diff --git a/src/main/resources/static/dijit/BackgroundIframe.js b/src/main/resources/static/dijit/BackgroundIframe.js
new file mode 100644
index 0000000000000000000000000000000000000000..4da9d5001f264835f9dc1e5f66ddab4218b8fc34
--- /dev/null
+++ b/src/main/resources/static/dijit/BackgroundIframe.js
@@ -0,0 +1,118 @@
+define([
+	"require",			// require.toUrl
+	"./main",	// to export dijit.BackgroundIframe
+	"dojo/_base/config",
+	"dojo/dom-construct", // domConstruct.create
+	"dojo/dom-style", // domStyle.set
+	"dojo/_base/lang", // lang.extend lang.hitch
+	"dojo/on",
+	"dojo/sniff" // has("ie"), has("trident"), has("quirks")
+], function(require, dijit, config, domConstruct, domStyle, lang, on, has){
+
+	// module:
+	//		dijit/BackgroundIFrame
+
+	// Flag for whether to create background iframe behind popups like Menus and Dialog.
+	// A background iframe is useful to prevent problems with popups appearing behind applets/pdf files,
+	// and is also useful on older versions of IE (IE6 and IE7) to prevent the "bleed through select" problem.
+	// By default, it's enabled for IE6-10, excluding Windows Phone 8,
+	// and it's also enabled for IE11 on Windows 7 and Windows 2008 Server.
+	// TODO: For 2.0, make this false by default.  Also, possibly move definition to has.js so that this module can be
+	// conditionally required via  dojo/has!bgIfame?dijit/BackgroundIframe
+	has.add("config-bgIframe",
+		(has("ie") && !/IEMobile\/10\.0/.test(navigator.userAgent)) || // No iframe on WP8, to match 1.9 behavior
+		(has("trident") && /Windows NT 6.[01]/.test(navigator.userAgent)));
+
+	var _frames = new function(){
+		// summary:
+		//		cache of iframes
+
+		var queue = [];
+
+		this.pop = function(){
+			var iframe;
+			if(queue.length){
+				iframe = queue.pop();
+				iframe.style.display="";
+			}else{
+				// transparency needed for DialogUnderlay and for tooltips on IE (to see screen near connector)
+				if(has("ie") < 9){
+					var burl = config["dojoBlankHtmlUrl"] || require.toUrl("dojo/resources/blank.html") || "javascript:\"\"";
+					var html="<iframe src='" + burl + "' role='presentation'"
+						+ " style='position: absolute; left: 0px; top: 0px;"
+						+ "z-index: -1; filter:Alpha(Opacity=\"0\");'>";
+					iframe = document.createElement(html);
+				}else{
+					iframe = domConstruct.create("iframe");
+					iframe.src = 'javascript:""';
+					iframe.className = "dijitBackgroundIframe";
+					iframe.setAttribute("role", "presentation");
+					domStyle.set(iframe, "opacity", 0.1);
+				}
+				iframe.tabIndex = -1; // Magic to prevent iframe from getting focus on tab keypress - as style didn't work.
+			}
+			return iframe;
+		};
+
+		this.push = function(iframe){
+			iframe.style.display="none";
+			queue.push(iframe);
+		}
+	}();
+
+
+	dijit.BackgroundIframe = function(/*DomNode*/ node){
+		// summary:
+		//		For IE/FF z-index shenanigans. id attribute is required.
+		//
+		// description:
+		//		new dijit.BackgroundIframe(node).
+		//
+		//		Makes a background iframe as a child of node, that fills
+		//		area (and position) of node
+
+		if(!node.id){ throw new Error("no id"); }
+		if(has("config-bgIframe")){
+			var iframe = (this.iframe = _frames.pop());
+			node.appendChild(iframe);
+			if(has("ie")<7 || has("quirks")){
+				this.resize(node);
+				this._conn = on(node, 'resize', lang.hitch(this, "resize", node));
+			}else{
+				domStyle.set(iframe, {
+					width: '100%',
+					height: '100%'
+				});
+			}
+		}
+	};
+
+	lang.extend(dijit.BackgroundIframe, {
+		resize: function(node){
+			// summary:
+			//		Resize the iframe so it's the same size as node.
+			//		Needed on IE6 and IE/quirks because height:100% doesn't work right.
+			if(this.iframe){
+				domStyle.set(this.iframe, {
+					width: node.offsetWidth + 'px',
+					height: node.offsetHeight + 'px'
+				});
+			}
+		},
+		destroy: function(){
+			// summary:
+			//		destroy the iframe
+			if(this._conn){
+				this._conn.remove();
+				this._conn = null;
+			}
+			if(this.iframe){
+				this.iframe.parentNode.removeChild(this.iframe);
+				_frames.push(this.iframe);
+				delete this.iframe;
+			}
+		}
+	});
+
+	return dijit.BackgroundIframe;
+});
diff --git a/src/main/resources/static/dijit/CONTRIBUTING.md b/src/main/resources/static/dijit/CONTRIBUTING.md
new file mode 100644
index 0000000000000000000000000000000000000000..d2387d98c55643947a318b7fc98675cb5e9809b2
--- /dev/null
+++ b/src/main/resources/static/dijit/CONTRIBUTING.md
@@ -0,0 +1,228 @@
+_Do you have a contribution?  We welcome contributions, but please ensure that you read the following information
+before issuing a pull request.  Also refer back to this document as a checklist before issuing your pull request.
+This will save time for everyone._
+
+# Before You Start
+
+## Understanding the Basics
+
+If you don't understand what a *pull request* is, or how to submit one, please refer to the [help documentation][]
+provided by GitHub.
+
+## Is It Really a Support Issue
+
+If you aren't sure if your contribution is needed or necessary, please visit the [support forum][] before attempting to
+submit a pull request or a ticket.
+
+## Search Dojo Toolkit's Bug Database
+
+We require every commit to be tracked via our [bug database][].  It is useful, before you get too far, that you have
+checked that your issue isn't already known, otherwise addressed?  If you think it is a valid defect or enhancement,
+please open a new ticket before submitting your pull request.
+
+## Discuss Non-Trivial Contributions with the Committers
+
+If your desired contribution is more than a non-trivial fix, you should discuss it on the
+[contributor's mailing list][dojo-contrib].  If you currently are not a member, you can request to be added.
+
+## Contributor License Agreement
+
+We require all contributions, to be covered under the Dojo Foundation's [Contributor License Agreement][cla].  This can
+be done electronically and essentially ensures that you are making it clear that your contributions are your
+contributions, you have the legal right to contribute and you are transferring the copyright of your works to the Dojo
+Foundation.
+
+If you are an unfamiliar contributor to the committer assessing your pull request, it is best to make it clear how
+you are covered by a CLA in the notes of the pull request.  The committer will [verify][claCheck] your status.
+
+If your GitHub user id you are submitting your pull request from differs from the Dojo Community ID or e-mail address
+which you have signed your CLA under, you should specifically note what you have your CLA filed under (and for CCLA
+that you are listed under your companies authorised contributors).
+
+# Submitting a Pull Request
+
+The following are the general steps you should follow in creating a pull request.  Subsequent pull requests only need
+to follow step 3 and beyond:
+
+1. Fork the repository on GitHub
+2. Clone the forked repository to your machine
+3. Create a "feature" branch in your local repository
+4. Make your changes and commit them to your local repository
+5. Rebase and push your commits to your GitHub remote fork/repository
+6. Issue a Pull Request to the official repository
+7. Your Pull Request is reviewed by a committer and merged into the repository
+
+*Note* While there are other ways to accomplish the steps using other tools, the examples here will assume the most
+actions will be performed via the `git` command line.
+
+## 1. Fork the Repository
+
+When logged into your GitHub account, and you are viewing one of the main repositories, you will see the *Fork* button.
+Clicking this button will show you which repositories your can fork to.  Choose your own account.  Once the process
+finishes, you will have your own repository that is "forked" from the GitHub one.
+
+Forking is a GitHub term and not a git term.  Git is a wholly distributed source control system and simply worries
+about local and remote repositories and allows you to manage your code against them.  GitHub then adds this additional
+layer of structure of how repositories can relate to each other.
+
+## 2. Clone the Forked Repository
+
+Once you have successfully forked your repository, you will need to clone it locally to your machine:
+
+```bash
+$ git clone --recursive git@github.com:username/dijit.git
+```
+
+This will clone your fork to your current path in a directory named `dijit`.
+
+It is important that you clone recursively for ``dojox``, ``demos`` or ``util``because some of the code is contained in
+submodules.  You won't be able to submit your changes to the repositories that way though.  If you are working on any of
+these sub-projects, you should contact those project leads to see if their workflow differs.
+
+You should also setup the `upstream` repository.  This will allow you to take changes from the "master" repository
+and merge them into your local clone and then push them to your GitHub fork:
+
+```bash
+$ cd dojo
+$ git remote add upstream git@github.com:dojo/dijit.git
+$ git fetch upstream
+```
+
+Then you can retrieve upstream changes and rebase on them into your code like this:
+
+```bash
+$ git pull --rebase upstream master
+```
+
+For more information on maintaining a fork, please see the GitHub Help article [Fork a Repo][] and information on
+[rebasing][] from git.
+
+## 3. Create a Branch
+
+The easiest workflow is to keep your master branch in sync with the upstream branch and do not locate any of your own
+commits in that branch.  When you want to work on a new feature, you then ensure you are on the master branch and create
+a new branch from there.  While the name of the branch can be anything, it can often be easy to use the ticket number
+you might be working on.  For example:
+
+```bash
+$ git checkout -b t12345 master
+Switched to a new branch 't12345'
+```
+
+You will then be on the feature branch.  You can verify what branch you are on like this:
+
+```bash
+$ git status
+# On branch t12345
+nothing to commit, working directory clean
+```
+
+## 4. Make Changes and Commit
+
+Now you just need to make your changes.  Once you have finished your changes (and tested them) you need to commit them
+to your local repository (assuming you have staged your changes for committing):
+
+```bash
+$ git status
+# On branch t12345
+# Changes to be committed:
+#   (use "git reset HEAD <file>..." to unstage)
+#
+#        modified:   somefile.js
+#
+$ git commit -m "Corrects some defect, fixes #12345, refs #12346"
+[t12345 0000000] Corrects some defect, fixes #12345, refs #12346
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+```
+
+## 5. Rebase and Push Changes
+
+If you have been working on your contribution for a while, the upstream repository may have changed.  You may want to
+ensure your work is on top of the latest changes so your pull request can be applied cleanly:
+
+```bash
+$ git pull --rebase upstream master
+```
+
+When you are ready to push your commit to your GitHub repository for the first time on this branch you would do the
+following:
+
+```bash
+$ git push -u origin t12345
+```
+
+After the first time, you simply need to do:
+
+```bash
+$ git push
+```
+
+## 6. Issue a Pull Request
+
+In order to have your commits merged into the main repository, you need to create a pull request.  The instructions for
+this can be found in the GitHub Help Article [Creating a Pull Request][].  Essentially you do the following:
+
+1. Go to the site for your repository.
+2. Click the Pull Request button.
+3. Select the feature branch from your repository.
+4. Enter a title and description of your pull request mentioning the corresponding [bug database][] ticket in the description.
+5. Review the commit and files changed tabs.
+6. Click `Send Pull Request`
+
+You will get notified about the status of your pull request based on your GitHub settings.
+
+## 7. Request is Reviewed and Merged
+
+Your request will be reviewed.  It may be merged directly, or you may receive feedback or questions on your pull
+request.
+
+# What Makes a Successful Pull Request?
+
+Having your contribution accepted is more than just the mechanics of getting your contribution into a pull request,
+there are several other things that are expected when contributing to the Dojo Toolkit which are covered below.
+
+## Coding Style and Linting
+
+Dojo has a very specific [coding style][styleguide].  All pull requests should adhere to this.
+
+## Inline Documentation
+
+Dojo has an inline API documentation called [DojoDoc][].  Any pull request should ensure it has updated the inline
+documentation appropriately or added the appropriate inline documentation.
+
+## Test Cases
+
+If the pull request changes the functional behaviour or is fixing a defect, the unit test cases should be modified to
+reflect this.  The committer reviewing your pull request is likely to request the appropriate changes in the test
+cases.  Dojo utilises [Intern][] for all new tests, and has legacy support for its previous generation test harness called [D.O.H.][] and is available as part of the [dojo/util][] repository. All new tests should be authored using Intern.
+
+It is expected that you will have tested your changes against the existing test cases and appropriate platforms prior to
+submitting your pull request.
+
+## Licensing
+
+All of your submissions are licensed under a dual "New" BSD/AFL license.
+
+## Expect Discussion and Rework
+
+Unless you have been working with contributing to Dojo for a while, expect a significant amount of feedback on your
+pull requests.  We are a very passionate community and even the committers often will provide robust feedback to each
+other about their code.  Don't be offended by such feedback or feel that your contributions aren't welcome, it is just
+that we are quite passionate and Dojo has a long history with many things that are the "Dojo-way" which may be
+unfamiliar to those who are just starting to contribute.
+
+[help documentation]: http://help.github.com/send-pull-requests
+[bug database]: http://bugs.dojotoolkit.org/
+[support forum]: http://dojotoolkit.org/community/
+[dojo-contrib]: http://mail.dojotoolkit.org/mailman/listinfo/dojo-contributors
+[cla]: http://dojofoundation.org/about/cla
+[claCheck]: http://dojofoundation.org/about/claCheck
+[Creating a Pull Request]: https://help.github.com/articles/creating-a-pull-request
+[Fork a Repo]: https://help.github.com/articles/fork-a-repo
+[Intern]: http://theintern.io/
+[styleguide]: http://dojotoolkit.org/reference-guide/developer/styleguide.html
+[DojoDoc]: http://dojotoolkit.org/reference-guide/developer/markup.html
+[D.O.H.]: http://dojotoolkit.org/reference-guide/util/doh.html
+[dojo/util]: https://github.com/dojo/util
+[interactive rebase]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages
+[rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
diff --git a/src/main/resources/static/dijit/Calendar.js b/src/main/resources/static/dijit/Calendar.js
new file mode 100644
index 0000000000000000000000000000000000000000..909e74cfb8a419382580924e3fd26da176464a55
--- /dev/null
+++ b/src/main/resources/static/dijit/Calendar.js
@@ -0,0 +1,323 @@
+define([
+	"dojo/_base/array", // array.map
+	"dojo/date",
+	"dojo/date/locale",
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.get
+	"dojo/dom-class", // domClass.add domClass.contains domClass.remove domClass.toggle
+	"dojo/dom-construct",	// create
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/keys", // keys
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dojo/sniff", // has("ie")
+	"./CalendarLite",
+	"./_Widget",
+	"./_CssStateMixin",
+	"./_TemplatedMixin",
+	"./form/DropDownButton"
+], function(array, date, local, declare, domAttr, domClass, domConstruct, kernel, keys, lang, on, has,
+			CalendarLite, _Widget, _CssStateMixin, _TemplatedMixin, DropDownButton){
+
+	// module:
+	//		dijit/Calendar
+
+	// _Widget for deprecated methods like setAttribute()
+	var Calendar = declare("dijit.Calendar", [CalendarLite, _Widget, _CssStateMixin], {
+		// summary:
+		//		A simple GUI for choosing a date in the context of a monthly calendar.
+		//
+		// description:
+		//		See CalendarLite for general description.   Calendar extends CalendarLite, adding:
+		//
+		//		- month drop down list
+		//		- keyboard navigation
+		//		- CSS classes for hover/mousepress on date, month, and year nodes
+		//		- support of deprecated methods (will be removed in 2.0)
+
+		baseClass: "dijitCalendar",
+
+		// Set node classes for various mouse events, see dijit._CssStateMixin for more details
+		cssStateNodes: {
+			"decrementMonth": "dijitCalendarArrow",
+			"incrementMonth": "dijitCalendarArrow",
+			"previousYearLabelNode": "dijitCalendarPreviousYear",
+			"nextYearLabelNode": "dijitCalendarNextYear"
+		},
+
+		setValue: function(/*Date*/ value){
+			// summary:
+			//		Deprecated.   Use set('value', ...) instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated("dijit.Calendar:setValue() is deprecated.  Use set('value', ...) instead.", "", "2.0");
+			this.set('value', value);
+		},
+
+		_createMonthWidget: function(){
+			// summary:
+			//		Creates the drop down button that displays the current month and lets user pick a new one
+
+			return new Calendar._MonthDropDownButton({
+				id: this.id + "_mddb",
+				tabIndex: -1,
+				onMonthSelect: lang.hitch(this, "_onMonthSelect"),
+				lang: this.lang,
+				dateLocaleModule: this.dateLocaleModule
+			}, this.monthNode);
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// Events specific to Calendar, not used in CalendarLite
+			this.own(
+				on(this.domNode, "keydown", lang.hitch(this, "_onKeyDown")),
+				on(this.dateRowsNode, "mouseover", lang.hitch(this, "_onDayMouseOver")),
+				on(this.dateRowsNode, "mouseout", lang.hitch(this, "_onDayMouseOut")),
+				on(this.dateRowsNode, "mousedown", lang.hitch(this, "_onDayMouseDown")),
+				on(this.dateRowsNode, "mouseup", lang.hitch(this, "_onDayMouseUp"))
+			);
+		},
+
+		_onMonthSelect: function(/*Number*/ newMonth){
+			// summary:
+			//		Handler for when user selects a month from the drop down list
+			// tags:
+			//		protected
+
+			// move to selected month, bounding by the number of days in the month
+			// (ex: jan 31 --> feb 28, not feb 31)
+			var date = new this.dateClassObj(this.currentFocus);
+			date.setDate(1);
+			date.setMonth(newMonth);
+			var daysInMonth = this.dateModule.getDaysInMonth(date);
+			var currentDate = this.currentFocus.getDate();
+			date.setDate(Math.min(currentDate, daysInMonth));
+			this._setCurrentFocusAttr(date);
+		},
+
+		_onDayMouseOver: function(/*Event*/ evt){
+			// summary:
+			//		Handler for mouse over events on days, sets hovered style
+			// tags:
+			//		protected
+
+			// event can occur on <td> or the <span> inside the td,
+			// set node to the <td>.
+			var node =
+				domClass.contains(evt.target, "dijitCalendarDateLabel") ?
+					evt.target.parentNode :
+					evt.target;
+
+			if(node && (
+				(node.dijitDateValue && !domClass.contains(node, "dijitCalendarDisabledDate"))
+					|| node == this.previousYearLabelNode || node == this.nextYearLabelNode
+				)){
+				domClass.add(node, "dijitCalendarHoveredDate");
+				this._currentNode = node;
+			}
+		},
+
+		_onDayMouseOut: function(/*Event*/ evt){
+			// summary:
+			//		Handler for mouse out events on days, clears hovered style
+			// tags:
+			//		protected
+
+			if(!this._currentNode){
+				return;
+			}
+
+			// if mouse out occurs moving from <td> to <span> inside <td>, ignore it
+			if(evt.relatedTarget && evt.relatedTarget.parentNode == this._currentNode){
+				return;
+			}
+			var cls = "dijitCalendarHoveredDate";
+			if(domClass.contains(this._currentNode, "dijitCalendarActiveDate")){
+				cls += " dijitCalendarActiveDate";
+			}
+			domClass.remove(this._currentNode, cls);
+			this._currentNode = null;
+		},
+
+		_onDayMouseDown: function(/*Event*/ evt){
+			var node = evt.target.parentNode;
+			if(node && node.dijitDateValue && !domClass.contains(node, "dijitCalendarDisabledDate")){
+				domClass.add(node, "dijitCalendarActiveDate");
+				this._currentNode = node;
+			}
+		},
+
+		_onDayMouseUp: function(/*Event*/ evt){
+			var node = evt.target.parentNode;
+			if(node && node.dijitDateValue){
+				domClass.remove(node, "dijitCalendarActiveDate");
+			}
+		},
+
+		handleKey: function(/*Event*/ evt){
+			// summary:
+			//		Provides keyboard navigation of calendar.
+			// description:
+			//		Called from _onKeyDown() to handle keydown on a stand alone Calendar,
+			//		and also from `dijit/form/_DateTimeTextBox` to pass a keydown event
+			//		from the `dijit/form/DateTextBox` to be handled in this widget
+			// returns:
+			//		False if the key was recognized as a navigation key,
+			//		to indicate that the event was handled by Calendar and shouldn't be propagated
+			// tags:
+			//		protected
+			var increment = -1,
+				interval,
+				newValue = this.currentFocus;
+			switch(evt.keyCode){
+				case keys.RIGHT_ARROW:
+					increment = 1;
+				//fallthrough...
+				case keys.LEFT_ARROW:
+					interval = "day";
+					if(!this.isLeftToRight()){
+						increment *= -1;
+					}
+					break;
+				case keys.DOWN_ARROW:
+					increment = 1;
+				//fallthrough...
+				case keys.UP_ARROW:
+					interval = "week";
+					break;
+				case keys.PAGE_DOWN:
+					increment = 1;
+				//fallthrough...
+				case keys.PAGE_UP:
+					interval = evt.ctrlKey || evt.altKey ? "year" : "month";
+					break;
+				case keys.END:
+					// go to the next month
+					newValue = this.dateModule.add(newValue, "month", 1);
+					// subtract a day from the result when we're done
+					interval = "day";
+				//fallthrough...
+				case keys.HOME:
+					newValue = new this.dateClassObj(newValue);
+					newValue.setDate(1);
+					break;
+				default:
+					return true;
+			}
+
+			if(interval){
+				newValue = this.dateModule.add(newValue, interval, increment);
+			}
+
+			this._setCurrentFocusAttr(newValue);
+
+			return false;
+		},
+
+		_onKeyDown: function(/*Event*/ evt){
+			// summary:
+			//		For handling keydown events on a stand alone calendar
+			if(!this.handleKey(evt)){
+				evt.stopPropagation();
+				evt.preventDefault();
+			}
+		},
+
+		onValueSelected: function(/*Date*/ /*===== date =====*/){
+			// summary:
+			//		Deprecated.   Notification that a date cell was selected.  It may be the same as the previous value.
+			// description:
+			//		Formerly used by `dijit/form/_DateTimeTextBox` (and thus `dijit/form/DateTextBox`)
+			//		to get notification when the user has clicked a date.  Now onExecute() (above) is used.
+			// tags:
+			//		protected
+		},
+
+		onChange: function(value){
+			this.onValueSelected(value);	// remove in 2.0
+		},
+
+		getClassForDate: function(/*===== dateObject, locale =====*/){
+			// summary:
+			//		May be overridden to return CSS classes to associate with the date entry for the given dateObject,
+			//		for example to indicate a holiday in specified locale.
+			// dateObject: Date
+			// locale: String?
+			// tags:
+			//		extension
+
+			/*=====
+			 return ""; // String
+			 =====*/
+		}
+	});
+
+	Calendar._MonthDropDownButton = declare("dijit.Calendar._MonthDropDownButton", DropDownButton, {
+		// summary:
+		//		DropDownButton for the current month.    Displays name of current month
+		//		and a list of month names in the drop down
+
+		onMonthSelect: function(){
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+			this.dropDown = new Calendar._MonthDropDown({
+				id: this.id + "_mdd", //do not change this id because it is referenced in the template
+				onChange: this.onMonthSelect
+			});
+		},
+		_setMonthAttr: function(month){
+			// summary:
+			//		Set the current month to display as a label
+			var monthNames = this.dateLocaleModule.getNames('months', 'wide', 'standAlone', this.lang, month);
+			this.dropDown.set("months", monthNames);
+
+			// Set name of current month and also fill in spacer element with all the month names
+			// (invisible) so that the maximum width will affect layout.   But not on IE6 because then
+			// the center <TH> overlaps the right <TH> (due to a browser bug).
+			this.containerNode.innerHTML =
+				(has("ie") == 6 ? "" : "<div class='dijitSpacer'>" + this.dropDown.domNode.innerHTML + "</div>") +
+					"<div class='dijitCalendarMonthLabel dijitCalendarCurrentMonthLabel'>" + monthNames[month.getMonth()] + "</div>";
+		}
+	});
+
+	Calendar._MonthDropDown = declare("dijit.Calendar._MonthDropDown", [_Widget, _TemplatedMixin, _CssStateMixin], {
+		// summary:
+		//		The list-of-months drop down from the MonthDropDownButton
+
+		// months: String[]
+		//		List of names of months, possibly w/some undefined entries for Hebrew leap months
+		//		(ex: ["January", "February", undefined, "April", ...])
+		months: [],
+
+		baseClass: "dijitCalendarMonthMenu dijitMenu",
+
+		templateString: "<div data-dojo-attach-event='ondijitclick:_onClick'></div>",
+
+		_setMonthsAttr: function(/*String[]*/ months){
+			this.domNode.innerHTML = "";
+			array.forEach(months, function(month, idx){
+				var div = domConstruct.create("div", {
+					className: "dijitCalendarMonthLabel",
+					month: idx,
+					innerHTML: month
+				}, this.domNode);
+				div._cssState = "dijitCalendarMonthLabel";	// trigger _CSSStateMixin magic; property, not attribute.
+			}, this);
+		},
+
+		_onClick: function(/*Event*/ evt){
+			this.onChange(domAttr.get(evt.target, "month"));
+		},
+
+		onChange: function(/*Number*/ /*===== month =====*/){
+			// summary:
+			//		Callback when month is selected from drop down
+		}
+	});
+
+	return Calendar;
+});
diff --git a/src/main/resources/static/dijit/CalendarLite.js b/src/main/resources/static/dijit/CalendarLite.js
new file mode 100644
index 0000000000000000000000000000000000000000..1dbd13a8e1493b60982cfb9d3020bee16c45cb5b
--- /dev/null
+++ b/src/main/resources/static/dijit/CalendarLite.js
@@ -0,0 +1,535 @@
+define([
+	"dojo/_base/array", // array.forEach array.map
+	"dojo/_base/declare", // declare
+	"dojo/cldr/supplemental", // cldrSupplemental.getFirstDayOfWeek
+	"dojo/date", // date
+	"dojo/date/locale",
+	"dojo/date/stamp", // stamp.fromISOString
+	"dojo/dom", // dom.setSelectable
+	"dojo/dom-class", // domClass.contains
+	"dojo/dom-attr",
+	"dojo/_base/lang", // lang.getObject, lang.hitch
+	"dojo/on",
+	"dojo/sniff", // has("ie") has("webkit")
+	"dojo/string", // string.substitute
+	"./_WidgetBase",
+	"./_TemplatedMixin",
+	"dojo/text!./templates/Calendar.html",
+	"./a11yclick",	// not used directly, but template has ondijitclick in it
+	"./hccss"    // not used directly, but sets CSS class on <body>
+], function(array, declare, cldrSupplemental, date, locale, stamp, dom, domClass, domAttr, lang, on, has, string, _WidgetBase, _TemplatedMixin, template){
+
+
+	// module:
+	//		dijit/CalendarLite
+
+	var CalendarLite = declare("dijit.CalendarLite", [_WidgetBase, _TemplatedMixin], {
+		// summary:
+		//		Lightweight version of Calendar widget aimed towards mobile use
+		//
+		// description:
+		//		A simple GUI for choosing a date in the context of a monthly calendar.
+		//		This widget can't be used in a form because it doesn't serialize the date to an
+		//		`<input>` field.  For a form element, use dijit/form/DateTextBox instead.
+		//
+		//		Note that the parser takes all dates attributes passed in the
+		//		[RFC 3339 format](http://www.faqs.org/rfcs/rfc3339.html), e.g. `2005-06-30T08:05:00-07:00`
+		//		so that they are serializable and locale-independent.
+		//
+		//		Also note that this widget isn't keyboard accessible; use dijit.Calendar for that
+		// example:
+		//	|	var calendar = new dijit.CalendarLite({}, dojo.byId("calendarNode"));
+		//
+		// example:
+		//	|	<div data-dojo-type="dijit/CalendarLite"></div>
+
+		// Template for main calendar
+		templateString: template,
+
+		// Template for cell for a day of the week (ex: M)
+		dowTemplateString: '<th class="dijitReset dijitCalendarDayLabelTemplate" role="columnheader" scope="col"><span class="dijitCalendarDayLabel">${d}</span></th>',
+
+		// Templates for a single date (ex: 13), and for a row for a week (ex: 20 21 22 23 24 25 26)
+		dateTemplateString: '<td class="dijitReset" role="gridcell" data-dojo-attach-point="dateCells"><span class="dijitCalendarDateLabel" data-dojo-attach-point="dateLabels"></span></td>',
+		weekTemplateString: '<tr class="dijitReset dijitCalendarWeekTemplate" role="row">${d}${d}${d}${d}${d}${d}${d}</tr>',
+
+		// value: Date
+		//		The currently selected Date, initially set to invalid date to indicate no selection.
+		value: new Date(""),
+		// TODO: for 2.0 make this a string (ISO format) rather than a Date
+
+		// datePackage: String
+		//		JavaScript namespace to find calendar routines.	 If unspecified, uses Gregorian calendar routines
+		//		at dojo/date and dojo/date/locale.
+		datePackage: "",
+		//		TODO: for 2.0, replace datePackage with dateModule and dateLocalModule attributes specifying MIDs,
+		//		or alternately just get rid of this completely and tell user to use module ID remapping
+		//		via require
+
+		// dayWidth: String
+		//		How to represent the days of the week in the calendar header. See locale
+		dayWidth: "narrow",
+
+		// tabIndex: String
+		//		Order fields are traversed when user hits the tab key
+		tabIndex: "0",
+
+		// dayOffset: Integer
+		//		(Optional) The first day of week override. By default the first day of week is determined
+		//		for the current locale (extracted from the CLDR).
+		//		Special value -1 (default value), means use locale dependent value.
+		dayOffset: -1,
+
+		// currentFocus: Date
+		//		Date object containing the currently focused date, or the date which would be focused
+		//		if the calendar itself was focused.   Also indicates which year and month to display,
+		//		i.e. the current "page" the calendar is on.
+		currentFocus: new Date(),
+
+		// Put the summary to the node with role=grid
+		_setSummaryAttr: "gridNode",
+
+		baseClass: "dijitCalendar dijitCalendarLite",
+
+		_isValidDate: function(/*Date*/ value){
+			// summary:
+			//		Runs various tests on the value, checking that it's a valid date, rather
+			//		than blank or NaN.
+			// tags:
+			//		private
+			return value && !isNaN(value) && typeof value == "object" &&
+				value.toString() != this.constructor.prototype.value.toString();
+		},
+
+		_getValueAttr: function(){
+			// summary:
+			//		Support get('value')
+
+			// this.value is set to 1AM, but return midnight, local time for back-compat
+			var storedVal = this._get("value");
+			if(storedVal && !isNaN(storedVal)){
+				var value = new this.dateClassObj(storedVal);
+				value.setHours(0, 0, 0, 0);
+
+				// If daylight savings pushes midnight to the previous date, fix the Date
+				// object to point at 1am so it will represent the correct day. See #9366
+				if(value.getDate() < storedVal.getDate()){
+					value = this.dateModule.add(value, "hour", 1);
+				}
+				return value;
+			}else{
+				return null;
+			}
+		},
+
+		_setValueAttr: function(/*Date|Number*/ value, /*Boolean*/ priorityChange){
+			// summary:
+			//		Support set("value", ...)
+			// description:
+			//		Set the current date and update the UI.  If the date is disabled, the value will
+			//		not change, but the display will change to the corresponding month.
+			// value:
+			//		Either a Date or the number of seconds since 1970.
+			// tags:
+			//		protected
+			if(typeof value == "string"){
+				value = stamp.fromISOString(value);
+			}
+			value = this._patchDate(value);
+
+			if(this._isValidDate(value) && !this.isDisabledDate(value, this.lang)){
+				this._set("value", value);
+
+				// Set focus cell to the new value.   Arguably this should only happen when there isn't a current
+				// focus point.   This will also repopulate the grid to new month/year if necessary.
+				this.set("currentFocus", value);
+
+				// Mark the selected date
+				this._markSelectedDates([value]);
+
+				if(this._created && (priorityChange || typeof priorityChange == "undefined")){
+					this.onChange(this.get('value'));
+				}
+			}else{
+				// clear value, and mark all dates as unselected
+				this._set("value", null);
+				this._markSelectedDates([]);
+			}
+		},
+
+		_patchDate: function(/*Date|Number*/ value){
+			// summary:
+			//		Convert Number into Date, or copy Date object.   Then, round to nearest day,
+			//		setting to 1am to avoid issues when DST shift occurs at midnight, see #8521, #9366)
+			if(value){
+				value = new this.dateClassObj(value);
+				value.setHours(1, 0, 0, 0);
+			}
+			return value;
+		},
+
+		_setText: function(node, text){
+			// summary:
+			//		This just sets the content of node to the specified text.
+			//		Can't do "node.innerHTML=text" because of an IE bug w/tables, see #3434.
+			// tags:
+			//		private
+			while(node.firstChild){
+				node.removeChild(node.firstChild);
+			}
+			node.appendChild(node.ownerDocument.createTextNode(text));
+		},
+
+		_populateGrid: function(){
+			// summary:
+			//		Fills in the calendar grid with each day (1-31).
+			//		Call this on creation, when moving to a new month.
+			// tags:
+			//		private
+
+			var month = new this.dateClassObj(this.currentFocus);
+			month.setDate(1);
+			month = this._patchDate(month);	// needed if currentFocus is start or end of DST, see #17033
+
+			var firstDay = month.getDay(),
+				daysInMonth = this.dateModule.getDaysInMonth(month),
+				daysInPreviousMonth = this.dateModule.getDaysInMonth(this.dateModule.add(month, "month", -1)),
+				today = new this.dateClassObj(),
+				dayOffset = this.dayOffset >= 0 ? this.dayOffset : cldrSupplemental.getFirstDayOfWeek(this.lang);
+			if(dayOffset > firstDay){
+				dayOffset -= 7;
+			}
+
+			// If they didn't provide a summary, change the default summary to match with the new month
+			if(!this.summary){
+				var monthNames = this.dateLocaleModule.getNames('months', 'wide', 'standAlone', this.lang, month)
+				this.gridNode.setAttribute("summary", monthNames[month.getMonth()]);
+			}
+
+			// Mapping from date (as specified by number returned from Date.valueOf()) to corresponding <td>
+			this._date2cell = {};
+
+			// Iterate through dates in the calendar and fill in date numbers and style info
+			array.forEach(this.dateCells, function(template, idx){
+				var i = idx + dayOffset;
+				var date = new this.dateClassObj(month),
+					number, clazz = "dijitCalendar", adj = 0;
+
+				if(i < firstDay){
+					number = daysInPreviousMonth - firstDay + i + 1;
+					adj = -1;
+					clazz += "Previous";
+				}else if(i >= (firstDay + daysInMonth)){
+					number = i - firstDay - daysInMonth + 1;
+					adj = 1;
+					clazz += "Next";
+				}else{
+					number = i - firstDay + 1;
+					clazz += "Current";
+				}
+
+				if(adj){
+					date = this.dateModule.add(date, "month", adj);
+				}
+				date.setDate(number);
+
+				if(!this.dateModule.compare(date, today, "date")){
+					clazz = "dijitCalendarCurrentDate " + clazz;
+				}
+
+				if(this.isDisabledDate(date, this.lang)){
+					clazz = "dijitCalendarDisabledDate " + clazz;
+					template.setAttribute("aria-disabled", "true");
+				}else{
+					clazz = "dijitCalendarEnabledDate " + clazz;
+					template.removeAttribute("aria-disabled");
+					template.setAttribute("aria-selected", "false");
+				}
+
+				var clazz2 = this.getClassForDate(date, this.lang);
+				if(clazz2){
+					clazz = clazz2 + " " + clazz;
+				}
+
+				template.className = clazz + "Month dijitCalendarDateTemplate";
+
+				// Each cell has an associated integer value representing it's date
+				var dateVal = date.valueOf();
+				this._date2cell[dateVal] = template;
+				template.dijitDateValue = dateVal;
+
+				// Set Date string (ex: "13").
+
+				var localizedDate = date.getDateLocalized ? date.getDateLocalized(this.lang) : date.getDate()
+				this._setText(this.dateLabels[idx], localizedDate);
+				domAttr.set(template, 'aria-label', locale.format(date, {
+					selector: 'date',
+					formatLength: 'long'
+				}));
+			}, this);
+		},
+
+		_populateControls: function(){
+			// summary:
+			//		Fill in localized month, and prev/current/next years
+			// tags:
+			//		protected
+
+			var month = new this.dateClassObj(this.currentFocus);
+			month.setDate(1);
+
+			// set name of this month
+			this.monthWidget.set("month", month);
+
+			var y = month.getFullYear() - 1;
+			var d = new this.dateClassObj();
+			array.forEach(["previous", "current", "next"], function(name){
+				d.setFullYear(y++);
+				this._setText(this[name + "YearLabelNode"],
+					this.dateLocaleModule.format(d, {selector: 'year', locale: this.lang}));
+			}, this);
+		},
+
+		goToToday: function(){
+			// summary:
+			//		Sets calendar's value to today's date
+			this.set('value', new this.dateClassObj());
+		},
+
+		constructor: function(params /*===== , srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified, replace srcNodeRef with my generated DOM tree
+
+			this.dateModule = params.datePackage ? lang.getObject(params.datePackage, false) : date;
+			this.dateClassObj = this.dateModule.Date || Date;
+			this.dateLocaleModule = params.datePackage ? lang.getObject(params.datePackage + ".locale", false) : locale;
+		},
+
+		_createMonthWidget: function(){
+			// summary:
+			//		Creates the drop down button that displays the current month and lets user pick a new one
+
+			return CalendarLite._MonthWidget({
+				id: this.id + "_mddb",
+				lang: this.lang,
+				dateLocaleModule: this.dateLocaleModule
+			}, this.monthNode);
+		},
+
+		buildRendering: function(){
+			// Markup for days of the week (referenced from template)
+			var d = this.dowTemplateString,
+				dayNames = this.dateLocaleModule.getNames('days', this.dayWidth, 'standAlone', this.lang),
+				dayOffset = this.dayOffset >= 0 ? this.dayOffset : cldrSupplemental.getFirstDayOfWeek(this.lang);
+			this.dayCellsHtml = string.substitute([d, d, d, d, d, d, d].join(""), {d: ""}, function(){
+				return dayNames[dayOffset++ % 7];
+			});
+
+			// Markup for dates of the month (referenced from template), but without numbers filled in
+			var r = string.substitute(this.weekTemplateString, {d: this.dateTemplateString});
+			this.dateRowsHtml = [r, r, r, r, r, r].join("");
+
+			// Instantiate from template.
+			// dateCells and dateLabels arrays filled when _Templated parses my template.
+			this.dateCells = [];
+			this.dateLabels = [];
+			this.inherited(arguments);
+
+			dom.setSelectable(this.domNode, false);
+
+			var dateObj = new this.dateClassObj(this.currentFocus);
+
+			this.monthWidget = this._createMonthWidget();
+
+			this.set('currentFocus', dateObj, false);	// draw the grid to the month specified by currentFocus
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+			this._connectControls();
+		},
+
+		_connectControls: function(){
+			// summary:
+			//		Set up connects for increment/decrement of months/years
+			// tags:
+			//		protected
+
+			var connect = lang.hitch(this, function(nodeProp, part, amount){
+				this[nodeProp].dojoClick = true;
+				return on(this[nodeProp], "click", lang.hitch(this, function(){
+					this._setCurrentFocusAttr(this.dateModule.add(this.currentFocus, part, amount));
+				}));
+			});
+
+			this.own(
+				connect("incrementMonth", "month", 1),
+				connect("decrementMonth", "month", -1),
+				connect("nextYearLabelNode", "year", 1),
+				connect("previousYearLabelNode", "year", -1)
+			);
+		},
+
+		_setCurrentFocusAttr: function(/*Date*/ date, /*Boolean*/ forceFocus){
+			// summary:
+			//		If the calendar currently has focus, then focuses specified date,
+			//		changing the currently displayed month/year if necessary.
+			//		If the calendar doesn't have focus, updates currently
+			//		displayed month/year, and sets the cell that will get focus
+			//		when Calendar is focused.
+			// forceFocus:
+			//		If true, will focus() the cell even if calendar itself doesn't have focus
+
+			var oldFocus = this.currentFocus,
+				oldCell = this._getNodeByDate(oldFocus);
+			date = this._patchDate(date);
+
+			this._set("currentFocus", date);
+
+			// If the focus is on a different month than the current calendar month, switch the displayed month.
+			// Also will populate the grid initially, on Calendar creation.
+			if(!this._date2cell || this.dateModule.difference(oldFocus, date, "month") != 0){
+				this._populateGrid();
+				this._populateControls();
+				this._markSelectedDates([this.value]);
+			}
+
+			// set tabIndex=0 on new cell, and focus it (but only if Calendar itself is focused)
+			var newCell = this._getNodeByDate(date);
+			newCell.setAttribute("tabIndex", this.tabIndex);
+			if(this.focused || forceFocus){
+				newCell.focus();
+			}
+
+			// set tabIndex=-1 on old focusable cell
+			if(oldCell && oldCell != newCell){
+				if(has("webkit")){    // see #11064 about webkit bug
+					oldCell.setAttribute("tabIndex", "-1");
+				}else{
+					oldCell.removeAttribute("tabIndex");
+				}
+			}
+		},
+
+		focus: function(){
+			// summary:
+			//		Focus the calendar by focusing one of the calendar cells
+			this._setCurrentFocusAttr(this.currentFocus, true);
+		},
+
+		_onDayClick: function(/*Event*/ evt){
+			// summary:
+			//		Handler for day clicks, selects the date if appropriate
+			// tags:
+			//		protected
+			evt.stopPropagation();
+			evt.preventDefault();
+			for(var node = evt.target; node && !node.dijitDateValue; node = node.parentNode){
+				;
+			}
+			if(node && !domClass.contains(node, "dijitCalendarDisabledDate")){
+				this.set('value', node.dijitDateValue);
+			}
+		},
+
+		_getNodeByDate: function(/*Date*/ value){
+			// summary:
+			//		Returns the cell corresponding to the date, or null if the date is not within the currently
+			//		displayed month.
+			value = this._patchDate(value);
+			return value && this._date2cell ? this._date2cell[value.valueOf()] : null;
+		},
+
+		_markSelectedDates: function(/*Date[]*/ dates){
+			// summary:
+			//		Marks the specified cells as selected, and clears cells previously marked as selected.
+			//		For CalendarLite at most one cell is selected at any point, but this allows an array
+			//		for easy subclassing.
+
+			// Function to mark a cell as selected or unselected
+			function mark(/*Boolean*/ selected, /*DomNode*/ cell){
+				domClass.toggle(cell, "dijitCalendarSelectedDate", selected);
+				cell.setAttribute("aria-selected", selected ? "true" : "false");
+			}
+
+			// Clear previously selected cells.
+			array.forEach(this._selectedCells || [], lang.partial(mark, false));
+
+			// Mark newly selected cells.  Ignore dates outside the currently displayed month.
+			this._selectedCells = array.filter(array.map(dates, this._getNodeByDate, this), function(n){
+				return n;
+			});
+			array.forEach(this._selectedCells, lang.partial(mark, true));
+		},
+
+		onChange: function(/*Date*/ /*===== date =====*/){
+			// summary:
+			//		Called only when the selected date has changed
+		},
+
+		isDisabledDate: function(/*===== dateObject, locale =====*/){
+			// summary:
+			//		May be overridden to disable certain dates in the calendar e.g. `isDisabledDate=dojo.date.locale.isWeekend`
+			// dateObject: Date
+			// locale: String?
+			// tags:
+			//		extension
+			/*=====
+			 return false; // Boolean
+			 =====*/
+		},
+
+		getClassForDate: function(/*===== dateObject, locale =====*/){
+			// summary:
+			//		May be overridden to return CSS classes to associate with the date entry for the given dateObject,
+			//		for example to indicate a holiday in specified locale.
+			// dateObject: Date
+			// locale: String?
+			// tags:
+			//		extension
+
+			/*=====
+			 return ""; // String
+			 =====*/
+		}
+	});
+
+	CalendarLite._MonthWidget = declare("dijit.CalendarLite._MonthWidget", _WidgetBase, {
+		// summary:
+		//		Displays name of current month padded to the width of the month
+		//		w/the longest name, so that changing months doesn't change width.
+		//
+		//		Create as:
+		// |	new Calendar._MonthWidget({
+		// |			lang: ...,
+		// |			dateLocaleModule: ...
+		// |		})
+
+		_setMonthAttr: function(month){
+			// summary:
+			//		Set the current month to display as a label
+			var monthNames = this.dateLocaleModule.getNames('months', 'wide', 'standAlone', this.lang, month),
+				spacer =
+					(has("ie") == 6 ? "" : "<div class='dijitSpacer'>" +
+						array.map(monthNames,function(s){
+							return "<div>" + s + "</div>";
+						}).join("") + "</div>");
+
+			// Set name of current month and also fill in spacer element with all the month names
+			// (invisible) so that the maximum width will affect layout.   But not on IE6 because then
+			// the center <TH> overlaps the right <TH> (due to a browser bug).
+			this.domNode.innerHTML =
+				spacer +
+					"<div class='dijitCalendarMonthLabel dijitCalendarCurrentMonthLabel'>" +
+					monthNames[month.getMonth()] + "</div>";
+		}
+	});
+
+	return CalendarLite;
+});
diff --git a/src/main/resources/static/dijit/CheckedMenuItem.js b/src/main/resources/static/dijit/CheckedMenuItem.js
new file mode 100644
index 0000000000000000000000000000000000000000..06e57c16c77843f609d4194f9198c45347cd03c0
--- /dev/null
+++ b/src/main/resources/static/dijit/CheckedMenuItem.js
@@ -0,0 +1,56 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.toggle
+	"./MenuItem",
+	"dojo/text!./templates/CheckedMenuItem.html",
+	"./hccss"
+], function(declare, domClass, MenuItem, template){
+
+	// module:
+	//		dijit/CheckedMenuItem
+
+	return declare("dijit.CheckedMenuItem", MenuItem, {
+		// summary:
+		//		A checkbox-like menu item for toggling on and off
+
+		// Use both base classes so we get styles like dijitMenuItemDisabled
+		baseClass: "dijitMenuItem dijitCheckedMenuItem",
+
+		templateString: template,
+
+		// checked: Boolean
+		//		Our checked state
+		checked: false,
+		_setCheckedAttr: function(/*Boolean*/ checked){
+			this.domNode.setAttribute("aria-checked", checked ? "true" : "false");
+			this._set("checked", checked);	// triggers CSS update via _CssStateMixin
+		},
+
+		iconClass: "",	// override dijitNoIcon
+
+		role: "menuitemcheckbox",
+
+		// checkedChar: String
+		//		Character (or string) used in place of checkbox icon when display in high contrast mode
+		checkedChar: "&#10003;",
+
+		onChange: function(/*Boolean*/ /*===== checked =====*/){
+			// summary:
+			//		User defined function to handle check/uncheck events
+			// tags:
+			//		callback
+		},
+
+		_onClick: function(evt){
+			// summary:
+			//		Clicking this item just toggles its state
+			// tags:
+			//		private
+			if(!this.disabled){
+				this.set("checked", !this.checked);
+				this.onChange(this.checked);
+			}
+			this.onClick(evt);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/ColorPalette.js b/src/main/resources/static/dijit/ColorPalette.js
new file mode 100644
index 0000000000000000000000000000000000000000..bae06813d9dd0dbd1cbe3b91cfcd5a22d77e8fd1
--- /dev/null
+++ b/src/main/resources/static/dijit/ColorPalette.js
@@ -0,0 +1,160 @@
+define([
+	"require", // require.toUrl
+	"dojo/text!./templates/ColorPalette.html",
+	"./_Widget", // used also to load dijit/hccss for setting has("highcontrast")
+	"./_TemplatedMixin",
+	"./_PaletteMixin",
+	"./hccss", // has("highcontrast")
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/_base/Color", // dojo.Color dojo.Color.named
+	"dojo/_base/declare", // declare
+	"dojo/dom-construct", // domConstruct.place
+	"dojo/string", // string.substitute
+	"dojo/i18n!dojo/nls/colors", // translations
+	"dojo/colors"    // extend dojo.Color w/names of other colors
+], function(require, template, _Widget, _TemplatedMixin, _PaletteMixin, has, i18n, Color,
+	declare, domConstruct, string){
+
+	// module:
+	//		dijit/ColorPalette
+
+	var ColorPalette = declare("dijit.ColorPalette", [_Widget, _TemplatedMixin, _PaletteMixin], {
+		// summary:
+		//		A keyboard accessible color-picking widget
+		// description:
+		//		Grid showing various colors, so the user can pick a certain color.
+		//		Can be used standalone, or as a popup.
+		//
+		// example:
+		// |	<div data-dojo-type="dijit/ColorPalette"></div>
+		//
+		// example:
+		// |	var picker = new dijit.ColorPalette({ },srcNode);
+		// |	picker.startup();
+
+
+		// palette: [const] String
+		//		Size of grid, either "7x10" or "3x4".
+		palette: "7x10",
+
+		// _palettes: [protected] Map
+		//		This represents the value of the colors.
+		//		The first level is a hashmap of the different palettes available.
+		//		The next two dimensions represent the columns and rows of colors.
+		_palettes: {
+			"7x10": [
+				["white", "seashell", "cornsilk", "lemonchiffon", "lightyellow", "palegreen", "paleturquoise", "lightcyan", "lavender", "plum"],
+				["lightgray", "pink", "bisque", "moccasin", "khaki", "lightgreen", "lightseagreen", "lightskyblue", "cornflowerblue", "violet"],
+				["silver", "lightcoral", "sandybrown", "orange", "palegoldenrod", "chartreuse", "mediumturquoise", "skyblue", "mediumslateblue", "orchid"],
+				["gray", "red", "orangered", "darkorange", "yellow", "limegreen", "darkseagreen", "royalblue", "slateblue", "mediumorchid"],
+				["dimgray", "crimson", "chocolate", "coral", "gold", "forestgreen", "seagreen", "blue", "blueviolet", "darkorchid"],
+				["darkslategray", "firebrick", "saddlebrown", "sienna", "olive", "green", "darkcyan", "mediumblue", "darkslateblue", "darkmagenta" ],
+				["black", "darkred", "maroon", "brown", "darkolivegreen", "darkgreen", "midnightblue", "navy", "indigo", "purple"]
+			],
+
+			"3x4": [
+				["white", "lime", "green", "blue"],
+				["silver", "yellow", "fuchsia", "navy"],
+				["gray", "red", "purple", "black"]
+			]
+		},
+
+		// templateString: String
+		//		The template of this widget.
+		templateString: template,
+
+		baseClass: "dijitColorPalette",
+
+		_dyeFactory: function(value, row, col, title){
+			// Overrides _PaletteMixin._dyeFactory().
+			return new this._dyeClass(value, row, col, title);
+		},
+
+		buildRendering: function(){
+			// Instantiate the template, which makes a skeleton into which we'll insert a bunch of
+			// <img> nodes
+			this.inherited(arguments);
+
+			//	Creates customized constructor for dye class (color of a single cell) for
+			//	specified palette and high-contrast vs. normal mode.   Used in _getDye().
+			this._dyeClass = declare(ColorPalette._Color, {
+				palette: this.palette
+			});
+
+			// Creates <img> nodes in each cell of the template.
+			this._preparePalette(
+				this._palettes[this.palette],
+				i18n.getLocalization("dojo", "colors", this.lang));
+		}
+	});
+
+	ColorPalette._Color = declare("dijit._Color", Color, {
+		// summary:
+		//		Object associated with each cell in a ColorPalette palette.
+		//		Implements dijit/Dye.
+
+		// Template for each cell in normal (non-high-contrast mode).  Each cell contains a wrapper
+		// node for showing the border (called dijitPaletteImg for back-compat), and dijitColorPaletteSwatch
+		// for showing the color.
+		template: "<span class='dijitInline dijitPaletteImg'>" +
+			"<img src='${blankGif}' alt='${alt}' title='${title}' class='dijitColorPaletteSwatch' style='background-color: ${color}'/>" +
+			"</span>",
+
+		// Template for each cell in high contrast mode.  Each cell contains an image with the whole palette,
+		// but scrolled and clipped to show the correct color only
+		hcTemplate: "<span class='dijitInline dijitPaletteImg' style='position: relative; overflow: hidden; height: 12px; width: 14px;'>" +
+			"<img src='${image}' alt='${alt}' title='${title}' style='position: absolute; left: ${left}px; top: ${top}px; ${size}'/>" +
+			"</span>",
+
+		// _imagePaths: [protected] Map
+		//		This is stores the path to the palette images used for high-contrast mode display
+		_imagePaths: {
+			"7x10": require.toUrl("./themes/a11y/colors7x10.png"),
+			"3x4": require.toUrl("./themes/a11y/colors3x4.png")
+		},
+
+		constructor: function(alias, row, col, title){
+			// summary:
+			//		Constructor for ColorPalette._Color
+			// alias: String
+			//		English name of the color.
+			// row: Number
+			//		Vertical position in grid.
+			// column: Number
+			//		Horizontal position in grid.
+			// title: String
+			//		Localized name of the color.
+			this._title = title;
+			this._row = row;
+			this._col = col;
+			this.setColor(Color.named[alias]);
+		},
+
+		getValue: function(){
+			// summary:
+			//		Note that although dijit._Color is initialized with a value like "white" getValue() always
+			//		returns a hex value
+			return this.toHex();
+		},
+
+		fillCell: function(/*DOMNode*/ cell, /*String*/ blankGif){
+			var html = string.substitute(has("highcontrast") ? this.hcTemplate : this.template, {
+				// substitution variables for normal mode
+				color: this.toHex(),
+				blankGif: blankGif,
+				alt: this._title,
+				title: this._title,
+
+				// variables used for high contrast mode
+				image: this._imagePaths[this.palette].toString(),
+				left: this._col * -20 - 5,
+				top: this._row * -20 - 5,
+				size: this.palette == "7x10" ? "height: 145px; width: 206px" : "height: 64px; width: 86px"
+			});
+
+			domConstruct.place(html, cell);
+		}
+	});
+
+	return ColorPalette;
+});
diff --git a/src/main/resources/static/dijit/ConfirmDialog.js b/src/main/resources/static/dijit/ConfirmDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac4b2ec3b3f785ebbadf0a70f45172c55330efcc
--- /dev/null
+++ b/src/main/resources/static/dijit/ConfirmDialog.js
@@ -0,0 +1,11 @@
+define([
+	"dojo/_base/declare",
+	"./Dialog",
+	"./_ConfirmDialogMixin"
+], function(declare, Dialog, _ConfirmDialogMixin) {
+
+	return declare("dijit.ConfirmDialog", [Dialog, _ConfirmDialogMixin], {
+		// summary:
+		//		A Dialog with OK/Cancel buttons.
+	});
+});
diff --git a/src/main/resources/static/dijit/ConfirmTooltipDialog.js b/src/main/resources/static/dijit/ConfirmTooltipDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..a3a64cb0c8a200cbc29ccf400832d44f3fca8050
--- /dev/null
+++ b/src/main/resources/static/dijit/ConfirmTooltipDialog.js
@@ -0,0 +1,11 @@
+define([
+	"dojo/_base/declare",
+	"./TooltipDialog",
+	"./_ConfirmDialogMixin"
+], function(declare, TooltipDialog, _ConfirmDialogMixin) {
+	
+	return declare("dijit.ConfirmTooltipDialog", [TooltipDialog, _ConfirmDialogMixin], {
+		// summary:
+		//		A TooltipDialog with OK/Cancel buttons.
+	});
+});
diff --git a/src/main/resources/static/dijit/Declaration.js b/src/main/resources/static/dijit/Declaration.js
new file mode 100644
index 0000000000000000000000000000000000000000..3c8614881e64bc745d798aa340be7bacca10ada0
--- /dev/null
+++ b/src/main/resources/static/dijit/Declaration.js
@@ -0,0 +1,115 @@
+define([
+	"dojo/_base/array", // array.forEach array.map
+	"dojo/aspect",	// aspect.after
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang", // lang.getObject
+	"dojo/parser", // parser._functionFromScript
+	"dojo/query", // query
+	"./_Widget",
+	"./_TemplatedMixin",
+	"./_WidgetsInTemplateMixin",
+	"dojo/NodeList-dom"
+], function(array, aspect, declare, lang, parser, query, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin){
+
+	// module:
+	//		dijit/Declaration
+
+	return declare("dijit.Declaration", _Widget, {
+		// summary:
+		//		The Declaration widget allows a developer to declare new widget
+		//		classes directly from a snippet of markup.
+
+		// _noScript: [private] Boolean
+		//		Flag to parser to leave alone the script tags contained inside of me
+		_noScript: true,
+
+		// stopParser: [private] Boolean
+		//		Flag to parser to not try and parse widgets declared inside of me
+		stopParser: true,
+
+		// widgetClass: [const] String
+		//		Name of class being declared, ex: "acme.myWidget"
+		widgetClass: "",
+
+		// propList: [const] Object
+		//		Set of attributes for this widget along with default values, ex:
+		//		{delay: 100, title: "hello world"}
+		defaults: null,
+
+		// mixins: [const] String[]
+		//		List containing the prototype for this widget, and also any mixins,
+		//		ex: ["dijit._Widget", "dijit._Container"]
+		mixins: [],
+
+		buildRendering: function(){
+			var src = this.srcNodeRef.parentNode.removeChild(this.srcNodeRef),
+				methods = query("> script[type='dojo/method']", src).orphan(),
+				connects = query("> script[type='dojo/connect']", src).orphan(), // remove for 2.0
+				aspects = query("> script[type='dojo/aspect']", src).orphan(),
+				srcType = src.nodeName;
+
+			var propList = this.defaults || {};
+
+			// For all methods defined like <script type="dojo/method" data-dojo-event="foo">,
+			// add that method to prototype.
+			// If there's no "event" specified then it's code to run on instantiation,
+			// so it becomes a connection to "postscript" (handled below).
+			array.forEach(methods, function(s){
+				var evt = s.getAttribute("event") || s.getAttribute("data-dojo-event"), // remove "event" for 2.0
+					func = parser._functionFromScript(s, "data-dojo-");
+				if(evt){
+					propList[evt] = func;
+				}else{
+					aspects.push(s);
+				}
+			});
+
+			// map array of strings like [ "dijit.form.Button" ] to array of mixin objects
+			// (note that array.map(this.mixins, lang.getObject) doesn't work because it passes
+			// a bogus third argument to getObject(), confusing it)
+			if(this.mixins.length){
+				this.mixins = array.map(this.mixins, function(name){ return lang.getObject(name); } );
+			}else{
+				this.mixins = [ _Widget, _TemplatedMixin, _WidgetsInTemplateMixin ];
+			}
+
+			propList._skipNodeCache = true;
+			propList.templateString =
+				"<"+srcType+" class='"+src.className+"'" +
+				" data-dojo-attach-point='"+
+					(src.getAttribute("data-dojo-attach-point") || src.getAttribute("dojoAttachPoint") || '')+
+				"' data-dojo-attach-event='"+
+					(src.getAttribute("data-dojo-attach-event") || src.getAttribute("dojoAttachEvent") || '')+
+				"' >"+src.innerHTML.replace(/\%7B/g,"{").replace(/\%7D/g,"}")+"</"+srcType+">";
+
+			// create the new widget class
+			var wc = declare(
+				this.widgetClass,
+				this.mixins,
+				propList
+			);
+
+			// Handle <script> blocks of form:
+			//		<script type="dojo/aspect" data-dojo-advice="after" data-dojo-method="foo">
+			// and
+			//		<script type="dojo/method">
+			// (Note that the second one is just shorthand for a dojo/aspect to postscript)
+			// Since this is a connect in the declaration, we are actually connection to the method
+			// in the _prototype_.
+			array.forEach(aspects, function(s){
+				var advice = s.getAttribute("data-dojo-advice") || "after",
+					method = s.getAttribute("data-dojo-method") || "postscript",
+					func = parser._functionFromScript(s);
+				aspect.after(wc.prototype, method, func, true);
+			});
+
+			// Handle legacy <script type="dojo/connect" data-dojo-event="foo">.
+			// Remove for 2.0.
+			array.forEach(connects, function(s){
+				var evt = s.getAttribute("event") || s.getAttribute("data-dojo-event"),
+					func = parser._functionFromScript(s);
+				aspect.after(wc.prototype, evt, func, true);
+			});
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/Destroyable.js b/src/main/resources/static/dijit/Destroyable.js
new file mode 100644
index 0000000000000000000000000000000000000000..23ede8a14cf9c70ff0175b77362f7376b79448b5
--- /dev/null
+++ b/src/main/resources/static/dijit/Destroyable.js
@@ -0,0 +1,83 @@
+define([
+	"dojo/_base/array", // array.forEach array.map
+	"dojo/aspect",
+	"dojo/_base/declare"
+], function(array, aspect, declare){
+
+	// module:
+	//		dijit/Destroyable
+
+	return declare("dijit.Destroyable", null, {
+		// summary:
+		//		Mixin to track handles and release them when instance is destroyed.
+		// description:
+		//		Call this.own(...) on list of handles (returned from dojo/aspect, dojo/on,
+		//		dojo/Stateful::watch, or any class (including widgets) with a destroyRecursive() or destroy() method.
+		//		Then call destroy() later to destroy this instance and release the resources.
+
+		destroy: function(/*Boolean*/ preserveDom){
+			// summary:
+			//		Destroy this class, releasing any resources registered via own().
+			this._destroyed = true;
+		},
+
+		own: function(){
+			// summary:
+			//		Track specified handles and remove/destroy them when this instance is destroyed, unless they were
+			//		already removed/destroyed manually.
+			// tags:
+			//		protected
+			// returns:
+			//		The array of specified handles, so you can do for example:
+			//	|		var handle = this.own(on(...))[0];
+
+			var cleanupMethods = [
+				"destroyRecursive",
+				"destroy",
+				"remove"
+			];
+
+			array.forEach(arguments, function(handle){
+				// When this.destroy() is called, destroy handle.  Since I'm using aspect.before(),
+				// the handle will be destroyed before a subclass's destroy() method starts running, before it calls
+				// this.inherited() or even if it doesn't call this.inherited() at all.  If that's an issue, make an
+				// onDestroy() method and connect to that instead.
+				var destroyMethodName;
+				var odh = aspect.before(this, "destroy", function (preserveDom){
+					handle[destroyMethodName](preserveDom);
+				});
+
+				// Callback for when handle is manually destroyed.
+				var hdhs = [];
+				function onManualDestroy(){
+					odh.remove();
+					array.forEach(hdhs, function(hdh){
+						hdh.remove();
+					});
+				}
+
+				// Setup listeners for manual destroy of handle.
+				// Also computes destroyMethodName, used in listener above.
+				if(handle.then){
+					// Special path for Promises.  Detect when Promise is resolved, rejected, or
+					// canceled (nb: cancelling a Promise causes it to be rejected).
+					destroyMethodName = "cancel";
+					handle.then(onManualDestroy, onManualDestroy);
+				}else{
+					// Path for other handles.  Just use AOP to detect when handle is manually destroyed.
+					array.forEach(cleanupMethods, function(cleanupMethod){
+						if(typeof handle[cleanupMethod] === "function"){
+							if(!destroyMethodName){
+								// Use first matching method name in above listener (prefer destroyRecursive() to destroy())
+								destroyMethodName = cleanupMethod;
+							}
+							hdhs.push(aspect.after(handle, cleanupMethod, onManualDestroy, true));
+						}
+					});
+				}
+			}, this);
+
+			return arguments;		// handle
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/Dialog.js b/src/main/resources/static/dijit/Dialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b04f1709ffd84cb6c16a98b426cd0e9d38bb778
--- /dev/null
+++ b/src/main/resources/static/dijit/Dialog.js
@@ -0,0 +1,702 @@
+define([
+	"require",
+	"dojo/_base/array", // array.forEach array.indexOf array.map
+	"dojo/aspect",
+	"dojo/_base/declare", // declare
+	"dojo/Deferred", // Deferred
+	"dojo/dom", // dom.isDescendant
+	"dojo/dom-class", // domClass.add domClass.contains
+	"dojo/dom-geometry", // domGeometry.position
+	"dojo/dom-style", // domStyle.set
+	"dojo/_base/fx", // fx.fadeIn fx.fadeOut
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/keys",
+	"dojo/_base/lang", // lang.mixin lang.hitch
+	"dojo/on",
+	"dojo/ready",
+	"dojo/sniff", // has("ie") has("opera") has("dijit-legacy-requires")
+	"dojo/window", // winUtils.getBox, winUtils.get
+	"dojo/dnd/Moveable", // Moveable
+	"dojo/dnd/TimedMoveable", // TimedMoveable
+	"./focus",
+	"./_base/manager", // manager.defaultDuration
+	"./_Widget",
+	"./_TemplatedMixin",
+	"./_CssStateMixin",
+	"./form/_FormMixin",
+	"./_DialogMixin",
+	"./DialogUnderlay",
+	"./layout/ContentPane",
+	"./layout/utils",
+	"dojo/text!./templates/Dialog.html",
+	"./a11yclick",	// template uses ondijitclick
+	"dojo/i18n!./nls/common"
+], function(require, array, aspect, declare, Deferred,
+			dom, domClass, domGeometry, domStyle, fx, i18n, keys, lang, on, ready, has, winUtils,
+			Moveable, TimedMoveable, focus, manager, _Widget, _TemplatedMixin, _CssStateMixin, _FormMixin, _DialogMixin,
+			DialogUnderlay, ContentPane, utils, template){
+
+	// module:
+	//		dijit/Dialog
+
+	var resolvedDeferred = new Deferred();
+	resolvedDeferred.resolve(true);
+
+	function nop(){}
+
+	var _DialogBase = declare("dijit._DialogBase" + (has("dojo-bidi") ? "_NoBidi" : ""), [_TemplatedMixin, _FormMixin, _DialogMixin, _CssStateMixin], {
+		templateString: template,
+
+		baseClass: "dijitDialog",
+
+		cssStateNodes: {
+			closeButtonNode: "dijitDialogCloseIcon"
+		},
+
+		// Map widget attributes to DOMNode attributes.
+		_setTitleAttr: { node: "titleNode", type: "innerHTML" },
+
+		// open: [readonly] Boolean
+		//		True if Dialog is currently displayed on screen.
+		open: false,
+
+		// duration: Integer
+		//		The time in milliseconds it takes the dialog to fade in and out
+		duration: manager.defaultDuration,
+
+		// refocus: Boolean
+		//		A Toggle to modify the default focus behavior of a Dialog, which
+		//		is to re-focus the element which had focus before being opened.
+		//		False will disable refocusing. Default: true
+		refocus: true,
+
+		// autofocus: Boolean
+		//		A Toggle to modify the default focus behavior of a Dialog, which
+		//		is to focus on the first dialog element after opening the dialog.
+		//		False will disable autofocusing. Default: true
+		autofocus: true,
+
+		// _firstFocusItem: [private readonly] DomNode
+		//		The pointer to the first focusable node in the dialog.
+		//		Set by `dijit/_DialogMixin._getFocusItems()`.
+		_firstFocusItem: null,
+
+		// _lastFocusItem: [private readonly] DomNode
+		//		The pointer to which node has focus prior to our dialog.
+		//		Set by `dijit/_DialogMixin._getFocusItems()`.
+		_lastFocusItem: null,
+
+		// draggable: Boolean
+		//		Toggles the movable aspect of the Dialog. If true, Dialog
+		//		can be dragged by it's title. If false it will remain centered
+		//		in the viewport.
+		draggable: true,
+		_setDraggableAttr: function(/*Boolean*/ val){
+			// Avoid _WidgetBase behavior of copying draggable attribute to this.domNode,
+			// as that prevents text select on modern browsers (#14452)
+			this._set("draggable", val);
+		},
+
+		// maxRatio: Number
+		//		Maximum size to allow the dialog to expand to, relative to viewport size
+		maxRatio: 0.9,
+
+		// closable: Boolean
+		//		Dialog show [x] icon to close itself, and ESC key will close the dialog.
+		closable: true,
+		_setClosableAttr: function(val){
+			this.closeButtonNode.style.display = val ? "" : "none";
+			this._set("closable", val);
+		},
+
+		postMixInProperties: function(){
+			var _nlsResources = i18n.getLocalization("dijit", "common");
+			lang.mixin(this, _nlsResources);
+			this.inherited(arguments);
+		},
+
+		postCreate: function(){
+			domStyle.set(this.domNode, {
+				display: "none",
+				position: "absolute"
+			});
+			this.ownerDocumentBody.appendChild(this.domNode);
+
+			this.inherited(arguments);
+
+			aspect.after(this, "onExecute", lang.hitch(this, "hide"), true);
+			aspect.after(this, "onCancel", lang.hitch(this, "hide"), true);
+
+			this._modalconnects = [];
+		},
+
+		onLoad: function(){
+			// summary:
+			//		Called when data has been loaded from an href.
+			//		Unlike most other callbacks, this function can be connected to (via `dojo.connect`)
+			//		but should *not* be overridden.
+			// tags:
+			//		callback
+
+			// when href is specified we need to reposition the dialog after the data is loaded
+			// and find the focusable elements
+			this.resize();
+			this._position();
+
+			if(this.autofocus && DialogLevelManager.isTop(this)){
+				this._getFocusItems();
+				focus.focus(this._firstFocusItem);
+			}
+
+			this.inherited(arguments);
+		},
+
+		focus: function(){
+			this._getFocusItems();
+			focus.focus(this._firstFocusItem);
+		},
+
+		_endDrag: function(){
+			// summary:
+			//		Called after dragging the Dialog. Saves the position of the dialog in the viewport,
+			//		and also adjust position to be fully within the viewport, so user doesn't lose access to handle
+			var nodePosition = domGeometry.position(this.domNode),
+				viewport = winUtils.getBox(this.ownerDocument);
+			nodePosition.y = Math.min(Math.max(nodePosition.y, 0), (viewport.h - nodePosition.h));
+			nodePosition.x = Math.min(Math.max(nodePosition.x, 0), (viewport.w - nodePosition.w));
+			this._relativePosition = nodePosition;
+			this._position();
+		},
+
+		_setup: function(){
+			// summary:
+			//		Stuff we need to do before showing the Dialog for the first
+			//		time (but we defer it until right beforehand, for
+			//		performance reasons).
+			// tags:
+			//		private
+
+			var node = this.domNode;
+
+			if(this.titleBar && this.draggable){
+				this._moveable = new ((has("ie") == 6) ? TimedMoveable // prevent overload, see #5285
+					: Moveable)(node, { handle: this.titleBar });
+				aspect.after(this._moveable, "onMoveStop", lang.hitch(this, "_endDrag"), true);
+			}else{
+				domClass.add(node, "dijitDialogFixed");
+			}
+
+			this.underlayAttrs = {
+				dialogId: this.id,
+				"class": array.map(this["class"].split(/\s/),function(s){
+					return s + "_underlay";
+				}).join(" "),
+				_onKeyDown: lang.hitch(this, "_onKey"),
+				ownerDocument: this.ownerDocument
+			};
+		},
+
+		_size: function(){
+			// TODO: remove for 2.0
+			this.resize();
+		},
+
+		_position: function(){
+			// summary:
+			//		Position the dialog in the viewport.  If no relative offset
+			//		in the viewport has been determined (by dragging, for instance),
+			//		center the dialog.  Otherwise, use the Dialog's stored relative offset,
+			//		clipped to fit inside the viewport (which may have been shrunk).
+			//		Finally, adjust position according to viewport's scroll.
+
+			if(!domClass.contains(this.ownerDocumentBody, "dojoMove")){    // don't do anything if called during auto-scroll
+				var node = this.domNode,
+					viewport = winUtils.getBox(this.ownerDocument),
+					p = this._relativePosition,
+					bb = domGeometry.position(node),
+					l = Math.floor(viewport.l + (p ? Math.min(p.x, viewport.w - bb.w) : (viewport.w - bb.w) / 2)),
+					t = Math.floor(viewport.t + (p ? Math.min(p.y, viewport.h - bb.h) : (viewport.h - bb.h) / 2));
+
+				domStyle.set(node, {
+					left: l + "px",
+					top: t + "px"
+				});
+			}
+		},
+
+		_onKey: function(/*Event*/ evt){
+			// summary:
+			//		Handles the keyboard events for accessibility reasons
+			// tags:
+			//		private
+
+			if(evt.keyCode == keys.TAB){
+				this._getFocusItems();
+				var node = evt.target;
+				if(this._firstFocusItem == this._lastFocusItem){
+					// don't move focus anywhere, but don't allow browser to move focus off of dialog either
+					evt.stopPropagation();
+					evt.preventDefault();
+				}else if(node == this._firstFocusItem && evt.shiftKey){
+					// if we are shift-tabbing from first focusable item in dialog, send focus to last item
+					focus.focus(this._lastFocusItem);
+					evt.stopPropagation();
+					evt.preventDefault();
+				}else if(node == this._lastFocusItem && !evt.shiftKey){
+					// if we are tabbing from last focusable item in dialog, send focus to first item
+					focus.focus(this._firstFocusItem);
+					evt.stopPropagation();
+					evt.preventDefault();
+				}
+			}else if(this.closable && evt.keyCode == keys.ESCAPE){
+				this.onCancel();
+				evt.stopPropagation();
+				evt.preventDefault();
+			}
+		},
+
+		show: function(){
+			// summary:
+			//		Display the dialog
+			// returns: dojo/promise/Promise
+			//		Promise object that resolves when the display animation is complete
+
+			if(this.open){
+				return resolvedDeferred.promise;
+			}
+
+			if(!this._started){
+				this.startup();
+			}
+
+			// first time we show the dialog, there's some initialization stuff to do
+			if(!this._alreadyInitialized){
+				this._setup();
+				this._alreadyInitialized = true;
+			}
+
+			if(this._fadeOutDeferred){
+				// There's a hide() operation in progress, so cancel it, but still call DialogLevelManager.hide()
+				// as though the hide() completed, in preparation for the DialogLevelManager.show() call below.
+				this._fadeOutDeferred.cancel();
+				DialogLevelManager.hide(this);
+			}
+
+			// Recenter Dialog if user scrolls browser.  Connecting to document doesn't work on IE, need to use window.
+			// Be sure that event object doesn't get passed to resize() method, because it's expecting an optional
+			// {w: ..., h:...} arg.
+			var win = winUtils.get(this.ownerDocument);
+			this._modalconnects.push(on(win, "scroll", lang.hitch(this, "resize", null)));
+
+			this._modalconnects.push(on(this.domNode, "keydown", lang.hitch(this, "_onKey")));
+
+			domStyle.set(this.domNode, {
+				opacity: 0,
+				display: ""
+			});
+
+			this._set("open", true);
+			this._onShow(); // lazy load trigger
+
+			this.resize();
+			this._position();
+
+			// fade-in Animation object, setup below
+			var fadeIn;
+
+			this._fadeInDeferred = new Deferred(lang.hitch(this, function(){
+				fadeIn.stop();
+				delete this._fadeInDeferred;
+			}));
+			this._fadeInDeferred.then(undefined, nop);	// avoid spurious CancelError message to console
+
+			// If delay is 0, code below will delete this._fadeInDeferred instantly, so grab promise while we can.
+			var promise = this._fadeInDeferred.promise;
+
+			fadeIn = fx.fadeIn({
+				node: this.domNode,
+				duration: this.duration,
+				beforeBegin: lang.hitch(this, function(){
+					DialogLevelManager.show(this, this.underlayAttrs);
+				}),
+				onEnd: lang.hitch(this, function(){
+					if(this.autofocus && DialogLevelManager.isTop(this)){
+						// find focusable items each time dialog is shown since if dialog contains a widget the
+						// first focusable items can change
+						this._getFocusItems();
+						focus.focus(this._firstFocusItem);
+					}
+					this._fadeInDeferred.resolve(true);
+					delete this._fadeInDeferred;
+				})
+			}).play();
+
+			return promise;
+		},
+
+		hide: function(){
+			// summary:
+			//		Hide the dialog
+			// returns: dojo/promise/Promise
+			//		Promise object that resolves when the display animation is complete
+
+			// If we haven't been initialized yet then we aren't showing and we can just return.
+			// Likewise if we are already hidden, or are currently fading out.
+			if(!this._alreadyInitialized || !this.open){
+				return resolvedDeferred.promise;
+			}
+			if(this._fadeInDeferred){
+				this._fadeInDeferred.cancel();
+			}
+
+			// fade-in Animation object, setup below
+			var fadeOut;
+
+			this._fadeOutDeferred = new Deferred(lang.hitch(this, function(){
+				fadeOut.stop();
+				delete this._fadeOutDeferred;
+			}));
+			this._fadeOutDeferred.then(undefined, nop);	// avoid spurious CancelError message to console
+
+			// fire onHide when the promise resolves.
+			this._fadeOutDeferred.then(lang.hitch(this, 'onHide'));
+
+			// If delay is 0, code below will delete this._fadeOutDeferred instantly, so grab promise while we can.
+			var promise = this._fadeOutDeferred.promise;
+
+			fadeOut = fx.fadeOut({
+				node: this.domNode,
+				duration: this.duration,
+				onEnd: lang.hitch(this, function(){
+					this.domNode.style.display = "none";
+					DialogLevelManager.hide(this);
+					this._fadeOutDeferred.resolve(true);
+					delete this._fadeOutDeferred;
+				})
+			}).play();
+
+			if(this._scrollConnected){
+				this._scrollConnected = false;
+			}
+			var h;
+			while(h = this._modalconnects.pop()){
+				h.remove();
+			}
+
+			if(this._relativePosition){
+				delete this._relativePosition;
+			}
+			this._set("open", false);
+
+			return promise;
+		},
+
+		resize: function(dim){
+			// summary:
+			//		Called with no argument when viewport scrolled or viewport size changed.  Adjusts Dialog as
+			//		necessary to keep it visible.
+			//
+			//		Can also be called with an argument (by dojox/layout/ResizeHandle etc.) to explicitly set the
+			//		size of the dialog.
+			// dim: Object?
+			//		Optional dimension object like {w: 200, h: 300}
+
+			if(this.domNode.style.display != "none"){
+
+				this._checkIfSingleChild();
+
+				if(!dim){
+					if(this._shrunk){
+						// If we earlier shrunk the dialog to fit in the viewport, reset it to its natural size
+						if(this._singleChild){
+							if(typeof this._singleChildOriginalStyle != "undefined"){
+								this._singleChild.domNode.style.cssText = this._singleChildOriginalStyle;
+								delete this._singleChildOriginalStyle;
+							}
+						}
+						array.forEach([this.domNode, this.containerNode, this.titleBar, this.actionBarNode], function(node){
+							if(node){	// because titleBar may not be defined
+								domStyle.set(node, {
+									position: "static",
+									width: "auto",
+									height: "auto"
+								});
+							}
+						});
+						this.domNode.style.position = "absolute";
+					}
+
+					// If necessary, shrink Dialog to fit in viewport and have some space around it
+					// to indicate that it's a popup.  This will also compensate for possible scrollbars on viewport.
+					var viewport = winUtils.getBox(this.ownerDocument);
+					viewport.w *= this.maxRatio;
+					viewport.h *= this.maxRatio;
+
+					var bb = domGeometry.position(this.domNode);
+					if(bb.w >= viewport.w || bb.h >= viewport.h){
+						dim = {
+							w: Math.min(bb.w, viewport.w),
+							h: Math.min(bb.h, viewport.h)
+						};
+						this._shrunk = true;
+					}else{
+						this._shrunk = false;
+					}
+				}
+
+				// Code to run if user has requested an explicit size, or the shrinking code above set an implicit size
+				if(dim){
+					// Set this.domNode to specified size
+					domGeometry.setMarginBox(this.domNode, dim);
+
+					// And then size this.containerNode
+					var layoutNodes = [];
+					if(this.titleBar){
+						layoutNodes.push({domNode: this.titleBar, region: "top"});
+					}
+					if(this.actionBarNode){
+						layoutNodes.push({domNode: this.actionBarNode, region: "bottom"});
+					}
+					var centerSize = {domNode: this.containerNode, region: "center"};
+					layoutNodes.push(centerSize);
+
+					var contentDim = utils.marginBox2contentBox(this.domNode, dim);
+					utils.layoutChildren(this.domNode, contentDim, layoutNodes);
+
+					// And then if this.containerNode has a single layout widget child, size it too.
+					// Otherwise, make this.containerNode show a scrollbar if it's overflowing.
+					if(this._singleChild){
+						var cb = utils.marginBox2contentBox(this.containerNode, centerSize);
+						// note: if containerNode has padding singleChildSize will have l and t set,
+						// but don't pass them to resize() or it will doubly-offset the child
+						this._singleChild.resize({w: cb.w, h: cb.h});
+						// TODO: save original size for restoring it on another show()?
+					}else{
+						this.containerNode.style.overflow = "auto";
+						this._layoutChildren();		// send resize() event to all child widgets
+					}
+				}else{
+					this._layoutChildren();		// send resize() event to all child widgets
+				}
+
+				if(!has("touch") && !dim){
+					// If the user has scrolled the viewport then reposition the Dialog.  But don't do it for touch
+					// devices, because it will counteract when a keyboard pops up and then the browser auto-scrolls
+					// the focused node into view.
+					this._position();
+				}
+			}
+		},
+
+		_layoutChildren: function(){
+			// Override _ContentPaneResizeMixin._layoutChildren because even when there's just a single layout child
+			// widget, sometimes we don't want to size it explicitly (i.e. to pass a dim argument to resize())
+
+			array.forEach(this.getChildren(), function(widget){
+				if(widget.resize){
+					widget.resize();
+				}
+			});
+		},
+
+		destroy: function(){
+			if(this._fadeInDeferred){
+				this._fadeInDeferred.cancel();
+			}
+			if(this._fadeOutDeferred){
+				this._fadeOutDeferred.cancel();
+			}
+			if(this._moveable){
+				this._moveable.destroy();
+			}
+			var h;
+			while(h = this._modalconnects.pop()){
+				h.remove();
+			}
+
+			DialogLevelManager.hide(this);
+
+			this.inherited(arguments);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		_DialogBase = declare("dijit._DialogBase", _DialogBase, {
+			_setTitleAttr: function(/*String*/ title){
+				this._set("title", title);
+				this.titleNode.innerHTML = title;
+				this.applyTextDir(this.titleNode);
+			},
+
+			_setTextDirAttr: function(textDir){
+				if(this._created && this.textDir != textDir){
+					this._set("textDir", textDir);
+					this.set("title", this.title);
+				}
+			}
+		});
+	}
+
+	var Dialog = declare("dijit.Dialog", [ContentPane, _DialogBase], {
+		// summary:
+		//		A modal dialog Widget.
+		// description:
+		//		Pops up a modal dialog window, blocking access to the screen
+		//		and also graying out the screen Dialog is extended from
+		//		ContentPane so it supports all the same parameters (href, etc.).
+		// example:
+		// |	<div data-dojo-type="dijit/Dialog" data-dojo-props="href: 'test.html'"></div>
+		// example:
+		// |	var foo = new Dialog({ title: "test dialog", content: "test content" });
+		// |	foo.placeAt(win.body());
+		// |	foo.startup();
+	});
+	Dialog._DialogBase = _DialogBase;	// for monkey patching and dojox/widget/DialogSimple
+
+	var DialogLevelManager = Dialog._DialogLevelManager = {
+		// summary:
+		//		Controls the various active "levels" on the page, starting with the
+		//		stuff initially visible on the page (at z-index 0), and then having an entry for
+		//		each Dialog shown.
+
+		_beginZIndex: 950,
+
+		show: function(/*dijit/_WidgetBase*/ dialog, /*Object*/ underlayAttrs){
+			// summary:
+			//		Call right before fade-in animation for new dialog.
+			//		Saves current focus, displays/adjusts underlay for new dialog,
+			//		and sets the z-index of the dialog itself.
+			//
+			//		New dialog will be displayed on top of all currently displayed dialogs.
+			//
+			//		Caller is responsible for setting focus in new dialog after the fade-in
+			//		animation completes.
+
+			// Save current focus
+			ds[ds.length - 1].focus = focus.curNode;
+
+			// Set z-index a bit above previous dialog
+			var zIndex = ds[ds.length - 1].dialog ? ds[ds.length - 1].zIndex + 2 : Dialog._DialogLevelManager._beginZIndex;
+			domStyle.set(dialog.domNode, 'zIndex', zIndex);
+
+			// Display the underlay, or if already displayed then adjust for this new dialog
+			DialogUnderlay.show(underlayAttrs, zIndex - 1);
+
+			ds.push({dialog: dialog, underlayAttrs: underlayAttrs, zIndex: zIndex});
+		},
+
+		hide: function(/*dijit/_WidgetBase*/ dialog){
+			// summary:
+			//		Called when the specified dialog is hidden/destroyed, after the fade-out
+			//		animation ends, in order to reset page focus, fix the underlay, etc.
+			//		If the specified dialog isn't open then does nothing.
+			//
+			//		Caller is responsible for either setting display:none on the dialog domNode,
+			//		or calling dijit/popup.hide(), or removing it from the page DOM.
+
+			if(ds[ds.length - 1].dialog == dialog){
+				// Removing the top (or only) dialog in the stack, return focus
+				// to previous dialog
+
+				ds.pop();
+
+				var pd = ds[ds.length - 1];	// the new active dialog (or the base page itself)
+
+				// Adjust underlay
+				if(ds.length == 1){
+					// Returning to original page.  Hide the underlay.
+					DialogUnderlay.hide();
+				}else{
+					// Popping back to previous dialog, adjust underlay.
+					DialogUnderlay.show(pd.underlayAttrs, pd.zIndex - 1);
+				}
+
+				// Adjust focus.
+				// TODO: regardless of setting of dialog.refocus, if the exeucte() method set focus somewhere,
+				// don't shift focus back to button.  Note that execute() runs at the start of the fade-out but
+				// this code runs later, at the end of the fade-out.  Menu has code like this.
+				if(dialog.refocus){
+					// If we are returning control to a previous dialog but for some reason
+					// that dialog didn't have a focused field, set focus to first focusable item.
+					// This situation could happen if two dialogs appeared at nearly the same time,
+					// since a dialog doesn't set it's focus until the fade-in is finished.
+					var focus = pd.focus;
+					if(pd.dialog && (!focus || !dom.isDescendant(focus, pd.dialog.domNode))){
+						pd.dialog._getFocusItems();
+						focus = pd.dialog._firstFocusItem;
+					}
+
+					if(focus){
+						// Refocus the button that spawned the Dialog.   This will fail in corner cases including
+						// page unload on IE, because the dijit/form/Button that launched the Dialog may get destroyed
+						// before this code runs.  (#15058)
+						try{
+							focus.focus();
+						}catch(e){
+						}
+					}
+				}
+			}else{
+				// Removing a dialog out of order (#9944, #10705).
+				// Don't need to mess with underlay or z-index or anything.
+				var idx = array.indexOf(array.map(ds, function(elem){
+					return elem.dialog;
+				}), dialog);
+				if(idx != -1){
+					ds.splice(idx, 1);
+				}
+			}
+		},
+
+		isTop: function(/*dijit/_WidgetBase*/ dialog){
+			// summary:
+			//		Returns true if specified Dialog is the top in the task
+			return ds[ds.length - 1].dialog == dialog;
+		}
+	};
+
+	// Stack representing the various active "levels" on the page, starting with the
+	// stuff initially visible on the page (at z-index 0), and then having an entry for
+	// each Dialog shown.
+	// Each element in stack has form {
+	//		dialog: dialogWidget,
+	//		focus: returnFromGetFocus(),
+	//		underlayAttrs: attributes to set on underlay (when this widget is active)
+	// }
+	var ds = Dialog._dialogStack = [
+		{dialog: null, focus: null, underlayAttrs: null}    // entry for stuff at z-index: 0
+	];
+
+	// If focus was accidentally removed from the dialog, such as if the user clicked a blank
+	// area of the screen, or clicked the browser's address bar and then tabbed into the page,
+	// then refocus.   Won't do anything if focus was removed because the Dialog was closed, or
+	// because a new Dialog popped up on top of the old one, or when focus moves to popups
+	focus.watch("curNode", function(attr, oldNode, node){
+ 		// Note: if no dialogs, ds.length==1 but ds[ds.length-1].dialog is null
+		var topDialog = ds[ds.length - 1].dialog;
+
+		// If a node was focused, and there's a Dialog currently showing, and not in the process of fading out...
+		// Ignore focus events on other document though because it's likely an Editor inside of the Dialog.
+		if(node && topDialog && !topDialog._fadeOutDeferred && node.ownerDocument == topDialog.ownerDocument){
+			// If the node that was focused is inside the dialog or in a popup, even a context menu that isn't
+			// technically a descendant of the the dialog, don't do anything.
+			do{
+				if(node == topDialog.domNode || domClass.contains(node, "dijitPopup")){ return; }
+			}while(node = node.parentNode);
+
+			// Otherwise, return focus to the dialog.  Use a delay to avoid confusing dijit/focus code's
+			// own tracking of focus.
+			topDialog.focus();
+		}
+	});
+
+	// Back compat w/1.6, remove for 2.0
+	if(has("dijit-legacy-requires")){
+		ready(0, function(){
+			var requires = ["dijit/TooltipDialog"];
+			require(requires);	// use indirection so modules not rolled into a build
+		});
+	}
+
+	return Dialog;
+});
diff --git a/src/main/resources/static/dijit/DialogUnderlay.js b/src/main/resources/static/dijit/DialogUnderlay.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a823cccad96818bd66a0f07f54f12c25dbe7e92
--- /dev/null
+++ b/src/main/resources/static/dijit/DialogUnderlay.js
@@ -0,0 +1,171 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang", // lang.hitch
+	"dojo/aspect", // aspect.after
+	"dojo/dom-attr", // domAttr.set
+	"dojo/dom-style", // domStyle.getComputedStyle
+	"dojo/on",
+	"dojo/window", // winUtils.getBox, winUtils.get
+	"./_Widget",
+	"./_TemplatedMixin",
+	"./BackgroundIframe",
+	"./Viewport",
+	"./main" // for back-compat, exporting dijit._underlay (remove in 2.0)
+], function(declare, lang, aspect, domAttr, domStyle, on,
+			winUtils, _Widget, _TemplatedMixin, BackgroundIframe, Viewport, dijit){
+
+	// module:
+	//		dijit/DialogUnderlay
+
+	var DialogUnderlay = declare("dijit.DialogUnderlay", [_Widget, _TemplatedMixin], {
+		// summary:
+		//		A component used to block input behind a `dijit/Dialog`.
+		//
+		//		Normally this class should not be instantiated directly, but rather shown and hidden via
+		//		DialogUnderlay.show() and DialogUnderlay.hide().  And usually the module is not accessed directly
+		//		at all, since the underlay is shown and hidden by Dialog.DialogLevelManager.
+		//
+		//		The underlay itself can be styled based on and id:
+		//	|	#myDialog_underlay { background-color:red; }
+		//
+		//		In the case of `dijit.Dialog`, this id is based on the id of the Dialog,
+		//		suffixed with _underlay.
+
+		// Template has two divs; outer div is used for fade-in/fade-out, and also to hold background iframe.
+		// Inner div has opacity specified in CSS file.
+		templateString: "<div class='dijitDialogUnderlayWrapper'><div class='dijitDialogUnderlay' tabIndex='-1' data-dojo-attach-point='node'></div></div>",
+
+		// Parameters on creation or updatable later
+
+		// dialogId: String
+		//		Id of the dialog.... DialogUnderlay's id is based on this id
+		dialogId: "",
+
+		// class: String
+		//		This class name is used on the DialogUnderlay node, in addition to dijitDialogUnderlay
+		"class": "",
+
+		// This will get overwritten as soon as show() is call, but leave an empty array in case hide() or destroy()
+		// is called first.   The array is shared between instances but that's OK because we never write into it.
+		_modalConnects: [],
+
+		_setDialogIdAttr: function(id){
+			domAttr.set(this.node, "id", id + "_underlay");
+			this._set("dialogId", id);
+		},
+
+		_setClassAttr: function(clazz){
+			this.node.className = "dijitDialogUnderlay " + clazz;
+			this._set("class", clazz);
+		},
+
+		postCreate: function(){
+			// Append the underlay to the body
+			this.ownerDocumentBody.appendChild(this.domNode);
+
+			this.own(on(this.domNode, "keydown", lang.hitch(this, "_onKeyDown")));
+
+			this.inherited(arguments);
+		},
+
+		layout: function(){
+			// summary:
+			//		Sets the background to the size of the viewport
+			//
+			// description:
+			//		Sets the background to the size of the viewport (rather than the size
+			//		of the document) since we need to cover the whole browser window, even
+			//		if the document is only a few lines long.
+			// tags:
+			//		private
+
+			var is = this.node.style,
+				os = this.domNode.style;
+
+			// hide the background temporarily, so that the background itself isn't
+			// causing scrollbars to appear (might happen when user shrinks browser
+			// window and then we are called to resize)
+			os.display = "none";
+
+			// then resize and show
+			var viewport = winUtils.getBox(this.ownerDocument);
+			os.top = viewport.t + "px";
+			os.left = viewport.l + "px";
+			is.width = viewport.w + "px";
+			is.height = viewport.h + "px";
+			os.display = "block";
+		},
+
+		show: function(){
+			// summary:
+			//		Show the dialog underlay
+			this.domNode.style.display = "block";
+			this.open = true;
+			this.layout();
+			this.bgIframe = new BackgroundIframe(this.domNode);
+
+			var win = winUtils.get(this.ownerDocument);
+			this._modalConnects = [
+				Viewport.on("resize", lang.hitch(this, "layout")),
+				on(win, "scroll", lang.hitch(this, "layout"))
+			];
+
+		},
+
+		hide: function(){
+			// summary:
+			//		Hides the dialog underlay
+
+			this.bgIframe.destroy();
+			delete this.bgIframe;
+			this.domNode.style.display = "none";
+			while(this._modalConnects.length){ (this._modalConnects.pop()).remove(); }
+			this.open = false;
+		},
+
+		destroy: function(){
+			while(this._modalConnects.length){ (this._modalConnects.pop()).remove(); }
+			this.inherited(arguments);
+		},
+
+		_onKeyDown: function(){
+			// summary:
+			//		Extension point so Dialog can monitor keyboard events on the underlay.
+		}
+	});
+
+	DialogUnderlay.show = function(/*Object*/ attrs, /*Number*/ zIndex){
+		// summary:
+		//		Display the underlay with the given attributes set.  If the underlay is already displayed,
+		//		then adjust it's attributes as specified.
+		// attrs:
+		//		The parameters to create DialogUnderlay with.
+		// zIndex:
+		//		zIndex of the underlay
+
+		var underlay = DialogUnderlay._singleton;
+		if(!underlay || underlay._destroyed){
+			underlay = dijit._underlay = DialogUnderlay._singleton = new DialogUnderlay(attrs);
+		}else{
+			if(attrs){ underlay.set(attrs); }
+		}
+		domStyle.set(underlay.domNode, 'zIndex', zIndex);
+		if(!underlay.open){
+			underlay.show();
+		}
+	};
+
+	DialogUnderlay.hide = function(){
+		// summary:
+		//		Hide the underlay.
+
+		// Guard code in case the underlay widget has already been destroyed
+		// because we are being called during page unload (when all widgets are destroyed)
+		var underlay = DialogUnderlay._singleton;
+		if(underlay && !underlay._destroyed){
+			underlay.hide();
+		}
+	};
+
+	return DialogUnderlay;
+});
diff --git a/src/main/resources/static/dijit/DropDownMenu.js b/src/main/resources/static/dijit/DropDownMenu.js
new file mode 100644
index 0000000000000000000000000000000000000000..28f8858026c701e1b7ac3ab696ba3a28c7bead18
--- /dev/null
+++ b/src/main/resources/static/dijit/DropDownMenu.js
@@ -0,0 +1,44 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/keys", // keys
+	"dojo/text!./templates/Menu.html",
+	"./_MenuBase"
+], function(declare, keys, template, _MenuBase){
+
+	// module:
+	//		dijit/DropDownMenu
+
+	return declare("dijit.DropDownMenu", _MenuBase, {
+		// summary:
+		//		A menu, without features for context menu (Meaning, drop down menu)
+
+		templateString: template,
+
+		baseClass: "dijitMenu",
+
+		// Arrow key navigation
+		_onUpArrow: function(){
+			this.focusPrev();
+		},
+		_onDownArrow: function(){
+			this.focusNext();
+		},
+		_onRightArrow: function(/*Event*/ evt){
+			this._moveToPopup(evt);
+			evt.stopPropagation();
+			evt.preventDefault();
+		},
+		_onLeftArrow: function(/*Event*/ evt){
+			if(this.parentMenu){
+				if(this.parentMenu._isMenuBar){
+					this.parentMenu.focusPrev();
+				}else{
+					this.onCancel(false);
+				}
+			}else{
+				evt.stopPropagation();
+				evt.preventDefault();
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/Editor.js b/src/main/resources/static/dijit/Editor.js
new file mode 100644
index 0000000000000000000000000000000000000000..ada9d9a4dd0109a8c0f9828c60f32cb79d120e9b
--- /dev/null
+++ b/src/main/resources/static/dijit/Editor.js
@@ -0,0 +1,875 @@
+define([
+	"require",
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/Deferred", // Deferred
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/dom-attr", // domAttr.set
+	"dojo/dom-class", // domClass.add
+	"dojo/dom-geometry",
+	"dojo/dom-style", // domStyle.set, get
+	"dojo/keys", // keys.F1 keys.F15 keys.TAB
+	"dojo/_base/lang", // lang.getObject lang.hitch
+	"dojo/sniff", // has("ie") has("mac") has("webkit")
+	"dojo/string", // string.substitute
+	"dojo/topic", // topic.publish()
+	"./_Container",
+	"./Toolbar",
+	"./ToolbarSeparator",
+	"./layout/_LayoutWidget",
+	"./form/ToggleButton",
+	"./_editor/_Plugin",
+	"./_editor/plugins/EnterKeyHandling",
+	"./_editor/html",
+	"./_editor/range",
+	"./_editor/RichText",
+	"./main", // dijit._scopeName
+	"dojo/i18n!./_editor/nls/commands"
+], function(require, array, declare, Deferred, i18n, domAttr, domClass, domGeometry, domStyle,
+			keys, lang, has, string, topic,
+			_Container, Toolbar, ToolbarSeparator, _LayoutWidget, ToggleButton,
+			_Plugin, EnterKeyHandling, html, rangeapi, RichText, dijit){
+
+	// module:
+	//		dijit/Editor
+
+	var Editor = declare("dijit.Editor", RichText, {
+		// summary:
+		//		A rich text Editing widget
+		//
+		// description:
+		//		This widget provides basic WYSIWYG editing features, based on the browser's
+		//		underlying rich text editing capability, accompanied by a toolbar (`dijit.Toolbar`).
+		//		A plugin model is available to extend the editor's capabilities as well as the
+		//		the options available in the toolbar.  Content generation may vary across
+		//		browsers, and clipboard operations may have different results, to name
+		//		a few limitations.  Note: this widget should not be used with the HTML
+		//		&lt;TEXTAREA&gt; tag -- see dijit/_editor/RichText for details.
+
+		// plugins: [const] Object[]
+		//		A list of plugin names (as strings) or instances (as objects)
+		//		for this widget.
+		//
+		//		When declared in markup, it might look like:
+		//	|	plugins="['bold',{name:'dijit._editor.plugins.FontChoice', command:'fontName', generic:true}]"
+		plugins: null,
+
+		// extraPlugins: [const] Object[]
+		//		A list of extra plugin names which will be appended to plugins array
+		extraPlugins: null,
+
+		constructor: function(/*===== params, srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Initial settings for any of the attributes, except readonly attributes.
+			// srcNodeRef: DOMNode
+			//		The editor replaces the specified DOMNode.
+
+			if(!lang.isArray(this.plugins)){
+				this.plugins = ["undo", "redo", "|", "cut", "copy", "paste", "|", "bold", "italic", "underline", "strikethrough", "|",
+					"insertOrderedList", "insertUnorderedList", "indent", "outdent", "|", "justifyLeft", "justifyRight", "justifyCenter", "justifyFull",
+					EnterKeyHandling /*, "createLink"*/];
+			}
+
+			this._plugins = [];
+			this._editInterval = this.editActionInterval * 1000;
+
+			//IE will always lose focus when other element gets focus, while for FF and safari,
+			//when no iframe is used, focus will be lost whenever another element gets focus.
+			//For IE, we can connect to onBeforeDeactivate, which will be called right before
+			//the focus is lost, so we can obtain the selected range. For other browsers,
+			//no equivalent of onBeforeDeactivate, so we need to do two things to make sure
+			//selection is properly saved before focus is lost: 1) when user clicks another
+			//element in the page, in which case we listen to mousedown on the entire page and
+			//see whether user clicks out of a focus editor, if so, save selection (focus will
+			//only lost after onmousedown event is fired, so we can obtain correct caret pos.)
+			//2) when user tabs away from the editor, which is handled in onKeyDown below.
+			if(has("ie") || has("trident") || has("edge")){
+				this.events.push("onBeforeDeactivate");
+				this.events.push("onBeforeActivate");
+			}
+		},
+
+		postMixInProperties: function(){
+			// summary:
+			//	Extension to make sure a deferred is in place before certain functions
+			//	execute, like making sure all the plugins are properly inserted.
+
+			// Set up a deferred so that the value isn't applied to the editor
+			// until all the plugins load, needed to avoid timing condition
+			// reported in #10537.
+			this.setValueDeferred = new Deferred();
+			this.inherited(arguments);
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			//for custom undo/redo, if enabled.
+			this._steps = this._steps.slice(0);
+			this._undoedSteps = this._undoedSteps.slice(0);
+
+			if(lang.isArray(this.extraPlugins)){
+				this.plugins = this.plugins.concat(this.extraPlugins);
+			}
+
+			this.commands = i18n.getLocalization("dijit._editor", "commands", this.lang);
+
+			if(has("webkit")){
+				// Disable selecting the entire editor by inadvertent double-clicks.
+				// on buttons, title bar, etc.  Otherwise clicking too fast on
+				// a button such as undo/redo selects the entire editor.
+				domStyle.set(this.domNode, "KhtmlUserSelect", "none");
+			}
+		},
+
+		startup: function(){
+
+			this.inherited(arguments);
+
+			if(!this.toolbar){
+				// if we haven't been assigned a toolbar, create one
+				this.toolbar = new Toolbar({
+					ownerDocument: this.ownerDocument,
+					dir: this.dir,
+					lang: this.lang,
+					"aria-label": this.id
+				});
+				this.header.appendChild(this.toolbar.domNode);
+			}
+
+			array.forEach(this.plugins, this.addPlugin, this);
+
+			// Okay, denote the value can now be set.
+			this.setValueDeferred.resolve(true);
+
+			domClass.add(this.iframe.parentNode, "dijitEditorIFrameContainer");
+			domClass.add(this.iframe, "dijitEditorIFrame");
+			domAttr.set(this.iframe, "allowTransparency", true);
+
+			this.toolbar.startup();
+			this.onNormalizedDisplayChanged(); //update toolbar button status
+		},
+
+		destroy: function(){
+			array.forEach(this._plugins, function(p){
+				if(p && p.destroy){
+					p.destroy();
+				}
+			});
+			this._plugins = [];
+			this.toolbar.destroyRecursive();
+			delete this.toolbar;
+			this.inherited(arguments);
+		},
+		addPlugin: function(/*String||Object||Function*/ plugin, /*Integer?*/ index){
+			// summary:
+			//		takes a plugin name as a string or a plugin instance and
+			//		adds it to the toolbar and associates it with this editor
+			//		instance. The resulting plugin is added to the Editor's
+			//		plugins array. If index is passed, it's placed in the plugins
+			//		array at that index. No big magic, but a nice helper for
+			//		passing in plugin names via markup.
+			// plugin:
+			//		String, args object, plugin instance, or plugin constructor
+			// args:
+			//		This object will be passed to the plugin constructor
+			// index:
+			//		Used when creating an instance from
+			//		something already in this.plugins. Ensures that the new
+			//		instance is assigned to this.plugins at that index.
+			var args = lang.isString(plugin) ? {name: plugin} : lang.isFunction(plugin) ? {ctor: plugin} : plugin;
+			if(!args.setEditor){
+				var o = {"args": args, "plugin": null, "editor": this};
+				if(args.name){
+					// search registry for a plugin factory matching args.name, if it's not there then
+					// fallback to 1.0 API:
+					// ask all loaded plugin modules to fill in o.plugin if they can (ie, if they implement args.name)
+					// remove fallback for 2.0.
+					if(_Plugin.registry[args.name]){
+						o.plugin = _Plugin.registry[args.name](args);
+					}else{
+						topic.publish(dijit._scopeName + ".Editor.getPlugin", o);	// publish
+					}
+				}
+				if(!o.plugin){
+					try{
+						// TODO: remove lang.getObject() call in 2.0
+						var pc = args.ctor || lang.getObject(args.name) || require(args.name);
+						if(pc){
+							o.plugin = new pc(args);
+						}
+					}catch(e){
+						throw new Error(this.id + ": cannot find plugin [" + args.name + "]");
+					}
+				}
+				if(!o.plugin){
+					throw new Error(this.id + ": cannot find plugin [" + args.name + "]");
+				}
+				plugin = o.plugin;
+			}
+			if(arguments.length > 1){
+				this._plugins[index] = plugin;
+			}else{
+				this._plugins.push(plugin);
+			}
+			plugin.setEditor(this);
+			if(lang.isFunction(plugin.setToolbar)){
+				plugin.setToolbar(this.toolbar);
+			}
+		},
+
+		//the following 2 functions are required to make the editor play nice under a layout widget, see #4070
+
+		resize: function(size){
+			// summary:
+			//		Resize the editor to the specified size, see `dijit/layout/_LayoutWidget.resize()`
+			if(size){
+				// we've been given a height/width for the entire editor (toolbar + contents), calls layout()
+				// to split the allocated size between the toolbar and the contents
+				_LayoutWidget.prototype.resize.apply(this, arguments);
+			}
+			/*
+			 else{
+			 // do nothing, the editor is already laid out correctly.   The user has probably specified
+			 // the height parameter, which was used to set a size on the iframe
+			 }
+			 */
+		},
+		layout: function(){
+			// summary:
+			//		Called from `dijit/layout/_LayoutWidget.resize()`.  This shouldn't be called directly
+			// tags:
+			//		protected
+
+			// Converts the iframe (or rather the <div> surrounding it) to take all the available space
+			// except what's needed for the header (toolbars) and footer (breadcrumbs, etc).
+			// A class was added to the iframe container and some themes style it, so we have to
+			// calc off the added margins and padding too. See tracker: #10662
+			var areaHeight = (this._contentBox.h -
+				(this.getHeaderHeight() + this.getFooterHeight() +
+					domGeometry.getPadBorderExtents(this.iframe.parentNode).h +
+					domGeometry.getMarginExtents(this.iframe.parentNode).h));
+			this.editingArea.style.height = areaHeight + "px";
+			if(this.iframe){
+				this.iframe.style.height = "100%";
+			}
+			this._layoutMode = true;
+		},
+
+		_onIEMouseDown: function(/*Event*/ e){
+			// summary:
+			//		IE only to prevent 2 clicks to focus
+			// tags:
+			//		private
+			var outsideClientArea;
+			// IE 8's componentFromPoint is broken, which is a shame since it
+			// was smaller code, but oh well.  We have to do this brute force
+			// to detect if the click was scroller or not.
+			var b = this.document.body;
+			var clientWidth = b.clientWidth;
+			var clientHeight = b.clientHeight;
+			var clientLeft = b.clientLeft;
+			var offsetWidth = b.offsetWidth;
+			var offsetHeight = b.offsetHeight;
+			var offsetLeft = b.offsetLeft;
+
+			//Check for vertical scroller click.
+			if(/^rtl$/i.test(b.dir || "")){
+				if(clientWidth < offsetWidth && e.x > clientWidth && e.x < offsetWidth){
+					// Check the click was between width and offset width, if so, scroller
+					outsideClientArea = true;
+				}
+			}else{
+				// RTL mode, we have to go by the left offsets.
+				if(e.x < clientLeft && e.x > offsetLeft){
+					// Check the click was between width and offset width, if so, scroller
+					outsideClientArea = true;
+				}
+			}
+			if(!outsideClientArea){
+				// Okay, might be horiz scroller, check that.
+				if(clientHeight < offsetHeight && e.y > clientHeight && e.y < offsetHeight){
+					// Horizontal scroller.
+					outsideClientArea = true;
+				}
+			}
+			if(!outsideClientArea){
+				delete this._cursorToStart; // Remove the force to cursor to start position.
+				delete this._savedSelection; // new mouse position overrides old selection
+				if(e.target.tagName == "BODY"){
+					this.defer("placeCursorAtEnd");
+				}
+				this.inherited(arguments);
+			}
+		},
+		onBeforeActivate: function(){
+			this._restoreSelection();
+		},
+		onBeforeDeactivate: function(e){
+			// summary:
+			//		Called on IE right before focus is lost.   Saves the selected range.
+			// tags:
+			//		private
+			if(this.customUndo){
+				this.endEditing(true);
+			}
+			//in IE, the selection will be lost when other elements get focus,
+			//let's save focus before the editor is deactivated
+			if(e.target.tagName != "BODY"){
+				this._saveSelection();
+			}
+			//console.log('onBeforeDeactivate',this);
+		},
+
+		/* beginning of custom undo/redo support */
+
+		// customUndo: Boolean
+		//		Whether we shall use custom undo/redo support instead of the native
+		//		browser support. By default, we now use custom undo.  It works better
+		//		than native browser support and provides a consistent behavior across
+		//		browsers with a minimal performance hit.  We already had the hit on
+		//		the slowest browser, IE, anyway.
+		customUndo: true,
+
+		// editActionInterval: Integer
+		//		When using customUndo, not every keystroke will be saved as a step.
+		//		Instead typing (including delete) will be grouped together: after
+		//		a user stops typing for editActionInterval seconds, a step will be
+		//		saved; if a user resume typing within editActionInterval seconds,
+		//		the timeout will be restarted. By default, editActionInterval is 3
+		//		seconds.
+		editActionInterval: 3,
+
+		beginEditing: function(cmd){
+			// summary:
+			//		Called to note that the user has started typing alphanumeric characters, if it's not already noted.
+			//		Deals with saving undo; see editActionInterval parameter.
+			// tags:
+			//		private
+			if(!this._inEditing){
+				this._inEditing = true;
+				this._beginEditing(cmd);
+			}
+			if(this.editActionInterval > 0){
+				if(this._editTimer){
+					this._editTimer.remove();
+				}
+				this._editTimer = this.defer("endEditing", this._editInterval);
+			}
+		},
+
+		// TODO: declaring these in the prototype is meaningless, just create in the constructor/postCreate
+		_steps: [],
+		_undoedSteps: [],
+
+		execCommand: function(cmd){
+			// summary:
+			//		Main handler for executing any commands to the editor, like paste, bold, etc.
+			//		Called by plugins, but not meant to be called by end users.
+			// tags:
+			//		protected
+			if(this.customUndo && (cmd == 'undo' || cmd == 'redo')){
+				return this[cmd]();
+			}else{
+				if(this.customUndo){
+					this.endEditing();
+					this._beginEditing();
+				}
+				var r = this.inherited(arguments);
+				if(this.customUndo){
+					this._endEditing();
+				}
+				return r;
+			}
+		},
+
+		_pasteImpl: function(){
+			// summary:
+			//		Over-ride of paste command control to make execCommand cleaner
+			// tags:
+			//		Protected
+			return this._clipboardCommand("paste");
+		},
+
+		_cutImpl: function(){
+			// summary:
+			//		Over-ride of cut command control to make execCommand cleaner
+			// tags:
+			//		Protected
+			return this._clipboardCommand("cut");
+		},
+
+		_copyImpl: function(){
+			// summary:
+			//		Over-ride of copy command control to make execCommand cleaner
+			// tags:
+			//		Protected
+			return this._clipboardCommand("copy");
+		},
+
+		_clipboardCommand: function(cmd){
+			// summary:
+			//		Function to handle processing clipboard commands (or at least try to).
+			// tags:
+			//		Private
+			var r;
+			try{
+				// Try to exec the superclass exec-command and see if it works.
+				r = this.document.execCommand(cmd, false, null);
+				if(has("webkit") && !r){ //see #4598: webkit does not guarantee clipboard support from js
+					throw {}; // throw to show the warning
+				}
+			}catch(e){
+				//Ticket #18467 removed the checks to specific codes
+				// Warn user of platform limitation.  Cannot programmatically access clipboard. See ticket #4136
+				var sub = string.substitute,
+					accel = {cut: 'X', copy: 'C', paste: 'V'};
+				alert(sub(this.commands.systemShortcut,
+					[this.commands[cmd], sub(this.commands[has("mac") ? 'appleKey' : 'ctrlKey'], [accel[cmd]])]));
+				r = false;
+			}
+			return r;
+		},
+
+		queryCommandEnabled: function(cmd){
+			// summary:
+			//		Returns true if specified editor command is enabled.
+			//		Used by the plugins to know when to highlight/not highlight buttons.
+			// tags:
+			//		protected
+			if(this.customUndo && (cmd == 'undo' || cmd == 'redo')){
+				return cmd == 'undo' ? (this._steps.length > 1) : (this._undoedSteps.length > 0);
+			}else{
+				return this.inherited(arguments);
+			}
+		},
+		_moveToBookmark: function(b){
+			// summary:
+			//		Selects the text specified in bookmark b
+			// tags:
+			//		private
+			var bookmark = b.mark;
+			var mark = b.mark;
+			var col = b.isCollapsed;
+			var r, sNode, eNode, sel;
+			if(mark){
+				if(has("ie") < 9 || (has("ie") === 9 && has("quirks"))){
+					if(lang.isArray(mark)){
+						// IE CONTROL, have to use the native bookmark.
+						bookmark = [];
+						array.forEach(mark, function(n){
+							bookmark.push(rangeapi.getNode(n, this.editNode));
+						}, this);
+						this.selection.moveToBookmark({mark: bookmark, isCollapsed: col});
+					}else{
+						if(mark.startContainer && mark.endContainer){
+							// Use the pseudo WC3 range API.  This works better for positions
+							// than the IE native bookmark code.
+							sel = rangeapi.getSelection(this.window);
+							if(sel && sel.removeAllRanges){
+								sel.removeAllRanges();
+								r = rangeapi.create(this.window);
+								sNode = rangeapi.getNode(mark.startContainer, this.editNode);
+								eNode = rangeapi.getNode(mark.endContainer, this.editNode);
+								if(sNode && eNode){
+									// Okay, we believe we found the position, so add it into the selection
+									// There are cases where it may not be found, particularly in undo/redo, when
+									// IE changes the underlying DOM on us (wraps text in a <p> tag or similar.
+									// So, in those cases, don't bother restoring selection.
+									r.setStart(sNode, mark.startOffset);
+									r.setEnd(eNode, mark.endOffset);
+									sel.addRange(r);
+								}
+							}
+						}
+					}
+				}else{//w3c range
+					sel = rangeapi.getSelection(this.window);
+					if(sel && sel.removeAllRanges){
+						sel.removeAllRanges();
+						r = rangeapi.create(this.window);
+						sNode = rangeapi.getNode(mark.startContainer, this.editNode);
+						eNode = rangeapi.getNode(mark.endContainer, this.editNode);
+						if(sNode && eNode){
+							// Okay, we believe we found the position, so add it into the selection
+							// There are cases where it may not be found, particularly in undo/redo, when
+							// formatting as been done and so on, so don't restore selection then.
+							r.setStart(sNode, mark.startOffset);
+							r.setEnd(eNode, mark.endOffset);
+							sel.addRange(r);
+						}
+					}
+				}
+			}
+		},
+		_changeToStep: function(from, to){
+			// summary:
+			//		Reverts editor to "to" setting, from the undo stack.
+			// tags:
+			//		private
+			this.setValue(to.text);
+			var b = to.bookmark;
+			if(!b){
+				return;
+			}
+			this._moveToBookmark(b);
+		},
+		undo: function(){
+			// summary:
+			//		Handler for editor undo (ex: ctrl-z) operation
+			// tags:
+			//		private
+			var ret = false;
+			if(!this._undoRedoActive){
+				this._undoRedoActive = true;
+				this.endEditing(true);
+				var s = this._steps.pop();
+				if(s && this._steps.length > 0){
+					this.focus();
+					this._changeToStep(s, this._steps[this._steps.length - 1]);
+					this._undoedSteps.push(s);
+					this.onDisplayChanged();
+					delete this._undoRedoActive;
+					ret = true;
+				}
+				delete this._undoRedoActive;
+			}
+			return ret;
+		},
+		redo: function(){
+			// summary:
+			//		Handler for editor redo (ex: ctrl-y) operation
+			// tags:
+			//		private
+			var ret = false;
+			if(!this._undoRedoActive){
+				this._undoRedoActive = true;
+				this.endEditing(true);
+				var s = this._undoedSteps.pop();
+				if(s && this._steps.length > 0){
+					this.focus();
+					this._changeToStep(this._steps[this._steps.length - 1], s);
+					this._steps.push(s);
+					this.onDisplayChanged();
+					ret = true;
+				}
+				delete this._undoRedoActive;
+			}
+			return ret;
+		},
+		endEditing: function(ignore_caret){
+			// summary:
+			//		Called to note that the user has stopped typing alphanumeric characters, if it's not already noted.
+			//		Deals with saving undo; see editActionInterval parameter.
+			// tags:
+			//		private
+			if(this._editTimer){
+				this._editTimer = this._editTimer.remove();
+			}
+			if(this._inEditing){
+				this._endEditing(ignore_caret);
+				this._inEditing = false;
+			}
+		},
+
+		_getBookmark: function(){
+			// summary:
+			//		Get the currently selected text
+			// tags:
+			//		protected
+			var b = this.selection.getBookmark();
+			var tmp = [];
+			if(b && b.mark){
+				var mark = b.mark;
+				if(has("ie") < 9 || (has("ie") === 9 && has("quirks"))){
+					// Try to use the pseudo range API on IE for better accuracy.
+					var sel = rangeapi.getSelection(this.window);
+					if(!lang.isArray(mark)){
+						if(sel){
+							var range;
+							if(sel.rangeCount){
+								range = sel.getRangeAt(0);
+							}
+							if(range){
+								b.mark = range.cloneRange();
+							}else{
+								b.mark = this.selection.getBookmark();
+							}
+						}
+					}else{
+						// Control ranges (img, table, etc), handle differently.
+						array.forEach(b.mark, function(n){
+							tmp.push(rangeapi.getIndex(n, this.editNode).o);
+						}, this);
+						b.mark = tmp;
+					}
+				}
+				try{
+					if(b.mark && b.mark.startContainer){
+						tmp = rangeapi.getIndex(b.mark.startContainer, this.editNode).o;
+						b.mark = {startContainer: tmp,
+							startOffset: b.mark.startOffset,
+							endContainer: b.mark.endContainer === b.mark.startContainer ? tmp : rangeapi.getIndex(b.mark.endContainer, this.editNode).o,
+							endOffset: b.mark.endOffset};
+					}
+				}catch(e){
+					b.mark = null;
+				}
+			}
+			return b;
+		},
+		_beginEditing: function(){
+			// summary:
+			//		Called when the user starts typing alphanumeric characters.
+			//		Deals with saving undo; see editActionInterval parameter.
+			// tags:
+			//		private
+			if(this._steps.length === 0){
+				// You want to use the editor content without post filtering
+				// to make sure selection restores right for the 'initial' state.
+				// and undo is called.  So not using this.value, as it was 'processed'
+				// and the line-up for selections may have been altered.
+				this._steps.push({'text': html.getChildrenHtml(this.editNode), 'bookmark': this._getBookmark()});
+			}
+		},
+		_endEditing: function(){
+			// summary:
+			//		Called when the user stops typing alphanumeric characters.
+			//		Deals with saving undo; see editActionInterval parameter.
+			// tags:
+			//		private
+
+			// Avoid filtering to make sure selections restore.
+			var v = html.getChildrenHtml(this.editNode);
+
+			this._undoedSteps = [];//clear undoed steps
+			this._steps.push({text: v, bookmark: this._getBookmark()});
+		},
+		onKeyDown: function(e){
+			// summary:
+			//		Handler for onkeydown event.
+			// tags:
+			//		private
+
+			//We need to save selection if the user TAB away from this editor
+			//no need to call _saveSelection for IE, as that will be taken care of in onBeforeDeactivate
+			if(!has("ie") && !this.iframe && e.keyCode == keys.TAB && !this.tabIndent){
+				this._saveSelection();
+			}
+			if(!this.customUndo){
+				this.inherited(arguments);
+				return;
+			}
+			var k = e.keyCode;
+			if(e.ctrlKey && !e.shiftKey && !e.altKey){//undo and redo only if the special right Alt + z/y are not pressed #5892
+				if(k == 90 || k == 122){ //z, but also F11 key
+					e.stopPropagation();
+					e.preventDefault();
+					this.undo();
+					return;
+				}else if(k == 89 || k == 121){ //y
+					e.stopPropagation();
+					e.preventDefault();
+					this.redo();
+					return;
+				}
+			}
+			this.inherited(arguments);
+
+			switch(k){
+				case keys.ENTER:
+				case keys.BACKSPACE:
+				case keys.DELETE:
+					this.beginEditing();
+					break;
+				case 88: //x
+				case 86: //v
+					if(e.ctrlKey && !e.altKey && !e.metaKey){
+						this.endEditing();//end current typing step if any
+						if(e.keyCode == 88){
+							this.beginEditing('cut');
+						}else{
+							this.beginEditing('paste');
+						}
+						//use timeout to trigger after the paste is complete
+						this.defer("endEditing", 1);
+						break;
+					}
+				//pass through
+				default:
+					if(!e.ctrlKey && !e.altKey && !e.metaKey && (e.keyCode < keys.F1 || e.keyCode > keys.F15)){
+						this.beginEditing();
+						break;
+					}
+				//pass through
+				case keys.ALT:
+					this.endEditing();
+					break;
+				case keys.UP_ARROW:
+				case keys.DOWN_ARROW:
+				case keys.LEFT_ARROW:
+				case keys.RIGHT_ARROW:
+				case keys.HOME:
+				case keys.END:
+				case keys.PAGE_UP:
+				case keys.PAGE_DOWN:
+					this.endEditing(true);
+					break;
+				//maybe ctrl+backspace/delete, so don't endEditing when ctrl is pressed
+				case keys.CTRL:
+				case keys.SHIFT:
+				case keys.TAB:
+					break;
+			}
+		},
+		_onBlur: function(){
+			// summary:
+			//		Called from focus manager when focus has moved away from this editor
+			// tags:
+			//		protected
+
+			//this._saveSelection();
+			this.inherited(arguments);
+			this.endEditing(true);
+		},
+		_saveSelection: function(){
+			// summary:
+			//		Save the currently selected text in _savedSelection attribute
+			// tags:
+			//		private
+			try{
+				this._savedSelection = this._getBookmark();
+			}catch(e){ /* Squelch any errors that occur if selection save occurs due to being hidden simultaneously. */
+			}
+		},
+		_restoreSelection: function(){
+			// summary:
+			//		Re-select the text specified in _savedSelection attribute;
+			//		see _saveSelection().
+			// tags:
+			//		private
+			if(this._savedSelection){
+				// Clear off cursor to start, we're deliberately going to a selection.
+				delete this._cursorToStart;
+				// only restore the selection if the current range is collapsed
+				// if not collapsed, then it means the editor does not lose
+				// selection and there is no need to restore it
+				if(this.selection.isCollapsed()){
+					this._moveToBookmark(this._savedSelection);
+				}
+				delete this._savedSelection;
+			}
+		},
+
+		onClick: function(){
+			// summary:
+			//		Handler for when editor is clicked
+			// tags:
+			//		protected
+			this.endEditing(true);
+			this.inherited(arguments);
+		},
+
+		replaceValue: function(/*String*/ html){
+			// summary:
+			//		over-ride of replaceValue to support custom undo and stack maintenance.
+			// tags:
+			//		protected
+			if(!this.customUndo){
+				this.inherited(arguments);
+			}else{
+				if(this.isClosed){
+					this.setValue(html);
+				}else{
+					this.beginEditing();
+					if(!html){
+						html = "&#160;";	// &nbsp;
+					}
+					this.setValue(html);
+					this.endEditing();
+				}
+			}
+		},
+
+		_setDisabledAttr: function(/*Boolean*/ value){
+			this.setValueDeferred.then(lang.hitch(this, function(){
+				if((!this.disabled && value) || (!this._buttonEnabledPlugins && value)){
+					// Disable editor: disable all enabled buttons and remember that list
+					array.forEach(this._plugins, function(p){
+						p.set("disabled", true);
+					});
+				}else if(this.disabled && !value){
+					// Restore plugins to being active.
+					array.forEach(this._plugins, function(p){
+						p.set("disabled", false);
+					});
+				}
+			}));
+			this.inherited(arguments);
+		},
+
+		_setStateClass: function(){
+			try{
+				this.inherited(arguments);
+
+				// Let theme set the editor's text color based on editor enabled/disabled state.
+				// We need to jump through hoops because the main document (where the theme CSS is)
+				// is separate from the iframe's document.
+				if(this.document && this.document.body){
+					domStyle.set(this.document.body, "color", domStyle.get(this.iframe, "color"));
+				}
+			}catch(e){ /* Squelch any errors caused by focus change if hidden during a state change */
+			}
+		}
+	});
+
+	// Register the "default plugins", ie, the built-in editor commands
+	function simplePluginFactory(args){
+		return new _Plugin({ command: args.name });
+	}
+
+	function togglePluginFactory(args){
+		return new _Plugin({ buttonClass: ToggleButton, command: args.name });
+	}
+
+	lang.mixin(_Plugin.registry, {
+		"undo": simplePluginFactory,
+		"redo": simplePluginFactory,
+		"cut": simplePluginFactory,
+		"copy": simplePluginFactory,
+		"paste": simplePluginFactory,
+		"insertOrderedList": simplePluginFactory,
+		"insertUnorderedList": simplePluginFactory,
+		"indent": simplePluginFactory,
+		"outdent": simplePluginFactory,
+		"justifyCenter": simplePluginFactory,
+		"justifyFull": simplePluginFactory,
+		"justifyLeft": simplePluginFactory,
+		"justifyRight": simplePluginFactory,
+		"delete": simplePluginFactory,
+		"selectAll": simplePluginFactory,
+		"removeFormat": simplePluginFactory,
+		"unlink": simplePluginFactory,
+		"insertHorizontalRule": simplePluginFactory,
+
+		"bold": togglePluginFactory,
+		"italic": togglePluginFactory,
+		"underline": togglePluginFactory,
+		"strikethrough": togglePluginFactory,
+		"subscript": togglePluginFactory,
+		"superscript": togglePluginFactory,
+
+		"|": function(){
+			return new _Plugin({
+				setEditor: function(editor){
+					this.editor = editor;
+					this.button = new ToolbarSeparator({ownerDocument: editor.ownerDocument});
+				}
+			});
+		}
+	});
+
+	return Editor;
+});
diff --git a/src/main/resources/static/dijit/Fieldset.js b/src/main/resources/static/dijit/Fieldset.js
new file mode 100644
index 0000000000000000000000000000000000000000..ccb52edd19dabac68437619b0ffb228f42df8d69
--- /dev/null
+++ b/src/main/resources/static/dijit/Fieldset.js
@@ -0,0 +1,41 @@
+define([
+	"dojo/_base/declare",
+	"dojo/query!css2",
+	"dijit/TitlePane",
+	"dojo/text!./templates/Fieldset.html",
+	"./a11yclick"	// template uses ondijitclick
+], function(declare, query, TitlePane, template){
+
+
+	return declare("dijit.Fieldset", TitlePane, {
+		// summary:
+		//		An accessible fieldset that can be expanded or collapsed via
+		//		its legend.  Fieldset extends `dijit.TitlePane`.
+
+		// baseClass: [protected] String
+		//		The root className to use for the various states of this widget
+		baseClass: 'dijitFieldset',
+
+		// title: String
+		//		Content of the legend tag. Overrides <legend> tag if not empty.
+		title: '',
+
+		// open: Boolean
+		//		Whether fieldset is opened or closed.
+		open: true,
+
+		templateString: template,
+
+		postCreate: function() {
+			if(!this.title){
+				var legends = query('legend', this.containerNode);
+				if(legends.length) { // oops, no legend?
+					this.set('title', legends[0].innerHTML);
+					legends[0].parentNode.removeChild(legends[0]);
+				}
+			}
+
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/InlineEditBox.js b/src/main/resources/static/dijit/InlineEditBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..dd0294635f9d833a0029adce3036fdbbe669cf66
--- /dev/null
+++ b/src/main/resources/static/dijit/InlineEditBox.js
@@ -0,0 +1,658 @@
+define([
+	"require",
+	"dojo/_base/array", // array.forEach
+	"dojo/aspect",
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set domAttr.get
+	"dojo/dom-class", // domClass.add domClass.remove domClass.toggle
+	"dojo/dom-construct", // domConstruct.create domConstruct.destroy
+	"dojo/dom-style", // domStyle.getComputedStyle domStyle.set domStyle.get
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/keys", // keys.ENTER keys.ESCAPE
+	"dojo/_base/lang", // lang.getObject
+	"dojo/on",
+	"dojo/sniff", // has("ie")
+	"dojo/when",
+	"./a11yclick",
+	"./focus",
+	"./_Widget",
+	"./_TemplatedMixin",
+	"./_WidgetsInTemplateMixin",
+	"./_Container",
+	"./form/Button",
+	"./form/_TextBoxMixin",
+	"./form/TextBox",
+	"dojo/text!./templates/InlineEditBox.html",
+	"dojo/i18n!./nls/common"
+], function(require, array, aspect, declare, domAttr, domClass, domConstruct, domStyle, i18n, kernel, keys, lang, on, has, when, a11yclick, fm, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin, _Container, Button, _TextBoxMixin, TextBox, template){
+
+	// module:
+	//		dijit/InlineEditBox
+
+	var InlineEditor = declare("dijit._InlineEditor", [_Widget, _TemplatedMixin, _WidgetsInTemplateMixin], {
+		// summary:
+		//		Internal widget used by InlineEditBox, displayed when in editing mode
+		//		to display the editor and maybe save/cancel buttons.  Calling code should
+		//		connect to save/cancel methods to detect when editing is finished
+		//
+		//		Has mainly the same parameters as InlineEditBox, plus these values:
+		//
+		// style: Object
+		//		Set of CSS attributes of display node, to replicate in editor
+		//
+		// value: String
+		//		Value as an HTML string or plain text string, depending on renderAsHTML flag
+
+		templateString: template,
+
+		contextRequire: require,
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			this.messages = i18n.getLocalization("dijit", "common", this.lang);
+			array.forEach(["buttonSave", "buttonCancel"], function(prop){
+				if(!this[prop]){
+					this[prop] = this.messages[prop];
+				}
+			}, this);
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			// Create edit widget in place in the template
+			// TODO: remove getObject() for 2.0
+			var Cls = typeof this.editor == "string" ? (lang.getObject(this.editor) || require(this.editor)) : this.editor;
+
+			// Copy the style from the source
+			// Don't copy ALL properties though, just the necessary/applicable ones.
+			// wrapperStyle/destStyle code is to workaround IE bug where getComputedStyle().fontSize
+			// is a relative value like 200%, rather than an absolute value like 24px, and
+			// the 200% can refer *either* to a setting on the node or it's ancestor (see #11175)
+			var srcStyle = this.sourceStyle,
+				editStyle = "line-height:" + srcStyle.lineHeight + ";",
+				destStyle = domStyle.getComputedStyle(this.domNode);
+			array.forEach(["Weight", "Family", "Size", "Style"], function(prop){
+				var textStyle = srcStyle["font" + prop],
+					wrapperStyle = destStyle["font" + prop];
+				if(wrapperStyle != textStyle){
+					editStyle += "font-" + prop + ":" + srcStyle["font" + prop] + ";";
+				}
+			}, this);
+			array.forEach(["marginTop", "marginBottom", "marginLeft", "marginRight", "position", "left", "top", "right", "bottom", "float", "clear", "display"], function(prop){
+				this.domNode.style[prop] = srcStyle[prop];
+			}, this);
+			var width = this.inlineEditBox.width;
+			if(width == "100%"){
+				// block mode
+				editStyle += "width:100%;";
+				this.domNode.style.display = "block";
+			}else{
+				// inline-block mode
+				editStyle += "width:" + (width + (Number(width) == width ? "px" : "")) + ";";
+			}
+			var editorParams = lang.delegate(this.inlineEditBox.editorParams, {
+				style: editStyle,
+				dir: this.dir,
+				lang: this.lang,
+				textDir: this.textDir
+			});
+			// set the value in onLoadDeferred instead so the widget has time to finish initializing
+			//editorParams[("displayedValue" in Cls.prototype || "_setDisplayedValueAttr" in Cls.prototype) ? "displayedValue" : "value"] = this.value;
+			this.editWidget = new Cls(editorParams, this.editorPlaceholder);
+
+			if(this.inlineEditBox.autoSave){
+				// Remove the save/cancel buttons since saving is done by simply tabbing away or
+				// selecting a value from the drop down list
+				this.saveButton.destroy();
+				this.cancelButton.destroy();
+				this.saveButton = this.cancelButton = null;
+				domConstruct.destroy(this.buttonContainer);
+			}
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			var ew = this.editWidget;
+
+			if(this.inlineEditBox.autoSave){
+				this.own(
+					// Selecting a value from a drop down list causes an onChange event and then we save
+					aspect.after(ew, "onChange", lang.hitch(this, "_onChange"), true),
+
+					// ESC and TAB should cancel and save.
+					on(ew, "keydown", lang.hitch(this, "_onKeyDown"))
+				);
+			}else{
+				// If possible, enable/disable save button based on whether the user has changed the value
+				if("intermediateChanges" in ew){
+					ew.set("intermediateChanges", true);
+					this.own(aspect.after(ew, "onChange", lang.hitch(this, "_onIntermediateChange"), true));
+					this.saveButton.set("disabled", true);
+				}
+			}
+		},
+
+		startup: function(){
+			this.editWidget.startup();
+			this.inherited(arguments);
+		},
+
+		_onIntermediateChange: function(/*===== val =====*/){
+			// summary:
+			//		Called for editor widgets that support the intermediateChanges=true flag as a way
+			//		to detect when to enable/disabled the save button
+			this.saveButton.set("disabled", (this.getValue() == this._resetValue) || !this.enableSave());
+		},
+
+		destroy: function(){
+			this.editWidget.destroy(true); // let the parent wrapper widget clean up the DOM
+			this.inherited(arguments);
+		},
+
+		getValue: function(){
+			// summary:
+			//		Return the [display] value of the edit widget
+			var ew = this.editWidget;
+			return String(ew.get(("displayedValue" in ew || "_getDisplayedValueAttr" in ew) ? "displayedValue" : "value"));
+		},
+
+		_onKeyDown: function(e){
+			// summary:
+			//		Handler for keydown in the edit box in autoSave mode.
+			// description:
+			//		For autoSave widgets, if Esc/Enter, call cancel/save.
+			// tags:
+			//		private
+
+			if(this.inlineEditBox.autoSave && this.inlineEditBox.editing){
+				if(e.altKey || e.ctrlKey){
+					return;
+				}
+				// If Enter/Esc pressed, treat as save/cancel.
+				if(e.keyCode == keys.ESCAPE){
+					e.stopPropagation();
+					e.preventDefault();
+					this.cancel(true); // sets editing=false which short-circuits _onBlur processing
+				}else if(e.keyCode == keys.ENTER && e.target.tagName == "INPUT"){
+					e.stopPropagation();
+					e.preventDefault();
+					this._onChange(); // fire _onBlur and then save
+				}
+
+				// _onBlur will handle TAB automatically by allowing
+				// the TAB to change focus before we mess with the DOM: #6227
+				// Expounding by request:
+				//	The current focus is on the edit widget input field.
+				//	save() will hide and destroy this widget.
+				//	We want the focus to jump from the currently hidden
+				//	displayNode, but since it's hidden, it's impossible to
+				//	unhide it, focus it, and then have the browser focus
+				//	away from it to the next focusable element since each
+				//	of these events is asynchronous and the focus-to-next-element
+				//	is already queued.
+				//	So we allow the browser time to unqueue the move-focus event
+				//	before we do all the hide/show stuff.
+			}
+		},
+
+		_onBlur: function(){
+			// summary:
+			//		Called when focus moves outside the editor
+			// tags:
+			//		private
+
+			this.inherited(arguments);
+			if(this.inlineEditBox.autoSave && this.inlineEditBox.editing){
+				if(this.getValue() == this._resetValue){
+					this.cancel(false);
+				}else if(this.enableSave()){
+					this.save(false);
+				}
+			}
+		},
+
+		_onChange: function(){
+			// summary:
+			//		Called when the underlying widget fires an onChange event,
+			//		such as when the user selects a value from the drop down list of a ComboBox,
+			//		which means that the user has finished entering the value and we should save.
+			// tags:
+			//		private
+
+			if(this.inlineEditBox.autoSave && this.inlineEditBox.editing && this.enableSave()){
+				fm.focus(this.inlineEditBox.displayNode); // fires _onBlur which will save the formatted value
+			}
+		},
+
+		enableSave: function(){
+			// summary:
+			//		User overridable function returning a Boolean to indicate
+			//		if the Save button should be enabled or not - usually due to invalid conditions
+			// tags:
+			//		extension
+			return this.editWidget.isValid ? this.editWidget.isValid() : true;
+		},
+
+		focus: function(){
+			// summary:
+			//		Focus the edit widget.
+			// tags:
+			//		protected
+
+			this.editWidget.focus();
+
+			if(this.editWidget.focusNode){
+				// IE can take 30ms to report the focus event, but focus manager needs to know before a 0ms timeout.
+				fm._onFocusNode(this.editWidget.focusNode);
+
+				if(this.editWidget.focusNode.tagName == "INPUT"){
+					this.defer(function(){
+						_TextBoxMixin.selectInputText(this.editWidget.focusNode);
+					});
+				}
+			}
+		}
+	});
+
+
+	var InlineEditBox = declare("dijit.InlineEditBox" + (has("dojo-bidi") ? "_NoBidi" : ""), _Widget, {
+		// summary:
+		//		An element with in-line edit capabilities
+		//
+		// description:
+		//		Behavior for an existing node (`<p>`, `<div>`, `<span>`, etc.) so that
+		//		when you click it, an editor shows up in place of the original
+		//		text.  Optionally, Save and Cancel button are displayed below the edit widget.
+		//		When Save is clicked, the text is pulled from the edit
+		//		widget and redisplayed and the edit widget is again hidden.
+		//		By default a plain Textarea widget is used as the editor (or for
+		//		inline values a TextBox), but you can specify an editor such as
+		//		dijit.Editor (for editing HTML) or a Slider (for adjusting a number).
+		//		An edit widget must support the following API to be used:
+		//
+		//		- displayedValue or value as initialization parameter,
+		//			and available through set('displayedValue') / set('value')
+		//		- void focus()
+		//		- DOM-node focusNode = node containing editable text
+
+		// editing: [readonly] Boolean
+		//		Is the node currently in edit mode?
+		editing: false,
+
+		// autoSave: [const] Boolean
+		//		Changing the value automatically saves it; don't have to push save button
+		//		(and save button isn't even displayed)
+		autoSave: true,
+
+		// buttonSave: String
+		//		Save button label
+		buttonSave: "",
+
+		// buttonCancel: String
+		//		Cancel button label
+		buttonCancel: "",
+
+		// renderAsHtml: Boolean
+		//		Set this to true if the specified Editor's value should be interpreted as HTML
+		//		rather than plain text (ex: `dijit.Editor`)
+		renderAsHtml: false,
+
+		// editor: String|Function
+		//		MID (ex: "dijit/form/TextBox") or constructor for editor widget
+		editor: TextBox,
+
+		// editorWrapper: String|Function
+		//		Class name (or reference to the Class) for widget that wraps the editor widget, displaying save/cancel
+		//		buttons.
+		editorWrapper: InlineEditor,
+
+		// editorParams: Object
+		//		Set of parameters for editor, like {required: true}
+		editorParams: {},
+
+		// disabled: Boolean
+		//		If true, clicking the InlineEditBox to edit it will have no effect.
+		disabled: false,
+
+		onChange: function(/*===== value =====*/){
+			// summary:
+			//		Set this handler to be notified of changes to value.
+			// tags:
+			//		callback
+		},
+
+		onCancel: function(){
+			// summary:
+			//		Set this handler to be notified when editing is cancelled.
+			// tags:
+			//		callback
+		},
+
+		// width: String
+		//		Width of editor.  By default it's width=100% (ie, block mode).
+		width: "100%",
+
+		// value: String
+		//		The display value of the widget in read-only mode
+		value: "",
+
+		// noValueIndicator: [const] String
+		//		The text that gets displayed when there is no value (so that the user has a place to click to edit)
+		noValueIndicator: has("ie") <= 6 ? // font-family needed on IE6 but it messes up IE8
+			"<span style='font-family: wingdings; text-decoration: underline;'>&#160;&#160;&#160;&#160;&#x270d;&#160;&#160;&#160;&#160;</span>" :
+			"<span style='text-decoration: underline;'>&#160;&#160;&#160;&#160;&#x270d;&#160;&#160;&#160;&#160;</span>", // &#160; == &nbsp;
+
+		constructor: function(/*===== params, srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified:
+			//
+			//		- use srcNodeRef.innerHTML as my value
+			//		- replace srcNodeRef with my generated DOM tree
+
+			this.editorParams = {};
+		},
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+
+			// save pointer to original source node, since Widget nulls-out srcNodeRef
+			this.displayNode = this.srcNodeRef;
+
+			// connect handlers to the display node
+			this.own(
+				on(this.displayNode, a11yclick, lang.hitch(this, "_onClick")),
+				on(this.displayNode, "mouseover, focus", lang.hitch(this, "_onMouseOver")),
+				on(this.displayNode, "mouseout, blur", lang.hitch(this, "_onMouseOut"))
+			);
+
+			this.displayNode.setAttribute("role", "button");
+			if(!this.displayNode.getAttribute("tabIndex")){
+				this.displayNode.setAttribute("tabIndex", 0);
+			}
+
+			if(!this.value && !("value" in this.params)){ // "" is a good value if specified directly so check params){
+				this.value = lang.trim(this.renderAsHtml ? this.displayNode.innerHTML :
+					(this.displayNode.innerText || this.displayNode.textContent || ""));
+			}
+			if(!this.value){
+				this.displayNode.innerHTML = this.noValueIndicator;
+			}
+
+			domClass.add(this.displayNode, 'dijitInlineEditBoxDisplayMode');
+		},
+
+		setDisabled: function(/*Boolean*/ disabled){
+			// summary:
+			//		Deprecated.   Use set('disabled', ...) instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated("dijit.InlineEditBox.setDisabled() is deprecated.  Use set('disabled', bool) instead.", "", "2.0");
+			this.set('disabled', disabled);
+		},
+
+		_setDisabledAttr: function(/*Boolean*/ disabled){
+			// summary:
+			//		Hook to make set("disabled", ...) work.
+			//		Set disabled state of widget.
+			this.domNode.setAttribute("aria-disabled", disabled ? "true" : "false");
+			if(disabled){
+				this.displayNode.removeAttribute("tabIndex");
+			}else{
+				this.displayNode.setAttribute("tabIndex", 0);
+			}
+			domClass.toggle(this.displayNode, "dijitInlineEditBoxDisplayModeDisabled", disabled);
+			this._set("disabled", disabled);
+		},
+
+		_onMouseOver: function(){
+			// summary:
+			//		Handler for onmouseover and onfocus event.
+			// tags:
+			//		private
+			if(!this.disabled){
+				domClass.add(this.displayNode, "dijitInlineEditBoxDisplayModeHover");
+			}
+		},
+
+		_onMouseOut: function(){
+			// summary:
+			//		Handler for onmouseout and onblur event.
+			// tags:
+			//		private
+			domClass.remove(this.displayNode, "dijitInlineEditBoxDisplayModeHover");
+		},
+
+		_onClick: function(/*Event*/ e){
+			// summary:
+			//		Handler for onclick event.
+			// tags:
+			//		private
+			if(this.disabled){
+				return;
+			}
+			if(e){
+				e.stopPropagation();
+				e.preventDefault();
+			}
+			this._onMouseOut();
+
+			// Since FF gets upset if you move a node while in an event handler for that node...
+			this.defer("edit");
+		},
+
+		edit: function(){
+			// summary:
+			//		Display the editor widget in place of the original (read only) markup.
+			// tags:
+			//		private
+
+			if(this.disabled || this.editing){
+				return;
+			}
+			this._set('editing', true);
+
+			// save some display node values that can be restored later
+			this._savedTabIndex = domAttr.get(this.displayNode, "tabIndex") || "0";
+
+			if(!this.wrapperWidget){
+				// Placeholder for edit widget
+				// Put place holder (and eventually editWidget) before the display node so that it's positioned correctly
+				// when Calendar dropdown appears, which happens automatically on focus.
+				var placeholder = domConstruct.create("span", null, this.domNode, "before");
+
+				// Create the editor wrapper (the thing that holds the editor widget and the save/cancel buttons)
+				var Ewc = typeof this.editorWrapper == "string" ? lang.getObject(this.editorWrapper) : this.editorWrapper;
+				this.wrapperWidget = new Ewc({
+					value: this.value,
+					buttonSave: this.buttonSave,
+					buttonCancel: this.buttonCancel,
+					dir: this.dir,
+					lang: this.lang,
+					tabIndex: this._savedTabIndex,
+					editor: this.editor,
+					inlineEditBox: this,
+					sourceStyle: domStyle.getComputedStyle(this.displayNode),
+					save: lang.hitch(this, "save"),
+					cancel: lang.hitch(this, "cancel"),
+					textDir: this.textDir
+				}, placeholder);
+				if(!this.wrapperWidget._started){
+					this.wrapperWidget.startup();
+				}
+				if(!this._started){
+					this.startup();
+				}
+			}
+			var ww = this.wrapperWidget;
+
+			// to avoid screen jitter, we first create the editor with position: absolute, visibility: hidden,
+			// and then when it's finished rendering, we switch from display mode to editor
+			// position: absolute releases screen space allocated to the display node
+			// opacity:0 is the same as visibility: hidden but is still focusable
+			// visibility: hidden removes focus outline
+
+			domClass.add(this.displayNode, "dijitOffScreen");
+			domClass.remove(ww.domNode, "dijitOffScreen");
+			domStyle.set(ww.domNode, { visibility: "visible" });
+			domAttr.set(this.displayNode, "tabIndex", "-1"); // needed by WebKit for TAB from editor to skip displayNode
+
+			// After edit widget has finished initializing (in particular need to wait for dijit.Editor),
+			// or immediately if there is no onLoadDeferred Deferred,
+			// replace the display widget with edit widget, leaving them both displayed for a brief time so that
+			// focus can be shifted without incident.
+			var ew = ww.editWidget;
+			var self = this;
+			when(ew.onLoadDeferred, lang.hitch(ww, function(){
+				// set value again in case the edit widget's value is just now valid
+				ew.set(("displayedValue" in ew || "_setDisplayedValueAttr" in ew) ? "displayedValue" : "value", self.value);
+				this.defer(function(){ // defer needed so that the change of focus doesn't happen on mousedown which also sets focus
+					// the saveButton should start out disabled in most cases but the above set could have fired onChange
+					if(ww.saveButton){
+						ww.saveButton.set("disabled", "intermediateChanges" in ew);
+					}
+					this.focus(); // both nodes are showing, so we can switch focus safely
+					this._resetValue = this.getValue();
+				});
+			}));
+		},
+
+		_onBlur: function(){
+			// summary:
+			//		Called when focus moves outside the InlineEditBox.
+			//		Performs garbage collection.
+			// tags:
+			//		private
+
+			this.inherited(arguments);
+			if(!this.editing){
+				/* causes IE focus problems, see TooltipDialog_a11y.html...
+				 this.defer(function(){
+				 if(this.wrapperWidget){
+				 this.wrapperWidget.destroy();
+				 delete this.wrapperWidget;
+				 }
+				 });
+				 */
+			}
+		},
+
+		destroy: function(){
+			if(this.wrapperWidget && !this.wrapperWidget._destroyed){
+				this.wrapperWidget.destroy();
+				delete this.wrapperWidget;
+			}
+			this.inherited(arguments);
+		},
+
+		_showText: function(/*Boolean*/ focus){
+			// summary:
+			//		Revert to display mode, and optionally focus on display node
+			// tags:
+			//		private
+
+			var ww = this.wrapperWidget;
+			domStyle.set(ww.domNode, { visibility: "hidden" }); // hide the editor from mouse/keyboard events
+			domClass.add(ww.domNode, "dijitOffScreen");
+			domClass.remove(this.displayNode, "dijitOffScreen");
+			domAttr.set(this.displayNode, "tabIndex", this._savedTabIndex);
+			if(focus){
+				fm.focus(this.displayNode);
+			}
+		},
+
+		save: function(/*Boolean*/ focus){
+			// summary:
+			//		Save the contents of the editor and revert to display mode.
+			// focus: Boolean
+			//		Focus on the display mode text
+			// tags:
+			//		private
+
+			if(this.disabled || !this.editing){
+				return;
+			}
+			this._set('editing', false);
+
+			var ww = this.wrapperWidget;
+			var value = ww.getValue();
+			this.set('value', value); // display changed, formatted value
+
+			this._showText(focus); // set focus as needed
+		},
+
+		setValue: function(/*String*/ val){
+			// summary:
+			//		Deprecated.   Use set('value', ...) instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated("dijit.InlineEditBox.setValue() is deprecated.  Use set('value', ...) instead.", "", "2.0");
+			return this.set("value", val);
+		},
+
+		_setValueAttr: function(/*String*/ val){
+			// summary:
+			//		Hook to make set("value", ...) work.
+			//		Inserts specified HTML value into this node, or an "input needed" character if node is blank.
+
+			val = lang.trim(val);
+			var renderVal = this.renderAsHtml ? val : val.replace(/&/gm, "&amp;").replace(/</gm, "&lt;").replace(/>/gm, "&gt;").replace(/"/gm, "&quot;").replace(/\n/g, "<br>");
+			this.displayNode.innerHTML = renderVal || this.noValueIndicator;
+			this._set("value", val);
+
+			if(this._started){
+				// tell the world that we have changed
+				this.defer(function(){
+					this.onChange(val);
+				}); // defer prevents browser freeze for long-running event handlers
+			}
+		},
+
+		getValue: function(){
+			// summary:
+			//		Deprecated.   Use get('value') instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated("dijit.InlineEditBox.getValue() is deprecated.  Use get('value') instead.", "", "2.0");
+			return this.get("value");
+		},
+
+		cancel: function(/*Boolean*/ focus){
+			// summary:
+			//		Revert to display mode, discarding any changes made in the editor
+			// tags:
+			//		private
+
+			if(this.disabled || !this.editing){
+				return;
+			}
+			this._set('editing', false);
+
+			// tell the world that we have no changes
+			this.defer("onCancel"); // defer prevents browser freeze for long-running event handlers
+
+			this._showText(focus);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		InlineEditBox = declare("dijit.InlineEditBox", InlineEditBox, {
+			_setValueAttr: function(){
+				this.inherited(arguments);
+				this.applyTextDir(this.displayNode);
+			}
+		});
+	}
+
+	InlineEditBox._InlineEditor = InlineEditor;	// for monkey patching
+
+	return InlineEditBox;
+});
diff --git a/src/main/resources/static/dijit/LICENSE b/src/main/resources/static/dijit/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..0f27d7f3a159dc5a13e9978d9f2b6c8f074362e7
--- /dev/null
+++ b/src/main/resources/static/dijit/LICENSE
@@ -0,0 +1,195 @@
+Dojo is available under *either* the terms of the modified BSD license *or* the
+Academic Free License version 2.1. As a recipient of Dojo, you may choose which
+license to receive this code under (except as noted in per-module LICENSE
+files). Some modules may not be the copyright of the Dojo Foundation. These
+modules contain explicit declarations of copyright in both the LICENSE files in
+the directories in which they reside and in the code itself. No external
+contributions are allowed under licenses which are fundamentally incompatible
+with the AFL or BSD licenses that Dojo is distributed under.
+
+The text of the AFL and BSD licenses is reproduced below. 
+
+-------------------------------------------------------------------------------
+The "New" BSD License:
+**********************
+
+Copyright (c) 2005-2016, The Dojo Foundation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * 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.
+  * Neither the name of the Dojo Foundation nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------------------
+The Academic Free License, v. 2.1:
+**********************************
+
+This Academic Free License (the "License") applies to any original work of
+authorship (the "Original Work") whose owner (the "Licensor") has placed the
+following notice immediately following the copyright notice for the Original
+Work:
+
+Licensed under the Academic Free License version 2.1
+
+1) Grant of Copyright License. Licensor hereby grants You a world-wide,
+royalty-free, non-exclusive, perpetual, sublicenseable license to do the
+following:
+
+a) to reproduce the Original Work in copies;
+
+b) to prepare derivative works ("Derivative Works") based upon the Original
+Work;
+
+c) to distribute copies of the Original Work and Derivative Works to the
+public;
+
+d) to perform the Original Work publicly; and
+
+e) to display the Original Work publicly.
+
+2) Grant of Patent License. Licensor hereby grants You a world-wide,
+royalty-free, non-exclusive, perpetual, sublicenseable license, under patent
+claims owned or controlled by the Licensor that are embodied in the Original
+Work as furnished by the Licensor, to make, use, sell and offer for sale the
+Original Work and Derivative Works.
+
+3) Grant of Source Code License. The term "Source Code" means the preferred
+form of the Original Work for making modifications to it and all available
+documentation describing how to modify the Original Work. Licensor hereby
+agrees to provide a machine-readable copy of the Source Code of the Original
+Work along with each copy of the Original Work that Licensor distributes.
+Licensor reserves the right to satisfy this obligation by placing a
+machine-readable copy of the Source Code in an information repository
+reasonably calculated to permit inexpensive and convenient access by You for as
+long as Licensor continues to distribute the Original Work, and by publishing
+the address of that information repository in a notice immediately following
+the copyright notice that applies to the Original Work.
+
+4) Exclusions From License Grant. Neither the names of Licensor, nor the names
+of any contributors to the Original Work, nor any of their trademarks or
+service marks, may be used to endorse or promote products derived from this
+Original Work without express prior written permission of the Licensor. Nothing
+in this License shall be deemed to grant any rights to trademarks, copyrights,
+patents, trade secrets or any other intellectual property of Licensor except as
+expressly stated herein. No patent license is granted to make, use, sell or
+offer to sell embodiments of any patent claims other than the licensed claims
+defined in Section 2. No right is granted to the trademarks of Licensor even if
+such marks are included in the Original Work. Nothing in this License shall be
+interpreted to prohibit Licensor from licensing under different terms from this
+License any Original Work that Licensor otherwise would have a right to
+license.
+
+5) This section intentionally omitted.
+
+6) Attribution Rights. You must retain, in the Source Code of any Derivative
+Works that You create, all copyright, patent or trademark notices from the
+Source Code of the Original Work, as well as any notices of licensing and any
+descriptive text identified therein as an "Attribution Notice." You must cause
+the Source Code for any Derivative Works that You create to carry a prominent
+Attribution Notice reasonably calculated to inform recipients that You have
+modified the Original Work.
+
+7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that
+the copyright in and to the Original Work and the patent rights granted herein
+by Licensor are owned by the Licensor or are sublicensed to You under the terms
+of this License with the permission of the contributor(s) of those copyrights
+and patent rights. Except as expressly stated in the immediately proceeding
+sentence, the Original Work is provided under this License on an "AS IS" BASIS
+and WITHOUT WARRANTY, either express or implied, including, without limitation,
+the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
+This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No
+license to Original Work is granted hereunder except under this disclaimer.
+
+8) Limitation of Liability. Under no circumstances and under no legal theory,
+whether in tort (including negligence), contract, or otherwise, shall the
+Licensor be liable to any person for any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License
+or the use of the Original Work including, without limitation, damages for loss
+of goodwill, work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses. This limitation of liability shall not
+apply to liability for death or personal injury resulting from Licensor's
+negligence to the extent applicable law prohibits such limitation. Some
+jurisdictions do not allow the exclusion or limitation of incidental or
+consequential damages, so this exclusion and limitation may not apply to You.
+
+9) Acceptance and Termination. If You distribute copies of the Original Work or
+a Derivative Work, You must make a reasonable effort under the circumstances to
+obtain the express assent of recipients to the terms of this License. Nothing
+else but this License (or another written agreement between Licensor and You)
+grants You permission to create Derivative Works based upon the Original Work
+or to exercise any of the rights granted in Section 1 herein, and any attempt
+to do so except under the terms of this License (or another written agreement
+between Licensor and You) is expressly prohibited by U.S. copyright law, the
+equivalent laws of other countries, and by international treaty. Therefore, by
+exercising any of the rights granted to You in Section 1 herein, You indicate
+Your acceptance of this License and all of its terms and conditions.
+
+10) Termination for Patent Action. This License shall terminate automatically
+and You may no longer exercise any of the rights granted to You by this License
+as of the date You commence an action, including a cross-claim or counterclaim,
+against Licensor or any licensee alleging that the Original Work infringes a
+patent. This termination provision shall not apply for an action alleging
+patent infringement by combinations of the Original Work with other software or
+hardware.
+
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this
+License may be brought only in the courts of a jurisdiction wherein the
+Licensor resides or in which Licensor conducts its primary business, and under
+the laws of that jurisdiction excluding its conflict-of-law provisions. The
+application of the United Nations Convention on Contracts for the International
+Sale of Goods is expressly excluded. Any use of the Original Work outside the
+scope of this License or after its termination shall be subject to the
+requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et
+seq., the equivalent laws of other countries, and international treaty. This
+section shall survive the termination of this License.
+
+12) Attorneys Fees. In any action to enforce the terms of this License or
+seeking damages relating thereto, the prevailing party shall be entitled to
+recover its costs and expenses, including, without limitation, reasonable
+attorneys' fees and costs incurred in connection with such action, including
+any appeal of such action. This section shall survive the termination of this
+License.
+
+13) Miscellaneous. This License represents the complete agreement concerning
+the subject matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent necessary to
+make it enforceable.
+
+14) Definition of "You" in This License. "You" throughout this License, whether
+in upper or lower case, means an individual or a legal entity exercising rights
+under, and complying with all of the terms of, this License. For legal
+entities, "You" includes any entity that controls, is controlled by, or is
+under common control with you. For purposes of this definition, "control" means
+(i) the power, direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty percent
+(50%) or more of the outstanding shares, or (iii) beneficial ownership of such
+entity.
+
+15) Right to Use. You may use the Original Work in all ways not otherwise
+restricted or conditioned by this License or by law, and Licensor promises not
+to interfere with or be responsible for such uses by You.
+
+This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved.
+Permission is hereby granted to copy and distribute this license without
+modification. This license may not be modified without the express written
+permission of its copyright owner.
diff --git a/src/main/resources/static/dijit/Menu.js b/src/main/resources/static/dijit/Menu.js
new file mode 100644
index 0000000000000000000000000000000000000000..948a60c3ff55076865eca303c2b130723072eb6a
--- /dev/null
+++ b/src/main/resources/static/dijit/Menu.js
@@ -0,0 +1,386 @@
+define([
+	"require",
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.byId dom.isDescendant
+	"dojo/dom-attr", // domAttr.get domAttr.set domAttr.has domAttr.remove
+	"dojo/dom-geometry", // domStyle.getComputedStyle domGeometry.position
+	"dojo/dom-style", // domStyle.getComputedStyle
+	"dojo/keys", // keys.F10
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dojo/sniff", // has("ie"), has("quirks")
+	"dojo/_base/window", // win.body
+	"dojo/window", // winUtils.get
+	"./popup",
+	"./DropDownMenu",
+	"dojo/ready"
+], function(require, array, declare, dom, domAttr, domGeometry, domStyle, keys, lang, on, has, win, winUtils, pm, DropDownMenu, ready){
+
+	// module:
+	//		dijit/Menu
+
+	// Back compat w/1.6, remove for 2.0
+	if(has("dijit-legacy-requires")){
+		ready(0, function(){
+			var requires = ["dijit/MenuItem", "dijit/PopupMenuItem", "dijit/CheckedMenuItem", "dijit/MenuSeparator"];
+			require(requires);	// use indirection so modules not rolled into a build
+		});
+	}
+
+	return declare("dijit.Menu", DropDownMenu, {
+		// summary:
+		//		A context menu you can assign to multiple elements
+
+		constructor: function(/*===== params, srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified:
+			//
+			//		- use srcNodeRef.innerHTML as my contents
+			//		- replace srcNodeRef with my generated DOM tree
+
+			this._bindings = [];
+		},
+
+		// targetNodeIds: [const] String[]
+		//		Array of dom node ids of nodes to attach to.
+		//		Fill this with nodeIds upon widget creation and it becomes context menu for those nodes.
+		targetNodeIds: [],
+
+		// selector: String?
+		//		CSS expression to apply this Menu to descendants of targetNodeIds, rather than to
+		//		the nodes specified by targetNodeIds themselves.  Useful for applying a Menu to
+		//		a range of rows in a table, tree, etc.
+		//
+		//		The application must require() an appropriate level of dojo/query to handle the selector.
+		selector: "",
+
+		// TODO: in 2.0 remove support for multiple targetNodeIds.   selector gives the same effect.
+		// So, change targetNodeIds to a targetNodeId: "", remove bindDomNode()/unBindDomNode(), etc.
+
+		/*=====
+		// currentTarget: [readonly] DOMNode
+		//		For context menus, set to the current node that the Menu is being displayed for.
+		//		Useful so that the menu actions can be tailored according to the node
+		currentTarget: null,
+		=====*/
+
+		// contextMenuForWindow: [const] Boolean
+		//		If true, right clicking anywhere on the window will cause this context menu to open.
+		//		If false, must specify targetNodeIds.
+		contextMenuForWindow: false,
+
+		// leftClickToOpen: [const] Boolean
+		//		If true, menu will open on left click instead of right click, similar to a file menu.
+		leftClickToOpen: false,
+		// TODO: remove in 2.0, we have better ways of opening a menu with a left click, by extending _HasDropDown.
+
+		// refocus: Boolean
+		//		When this menu closes, re-focus the element which had focus before it was opened.
+		refocus: true,
+
+		postCreate: function(){
+			if(this.contextMenuForWindow){
+				this.bindDomNode(this.ownerDocumentBody);
+			}else{
+				array.forEach(this.targetNodeIds, this.bindDomNode, this);
+			}
+			this.inherited(arguments);
+		},
+
+		// thanks burstlib!
+		_iframeContentWindow: function(/* HTMLIFrameElement */iframe_el){
+			// summary:
+			//		Returns the window reference of the passed iframe
+			// tags:
+			//		private
+			return winUtils.get(this._iframeContentDocument(iframe_el)) ||
+				// Moz. TODO: is this available when defaultView isn't?
+				this._iframeContentDocument(iframe_el)['__parent__'] ||
+				(iframe_el.name && document.frames[iframe_el.name]) || null;	//	Window
+		},
+
+		_iframeContentDocument: function(/* HTMLIFrameElement */iframe_el){
+			// summary:
+			//		Returns a reference to the document object inside iframe_el
+			// tags:
+			//		protected
+			return iframe_el.contentDocument // W3
+				|| (iframe_el.contentWindow && iframe_el.contentWindow.document) // IE
+				|| (iframe_el.name && document.frames[iframe_el.name] && document.frames[iframe_el.name].document)
+				|| null;	//	HTMLDocument
+		},
+
+		bindDomNode: function(/*String|DomNode*/ node){
+			// summary:
+			//		Attach menu to given node
+			node = dom.byId(node, this.ownerDocument);
+
+			var cn;	// Connect node
+
+			// Support context menus on iframes.  Rather than binding to the iframe itself we need
+			// to bind to the <body> node inside the iframe.
+			if(node.tagName.toLowerCase() == "iframe"){
+				var iframe = node,
+					window = this._iframeContentWindow(iframe);
+				cn = win.body(window.document);
+			}else{
+				// To capture these events at the top level, attach to <html>, not <body>.
+				// Otherwise right-click context menu just doesn't work.
+				cn = (node == win.body(this.ownerDocument) ? this.ownerDocument.documentElement : node);
+			}
+
+
+			// "binding" is the object to track our connection to the node (ie, the parameter to bindDomNode())
+			var binding = {
+				node: node,
+				iframe: iframe
+			};
+
+			// Save info about binding in _bindings[], and make node itself record index(+1) into
+			// _bindings[] array.  Prefix w/_dijitMenu to avoid setting an attribute that may
+			// start with a number, which fails on FF/safari.
+			domAttr.set(node, "_dijitMenu" + this.id, this._bindings.push(binding));
+
+			// Setup the connections to monitor click etc., unless we are connecting to an iframe which hasn't finished
+			// loading yet, in which case we need to wait for the onload event first, and then connect
+			// On linux Shift-F10 produces the oncontextmenu event, but on Windows it doesn't, so
+			// we need to monitor keyboard events in addition to the oncontextmenu event.
+			var doConnects = lang.hitch(this, function(cn){
+				var selector = this.selector,
+					delegatedEvent = selector ?
+						function(eventType){
+							return on.selector(selector, eventType);
+						} :
+						function(eventType){
+							return eventType;
+						},
+					self = this;
+				return [
+					on(cn, delegatedEvent(this.leftClickToOpen ? "click" : "contextmenu"), function(evt){
+						evt.stopPropagation();
+						evt.preventDefault();
+
+						if((new Date()).getTime() < self._lastKeyDown + 500){
+							// Ignore contextmenu/click events that were already processed in keydown handler below.
+							// But still call preventDefault() (above) so system context menu doesn't appear.
+							return;
+						}
+
+						// Schedule context menu to be opened.
+						// Note that this won't work will if the click was generated by the keyboard, while
+						// focused on a <button> etc.   In that case evt.pageX and evt.pageY are either (0,0) or
+						// wherever the mouse cursor is.  See keydown handler below.
+						self._scheduleOpen(this, iframe, {x: evt.pageX, y: evt.pageY}, evt.target);
+					}),
+					on(cn, delegatedEvent("keydown"), function(evt){
+						if(evt.keyCode == 93 ||									// context menu key
+							(evt.shiftKey && evt.keyCode == keys.F10) ||		// shift-F10
+							(self.leftClickToOpen && evt.keyCode == keys.SPACE)	// space key
+						){
+							evt.stopPropagation();
+							evt.preventDefault();
+
+							// Open the menu around evt.target.  Note that "this" and evt.target
+							// are likely different, especially for global context menu, where "this" is <body>.
+							self._scheduleOpen(this, iframe, null, evt.target);	// no coords - open near evt.target
+
+							self._lastKeyDown = (new Date()).getTime();
+						}
+					})
+				];
+			});
+			binding.connects = cn ? doConnects(cn) : [];
+
+			if(iframe){
+				// Setup handler to [re]bind to the iframe when the contents are initially loaded,
+				// and every time the contents change.
+				// Need to do this b/c we are actually binding to the iframe's <body> node.
+				// Note: can't use connect.connect(), see #9609.
+
+				binding.onloadHandler = lang.hitch(this, function(){
+					// want to remove old connections, but IE throws exceptions when trying to
+					// access the <body> node because it's already gone, or at least in a state of limbo
+
+					var window = this._iframeContentWindow(iframe),
+						cn = win.body(window.document);
+					binding.connects = doConnects(cn);
+				});
+				if(iframe.addEventListener){
+					iframe.addEventListener("load", binding.onloadHandler, false);
+				}else{
+					iframe.attachEvent("onload", binding.onloadHandler);
+				}
+			}
+		},
+
+		unBindDomNode: function(/*String|DomNode*/ nodeName){
+			// summary:
+			//		Detach menu from given node
+
+			var node;
+			try{
+				node = dom.byId(nodeName, this.ownerDocument);
+			}catch(e){
+				// On IE the dom.byId() call will get an exception if the attach point was
+				// the <body> node of an <iframe> that has since been reloaded (and thus the
+				// <body> node is in a limbo state of destruction.
+				return;
+			}
+
+			// node["_dijitMenu" + this.id] contains index(+1) into my _bindings[] array
+			var attrName = "_dijitMenu" + this.id;
+			if(node && domAttr.has(node, attrName)){
+				var bid = domAttr.get(node, attrName) - 1, b = this._bindings[bid], h;
+				while((h = b.connects.pop())){
+					h.remove();
+				}
+
+				// Remove listener for iframe onload events
+				var iframe = b.iframe;
+				if(iframe){
+					if(iframe.removeEventListener){
+						iframe.removeEventListener("load", b.onloadHandler, false);
+					}else{
+						iframe.detachEvent("onload", b.onloadHandler);
+					}
+				}
+
+				domAttr.remove(node, attrName);
+				delete this._bindings[bid];
+			}
+		},
+
+		_scheduleOpen: function(delegatedTarget, iframe, coords, target){
+			// summary:
+			//		Set timer to display myself.  Using a timer rather than displaying immediately solves
+			//		IE problem: without the delay, focus work in "open" causes the system
+			//		context menu to appear in spite of evt.preventDefault().
+			// delegatedTarget: Element
+			//		The node specified in targetNodeIds or matching selector that the menu is being opened for.
+			// iframe: HTMLIframeElement?
+			//		Set if target is inside the specified iframe.
+			// coords: Object
+			//		x/y position to center the menu around.  Undefined if menu was opened via keyboard.
+			// target: Element
+			//		The actual clicked node, either delegatedTarget or a descendant.
+
+			if(!this._openTimer){
+				this._openTimer = this.defer(function(){
+					delete this._openTimer;
+					this._openMyself({
+						target: target,
+						delegatedTarget: delegatedTarget,
+						iframe: iframe,
+						coords: coords
+					});
+				}, 1);
+			}
+		},
+
+		_openMyself: function(args){
+			// summary:
+			//		Internal function for opening myself when the user does a right-click or something similar.
+			// args:
+			//		This is an Object containing:
+			//
+			//		- target: The node that is being clicked.
+			//		- delegatedTarget: The node from this.targetNodeIds or matching this.selector,
+			//		  either the same as target or an ancestor of target.
+			//		- iframe: If an `<iframe>` is being clicked, iframe points to that iframe
+			//		- coords: Mouse cursor x/y coordinates.  Null when opened via keyboard.
+			//		  Put menu at specified position in iframe (if iframe specified) or otherwise in viewport.
+			//
+			//		_openMyself() formerly took the event object, and since various code references
+			//		evt.target (after connecting to _openMyself()), using an Object for parameters
+			//		(so that old code still works).
+
+			var target = args.target,
+				iframe = args.iframe,
+				coords = args.coords,
+				byKeyboard = !coords;
+
+			// To be used by MenuItem event handlers to tell which node the menu was opened on
+			this.currentTarget = args.delegatedTarget;
+
+			// Get coordinates to open menu, either at specified (mouse) position or (if triggered via keyboard)
+			// then near the node the menu is assigned to.
+			if(coords){
+				if(iframe){
+					// Specified coordinates are on <body> node of an <iframe>, convert to match main document
+					var ifc = domGeometry.position(iframe, true),
+						window = this._iframeContentWindow(iframe),
+						scroll = domGeometry.docScroll(window.document);
+
+					var cs = domStyle.getComputedStyle(iframe),
+						tp = domStyle.toPixelValue,
+						left = (has("ie") && has("quirks") ? 0 : tp(iframe, cs.paddingLeft)) + (has("ie") && has("quirks") ? tp(iframe, cs.borderLeftWidth) : 0),
+						top = (has("ie") && has("quirks") ? 0 : tp(iframe, cs.paddingTop)) + (has("ie") && has("quirks") ? tp(iframe, cs.borderTopWidth) : 0);
+
+					coords.x += ifc.x + left - scroll.x;
+					coords.y += ifc.y + top - scroll.y;
+				}
+			}else{
+				coords = domGeometry.position(target, true);
+				coords.x += 10;
+				coords.y += 10;
+			}
+
+			var self = this;
+			var prevFocusNode = this._focusManager.get("prevNode");
+			var curFocusNode = this._focusManager.get("curNode");
+			var savedFocusNode = !curFocusNode || (dom.isDescendant(curFocusNode, this.domNode)) ? prevFocusNode : curFocusNode;
+
+			function closeAndRestoreFocus(){
+				// user has clicked on a menu or popup
+				if(self.refocus && savedFocusNode){
+					savedFocusNode.focus();
+				}
+				pm.close(self);
+			}
+
+			pm.open({
+				popup: this,
+				x: coords.x,
+				y: coords.y,
+				onExecute: closeAndRestoreFocus,
+				onCancel: closeAndRestoreFocus,
+				orient: this.isLeftToRight() ? 'L' : 'R'
+			});
+
+			// Focus the menu even when opened by mouse, so that a click on blank area of screen will close it
+			this.focus();
+			if(!byKeyboard){
+				// But then (when opened by mouse), mark Menu as passive, so that the first item isn't highlighted.
+				// On IE9+ this needs to be on a delay because the focus is asynchronous.
+				this.defer(function(){
+					this._cleanUp(true);
+				});
+			}
+
+			this._onBlur = function(){
+				this.inherited('_onBlur', arguments);
+				// Usually the parent closes the child widget but if this is a context
+				// menu then there is no parent
+				pm.close(this);
+				// don't try to restore focus; user has clicked another part of the screen
+				// and set focus there
+			};
+		},
+
+		destroy: function(){
+			array.forEach(this._bindings, function(b){
+				if(b){
+					this.unBindDomNode(b.node);
+				}
+			}, this);
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/MenuBar.js b/src/main/resources/static/dijit/MenuBar.js
new file mode 100644
index 0000000000000000000000000000000000000000..31a7865b3b7387da31774de2113b9f24060f14c4
--- /dev/null
+++ b/src/main/resources/static/dijit/MenuBar.js
@@ -0,0 +1,89 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/keys", // keys.DOWN_ARROW
+	"./_MenuBase",
+	"dojo/text!./templates/MenuBar.html"
+], function(declare, keys, _MenuBase, template){
+
+	// module:
+	//		dijit/MenuBar
+
+	return declare("dijit.MenuBar", _MenuBase, {
+		// summary:
+		//		A menu bar, listing menu choices horizontally, like the "File" menu in most desktop applications
+
+		templateString: template,
+
+		baseClass: "dijitMenuBar",
+
+		// By default open popups for MenuBar instantly
+		popupDelay: 0,
+
+		// _isMenuBar: [protected] Boolean
+		//		This is a MenuBar widget, not a (vertical) Menu widget.
+		_isMenuBar: true,
+
+		// parameter to dijit.popup.open() about where to put popup (relative to this.domNode)
+		_orient: ["below"],
+
+		_moveToPopup: function(/*Event*/ evt){
+			// summary:
+			//		This handles the down arrow key, opening a submenu if one exists.
+			//		Unlike _MenuBase._moveToPopup(), will never move to the next item in the MenuBar.
+			// tags:
+			//		private
+
+			if(this.focusedChild && this.focusedChild.popup && !this.focusedChild.disabled){
+				this.onItemClick(this.focusedChild, evt);
+			}
+		},
+
+		focusChild: function(item){
+			// Overload focusChild so that whenever a new item is focused and the menu is active, open its submenu immediately.
+
+			this.inherited(arguments);
+			if(this.activated && item.popup && !item.disabled){
+				this._openItemPopup(item, true);
+			}
+		},
+
+		_onChildDeselect: function(item){
+			// override _MenuBase._onChildDeselect() to close submenu immediately
+
+			if(this.currentPopupItem == item){
+				this.currentPopupItem = null;
+				item._closePopup(); // this calls onClose
+			}
+
+			this.inherited(arguments);
+		},
+
+		// Arrow key navigation
+		_onLeftArrow: function(){
+			this.focusPrev();
+		},
+		_onRightArrow: function(){
+			this.focusNext();
+		},
+		_onDownArrow: function(/*Event*/ evt){
+			this._moveToPopup(evt);
+		},
+		_onUpArrow: function(){
+		},
+
+		onItemClick: function(/*dijit/_WidgetBase*/ item, /*Event*/ evt){
+			// summary:
+			//		Handle clicks on an item.   Also called by _moveToPopup() due to a down-arrow key on the item.
+			//		Cancels a dropdown if already open and click is either mouse or space/enter.
+			//		Don't close dropdown due to down arrow.
+			// tags:
+			//		private
+			if(item.popup && item.popup.isShowingNow && (!/^key/.test(evt.type) || evt.keyCode !== keys.DOWN_ARROW)){
+				item.focusNode.focus();
+				this._cleanUp(true);
+			}else{
+				this.inherited(arguments);
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/MenuBarItem.js b/src/main/resources/static/dijit/MenuBarItem.js
new file mode 100644
index 0000000000000000000000000000000000000000..1675a986abac2769063e42f28932ac748e53d5dd
--- /dev/null
+++ b/src/main/resources/static/dijit/MenuBarItem.js
@@ -0,0 +1,26 @@
+define([
+	"dojo/_base/declare", // declare
+	"./MenuItem",
+	"dojo/text!./templates/MenuBarItem.html"
+], function(declare, MenuItem, template){
+
+	// module:
+	//		dijit/MenuBarItem
+
+	var _MenuBarItemMixin = declare("dijit._MenuBarItemMixin", null, {
+		templateString: template,
+
+		// Map widget attributes to DOMNode attributes.
+		_setIconClassAttr: null	// cancel MenuItem setter because we don't have a place for an icon
+	});
+
+	var MenuBarItem = declare("dijit.MenuBarItem", [MenuItem, _MenuBarItemMixin], {
+		// summary:
+		//		Item in a MenuBar that's clickable, and doesn't spawn a submenu when pressed (or hovered)
+
+	});
+	MenuBarItem._MenuBarItemMixin = _MenuBarItemMixin;	// dojox.mobile is accessing this
+
+
+	return MenuBarItem;
+});
diff --git a/src/main/resources/static/dijit/MenuItem.js b/src/main/resources/static/dijit/MenuItem.js
new file mode 100644
index 0000000000000000000000000000000000000000..0d73c86122bb0bc269e4ff1fbf7bfd2d58c360d1
--- /dev/null
+++ b/src/main/resources/static/dijit/MenuItem.js
@@ -0,0 +1,182 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.setSelectable
+	"dojo/dom-attr", // domAttr.set
+	"dojo/dom-class", // domClass.toggle
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/sniff", // has("ie")
+	"dojo/_base/lang", // lang.hitch
+	"./_Widget",
+	"./_TemplatedMixin",
+	"./_Contained",
+	"./_CssStateMixin",
+	"dojo/text!./templates/MenuItem.html"
+], function(declare, dom, domAttr, domClass, kernel, has, lang,
+			_Widget, _TemplatedMixin, _Contained, _CssStateMixin, template){
+
+	// module:
+	//		dijit/MenuItem
+
+	var MenuItem = declare("dijit.MenuItem" + (has("dojo-bidi") ? "_NoBidi" : ""),
+		[_Widget, _TemplatedMixin, _Contained, _CssStateMixin], {
+		// summary:
+		//		A line item in a Menu Widget
+
+		// Make 3 columns
+		// icon, label, and expand arrow (BiDi-dependent) indicating sub-menu
+		templateString: template,
+
+		baseClass: "dijitMenuItem",
+
+		// label: String
+		//		Menu text as HTML
+		label: "",
+		_setLabelAttr: function(val){
+			this._set("label", val);
+			var shortcutKey = "";
+			var text;
+			var ndx = val.search(/{\S}/);
+			if(ndx >= 0){
+				shortcutKey = val.charAt(ndx + 1);
+				var prefix = val.substr(0, ndx);
+				var suffix = val.substr(ndx + 3);
+				text = prefix + shortcutKey + suffix;
+				val = prefix + '<span class="dijitMenuItemShortcutKey">' + shortcutKey + '</span>' + suffix;
+			}else{
+				text = val;
+			}
+			this.domNode.setAttribute("aria-label", text + " " + this.accelKey);
+			this.containerNode.innerHTML = val;
+			this._set('shortcutKey', shortcutKey);
+		},
+
+		/*=====
+		// shortcutKey: [readonly] String
+		//		Single character (underlined when the parent Menu is focused) used to navigate directly to this widget,
+		//		also known as [a mnemonic](http://en.wikipedia.org/wiki/Mnemonics_(keyboard%29).
+		//		This is denoted in the label by surrounding the single character with {}.
+		//		For example, if label="{F}ile", then shortcutKey="F".
+		shortcutKey: "",
+		=====*/
+
+		// iconClass: String
+		//		Class to apply to DOMNode to make it display an icon.
+		iconClass: "dijitNoIcon",
+		_setIconClassAttr: { node: "iconNode", type: "class" },
+
+		// accelKey: String
+		//		Text for the accelerator (shortcut) key combination, a control, alt, etc. modified keystroke meant to
+		//		execute the menu item regardless of where the focus is on the page.
+		//
+		//		Note that although Menu can display accelerator keys, there is no infrastructure to actually catch and
+		//		execute those accelerators.
+		accelKey: "",
+
+		// disabled: Boolean
+		//		If true, the menu item is disabled.
+		//		If false, the menu item is enabled.
+		disabled: false,
+
+		_fillContent: function(/*DomNode*/ source){
+			// If button label is specified as srcNodeRef.innerHTML rather than
+			// this.params.label, handle it here.
+			if(source && !("label" in this.params)){
+				this._set('label', source.innerHTML);
+			}
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			var label = this.id + "_text";
+			domAttr.set(this.containerNode, "id", label); // only needed for backward compat
+			if(this.accelKeyNode){
+				domAttr.set(this.accelKeyNode, "id", this.id + "_accel"); // only needed for backward compat
+			}
+			dom.setSelectable(this.domNode, false);
+		},
+
+		onClick: function(/*Event*/){
+			// summary:
+			//		User defined function to handle clicks
+			// tags:
+			//		callback
+		},
+
+		focus: function(){
+			// summary:
+			//		Focus on this MenuItem
+			try{
+				if(has("ie") == 8){
+					// needed for IE8 which won't scroll TR tags into view on focus yet calling scrollIntoView creates flicker (#10275)
+					this.containerNode.focus();
+				}
+				this.focusNode.focus();
+			}catch(e){
+				// this throws on IE (at least) in some scenarios
+			}
+		},
+
+		_setSelected: function(selected){
+			// summary:
+			//		Indicate that this node is the currently selected one
+			// tags:
+			//		private
+
+			domClass.toggle(this.domNode, "dijitMenuItemSelected", selected);
+		},
+
+		setLabel: function(/*String*/ content){
+			// summary:
+			//		Deprecated.   Use set('label', ...) instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated("dijit.MenuItem.setLabel() is deprecated.  Use set('label', ...) instead.", "", "2.0");
+			this.set("label", content);
+		},
+
+		setDisabled: function(/*Boolean*/ disabled){
+			// summary:
+			//		Deprecated.   Use set('disabled', bool) instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated("dijit.Menu.setDisabled() is deprecated.  Use set('disabled', bool) instead.", "", "2.0");
+			this.set('disabled', disabled);
+		},
+
+		_setDisabledAttr: function(/*Boolean*/ value){
+			// summary:
+			//		Hook for attr('disabled', ...) to work.
+			//		Enable or disable this menu item.
+
+			this.focusNode.setAttribute('aria-disabled', value ? 'true' : 'false');
+			this._set("disabled", value);
+		},
+
+		_setAccelKeyAttr: function(/*String*/ value){
+			// summary:
+			//		Hook for attr('accelKey', ...) to work.
+			//		Set accelKey on this menu item.
+
+			if(this.accelKeyNode){
+				this.accelKeyNode.style.display = value ? "" : "none";
+				this.accelKeyNode.innerHTML = value;
+				//have to use colSpan to make it work in IE
+				domAttr.set(this.containerNode, 'colSpan', value ? "1" : "2");
+			}
+			this._set("accelKey", value);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		MenuItem = declare("dijit.MenuItem", MenuItem, {
+			_setLabelAttr: function(val){
+				this.inherited(arguments);
+				if(this.textDir === "auto"){
+					this.applyTextDir(this.textDirNode);
+				}
+			}
+		});
+	}
+
+	return MenuItem;
+});
diff --git a/src/main/resources/static/dijit/MenuSeparator.js b/src/main/resources/static/dijit/MenuSeparator.js
new file mode 100644
index 0000000000000000000000000000000000000000..3c4313b1622bd5d373ba7a181fb3e06566e9b50e
--- /dev/null
+++ b/src/main/resources/static/dijit/MenuSeparator.js
@@ -0,0 +1,33 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.setSelectable
+	"./_WidgetBase",
+	"./_TemplatedMixin",
+	"./_Contained",
+	"dojo/text!./templates/MenuSeparator.html"
+], function(declare, dom, _WidgetBase, _TemplatedMixin, _Contained, template){
+
+	// module:
+	//		dijit/MenuSeparator
+
+	return declare("dijit.MenuSeparator", [_WidgetBase, _TemplatedMixin, _Contained], {
+		// summary:
+		//		A line between two menu items
+
+		templateString: template,
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			dom.setSelectable(this.domNode, false);
+		},
+
+		isFocusable: function(){
+			// summary:
+			//		Override to always return false
+			// tags:
+			//		protected
+
+			return false; // Boolean
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/PopupMenuBarItem.js b/src/main/resources/static/dijit/PopupMenuBarItem.js
new file mode 100644
index 0000000000000000000000000000000000000000..4192df36caef39c6c90bb5c1df2135f924348793
--- /dev/null
+++ b/src/main/resources/static/dijit/PopupMenuBarItem.js
@@ -0,0 +1,16 @@
+define([
+	"dojo/_base/declare", // declare
+	"./PopupMenuItem",
+	"./MenuBarItem"
+], function(declare, PopupMenuItem, MenuBarItem){
+
+	// module:
+	//		dijit/PopupMenuBarItem
+
+	var _MenuBarItemMixin = MenuBarItem._MenuBarItemMixin;
+
+	return declare("dijit.PopupMenuBarItem", [PopupMenuItem, _MenuBarItemMixin], {
+		// summary:
+		//		Item in a MenuBar like "File" or "Edit", that spawns a submenu when pressed (or hovered)
+	});
+});
diff --git a/src/main/resources/static/dijit/PopupMenuItem.js b/src/main/resources/static/dijit/PopupMenuItem.js
new file mode 100644
index 0000000000000000000000000000000000000000..33ccffc511a9a8cd684529cd263671a3cd1dd242
--- /dev/null
+++ b/src/main/resources/static/dijit/PopupMenuItem.js
@@ -0,0 +1,101 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-style", // domStyle.set
+	"dojo/_base/lang",
+	"dojo/query", // query
+	"./popup",
+	"./registry",	// registry.byNode
+	"./MenuItem",
+	"./hccss"
+], function(declare, domStyle, lang, query, pm, registry, MenuItem){
+
+	// module:
+	//		dijit/PopupMenuItem
+
+	return declare("dijit.PopupMenuItem", MenuItem, {
+		// summary:
+		//		An item in a Menu that spawn a drop down (usually a drop down menu)
+
+		baseClass: "dijitMenuItem dijitPopupMenuItem",
+
+		_fillContent: function(){
+			// summary:
+			//		When Menu is declared in markup, this code gets the menu label and
+			//		the popup widget from the srcNodeRef.
+			// description:
+			//		srcNodeRef.innerHTML contains both the menu item text and a popup widget
+			//		The first part holds the menu item text and the second part is the popup
+			// example:
+			// |	<div data-dojo-type="dijit/PopupMenuItem">
+			// |		<span>pick me</span>
+			// |		<popup> ... </popup>
+			// |	</div>
+			// tags:
+			//		protected
+
+			if(this.srcNodeRef){
+				var nodes = query("*", this.srcNodeRef);
+				this.inherited(arguments, [nodes[0]]);
+
+				// save pointer to srcNode so we can grab the drop down widget after it's instantiated
+				this.dropDownContainer = this.srcNodeRef;
+			}
+		},
+
+		_openPopup: function(/*Object*/ params, /*Boolean*/ focus){
+			// summary:
+			//		Open the popup to the side of/underneath this MenuItem, and optionally focus first item
+			// tags:
+			//		protected
+
+			var popup = this.popup;
+
+			pm.open(lang.delegate(params, {
+				popup: this.popup,
+				around: this.domNode
+			}));
+
+			if(focus && popup.focus){
+				popup.focus();
+			}
+		},
+
+		_closePopup: function(){
+			pm.close(this.popup);
+			this.popup.parentMenu = null;
+		},
+
+		startup: function(){
+			if(this._started){ return; }
+			this.inherited(arguments);
+
+			// We didn't copy the dropdown widget from the this.srcNodeRef, so it's in no-man's
+			// land now.  Move it to <body>.
+			if(!this.popup){
+				var node = query("[widgetId]", this.dropDownContainer)[0];
+				this.popup = registry.byNode(node);
+			}
+			this.ownerDocumentBody.appendChild(this.popup.domNode);
+			this.popup.domNode.setAttribute("aria-labelledby", this.containerNode.id);
+			this.popup.startup();
+
+			this.popup.domNode.style.display="none";
+			if(this.arrowWrapper){
+				domStyle.set(this.arrowWrapper, "visibility", "");
+			}
+			this.focusNode.setAttribute("aria-haspopup", "true");
+		},
+
+		destroyDescendants: function(/*Boolean*/ preserveDom){
+			if(this.popup){
+				// Destroy the popup, unless it's already been destroyed.  This can happen because
+				// the popup is a direct child of <body> even though it's logically my child.
+				if(!this.popup._destroyed){
+					this.popup.destroyRecursive(preserveDom);
+				}
+				delete this.popup;
+			}
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/ProgressBar.js b/src/main/resources/static/dijit/ProgressBar.js
new file mode 100644
index 0000000000000000000000000000000000000000..c0e649f63b0f1b7c0220a575dd73ec936e6f9453
--- /dev/null
+++ b/src/main/resources/static/dijit/ProgressBar.js
@@ -0,0 +1,170 @@
+define([
+	"require", // require.toUrl
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.toggle
+	"dojo/_base/lang", // lang.mixin
+	"dojo/number", // number.format
+	"./_Widget",
+	"./_TemplatedMixin",
+	"dojo/text!./templates/ProgressBar.html"
+], function(require, declare, domClass, lang, number, _Widget, _TemplatedMixin, template){
+
+	// module:
+	//		dijit/ProgressBar
+
+	return declare("dijit.ProgressBar", [_Widget, _TemplatedMixin], {
+		// summary:
+		//		A progress indication widget, showing the amount completed
+		//		(often the percentage completed) of a task.
+
+		// progress: [const] String (Percentage or Number)
+		//		Number or percentage indicating amount of task completed.
+		//		Deprecated.   Use "value" instead.
+		progress: "0",
+
+		// value: String (Percentage or Number)
+		//		Number or percentage indicating amount of task completed.
+		//		With "%": percentage value, 0% <= progress <= 100%, or
+		//		without "%": absolute value, 0 <= progress <= maximum.
+		//		Infinity means that the progress bar is indeterminate.
+		value: "",
+
+		// maximum: [const] Float
+		//		Max sample number
+		maximum: 100,
+
+		// places: [const] Number
+		//		Number of places to show in values; 0 by default
+		places: 0,
+
+		// indeterminate: [const] Boolean
+		//		If false: show progress value (number or percentage).
+		//		If true: show that a process is underway but that the amount completed is unknown.
+		//		Deprecated.   Use "value" instead.
+		indeterminate: false,
+
+		// label: String?
+		//		HTML label on progress bar.   Defaults to percentage for determinate progress bar and
+		//		blank for indeterminate progress bar.
+		label: "",
+
+		// name: String
+		//		this is the field name (for a form) if set. This needs to be set if you want to use
+		//		this widget in a dijit/form/Form widget (such as dijit/Dialog)
+		name: '',
+
+		templateString: template,
+
+		// _indeterminateHighContrastImagePath: [private] URL
+		//		URL to image to use for indeterminate progress bar when display is in high contrast mode
+		_indeterminateHighContrastImagePath: require.toUrl("./themes/a11y/indeterminate_progress.gif"),
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+
+			// Back-compat for when constructor specifies indeterminate or progress, rather than value.   Remove for 2.0.
+			if(!(this.params && "value" in this.params)){
+				this.value = this.indeterminate ? Infinity : this.progress;
+			}
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			this.indeterminateHighContrastImage.setAttribute("src",
+				this._indeterminateHighContrastImagePath.toString());
+			this.update();
+		},
+
+		_setDirAttr: function(val){
+			// Normally _CssStateMixin takes care of this, but we aren't extending it
+			var rtl = val.toLowerCase() == "rtl";
+			domClass.toggle(this.domNode, "dijitProgressBarRtl", rtl);
+			domClass.toggle(this.domNode, "dijitProgressBarIndeterminateRtl", this.indeterminate && rtl);
+			this.inherited(arguments);
+		},
+
+		update: function(/*Object?*/attributes){
+			// summary:
+			//		Internal method to change attributes of ProgressBar, similar to set(hash).  Users should call
+			//		set("value", ...) rather than calling this method directly.
+			// attributes:
+			//		May provide progress and/or maximum properties on this parameter;
+			//		see attribute specs for details.
+			// example:
+			//	|	myProgressBar.update({'indeterminate': true});
+			//	|	myProgressBar.update({'progress': 80});
+			//	|	myProgressBar.update({'indeterminate': true, label:"Loading ..." })
+			// tags:
+			//		private
+
+			// TODO: deprecate this method and use set() instead
+
+			lang.mixin(this, attributes || {});
+			var tip = this.internalProgress, ap = this.domNode;
+			var percent = 1;
+			if(this.indeterminate){
+				ap.removeAttribute("aria-valuenow");
+			}else{
+				if(String(this.progress).indexOf("%") != -1){
+					percent = Math.min(parseFloat(this.progress) / 100, 1);
+					this.progress = percent * this.maximum;
+				}else{
+					this.progress = Math.min(this.progress, this.maximum);
+					percent = this.maximum ? this.progress / this.maximum : 0;
+				}
+				ap.setAttribute("aria-valuenow", this.progress);
+			}
+
+			// Even indeterminate ProgressBars should have these attributes
+			ap.setAttribute("aria-labelledby", this.labelNode.id);
+			ap.setAttribute("aria-valuemin", 0);
+			ap.setAttribute("aria-valuemax", this.maximum);
+
+			this.labelNode.innerHTML = this.report(percent);
+
+			domClass.toggle(this.domNode, "dijitProgressBarIndeterminate", this.indeterminate);
+			domClass.toggle(this.domNode, "dijitProgressBarIndeterminateRtl", this.indeterminate && !this.isLeftToRight());
+
+			tip.style.width = (percent * 100) + "%";
+			this.onChange();
+		},
+
+		_setValueAttr: function(v){
+			this._set("value", v);
+			if(v == Infinity){
+				this.update({indeterminate: true});
+			}else{
+				this.update({indeterminate: false, progress: v});
+			}
+		},
+
+		_setLabelAttr: function(label){
+			this._set("label", label);
+			this.update();
+		},
+
+		_setIndeterminateAttr: function(indeterminate){
+			// Deprecated, use set("value", ...) instead
+			this._set("indeterminate", indeterminate);
+			this.update();
+		},
+
+		report: function(/*float*/percent){
+			// summary:
+			//		Generates HTML message to show inside progress bar (normally indicating amount of task completed).
+			//		May be overridden.
+			// tags:
+			//		extension
+
+			return this.label ? this.label :
+				(this.indeterminate ? "&#160;" : number.format(percent, { type: "percent", places: this.places, locale: this.lang }));
+		},
+
+		onChange: function(){
+			// summary:
+			//		Callback fired when progress updates.
+			// tags:
+			//		extension
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/README.md b/src/main/resources/static/dijit/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..70c66e3388bcd19a4b748b83370a28f9d5c64493
--- /dev/null
+++ b/src/main/resources/static/dijit/README.md
@@ -0,0 +1,32 @@
+# dijit
+
+**dijit** is the package that contains the widget library for Dojo Toolkit.  It requires the [core][] of the Dojo
+Toolkit and provides a framework for building additional widgets as well as a full set of rich user interface widgets
+including form, layout and data-aware items.
+
+## Installing
+
+Installation instructions are available at [dojotoolkit.org/download][download].
+
+## Getting Started
+
+If you are starting out with Dojo and Dijit, the following resources are available to you:
+
+* [Tutorials][]
+* [Reference Guide][]
+* [API Documentation][]
+* [Community Forum][]
+
+## License and Copyright
+
+The Dojo Toolkit (including this package) is dual licensed under BSD 3-Clause and AFL.  For more information on the
+license please see the [License Information][].  The Dojo Toolkit is Copyright (c) 2005-2016, The Dojo Foundation.  All
+rights reserved.
+
+[core]: https://github.com/dojo/dojo
+[download]: http://dojotoolkit.org/download/
+[Tutorials]: http://dojotoolkit.org/documentation/
+[Reference Guide]: http://dojotoolkit.org/reference-guide/
+[API Documentation]: http://dojotoolkit.org/api/
+[Community Forum]: http://dojotoolkit.org/community/
+[License Information]: http://dojotoolkit.org/license
diff --git a/src/main/resources/static/dijit/RadioMenuItem.js b/src/main/resources/static/dijit/RadioMenuItem.js
new file mode 100644
index 0000000000000000000000000000000000000000..325d03534de8a4e70f6c7b69297d41568f79b3ba
--- /dev/null
+++ b/src/main/resources/static/dijit/RadioMenuItem.js
@@ -0,0 +1,73 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.toggle
+	"dojo/query!css2", // query
+	"./CheckedMenuItem",
+	"./registry"    // registry.getEnclosingWidget
+], function(array, declare, domClass, query, CheckedMenuItem, registry){
+
+	// module:
+	//		dijit/RadioButtonMenuItem
+
+	return declare("dijit.RadioButtonMenuItem", CheckedMenuItem, {
+		// summary:
+		//		A radio-button-like menu item for toggling on and off
+
+		// Use both base classes so we get styles like dijitMenuItemDisabled
+		baseClass: "dijitMenuItem dijitRadioMenuItem",
+
+		role: "menuitemradio",
+
+		// checkedChar: String
+		//		Character (or string) used in place of radio button icon when display in high contrast mode
+		checkedChar: "*",
+
+		// group: String
+		//		Toggling on a RadioMenuItem in a given group toggles off the other RadioMenuItems in that group.
+		group: "",
+		_setGroupAttr: "domNode",	// needs to be set as an attribute so dojo/query can find it
+
+		_setCheckedAttr: function(/*Boolean*/ checked){
+			// If I am being checked then have to deselect currently checked items
+			this.inherited(arguments);
+			if(!this._created){
+				return;
+			}
+			if(checked && this.group){
+				array.forEach(this._getRelatedWidgets(), function(widget){
+					if(widget != this && widget.checked){
+						widget.set('checked', false);
+					}
+				}, this);
+			}
+		},
+
+		_onClick: function(evt){
+			// summary:
+			//		Clicking this item toggles it on.   If it's already on, then clicking does nothing.
+			// tags:
+			//		private
+
+			if(!this.disabled && !this.checked){
+				this.set("checked", true);
+				this.onChange(true);
+			}
+			this.onClick(evt);
+		},
+
+		_getRelatedWidgets: function(){
+			// Private function needed to help iterate over all radio menu items in a group.
+			var ary = [];
+			query("[group=" + this.group + "][role=" + this.role + "]").forEach(
+				function(menuItemNode){
+					var widget = registry.getEnclosingWidget(menuItemNode);
+					if(widget){
+						ary.push(widget);
+					}
+				}
+			);
+			return ary;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/TitlePane.js b/src/main/resources/static/dijit/TitlePane.js
new file mode 100644
index 0000000000000000000000000000000000000000..de83854f628c7a518b693947c031d8858a5df208
--- /dev/null
+++ b/src/main/resources/static/dijit/TitlePane.js
@@ -0,0 +1,292 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.setSelectable
+	"dojo/dom-attr", // domAttr.set or get domAttr.remove
+	"dojo/dom-class", // domClass.replace
+	"dojo/dom-geometry", // domGeometry.setMarginBox domGeometry.getMarginBox
+	"dojo/fx", // fxUtils.wipeIn fxUtils.wipeOut
+	"dojo/has",
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/keys", // keys.DOWN_ARROW keys.ENTER
+	"./_CssStateMixin",
+	"./_TemplatedMixin",
+	"./layout/ContentPane",
+	"dojo/text!./templates/TitlePane.html",
+	"./_base/manager",    // defaultDuration
+	"./a11yclick"	// template uses ondijitclick
+], function(array, declare, dom, domAttr, domClass, domGeometry, fxUtils, has, kernel, keys,
+			_CssStateMixin, _TemplatedMixin, ContentPane, template, manager){
+
+	// module:
+	//		dijit/TitlePane
+
+	var TitlePane = declare("dijit.TitlePane", [ContentPane, _TemplatedMixin, _CssStateMixin], {
+		// summary:
+		//		A pane with a title on top, that can be expanded or collapsed.
+		//
+		// description:
+		//		An accessible container with a title Heading, and a content
+		//		section that slides open and closed. TitlePane is an extension to
+		//		`dijit/layout/ContentPane`, providing all the useful content-control aspects from it.
+		//
+		// example:
+		//	|	// load a TitlePane from remote file:
+		//	|	var foo = new dijit.TitlePane({ href: "foobar.html", title:"Title" });
+		//	|	foo.startup();
+		//
+		// example:
+		//	|	<!-- markup href example: -->
+		//	|	<div data-dojo-type="dijit/TitlePane" data-dojo-props="href: 'foobar.html', title: 'Title'"></div>
+		//
+		// example:
+		//	|	<!-- markup with inline data -->
+		//	|	<div data-dojo-type="dijit/TitlePane" title="Title">
+		//	|		<p>I am content</p>
+		//	|	</div>
+
+		// title: String
+		//		Title of the pane
+		title: "",
+		_setTitleAttr: { node: "titleNode", type: "innerHTML" }, // override default where title becomes a hover tooltip
+
+		// open: Boolean
+		//		Whether pane is opened or closed.
+		open: true,
+
+		// toggleable: Boolean
+		//		Whether pane can be opened or closed by clicking the title bar.
+		toggleable: true,
+
+		// tabIndex: String
+		//		Tabindex setting for the title (so users can tab to the title then
+		//		use space/enter to open/close the title pane)
+		tabIndex: "0",
+
+		// duration: Integer
+		//		Time in milliseconds to fade in/fade out
+		duration: manager.defaultDuration,
+
+		// baseClass: [protected] String
+		//		The root className to be placed on this widget's domNode.
+		baseClass: "dijitTitlePane",
+
+		templateString: template,
+
+		// doLayout: [protected] Boolean
+		//		Don't change this parameter from the default value.
+		//		This ContentPane parameter doesn't make sense for TitlePane, since TitlePane
+		//		is never a child of a layout container, nor should TitlePane try to control
+		//		the size of an inner widget.
+		doLayout: false,
+
+		// Tooltip is defined in _WidgetBase but we need to handle the mapping to DOM here
+		_setTooltipAttr: {node: "focusNode", type: "attribute", attribute: "title"}, // focusNode spans the entire width, titleNode doesn't
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			dom.setSelectable(this.titleNode, false);
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// Hover and focus effect on title bar, except for non-toggleable TitlePanes
+			// This should really be controlled from _setToggleableAttr() but _CssStateMixin
+			// doesn't provide a way to disconnect a previous _trackMouseState() call
+			if(this.toggleable){
+				this._trackMouseState(this.titleBarNode, this.baseClass + "Title");
+			}
+
+			// setup open/close animations
+			var hideNode = this.hideNode, wipeNode = this.wipeNode;
+			this._wipeIn = fxUtils.wipeIn({
+				node: wipeNode,
+				duration: this.duration,
+				beforeBegin: function(){
+					hideNode.style.display = "";
+				}
+			});
+			this._wipeOut = fxUtils.wipeOut({
+				node: wipeNode,
+				duration: this.duration,
+				onEnd: function(){
+					hideNode.style.display = "none";
+				}
+			});
+		},
+
+		_setOpenAttr: function(/*Boolean*/ open, /*Boolean*/ animate){
+			// summary:
+			//		Hook to make set("open", boolean) control the open/closed state of the pane.
+			// open: Boolean
+			//		True if you want to open the pane, false if you want to close it.
+
+			array.forEach([this._wipeIn, this._wipeOut], function(animation){
+				if(animation && animation.status() == "playing"){
+					animation.stop();
+				}
+			});
+
+			if(animate){
+				var anim = this[open ? "_wipeIn" : "_wipeOut"];
+				anim.play();
+			}else{
+				this.hideNode.style.display = this.wipeNode.style.display = open ? "" : "none";
+			}
+
+			// load content (if this is the first time we are opening the TitlePane
+			// and content is specified as an href, or href was set when hidden)
+			if(this._started){
+				if(open){
+					this._onShow();
+				}else{
+					this.onHide();
+				}
+			}
+
+			this.containerNode.setAttribute("aria-hidden", open ? "false" : "true");
+			this.focusNode.setAttribute("aria-pressed", open ? "true" : "false");
+
+			this._set("open", open);
+
+			this._setCss();
+		},
+
+		_setToggleableAttr: function(/*Boolean*/ canToggle){
+			// summary:
+			//		Hook to make set("toggleable", boolean) work.
+			// canToggle: Boolean
+			//		True to allow user to open/close pane by clicking title bar.
+
+			this.focusNode.setAttribute("role", canToggle ? "button" : "heading");
+			if(canToggle){
+				this.focusNode.setAttribute("aria-controls", this.id + "_pane");
+				this.focusNode.setAttribute("tabIndex", this.tabIndex);
+				this.focusNode.setAttribute("aria-pressed", this.open);
+			}else{
+				domAttr.remove(this.focusNode, "aria-controls");
+				domAttr.remove(this.focusNode, "tabIndex");
+				domAttr.remove(this.focusNode, "aria-pressed");
+			}
+
+			this._set("toggleable", canToggle);
+
+			this._setCss();
+		},
+
+		_setContentAttr: function(/*String|DomNode|Nodelist*/ content){
+			// summary:
+			//		Hook to make set("content", ...) work.
+			//		Typically called when an href is loaded.  Our job is to make the animation smooth.
+
+			if(!this.open || !this._wipeOut || this._wipeOut.status() == "playing"){
+				// we are currently *closing* the pane (or the pane is closed), so just let that continue
+				this.inherited(arguments);
+			}else{
+				if(this._wipeIn && this._wipeIn.status() == "playing"){
+					this._wipeIn.stop();
+				}
+
+				// freeze container at current height so that adding new content doesn't make it jump
+				domGeometry.setMarginBox(this.wipeNode, { h: domGeometry.getMarginBox(this.wipeNode).h });
+
+				// add the new content (erasing the old content, if any)
+				this.inherited(arguments);
+
+				// call _wipeIn.play() to animate from current height to new height
+				if(this._wipeIn){
+					this._wipeIn.play();
+				}else{
+					this.hideNode.style.display = "";
+				}
+			}
+		},
+
+		toggle: function(){
+			// summary:
+			//		Switches between opened and closed state
+			// tags:
+			//		private
+
+			this._setOpenAttr(!this.open, true);
+		},
+
+		_setCss: function(){
+			// summary:
+			//		Set the open/close css state for the TitlePane
+			// tags:
+			//		private
+
+			var node = this.titleBarNode || this.focusNode;
+			var oldCls = this._titleBarClass;
+			this._titleBarClass = this.baseClass + "Title" + (this.toggleable ? "" : "Fixed") + (this.open ? "Open" : "Closed");
+			domClass.replace(node, this._titleBarClass, oldCls || "");
+
+			// Back compat, remove for 2.0
+			domClass.replace(node, this._titleBarClass.replace("TitlePaneTitle", ""), (oldCls || "").replace("TitlePaneTitle", ""));
+
+			this.arrowNodeInner.innerHTML = this.open ? "-" : "+";
+		},
+
+		_onTitleKey: function(/*Event*/ e){
+			// summary:
+			//		Handler for when user hits a key
+			// tags:
+			//		private
+
+			if(e.keyCode == keys.DOWN_ARROW && this.open){
+				this.containerNode.focus();
+				e.preventDefault();
+			}
+		},
+
+		_onTitleClick: function(){
+			// summary:
+			//		Handler when user clicks the title bar
+			// tags:
+			//		private
+			if(this.toggleable){
+				this.toggle();
+			}
+		},
+
+		setTitle: function(/*String*/ title){
+			// summary:
+			//		Deprecated.  Use set('title', ...) instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated("dijit.TitlePane.setTitle() is deprecated.  Use set('title', ...) instead.", "", "2.0");
+			this.set("title", title);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		TitlePane.extend({
+			_setTitleAttr: function(/*String*/ title){
+				// Override default where title becomes a hover tooltip
+				this._set("title", title);
+				this.titleNode.innerHTML = title;
+				this.applyTextDir(this.titleNode);
+			},
+
+			_setTooltipAttr: function(/*String*/ tooltip){
+				this._set("tooltip", tooltip);
+				if(this.textDir){
+					tooltip = this.enforceTextDirWithUcc(null, tooltip);
+				}
+				domAttr.set(this.focusNode, "title", tooltip);			// focusNode spans the entire width, titleNode doesn't
+			},
+
+			_setTextDirAttr: function(textDir){
+				if(this._created && this.textDir != textDir){
+					this._set("textDir", textDir);
+					this.set("title", this.title);
+					this.set("tooltip", this.tooltip);
+				}
+			}
+		});
+	}
+
+	return TitlePane;
+});
diff --git a/src/main/resources/static/dijit/Toolbar.js b/src/main/resources/static/dijit/Toolbar.js
new file mode 100644
index 0000000000000000000000000000000000000000..6f964661c2020a30773459d1619560bdd6cd7393
--- /dev/null
+++ b/src/main/resources/static/dijit/Toolbar.js
@@ -0,0 +1,42 @@
+define([
+	"require",
+	"dojo/_base/declare", // declare
+	"dojo/has",
+	"dojo/keys", // keys.LEFT_ARROW keys.RIGHT_ARROW
+	"dojo/ready",
+	"./_Widget",
+	"./_KeyNavContainer",
+	"./_TemplatedMixin"
+], function(require, declare, has, keys, ready, _Widget, _KeyNavContainer, _TemplatedMixin){
+
+	// module:
+	//		dijit/Toolbar
+
+
+	// Back compat w/1.6, remove for 2.0
+	if(has("dijit-legacy-requires")){
+		ready(0, function(){
+			var requires = ["dijit/ToolbarSeparator"];
+			require(requires);	// use indirection so modules not rolled into a build
+		});
+	}
+
+	return declare("dijit.Toolbar", [_Widget, _TemplatedMixin, _KeyNavContainer], {
+		// summary:
+		//		A Toolbar widget, used to hold things like `dijit/Editor` buttons
+
+		templateString:
+			'<div class="dijit" role="toolbar" tabIndex="${tabIndex}" data-dojo-attach-point="containerNode">' +
+			'</div>',
+
+		baseClass: "dijitToolbar",
+
+		_onLeftArrow: function(){
+			this.focusPrev();
+		},
+
+		_onRightArrow: function(){
+			this.focusNext();
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/ToolbarSeparator.js b/src/main/resources/static/dijit/ToolbarSeparator.js
new file mode 100644
index 0000000000000000000000000000000000000000..2ec64203d8ff673fdcd22478dced044dbba882a1
--- /dev/null
+++ b/src/main/resources/static/dijit/ToolbarSeparator.js
@@ -0,0 +1,31 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.setSelectable
+	"./_Widget",
+	"./_TemplatedMixin"
+], function(declare, dom, _Widget, _TemplatedMixin){
+
+	// module:
+	//		dijit/ToolbarSeparator
+
+
+	return declare("dijit.ToolbarSeparator", [_Widget, _TemplatedMixin], {
+		// summary:
+		//		A spacer between two `dijit.Toolbar` items
+
+		templateString: '<div class="dijitToolbarSeparator dijitInline" role="presentation"></div>',
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			dom.setSelectable(this.domNode, false);
+		},
+
+		isFocusable: function(){
+			// summary:
+			//		This widget isn't focusable, so pass along that fact.
+			// tags:
+			//		protected
+			return false;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/Tooltip.js b/src/main/resources/static/dijit/Tooltip.js
new file mode 100644
index 0000000000000000000000000000000000000000..0dff517bcabbf590e750668effdaa07b61053b01
--- /dev/null
+++ b/src/main/resources/static/dijit/Tooltip.js
@@ -0,0 +1,610 @@
+define([
+	"dojo/_base/array", // array.forEach array.indexOf array.map
+	"dojo/_base/declare", // declare
+	"dojo/_base/fx", // fx.fadeIn fx.fadeOut
+	"dojo/dom", // dom.byId
+	"dojo/dom-class", // domClass.add
+	"dojo/dom-geometry", // domGeometry.position
+	"dojo/dom-style", // domStyle.set, domStyle.get
+	"dojo/_base/lang", // lang.hitch lang.isArrayLike
+	"dojo/mouse",
+	"dojo/on",
+	"dojo/sniff", // has("ie"), has("trident")
+	"./_base/manager",	// manager.defaultDuration
+	"./place",
+	"./_Widget",
+	"./_TemplatedMixin",
+	"./BackgroundIframe",
+	"dojo/text!./templates/Tooltip.html",
+	"./main"		// sets dijit.showTooltip etc. for back-compat
+], function(array, declare, fx, dom, domClass, domGeometry, domStyle, lang, mouse, on, has,
+			manager, place, _Widget, _TemplatedMixin, BackgroundIframe, template, dijit){
+
+	// module:
+	//		dijit/Tooltip
+
+
+	// TODO: Tooltip should really share more positioning code with TooltipDialog, like:
+	//		- the orient() method
+	//		- the connector positioning code in show()
+	//		- the dijitTooltip[Dialog] class
+	//
+	// The problem is that Tooltip's implementation supplies it's own <iframe> and interacts directly
+	// with dijit/place, rather than going through dijit/popup like TooltipDialog and other popups (ex: Menu).
+
+	var MasterTooltip = declare("dijit._MasterTooltip", [_Widget, _TemplatedMixin], {
+		// summary:
+		//		Internal widget that holds the actual tooltip markup,
+		//		which occurs once per page.
+		//		Called by Tooltip widgets which are just containers to hold
+		//		the markup
+		// tags:
+		//		protected
+
+		// duration: Integer
+		//		Milliseconds to fade in/fade out
+		duration: manager.defaultDuration,
+
+		templateString: template,
+
+		postCreate: function(){
+			this.ownerDocumentBody.appendChild(this.domNode);
+
+			this.bgIframe = new BackgroundIframe(this.domNode);
+
+			// Setup fade-in and fade-out functions.
+			this.fadeIn = fx.fadeIn({ node: this.domNode, duration: this.duration, onEnd: lang.hitch(this, "_onShow") });
+			this.fadeOut = fx.fadeOut({ node: this.domNode, duration: this.duration, onEnd: lang.hitch(this, "_onHide") });
+		},
+
+		show: function(innerHTML, aroundNode, position, rtl, textDir, onMouseEnter, onMouseLeave){
+			// summary:
+			//		Display tooltip w/specified contents to right of specified node
+			//		(To left if there's no space on the right, or if rtl == true)
+			// innerHTML: String
+			//		Contents of the tooltip
+			// aroundNode: DomNode|dijit/place.__Rectangle
+			//		Specifies that tooltip should be next to this node / area
+			// position: String[]?
+			//		List of positions to try to position tooltip (ex: ["right", "above"])
+			// rtl: Boolean?
+			//		Corresponds to `WidgetBase.dir` attribute, where false means "ltr" and true
+			//		means "rtl"; specifies GUI direction, not text direction.
+			// textDir: String?
+			//		Corresponds to `WidgetBase.textdir` attribute; specifies direction of text.
+			// onMouseEnter: Function?
+			//		Callback function for mouse enter on tooltip
+			// onMouseLeave: Function?
+			//		Callback function for mouse leave on tooltip
+
+			if(this.aroundNode && this.aroundNode === aroundNode && this.containerNode.innerHTML == innerHTML){
+				return;
+			}
+
+			if(this.fadeOut.status() == "playing"){
+				// previous tooltip is being hidden; wait until the hide completes then show new one
+				this._onDeck=arguments;
+				return;
+			}
+			this.containerNode.innerHTML=innerHTML;
+
+			if(textDir){
+				this.set("textDir", textDir);
+			}
+
+			this.containerNode.align = rtl? "right" : "left"; //fix the text alignment
+
+			var pos = place.around(this.domNode, aroundNode,
+				position && position.length ? position : Tooltip.defaultPosition, !rtl, lang.hitch(this, "orient"));
+
+			// Position the tooltip connector for middle alignment.
+			// This could not have been done in orient() since the tooltip wasn't positioned at that time.
+			var aroundNodeCoords = pos.aroundNodePos;
+			if(pos.corner.charAt(0) == 'M' && pos.aroundCorner.charAt(0) == 'M'){
+				this.connectorNode.style.top = aroundNodeCoords.y + ((aroundNodeCoords.h - this.connectorNode.offsetHeight) >> 1) - pos.y + "px";
+				this.connectorNode.style.left = "";
+			}else if(pos.corner.charAt(1) == 'M' && pos.aroundCorner.charAt(1) == 'M'){
+				this.connectorNode.style.left = aroundNodeCoords.x + ((aroundNodeCoords.w - this.connectorNode.offsetWidth) >> 1) - pos.x + "px";
+			}else{
+				// Not *-centered, but just above/below/after/before
+				this.connectorNode.style.left = "";
+				this.connectorNode.style.top = "";
+			}
+
+			// show it
+			domStyle.set(this.domNode, "opacity", 0);
+			this.fadeIn.play();
+			this.isShowingNow = true;
+			this.aroundNode = aroundNode;
+
+			this.onMouseEnter = onMouseEnter || noop;
+			this.onMouseLeave = onMouseLeave || noop;
+		},
+
+		orient: function(/*DomNode*/ node, /*String*/ aroundCorner, /*String*/ tooltipCorner, /*Object*/ spaceAvailable, /*Object*/ aroundNodeCoords){
+			// summary:
+			//		Private function to set CSS for tooltip node based on which position it's in.
+			//		This is called by the dijit popup code.   It will also reduce the tooltip's
+			//		width to whatever width is available
+			// tags:
+			//		protected
+
+			this.connectorNode.style.top = ""; //reset to default
+
+			var heightAvailable = spaceAvailable.h,
+				widthAvailable = spaceAvailable.w;
+
+			node.className = "dijitTooltip " +
+				{
+					"MR-ML": "dijitTooltipRight",
+					"ML-MR": "dijitTooltipLeft",
+					"TM-BM": "dijitTooltipAbove",
+					"BM-TM": "dijitTooltipBelow",
+					"BL-TL": "dijitTooltipBelow dijitTooltipABLeft",
+					"TL-BL": "dijitTooltipAbove dijitTooltipABLeft",
+					"BR-TR": "dijitTooltipBelow dijitTooltipABRight",
+					"TR-BR": "dijitTooltipAbove dijitTooltipABRight",
+					"BR-BL": "dijitTooltipRight",
+					"BL-BR": "dijitTooltipLeft"
+				}[aroundCorner + "-" + tooltipCorner];
+
+			// reset width; it may have been set by orient() on a previous tooltip show()
+			this.domNode.style.width = "auto";
+
+			// Reduce tooltip's width to the amount of width available, so that it doesn't overflow screen.
+			// Note that sometimes widthAvailable is negative, but we guard against setting style.width to a
+			// negative number since that causes an exception on IE.
+			var size = domGeometry.position(this.domNode);
+			if(has("ie") || has("trident")){
+				// workaround strange IE bug where setting width to offsetWidth causes words to wrap
+				size.w += 2;
+			}
+
+			var width = Math.min((Math.max(widthAvailable,1)), size.w);
+
+			domGeometry.setMarginBox(this.domNode, {w: width});
+
+			// Reposition the tooltip connector.
+			if(tooltipCorner.charAt(0) == 'B' && aroundCorner.charAt(0) == 'B'){
+				var bb = domGeometry.position(node);
+				var tooltipConnectorHeight = this.connectorNode.offsetHeight;
+				if(bb.h > heightAvailable){
+					// The tooltip starts at the top of the page and will extend past the aroundNode
+					var aroundNodePlacement = heightAvailable - ((aroundNodeCoords.h + tooltipConnectorHeight) >> 1);
+					this.connectorNode.style.top = aroundNodePlacement + "px";
+					this.connectorNode.style.bottom = "";
+				}else{
+					// Align center of connector with center of aroundNode, except don't let bottom
+					// of connector extend below bottom of tooltip content, or top of connector
+					// extend past top of tooltip content
+					this.connectorNode.style.bottom = Math.min(
+						Math.max(aroundNodeCoords.h/2 - tooltipConnectorHeight/2, 0),
+						bb.h - tooltipConnectorHeight) + "px";
+					this.connectorNode.style.top = "";
+				}
+			}else{
+				// reset the tooltip back to the defaults
+				this.connectorNode.style.top = "";
+				this.connectorNode.style.bottom = "";
+			}
+
+			return Math.max(0, size.w - widthAvailable);
+		},
+
+		_onShow: function(){
+			// summary:
+			//		Called at end of fade-in operation
+			// tags:
+			//		protected
+			if(has("ie")){
+				// the arrow won't show up on a node w/an opacity filter
+				this.domNode.style.filter="";
+			}
+		},
+
+		hide: function(aroundNode){
+			// summary:
+			//		Hide the tooltip
+
+			if(this._onDeck && this._onDeck[1] == aroundNode){
+				// this hide request is for a show() that hasn't even started yet;
+				// just cancel the pending show()
+				this._onDeck=null;
+			}else if(this.aroundNode === aroundNode){
+				// this hide request is for the currently displayed tooltip
+				this.fadeIn.stop();
+				this.isShowingNow = false;
+				this.aroundNode = null;
+				this.fadeOut.play();
+			}else{
+				// just ignore the call, it's for a tooltip that has already been erased
+			}
+
+			this.onMouseEnter = this.onMouseLeave = noop;
+		},
+
+		_onHide: function(){
+			// summary:
+			//		Called at end of fade-out operation
+			// tags:
+			//		protected
+
+			this.domNode.style.cssText="";	// to position offscreen again
+			this.containerNode.innerHTML="";
+			if(this._onDeck){
+				// a show request has been queued up; do it now
+				this.show.apply(this, this._onDeck);
+				this._onDeck=null;
+			}
+		}
+	});
+
+	if(has("dojo-bidi")){
+		MasterTooltip.extend({
+			_setAutoTextDir: function(/*Object*/node){
+				// summary:
+				//		Resolve "auto" text direction for children nodes
+				// tags:
+				//		private
+
+				this.applyTextDir(node);
+				array.forEach(node.children, function(child){ this._setAutoTextDir(child); }, this);
+			},
+
+			_setTextDirAttr: function(/*String*/ textDir){
+				// summary:
+				//		Setter for textDir.
+				// description:
+				//		Users shouldn't call this function; they should be calling
+				//		set('textDir', value)
+				// tags:
+				//		private
+
+				this._set("textDir", textDir);
+
+				if (textDir == "auto"){
+					this._setAutoTextDir(this.containerNode);
+				}else{
+					this.containerNode.dir = this.textDir;
+				}
+			}
+		});
+	}
+
+	dijit.showTooltip = function(innerHTML, aroundNode, position, rtl, textDir, onMouseEnter, onMouseLeave){
+		// summary:
+		//		Static method to display tooltip w/specified contents in specified position.
+		//		See description of dijit/Tooltip.defaultPosition for details on position parameter.
+		//		If position is not specified then dijit/Tooltip.defaultPosition is used.
+		// innerHTML: String
+		//		Contents of the tooltip
+		// aroundNode: place.__Rectangle
+		//		Specifies that tooltip should be next to this node / area
+		// position: String[]?
+		//		List of positions to try to position tooltip (ex: ["right", "above"])
+		// rtl: Boolean?
+		//		Corresponds to `WidgetBase.dir` attribute, where false means "ltr" and true
+		//		means "rtl"; specifies GUI direction, not text direction.
+		// textDir: String?
+		//		Corresponds to `WidgetBase.textdir` attribute; specifies direction of text.
+		// onMouseEnter: Function?
+		//		Callback function for mouse over on tooltip
+		// onMouseLeave: Function?
+		//		Callback function for mouse leave on tooltip
+
+		// After/before don't work, but for back-compat convert them to the working after-centered, before-centered.
+		// Possibly remove this in 2.0.   Alternately, get before/after to work.
+		if(position){
+			position = array.map(position, function(val){
+				return {after: "after-centered", before: "before-centered"}[val] || val;
+			});
+		}
+
+		if(!Tooltip._masterTT){ dijit._masterTT = Tooltip._masterTT = new MasterTooltip(); }
+		return Tooltip._masterTT.show(innerHTML, aroundNode, position, rtl, textDir, onMouseEnter, onMouseLeave);
+	};
+
+	dijit.hideTooltip = function(aroundNode){
+		// summary:
+		//		Static method to hide the tooltip displayed via showTooltip()
+		return Tooltip._masterTT && Tooltip._masterTT.hide(aroundNode);
+	};
+
+	// Possible states for a tooltip, see Tooltip.state property for definitions
+	var DORMANT = "DORMANT",
+		SHOW_TIMER = "SHOW TIMER",
+		SHOWING = "SHOWING",
+		HIDE_TIMER = "HIDE TIMER";
+
+	function noop(){}
+
+	var Tooltip = declare("dijit.Tooltip", _Widget, {
+		// summary:
+		//		Pops up a tooltip (a help message) when you hover over a node.
+		//		Also provides static show() and hide() methods that can be used without instantiating a dijit/Tooltip.
+
+		// label: String
+		//		HTML to display in the tooltip.
+		//		Specified as innerHTML when creating the widget from markup.
+		label: "",
+
+		// showDelay: Integer
+		//		Number of milliseconds to wait after hovering over/focusing on the object, before
+		//		the tooltip is displayed.
+		showDelay: 400,
+
+		// hideDelay: Integer
+		//		Number of milliseconds to wait after unhovering the object, before
+		//		the tooltip is hidden.  Note that blurring an object hides the tooltip immediately.
+		hideDelay: 400,
+
+		// connectId: String|String[]|DomNode|DomNode[]
+		//		Id of domNode(s) to attach the tooltip to.
+		//		When user hovers over specified dom node(s), the tooltip will appear.
+		connectId: [],
+
+		// position: String[]
+		//		See description of `dijit/Tooltip.defaultPosition` for details on position parameter.
+		position: [],
+
+		// selector: String?
+		//		CSS expression to apply this Tooltip to descendants of connectIds, rather than to
+		//		the nodes specified by connectIds themselves.    Useful for applying a Tooltip to
+		//		a range of rows in a table, tree, etc.   Use in conjunction with getContent() parameter.
+		//		Ex: connectId: myTable, selector: "tr", getContent: function(node){ return ...; }
+		//
+		//		The application must require() an appropriate level of dojo/query to handle the selector.
+		selector: "",
+
+		// TODO: in 2.0 remove support for multiple connectIds.   selector gives the same effect.
+		// So, change connectId to a "", remove addTarget()/removeTarget(), etc.
+
+		_setConnectIdAttr: function(/*String|String[]|DomNode|DomNode[]*/ newId){
+			// summary:
+			//		Connect to specified node(s)
+
+			// Remove connections to old nodes (if there are any)
+			array.forEach(this._connections || [], function(nested){
+				array.forEach(nested, function(handle){ handle.remove(); });
+			}, this);
+
+			// Make array of id's to connect to, excluding entries for nodes that don't exist yet, see startup()
+			this._connectIds = array.filter(lang.isArrayLike(newId) ? newId : (newId ? [newId] : []),
+					function(id){ return dom.byId(id, this.ownerDocument); }, this);
+
+			// Make connections
+			this._connections = array.map(this._connectIds, function(id){
+				var node = dom.byId(id, this.ownerDocument),
+					selector = this.selector,
+					delegatedEvent = selector ?
+						function(eventType){ return on.selector(selector, eventType); } :
+						function(eventType){ return eventType; },
+					self = this;
+				return [
+					on(node, delegatedEvent(mouse.enter), function(){
+						self._onHover(this);
+					}),
+					on(node, delegatedEvent("focusin"), function(){
+						self._onHover(this);
+					}),
+					on(node, delegatedEvent(mouse.leave), lang.hitch(self, "_onUnHover")),
+					on(node, delegatedEvent("focusout"), lang.hitch(self, "set", "state", DORMANT))
+				];
+			}, this);
+
+			this._set("connectId", newId);
+		},
+
+		addTarget: function(/*DomNode|String*/ node){
+			// summary:
+			//		Attach tooltip to specified node if it's not already connected
+
+			// TODO: remove in 2.0 and just use set("connectId", ...) interface
+
+			var id = node.id || node;
+			if(array.indexOf(this._connectIds, id) == -1){
+				this.set("connectId", this._connectIds.concat(id));
+			}
+		},
+
+		removeTarget: function(/*DomNode|String*/ node){
+			// summary:
+			//		Detach tooltip from specified node
+
+			// TODO: remove in 2.0 and just use set("connectId", ...) interface
+
+			var id = node.id || node,	// map from DOMNode back to plain id string
+				idx = array.indexOf(this._connectIds, id);
+			if(idx >= 0){
+				// remove id (modifies original this._connectIds but that's OK in this case)
+				this._connectIds.splice(idx, 1);
+				this.set("connectId", this._connectIds);
+			}
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			domClass.add(this.domNode,"dijitTooltipData");
+		},
+
+		startup: function(){
+			this.inherited(arguments);
+
+			// If this tooltip was created in a template, or for some other reason the specified connectId[s]
+			// didn't exist during the widget's initialization, then connect now.
+			var ids = this.connectId;
+			array.forEach(lang.isArrayLike(ids) ? ids : [ids], this.addTarget, this);
+		},
+
+		getContent: function(/*DomNode*/ node){
+			// summary:
+			//		User overridable function that return the text to display in the tooltip.
+			// tags:
+			//		extension
+			return this.label || this.domNode.innerHTML;
+		},
+
+		// state: [private readonly] String
+		//		One of:
+		//
+		//		- DORMANT: tooltip not SHOWING
+		//		- SHOW TIMER: tooltip not SHOWING but timer set to show it
+		//		- SHOWING: tooltip displayed
+		//		- HIDE TIMER: tooltip displayed, but timer set to hide it
+		state: DORMANT,
+		_setStateAttr: function(val){
+			if(this.state == val ||
+				(val == SHOW_TIMER && this.state == SHOWING) ||
+				(val == HIDE_TIMER && this.state == DORMANT)){
+				return;
+			}
+
+			if(this._hideTimer){
+				this._hideTimer.remove();
+				delete this._hideTimer;
+			}
+			if(this._showTimer){
+				this._showTimer.remove();
+				delete this._showTimer;
+			}
+
+			switch(val){
+				case DORMANT:
+					if(this._connectNode){
+						Tooltip.hide(this._connectNode);
+						delete this._connectNode;
+						this.onHide();
+					}
+					break;
+				case SHOW_TIMER:	 // set timer to show tooltip
+					// should only get here from a DORMANT state, i.e. tooltip can't be already SHOWING
+					if(this.state != SHOWING){
+						this._showTimer = this.defer(function(){ this.set("state", SHOWING); }, this.showDelay);
+					}
+					break;
+				case SHOWING:		// show tooltip and clear timers
+					var content = this.getContent(this._connectNode);
+					if(!content){
+						this.set("state", DORMANT);
+						return;
+					}
+
+					// Show tooltip and setup callbacks for mouseenter/mouseleave of tooltip itself
+					Tooltip.show(content, this._connectNode, this.position, !this.isLeftToRight(), this.textDir,
+						lang.hitch(this, "set", "state", SHOWING), lang.hitch(this, "set", "state", HIDE_TIMER));
+
+					this.onShow(this._connectNode, this.position);
+					break;
+				case HIDE_TIMER:	// set timer set to hide tooltip
+					this._hideTimer = this.defer(function(){ this.set("state", DORMANT); }, this.hideDelay);
+					break;
+			}
+
+			this._set("state", val);
+		},
+
+		_onHover: function(/*DomNode*/ target){
+			// summary:
+			//		Despite the name of this method, it actually handles both hover and focus
+			//		events on the target node, setting a timer to show the tooltip.
+			// tags:
+			//		private
+
+			if(this._connectNode && target != this._connectNode){
+				// Tooltip is displaying for another node
+				this.set("state", DORMANT);
+			}
+			this._connectNode = target;		// _connectNode means "tooltip currently displayed for this node"
+
+			this.set("state", SHOW_TIMER);	// no-op if show-timer already set, or if already showing
+		},
+
+		_onUnHover: function(/*DomNode*/ target){
+			// summary:
+			//		Handles mouseleave event on the target node, hiding the tooltip.
+			// tags:
+			//		private
+
+			this.set("state", HIDE_TIMER);		// no-op if already dormant, or if hide-timer already set
+		},
+
+		// open() and close() aren't used anymore, except from the _BidiSupport/misc/Tooltip test.
+		// Should probably remove for 2.0, but leaving for now.
+		open: function(/*DomNode*/ target){
+			// summary:
+			//		Display the tooltip; usually not called directly.
+			// tags:
+			//		private
+
+			this.set("state", DORMANT);
+			this._connectNode = target;		// _connectNode means "tooltip currently displayed for this node"
+			this.set("state", SHOWING);
+		},
+
+		close: function(){
+			// summary:
+			//		Hide the tooltip or cancel timer for show of tooltip
+			// tags:
+			//		private
+
+			this.set("state", DORMANT);
+		},
+
+		onShow: function(/*===== target, position =====*/){
+			// summary:
+			//		Called when the tooltip is shown
+			// tags:
+			//		callback
+		},
+
+		onHide: function(){
+			// summary:
+			//		Called when the tooltip is hidden
+			// tags:
+			//		callback
+		},
+
+		destroy: function(){
+			this.set("state", DORMANT);
+
+			// Remove connections manually since they aren't registered to be removed by _WidgetBase
+			array.forEach(this._connections || [], function(nested){
+				array.forEach(nested, function(handle){ handle.remove(); });
+			}, this);
+
+			this.inherited(arguments);
+		}
+	});
+
+	Tooltip._MasterTooltip = MasterTooltip;		// for monkey patching
+	Tooltip.show = dijit.showTooltip;		// export function through module return value
+	Tooltip.hide = dijit.hideTooltip;		// export function through module return value
+
+	Tooltip.defaultPosition = ["after-centered", "before-centered"];
+
+	/*=====
+	lang.mixin(Tooltip, {
+		 // defaultPosition: String[]
+		 //		This variable controls the position of tooltips, if the position is not specified to
+		 //		the Tooltip widget or *TextBox widget itself.  It's an array of strings with the values
+		 //		possible for `dijit/place.around()`.   The recommended values are:
+		 //
+		 //		- before-centered: centers tooltip to the left of the anchor node/widget, or to the right
+		 //		  in the case of RTL scripts like Hebrew and Arabic
+		 //		- after-centered: centers tooltip to the right of the anchor node/widget, or to the left
+		 //		  in the case of RTL scripts like Hebrew and Arabic
+		 //		- above-centered: tooltip is centered above anchor node
+		 //		- below-centered: tooltip is centered above anchor node
+		 //
+		 //		The list is positions is tried, in order, until a position is found where the tooltip fits
+		 //		within the viewport.
+		 //
+		 //		Be careful setting this parameter.  A value of "above-centered" may work fine until the user scrolls
+		 //		the screen so that there's no room above the target node.   Nodes with drop downs, like
+		 //		DropDownButton or FilteringSelect, are especially problematic, in that you need to be sure
+		 //		that the drop down and tooltip don't overlap, even when the viewport is scrolled so that there
+		 //		is only room below (or above) the target node, but not both.
+	 });
+	=====*/
+	return Tooltip;
+});
diff --git a/src/main/resources/static/dijit/TooltipDialog.js b/src/main/resources/static/dijit/TooltipDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..b4f9967245488ad099b86d7453ff92e9e970b31b
--- /dev/null
+++ b/src/main/resources/static/dijit/TooltipDialog.js
@@ -0,0 +1,198 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.replace
+	"dojo/has",
+	"dojo/keys", // keys
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"./focus",
+	"./layout/ContentPane",
+	"./_DialogMixin",
+	"./form/_FormMixin",
+	"./_TemplatedMixin",
+	"dojo/text!./templates/TooltipDialog.html",
+	"./main"        // exports methods to dijit global
+], function(declare, domClass, has, keys, lang, on, focus, ContentPane, _DialogMixin, _FormMixin, _TemplatedMixin, template, dijit){
+
+	// module:
+	//		dijit/TooltipDialog
+
+
+	var TooltipDialog = declare("dijit.TooltipDialog",
+		[ContentPane, _TemplatedMixin, _FormMixin, _DialogMixin], {
+			// summary:
+			//		Pops up a dialog that appears like a Tooltip
+
+			// title: String
+			//		Description of tooltip dialog (required for a11y)
+			title: "",
+
+			// doLayout: [protected] Boolean
+			//		Don't change this parameter from the default value.
+			//		This ContentPane parameter doesn't make sense for TooltipDialog, since TooltipDialog
+			//		is never a child of a layout container, nor can you specify the size of
+			//		TooltipDialog in order to control the size of an inner widget.
+			doLayout: false,
+
+			// autofocus: Boolean
+			//		A Toggle to modify the default focus behavior of a Dialog, which
+			//		is to focus on the first dialog element after opening the dialog.
+			//		False will disable autofocusing.  Default: true.
+			autofocus: true,
+
+			// baseClass: [protected] String
+			//		The root className to use for the various states of this widget
+			baseClass: "dijitTooltipDialog",
+
+			// _firstFocusItem: [private readonly] DomNode
+			//		The pointer to the first focusable node in the dialog.
+			//		Set by `dijit/_DialogMixin._getFocusItems()`.
+			_firstFocusItem: null,
+
+			// _lastFocusItem: [private readonly] DomNode
+			//		The pointer to which node has focus prior to our dialog.
+			//		Set by `dijit/_DialogMixin._getFocusItems()`.
+			_lastFocusItem: null,
+
+			templateString: template,
+
+			_setTitleAttr: "containerNode",
+
+			postCreate: function(){
+				this.inherited(arguments);
+				this.own(on(this.domNode, "keydown", lang.hitch(this, "_onKey")));
+			},
+
+			orient: function(/*DomNode*/ node, /*String*/ aroundCorner, /*String*/ tooltipCorner){
+				// summary:
+				//		Configure widget to be displayed in given position relative to the button.
+				//		This is called from the dijit.popup code, and should not be called
+				//		directly.
+				// tags:
+				//		protected
+
+				// Note: intentionally not using dijitTooltip class since that sets position:absolute, which
+				// confuses dijit/popup trying to get the size of the tooltip.
+				var newC = {
+					// Real around node
+					"MR-ML": "dijitTooltipRight",
+					"ML-MR": "dijitTooltipLeft",
+					"TM-BM": "dijitTooltipAbove",
+					"BM-TM": "dijitTooltipBelow",
+					"BL-TL": "dijitTooltipBelow dijitTooltipABLeft",
+					"TL-BL": "dijitTooltipAbove dijitTooltipABLeft",
+					"BR-TR": "dijitTooltipBelow dijitTooltipABRight",
+					"TR-BR": "dijitTooltipAbove dijitTooltipABRight",
+					"BR-BL": "dijitTooltipRight",
+					"BL-BR": "dijitTooltipLeft",
+
+					// Positioning "around" a point, ex: mouse position
+					"BR-TL": "dijitTooltipBelow dijitTooltipABLeft",
+					"BL-TR": "dijitTooltipBelow dijitTooltipABRight",
+					"TL-BR": "dijitTooltipAbove dijitTooltipABRight",
+					"TR-BL": "dijitTooltipAbove dijitTooltipABLeft"
+				}[aroundCorner + "-" + tooltipCorner];
+
+				domClass.replace(this.domNode, newC, this._currentOrientClass || "");
+				this._currentOrientClass = newC;
+
+				// Tooltip.orient() has code to reposition connector for when Tooltip is before/after anchor.
+				// Not putting here to avoid code bloat, and since TooltipDialogs are generally above/below.
+				// Should combine code from Tooltip and TooltipDialog.
+			},
+
+			focus: function(){
+				// summary:
+				//		Focus on first field
+				this._getFocusItems();
+				focus.focus(this._firstFocusItem);
+			},
+
+			onOpen: function(/*Object*/ pos){
+				// summary:
+				//		Called when dialog is displayed.
+				//		This is called from the dijit.popup code, and should not be called directly.
+				// tags:
+				//		protected
+
+				this.orient(this.domNode, pos.aroundCorner, pos.corner);
+
+				// Position the tooltip connector for middle alignment.
+				// This could not have been done in orient() since the tooltip wasn't positioned at that time.
+				var aroundNodeCoords = pos.aroundNodePos;
+				if(pos.corner.charAt(0) == 'M' && pos.aroundCorner.charAt(0) == 'M'){
+					this.connectorNode.style.top = aroundNodeCoords.y + ((aroundNodeCoords.h - this.connectorNode.offsetHeight) >> 1) - pos.y + "px";
+					this.connectorNode.style.left = "";
+				}else if(pos.corner.charAt(1) == 'M' && pos.aroundCorner.charAt(1) == 'M'){
+					this.connectorNode.style.left = aroundNodeCoords.x + ((aroundNodeCoords.w - this.connectorNode.offsetWidth) >> 1) - pos.x + "px";
+				}
+
+				this._onShow(); // lazy load trigger  (TODO: shouldn't we load before positioning?)
+			},
+
+			onClose: function(){
+				// summary:
+				//		Called when dialog is hidden.
+				//		This is called from the dijit.popup code, and should not be called directly.
+				// tags:
+				//		protected
+				this.onHide();
+			},
+
+			_onKey: function(/*Event*/ evt){
+				// summary:
+				//		Handler for keydown events
+				// description:
+				//		Keep keyboard focus in dialog; close dialog on escape key
+				// tags:
+				//		private
+
+				if(evt.keyCode == keys.ESCAPE){
+					// Use defer to avoid crash on IE, see #10396.  Not sure if this is still needed or not.
+					// If this if() wasn't here, presumably dijit/popup would catch the ESCAPE key and close the popup.
+					this.defer("onCancel");
+					evt.stopPropagation();
+					evt.preventDefault();
+				}else if(evt.keyCode == keys.TAB){
+					var node = evt.target;
+					this._getFocusItems();
+					if(this._firstFocusItem == this._lastFocusItem){
+						evt.stopPropagation();
+						evt.preventDefault();
+					}else if(node == this._firstFocusItem && evt.shiftKey){
+						focus.focus(this._lastFocusItem); // send focus to last item in dialog
+						evt.stopPropagation();
+						evt.preventDefault();
+					}else if(node == this._lastFocusItem && !evt.shiftKey){
+						focus.focus(this._firstFocusItem); // send focus to first item in dialog
+						evt.stopPropagation();
+						evt.preventDefault();
+					}else{
+						// we want the browser's default tab handling to move focus
+						// but we don't want the tab to propagate upwards
+						evt.stopPropagation();
+					}
+				}
+			}
+		});
+
+	if(has("dojo-bidi")){
+		TooltipDialog.extend({
+			_setTitleAttr: function(/*String*/ title){
+				this.containerNode.title = (this.textDir && this.enforceTextDirWithUcc) ? this.enforceTextDirWithUcc(null, title) : title;
+				this._set("title", title);
+			},
+
+			_setTextDirAttr: function(/*String*/ textDir){
+				if(!this._created || this.textDir != textDir){
+					this._set("textDir", textDir);
+					if(this.textDir && this.title){
+						this.containerNode.title = this.enforceTextDirWithUcc(null, this.title);
+					}
+				}
+			}
+		});
+	}
+
+	return TooltipDialog;
+});
diff --git a/src/main/resources/static/dijit/Tree.js b/src/main/resources/static/dijit/Tree.js
new file mode 100644
index 0000000000000000000000000000000000000000..212504b527bc466acf879842c2aea892547b3efb
--- /dev/null
+++ b/src/main/resources/static/dijit/Tree.js
@@ -0,0 +1,1831 @@
+define([
+	"dojo/_base/array", // array.filter array.forEach array.map
+	"dojo/aspect",
+	"dojo/cookie", // cookie
+	"dojo/_base/declare", // declare
+	"dojo/Deferred", // Deferred
+	"dojo/promise/all",
+	"dojo/dom", // dom.isDescendant
+	"dojo/dom-class", // domClass.add domClass.remove domClass.replace domClass.toggle
+	"dojo/dom-geometry", // domGeometry.setMarginBox domGeometry.position
+	"dojo/dom-style", // domStyle.set
+	"dojo/errors/create", // createError
+	"dojo/fx", // fxUtils.wipeIn fxUtils.wipeOut
+	"dojo/has",
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/keys", // arrows etc.
+	"dojo/_base/lang", // lang.getObject lang.mixin lang.hitch
+	"dojo/on", // on(), on.selector()
+	"dojo/topic",
+	"dojo/touch",
+	"dojo/when",
+	"./a11yclick",
+	"./focus",
+	"./registry", // registry.byNode(), registry.getEnclosingWidget()
+	"./_base/manager", // manager.defaultDuration
+	"./_Widget",
+	"./_TemplatedMixin",
+	"./_Container",
+	"./_Contained",
+	"./_CssStateMixin",
+	"./_KeyNavMixin",
+	"dojo/text!./templates/TreeNode.html",
+	"dojo/text!./templates/Tree.html",
+	"./tree/TreeStoreModel",
+	"./tree/ForestStoreModel",
+	"./tree/_dndSelector",
+	"dojo/query!css2"	// needed when on.selector() used with a string for the selector
+], function(array, aspect, cookie, declare, Deferred, all,
+			dom, domClass, domGeometry, domStyle, createError, fxUtils, has, kernel, keys, lang, on, topic, touch, when,
+			a11yclick, focus, registry, manager, _Widget, _TemplatedMixin, _Container, _Contained, _CssStateMixin, _KeyNavMixin,
+			treeNodeTemplate, treeTemplate, TreeStoreModel, ForestStoreModel, _dndSelector){
+
+	// module:
+	//		dijit/Tree
+
+	function shimmedPromise(/*Deferred|Promise*/ d){
+		// summary:
+		//		Return a Promise based on given Deferred or Promise, with back-compat addCallback() and addErrback() shims
+		//		added (TODO: remove those back-compat shims, and this method, for 2.0)
+
+		return lang.delegate(d.promise || d, {
+			addCallback: function(callback){
+				this.then(callback);
+			},
+			addErrback: function(errback){
+				this.otherwise(errback);
+			}
+		});
+	}
+
+	var TreeNode = declare("dijit._TreeNode", [_Widget, _TemplatedMixin, _Container, _Contained, _CssStateMixin], {
+		// summary:
+		//		Single node within a tree.   This class is used internally
+		//		by Tree and should not be accessed directly.
+		// tags:
+		//		private
+
+		// item: [const] Item
+		//		the dojo.data entry this tree represents
+		item: null,
+
+		// isTreeNode: [protected] Boolean
+		//		Indicates that this is a TreeNode.   Used by `dijit.Tree` only,
+		//		should not be accessed directly.
+		isTreeNode: true,
+
+		// label: String
+		//		Text of this tree node
+		label: "",
+		_setLabelAttr: function(val){
+			this.labelNode[this.labelType == "html" ? "innerHTML" : "innerText" in this.labelNode ?
+				"innerText" : "textContent"] = val;
+			this._set("label", val);
+			if(has("dojo-bidi")){
+				this.applyTextDir(this.labelNode);
+			}
+		},
+
+		// labelType: [const] String
+		//		Specifies how to interpret the label.  Can be "html" or "text".
+		labelType: "text",
+
+		// isExpandable: [private] Boolean
+		//		This node has children, so show the expando node (+ sign)
+		isExpandable: null,
+
+		// isExpanded: [readonly] Boolean
+		//		This node is currently expanded (ie, opened)
+		isExpanded: false,
+
+		// state: [private] String
+		//		Dynamic loading-related stuff.
+		//		When an empty folder node appears, it is "NotLoaded" first,
+		//		then after dojo.data query it becomes "Loading" and, finally "Loaded"
+		state: "NotLoaded",
+
+		templateString: treeNodeTemplate,
+
+		baseClass: "dijitTreeNode",
+
+		// For hover effect for tree node, and focus effect for label
+		cssStateNodes: {
+			rowNode: "dijitTreeRow"
+		},
+
+		// Tooltip is defined in _WidgetBase but we need to handle the mapping to DOM here
+		_setTooltipAttr: {node: "rowNode", type: "attribute", attribute: "title"},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			// set expand icon for leaf
+			this._setExpando();
+
+			// set icon and label class based on item
+			this._updateItemClasses(this.item);
+
+			if(this.isExpandable){
+				this.labelNode.setAttribute("aria-expanded", this.isExpanded);
+			}
+
+			//aria-selected should be false on all selectable elements.
+			this.setSelected(false);
+		},
+
+		_setIndentAttr: function(indent){
+			// summary:
+			//		Tell this node how many levels it should be indented
+			// description:
+			//		0 for top level nodes, 1 for their children, 2 for their
+			//		grandchildren, etc.
+
+			// Math.max() is to prevent negative padding on hidden root node (when indent == -1)
+			var pixels = (Math.max(indent, 0) * this.tree._nodePixelIndent) + "px";
+
+			domStyle.set(this.domNode, "backgroundPosition", pixels + " 0px");	// TODOC: what is this for???
+			domStyle.set(this.rowNode, this.isLeftToRight() ? "paddingLeft" : "paddingRight", pixels);
+
+			array.forEach(this.getChildren(), function(child){
+				child.set("indent", indent + 1);
+			});
+
+			this._set("indent", indent);
+		},
+
+		markProcessing: function(){
+			// summary:
+			//		Visually denote that tree is loading data, etc.
+			// tags:
+			//		private
+			this.state = "Loading";
+			this._setExpando(true);
+		},
+
+		unmarkProcessing: function(){
+			// summary:
+			//		Clear markup from markProcessing() call
+			// tags:
+			//		private
+			this._setExpando(false);
+		},
+
+		_updateItemClasses: function(item){
+			// summary:
+			//		Set appropriate CSS classes for icon and label dom node
+			//		(used to allow for item updates to change respective CSS)
+			// tags:
+			//		private
+			var tree = this.tree, model = tree.model;
+			if(tree._v10Compat && item === model.root){
+				// For back-compat with 1.0, need to use null to specify root item (TODO: remove in 2.0)
+				item = null;
+			}
+			this._applyClassAndStyle(item, "icon", "Icon");
+			this._applyClassAndStyle(item, "label", "Label");
+			this._applyClassAndStyle(item, "row", "Row");
+
+			this.tree._startPaint(true);		// signifies paint started and finished (synchronously)
+		},
+
+		_applyClassAndStyle: function(item, lower, upper){
+			// summary:
+			//		Set the appropriate CSS classes and styles for labels, icons and rows.
+			//
+			// item:
+			//		The data item.
+			//
+			// lower:
+			//		The lower case attribute to use, e.g. 'icon', 'label' or 'row'.
+			//
+			// upper:
+			//		The upper case attribute to use, e.g. 'Icon', 'Label' or 'Row'.
+			//
+			// tags:
+			//		private
+
+			var clsName = "_" + lower + "Class";
+			var nodeName = lower + "Node";
+			var oldCls = this[clsName];
+
+			this[clsName] = this.tree["get" + upper + "Class"](item, this.isExpanded);
+			domClass.replace(this[nodeName], this[clsName] || "", oldCls || "");
+
+			domStyle.set(this[nodeName], this.tree["get" + upper + "Style"](item, this.isExpanded) || {});
+		},
+
+		_updateLayout: function(){
+			// summary:
+			//		Set appropriate CSS classes for this.domNode
+			// tags:
+			//		private
+
+			// if we are hiding the root node then make every first level child look like a root node
+			var parent = this.getParent(),
+				markAsRoot = !parent || !parent.rowNode || parent.rowNode.style.display == "none";
+			domClass.toggle(this.domNode, "dijitTreeIsRoot", markAsRoot);
+
+			domClass.toggle(this.domNode, "dijitTreeIsLast", !markAsRoot && !this.getNextSibling());
+		},
+
+		_setExpando: function(/*Boolean*/ processing){
+			// summary:
+			//		Set the right image for the expando node
+			// tags:
+			//		private
+
+			var styles = ["dijitTreeExpandoLoading", "dijitTreeExpandoOpened",
+					"dijitTreeExpandoClosed", "dijitTreeExpandoLeaf"],
+				_a11yStates = ["*", "-", "+", "*"],
+				idx = processing ? 0 : (this.isExpandable ? (this.isExpanded ? 1 : 2) : 3);
+
+			// apply the appropriate class to the expando node
+			domClass.replace(this.expandoNode, styles[idx], styles);
+
+			// provide a non-image based indicator for images-off mode
+			this.expandoNodeText.innerHTML = _a11yStates[idx];
+
+		},
+
+		expand: function(){
+			// summary:
+			//		Show my children
+			// returns:
+			//		Promise that resolves when expansion is complete
+
+			// If there's already an expand in progress or we are already expanded, just return
+			if(this._expandDeferred){
+				return shimmedPromise(this._expandDeferred);		// dojo/promise/Promise
+			}
+
+			// cancel in progress collapse operation
+			if(this._collapseDeferred){
+				this._collapseDeferred.cancel();
+				delete this._collapseDeferred;
+			}
+
+			// All the state information for when a node is expanded, maybe this should be
+			// set when the animation completes instead
+			this.isExpanded = true;
+			this.labelNode.setAttribute("aria-expanded", "true");
+			if(this.tree.showRoot || this !== this.tree.rootNode){
+				this.containerNode.setAttribute("role", "group");
+			}
+			domClass.add(this.contentNode, 'dijitTreeContentExpanded');
+			this._setExpando();
+			this._updateItemClasses(this.item);
+
+			if(this == this.tree.rootNode && this.tree.showRoot){
+				this.tree.domNode.setAttribute("aria-expanded", "true");
+			}
+
+			var wipeIn = fxUtils.wipeIn({
+				node: this.containerNode,
+				duration: manager.defaultDuration
+			});
+
+			// Deferred that fires when expand is complete
+			var def = (this._expandDeferred = new Deferred(function(){
+				// Canceller
+				wipeIn.stop();
+			}));
+
+			aspect.after(wipeIn, "onEnd", function(){
+				def.resolve(true);
+			}, true);
+
+			wipeIn.play();
+
+			return shimmedPromise(def);		// dojo/promise/Promise
+		},
+
+		collapse: function(){
+			// summary:
+			//		Collapse this node (if it's expanded)
+			// returns:
+			//		Promise that resolves when collapse is complete
+
+			if(this._collapseDeferred){
+				// Node is already collapsed, or there's a collapse in progress, just return that Deferred
+				return shimmedPromise(this._collapseDeferred);
+			}
+
+			// cancel in progress expand operation
+			if(this._expandDeferred){
+				this._expandDeferred.cancel();
+				delete this._expandDeferred;
+			}
+
+			this.isExpanded = false;
+			this.labelNode.setAttribute("aria-expanded", "false");
+			if(this == this.tree.rootNode && this.tree.showRoot){
+				this.tree.domNode.setAttribute("aria-expanded", "false");
+			}
+			domClass.remove(this.contentNode, 'dijitTreeContentExpanded');
+			this._setExpando();
+			this._updateItemClasses(this.item);
+
+			var wipeOut = fxUtils.wipeOut({
+				node: this.containerNode,
+				duration: manager.defaultDuration
+			});
+
+			// Deferred that fires when expand is complete
+			var def = (this._collapseDeferred = new Deferred(function(){
+				// Canceller
+				wipeOut.stop();
+			}));
+
+			aspect.after(wipeOut, "onEnd", function(){
+				def.resolve(true);
+			}, true);
+
+			wipeOut.play();
+
+			return shimmedPromise(def);		// dojo/promise/Promise
+		},
+
+		// indent: Integer
+		//		Levels from this node to the root node
+		indent: 0,
+
+		setChildItems: function(/* Object[] */ items){
+			// summary:
+			//		Sets the child items of this node, removing/adding nodes
+			//		from current children to match specified items[] array.
+			//		Also, if this.persist == true, expands any children that were previously
+			//		opened.
+			// returns:
+			//		Promise that resolves after all previously opened children
+			//		have been expanded again (or fires instantly if there are no such children).
+
+			var tree = this.tree,
+				model = tree.model,
+				defs = [];	// list of deferreds that need to fire before I am complete
+
+
+			var focusedChild = tree.focusedChild;
+
+			// Orphan all my existing children.
+			// If items contains some of the same items as before then we will reattach them.
+			// Don't call this.removeChild() because that will collapse the tree etc.
+			var oldChildren = this.getChildren();
+			array.forEach(oldChildren, function(child){
+				_Container.prototype.removeChild.call(this, child);
+			}, this);
+
+			// All the old children of this TreeNode are subject for destruction if
+			//		1) they aren't listed in the new children array (items)
+			//		2) they aren't immediately adopted by another node (DnD)
+			this.defer(function(){
+				array.forEach(oldChildren, function(node){
+					if(!node._destroyed && !node.getParent()){
+						// If node is in selection then remove it.
+						tree.dndController.removeTreeNode(node);
+
+						// Deregister mapping from item id --> this node and its descendants
+						function remove(node){
+							var id = model.getIdentity(node.item),
+								ary = tree._itemNodesMap[id];
+							if(ary.length == 1){
+								delete tree._itemNodesMap[id];
+							}else{
+								var index = array.indexOf(ary, node);
+								if(index != -1){
+									ary.splice(index, 1);
+								}
+							}
+							array.forEach(node.getChildren(), remove);
+						}
+
+						remove(node);
+
+						// Remove any entries involving this node from cookie tracking expanded nodes
+						if(tree.persist){
+							var destroyedPath = array.map(node.getTreePath(),function(item){
+								return tree.model.getIdentity(item);
+							}).join("/");
+							for(var path in tree._openedNodes){
+								if(path.substr(0, destroyedPath.length) == destroyedPath){
+									delete tree._openedNodes[path];
+								}
+							}
+							tree._saveExpandedNodes();
+						}
+
+						// If we've orphaned the focused node then move focus to the root node
+						if(tree.lastFocusedChild && !dom.isDescendant(tree.lastFocusedChild.domNode, tree.domNode)){
+							delete tree.lastFocusedChild;
+						}
+						if(focusedChild && !dom.isDescendant(focusedChild.domNode, tree.domNode)){
+							tree.focus();	// could alternately focus this node (parent of the deleted node)
+						}
+
+						// And finally we can destroy the node
+						node.destroyRecursive();
+					}
+				});
+
+			});
+
+			this.state = "Loaded";
+
+			if(items && items.length > 0){
+				this.isExpandable = true;
+
+				// Create _TreeNode widget for each specified tree node, unless one already
+				// exists and isn't being used (presumably it's from a DnD move and was recently
+				// released
+				array.forEach(items, function(item){    // MARKER: REUSE NODE
+					var id = model.getIdentity(item),
+						existingNodes = tree._itemNodesMap[id],
+						node;
+					if(existingNodes){
+						for(var i = 0; i < existingNodes.length; i++){
+							if(existingNodes[i] && !existingNodes[i].getParent()){
+								node = existingNodes[i];
+								node.set('indent', this.indent + 1);
+								break;
+							}
+						}
+					}
+					if(!node){
+						node = this.tree._createTreeNode({
+							item: item,
+							tree: tree,
+							isExpandable: model.mayHaveChildren(item),
+							label: tree.getLabel(item),
+							labelType: (tree.model && tree.model.labelType) || "text",
+							tooltip: tree.getTooltip(item),
+							ownerDocument: tree.ownerDocument,
+							dir: tree.dir,
+							lang: tree.lang,
+							textDir: tree.textDir,
+							indent: this.indent + 1
+						});
+						if(existingNodes){
+							existingNodes.push(node);
+						}else{
+							tree._itemNodesMap[id] = [node];
+						}
+					}
+					this.addChild(node);
+
+					// If node was previously opened then open it again now (this may trigger
+					// more data store accesses, recursively)
+					if(this.tree.autoExpand || this.tree._state(node)){
+						defs.push(tree._expandNode(node));
+					}
+				}, this);
+
+				// note that updateLayout() needs to be called on each child after
+				// _all_ the children exist
+				array.forEach(this.getChildren(), function(child){
+					child._updateLayout();
+				});
+			}else{
+				this.isExpandable = false;
+			}
+
+			if(this._setExpando){
+				// change expando to/from dot or + icon, as appropriate
+				this._setExpando(false);
+			}
+
+			// Set leaf icon or folder icon, as appropriate
+			this._updateItemClasses(this.item);
+
+			var def = all(defs);
+			this.tree._startPaint(def);		// to reset TreeNode widths after an item is added/removed from the Tree
+			return shimmedPromise(def);		// dojo/promise/Promise
+		},
+
+		getTreePath: function(){
+			var node = this;
+			var path = [];
+			while(node && node !== this.tree.rootNode){
+				path.unshift(node.item);
+				node = node.getParent();
+			}
+			path.unshift(this.tree.rootNode.item);
+
+			return path;
+		},
+
+		getIdentity: function(){
+			return this.tree.model.getIdentity(this.item);
+		},
+
+		removeChild: function(/* treeNode */ node){
+			this.inherited(arguments);
+
+			var children = this.getChildren();
+			if(children.length == 0){
+				this.isExpandable = false;
+				this.collapse();
+			}
+
+			array.forEach(children, function(child){
+				child._updateLayout();
+			});
+		},
+
+		makeExpandable: function(){
+			// summary:
+			//		if this node wasn't already showing the expando node,
+			//		turn it into one and call _setExpando()
+
+			// TODO: hmm this isn't called from anywhere, maybe should remove it for 2.0
+
+			this.isExpandable = true;
+			this._setExpando(false);
+		},
+
+		setSelected: function(/*Boolean*/ selected){
+			// summary:
+			//		A Tree has a (single) currently selected node.
+			//		Mark that this node is/isn't that currently selected node.
+			// description:
+			//		In particular, setting a node as selected involves setting tabIndex
+			//		so that when user tabs to the tree, focus will go to that node (only).
+			this.labelNode.setAttribute("aria-selected", selected ? "true" : "false");
+			domClass.toggle(this.rowNode, "dijitTreeRowSelected", selected);
+		},
+
+		focus: function(){
+			focus.focus(this.focusNode);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		TreeNode.extend({
+			_setTextDirAttr: function(textDir){
+				if(textDir && ((this.textDir != textDir) || !this._created)){
+					this._set("textDir", textDir);
+					this.applyTextDir(this.labelNode);
+					array.forEach(this.getChildren(), function(childNode){
+						childNode.set("textDir", textDir);
+					}, this);
+				}
+			}
+		});
+	}
+
+	var Tree = declare("dijit.Tree", [_Widget, _KeyNavMixin, _TemplatedMixin, _CssStateMixin], {
+		// summary:
+		//		This widget displays hierarchical data from a store.
+
+		baseClass: "dijitTree",
+
+		// store: [deprecated] String|dojo/data/Store
+		//		Deprecated.  Use "model" parameter instead.
+		//		The store to get data to display in the tree.
+		store: null,
+
+		// model: [const] dijit/tree/model
+		//		Interface to read tree data, get notifications of changes to tree data,
+		//		and for handling drop operations (i.e drag and drop onto the tree)
+		model: null,
+
+		// query: [deprecated] anything
+		//		Deprecated.  User should specify query to the model directly instead.
+		//		Specifies datastore query to return the root item or top items for the tree.
+		query: null,
+
+		// label: [deprecated] String
+		//		Deprecated.  Use dijit/tree/ForestStoreModel directly instead.
+		//		Used in conjunction with query parameter.
+		//		If a query is specified (rather than a root node id), and a label is also specified,
+		//		then a fake root node is created and displayed, with this label.
+		label: "",
+
+		// showRoot: [const] Boolean
+		//		Should the root node be displayed, or hidden?
+		showRoot: true,
+
+		// childrenAttr: [deprecated] String[]
+		//		Deprecated.   This information should be specified in the model.
+		//		One ore more attributes that holds children of a tree node
+		childrenAttr: ["children"],
+
+		// paths: String[][] or Item[][]
+		//		Full paths from rootNode to selected nodes expressed as array of items or array of ids.
+		//		Since setting the paths may be asynchronous (because of waiting on dojo.data), set("paths", ...)
+		//		returns a Promise to indicate when the set is complete.
+		paths: [],
+
+		// path: String[] or Item[]
+		//		Backward compatible singular variant of paths.
+		path: [],
+
+		// selectedItems: [readonly] Item[]
+		//		The currently selected items in this tree.
+		//		This property can only be set (via set('selectedItems', ...)) when that item is already
+		//		visible in the tree.   (I.e. the tree has already been expanded to show that node.)
+		//		Should generally use `paths` attribute to set the selected items instead.
+		selectedItems: null,
+
+		// selectedItem: [readonly] Item
+		//		Backward compatible singular variant of selectedItems.
+		selectedItem: null,
+
+		// openOnClick: Boolean
+		//		If true, clicking a folder node's label will open it, rather than calling onClick()
+		openOnClick: false,
+
+		// openOnDblClick: Boolean
+		//		If true, double-clicking a folder node's label will open it, rather than calling onDblClick()
+		openOnDblClick: false,
+
+		templateString: treeTemplate,
+
+		// persist: Boolean
+		//		Enables/disables use of cookies for state saving.
+		persist: false,
+
+		// autoExpand: Boolean
+		//		Fully expand the tree on load.   Overrides `persist`.
+		autoExpand: false,
+
+		// dndController: [protected] Function|String
+		//		Class to use as as the dnd controller.  Specifying this class enables DnD.
+		//		Generally you should specify this as dijit/tree/dndSource.
+		//		Setting of dijit/tree/_dndSelector handles selection only (no actual DnD).
+		dndController: _dndSelector,
+
+		// parameters to pull off of the tree and pass on to the dndController as its params
+		dndParams: ["onDndDrop", "itemCreator", "onDndCancel", "checkAcceptance", "checkItemAcceptance", "dragThreshold", "betweenThreshold"],
+
+		//declare the above items so they can be pulled from the tree's markup
+
+		// onDndDrop: [protected] Function
+		//		Parameter to dndController, see `dijit/tree/dndSource.onDndDrop()`.
+		//		Generally this doesn't need to be set.
+		onDndDrop: null,
+
+		itemCreator: null,
+		/*=====
+		itemCreator: function(nodes, target, source){
+			// summary:
+			//		Returns objects passed to `Tree.model.newItem()` based on DnD nodes
+			//		dropped onto the tree.   Developer must override this method to enable
+			//		dropping from external sources onto this Tree, unless the Tree.model's items
+			//		happen to look like {id: 123, name: "Apple" } with no other attributes.
+			//
+			//		For each node in nodes[], which came from source, create a hash of name/value
+			//		pairs to be passed to Tree.model.newItem().  Returns array of those hashes.
+			// nodes: DomNode[]
+			//		The DOMNodes dragged from the source container
+			// target: DomNode
+			//		The target TreeNode.rowNode
+			// source: dojo/dnd/Source
+			//		The source container the nodes were dragged from, perhaps another Tree or a plain dojo/dnd/Source
+			// returns: Object[]
+			//		Array of name/value hashes for each new item to be added to the Tree, like:
+			// |	[
+			// |		{ id: 123, label: "apple", foo: "bar" },
+			// |		{ id: 456, label: "pear", zaz: "bam" }
+			// |	]
+			// tags:
+			//		extension
+			return [{}];
+		},
+		=====*/
+
+		// onDndCancel: [protected] Function
+		//		Parameter to dndController, see `dijit/tree/dndSource.onDndCancel()`.
+		//		Generally this doesn't need to be set.
+		onDndCancel: null,
+
+		/*=====
+		checkAcceptance: function(source, nodes){
+			// summary:
+			//		Checks if the Tree itself can accept nodes from this source
+			// source: dijit/tree/dndSource
+			//		The source which provides items
+			// nodes: DOMNode[]
+			//		Array of DOM nodes corresponding to nodes being dropped, dijitTreeRow nodes if
+			//		source is a dijit/Tree.
+			// tags:
+			//		extension
+			return true;	// Boolean
+		},
+		=====*/
+		checkAcceptance: null,
+
+		/*=====
+		checkItemAcceptance: function(target, source, position){
+			// summary:
+			//		Stub function to be overridden if one wants to check for the ability to drop at the node/item level
+			// description:
+			//		In the base case, this is called to check if target can become a child of source.
+			//		When betweenThreshold is set, position="before" or "after" means that we
+			//		are asking if the source node can be dropped before/after the target node.
+			// target: DOMNode
+			//		The dijitTreeRoot DOM node inside of the TreeNode that we are dropping on to
+			//		Use registry.getEnclosingWidget(target) to get the TreeNode.
+			// source: dijit/tree/dndSource
+			//		The (set of) nodes we are dropping
+			// position: String
+			//		"over", "before", or "after"
+			// tags:
+			//		extension
+			return true;	// Boolean
+		},
+		=====*/
+		checkItemAcceptance: null,
+
+		// dragThreshold: Integer
+		//		Number of pixels mouse moves before it's considered the start of a drag operation
+		dragThreshold: 5,
+
+		// betweenThreshold: Integer
+		//		Set to a positive value to allow drag and drop "between" nodes.
+		//
+		//		If during DnD mouse is over a (target) node but less than betweenThreshold
+		//		pixels from the bottom edge, dropping the the dragged node will make it
+		//		the next sibling of the target node, rather than the child.
+		//
+		//		Similarly, if mouse is over a target node but less that betweenThreshold
+		//		pixels from the top edge, dropping the dragged node will make it
+		//		the target node's previous sibling rather than the target node's child.
+		betweenThreshold: 0,
+
+		// _nodePixelIndent: Integer
+		//		Number of pixels to indent tree nodes (relative to parent node).
+		//		Default is 19 but can be overridden by setting CSS class dijitTreeIndent
+		//		and calling resize() or startup() on tree after it's in the DOM.
+		_nodePixelIndent: 19,
+
+		_publish: function(/*String*/ topicName, /*Object*/ message){
+			// summary:
+			//		Publish a message for this widget/topic
+			topic.publish(this.id, lang.mixin({tree: this, event: topicName}, message || {}));	// publish
+		},
+
+		postMixInProperties: function(){
+			this.tree = this;
+
+			if(this.autoExpand){
+				// There's little point in saving opened/closed state of nodes for a Tree
+				// that initially opens all it's nodes.
+				this.persist = false;
+			}
+
+			this._itemNodesMap = {};
+
+			if(!this.cookieName && this.id){
+				this.cookieName = this.id + "SaveStateCookie";
+			}
+
+			// Deferred that resolves when all the children have loaded.
+			this.expandChildrenDeferred = new Deferred();
+
+			// Promise that resolves when all pending operations complete.
+			this.pendingCommandsPromise = this.expandChildrenDeferred.promise;
+
+			this.inherited(arguments);
+		},
+
+		postCreate: function(){
+			this._initState();
+
+			// Catch events on TreeNodes
+			var self = this;
+			this.own(
+				on(this.containerNode, on.selector(".dijitTreeNode", touch.enter), function(evt){
+					self._onNodeMouseEnter(registry.byNode(this), evt);
+				}),
+				on(this.containerNode, on.selector(".dijitTreeNode", touch.leave), function(evt){
+					self._onNodeMouseLeave(registry.byNode(this), evt);
+				}),
+				on(this.containerNode, on.selector(".dijitTreeRow", a11yclick.press), function(evt){
+					self._onNodePress(registry.getEnclosingWidget(this), evt);
+				}),
+				on(this.containerNode, on.selector(".dijitTreeRow", a11yclick), function(evt){
+					self._onClick(registry.getEnclosingWidget(this), evt);
+				}),
+				on(this.containerNode, on.selector(".dijitTreeRow", "dblclick"), function(evt){
+					self._onDblClick(registry.getEnclosingWidget(this), evt);
+				})
+			);
+
+			// Create glue between store and Tree, if not specified directly by user
+			if(!this.model){
+				this._store2model();
+			}
+
+			// monitor changes to items
+			this.own(
+				aspect.after(this.model, "onChange", lang.hitch(this, "_onItemChange"), true),
+				aspect.after(this.model, "onChildrenChange", lang.hitch(this, "_onItemChildrenChange"), true),
+				aspect.after(this.model, "onDelete", lang.hitch(this, "_onItemDelete"), true)
+			);
+
+			this.inherited(arguments);
+
+			if(this.dndController){
+				// TODO: remove string support in 2.0.
+				if(lang.isString(this.dndController)){
+					this.dndController = lang.getObject(this.dndController);
+				}
+				var params = {};
+				for(var i = 0; i < this.dndParams.length; i++){
+					if(this[this.dndParams[i]]){
+						params[this.dndParams[i]] = this[this.dndParams[i]];
+					}
+				}
+				this.dndController = new this.dndController(this, params);
+			}
+
+			this._load();
+
+			// onLoadDeferred should fire when all commands that are part of initialization have completed.
+			// It will include all the set("paths", ...) commands that happen during initialization.
+			this.onLoadDeferred = shimmedPromise(this.pendingCommandsPromise);
+
+			this.onLoadDeferred.then(lang.hitch(this, "onLoad"));
+		},
+
+		_store2model: function(){
+			// summary:
+			//		User specified a store&query rather than model, so create model from store/query
+			this._v10Compat = true;
+			kernel.deprecated("Tree: from version 2.0, should specify a model object rather than a store/query");
+
+			var modelParams = {
+				id: this.id + "_ForestStoreModel",
+				store: this.store,
+				query: this.query,
+				childrenAttrs: this.childrenAttr
+			};
+
+			// Only override the model's mayHaveChildren() method if the user has specified an override
+			if(this.params.mayHaveChildren){
+				modelParams.mayHaveChildren = lang.hitch(this, "mayHaveChildren");
+			}
+
+			if(this.params.getItemChildren){
+				modelParams.getChildren = lang.hitch(this, function(item, onComplete, onError){
+					this.getItemChildren((this._v10Compat && item === this.model.root) ? null : item, onComplete, onError);
+				});
+			}
+			this.model = new ForestStoreModel(modelParams);
+
+			// For backwards compatibility, the visibility of the root node is controlled by
+			// whether or not the user has specified a label
+			this.showRoot = Boolean(this.label);
+		},
+
+		onLoad: function(){
+			// summary:
+			//		Called when tree finishes loading and expanding.
+			// description:
+			//		If persist == true the loading may encompass many levels of fetches
+			//		from the data store, each asynchronous.   Waits for all to finish.
+			// tags:
+			//		callback
+		},
+
+		_load: function(){
+			// summary:
+			//		Initial load of the tree.
+			//		Load root node (possibly hidden) and it's children.
+			this.model.getRoot(
+				lang.hitch(this, function(item){
+					var rn = (this.rootNode = this.tree._createTreeNode({
+						item: item,
+						tree: this,
+						isExpandable: true,
+						label: this.label || this.getLabel(item),
+						labelType: this.model.labelType || "text",
+						textDir: this.textDir,
+						indent: this.showRoot ? 0 : -1
+					}));
+
+					if(!this.showRoot){
+						rn.rowNode.style.display = "none";
+						// if root is not visible, move tree role to the invisible
+						// root node's containerNode, see #12135
+						this.domNode.setAttribute("role", "presentation");
+						this.domNode.removeAttribute("aria-expanded");
+						this.domNode.removeAttribute("aria-multiselectable");
+
+						// move the aria-label or aria-labelledby to the element with the role
+						if(this["aria-label"]){
+							rn.containerNode.setAttribute("aria-label", this["aria-label"]);
+							this.domNode.removeAttribute("aria-label");
+						}else if(this["aria-labelledby"]){
+							rn.containerNode.setAttribute("aria-labelledby", this["aria-labelledby"]);
+							this.domNode.removeAttribute("aria-labelledby");
+						}
+						rn.labelNode.setAttribute("role", "presentation");
+						rn.labelNode.removeAttribute("aria-selected");
+						rn.containerNode.setAttribute("role", "tree");
+						rn.containerNode.setAttribute("aria-expanded", "true");
+						rn.containerNode.setAttribute("aria-multiselectable", !this.dndController.singular);
+					}else{
+						this.domNode.setAttribute("aria-multiselectable", !this.dndController.singular);
+						this.rootLoadingIndicator.style.display = "none";
+					}
+
+					this.containerNode.appendChild(rn.domNode);
+					var identity = this.model.getIdentity(item);
+					if(this._itemNodesMap[identity]){
+						this._itemNodesMap[identity].push(rn);
+					}else{
+						this._itemNodesMap[identity] = [rn];
+					}
+
+					rn._updateLayout();		// sets "dijitTreeIsRoot" CSS classname
+
+					// Load top level children, and if persist==true, all nodes that were previously opened
+					this._expandNode(rn).then(lang.hitch(this, function(){
+						// Then, select the nodes specified by params.paths[], assuming Tree hasn't been deleted.
+						if(!this._destroyed){
+							this.rootLoadingIndicator.style.display = "none";
+							this.expandChildrenDeferred.resolve(true);
+						}
+					}));
+				}),
+				lang.hitch(this, function(err){
+					console.error(this, ": error loading root: ", err);
+				})
+			);
+		},
+
+		getNodesByItem: function(/*Item or id*/ item){
+			// summary:
+			//		Returns all tree nodes that refer to an item
+			// returns:
+			//		Array of tree nodes that refer to passed item
+
+			if(!item){
+				return [];
+			}
+			var identity = lang.isString(item) ? item : this.model.getIdentity(item);
+			// return a copy so widget don't get messed up by changes to returned array
+			return [].concat(this._itemNodesMap[identity]);
+		},
+
+		_setSelectedItemAttr: function(/*Item or id*/ item){
+			this.set('selectedItems', [item]);
+		},
+
+		_setSelectedItemsAttr: function(/*Items or ids*/ items){
+			// summary:
+			//		Select tree nodes related to passed items.
+			//		WARNING: if model use multi-parented items or desired tree node isn't already loaded
+			//		behavior is undefined. Use set('paths', ...) instead.
+			var tree = this;
+			return this.pendingCommandsPromise = this.pendingCommandsPromise.always(lang.hitch(this, function(){
+				var identities = array.map(items, function(item){
+					return (!item || lang.isString(item)) ? item : tree.model.getIdentity(item);
+				});
+				var nodes = [];
+				array.forEach(identities, function(id){
+					nodes = nodes.concat(tree._itemNodesMap[id] || []);
+				});
+				this.set('selectedNodes', nodes);
+			}));
+		},
+
+		_setPathAttr: function(/*Item[]|String[]*/ path){
+			// summary:
+			//		Singular variant of _setPathsAttr
+			if(path.length){
+				return shimmedPromise(this.set("paths", [path]).then(function(paths){ return paths[0]; }));
+			}else{
+				// Empty list is interpreted as "select nothing"
+				return shimmedPromise(this.set("paths", []).then(function(paths){ return paths[0]; }));
+			}
+		},
+
+		_setPathsAttr: function(/*Item[][]|String[][]*/ paths){
+			// summary:
+			//		Select the tree nodes identified by passed paths.
+			// paths:
+			//		Array of arrays of items or item id's
+			// returns:
+			//		Promise to indicate when the set is complete
+
+			var tree = this;
+
+			function selectPath(path, nodes){
+				// Traverse path, returning Promise for node at the end of the path.
+				// The next path component should be among "nodes".
+				var nextPath = path.shift();
+				var nextNode = array.filter(nodes, function(node){
+					return node.getIdentity() == nextPath;
+				})[0];
+				if(!!nextNode){
+					if(path.length){
+						return tree._expandNode(nextNode).then(function(){
+							return selectPath(path, nextNode.getChildren());
+						});
+					}else{
+						// Successfully reached the end of this path
+						return nextNode;
+					}
+				}else{
+					throw new Tree.PathError("Could not expand path at " + nextPath);
+				}
+			}
+
+			// Let any previous set("path", ...) commands complete before this one starts.
+			// TODO for 2.0: make the user do this wait themselves?
+			return shimmedPromise(this.pendingCommandsPromise = this.pendingCommandsPromise.always(function(){
+				// We may need to wait for some nodes to expand, so setting
+				// each path will involve a Deferred. We bring those deferreds
+				// together with a dojo/promise/all.
+				return all(array.map(paths, function(path){
+					// normalize path to use identity
+					path = array.map(path, function(item){
+						return item && lang.isObject(item) ? tree.model.getIdentity(item) : item;
+					});
+
+					if(path.length){
+						return selectPath(path, [tree.rootNode]);
+					}else{
+						throw new Tree.PathError("Empty path");
+					}
+				}));
+			}).then(function setNodes(newNodes){
+				// After all expansion is finished, set the selection to last element from each path
+				tree.set("selectedNodes", newNodes);
+				return tree.paths;
+			}));
+		},
+
+		_setSelectedNodeAttr: function(node){
+			this.set('selectedNodes', [node]);
+		},
+		_setSelectedNodesAttr: function(nodes){
+			// summary:
+			//		Marks the specified TreeNodes as selected.
+			// nodes: TreeNode[]
+			//		TreeNodes to mark.
+			this.dndController.setSelection(nodes);
+		},
+
+
+		expandAll: function(){
+			// summary:
+			//		Expand all nodes in the tree
+			// returns:
+			//		Promise that resolves when all nodes have expanded
+
+			var _this = this;
+
+			function expand(node){
+				// Expand the node
+				return _this._expandNode(node).then(function(){
+					// When node has expanded, call expand() recursively on each non-leaf child
+					var childBranches = array.filter(node.getChildren() || [], function(node){
+						return node.isExpandable;
+					});
+
+					// And when all those recursive calls finish, signal that I'm finished
+					return all(array.map(childBranches, expand));
+				});
+			}
+
+			return shimmedPromise(expand(this.rootNode));
+		},
+
+		collapseAll: function(){
+			// summary:
+			//		Collapse all nodes in the tree
+			// returns:
+			//		Promise that resolves when all nodes have collapsed
+
+			var _this = this;
+
+			function collapse(node){
+				// Collapse children first
+				var childBranches = array.filter(node.getChildren() || [], function(node){
+						return node.isExpandable;
+					}),
+					defs = all(array.map(childBranches, collapse));
+
+				// And when all those recursive calls finish, collapse myself, unless I'm the invisible root node,
+				// in which case collapseAll() is finished
+				if(!node.isExpanded || (node == _this.rootNode && !_this.showRoot)){
+					return defs;
+				}else{
+					// When node has collapsed, signal that call is finished
+					return defs.then(function(){
+						return _this._collapseNode(node);
+					});
+				}
+			}
+
+			return shimmedPromise(collapse(this.rootNode));
+		},
+
+		////////////// Data store related functions //////////////////////
+		// These just get passed to the model; they are here for back-compat
+
+		mayHaveChildren: function(/*dojo/data/Item*/ /*===== item =====*/){
+			// summary:
+			//		Deprecated.   This should be specified on the model itself.
+			//
+			//		Overridable function to tell if an item has or may have children.
+			//		Controls whether or not +/- expando icon is shown.
+			//		(For efficiency reasons we may not want to check if an element actually
+			//		has children until user clicks the expando node)
+			// tags:
+			//		deprecated
+		},
+
+		getItemChildren: function(/*===== parentItem, onComplete =====*/){
+			// summary:
+			//		Deprecated.   This should be specified on the model itself.
+			//
+			//		Overridable function that return array of child items of given parent item,
+			//		or if parentItem==null then return top items in tree
+			// tags:
+			//		deprecated
+		},
+
+		///////////////////////////////////////////////////////
+		// Functions for converting an item to a TreeNode
+		getLabel: function(/*dojo/data/Item*/ item){
+			// summary:
+			//		Overridable function to get the label for a tree node (given the item)
+			// tags:
+			//		extension
+			return this.model.getLabel(item);	// String
+		},
+
+		getIconClass: function(/*dojo/data/Item*/ item, /*Boolean*/ opened){
+			// summary:
+			//		Overridable function to return CSS class name to display icon
+			// tags:
+			//		extension
+			return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "dijitLeaf"
+		},
+
+		getLabelClass: function(/*===== item, opened =====*/){
+			// summary:
+			//		Overridable function to return CSS class name to display label
+			// item: dojo/data/Item
+			// opened: Boolean
+			// returns: String
+			//		CSS class name
+			// tags:
+			//		extension
+		},
+
+		getRowClass: function(/*===== item, opened =====*/){
+			// summary:
+			//		Overridable function to return CSS class name to display row
+			// item: dojo/data/Item
+			// opened: Boolean
+			// returns: String
+			//		CSS class name
+			// tags:
+			//		extension
+		},
+
+		getIconStyle: function(/*===== item, opened =====*/){
+			// summary:
+			//		Overridable function to return CSS styles to display icon
+			// item: dojo/data/Item
+			// opened: Boolean
+			// returns: Object
+			//		Object suitable for input to dojo.style() like {backgroundImage: "url(...)"}
+			// tags:
+			//		extension
+		},
+
+		getLabelStyle: function(/*===== item, opened =====*/){
+			// summary:
+			//		Overridable function to return CSS styles to display label
+			// item: dojo/data/Item
+			// opened: Boolean
+			// returns:
+			//		Object suitable for input to dojo.style() like {color: "red", background: "green"}
+			// tags:
+			//		extension
+		},
+
+		getRowStyle: function(/*===== item, opened =====*/){
+			// summary:
+			//		Overridable function to return CSS styles to display row
+			// item: dojo/data/Item
+			// opened: Boolean
+			// returns:
+			//		Object suitable for input to dojo.style() like {background-color: "#bbb"}
+			// tags:
+			//		extension
+		},
+
+		getTooltip: function(/*dojo/data/Item*/ /*===== item =====*/){
+			// summary:
+			//		Overridable function to get the tooltip for a tree node (given the item)
+			// tags:
+			//		extension
+			return "";	// String
+		},
+
+		/////////// Keyboard and Mouse handlers ////////////////////
+
+
+		_onDownArrow: function(/*Event*/ evt, /*TreeNode*/ node){
+			// summary:
+			//		down arrow pressed; get next visible node, set focus there
+
+			var nextNode = this._getNext(node);
+			if(nextNode && nextNode.isTreeNode){
+				this.focusNode(nextNode);
+			}
+		},
+
+		_onUpArrow: function(/*Event*/ evt, /*TreeNode*/ node){
+			// summary:
+			//		Up arrow pressed; move to previous visible node
+
+			// if younger siblings
+			var previousSibling = node.getPreviousSibling();
+			if(previousSibling){
+				node = previousSibling;
+				// if the previous node is expanded, dive in deep
+				while(node.isExpandable && node.isExpanded && node.hasChildren()){
+					// move to the last child
+					var children = node.getChildren();
+					node = children[children.length - 1];
+				}
+			}else{
+				// if this is the first child, return the parent
+				// unless the parent is the root of a tree with a hidden root
+				var parent = node.getParent();
+				if(!(!this.showRoot && parent === this.rootNode)){
+					node = parent;
+				}
+			}
+
+			if(node && node.isTreeNode){
+				this.focusNode(node);
+			}
+		},
+
+		_onRightArrow: function(/*Event*/ evt, /*TreeNode*/ node){
+			// summary:
+			//		Right arrow pressed; go to child node
+
+			// if not expanded, expand, else move to 1st child
+			if(node.isExpandable && !node.isExpanded){
+				this._expandNode(node);
+			}else if(node.hasChildren()){
+				node = node.getChildren()[0];
+				if(node && node.isTreeNode){
+					this.focusNode(node);
+				}
+			}
+		},
+
+		_onLeftArrow: function(/*Event*/ evt, /*TreeNode*/ node){
+			// summary:
+			//		Left arrow pressed.
+			//		If not collapsed, collapse, else move to parent.
+
+			if(node.isExpandable && node.isExpanded){
+				this._collapseNode(node);
+			}else{
+				var parent = node.getParent();
+				if(parent && parent.isTreeNode && !(!this.showRoot && parent === this.rootNode)){
+					this.focusNode(parent);
+				}
+			}
+		},
+
+		focusLastChild: function(){
+			// summary:
+			//		End key pressed; go to last visible node.
+
+			var node = this._getLast();
+			if(node && node.isTreeNode){
+				this.focusNode(node);
+			}
+		},
+
+		_getFirst: function(){
+			// summary:
+			//		Returns the first child.
+			// tags:
+			//		abstract extension
+			return this.showRoot ? this.rootNode : this.rootNode.getChildren()[0];
+		},
+
+		_getLast: function(){
+			// summary:
+			//		Returns the last descendant.
+			// tags:
+			//		abstract extension
+			var node = this.rootNode;
+			while(node.isExpanded){
+				var c = node.getChildren();
+				if(!c.length){
+					break;
+				}
+				node = c[c.length - 1];
+			}
+			return node;
+		},
+
+		// Tree only searches forward so dir parameter is unused
+		_getNext: function(node){
+			// summary:
+			//		Returns the next descendant, compared to "child".
+			// node: Widget
+			//		The current widget
+			// tags:
+			//		abstract extension
+
+			if(node.isExpandable && node.isExpanded && node.hasChildren()){
+				// if this is an expanded node, get the first child
+				return node.getChildren()[0];		// TreeNode
+			}else{
+				// find a parent node with a sibling
+				while(node && node.isTreeNode){
+					var returnNode = node.getNextSibling();
+					if(returnNode){
+						return returnNode;		// TreeNode
+					}
+					node = node.getParent();
+				}
+				return null;
+			}
+		},
+
+		// Implement _KeyNavContainer.childSelector, to identify which nodes are navigable
+		childSelector: ".dijitTreeRow",
+
+		isExpandoNode: function(node, widget){
+			// summary:
+			//		check whether a dom node is the expandoNode for a particular TreeNode widget
+			return dom.isDescendant(node, widget.expandoNode) || dom.isDescendant(node, widget.expandoNodeText);
+		},
+
+		_onNodePress: function(/*TreeNode*/ nodeWidget, /*Event*/ e){
+			// Touching a node should focus it, even if you touch the expando node or the edges rather than the label.
+			// Especially important to avoid _KeyNavMixin._onContainerFocus() causing the previously focused TreeNode
+			// to get focus
+			this.focusNode(nodeWidget);
+		},
+
+		__click: function(/*TreeNode*/ nodeWidget, /*Event*/ e, /*Boolean*/doOpen, /*String*/func){
+			var domElement = e.target,
+				isExpandoClick = this.isExpandoNode(domElement, nodeWidget);
+
+			if(nodeWidget.isExpandable && (doOpen || isExpandoClick)){
+				// expando node was clicked, or label of a folder node was clicked; open it
+				this._onExpandoClick({node: nodeWidget});
+			}else{
+				this._publish("execute", { item: nodeWidget.item, node: nodeWidget, evt: e });
+				this[func](nodeWidget.item, nodeWidget, e);
+				this.focusNode(nodeWidget);
+			}
+			e.stopPropagation();
+			e.preventDefault();
+		},
+		_onClick: function(/*TreeNode*/ nodeWidget, /*Event*/ e){
+			// summary:
+			//		Translates click events into commands for the controller to process
+			this.__click(nodeWidget, e, this.openOnClick, 'onClick');
+		},
+		_onDblClick: function(/*TreeNode*/ nodeWidget, /*Event*/ e){
+			// summary:
+			//		Translates double-click events into commands for the controller to process
+			this.__click(nodeWidget, e, this.openOnDblClick, 'onDblClick');
+		},
+
+		_onExpandoClick: function(/*Object*/ message){
+			// summary:
+			//		User clicked the +/- icon; expand or collapse my children.
+			var node = message.node;
+
+			// If we are collapsing, we might be hiding the currently focused node.
+			// Also, clicking the expando node might have erased focus from the current node.
+			// For simplicity's sake just focus on the node with the expando.
+			this.focusNode(node);
+
+			if(node.isExpanded){
+				this._collapseNode(node);
+			}else{
+				this._expandNode(node);
+			}
+		},
+
+		onClick: function(/*===== item, node, evt =====*/){
+			// summary:
+			//		Callback when a tree node is clicked
+			// item: Object
+			//		Object from the dojo/store corresponding to this TreeNode
+			// node: TreeNode
+			//		The TreeNode itself
+			// evt: Event
+			//		The event
+			// tags:
+			//		callback
+		},
+		onDblClick: function(/*===== item, node, evt =====*/){
+			// summary:
+			//		Callback when a tree node is double-clicked
+			// item: Object
+			//		Object from the dojo/store corresponding to this TreeNode
+			// node: TreeNode
+			//		The TreeNode itself
+			// evt: Event
+			//		The event
+			// tags:
+			//		callback
+		},
+		onOpen: function(/*===== item, node =====*/){
+			// summary:
+			//		Callback when a node is opened
+			// item: dojo/data/Item
+			// node: TreeNode
+			// tags:
+			//		callback
+		},
+		onClose: function(/*===== item, node =====*/){
+			// summary:
+			//		Callback when a node is closed
+			// item: Object
+			//		Object from the dojo/store corresponding to this TreeNode
+			// node: TreeNode
+			//		The TreeNode itself
+			// tags:
+			//		callback
+		},
+
+		_getNextNode: function(node){
+			// summary:
+			//		Get next visible node
+
+			kernel.deprecated(this.declaredClass + "::_getNextNode(node) is deprecated. Use _getNext(node) instead.", "", "2.0");
+			return this._getNext(node);
+		},
+
+		_getRootOrFirstNode: function(){
+			// summary:
+			//		Get first visible node
+			kernel.deprecated(this.declaredClass + "::_getRootOrFirstNode() is deprecated. Use _getFirst() instead.", "", "2.0");
+			return this._getFirst();
+		},
+
+		_collapseNode: function(/*TreeNode*/ node){
+			// summary:
+			//		Called when the user has requested to collapse the node
+			// returns:
+			//		Promise that resolves when the node has finished closing
+
+			if(node._expandNodeDeferred){
+				delete node._expandNodeDeferred;
+			}
+
+			if(node.state == "Loading"){
+				// ignore clicks while we are in the process of loading data
+				return;
+			}
+
+			if(node.isExpanded){
+				var ret = node.collapse();
+
+				this.onClose(node.item, node);
+				this._state(node, false);
+
+				this._startPaint(ret);	// after this finishes, need to reset widths of TreeNodes
+
+				return ret;
+			}
+		},
+
+		_expandNode: function(/*TreeNode*/ node){
+			// summary:
+			//		Called when the user has requested to expand the node
+			// returns:
+			//		Promise that resolves when the node is loaded and opened and (if persist=true) all it's descendants
+			//		that were previously opened too
+
+			if(node._expandNodeDeferred){
+				// there's already an expand in progress, or completed, so just return
+				return node._expandNodeDeferred;	// dojo/Deferred
+			}
+
+			var model = this.model,
+				item = node.item,
+				_this = this;
+
+			// Load data if it's not already loaded
+			if(!node._loadDeferred){
+				// need to load all the children before expanding
+				node.markProcessing();
+
+				// Setup deferred to signal when the load and expand are finished.
+				// Save that deferred in this._expandDeferred as a flag that operation is in progress.
+				node._loadDeferred = new Deferred();
+
+				// Get the children
+				model.getChildren(
+					item,
+					function(items){
+						node.unmarkProcessing();
+
+						// Display the children and also start expanding any children that were previously expanded
+						// (if this.persist == true).   The returned Deferred will fire when those expansions finish.
+						node.setChildItems(items).then(function(){
+							node._loadDeferred.resolve(items);
+						});
+					},
+					function(err){
+						console.error(_this, ": error loading " + node.label + " children: ", err);
+						node._loadDeferred.reject(err);
+					}
+				);
+			}
+
+			// Expand the node after data has loaded
+			var def = node._loadDeferred.then(lang.hitch(this, function(){
+				var def2 = node.expand();
+
+				// seems like these should delayed until node.expand() completes, but left here for back-compat about
+				// when this.isOpen flag gets set (ie, at the beginning of the animation)
+				this.onOpen(node.item, node);
+				this._state(node, true);
+
+				return def2;
+			}));
+
+			this._startPaint(def);	// after this finishes, need to reset widths of TreeNodes
+
+			return def;	// dojo/promise/Promise
+		},
+
+		////////////////// Miscellaneous functions ////////////////
+
+		focusNode: function(/* _tree.Node */ node){
+			// summary:
+			//		Focus on the specified node (which must be visible)
+			// tags:
+			//		protected
+
+			var scrollLeft = this.domNode.scrollLeft;
+			this.focusChild(node);
+			this.domNode.scrollLeft = scrollLeft;
+		},
+
+		_onNodeMouseEnter: function(/*dijit/_WidgetBase*/ /*===== node =====*/){
+			// summary:
+			//		Called when mouse is over a node (onmouseenter event),
+			//		this is monitored by the DND code
+		},
+
+		_onNodeMouseLeave: function(/*dijit/_WidgetBase*/ /*===== node =====*/){
+			// summary:
+			//		Called when mouse leaves a node (onmouseleave event),
+			//		this is monitored by the DND code
+		},
+
+		//////////////// Events from the model //////////////////////////
+
+		_onItemChange: function(/*Item*/ item){
+			// summary:
+			//		Processes notification of a change to an item's scalar values like label
+			var model = this.model,
+				identity = model.getIdentity(item),
+				nodes = this._itemNodesMap[identity];
+
+			if(nodes){
+				var label = this.getLabel(item),
+					tooltip = this.getTooltip(item);
+				array.forEach(nodes, function(node){
+					node.set({
+						item: item, // theoretically could be new JS Object representing same item
+						label: label,
+						tooltip: tooltip
+					});
+					node._updateItemClasses(item);
+				});
+			}
+		},
+
+		_onItemChildrenChange: function(/*dojo/data/Item*/ parent, /*dojo/data/Item[]*/ newChildrenList){
+			// summary:
+			//		Processes notification of a change to an item's children
+			var model = this.model,
+				identity = model.getIdentity(parent),
+				parentNodes = this._itemNodesMap[identity];
+
+			if(parentNodes){
+				array.forEach(parentNodes, function(parentNode){
+					parentNode.setChildItems(newChildrenList);
+				});
+			}
+		},
+
+		_onItemDelete: function(/*Item*/ item){
+			// summary:
+			//		Processes notification of a deletion of an item.
+			//		Not called from new dojo.store interface but there's cleanup code in setChildItems() instead.
+
+			var model = this.model,
+				identity = model.getIdentity(item),
+				nodes = this._itemNodesMap[identity];
+
+			if(nodes){
+				array.forEach(nodes, function(node){
+					// Remove node from set of selected nodes (if it's selected)
+					this.dndController.removeTreeNode(node);
+
+					var parent = node.getParent();
+					if(parent){
+						// if node has not already been orphaned from a _onSetItem(parent, "children", ..) call...
+						parent.removeChild(node);
+					}
+
+					// If we've orphaned the focused node then move focus to the root node
+					if(this.lastFocusedChild && !dom.isDescendant(this.lastFocusedChild.domNode, this.domNode)){
+						delete this.lastFocusedChild;
+					}
+					if(this.focusedChild && !dom.isDescendant(this.focusedChild.domNode, this.domNode)){
+						this.focus();
+					}
+
+					node.destroyRecursive();
+				}, this);
+				delete this._itemNodesMap[identity];
+			}
+		},
+
+		/////////////// Miscellaneous funcs
+
+		_initState: function(){
+			// summary:
+			//		Load in which nodes should be opened automatically
+			this._openedNodes = {};
+			if(this.persist && this.cookieName){
+				var oreo = cookie(this.cookieName);
+				if(oreo){
+					array.forEach(oreo.split(','), function(item){
+						this._openedNodes[item] = true;
+					}, this);
+				}
+			}
+		},
+
+		_state: function(node, expanded){
+			// summary:
+			//		Query or set expanded state for an node
+			if(!this.persist){
+				return false;
+			}
+			var path = array.map(node.getTreePath(),function(item){
+				return this.model.getIdentity(item);
+			}, this).join("/");
+			if(arguments.length === 1){
+				return this._openedNodes[path];
+			}else{
+				if(expanded){
+					this._openedNodes[path] = true;
+				}else{
+					delete this._openedNodes[path];
+				}
+				this._saveExpandedNodes();
+			}
+		},
+
+		_saveExpandedNodes: function(){
+			if(this.persist && this.cookieName){
+				var ary = [];
+				for(var id in this._openedNodes){
+					ary.push(id);
+				}
+				cookie(this.cookieName, ary.join(","), {expires: 365});
+			}
+		},
+
+		destroy: function(){
+			if(this._curSearch){
+				this._curSearch.timer.remove();
+				delete this._curSearch;
+			}
+			if(this.rootNode){
+				this.rootNode.destroyRecursive();
+			}
+			if(this.dndController && !lang.isString(this.dndController)){
+				this.dndController.destroy();
+			}
+			this.rootNode = null;
+			this.inherited(arguments);
+		},
+
+		destroyRecursive: function(){
+			// A tree is treated as a leaf, not as a node with children (like a grid),
+			// but defining destroyRecursive for back-compat.
+			this.destroy();
+		},
+
+		resize: function(changeSize){
+			if(changeSize){
+				domGeometry.setMarginBox(this.domNode, changeSize);
+			}
+
+			// The main JS sizing involved w/tree is the indentation, which is specified
+			// in CSS and read in through this dummy indentDetector node (tree must be
+			// visible and attached to the DOM to read this).
+			// If the Tree is hidden domGeometry.position(this.tree.indentDetector).w will return 0, in which case just
+			// keep the default value.
+			this._nodePixelIndent = domGeometry.position(this.tree.indentDetector).w || this._nodePixelIndent;
+
+			// resize() may be called before this.rootNode is created, so wait until it's available
+			this.expandChildrenDeferred.then(lang.hitch(this, function(){
+				// If tree has already loaded, then reset indent for all the nodes
+				this.rootNode.set('indent', this.showRoot ? 0 : -1);
+
+				// Also, adjust widths of all rows to match width of Tree
+				this._adjustWidths();
+			}));
+		},
+
+		_outstandingPaintOperations: 0,
+		_startPaint: function(/*Promise|Boolean*/ p){
+			// summary:
+			//		Called at the start of an operation that will change what's displayed.
+			// p:
+			//		Promise that tells when the operation will complete.  Alternately, if it's just a Boolean, it signifies
+			//		that the operation was synchronous, and already completed.
+
+			this._outstandingPaintOperations++;
+			if(this._adjustWidthsTimer){
+				this._adjustWidthsTimer.remove();
+				delete this._adjustWidthsTimer;
+			}
+
+			var oc = lang.hitch(this, function(){
+				this._outstandingPaintOperations--;
+
+				if(this._outstandingPaintOperations <= 0 && !this._adjustWidthsTimer && this._started){
+					// Use defer() to avoid a width adjustment when another operation will immediately follow,
+					// such as a sequence of opening a node, then it's children, then it's grandchildren, etc.
+					this._adjustWidthsTimer = this.defer("_adjustWidths");
+				}
+			});
+			when(p, oc, oc);
+		},
+
+		_adjustWidths: function(){
+			// summary:
+			//		Size container to match widest TreeNode, so that highlighting with scrolling works (#13141, #16132)
+
+			if(this._adjustWidthsTimer){
+				this._adjustWidthsTimer.remove();
+				delete this._adjustWidthsTimer;
+			}
+
+			this.containerNode.style.width = "auto";
+			this.containerNode.style.width = this.domNode.scrollWidth > this.domNode.offsetWidth ? "auto" : "100%";
+		},
+
+		_createTreeNode: function(/*Object*/ args){
+			// summary:
+			//		creates a TreeNode
+			// description:
+			//		Developers can override this method to define their own TreeNode class;
+			//		However it will probably be removed in a future release in favor of a way
+			//		of just specifying a widget for the label, rather than one that contains
+			//		the children too.
+			return new TreeNode(args);
+		},
+
+		focus: function(){
+			// summary:
+			//		Default focus() implementation: focus the previously focused child, or first child.
+			//		Some applications may want to change this method to focus the [first] selected child.
+
+			if(this.lastFocusedChild){
+				this.focusNode(this.lastFocusedChild);
+			}else{
+				this.focusFirstChild();
+			}
+		}
+	});
+
+	if(has("dojo-bidi")){
+		Tree.extend({
+			_setTextDirAttr: function(textDir){
+				if(textDir && this.textDir != textDir){
+					this._set("textDir", textDir);
+					this.rootNode.set("textDir", textDir);
+				}
+			}
+		});
+	}
+
+	Tree.PathError = createError("TreePathError");
+	Tree._TreeNode = TreeNode;	// for monkey patching or creating subclasses of TreeNode
+
+	return Tree;
+});
diff --git a/src/main/resources/static/dijit/Viewport.js b/src/main/resources/static/dijit/Viewport.js
new file mode 100644
index 0000000000000000000000000000000000000000..bf9a811531902d2bbc51bcf4a784d53decf02adb
--- /dev/null
+++ b/src/main/resources/static/dijit/Viewport.js
@@ -0,0 +1,87 @@
+define([
+	"dojo/Evented",
+	"dojo/on",
+	"dojo/domReady",
+	"dojo/sniff",	// has("ie"), has("ios")
+	"dojo/window" // getBox()
+], function(Evented, on, domReady, has, winUtils){
+
+	// module:
+	//		dijit/Viewport
+
+	/*=====
+	return {
+		// summary:
+		//		Utility singleton to watch for viewport resizes, avoiding duplicate notifications
+		//		which can lead to infinite loops.
+		// description:
+		//		Usage: Viewport.on("resize", myCallback).
+		//
+		//		myCallback() is called without arguments in case it's _WidgetBase.resize(),
+		//		which would interpret the argument as the size to make the widget.
+	};
+	=====*/
+
+	var Viewport = new Evented();
+
+	var focusedNode;
+
+	domReady(function(){
+		var oldBox = winUtils.getBox();
+		Viewport._rlh = on(window, "resize", function(){
+			var newBox = winUtils.getBox();
+			if(oldBox.h == newBox.h && oldBox.w == newBox.w){ return; }
+			oldBox = newBox;
+			Viewport.emit("resize");
+		});
+
+		// Also catch zoom changes on IE8, since they don't naturally generate resize events
+		if(has("ie") == 8){
+			var deviceXDPI = screen.deviceXDPI;
+			setInterval(function(){
+				if(screen.deviceXDPI != deviceXDPI){
+					deviceXDPI = screen.deviceXDPI;
+					Viewport.emit("resize");
+				}
+			}, 500);
+		}
+
+		// On iOS, keep track of the focused node so we can guess when the keyboard is/isn't being displayed.
+		if(has("ios")){
+			on(document, "focusin", function(evt){
+				focusedNode = evt.target;
+			});
+			on(document, "focusout", function(evt){
+				focusedNode = null;
+			});
+		}
+	});
+
+	Viewport.getEffectiveBox = function(/*Document*/ doc){
+		// summary:
+		//		Get the size of the viewport, or on mobile devices, the part of the viewport not obscured by the
+		//		virtual keyboard.
+
+		var box = winUtils.getBox(doc);
+
+		// Account for iOS virtual keyboard, if it's being shown.  Unfortunately no direct way to check or measure.
+		var tag = focusedNode && focusedNode.tagName && focusedNode.tagName.toLowerCase();
+		if(has("ios") && focusedNode && !focusedNode.readOnly && (tag == "textarea" || (tag == "input" &&
+			/^(color|email|number|password|search|tel|text|url)$/.test(focusedNode.type)))){
+
+			// Box represents the size of the viewport.  Some of the viewport is likely covered by the keyboard.
+			// Estimate height of visible viewport assuming viewport goes to bottom of screen, but is covered by keyboard.
+			box.h *= (orientation == 0 || orientation == 180 ? 0.66 : 0.40);
+
+			// Above measurement will be inaccurate if viewport was scrolled up so far that it ends before the bottom
+			// of the screen.   In this case, keyboard isn't covering as much of the viewport as we thought.
+			// We know the visible size is at least the distance from the top of the viewport to the focused node.
+			var rect = focusedNode.getBoundingClientRect();
+			box.h = Math.max(box.h, rect.top + rect.height);
+		}
+
+		return box;
+	};
+
+	return Viewport;
+});
diff --git a/src/main/resources/static/dijit/WidgetSet.js b/src/main/resources/static/dijit/WidgetSet.js
new file mode 100644
index 0000000000000000000000000000000000000000..ea2504479fc1193a89c875ca9a6e38b261b89b44
--- /dev/null
+++ b/src/main/resources/static/dijit/WidgetSet.js
@@ -0,0 +1,247 @@
+define([
+	"dojo/_base/array", // array.forEach array.map
+	"dojo/_base/declare", // declare
+	"dojo/_base/kernel", // kernel.global
+	"./registry"	// to add functions to dijit.registry
+], function(array, declare, kernel, registry){
+
+	// module:
+	//		dijit/WidgetSet
+
+	var WidgetSet = declare("dijit.WidgetSet", null, {
+		// summary:
+		//		A set of widgets indexed by id.
+		//		Deprecated, will be removed in 2.0.
+		//
+		// example:
+		//		Create a small list of widgets:
+		//		|	require(["dijit/WidgetSet", "dijit/registry"],
+		//		|		function(WidgetSet, registry){
+		//		|		var ws = new WidgetSet();
+		//		|		ws.add(registry.byId("one"));
+		//		|		ws.add(registry.byId("two"));
+		//		|		// destroy both:
+		//		|		ws.forEach(function(w){ w.destroy(); });
+		//		|	});
+
+		constructor: function(){
+			this._hash = {};
+			this.length = 0;
+		},
+
+		add: function(/*dijit/_WidgetBase*/ widget){
+			// summary:
+			//		Add a widget to this list. If a duplicate ID is detected, a error is thrown.
+			//
+			// widget: dijit/_WidgetBase
+			//		Any dijit/_WidgetBase subclass.
+			if(this._hash[widget.id]){
+				throw new Error("Tried to register widget with id==" + widget.id + " but that id is already registered");
+			}
+			this._hash[widget.id] = widget;
+			this.length++;
+		},
+
+		remove: function(/*String*/ id){
+			// summary:
+			//		Remove a widget from this WidgetSet. Does not destroy the widget; simply
+			//		removes the reference.
+			if(this._hash[id]){
+				delete this._hash[id];
+				this.length--;
+			}
+		},
+
+		forEach: function(/*Function*/ func, /* Object? */thisObj){
+			// summary:
+			//		Call specified function for each widget in this set.
+			//
+			// func:
+			//		A callback function to run for each item. Is passed the widget, the index
+			//		in the iteration, and the full hash, similar to `array.forEach`.
+			//
+			// thisObj:
+			//		An optional scope parameter
+			//
+			// example:
+			//		Using the default `dijit.registry` instance:
+			//		|	require(["dijit/WidgetSet", "dijit/registry"],
+			//		|		function(WidgetSet, registry){
+			//		|		registry.forEach(function(widget){
+			//		|			console.log(widget.declaredClass);
+			//		|		});
+			//		|	});
+			//
+			// returns:
+			//		Returns self, in order to allow for further chaining.
+
+			thisObj = thisObj || kernel.global;
+			var i = 0, id;
+			for(id in this._hash){
+				func.call(thisObj, this._hash[id], i++, this._hash);
+			}
+			return this;	// dijit/WidgetSet
+		},
+
+		filter: function(/*Function*/ filter, /* Object? */thisObj){
+			// summary:
+			//		Filter down this WidgetSet to a smaller new WidgetSet
+			//		Works the same as `array.filter` and `NodeList.filter`
+			//
+			// filter:
+			//		Callback function to test truthiness. Is passed the widget
+			//		reference and the pseudo-index in the object.
+			//
+			// thisObj: Object?
+			//		Option scope to use for the filter function.
+			//
+			// example:
+			//		Arbitrary: select the odd widgets in this list
+			//		|	
+			//		|		
+			//		|	
+			//		|	require(["dijit/WidgetSet", "dijit/registry"],
+			//		|		function(WidgetSet, registry){
+			//		|		registry.filter(function(w, i){
+			//		|			return i % 2 == 0;
+			//		|		}).forEach(function(w){ /* odd ones */ });
+			//		|	});
+
+			thisObj = thisObj || kernel.global;
+			var res = new WidgetSet(), i = 0, id;
+			for(id in this._hash){
+				var w = this._hash[id];
+				if(filter.call(thisObj, w, i++, this._hash)){
+					res.add(w);
+				}
+			}
+			return res; // dijit/WidgetSet
+		},
+
+		byId: function(/*String*/ id){
+			// summary:
+			//		Find a widget in this list by it's id.
+			// example:
+			//		Test if an id is in a particular WidgetSet
+			//		|	require(["dijit/WidgetSet", "dijit/registry"],
+			//		|		function(WidgetSet, registry){
+			//		|		var ws = new WidgetSet();
+			//		|		ws.add(registry.byId("bar"));
+			//		|		var t = ws.byId("bar") // returns a widget
+			//		|		var x = ws.byId("foo"); // returns undefined
+			//		|	});
+
+			return this._hash[id];	// dijit/_WidgetBase
+		},
+
+		byClass: function(/*String*/ cls){
+			// summary:
+			//		Reduce this widgetset to a new WidgetSet of a particular `declaredClass`
+			//
+			// cls: String
+			//		The Class to scan for. Full dot-notated string.
+			//
+			// example:
+			//		Find all `dijit.TitlePane`s in a page:
+			//		|	require(["dijit/WidgetSet", "dijit/registry"],
+			//		|		function(WidgetSet, registry){
+			//		|		registry.byClass("dijit.TitlePane").forEach(function(tp){ tp.close(); });
+			//		|	});
+
+			var res = new WidgetSet(), id, widget;
+			for(id in this._hash){
+				widget = this._hash[id];
+				if(widget.declaredClass == cls){
+					res.add(widget);
+				}
+			 }
+			 return res; // dijit/WidgetSet
+		},
+
+		toArray: function(){
+			// summary:
+			//		Convert this WidgetSet into a true Array
+			//
+			// example:
+			//		Work with the widget .domNodes in a real Array
+			//		|	require(["dijit/WidgetSet", "dijit/registry"],
+			//		|		function(WidgetSet, registry){
+			//		|		array.map(registry.toArray(), function(w){ return w.domNode; });
+			//		|	});
+
+
+			var ar = [];
+			for(var id in this._hash){
+				ar.push(this._hash[id]);
+			}
+			return ar;	// dijit/_WidgetBase[]
+		},
+
+		map: function(/* Function */func, /* Object? */thisObj){
+			// summary:
+			//		Create a new Array from this WidgetSet, following the same rules as `array.map`
+			// example:
+			//		|	require(["dijit/WidgetSet", "dijit/registry"],
+			//		|		function(WidgetSet, registry){
+			//		|		var nodes = registry.map(function(w){ return w.domNode; });
+			//		|	});
+			//
+			// returns:
+			//		A new array of the returned values.
+			return array.map(this.toArray(), func, thisObj); // Array
+		},
+
+		every: function(func, thisObj){
+			// summary:
+			//		A synthetic clone of `array.every` acting explicitly on this WidgetSet
+			//
+			// func: Function
+			//		A callback function run for every widget in this list. Exits loop
+			//		when the first false return is encountered.
+			//
+			// thisObj: Object?
+			//		Optional scope parameter to use for the callback
+
+			thisObj = thisObj || kernel.global;
+			var x = 0, i;
+			for(i in this._hash){
+				if(!func.call(thisObj, this._hash[i], x++, this._hash)){
+					return false; // Boolean
+				}
+			}
+			return true; // Boolean
+		},
+
+		some: function(func, thisObj){
+			// summary:
+			//		A synthetic clone of `array.some` acting explicitly on this WidgetSet
+			//
+			// func: Function
+			//		A callback function run for every widget in this list. Exits loop
+			//		when the first true return is encountered.
+			//
+			// thisObj: Object?
+			//		Optional scope parameter to use for the callback
+
+			thisObj = thisObj || kernel.global;
+			var x = 0, i;
+			for(i in this._hash){
+				if(func.call(thisObj, this._hash[i], x++, this._hash)){
+					return true; // Boolean
+				}
+			}
+			return false; // Boolean
+		}
+
+	});
+
+	// Add in 1.x compatibility methods to dijit/registry.
+	// These functions won't show up in the API doc but since they are deprecated anyway,
+	// that's probably for the best.
+	array.forEach(["forEach", "filter", "byClass", "map", "every", "some"], function(func){
+		registry[func] = WidgetSet.prototype[func];
+	});
+
+
+	return WidgetSet;
+});
diff --git a/src/main/resources/static/dijit/_AttachMixin.js b/src/main/resources/static/dijit/_AttachMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..02ab1bd3ed8e270c906be4cd0c7db9f8d696f973
--- /dev/null
+++ b/src/main/resources/static/dijit/_AttachMixin.js
@@ -0,0 +1,238 @@
+define([
+	"require",
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/connect",	// remove for 2.0
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang", // lang.getObject
+	"dojo/mouse",
+	"dojo/on",
+	"dojo/touch",
+	"./_WidgetBase"
+], function(require, array, connect, declare, lang, mouse, on, touch, _WidgetBase){
+
+	// module:
+	//		dijit/_AttachMixin
+
+	// Map from string name like "mouseenter" to synthetic event like mouse.enter
+	var synthEvents = lang.delegate(touch, {
+		"mouseenter": mouse.enter,
+		"mouseleave": mouse.leave,
+		"keypress": connect._keypress	// remove for 2.0
+	});
+
+	// To be lightweight, _AttachMixin doesn't require() dijit/a11yclick.
+	// If the subclass has a template using "ondijitclick", it must load dijit/a11yclick itself.
+	// In that case, the a11yclick variable below will get set to point to that synthetic event.
+	var a11yclick;
+
+	var _AttachMixin = declare("dijit._AttachMixin", null, {
+		// summary:
+		//		Mixin for widgets to attach to dom nodes and setup events via
+		//		convenient data-dojo-attach-point and data-dojo-attach-event DOM attributes.
+		//
+		//		Superclass of _TemplatedMixin, and can also be used standalone when templates are pre-rendered on the
+		//		server.
+		//
+		//		Does not [yet] handle widgets like ContentPane with this.containerNode set.   It should skip
+		//		scanning for data-dojo-attach-point and data-dojo-attach-event inside this.containerNode, but it
+		//		doesn't.
+
+/*=====
+		// _attachPoints: [private] String[]
+		//		List of widget attribute names associated with data-dojo-attach-point=... in the
+		//		template, ex: ["containerNode", "labelNode"]
+		_attachPoints: [],
+
+		// _attachEvents: [private] Handle[]
+		//		List of connections associated with data-dojo-attach-event=... in the
+		//		template
+		_attachEvents: [],
+
+		// attachScope: [public] Object
+		//		Object to which attach points and events will be scoped.  Defaults
+		//		to 'this'.
+		attachScope: undefined,
+
+		// searchContainerNode: [protected] Boolean
+		//		Search descendants of this.containerNode for data-dojo-attach-point and data-dojo-attach-event.
+		//		Should generally be left false (the default value) both for performance and to avoid failures when
+		//		this.containerNode holds other _AttachMixin instances with their own attach points and events.
+ 		searchContainerNode: false,
+ =====*/
+
+		constructor: function(/*===== params, srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified, replace srcNodeRef with my generated DOM tree.
+
+			this._attachPoints = [];
+			this._attachEvents = [];
+		},
+
+
+		buildRendering: function(){
+			// summary:
+			//		Attach to DOM nodes marked with special attributes.
+			// tags:
+			//		protected
+
+			this.inherited(arguments);
+
+			// recurse through the node, looking for, and attaching to, our
+			// attachment points and events, which should be defined on the template node.
+			this._attachTemplateNodes(this.domNode);
+
+			this._beforeFillContent();		// hook for _WidgetsInTemplateMixin
+		},
+
+		_beforeFillContent: function(){
+		},
+
+		_attachTemplateNodes: function(rootNode){
+			// summary:
+			//		Iterate through the dom nodes and attach functions and nodes accordingly.
+			// description:
+			//		Map widget properties and functions to the handlers specified in
+			//		the dom node and it's descendants. This function iterates over all
+			//		nodes and looks for these properties:
+			//
+			//		- dojoAttachPoint/data-dojo-attach-point
+			//		- dojoAttachEvent/data-dojo-attach-event
+			// rootNode: DomNode
+			//		The node to search for properties. All descendants will be searched.
+			// tags:
+			//		private
+
+			// DFS to process all nodes except those inside of this.containerNode
+			var node = rootNode;
+			while(true){
+				if(node.nodeType == 1 && (this._processTemplateNode(node, function(n,p){ return n.getAttribute(p); },
+						this._attach) || this.searchContainerNode) && node.firstChild){
+					node = node.firstChild;
+				}else{
+					if(node == rootNode){ return; }
+					while(!node.nextSibling){
+						node = node.parentNode;
+						if(node == rootNode){ return; }
+					}
+					node = node.nextSibling;
+				}
+			}
+		},
+
+		_processTemplateNode: function(/*DOMNode|Widget*/ baseNode, getAttrFunc, attachFunc){
+			// summary:
+			//		Process data-dojo-attach-point and data-dojo-attach-event for given node or widget.
+			//		Returns true if caller should process baseNode's children too.
+
+			var ret = true;
+
+			// Process data-dojo-attach-point
+			var _attachScope = this.attachScope || this,
+				attachPoint = getAttrFunc(baseNode, "dojoAttachPoint") || getAttrFunc(baseNode, "data-dojo-attach-point");
+			if(attachPoint){
+				var point, points = attachPoint.split(/\s*,\s*/);
+				while((point = points.shift())){
+					if(lang.isArray(_attachScope[point])){
+						_attachScope[point].push(baseNode);
+					}else{
+						_attachScope[point] = baseNode;
+					}
+					ret = (point != "containerNode");
+					this._attachPoints.push(point);
+				}
+			}
+
+			// Process data-dojo-attach-event
+			var attachEvent = getAttrFunc(baseNode, "dojoAttachEvent") || getAttrFunc(baseNode, "data-dojo-attach-event");
+			if(attachEvent){
+				// NOTE: we want to support attributes that have the form
+				// "domEvent: nativeEvent, ..."
+				var event, events = attachEvent.split(/\s*,\s*/);
+				var trim = lang.trim;
+				while((event = events.shift())){
+					if(event){
+						var thisFunc = null;
+						if(event.indexOf(":") != -1){
+							// oh, if only JS had tuple assignment
+							var funcNameArr = event.split(":");
+							event = trim(funcNameArr[0]);
+							thisFunc = trim(funcNameArr[1]);
+						}else{
+							event = trim(event);
+						}
+						if(!thisFunc){
+							thisFunc = event;
+						}
+
+						this._attachEvents.push(attachFunc(baseNode, event, lang.hitch(_attachScope, thisFunc)));
+					}
+				}
+			}
+
+			return ret;
+		},
+
+		_attach: function(node, type, func){
+			// summary:
+			//		Roughly corresponding to dojo/on, this is the default function for processing a
+			//		data-dojo-attach-event.  Meant to attach to DOMNodes, not to widgets.
+			// node: DOMNode
+			//		The node to setup a listener on.
+			// type: String
+			//		Event name like "click".
+			// getAttrFunc: Function
+			//		Function to get the specified property for a given DomNode/Widget.
+			// attachFunc: Function?
+			//		Attaches an event handler from the specified node/widget to specified function.
+
+			// Map special type names like "mouseenter" to synthetic events.
+			// Subclasses are responsible to require() dijit/a11yclick if they want to use it.
+			type = type.replace(/^on/, "").toLowerCase();
+			if(type == "dijitclick"){
+				type = a11yclick || (a11yclick = require("./a11yclick"));
+			}else{
+				type = synthEvents[type] || type;
+			}
+
+			return on(node, type, func);
+		},
+
+		_detachTemplateNodes: function() {
+			// summary:
+			//		Detach and clean up the attachments made in _attachtempalteNodes.
+
+			// Delete all attach points to prevent IE6 memory leaks.
+			var _attachScope = this.attachScope || this;
+			array.forEach(this._attachPoints, function(point){
+				delete _attachScope[point];
+			});
+			this._attachPoints = [];
+
+			// And same for event handlers
+			array.forEach(this._attachEvents, function(handle){ handle.remove(); });
+			this._attachEvents = [];
+		},
+
+		destroyRendering: function(){
+			this._detachTemplateNodes();
+			this.inherited(arguments);
+		}
+	});
+
+	// These arguments can be specified for widgets which are used in templates.
+	// Since any widget can be specified as sub widgets in template, mix it
+	// into the base widget class.  (This is a hack, but it's effective.).
+	// Remove for 2.0.   Also, hide from API doc parser.
+	lang.extend(_WidgetBase, /*===== {} || =====*/ {
+		dojoAttachEvent: "",
+		dojoAttachPoint: ""
+	});
+	
+	return _AttachMixin;
+});
diff --git a/src/main/resources/static/dijit/_BidiMixin.js b/src/main/resources/static/dijit/_BidiMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..28b5cb833a523c39757b4d543e0255a5bd34d892
--- /dev/null
+++ b/src/main/resources/static/dijit/_BidiMixin.js
@@ -0,0 +1,145 @@
+define([], function(){
+
+	// module:
+	//		dijit/_BidiMixin
+
+	// UCC - constants that will be used by bidi support.
+	var bidi_const = {
+		LRM : '\u200E',
+		LRE : '\u202A',
+		PDF : '\u202C',
+		RLM : '\u200f',
+		RLE : '\u202B'
+	};
+
+	return {
+		// summary:
+		//		When has("dojo-bidi") is true, _WidgetBase will mixin this class.   It enables support for the textdir
+		//		property to control text direction independently from the GUI direction.
+		// description:
+		//		There's a special need for displaying BIDI text in rtl direction
+		//		in ltr GUI, sometimes needed auto support.
+		//		In creation of widget, if it's want to activate this class,
+		//		the widget should define the "textDir".
+
+		getTextDir: function(/*String*/ text){
+			// summary:
+			//		Gets the right direction of text.
+			// description:
+			//		If textDir is ltr or rtl returns the value.
+			//		If it's auto, calls to another function that responsible
+			//		for checking the value, and defining the direction.
+			// tags:
+			//		protected.
+			return this.textDir == "auto" ? this._checkContextual(text) : this.textDir;
+		},
+
+		_checkContextual: function(text){
+			// summary:
+			//		Finds the first strong (directional) character, return ltr if isLatin
+			//		or rtl if isBidiChar.
+			// tags:
+			//		private.
+
+			// look for strong (directional) characters
+			var fdc = /[A-Za-z\u05d0-\u065f\u066a-\u06ef\u06fa-\u07ff\ufb1d-\ufdff\ufe70-\ufefc]/.exec(text);
+			// if found return the direction that defined by the character, else return widgets dir as defult.
+			return fdc ? ( fdc[0] <= 'z' ? "ltr" : "rtl" ) : this.dir ? this.dir : this.isLeftToRight() ? "ltr" : "rtl";
+		},
+
+		applyTextDir: function(/*DOMNode*/ element, /*String?*/ text){
+			// summary:
+			//		Set element.dir according to this.textDir, assuming this.textDir has a value.
+			// element:
+			//		The text element to be set. Should have dir property.
+			// text:
+			//		If specified, and this.textDir is "auto", for calculating the right transformation
+			//		Otherwise text read from element.
+			// description:
+			//		If textDir is ltr or rtl returns the value.
+			//		If it's auto, calls to another function that responsible
+			//		for checking the value, and defining the direction.
+			// tags:
+			//		protected.
+
+			if(this.textDir){
+				var textDir = this.textDir;
+				if(textDir == "auto"){
+					// convert "auto" to either "ltr" or "rtl"
+					if(typeof text === "undefined"){
+						// text not specified, get text from element
+						var tagName = element.tagName.toLowerCase();
+						text = (tagName == "input" || tagName == "textarea") ? element.value :
+							element.innerText || element.textContent || "";
+					}
+					textDir = this._checkContextual(text);
+				}
+
+				if(element.dir != textDir){
+					// set element's dir to match textDir, but not when textDir is null and not when it already matches
+					element.dir = textDir;
+				}
+			}
+		},
+
+		enforceTextDirWithUcc: function(option, text){
+			// summary:
+			//		Wraps by UCC (Unicode control characters) option's text according to this.textDir
+			// option:
+			//		The element (`<option>`) we wrapping the text for.
+			// text:
+			//		The text to be wrapped.
+			// description:
+			//		There's a dir problem with some HTML elements. For some elements (e.g. `<option>`, `<select>`)
+			//		defining the dir in different direction then the GUI orientation, won't display correctly.
+			//		FF 3.6 will change the alignment of the text in option - this doesn't follow the bidi standards (static text
+			//		should be aligned following GUI direction). IE8 and Opera11.10 completely ignore dir setting for `<option>`.
+			//		Therefore the only solution is to use UCC (Unicode  control characters) to display the text in correct orientation.
+			//		This function saves the original text value for later restoration if needed, for example if the textDir will change etc.
+			if(this.textDir){
+				if(option){
+					option.originalText = text;
+				}
+				var dir = this.textDir == "auto" ? this._checkContextual(text) : this.textDir;
+				return (dir == "ltr" ? bidi_const.LRE : bidi_const.RLE ) + text + bidi_const.PDF;
+			}
+			return text;
+		},
+
+		restoreOriginalText: function(origObj){
+			// summary:
+			//		Restores the text of origObj, if needed, after enforceTextDirWithUcc, e.g. set("textDir", textDir).
+			// origObj:
+			//		The element (`<option>`) to restore.
+			// description:
+			//		Sets the text of origObj to origObj.originalText, which is the original text, without the UCCs.
+			//		The function than removes the originalText from origObj!
+			if(origObj.originalText){
+				origObj.text = origObj.originalText;
+				delete origObj.originalText;
+			}
+			return origObj;
+		},
+
+		_setTextDirAttr: function(/*String*/ textDir){
+			// summary:
+			//		Setter for textDir.
+			// description:
+			//		Users shouldn't call this function; they should be calling
+			//		set('textDir', value)
+			if(!this._created || this.textDir != textDir){
+				this._set("textDir", textDir);
+				var node = null;
+				if(this.displayNode){
+					node = this.displayNode;
+					this.displayNode.align = this.dir == "rtl" ? "right" : "left";
+				}else{
+					node = this.textDirNode || this.focusNode || this.textbox;
+				}
+				if(node){
+					this.applyTextDir(node);
+				}
+			}
+		}
+	};
+});
diff --git a/src/main/resources/static/dijit/_BidiSupport.js b/src/main/resources/static/dijit/_BidiSupport.js
new file mode 100644
index 0000000000000000000000000000000000000000..de1177da3ad660847dbc6a8d6d68dcf84c47be17
--- /dev/null
+++ b/src/main/resources/static/dijit/_BidiSupport.js
@@ -0,0 +1,21 @@
+define(["dojo/has", "./_WidgetBase", "./_BidiMixin"], function(has, _WidgetBase, _BidiMixin){
+
+	// module:
+	//		dijit/_BidiSupport
+
+	/*=====
+	return function(){
+		// summary:
+		//		Deprecated module for enabling textdir support in the dijit widgets.   New code should just define
+		//		has("dojo-bidi") to return true, rather than manually requiring this module.
+	};
+	=====*/
+
+	_WidgetBase.extend(_BidiMixin);
+
+	// Back-compat with version 1.8: just including _BidiSupport should trigger bidi support in all the widgets.
+	// Although this statement doesn't do much because the other widgets have likely already been loaded.
+	has.add("dojo-bidi", true);
+
+	return _WidgetBase;
+});
diff --git a/src/main/resources/static/dijit/_Calendar.js b/src/main/resources/static/dijit/_Calendar.js
new file mode 100644
index 0000000000000000000000000000000000000000..488e6b1675de19e4275044eedf33cd03551903df
--- /dev/null
+++ b/src/main/resources/static/dijit/_Calendar.js
@@ -0,0 +1,22 @@
+define([
+	"dojo/_base/kernel", // kernel.deprecated
+	"./Calendar",
+	"./main"	// for exporting dijit.Calendar
+], function(kernel, Calendar, dijit){
+
+	// module:
+	//		dijit/_Calendar
+
+	/*=====
+	return {
+		// summary:
+		//		Deprecated widget, used dijit/Calendar instead.   Will be removed in 2.0.
+	};
+	=====*/
+
+	kernel.deprecated("dijit._Calendar is deprecated", "dijit._Calendar moved to dijit.Calendar", 2.0);
+
+	// dijit._Calendar had an underscore all this time merely because it did
+	// not satisfy dijit's a11y policy.
+	dijit._Calendar = Calendar;
+});
diff --git a/src/main/resources/static/dijit/_ConfirmDialogMixin.js b/src/main/resources/static/dijit/_ConfirmDialogMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..7eb9517e18e1588ff386e46c4c1e4e76d5dd188d
--- /dev/null
+++ b/src/main/resources/static/dijit/_ConfirmDialogMixin.js
@@ -0,0 +1,26 @@
+define([
+	"dojo/_base/declare",
+	"./_WidgetsInTemplateMixin",
+	"dojo/i18n!./nls/common",
+	"dojo/text!./templates/actionBar.html",
+	"./form/Button"		// used by template
+], function(declare, _WidgetsInTemplateMixin, strings, actionBarMarkup) {
+
+	return declare("dijit._ConfirmDialogMixin", _WidgetsInTemplateMixin, {
+		// summary:
+		//		Mixin for Dialog/TooltipDialog with OK/Cancel buttons.
+
+		// HTML snippet for action bar, overrides _DialogMixin.actionBarTemplate
+		actionBarTemplate: actionBarMarkup,
+
+		// buttonOk: String
+		//		Label of OK button
+		buttonOk: strings.buttonOk,
+		_setButtonOkAttr: { node: "okButton", attribute: "label" },
+
+		// buttonCancel: String
+		//		Label of cancel button
+		buttonCancel: strings.buttonCancel,
+		_setButtonCancelAttr: { node: "cancelButton", attribute: "label" }
+	});
+});
diff --git a/src/main/resources/static/dijit/_Contained.js b/src/main/resources/static/dijit/_Contained.js
new file mode 100644
index 0000000000000000000000000000000000000000..dd139a6348e379fb95c319da10942c54d22c3c7e
--- /dev/null
+++ b/src/main/resources/static/dijit/_Contained.js
@@ -0,0 +1,56 @@
+define([
+	"dojo/_base/declare", // declare
+	"./registry"	// registry.getEnclosingWidget(), registry.byNode()
+], function(declare, registry){
+
+	// module:
+	//		dijit/_Contained
+
+	return declare("dijit._Contained", null, {
+		// summary:
+		//		Mixin for widgets that are children of a container widget
+		// example:
+		//	|	// make a basic custom widget that knows about its parents
+		//	|	declare("my.customClass",[dijit._WidgetBase, dijit._Contained],{});
+
+		_getSibling: function(/*String*/ which){
+			// summary:
+			//		Returns next or previous sibling
+			// which:
+			//		Either "next" or "previous"
+			// tags:
+			//		private
+			var p = this.getParent();
+			return (p && p._getSiblingOfChild && p._getSiblingOfChild(this, which == "previous" ? -1 : 1)) || null;	// dijit/_WidgetBase
+		},
+
+		getPreviousSibling: function(){
+			// summary:
+			//		Returns null if this is the first child of the parent,
+			//		otherwise returns the next element sibling to the "left".
+
+			return this._getSibling("previous"); // dijit/_WidgetBase
+		},
+
+		getNextSibling: function(){
+			// summary:
+			//		Returns null if this is the last child of the parent,
+			//		otherwise returns the next element sibling to the "right".
+
+			return this._getSibling("next"); // dijit/_WidgetBase
+		},
+
+		getIndexInParent: function(){
+			// summary:
+			//		Returns the index of this widget within its container parent.
+			//		It returns -1 if the parent does not exist, or if the parent
+			//		is not a dijit/_Container
+
+			var p = this.getParent();
+			if(!p || !p.getIndexOfChild){
+				return -1; // int
+			}
+			return p.getIndexOfChild(this); // int
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/_Container.js b/src/main/resources/static/dijit/_Container.js
new file mode 100644
index 0000000000000000000000000000000000000000..ad19955abf3c6ae91919fae68d360a61abdb35fc
--- /dev/null
+++ b/src/main/resources/static/dijit/_Container.js
@@ -0,0 +1,108 @@
+define([
+	"dojo/_base/array", // array.forEach array.indexOf
+	"dojo/_base/declare", // declare
+	"dojo/dom-construct", // domConstruct.place
+	"dojo/_base/kernel" // kernel.deprecated
+], function(array, declare, domConstruct, kernel){
+
+	// module:
+	//		dijit/_Container
+
+	return declare("dijit._Container", null, {
+		// summary:
+		//		Mixin for widgets that contain HTML and/or a set of widget children.
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			if(!this.containerNode){
+				// All widgets with descendants must set containerNode.
+				// NB: this code doesn't quite work right because for TabContainer it runs before
+				// _TemplatedMixin::buildRendering(), and thus
+				// sets this.containerNode to this.domNode, later to be overridden by the assignment in the template.
+				this.containerNode = this.domNode;
+			}
+		},
+
+		addChild: function(/*dijit/_WidgetBase*/ widget, /*int?*/ insertIndex){
+			// summary:
+			//		Makes the given widget a child of this widget.
+			// description:
+			//		Inserts specified child widget's dom node as a child of this widget's
+			//		container node, and possibly does other processing (such as layout).
+
+			// I want to just call domConstruct.place(widget.domNode, this.containerNode, insertIndex), but the counting
+			// is thrown off by text nodes and comment nodes that show up when constructed by markup.
+			// In the future consider stripping those nodes on construction, either in the parser or this widget code.
+			var refNode = this.containerNode;
+			if(insertIndex > 0){
+				// Old-school way to get nth child; dojo.query would be easier but _Container was weened from dojo.query
+				// in #10087 to minimize download size.   Not sure if that's still and issue with new smaller dojo/query.
+				refNode = refNode.firstChild;
+				while(insertIndex > 0){
+					if(refNode.nodeType == 1){ insertIndex--; }
+					refNode = refNode.nextSibling;
+				}
+				if(refNode){
+					insertIndex = "before";
+				}else{
+					// to support addChild(child, n-1) where there are n children (should add child at end)
+					refNode = this.containerNode;
+					insertIndex = "last";
+				}
+			}
+
+			domConstruct.place(widget.domNode, refNode, insertIndex);
+
+			// If I've been started but the child widget hasn't been started,
+			// start it now.  Make sure to do this after widget has been
+			// inserted into the DOM tree, so it can see that it's being controlled by me,
+			// so it doesn't try to size itself.
+			if(this._started && !widget._started){
+				widget.startup();
+			}
+		},
+
+		removeChild: function(/*Widget|int*/ widget){
+			// summary:
+			//		Removes the passed widget instance from this widget but does
+			//		not destroy it.  You can also pass in an integer indicating
+			//		the index within the container to remove (ie, removeChild(5) removes the sixth widget).
+
+			if(typeof widget == "number"){
+				widget = this.getChildren()[widget];
+			}
+
+			if(widget){
+				var node = widget.domNode;
+				if(node && node.parentNode){
+					node.parentNode.removeChild(node); // detach but don't destroy
+				}
+			}
+		},
+
+		hasChildren: function(){
+			// summary:
+			//		Returns true if widget has child widgets, i.e. if this.containerNode contains widgets.
+			return this.getChildren().length > 0;	// Boolean
+		},
+
+		_getSiblingOfChild: function(/*dijit/_WidgetBase*/ child, /*int*/ dir){
+			// summary:
+			//		Get the next or previous widget sibling of child
+			// dir:
+			//		if 1, get the next sibling
+			//		if -1, get the previous sibling
+			// tags:
+			//		private
+			var children = this.getChildren(),
+				idx = array.indexOf(children, child);	// int
+			return children[idx + dir];
+		},
+
+		getIndexOfChild: function(/*dijit/_WidgetBase*/ child){
+			// summary:
+			//		Gets the index of the child in this container or -1 if not found
+			return array.indexOf(this.getChildren(), child);	// int
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/_CssStateMixin.js b/src/main/resources/static/dijit/_CssStateMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..4a6588c6c25a5280187a96d3a757766f243ee35a
--- /dev/null
+++ b/src/main/resources/static/dijit/_CssStateMixin.js
@@ -0,0 +1,372 @@
+define([
+	"dojo/_base/array", // array.forEach array.map
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.isDescendant()
+	"dojo/dom-class", // domClass.toggle
+	"dojo/has",
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dojo/domReady",
+	"dojo/touch",
+	"dojo/_base/window", // win.body
+	"./a11yclick",
+	"./registry"
+], function(array, declare, dom, domClass, has, lang, on, domReady, touch, win, a11yclick, registry){
+
+	// module:
+	//		dijit/_CssStateMixin
+
+	var CssStateMixin = declare("dijit._CssStateMixin", [], {
+		// summary:
+		//		Mixin for widgets to set CSS classes on the widget DOM nodes depending on hover/mouse press/focus
+		//		state changes, and also higher-level state changes such becoming disabled or selected.
+		//
+		// description:
+		//		By mixing this class into your widget, and setting the this.baseClass attribute, it will automatically
+		//		maintain CSS classes on the widget root node (this.domNode) depending on hover,
+		//		active, focus, etc. state.   Ex: with a baseClass of dijitButton, it will apply the classes
+		//		dijitButtonHovered and dijitButtonActive, as the user moves the mouse over the widget and clicks it.
+		//
+		//		It also sets CSS like dijitButtonDisabled based on widget semantic state.
+		//
+		//		By setting the cssStateNodes attribute, a widget can also track events on subnodes (like buttons
+		//		within the widget).
+
+		/*=====
+		 // cssStateNodes: [protected] Object
+		 //		Subclasses may define a cssStateNodes property that lists sub-nodes within the widget that
+		 //		need CSS classes applied on mouse hover/press and focus.
+		 //
+		 //		Each entry in this optional hash is a an attach-point name (like "upArrowButton") mapped to a CSS class name
+		 //		(like "dijitUpArrowButton"). Example:
+		 //	|		{
+		 //	|			"upArrowButton": "dijitUpArrowButton",
+		 //	|			"downArrowButton": "dijitDownArrowButton"
+		 //	|		}
+		 //		The above will set the CSS class dijitUpArrowButton to the this.upArrowButton DOMNode when it
+		 //		is hovered, etc.
+		 cssStateNodes: {},
+		 =====*/
+
+		// hovering: [readonly] Boolean
+		//		True if cursor is over this widget
+		hovering: false,
+
+		// active: [readonly] Boolean
+		//		True if mouse was pressed while over this widget, and hasn't been released yet
+		active: false,
+
+		_applyAttributes: function(){
+			// This code would typically be in postCreate(), but putting in _applyAttributes() for
+			// performance: so the class changes happen before DOM is inserted into the document.
+			// Change back to postCreate() in 2.0.  See #11635.
+
+			this.inherited(arguments);
+
+			// Monitoring changes to disabled, readonly, etc. state, and update CSS class of root node
+			array.forEach(["disabled", "readOnly", "checked", "selected", "focused", "state", "hovering", "active", "_opened"], function(attr){
+				this.watch(attr, lang.hitch(this, "_setStateClass"));
+			}, this);
+
+			// Track hover and active mouse events on widget root node, plus possibly on subnodes
+			for(var ap in this.cssStateNodes || {}){
+				this._trackMouseState(this[ap], this.cssStateNodes[ap]);
+			}
+			this._trackMouseState(this.domNode, this.baseClass);
+
+			// Set state initially; there's probably no hover/active/focus state but widget might be
+			// disabled/readonly/checked/selected so we want to set CSS classes for those conditions.
+			this._setStateClass();
+		},
+
+		_cssMouseEvent: function(/*Event*/ event){
+			// summary:
+			//		Handler for CSS event on this.domNode. Sets hovering and active properties depending on mouse state,
+			//		which triggers _setStateClass() to set appropriate CSS classes for this.domNode.
+
+			if(!this.disabled){
+				switch(event.type){
+					case "mouseover":
+					case "MSPointerOver":
+					case "pointerover":
+						this._set("hovering", true);
+						this._set("active", this._mouseDown);
+						break;
+					case "mouseout":
+					case "MSPointerOut":
+					case "pointerout":
+						this._set("hovering", false);
+						this._set("active", false);
+						break;
+					case "mousedown":
+					case "touchstart":
+					case "MSPointerDown":
+					case "pointerdown":
+					case "keydown":
+						this._set("active", true);
+						break;
+					case "mouseup":
+					case "dojotouchend":
+					case "MSPointerUp":
+					case "pointerup":
+					case "keyup":
+						this._set("active", false);
+						break;
+				}
+			}
+		},
+
+		_setStateClass: function(){
+			// summary:
+			//		Update the visual state of the widget by setting the css classes on this.domNode
+			//		(or this.stateNode if defined) by combining this.baseClass with
+			//		various suffixes that represent the current widget state(s).
+			//
+			// description:
+			//		In the case where a widget has multiple
+			//		states, it sets the class based on all possible
+			//		combinations.  For example, an invalid form widget that is being hovered
+			//		will be "dijitInput dijitInputInvalid dijitInputHover dijitInputInvalidHover".
+			//
+			//		The widget may have one or more of the following states, determined
+			//		by this.state, this.checked, this.valid, and this.selected:
+			//
+			//		- Error - ValidationTextBox sets this.state to "Error" if the current input value is invalid
+			//		- Incomplete - ValidationTextBox sets this.state to "Incomplete" if the current input value is not finished yet
+			//		- Checked - ex: a checkmark or a ToggleButton in a checked state, will have this.checked==true
+			//		- Selected - ex: currently selected tab will have this.selected==true
+			//
+			//		In addition, it may have one or more of the following states,
+			//		based on this.disabled and flags set in _onMouse (this.active, this.hovering) and from focus manager (this.focused):
+			//
+			//		- Disabled	- if the widget is disabled
+			//		- Active		- if the mouse (or space/enter key?) is being pressed down
+			//		- Focused		- if the widget has focus
+			//		- Hover		- if the mouse is over the widget
+
+			// Compute new set of classes
+			var newStateClasses = this.baseClass.split(" ");
+
+			function multiply(modifier){
+				newStateClasses = newStateClasses.concat(array.map(newStateClasses, function(c){
+					return c + modifier;
+				}), "dijit" + modifier);
+			}
+
+			if(!this.isLeftToRight()){
+				// For RTL mode we need to set an addition class like dijitTextBoxRtl.
+				multiply("Rtl");
+			}
+
+			var checkedState = this.checked == "mixed" ? "Mixed" : (this.checked ? "Checked" : "");
+			if(this.checked){
+				multiply(checkedState);
+			}
+			if(this.state){
+				multiply(this.state);
+			}
+			if(this.selected){
+				multiply("Selected");
+			}
+			if(this._opened){
+				multiply("Opened");
+			}
+
+			if(this.disabled){
+				multiply("Disabled");
+			}else if(this.readOnly){
+				multiply("ReadOnly");
+			}else{
+				if(this.active){
+					multiply("Active");
+				}else if(this.hovering){
+					multiply("Hover");
+				}
+			}
+
+			if(this.focused){
+				multiply("Focused");
+			}
+
+			// Remove old state classes and add new ones.
+			// For performance concerns we only write into domNode.className once.
+			var tn = this.stateNode || this.domNode,
+				classHash = {};	// set of all classes (state and otherwise) for node
+
+			array.forEach(tn.className.split(" "), function(c){
+				classHash[c] = true;
+			});
+
+			if("_stateClasses" in this){
+				array.forEach(this._stateClasses, function(c){
+					delete classHash[c];
+				});
+			}
+
+			array.forEach(newStateClasses, function(c){
+				classHash[c] = true;
+			});
+
+			var newClasses = [];
+			for(var c in classHash){
+				newClasses.push(c);
+			}
+			tn.className = newClasses.join(" ");
+
+			this._stateClasses = newStateClasses;
+		},
+
+		_subnodeCssMouseEvent: function(node, clazz, evt){
+			// summary:
+			//		Handler for hover/active mouse event on widget's subnode
+			if(this.disabled || this.readOnly){
+				return;
+			}
+
+			function hover(isHovering){
+				domClass.toggle(node, clazz + "Hover", isHovering);
+			}
+
+			function active(isActive){
+				domClass.toggle(node, clazz + "Active", isActive);
+			}
+
+			function focused(isFocused){
+				domClass.toggle(node, clazz + "Focused", isFocused);
+			}
+
+			switch(evt.type){
+				case "mouseover":
+				case "MSPointerOver":
+				case "pointerover":
+					hover(true);
+					break;
+				case "mouseout":
+				case "MSPointerOut":
+				case "pointerout":
+					hover(false);
+					active(false);
+					break;
+				case "mousedown":
+				case "touchstart":
+				case "MSPointerDown":
+				case "pointerdown":
+				case "keydown":
+					active(true);
+					break;
+				case "mouseup":
+				case "MSPointerUp":
+				case "pointerup":
+				case "dojotouchend":
+				case "keyup":
+					active(false);
+					break;
+				case "focus":
+				case "focusin":
+					focused(true);
+					break;
+				case "blur":
+				case "focusout":
+					focused(false);
+					break;
+			}
+		},
+
+		_trackMouseState: function(/*DomNode*/ node, /*String*/ clazz){
+			// summary:
+			//		Track mouse/focus events on specified node and set CSS class on that node to indicate
+			//		current state.   Usually not called directly, but via cssStateNodes attribute.
+			// description:
+			//		Given class=foo, will set the following CSS class on the node
+			//
+			//		- fooActive: if the user is currently pressing down the mouse button while over the node
+			//		- fooHover: if the user is hovering the mouse over the node, but not pressing down a button
+			//		- fooFocus: if the node is focused
+			//
+			//		Note that it won't set any classes if the widget is disabled.
+			// node: DomNode
+			//		Should be a sub-node of the widget, not the top node (this.domNode), since the top node
+			//		is handled specially and automatically just by mixing in this class.
+			// clazz: String
+			//		CSS class name (ex: dijitSliderUpArrow)
+
+			// Flag for listener code below to call this._cssMouseEvent() or this._subnodeCssMouseEvent()
+			// when node is hovered/active
+			node._cssState = clazz;
+		}
+	});
+
+	domReady(function(){
+		// Document level listener to catch hover etc. events on widget root nodes and subnodes.
+		// Note that when the mouse is moved quickly, a single onmouseenter event could signal that multiple widgets
+		// have been hovered or unhovered (try test_Accordion.html)
+
+		function pointerHandler(evt, target, relatedTarget){
+			// Handler for mouseover, mouseout, a11yclick.press and a11click.release events
+
+			// Poor man's event propagation.  Don't propagate event to ancestors of evt.relatedTarget,
+			// to avoid processing mouseout events moving from a widget's domNode to a descendant node;
+			// such events shouldn't be interpreted as a mouseleave on the widget.
+			if(relatedTarget && dom.isDescendant(relatedTarget, target)){
+				return;
+			}
+
+			for(var node = target; node && node != relatedTarget; node = node.parentNode){
+				// Process any nodes with _cssState property.   They are generally widget root nodes,
+				// but could also be sub-nodes within a widget
+				if(node._cssState){
+					var widget = registry.getEnclosingWidget(node);
+					if(widget){
+						if(node == widget.domNode){
+							// event on the widget's root node
+							widget._cssMouseEvent(evt);
+						}else{
+							// event on widget's sub-node
+							widget._subnodeCssMouseEvent(node, node._cssState, evt);
+						}
+					}
+				}
+			}
+		}
+
+		var body = win.body(), activeNode;
+
+		// Handle pointer related events (i.e. mouse or touch)
+		on(body, touch.over, function(evt){
+			// Using touch.over rather than mouseover mainly to ignore phantom mouse events on iOS.
+			pointerHandler(evt, evt.target, evt.relatedTarget);
+		});
+		on(body, touch.out, function(evt){
+			// Using touch.out rather than mouseout mainly to ignore phantom mouse events on iOS.
+			pointerHandler(evt, evt.target, evt.relatedTarget);
+		});
+		on(body, a11yclick.press, function(evt){
+			// Save the a11yclick.press target to reference when the a11yclick.release comes.
+			activeNode = evt.target;
+			pointerHandler(evt, activeNode)
+		});
+		on(body, a11yclick.release, function(evt){
+			// The release event could come on a separate node than the press event, if for example user slid finger.
+			// Reference activeNode to reset the state of the node that got state set in the a11yclick.press handler.
+			pointerHandler(evt, activeNode);
+			activeNode = null;
+		});
+
+		// Track focus events on widget sub-nodes that have been registered via _trackMouseState().
+		// However, don't track focus events on the widget root nodes, because focus is tracked via the
+		// focus manager (and it's not really tracking focus, but rather tracking that focus is on one of the widget's
+		// nodes or a subwidget's node or a popup node, etc.)
+		// Remove for 2.0 (if focus CSS needed, just use :focus pseudo-selector).
+		on(body, "focusin, focusout", function(evt){
+			var node = evt.target;
+			if(node._cssState && !node.getAttribute("widgetId")){
+				var widget = registry.getEnclosingWidget(node);
+				if(widget){
+					widget._subnodeCssMouseEvent(node, node._cssState, evt);
+				}
+			}
+		});
+	});
+
+	return CssStateMixin;
+});
diff --git a/src/main/resources/static/dijit/_DialogMixin.js b/src/main/resources/static/dijit/_DialogMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..32780f374b10734ad29c3dccd95b9119178d6504
--- /dev/null
+++ b/src/main/resources/static/dijit/_DialogMixin.js
@@ -0,0 +1,75 @@
+define([
+	"dojo/_base/declare", // declare
+	"./a11y"	// _getTabNavigable
+], function(declare, a11y){
+
+	// module:
+	//		dijit/_DialogMixin
+
+	return declare("dijit._DialogMixin", null, {
+		// summary:
+		//		This provides functions useful to Dialog and TooltipDialog
+
+		// actionBarTemplate: String
+		//		HTML snippet to show the action bar (gray bar with OK/cancel buttons).
+		//		Blank by default, but used by ConfirmDialog/ConfirmTooltipDialog subclasses.
+		actionBarTemplate: "",
+
+		execute: function(/*Object*/ /*===== formContents =====*/){
+			// summary:
+			//		Callback when the user hits the submit button.
+			//		Override this method to handle Dialog execution.
+			// description:
+			//		After the user has pressed the submit button, the Dialog
+			//		first calls onExecute() to notify the container to hide the
+			//		dialog and restore focus to wherever it used to be.
+			//
+			//		*Then* this method is called.
+			// type:
+			//		callback
+		},
+
+		onCancel: function(){
+			// summary:
+			//		Called when user has pressed the Dialog's cancel button, to notify container.
+			// description:
+			//		Developer shouldn't override or connect to this method;
+			//		it's a private communication device between the TooltipDialog
+			//		and the thing that opened it (ex: `dijit/form/DropDownButton`)
+			// type:
+			//		protected
+		},
+
+		onExecute: function(){
+			// summary:
+			//		Called when user has pressed the dialog's OK button, to notify container.
+			// description:
+			//		Developer shouldn't override or connect to this method;
+			//		it's a private communication device between the TooltipDialog
+			//		and the thing that opened it (ex: `dijit/form/DropDownButton`)
+			// type:
+			//		protected
+		},
+
+		_onSubmit: function(){
+			// summary:
+			//		Callback when user hits submit button
+			// type:
+			//		protected
+			this.onExecute();	// notify container that we are about to execute
+			this.execute(this.get('value'));
+		},
+
+		_getFocusItems: function(){
+			// summary:
+			//		Finds focusable items in dialog,
+			//		and sets this._firstFocusItem and this._lastFocusItem
+			// tags:
+			//		protected
+
+			var elems = a11y._getTabNavigable(this.domNode);
+			this._firstFocusItem = elems.lowest || elems.first || this.closeButtonNode || this.domNode;
+			this._lastFocusItem = elems.last || elems.highest || this._firstFocusItem;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/_FocusMixin.js b/src/main/resources/static/dijit/_FocusMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..473ebe79e6edc736b49a417a813514e4cc67a22d
--- /dev/null
+++ b/src/main/resources/static/dijit/_FocusMixin.js
@@ -0,0 +1,66 @@
+define([
+	"./focus",
+	"./_WidgetBase",
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang" // lang.extend
+], function(focus, _WidgetBase, declare, lang){
+
+	// module:
+	//		dijit/_FocusMixin
+
+	// We don't know where _FocusMixin will occur in the inheritance chain, but we need the _onFocus()/_onBlur() below
+	// to be last in the inheritance chain, so mixin to _WidgetBase.
+	lang.extend(_WidgetBase, {
+		// focused: [readonly] Boolean
+		//		This widget or a widget it contains has focus, or is "active" because
+		//		it was recently clicked.
+		focused: false,
+
+		onFocus: function(){
+			// summary:
+			//		Called when the widget becomes "active" because
+			//		it or a widget inside of it either has focus, or has recently
+			//		been clicked.
+			// tags:
+			//		callback
+		},
+
+		onBlur: function(){
+			// summary:
+			//		Called when the widget stops being "active" because
+			//		focus moved to something outside of it, or the user
+			//		clicked somewhere outside of it, or the widget was
+			//		hidden.
+			// tags:
+			//		callback
+		},
+
+		_onFocus: function(){
+			// summary:
+			//		This is where widgets do processing for when they are active,
+			//		such as changing CSS classes.  See onFocus() for more details.
+			// tags:
+			//		protected
+			this.onFocus();
+		},
+
+		_onBlur: function(){
+			// summary:
+			//		This is where widgets do processing for when they stop being active,
+			//		such as changing CSS classes.  See onBlur() for more details.
+			// tags:
+			//		protected
+			this.onBlur();
+		}
+	});
+
+	return declare("dijit._FocusMixin", null, {
+		// summary:
+		//		Mixin to widget to provide _onFocus() and _onBlur() methods that
+		//		fire when a widget or its descendants get/lose focus
+
+		// flag that I want _onFocus()/_onBlur() notifications from focus manager
+		_focusManager: focus
+	});
+
+});
diff --git a/src/main/resources/static/dijit/_HasDropDown.js b/src/main/resources/static/dijit/_HasDropDown.js
new file mode 100644
index 0000000000000000000000000000000000000000..3857e932f1be5623248a86ff3774053761b4c42b
--- /dev/null
+++ b/src/main/resources/static/dijit/_HasDropDown.js
@@ -0,0 +1,472 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/_base/Deferred",
+	"dojo/dom", // dom.isDescendant
+	"dojo/dom-attr", // domAttr.set
+	"dojo/dom-class", // domClass.add domClass.contains domClass.remove
+	"dojo/dom-geometry", // domGeometry.marginBox domGeometry.position
+	"dojo/dom-style", // domStyle.set
+	"dojo/has", // has("touch")
+	"dojo/keys", // keys.DOWN_ARROW keys.ENTER keys.ESCAPE
+	"dojo/_base/lang", // lang.hitch lang.isFunction
+	"dojo/on",
+	"dojo/touch",
+	"./registry", // registry.byNode()
+	"./focus",
+	"./popup",
+	"./_FocusMixin"
+], function(declare, Deferred, dom, domAttr, domClass, domGeometry, domStyle, has, keys, lang, on, touch,
+			registry, focus, popup, _FocusMixin){
+
+
+	// module:
+	//		dijit/_HasDropDown
+
+	return declare("dijit._HasDropDown", _FocusMixin, {
+		// summary:
+		//		Mixin for widgets that need drop down ability.
+
+		// _buttonNode: [protected] DomNode
+		//		The button/icon/node to click to display the drop down.
+		//		Can be set via a data-dojo-attach-point assignment.
+		//		If missing, then either focusNode or domNode (if focusNode is also missing) will be used.
+		_buttonNode: null,
+
+		// _arrowWrapperNode: [protected] DomNode
+		//		Will set CSS class dijitUpArrow, dijitDownArrow, dijitRightArrow etc. on this node depending
+		//		on where the drop down is set to be positioned.
+		//		Can be set via a data-dojo-attach-point assignment.
+		//		If missing, then _buttonNode will be used.
+		_arrowWrapperNode: null,
+
+		// _popupStateNode: [protected] DomNode
+		//		The node to set the aria-expanded class on.
+		//		Also sets popupActive class but that will be removed in 2.0.
+		//		Can be set via a data-dojo-attach-point assignment.
+		//		If missing, then focusNode or _buttonNode (if focusNode is missing) will be used.
+		_popupStateNode: null,
+
+		// _aroundNode: [protected] DomNode
+		//		The node to display the popup around.
+		//		Can be set via a data-dojo-attach-point assignment.
+		//		If missing, then domNode will be used.
+		_aroundNode: null,
+
+		// dropDown: [protected] Widget
+		//		The widget to display as a popup.  This widget *must* be
+		//		defined before the startup function is called.
+		dropDown: null,
+
+		// autoWidth: [protected] Boolean
+		//		Set to true to make the drop down at least as wide as this
+		//		widget.  Set to false if the drop down should just be its
+		//		default width.
+		autoWidth: true,
+
+		// forceWidth: [protected] Boolean
+		//		Set to true to make the drop down exactly as wide as this
+		//		widget.  Overrides autoWidth.
+		forceWidth: false,
+
+		// maxHeight: [protected] Integer
+		//		The max height for our dropdown.
+		//		Any dropdown taller than this will have scrollbars.
+		//		Set to 0 for no max height, or -1 to limit height to available space in viewport
+		maxHeight: -1,
+
+		// dropDownPosition: [const] String[]
+		//		This variable controls the position of the drop down.
+		//		It's an array of strings with the following values:
+		//
+		//		- before: places drop down to the left of the target node/widget, or to the right in
+		//		  the case of RTL scripts like Hebrew and Arabic
+		//		- after: places drop down to the right of the target node/widget, or to the left in
+		//		  the case of RTL scripts like Hebrew and Arabic
+		//		- above: drop down goes above target node
+		//		- below: drop down goes below target node
+		//
+		//		The list is positions is tried, in order, until a position is found where the drop down fits
+		//		within the viewport.
+		//
+		dropDownPosition: ["below", "above"],
+
+		// _stopClickEvents: Boolean
+		//		When set to false, the click events will not be stopped, in
+		//		case you want to use them in your subclass
+		_stopClickEvents: true,
+
+		_onDropDownMouseDown: function(/*Event*/ e){
+			// summary:
+			//		Callback when the user mousedown/touchstart on the arrow icon.
+
+			if(this.disabled || this.readOnly){
+				return;
+			}
+
+			// Prevent default to stop things like text selection, but don't stop propagation, so that:
+			//		1. TimeTextBox etc. can focus the <input> on mousedown
+			//		2. dropDownButtonActive class applied by _CssStateMixin (on button depress)
+			//		3. user defined onMouseDown handler fires
+			//
+			// Also, don't call preventDefault() on MSPointerDown event (on IE10) because that prevents the button
+			// from getting focus, and then the focus manager doesn't know what's going on (#17262)
+			if(e.type != "MSPointerDown" && e.type != "pointerdown"){
+				e.preventDefault();
+			}
+
+			this.own(on.once(this.ownerDocument, touch.release, lang.hitch(this, "_onDropDownMouseUp")));
+
+			this.toggleDropDown();
+		},
+
+		_onDropDownMouseUp: function(/*Event?*/ e){
+			// summary:
+			//		Callback on mouseup/touchend after mousedown/touchstart on the arrow icon.
+			//		Note that this function is called regardless of what node the event occurred on (but only after
+			//		a mousedown/touchstart on the arrow).
+			//
+			//		If the drop down is a simple menu and the cursor is over the menu, we execute it, otherwise, we focus our
+			//		drop down widget.  If the event is missing, then we are not
+			//		a mouseup event.
+			//
+			//		This is useful for the common mouse movement pattern
+			//		with native browser `<select>` nodes:
+			//
+			//		1. mouse down on the select node (probably on the arrow)
+			//		2. move mouse to a menu item while holding down the mouse button
+			//		3. mouse up.  this selects the menu item as though the user had clicked it.
+
+			var dropDown = this.dropDown, overMenu = false;
+
+			if(e && this._opened){
+				// This code deals with the corner-case when the drop down covers the original widget,
+				// because it's so large.  In that case mouse-up shouldn't select a value from the menu.
+				// Find out if our target is somewhere in our dropdown widget,
+				// but not over our _buttonNode (the clickable node)
+				var c = domGeometry.position(this._buttonNode, true);
+				if(!(e.pageX >= c.x && e.pageX <= c.x + c.w) || !(e.pageY >= c.y && e.pageY <= c.y + c.h)){
+					var t = e.target;
+					while(t && !overMenu){
+						if(domClass.contains(t, "dijitPopup")){
+							overMenu = true;
+						}else{
+							t = t.parentNode;
+						}
+					}
+					if(overMenu){
+						t = e.target;
+						if(dropDown.onItemClick){
+							var menuItem;
+							while(t && !(menuItem = registry.byNode(t))){
+								t = t.parentNode;
+							}
+							if(menuItem && menuItem.onClick && menuItem.getParent){
+								menuItem.getParent().onItemClick(menuItem, e);
+							}
+						}
+						return;
+					}
+				}
+			}
+			if(this._opened){
+				// Focus the dropdown widget unless it's a menu (in which case autoFocus is set to false).
+				// Even if it's a menu, we need to focus it if this is a fake mouse event caused by the user typing
+				// SPACE/ENTER while using JAWS.  Jaws converts the SPACE/ENTER key into mousedown/mouseup events.
+				// If this.hovering is false then it's presumably actually a keyboard event.
+				if(dropDown.focus && (dropDown.autoFocus !== false || (e.type == "mouseup" && !this.hovering))){
+					// Do it on a delay so that we don't steal back focus from the dropdown.
+					this._focusDropDownTimer = this.defer(function(){
+						dropDown.focus();
+						delete this._focusDropDownTimer;
+					});
+				}
+			}else{
+				// The drop down arrow icon probably can't receive focus, but widget itself should get focus.
+				// defer() needed to make it work on IE (test DateTextBox)
+				if(this.focus){
+					this.defer("focus");
+				}
+			}
+		},
+
+		_onDropDownClick: function(/*Event*/ e){
+			// The drop down was already opened on mousedown/keydown; just need to stop the event
+			if(this._stopClickEvents){
+				e.stopPropagation();
+				e.preventDefault();
+			}
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			this._buttonNode = this._buttonNode || this.focusNode || this.domNode;
+			this._popupStateNode = this._popupStateNode || this.focusNode || this._buttonNode;
+
+			// Add a class to the "dijitDownArrowButton" type class to _buttonNode so theme can set direction of arrow
+			// based on where drop down will normally appear
+			var defaultPos = {
+				"after": this.isLeftToRight() ? "Right" : "Left",
+				"before": this.isLeftToRight() ? "Left" : "Right",
+				"above": "Up",
+				"below": "Down",
+				"left": "Left",
+				"right": "Right"
+			}[this.dropDownPosition[0]] || this.dropDownPosition[0] || "Down";
+			domClass.add(this._arrowWrapperNode || this._buttonNode, "dijit" + defaultPos + "ArrowButton");
+		},
+
+		postCreate: function(){
+			// summary:
+			//		set up nodes and connect our mouse and keyboard events
+
+			this.inherited(arguments);
+
+			var keyboardEventNode = this.focusNode || this.domNode;
+			this.own(
+				on(this._buttonNode, touch.press, lang.hitch(this, "_onDropDownMouseDown")),
+				on(this._buttonNode, "click", lang.hitch(this, "_onDropDownClick")),
+				on(keyboardEventNode, "keydown", lang.hitch(this, "_onKey")),
+				on(keyboardEventNode, "keyup", lang.hitch(this, "_onKeyUp"))
+			);
+		},
+
+		destroy: function(){
+			// If dropdown is open, close it, to avoid leaving dijit/focus in a strange state.
+			// Put focus back on me to avoid the focused node getting destroyed, which flummoxes IE.
+			if(this._opened){
+				this.closeDropDown(true);
+			}
+
+			if(this.dropDown){
+				// Destroy the drop down, unless it's already been destroyed.  This can happen because
+				// the drop down is a direct child of <body> even though it's logically my child.
+				if(!this.dropDown._destroyed){
+					this.dropDown.destroyRecursive();
+				}
+				delete this.dropDown;
+			}
+			this.inherited(arguments);
+		},
+
+		_onKey: function(/*Event*/ e){
+			// summary:
+			//		Callback when the user presses a key while focused on the button node
+
+			if(this.disabled || this.readOnly){
+				return;
+			}
+			var d = this.dropDown, target = e.target;
+			if(d && this._opened && d.handleKey){
+				if(d.handleKey(e) === false){
+					/* false return code means that the drop down handled the key */
+					e.stopPropagation();
+					e.preventDefault();
+					return;
+				}
+			}
+			if(d && this._opened && e.keyCode == keys.ESCAPE){
+				this.closeDropDown();
+				e.stopPropagation();
+				e.preventDefault();
+			}else if(!this._opened &&
+				(e.keyCode == keys.DOWN_ARROW ||
+					// ignore unmodified SPACE if _KeyNavMixin has active searching in progress
+					( (e.keyCode == keys.ENTER || (e.keyCode == keys.SPACE && (!this._searchTimer || (e.ctrlKey || e.altKey || e.metaKey)))) &&
+						//ignore enter and space if the event is for a text input
+						((target.tagName || "").toLowerCase() !== 'input' ||
+							(target.type && target.type.toLowerCase() !== 'text'))))){
+				// Toggle the drop down, but wait until keyup so that the drop down doesn't
+				// get a stray keyup event, or in the case of key-repeat (because user held
+				// down key for too long), stray keydown events
+				this._toggleOnKeyUp = true;
+				e.stopPropagation();
+				e.preventDefault();
+			}
+		},
+
+		_onKeyUp: function(){
+			if(this._toggleOnKeyUp){
+				delete this._toggleOnKeyUp;
+				this.toggleDropDown();
+				var d = this.dropDown;	// drop down may not exist until toggleDropDown() call
+				if(d && d.focus){
+					this.defer(lang.hitch(d, "focus"), 1);
+				}
+			}
+		},
+
+		_onBlur: function(){
+			// summary:
+			//		Called magically when focus has shifted away from this widget and it's dropdown
+
+			// Close dropdown but don't focus my <input>.  User may have focused somewhere else (ex: clicked another
+			// input), and even if they just clicked a blank area of the screen, focusing my <input> will unwantedly
+			// popup the keyboard on mobile.
+			this.closeDropDown(false);
+
+			this.inherited(arguments);
+		},
+
+		isLoaded: function(){
+			// summary:
+			//		Returns true if the dropdown exists and it's data is loaded.  This can
+			//		be overridden in order to force a call to loadDropDown().
+			// tags:
+			//		protected
+
+			return true;
+		},
+
+		loadDropDown: function(/*Function*/ loadCallback){
+			// summary:
+			//		Creates the drop down if it doesn't exist, loads the data
+			//		if there's an href and it hasn't been loaded yet, and then calls
+			//		the given callback.
+			// tags:
+			//		protected
+
+			// TODO: for 2.0, change API to return a Deferred, instead of calling loadCallback?
+			loadCallback();
+		},
+
+		loadAndOpenDropDown: function(){
+			// summary:
+			//		Creates the drop down if it doesn't exist, loads the data
+			//		if there's an href and it hasn't been loaded yet, and
+			//		then opens the drop down.  This is basically a callback when the
+			//		user presses the down arrow button to open the drop down.
+			// returns: Deferred
+			//		Deferred for the drop down widget that
+			//		fires when drop down is created and loaded
+			// tags:
+			//		protected
+			var d = new Deferred(),
+				afterLoad = lang.hitch(this, function(){
+					this.openDropDown();
+					d.resolve(this.dropDown);
+				});
+			if(!this.isLoaded()){
+				this.loadDropDown(afterLoad);
+			}else{
+				afterLoad();
+			}
+			return d;
+		},
+
+		toggleDropDown: function(){
+			// summary:
+			//		Callback when the user presses the down arrow button or presses
+			//		the down arrow key to open/close the drop down.
+			//		Toggle the drop-down widget; if it is up, close it, if not, open it
+			// tags:
+			//		protected
+
+			if(this.disabled || this.readOnly){
+				return;
+			}
+			if(!this._opened){
+				this.loadAndOpenDropDown();
+			}else{
+				this.closeDropDown(true);	// refocus button to avoid hiding node w/focus
+			}
+		},
+
+		openDropDown: function(){
+			// summary:
+			//		Opens the dropdown for this widget.   To be called only when this.dropDown
+			//		has been created and is ready to display (ie, it's data is loaded).
+			// returns:
+			//		return value of dijit/popup.open()
+			// tags:
+			//		protected
+
+			var dropDown = this.dropDown,
+				ddNode = dropDown.domNode,
+				aroundNode = this._aroundNode || this.domNode,
+				self = this;
+
+			var retVal = popup.open({
+				parent: this,
+				popup: dropDown,
+				around: aroundNode,
+				orient: this.dropDownPosition,
+				maxHeight: this.maxHeight,
+				onExecute: function(){
+					self.closeDropDown(true);
+				},
+				onCancel: function(){
+					self.closeDropDown(true);
+				},
+				onClose: function(){
+					domAttr.set(self._popupStateNode, "popupActive", false);
+					domClass.remove(self._popupStateNode, "dijitHasDropDownOpen");
+					self._set("_opened", false);	// use set() because _CssStateMixin is watching
+				}
+			});
+
+			// Set width of drop down if necessary, so that dropdown width + width of scrollbar (from popup wrapper)
+			// matches width of aroundNode
+			if(this.forceWidth || (this.autoWidth && aroundNode.offsetWidth > dropDown._popupWrapper.offsetWidth)){
+				var widthAdjust = aroundNode.offsetWidth - dropDown._popupWrapper.offsetWidth;
+				var resizeArgs = {
+					w: dropDown.domNode.offsetWidth + widthAdjust
+				};
+				this._origStyle = ddNode.style.cssText;
+				if(lang.isFunction(dropDown.resize)){
+					dropDown.resize(resizeArgs);
+				}else{
+					domGeometry.setMarginBox(ddNode, resizeArgs);
+				}
+
+				// If dropdown is right-aligned then compensate for width change by changing horizontal position
+				if(retVal.corner[1] == "R"){
+					dropDown._popupWrapper.style.left =
+						(dropDown._popupWrapper.style.left.replace("px", "") - widthAdjust) + "px";
+				}
+			}
+
+			domAttr.set(this._popupStateNode, "popupActive", "true");
+			domClass.add(this._popupStateNode, "dijitHasDropDownOpen");
+			this._set("_opened", true);	// use set() because _CssStateMixin is watching
+
+			this._popupStateNode.setAttribute("aria-expanded", "true");
+			this._popupStateNode.setAttribute("aria-owns", dropDown.id);
+
+			// Set aria-labelledby on dropdown if it's not already set to something more meaningful
+			if(ddNode.getAttribute("role") !== "presentation" && !ddNode.getAttribute("aria-labelledby")){
+				ddNode.setAttribute("aria-labelledby", this.id);
+			}
+
+			return retVal;
+		},
+
+		closeDropDown: function(/*Boolean*/ focus){
+			// summary:
+			//		Closes the drop down on this widget
+			// focus:
+			//		If true, refocuses the button widget
+			// tags:
+			//		protected
+
+			if(this._focusDropDownTimer){
+				this._focusDropDownTimer.remove();
+				delete this._focusDropDownTimer;
+			}
+
+			if(this._opened){
+				this._popupStateNode.setAttribute("aria-expanded", "false");
+				if(focus && this.focus){
+					this.focus();
+				}
+				popup.close(this.dropDown);
+				this._opened = false;
+			}
+
+			if(this._origStyle){
+				this.dropDown.domNode.style.cssText = this._origStyle;
+				delete this._origStyle;
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/_KeyNavContainer.js b/src/main/resources/static/dijit/_KeyNavContainer.js
new file mode 100644
index 0000000000000000000000000000000000000000..e354e7f5fc407ebc1786fccc760cd6a77350f5f9
--- /dev/null
+++ b/src/main/resources/static/dijit/_KeyNavContainer.js
@@ -0,0 +1,128 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/keys", // keys.END keys.HOME
+	"dojo/_base/lang", // lang.hitch
+	"./registry",
+	"./_Container",
+	"./_FocusMixin",
+	"./_KeyNavMixin"
+], function(array, declare, domAttr, kernel, keys, lang, registry, _Container, _FocusMixin, _KeyNavMixin){
+
+
+	// module:
+	//		dijit/_KeyNavContainer
+
+	return declare("dijit._KeyNavContainer", [_FocusMixin, _KeyNavMixin, _Container], {
+		// summary:
+		//		A _Container with keyboard navigation of its children.
+		// description:
+		//		Provides normalized keyboard and focusing code for Container widgets.
+		//		To use this mixin, call connectKeyNavHandlers() in postCreate().
+		//		Also, child widgets must implement a focus() method.
+
+		connectKeyNavHandlers: function(/*keys[]*/ prevKeyCodes, /*keys[]*/ nextKeyCodes){
+			// summary:
+			//		Deprecated.  You can call this in postCreate() to attach the keyboard handlers to the container,
+			//		but the preferred method is to override _onLeftArrow() and _onRightArrow(), or
+			//		_onUpArrow() and _onDownArrow(), to call focusPrev() and focusNext().
+			// prevKeyCodes: keys[]
+			//		Key codes for navigating to the previous child.
+			// nextKeyCodes: keys[]
+			//		Key codes for navigating to the next child.
+			// tags:
+			//		protected
+
+			// TODO: remove for 2.0, and make subclasses override _onLeftArrow, _onRightArrow etc. instead.
+
+			var keyCodes = (this._keyNavCodes = {});
+			var prev = lang.hitch(this, "focusPrev");
+			var next = lang.hitch(this, "focusNext");
+			array.forEach(prevKeyCodes, function(code){
+				keyCodes[code] = prev;
+			});
+			array.forEach(nextKeyCodes, function(code){
+				keyCodes[code] = next;
+			});
+			keyCodes[keys.HOME] = lang.hitch(this, "focusFirstChild");
+			keyCodes[keys.END] = lang.hitch(this, "focusLastChild");
+		},
+
+		startupKeyNavChildren: function(){
+			kernel.deprecated("startupKeyNavChildren() call no longer needed", "", "2.0");
+		},
+
+		startup: function(){
+			this.inherited(arguments);
+			array.forEach(this.getChildren(), lang.hitch(this, "_startupChild"));
+		},
+
+		addChild: function(/*dijit/_WidgetBase*/ widget, /*int?*/ insertIndex){
+			this.inherited(arguments);
+			this._startupChild(widget);
+		},
+
+		_startupChild: function(/*dijit/_WidgetBase*/ widget){
+			// summary:
+			//		Setup for each child widget.
+			// description:
+			//		Sets tabIndex=-1 on each child, so that the tab key will
+			//		leave the container rather than visiting each child.
+			//
+			//		Note: if you add children by a different method than addChild(), then need to call this manually
+			//		or at least make sure the child's tabIndex is -1.
+			//
+			//		Note: see also _LayoutWidget.setupChild(), which is also called for each child widget.
+			// tags:
+			//		private
+
+			widget.set("tabIndex", "-1");
+		},
+
+		_getFirst: function(){
+			// summary:
+			//		Returns the first child.
+			// tags:
+			//		abstract extension
+			var children = this.getChildren();
+			return children.length ? children[0] : null;
+		},
+
+		_getLast: function(){
+			// summary:
+			//		Returns the last descendant.
+			// tags:
+			//		abstract extension
+			var children = this.getChildren();
+			return children.length ? children[children.length - 1] : null;
+		},
+
+		focusNext: function(){
+			// summary:
+			//		Focus the next widget
+			// tags:
+			//		protected
+			this.focusChild(this._getNextFocusableChild(this.focusedChild, 1));
+		},
+
+		focusPrev: function(){
+			// summary:
+			//		Focus the last focusable node in the previous widget
+			//		(ex: go to the ComboButton icon section rather than button section)
+			// tags:
+			//		protected
+			this.focusChild(this._getNextFocusableChild(this.focusedChild, -1), true);
+		},
+
+		childSelector: function(/*DOMNode*/ node){
+			// Implement _KeyNavMixin.childSelector, to identify focusable child nodes.
+			// If we allowed a dojo/query dependency from this module this could more simply be a string "> *"
+			// instead of this function.
+
+			var node = registry.byNode(node);
+			return node && node.getParent() == this;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/_KeyNavMixin.js b/src/main/resources/static/dijit/_KeyNavMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..e6a50f81b6fa309a7be2e2cb50f8a04305af030e
--- /dev/null
+++ b/src/main/resources/static/dijit/_KeyNavMixin.js
@@ -0,0 +1,487 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/keys", // keys.END keys.HOME, keys.LEFT_ARROW etc.
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dijit/registry",
+	"dijit/_FocusMixin"        // to make _onBlur() work
+], function(array, declare, domAttr, keys, lang, on, registry, _FocusMixin){
+
+	// module:
+	//		dijit/_KeyNavMixin
+
+	return declare("dijit._KeyNavMixin", _FocusMixin, {
+		// summary:
+		//		A mixin to allow arrow key and letter key navigation of child or descendant widgets.
+		//		It can be used by dijit/_Container based widgets with a flat list of children,
+		//		or more complex widgets like dijit/Tree.
+		//
+		//		To use this mixin, the subclass must:
+		//
+		//			- Implement  _getNext(), _getFirst(), _getLast(), _onLeftArrow(), _onRightArrow()
+		//			  _onDownArrow(), _onUpArrow() methods to handle home/end/left/right/up/down keystrokes.
+		//			  Next and previous in this context refer to a linear ordering of the descendants used
+		//			  by letter key search.
+		//			- Set all descendants' initial tabIndex to "-1"; both initial descendants and any
+		//			  descendants added later, by for example addChild()
+		//			- Define childSelector to a function or string that identifies focusable descendant widgets
+		//
+		//		Also, child widgets must implement a focus() method.
+
+		/*=====
+		 // focusedChild: [protected readonly] Widget
+		 //		The currently focused child widget, or null if there isn't one
+		 focusedChild: null,
+
+		 // _keyNavCodes: Object
+		 //		Hash mapping key code (arrow keys and home/end key) to functions to handle those keys.
+		 //		Usually not used directly, as subclasses can instead override _onLeftArrow() etc.
+		 _keyNavCodes: {},
+		 =====*/
+
+		// tabIndex: String
+		//		Tab index of the container; same as HTML tabIndex attribute.
+		//		Note then when user tabs into the container, focus is immediately
+		//		moved to the first item in the container.
+		tabIndex: "0",
+
+		// childSelector: [protected abstract] Function||String
+		//		Selector (passed to on.selector()) used to identify what to treat as a child widget.   Used to monitor
+		//		focus events and set this.focusedChild.   Must be set by implementing class.   If this is a string
+		//		(ex: "> *") then the implementing class must require dojo/query.
+		childSelector: null,
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// Set tabIndex on this.domNode.  Will be automatic after #7381 is fixed.
+			domAttr.set(this.domNode, "tabIndex", this.tabIndex);
+
+			if(!this._keyNavCodes){
+				var keyCodes = this._keyNavCodes = {};
+				keyCodes[keys.HOME] = lang.hitch(this, "focusFirstChild");
+				keyCodes[keys.END] = lang.hitch(this, "focusLastChild");
+				keyCodes[this.isLeftToRight() ? keys.LEFT_ARROW : keys.RIGHT_ARROW] = lang.hitch(this, "_onLeftArrow");
+				keyCodes[this.isLeftToRight() ? keys.RIGHT_ARROW : keys.LEFT_ARROW] = lang.hitch(this, "_onRightArrow");
+				keyCodes[keys.UP_ARROW] = lang.hitch(this, "_onUpArrow");
+				keyCodes[keys.DOWN_ARROW] = lang.hitch(this, "_onDownArrow");
+			}
+
+			var self = this,
+				childSelector = typeof this.childSelector == "string"
+					? this.childSelector
+					: lang.hitch(this, "childSelector");
+			this.own(
+				on(this.domNode, "keypress", lang.hitch(this, "_onContainerKeypress")),
+				on(this.domNode, "keydown", lang.hitch(this, "_onContainerKeydown")),
+				on(this.domNode, "focus", lang.hitch(this, "_onContainerFocus")),
+				on(this.containerNode, on.selector(childSelector, "focusin"), function(evt){
+					self._onChildFocus(registry.getEnclosingWidget(this), evt);
+				})
+			);
+		},
+
+		_onLeftArrow: function(){
+			// summary:
+			//		Called on left arrow key, or right arrow key if widget is in RTL mode.
+			//		Should go back to the previous child in horizontal container widgets like Toolbar.
+			// tags:
+			//		extension
+		},
+
+		_onRightArrow: function(){
+			// summary:
+			//		Called on right arrow key, or left arrow key if widget is in RTL mode.
+			//		Should go to the next child in horizontal container widgets like Toolbar.
+			// tags:
+			//		extension
+		},
+
+		_onUpArrow: function(){
+			// summary:
+			//		Called on up arrow key. Should go to the previous child in vertical container widgets like Menu.
+			// tags:
+			//		extension
+		},
+
+		_onDownArrow: function(){
+			// summary:
+			//		Called on down arrow key. Should go to the next child in vertical container widgets like Menu.
+			// tags:
+			//		extension
+		},
+
+		focus: function(){
+			// summary:
+			//		Default focus() implementation: focus the first child.
+			this.focusFirstChild();
+		},
+
+		_getFirstFocusableChild: function(){
+			// summary:
+			//		Returns first child that can be focused.
+
+			// Leverage _getNextFocusableChild() to skip disabled children
+			return this._getNextFocusableChild(null, 1);	// dijit/_WidgetBase
+		},
+
+		_getLastFocusableChild: function(){
+			// summary:
+			//		Returns last child that can be focused.
+
+			// Leverage _getNextFocusableChild() to skip disabled children
+			return this._getNextFocusableChild(null, -1);	// dijit/_WidgetBase
+		},
+
+		focusFirstChild: function(){
+			// summary:
+			//		Focus the first focusable child in the container.
+			// tags:
+			//		protected
+
+			this.focusChild(this._getFirstFocusableChild());
+		},
+
+		focusLastChild: function(){
+			// summary:
+			//		Focus the last focusable child in the container.
+			// tags:
+			//		protected
+
+			this.focusChild(this._getLastFocusableChild());
+		},
+
+		focusChild: function(/*dijit/_WidgetBase*/ widget, /*Boolean*/ last){
+			// summary:
+			//		Focus specified child widget.
+			// widget:
+			//		Reference to container's child widget
+			// last:
+			//		If true and if widget has multiple focusable nodes, focus the
+			//		last one instead of the first one
+			// tags:
+			//		protected
+
+			if(!widget){
+				return;
+			}
+
+			if(this.focusedChild && widget !== this.focusedChild){
+				this._onChildBlur(this.focusedChild);	// used to be used by _MenuBase
+			}
+			widget.set("tabIndex", this.tabIndex);	// for IE focus outline to appear, must set tabIndex before focus
+			widget.focus(last ? "end" : "start");
+
+			// Don't set focusedChild here, because the focus event should trigger a call to _onChildFocus(), which will
+			// set it.   More importantly, _onChildFocus(), which may be executed asynchronously (after this function
+			// returns) needs to know the old focusedChild to set its tabIndex to -1.
+		},
+
+		_onContainerFocus: function(evt){
+			// summary:
+			//		Handler for when the container itself gets focus.
+			// description:
+			//		Initially the container itself has a tabIndex, but when it gets
+			//		focus, switch focus to first child.
+			//
+			//		TODO for 2.0 (or earlier): Instead of having the container tabbable, always maintain a single child
+			//		widget as tabbable, Requires code in startup(), addChild(), and removeChild().
+			//		That would avoid various issues like #17347.
+			// tags:
+			//		private
+
+			// Note that we can't use _onFocus() because switching focus from the
+			// _onFocus() handler confuses the focus.js code
+			// (because it causes _onFocusNode() to be called recursively).
+			// Also, _onFocus() would fire when focus went directly to a child widget due to mouse click.
+
+			// Ignore spurious focus events:
+			//	1. focus on a child widget bubbles on FF
+			//	2. on IE, clicking the scrollbar of a select dropdown moves focus from the focused child item to me
+			if(evt.target !== this.domNode || this.focusedChild){
+				return;
+			}
+
+			this.focus();
+		},
+
+		_onFocus: function(){
+			// When the container gets focus by being tabbed into, or a descendant gets focus by being clicked,
+			// set the container's tabIndex to -1 (don't remove as that breaks Safari 4) so that tab or shift-tab
+			// will go to the fields after/before the container, rather than the container itself
+			domAttr.set(this.domNode, "tabIndex", "-1");
+
+			this.inherited(arguments);
+		},
+
+		_onBlur: function(evt){
+			// When focus is moved away the container, and its descendant (popup) widgets,
+			// then restore the container's tabIndex so that user can tab to it again.
+			// Note that using _onBlur() so that this doesn't happen when focus is shifted
+			// to one of my child widgets (typically a popup)
+
+			// TODO: for 2.0 consider changing this to blur whenever the container blurs, to be truthful that there is
+			// no focused child at that time.
+
+			domAttr.set(this.domNode, "tabIndex", this.tabIndex);
+			if(this.focusedChild){
+				this.focusedChild.set("tabIndex", "-1");
+				this.lastFocusedChild = this.focusedChild;
+				this._set("focusedChild", null);
+			}
+			this.inherited(arguments);
+		},
+
+		_onChildFocus: function(/*dijit/_WidgetBase*/ child){
+			// summary:
+			//		Called when a child widget gets focus, either by user clicking
+			//		it, or programatically by arrow key handling code.
+			// description:
+			//		It marks that the current node is the selected one, and the previously
+			//		selected node no longer is.
+
+			if(child && child != this.focusedChild){
+				if(this.focusedChild && !this.focusedChild._destroyed){
+					// mark that the previously focusable node is no longer focusable
+					this.focusedChild.set("tabIndex", "-1");
+				}
+
+				// mark that the new node is the currently selected one
+				child.set("tabIndex", this.tabIndex);
+				this.lastFocused = child;		// back-compat for Tree, remove for 2.0
+				this._set("focusedChild", child);
+			}
+		},
+
+		_searchString: "",
+		// multiCharSearchDuration: Number
+		//		If multiple characters are typed where each keystroke happens within
+		//		multiCharSearchDuration of the previous keystroke,
+		//		search for nodes matching all the keystrokes.
+		//
+		//		For example, typing "ab" will search for entries starting with
+		//		"ab" unless the delay between "a" and "b" is greater than multiCharSearchDuration.
+		multiCharSearchDuration: 1000,
+
+		onKeyboardSearch: function(/*dijit/_WidgetBase*/ item, /*Event*/ evt, /*String*/ searchString, /*Number*/ numMatches){
+			// summary:
+			//		When a key is pressed that matches a child item,
+			//		this method is called so that a widget can take appropriate action is necessary.
+			// tags:
+			//		protected
+			if(item){
+				this.focusChild(item);
+			}
+		},
+
+		_keyboardSearchCompare: function(/*dijit/_WidgetBase*/ item, /*String*/ searchString){
+			// summary:
+			//		Compares the searchString to the widget's text label, returning:
+			//
+			//			* -1: a high priority match  and stop searching
+			//		 	* 0: not a match
+			//		 	* 1: a match but keep looking for a higher priority match
+			// tags:
+			//		private
+
+			var element = item.domNode,
+				text = item.label || (element.focusNode ? element.focusNode.label : '') || element.innerText || element.textContent || "",
+				currentString = text.replace(/^\s+/, '').substr(0, searchString.length).toLowerCase();
+
+			return (!!searchString.length && currentString == searchString) ? -1 : 0; // stop searching after first match by default
+		},
+
+		_onContainerKeydown: function(evt){
+			// summary:
+			//		When a key is pressed, if it's an arrow key etc. then it's handled here.
+			// tags:
+			//		private
+
+			var func = this._keyNavCodes[evt.keyCode];
+			if(func){
+				func(evt, this.focusedChild);
+				evt.stopPropagation();
+				evt.preventDefault();
+				this._searchString = ''; // so a DOWN_ARROW b doesn't search for ab
+			}else if(evt.keyCode == keys.SPACE && this._searchTimer && !(evt.ctrlKey || evt.altKey || evt.metaKey)){
+				evt.stopImmediatePropagation(); // stop a11yclick and _HasDropdown from seeing SPACE if we're doing keyboard searching
+				evt.preventDefault(); // stop IE from scrolling, and most browsers (except FF) from sending keypress
+				this._keyboardSearch(evt, ' ');
+			}
+		},
+
+		_onContainerKeypress: function(evt){
+			// summary:
+			//		When a printable key is pressed, it's handled here, searching by letter.
+			// tags:
+			//		private
+
+			// Ignore:
+			// 		- duplicate events on firefox (ex: arrow key that will be handled by keydown handler)
+			//		- control sequences like CMD-Q.
+			//		- the SPACE key (only occurs on FF)
+			//
+			// Note: if there's no search in progress, then SPACE should be ignored.   If there is a search
+			// in progress, then SPACE is handled in _onContainerKeyDown.
+			if(evt.charCode <= keys.SPACE || evt.ctrlKey || evt.altKey || evt.metaKey){
+				return;
+			}
+
+			evt.preventDefault();
+			evt.stopPropagation();
+
+			this._keyboardSearch(evt, String.fromCharCode(evt.charCode).toLowerCase());
+		},
+
+		_keyboardSearch: function(/*Event*/ evt, /*String*/ keyChar){
+			// summary:
+			//		Perform a search of the widget's options based on the user's keyboard activity
+			// description:
+			//		Called on keypress (and sometimes keydown), searches through this widget's children
+			//		looking for items that match the user's typed search string.  Multiple characters
+			//		typed within 1 sec of each other are combined for multicharacter searching.
+			// tags:
+			//		private
+			var
+				matchedItem = null,
+				searchString,
+				numMatches = 0,
+				search = lang.hitch(this, function(){
+					if(this._searchTimer){
+						this._searchTimer.remove();
+					}
+					this._searchString += keyChar;
+					var allSameLetter = /^(.)\1*$/.test(this._searchString);
+					var searchLen = allSameLetter ? 1 : this._searchString.length;
+					searchString = this._searchString.substr(0, searchLen);
+					// commented out code block to search again if the multichar search fails after a smaller timeout
+					//this._searchTimer = this.defer(function(){ // this is the "failure" timeout
+					//	this._typingSlowly = true; // if the search fails, then treat as a full timeout
+					//	this._searchTimer = this.defer(function(){ // this is the "success" timeout
+					//		this._searchTimer = null;
+					//		this._searchString = '';
+					//	}, this.multiCharSearchDuration >> 1);
+					//}, this.multiCharSearchDuration >> 1);
+					this._searchTimer = this.defer(function(){ // this is the "success" timeout
+						this._searchTimer = null;
+						this._searchString = '';
+					}, this.multiCharSearchDuration);
+					var currentItem = this.focusedChild || null;
+					if(searchLen == 1 || !currentItem){
+						currentItem = this._getNextFocusableChild(currentItem, 1); // skip current
+						if(!currentItem){
+							return;
+						} // no items
+					}
+					var stop = currentItem;
+					do{
+						var rc = this._keyboardSearchCompare(currentItem, searchString);
+						if(!!rc && numMatches++ == 0){
+							matchedItem = currentItem;
+						}
+						if(rc == -1){ // priority match
+							numMatches = -1;
+							break;
+						}
+						currentItem = this._getNextFocusableChild(currentItem, 1);
+					}while(currentItem && currentItem != stop);
+					// commented out code block to search again if the multichar search fails after a smaller timeout
+					//if(!numMatches && (this._typingSlowly || searchLen == 1)){
+					//	this._searchString = '';
+					//	if(searchLen > 1){
+					//		// if no matches and they're typing slowly, then go back to first letter searching
+					//		search();
+					//	}
+					//}
+				});
+
+			search();
+			// commented out code block to search again if the multichar search fails after a smaller timeout
+			//this._typingSlowly = false;
+			this.onKeyboardSearch(matchedItem, evt, searchString, numMatches);
+		},
+
+		_onChildBlur: function(/*dijit/_WidgetBase*/ /*===== widget =====*/){
+			// summary:
+			//		Called when focus leaves a child widget to go
+			//		to a sibling widget.
+			//		Used to be used by MenuBase.js (remove for 2.0)
+			// tags:
+			//		protected
+		},
+
+		_getNextFocusableChild: function(child, dir){
+			// summary:
+			//		Returns the next or previous focusable descendant, compared to "child".
+			//		Implements and extends _KeyNavMixin._getNextFocusableChild() for a _Container.
+			// child: Widget
+			//		The current widget
+			// dir: Integer
+			//		- 1 = after
+			//		- -1 = before
+			// tags:
+			//		abstract extension
+
+			var wrappedValue = child;
+			do{
+				if(!child){
+					child = this[dir > 0 ? "_getFirst" : "_getLast"]();
+					if(!child){ break; }
+				}else{
+					child = this._getNext(child, dir);
+				}
+				if(child != null && child != wrappedValue && child.isFocusable()){
+					return child;	// dijit/_WidgetBase
+				}
+			}while(child != wrappedValue);
+			// no focusable child found
+			return null;	// dijit/_WidgetBase
+		},
+
+		_getFirst: function(){
+			// summary:
+			//		Returns the first child.
+			// tags:
+			//		abstract extension
+
+			return null;	// dijit/_WidgetBase
+		},
+
+		_getLast: function(){
+			// summary:
+			//		Returns the last descendant.
+			// tags:
+			//		abstract extension
+
+			return null;	// dijit/_WidgetBase
+		},
+
+		_getNext: function(child, dir){
+			// summary:
+			//		Returns the next descendant, compared to "child".
+			// child: Widget
+			//		The current widget
+			// dir: Integer
+			//		- 1 = after
+			//		- -1 = before
+			// tags:
+			//		abstract extension
+
+			if(child){
+				child = child.domNode;
+				while(child){
+					child = child[dir < 0 ? "previousSibling" : "nextSibling"];
+					if(child  && "getAttribute" in child){
+						var w = registry.byNode(child);
+						if(w){
+							return w; // dijit/_WidgetBase
+						}
+					}
+				}
+			}
+			return null;	// dijit/_WidgetBase
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/_MenuBase.js b/src/main/resources/static/dijit/_MenuBase.js
new file mode 100644
index 0000000000000000000000000000000000000000..0fb0720164c1a1e252595af32751a4c47017dd64
--- /dev/null
+++ b/src/main/resources/static/dijit/_MenuBase.js
@@ -0,0 +1,466 @@
+define([
+	"dojo/_base/array", // array.indexOf
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.isDescendant domClass.replace
+	"dojo/dom-attr",
+	"dojo/dom-class", // domClass.replace
+	"dojo/_base/lang", // lang.hitch
+	"dojo/mouse", // mouse.enter, mouse.leave
+	"dojo/on",
+	"dojo/window",
+	"./a11yclick",
+	"./registry",
+	"./_Widget",
+	"./_CssStateMixin",
+	"./_KeyNavContainer",
+	"./_TemplatedMixin"
+], function(array, declare, dom, domAttr, domClass, lang, mouse, on, winUtils, a11yclick,
+			registry, _Widget, _CssStateMixin, _KeyNavContainer, _TemplatedMixin){
+
+	// module:
+	//		dijit/_MenuBase
+
+	return declare("dijit._MenuBase", [_Widget, _TemplatedMixin, _KeyNavContainer, _CssStateMixin], {
+		// summary:
+		//		Abstract base class for Menu and MenuBar.
+		//		Subclass should implement _onUpArrow(), _onDownArrow(), _onLeftArrow(), and _onRightArrow().
+
+		// selected: dijit/MenuItem
+		//		Currently selected (a.k.a. highlighted) MenuItem, or null if no MenuItem is selected.
+		//		If a submenu is open, will be set to MenuItem that displayed the submenu.   OTOH, if
+		//		this Menu is in passive mode (i.e. hasn't been clicked yet), will be null, because
+		//		"selected" is not merely "hovered".
+		selected: null,
+		_setSelectedAttr: function(item){
+			if(this.selected != item){
+				if(this.selected){
+					this.selected._setSelected(false);
+					this._onChildDeselect(this.selected);
+				}
+				if(item){
+					item._setSelected(true);
+				}
+				this._set("selected", item);
+			}
+		},
+
+		// activated: [readonly] Boolean
+		//		This Menu has been clicked (mouse or via space/arrow key) or opened as a submenu,
+		//		so mere mouseover will open submenus.  Focusing a menu via TAB does NOT automatically make it active
+		//		since TAB is a navigation operation and not a selection one.
+		//		For Windows apps, pressing the ALT key focuses the menubar menus (similar to TAB navigation) but the
+		//		menu is not active (ie no dropdown) until an item is clicked.
+		activated: false,
+		_setActivatedAttr: function(val){
+			domClass.toggle(this.domNode, "dijitMenuActive", val);
+			domClass.toggle(this.domNode, "dijitMenuPassive", !val);
+			this._set("activated", val);
+		},
+
+		// parentMenu: [readonly] Widget
+		//		pointer to menu that displayed me
+		parentMenu: null,
+
+		// popupDelay: Integer
+		//		After a menu has been activated (by clicking on it etc.), number of milliseconds before hovering
+		//		(without clicking) another MenuItem causes that MenuItem's popup to automatically open.
+		popupDelay: 500,
+
+		// passivePopupDelay: Integer
+		//		For a passive (unclicked) Menu, number of milliseconds before hovering (without clicking) will cause
+		//		the popup to open.  Default is Infinity, meaning you need to click the menu to open it.
+		passivePopupDelay: Infinity,
+
+		// autoFocus: Boolean
+		//		A toggle to control whether or not a Menu gets focused when opened as a drop down from a MenuBar
+		//		or DropDownButton/ComboButton.   Note though that it always get focused when opened via the keyboard.
+		autoFocus: false,
+
+		childSelector: function(/*DOMNode*/ node){
+			// summary:
+			//		Selector (passed to on.selector()) used to identify MenuItem child widgets, but exclude inert children
+			//		like MenuSeparator.  If subclass overrides to a string (ex: "> *"), the subclass must require dojo/query.
+			// tags:
+			//		protected
+
+			var widget = registry.byNode(node);
+			return node.parentNode == this.containerNode && widget && widget.focus;
+		},
+
+		postCreate: function(){
+			var self = this,
+				matches = typeof this.childSelector == "string" ? this.childSelector : lang.hitch(this, "childSelector");
+			this.own(
+				on(this.containerNode, on.selector(matches, mouse.enter), function(){
+					self.onItemHover(registry.byNode(this));
+				}),
+				on(this.containerNode, on.selector(matches, mouse.leave), function(){
+					self.onItemUnhover(registry.byNode(this));
+				}),
+				on(this.containerNode, on.selector(matches, a11yclick), function(evt){
+					self.onItemClick(registry.byNode(this), evt);
+					evt.stopPropagation();
+				}),
+				on(this.containerNode, on.selector(matches, "focusin"), function(){
+					self._onItemFocus(registry.byNode(this));
+				})
+			);
+			this.inherited(arguments);
+		},
+
+		onKeyboardSearch: function(/*MenuItem*/ item, /*Event*/ evt, /*String*/ searchString, /*Number*/ numMatches){
+			// summary:
+			//		Attach point for notification about when a menu item has been searched for
+			//		via the keyboard search mechanism.
+			// tags:
+			//		protected
+			this.inherited(arguments);
+			if(!!item && (numMatches == -1 || (!!item.popup && numMatches == 1))){
+				this.onItemClick(item, evt);
+			}
+		},
+
+		_keyboardSearchCompare: function(/*dijit/_WidgetBase*/ item, /*String*/ searchString){
+			// summary:
+			//		Compares the searchString to the widget's text label, returning:
+			//		-1: a high priority match and stop searching
+			//		 0: no match
+			//		 1: a match but keep looking for a higher priority match
+			// tags:
+			//		private
+			if(!!item.shortcutKey){
+				// accessKey matches have priority
+				return searchString == item.shortcutKey.toLowerCase() ? -1 : 0;
+			}
+			return this.inherited(arguments) ? 1 : 0; // change return value of -1 to 1 so that searching continues
+		},
+
+		onExecute: function(){
+			// summary:
+			//		Attach point for notification about when a menu item has been executed.
+			//		This is an internal mechanism used for Menus to signal to their parent to
+			//		close them, because they are about to execute the onClick handler.  In
+			//		general developers should not attach to or override this method.
+			// tags:
+			//		protected
+		},
+
+		onCancel: function(/*Boolean*/ /*===== closeAll =====*/){
+			// summary:
+			//		Attach point for notification about when the user cancels the current menu
+			//		This is an internal mechanism used for Menus to signal to their parent to
+			//		close them.  In general developers should not attach to or override this method.
+			// tags:
+			//		protected
+		},
+
+		_moveToPopup: function(/*Event*/ evt){
+			// summary:
+			//		This handles the right arrow key (left arrow key on RTL systems),
+			//		which will either open a submenu, or move to the next item in the
+			//		ancestor MenuBar
+			// tags:
+			//		private
+
+			if(this.focusedChild && this.focusedChild.popup && !this.focusedChild.disabled){
+				this.onItemClick(this.focusedChild, evt);
+			}else{
+				var topMenu = this._getTopMenu();
+				if(topMenu && topMenu._isMenuBar){
+					topMenu.focusNext();
+				}
+			}
+		},
+
+		_onPopupHover: function(/*Event*/ /*===== evt =====*/){
+			// summary:
+			//		This handler is called when the mouse moves over the popup.
+			// tags:
+			//		private
+
+			// if the mouse hovers over a menu popup that is in pending-close state,
+			// then stop the close operation.
+			// This can't be done in onItemHover since some popup targets don't have MenuItems (e.g. ColorPicker)
+
+			// highlight the parent menu item pointing to this popup (in case user temporarily moused over another MenuItem)
+			this.set("selected", this.currentPopupItem);
+
+			// cancel the pending close (if there is one) (in case user temporarily moused over another MenuItem)
+			this._stopPendingCloseTimer();
+		},
+
+		onItemHover: function(/*MenuItem*/ item){
+			// summary:
+			//		Called when cursor is over a MenuItem.
+			// tags:
+			//		protected
+
+			// Don't do anything unless user has "activated" the menu by:
+			//		1) clicking it
+			//		2) opening it from a parent menu (which automatically activates it)
+
+			if(this.activated){
+				this.set("selected", item);
+				if(item.popup && !item.disabled && !this.hover_timer){
+					this.hover_timer = this.defer(function(){
+						this._openItemPopup(item);
+					}, this.popupDelay);
+				}
+			}else if(this.passivePopupDelay < Infinity){
+				if(this.passive_hover_timer){
+					this.passive_hover_timer.remove();
+				}
+				this.passive_hover_timer = this.defer(function(){
+					this.onItemClick(item, {type: "click"});
+				}, this.passivePopupDelay);
+			}
+
+			this._hoveredChild = item;
+
+			item._set("hovering", true);
+		},
+
+		_onChildDeselect: function(item){
+			// summary:
+			//		Called when a child MenuItem becomes deselected.   Setup timer to close its popup.
+
+			this._stopPopupTimer();
+
+			// Setup timer to close all popups that are open and descendants of this menu.
+			// Will be canceled if user quickly moves the mouse over the popup.
+			if(this.currentPopupItem == item){
+				this._stopPendingCloseTimer();
+				this._pendingClose_timer = this.defer(function(){
+					this._pendingClose_timer = null;
+					this.currentPopupItem = null;
+					item._closePopup(); // this calls onClose
+				}, this.popupDelay);
+			}
+		},
+
+		onItemUnhover: function(/*MenuItem*/ item){
+			// summary:
+			//		Callback fires when mouse exits a MenuItem
+			// tags:
+			//		protected
+
+			if(this._hoveredChild == item){
+				this._hoveredChild = null;
+			}
+
+			if(this.passive_hover_timer){
+				this.passive_hover_timer.remove();
+				this.passive_hover_timer = null;
+			}
+
+			item._set("hovering", false);
+		},
+
+		_stopPopupTimer: function(){
+			// summary:
+			//		Cancels the popup timer because the user has stop hovering
+			//		on the MenuItem, etc.
+			// tags:
+			//		private
+
+			if(this.hover_timer){
+				this.hover_timer = this.hover_timer.remove();
+			}
+		},
+
+		_stopPendingCloseTimer: function(){
+			// summary:
+			//		Cancels the pending-close timer because the close has been preempted
+			// tags:
+			//		private
+			if(this._pendingClose_timer){
+				this._pendingClose_timer = this._pendingClose_timer.remove();
+			}
+		},
+
+		_getTopMenu: function(){
+			// summary:
+			//		Returns the top menu in this chain of Menus
+			// tags:
+			//		private
+			for(var top = this; top.parentMenu; top = top.parentMenu){}
+			return top;
+		},
+
+		onItemClick: function(/*dijit/_WidgetBase*/ item, /*Event*/ evt){
+			// summary:
+			//		Handle clicks on an item.
+			// tags:
+			//		private
+
+			if(this.passive_hover_timer){
+				this.passive_hover_timer.remove();
+			}
+
+			this.focusChild(item);
+
+			if(item.disabled){
+				return false;
+			}
+
+			if(item.popup){
+				this.set("selected", item);
+				this.set("activated", true);
+				var byKeyboard = /^key/.test(evt._origType || evt.type) ||
+					(evt.clientX == 0 && evt.clientY == 0);	// detects accessKey like ALT+SHIFT+F, where type is "click"
+				this._openItemPopup(item, byKeyboard);
+			}else{
+				// before calling user defined handler, close hierarchy of menus
+				// and restore focus to place it was when menu was opened
+				this.onExecute();
+
+				// user defined handler for click
+				item._onClick ? item._onClick(evt) : item.onClick(evt);
+			}
+		},
+
+		_openItemPopup: function(/*dijit/MenuItem*/ from_item, /*Boolean*/ focus){
+			// summary:
+			//		Open the popup to the side of/underneath the current menu item, and optionally focus first item
+			// tags:
+			//		protected
+
+			if(from_item == this.currentPopupItem){
+				// Specified popup is already being shown, so just return
+				return;
+			}
+			if(this.currentPopupItem){
+				// If another popup is currently shown, then close it
+				this._stopPendingCloseTimer();
+				this.currentPopupItem._closePopup();
+			}
+			this._stopPopupTimer();
+
+			var popup = from_item.popup;
+			popup.parentMenu = this;
+
+			// detect mouseover of the popup to handle lazy mouse movements that temporarily focus other menu items\c
+			this.own(this._mouseoverHandle = on.once(popup.domNode, "mouseover", lang.hitch(this, "_onPopupHover")));
+
+			var self = this;
+			from_item._openPopup({
+				parent: this,
+				orient: this._orient || ["after", "before"],
+				onCancel: function(){ // called when the child menu is canceled
+					if(focus){
+						// put focus back on my node before focused node is hidden
+						self.focusChild(from_item);
+					}
+
+					// close the submenu (be sure this is done _after_ focus is moved)
+					self._cleanUp();
+				},
+				onExecute: lang.hitch(this, "_cleanUp", true),
+				onClose: function(){
+					// Remove handler created by onItemHover
+					if(self._mouseoverHandle){
+						self._mouseoverHandle.remove();
+						delete self._mouseoverHandle;
+					}
+				}
+			}, focus);
+
+			this.currentPopupItem = from_item;
+
+			// TODO: focusing a popup should clear tabIndex on Menu (and it's child MenuItems), so that neither
+			// TAB nor SHIFT-TAB returns to the menu.  Only ESC or ENTER should return to the menu.
+		},
+
+		onOpen: function(/*Event*/ /*===== e =====*/){
+			// summary:
+			//		Callback when this menu is opened.
+			//		This is called by the popup manager as notification that the menu
+			//		was opened.
+			// tags:
+			//		private
+
+			this.isShowingNow = true;
+			this.set("activated", true);
+		},
+
+		onClose: function(){
+			// summary:
+			//		Callback when this menu is closed.
+			//		This is called by the popup manager as notification that the menu
+			//		was closed.
+			// tags:
+			//		private
+
+			this.set("activated", false);
+			this.set("selected", null);
+			this.isShowingNow = false;
+			this.parentMenu = null;
+		},
+
+		_closeChild: function(){
+			// summary:
+			//		Called when submenu is clicked or focus is lost.  Close hierarchy of menus.
+			// tags:
+			//		private
+			this._stopPopupTimer();
+
+			if(this.currentPopupItem){
+				// If focus is on a descendant MenuItem then move focus to me,
+				// because IE doesn't like it when you display:none a node with focus,
+				// and also so keyboard users don't lose control.
+				// Likely, immediately after a user defined onClick handler will move focus somewhere
+				// else, like a Dialog.
+				if(this.focused){
+					domAttr.set(this.selected.focusNode, "tabIndex", this.tabIndex);
+					this.selected.focusNode.focus();
+				}
+
+				// Close all popups that are open and descendants of this menu
+				this.currentPopupItem._closePopup();
+				this.currentPopupItem = null;
+			}
+		},
+
+		_onItemFocus: function(/*MenuItem*/ item){
+			// summary:
+			//		Called when child of this Menu gets focus from:
+			//
+			//		1. clicking it
+			//		2. tabbing into it
+			//		3. being opened by a parent menu.
+			//
+			//		This is not called just from mouse hover.
+
+			if(this._hoveredChild && this._hoveredChild != item){
+				this.onItemUnhover(this._hoveredChild);	// any previous mouse movement is trumped by focus selection
+			}
+			this.set("selected", item);
+		},
+
+		_onBlur: function(){
+			// summary:
+			//		Called when focus is moved away from this Menu and it's submenus.
+			// tags:
+			//		protected
+
+			this._cleanUp(true);
+			this.inherited(arguments);
+		},
+
+		_cleanUp: function(/*Boolean*/ clearSelectedItem){
+			// summary:
+			//		Called when the user is done with this menu.  Closes hierarchy of menus.
+			// tags:
+			//		private
+
+			this._closeChild(); // don't call this.onClose since that's incorrect for MenuBar's that never close
+			if(typeof this.isShowingNow == 'undefined'){ // non-popup menu doesn't call onClose
+				this.set("activated", false);
+			}
+
+			if(clearSelectedItem){
+				this.set("selected", null);
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/_OnDijitClickMixin.js b/src/main/resources/static/dijit/_OnDijitClickMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..00092020232633cfbbf171a3334eaeaf1421f287
--- /dev/null
+++ b/src/main/resources/static/dijit/_OnDijitClickMixin.js
@@ -0,0 +1,31 @@
+define([
+	"dojo/on",
+	"dojo/_base/array", // array.forEach
+	"dojo/keys", // keys.ENTER keys.SPACE
+	"dojo/_base/declare", // declare
+	"dojo/has", // has("dom-addeventlistener")
+	"./a11yclick"
+], function(on, array, keys, declare, has, a11yclick){
+
+	// module:
+	//		dijit/_OnDijitClickMixin
+
+	var ret = declare("dijit._OnDijitClickMixin", null, {
+		// summary:
+		//		Deprecated.   New code should access the dijit/a11yclick event directly, ex:
+		//		|	this.own(on(node, a11yclick, function(){ ... }));
+		//
+		//		Mixing in this class will make _WidgetBase.connect(node, "ondijitclick", ...) work.
+		//		It also used to be necessary to make templates with ondijitclick work, but now you can just require
+		//		dijit/a11yclick.
+
+		connect: function(obj, event, method){
+			// override _WidgetBase.connect() to make this.connect(node, "ondijitclick", ...) work
+			return this.inherited(arguments, [obj, event == "ondijitclick" ? a11yclick : event, method]);
+		}
+	});
+
+	ret.a11yclick = a11yclick;	// back compat
+
+	return ret;
+});
diff --git a/src/main/resources/static/dijit/_PaletteMixin.js b/src/main/resources/static/dijit/_PaletteMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..33b1931849774b1856ad07f94615ac26bae049fb
--- /dev/null
+++ b/src/main/resources/static/dijit/_PaletteMixin.js
@@ -0,0 +1,339 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/dom-class", // domClass.add domClass.remove
+	"dojo/dom-construct", // domConstruct.create domConstruct.place
+	"dojo/keys", // keys
+	"dojo/_base/lang", // lang.getObject
+	"dojo/on",
+	"./_CssStateMixin",
+	"./a11yclick",
+	"./focus",
+	"./typematic"
+], function(declare, domAttr, domClass, domConstruct, keys, lang, on, _CssStateMixin, a11yclick, focus, typematic){
+
+	// module:
+	//		dijit/_PaletteMixin
+
+	var PaletteMixin = declare("dijit._PaletteMixin", _CssStateMixin, {
+		// summary:
+		//		A keyboard accessible palette, for picking a color/emoticon/etc.
+		// description:
+		//		A mixin for a grid showing various entities, so the user can pick a certain entity.
+
+		// defaultTimeout: Number
+		//		Number of milliseconds before a held key or button becomes typematic
+		defaultTimeout: 500,
+
+		// timeoutChangeRate: Number
+		//		Fraction of time used to change the typematic timer between events
+		//		1.0 means that each typematic event fires at defaultTimeout intervals
+		//		Less than 1.0 means that each typematic event fires at an increasing faster rate
+		timeoutChangeRate: 0.90,
+
+		// value: String
+		//		Currently selected color/emoticon/etc.
+		value: "",
+
+		// _selectedCell: [private] Integer
+		//		Index of the currently selected cell. Initially, none selected
+		_selectedCell: -1,
+
+		/*=====
+		 // _currentFocus: [private] DomNode
+		 //		The currently focused cell (if the palette itself has focus), or otherwise
+		 //		the cell to be focused when the palette itself gets focus.
+		 //		Different from value, which represents the selected (i.e. clicked) cell.
+		 _currentFocus: null,
+		 =====*/
+
+		/*=====
+		 // _xDim: [protected] Integer
+		 //		This is the number of cells horizontally across.
+		 _xDim: null,
+		 =====*/
+
+		/*=====
+		 // _yDim: [protected] Integer
+		 //		This is the number of cells vertically down.
+		 _yDim: null,
+		 =====*/
+
+		// tabIndex: String
+		//		Widget tab index.
+		tabIndex: "0",
+
+		// cellClass: [protected] String
+		//		CSS class applied to each cell in the palette
+		cellClass: "dijitPaletteCell",
+
+		// dyeClass: [protected] Constructor
+		//		Constructor for Object created for each cell of the palette.
+		//		dyeClass should implement the dijit/_PaletteMixin.__Dye interface.
+		dyeClass: null,
+
+		_dyeFactory: function(value /*===== , row, col, title =====*/){
+			// summary:
+			//		Return instance of dijit.Dye for specified cell of palette
+			// tags:
+			//		extension
+
+			// Remove string support for 2.0
+			var dyeClassObj = typeof this.dyeClass == "string" ? lang.getObject(this.dyeClass) : this.dyeClass;
+			return new dyeClassObj(value);
+		},
+
+		_preparePalette: function(choices, titles){
+			// summary:
+			//		Subclass must call _preparePalette() from postCreate(), passing in the tooltip
+			//		for each cell
+			// choices: String[][]
+			//		id's for each cell of the palette, used to create Dye JS object for each cell
+			// titles: String[]
+			//		Localized tooltip for each cell
+
+			this._cells = [];
+			var url = this._blankGif;
+
+			this.own(on(this.gridNode, a11yclick, lang.hitch(this, "_onCellClick")));
+
+			for(var row = 0; row < choices.length; row++){
+				var rowNode = domConstruct.create("tr", {tabIndex: "-1", role: "row"}, this.gridNode);
+				for(var col = 0; col < choices[row].length; col++){
+					var value = choices[row][col];
+					if(value){
+						var cellObject = this._dyeFactory(value, row, col, titles[value]);
+
+						var cellNode = domConstruct.create("td", {
+							"class": this.cellClass,
+							tabIndex: "-1",
+							title: titles[value],
+							role: "gridcell"
+						}, rowNode);
+
+						// prepare cell inner structure
+						cellObject.fillCell(cellNode, url);
+
+						cellNode.idx = this._cells.length;
+
+						// save cell info into _cells
+						this._cells.push({node: cellNode, dye: cellObject});
+					}
+				}
+			}
+			this._xDim = choices[0].length;
+			this._yDim = choices.length;
+
+			// Now set all events
+			// The palette itself is navigated to with the tab key on the keyboard
+			// Keyboard navigation within the Palette is with the arrow keys
+			// Spacebar selects the cell.
+			// For the up key the index is changed by negative the x dimension.
+
+			var keyIncrementMap = {
+				UP_ARROW: -this._xDim,
+				// The down key the index is increase by the x dimension.
+				DOWN_ARROW: this._xDim,
+				// Right and left move the index by 1.
+				RIGHT_ARROW: this.isLeftToRight() ? 1 : -1,
+				LEFT_ARROW: this.isLeftToRight() ? -1 : 1
+			};
+			for(var key in keyIncrementMap){
+				this.own(
+					typematic.addKeyListener(
+						this.domNode,
+						{keyCode: keys[key], ctrlKey: false, altKey: false, shiftKey: false},
+						this,
+						function(){
+							var increment = keyIncrementMap[key];
+							return function(count){
+								this._navigateByKey(increment, count);
+							};
+						}(),
+						this.timeoutChangeRate,
+						this.defaultTimeout
+					)
+				);
+			}
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// Set initial navigable node.
+			this._setCurrent(this._cells[0].node);
+		},
+
+		focus: function(){
+			// summary:
+			//		Focus this widget.  Puts focus on the most recently focused cell.
+
+			// The cell already has tabIndex set, just need to set CSS and focus it
+			focus.focus(this._currentFocus);
+		},
+
+		_onCellClick: function(/*Event*/ evt){
+			// summary:
+			//		Handler for click, enter key & space key. Selects the cell.
+			// evt:
+			//		The event.
+			// tags:
+			//		private
+
+			var target = evt.target;
+
+			// Find TD associated with click event.   For ColorPalette user likely clicked IMG inside of TD
+			while(target.tagName != "TD"){
+				if(!target.parentNode || target == this.gridNode){    // probably can never happen, but just in case
+					return;
+				}
+				target = target.parentNode;
+			}
+
+			var value = this._getDye(target).getValue();
+
+			// First focus the clicked cell, and then send onChange() notification.
+			// onChange() (via _setValueAttr) must be after the focus call, because
+			// it may trigger a refocus to somewhere else (like the Editor content area), and that
+			// second focus should win.
+			this._setCurrent(target);
+			focus.focus(target);
+			this._setValueAttr(value, true);
+
+			evt.stopPropagation();
+			evt.preventDefault();
+		},
+
+		_setCurrent: function(/*DomNode*/ node){
+			// summary:
+			//		Sets which node is the focused cell.
+			// description:
+			//		At any point in time there's exactly one
+			//		cell with tabIndex != -1.   If focus is inside the palette then
+			//		focus is on that cell.
+			//
+			//		After calling this method, arrow key handlers and mouse click handlers
+			//		should focus the cell in a setTimeout().
+			// tags:
+			//		protected
+			if("_currentFocus" in this){
+				// Remove tabIndex on old cell
+				domAttr.set(this._currentFocus, "tabIndex", "-1");
+			}
+
+			// Set tabIndex of new cell
+			this._currentFocus = node;
+			if(node){
+				domAttr.set(node, "tabIndex", this.tabIndex);
+			}
+		},
+
+		_setValueAttr: function(value, priorityChange){
+			// summary:
+			//		This selects a cell. It triggers the onChange event.
+			// value: String
+			//		Value of the cell to select
+			// tags:
+			//		protected
+			// priorityChange: Boolean?
+			//		Optional parameter used to tell the select whether or not to fire
+			//		onChange event.
+
+			// clear old selected cell
+			if(this._selectedCell >= 0){
+				domClass.remove(this._cells[this._selectedCell].node, this.cellClass + "Selected");
+			}
+			this._selectedCell = -1;
+
+			// search for cell matching specified value
+			if(value){
+				for(var i = 0; i < this._cells.length; i++){
+					if(value == this._cells[i].dye.getValue()){
+						this._selectedCell = i;
+						domClass.add(this._cells[i].node, this.cellClass + "Selected");
+						break;
+					}
+				}
+			}
+
+			// record new value, or null if no matching cell
+			this._set("value", this._selectedCell >= 0 ? value : null);
+
+			if(priorityChange || priorityChange === undefined){
+				this.onChange(value);
+			}
+		},
+
+		onChange: function(/*===== value =====*/){
+			// summary:
+			//		Callback when a cell is selected.
+			// value: String
+			//		Value corresponding to cell.
+		},
+
+		_navigateByKey: function(increment, typeCount){
+			// summary:
+			//		This is the callback for typematic.
+			//		It changes the focus and the highlighed cell.
+			// increment:
+			//		How much the key is navigated.
+			// typeCount:
+			//		How many times typematic has fired.
+			// tags:
+			//		private
+
+			// typecount == -1 means the key is released.
+			if(typeCount == -1){
+				return;
+			}
+
+			var newFocusIndex = this._currentFocus.idx + increment;
+			if(newFocusIndex < this._cells.length && newFocusIndex > -1){
+				var focusNode = this._cells[newFocusIndex].node;
+				this._setCurrent(focusNode);
+
+				// Actually focus the node, for the benefit of screen readers.
+				// Use defer because IE doesn't like changing focus inside of an event handler
+				this.defer(lang.hitch(focus, "focus", focusNode));
+			}
+		},
+
+		_getDye: function(/*DomNode*/ cell){
+			// summary:
+			//		Get JS object for given cell DOMNode
+
+			return this._cells[cell.idx].dye;
+		}
+	});
+
+	/*=====
+	 PaletteMixin.__Dye = declare("dijit.Dye", null, {
+		 // summary:
+		 //		Interface for the JS Object associated with a palette cell (i.e. DOMNode)
+
+		 constructor: function(alias, row, col){
+			 // summary:
+			 //		Initialize according to value or alias like "white"
+			 // alias: String
+		 },
+
+		 getValue: function(){
+			 // summary:
+			 //		Return "value" of cell; meaning of "value" varies by subclass.
+			 // description:
+			 //		For example color hex value, emoticon ascii value etc, entity hex value.
+		 },
+
+		 fillCell: function(cell, blankGif){
+			 // summary:
+			 //		Add cell DOMNode inner structure
+			 // cell: DomNode
+			 //		The surrounding cell
+			 // blankGif: String
+			 //		URL for blank cell image
+		 }
+	 });
+	 =====*/
+
+	return PaletteMixin;
+});
diff --git a/src/main/resources/static/dijit/_Templated.js b/src/main/resources/static/dijit/_Templated.js
new file mode 100644
index 0000000000000000000000000000000000000000..24d2bf94414cb9f9cc6094338496e2e8044564c2
--- /dev/null
+++ b/src/main/resources/static/dijit/_Templated.js
@@ -0,0 +1,53 @@
+define([
+	"./_WidgetBase",
+	"./_TemplatedMixin",
+	"./_WidgetsInTemplateMixin",
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang", // lang.extend lang.isArray
+	"dojo/_base/kernel" // kernel.deprecated
+], function(_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, array, declare, lang, kernel){
+
+	// module:
+	//		dijit/_Templated
+
+	// These arguments can be specified for widgets which are used in templates.
+	// Since any widget can be specified as sub widgets in template, mix it
+	// into the base widget class.  (This is a hack, but it's effective.)
+	// Remove for 2.0.   Also, hide from API doc parser.
+	lang.extend(_WidgetBase, /*===== {} || =====*/ {
+		waiRole: "",
+		waiState:""
+	});
+
+	return declare("dijit._Templated", [_TemplatedMixin, _WidgetsInTemplateMixin], {
+		// summary:
+		//		Deprecated mixin for widgets that are instantiated from a template.
+		//		Widgets should use _TemplatedMixin plus if necessary _WidgetsInTemplateMixin instead.
+
+		constructor: function(){
+			kernel.deprecated(this.declaredClass + ": dijit._Templated deprecated, use dijit._TemplatedMixin and if necessary dijit._WidgetsInTemplateMixin", "", "2.0");
+		},
+
+		_processNode: function(baseNode, getAttrFunc){
+			var ret = this.inherited(arguments);
+
+			// Do deprecated waiRole and waiState
+			var role = getAttrFunc(baseNode, "waiRole");
+			if(role){
+				baseNode.setAttribute("role", role);
+			}
+			var values = getAttrFunc(baseNode, "waiState");
+			if(values){
+				array.forEach(values.split(/\s*,\s*/), function(stateValue){
+					if(stateValue.indexOf('-') != -1){
+						var pair = stateValue.split('-');
+						baseNode.setAttribute("aria-"+pair[0], pair[1]);
+					}
+				});
+			}
+
+			return ret;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/_TemplatedMixin.js b/src/main/resources/static/dijit/_TemplatedMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..f1efeadbac22f9fe6e128a4e70cddf0380e8a9db
--- /dev/null
+++ b/src/main/resources/static/dijit/_TemplatedMixin.js
@@ -0,0 +1,205 @@
+define([
+	"dojo/cache",	// dojo.cache
+	"dojo/_base/declare", // declare
+	"dojo/dom-construct", // domConstruct.destroy, domConstruct.toDom
+	"dojo/_base/lang", // lang.getObject
+	"dojo/on",
+	"dojo/sniff", // has("ie")
+	"dojo/string", // string.substitute string.trim
+	"./_AttachMixin"
+], function(cache, declare, domConstruct, lang, on, has, string, _AttachMixin){
+
+	// module:
+	//		dijit/_TemplatedMixin
+
+	var _TemplatedMixin = declare("dijit._TemplatedMixin", _AttachMixin, {
+		// summary:
+		//		Mixin for widgets that are instantiated from a template
+
+		// templateString: [protected] String
+		//		A string that represents the widget template.
+		//		Use in conjunction with dojo.cache() to load from a file.
+		templateString: null,
+
+		// templatePath: [protected deprecated] String
+		//		Path to template (HTML file) for this widget relative to dojo.baseUrl.
+		//		Deprecated: use templateString with require([... "dojo/text!..."], ...) instead
+		templatePath: null,
+
+		// skipNodeCache: [protected] Boolean
+		//		If using a cached widget template nodes poses issues for a
+		//		particular widget class, it can set this property to ensure
+		//		that its template is always re-built from a string
+		_skipNodeCache: false,
+
+/*=====
+		// _rendered: Boolean
+		//		Not normally use, but this flag can be set by the app if the server has already rendered the template,
+		//		i.e. already inlining the template for the widget into the main page.   Reduces _TemplatedMixin to
+		//		just function like _AttachMixin.
+		_rendered: false,
+=====*/
+
+		// Set _AttachMixin.searchContainerNode to true for back-compat for widgets that have data-dojo-attach-point's
+		// and events inside this.containerNode.   Remove for 2.0.
+		searchContainerNode: true,
+
+		_stringRepl: function(tmpl){
+			// summary:
+			//		Does substitution of ${foo} type properties in template string
+			// tags:
+			//		private
+			var className = this.declaredClass, _this = this;
+			// Cache contains a string because we need to do property replacement
+			// do the property replacement
+			return string.substitute(tmpl, this, function(value, key){
+				if(key.charAt(0) == '!'){ value = lang.getObject(key.substr(1), false, _this); }
+				if(typeof value == "undefined"){ throw new Error(className+" template:"+key); } // a debugging aide
+				if(value == null){ return ""; }
+
+				// Substitution keys beginning with ! will skip the transform step,
+				// in case a user wishes to insert unescaped markup, e.g. ${!foo}
+				return key.charAt(0) == "!" ? value : this._escapeValue("" + value);
+			}, this);
+		},
+
+		_escapeValue: function(/*String*/ val){
+			// summary:
+			//		Escape a value to be inserted into the template, either into an attribute value
+			//		(ex: foo="${bar}") or as inner text of an element (ex: <span>${foo}</span>)
+
+			// Safer substitution, see heading "Attribute values" in
+			// http://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.3.2
+			// and also https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
+			return val.replace(/["'<>&]/g, function(val){
+				return {
+					"&": "&amp;",
+					"<": "&lt;",
+					">": "&gt;",
+					"\"": "&quot;",
+					"'": "&#x27;"
+				}[val];
+			});
+		},
+
+		buildRendering: function(){
+			// summary:
+			//		Construct the UI for this widget from a template, setting this.domNode.
+			// tags:
+			//		protected
+
+			if(!this._rendered){
+				if(!this.templateString){
+					this.templateString = cache(this.templatePath, {sanitize: true});
+				}
+
+				// Lookup cached version of template, and download to cache if it
+				// isn't there already.  Returns either a DomNode or a string, depending on
+				// whether or not the template contains ${foo} replacement parameters.
+				var cached = _TemplatedMixin.getCachedTemplate(this.templateString, this._skipNodeCache, this.ownerDocument);
+
+				var node;
+				if(lang.isString(cached)){
+					node = domConstruct.toDom(this._stringRepl(cached), this.ownerDocument);
+					if(node.nodeType != 1){
+						// Flag common problems such as templates with multiple top level nodes (nodeType == 11)
+						throw new Error("Invalid template: " + cached);
+					}
+				}else{
+					// if it's a node, all we have to do is clone it
+					node = cached.cloneNode(true);
+				}
+
+				this.domNode = node;
+			}
+
+			// Call down to _WidgetBase.buildRendering() to get base classes assigned
+			// TODO: change the baseClass assignment to _setBaseClassAttr
+			this.inherited(arguments);
+
+			if(!this._rendered){
+				this._fillContent(this.srcNodeRef);
+			}
+
+			this._rendered = true;
+		},
+
+		_fillContent: function(/*DomNode*/ source){
+			// summary:
+			//		Relocate source contents to templated container node.
+			//		this.containerNode must be able to receive children, or exceptions will be thrown.
+			// tags:
+			//		protected
+			var dest = this.containerNode;
+			if(source && dest){
+				while(source.hasChildNodes()){
+					dest.appendChild(source.firstChild);
+				}
+			}
+		}
+
+	});
+
+	// key is templateString; object is either string or DOM tree
+	_TemplatedMixin._templateCache = {};
+
+	_TemplatedMixin.getCachedTemplate = function(templateString, alwaysUseString, doc){
+		// summary:
+		//		Static method to get a template based on the templatePath or
+		//		templateString key
+		// templateString: String
+		//		The template
+		// alwaysUseString: Boolean
+		//		Don't cache the DOM tree for this template, even if it doesn't have any variables
+		// doc: Document?
+		//		The target document.   Defaults to document global if unspecified.
+		// returns: Mixed
+		//		Either string (if there are ${} variables that need to be replaced) or just
+		//		a DOM tree (if the node can be cloned directly)
+
+		// is it already cached?
+		var tmplts = _TemplatedMixin._templateCache;
+		var key = templateString;
+		var cached = tmplts[key];
+		if(cached){
+			try{
+				// if the cached value is an innerHTML string (no ownerDocument) or a DOM tree created within the
+				// current document, then use the current cached value
+				if(!cached.ownerDocument || cached.ownerDocument == (doc || document)){
+					// string or node of the same document
+					return cached;
+				}
+			}catch(e){ /* squelch */ } // IE can throw an exception if cached.ownerDocument was reloaded
+			domConstruct.destroy(cached);
+		}
+
+		templateString = string.trim(templateString);
+
+		if(alwaysUseString || templateString.match(/\$\{([^\}]+)\}/g)){
+			// there are variables in the template so all we can do is cache the string
+			return (tmplts[key] = templateString); //String
+		}else{
+			// there are no variables in the template so we can cache the DOM tree
+			var node = domConstruct.toDom(templateString, doc);
+			if(node.nodeType != 1){
+				throw new Error("Invalid template: " + templateString);
+			}
+			return (tmplts[key] = node); //Node
+		}
+	};
+
+	if(has("ie")){
+		on(window, "unload", function(){
+			var cache = _TemplatedMixin._templateCache;
+			for(var key in cache){
+				var value = cache[key];
+				if(typeof value == "object"){ // value is either a string or a DOM node template
+					domConstruct.destroy(value);
+				}
+				delete cache[key];
+			}
+		});
+	}
+
+	return _TemplatedMixin;
+});
diff --git a/src/main/resources/static/dijit/_TimePicker.js b/src/main/resources/static/dijit/_TimePicker.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b672a94092ebbade42c50ead42c19118b146641
--- /dev/null
+++ b/src/main/resources/static/dijit/_TimePicker.js
@@ -0,0 +1,435 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/date", // date.compare
+	"dojo/date/locale", // locale.format
+	"dojo/date/stamp", // stamp.fromISOString stamp.toISOString
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add domClass.contains domClass.toggle
+	"dojo/dom-construct", // domConstruct.create
+	"dojo/_base/kernel", // deprecated
+	"dojo/keys", // keys
+	"dojo/_base/lang", // lang.mixin
+	"dojo/sniff", // has(...)
+	"dojo/query", // query
+	"dojo/mouse", // mouse.wheel
+	"dojo/on",
+	"./_WidgetBase",
+	"./form/_ListMouseMixin"
+], function(array, ddate, locale, stamp, declare, domClass, domConstruct, kernel, keys, lang, has, query, mouse, on,
+			_WidgetBase, _ListMouseMixin){
+
+	// module:
+	//		dijit/_TimePicker
+
+
+	var TimePicker = declare("dijit._TimePicker", [_WidgetBase, _ListMouseMixin], {
+		// summary:
+		//		A time picker dropdown, used by dijit/form/TimeTextBox.
+		//		This widget is not available as a standalone widget due to lack of accessibility support.
+
+		// baseClass: [protected] String
+		//		The root className to use for the various states of this widget
+		baseClass: "dijitTimePicker",
+
+		// pickerMin: String
+		//		ISO-8601 string representing the time of the first
+		//		visible element in the time picker.
+		//		Set in local time, without a time zone.
+		pickerMin: "T00:00:00",
+
+		// pickerMax: String
+		//		ISO-8601 string representing the last (possible) time
+		//		added to the time picker.
+		//		Set in local time, without a time zone.
+		pickerMax: "T23:59:59",
+
+		// clickableIncrement: String
+		//		ISO-8601 string representing the interval between choices in the time picker.
+		//		Set in local time, without a time zone.
+		//		Example: `T00:15:00` creates 15 minute increments
+		//		Must divide dijit/_TimePicker.visibleIncrement evenly
+		clickableIncrement: "T00:15:00",
+
+		// visibleIncrement: String
+		//		ISO-8601 string representing the interval between "major" choices in the time picker.
+		//		Each theme will highlight the major choices with a larger font / different color / etc.
+		//		Set in local time, without a time zone.
+		//		Example: `T01:00:00` creates text in every 1 hour increment
+		visibleIncrement: "T01:00:00",
+
+		// value: String
+		//		Time to display.
+		//		Defaults to current time.
+		//		Can be a Date object or an ISO-8601 string.
+		//		If you specify the GMT time zone (`-01:00`),
+		//		the time will be converted to the local time in the local time zone.
+		//		Otherwise, the time is considered to be in the local time zone.
+		//		If you specify the date and isDate is true, the date is used.
+		//		Example: if your local time zone is `GMT -05:00`,
+		//		`T10:00:00` becomes `T10:00:00-05:00` (considered to be local time),
+		//		`T10:00:00-01:00` becomes `T06:00:00-05:00` (4 hour difference),
+		//		`T10:00:00Z` becomes `T05:00:00-05:00` (5 hour difference between Zulu and local time)
+		//		`yyyy-mm-ddThh:mm:ss` is the format to set the date and time
+		//		Example: `2007-06-01T09:00:00`
+		value: new Date(),
+
+		_visibleIncrement: 2,
+		_clickableIncrement: 1,
+		_totalIncrements: 10,
+
+		// constraints: TimePicker.__Constraints
+		//		Specifies valid range of times (start time, end time), and also used by TimeTextBox to pass other
+		//		options to the TimePicker: pickerMin, pickerMax, clickableIncrement, and visibleIncrement.
+		constraints: {},
+
+		/*=====
+		 serialize: function(val, options){
+			 // summary:
+			 //		User overridable function used to convert the attr('value') result to a String
+			 // val: Date
+			 //		The current value
+			 // options: Object?
+			 // tags:
+			 //		protected
+		 },
+		 =====*/
+		serialize: stamp.toISOString,
+
+		/*=====
+		 // filterString: string
+		 //		The string to filter by
+		 filterString: "",
+		 =====*/
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			this.containerNode = this.domNode;	// expected by _ListBase
+			this.timeMenu = this.domNode;	// for back-compat
+		},
+
+		setValue: function(/*Date*/ value){
+			// summary:
+			//		Deprecated.  Used set('value') instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated("dijit._TimePicker:setValue() is deprecated.  Use set('value', ...) instead.", "", "2.0");
+			this.set('value', value);
+		},
+
+		_setValueAttr: function(/*Date*/ date){
+			// summary:
+			//		Hook so set('value', ...) works.
+			// description:
+			//		Set the value of the TimePicker.
+			//		Redraws the TimePicker around the new date.
+			// tags:
+			//		protected
+			this._set("value", date);
+			this._showText();
+		},
+
+		_setFilterStringAttr: function(val){
+			// summary:
+			//		Called by TimeTextBox to filter the values shown in my list
+			this._set("filterString", val);
+			this._showText();
+		},
+
+		isDisabledDate: function(/*===== dateObject, locale =====*/){
+			// summary:
+			//		May be overridden to disable certain dates in the TimePicker e.g. `isDisabledDate=locale.isWeekend`
+			// dateObject: Date
+			// locale: String?
+			// type:
+			//		extension
+			return false; // Boolean
+		},
+
+		_getFilteredNodes: function(/*number*/ start, /*number*/ maxNum, /*Boolean*/ before, /*DOMNode*/ lastNode){
+			// summary:
+			//		Returns a DocumentFragment of nodes with the filter applied.  At most maxNum nodes
+			//		will be returned - but fewer may be returned as well.  If the
+			//		before parameter is set to true, then it will return the elements
+			//		before the given index
+			// tags:
+			//		private
+
+			var nodes = this.ownerDocument.createDocumentFragment();
+
+			for(var i = 0 ; i < this._maxIncrement; i++){
+				var n = this._createOption(i);
+				if(n){
+					nodes.appendChild(n);
+				}
+			}
+
+			return nodes;
+		},
+
+		_showText: function(){
+			// summary:
+			//		Displays the relevant choices in the drop down list
+			// tags:
+			//		private
+			var fromIso = stamp.fromISOString;
+			this.domNode.innerHTML = "";
+			this._clickableIncrementDate = fromIso(this.clickableIncrement);
+			this._visibleIncrementDate = fromIso(this.visibleIncrement);
+			// get the value of the increments to find out how many divs to create
+			var
+				sinceMidnight = function(/*Date*/ date){
+					return date.getHours() * 60 * 60 + date.getMinutes() * 60 + date.getSeconds();
+				},
+				clickableIncrementSeconds = sinceMidnight(this._clickableIncrementDate),
+				visibleIncrementSeconds = sinceMidnight(this._visibleIncrementDate),
+				// round reference date to previous visible increment
+				time = (this.value || this.currentFocus).getTime();
+
+			this._refDate = fromIso(this.pickerMin);
+			this._refDate.setFullYear(1970, 0, 1); // match parse defaults
+
+			// assume clickable increment is the smallest unit
+			this._clickableIncrement = 1;
+			// divide the visible range by the clickable increment to get the number of divs to create
+			// example: 10:00:00/00:15:00 -> display 40 divs
+			// divide the visible increments by the clickable increments to get how often to display the time inline
+			// example: 01:00:00/00:15:00 -> display the time every 4 divs
+			this._visibleIncrement = visibleIncrementSeconds / clickableIncrementSeconds;
+
+			// get the number of increments (i.e. number of entries in the picker)
+			var endDate = fromIso(this.pickerMax);
+			endDate.setFullYear(1970, 0, 1);
+			var visibleRange = (endDate.getTime() - this._refDate.getTime()) * 0.001;
+			this._maxIncrement = Math.ceil((visibleRange + 1) / clickableIncrementSeconds);
+
+			var nodes = this._getFilteredNodes();
+
+			// never show empty due to a bad filter
+			if(!nodes.firstChild && this.filterString){
+				this.filterString = '';
+				this._showText();
+			}else{
+				this.domNode.appendChild(nodes);
+			}
+		},
+
+		constructor: function(/*===== params, srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified, replace srcNodeRef with my generated DOM tree
+
+			this.constraints = {};
+		},
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			this._setConstraintsAttr(this.constraints); // this needs to happen now (and later) due to codependency on _set*Attr calls
+		},
+
+		// For historical reasons TimeTextBox sends all the options for the _TimePicker inside of a constraints{} object
+		_setConstraintsAttr: function(/* Object */ constraints){
+			// brings in increments, etc.
+			for (var key in { clickableIncrement: 1, visibleIncrement: 1, pickerMin: 1, pickerMax: 1 }) {
+				if (key in constraints) {
+					this[key] = constraints[key];
+				}
+			}
+
+			// locale needs the lang in the constraints as locale
+			if(!constraints.locale){
+				constraints.locale = this.lang;
+			}
+		},
+
+		_createOption: function(/*Number*/ index){
+			// summary:
+			//		Creates a clickable time option, or returns null if the specified index doesn't match the filter
+			// tags:
+			//		private
+			var date = new Date(this._refDate);
+			var incrementDate = this._clickableIncrementDate;
+			date.setHours(date.getHours() + incrementDate.getHours() * index,
+				date.getMinutes() + incrementDate.getMinutes() * index,
+				date.getSeconds() + incrementDate.getSeconds() * index);
+			if(this.constraints.selector == "time"){
+				date.setFullYear(1970, 0, 1); // make sure each time is for the same date
+			}
+			var dateString = locale.format(date, this.constraints);
+			if(this.filterString && dateString.toLowerCase().indexOf(this.filterString) !== 0){
+				// Doesn't match the filter - return null
+				return null;
+			}
+
+			var div = this.ownerDocument.createElement("div");
+			div.className = this.baseClass + "Item";
+			div.date = date;
+			div.idx = index;
+			domConstruct.create('div', {
+				"class": this.baseClass + "ItemInner",
+				innerHTML: dateString
+			}, div);
+
+			var marker = index % this._visibleIncrement < 1 && index % this._visibleIncrement > -1,
+				tick = !marker && !(index % this._clickableIncrement);
+			if(marker){
+				div.className += " " + this.baseClass + "Marker";
+			}else if(tick){
+				div.className += " " + this.baseClass + "Tick";
+			}
+
+			if(this.isDisabledDate(date)){
+				// set disabled
+				div.className += " " + this.baseClass + "ItemDisabled";
+			}
+			if(this.value && !ddate.compare(this.value, date, this.constraints.selector)){
+				div.selected = true;
+				div.className += " " + this.baseClass + "ItemSelected";
+				this._selectedDiv = div;
+				if(marker){
+					div.className += " " + this.baseClass + "MarkerSelected";
+				}else if(tick){
+					div.className += " " + this.baseClass + "TickSelected";
+				}
+
+				// Initially highlight the current value.   User can change highlight by up/down arrow keys
+				// or mouse movement.
+				this._highlightOption(div, true);
+			}
+			return div;
+		},
+
+		onOpen: function(){
+			this.inherited(arguments);
+
+			// Since _ListBase::_setSelectedAttr() calls scrollIntoView(), shouldn't call it until list is visible.
+			this.set("selected", this._selectedDiv);
+		},
+
+		_onOptionSelected: function(/*Object*/ tgt, /*Boolean*/ change){
+			// summary:
+			//		Called when user clicks or keys to an option in the drop down list
+			// tgt: Object
+			//		tgt.target specifies the node that was clicked
+			// change: Boolean
+			//		If true, fire "change" event, otherwise just fire "input" event.
+			// tags:
+			//		private
+			var tdate = tgt.target.date || tgt.target.parentNode.date;
+			if(!tdate || this.isDisabledDate(tdate)){
+				return;
+			}
+			this._set('value', tdate);
+			this.emit("input");
+			if(change) {
+				this._highlighted_option = null;
+				this.set('value', tdate);
+				this.onChange(tdate);
+			}
+		},
+
+		onChange: function(/*Date*/ /*===== time =====*/){
+			// summary:
+			//		Notification that a time was selected.  It may be the same as the previous value.
+			// tags:
+			//		public
+		},
+
+		_highlightOption: function(/*node*/ node, /*Boolean*/ highlight){
+			// summary:
+			//		Turns on/off highlight effect on a node based on mouse out/over event
+			// tags:
+			//		private
+			if(!node){
+				return;
+			}
+			if(highlight){
+				if(this._highlighted_option){
+					this._highlightOption(this._highlighted_option, false);
+				}
+				this._highlighted_option = node;
+			}else if(this._highlighted_option !== node){
+				return;
+			}else{
+				this._highlighted_option = null;
+			}
+			domClass.toggle(node, this.baseClass + "ItemHover", highlight);
+			if(domClass.contains(node, this.baseClass + "Marker")){
+				domClass.toggle(node, this.baseClass + "MarkerHover", highlight);
+			}else{
+				domClass.toggle(node, this.baseClass + "TickHover", highlight);
+			}
+		},
+
+		handleKey: function(/*Event*/ e){
+			// summary:
+			//		Called from `dijit/form/_DateTimeTextBox` to pass a keypress event
+			//		from the `dijit/form/TimeTextBox` to be handled in this widget
+			// tags:
+			//		protected
+			if(e.keyCode == keys.DOWN_ARROW){
+				this.selectNextNode();
+				this._onOptionSelected({target: this._highlighted_option}, false);
+				e.stopPropagation();
+				e.preventDefault();
+				return false;
+			}else if(e.keyCode == keys.UP_ARROW){
+				this.selectPreviousNode();
+				this._onOptionSelected({target: this._highlighted_option}, false);
+				e.stopPropagation();
+				e.preventDefault();
+				return false;
+			}else if(e.keyCode == keys.ENTER || e.keyCode === keys.TAB){
+				// mouse hover followed by TAB is NO selection
+				if(!this._keyboardSelected && e.keyCode === keys.TAB){
+					return true;	// true means don't call stopEvent()
+				}
+
+				// Accept the currently-highlighted option as the value
+				if(this._highlighted_option){
+					this._onOptionSelected({target: this._highlighted_option}, true);
+				}
+
+				// Call stopEvent() for ENTER key so that form doesn't submit,
+				// but not for TAB, so that TAB does switch focus
+				return e.keyCode === keys.TAB;
+			}
+			return undefined;
+		},
+
+		// Implement abstract methods for _ListBase
+		onHover: function(/*DomNode*/ node){
+			this._highlightOption(node, true);
+		},
+
+		onUnhover: function(/*DomNode*/ node){
+			this._highlightOption(node, false);
+		},
+
+		onSelect: function(/*DomNode*/ node){
+			this._highlightOption(node, true);
+		},
+
+		onDeselect: function(/*DomNode*/ node){
+			this._highlightOption(node, false);
+		},
+
+		onClick: function(/*DomNode*/ node){
+			this._onOptionSelected({target: node}, true);
+		}
+	});
+
+	/*=====
+	 TimePicker.__Constraints = declare(locale.__FormatOptions, {
+		 // clickableIncrement: String
+		 //		See `dijit/_TimePicker.clickableIncrement`
+		 clickableIncrement: "T00:15:00"
+	 });
+	 =====*/
+
+	return TimePicker;
+});
diff --git a/src/main/resources/static/dijit/_Widget.js b/src/main/resources/static/dijit/_Widget.js
new file mode 100644
index 0000000000000000000000000000000000000000..9be977cc6235d48208ab563e0295ffcb152e5feb
--- /dev/null
+++ b/src/main/resources/static/dijit/_Widget.js
@@ -0,0 +1,352 @@
+define([
+	"dojo/aspect",	// aspect.around
+	"dojo/_base/config",	// config.isDebug
+	"dojo/_base/connect",	// connect.connect
+	"dojo/_base/declare", // declare
+	"dojo/has",
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/lang", // lang.hitch
+	"dojo/query",
+	"dojo/ready",
+	"./registry",	// registry.byNode
+	"./_WidgetBase",
+	"./_OnDijitClickMixin",
+	"./_FocusMixin",
+	"dojo/uacss",		// browser sniffing (included for back-compat; subclasses may be using)
+	"./hccss"		// high contrast mode sniffing (included to set CSS classes on <body>, module ret value unused)
+], function(aspect, config, connect, declare, has, kernel, lang, query, ready,
+			registry, _WidgetBase, _OnDijitClickMixin, _FocusMixin){
+
+
+// module:
+//		dijit/_Widget
+
+
+function connectToDomNode(){
+	// summary:
+	//		If user connects to a widget method === this function, then they will
+	//		instead actually be connecting the equivalent event on this.domNode
+}
+
+// Trap dojo.connect() calls to connectToDomNode methods, and redirect to _Widget.on()
+function aroundAdvice(originalConnect){
+	return function(obj, event, scope, method){
+		if(obj && typeof event == "string" && obj[event] == connectToDomNode){
+			return obj.on(event.substring(2).toLowerCase(), lang.hitch(scope, method));
+		}
+		return originalConnect.apply(connect, arguments);
+	};
+}
+aspect.around(connect, "connect", aroundAdvice);
+if(kernel.connect){
+	aspect.around(kernel, "connect", aroundAdvice);
+}
+
+var _Widget = declare("dijit._Widget", [_WidgetBase, _OnDijitClickMixin, _FocusMixin], {
+	// summary:
+	//		Old base class for widgets.   New widgets should extend `dijit/_WidgetBase` instead
+	// description:
+	//		Old Base class for Dijit widgets.
+	//
+	//		Extends _WidgetBase, adding support for:
+	//
+	//		- declaratively/programatically specifying widget initialization parameters like
+	//			onMouseMove="foo" that call foo when this.domNode gets a mousemove event
+	//		- ondijitclick:
+	//			Support new data-dojo-attach-event="ondijitclick: ..." that is triggered by a mouse click or a SPACE/ENTER keypress
+	//		- focus related functions:
+	//			In particular, the onFocus()/onBlur() callbacks.   Driven internally by
+	//			dijit/_base/focus.js.
+	//		- deprecated methods
+	//		- onShow(), onHide(), onClose()
+	//
+	//		Also, by loading code in dijit/_base, turns on:
+	//
+	//		- browser sniffing (putting browser class like `dj_ie` on `<html>` node)
+	//		- high contrast mode sniffing (add `dijit_a11y` class to `<body>` if machine is in high contrast mode)
+
+
+	////////////////// DEFERRED CONNECTS ///////////////////
+
+	onClick: connectToDomNode,
+	/*=====
+	onClick: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of mouse click events.
+		// event:
+		//		mouse Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onDblClick: connectToDomNode,
+	/*=====
+	onDblClick: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of mouse double click events.
+		// event:
+		//		mouse Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onKeyDown: connectToDomNode,
+	/*=====
+	onKeyDown: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of keys being pressed down.
+		// event:
+		//		key Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onKeyPress: connectToDomNode,
+	/*=====
+	onKeyPress: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of printable keys being typed.
+		// event:
+		//		key Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onKeyUp: connectToDomNode,
+	/*=====
+	onKeyUp: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of keys being released.
+		// event:
+		//		key Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onMouseDown: connectToDomNode,
+	/*=====
+	onMouseDown: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of when the mouse button is pressed down.
+		// event:
+		//		mouse Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onMouseMove: connectToDomNode,
+	/*=====
+	onMouseMove: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of when the mouse moves over nodes contained within this widget.
+		// event:
+		//		mouse Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onMouseOut: connectToDomNode,
+	/*=====
+	onMouseOut: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of when the mouse moves off of nodes contained within this widget.
+		// event:
+		//		mouse Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onMouseOver: connectToDomNode,
+	/*=====
+	onMouseOver: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of when the mouse moves onto nodes contained within this widget.
+		// event:
+		//		mouse Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onMouseLeave: connectToDomNode,
+	/*=====
+	onMouseLeave: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of when the mouse moves off of this widget.
+		// event:
+		//		mouse Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onMouseEnter: connectToDomNode,
+	/*=====
+	onMouseEnter: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of when the mouse moves onto this widget.
+		// event:
+		//		mouse Event
+		// tags:
+		//		callback
+	},
+	=====*/
+	onMouseUp: connectToDomNode,
+	/*=====
+	onMouseUp: function(event){
+		// summary:
+		//		Connect to this function to receive notifications of when the mouse button is released.
+		// event:
+		//		mouse Event
+		// tags:
+		//		callback
+	},
+	=====*/
+
+	constructor: function(params /*===== ,srcNodeRef =====*/){
+		// summary:
+		//		Create the widget.
+		// params: Object|null
+		//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+		//		and functions, typically callbacks like onClick.
+		//		The hash can contain any of the widget's properties, excluding read-only properties.
+		// srcNodeRef: DOMNode|String?
+		//		If a srcNodeRef (DOM node) is specified:
+		//
+		//		- use srcNodeRef.innerHTML as my contents
+		//		- if this is a behavioral widget then apply behavior to that srcNodeRef
+		//		- otherwise, replace srcNodeRef with my generated DOM tree
+
+		// extract parameters like onMouseMove that should connect directly to this.domNode
+		this._toConnect = {};
+		for(var name in params){
+			if(this[name] === connectToDomNode){
+				this._toConnect[name.replace(/^on/, "").toLowerCase()] = params[name];
+				delete params[name];
+			}
+		}
+	},
+
+	postCreate: function(){
+		this.inherited(arguments);
+
+		// perform connection from this.domNode to user specified handlers (ex: onMouseMove)
+		for(var name in this._toConnect){
+			this.on(name, this._toConnect[name]);
+		}
+		delete this._toConnect;
+	},
+
+	on: function(/*String|Function*/ type, /*Function*/ func){
+		if(this[this._onMap(type)] === connectToDomNode){
+			// Use connect.connect() rather than on() to get handling for "onmouseenter" on non-IE,
+			// normalization of onkeypress/onkeydown to behave like firefox, etc.
+			// Also, need to specify context as "this" rather than the default context of the DOMNode
+			// Remove in 2.0.
+			return connect.connect(this.domNode, type.toLowerCase(), this, func);
+		}
+		return this.inherited(arguments);
+	},
+
+	_setFocusedAttr: function(val){
+		// Remove this method in 2.0 (or sooner), just here to set _focused == focused, for back compat
+		// (but since it's a private variable we aren't required to keep supporting it).
+		this._focused = val;
+		this._set("focused", val);
+	},
+
+	////////////////// DEPRECATED METHODS ///////////////////
+
+	setAttribute: function(/*String*/ attr, /*anything*/ value){
+		// summary:
+		//		Deprecated.  Use set() instead.
+		// tags:
+		//		deprecated
+		kernel.deprecated(this.declaredClass+"::setAttribute(attr, value) is deprecated. Use set() instead.", "", "2.0");
+		this.set(attr, value);
+	},
+
+	attr: function(/*String|Object*/name, /*Object?*/value){
+		// summary:
+		//		This method is deprecated, use get() or set() directly.
+		// name:
+		//		The property to get or set. If an object is passed here and not
+		//		a string, its keys are used as names of attributes to be set
+		//		and the value of the object as values to set in the widget.
+		// value:
+		//		Optional. If provided, attr() operates as a setter. If omitted,
+		//		the current value of the named property is returned.
+		// tags:
+		//		deprecated
+
+		var args = arguments.length;
+		if(args >= 2 || typeof name === "object"){ // setter
+			return this.set.apply(this, arguments);
+		}else{ // getter
+			return this.get(name);
+		}
+	},
+
+	getDescendants: function(){
+		// summary:
+		//		Returns all the widgets contained by this, i.e., all widgets underneath this.containerNode.
+		//		This method should generally be avoided as it returns widgets declared in templates, which are
+		//		supposed to be internal/hidden, but it's left here for back-compat reasons.
+
+		kernel.deprecated(this.declaredClass+"::getDescendants() is deprecated. Use getChildren() instead.", "", "2.0");
+		return this.containerNode ? query('[widgetId]', this.containerNode).map(registry.byNode) : []; // dijit/_WidgetBase[]
+	},
+
+	////////////////// MISCELLANEOUS METHODS ///////////////////
+
+	_onShow: function(){
+		// summary:
+		//		Internal method called when this widget is made visible.
+		//		See `onShow` for details.
+		this.onShow();
+	},
+
+	onShow: function(){
+		// summary:
+		//		Called when this widget becomes the selected pane in a
+		//		`dijit/layout/TabContainer`, `dijit/layout/StackContainer`,
+		//		`dijit/layout/AccordionContainer`, etc.
+		//
+		//		Also called to indicate display of a `dijit.Dialog`, `dijit.TooltipDialog`, or `dijit.TitlePane`.
+		// tags:
+		//		callback
+	},
+
+	onHide: function(){
+		// summary:
+		//		Called when another widget becomes the selected pane in a
+		//		`dijit/layout/TabContainer`, `dijit/layout/StackContainer`,
+		//		`dijit/layout/AccordionContainer`, etc.
+		//
+		//		Also called to indicate hide of a `dijit.Dialog`, `dijit.TooltipDialog`, or `dijit.TitlePane`.
+		// tags:
+		//		callback
+	},
+
+	onClose: function(){
+		// summary:
+		//		Called when this widget is being displayed as a popup (ex: a Calendar popped
+		//		up from a DateTextBox), and it is hidden.
+		//		This is called from the dijit.popup code, and should not be called directly.
+		//
+		//		Also used as a parameter for children of `dijit/layout/StackContainer` or subclasses.
+		//		Callback if a user tries to close the child.   Child will be closed if this function returns true.
+		// tags:
+		//		extension
+
+		return true;		// Boolean
+	}
+});
+
+// For back-compat, remove in 2.0.
+if(has("dijit-legacy-requires")){
+	ready(0, function(){
+		var requires = ["dijit/_base"];
+		require(requires);	// use indirection so modules not rolled into a build
+	});
+}
+return _Widget;
+});
diff --git a/src/main/resources/static/dijit/_WidgetBase.js b/src/main/resources/static/dijit/_WidgetBase.js
new file mode 100644
index 0000000000000000000000000000000000000000..2396953348a66eb784a82b3fdfad6b523fe0637c
--- /dev/null
+++ b/src/main/resources/static/dijit/_WidgetBase.js
@@ -0,0 +1,1222 @@
+define([
+	"require", // require.toUrl
+	"dojo/_base/array", // array.forEach array.map
+	"dojo/aspect",
+	"dojo/_base/config", // config.blankGif
+	"dojo/_base/connect", // connect.connect
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.byId
+	"dojo/dom-attr", // domAttr.set domAttr.remove
+	"dojo/dom-class", // domClass.add domClass.replace
+	"dojo/dom-construct", // domConstruct.destroy domConstruct.place
+	"dojo/dom-geometry", // isBodyLtr
+	"dojo/dom-style", // domStyle.set, domStyle.get
+	"dojo/has",
+	"dojo/_base/kernel",
+	"dojo/_base/lang", // mixin(), isArray(), etc.
+	"dojo/on",
+	"dojo/ready",
+	"dojo/Stateful", // Stateful
+	"dojo/topic",
+	"dojo/_base/window", // win.body()
+	"./Destroyable",
+	"dojo/has!dojo-bidi?./_BidiMixin",
+	"./registry"    // registry.getUniqueId(), registry.findWidgets()
+], function(require, array, aspect, config, connect, declare,
+			dom, domAttr, domClass, domConstruct, domGeometry, domStyle, has, kernel,
+			lang, on, ready, Stateful, topic, win, Destroyable, _BidiMixin, registry){
+
+	// module:
+	//		dijit/_WidgetBase
+
+	// Flag to make dijit load modules the app didn't explicitly request, for backwards compatibility
+	has.add("dijit-legacy-requires", !kernel.isAsync);
+
+	// Flag to enable support for textdir attribute
+	has.add("dojo-bidi", false);
+
+
+	// For back-compat, remove in 2.0.
+	if(has("dijit-legacy-requires")){
+		ready(0, function(){
+			var requires = ["dijit/_base/manager"];
+			require(requires);	// use indirection so modules not rolled into a build
+		});
+	}
+
+	// Nested hash listing attributes for each tag, all strings in lowercase.
+	// ex: {"div": {"style": true, "tabindex" true}, "form": { ...
+	var tagAttrs = {};
+
+	function getAttrs(obj){
+		var ret = {};
+		for(var attr in obj){
+			ret[attr.toLowerCase()] = true;
+		}
+		return ret;
+	}
+
+	function nonEmptyAttrToDom(attr){
+		// summary:
+		//		Returns a setter function that copies the attribute to this.domNode,
+		//		or removes the attribute from this.domNode, depending on whether the
+		//		value is defined or not.
+		return function(val){
+			domAttr[val ? "set" : "remove"](this.domNode, attr, val);
+			this._set(attr, val);
+		};
+	}
+
+	function isEqual(a, b){
+		//	summary:
+		//		Function that determines whether two values are identical,
+		//		taking into account that NaN is not normally equal to itself
+		//		in JS.
+
+		return a === b || (/* a is NaN */ a !== a && /* b is NaN */ b !== b);
+	}
+
+	var _WidgetBase = declare("dijit._WidgetBase", [Stateful, Destroyable], {
+		// summary:
+		//		Future base class for all Dijit widgets.
+		// description:
+		//		Future base class for all Dijit widgets.
+		//		_Widget extends this class adding support for various features needed by desktop.
+		//
+		//		Provides stubs for widget lifecycle methods for subclasses to extend, like postMixInProperties(), buildRendering(),
+		//		postCreate(), startup(), and destroy(), and also public API methods like set(), get(), and watch().
+		//
+		//		Widgets can provide custom setters/getters for widget attributes, which are called automatically by set(name, value).
+		//		For an attribute XXX, define methods _setXXXAttr() and/or _getXXXAttr().
+		//
+		//		_setXXXAttr can also be a string/hash/array mapping from a widget attribute XXX to the widget's DOMNodes:
+		//
+		//		- DOM node attribute
+		// |		_setFocusAttr: {node: "focusNode", type: "attribute"}
+		// |		_setFocusAttr: "focusNode"	(shorthand)
+		// |		_setFocusAttr: ""		(shorthand, maps to this.domNode)
+		//		Maps this.focus to this.focusNode.focus, or (last example) this.domNode.focus
+		//
+		//		- DOM node innerHTML
+		//	|		_setTitleAttr: { node: "titleNode", type: "innerHTML" }
+		//		Maps this.title to this.titleNode.innerHTML
+		//
+		//		- DOM node innerText
+		//	|		_setTitleAttr: { node: "titleNode", type: "innerText" }
+		//		Maps this.title to this.titleNode.innerText
+		//
+		//		- DOM node CSS class
+		// |		_setMyClassAttr: { node: "domNode", type: "class" }
+		//		Maps this.myClass to this.domNode.className
+		//
+		//		- Toggle DOM node CSS class
+		// |		_setMyClassAttr: { node: "domNode", type: "toggleClass" }
+		//		Toggles myClass on this.domNode by this.myClass
+		//
+		//		If the value of _setXXXAttr is an array, then each element in the array matches one of the
+		//		formats of the above list.
+		//
+		//		If the custom setter is null, no action is performed other than saving the new value
+		//		in the widget (in this).
+		//
+		//		If no custom setter is defined for an attribute, then it will be copied
+		//		to this.focusNode (if the widget defines a focusNode), or this.domNode otherwise.
+		//		That's only done though for attributes that match DOMNode attributes (title,
+		//		alt, aria-labelledby, etc.)
+
+		// id: [const] String
+		//		A unique, opaque ID string that can be assigned by users or by the
+		//		system. If the developer passes an ID which is known not to be
+		//		unique, the specified ID is ignored and the system-generated ID is
+		//		used instead.
+		id: "",
+		_setIdAttr: "domNode", // to copy to this.domNode even for auto-generated id's
+
+		// lang: [const] String
+		//		Rarely used.  Overrides the default Dojo locale used to render this widget,
+		//		as defined by the [HTML LANG](http://www.w3.org/TR/html401/struct/dirlang.html#adef-lang) attribute.
+		//		Value must be among the list of locales specified during by the Dojo bootstrap,
+		//		formatted according to [RFC 3066](http://www.ietf.org/rfc/rfc3066.txt) (like en-us).
+		lang: "",
+		// set on domNode even when there's a focus node.	but don't set lang="", since that's invalid.
+		_setLangAttr: nonEmptyAttrToDom("lang"),
+
+		// dir: [const] String
+		//		Bi-directional support, as defined by the [HTML DIR](http://www.w3.org/TR/html401/struct/dirlang.html#adef-dir)
+		//		attribute. Either left-to-right "ltr" or right-to-left "rtl".  If undefined, widgets renders in page's
+		//		default direction.
+		dir: "",
+		// set on domNode even when there's a focus node.	but don't set dir="", since that's invalid.
+		_setDirAttr: nonEmptyAttrToDom("dir"), // to set on domNode even when there's a focus node
+
+		// class: String
+		//		HTML class attribute
+		"class": "",
+		_setClassAttr: { node: "domNode", type: "class" },
+
+		// Override automatic assigning type --> focusNode, it causes exception on IE6-8.
+		// Instead, type must be specified as ${type} in the template, as part of the original DOM.
+		_setTypeAttr: null,
+
+		// style: String||Object
+		//		HTML style attributes as cssText string or name/value hash
+		style: "",
+
+		// title: String
+		//		HTML title attribute.
+		//
+		//		For form widgets this specifies a tooltip to display when hovering over
+		//		the widget (just like the native HTML title attribute).
+		//
+		//		For TitlePane or for when this widget is a child of a TabContainer, AccordionContainer,
+		//		etc., it's used to specify the tab label, accordion pane title, etc.  In this case it's
+		//		interpreted as HTML.
+		title: "",
+
+		// tooltip: String
+		//		When this widget's title attribute is used to for a tab label, accordion pane title, etc.,
+		//		this specifies the tooltip to appear when the mouse is hovered over that text.
+		tooltip: "",
+
+		// baseClass: [protected] String
+		//		Root CSS class of the widget (ex: dijitTextBox), used to construct CSS classes to indicate
+		//		widget state.
+		baseClass: "",
+
+		// srcNodeRef: [readonly] DomNode
+		//		pointer to original DOM node
+		srcNodeRef: null,
+
+		// domNode: [readonly] DomNode
+		//		This is our visible representation of the widget! Other DOM
+		//		Nodes may by assigned to other properties, usually through the
+		//		template system's data-dojo-attach-point syntax, but the domNode
+		//		property is the canonical "top level" node in widget UI.
+		domNode: null,
+
+		// containerNode: [readonly] DomNode
+		//		Designates where children of the source DOM node will be placed.
+		//		"Children" in this case refers to both DOM nodes and widgets.
+		//		For example, for myWidget:
+		//
+		//		|	<div data-dojo-type=myWidget>
+		//		|		<b> here's a plain DOM node
+		//		|		<span data-dojo-type=subWidget>and a widget</span>
+		//		|		<i> and another plain DOM node </i>
+		//		|	</div>
+		//
+		//		containerNode would point to:
+		//
+		//		|		<b> here's a plain DOM node
+		//		|		<span data-dojo-type=subWidget>and a widget</span>
+		//		|		<i> and another plain DOM node </i>
+		//
+		//		In templated widgets, "containerNode" is set via a
+		//		data-dojo-attach-point assignment.
+		//
+		//		containerNode must be defined for any widget that accepts innerHTML
+		//		(like ContentPane or BorderContainer or even Button), and conversely
+		//		is null for widgets that don't, like TextBox.
+		containerNode: null,
+
+		// ownerDocument: [const] Document?
+		//		The document this widget belongs to.  If not specified to constructor, will default to
+		//		srcNodeRef.ownerDocument, or if no sourceRef specified, then to the document global
+		ownerDocument: null,
+		_setOwnerDocumentAttr: function(val){
+			// this setter is merely to avoid automatically trying to set this.domNode.ownerDocument
+			this._set("ownerDocument", val);
+		},
+
+		/*=====
+		// _started: [readonly] Boolean
+		//		startup() has completed.
+		_started: false,
+		=====*/
+
+		// attributeMap: [protected] Object
+		//		Deprecated.	Instead of attributeMap, widget should have a _setXXXAttr attribute
+		//		for each XXX attribute to be mapped to the DOM.
+		//
+		//		attributeMap sets up a "binding" between attributes (aka properties)
+		//		of the widget and the widget's DOM.
+		//		Changes to widget attributes listed in attributeMap will be
+		//		reflected into the DOM.
+		//
+		//		For example, calling set('title', 'hello')
+		//		on a TitlePane will automatically cause the TitlePane's DOM to update
+		//		with the new title.
+		//
+		//		attributeMap is a hash where the key is an attribute of the widget,
+		//		and the value reflects a binding to a:
+		//
+		//		- DOM node attribute
+		// |		focus: {node: "focusNode", type: "attribute"}
+		//		Maps this.focus to this.focusNode.focus
+		//
+		//		- DOM node innerHTML
+		//	|		title: { node: "titleNode", type: "innerHTML" }
+		//		Maps this.title to this.titleNode.innerHTML
+		//
+		//		- DOM node innerText
+		//	|		title: { node: "titleNode", type: "innerText" }
+		//		Maps this.title to this.titleNode.innerText
+		//
+		//		- DOM node CSS class
+		// |		myClass: { node: "domNode", type: "class" }
+		//		Maps this.myClass to this.domNode.className
+		//
+		//		If the value is an array, then each element in the array matches one of the
+		//		formats of the above list.
+		//
+		//		There are also some shorthands for backwards compatibility:
+		//
+		//		- string --> { node: string, type: "attribute" }, for example:
+		//
+		//	|	"focusNode" ---> { node: "focusNode", type: "attribute" }
+		//
+		//		- "" --> { node: "domNode", type: "attribute" }
+		attributeMap: {},
+
+		// _blankGif: [protected] String
+		//		Path to a blank 1x1 image.
+		//		Used by `<img>` nodes in templates that really get their image via CSS background-image.
+		_blankGif: config.blankGif || require.toUrl("dojo/resources/blank.gif"),
+
+		// textDir: String
+		//		Bi-directional support,	the main variable which is responsible for the direction of the text.
+		//		The text direction can be different than the GUI direction by using this parameter in creation
+		//		of a widget.
+		//
+		//		This property is only effective when `has("dojo-bidi")` is defined to be true.
+		//
+		//		Allowed values:
+		//
+		//		1. "" - default value; text is same direction as widget
+		//		2. "ltr"
+		//		3. "rtl"
+		//		4. "auto" - contextual the direction of a text defined by first strong letter.
+		textDir: "",
+
+		//////////// INITIALIZATION METHODS ///////////////////////////////////////
+
+		/*=====
+		constructor: function(params, srcNodeRef){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified:
+			//
+			//		- use srcNodeRef.innerHTML as my contents
+			//		- if this is a behavioral widget then apply behavior to that srcNodeRef
+			//		- otherwise, replace srcNodeRef with my generated DOM tree
+		},
+		=====*/
+
+		_introspect: function(){
+			// summary:
+			//		Collect metadata about this widget (only once per class, not once per instance):
+			//
+			//			- list of attributes with custom setters, storing in this.constructor._setterAttrs
+			//			- generate this.constructor._onMap, mapping names like "mousedown" to functions like onMouseDown
+
+			var ctor = this.constructor;
+			if(!ctor._setterAttrs){
+				var proto = ctor.prototype,
+					attrs = ctor._setterAttrs = [], // attributes with custom setters
+					onMap = (ctor._onMap = {});
+
+				// Items in this.attributeMap are like custom setters.  For back-compat, remove for 2.0.
+				for(var name in proto.attributeMap){
+					attrs.push(name);
+				}
+
+				// Loop over widget properties, collecting properties with custom setters and filling in ctor._onMap.
+				for(name in proto){
+					if(/^on/.test(name)){
+						onMap[name.substring(2).toLowerCase()] = name;
+					}
+
+					if(/^_set[A-Z](.*)Attr$/.test(name)){
+						name = name.charAt(4).toLowerCase() + name.substr(5, name.length - 9);
+						if(!proto.attributeMap || !(name in proto.attributeMap)){
+							attrs.push(name);
+						}
+					}
+				}
+
+				// Note: this isn't picking up info on properties like aria-label and role, that don't have custom setters
+				// but that set() maps to attributes on this.domNode or this.focusNode
+			}
+		},
+
+		postscript: function(/*Object?*/params, /*DomNode|String*/srcNodeRef){
+			// summary:
+			//		Kicks off widget instantiation.  See create() for details.
+			// tags:
+			//		private
+
+			// Note that we skip calling this.inherited(), i.e. dojo/Stateful::postscript(), because 1.x widgets don't
+			// expect their custom setters to get called until after buildRendering().  Consider changing for 2.0.
+
+			this.create(params, srcNodeRef);
+		},
+
+		create: function(params, srcNodeRef){
+			// summary:
+			//		Kick off the life-cycle of a widget
+			// description:
+			//		Create calls a number of widget methods (postMixInProperties, buildRendering, postCreate,
+			//		etc.), some of which of you'll want to override. See http://dojotoolkit.org/reference-guide/dijit/_WidgetBase.html
+			//		for a discussion of the widget creation lifecycle.
+			//
+			//		Of course, adventurous developers could override create entirely, but this should
+			//		only be done as a last resort.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified:
+			//
+			//		- use srcNodeRef.innerHTML as my contents
+			//		- if this is a behavioral widget then apply behavior to that srcNodeRef
+			//		- otherwise, replace srcNodeRef with my generated DOM tree
+			// tags:
+			//		private
+
+			// First time widget is instantiated, scan prototype to figure out info about custom setters etc.
+			this._introspect();
+
+			// store pointer to original DOM tree
+			this.srcNodeRef = dom.byId(srcNodeRef);
+
+			// No longer used, remove for 2.0.
+			this._connects = [];
+			this._supportingWidgets = [];
+
+			// this is here for back-compat, remove in 2.0 (but check NodeList-instantiate.html test)
+			if(this.srcNodeRef && this.srcNodeRef.id  && (typeof this.srcNodeRef.id == "string")){
+				this.id = this.srcNodeRef.id;
+			}
+
+			// mix in our passed parameters
+			if(params){
+				this.params = params;
+				lang.mixin(this, params);
+			}
+			this.postMixInProperties();
+
+			// Generate an id for the widget if one wasn't specified, or it was specified as id: undefined.
+			// Do this before buildRendering() because it might expect the id to be there.
+			if(!this.id){
+				this.id = registry.getUniqueId(this.declaredClass.replace(/\./g, "_"));
+				if(this.params){
+					// if params contains {id: undefined}, prevent _applyAttributes() from processing it
+					delete this.params.id;
+				}
+			}
+
+			// The document and <body> node this widget is associated with
+			this.ownerDocument = this.ownerDocument || (this.srcNodeRef ? this.srcNodeRef.ownerDocument : document);
+			this.ownerDocumentBody = win.body(this.ownerDocument);
+
+			registry.add(this);
+
+			this.buildRendering();
+
+			var deleteSrcNodeRef;
+
+			if(this.domNode){
+				// Copy attributes listed in attributeMap into the [newly created] DOM for the widget.
+				// Also calls custom setters for all attributes with custom setters.
+				this._applyAttributes();
+
+				// If srcNodeRef was specified, then swap out original srcNode for this widget's DOM tree.
+				// For 2.0, move this after postCreate().  postCreate() shouldn't depend on the
+				// widget being attached to the DOM since it isn't when a widget is created programmatically like
+				// new MyWidget({}).	See #11635.
+				var source = this.srcNodeRef;
+				if(source && source.parentNode && this.domNode !== source){
+					source.parentNode.replaceChild(this.domNode, source);
+					deleteSrcNodeRef = true;
+				}
+
+				// Note: for 2.0 may want to rename widgetId to dojo._scopeName + "_widgetId",
+				// assuming that dojo._scopeName even exists in 2.0
+				this.domNode.setAttribute("widgetId", this.id);
+			}
+			this.postCreate();
+
+			// If srcNodeRef has been processed and removed from the DOM (e.g. TemplatedWidget) then delete it to allow GC.
+			// I think for back-compatibility it isn't deleting srcNodeRef until after postCreate() has run.
+			if(deleteSrcNodeRef){
+				delete this.srcNodeRef;
+			}
+
+			this._created = true;
+		},
+
+		_applyAttributes: function(){
+			// summary:
+			//		Step during widget creation to copy  widget attributes to the
+			//		DOM according to attributeMap and _setXXXAttr objects, and also to call
+			//		custom _setXXXAttr() methods.
+			//
+			//		Skips over blank/false attribute values, unless they were explicitly specified
+			//		as parameters to the widget, since those are the default anyway,
+			//		and setting tabIndex="" is different than not setting tabIndex at all.
+			//
+			//		For backwards-compatibility reasons attributeMap overrides _setXXXAttr when
+			//		_setXXXAttr is a hash/string/array, but _setXXXAttr as a functions override attributeMap.
+			// tags:
+			//		private
+
+			// Call this.set() for each property that was either specified as parameter to constructor,
+			// or is in the list found above.	For correlated properties like value and displayedValue, the one
+			// specified as a parameter should take precedence.
+			// Particularly important for new DateTextBox({displayedValue: ...}) since DateTextBox's default value is
+			// NaN and thus is not ignored like a default value of "".
+
+			// Step 1: Save the current values of the widget properties that were specified as parameters to the constructor.
+			// Generally this.foo == this.params.foo, except if postMixInProperties() changed the value of this.foo.
+			var params = {};
+			for(var key in this.params || {}){
+				params[key] = this._get(key);
+			}
+
+			// Step 2: Call set() for each property with a non-falsy value that wasn't passed as a parameter to the constructor
+			array.forEach(this.constructor._setterAttrs, function(key){
+				if(!(key in params)){
+					var val = this._get(key);
+					if(val){
+						this.set(key, val);
+					}
+				}
+			}, this);
+
+			// Step 3: Call set() for each property that was specified as parameter to constructor.
+			// Use params hash created above to ignore side effects from step #2 above.
+			for(key in params){
+				this.set(key, params[key]);
+			}
+		},
+
+		postMixInProperties: function(){
+			// summary:
+			//		Called after the parameters to the widget have been read-in,
+			//		but before the widget template is instantiated. Especially
+			//		useful to set properties that are referenced in the widget
+			//		template.
+			// tags:
+			//		protected
+		},
+
+		buildRendering: function(){
+			// summary:
+			//		Construct the UI for this widget, setting this.domNode.
+			//		Most widgets will mixin `dijit._TemplatedMixin`, which implements this method.
+			// tags:
+			//		protected
+
+			if(!this.domNode){
+				// Create root node if it wasn't created by _TemplatedMixin
+				this.domNode = this.srcNodeRef || this.ownerDocument.createElement("div");
+			}
+
+			// baseClass is a single class name or occasionally a space-separated list of names.
+			// Add those classes to the DOMNode.  If RTL mode then also add with Rtl suffix.
+			// TODO: make baseClass custom setter
+			if(this.baseClass){
+				var classes = this.baseClass.split(" ");
+				if(!this.isLeftToRight()){
+					classes = classes.concat(array.map(classes, function(name){
+						return name + "Rtl";
+					}));
+				}
+				domClass.add(this.domNode, classes);
+			}
+		},
+
+		postCreate: function(){
+			// summary:
+			//		Processing after the DOM fragment is created
+			// description:
+			//		Called after the DOM fragment has been created, but not necessarily
+			//		added to the document.  Do not include any operations which rely on
+			//		node dimensions or placement.
+			// tags:
+			//		protected
+		},
+
+		startup: function(){
+			// summary:
+			//		Processing after the DOM fragment is added to the document
+			// description:
+			//		Called after a widget and its children have been created and added to the page,
+			//		and all related widgets have finished their create() cycle, up through postCreate().
+			//
+			//		Note that startup() may be called while the widget is still hidden, for example if the widget is
+			//		inside a hidden dijit/Dialog or an unselected tab of a dijit/layout/TabContainer.
+			//		For widgets that need to do layout, it's best to put that layout code inside resize(), and then
+			//		extend dijit/layout/_LayoutWidget so that resize() is called when the widget is visible.
+			if(this._started){
+				return;
+			}
+			this._started = true;
+			array.forEach(this.getChildren(), function(obj){
+				if(!obj._started && !obj._destroyed && lang.isFunction(obj.startup)){
+					obj.startup();
+					obj._started = true;
+				}
+			});
+		},
+
+		//////////// DESTROY FUNCTIONS ////////////////////////////////
+
+		destroyRecursive: function(/*Boolean?*/ preserveDom){
+			// summary:
+			//		Destroy this widget and its descendants
+			// description:
+			//		This is the generic "destructor" function that all widget users
+			//		should call to cleanly discard with a widget. Once a widget is
+			//		destroyed, it is removed from the manager object.
+			// preserveDom:
+			//		If true, this method will leave the original DOM structure
+			//		alone of descendant Widgets. Note: This will NOT work with
+			//		dijit._TemplatedMixin widgets.
+
+			this._beingDestroyed = true;
+			this.destroyDescendants(preserveDom);
+			this.destroy(preserveDom);
+		},
+
+		destroy: function(/*Boolean*/ preserveDom){
+			// summary:
+			//		Destroy this widget, but not its descendants.  Descendants means widgets inside of
+			//		this.containerNode.   Will also destroy any resources (including widgets) registered via this.own().
+			//
+			//		This method will also destroy internal widgets such as those created from a template,
+			//		assuming those widgets exist inside of this.domNode but outside of this.containerNode.
+			//
+			//		For 2.0 it's planned that this method will also destroy descendant widgets, so apps should not
+			//		depend on the current ability to destroy a widget without destroying its descendants.   Generally
+			//		they should use destroyRecursive() for widgets with children.
+			// preserveDom: Boolean
+			//		If true, this method will leave the original DOM structure alone.
+			//		Note: This will not yet work with _TemplatedMixin widgets
+
+			this._beingDestroyed = true;
+			this.uninitialize();
+
+			function destroy(w){
+				if(w.destroyRecursive){
+					w.destroyRecursive(preserveDom);
+				}else if(w.destroy){
+					w.destroy(preserveDom);
+				}
+			}
+
+			// Back-compat, remove for 2.0
+			array.forEach(this._connects, lang.hitch(this, "disconnect"));
+			array.forEach(this._supportingWidgets, destroy);
+
+			// Destroy supporting widgets, but not child widgets under this.containerNode (for 2.0, destroy child widgets
+			// here too).   if() statement is to guard against exception if destroy() called multiple times (see #15815).
+			if(this.domNode){
+				array.forEach(registry.findWidgets(this.domNode, this.containerNode), destroy);
+			}
+
+			this.destroyRendering(preserveDom);
+			registry.remove(this.id);
+			this._destroyed = true;
+		},
+
+		destroyRendering: function(/*Boolean?*/ preserveDom){
+			// summary:
+			//		Destroys the DOM nodes associated with this widget.
+			// preserveDom:
+			//		If true, this method will leave the original DOM structure alone
+			//		during tear-down. Note: this will not work with _Templated
+			//		widgets yet.
+			// tags:
+			//		protected
+
+			if(this.bgIframe){
+				this.bgIframe.destroy(preserveDom);
+				delete this.bgIframe;
+			}
+
+			if(this.domNode){
+				if(preserveDom){
+					domAttr.remove(this.domNode, "widgetId");
+				}else{
+					domConstruct.destroy(this.domNode);
+				}
+				delete this.domNode;
+			}
+
+			if(this.srcNodeRef){
+				if(!preserveDom){
+					domConstruct.destroy(this.srcNodeRef);
+				}
+				delete this.srcNodeRef;
+			}
+		},
+
+		destroyDescendants: function(/*Boolean?*/ preserveDom){
+			// summary:
+			//		Recursively destroy the children of this widget and their
+			//		descendants.
+			// preserveDom:
+			//		If true, the preserveDom attribute is passed to all descendant
+			//		widget's .destroy() method. Not for use with _Templated
+			//		widgets.
+
+			// get all direct descendants and destroy them recursively
+			array.forEach(this.getChildren(), function(widget){
+				if(widget.destroyRecursive){
+					widget.destroyRecursive(preserveDom);
+				}
+			});
+		},
+
+		uninitialize: function(){
+			// summary:
+			//		Deprecated. Override destroy() instead to implement custom widget tear-down
+			//		behavior.
+			// tags:
+			//		protected
+			return false;
+		},
+
+		////////////////// GET/SET, CUSTOM SETTERS, ETC. ///////////////////
+
+		_setStyleAttr: function(/*String||Object*/ value){
+			// summary:
+			//		Sets the style attribute of the widget according to value,
+			//		which is either a hash like {height: "5px", width: "3px"}
+			//		or a plain string
+			// description:
+			//		Determines which node to set the style on based on style setting
+			//		in attributeMap.
+			// tags:
+			//		protected
+
+			var mapNode = this.domNode;
+
+			// Note: technically we should revert any style setting made in a previous call
+			// to his method, but that's difficult to keep track of.
+
+			if(lang.isObject(value)){
+				domStyle.set(mapNode, value);
+			}else{
+				if(mapNode.style.cssText){
+					mapNode.style.cssText += "; " + value;
+				}else{
+					mapNode.style.cssText = value;
+				}
+			}
+
+			this._set("style", value);
+		},
+
+		_attrToDom: function(/*String*/ attr, /*String*/ value, /*Object?*/ commands){
+			// summary:
+			//		Reflect a widget attribute (title, tabIndex, duration etc.) to
+			//		the widget DOM, as specified by commands parameter.
+			//		If commands isn't specified then it's looked up from attributeMap.
+			//		Note some attributes like "type"
+			//		cannot be processed this way as they are not mutable.
+			// attr:
+			//		Name of member variable (ex: "focusNode" maps to this.focusNode) pointing
+			//		to DOMNode inside the widget, or alternately pointing to a subwidget
+			// tags:
+			//		private
+
+			commands = arguments.length >= 3 ? commands : this.attributeMap[attr];
+
+			array.forEach(lang.isArray(commands) ? commands : [commands], function(command){
+
+				// Get target node and what we are doing to that node
+				var mapNode = this[command.node || command || "domNode"];	// DOM node
+				var type = command.type || "attribute";	// class, innerHTML, innerText, or attribute
+
+				switch(type){
+					case "attribute":
+						if(lang.isFunction(value)){ // functions execute in the context of the widget
+							value = lang.hitch(this, value);
+						}
+
+						// Get the name of the DOM node attribute; usually it's the same
+						// as the name of the attribute in the widget (attr), but can be overridden.
+						// Also maps handler names to lowercase, like onSubmit --> onsubmit
+						var attrName = command.attribute ? command.attribute :
+							(/^on[A-Z][a-zA-Z]*$/.test(attr) ? attr.toLowerCase() : attr);
+
+						if(mapNode.tagName){
+							// Normal case, mapping to a DOMNode.  Note that modern browsers will have a mapNode.set()
+							// method, but for consistency we still call domAttr
+							domAttr.set(mapNode, attrName, value);
+						}else{
+							// mapping to a sub-widget
+							mapNode.set(attrName, value);
+						}
+						break;
+					case "innerText":
+						mapNode.innerHTML = "";
+						mapNode.appendChild(this.ownerDocument.createTextNode(value));
+						break;
+					case "innerHTML":
+						mapNode.innerHTML = value;
+						break;
+					case "class":
+						domClass.replace(mapNode, value, this[attr]);
+						break;
+					case "toggleClass":
+						domClass.toggle(mapNode, command.className || attr, value);
+						break;
+				}
+			}, this);
+		},
+
+		get: function(name){
+			// summary:
+			//		Get a property from a widget.
+			// name:
+			//		The property to get.
+			// description:
+			//		Get a named property from a widget. The property may
+			//		potentially be retrieved via a getter method. If no getter is defined, this
+			//		just retrieves the object's property.
+			//
+			//		For example, if the widget has properties `foo` and `bar`
+			//		and a method named `_getFooAttr()`, calling:
+			//		`myWidget.get("foo")` would be equivalent to calling
+			//		`widget._getFooAttr()` and `myWidget.get("bar")`
+			//		would be equivalent to the expression
+			//		`widget.bar2`
+			var names = this._getAttrNames(name);
+			return this[names.g] ? this[names.g]() : this._get(name);
+		},
+
+		set: function(name, value){
+			// summary:
+			//		Set a property on a widget
+			// name:
+			//		The property to set.
+			// value:
+			//		The value to set in the property.
+			// description:
+			//		Sets named properties on a widget which may potentially be handled by a
+			//		setter in the widget.
+			//
+			//		For example, if the widget has properties `foo` and `bar`
+			//		and a method named `_setFooAttr()`, calling
+			//		`myWidget.set("foo", "Howdy!")` would be equivalent to calling
+			//		`widget._setFooAttr("Howdy!")` and `myWidget.set("bar", 3)`
+			//		would be equivalent to the statement `widget.bar = 3;`
+			//
+			//		set() may also be called with a hash of name/value pairs, ex:
+			//
+			//	|	myWidget.set({
+			//	|		foo: "Howdy",
+			//	|		bar: 3
+			//	|	});
+			//
+			//	This is equivalent to calling `set(foo, "Howdy")` and `set(bar, 3)`
+
+			if(typeof name === "object"){
+				for(var x in name){
+					this.set(x, name[x]);
+				}
+				return this;
+			}
+			var names = this._getAttrNames(name),
+				setter = this[names.s];
+			if(lang.isFunction(setter)){
+				// use the explicit setter
+				var result = setter.apply(this, Array.prototype.slice.call(arguments, 1));
+			}else{
+				// Mapping from widget attribute to DOMNode/subwidget attribute/value/etc.
+				// Map according to:
+				//		1. attributeMap setting, if one exists (TODO: attributeMap deprecated, remove in 2.0)
+				//		2. _setFooAttr: {...} type attribute in the widget (if one exists)
+				//		3. apply to focusNode or domNode if standard attribute name, excluding funcs like onClick.
+				// Checks if an attribute is a "standard attribute" by whether the DOMNode JS object has a similar
+				// attribute name (ex: accept-charset attribute matches jsObject.acceptCharset).
+				// Note also that Tree.focusNode() is a function not a DOMNode, so test for that.
+				var defaultNode = this.focusNode && !lang.isFunction(this.focusNode) ? "focusNode" : "domNode",
+					tag = this[defaultNode] && this[defaultNode].tagName,
+					attrsForTag = tag && (tagAttrs[tag] || (tagAttrs[tag] = getAttrs(this[defaultNode]))),
+					map = name in this.attributeMap ? this.attributeMap[name] :
+						names.s in this ? this[names.s] :
+							((attrsForTag && names.l in attrsForTag && typeof value != "function") ||
+								/^aria-|^data-|^role$/.test(name)) ? defaultNode : null;
+				if(map != null){
+					this._attrToDom(name, value, map);
+				}
+				this._set(name, value);
+			}
+			return result || this;
+		},
+
+		_attrPairNames: {}, // shared between all widgets
+		_getAttrNames: function(name){
+			// summary:
+			//		Helper function for get() and set().
+			//		Caches attribute name values so we don't do the string ops every time.
+			// tags:
+			//		private
+
+			var apn = this._attrPairNames;
+			if(apn[name]){
+				return apn[name];
+			}
+			var uc = name.replace(/^[a-z]|-[a-zA-Z]/g, function(c){
+				return c.charAt(c.length - 1).toUpperCase();
+			});
+			return (apn[name] = {
+				n: name + "Node",
+				s: "_set" + uc + "Attr", // converts dashes to camel case, ex: accept-charset --> _setAcceptCharsetAttr
+				g: "_get" + uc + "Attr",
+				l: uc.toLowerCase()        // lowercase name w/out dashes, ex: acceptcharset
+			});
+		},
+
+		_set: function(/*String*/ name, /*anything*/ value){
+			// summary:
+			//		Helper function to set new value for specified property, and call handlers
+			//		registered with watch() if the value has changed.
+			var oldValue = this[name];
+			this[name] = value;
+			if(this._created && !isEqual(oldValue, value)){
+				if(this._watchCallbacks){
+					this._watchCallbacks(name, oldValue, value);
+				}
+				this.emit("attrmodified-" + name, {
+					detail: {
+						prevValue: oldValue,
+						newValue: value
+					}
+				});
+			}
+		},
+
+		_get: function(/*String*/ name){
+			// summary:
+			//		Helper function to get value for specified property stored by this._set(),
+			//		i.e. for properties with custom setters.  Used mainly by custom getters.
+			//
+			//		For example, CheckBox._getValueAttr() calls this._get("value").
+
+			// future: return name in this.props ? this.props[name] : this[name];
+			return this[name];
+		},
+
+		emit: function(/*String*/ type, /*Object?*/ eventObj, /*Array?*/ callbackArgs){
+			// summary:
+			//		Used by widgets to signal that a synthetic event occurred, ex:
+			//	|	myWidget.emit("attrmodified-selectedChildWidget", {}).
+			//
+			//		Emits an event on this.domNode named type.toLowerCase(), based on eventObj.
+			//		Also calls onType() method, if present, and returns value from that method.
+			//		By default passes eventObj to callback, but will pass callbackArgs instead, if specified.
+			//		Modifies eventObj by adding missing parameters (bubbles, cancelable, widget).
+			// tags:
+			//		protected
+
+			// Specify fallback values for bubbles, cancelable in case they are not set in eventObj.
+			// Also set pointer to widget, although since we can't add a pointer to the widget for native events
+			// (see #14729), maybe we shouldn't do it here?
+			eventObj = eventObj || {};
+			if(eventObj.bubbles === undefined){
+				eventObj.bubbles = true;
+			}
+			if(eventObj.cancelable === undefined){
+				eventObj.cancelable = true;
+			}
+			if(!eventObj.detail){
+				eventObj.detail = {};
+			}
+			eventObj.detail.widget = this;
+
+			var ret, callback = this["on" + type];
+			if(callback){
+				ret = callback.apply(this, callbackArgs ? callbackArgs : [eventObj]);
+			}
+
+			// Emit event, but avoid spurious emit()'s as parent sets properties on child during startup/destroy
+			if(this._started && !this._beingDestroyed){
+				on.emit(this.domNode, type.toLowerCase(), eventObj);
+			}
+
+			return ret;
+		},
+
+		on: function(/*String|Function*/ type, /*Function*/ func){
+			// summary:
+			//		Call specified function when event occurs, ex: myWidget.on("click", function(){ ... }).
+			// type:
+			//		Name of event (ex: "click") or extension event like touch.press.
+			// description:
+			//		Call specified function when event `type` occurs, ex: `myWidget.on("click", function(){ ... })`.
+			//		Note that the function is not run in any particular scope, so if (for example) you want it to run in the
+			//		widget's scope you must do `myWidget.on("click", lang.hitch(myWidget, func))`.
+
+			// For backwards compatibility, if there's an onType() method in the widget then connect to that.
+			// Remove in 2.0.
+			var widgetMethod = this._onMap(type);
+			if(widgetMethod){
+				return aspect.after(this, widgetMethod, func, true);
+			}
+
+			// Otherwise, just listen for the event on this.domNode.
+			return this.own(on(this.domNode, type, func))[0];
+		},
+
+		_onMap: function(/*String|Function*/ type){
+			// summary:
+			//		Maps on() type parameter (ex: "mousemove") to method name (ex: "onMouseMove").
+			//		If type is a synthetic event like touch.press then returns undefined.
+			var ctor = this.constructor, map = ctor._onMap;
+			if(!map){
+				map = (ctor._onMap = {});
+				for(var attr in ctor.prototype){
+					if(/^on/.test(attr)){
+						map[attr.replace(/^on/, "").toLowerCase()] = attr;
+					}
+				}
+			}
+			return map[typeof type == "string" && type.toLowerCase()];	// String
+		},
+
+		toString: function(){
+			// summary:
+			//		Returns a string that represents the widget.
+			// description:
+			//		When a widget is cast to a string, this method will be used to generate the
+			//		output. Currently, it does not implement any sort of reversible
+			//		serialization.
+			return '[Widget ' + this.declaredClass + ', ' + (this.id || 'NO ID') + ']'; // String
+		},
+
+		getChildren: function(){
+			// summary:
+			//		Returns all direct children of this widget, i.e. all widgets underneath this.containerNode whose parent
+			//		is this widget.   Note that it does not return all descendants, but rather just direct children.
+			//		Analogous to [Node.childNodes](https://developer.mozilla.org/en-US/docs/DOM/Node.childNodes),
+			//		except containing widgets rather than DOMNodes.
+			//
+			//		The result intentionally excludes internally created widgets (a.k.a. supporting widgets)
+			//		outside of this.containerNode.
+			//
+			//		Note that the array returned is a simple array.  Application code should not assume
+			//		existence of methods like forEach().
+
+			return this.containerNode ? registry.findWidgets(this.containerNode) : []; // dijit/_WidgetBase[]
+		},
+
+		getParent: function(){
+			// summary:
+			//		Returns the parent widget of this widget.
+
+			return registry.getEnclosingWidget(this.domNode.parentNode);
+		},
+
+		connect: function(/*Object|null*/ obj, /*String|Function*/ event, /*String|Function*/ method){
+			// summary:
+			//		Deprecated, will be removed in 2.0, use this.own(on(...)) or this.own(aspect.after(...)) instead.
+			//
+			//		Connects specified obj/event to specified method of this object
+			//		and registers for disconnect() on widget destroy.
+			//
+			//		Provide widget-specific analog to dojo.connect, except with the
+			//		implicit use of this widget as the target object.
+			//		Events connected with `this.connect` are disconnected upon
+			//		destruction.
+			// returns:
+			//		A handle that can be passed to `disconnect` in order to disconnect before
+			//		the widget is destroyed.
+			// example:
+			//	|	var btn = new Button();
+			//	|	// when foo.bar() is called, call the listener we're going to
+			//	|	// provide in the scope of btn
+			//	|	btn.connect(foo, "bar", function(){
+			//	|		console.debug(this.toString());
+			//	|	});
+			// tags:
+			//		protected
+
+			return this.own(connect.connect(obj, event, this, method))[0];	// handle
+		},
+
+		disconnect: function(handle){
+			// summary:
+			//		Deprecated, will be removed in 2.0, use handle.remove() instead.
+			//
+			//		Disconnects handle created by `connect`.
+			// tags:
+			//		protected
+
+			handle.remove();
+		},
+
+		subscribe: function(t, method){
+			// summary:
+			//		Deprecated, will be removed in 2.0, use this.own(topic.subscribe()) instead.
+			//
+			//		Subscribes to the specified topic and calls the specified method
+			//		of this object and registers for unsubscribe() on widget destroy.
+			//
+			//		Provide widget-specific analog to dojo.subscribe, except with the
+			//		implicit use of this widget as the target object.
+			// t: String
+			//		The topic
+			// method: Function
+			//		The callback
+			// example:
+			//	|	var btn = new Button();
+			//	|	// when /my/topic is published, this button changes its label to
+			//	|	// be the parameter of the topic.
+			//	|	btn.subscribe("/my/topic", function(v){
+			//	|		this.set("label", v);
+			//	|	});
+			// tags:
+			//		protected
+			return this.own(topic.subscribe(t, lang.hitch(this, method)))[0];	// handle
+		},
+
+		unsubscribe: function(/*Object*/ handle){
+			// summary:
+			//		Deprecated, will be removed in 2.0, use handle.remove() instead.
+			//
+			//		Unsubscribes handle created by this.subscribe.
+			//		Also removes handle from this widget's list of subscriptions
+			// tags:
+			//		protected
+
+			handle.remove();
+		},
+
+		isLeftToRight: function(){
+			// summary:
+			//		Return this widget's explicit or implicit orientation (true for LTR, false for RTL)
+			// tags:
+			//		protected
+			return this.dir ? (this.dir.toLowerCase() == "ltr") : domGeometry.isBodyLtr(this.ownerDocument); //Boolean
+		},
+
+		isFocusable: function(){
+			// summary:
+			//		Return true if this widget can currently be focused
+			//		and false if not
+			return this.focus && (domStyle.get(this.domNode, "display") != "none");
+		},
+
+		placeAt: function(/*String|DomNode|DocumentFragment|dijit/_WidgetBase*/ reference, /*String|Int?*/ position){
+			// summary:
+			//		Place this widget somewhere in the DOM based
+			//		on standard domConstruct.place() conventions.
+			// description:
+			//		A convenience function provided in all _Widgets, providing a simple
+			//		shorthand mechanism to put an existing (or newly created) Widget
+			//		somewhere in the dom, and allow chaining.
+			// reference:
+			//		Widget, DOMNode, DocumentFragment, or id of widget or DOMNode
+			// position:
+			//		If reference is a widget (or id of widget), and that widget has an ".addChild" method,
+			//		it will be called passing this widget instance into that method, supplying the optional
+			//		position index passed.  In this case position (if specified) should be an integer.
+			//
+			//		If reference is a DOMNode (or id matching a DOMNode but not a widget),
+			//		the position argument can be a numeric index or a string
+			//		"first", "last", "before", or "after", same as dojo/dom-construct::place().
+			// returns: dijit/_WidgetBase
+			//		Provides a useful return of the newly created dijit._Widget instance so you
+			//		can "chain" this function by instantiating, placing, then saving the return value
+			//		to a variable.
+			// example:
+			//	|	// create a Button with no srcNodeRef, and place it in the body:
+			//	|	var button = new Button({ label:"click" }).placeAt(win.body());
+			//	|	// now, 'button' is still the widget reference to the newly created button
+			//	|	button.on("click", function(e){ console.log('click'); }));
+			// example:
+			//	|	// create a button out of a node with id="src" and append it to id="wrapper":
+			//	|	var button = new Button({},"src").placeAt("wrapper");
+			// example:
+			//	|	// place a new button as the first element of some div
+			//	|	var button = new Button({ label:"click" }).placeAt("wrapper","first");
+			// example:
+			//	|	// create a contentpane and add it to a TabContainer
+			//	|	var tc = dijit.byId("myTabs");
+			//	|	new ContentPane({ href:"foo.html", title:"Wow!" }).placeAt(tc)
+
+			var refWidget = !reference.tagName && registry.byId(reference);
+			if(refWidget && refWidget.addChild && (!position || typeof position === "number")){
+				// Adding this to refWidget and can use refWidget.addChild() to handle everything.
+				refWidget.addChild(this, position);
+			}else{
+				// "reference" is a plain DOMNode, or we can't use refWidget.addChild().   Use domConstruct.place() and
+				// target refWidget.containerNode for nested placement (position==number, "first", "last", "only"), and
+				// refWidget.domNode otherwise ("after"/"before"/"replace").  (But not supported officially, see #14946.)
+				var ref = refWidget && ("domNode" in refWidget) ?
+					(refWidget.containerNode && !/after|before|replace/.test(position || "") ?
+						refWidget.containerNode : refWidget.domNode) : dom.byId(reference, this.ownerDocument);
+				domConstruct.place(this.domNode, ref, position);
+
+				// Start this iff it has a parent widget that's already started.
+				// TODO: for 2.0 maybe it should also start the widget when this.getParent() returns null??
+				if(!this._started && (this.getParent() || {})._started){
+					this.startup();
+				}
+			}
+			return this;
+		},
+
+		defer: function(fcn, delay){
+			// summary:
+			//		Wrapper to setTimeout to avoid deferred functions executing
+			//		after the originating widget has been destroyed.
+			//		Returns an object handle with a remove method (that returns null) (replaces clearTimeout).
+			// fcn: Function
+			//		Function reference.
+			// delay: Number?
+			//		Delay, defaults to 0.
+			// tags:
+			//		protected
+
+			var timer = setTimeout(lang.hitch(this,
+				function(){
+					if(!timer){
+						return;
+					}
+					timer = null;
+					if(!this._destroyed){
+						lang.hitch(this, fcn)();
+					}
+				}),
+				delay || 0
+			);
+			return {
+				remove: function(){
+					if(timer){
+						clearTimeout(timer);
+						timer = null;
+					}
+					return null; // so this works well: handle = handle.remove();
+				}
+			};
+		}
+	});
+
+	if(has("dojo-bidi")){
+		_WidgetBase.extend(_BidiMixin);
+	}
+
+	return _WidgetBase;
+});
diff --git a/src/main/resources/static/dijit/_WidgetsInTemplateMixin.js b/src/main/resources/static/dijit/_WidgetsInTemplateMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..9608c61928843421a720efb5ba1507542ad514f7
--- /dev/null
+++ b/src/main/resources/static/dijit/_WidgetsInTemplateMixin.js
@@ -0,0 +1,108 @@
+define([
+	"dojo/_base/array", // forEach()
+	"dojo/aspect", // after()
+	"dojo/_base/declare", // declare()
+	"dojo/_base/lang",	// hitch()
+	"dojo/parser" // parse()
+], function(array, aspect, declare, lang, parser){
+
+	// module:
+	//		dijit/_WidgetsInTemplateMixin
+
+	return declare("dijit._WidgetsInTemplateMixin", null, {
+		// summary:
+		//		Mixin to supplement _TemplatedMixin when template contains widgets
+
+		// _earlyTemplatedStartup: Boolean
+		//		A fallback to preserve the 1.0 - 1.3 behavior of children in
+		//		templates having their startup called before the parent widget
+		//		fires postCreate. Defaults to 'false', causing child widgets to
+		//		have their .startup() called immediately before a parent widget
+		//		.startup(), but always after the parent .postCreate(). Set to
+		//		'true' to re-enable to previous, arguably broken, behavior.
+		_earlyTemplatedStartup: false,
+
+		// contextRequire: Function
+		//		Used to provide a context require to the dojo/parser in order to be
+		//		able to use relative MIDs (e.g. `./Widget`) in the widget's template.
+		contextRequire: null,
+
+		_beforeFillContent: function(){
+			// Short circuit the parser when the template doesn't contain any widgets.  Note that checking against
+			// this.templateString is insufficient because the data-dojo-type=... may appear through a substitution
+			// variable, like in ConfirmDialog, where the widget is hidden inside of the ${!actionBarTemplate}.
+			if(/dojoType|data-dojo-type/i.test(this.domNode.innerHTML)){
+				// Before copying over content, instantiate widgets in template
+				var node = this.domNode;
+
+				if(this.containerNode && !this.searchContainerNode){
+					// Tell parse call below not to look for widgets inside of this.containerNode
+					this.containerNode.stopParser = true;
+				}
+
+				parser.parse(node, {
+					noStart: !this._earlyTemplatedStartup,
+					template: true,
+					inherited: {dir: this.dir, lang: this.lang, textDir: this.textDir},
+					propsThis: this,	// so data-dojo-props of widgets in the template can reference "this" to refer to me
+					contextRequire: this.contextRequire,
+					scope: "dojo"	// even in multi-version mode templates use dojoType/data-dojo-type
+				}).then(lang.hitch(this, function(widgets){
+					this._startupWidgets = widgets;
+
+					// _WidgetBase::destroy() will destroy any supporting widgets under this.domNode.
+					// If we wanted to, we could call this.own() on anything in this._startupWidgets that was moved outside
+					// of this.domNode (like Dialog, which is moved to <body>).
+
+					// Hook up attach points and events for nodes that were converted to widgets
+					for(var i = 0; i < widgets.length; i++){
+						this._processTemplateNode(widgets[i], function(n,p){
+							// callback to get a property of a widget
+							return n[p];
+						}, function(widget, type, callback){
+							// callback to do data-dojo-attach-event to a widget
+							if(type in widget){
+								// back-compat, remove for 2.0
+								return widget.connect(widget, type, callback);
+							}else{
+								// 1.x may never hit this branch, but it's the default for 2.0
+								return widget.on(type, callback, true);
+							}
+						});
+					}
+
+					// Cleanup flag set above, just in case
+					if(this.containerNode && this.containerNode.stopParser){
+						delete this.containerNode.stopParser;
+					}
+				}));
+
+				if(!this._startupWidgets){
+					throw new Error(this.declaredClass + ": parser returned unfilled promise (probably waiting for module auto-load), " +
+						"unsupported by _WidgetsInTemplateMixin.   Must pre-load all supporting widgets before instantiation.");
+				}
+			}
+		},
+
+		_processTemplateNode: function(/*DOMNode|Widget*/ baseNode, getAttrFunc, attachFunc){
+			// Override _AttachMixin._processNode to skip DOMNodes with data-dojo-type set.   They are handled separately
+			// in the _beforeFillContent() code above.
+
+			if(getAttrFunc(baseNode, "dojoType") || getAttrFunc(baseNode, "data-dojo-type")){
+				return true;
+			}
+
+			return this.inherited(arguments);
+		},
+
+		startup: function(){
+			array.forEach(this._startupWidgets, function(w){
+				if(w && !w._started && w.startup){
+					w.startup();
+				}
+			});
+			this._startupWidgets = null;
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/_base.js b/src/main/resources/static/dijit/_base.js
new file mode 100644
index 0000000000000000000000000000000000000000..671f99f5b02d9143480804cac562199ee444d8f6
--- /dev/null
+++ b/src/main/resources/static/dijit/_base.js
@@ -0,0 +1,27 @@
+define([
+	"./main",
+	"./a11y",	// used to be in dijit/_base/manager
+	"./WidgetSet",	// used to be in dijit/_base/manager
+	"./_base/focus",
+	"./_base/manager",
+	"./_base/place",
+	"./_base/popup",
+	"./_base/scroll",
+	"./_base/sniff",
+	"./_base/typematic",
+	"./_base/wai",
+	"./_base/window"
+], function(dijit){
+
+	// module:
+	//		dijit/_base
+
+	/*=====
+	return {
+		// summary:
+		//		Includes all the modules in dijit/_base
+	};
+	=====*/
+
+	return dijit._base;
+});
diff --git a/src/main/resources/static/dijit/_base/focus.js b/src/main/resources/static/dijit/_base/focus.js
new file mode 100644
index 0000000000000000000000000000000000000000..94f3071ca0a07738c3908957998a00eb9a59624f
--- /dev/null
+++ b/src/main/resources/static/dijit/_base/focus.js
@@ -0,0 +1,207 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/dom", // dom.isDescendant
+	"dojo/_base/lang", // lang.isArray
+	"dojo/topic", // publish
+	"dojo/_base/window", // win.doc win.doc.selection win.global win.global.getSelection win.withGlobal
+	"../focus",
+	"../selection",
+	"../main"	// for exporting symbols to dijit
+], function(array, dom, lang, topic, win, focus, selection, dijit){
+
+	// module:
+	//		dijit/_base/focus
+
+	var exports = {
+		// summary:
+		//		Deprecated module to monitor currently focused node and stack of currently focused widgets.
+		//		New code should access dijit/focus directly.
+
+		// _curFocus: DomNode
+		//		Currently focused item on screen
+		_curFocus: null,
+
+		// _prevFocus: DomNode
+		//		Previously focused item on screen
+		_prevFocus: null,
+
+		isCollapsed: function(){
+			// summary:
+			//		Returns true if there is no text selected
+			return dijit.getBookmark().isCollapsed;
+		},
+
+		getBookmark: function(){
+			// summary:
+			//		Retrieves a bookmark that can be used with moveToBookmark to return to the same range
+			var sel = win.global == window ? selection : new selection.SelectionManager(win.global);
+			return sel.getBookmark();
+		},
+
+		moveToBookmark: function(/*Object*/ bookmark){
+			// summary:
+			//		Moves current selection to a bookmark
+			// bookmark:
+			//		This should be a returned object from dijit.getBookmark()
+
+			var sel = win.global == window ? selection : new selection.SelectionManager(win.global);
+			return sel.moveToBookmark(bookmark);
+		},
+
+		getFocus: function(/*Widget?*/ menu, /*Window?*/ openedForWindow){
+			// summary:
+			//		Called as getFocus(), this returns an Object showing the current focus
+			//		and selected text.
+			//
+			//		Called as getFocus(widget), where widget is a (widget representing) a button
+			//		that was just pressed, it returns where focus was before that button
+			//		was pressed.   (Pressing the button may have either shifted focus to the button,
+			//		or removed focus altogether.)   In this case the selected text is not returned,
+			//		since it can't be accurately determined.
+			//
+			// menu: dijit/_WidgetBase|{domNode: DomNode} structure
+			//		The button that was just pressed.  If focus has disappeared or moved
+			//		to this button, returns the previous focus.  In this case the bookmark
+			//		information is already lost, and null is returned.
+			//
+			// openedForWindow:
+			//		iframe in which menu was opened
+			//
+			// returns:
+			//		A handle to restore focus/selection, to be passed to `dijit.focus`
+			var node = !focus.curNode || (menu && dom.isDescendant(focus.curNode, menu.domNode)) ? dijit._prevFocus : focus.curNode;
+			return {
+				node: node,
+				bookmark: node && (node == focus.curNode) && win.withGlobal(openedForWindow || win.global, dijit.getBookmark),
+				openedForWindow: openedForWindow
+			}; // Object
+		},
+
+		// _activeStack: dijit/_WidgetBase[]
+		//		List of currently active widgets (focused widget and it's ancestors)
+		_activeStack: [],
+
+		registerIframe: function(/*DomNode*/ iframe){
+			// summary:
+			//		Registers listeners on the specified iframe so that any click
+			//		or focus event on that iframe (or anything in it) is reported
+			//		as a focus/click event on the `<iframe>` itself.
+			// description:
+			//		Currently only used by editor.
+			// returns:
+			//		Handle to pass to unregisterIframe()
+			return focus.registerIframe(iframe);
+		},
+
+		unregisterIframe: function(/*Object*/ handle){
+			// summary:
+			//		Unregisters listeners on the specified iframe created by registerIframe.
+			//		After calling be sure to delete or null out the handle itself.
+			// handle:
+			//		Handle returned by registerIframe()
+
+			handle && handle.remove();
+		},
+
+		registerWin: function(/*Window?*/targetWindow, /*DomNode?*/ effectiveNode){
+			// summary:
+			//		Registers listeners on the specified window (either the main
+			//		window or an iframe's window) to detect when the user has clicked somewhere
+			//		or focused somewhere.
+			// description:
+			//		Users should call registerIframe() instead of this method.
+			// targetWindow:
+			//		If specified this is the window associated with the iframe,
+			//		i.e. iframe.contentWindow.
+			// effectiveNode:
+			//		If specified, report any focus events inside targetWindow as
+			//		an event on effectiveNode, rather than on evt.target.
+			// returns:
+			//		Handle to pass to unregisterWin()
+
+			return focus.registerWin(targetWindow, effectiveNode);
+		},
+
+		unregisterWin: function(/*Handle*/ handle){
+			// summary:
+			//		Unregisters listeners on the specified window (either the main
+			//		window or an iframe's window) according to handle returned from registerWin().
+			//		After calling be sure to delete or null out the handle itself.
+
+			handle && handle.remove();
+		}
+	};
+
+	// Override focus singleton's focus function so that dijit.focus()
+	// has backwards compatible behavior of restoring selection (although
+	// probably no one is using that).
+	focus.focus = function(/*Object|DomNode */ handle){
+		// summary:
+		//		Sets the focused node and the selection according to argument.
+		//		To set focus to an iframe's content, pass in the iframe itself.
+		// handle:
+		//		object returned by get(), or a DomNode
+
+		if(!handle){ return; }
+
+		var node = "node" in handle ? handle.node : handle,		// because handle is either DomNode or a composite object
+			bookmark = handle.bookmark,
+			openedForWindow = handle.openedForWindow,
+			collapsed = bookmark ? bookmark.isCollapsed : false;
+
+		// Set the focus
+		// Note that for iframe's we need to use the <iframe> to follow the parentNode chain,
+		// but we need to set focus to iframe.contentWindow
+		if(node){
+			var focusNode = (node.tagName.toLowerCase() == "iframe") ? node.contentWindow : node;
+			if(focusNode && focusNode.focus){
+				try{
+					// Gecko throws sometimes if setting focus is impossible,
+					// node not displayed or something like that
+					focusNode.focus();
+				}catch(e){/*quiet*/}
+			}
+			focus._onFocusNode(node);
+		}
+
+		// set the selection
+		// do not need to restore if current selection is not empty
+		// (use keyboard to select a menu item) or if previous selection was collapsed
+		// as it may cause focus shift (Esp in IE).
+		if(bookmark && win.withGlobal(openedForWindow || win.global, dijit.isCollapsed) && !collapsed){
+			if(openedForWindow){
+				openedForWindow.focus();
+			}
+			try{
+				win.withGlobal(openedForWindow || win.global, dijit.moveToBookmark, null, [bookmark]);
+			}catch(e2){
+				/*squelch IE internal error, see http://trac.dojotoolkit.org/ticket/1984 */
+			}
+		}
+	};
+
+	// For back compatibility, monitor changes to focused node and active widget stack,
+	// publishing events and copying changes from focus manager variables into dijit (top level) variables
+	focus.watch("curNode", function(name, oldVal, newVal){
+		dijit._curFocus = newVal;
+		dijit._prevFocus = oldVal;
+		if(newVal){
+			topic.publish("focusNode", newVal);	// publish
+		}
+	});
+	focus.watch("activeStack", function(name, oldVal, newVal){
+		dijit._activeStack = newVal;
+	});
+
+	focus.on("widget-blur", function(widget, by){
+		topic.publish("widgetBlur", widget, by);	// publish
+	});
+	focus.on("widget-focus", function(widget, by){
+		topic.publish("widgetFocus", widget, by);	// publish
+	});
+
+	lang.mixin(dijit, exports);
+
+	/*===== return exports; =====*/
+	return dijit;	// for back compat :-(
+});
diff --git a/src/main/resources/static/dijit/_base/manager.js b/src/main/resources/static/dijit/_base/manager.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f4f7edd9f2456f5b7e4fb8da331dff90a35c190
--- /dev/null
+++ b/src/main/resources/static/dijit/_base/manager.js
@@ -0,0 +1,35 @@
+define([
+	"dojo/_base/array",
+	"dojo/_base/config", // defaultDuration
+	"dojo/_base/lang",
+	"../registry",
+	"../main"	// for setting exports to dijit namespace
+], function(array, config, lang, registry, dijit){
+
+	// module:
+	//		dijit/_base/manager
+
+	var exports = {
+		// summary:
+		//		Deprecated.  Shim to methods on registry, plus a few other declarations.
+		//		New code should access dijit/registry directly when possible.
+	};
+
+	array.forEach(["byId", "getUniqueId", "findWidgets", "_destroyAll", "byNode", "getEnclosingWidget"], function(name){
+		exports[name] = registry[name];
+	});
+
+	 lang.mixin(exports, {
+		 // defaultDuration: Integer
+		 //		The default fx.animation speed (in ms) to use for all Dijit
+		 //		transitional fx.animations, unless otherwise specified
+		 //		on a per-instance basis. Defaults to 200, overrided by
+		 //		`djConfig.defaultDuration`
+		 defaultDuration: config["defaultDuration"] || 200
+	 });
+
+	lang.mixin(dijit, exports);
+
+	/*===== return exports; =====*/
+	return dijit;	// for back compat :-(
+});
diff --git a/src/main/resources/static/dijit/_base/place.js b/src/main/resources/static/dijit/_base/place.js
new file mode 100644
index 0000000000000000000000000000000000000000..dbfd2a63a6af5f86f793493fbfa0e123839cc4f1
--- /dev/null
+++ b/src/main/resources/static/dijit/_base/place.js
@@ -0,0 +1,131 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/lang", // lang.isArray, lang.mixin
+	"dojo/window", // windowUtils.getBox
+	"../place",
+	"../main"	// export to dijit namespace
+], function(array, lang, windowUtils, place, dijit){
+
+	// module:
+	//		dijit/_base/place
+
+
+	var exports = {
+		// summary:
+		//		Deprecated back compatibility module, new code should use dijit/place directly instead of using this module.
+	};
+
+	exports.getViewport = function(){
+		// summary:
+		//		Deprecated method to return the dimensions and scroll position of the viewable area of a browser window.
+		//		New code should use windowUtils.getBox()
+
+		return windowUtils.getBox();
+	};
+
+	exports.placeOnScreen = place.at;
+
+	exports.placeOnScreenAroundElement = function(node, aroundNode, aroundCorners, layoutNode){
+		// summary:
+		//		Like dijit.placeOnScreenAroundNode(), except it accepts an arbitrary object
+		//		for the "around" argument and finds a proper processor to place a node.
+		//		Deprecated, new code should use dijit/place.around() instead.
+
+		// Convert old style {"BL": "TL", "BR": "TR"} type argument
+		// to style needed by dijit.place code:
+		//		[
+		//			{aroundCorner: "BL", corner: "TL" },
+		//			{aroundCorner: "BR", corner: "TR" }
+		//		]
+		var positions;
+		if(lang.isArray(aroundCorners)){
+			positions = aroundCorners;
+		}else{
+			positions = [];
+			for(var key in aroundCorners){
+				positions.push({aroundCorner: key, corner: aroundCorners[key]});
+			}
+		}
+
+		return place.around(node, aroundNode, positions, true, layoutNode);
+	};
+
+	exports.placeOnScreenAroundNode = exports.placeOnScreenAroundElement;
+	/*=====
+	exports.placeOnScreenAroundNode = function(node, aroundNode, aroundCorners, layoutNode){
+		// summary:
+		//		Position node adjacent or kitty-corner to aroundNode
+		//		such that it's fully visible in viewport.
+		//		Deprecated, new code should use dijit/place.around() instead.
+	};
+	=====*/
+
+	exports.placeOnScreenAroundRectangle = exports.placeOnScreenAroundElement;
+	/*=====
+	exports.placeOnScreenAroundRectangle = function(node, aroundRect, aroundCorners, layoutNode){
+		// summary:
+		//		Like dijit.placeOnScreenAroundNode(), except that the "around"
+		//		parameter is an arbitrary rectangle on the screen (x, y, width, height)
+		//		instead of a dom node.
+		//		Deprecated, new code should use dijit/place.around() instead.
+	};
+	=====*/
+
+	exports.getPopupAroundAlignment = function(/*Array*/ position, /*Boolean*/ leftToRight){
+		// summary:
+		//		Deprecated method, unneeded when using dijit/place directly.
+		//		Transforms the passed array of preferred positions into a format suitable for
+		//		passing as the aroundCorners argument to dijit/place.placeOnScreenAroundElement.
+		// position: String[]
+		//		This variable controls the position of the drop down.
+		//		It's an array of strings with the following values:
+		//
+		//		- before: places drop down to the left of the target node/widget, or to the right in
+		//		  the case of RTL scripts like Hebrew and Arabic
+		//		- after: places drop down to the right of the target node/widget, or to the left in
+		//		  the case of RTL scripts like Hebrew and Arabic
+		//		- above: drop down goes above target node
+		//		- below: drop down goes below target node
+		//
+		//		The list is positions is tried, in order, until a position is found where the drop down fits
+		//		within the viewport.
+		// leftToRight: Boolean
+		//		Whether the popup will be displaying in leftToRight mode.
+
+		var align = {};
+		array.forEach(position, function(pos){
+			var ltr = leftToRight;
+			switch(pos){
+				case "after":
+					align[leftToRight ? "BR" : "BL"] = leftToRight ? "BL" : "BR";
+					break;
+				case "before":
+					align[leftToRight ? "BL" : "BR"] = leftToRight ? "BR" : "BL";
+					break;
+				case "below-alt":
+					ltr = !ltr;
+					// fall through
+				case "below":
+					// first try to align left borders, next try to align right borders (or reverse for RTL mode)
+					align[ltr ? "BL" : "BR"] = ltr ? "TL" : "TR";
+					align[ltr ? "BR" : "BL"] = ltr ? "TR" : "TL";
+					break;
+				case "above-alt":
+					ltr = !ltr;
+					// fall through
+				case "above":
+				default:
+					// first try to align left borders, next try to align right borders (or reverse for RTL mode)
+					align[ltr ? "TL" : "TR"] = ltr ? "BL" : "BR";
+					align[ltr ? "TR" : "TL"] = ltr ? "BR" : "BL";
+					break;
+			}
+		});
+		return align;
+	};
+
+	lang.mixin(dijit, exports);
+
+	/*===== return exports; =====*/
+	return dijit;	// for back compat :-(
+});
diff --git a/src/main/resources/static/dijit/_base/popup.js b/src/main/resources/static/dijit/_base/popup.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b0aa204ec6fa1b9654a542bf2d21da7ad19da28
--- /dev/null
+++ b/src/main/resources/static/dijit/_base/popup.js
@@ -0,0 +1,58 @@
+define([
+	"dojo/dom-class", // domClass.contains
+	"dojo/_base/window",
+	"../popup",
+	"../BackgroundIframe"	// just loading for back-compat, in case client code is referencing it
+], function(domClass, win, popup){
+
+// module:
+//		dijit/_base/popup
+
+/*=====
+return {
+	// summary:
+	//		Deprecated.   Old module for popups, new code should use dijit/popup directly.
+};
+=====*/
+
+
+// Hack support for old API passing in node instead of a widget (to various methods)
+var origCreateWrapper = popup._createWrapper;
+popup._createWrapper = function(widget){
+	if(!widget.declaredClass){
+		// make fake widget to pass to new API
+		widget = {
+			_popupWrapper: (widget.parentNode && domClass.contains(widget.parentNode, "dijitPopup")) ?
+				widget.parentNode : null,
+			domNode: widget,
+			destroy: function(){},
+			ownerDocument: widget.ownerDocument,
+			ownerDocumentBody: win.body(widget.ownerDocument)
+		};
+	}
+	return origCreateWrapper.call(this, widget);
+};
+
+// Support old format of orient parameter
+var origOpen = popup.open;
+popup.open = function(/*__OpenArgs*/ args){
+	// Convert old hash structure (ex: {"BL": "TL", ...}) of orient to format compatible w/new popup.open() API.
+	// Don't do conversion for:
+	//		- null parameter (that means to use the default positioning)
+	//		- "R" or "L" strings used to indicate positioning for context menus (when there is no around node)
+	//		- new format, ex: ["below", "above"]
+	//		- return value from deprecated dijit.getPopupAroundAlignment() method,
+	//			ex: ["below", "above"]
+	if(args.orient && typeof args.orient != "string" && !("length" in args.orient)){
+		var ary = [];
+		for(var key in args.orient){
+			ary.push({aroundCorner: key, corner: args.orient[key]});
+		}
+		args.orient = ary;
+	}
+
+	return origOpen.call(this, args);
+};
+
+return popup;
+});
diff --git a/src/main/resources/static/dijit/_base/scroll.js b/src/main/resources/static/dijit/_base/scroll.js
new file mode 100644
index 0000000000000000000000000000000000000000..4d9468cf573e712eaf39b8428166255a1360109b
--- /dev/null
+++ b/src/main/resources/static/dijit/_base/scroll.js
@@ -0,0 +1,22 @@
+define([
+	"dojo/window", // windowUtils.scrollIntoView
+	"../main"	// export symbol to dijit
+], function(windowUtils, dijit){
+	// module:
+	//		dijit/_base/scroll
+
+	/*=====
+	return {
+		// summary:
+		//		Back compatibility module, new code should use windowUtils directly instead of using this module.
+	};
+	=====*/
+
+	dijit.scrollIntoView = function(/*DomNode*/ node, /*Object?*/ pos){
+		// summary:
+		//		Scroll the passed node into view, if it is not already.
+		//		Deprecated, use `windowUtils.scrollIntoView` instead.
+
+		windowUtils.scrollIntoView(node, pos);
+	};
+});
diff --git a/src/main/resources/static/dijit/_base/sniff.js b/src/main/resources/static/dijit/_base/sniff.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f4e547c84d76f0116339496eca3cf635e55c8c5
--- /dev/null
+++ b/src/main/resources/static/dijit/_base/sniff.js
@@ -0,0 +1,12 @@
+define([ "dojo/uacss" ], function(){
+
+	// module:
+	//		dijit/_base/sniff
+
+	/*=====
+	return {
+		// summary:
+		//		Deprecated, back compatibility module, new code should require dojo/uacss directly instead of this module.
+	};
+	=====*/
+});
diff --git a/src/main/resources/static/dijit/_base/typematic.js b/src/main/resources/static/dijit/_base/typematic.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ac8602c3e69651fc7bf44dd6861dbfa8c27c05f
--- /dev/null
+++ b/src/main/resources/static/dijit/_base/typematic.js
@@ -0,0 +1,10 @@
+define(["../typematic"], function(){
+
+	/*=====
+	return {
+		// summary:
+		//		Deprecated, for back-compat, just loads top level module
+	};
+	=====*/
+
+});
diff --git a/src/main/resources/static/dijit/_base/wai.js b/src/main/resources/static/dijit/_base/wai.js
new file mode 100644
index 0000000000000000000000000000000000000000..f139913a9e90229e8207c2fe85ed01851ddd1f6c
--- /dev/null
+++ b/src/main/resources/static/dijit/_base/wai.js
@@ -0,0 +1,109 @@
+define([
+	"dojo/dom-attr", // domAttr.attr
+	"dojo/_base/lang", // lang.mixin
+	"../main",	// export symbols to dijit
+	"../hccss"			// not using this module directly, but loading it sets CSS flag on <html>
+], function(domAttr, lang, dijit){
+
+	// module:
+	//		dijit/_base/wai
+
+	var exports = {
+		// summary:
+		//		Deprecated methods for setting/getting wai roles and states.
+		//		New code should call setAttribute()/getAttribute() directly.
+		//
+		//		Also loads hccss to apply dj_a11y class to root node if machine is in high-contrast mode.
+
+		hasWaiRole: function(/*Element*/ elem, /*String?*/ role){
+			// summary:
+			//		Determines if an element has a particular role.
+			// returns:
+			//		True if elem has the specific role attribute and false if not.
+			//		For backwards compatibility if role parameter not provided,
+			//		returns true if has a role
+			var waiRole = this.getWaiRole(elem);
+			return role ? (waiRole.indexOf(role) > -1) : (waiRole.length > 0);
+		},
+
+		getWaiRole: function(/*Element*/ elem){
+			// summary:
+			//		Gets the role for an element (which should be a wai role).
+			// returns:
+			//		The role of elem or an empty string if elem
+			//		does not have a role.
+			 return lang.trim((domAttr.get(elem, "role") || "").replace("wairole:",""));
+		},
+
+		setWaiRole: function(/*Element*/ elem, /*String*/ role){
+			// summary:
+			//		Sets the role on an element.
+			// description:
+			//		Replace existing role attribute with new role.
+
+			domAttr.set(elem, "role", role);
+		},
+
+		removeWaiRole: function(/*Element*/ elem, /*String*/ role){
+			// summary:
+			//		Removes the specified role from an element.
+			//		Removes role attribute if no specific role provided (for backwards compat.)
+
+			var roleValue = domAttr.get(elem, "role");
+			if(!roleValue){ return; }
+			if(role){
+				var t = lang.trim((" " + roleValue + " ").replace(" " + role + " ", " "));
+				domAttr.set(elem, "role", t);
+			}else{
+				elem.removeAttribute("role");
+			}
+		},
+
+		hasWaiState: function(/*Element*/ elem, /*String*/ state){
+			// summary:
+			//		Determines if an element has a given state.
+			// description:
+			//		Checks for an attribute called "aria-"+state.
+			// returns:
+			//		true if elem has a value for the given state and
+			//		false if it does not.
+
+			return elem.hasAttribute ? elem.hasAttribute("aria-"+state) : !!elem.getAttribute("aria-"+state);
+		},
+
+		getWaiState: function(/*Element*/ elem, /*String*/ state){
+			// summary:
+			//		Gets the value of a state on an element.
+			// description:
+			//		Checks for an attribute called "aria-"+state.
+			// returns:
+			//		The value of the requested state on elem
+			//		or an empty string if elem has no value for state.
+
+			return elem.getAttribute("aria-"+state) || "";
+		},
+
+		setWaiState: function(/*Element*/ elem, /*String*/ state, /*String*/ value){
+			// summary:
+			//		Sets a state on an element.
+			// description:
+			//		Sets an attribute called "aria-"+state.
+
+			elem.setAttribute("aria-"+state, value);
+		},
+
+		removeWaiState: function(/*Element*/ elem, /*String*/ state){
+			// summary:
+			//		Removes a state from an element.
+			// description:
+			//		Sets an attribute called "aria-"+state.
+
+			elem.removeAttribute("aria-"+state);
+		}
+	};
+
+	lang.mixin(dijit, exports);
+
+	/*===== return exports; =====*/
+	return dijit;	// for back compat :-(
+});
diff --git a/src/main/resources/static/dijit/_base/window.js b/src/main/resources/static/dijit/_base/window.js
new file mode 100644
index 0000000000000000000000000000000000000000..ba3f80203d1384585a9bb1fa9e299db59c0cd6d4
--- /dev/null
+++ b/src/main/resources/static/dijit/_base/window.js
@@ -0,0 +1,18 @@
+define([
+	"dojo/window", // windowUtils.get
+	"../main"	// export symbol to dijit
+], function(windowUtils, dijit){
+	// module:
+	//		dijit/_base/window
+
+	/*=====
+	return {
+		// summary:
+		//		Back compatibility module, new code should use windowUtils directly instead of using this module.
+	};
+	=====*/
+
+	dijit.getDocumentWindow = function(doc){
+		return windowUtils.get(doc);
+	};
+});
diff --git a/src/main/resources/static/dijit/_editor/RichText.js b/src/main/resources/static/dijit/_editor/RichText.js
new file mode 100644
index 0000000000000000000000000000000000000000..3658de7ed545cec8cf6b7d7fc2d6c3bdbe31b37d
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/RichText.js
@@ -0,0 +1,2997 @@
+define([
+	"dojo/_base/array", // array.forEach array.indexOf array.some
+	"dojo/_base/config", // config
+	"dojo/_base/declare", // declare
+	"dojo/_base/Deferred", // Deferred
+	"dojo/dom", // dom.byId
+	"dojo/dom-attr", // domAttr.set or get
+	"dojo/dom-class", // domClass.add domClass.remove
+	"dojo/dom-construct", // domConstruct.create domConstruct.destroy domConstruct.place
+	"dojo/dom-geometry", // domGeometry.position
+	"dojo/dom-style", // domStyle.getComputedStyle domStyle.set
+	"dojo/_base/kernel", // kernel.deprecated, kernel.locale
+	"dojo/keys", // keys.BACKSPACE keys.TAB
+	"dojo/_base/lang", // lang.clone lang.hitch lang.isArray lang.isFunction lang.isString lang.trim
+	"dojo/on", // on()
+	"dojo/query", // query
+	"dojo/domReady",
+	"dojo/sniff", // has("ie") has("mozilla") has("opera") has("safari") has("webkit")
+	"dojo/string",
+	"dojo/topic", // topic.publish() (publish)
+	"dojo/_base/unload", // unload
+	"dojo/_base/url", // url
+	"dojo/window", // winUtils.get()
+	"../_Widget",
+	"../_CssStateMixin",
+	"../selection",
+	"./range",
+	"./html",
+	"../focus",
+	"../main"    // dijit._scopeName
+], function(array, config, declare, Deferred, dom, domAttr, domClass, domConstruct, domGeometry, domStyle,
+			kernel, keys, lang, on, query, domReady, has, string, topic, unload, _Url, winUtils,
+			_Widget, _CssStateMixin, selectionapi, rangeapi, htmlapi, focus, dijit){
+
+	// module:
+	//		dijit/_editor/RichText
+
+	// If you want to allow for rich text saving with back/forward actions, you must add a text area to your page with
+	// the id==dijit._scopeName + "._editor.RichText.value" (typically "dijit/_editor/RichText.value). For example,
+	// something like this will work:
+	//
+	//	<textarea id="dijit._editor.RichText.value" style="display:none;position:absolute;top:-100px;left:-100px;height:3px;width:3px;overflow:hidden;"></textarea>
+
+	var RichText = declare("dijit._editor.RichText", [_Widget, _CssStateMixin], {
+		// summary:
+		//		dijit/_editor/RichText is the core of dijit.Editor, which provides basic
+		//		WYSIWYG editing features.
+		//
+		// description:
+		//		dijit/_editor/RichText is the core of dijit.Editor, which provides basic
+		//		WYSIWYG editing features. It also encapsulates the differences
+		//		of different js engines for various browsers.  Do not use this widget
+		//		with an HTML &lt;TEXTAREA&gt; tag, since the browser unescapes XML escape characters,
+		//		like &lt;.  This can have unexpected behavior and lead to security issues
+		//		such as scripting attacks.
+		//
+		// tags:
+		//		private
+
+		constructor: function(params /*===== , srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Initial settings for any of the widget attributes, except readonly attributes.
+			// srcNodeRef: DOMNode
+			//		The widget replaces the specified DOMNode.
+
+			// contentPreFilters: Function(String)[]
+			//		Pre content filter function register array.
+			//		these filters will be executed before the actual
+			//		editing area gets the html content.
+			this.contentPreFilters = [];
+
+			// contentPostFilters: Function(String)[]
+			//		post content filter function register array.
+			//		These will be used on the resulting html
+			//		from contentDomPostFilters. The resulting
+			//		content is the final html (returned by getValue()).
+			this.contentPostFilters = [];
+
+			// contentDomPreFilters: Function(DomNode)[]
+			//		Pre content dom filter function register array.
+			//		These filters are applied after the result from
+			//		contentPreFilters are set to the editing area.
+			this.contentDomPreFilters = [];
+
+			// contentDomPostFilters: Function(DomNode)[]
+			//		Post content dom filter function register array.
+			//		These filters are executed on the editing area dom.
+			//		The result from these will be passed to contentPostFilters.
+			this.contentDomPostFilters = [];
+
+			// editingAreaStyleSheets: dojo._URL[]
+			//		array to store all the stylesheets applied to the editing area
+			this.editingAreaStyleSheets = [];
+
+			// Make a copy of this.events before we start writing into it, otherwise we
+			// will modify the prototype which leads to bad things on pages w/multiple editors
+			this.events = [].concat(this.events);
+
+			this._keyHandlers = {};
+
+			if(params && lang.isString(params.value)){
+				this.value = params.value;
+			}
+
+			this.onLoadDeferred = new Deferred();
+		},
+
+		baseClass: "dijitEditor",
+
+		// inheritWidth: Boolean
+		//		whether to inherit the parent's width or simply use 100%
+		inheritWidth: false,
+
+		// focusOnLoad: [deprecated] Boolean
+		//		Focus into this widget when the page is loaded
+		focusOnLoad: false,
+
+		// name: String?
+		//		Specifies the name of a (hidden) `<textarea>` node on the page that's used to save
+		//		the editor content on page leave.   Used to restore editor contents after navigating
+		//		to a new page and then hitting the back button.
+		name: "",
+
+		// styleSheets: [const] String
+		//		semicolon (";") separated list of css files for the editing area
+		styleSheets: "",
+
+		// height: String
+		//		Set height to fix the editor at a specific height, with scrolling.
+		//		By default, this is 300px.  If you want to have the editor always
+		//		resizes to accommodate the content, use AlwaysShowToolbar plugin
+		//		and set height="".  If this editor is used within a layout widget,
+		//		set height="100%".
+		height: "300px",
+
+		// minHeight: String
+		//		The minimum height that the editor should have.
+		minHeight: "1em",
+
+		// isClosed: [private] Boolean
+		isClosed: true,
+
+		// isLoaded: [private] Boolean
+		isLoaded: false,
+
+		// _SEPARATOR: [private] String
+		//		Used to concat contents from multiple editors into a single string,
+		//		so they can be saved into a single `<textarea>` node.  See "name" attribute.
+		_SEPARATOR: "@@**%%__RICHTEXTBOUNDRY__%%**@@",
+
+		// _NAME_CONTENT_SEP: [private] String
+		//		USed to separate name from content.  Just a colon isn't safe.
+		_NAME_CONTENT_SEP: "@@**%%:%%**@@",
+
+		// onLoadDeferred: [readonly] dojo/promise/Promise
+		//		Deferred which is fired when the editor finishes loading.
+		//		Call myEditor.onLoadDeferred.then(callback) it to be informed
+		//		when the rich-text area initialization is finalized.
+		onLoadDeferred: null,
+
+		// isTabIndent: Boolean
+		//		Make tab key and shift-tab indent and outdent rather than navigating.
+		//		Caution: sing this makes web pages inaccessible to users unable to use a mouse.
+		isTabIndent: false,
+
+		// disableSpellCheck: [const] Boolean
+		//		When true, disables the browser's native spell checking, if supported.
+		//		Works only in Firefox.
+		disableSpellCheck: false,
+
+		postCreate: function(){
+			if("textarea" === this.domNode.tagName.toLowerCase()){
+				console.warn("RichText should not be used with the TEXTAREA tag.  See dijit._editor.RichText docs.");
+			}
+
+			// Push in the builtin filters now, making them the first executed, but not over-riding anything
+			// users passed in.  See: #6062
+			this.contentPreFilters = [
+				lang.trim,	// avoid IE10 problem hitting ENTER on last line when there's a trailing \n.
+				lang.hitch(this, "_preFixUrlAttributes")
+			].concat(this.contentPreFilters);
+			if(has("mozilla")){
+				this.contentPreFilters = [this._normalizeFontStyle].concat(this.contentPreFilters);
+				this.contentPostFilters = [this._removeMozBogus].concat(this.contentPostFilters);
+			}
+			if(has("webkit")){
+				// Try to clean up WebKit bogus artifacts.  The inserted classes
+				// made by WebKit sometimes messes things up.
+				this.contentPreFilters = [this._removeWebkitBogus].concat(this.contentPreFilters);
+				this.contentPostFilters = [this._removeWebkitBogus].concat(this.contentPostFilters);
+			}
+			if(has("ie") || has("trident")){
+				// IE generates <strong> and <em> but we want to normalize to <b> and <i>
+				// Still happens in IE11, but doesn't happen with Edge.
+				this.contentPostFilters = [this._normalizeFontStyle].concat(this.contentPostFilters);
+				this.contentDomPostFilters = [lang.hitch(this, "_stripBreakerNodes")].concat(this.contentDomPostFilters);
+			}
+			this.contentDomPostFilters = [lang.hitch(this, "_stripTrailingEmptyNodes")].concat(this.contentDomPostFilters);
+			this.inherited(arguments);
+
+			topic.publish(dijit._scopeName + "._editor.RichText::init", this);
+		},
+
+		startup: function(){
+			this.inherited(arguments);
+
+			// Don't call open() until startup() because we need to be attached to the DOM, and also if we are the
+			// child of a StackContainer, let StackContainer._setupChild() do DOM manipulations before iframe is
+			// created, to avoid duplicate onload call.
+			this.open();
+			this.setupDefaultShortcuts();
+		},
+
+		setupDefaultShortcuts: function(){
+			// summary:
+			//		Add some default key handlers
+			// description:
+			//		Overwrite this to setup your own handlers. The default
+			//		implementation does not use Editor commands, but directly
+			//		executes the builtin commands within the underlying browser
+			//		support.
+			// tags:
+			//		protected
+			var exec = lang.hitch(this, function(cmd, arg){
+				return function(){
+					return !this.execCommand(cmd, arg);
+				};
+			});
+
+			var ctrlKeyHandlers = {
+				b: exec("bold"),
+				i: exec("italic"),
+				u: exec("underline"),
+				a: exec("selectall"),
+				s: function(){
+					this.save(true);
+				},
+				m: function(){
+					this.isTabIndent = !this.isTabIndent;
+				},
+
+				"1": exec("formatblock", "h1"),
+				"2": exec("formatblock", "h2"),
+				"3": exec("formatblock", "h3"),
+				"4": exec("formatblock", "h4"),
+
+				"\\": exec("insertunorderedlist")
+			};
+
+			if(!has("ie")){
+				ctrlKeyHandlers.Z = exec("redo"); //FIXME: undo?
+			}
+
+			var key;
+			for(key in ctrlKeyHandlers){
+				this.addKeyHandler(key, true, false, ctrlKeyHandlers[key]);
+			}
+		},
+
+		// events: [private] String[]
+		//		 events which should be connected to the underlying editing area
+		events: ["onKeyDown", "onKeyUp"], // onClick handled specially
+
+		// captureEvents: [deprecated] String[]
+		//		 Events which should be connected to the underlying editing
+		//		 area, events in this array will be addListener with
+		//		 capture=true.
+		// TODO: looking at the code I don't see any distinction between events and captureEvents,
+		// so get rid of this for 2.0 if not sooner
+		captureEvents: [],
+
+		_editorCommandsLocalized: false,
+		_localizeEditorCommands: function(){
+			// summary:
+			//		When IE is running in a non-English locale, the API actually changes,
+			//		so that we have to say (for example) danraku instead of p (for paragraph).
+			//		Handle that here.
+			// tags:
+			//		private
+			if(RichText._editorCommandsLocalized){
+				// Use the already generate cache of mappings.
+				this._local2NativeFormatNames = RichText._local2NativeFormatNames;
+				this._native2LocalFormatNames = RichText._native2LocalFormatNames;
+				return;
+			}
+			RichText._editorCommandsLocalized = true;
+			RichText._local2NativeFormatNames = {};
+			RichText._native2LocalFormatNames = {};
+			this._local2NativeFormatNames = RichText._local2NativeFormatNames;
+			this._native2LocalFormatNames = RichText._native2LocalFormatNames;
+			//in IE, names for blockformat is locale dependent, so we cache the values here
+
+			//put p after div, so if IE returns Normal, we show it as paragraph
+			//We can distinguish p and div if IE returns Normal, however, in order to detect that,
+			//we have to call this.document.selection.createRange().parentElement() or such, which
+			//could slow things down. Leave it as it is for now
+			var formats = ['div', 'p', 'pre', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'ul', 'address'];
+			var localhtml = "", format, i = 0;
+			while((format = formats[i++])){
+				//append a <br> after each element to separate the elements more reliably
+				if(format.charAt(1) !== 'l'){
+					localhtml += "<" + format + "><span>content</span></" + format + "><br/>";
+				}else{
+					localhtml += "<" + format + "><li>content</li></" + format + "><br/>";
+				}
+			}
+			// queryCommandValue returns empty if we hide editNode, so move it out of screen temporary
+			// Also, IE9 does weird stuff unless we do it inside the editor iframe.
+			var style = { position: "absolute", top: "0px", zIndex: 10, opacity: 0.01 };
+			var div = domConstruct.create('div', {style: style, innerHTML: localhtml});
+			this.ownerDocumentBody.appendChild(div);
+
+			// IE9 has a timing issue with doing this right after setting
+			// the inner HTML, so put a delay in.
+			var inject = lang.hitch(this, function(){
+				var node = div.firstChild;
+				while(node){
+					try{
+						this.selection.selectElement(node.firstChild);
+						var nativename = node.tagName.toLowerCase();
+						this._local2NativeFormatNames[nativename] = document.queryCommandValue("formatblock");
+						this._native2LocalFormatNames[this._local2NativeFormatNames[nativename]] = nativename;
+						node = node.nextSibling.nextSibling;
+						//console.log("Mapped: ", nativename, " to: ", this._local2NativeFormatNames[nativename]);
+					}catch(e){ /*Sqelch the occasional IE9 error */
+					}
+				}
+				domConstruct.destroy(div);
+			});
+			this.defer(inject);
+		},
+
+		open: function(/*DomNode?*/ element){
+			// summary:
+			//		Transforms the node referenced in this.domNode into a rich text editing
+			//		node.
+			// description:
+			//		Sets up the editing area asynchronously. This will result in
+			//		the creation and replacement with an iframe.
+			// tags:
+			//		private
+
+			if(!this.onLoadDeferred || this.onLoadDeferred.fired >= 0){
+				this.onLoadDeferred = new Deferred();
+			}
+
+			if(!this.isClosed){
+				this.close();
+			}
+			topic.publish(dijit._scopeName + "._editor.RichText::open", this);
+
+			if(arguments.length === 1 && element.nodeName){ // else unchanged
+				this.domNode = element;
+			}
+
+			var dn = this.domNode;
+
+			// Compute initial value of the editor
+			var html;
+			if(lang.isString(this.value)){
+				// Allow setting the editor content programmatically instead of
+				// relying on the initial content being contained within the target
+				// domNode.
+				html = this.value;
+				dn.innerHTML = "";
+			}else if(dn.nodeName && dn.nodeName.toLowerCase() == "textarea"){
+				// if we were created from a textarea, then we need to create a
+				// new editing harness node.
+				var ta = (this.textarea = dn);
+				this.name = ta.name;
+				html = ta.value;
+				dn = this.domNode = this.ownerDocument.createElement("div");
+				dn.setAttribute('widgetId', this.id);
+				ta.removeAttribute('widgetId');
+				dn.cssText = ta.cssText;
+				dn.className += " " + ta.className;
+				domConstruct.place(dn, ta, "before");
+				var tmpFunc = lang.hitch(this, function(){
+					//some browsers refuse to submit display=none textarea, so
+					//move the textarea off screen instead
+					domStyle.set(ta, {
+						display: "block",
+						position: "absolute",
+						top: "-1000px"
+					});
+
+					if(has("ie")){ //nasty IE bug: abnormal formatting if overflow is not hidden
+						var s = ta.style;
+						this.__overflow = s.overflow;
+						s.overflow = "hidden";
+					}
+				});
+				if(has("ie")){
+					this.defer(tmpFunc, 10);
+				}else{
+					tmpFunc();
+				}
+
+				if(ta.form){
+					var resetValue = ta.value;
+					this.reset = function(){
+						var current = this.getValue();
+						if(current !== resetValue){
+							this.replaceValue(resetValue);
+						}
+					};
+					on(ta.form, "submit", lang.hitch(this, function(){
+						// Copy value to the <textarea> so it gets submitted along with form.
+						// FIXME: should we be calling close() here instead?
+						domAttr.set(ta, 'disabled', this.disabled); // don't submit the value if disabled
+						ta.value = this.getValue();
+					}));
+				}
+			}else{
+				html = htmlapi.getChildrenHtml(dn);
+				dn.innerHTML = "";
+			}
+			this.value = html;
+
+			// If we're a list item we have to put in a blank line to force the
+			// bullet to nicely align at the top of text
+			if(dn.nodeName && dn.nodeName === "LI"){
+				dn.innerHTML = " <br>";
+			}
+
+			// Construct the editor div structure.
+			this.header = dn.ownerDocument.createElement("div");
+			dn.appendChild(this.header);
+			this.editingArea = dn.ownerDocument.createElement("div");
+			dn.appendChild(this.editingArea);
+			this.footer = dn.ownerDocument.createElement("div");
+			dn.appendChild(this.footer);
+
+			if(!this.name){
+				this.name = this.id + "_AUTOGEN";
+			}
+
+			// User has pressed back/forward button so we lost the text in the editor, but it's saved
+			// in a hidden <textarea> (which contains the data for all the editors on this page),
+			// so get editor value from there
+			if(this.name !== "" && (!config["useXDomain"] || config["allowXdRichTextSave"])){
+				var saveTextarea = dom.byId(dijit._scopeName + "._editor.RichText.value");
+				if(saveTextarea && saveTextarea.value !== ""){
+					var datas = saveTextarea.value.split(this._SEPARATOR), i = 0, dat;
+					while((dat = datas[i++])){
+						var data = dat.split(this._NAME_CONTENT_SEP);
+						if(data[0] === this.name){
+							this.value = data[1];
+							datas = datas.splice(i, 1);
+							saveTextarea.value = datas.join(this._SEPARATOR);
+							break;
+						}
+					}
+				}
+
+				if(!RichText._globalSaveHandler){
+					RichText._globalSaveHandler = {};
+					unload.addOnUnload(function(){
+						var id;
+						for(id in RichText._globalSaveHandler){
+							var f = RichText._globalSaveHandler[id];
+							if(lang.isFunction(f)){
+								f();
+							}
+						}
+					});
+				}
+				RichText._globalSaveHandler[this.id] = lang.hitch(this, "_saveContent");
+			}
+
+			this.isClosed = false;
+
+			var ifr = (this.editorObject = this.iframe = this.ownerDocument.createElement('iframe'));
+			ifr.id = this.id + "_iframe";
+			ifr.style.border = "none";
+			ifr.style.width = "100%";
+			if(this._layoutMode){
+				// iframe should be 100% height, thus getting it's height from surrounding
+				// <div> (which has the correct height set by Editor)
+				ifr.style.height = "100%";
+			}else{
+				if(has("ie") >= 7){
+					if(this.height){
+						ifr.style.height = this.height;
+					}
+					if(this.minHeight){
+						ifr.style.minHeight = this.minHeight;
+					}
+				}else{
+					ifr.style.height = this.height ? this.height : this.minHeight;
+				}
+			}
+			ifr.frameBorder = 0;
+			ifr._loadFunc = lang.hitch(this, function(w){
+				// This method is called when the editor is first loaded and also if the Editor's
+				// dom node is repositioned. Unfortunately repositioning the Editor tends to
+				// clear the iframe's contents, so we can't just no-op in that case.
+
+				this.window = w;
+				this.document = w.document;
+
+				// instantiate class to access selected text in editor's iframe
+				this.selection = new selectionapi.SelectionManager(w);
+
+				if(has("ie")){
+					this._localizeEditorCommands();
+				}
+
+				// Do final setup and set contents of editor.
+				// Use get("value") rather than html in case _loadFunc() is being called for a second time
+				// because editor's DOMNode was repositioned.
+				this.onLoad(this.get("value"));
+			});
+
+			// Attach iframe to document, and set the initial (blank) content.
+			var src = this._getIframeDocTxt().replace(/\\/g, "\\\\").replace(/'/g, "\\'"),
+				s;
+
+			// IE10 and earlier will throw an "Access is denied" error when attempting to access the parent frame if
+			// document.domain has been set, unless the child frame also has the same document.domain set. In some
+			// cases, we can only set document.domain while the document is being constructed using open/write/close;
+			// attempting to set it later results in a different "This method can't be used in this context" error.
+			// However, in at least IE9-10, sometimes the parent.window check will succeed and the access failure will
+			// only happen later when trying to access frameElement, so there is an additional check and fix there
+			// as well. See #17529
+			if (has("ie") < 11) {
+				s = 'javascript:document.open();try{parent.window;}catch(e){document.domain="' + document.domain + '";}' +
+					'document.write(\'' + src + '\');document.close()';
+			}
+			else {
+				s = "javascript: '" + src + "'";
+			}
+
+			// Attach to document before setting the content, to avoid problem w/iframe running in
+			// wrong security context (IE9 and IE11), see #16633.
+			this.editingArea.appendChild(ifr);
+			ifr.src = s;
+
+			// TODO: this is a guess at the default line-height, kinda works
+			if(dn.nodeName === "LI"){
+				dn.lastChild.style.marginTop = "-1.2em";
+			}
+
+			domClass.add(this.domNode, this.baseClass);
+		},
+
+		//static cache variables shared among all instance of this class
+		_local2NativeFormatNames: {},
+		_native2LocalFormatNames: {},
+
+		_getIframeDocTxt: function(){
+			// summary:
+			//		Generates the boilerplate text of the document inside the iframe (ie, `<html><head>...</head><body/></html>`).
+			//		Editor content (if not blank) should be added afterwards.
+			// tags:
+			//		private
+			var _cs = domStyle.getComputedStyle(this.domNode);
+
+			// Find any associated label element, aria-label, or aria-labelledby and get unescaped text.
+			var title;
+			if(this["aria-label"]){
+				title = this["aria-label"];
+			}else{
+				var labelNode = query('label[for="' + this.id + '"]', this.ownerDocument)[0] ||
+						dom.byId(this["aria-labelledby"], this.ownerDocument);
+				if(labelNode){
+					title = labelNode.textContent || labelNode.innerHTML || "";
+				}
+			}
+
+			// The contents inside of <body>.  The real contents are set later via a call to setValue().
+			// In auto-expand mode, need a wrapper div for AlwaysShowToolbar plugin to correctly
+			// expand/contract the editor as the content changes.
+			var html = "<div id='dijitEditorBody' role='textbox' aria-multiline='true' " +
+					(title ? " aria-label='" + string.escape(title) + "'" : "") + "></div>";
+
+			var font = [ _cs.fontWeight, _cs.fontSize, _cs.fontFamily ].join(" ");
+
+			// line height is tricky - applying a units value will mess things up.
+			// if we can't get a non-units value, bail out.
+			var lineHeight = _cs.lineHeight;
+			if(lineHeight.indexOf("px") >= 0){
+				lineHeight = parseFloat(lineHeight) / parseFloat(_cs.fontSize);
+				// console.debug(lineHeight);
+			}else if(lineHeight.indexOf("em") >= 0){
+				lineHeight = parseFloat(lineHeight);
+			}else{
+				// If we can't get a non-units value, just default
+				// it to the CSS spec default of 'normal'.  Seems to
+				// work better, esp on IE, than '1.0'
+				lineHeight = "normal";
+			}
+			var userStyle = "";
+			var self = this;
+			this.style.replace(/(^|;)\s*(line-|font-?)[^;]+/ig, function(match){
+				match = match.replace(/^;/ig, "") + ';';
+				var s = match.split(":")[0];
+				if(s){
+					s = lang.trim(s);
+					s = s.toLowerCase();
+					var i;
+					var sC = "";
+					for(i = 0; i < s.length; i++){
+						var c = s.charAt(i);
+						switch(c){
+							case "-":
+								i++;
+								c = s.charAt(i).toUpperCase();
+							default:
+								sC += c;
+						}
+					}
+					domStyle.set(self.domNode, sC, "");
+				}
+				userStyle += match + ';';
+			});
+
+			// Now that we have the title, also set it as the title attribute on the iframe
+			this.iframe.setAttribute("title", title);
+
+			// if this.lang is unset then use default value, to avoid invalid setting of lang=""
+			var language = this.lang || kernel.locale.replace(/-.*/, "");
+
+			return [
+				"<!DOCTYPE html>",
+				"<html lang='" + language + "'" + (this.isLeftToRight() ? "" : " dir='rtl'") + ">\n",
+				"<head>\n",
+				"<meta http-equiv='Content-Type' content='text/html'>\n",
+				title ? "<title>" + string.escape(title) + "</title>" : "",
+				"<style>\n",
+				"\tbody,html {\n",
+				"\t\tbackground:transparent;\n",
+				"\t\tpadding: 1px 0 0 0;\n",
+				"\t\tmargin: -1px 0 0 0;\n", // remove extraneous vertical scrollbar on safari and firefox
+				"\t}\n",
+				"\tbody,html,#dijitEditorBody { outline: none; }",
+
+				// Set <body> to expand to full size of editor, so clicking anywhere will work.
+				// Except in auto-expand mode, in which case the editor expands to the size of <body>.
+				// Also determine how scrollers should be applied.  In autoexpand mode (height = "") no scrollers on y at all.
+				// But in fixed height mode we want both x/y scrollers.
+				// Scrollers go on <body> since it's been set to height: 100%.
+				"html { height: 100%; width: 100%; overflow: hidden; }\n",	// scroll bar is on #dijitEditorBody, shouldn't be on <html>
+				this.height ? "\tbody,#dijitEditorBody { height: 100%; width: 100%; overflow: auto; }\n" :
+					"\tbody,#dijitEditorBody { min-height: " + this.minHeight + "; width: 100%; overflow-x: auto; overflow-y: hidden; }\n",
+
+				// TODO: left positioning will cause contents to disappear out of view
+				//	   if it gets too wide for the visible area
+				"\tbody{\n",
+				"\t\ttop:0px;\n",
+				"\t\tleft:0px;\n",
+				"\t\tright:0px;\n",
+				"\t\tfont:", font, ";\n",
+				((this.height || has("opera")) ? "" : "\t\tposition: fixed;\n"),
+				"\t\tline-height:", lineHeight, ";\n",
+				"\t}\n",
+				"\tp{ margin: 1em 0; }\n",
+
+				"\tli > ul:-moz-first-node, li > ol:-moz-first-node{ padding-top: 1.2em; }\n",
+				// Can't set min-height in IE>=9, it puts layout on li, which puts move/resize handles.
+				// Also can't set it on Edge, as it leads to strange behavior where hitting the return key
+				// doesn't start a new list item.
+				(has("ie") || has("trident") || has("edge") ? "" : "\tli{ min-height:1.2em; }\n"),
+				"</style>\n",
+				this._applyEditingAreaStyleSheets(), "\n",
+				"</head>\n<body role='application'",
+				title ? " aria-label='" + string.escape(title) + "'" : "",
+
+				// Onload handler fills in real editor content.
+				// On IE9, sometimes onload is called twice, and the first time frameElement is null (test_FullScreen.html)
+				// On IE9-10, it is also possible that accessing window.parent in the initial creation of the
+				// iframe DOM will succeed, but trying to access window.frameElement will fail, in which case we
+				// *can* set the domain without a "This method can't be used in this context" error. See #17529
+				"onload='try{frameElement && frameElement._loadFunc(window,document)}catch(e){document.domain=\"" + document.domain + "\";frameElement._loadFunc(window,document)}' ",
+				"style='" + userStyle + "'>", html, "</body>\n</html>"
+			].join(""); // String
+		},
+
+		_applyEditingAreaStyleSheets: function(){
+			// summary:
+			//		apply the specified css files in styleSheets
+			// tags:
+			//		private
+			var files = [];
+			if(this.styleSheets){
+				files = this.styleSheets.split(';');
+				this.styleSheets = '';
+			}
+
+			//empty this.editingAreaStyleSheets here, as it will be filled in addStyleSheet
+			files = files.concat(this.editingAreaStyleSheets);
+			this.editingAreaStyleSheets = [];
+
+			var text = '', i = 0, url, ownerWindow = winUtils.get(this.ownerDocument);
+			while((url = files[i++])){
+				var abstring = (new _Url(ownerWindow.location, url)).toString();
+				this.editingAreaStyleSheets.push(abstring);
+				text += '<link rel="stylesheet" type="text/css" href="' + abstring + '"/>';
+			}
+			return text;
+		},
+
+		addStyleSheet: function(/*dojo/_base/url*/ uri){
+			// summary:
+			//		add an external stylesheet for the editing area
+			// uri:
+			//		Url of the external css file
+			var url = uri.toString(), ownerWindow = winUtils.get(this.ownerDocument);
+
+			//if uri is relative, then convert it to absolute so that it can be resolved correctly in iframe
+			if(url.charAt(0) === '.' || (url.charAt(0) !== '/' && !uri.host)){
+				url = (new _Url(ownerWindow.location, url)).toString();
+			}
+
+			if(array.indexOf(this.editingAreaStyleSheets, url) > -1){
+//			console.debug("dijit/_editor/RichText.addStyleSheet(): Style sheet "+url+" is already applied");
+				return;
+			}
+
+			this.editingAreaStyleSheets.push(url);
+			this.onLoadDeferred.then(lang.hitch(this, function(){
+				if(this.document.createStyleSheet){ //IE
+					this.document.createStyleSheet(url);
+				}else{ //other browser
+					var head = this.document.getElementsByTagName("head")[0];
+					var stylesheet = this.document.createElement("link");
+					stylesheet.rel = "stylesheet";
+					stylesheet.type = "text/css";
+					stylesheet.href = url;
+					head.appendChild(stylesheet);
+				}
+			}));
+		},
+
+		removeStyleSheet: function(/*dojo/_base/url*/ uri){
+			// summary:
+			//		remove an external stylesheet for the editing area
+			var url = uri.toString(), ownerWindow = winUtils.get(this.ownerDocument);
+			//if uri is relative, then convert it to absolute so that it can be resolved correctly in iframe
+			if(url.charAt(0) === '.' || (url.charAt(0) !== '/' && !uri.host)){
+				url = (new _Url(ownerWindow.location, url)).toString();
+			}
+			var index = array.indexOf(this.editingAreaStyleSheets, url);
+			if(index === -1){
+//			console.debug("dijit/_editor/RichText.removeStyleSheet(): Style sheet "+url+" has not been applied");
+				return;
+			}
+			delete this.editingAreaStyleSheets[index];
+			query('link[href="' + url + '"]', this.window.document).orphan();
+		},
+
+		// disabled: Boolean
+		//		The editor is disabled; the text cannot be changed.
+		disabled: false,
+
+		_mozSettingProps: {'styleWithCSS': false},
+		_setDisabledAttr: function(/*Boolean*/ value){
+			value = !!value;
+			this._set("disabled", value);
+			if(!this.isLoaded){
+				return;
+			} // this method requires init to be complete
+			var preventIEfocus = has("ie") && (this.isLoaded || !this.focusOnLoad);
+			if(preventIEfocus){
+				this.editNode.unselectable = "on";
+			}
+			this.editNode.contentEditable = !value;
+			this.editNode.tabIndex = value ? "-1" : this.tabIndex;
+			if(preventIEfocus){
+				this.defer(function(){
+					if(this.editNode){        // guard in case widget destroyed before timeout
+						this.editNode.unselectable = "off";
+					}
+				});
+			}
+			if(has("mozilla") && !value && this._mozSettingProps){
+				var ps = this._mozSettingProps;
+				var n;
+				for(n in ps){
+					if(ps.hasOwnProperty(n)){
+						try{
+							this.document.execCommand(n, false, ps[n]);
+						}catch(e2){
+						}
+					}
+				}
+			}
+			this._disabledOK = true;
+		},
+
+		/* Event handlers
+		 *****************/
+
+		onLoad: function(/*String*/ html){
+			// summary:
+			//		Handler after the iframe finishes loading.
+			// html: String
+			//		Editor contents should be set to this value
+			// tags:
+			//		protected
+
+			if(!this.window.__registeredWindow){
+				this.window.__registeredWindow = true;
+				this._iframeRegHandle = focus.registerIframe(this.iframe);
+			}
+
+			// there's a wrapper div around the content, see _getIframeDocTxt().
+			this.editNode = this.document.body.firstChild;
+			var _this = this;
+
+			// Helper code so IE and FF skip over focusing on the <iframe> and just focus on the inner <div>.
+			// See #4996 IE wants to focus the BODY tag.
+			this.beforeIframeNode = domConstruct.place("<div tabIndex=-1></div>", this.iframe, "before");
+			this.afterIframeNode = domConstruct.place("<div tabIndex=-1></div>", this.iframe, "after");
+			this.iframe.onfocus = this.document.onfocus = function(){
+				_this.editNode.focus();
+			};
+
+			this.focusNode = this.editNode; // for InlineEditBox
+
+
+			var events = this.events.concat(this.captureEvents);
+			var ap = this.iframe ? this.document : this.editNode;
+			this.own.apply(this,
+				array.map(events, function(item){
+					var type = item.toLowerCase().replace(/^on/, "");
+					return on(ap, type, lang.hitch(this, item));
+				}, this)
+			);
+
+			this.own(
+				// mouseup in the margin does not generate an onclick event
+				on(ap, "mouseup", lang.hitch(this, "onClick"))
+			);
+
+			if(has("ie")){ // IE contentEditable
+				this.own(on(this.document, "mousedown", lang.hitch(this, "_onIEMouseDown"))); // #4996 fix focus
+
+				// give the node Layout on IE
+				// TODO: this may no longer be needed, since we've reverted IE to using an iframe,
+				// not contentEditable.   Removing it would also probably remove the need for creating
+				// the extra <div> in _getIframeDocTxt()
+				this.editNode.style.zoom = 1.0;
+			}
+
+			if(has("webkit")){
+				//WebKit sometimes doesn't fire right on selections, so the toolbar
+				//doesn't update right.  Therefore, help it out a bit with an additional
+				//listener.  A mouse up will typically indicate a display change, so fire this
+				//and get the toolbar to adapt.  Reference: #9532
+				this._webkitListener = this.own(on(this.document, "mouseup", lang.hitch(this, "onDisplayChanged")))[0];
+				this.own(on(this.document, "mousedown", lang.hitch(this, function(e){
+					var t = e.target;
+					if(t && (t === this.document.body || t === this.document)){
+						// Since WebKit uses the inner DIV, we need to check and set position.
+						// See: #12024 as to why the change was made.
+						this.defer("placeCursorAtEnd");
+					}
+				})));
+			}
+
+			if(has("ie")){
+				// Try to make sure 'hidden' elements aren't visible in edit mode (like browsers other than IE
+				// do).  See #9103
+				try{
+					this.document.execCommand('RespectVisibilityInDesign', true, null);
+				}catch(e){/* squelch */
+				}
+			}
+
+			this.isLoaded = true;
+
+			this.set('disabled', this.disabled); // initialize content to editable (or not)
+
+			// Note that setValue() call will only work after isLoaded is set to true (above)
+
+			// Set up a function to allow delaying the setValue until a callback is fired
+			// This ensures extensions like dijit.Editor have a way to hold the value set
+			// until plugins load (and do things like register filters).
+			var setContent = lang.hitch(this, function(){
+				this.setValue(html);
+
+				// Tell app that the Editor has finished loading.  isFulfilled() check avoids spurious
+				// console warning when this function is called repeatedly because Editor DOMNode was moved.
+				if(this.onLoadDeferred && !this.onLoadDeferred.isFulfilled()){
+					this.onLoadDeferred.resolve(true);
+				}
+
+				this.onDisplayChanged();
+				if(this.focusOnLoad){
+					// after the document loads, then set focus after updateInterval expires so that
+					// onNormalizedDisplayChanged has run to avoid input caret issues
+					domReady(lang.hitch(this, "defer", "focus", this.updateInterval));
+				}
+				// Save off the initial content now
+				this.value = this.getValue(true);
+			});
+			if(this.setValueDeferred){
+				this.setValueDeferred.then(setContent);
+			}else{
+				setContent();
+			}
+		},
+
+		onKeyDown: function(/* Event */ e){
+			// summary:
+			//		Handler for keydown event
+			// tags:
+			//		protected
+
+			// Modifier keys should not cause the onKeyPressed event because they do not cause any change to the
+			// display
+			if(e.keyCode === keys.SHIFT ||
+			   e.keyCode === keys.ALT ||
+			   e.keyCode === keys.META ||
+			   e.keyCode === keys.CTRL){
+				return true;
+			}
+
+			if(e.keyCode === keys.TAB && this.isTabIndent){
+				//prevent tab from moving focus out of editor
+				e.stopPropagation();
+				e.preventDefault();
+
+				// FIXME: this is a poor-man's indent/outdent. It would be
+				// better if it added 4 "&nbsp;" chars in an undoable way.
+				// Unfortunately pasteHTML does not prove to be undoable
+				if(this.queryCommandEnabled((e.shiftKey ? "outdent" : "indent"))){
+					this.execCommand((e.shiftKey ? "outdent" : "indent"));
+				}
+			}
+
+			// Make tab and shift-tab skip over the <iframe>, going from the nested <div> to the toolbar
+			// or next element after the editor
+			if(e.keyCode == keys.TAB && !this.isTabIndent && !e.ctrlKey && !e.altKey){
+				if(e.shiftKey){
+					// focus the <iframe> so the browser will shift-tab away from it instead
+					this.beforeIframeNode.focus();
+				}else{
+					// focus node after the <iframe> so the browser will tab away from it instead
+					this.afterIframeNode.focus();
+				}
+
+				// Prevent onKeyPressed from firing in order to avoid triggering a display change event when the
+				// editor is tabbed away; this fixes toolbar controls being inappropriately disabled in IE9+
+				return true;
+			}
+
+			if(has("ie") < 9 && e.keyCode === keys.BACKSPACE && this.document.selection.type === "Control"){
+				// IE has a bug where if a non-text object is selected in the editor,
+				// hitting backspace would act as if the browser's back button was
+				// clicked instead of deleting the object. see #1069
+				e.stopPropagation();
+				e.preventDefault();
+				this.execCommand("delete");
+			}
+
+			if(has("ff")){
+				if(e.keyCode === keys.PAGE_UP || e.keyCode === keys.PAGE_DOWN){
+					if(this.editNode.clientHeight >= this.editNode.scrollHeight){
+						// Stop the event to prevent firefox from trapping the cursor when there is no scroll bar.
+						e.preventDefault();
+					}
+				}
+			}
+
+			var handlers = this._keyHandlers[e.keyCode],
+				args = arguments;
+
+			if(handlers && !e.altKey){
+				array.some(handlers, function(h){
+					// treat meta- same as ctrl-, for benefit of mac users
+					if(!(h.shift ^ e.shiftKey) && !(h.ctrl ^ (e.ctrlKey || e.metaKey))){
+						if(!h.handler.apply(this, args)){
+							e.preventDefault();
+						}
+						return true;
+					}
+				}, this);
+			}
+
+			// function call after the character has been inserted
+			this.defer("onKeyPressed", 1);
+
+			return true;
+		},
+
+		onKeyUp: function(/*===== e =====*/){
+			// summary:
+			//		Handler for onkeyup event
+			// tags:
+			//		callback
+		},
+
+		setDisabled: function(/*Boolean*/ disabled){
+			// summary:
+			//		Deprecated, use set('disabled', ...) instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated('dijit.Editor::setDisabled is deprecated', 'use dijit.Editor::attr("disabled",boolean) instead', 2.0);
+			this.set('disabled', disabled);
+		},
+		_setValueAttr: function(/*String*/ value){
+			// summary:
+			//		Registers that attr("value", foo) should call setValue(foo)
+			this.setValue(value);
+		},
+		_setDisableSpellCheckAttr: function(/*Boolean*/ disabled){
+			if(this.document){
+				domAttr.set(this.document.body, "spellcheck", !disabled);
+			}else{
+				// try again after the editor is finished loading
+				this.onLoadDeferred.then(lang.hitch(this, function(){
+					domAttr.set(this.document.body, "spellcheck", !disabled);
+				}));
+			}
+			this._set("disableSpellCheck", disabled);
+		},
+
+		addKeyHandler: function(/*String|Number*/ key, /*Boolean*/ ctrl, /*Boolean*/ shift, /*Function*/ handler){
+			// summary:
+			//		Add a handler for a keyboard shortcut
+			// tags:
+			//		protected
+
+			if(typeof key == "string"){
+				// Something like Ctrl-B.  Since using keydown event, we need to convert string to a number.
+				key = key.toUpperCase().charCodeAt(0);
+			}
+
+			if(!lang.isArray(this._keyHandlers[key])){
+				this._keyHandlers[key] = [];
+			}
+
+			this._keyHandlers[key].push({
+				shift: shift || false,
+				ctrl: ctrl || false,
+				handler: handler
+			});
+		},
+
+		onKeyPressed: function(){
+			// summary:
+			//		Handler for after the user has pressed a key, and the display has been updated.
+			//		(Runs on a timer so that it runs after the display is updated)
+			// tags:
+			//		private
+			this.onDisplayChanged(/*e*/); // can't pass in e
+		},
+
+		onClick: function(/*Event*/ e){
+			// summary:
+			//		Handler for when the user clicks.
+			// tags:
+			//		private
+
+			// console.info('onClick',this._tryDesignModeOn);
+			this.onDisplayChanged(e);
+		},
+
+		_onIEMouseDown: function(){
+			// summary:
+			//		IE only to prevent 2 clicks to focus
+			// tags:
+			//		protected
+
+			if(!this.focused && !this.disabled){
+				this.focus();
+			}
+		},
+
+		_onBlur: function(e){
+			// summary:
+			//		Called from focus manager when focus has moved away from this editor
+			// tags:
+			//		protected
+
+			// Workaround IE problem when you blur the browser windows while an editor is focused: IE hangs
+			// when you focus editor #1, blur the browser window, and then click editor #0.  See #16939.
+			// Note: Edge doesn't seem to have this problem.
+			if(has("ie") || has("trident")){
+				this.defer(function(){
+					if(!focus.curNode){
+						this.ownerDocumentBody.focus();
+					}
+				});
+			}
+
+			this.inherited(arguments);
+
+			var newValue = this.getValue(true);
+			if(newValue !== this.value){
+				this.onChange(newValue);
+			}
+			this._set("value", newValue);
+		},
+
+		_onFocus: function(/*Event*/ e){
+			// summary:
+			//		Called from focus manager when focus has moved into this editor
+			// tags:
+			//		protected
+
+			// console.info('_onFocus')
+			if(!this.disabled){
+				if(!this._disabledOK){
+					this.set('disabled', false);
+				}
+				this.inherited(arguments);
+			}
+		},
+
+		// TODO: remove in 2.0
+		blur: function(){
+			// summary:
+			//		Remove focus from this instance.
+			// tags:
+			//		deprecated
+			if(!has("ie") && this.window.document.documentElement && this.window.document.documentElement.focus){
+				this.window.document.documentElement.focus();
+			}else if(this.ownerDocumentBody.focus){
+				this.ownerDocumentBody.focus();
+			}
+		},
+
+		focus: function(){
+			// summary:
+			//		Move focus to this editor
+			if(!this.isLoaded){
+				this.focusOnLoad = true;
+				return;
+			}
+			if(has("ie") < 9){
+				//this.editNode.focus(); -> causes IE to scroll always (strict and quirks mode) to the top the Iframe
+				// if we fire the event manually and let the browser handle the focusing, the latest
+				// cursor position is focused like in FF
+				this.iframe.fireEvent('onfocus', document.createEventObject()); // createEventObject/fireEvent only in IE < 11
+			}else{
+				// Firefox and chrome
+				this.editNode.focus();
+			}
+		},
+
+		// _lastUpdate: 0,
+		updateInterval: 200,
+		_updateTimer: null,
+		onDisplayChanged: function(/*Event*/ /*===== e =====*/){
+			// summary:
+			//		This event will be fired every time the display context
+			//		changes and the result needs to be reflected in the UI.
+			// description:
+			//		If you don't want to have update too often,
+			//		onNormalizedDisplayChanged should be used instead
+			// tags:
+			//		private
+
+			// var _t=new Date();
+			if(this._updateTimer){
+				this._updateTimer.remove();
+			}
+			this._updateTimer = this.defer("onNormalizedDisplayChanged", this.updateInterval);
+
+			// Technically this should trigger a call to watch("value", ...) registered handlers,
+			// but getValue() is too slow to call on every keystroke so we don't.
+		},
+		onNormalizedDisplayChanged: function(){
+			// summary:
+			//		This event is fired every updateInterval ms or more
+			// description:
+			//		If something needs to happen immediately after a
+			//		user change, please use onDisplayChanged instead.
+			// tags:
+			//		private
+			delete this._updateTimer;
+		},
+		onChange: function(/*===== newContent =====*/){
+			// summary:
+			//		This is fired if and only if the editor loses focus and
+			//		the content is changed.
+		},
+		_normalizeCommand: function(/*String*/ cmd, /*Anything?*/argument){
+			// summary:
+			//		Used as the advice function to map our
+			//		normalized set of commands to those supported by the target
+			//		browser.
+			// tags:
+			//		private
+
+			var command = cmd.toLowerCase();
+			if(command === "formatblock"){
+				if(has("safari") && argument === undefined){
+					command = "heading";
+				}
+			}else if(command === "hilitecolor" && !has("mozilla")){
+				command = "backcolor";
+			}
+
+			return command;
+		},
+
+		_qcaCache: {},
+		queryCommandAvailable: function(/*String*/ command){
+			// summary:
+			//		Tests whether a command is supported by the host. Clients
+			//		SHOULD check whether a command is supported before attempting
+			//		to use it, behaviour for unsupported commands is undefined.
+			// command:
+			//		The command to test for
+			// tags:
+			//		private
+
+			// memoizing version. See _queryCommandAvailable for computing version
+			var ca = this._qcaCache[command];
+			if(ca !== undefined){
+				return ca;
+			}
+			return (this._qcaCache[command] = this._queryCommandAvailable(command));
+		},
+
+		_queryCommandAvailable: function(/*String*/ command){
+			// summary:
+			//		See queryCommandAvailable().
+			// tags:
+			//		private
+
+			switch(command.toLowerCase()){
+				case "bold":
+				case "italic":
+				case "underline":
+				case "subscript":
+				case "superscript":
+				case "fontname":
+				case "fontsize":
+				case "forecolor":
+				case "hilitecolor":
+				case "justifycenter":
+				case "justifyfull":
+				case "justifyleft":
+				case "justifyright":
+				case "delete":
+				case "selectall":
+				case "toggledir":
+
+				case "createlink":
+				case "unlink":
+				case "removeformat":
+				case "inserthorizontalrule":
+				case "insertimage":
+				case "insertorderedlist":
+				case "insertunorderedlist":
+				case "indent":
+				case "outdent":
+				case "formatblock":
+				case "inserthtml":
+				case "undo":
+				case "redo":
+				case "strikethrough":
+				case "tabindent":
+
+				case "cut":
+				case "copy":
+				case "paste":
+					return true;
+
+				// Note: This code path is apparently never called.  Not sure if it should return true or false
+				// for Edge.
+				case "blockdirltr":
+				case "blockdirrtl":
+				case "dirltr":
+				case "dirrtl":
+				case "inlinedirltr":
+				case "inlinedirrtl":
+					return has("ie") || has("trident") || has("edge");
+
+				// Note: This code path is apparently never called, not even by the dojox/editor table plugins.
+				// There's also an _inserttableEnabledImpl() method that's also never called.
+				// Previously this code returned truthy for IE and mozilla, but false for chrome/safari, so
+				// leaving it that way just in case.
+				case "inserttable":
+				case "insertcell":
+				case "insertcol":
+				case "insertrow":
+				case "deletecells":
+				case "deletecols":
+				case "deleterows":
+				case "mergecells":
+				case "splitcell":
+					return !has("webkit");
+
+				default:
+					return false;
+			}
+		},
+
+		execCommand: function(/*String*/ command, argument){
+			// summary:
+			//		Executes a command in the Rich Text area
+			// command:
+			//		The command to execute
+			// argument:
+			//		An optional argument to the command
+			// tags:
+			//		protected
+			var returnValue;
+
+			//focus() is required for IE to work
+			//In addition, focus() makes sure after the execution of
+			//the command, the editor receives the focus as expected
+			if(this.focused){
+				// put focus back in the iframe, unless focus has somehow been shifted out of the editor completely
+				this.focus();
+			}
+
+			command = this._normalizeCommand(command, argument);
+
+			if(argument !== undefined){
+				if(command === "heading"){
+					throw new Error("unimplemented");
+				}else if(command === "formatblock" && (has("ie") || has("trident"))){
+					// See http://stackoverflow.com/questions/10741831/execcommand-formatblock-headings-in-ie.
+					// Not necessary on Edge though.
+					argument = '<' + argument + '>';
+				}
+			}
+
+			//Check to see if we have any over-rides for commands, they will be functions on this
+			//widget of the form _commandImpl.  If we don't, fall through to the basic native
+			//exec command of the browser.
+			var implFunc = "_" + command + "Impl";
+			if(this[implFunc]){
+				returnValue = this[implFunc](argument);
+			}else{
+				argument = arguments.length > 1 ? argument : null;
+				if(argument || command !== "createlink"){
+					returnValue = this.document.execCommand(command, false, argument);
+				}
+			}
+
+			this.onDisplayChanged();
+			return returnValue;
+		},
+
+		queryCommandEnabled: function(/*String*/ command){
+			// summary:
+			//		Check whether a command is enabled or not.
+			// command:
+			//		The command to execute
+			// tags:
+			//		protected
+			if(this.disabled || !this._disabledOK){
+				return false;
+			}
+
+			command = this._normalizeCommand(command);
+
+			//Check to see if we have any over-rides for commands, they will be functions on this
+			//widget of the form _commandEnabledImpl.  If we don't, fall through to the basic native
+			//command of the browser.
+			var implFunc = "_" + command + "EnabledImpl";
+
+			if(this[implFunc]){
+				return  this[implFunc](command);
+			}else{
+				return this._browserQueryCommandEnabled(command);
+			}
+		},
+
+		queryCommandState: function(command){
+			// summary:
+			//		Check the state of a given command and returns true or false.
+			// tags:
+			//		protected
+
+			if(this.disabled || !this._disabledOK){
+				return false;
+			}
+			command = this._normalizeCommand(command);
+			try{
+				return this.document.queryCommandState(command);
+			}catch(e){
+				//Squelch, occurs if editor is hidden on FF 3 (and maybe others.)
+				return false;
+			}
+		},
+
+		queryCommandValue: function(command){
+			// summary:
+			//		Check the value of a given command. This matters most for
+			//		custom selections and complex values like font value setting.
+			// tags:
+			//		protected
+
+			if(this.disabled || !this._disabledOK){
+				return false;
+			}
+			var r;
+			command = this._normalizeCommand(command);
+			if(has("ie") && command === "formatblock"){
+				// This is to deal with IE bug when running in non-English.  See _localizeEditorCommands().
+				// Apparently not needed on IE11 or Edge.
+				r = this._native2LocalFormatNames[this.document.queryCommandValue(command)];
+			}else if(has("mozilla") && command === "hilitecolor"){
+				var oldValue;
+				try{
+					oldValue = this.document.queryCommandValue("styleWithCSS");
+				}catch(e){
+					oldValue = false;
+				}
+				this.document.execCommand("styleWithCSS", false, true);
+				r = this.document.queryCommandValue(command);
+				this.document.execCommand("styleWithCSS", false, oldValue);
+			}else{
+				r = this.document.queryCommandValue(command);
+			}
+			return r;
+		},
+
+		// Misc.
+
+		_sCall: function(name, args){
+			// summary:
+			//		Deprecated, remove for 2.0.   New code should access this.selection directly.
+			//		Run the named method of dijit/selection over the
+			//		current editor instance's window, with the passed args.
+			// tags:
+			//		private deprecated
+
+			return this.selection[name].apply(this.selection, args);
+		},
+
+		// FIXME: this is a TON of code duplication. Why?
+
+		placeCursorAtStart: function(){
+			// summary:
+			//		Place the cursor at the start of the editing area.
+			// tags:
+			//		private
+
+			this.focus();
+
+			//see comments in placeCursorAtEnd
+			var isvalid = false;
+			if(has("mozilla")){
+				// TODO:  Is this branch even necessary?
+				var first = this.editNode.firstChild;
+				while(first){
+					if(first.nodeType === 3){
+						if(first.nodeValue.replace(/^\s+|\s+$/g, "").length > 0){
+							isvalid = true;
+							this.selection.selectElement(first);
+							break;
+						}
+					}else if(first.nodeType === 1){
+						isvalid = true;
+						var tg = first.tagName ? first.tagName.toLowerCase() : "";
+						// Collapse before childless tags.
+						if(/br|input|img|base|meta|area|basefont|hr|link/.test(tg)){
+							this.selection.selectElement(first);
+						}else{
+							// Collapse inside tags with children.
+							this.selection.selectElementChildren(first);
+						}
+						break;
+					}
+					first = first.nextSibling;
+				}
+			}else{
+				isvalid = true;
+				this.selection.selectElementChildren(this.editNode);
+			}
+			if(isvalid){
+				this.selection.collapse(true);
+			}
+		},
+
+		placeCursorAtEnd: function(){
+			// summary:
+			//		Place the cursor at the end of the editing area.
+			// tags:
+			//		private
+
+			this.focus();
+
+			//In mozilla, if last child is not a text node, we have to use
+			// selectElementChildren on this.editNode.lastChild otherwise the
+			// cursor would be placed at the end of the closing tag of
+			//this.editNode.lastChild
+			var isvalid = false;
+			if(has("mozilla")){
+				var last = this.editNode.lastChild;
+				while(last){
+					if(last.nodeType === 3){
+						if(last.nodeValue.replace(/^\s+|\s+$/g, "").length > 0){
+							isvalid = true;
+							this.selection.selectElement(last);
+							break;
+						}
+					}else if(last.nodeType === 1){
+						isvalid = true;
+						this.selection.selectElement(last.lastChild || last);
+						break;
+					}
+					last = last.previousSibling;
+				}
+			}else{
+				isvalid = true;
+				this.selection.selectElementChildren(this.editNode);
+			}
+			if(isvalid){
+				this.selection.collapse(false);
+			}
+		},
+
+		getValue: function(/*Boolean?*/ nonDestructive){
+			// summary:
+			//		Return the current content of the editing area (post filters
+			//		are applied).  Users should call get('value') instead.
+			// nonDestructive:
+			//		defaults to false. Should the post-filtering be run over a copy
+			//		of the live DOM? Most users should pass "true" here unless they
+			//		*really* know that none of the installed filters are going to
+			//		mess up the editing session.
+			// tags:
+			//		private
+			if(this.textarea){
+				if(this.isClosed || !this.isLoaded){
+					return this.textarea.value;
+				}
+			}
+
+			return this.isLoaded ? this._postFilterContent(null, nonDestructive) : this.value;
+		},
+		_getValueAttr: function(){
+			// summary:
+			//		Hook to make attr("value") work
+			return this.getValue(true);
+		},
+
+		setValue: function(/*String*/ html){
+			// summary:
+			//		This function sets the content. No undo history is preserved.
+			//		Users should use set('value', ...) instead.
+			// tags:
+			//		deprecated
+
+			// TODO: remove this and getValue() for 2.0, and move code to _setValueAttr()
+
+			if(!this.isLoaded){
+				// try again after the editor is finished loading
+				this.onLoadDeferred.then(lang.hitch(this, function(){
+					this.setValue(html);
+				}));
+				return;
+			}
+			if(this.textarea && (this.isClosed || !this.isLoaded)){
+				this.textarea.value = html;
+			}else{
+				html = this._preFilterContent(html);
+				var node = this.isClosed ? this.domNode : this.editNode;
+
+				node.innerHTML = html;
+				this._preDomFilterContent(node);
+			}
+
+			this.onDisplayChanged();
+			this._set("value", this.getValue(true));
+		},
+
+		replaceValue: function(/*String*/ html){
+			// summary:
+			//		This function set the content while trying to maintain the undo stack
+			//		(now only works fine with Moz, this is identical to setValue in all
+			//		other browsers)
+			// tags:
+			//		protected
+
+			if(this.isClosed){
+				this.setValue(html);
+			}else if(this.window && this.window.getSelection && !has("mozilla")){ // Safari
+				// look ma! it's a totally f'd browser!
+				this.setValue(html);
+			}else if(this.window && this.window.getSelection){ // Moz
+				html = this._preFilterContent(html);
+				this.execCommand("selectall");
+				this.execCommand("inserthtml", html);
+				this._preDomFilterContent(this.editNode);
+			}else if(this.document && this.document.selection){//IE
+				//In IE, when the first element is not a text node, say
+				//an <a> tag, when replacing the content of the editing
+				//area, the <a> tag will be around all the content
+				//so for now, use setValue for IE too
+				this.setValue(html);
+			}
+
+			this._set("value", this.getValue(true));
+		},
+
+		_preFilterContent: function(/*String*/ html){
+			// summary:
+			//		Filter the input before setting the content of the editing
+			//		area. DOM pre-filtering may happen after this
+			//		string-based filtering takes place but as of 1.2, this is not
+			//		guaranteed for operations such as the inserthtml command.
+			// tags:
+			//		private
+
+			var ec = html;
+			array.forEach(this.contentPreFilters, function(ef){
+				if(ef){
+					ec = ef(ec);
+				}
+			});
+			return ec;
+		},
+		_preDomFilterContent: function(/*DomNode*/ dom){
+			// summary:
+			//		filter the input's live DOM. All filter operations should be
+			//		considered to be "live" and operating on the DOM that the user
+			//		will be interacting with in their editing session.
+			// tags:
+			//		private
+			dom = dom || this.editNode;
+			array.forEach(this.contentDomPreFilters, function(ef){
+				if(ef && lang.isFunction(ef)){
+					ef(dom);
+				}
+			}, this);
+		},
+
+		_postFilterContent: function(/*DomNode|DomNode[]|String?*/ dom, /*Boolean?*/ nonDestructive){
+			// summary:
+			//		filter the output after getting the content of the editing area
+			//
+			// description:
+			//		post-filtering allows plug-ins and users to specify any number
+			//		of transforms over the editor's content, enabling many common
+			//		use-cases such as transforming absolute to relative URLs (and
+			//		vice-versa), ensuring conformance with a particular DTD, etc.
+			//		The filters are registered in the contentDomPostFilters and
+			//		contentPostFilters arrays. Each item in the
+			//		contentDomPostFilters array is a function which takes a DOM
+			//		Node or array of nodes as its only argument and returns the
+			//		same. It is then passed down the chain for further filtering.
+			//		The contentPostFilters array behaves the same way, except each
+			//		member operates on strings. Together, the DOM and string-based
+			//		filtering allow the full range of post-processing that should
+			//		be necessaray to enable even the most agressive of post-editing
+			//		conversions to take place.
+			//
+			//		If nonDestructive is set to "true", the nodes are cloned before
+			//		filtering proceeds to avoid potentially destructive transforms
+			//		to the content which may still needed to be edited further.
+			//		Once DOM filtering has taken place, the serialized version of
+			//		the DOM which is passed is run through each of the
+			//		contentPostFilters functions.
+			//
+			// dom:
+			//		a node, set of nodes, which to filter using each of the current
+			//		members of the contentDomPostFilters and contentPostFilters arrays.
+			//
+			// nonDestructive:
+			//		defaults to "false". If true, ensures that filtering happens on
+			//		a clone of the passed-in content and not the actual node
+			//		itself.
+			//
+			// tags:
+			//		private
+
+			var ec;
+			if(!lang.isString(dom)){
+				dom = dom || this.editNode;
+				if(this.contentDomPostFilters.length){
+					if(nonDestructive){
+						dom = lang.clone(dom);
+					}
+					array.forEach(this.contentDomPostFilters, function(ef){
+						dom = ef(dom);
+					});
+				}
+				ec = htmlapi.getChildrenHtml(dom);
+			}else{
+				ec = dom;
+			}
+
+			if(!lang.trim(ec.replace(/^\xA0\xA0*/, '').replace(/\xA0\xA0*$/, '')).length){
+				ec = "";
+			}
+
+			array.forEach(this.contentPostFilters, function(ef){
+				ec = ef(ec);
+			});
+
+			return ec;
+		},
+
+		_saveContent: function(){
+			// summary:
+			//		Saves the content in an onunload event if the editor has not been closed
+			// tags:
+			//		private
+
+			var saveTextarea = dom.byId(dijit._scopeName + "._editor.RichText.value");
+			if(saveTextarea){
+				if(saveTextarea.value){
+					saveTextarea.value += this._SEPARATOR;
+				}
+				saveTextarea.value += this.name + this._NAME_CONTENT_SEP + this.getValue(true);
+			}
+		},
+
+
+		escapeXml: function(/*String*/ str, /*Boolean*/ noSingleQuotes){
+			// summary:
+			//		Adds escape sequences for special characters in XML.
+			//		Optionally skips escapes for single quotes
+			// tags:
+			//		private
+
+			str = str.replace(/&/gm, "&amp;").replace(/</gm, "&lt;").replace(/>/gm, "&gt;").replace(/"/gm, "&quot;");
+			if(!noSingleQuotes){
+				str = str.replace(/'/gm, "&#39;");
+			}
+			return str; // string
+		},
+
+		getNodeHtml: function(/* DomNode */ node){
+			// summary:
+			//		Deprecated.   Use dijit/_editor/html::_getNodeHtml() instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated('dijit.Editor::getNodeHtml is deprecated', 'use dijit/_editor/html::getNodeHtml instead', 2);
+			return htmlapi.getNodeHtml(node); // String
+		},
+
+		getNodeChildrenHtml: function(/* DomNode */ dom){
+			// summary:
+			//		Deprecated.   Use dijit/_editor/html::getChildrenHtml() instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated('dijit.Editor::getNodeChildrenHtml is deprecated', 'use dijit/_editor/html::getChildrenHtml instead', 2);
+			return htmlapi.getChildrenHtml(dom);
+		},
+
+		close: function(/*Boolean?*/ save){
+			// summary:
+			//		Kills the editor and optionally writes back the modified contents to the
+			//		element from which it originated.
+			// save:
+			//		Whether or not to save the changes. If false, the changes are discarded.
+			// tags:
+			//		private
+
+			if(this.isClosed){
+				return;
+			}
+
+			if(!arguments.length){
+				save = true;
+			}
+			if(save){
+				this._set("value", this.getValue(true));
+			}
+
+			// line height is squashed for iframes
+			// FIXME: why was this here? if(this.iframe){ this.domNode.style.lineHeight = null; }
+
+			if(this.interval){
+				clearInterval(this.interval);
+			}
+
+			if(this._webkitListener){
+				// Cleanup of WebKit fix: #9532
+				this._webkitListener.remove();
+				delete this._webkitListener;
+			}
+
+			// Guard against memory leaks on IE (see #9268)
+			if(has("ie")){
+				this.iframe.onfocus = null;
+			}
+			this.iframe._loadFunc = null;
+
+			if(this._iframeRegHandle){
+				this._iframeRegHandle.remove();
+				delete this._iframeRegHandle;
+			}
+
+			if(this.textarea){
+				var s = this.textarea.style;
+				s.position = "";
+				s.left = s.top = "";
+				if(has("ie")){
+					s.overflow = this.__overflow;
+					this.__overflow = null;
+				}
+				this.textarea.value = this.value;
+				domConstruct.destroy(this.domNode);
+				this.domNode = this.textarea;
+			}else{
+				// Note that this destroys the iframe
+				this.domNode.innerHTML = this.value;
+			}
+			delete this.iframe;
+
+			domClass.remove(this.domNode, this.baseClass);
+			this.isClosed = true;
+			this.isLoaded = false;
+
+			delete this.editNode;
+			delete this.focusNode;
+
+			if(this.window && this.window._frameElement){
+				this.window._frameElement = null;
+			}
+
+			this.window = null;
+			this.document = null;
+			this.editingArea = null;
+			this.editorObject = null;
+		},
+
+		destroy: function(){
+			if(!this.isClosed){
+				this.close(false);
+			}
+			if(this._updateTimer){
+				this._updateTimer.remove();
+			}
+			this.inherited(arguments);
+			if(RichText._globalSaveHandler){
+				delete RichText._globalSaveHandler[this.id];
+			}
+		},
+
+		_removeMozBogus: function(/* String */ html){
+			// summary:
+			//		Post filter to remove unwanted HTML attributes generated by mozilla
+			// tags:
+			//		private
+			return html.replace(/\stype="_moz"/gi, '').replace(/\s_moz_dirty=""/gi, '').replace(/_moz_resizing="(true|false)"/gi, ''); // String
+		},
+		_removeWebkitBogus: function(/* String */ html){
+			// summary:
+			//		Post filter to remove unwanted HTML attributes generated by webkit
+			// tags:
+			//		private
+			html = html.replace(/\sclass="webkit-block-placeholder"/gi, '');
+			html = html.replace(/\sclass="apple-style-span"/gi, '');
+			// For some reason copy/paste sometime adds extra meta tags for charset on
+			// webkit (chrome) on mac.They need to be removed.  See: #12007"
+			html = html.replace(/<meta charset=\"utf-8\" \/>/gi, '');
+			return html; // String
+		},
+		_normalizeFontStyle: function(/* String */ html){
+			// summary:
+			//		Convert 'strong' and 'em' to 'b' and 'i'.
+			// description:
+			//		Moz can not handle strong/em tags correctly, so to help
+			//		mozilla and also to normalize output, convert them to 'b' and 'i'.
+			//
+			//		Note the IE generates 'strong' and 'em' rather than 'b' and 'i'
+			// tags:
+			//		private
+			return html.replace(/<(\/)?strong([ \>])/gi, '<$1b$2')
+				.replace(/<(\/)?em([ \>])/gi, '<$1i$2'); // String
+		},
+
+		_preFixUrlAttributes: function(/* String */ html){
+			// summary:
+			//		Pre-filter to do fixing to href attributes on `<a>` and `<img>` tags
+			// tags:
+			//		private
+			return html.replace(/(?:(<a(?=\s).*?\shref=)("|')(.*?)\2)|(?:(<a\s.*?href=)([^"'][^ >]+))/gi,
+				'$1$4$2$3$5$2 _djrealurl=$2$3$5$2')
+				.replace(/(?:(<img(?=\s).*?\ssrc=)("|')(.*?)\2)|(?:(<img\s.*?src=)([^"'][^ >]+))/gi,
+				'$1$4$2$3$5$2 _djrealurl=$2$3$5$2'); // String
+		},
+
+		/*****************************************************************************
+		 The following functions implement HTML manipulation commands for various
+		 browser/contentEditable implementations.  The goal of them is to enforce
+		 standard behaviors of them.
+		 ******************************************************************************/
+
+		/*** queryCommandEnabled implementations ***/
+
+		_browserQueryCommandEnabled: function(command){
+			// summary:
+			//		Implementation to call to the native queryCommandEnabled of the browser.
+			// command:
+			//		The command to check.
+			// tags:
+			//		protected
+			if(!command){
+				return false;
+			}
+			var elem = has("ie") < 9 ? this.document.selection.createRange() : this.document;
+			try{
+				return elem.queryCommandEnabled(command);
+			}catch(e){
+				return false;
+			}
+		},
+
+		_createlinkEnabledImpl: function(/*===== argument =====*/){
+			// summary:
+			//		This function implements the test for if the create link
+			//		command should be enabled or not.
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var enabled = true;
+			if(has("opera")){
+				var sel = this.window.getSelection();
+				if(sel.isCollapsed){
+					enabled = true;
+				}else{
+					enabled = this.document.queryCommandEnabled("createlink");
+				}
+			}else{
+				enabled = this._browserQueryCommandEnabled("createlink");
+			}
+			return enabled;
+		},
+
+		_unlinkEnabledImpl: function(/*===== argument =====*/){
+			// summary:
+			//		This function implements the test for if the unlink
+			//		command should be enabled or not.
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var enabled = true;
+			if(has("mozilla") || has("webkit")){
+				enabled = this.selection.hasAncestorElement("a");
+			}else{
+				enabled = this._browserQueryCommandEnabled("unlink");
+			}
+			return enabled;
+		},
+
+		_inserttableEnabledImpl: function(/*===== argument =====*/){
+			// summary:
+			//		This function implements the test for if the inserttable
+			//		command should be enabled or not.
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var enabled = true;
+			if(has("mozilla") || has("webkit")){
+				enabled = true;
+			}else{
+				enabled = this._browserQueryCommandEnabled("inserttable");
+			}
+			return enabled;
+		},
+
+		_cutEnabledImpl: function(/*===== argument =====*/){
+			// summary:
+			//		This function implements the test for if the cut
+			//		command should be enabled or not.
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var enabled = true;
+			if(has("webkit")){
+				// WebKit deems clipboard activity as a security threat and natively would return false
+				var sel = this.window.getSelection();
+				if(sel){
+					sel = sel.toString();
+				}
+				enabled = !!sel;
+			}else{
+				enabled = this._browserQueryCommandEnabled("cut");
+			}
+			return enabled;
+		},
+
+		_copyEnabledImpl: function(/*===== argument =====*/){
+			// summary:
+			//		This function implements the test for if the copy
+			//		command should be enabled or not.
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var enabled = true;
+			if(has("webkit")){
+				// WebKit deems clipboard activity as a security threat and natively would return false
+				var sel = this.window.getSelection();
+				if(sel){
+					sel = sel.toString();
+				}
+				enabled = !!sel;
+			}else{
+				enabled = this._browserQueryCommandEnabled("copy");
+			}
+			return enabled;
+		},
+
+		_pasteEnabledImpl: function(/*===== argument =====*/){
+			// summary:c
+			//		This function implements the test for if the paste
+			//		command should be enabled or not.
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var enabled = true;
+			if(has("webkit")){
+				return true;
+			}else{
+				enabled = this._browserQueryCommandEnabled("paste");
+			}
+			return enabled;
+		},
+
+		/*** execCommand implementations ***/
+
+		_inserthorizontalruleImpl: function(argument){
+			// summary:
+			//		This function implements the insertion of HTML 'HR' tags.
+			//		into a point on the page.  IE doesn't to it right, so
+			//		we have to use an alternate form
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			if(has("ie")){
+				return this._inserthtmlImpl("<hr>");
+			}
+			return this.document.execCommand("inserthorizontalrule", false, argument);
+		},
+
+		_unlinkImpl: function(argument){
+			// summary:
+			//		This function implements the unlink of an 'a' tag.
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			if((this.queryCommandEnabled("unlink")) && (has("mozilla") || has("webkit"))){
+				var a = this.selection.getAncestorElement("a");
+				this.selection.selectElement(a);
+				return this.document.execCommand("unlink", false, null);
+			}
+			return this.document.execCommand("unlink", false, argument);
+		},
+
+		_hilitecolorImpl: function(argument){
+			// summary:
+			//		This function implements the hilitecolor command
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var returnValue;
+			var isApplied = this._handleTextColorOrProperties("hilitecolor", argument);
+			if(!isApplied){
+				if(has("mozilla")){
+					// mozilla doesn't support hilitecolor properly when useCSS is
+					// set to false (bugzilla #279330)
+					this.document.execCommand("styleWithCSS", false, true);
+					console.log("Executing color command.");
+					returnValue = this.document.execCommand("hilitecolor", false, argument);
+					this.document.execCommand("styleWithCSS", false, false);
+				}else{
+					returnValue = this.document.execCommand("hilitecolor", false, argument);
+				}
+			}
+			return returnValue;
+		},
+
+		_backcolorImpl: function(argument){
+			// summary:
+			//		This function implements the backcolor command
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			if(has("ie")){
+				// Tested under IE 6 XP2, no problem here, comment out
+				// IE weirdly collapses ranges when we exec these commands, so prevent it
+				//	var tr = this.document.selection.createRange();
+				argument = argument ? argument : null;
+			}
+			var isApplied = this._handleTextColorOrProperties("backcolor", argument);
+			if(!isApplied){
+				isApplied = this.document.execCommand("backcolor", false, argument);
+			}
+			return isApplied;
+		},
+
+		_forecolorImpl: function(argument){
+			// summary:
+			//		This function implements the forecolor command
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			if(has("ie")){
+				// Tested under IE 6 XP2, no problem here, comment out
+				// IE weirdly collapses ranges when we exec these commands, so prevent it
+				//	var tr = this.document.selection.createRange();
+				argument = argument ? argument : null;
+			}
+			var isApplied = false;
+			isApplied = this._handleTextColorOrProperties("forecolor", argument);
+			if(!isApplied){
+				isApplied = this.document.execCommand("forecolor", false, argument);
+			}
+			return isApplied;
+		},
+
+		_inserthtmlImpl: function(argument){
+			// summary:
+			//		This function implements the insertion of HTML content into
+			//		a point on the page.
+			// argument:
+			//		The content to insert, if any.
+			// tags:
+			//		protected
+			argument = this._preFilterContent(argument);
+			var rv = true;
+			if(has("ie") < 9){
+				var insertRange = this.document.selection.createRange();
+				if(this.document.selection.type.toUpperCase() === 'CONTROL'){
+					var n = insertRange.item(0);
+					while(insertRange.length){
+						insertRange.remove(insertRange.item(0));
+					}
+					n.outerHTML = argument;
+				}else{
+					insertRange.pasteHTML(argument);
+				}
+				insertRange.select();
+			}else if(has("trident") < 8){
+				var insertRange;
+				var selection = rangeapi.getSelection(this.window);
+				if(selection && selection.rangeCount && selection.getRangeAt){
+					insertRange = selection.getRangeAt(0);
+					insertRange.deleteContents();
+
+					var div = domConstruct.create('div');
+					div.innerHTML = argument;
+					var node, lastNode;
+					var n = this.document.createDocumentFragment();
+					while((node = div.firstChild)){
+						lastNode = n.appendChild(node);
+					}
+					insertRange.insertNode(n);
+					if(lastNode) {
+						insertRange = insertRange.cloneRange();
+						insertRange.setStartAfter(lastNode);
+						insertRange.collapse(false);
+						selection.removeAllRanges();
+						selection.addRange(insertRange);
+					}
+				}
+			}else if(has("mozilla") && !argument.length){
+				//mozilla can not inserthtml an empty html to delete current selection
+				//so we delete the selection instead in this case
+				this.selection.remove(); // FIXME
+			}else{
+				rv = this.document.execCommand("inserthtml", false, argument);
+			}
+			return rv;
+		},
+
+		_boldImpl: function(argument){
+			// summary:
+			//		This function implements an over-ride of the bold command.
+			// argument:
+			//		Not used, operates by selection.
+			// tags:
+			//		protected
+			var applied = false;
+			if(has("ie") || has("trident")){
+				this._adaptIESelection();
+				applied = this._adaptIEFormatAreaAndExec("bold");
+			}
+			if(!applied){
+				applied = this.document.execCommand("bold", false, argument);
+			}
+			return applied;
+		},
+
+		_italicImpl: function(argument){
+			// summary:
+			//		This function implements an over-ride of the italic command.
+			// argument:
+			//		Not used, operates by selection.
+			// tags:
+			//		protected
+			var applied = false;
+			if(has("ie") || has("trident")){
+				this._adaptIESelection();
+				applied = this._adaptIEFormatAreaAndExec("italic");
+			}
+			if(!applied){
+				applied = this.document.execCommand("italic", false, argument);
+			}
+			return applied;
+		},
+
+		_underlineImpl: function(argument){
+			// summary:
+			//		This function implements an over-ride of the underline command.
+			// argument:
+			//		Not used, operates by selection.
+			// tags:
+			//		protected
+			var applied = false;
+			if(has("ie") || has("trident")){
+				this._adaptIESelection();
+				applied = this._adaptIEFormatAreaAndExec("underline");
+			}
+			if(!applied){
+				applied = this.document.execCommand("underline", false, argument);
+			}
+			return applied;
+		},
+
+		_strikethroughImpl: function(argument){
+			// summary:
+			//		This function implements an over-ride of the strikethrough command.
+			// argument:
+			//		Not used, operates by selection.
+			// tags:
+			//		protected
+			var applied = false;
+			if(has("ie") || has("trident")){
+				this._adaptIESelection();
+				applied = this._adaptIEFormatAreaAndExec("strikethrough");
+			}
+			if(!applied){
+				applied = this.document.execCommand("strikethrough", false, argument);
+			}
+			return applied;
+		},
+
+		_superscriptImpl: function(argument){
+			// summary:
+			//		This function implements an over-ride of the superscript command.
+			// argument:
+			//		Not used, operates by selection.
+			// tags:
+			//		protected
+			var applied = false;
+			if(has("ie") || has("trident")){
+				this._adaptIESelection();
+				applied = this._adaptIEFormatAreaAndExec("superscript");
+			}
+			if(!applied){
+				applied = this.document.execCommand("superscript", false, argument);
+			}
+			return applied;
+		},
+
+		_subscriptImpl: function(argument){
+			// summary:
+			//		This function implements an over-ride of the superscript command.
+			// argument:
+			//		Not used, operates by selection.
+			// tags:
+			//		protected
+			var applied = false;
+			if(has("ie") || has("trident")){
+				this._adaptIESelection();
+				applied = this._adaptIEFormatAreaAndExec("subscript");
+
+			}
+			if(!applied){
+				applied = this.document.execCommand("subscript", false, argument);
+			}
+			return applied;
+		},
+
+		_fontnameImpl: function(argument){
+			// summary:
+			//		This function implements the fontname command
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var isApplied;
+			if(has("ie") || has("trident")){
+				isApplied = this._handleTextColorOrProperties("fontname", argument);
+			}
+			if(!isApplied){
+				isApplied = this.document.execCommand("fontname", false, argument);
+			}
+			return isApplied;
+		},
+
+		_fontsizeImpl: function(argument){
+			// summary:
+			//		This function implements the fontsize command
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var isApplied;
+			if(has("ie") || has("trident")){
+				isApplied = this._handleTextColorOrProperties("fontsize", argument);
+			}
+			if(!isApplied){
+				isApplied = this.document.execCommand("fontsize", false, argument);
+			}
+			return isApplied;
+		},
+
+		_insertorderedlistImpl: function(argument){
+			// summary:
+			//		This function implements the insertorderedlist command
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var applied = false;
+			if(has("ie") || has("trident") || has("edge")){
+				applied = this._adaptIEList("insertorderedlist", argument);
+			}
+			if(!applied){
+				applied = this.document.execCommand("insertorderedlist", false, argument);
+			}
+			return applied;
+		},
+
+		_insertunorderedlistImpl: function(argument){
+			// summary:
+			//		This function implements the insertunorderedlist command
+			// argument:
+			//		arguments to the exec command, if any.
+			// tags:
+			//		protected
+			var applied = false;
+			if(has("ie") || has("trident") || has("edge")){
+				applied = this._adaptIEList("insertunorderedlist", argument);
+			}
+			if(!applied){
+				applied = this.document.execCommand("insertunorderedlist", false, argument);
+			}
+			return applied;
+		},
+
+		getHeaderHeight: function(){
+			// summary:
+			//		A function for obtaining the height of the header node
+			return this._getNodeChildrenHeight(this.header); // Number
+		},
+
+		getFooterHeight: function(){
+			// summary:
+			//		A function for obtaining the height of the footer node
+			return this._getNodeChildrenHeight(this.footer); // Number
+		},
+
+		_getNodeChildrenHeight: function(node){
+			// summary:
+			//		An internal function for computing the cumulative height of all child nodes of 'node'
+			// node:
+			//		The node to process the children of;
+			var h = 0;
+			if(node && node.childNodes){
+				// IE didn't compute it right when position was obtained on the node directly is some cases,
+				// so we have to walk over all the children manually.
+				var i;
+				for(i = 0; i < node.childNodes.length; i++){
+					var size = domGeometry.position(node.childNodes[i]);
+					h += size.h;
+				}
+			}
+			return h; // Number
+		},
+
+		_isNodeEmpty: function(node, startOffset){
+			// summary:
+			//		Function to test if a node is devoid of real content.
+			// node:
+			//		The node to check.
+			// tags:
+			//		private.
+			if(node.nodeType === 1/*element*/){
+				if(node.childNodes.length > 0){
+					return this._isNodeEmpty(node.childNodes[0], startOffset);	// huh?   why test just first child?
+				}
+				return true;
+			}else if(node.nodeType === 3/*text*/){
+				return (node.nodeValue.substring(startOffset) === "");
+			}
+			return false;
+		},
+
+		_removeStartingRangeFromRange: function(node, range){
+			// summary:
+			//		Function to adjust selection range by removing the current
+			//		start node.
+			// node:
+			//		The node to remove from the starting range.
+			// range:
+			//		The range to adapt.
+			// tags:
+			//		private
+			if(node.nextSibling){
+				range.setStart(node.nextSibling, 0);
+			}else{
+				var parent = node.parentNode;
+				while(parent && parent.nextSibling == null){
+					//move up the tree until we find a parent that has another node, that node will be the next node
+					parent = parent.parentNode;
+				}
+				if(parent){
+					range.setStart(parent.nextSibling, 0);
+				}
+			}
+			return range;
+		},
+
+		_adaptIESelection: function(){
+			// summary:
+			//		Function to adapt the IE range by removing leading 'newlines'
+			//		Needed to fix issue with bold/italics/underline not working if
+			//		range included leading 'newlines'.
+			//		In IE, if a user starts a selection at the very end of a line,
+			//		then the native browser commands will fail to execute correctly.
+			//		To work around the issue,  we can remove all empty nodes from
+			//		the start of the range selection.
+			//
+			//		Note: not needed on Edge because Windows 10 won't let the user make
+			//		a selection containing leading or trailing newlines.
+			var selection = rangeapi.getSelection(this.window);
+			if(selection && selection.rangeCount && !selection.isCollapsed){
+				var range = selection.getRangeAt(0);
+				var firstNode = range.startContainer;
+				var startOffset = range.startOffset;
+
+				while(firstNode.nodeType === 3/*text*/ && startOffset >= firstNode.length && firstNode.nextSibling){
+					//traverse the text nodes until we get to the one that is actually highlighted
+					startOffset = startOffset - firstNode.length;
+					firstNode = firstNode.nextSibling;
+				}
+
+				//Remove the starting ranges until the range does not start with an empty node.
+				var lastNode = null;
+				while(this._isNodeEmpty(firstNode, startOffset) && firstNode !== lastNode){
+					lastNode = firstNode; //this will break the loop in case we can't find the next sibling
+					range = this._removeStartingRangeFromRange(firstNode, range); //move the start container to the next node in the range
+					firstNode = range.startContainer;
+					startOffset = 0; //start at the beginning of the new starting range
+				}
+				selection.removeAllRanges();// this will work as long as users cannot select multiple ranges. I have not been able to do that in the editor.
+				selection.addRange(range);
+			}
+		},
+
+		_adaptIEFormatAreaAndExec: function(command){
+			// summary:
+			//		Function to handle IE's quirkiness regarding how it handles
+			//		format commands on a word.  This involves a lit of node splitting
+			//		and format cloning.
+			// command:
+			//		The format command, needed to check if the desired
+			//		command is true or not.
+			var selection = rangeapi.getSelection(this.window);
+			var doc = this.document;
+			var rs, ret, range, txt, startNode, endNode, breaker, sNode;
+			if(command && selection && selection.isCollapsed){
+				var isApplied = this.queryCommandValue(command);
+				if(isApplied){
+
+					// We have to split backwards until we hit the format
+					var nNames = this._tagNamesForCommand(command);
+					range = selection.getRangeAt(0);
+					var fs = range.startContainer;
+					if(fs.nodeType === 3){
+						var offset = range.endOffset;
+						if(fs.length < offset){
+							//We are not looking from the right node, try to locate the correct one
+							ret = this._adjustNodeAndOffset(rs, offset);
+							fs = ret.node;
+							offset = ret.offset;
+						}
+					}
+					var topNode;
+					while(fs && fs !== this.editNode){
+						// We have to walk back and see if this is still a format or not.
+						// Hm, how do I do this?
+						var tName = fs.tagName ? fs.tagName.toLowerCase() : "";
+						if(array.indexOf(nNames, tName) > -1){
+							topNode = fs;
+							break;
+						}
+						fs = fs.parentNode;
+					}
+
+					// Okay, we have a stopping place, time to split things apart.
+					if(topNode){
+						// Okay, we know how far we have to split backwards, so we have to split now.
+						rs = range.startContainer;
+						var newblock = doc.createElement(topNode.tagName);
+						domConstruct.place(newblock, topNode, "after");
+						if(rs && rs.nodeType === 3){
+							// Text node, we have to split it.
+							var nodeToMove, tNode;
+							var endOffset = range.endOffset;
+							if(rs.length < endOffset){
+								//We are not splitting the right node, try to locate the correct one
+								ret = this._adjustNodeAndOffset(rs, endOffset);
+								rs = ret.node;
+								endOffset = ret.offset;
+							}
+
+							txt = rs.nodeValue;
+							startNode = doc.createTextNode(txt.substring(0, endOffset));
+							var endText = txt.substring(endOffset, txt.length);
+							if(endText){
+								endNode = doc.createTextNode(endText);
+							}
+							// Place the split, then remove original nodes.
+							domConstruct.place(startNode, rs, "before");
+							if(endNode){
+								breaker = doc.createElement("span");
+								breaker.className = "ieFormatBreakerSpan";
+								domConstruct.place(breaker, rs, "after");
+								domConstruct.place(endNode, breaker, "after");
+								endNode = breaker;
+							}
+							domConstruct.destroy(rs);
+
+							// Okay, we split the text.  Now we need to see if we're
+							// parented to the block element we're splitting and if
+							// not, we have to split all the way up.  Ugh.
+							var parentC = startNode.parentNode;
+							var tagList = [];
+							var tagData;
+							while(parentC !== topNode){
+								var tg = parentC.tagName;
+								tagData = {tagName: tg};
+								tagList.push(tagData);
+
+								var newTg = doc.createElement(tg);
+								// Clone over any 'style' data.
+								if(parentC.style){
+									if(newTg.style){
+										if(parentC.style.cssText){
+											newTg.style.cssText = parentC.style.cssText;
+											tagData.cssText = parentC.style.cssText;
+										}
+									}
+								}
+								// If font also need to clone over any font data.
+								if(parentC.tagName === "FONT"){
+									if(parentC.color){
+										newTg.color = parentC.color;
+										tagData.color = parentC.color;
+									}
+									if(parentC.face){
+										newTg.face = parentC.face;
+										tagData.face = parentC.face;
+									}
+									if(parentC.size){  // this check was necessary on IE
+										newTg.size = parentC.size;
+										tagData.size = parentC.size;
+									}
+								}
+								if(parentC.className){
+									newTg.className = parentC.className;
+									tagData.className = parentC.className;
+								}
+
+								// Now move end node and every sibling
+								// after it over into the new tag.
+								if(endNode){
+									nodeToMove = endNode;
+									while(nodeToMove){
+										tNode = nodeToMove.nextSibling;
+										newTg.appendChild(nodeToMove);
+										nodeToMove = tNode;
+									}
+								}
+								if(newTg.tagName == parentC.tagName){
+									breaker = doc.createElement("span");
+									breaker.className = "ieFormatBreakerSpan";
+									domConstruct.place(breaker, parentC, "after");
+									domConstruct.place(newTg, breaker, "after");
+								}else{
+									domConstruct.place(newTg, parentC, "after");
+								}
+								startNode = parentC;
+								endNode = newTg;
+								parentC = parentC.parentNode;
+							}
+
+							// Lastly, move the split out all the split tags
+							// to the new block as they should now be split properly.
+							if(endNode){
+								nodeToMove = endNode;
+								if(nodeToMove.nodeType === 1 || (nodeToMove.nodeType === 3 && nodeToMove.nodeValue)){
+									// Non-blank text and non-text nodes need to clear out that blank space
+									// before moving the contents.
+									newblock.innerHTML = "";
+								}
+								while(nodeToMove){
+									tNode = nodeToMove.nextSibling;
+									newblock.appendChild(nodeToMove);
+									nodeToMove = tNode;
+								}
+							}
+
+							// We had intermediate tags, we have to now recreate them inbetween the split
+							// and restore what styles, classnames, etc, we can.
+							var newrange;
+							if(tagList.length){
+								tagData = tagList.pop();
+								var newContTag = doc.createElement(tagData.tagName);
+								if(tagData.cssText && newContTag.style){
+									newContTag.style.cssText = tagData.cssText;
+								}
+								if(tagData.className){
+									newContTag.className = tagData.className;
+								}
+								if(tagData.tagName === "FONT"){
+									if(tagData.color){
+										newContTag.color = tagData.color;
+									}
+									if(tagData.face){
+										newContTag.face = tagData.face;
+									}
+									if(tagData.size){
+										newContTag.size = tagData.size;
+									}
+								}
+								domConstruct.place(newContTag, newblock, "before");
+								while(tagList.length){
+									tagData = tagList.pop();
+									var newTgNode = doc.createElement(tagData.tagName);
+									if(tagData.cssText && newTgNode.style){
+										newTgNode.style.cssText = tagData.cssText;
+									}
+									if(tagData.className){
+										newTgNode.className = tagData.className;
+									}
+									if(tagData.tagName === "FONT"){
+										if(tagData.color){
+											newTgNode.color = tagData.color;
+										}
+										if(tagData.face){
+											newTgNode.face = tagData.face;
+										}
+										if(tagData.size){
+											newTgNode.size = tagData.size;
+										}
+									}
+									newContTag.appendChild(newTgNode);
+									newContTag = newTgNode;
+								}
+
+								// Okay, everything is theoretically split apart and removed from the content
+								// so insert the dummy text to select, select it, then
+								// clear to position cursor.
+								sNode = doc.createTextNode(".");
+								breaker.appendChild(sNode);
+								newContTag.appendChild(sNode);
+								newrange = rangeapi.create(this.window);
+								newrange.setStart(sNode, 0);
+								newrange.setEnd(sNode, sNode.length);
+								selection.removeAllRanges();
+								selection.addRange(newrange);
+								this.selection.collapse(false);
+								sNode.parentNode.innerHTML = "";
+							}else{
+								// No extra tags, so we have to insert a breaker point and rely
+								// on filters to remove it later.
+								breaker = doc.createElement("span");
+								breaker.className = "ieFormatBreakerSpan";
+								sNode = doc.createTextNode(".");
+								breaker.appendChild(sNode);
+								domConstruct.place(breaker, newblock, "before");
+								newrange = rangeapi.create(this.window);
+								newrange.setStart(sNode, 0);
+								newrange.setEnd(sNode, sNode.length);
+								selection.removeAllRanges();
+								selection.addRange(newrange);
+								this.selection.collapse(false);
+								sNode.parentNode.innerHTML = "";
+							}
+							if(!newblock.firstChild){
+								// Empty, we don't need it.  Split was at end or similar
+								// So, remove it.
+								domConstruct.destroy(newblock);
+							}
+							return true;
+						}
+					}
+					return false;
+				}else{
+					range = selection.getRangeAt(0);
+					rs = range.startContainer;
+					if(rs && rs.nodeType === 3){
+						// Text node, we have to split it.
+						var offset = range.startOffset;
+						if(rs.length < offset){
+							//We are not splitting the right node, try to locate the correct one
+							ret = this._adjustNodeAndOffset(rs, offset);
+							rs = ret.node;
+							offset = ret.offset;
+						}
+						txt = rs.nodeValue;
+						startNode = doc.createTextNode(txt.substring(0, offset));
+						var endText = txt.substring(offset);
+						if(endText !== ""){
+							endNode = doc.createTextNode(txt.substring(offset));
+						}
+						// Create a space, we'll select and bold it, so
+						// the whole word doesn't get bolded
+						breaker = doc.createElement("span");
+						sNode = doc.createTextNode(".");
+						breaker.appendChild(sNode);
+						if(startNode.length){
+							domConstruct.place(startNode, rs, "after");
+						}else{
+							startNode = rs;
+						}
+						domConstruct.place(breaker, startNode, "after");
+						if(endNode){
+							domConstruct.place(endNode, breaker, "after");
+						}
+						domConstruct.destroy(rs);
+						var newrange = rangeapi.create(this.window);
+						newrange.setStart(sNode, 0);
+						newrange.setEnd(sNode, sNode.length);
+						selection.removeAllRanges();
+						selection.addRange(newrange);
+						doc.execCommand(command);
+						domConstruct.place(breaker.firstChild, breaker, "before");
+						domConstruct.destroy(breaker);
+						newrange.setStart(sNode, 0);
+						newrange.setEnd(sNode, sNode.length);
+						selection.removeAllRanges();
+						selection.addRange(newrange);
+						this.selection.collapse(false);
+						sNode.parentNode.innerHTML = "";
+						return true;
+					}
+				}
+			}else{
+				return false;
+			}
+		},
+
+		_adaptIEList: function(command /*===== , argument =====*/){
+			// summary:
+			//		This function handles normalizing the IE list behavior as
+			//		much as possible.
+			// command:
+			//		The list command to execute.
+			// argument:
+			//		Any additional argument.
+			// tags:
+			//		private
+			var selection = rangeapi.getSelection(this.window);
+			if(selection.isCollapsed){
+				// In the case of no selection, let's commonize the behavior and
+				// make sure that it indents if needed.
+				if(selection.rangeCount && !this.queryCommandValue(command)){
+					var range = selection.getRangeAt(0);
+					var sc = range.startContainer;
+					if(sc && sc.nodeType == 3){
+						// text node.  Lets see if there is a node before it that isn't
+						// some sort of breaker.
+						if(!range.startOffset){
+							// We're at the beginning of a text area.  It may have been br split
+							// Who knows?  In any event, we must create the list manually
+							// or IE may shove too much into the list element.  It seems to
+							// grab content before the text node too if it's br split.
+							// Why can't IE work like everyone else?
+							// This problem also happens on Edge.
+
+							// Create a space, we'll select and bold it, so
+							// the whole word doesn't get bolded
+							var lType = "ul";
+							if(command === "insertorderedlist"){
+								lType = "ol";
+							}
+							var list = this.document.createElement(lType);
+							var li = domConstruct.create("li", null, list);
+							domConstruct.place(list, sc, "before");
+							// Move in the text node as part of the li.
+							li.appendChild(sc);
+							// We need a br after it or the enter key handler
+							// sometimes throws errors.
+							domConstruct.create("br", null, list, "after");
+							// Okay, now lets move our cursor to the beginning.
+							var newrange = rangeapi.create(this.window);
+							newrange.setStart(sc, 0);
+							newrange.setEnd(sc, sc.length);
+							selection.removeAllRanges();
+							selection.addRange(newrange);
+							this.selection.collapse(true);
+							return true;
+						}
+					}
+				}
+			}
+			return false;
+		},
+
+		_handleTextColorOrProperties: function(command, argument){
+			// summary:
+			//		This function handles applying text color as best it is
+			//		able to do so when the selection is collapsed, making the
+			//		behavior cross-browser consistent. It also handles the name
+			//		and size for IE.
+			// command:
+			//		The command.
+			// argument:
+			//		Any additional arguments.
+			// tags:
+			//		private
+			var selection = rangeapi.getSelection(this.window);
+			var doc = this.document;
+			var rs, ret, range, txt, startNode, endNode, breaker, sNode;
+			argument = argument || null;
+			if(command && selection && selection.isCollapsed){
+				if(selection.rangeCount){
+					range = selection.getRangeAt(0);
+					rs = range.startContainer;
+					if(rs && rs.nodeType === 3){
+						// Text node, we have to split it.
+						var offset = range.startOffset;
+						if(rs.length < offset){
+							//We are not splitting the right node, try to locate the correct one
+							ret = this._adjustNodeAndOffset(rs, offset);
+							rs = ret.node;
+							offset = ret.offset;
+						}
+						txt = rs.nodeValue;
+						startNode = doc.createTextNode(txt.substring(0, offset));
+						var endText = txt.substring(offset);
+						if(endText !== ""){
+							endNode = doc.createTextNode(txt.substring(offset));
+						}
+						// Create a space, we'll select and bold it, so
+						// the whole word doesn't get bolded
+						breaker = doc.createElement("span");
+						sNode = doc.createTextNode(".");
+						breaker.appendChild(sNode);
+						// Create a junk node to avoid it trying to style the breaker.
+						// This will get destroyed later.
+						var extraSpan = doc.createElement("span");
+						breaker.appendChild(extraSpan);
+						if(startNode.length){
+							domConstruct.place(startNode, rs, "after");
+						}else{
+							startNode = rs;
+						}
+						domConstruct.place(breaker, startNode, "after");
+						if(endNode){
+							domConstruct.place(endNode, breaker, "after");
+						}
+						domConstruct.destroy(rs);
+						var newrange = rangeapi.create(this.window);
+						newrange.setStart(sNode, 0);
+						newrange.setEnd(sNode, sNode.length);
+						selection.removeAllRanges();
+						selection.addRange(newrange);
+						if(has("webkit")){
+							// WebKit is frustrating with positioning the cursor.
+							// It stinks to have a selected space, but there really
+							// isn't much choice here.
+							var style = "color";
+							if(command === "hilitecolor" || command === "backcolor"){
+								style = "backgroundColor";
+							}
+							domStyle.set(breaker, style, argument);
+							this.selection.remove();
+							domConstruct.destroy(extraSpan);
+							breaker.innerHTML = "&#160;";	// &nbsp;
+							this.selection.selectElement(breaker);
+							this.focus();
+						}else{
+							this.execCommand(command, argument);
+							domConstruct.place(breaker.firstChild, breaker, "before");
+							domConstruct.destroy(breaker);
+							newrange.setStart(sNode, 0);
+							newrange.setEnd(sNode, sNode.length);
+							selection.removeAllRanges();
+							selection.addRange(newrange);
+							this.selection.collapse(false);
+							sNode.parentNode.removeChild(sNode);
+						}
+						return true;
+					}
+				}
+			}
+			return false;
+		},
+
+		_adjustNodeAndOffset: function(/*DomNode*/node, /*Int*/offset){
+			// summary:
+			//		In the case there are multiple text nodes in a row the offset may not be within the node.
+			//		If the offset is larger than the node length, it will attempt to find
+			//		the next text sibling until it locates the text node in which the offset refers to
+			// node:
+			//		The node to check.
+			// offset:
+			//		The position to find within the text node
+			// tags:
+			//		private.
+			while(node.length < offset && node.nextSibling && node.nextSibling.nodeType === 3){
+				//Adjust the offset and node in the case of multiple text nodes in a row
+				offset = offset - node.length;
+				node = node.nextSibling;
+			}
+			return {"node": node, "offset": offset};
+		},
+
+		_tagNamesForCommand: function(command){
+			// summary:
+			//		Function to return the tab names that are associated
+			//		with a particular style.
+			// command: String
+			//		The command to return tags for.
+			// tags:
+			//		private
+			if(command === "bold"){
+				return ["b", "strong"];
+			}else if(command === "italic"){
+				return ["i", "em"];
+			}else if(command === "strikethrough"){
+				return ["s", "strike"];
+			}else if(command === "superscript"){
+				return ["sup"];
+			}else if(command === "subscript"){
+				return ["sub"];
+			}else if(command === "underline"){
+				return ["u"];
+			}
+			return [];
+		},
+
+		_stripBreakerNodes: function(/*DOMNode*/ node){
+			// summary:
+			//		Function for stripping out the breaker spans inserted by the formatting command.
+			//		Registered as a filter for IE, handles the breaker spans needed to fix up
+			//		How bold/italic/etc, work when selection is collapsed (single cursor).
+			if(!this.isLoaded){
+				return;
+			} // this method requires init to be complete
+			query(".ieFormatBreakerSpan", node).forEach(function(b){
+				while(b.firstChild){
+					domConstruct.place(b.firstChild, b, "before");
+				}
+				domConstruct.destroy(b);
+			});
+			return node;
+		},
+
+		_stripTrailingEmptyNodes: function(/*DOMNode*/ node){
+			// summary:
+			//		Function for stripping trailing nodes without any text, excluding trailing nodes
+			//		like <img> or <div><img></div>, even though they don't have text either.
+
+			function isEmpty(node){
+				// If not for old IE we could check for Element children by node.firstElementChild
+				return (/^(p|div|br)$/i.test(node.nodeName) && node.children.length == 0 &&
+					/^[\s\xA0]*$/.test(node.textContent || node.innerText || "")) ||
+					(node.nodeType === 3/*text*/ && /^[\s\xA0]*$/.test(node.nodeValue));
+			}
+			while(node.lastChild && isEmpty(node.lastChild)){
+				domConstruct.destroy(node.lastChild);
+			}
+
+			return node;
+		},
+
+		// Needed to support ToggleDir plugin.  Intentionally not inside if(has("dojo-bidi")) block
+		// so that (for backwards compatibility) ToggleDir plugin works even when has("dojo-bidi") is falsy.
+		_setTextDirAttr: function(/*String*/ value){
+			// summary:
+			//		Sets textDir attribute.  Sets direction of editNode accordingly.
+			this._set("textDir", value);
+			this.onLoadDeferred.then(lang.hitch(this, function(){
+				this.editNode.dir = value;
+			}));
+		}
+	});
+
+	return RichText;
+});
diff --git a/src/main/resources/static/dijit/_editor/_Plugin.js b/src/main/resources/static/dijit/_editor/_Plugin.js
new file mode 100644
index 0000000000000000000000000000000000000000..f82b0672735c243a6f2778f0d2dee22cf4443861
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/_Plugin.js
@@ -0,0 +1,308 @@
+define([
+	"dojo/_base/connect", // connect.connect
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang", // lang.mixin, lang.hitch
+	"../Destroyable",
+	"../form/Button"
+], function(connect, declare, lang, Destroyable, Button){
+
+	// module:
+	//		dijit/_editor/_Plugin
+
+	var _Plugin = declare("dijit._editor._Plugin", Destroyable, {
+		// summary:
+		//		Base class for a "plugin" to the editor, which is usually
+		//		a single button on the Toolbar and some associated code
+
+		constructor: function(args){
+			// summary:
+			//		Create the plugin.
+			// args: Object?
+			//		Initial settings for any of the attributes.
+
+			this.params = args || {};
+			lang.mixin(this, this.params);
+			this._attrPairNames = {};
+		},
+
+		// editor: [const] dijit.Editor
+		//		Points to the parent editor
+		editor: null,
+
+		// iconClassPrefix: [const] String
+		//		The CSS class name for the button node is formed from `iconClassPrefix` and `command`
+		iconClassPrefix: "dijitEditorIcon",
+
+		// button: dijit/_WidgetBase?
+		//		Pointer to `dijit/form/Button` or other widget (ex: `dijit/form/FilteringSelect`)
+		//		that is added to the toolbar to control this plugin.
+		//		If not specified, will be created on initialization according to `buttonClass`
+		button: null,
+
+		// command: String
+		//		String like "insertUnorderedList", "outdent", "justifyCenter", etc. that represents an editor command.
+		//		Passed to editor.execCommand() if `useDefaultCommand` is true.
+		command: "",
+
+		// useDefaultCommand: Boolean
+		//		If true, this plugin executes by calling Editor.execCommand() with the argument specified in `command`.
+		useDefaultCommand: true,
+
+		// buttonClass: Widget Class
+		//		Class of widget (ex: dijit.form.Button or dijit/form/FilteringSelect)
+		//		that is added to the toolbar to control this plugin.
+		//		This is used to instantiate the button, unless `button` itself is specified directly.
+		buttonClass: Button,
+
+		// disabled: Boolean
+		//		Flag to indicate if this plugin has been disabled and should do nothing
+		//		helps control button state, among other things.  Set via the setter api.
+		disabled: false,
+
+		getLabel: function(/*String*/key){
+			// summary:
+			//		Returns the label to use for the button
+			// tags:
+			//		private
+			return this.editor.commands[key];		// String
+		},
+
+		_initButton: function(){
+			// summary:
+			//		Initialize the button or other widget that will control this plugin.
+			//		This code only works for plugins controlling built-in commands in the editor.
+			// tags:
+			//		protected extension
+			if(this.command.length){
+				var label = this.getLabel(this.command),
+					editor = this.editor,
+					className = this.iconClassPrefix + " " + this.iconClassPrefix + this.command.charAt(0).toUpperCase() + this.command.substr(1);
+				if(!this.button){
+					var props = lang.mixin({
+						label: label,
+						ownerDocument: editor.ownerDocument,
+						dir: editor.dir,
+						lang: editor.lang,
+						showLabel: false,
+						iconClass: className,
+						dropDown: this.dropDown,
+						tabIndex: "-1"
+					}, this.params || {});
+
+					// Avoid creating Button with a name like "dijit/editor/_plugins/ToggleDir", since that name becomes
+					// a global object, and then if the ToggleDir plugin is referenced again, _Plugin.js will
+					// find the <input> rather than the ToggleDir module.
+					// Not necessary in 2.0 once the getObject() call is removed from _Plugin.js.
+					delete props.name;
+
+					this.button = new this.buttonClass(props);
+				}
+			}
+			if(this.get("disabled") && this.button){
+				this.button.set("disabled", this.get("disabled"));
+			}
+		},
+
+		destroy: function(){
+			if(this.dropDown){
+				this.dropDown.destroyRecursive();
+			}
+
+			this.inherited(arguments);
+		},
+
+		connect: function(o, f, tf){
+			// summary:
+			//		Deprecated.  Use this.own() with dojo/on or dojo/aspect.instead.
+			//
+			//		Make a connect.connect() that is automatically disconnected when this plugin is destroyed.
+			//		Similar to `dijit/_Widget.connect()`.
+			// tags:
+			//		protected deprecated
+
+			this.own(connect.connect(o, f, this, tf));
+		},
+
+		updateState: function(){
+			// summary:
+			//		Change state of the plugin to respond to events in the editor.
+			// description:
+			//		This is called on meaningful events in the editor, such as change of selection
+			//		or caret position (but not simple typing of alphanumeric keys).   It gives the
+			//		plugin a chance to update the CSS of its button.
+			//
+			//		For example, the "bold" plugin will highlight/unhighlight the bold button depending on whether the
+			//		characters next to the caret are bold or not.
+			//
+			//		Only makes sense when `useDefaultCommand` is true, as it calls Editor.queryCommandEnabled(`command`).
+			var e = this.editor,
+				c = this.command,
+				checked, enabled;
+			if(!e || !e.isLoaded || !c.length){
+				return;
+			}
+			var disabled = this.get("disabled");
+			if(this.button){
+				try{
+					enabled = !disabled && e.queryCommandEnabled(c);
+					if(this.enabled !== enabled){
+						this.enabled = enabled;
+						this.button.set('disabled', !enabled);
+					}
+					if(enabled){
+						if(typeof this.button.checked == 'boolean'){
+							checked = e.queryCommandState(c);
+							if(this.checked !== checked){
+								this.checked = checked;
+								this.button.set('checked', e.queryCommandState(c));
+							}
+						}
+					}
+				}catch(e){
+					console.log(e); // FIXME: we shouldn't have debug statements in our code.  Log as an error?
+				}
+			}
+		},
+
+		setEditor: function(/*dijit/Editor*/ editor){
+			// summary:
+			//		Tell the plugin which Editor it is associated with.
+
+			// TODO: refactor code to just pass editor to constructor.
+
+			// FIXME: detach from previous editor!!
+			this.editor = editor;
+
+			// FIXME: prevent creating this if we don't need to (i.e., editor can't handle our command)
+			this._initButton();
+
+			// Processing for buttons that execute by calling editor.execCommand()
+			if(this.button && this.useDefaultCommand){
+				if(this.editor.queryCommandAvailable(this.command)){
+					this.own(this.button.on("click",
+						lang.hitch(this.editor, "execCommand", this.command, this.commandArg)
+					));
+				}else{
+					// hide button because editor doesn't support command (due to browser limitations)
+					this.button.domNode.style.display = "none";
+				}
+			}
+
+			this.own(this.editor.on("NormalizedDisplayChanged", lang.hitch(this, "updateState")));
+		},
+
+		setToolbar: function(/*dijit/Toolbar*/ toolbar){
+			// summary:
+			//		Tell the plugin to add it's controller widget (often a button)
+			//		to the toolbar.  Does nothing if there is no controller widget.
+
+			// TODO: refactor code to just pass toolbar to constructor.
+
+			if(this.button){
+				toolbar.addChild(this.button);
+			}
+			// console.debug("adding", this.button, "to:", toolbar);
+		},
+
+		set: function(/* attribute */ name, /* anything */ value){
+			// summary:
+			//		Set a property on a plugin
+			// name:
+			//		The property to set.
+			// value:
+			//		The value to set in the property.
+			// description:
+			//		Sets named properties on a plugin which may potentially be handled by a
+			//		setter in the plugin.
+			//		For example, if the plugin has a properties "foo"
+			//		and "bar" and a method named "_setFooAttr", calling:
+			//	|	plugin.set("foo", "Howdy!");
+			//		would be equivalent to writing:
+			//	|	plugin._setFooAttr("Howdy!");
+			//		and:
+			//	|	plugin.set("bar", 3);
+			//		would be equivalent to writing:
+			//	|	plugin.bar = 3;
+			//
+			//		set() may also be called with a hash of name/value pairs, ex:
+			//	|	plugin.set({
+			//	|		foo: "Howdy",
+			//	|		bar: 3
+			//	|	})
+			//		This is equivalent to calling set(foo, "Howdy") and set(bar, 3)
+			if(typeof name === "object"){
+				for(var x in name){
+					this.set(x, name[x]);
+				}
+				return this;
+			}
+			var names = this._getAttrNames(name);
+			if(this[names.s]){
+				// use the explicit setter
+				var result = this[names.s].apply(this, Array.prototype.slice.call(arguments, 1));
+			}else{
+				this._set(name, value);
+			}
+			return result || this;
+		},
+
+		get: function(name){
+			// summary:
+			//		Get a property from a plugin.
+			// name:
+			//		The property to get.
+			// description:
+			//		Get a named property from a plugin. The property may
+			//		potentially be retrieved via a getter method. If no getter is defined, this
+			//		just retrieves the object's property.
+			//		For example, if the plugin has a properties "foo"
+			//		and "bar" and a method named "_getFooAttr", calling:
+			//	|	plugin.get("foo");
+			//		would be equivalent to writing:
+			//	|	plugin._getFooAttr();
+			//		and:
+			//	|	plugin.get("bar");
+			//		would be equivalent to writing:
+			//	|	plugin.bar;
+			var names = this._getAttrNames(name);
+			return this[names.g] ? this[names.g]() : this[name];
+		},
+
+		_setDisabledAttr: function(disabled){
+			// summary:
+			//		Function to set the plugin state and call updateState to make sure the
+			//		button is updated appropriately.
+			this._set("disabled", disabled);
+			this.updateState();
+		},
+
+		_getAttrNames: function(name){
+			// summary:
+			//		Helper function for get() and set().
+			//		Caches attribute name values so we don't do the string ops every time.
+			// tags:
+			//		private
+
+			var apn = this._attrPairNames;
+			if(apn[name]){
+				return apn[name];
+			}
+			var uc = name.charAt(0).toUpperCase() + name.substr(1);
+			return (apn[name] = {
+				s: "_set" + uc + "Attr",
+				g: "_get" + uc + "Attr"
+			});
+		},
+
+		_set: function(/*String*/ name, /*anything*/ value){
+			// summary:
+			//		Helper function to set new value for specified attribute
+			this[name] = value;
+		}
+	});
+
+	// Hash mapping plugin name to factory, used for registering plugins
+	_Plugin.registry = {};
+
+	return _Plugin;
+});
diff --git a/src/main/resources/static/dijit/_editor/html.js b/src/main/resources/static/dijit/_editor/html.js
new file mode 100644
index 0000000000000000000000000000000000000000..15fe89419c29080085ef880bf0516c59d901ad0b
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/html.js
@@ -0,0 +1,224 @@
+define([
+	"dojo/_base/array",
+	"dojo/_base/lang", // lang.setObject
+	"dojo/sniff" // has("ie")
+], function(array, lang, has){
+
+	// module:
+	//		dijit/_editor/html
+
+	var exports = {
+		// summary:
+		//		HTML serialization utility functions used by editor
+	};
+	lang.setObject("dijit._editor.html", exports);
+
+	var escape = exports.escapeXml = function(/*String*/ str, /*Boolean?*/ noSingleQuotes){
+		// summary:
+		//		Adds escape sequences for special characters in XML: `&<>"'`.
+		//		Optionally skips escapes for single quotes.
+		str = str.replace(/&/gm, "&amp;").replace(/</gm, "&lt;").replace(/>/gm, "&gt;").replace(/"/gm, "&quot;");
+		if(!noSingleQuotes){
+			str = str.replace(/'/gm, "&#39;");
+		}
+		return str; // string
+	};
+
+	exports.getNodeHtml = function(/*DomNode*/ node){
+		// summary:
+		//		Return string representing HTML for node and it's children
+		var output = [];
+		exports.getNodeHtmlHelper(node, output);
+		return output.join("");
+	};
+
+	exports.getNodeHtmlHelper = function(/*DomNode*/ node, /*String[]*/ output){
+		// summary:
+		//		Pushes array of strings into output[] which represent HTML for node and it's children
+		switch(node.nodeType){
+			case 1: // element node
+				var lName = node.nodeName.toLowerCase();
+				if(!lName || lName.charAt(0) == "/"){
+					// IE does some strange things with malformed HTML input, like
+					// treating a close tag </span> without an open tag <span>, as
+					// a new tag with tagName of /span.  Corrupts output HTML, remove
+					// them.  Other browsers don't prefix tags that way, so will
+					// never show up.
+					return "";
+				}
+				output.push('<', lName);
+
+				// store the list of attributes and sort it to have the
+				// attributes appear in the dictionary order
+				var attrarray = [], attrhash = {};
+				var attr;
+				if(has("dom-attributes-explicit") || has("dom-attributes-specified-flag")){
+					// IE8+ and all other browsers.
+					var i = 0;
+					while((attr = node.attributes[i++])){
+						// ignore all attributes starting with _dj which are
+						// internal temporary attributes used by the editor
+						var n = attr.name;
+						if(n.substr(0, 3) !== '_dj' &&
+							(!has("dom-attributes-specified-flag") || attr.specified) && !(n in attrhash)){    // workaround repeated attributes bug in IE8 (LinkDialog test)
+							var v = attr.value;
+							if(n == 'src' || n == 'href'){
+								if(node.getAttribute('_djrealurl')){
+									v = node.getAttribute('_djrealurl');
+								}
+							}
+							if(has("ie") === 8 && n === "style"){
+								v = v.replace("HEIGHT:", "height:").replace("WIDTH:", "width:");
+							}
+							attrarray.push([n, v]);
+							attrhash[n] = v;
+						}
+					}
+				}else{
+					// IE6-7 code path
+					var clone = /^input$|^img$/i.test(node.nodeName) ? node : node.cloneNode(false);
+					var s = clone.outerHTML;
+					// Split up and manage the attrs via regexp
+					// similar to prettyPrint attr logic.
+					var rgxp_attrsMatch = /[\w-]+=("[^"]*"|'[^']*'|\S*)/gi
+					var attrSplit = s.match(rgxp_attrsMatch);
+					s = s.substr(0, s.indexOf('>'));
+					array.forEach(attrSplit, function(attr){
+						if(attr){
+							var idx = attr.indexOf("=");
+							if(idx > 0){
+								var key = attr.substring(0, idx);
+								if(key.substr(0, 3) != '_dj'){
+									if(key == 'src' || key == 'href'){
+										if(node.getAttribute('_djrealurl')){
+											attrarray.push([key, node.getAttribute('_djrealurl')]);
+											return;
+										}
+									}
+									var val, match;
+									switch(key){
+										case 'style':
+											val = node.style.cssText.toLowerCase();
+											break;
+										case 'class':
+											val = node.className;
+											break;
+										case 'width':
+											if(lName === "img"){
+												// This somehow gets lost on IE for IMG tags and the like
+												// and we have to find it in outerHTML, known IE oddity.
+												match = /width=(\S+)/i.exec(s);
+												if(match){
+													val = match[1];
+												}
+												break;
+											}
+										case 'height':
+											if(lName === "img"){
+												// This somehow gets lost on IE for IMG tags and the like
+												// and we have to find it in outerHTML, known IE oddity.
+												match = /height=(\S+)/i.exec(s);
+												if(match){
+													val = match[1];
+												}
+												break;
+											}
+										default:
+											val = node.getAttribute(key);
+									}
+									if(val != null){
+										attrarray.push([key, val.toString()]);
+									}
+								}
+							}
+						}
+					}, this);
+				}
+				attrarray.sort(function(a, b){
+					return a[0] < b[0] ? -1 : (a[0] == b[0] ? 0 : 1);
+				});
+				var j = 0;
+				while((attr = attrarray[j++])){
+					output.push(' ', attr[0], '="',
+						(typeof attr[1] === "string" ? escape(attr[1], true) : attr[1]), '"');
+				}
+				switch(lName){
+					case 'br':
+					case 'hr':
+					case 'img':
+					case 'input':
+					case 'base':
+					case 'meta':
+					case 'area':
+					case 'basefont':
+						// These should all be singly closed
+						output.push(' />');
+						break;
+					case 'script':
+						// Browsers handle script tags differently in how you get content,
+						// but innerHTML always seems to work, so insert its content that way
+						// Yes, it's bad to allow script tags in the editor code, but some people
+						// seem to want to do it, so we need to at least return them right.
+						// other plugins/filters can strip them.
+						output.push('>', node.innerHTML, '</', lName, '>');
+						break;
+					default:
+						output.push('>');
+						if(node.hasChildNodes()){
+							exports.getChildrenHtmlHelper(node, output);
+						}
+						output.push('</', lName, '>');
+				}
+				break;
+			case 4: // cdata
+			case 3: // text
+				// FIXME:
+				output.push(escape(node.nodeValue, true));
+				break;
+			case 8: // comment
+				// FIXME:
+				output.push('<!--', escape(node.nodeValue, true), '-->');
+				break;
+			default:
+				output.push("<!-- Element not recognized - Type: ", node.nodeType, " Name: ", node.nodeName, "-->");
+		}
+	};
+
+	exports.getChildrenHtml = function(/*DomNode*/ node){
+		// summary:
+		//		Returns the html content of a DomNode's children
+		var output = [];
+		exports.getChildrenHtmlHelper(node, output);
+		return output.join("");
+	};
+
+	exports.getChildrenHtmlHelper = function(/*DomNode*/ dom, /*String[]*/ output){
+		// summary:
+		//		Pushes the html content of a DomNode's children into out[]
+
+		if(!dom){
+			return;
+		}
+		var nodes = dom["childNodes"] || dom;
+
+		// IE issue.
+		// If we have an actual node we can check parent relationships on for IE,
+		// We should check, as IE sometimes builds invalid DOMS.  If no parent, we can't check
+		// And should just process it and hope for the best.
+		var checkParent = !has("ie") || nodes !== dom;
+
+		var node, i = 0;
+		while((node = nodes[i++])){
+			// IE is broken.  DOMs are supposed to be a tree.  But in the case of malformed HTML, IE generates a graph
+			// meaning one node ends up with multiple references (multiple parents).  This is totally wrong and invalid, but
+			// such is what it is.  We have to keep track and check for this because otherwise the source output HTML will have dups.
+			// No other browser generates a graph.  Leave it to IE to break a fundamental DOM rule.  So, we check the parent if we can
+			// If we can't, nothing more we can do other than walk it.
+			if(!checkParent || node.parentNode == dom){
+				exports.getNodeHtmlHelper(node, output);
+			}
+		}
+	};
+
+	return exports;
+});
diff --git a/src/main/resources/static/dijit/_editor/nls/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5ae7164ae3ac9895555f81f6a82b4da02012591
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/FontChoice.js
@@ -0,0 +1,69 @@
+define({ root:
+//begin v1.x content
+({
+	fontSize: "Size",
+	fontName: "Font",
+	formatBlock: "Format",
+
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+
+	noFormat: "None",
+	p: "Paragraph",
+	h1: "Heading",
+	h2: "Subheading",
+	h3: "Sub-subheading",
+	pre: "Pre-formatted",
+
+	1: "xx-small",
+	2: "x-small",
+	3: "small",
+	4: "medium",
+	5: "large",
+	6: "x-large",
+	7: "xx-large"
+})
+//end v1.x content
+,
+"bs": true,
+"mk": true,
+"sr": true,
+"zh": true,
+"zh-tw": true,
+"uk": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"id": true,
+"hu": true,
+"hr": true,
+"he": true,
+"fr": true,
+"fi": true,
+"eu": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"bg": true,
+"az": true,
+"ar": true
+});
diff --git a/src/main/resources/static/dijit/_editor/nls/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..d1565299096443c2f7fb5cbe9d2454578fe82d4e
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/LinkDialog.js
@@ -0,0 +1,55 @@
+define({ root:
+//begin v1.x content
+({
+	createLinkTitle: "Link Properties",
+	insertImageTitle: "Image Properties",
+	url: "URL:",
+	text: "Description:",
+	target: "Target:",
+	set: "Set",
+	currentWindow: "Current Window",
+	parentWindow: "Parent Window",
+	topWindow: "Topmost Window",
+	newWindow: "New Window"
+})
+//end v1.x content
+,
+"bs": true,
+"mk": true,
+"sr": true,
+"zh": true,
+"zh-tw": true,
+"uk": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"id": true,
+"hu": true,
+"hr": true,
+"he": true,
+"fr": true,
+"fi": true,
+"eu": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"bg": true,
+"az": true,
+"ar": true
+});
diff --git a/src/main/resources/static/dijit/_editor/nls/ar/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/ar/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..e67bb1a5c8fb43b14af3e6891aa2865ff7b5075e
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ar/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "الحجم",
+	fontName: "طاقم طباعة",
+	formatBlock: "النسق",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "أحادي المسا�ة",
+	cursive: "كتابة بحرو� متصلة",
+	fantasy: "خيالي",
+	noFormat: "�لا شيء�",
+	p: "�قرة",
+	h1: "عنوان",
+	h2: "عنوان �رعي",
+	h3: "�رعي-عنوان �رعي",
+	pre: "منسق بص�ة مسبقة",
+	1: "صغير جدا جدا",
+	2: "صغير جدا",
+	3: "صغير",
+	4: "متوسط",
+	5: "كبير",
+	6: "كبير جدا",
+	7: "كبير جدا جدا"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ar/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/ar/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..bc29ecf1f7688cc7f671bbd02dcc39e53d183094
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ar/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "خصائص الوصلة",
+	insertImageTitle: "خصائص الصورة",
+	url: "�عنوان URL:�",
+	text: "الوص�:",
+	target: "الهد�:",
+	set: "تحديد",
+	currentWindow: "النا�ذة الحالية",
+	parentWindow: "النا�ذة الرئيسية",
+	topWindow: "النا�ذة العلوية",
+	newWindow: "�نا�ذة جديدة�"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ar/commands.js b/src/main/resources/static/dijit/_editor/nls/ar/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c3afaf380e87a86af52e9d0ee7ac6a11138d8ea
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ar/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'عريض',
+	'copy': 'نسخ',
+	'cut': 'قص',
+	'delete': 'حذ�',
+	'indent': '�ازاحة للداخل�',
+	'insertHorizontalRule': 'مسطرة أ�قية',
+	'insertOrderedList': '�كش� مرقم�',
+	'insertUnorderedList': 'كش� نقطي',
+	'italic': 'مائل',
+	'justifyCenter': 'محاذاة �ي الوسط',
+	'justifyFull': 'ضبط',
+	'justifyLeft': 'محاذاة الى اليسار',
+	'justifyRight': 'محاذاة الى اليمين',
+	'outdent': 'ازاحة للخارج',
+	'paste': 'لصق',
+	'redo': 'اعادة',
+	'removeFormat': 'ازالة النسق',
+	'selectAll': 'اختيار كل',
+	'strikethrough': 'تشطيب',
+	'subscript': 'رمز س�لي',
+	'superscript': 'رمز علوي',
+	'underline': 'تسطير',
+	'undo': 'تراجع',
+	'unlink': 'ازالة وصلة',
+	'createLink': 'تكوين وصلة',
+	'toggleDir': 'تبديل الاتجاه',
+	'insertImage': 'ادراج صورة',
+	'insertTable': 'ادراج/تحرير جدول',
+	'toggleTableBorder': 'تبديل حدود الجدول',
+	'deleteTable': 'حذ� جدول',
+	'tableProp': 'خصائص الجدول',
+	'htmlToggle': 'مصدر HTML',
+	'foreColor': 'لون الواجهة الأمامية',
+	'hiliteColor': '�لون الخل�ية�',
+	'plainFormatBlock': 'نمط ال�قرة',
+	'formatBlock': 'نمط ال�قرة',
+	'fontSize': 'حجم طاقم الطباعة',
+	'fontName': 'اسم طاقم الطباعة',
+	'tabIndent': 'ازاحة علامة الجدولة للداخل',
+	"fullScreen": "تبديل  الشاشة الكاملة",
+	"viewSource": "\u202bمشاهدة مصدر HTML\u202c",
+	"print": "�طباعة�",
+	"newPage": "ص�حة جديدة",
+	/* Error messages */
+	'systemShortcut': 'يكون التصر� "${0}" متاحا �قط ببرنامج الاستعراض الخاص بك باستخدام المسار المختصر للوحة الم�اتيح.  استخدم ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/az/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/az/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..508c9254b3157949e5985b0c9d6aa63a02b083de
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/az/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	"1" : "xx-kiçik",
+	"2" : "x-kiçik",
+	"formatBlock" : "Format",
+	"3" : "kiçik",
+	"4" : "orta",
+	"5" : "böyük",
+	"6" : "çox-böyük",
+	"7" : "ən böyük",
+	"fantasy" : "fantaziya",
+	"serif" : "serif",
+	"p" : "Abzas",
+	"pre" : "�vvəldən düzəldilmiş",
+	"sans-serif" : "sans-serif",
+	"fontName" : "Åžrift",
+	"h1" : "Başlıq",
+	"h2" : "Alt Başlıq",
+	"h3" : "Alt Alt Başlıq",
+	"monospace" : "Tək aralıqlı",
+	"fontSize" : "Ölçü",
+	"cursive" : "�l yazısı",
+	"noFormat" : "Heç biri"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/az/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/az/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ff1be61150611383516e157a1ba847657cb02b8
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/az/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	"text" : "Yazı:",
+	"insertImageTitle" : "Şəkil başlığı əlavə et",
+	"set" : "Yönəlt",
+	"newWindow" : "Yeni pəncərə",
+	"topWindow" : "Üst pəncərə",
+	"target" : "Hədəf:",
+	"createLinkTitle" : "Köprü başlığı yarat",
+	"parentWindow" : "Ana pəncərə",
+	"currentWindow" : "Hazırki pəncərə",
+	"url" : "URL:"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/az/commands.js b/src/main/resources/static/dijit/_editor/nls/az/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..500c5268e691083c10e5d9ef1377615c44bb6cb4
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/az/commands.js
@@ -0,0 +1,50 @@
+define(
+({
+	"removeFormat" : "Formatı Sil",
+	"copy" :"Köçür",
+	"paste" :"Yapışdır",
+	"selectAll" :"Hamısını seç",
+	"insertOrderedList" :"Nömrəli siyahı", 
+	"insertTable" :"Cədvəl əlavə et",
+	"print" :"Yazdır",
+	"underline" :"Altıxətli",
+	"foreColor" :"Ön plan rəngi",
+	"htmlToggle" :"HTML kodu",
+	"formatBlock" :"Abzas stili",
+	"newPage" :"Yeni səhifə",
+	"insertHorizontalRule" :"Üfüqi qayda",
+	"delete" :"Sil",
+	"insertUnorderedList" :"İşarələnmiş siyahı",
+	"tableProp" :"Cədvəl xüsusiyyətləri",
+	"insertImage" :"Şəkil əlavə et",
+	"superscript" :"Ãœst iÅŸarÉ™",
+	"subscript" :"Alt iÅŸarÉ™",
+	"createLink" :"Körpü yarat",
+	"undo" :"GeriyÉ™ al",
+	"fullScreen" :"Tam ekran aç",
+	"italic" :"Ä°talik",
+	"fontName" :"Yazı tipi",
+	"justifyLeft" :"Sol tərəfə Doğrult",
+	"unlink" :"Körpünü sil",
+	"toggleTableBorder" :"Cədvəl kənarlarını göstər/Gizlət",
+	"viewSource" :"HTML qaynaq kodunu göstər",
+	"fontSize" :"Yazı tipi böyüklüğü",
+	"systemShortcut" :"\"${0}\" prosesi yalnız printerinizdə klaviatura qısayolu ilə istifadə oluna bilər. Bundan istifadə edin",
+	"indent" :"Girinti",
+	"redo" :"YenilÉ™",
+	"strikethrough" :"Üstündən xətt çəkilmiş",
+	"justifyFull" :"DoÄŸrult",
+	"justifyCenter" :"Ortaya doÄŸrult",
+	"hiliteColor" :"Arxa plan rəngi",
+	"deleteTable" :"Cədvəli sil",
+	"outdent" :"Çıxıntı",
+	"cut" :"Kəs",
+	"plainFormatBlock" :"Abzas stili",
+	"toggleDir" :"İstiqaməti dəyişdir",
+	"bold" :"Qalın",
+	"tabIndent" :"Qulp girintisi",
+	"justifyRight" :"SaÄŸa doÄŸrult",
+	"appleKey" : "⌘${0}",
+	"ctrlKey" : "ctrl+${0}"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/bg/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/bg/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..29721e7e2497f9775a0da410c6a5b21803cb0fee
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/bg/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Размер",
+	fontName: "Шрифт",
+	formatBlock: "Формат",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "��ма",
+	p: "Параграф",
+	h1: "Заглавна ча�т",
+	h2: "Подзаглавие",
+	h3: "Под-подзаглавие",
+	pre: "Предварително форматиран",
+	1: "xx-малък",
+	2: "x-малък",
+	3: "малък",
+	4: "�реден",
+	5: "гол�м",
+	6: "x-гол�м",
+	7: "xx-гол�м"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/bg/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/bg/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d92a01b61d4abe6f62905370da74bfef33d5322
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/bg/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Свой�тва на връзка",
+	insertImageTitle: "Свой�тва на изображение",
+	url: "URL:",
+	text: "Опи�ание:",
+	target: "Цел:",
+	set: "Задай",
+	currentWindow: "Текущ прозорец",
+	parentWindow: "Родител�ки прозорец",
+	topWindow: "�ай-горен прозорец",
+	newWindow: "�ов прозорец"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/bg/commands.js b/src/main/resources/static/dijit/_editor/nls/bg/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..d85cc08a9b23bd9e905e6b604c7a689161ddbe81
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/bg/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Получерен',
+	'copy': 'Копирай',
+	'cut': 'Изрежи',
+	'delete': 'Изтрий',
+	'indent': 'От�тъп',
+	'insertHorizontalRule': 'Хоризонтална лини�',
+	'insertOrderedList': '�омериран �пи�ък',
+	'insertUnorderedList': 'Спи�ък � водещи �имволи',
+	'italic': 'Кур�ив',
+	'justifyCenter': 'Центрирано подравн�ване',
+	'justifyFull': 'Дву�транно подравн�ване',
+	'justifyLeft': 'Подравн�ване отл�во',
+	'justifyRight': 'Подравн�ване отд��но',
+	'outdent': 'Обратен от�тъп',
+	'paste': 'По�тави',
+	'redo': 'Върни',
+	'removeFormat': 'Премахни форматирането',
+	'selectAll': 'Избери в�ички',
+	'strikethrough': 'Зачеркване',
+	'subscript': 'Долен индек�',
+	'superscript': 'Горен индек�',
+	'underline': 'Подчертаване',
+	'undo': 'Отмени',
+	'unlink': 'Премахване на връзка',
+	'createLink': 'Създаване на връзка',
+	'toggleDir': 'Превключване на по�ока',
+	'insertImage': 'Вмъкване на изображение',
+	'insertTable': 'Вмъкване/редактиране на таблица',
+	'toggleTableBorder': 'Превключване на граница на таблица',
+	'deleteTable': 'Изтриване на таблица',
+	'tableProp': 'Свой�тво на таблица',
+	'htmlToggle': 'HTML източник',
+	'foreColor': 'Цв�т на предни� план',
+	'hiliteColor': 'Цв�т на фон',
+	'plainFormatBlock': 'Стил на абзац',
+	'formatBlock': 'Стил на абзац',
+	'fontSize': 'Размер на шрифт',
+	'fontName': 'Име на шрифт',
+	'tabIndent': 'От�тъп на табулаци�',
+	"fullScreen": "Превключване на ц�л екран",
+	"viewSource": "Преглед на HTML източник",
+	"print": "Отпечатаване",
+	"newPage": "�ова �траница",
+	/* Error messages */
+	'systemShortcut': 'Дей�твие "${0}" е до�тъпно във Ваши� браузър �амо чрез използване на бърза клавишна комбинаци�. Използвайте ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/bs/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/bs/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..b460bbfa046c50c907a1fd887305e04c1db50686
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/bs/FontChoice.js
@@ -0,0 +1,29 @@
+define({      
+//begin v1.x content
+	fontSize: "Veli�ina",
+	fontName: "Font",
+	formatBlock: "Format",
+
+	serif: "serif",
+	"sans-serif": "bez-serifa",
+	monospace: "monoprostor",
+	cursive: "kurziv",
+	fantasy: "Fantazija",
+
+	noFormat: "ništa",
+	p: "Paragraf",
+	h1: "Naslov",
+	h2: "Podnaslov",
+	h3: "Pod-podnaslov",
+	pre: "Predformatizovano",
+
+	1: "xx-malo",
+	2: "x-malo",
+	3: "maleno",
+	4: "srednje",
+	5: "veliko",
+	6: "x-veliko",
+	7: "xx-veliko"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/bs/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/bs/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef583da04a5f18e02cf295a087996d8ecc79e123
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/bs/LinkDialog.js
@@ -0,0 +1,15 @@
+define({      
+//begin v1.x content
+	createLinkTitle: "Osobine povezivanja",
+	insertImageTitle: "Osobine slike",
+	url: "URL:",
+	text: "Opis",
+	target: "Cilj:",
+	set: "Postav",
+	currentWindow: "Trenutni prozor",
+	parentWindow: "Nadređeni prozor",
+	topWindow: "Najviši prozor",
+	newWindow: "Novi prozor"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/bs/commands.js b/src/main/resources/static/dijit/_editor/nls/bs/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..b94991627bf7461efc7aa6d24e2e8ea4aa2b12bf
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/bs/commands.js
@@ -0,0 +1,52 @@
+define({      
+//begin v1.x content
+	'bold': 'Boldirano',
+	'copy': 'Kopiraj',
+	'cut': 'Izreži',
+	'delete': 'Izbriši',
+	'indent': 'Uvla�i',
+	'insertHorizontalRule': 'Horizontalno pravilo',
+	'insertOrderedList': 'Numerisana lista',
+	'insertUnorderedList': 'Lista oznaka',
+	'italic': 'Kurziv',
+	'justifyCenter': 'Poravnaj po sredini',
+	'justifyFull': 'Poravnaj',
+	'justifyLeft': 'Poravnaj na lijevo',
+	'justifyRight': 'Poravnaj na desno',
+	'outdent': 'Izvuci',
+	'paste': 'Zalijepi',
+	'redo': 'Ponovo napravi',
+	'removeFormat': 'Ukloni format',
+	'selectAll': 'Izaberi sve',
+	'strikethrough': 'Precrtaj',
+	'subscript': 'Indeks',
+	'superscript': 'Superskript',
+	'underline': 'Podvuci',
+	'undo': 'Poništi',
+	'unlink': 'Ukloni link',
+	'createLink': 'Kreiraj link',
+	'toggleDir': 'Promijeni smjer',
+	'insertImage': 'Umetni sliku',
+	'insertTable': 'Umetni/uredi tabelu',
+	'toggleTableBorder': 'Promijeni rub tabele',
+	'deleteTable': 'Briši tabelu',
+	'tableProp': 'Osobina tabele',
+	'htmlToggle': 'HTML izvor',
+	'foreColor': 'Boja prednjeg plana',
+	'hiliteColor': 'Boja pozadine',
+	'plainFormatBlock': 'Stil paragrafa',
+	'formatBlock': 'Stil paragrafa',
+	'fontSize': 'Veli�ina fonta',
+	'fontName': 'Ime fonta',
+	'tabIndent': 'Uvla�enje kartice',
+	"fullScreen": "Promijeni pun ekran",
+	"viewSource": "Pogledaj HTML izvor",
+	"print": "Ispiši",
+	"newPage": "Nova stranica",
+	/* Error messages */
+	'systemShortcut': 'Akcija "${0}"je dostupna u vašem pretraživa�u kad koristite pre�icu tastature. Koristite ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/ca/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/ca/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..bc49d813182d2bb8b971e085ccd79694d9716f96
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ca/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Mida",
+	fontName: "Tipus de lletra",
+	formatBlock: "Format",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monoespai",
+	cursive: "Cursiva",
+	fantasy: "Fantasia",
+	noFormat: "Cap",
+	p: "Paràgraf",
+	h1: "Títol",
+	h2: "Subtítol",
+	h3: "Subsubtítol",
+	pre: "Format previ",
+	1: "xx-petit",
+	2: "x-petit",
+	3: "petit",
+	4: "mitjà",
+	5: "gran",
+	6: "x-gran",
+	7: "xx-gran"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ca/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/ca/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..f81cab3e1013158ffd6ada5dcf5cba5ddf57f7e0
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ca/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Propietats de l\'enllaç",
+	insertImageTitle: "Propietats de la imatge",
+	url: "URL:",
+	text: "Descripció:",
+	target: "Destinació:",
+	set: "Defineix",
+	currentWindow: "Finestra actual",
+	parentWindow: "Finestra pare",
+	topWindow: "Finestra superior",
+	newWindow: "Finestra nova"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ca/commands.js b/src/main/resources/static/dijit/_editor/nls/ca/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1e6d038a794d32f040acae9f74e85b25e031514
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ca/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Negreta',
+	'copy': 'Copia',
+	'cut': 'Retalla',
+	'delete': 'Suprimeix',
+	'indent': 'Sagnat',
+	'insertHorizontalRule': 'Regla horitzontal',
+	'insertOrderedList': 'Llista numerada',
+	'insertUnorderedList': 'Llista de vinyetes',
+	'italic': 'Cursiva',
+	'justifyCenter': 'Alineació centrada',
+	'justifyFull': 'Justifica',
+	'justifyLeft': 'Alineació a l\'esquerra',
+	'justifyRight': 'Alineació a la dreta',
+	'outdent': 'Sagnat a l\'esquerra',
+	'paste': 'Enganxa',
+	'redo': 'Refés',
+	'removeFormat': 'Elimina el format',
+	'selectAll': 'Selecciona-ho tot',
+	'strikethrough': 'Ratllat',
+	'subscript': 'Subíndex',
+	'superscript': 'Superíndex',
+	'underline': 'Subratllat',
+	'undo': 'Desfés',
+	'unlink': 'Elimina l\'enllaç',
+	'createLink': 'Crea un enllaç',
+	'toggleDir': 'Inverteix la direcció',
+	'insertImage': 'Insereix imatge',
+	'insertTable': 'Insereix/edita la taula',
+	'toggleTableBorder': 'Inverteix els contorns de taula',
+	'deleteTable': 'Suprimeix la taula',
+	'tableProp': 'Propietat de taula',
+	'htmlToggle': 'Font HTML',
+	'foreColor': 'Color de primer pla',
+	'hiliteColor': 'Color de fons',
+	'plainFormatBlock': 'Estil de paràgraf',
+	'formatBlock': 'Estil de paràgraf',
+	'fontSize': 'Mida del tipus de lletra',
+	'fontName': 'Nom del tipus de lletra',
+	'tabIndent': 'Sagnat',
+	"fullScreen": "Commuta pantalla completa",
+	"viewSource": "Visualitza font HTML",
+	"print": "Imprimeix",
+	"newPage": "Pàgina nova",
+	/* Error messages */
+	'systemShortcut': 'L\'acció "${0}" és l\'única disponible al navegador utilitzant una drecera del teclat. Utilitzeu ${1}.',
+	'ctrlKey':'control+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/commands.js b/src/main/resources/static/dijit/_editor/nls/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..01dfe1169b8336595b3d138cd62b405e4cac28f5
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/commands.js
@@ -0,0 +1,92 @@
+define({ root:
+//begin v1.x content
+({
+	'bold': 'Bold',
+	'copy': 'Copy',
+	'cut': 'Cut',
+	'delete': 'Delete',
+	'indent': 'Indent',
+	'insertHorizontalRule': 'Horizontal Rule',
+	'insertOrderedList': 'Numbered List',
+	'insertUnorderedList': 'Bullet List',
+	'italic': 'Italic',
+	'justifyCenter': 'Align Center',
+	'justifyFull': 'Justify',
+	'justifyLeft': 'Align Left',
+	'justifyRight': 'Align Right',
+	'outdent': 'Outdent',
+	'paste': 'Paste',
+	'redo': 'Redo',
+	'removeFormat': 'Remove Format',
+	'selectAll': 'Select All',
+	'strikethrough': 'Strikethrough',
+	'subscript': 'Subscript',
+	'superscript': 'Superscript',
+	'underline': 'Underline',
+	'undo': 'Undo',
+	'unlink': 'Remove Link',
+	'createLink': 'Create Link',
+	'toggleDir': 'Toggle Direction',
+	'insertImage': 'Insert Image',
+	'insertTable': 'Insert/Edit Table',
+	'toggleTableBorder': 'Toggle Table Border',
+	'deleteTable': 'Delete Table',
+	'tableProp': 'Table Property',
+	'htmlToggle': 'HTML Source',
+	'foreColor': 'Foreground Color',
+	'hiliteColor': 'Background Color',
+	'plainFormatBlock': 'Paragraph Style',
+	'formatBlock': 'Paragraph Style',
+	'fontSize': 'Font Size',
+	'fontName': 'Font Name',
+	'tabIndent': 'Tab Indent',
+	"fullScreen": "Toggle Full Screen",
+	"viewSource": "View HTML Source",
+	"print": "Print",
+	"newPage": "New Page",
+	/* Error messages */
+	'systemShortcut': 'The "${0}" action is only available in your browser using a keyboard shortcut. Use ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+//end v1.x content
+,
+"bs": true,
+"mk": true,
+"sr": true,
+"zh": true,
+"zh-tw": true,
+"uk": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"id": true,
+"hu": true,
+"hr": true,
+"he": true,
+"fr": true,
+"fi": true,
+"eu": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"bg": true,
+"az": true,
+"ar": true
+});
diff --git a/src/main/resources/static/dijit/_editor/nls/cs/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/cs/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ce5e3bf456fa9e0c9be9119eada51045490b55f
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/cs/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Velikost",
+	fontName: "Písmo",
+	formatBlock: "Formát",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "Žádný",
+	p: "Odstavec",
+	h1: "Nadpis",
+	h2: "Podnadpis",
+	h3: "Podnadpis 2",
+	pre: "Předformátované",
+	1: "extra malé",
+	2: "velmi malé",
+	3: "malé",
+	4: "střední",
+	5: "velké",
+	6: "velmi velké",
+	7: "extra velké"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/cs/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/cs/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..3aea5c8b9ad7c85e818b43ff8bcce2bc4e0bc722
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/cs/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Vlastnosti odkazu",
+	insertImageTitle: "Vlastnosti obrázku",
+	url: "Adresa URL:",
+	text: "Popis:",
+	target: "Cíl:",
+	set: "Nastavit",
+	currentWindow: "Aktuální okno",
+	parentWindow: "Nadřízené okno",
+	topWindow: "Okno nejvyšší úrovně",
+	newWindow: "Nové okno"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/cs/commands.js b/src/main/resources/static/dijit/_editor/nls/cs/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..911f6c648253736d7f77be6292b94c50012fa287
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/cs/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Tu�né',
+	'copy': 'Kopírovat',
+	'cut': 'Vyjmout',
+	'delete': 'Odstranit',
+	'indent': 'Odsadit',
+	'insertHorizontalRule': 'Vodorovná �ára',
+	'insertOrderedList': 'Číslovaný seznam',
+	'insertUnorderedList': 'Seznam s odrážkami',
+	'italic': 'Kurzíva',
+	'justifyCenter': 'Zarovnat na střed',
+	'justifyFull': 'Do bloku',
+	'justifyLeft': 'Zarovnat vlevo',
+	'justifyRight': 'Zarovnat vpravo',
+	'outdent': 'Předsadit',
+	'paste': 'Vložit',
+	'redo': 'Opakovat',
+	'removeFormat': 'Odebrat formát',
+	'selectAll': 'Vybrat vše',
+	'strikethrough': 'Přeškrtnutí',
+	'subscript': 'Dolní index',
+	'superscript': 'Horní index',
+	'underline': 'Podtržení',
+	'undo': 'Zpět',
+	'unlink': 'Odebrat odkaz',
+	'createLink': 'Vytvořit odkaz',
+	'toggleDir': 'Přepnout směr',
+	'insertImage': 'Vložit obrázek',
+	'insertTable': 'Vložit/upravit tabulku',
+	'toggleTableBorder': 'Přepnout ohrani�ení tabulky',
+	'deleteTable': 'Odstranit tabulku',
+	'tableProp': 'Vlastnost tabulky',
+	'htmlToggle': 'Zdroj HTML',
+	'foreColor': 'Barva popředí',
+	'hiliteColor': 'Barva pozadí',
+	'plainFormatBlock': 'Styl odstavce',
+	'formatBlock': 'Styl odstavce',
+	'fontSize': 'Velikost písma',
+	'fontName': 'Název písma',
+	'tabIndent': 'Odsazení tabulátoru',
+	"fullScreen": "Přepnout režim celé obrazovky",
+	"viewSource": "Zobrazit zdroj ve formátu HTML",
+	"print": "Tisk",
+	"newPage": "Nová stránka",
+	/* Error messages */
+	'systemShortcut': 'Akce "${0}" je v prohlíže�i dostupná pouze prostřednictvím klávesové zkratky. Použijte klávesovou zkratku ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/da/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/da/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..d2874175706c86667a34fc0ddd2a0c21948846c3
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/da/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Størrelse",
+	fontName: "Skrifttype",
+	formatBlock: "Format",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "kursiv",
+	fantasy: "fantasy",
+	noFormat: "Ingen",
+	p: "Afsnit",
+	h1: "Overskrift",
+	h2: "Underoverskrift",
+	h3: "Underunderoverskrift",
+	pre: "Forudformateret",
+	1: "xx-small",
+	2: "x-small",
+	3: "small",
+	4: "medium",
+	5: "large",
+	6: "x-large",
+	7: "xx-large"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/da/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/da/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..ab136cf7225c924d35f3e877a271ce72a7616606
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/da/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Linkegenskaber",
+	insertImageTitle: "Billedegenskaber",
+	url: "URL:",
+	text: "Beskrivelse:",
+	target: "MÃ¥l:",
+	set: "Definér",
+	currentWindow: "Aktuelt vindue",
+	parentWindow: "Overordnet vindue",
+	topWindow: "Øverste vindue",
+	newWindow: "Nyt vindue"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/da/commands.js b/src/main/resources/static/dijit/_editor/nls/da/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..06a6042e2918f9af9980d0d5ab5ea37e4abfc6a8
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/da/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Fed',
+	'copy': 'Kopiér',
+	'cut': 'Klip',
+	'delete': 'Slet',
+	'indent': 'Indrykning',
+	'insertHorizontalRule': 'Vandret linje',
+	'insertOrderedList': 'Nummereret liste',
+	'insertUnorderedList': 'Punktliste',
+	'italic': 'Kursiv',
+	'justifyCenter': 'Centreret',
+	'justifyFull': 'Lige margener',
+	'justifyLeft': 'Venstrejusteret',
+	'justifyRight': 'Højrejusteret',
+	'outdent': 'Udrykning',
+	'paste': 'Sæt ind',
+	'redo': 'Annullér Fortryd',
+	'removeFormat': 'Fjern format',
+	'selectAll': 'Markér alle',
+	'strikethrough': 'Gennemstreget',
+	'subscript': 'Sænket skrift',
+	'superscript': 'Hævet skrift',
+	'underline': 'Understreget',
+	'undo': 'Fortryd',
+	'unlink': 'Fjern link',
+	'createLink': 'Opret link',
+	'toggleDir': 'Skift retning',
+	'insertImage': 'Indsæt billede',
+	'insertTable': 'Indsæt/redigér tabel',
+	'toggleTableBorder': 'Skift tabelramme',
+	'deleteTable': 'Slet tabel',
+	'tableProp': 'Tabelegenskab',
+	'htmlToggle': 'HTML-kilde',
+	'foreColor': 'Forgrundsfarve',
+	'hiliteColor': 'Baggrundsfarve',
+	'plainFormatBlock': 'Afsnitstypografi',
+	'formatBlock': 'Afsnitstypografi',
+	'fontSize': 'Skriftstørrelse',
+	'fontName': 'Skriftnavn',
+	'tabIndent': 'Tabulatorindrykning',
+	"fullScreen": "Fuld skærm til/fra",
+	"viewSource": "Vis HTML-kilde",
+	"print": "Udskriv",
+	"newPage": "Ny side",
+	/* Error messages */
+	'systemShortcut': 'Funktionen "${0}" kan kun bruges i din browser med en tastaturgenvej. Brug ${1}.',
+	'ctrlKey':'Ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/de/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/de/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..9bdc80c9986bf6217409aea9809f7c0a88e6b9ab
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/de/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Größe",
+	fontName: "Schriftart",
+	formatBlock: "Format",
+	serif: "Serife",
+	"sans-serif": "Serifenlos",
+	monospace: "Monospaceschrift",
+	cursive: "Kursiv",
+	fantasy: "Fantasie",
+	noFormat: "Keine Angabe",
+	p: "Absatz",
+	h1: "Ãœberschrift",
+	h2: "Unterüberschrift",
+	h3: "Unterunterüberschrift",
+	pre: "Vorformatiert",
+	1: "XXS",
+	2: "XS",
+	3: "S",
+	4: "M",
+	5: "L",
+	6: "XL",
+	7: "XXL"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/de/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/de/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d0d963849e732f3428e08e5fa3cc3477e12ce06
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/de/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Linkeigenschaften",
+	insertImageTitle: "Grafikeigenschaften",
+	url: "URL:",
+	text: "Beschreibung:",
+	target: "Ziel:",
+	set: "Festlegen",
+	currentWindow: "Aktuelles Fenster",
+	parentWindow: "Ãœbergeordnetes Fenster",
+	topWindow: "Aktives Fenster",
+	newWindow: "Neues Fenster"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/de/commands.js b/src/main/resources/static/dijit/_editor/nls/de/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c44295c1781e1e53812293d08c304278135208a
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/de/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Fett',
+	'copy': 'Kopieren',
+	'cut': 'Ausschneiden',
+	'delete': 'Löschen',
+	'indent': 'Einrücken',
+	'insertHorizontalRule': 'Horizontaler Strich',
+	'insertOrderedList': 'Nummerierung',
+	'insertUnorderedList': 'Aufzählungszeichen',
+	'italic': 'Kursiv',
+	'justifyCenter': 'Zentriert',
+	'justifyFull': 'Blocksatz',
+	'justifyLeft': 'Linksbündig',
+	'justifyRight': 'Rechtsbündig',
+	'outdent': 'Ausrücken',
+	'paste': 'Einfügen',
+	'redo': 'Wiederholen',
+	'removeFormat': 'Formatierung entfernen',
+	'selectAll': 'Alles auswählen',
+	'strikethrough': 'Durchgestrichen',
+	'subscript': 'Tiefgestellt',
+	'superscript': 'Hochgestellt',
+	'underline': 'Unterstrichen',
+	'undo': 'Rückgängig',
+	'unlink': 'Link entfernen',
+	'createLink': 'Link erstellen',
+	'toggleDir': 'Richtung wechseln',
+	'insertImage': 'Grafik einfügen',
+	'insertTable': 'Tabelle einfügen/bearbeiten',
+	'toggleTableBorder': 'Tabellenumrandung ein-/ausschalten',
+	'deleteTable': 'Tabelle löschen',
+	'tableProp': 'Tabelleneigenschaft',
+	'htmlToggle': 'HTML-Quelltext',
+	'foreColor': 'Vordergrundfarbe',
+	'hiliteColor': 'Hintergrundfarbe',
+	'plainFormatBlock': 'Absatzstil',
+	'formatBlock': 'Absatzstil',
+	'fontSize': 'Schriftgröße',
+	'fontName': 'Schriftartname',
+	'tabIndent': 'Registerkarteneinrückung',
+	"fullScreen": "Gesamtanzeige",
+	"viewSource": "HTML-Quelle",
+	"print": "Drucken",
+	"newPage": "Neue Seite",
+	/* Error messages */
+	'systemShortcut': 'Die Aktion "${0}" ist nur über einen Direktaufruf in Ihrem Browser verfügbar. Verwenden Sie ${1}.',
+	'ctrlKey':'Strg+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/el/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/el/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..1d978cc025cc4334a91a74db13022146d6f9f5e5
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/el/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Μέγεθος",
+	fontName: "Γ�αμματοσει�ά",
+	formatBlock: "Μο�φή",
+	serif: "με πατο��ες (serif)",
+	"sans-serif": "χω�ίς πατο��ες (sans-serif)",
+	monospace: "σταθε�ο� πλάτους",
+	cursive: "πλάγιοι",
+	fantasy: "φαντασίας",
+	noFormat: "Χω�ίς",
+	p: "Πα�άγ�αφος",
+	h1: "Επικεφαλίδα",
+	h2: "Δευτε�ε�ουσα επικεφαλίδα",
+	h3: "Δευτε�ε�ουσα επικεφαλίδα τ�ίτου επιπέδου",
+	pre: "Π�ο-μο�φοποιημένο",
+	1: "xx-μικ�ά",
+	2: "x-μικ�ά",
+	3: "μικ�ά",
+	4: "μεσαία",
+	5: "μεγάλα",
+	6: "x-μεγάλα",
+	7: "xx-μεγάλα"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/el/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/el/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..d6e72de47491277cff1c0b57d71e23e825bdd1cd
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/el/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Ιδιότητες σ�νδεσης",
+	insertImageTitle: "Ιδιότητες εικόνας",
+	url: "Διε�θυνση URL:",
+	text: "Πε�ιγ�αφή:",
+	target: "Π�οο�ισμός:",
+	set: "Ο�ισμός",
+	currentWindow: "Τ�έχον πα�άθυ�ο",
+	parentWindow: "Γονικό πα�άθυ�ο",
+	topWindow: "Πα�άθυ�ο σε π�ώτο πλάνο",
+	newWindow: "�έο πα�άθυ�ο"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/el/commands.js b/src/main/resources/static/dijit/_editor/nls/el/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..52b2353157669fbeeeea798ee4d7d7ba390be914
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/el/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Έντονα',
+	'copy': 'Αντιγ�αφή',
+	'cut': 'Αποκοπή',
+	'delete': 'Διαγ�αφή',
+	'indent': 'Εσοχή',
+	'insertHorizontalRule': 'Ο�ιζόντια γ�αμμή',
+	'insertOrderedList': 'Α�ιθμημένη λίστα',
+	'insertUnorderedList': 'Λίστα με κουκίδες',
+	'italic': 'Πλάγια',
+	'justifyCenter': 'Στοίχιση στο κέντ�ο',
+	'justifyFull': 'Πλή�ης στοίχιση',
+	'justifyLeft': 'Στοίχιση α�ιστε�ά',
+	'justifyRight': 'Στοίχιση δεξιά',
+	'outdent': 'Μείωση πε�ιθω�ίου',
+	'paste': 'Επικόλληση',
+	'redo': 'Ακ��ωση αναί�εσης',
+	'removeFormat': 'Αφαί�εση μο�φοποίησης',
+	'selectAll': 'Επιλογή όλων',
+	'strikethrough': 'Διαγ�άμμιση',
+	'subscript': 'Δείκτης',
+	'superscript': 'Εκθέτης',
+	'underline': 'Υπογ�άμμιση',
+	'undo': 'Αναί�εση',
+	'unlink': 'Αφαί�εση διασ�νδεσης',
+	'createLink': 'Δημιου�γία διασ�νδεσης',
+	'toggleDir': 'Εναλλαγή κατε�θυνσης',
+	'insertImage': 'Εισαγωγή εικόνας',
+	'insertTable': 'Εισαγωγή/Τ�οποποίηση πίνακα',
+	'toggleTableBorder': 'Εναλλαγή εμφάνισης πε�ιγ�άμματος πίνακα',
+	'deleteTable': 'Διαγ�αφή πίνακα',
+	'tableProp': 'Ιδιότητα πίνακα',
+	'htmlToggle': 'Π�ωτογενής κώδικας HTML',
+	'foreColor': 'Χ�ώμα π�οσκηνίου',
+	'hiliteColor': 'Χ�ώμα φόντου',
+	'plainFormatBlock': 'Στυλ πα�αγ�άφου',
+	'formatBlock': 'Στυλ πα�αγ�άφου',
+	'fontSize': 'Μέγεθος γ�αμματοσει�άς',
+	'fontName': 'Όνομα γ�αμματοσει�άς',
+	'tabIndent': 'Εσοχή με το πλήκτ�ο Tab',
+	"fullScreen": "Εναλλαγή κατάστασης πλή�ους οθόνης",
+	"viewSource": "Π�οβολή π�οέλευσης HTML",
+	"print": "Εκτ�πωση",
+	"newPage": "�έα σελίδα",
+	/* Error messages */
+	'systemShortcut': 'Η ενέ�γεια "${0}" είναι διαθέσιμη στο π�όγ�αμμα πλοήγησης μόνο μέσω μιας συντόμευσης πληκτ�ολογίου. Χ�ησιμοποιήστε τη συντόμευση ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/es/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/es/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..95915aa848303bb8ebd90eaf7445ffd99c3c41a2
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/es/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Tamaño",
+	fontName: "Font",
+	formatBlock: "Formato",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "espacio sencillo",
+	cursive: "cursiva",
+	fantasy: "fantasía",
+	noFormat: "Ninguno",
+	p: "Párrafo",
+	h1: "Cabecera",
+	h2: "Subcabecera",
+	h3: "Sub-subcabecera",
+	pre: "Preformateado",
+	1: "xx-pequeño",
+	2: "x-pequeño",
+	3: "pequeño",
+	4: "medio",
+	5: "grande",
+	6: "x-grande",
+	7: "xx-grande"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/es/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/es/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..d59bba99004c7d7fa778c46272d622cf57ee72d0
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/es/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Propiedades del enlace",
+	insertImageTitle: "Propiedades de la imagen",
+	url: "URL:",
+	text: "Descripción:",
+	target: "Destino:",
+	set: "Establecer",
+	currentWindow: "Ventana actual",
+	parentWindow: "Ventana padre",
+	topWindow: "Ventana superior",
+	newWindow: "Nueva ventana"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/es/commands.js b/src/main/resources/static/dijit/_editor/nls/es/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..27d4f62c80ab1d64f85f6b4c3f3f00fe8e57c30d
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/es/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Negrita',
+	'copy': 'Copiar',
+	'cut': 'Cortar',
+	'delete': 'Suprimir',
+	'indent': 'Sangría',
+	'insertHorizontalRule': 'Regla horizontal',
+	'insertOrderedList': 'Lista numerada',
+	'insertUnorderedList': 'Lista con viñetas',
+	'italic': 'Cursiva',
+	'justifyCenter': 'Alinear centro',
+	'justifyFull': 'Justificar',
+	'justifyLeft': 'Alinear izquierda',
+	'justifyRight': 'Alinear derecha',
+	'outdent': 'Anular sangría',
+	'paste': 'Pegar',
+	'redo': 'Rehacer',
+	'removeFormat': 'Eliminar formato',
+	'selectAll': 'Seleccionar todo',
+	'strikethrough': 'Tachado',
+	'subscript': 'Subíndice',
+	'superscript': 'Superíndice',
+	'underline': 'Subrayado',
+	'undo': 'Deshacer',
+	'unlink': 'Eliminar enlace',
+	'createLink': 'Crear enlace',
+	'toggleDir': 'Conmutar dirección',
+	'insertImage': 'Insertar imagen',
+	'insertTable': 'Insertar/Editar tabla',
+	'toggleTableBorder': 'Conmutar borde de tabla',
+	'deleteTable': 'Suprimir tabla',
+	'tableProp': 'Propiedad de tabla',
+	'htmlToggle': 'Fuente HTML',
+	'foreColor': 'Color de primer plano',
+	'hiliteColor': 'Color de segundo plano',
+	'plainFormatBlock': 'Estilo de párrafo',
+	'formatBlock': 'Estilo de párrafo',
+	'fontSize': 'Tamaño de font',
+	'fontName': 'Nombre de font',
+	'tabIndent': 'Sangría de tabulador',
+	"fullScreen": "Conmutar pantalla completa",
+	"viewSource": "Ver fuente HTML",
+	"print": "Imprimir",
+	"newPage": "Nueva página",
+	/* Error messages */
+	'systemShortcut': 'La acción "${0}" sólo está disponible en su navegador mediante un atajo de teclado. Utilice ${1}.',
+	'ctrlKey':'control+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/eu/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/eu/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..967235c6a012f7b90a92e26d706d030447cb4ba3
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/eu/FontChoice.js
@@ -0,0 +1,29 @@
+define({      
+//begin v1.x content
+	fontSize: "Tamaina",
+	fontName: "Letra-tipoa",
+	formatBlock: "Formatua",
+
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "zuriune bakarrekoa",
+	cursive: "etzana",
+	fantasy: "fantasia",
+
+	noFormat: "Bat ere ez",
+	p: "Paragrafoa",
+	h1: "Izenburua",
+	h2: "Azpiizenburua",
+	h3: "Bigarren azpiizenburua",
+	pre: "Aurretik formateatua",
+
+	1: "xx-txikia",
+	2: "x-txikia",
+	3: "txikia",
+	4: "ertaina",
+	5: "handia",
+	6: "x-handia",
+	7: "xx-handia"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/eu/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/eu/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..5182cc32cefbc5ee48869e09fdd19d8de5322fe4
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/eu/LinkDialog.js
@@ -0,0 +1,15 @@
+define({      
+//begin v1.x content
+	createLinkTitle: "Estekaren propietateak",
+	insertImageTitle: "Irudiaren propietateak",
+	url: "URLa:",
+	text: "Azalpena:",
+	target: "Helburua:",
+	set: "Ezarri",
+	currentWindow: "Uneko leihoa",
+	parentWindow: "Leiho gurasoa",
+	topWindow: "Goi-goiko leihoa",
+	newWindow: "Leiho berria"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/eu/commands.js b/src/main/resources/static/dijit/_editor/nls/eu/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..a28c9463074a618439b0ec150527e1b06e5c95e2
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/eu/commands.js
@@ -0,0 +1,52 @@
+define({      
+//begin v1.x content
+	'bold': 'Lodia',
+	'copy': 'Kopiatu',
+	'cut': 'Moztu',
+	'delete': 'Kendu',
+	'indent': 'Barruranzko koska',
+	'insertHorizontalRule': 'Arau horizontala',
+	'insertOrderedList': 'Zenbakidun zerrenda',
+	'insertUnorderedList': 'Buletdun zerrenda',
+	'italic': 'Etzana',
+	'justifyCenter': 'Lerrokatu erdian',
+	'justifyFull': 'Justifikatuta',
+	'justifyLeft': 'Lerrokatu ezkerrean',
+	'justifyRight': 'Lerrokatu eskuinean',
+	'outdent': 'Kanporanzko koska',
+	'paste': 'Itsatsi',
+	'redo': 'Berregin',
+	'removeFormat': 'Kendu formatua',
+	'selectAll': 'Hautatu guztia',
+	'strikethrough': 'Marratua',
+	'subscript': 'Azpi-indizea',
+	'superscript': 'Goi-indizea',
+	'underline': 'Azpimarratua',
+	'undo': 'Desegin',
+	'unlink': 'Kendu esteka',
+	'createLink': 'Sortu esteka',
+	'toggleDir': 'Txandakatu norabidea',
+	'insertImage': 'Txertatu irudia',
+	'insertTable': 'Txertatu/editatu taula',
+	'toggleTableBorder': 'Txandakatu talaren ertza',
+	'deleteTable': 'Ezabatu taula',
+	'tableProp': 'Taula-propietatea',
+	'htmlToggle': 'HTML iturria',
+	'foreColor': 'Aurreko planoaren kolorea',
+	'hiliteColor': 'Atzeko planoaren kolorea',
+	'plainFormatBlock': 'Paragrafo-estiloa',
+	'formatBlock': 'Paragrafo-estiloa',
+	'fontSize': 'Letraren tamaina',
+	'fontName': 'Letra-tipoaren izena',
+	'tabIndent': 'Fitxaren koska',
+	"fullScreen": "Txandakatu pantaila osoa",
+	"viewSource": "Ikusi HTML iturburua",
+	"print": "Inprimatu",
+	"newPage": "Orrialde berria",
+	/* Error messages */
+	'systemShortcut': '"${0}" ekintza teklatuko lasterbide baten bidez arakatzailean soilik dago erabilgarri. Erabili ${1}.',
+	'ctrlKey':'ktrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/fi/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/fi/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..f274bb1e01c42d3f98c9fb5dce470913f92ae919
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/fi/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Koko",
+	fontName: "Fontti",
+	formatBlock: "Muotoile",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "Ei mitään",
+	p: "Kappale",
+	h1: "Otsikko",
+	h2: "Alatason otsikko",
+	h3: "Alimman tason otsikko",
+	pre: "Esimuotoiltu",
+	1: "xx-small",
+	2: "x-small",
+	3: "small",
+	4: "medium",
+	5: "large",
+	6: "x-large",
+	7: "xx-large"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/fi/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/fi/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..62bd3fd1f90c62e140e3a7f19b8a76f6ea80f12c
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/fi/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Linkin ominaisuudet",
+	insertImageTitle: "Kuvan ominaisuudet",
+	url: "URL-osoite:",
+	text: "Kuvaus:",
+	target: "Kohde:",
+	set: "Aseta",
+	currentWindow: "Nykyinen ikkuna",
+	parentWindow: "Pääikkuna",
+	topWindow: "Päällimmäinen ikkuna",
+	newWindow: "Uusi ikkuna"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/fi/commands.js b/src/main/resources/static/dijit/_editor/nls/fi/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1d08f11223e7b16845e5b332d9b01ac8f364247
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/fi/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Lihavointi',
+	'copy': 'Kopioi',
+	'cut': 'Leikkaa',
+	'delete': 'Poista',
+	'indent': 'Sisennä',
+	'insertHorizontalRule': 'Vaakasuuntainen viiva',
+	'insertOrderedList': 'Numeroitu luettelo',
+	'insertUnorderedList': 'Numeroimaton luettelo',
+	'italic': 'Kursivointi',
+	'justifyCenter': 'Tasaus keskelle',
+	'justifyFull': 'Tasaus',
+	'justifyLeft': 'Tasaus vasemmalle',
+	'justifyRight': 'Tasaus oikealle',
+	'outdent': 'Ulonna',
+	'paste': 'Liitä',
+	'redo': 'Tee uudelleen',
+	'removeFormat': 'Poista muotoilu',
+	'selectAll': 'Valitse kaikki',
+	'strikethrough': 'Yliviivaus',
+	'subscript': 'Alennettu',
+	'superscript': 'Korotettu',
+	'underline': 'Alleviivaus',
+	'undo': 'Kumoa',
+	'unlink': 'Poista linkki',
+	'createLink': 'Luo linkki',
+	'toggleDir': 'Vaihda suuntaa',
+	'insertImage': 'Lisää kuva',
+	'insertTable': 'Lisää taulukko/muokkaa taulukkoa',
+	'toggleTableBorder': 'Ota taulukon kehys käyttöön/poista kehys käytöstä',
+	'deleteTable': 'Poista taulukko',
+	'tableProp': 'Taulukon ominaisuudet',
+	'htmlToggle': 'HTML-lähde',
+	'foreColor': 'Edustaväri',
+	'hiliteColor': 'Taustaväri',
+	'plainFormatBlock': 'Kappaletyyli',
+	'formatBlock': 'Kappaletyyli',
+	'fontSize': 'Fonttikoko',
+	'fontName': 'Fontin nimi',
+	'tabIndent': 'Sarkainsisennys',
+	"fullScreen": "Vaihda koko näyttö",
+	"viewSource": "Näytä HTML-lähde",
+	"print": "Tulosta",
+	"newPage": "Uusi sivu",
+	/* Error messages */
+	'systemShortcut': 'Toiminto "${0}" on käytettävissä selaimessa vain näppäimistön pikatoiminnolla. Käytä seuraavaa: ${1}.',
+	'ctrlKey':'Ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/fr/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/fr/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb38826a5b7c4b9dbd73a282744296c77fc63b51
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/fr/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Taille",
+	fontName: "Police",
+	formatBlock: "Mise en forme",
+	serif: "serif",
+	"sans-serif": "sans serif",
+	monospace: "espacement fixe",
+	cursive: "cursive",
+	fantasy: "fantaisie",
+	noFormat: "Néant",
+	p: "Paragraphe",
+	h1: "En-tête",
+	h2: "Sous-en-tête",
+	h3: "Sous-sous-en-tête",
+	pre: "Pré-mise en forme",
+	1: "très très petite",
+	2: "très petite",
+	3: "petite",
+	4: "moyenne",
+	5: "grande",
+	6: "très grande",
+	7: "très très grande"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/fr/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/fr/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..5e789697a9708d9fbd5bc8f67bb609ccf3594f2c
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/fr/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Propriétés du lien",
+	insertImageTitle: "Propriétés de l'image",
+	url: "URL :",
+	text: "Description :",
+	target: "Cible :",
+	set: "Définir",
+	currentWindow: "Fenêtre actuelle",
+	parentWindow: "Fenêtre parent",
+	topWindow: "Fenêtre supérieure",
+	newWindow: "Nouvelle fenêtre"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/fr/commands.js b/src/main/resources/static/dijit/_editor/nls/fr/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c9a5f6b8a19911336e2aaee32790e171bc43279
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/fr/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Gras',
+	'copy': 'Copier',
+	'cut': 'Couper',
+	'delete': 'Supprimer',
+	'indent': 'Retrait',
+	'insertHorizontalRule': 'Règle horizontale',
+	'insertOrderedList': 'Liste numérotée',
+	'insertUnorderedList': 'Liste à puces',
+	'italic': 'Italique',
+	'justifyCenter': 'Aligner au centre',
+	'justifyFull': 'Justifier',
+	'justifyLeft': 'Aligner à gauche',
+	'justifyRight': 'Aligner à droite',
+	'outdent': 'Retrait négatif',
+	'paste': 'Coller',
+	'redo': 'Rétablir',
+	'removeFormat': 'Supprimer la mise en forme',
+	'selectAll': 'Sélectionner tout',
+	'strikethrough': 'Barrer',
+	'subscript': 'Indice',
+	'superscript': 'Exposant',
+	'underline': 'Souligner',
+	'undo': 'Annuler',
+	'unlink': 'Supprimer le lien',
+	'createLink': 'Créer un lien',
+	'toggleDir': 'Changer de sens',
+	'insertImage': 'Insérer une image',
+	'insertTable': 'Insérer/Modifier un tableau',
+	'toggleTableBorder': 'Afficher/Masquer la bordure du tableau',
+	'deleteTable': 'Supprimer le tableau',
+	'tableProp': 'Propriété du tableau',
+	'htmlToggle': 'Source HTML',
+	'foreColor': 'Couleur avant-plan',
+	'hiliteColor': 'Couleur arrière-plan',
+	'plainFormatBlock': 'Style de paragraphe',
+	'formatBlock': 'Style de paragraphe',
+	'fontSize': 'Taille de police',
+	'fontName': 'Nom de police',
+	'tabIndent': 'Retrait de tabulation',
+	"fullScreen": "Basculer en plein écran",
+	"viewSource": "Afficher la source HTML",
+	"print": "Imprimer",
+	"newPage": "Nouvelle page",
+	/* Error messages */
+	'systemShortcut': 'Action "${0}" uniquement disponible dans votre navigateur via un raccourci clavier. Utilisez ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/he/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/he/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd678a5a6482dd967e76989475aa1a07938b3b18
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/he/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "גודל",
+	fontName: "גופן",
+	formatBlock: "עיצוב",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "לל� ",
+	p: "פיסקה",
+	h1: "כותרת",
+	h2: "תת-כותרת",
+	h3: "תת-תת-כותרת",
+	pre: "מעוצב מר�ש",
+	1: "קטן ביות",
+	2: "קטן מ�וד",
+	3: "קטן",
+	4: "בינוני",
+	5: "גדול",
+	6: "גדול מ�וד",
+	7: "גדול ביותר"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/he/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/he/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..e73470b40dc0edfca0956d6ae12f202102c66cc2
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/he/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "תכונות קישור",
+	insertImageTitle: "תכונות תמונה",
+	url: "URL:�",
+	text: "תי�ור:",
+	target: "יעד:",
+	set: "הגדרה",
+	currentWindow: "חלון נוכחי",
+	parentWindow: "חלון �ב",
+	topWindow: "חלון עליון",
+	newWindow: "חלון חדש"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/he/commands.js b/src/main/resources/static/dijit/_editor/nls/he/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..d403a19a05298d294f358a11991a1d07e78239ae
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/he/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'מודגש',
+	'copy': 'העתקה',
+	'cut': 'גזירה',
+	'delete': 'מחיקה',
+	'indent': 'הגדלת כניסה',
+	'insertHorizontalRule': 'קו �ופקי',
+	'insertOrderedList': 'רשימה ממסופרת',
+	'insertUnorderedList': 'רשימה ע� תבליטי�',
+	'italic': 'נטוי',
+	'justifyCenter': 'יישור למרכז',
+	'justifyFull': 'יישור דו-צדדי',
+	'justifyLeft': 'יישור לימין',
+	'justifyRight': 'יישור לשמ�ל',
+	'outdent': 'הקטנת כניסה',
+	'paste': 'הדבקה',
+	'redo': 'שחזור פעולה',
+	'removeFormat': 'סילוק עיצוב',
+	'selectAll': 'בחירת הכל',
+	'strikethrough': 'קו חוצה',
+	'subscript': 'כתב תחתי',
+	'superscript': 'כתב עילי',
+	'underline': 'קו תחתון',
+	'undo': 'ביטול פעולה',
+	'unlink': 'סילוק הקישור',
+	'createLink': 'יצירת קישור',
+	'toggleDir': 'מיתוג כיוון',
+	'insertImage': 'הוספת תמונה',
+	'insertTable': 'הוספת/עריכת טבלה',
+	'toggleTableBorder': 'מיתוג גבול טבלה',
+	'deleteTable': 'מחיקת טבלה',
+	'tableProp': 'תכונת טבלה',
+	'htmlToggle': 'מקור HTML',
+	'foreColor': 'צבע חזית',
+	'hiliteColor': 'צבע רקע',
+	'plainFormatBlock': 'סגנון פיסקה',
+	'formatBlock': 'סגנון פיסקה',
+	'fontSize': 'גודל גופן',
+	'fontName': 'ש� גופן',
+	'tabIndent': 'כניסת ט�ב',
+	"fullScreen": "מיתוג מסך מל�",
+	"viewSource": "הצגת מקור HTML",
+	"print": "הדפסה",
+	"newPage": "דף חדש",
+	/* Error messages */
+	'systemShortcut': 'הפעולה "${0}" זמינה בדפדפן רק ב�מצעות קיצור דרך במקלדת.  השתמשו בקיצור ${1}.',
+	'ctrlKey':'ctrl+${0}‎',
+	'appleKey':'\u2318${0}‎' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/hr/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/hr/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..40684f53e3099c07f5a9b0dfa81aed2b70551d94
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/hr/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Veli�ina",
+	fontName: "Font",
+	formatBlock: "Oblikovanje",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "jednaki razmak",
+	cursive: "rukopisni",
+	fantasy: "fantastika",
+	noFormat: "Nijedan",
+	p: "Odlomak",
+	h1: "Naslov",
+	h2: "Podnaslov",
+	h3: "Pod-podnaslov",
+	pre: "Prethodno formatirano",
+	1: "vrlo vrlo malo",
+	2: "vrlo malo",
+	3: "malo",
+	4: "srednje",
+	5: "veliko",
+	6: "vrlo veliko",
+	7: "vrlo vrlo veliko"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/hr/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/hr/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..b8fd2ff7ae37a9a570cda2ba9ab5879991f14b88
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/hr/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Svojstva veze",
+	insertImageTitle: "Svojstva slike",
+	url: "URL:",
+	text: "Opis:",
+	target: "Cilj:",
+	set: "Postavi",
+	currentWindow: "Aktivni prozor",
+	parentWindow: "Nadređeni prozor",
+	topWindow: "Najviši prozor",
+	newWindow: "Novi prozor"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/hr/commands.js b/src/main/resources/static/dijit/_editor/nls/hr/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..88822c8b7f24ac4dd3973c603ca8113dc0ae1fbf
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/hr/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Podebljaj',
+	'copy': 'Kopiraj',
+	'cut': 'Izreži',
+	'delete': 'Izbriši',
+	'indent': 'Uvuci',
+	'insertHorizontalRule': 'Vodoravno ravnalo',
+	'insertOrderedList': 'Numerirani popis',
+	'insertUnorderedList': 'Popis s grafi�kim oznakama',
+	'italic': 'Kurziv',
+	'justifyCenter': 'Centriraj',
+	'justifyFull': 'Poravnaj',
+	'justifyLeft': 'Poravnaj lijevo',
+	'justifyRight': 'Poravnaj desno',
+	'outdent': 'Izvuci',
+	'paste': 'Zalijepi',
+	'redo': 'Ponovno napravi',
+	'removeFormat': 'Ukloni oblikovanje',
+	'selectAll': 'Izaberi sve',
+	'strikethrough': 'Precrtaj',
+	'subscript': 'Indeks',
+	'superscript': 'Superskript',
+	'underline': 'Podcrtaj',
+	'undo': 'Poništi',
+	'unlink': 'Ukloni vezu',
+	'createLink': 'Kreiraj vezu',
+	'toggleDir': 'Prebaci smjer',
+	'insertImage': 'Umetni sliku',
+	'insertTable': 'Umetni/Uredi tablicu',
+	'toggleTableBorder': 'Prebaci rub tablice',
+	'deleteTable': 'Izbriši tablicu',
+	'tableProp': 'Svojstvo tablice',
+	'htmlToggle': 'HTML izvor',
+	'foreColor': 'Boja prednjeg plana',
+	'hiliteColor': 'Boja pozadine',
+	'plainFormatBlock': 'Stil odlomka',
+	'formatBlock': 'Stil odlomka',
+	'fontSize': 'Veli�ina fonta',
+	'fontName': 'Ime fonta',
+	'tabIndent': 'Tabulator uvla�enja',
+	"fullScreen": "Prebaci na potpun ekran",
+	"viewSource": "Pogledaj HTML izvor",
+	"print": "Ispis",
+	"newPage": "Nova stranica",
+	/* Error messages */
+	'systemShortcut': '"${0}" akcija je dostupna jedino u vašem pregledniku upotrebom pre�ice tipkovnice. Koristite ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/hu/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/hu/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..c2da9d53dece5483ccfeb9ff20951d2eadf54365
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/hu/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Méret",
+	fontName: "Betűtípus",
+	formatBlock: "Formátum",
+	serif: "talpas",
+	"sans-serif": "talpatlan",
+	monospace: "rögzített szélességű",
+	cursive: "kurzív",
+	fantasy: "fantázia",
+	noFormat: "Nincs",
+	p: "Bekezdés",
+	h1: "Címsor",
+	h2: "Alcím",
+	h3: "Al-alcím",
+	pre: "Előformázott",
+	1: "xx-kicsi",
+	2: "x-kicsi",
+	3: "kicsi",
+	4: "közepes",
+	5: "nagy",
+	6: "x-nagy",
+	7: "xx-nagy"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/hu/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/hu/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..be65c03df0f7a6e103854f2f86520723bce7ce32
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/hu/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Hivatkozás tulajdonságai",
+	insertImageTitle: "Kép tulajdonságai",
+	url: "URL:",
+	text: "Leírás:",
+	target: "Cél:",
+	set: "Beállítás",
+	currentWindow: "Aktuális ablak",
+	parentWindow: "Szülő ablak",
+	topWindow: "Legfelső szintű ablak",
+	newWindow: "Új ablak"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/hu/commands.js b/src/main/resources/static/dijit/_editor/nls/hu/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..894722aec200bea357746ab3393c783e5203a3d6
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/hu/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Félkövér',
+	'copy': 'Másolás',
+	'cut': 'Kivágás',
+	'delete': 'Törlés',
+	'indent': 'Behúzás',
+	'insertHorizontalRule': 'Vízszintes vonalzó',
+	'insertOrderedList': 'Számozott lista',
+	'insertUnorderedList': 'Felsorolásjeles lista',
+	'italic': 'DÅ‘lt',
+	'justifyCenter': 'Középre igazítás',
+	'justifyFull': 'Sorkizárás',
+	'justifyLeft': 'Balra igazítás',
+	'justifyRight': 'Jobbra igazítás',
+	'outdent': 'Negatív behúzás',
+	'paste': 'Beillesztés',
+	'redo': 'Újra',
+	'removeFormat': 'Formázás eltávolítása',
+	'selectAll': 'Összes kijelölése',
+	'strikethrough': '�thúzott',
+	'subscript': 'Alsó index',
+	'superscript': 'Felső index',
+	'underline': 'Aláhúzott',
+	'undo': 'Visszavonás',
+	'unlink': 'Hivatkozás eltávolítása',
+	'createLink': 'Hivatkozás létrehozása',
+	'toggleDir': 'Irány váltókapcsoló',
+	'insertImage': 'Kép beszúrása',
+	'insertTable': 'Táblázat beszúrása/szerkesztése',
+	'toggleTableBorder': 'Táblázatszegély ki-/bekapcsolása',
+	'deleteTable': 'Táblázat törlése',
+	'tableProp': 'Táblázat tulajdonságai',
+	'htmlToggle': 'HTML forrás',
+	'foreColor': 'Előtérszín',
+	'hiliteColor': 'Háttérszín',
+	'plainFormatBlock': 'Bekezdés stílusa',
+	'formatBlock': 'Bekezdés stílusa',
+	'fontSize': 'Betűméret',
+	'fontName': 'Betűtípus',
+	'tabIndent': 'Tab behúzás',
+	"fullScreen": "Váltás teljes képernyőre",
+	"viewSource": "HTML forrás megjelenítése",
+	"print": "Nyomtatás",
+	"newPage": "Új oldal",
+	/* Error messages */
+	'systemShortcut': 'A(z) "${0}" művelet a böngészőben csak billentyűparancs használatával érhető el. Használja a következőt: ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/id/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/id/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..382b8c07b6588b1f99e8213f8f5de3040637359d
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/id/FontChoice.js
@@ -0,0 +1,26 @@
+define(
+({
+	fontSize: "Ukuran",
+	fontName: "Font",
+	formatBlock: "Format",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "None",
+	p: "Paragraf",
+	h1: "Judul",
+	h2: "Sub Judul",
+	h3: "Sub sub judul",
+	pre: "Praformat",
+	1: "xx-kecil",
+	2: "x-kecil",
+	3: "kecil",
+	4: "medium",
+	5: "besar",
+	6: "x-besar",
+	7: "xx-besar"
+})
+);
+
diff --git a/src/main/resources/static/dijit/_editor/nls/id/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/id/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..2c3f9c806b2adca49b3b95d9da68306d64e7b03c
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/id/LinkDialog.js
@@ -0,0 +1,15 @@
+define(
+({
+	createLinkTitle: "Properti Tautan",
+	insertImageTitle: "Properti Gambar",
+	url: "URL:",
+	text: "Deskripsi:",
+	target: "Target:",
+	set: "Atur",
+	currentWindow: "Jendela Saat Ini",
+	parentWindow: "Jendela Induk",
+	topWindow: "Jendela Paling Atas",
+	newWindow: "Jendela Baru"
+})
+);
+
diff --git a/src/main/resources/static/dijit/_editor/nls/id/commands.js b/src/main/resources/static/dijit/_editor/nls/id/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..bdcfd00e1ebc8ede84bb78058d2ce3aeb0728cf5
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/id/commands.js
@@ -0,0 +1,52 @@
+define(
+({
+	'bold': 'Tebal',
+	'copy': 'Salin',
+	'cut': 'Potong',
+	'delete': 'Hapus',
+	'indent': 'Inden',
+	'insertHorizontalRule': 'Penggaris horisontal',
+	'insertOrderedList': 'Daftar Bernomor',
+	'insertUnorderedList': 'Daftar Poin',
+	'italic': 'Miring',
+	'justifyCenter': 'Rata Tengah',
+	'justifyFull': 'Rata Kanan Kiri',
+	'justifyLeft': 'Rata Kiri',
+	'justifyRight': 'Rata Kanan',
+	'outdent': 'Hapus spasi di depan',
+	'paste': 'Tempel',
+	'redo': 'Ulangi',
+	'removeFormat': 'Hapus Format',
+	'selectAll': 'Pilih Semua',
+	'strikethrough': 'Coretan',
+	'subscript': 'Subskrip',
+	'superscript': 'Superskrip',
+	'underline': 'Garis Bawah',
+	'undo': 'Batalkan',
+	'unlink': 'Hapus Tautan',
+	'createLink': 'Buat Tautan',
+	'toggleDir': 'Ubah Arah',
+	'insertImage': 'Masukkan Gambar',
+	'insertTable': 'Masukkan/Edit Tabel',
+	'toggleTableBorder': 'Ubah Tepi Tabel',
+	'deleteTable': 'Hapus Tabel',
+	'tableProp': 'Properti Tabel',
+	'htmlToggle': 'Sumber HTML',
+	'foreColor': 'Warna Latar Depan',
+	'hiliteColor': 'Warna Latar Belakang',
+	'plainFormatBlock': 'Gaya Paragraf',
+	'formatBlock': 'Gaya Paragraf',
+	'fontSize': 'Ukuran Font',
+	'fontName': 'Nama Font',
+	'tabIndent': 'Inden Tab',
+	"fullScreen": "Beralih ke Layar Penuh",
+	"viewSource": "Lihat Sumber HTML",
+	"print": "Cetak",
+	"newPage": "Halaman Baru",
+	/* Error messages */
+	'systemShortcut': 'Tindakan "${0}" hanya tersedia pada peramban Anda menggunakan jalan pintas keyboard. Gunakan ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
+
diff --git a/src/main/resources/static/dijit/_editor/nls/it/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/it/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..e3ab11caebb533947822775da4c39e89996651fa
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/it/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Dimensione",
+	fontName: "Carattere",
+	formatBlock: "Formato",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "spaziatura fissa",
+	cursive: "corsivo",
+	fantasy: "fantasy",
+	noFormat: "Nessuna",
+	p: "Paragrafo",
+	h1: "Intestazione",
+	h2: "Sottointestazione",
+	h3: "Sottointestazione secondaria",
+	pre: "Preformattato",
+	1: "piccolissimo",
+	2: "molto piccolo",
+	3: "piccolo",
+	4: "medio",
+	5: "grande",
+	6: "molto grande",
+	7: "grandissimo"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/it/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/it/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..df7c4bb4836d42ed9b9bdb094f69c93557270a4e
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/it/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Proprietà collegamento",
+	insertImageTitle: "Proprietà immagine",
+	url: "URL:",
+	text: "Descrizione:",
+	target: "Destinazione:",
+	set: "Imposta",
+	currentWindow: "Finestra corrente",
+	parentWindow: "Finestra padre",
+	topWindow: "Finestra superiore",
+	newWindow: "Nuova finestra"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/it/commands.js b/src/main/resources/static/dijit/_editor/nls/it/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..56cac793947cf94b4f53108f21da54c3e5f582c9
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/it/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Grassetto',
+	'copy': 'Copia',
+	'cut': 'Taglia',
+	'delete': 'Elimina',
+	'indent': 'Rientro',
+	'insertHorizontalRule': 'Righello orizzontale',
+	'insertOrderedList': 'Elenco numerato',
+	'insertUnorderedList': 'Elenco puntato',
+	'italic': 'Corsivo',
+	'justifyCenter': 'Allinea al centro',
+	'justifyFull': 'Giustifica',
+	'justifyLeft': 'Allinea a sinistra',
+	'justifyRight': 'Allinea a destra',
+	'outdent': 'Annulla rientro',
+	'paste': 'Incolla',
+	'redo': 'Ripristina',
+	'removeFormat': 'Rimuovi formato',
+	'selectAll': 'Seleziona tutto',
+	'strikethrough': 'Barrato',
+	'subscript': 'Pedice',
+	'superscript': 'Apice',
+	'underline': 'Sottolinea',
+	'undo': 'Annulla',
+	'unlink': 'Rimuovi collegamento',
+	'createLink': 'Crea collegamento',
+	'toggleDir': 'Attiva/Disattiva direzione',
+	'insertImage': 'Inserisci immagine',
+	'insertTable': 'Inserisci/Modifica tabella',
+	'toggleTableBorder': 'Attiva/Disattiva bordo tabella',
+	'deleteTable': 'Elimina tabella',
+	'tableProp': 'Proprietà tabella',
+	'htmlToggle': 'Origine HTML',
+	'foreColor': 'Colore primo piano',
+	'hiliteColor': 'Colore sfondo',
+	'plainFormatBlock': 'Stile paragrafo',
+	'formatBlock': 'Stile paragrafo',
+	'fontSize': 'Dimensione carattere',
+	'fontName': 'Nome carattere',
+	'tabIndent': 'Rientro tabulazione',
+	"fullScreen": "Attiva/Disattiva schermo intero",
+	"viewSource": "Visualizza origine HTML",
+	"print": "Stampa",
+	"newPage": "Nuova pagina",
+	/* Error messages */
+	'systemShortcut': 'La azione "${0}" è disponibile solo nel browser tramite un tasto di scelta rapida. Utilizzare ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ja/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/ja/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..0cd28ac869345d8e1de60a8feddc0ef8c98db076
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ja/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "サイズ",
+	fontName: "フォント",
+	formatBlock: "フォーマット",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "��",
+	p: "段�",
+	h1: "見出�",
+	h2: "副見出�",
+	h3: "副見出��副見出�",
+	pre: "事�フォーマット済�",
+	1: "超極�",
+	2: "極�",
+	3: "å°�",
+	4: "標準",
+	5: "大",
+	6: "特大",
+	7: "超特大"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ja/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/ja/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a230a96fef7f6c3497dcfa9d4974aa25f771d7d
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ja/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "リンク・プロパティー",
+	insertImageTitle: "イメージ・プロパティー",
+	url: "URL:",
+	text: "説明:",
+	target: "ターゲット: ",
+	set: "設定",
+	currentWindow: "�在�ウィンドウ",
+	parentWindow: "親ウィンドウ",
+	topWindow: "最上�ウィンドウ",
+	newWindow: "新�ウィンドウ"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ja/commands.js b/src/main/resources/static/dijit/_editor/nls/ja/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c282872e8ca640df233ad47a0a35ddb15ab7063
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ja/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': '太字',
+	'copy': 'コピー',
+	'cut': '切り�り',
+	'delete': '削除',
+	'indent': 'インデント',
+	'insertHorizontalRule': '水平罫線',
+	'insertOrderedList': '番�付�リスト',
+	'insertUnorderedList': '黒丸付�リスト',
+	'italic': 'イタリック',
+	'justifyCenter': '中央��',
+	'justifyFull': '両端��',
+	'justifyLeft': '左��',
+	'justifyRight': '���',
+	'outdent': 'アウトデント',
+	'paste': '貼り付�',
+	'redo': 'やり直�',
+	'removeFormat': '形��削除',
+	'selectAll': '����択',
+	'strikethrough': '�り消�線',
+	'subscript': '下付�文字',
+	'superscript': '上付�文字',
+	'underline': '下線',
+	'undo': '元�戻�',
+	'unlink': 'リンク�削除',
+	'createLink': 'リンク�作�',
+	'toggleDir': '方��切り替�',
+	'insertImage': 'イメージ�挿入',
+	'insertTable': 'テーブル�挿入/編集',
+	'toggleTableBorder': 'テーブルボーダー�切り替�',
+	'deleteTable': 'テーブル�削除',
+	'tableProp': 'テーブルプロパティ',
+	'htmlToggle': 'HTML ソース',
+	'foreColor': '�景色',
+	'hiliteColor': '背景色',
+	'plainFormatBlock': '段�スタイル',
+	'formatBlock': '段�スタイル',
+	'fontSize': 'フォントサイズ',
+	'fontName': 'フォント�',
+	'tabIndent': 'タブインデント',
+	"fullScreen": "全画�表示�切り替�",
+	"viewSource": "HTML ソース�表示",
+	"print": "�刷",
+	"newPage": "新��ページ",
+	/* Error messages */
+	'systemShortcut': '"${0}" アクションを使用��る���ブラウザー�キーボードショートカットを使用�る場�����。 ${1} を使用������。',
+	'ctrlKey':'Ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/kk/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/kk/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..976e10dd5469210ba6e7385cd4613cb936a117fa
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/kk/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Өлшемі",
+	fontName: "Қаріп",
+	formatBlock: "Пішім",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "көлбеу",
+	fantasy: "fantasy",
+	noFormat: "Ешбір",
+	p: "Еже",
+	h1: "Тақырып",
+	h2: "Ішкі тақырып",
+	h3: "Ішкі-ішкі тақырып",
+	pre: "�лдын ала пішімделген",
+	1: "xx-кіші",
+	2: "x-кіші",
+	3: "кіші",
+	4: "орташа",
+	5: "үлкен",
+	6: "x-үлкен",
+	7: "xx-үлкен"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/kk/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/kk/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..7164e017c6c7d96d81bb3370cd374ef9278ccef0
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/kk/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Сілтеме �ипаттары",
+	insertImageTitle: "Сурет �ипаттары",
+	url: "URL:",
+	text: "Сипаттама:",
+	target: "Мақ�ат:",
+	set: "Орнату",
+	currentWindow: "�ғымдағы терезе",
+	parentWindow: "Ба�ты терезе",
+	topWindow: "Ең жоғарғы терезе",
+	newWindow: "Жаңа терезе"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/kk/commands.js b/src/main/resources/static/dijit/_editor/nls/kk/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..26c4c1fdfde07c6facebd396fe5966e6758d68a3
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/kk/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Қалың',
+	'copy': 'Көшіру',
+	'cut': 'Қиып алу',
+	'delete': 'Жою',
+	'indent': 'Шегіндіру',
+	'insertHorizontalRule': 'Көлденең �ызғыш',
+	'insertOrderedList': '�өмірленген тізім',
+	'insertUnorderedList': 'Таңбалауыш тізім',
+	'italic': 'Көлбеу',
+	'justifyCenter': 'Орта�ы бойынша туралау',
+	'justifyFull': 'Туралау',
+	'justifyLeft': 'Сол жақ бойынша туралау',
+	'justifyRight': 'Оң жақ бойынша туралау',
+	'outdent': 'Солға ығы�у',
+	'paste': 'Қою',
+	'redo': 'Қайтару',
+	'removeFormat': 'Пішімді алып та�тау',
+	'selectAll': 'Барлығын таңдау',
+	'strikethrough': 'Сызылған',
+	'subscript': 'Жола�ты',
+	'superscript': 'Жолү�ті',
+	'underline': '��ты �ызылған',
+	'undo': 'Болдырмау',
+	'unlink': 'Сілтемені алып та�тау',
+	'createLink': 'Сілтеме жа�ау',
+	'toggleDir': 'Бағытты қо�у',
+	'insertImage': 'Суретті кірі�тіру',
+	'insertTable': 'Ке�тені кірі�тіру/өңдеу',
+	'toggleTableBorder': 'Ке�те жиегін қо�у',
+	'deleteTable': 'Ке�тені жою',
+	'tableProp': 'Ке�те �ипаты',
+	'htmlToggle': 'HTML көзі',
+	'foreColor': '�лды тү�і',
+	'hiliteColor': 'Өң тү�і',
+	'plainFormatBlock': 'Еже мәнері',
+	'formatBlock': 'Еже мәнері',
+	'fontSize': 'Қаріп өлшемі',
+	'fontName': 'Қаріп атауы',
+	'tabIndent': 'Қойынды шегіні�і',
+	"fullScreen": "Толық �кранды қо�у",
+	"viewSource": "HTML көзін қарау",
+	"print": "Ба�ып шығару",
+	"newPage": "Жаңа бет",
+	/* Error messages */
+	'systemShortcut': '"${0}" әрекеті шолғышта тек пернелер тірке�імі арқылы қол жетімді. Қолдану ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ko/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/ko/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..566a0877073ff466dca8fa52c06ba66d1bc70e11
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ko/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "�기",
+	fontName: "글꼴",
+	formatBlock: "서�",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "없�",
+	p: "단�",
+	h1: "제목",
+	h2: "부제목",
+	h3: "하위 부제목",
+	pre: "서�� 지정�",
+	1: "가장 작게",
+	2: "조금 작게",
+	3: "작게",
+	4: "중간",
+	5: "�게",
+	6: "조금 �게",
+	7: "가장 �게"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ko/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/ko/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb1c4cefbe8d2bc02dc3eac9341eeb67a3cabc20
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ko/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "�� 특성",
+	insertImageTitle: "�미지 특성",
+	url: "URL:",
+	text: "설명:",
+	target: "대�",
+	set: "설정",
+	currentWindow: "현재 창",
+	parentWindow: "�위 창",
+	topWindow: "최�위 창",
+	newWindow: "새 창"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ko/commands.js b/src/main/resources/static/dijit/_editor/nls/ko/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..09732572dae2beb6920bda01670589253fd148cf
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ko/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': '굵�체',
+	'copy': '복사',
+	'cut': '잘�내기',
+	'delete': '삭제',
+	'indent': '들여쓰기',
+	'insertHorizontalRule': '수� �',
+	'insertOrderedList': '번호 목�',
+	'insertUnorderedList': '글머리표 목�',
+	'italic': '기울임체',
+	'justifyCenter': '가운� 맞춤',
+	'justifyFull': '양쪽 맞춤',
+	'justifyLeft': '왼쪽 맞춤',
+	'justifyRight': '오른쪽 맞춤',
+	'outdent': '내어쓰기',
+	'paste': '붙여넣기',
+	'redo': '다시 실행',
+	'removeFormat': '형� 제거',
+	'selectAll': '모� 선�',
+	'strikethrough': '취소선',
+	'subscript': '아래첨�',
+	'superscript': '위첨�',
+	'underline': '밑줄',
+	'undo': '실행 취소',
+	'unlink': '�� 제거',
+	'createLink': '�� 작성',
+	'toggleDir': '방향 토글',
+	'insertImage': '�미지 삽입',
+	'insertTable': '테�블 삽입/편집',
+	'toggleTableBorder': '테�블 외곽선 토글',
+	'deleteTable': '테�블 삭제',
+	'tableProp': '테�블 특성',
+	'htmlToggle': 'HTML 소스',
+	'foreColor': '전경색',
+	'hiliteColor': '배경색',
+	'plainFormatBlock': '단� 스타�',
+	'formatBlock': '단� 스타�',
+	'fontSize': '글꼴 �기',
+	'fontName': '글꼴 �름',
+	'tabIndent': '탭 들여쓰기',
+	"fullScreen": "전체 화면 토글",
+	"viewSource": "HTML 소스 보기",
+	"print": "�쇄",
+	"newPage": "새 페�지",
+	/* Error messages */
+	'systemShortcut': '"${0}" 조치는 브�우저�서 키보드 단축키를 �용해서만 사용할 수 있습니다. ${1}�(를) 사용하십시오.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/mk/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/mk/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..feaca401ba0bbc402f1a15baf2a12b137fed1624
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/mk/FontChoice.js
@@ -0,0 +1,29 @@
+define({      
+//begin v1.x content
+	fontSize: "Големина",
+	fontName: "Фонт",
+	formatBlock: "Формат",
+
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+
+	noFormat: "�ема",
+	p: "Па�у�",
+	h1: "�а�лов",
+	h2: "Заглавие",
+	h3: "Подзаглавие",
+	pre: "Претходно форматирано",
+
+	1: "xx-мало",
+	2: "x-мало",
+	3: "мало",
+	4: "�редно",
+	5: "големо",
+	6: "x-големо",
+	7: "xx-големо"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/mk/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/mk/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..d42a8f2757d93301bc7e42f48b25231a490b1ca5
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/mk/LinkDialog.js
@@ -0,0 +1,15 @@
+define({      
+//begin v1.x content
+	createLinkTitle: "Свој�тва на вр�ка",
+	insertImageTitle: "Свој�тва на �лика",
+	url: "URL-адре�а:",
+	text: "Опи�:",
+	target: "Цел:",
+	set: "По�тави",
+	currentWindow: "Тековен прозорец",
+	parentWindow: "�адреден прозорец",
+	topWindow: "Краен прозорец",
+	newWindow: "�ов прозорец"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/mk/commands.js b/src/main/resources/static/dijit/_editor/nls/mk/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..0d7a81125a210b254836a695da725b3769878b70
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/mk/commands.js
@@ -0,0 +1,52 @@
+define({      
+//begin v1.x content
+	'bold': 'Задебелено',
+	'copy': 'Копирај',
+	'cut': 'От�ечи',
+	'delete': 'Избриши',
+	'indent': 'Вовлекување',
+	'insertHorizontalRule': 'Хоризонтално правило',
+	'insertOrderedList': '�умериран �пи�ок',
+	'insertUnorderedList': 'Спи�ок �о знаци за подредување',
+	'italic': 'Курзив',
+	'justifyCenter': 'Порамни централно',
+	'justifyFull': 'Порамни',
+	'justifyLeft': 'Порамни налево',
+	'justifyRight': 'Порамни наде�но',
+	'outdent': 'Извлекување',
+	'paste': 'Залепи',
+	'redo': 'Повтори',
+	'removeFormat': 'От�трани формат',
+	'selectAll': 'Избери ги �ите',
+	'strikethrough': 'Прецртано',
+	'subscript': 'Долен индек�',
+	'superscript': 'Горен индек�',
+	'underline': 'Подвлечено',
+	'undo': 'Врати',
+	'unlink': 'От�трани вр�ка',
+	'createLink': 'Создај вр�ка',
+	'toggleDir': 'Префрли на�ока',
+	'insertImage': 'Вметни �лика',
+	'insertTable': 'Вметни/Уреди табела',
+	'toggleTableBorder': 'Префрли раб на табела',
+	'deleteTable': 'Избриши табела',
+	'tableProp': 'Свој�тво на табела',
+	'htmlToggle': 'HTML-извор',
+	'foreColor': 'Боја на преден план',
+	'hiliteColor': 'Боја на заднина',
+	'plainFormatBlock': 'Стил на па�у�',
+	'formatBlock': 'Стил на па�у�',
+	'fontSize': 'Големина на фонт',
+	'fontName': 'Име на фонт',
+	'tabIndent': 'Вовлекување на картичка',
+	"fullScreen": "Префрли на цел екран",
+	"viewSource": "Приказ на HTML-извор",
+	"print": "Печати",
+	"newPage": "�ова �траница",
+	/* Error messages */
+	'systemShortcut': 'Деј�твото "${0}" е до�тапно �амо во вашиот прегледувач �о кори�тење кратенки на та�татурата. Кори�ти ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/nb/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/nb/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..11458f86cdf306282ec88ed87a0f308c1361c160
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/nb/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Størrelse",
+	fontName: "Skrift",
+	formatBlock: "Format",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "kursiv",
+	fantasy: "fantasi",
+	noFormat: "Ingen",
+	p: "Avsnitt",
+	h1: "Overskrift",
+	h2: "Undertittel",
+	h3: "Under-undertittel",
+	pre: "Forhåndsformatert",
+	1: "xx-liten",
+	2: "x-liten",
+	3: "liten",
+	4: "middels",
+	5: "stor",
+	6: "x-stor",
+	7: "xx-stor"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/nb/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/nb/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..c2e4b820d8b7ced1bb4d717a86fa3167dbe2fc93
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/nb/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Koblingsegenskaper",
+	insertImageTitle: "Bildeegenskaper",
+	url: "URL:",
+	text: "Beskrivelse:",
+	target: "MÃ¥l:",
+	set: "Definer",
+	currentWindow: "Gjeldende vindu",
+	parentWindow: "Overordnet vindu",
+	topWindow: "Øverste vindu",
+	newWindow: "Nytt vindu"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/nb/commands.js b/src/main/resources/static/dijit/_editor/nls/nb/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..265759a03bb36a7d818ada8c4f8786b9abd94460
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/nb/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Fet',
+	'copy': 'Kopier',
+	'cut': 'Klipp ut',
+	'delete': 'Slett',
+	'indent': 'Innrykk',
+	'insertHorizontalRule': 'Vannrett strek',
+	'insertOrderedList': 'Nummerert liste',
+	'insertUnorderedList': 'Punktliste',
+	'italic': 'Kursiv',
+	'justifyCenter': 'Midtstill',
+	'justifyFull': 'Juster',
+	'justifyLeft': 'Venstrejuster',
+	'justifyRight': 'Høyrejuster',
+	'outdent': 'Fjern innrykk',
+	'paste': 'Lim inn',
+	'redo': 'Gjør om',
+	'removeFormat': 'Fjern format',
+	'selectAll': 'Velg alle',
+	'strikethrough': 'Gjennomstreking',
+	'subscript': 'Senket skrift',
+	'superscript': 'Hevet skrift',
+	'underline': 'Understreking',
+	'undo': 'Angre',
+	'unlink': 'Fjern kobling',
+	'createLink': 'Opprett kobling',
+	'toggleDir': 'Bytt retning',
+	'insertImage': 'Sett inn bilde',
+	'insertTable': 'Sett inn/rediger tabell',
+	'toggleTableBorder': 'Bytt tabellkant',
+	'deleteTable': 'Slett tabell',
+	'tableProp': 'Tabellegenskap',
+	'htmlToggle': 'HTML-kilde',
+	'foreColor': 'Forgrunnsfarge',
+	'hiliteColor': 'Bakgrunnsfarge',
+	'plainFormatBlock': 'Avsnittsstil',
+	'formatBlock': 'Avsnittsstil',
+	'fontSize': 'Skriftstørrelse',
+	'fontName': 'Skriftnavn',
+	'tabIndent': 'Tabulatorinnrykk',
+	"fullScreen": "Slå på/av full skjerm",
+	"viewSource": "Vis HTML-kilde",
+	"print": "Skriv ut",
+	"newPage": "Ny side",
+	/* Error messages */
+	'systemShortcut': 'Handlingen "${0}" er bare tilgjengelig i nettleseren ved hjelp av en tastatursnarvei. Bruk ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/nl/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/nl/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..69db6d14da28b1e225e4e1c21d199deba5014ce6
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/nl/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Grootte",
+	fontName: "Lettertype",
+	formatBlock: "Opmaak",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursief",
+	fantasy: "fantasy",
+	noFormat: "Geen",
+	p: "Alinea",
+	h1: "Kop",
+	h2: "Subkop",
+	h3: "Sub-subkop",
+	pre: "Vooraf opgemaakt",
+	1: "xx-klein",
+	2: "x-klein",
+	3: "klein",
+	4: "gemiddeld",
+	5: "groot",
+	6: "x-groot",
+	7: "xx-groot"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/nl/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/nl/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..b81c117b92c95eee87d8640270874e3209d10c35
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/nl/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Linkeigenschappen",
+	insertImageTitle: "Afbeeldingseigenschappen",
+	url: "URL:",
+	text: "Beschrijving:",
+	target: "Doel:",
+	set: "Instellen",
+	currentWindow: "Huidig venster",
+	parentWindow: "Hoofdvenster",
+	topWindow: "Bovenste venster",
+	newWindow: "Nieuw venster"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/nl/commands.js b/src/main/resources/static/dijit/_editor/nls/nl/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..432325a0013a9648e54868cac2bff36e9c70d72b
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/nl/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Vet',
+	'copy': 'Kopiëren',
+	'cut': 'Knippen',
+	'delete': 'Wissen',
+	'indent': 'Inspringen',
+	'insertHorizontalRule': 'Horizontale liniaal',
+	'insertOrderedList': 'Genummerde lijst',
+	'insertUnorderedList': 'Lijst met opsommingstekens',
+	'italic': 'Cursief',
+	'justifyCenter': 'Centreren',
+	'justifyFull': 'Uitvullen',
+	'justifyLeft': 'Links uitlijnen',
+	'justifyRight': 'Rechts uitlijnen',
+	'outdent': 'Uitspringen',
+	'paste': 'Plakken',
+	'redo': 'Opnieuw',
+	'removeFormat': 'Opmaak verwijderen',
+	'selectAll': 'Alles selecteren',
+	'strikethrough': 'Doorhalen',
+	'subscript': 'Subscript',
+	'superscript': 'Superscript',
+	'underline': 'Onderstrepen',
+	'undo': 'Ongedaan maken',
+	'unlink': 'Link verwijderen',
+	'createLink': 'Link maken',
+	'toggleDir': 'Schrijfrichting wijzigen',
+	'insertImage': 'Afbeelding invoegen',
+	'insertTable': 'Tabel invoegen/bewerken',
+	'toggleTableBorder': 'Tabelkader wijzigen',
+	'deleteTable': 'Tabel wissen',
+	'tableProp': 'Tabeleigenschap',
+	'htmlToggle': 'HTML-bron',
+	'foreColor': 'Voorgrondkleur',
+	'hiliteColor': 'Achtergrondkleur',
+	'plainFormatBlock': 'Alineastijl',
+	'formatBlock': 'Alineastijl',
+	'fontSize': 'Lettergrootte',
+	'fontName': 'Lettertype',
+	'tabIndent': 'Inspringen',
+	"fullScreen": "Volledig scherm in-/uitschakelen",
+	"viewSource": "HTML-bron bekijken",
+	"print": "Afdrukken",
+	"newPage": "Nieuwe pagina",
+	/* Error messages */
+	'systemShortcut': 'De actie "${0}" is alleen beschikbaar in uw browser via een sneltoetscombinatie. Gebruik ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/pl/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/pl/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..616fb86bd8ce5607b2616e220b422c2715f77597
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/pl/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Rozmiar",
+	fontName: "Czcionka",
+	formatBlock: "Format",
+	serif: "szeryfowa",
+	"sans-serif": "bezszeryfowa",
+	monospace: "czcionka o stałej szerokości",
+	cursive: "kursywa",
+	fantasy: "fantazyjna",
+	noFormat: "Brak",
+	p: "Akapit",
+	h1: "Nagłówek",
+	h2: "Nagłówek 2-go poziomu",
+	h3: "Nagłówek 3-go poziomu",
+	pre: "Wstępnie sformatowane",
+	1: "najmniejsza",
+	2: "mniejsza",
+	3: "mała",
+	4: "średnia",
+	5: "duże",
+	6: "większa",
+	7: "największa"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/pl/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/pl/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..1166dad0777c4fa8801d1a499524640a8af9c6cd
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/pl/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Właściwości odsyłacza",
+	insertImageTitle: "Właściwości obrazu",
+	url: "Adres URL:",
+	text: "Opis:",
+	target: "Docelowe:",
+	set: "Ustaw",
+	currentWindow: "Bieżące okno",
+	parentWindow: "Okno macierzyste",
+	topWindow: "Okno najwyższego poziomu",
+	newWindow: "Nowe okno"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/pl/commands.js b/src/main/resources/static/dijit/_editor/nls/pl/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..1a6f6c108b31b54a603f7e332e260d05c006bbbd
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/pl/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Pogrubienie',
+	'copy': 'Kopiuj',
+	'cut': 'Wytnij',
+	'delete': 'Usuń',
+	'indent': 'Wcięcie',
+	'insertHorizontalRule': 'Linia pozioma',
+	'insertOrderedList': 'Lista numerowana',
+	'insertUnorderedList': 'Lista wypunktowana',
+	'italic': 'Kursywa',
+	'justifyCenter': 'Wyrównaj do środka',
+	'justifyFull': 'Wyrównaj do lewej i prawej',
+	'justifyLeft': 'Wyrównaj do lewej',
+	'justifyRight': 'Wyrównaj do prawej',
+	'outdent': 'Usuń wcięcie',
+	'paste': 'Wklej',
+	'redo': 'Ponów',
+	'removeFormat': 'Usuń formatowanie',
+	'selectAll': 'Wybierz wszystko',
+	'strikethrough': 'Przekreślenie',
+	'subscript': 'Indeks dolny',
+	'superscript': 'Indeks górny',
+	'underline': 'Podkreślenie',
+	'undo': 'Cofnij',
+	'unlink': 'Usuń odsyłacz',
+	'createLink': 'Utwórz odsyłacz',
+	'toggleDir': 'Przełącz kierunek',
+	'insertImage': 'Wstaw obraz',
+	'insertTable': 'Wstaw/edytuj tabelÄ™',
+	'toggleTableBorder': 'Przełącz ramkę tabeli',
+	'deleteTable': 'Usuń tabelę',
+	'tableProp': 'Właściwość tabeli',
+	'htmlToggle': 'Źródło HTML',
+	'foreColor': 'Kolor pierwszego planu',
+	'hiliteColor': 'Kolor tła',
+	'plainFormatBlock': 'Styl akapitu',
+	'formatBlock': 'Styl akapitu',
+	'fontSize': 'Wielkość czcionki',
+	'fontName': 'Nazwa czcionki',
+	'tabIndent': 'Wcięcie o tabulator',
+	"fullScreen": "Przełącz pełny ekran",
+	"viewSource": "Wyświetl kod źródłowy HTML",
+	"print": "Drukuj",
+	"newPage": "Nowa strona",
+	/* Error messages */
+	'systemShortcut': 'Działanie ${0} jest dostępne w tej przeglądarce wyłącznie przy użyciu skrótu klawiaturowego. Należy użyć klawiszy ${1}.',
+	'ctrlKey':'Ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/pt-pt/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/pt-pt/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..e2c9352f2f9e5a6d43a9a3a0d1ae4caef6177abf
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/pt-pt/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Tamanho",
+	fontName: "Tipo de letra",
+	formatBlock: "Formato",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "Nenhum",
+	p: "Parágrafo",
+	h1: "Título",
+	h2: "Sub-título",
+	h3: "Sub-subtítulo",
+	pre: "Pré-formatado",
+	1: "xxs",
+	2: "xs",
+	3: "small",
+	4: "medium",
+	5: "large",
+	6: "xl",
+	7: "xxl"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/pt-pt/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/pt-pt/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..b44215ce288de13f94d39de693b8b9dbfa13ccc9
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/pt-pt/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Propriedades da ligação",
+	insertImageTitle: "Propriedades da imagem",
+	url: "URL:",
+	text: "Descrição:",
+	target: "Destino:",
+	set: "Definir",
+	currentWindow: "Janela actual",
+	parentWindow: "Janela ascendente",
+	topWindow: "Janela superior",
+	newWindow: "Nova janela"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/pt-pt/commands.js b/src/main/resources/static/dijit/_editor/nls/pt-pt/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..8fdddbc5e08316554b7b251269e5df1d63152f99
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/pt-pt/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Negrito',
+	'copy': 'Copiar',
+	'cut': 'Cortar',
+	'delete': 'Eliminar',
+	'indent': 'Indentar',
+	'insertHorizontalRule': 'Régua horizontal',
+	'insertOrderedList': 'Lista numerada',
+	'insertUnorderedList': 'Lista marcada',
+	'italic': 'Itálico',
+	'justifyCenter': 'Alinhar ao centro',
+	'justifyFull': 'Justificar',
+	'justifyLeft': 'Alinhar à esquerda',
+	'justifyRight': 'Alinhar à direita',
+	'outdent': 'Recuar',
+	'paste': 'Colar',
+	'redo': 'Repetir',
+	'removeFormat': 'Remover formato',
+	'selectAll': 'Seleccionar tudo',
+	'strikethrough': 'Rasurado',
+	'subscript': 'Inferior à linha',
+	'superscript': 'Superior à linha',
+	'underline': 'Sublinhado',
+	'undo': 'Anular',
+	'unlink': 'Remover ligação',
+	'createLink': 'Criar ligação',
+	'toggleDir': 'Alternar direcção',
+	'insertImage': 'Inserir imagem',
+	'insertTable': 'Inserir/Editar tabela',
+	'toggleTableBorder': 'Alternar contorno da tabela',
+	'deleteTable': 'Eliminar tabela',
+	'tableProp': 'Propriedades da tabela',
+	'htmlToggle': 'Origem HTML',
+	'foreColor': 'Cor de primeiro plano',
+	'hiliteColor': 'Cor de segundo plano',
+	'plainFormatBlock': 'Estilo de parágrafo',
+	'formatBlock': 'Estilo de parágrafo',
+	'fontSize': 'Tamanho do tipo de letra',
+	'fontName': 'Nome do tipo de letra',
+	'tabIndent': 'Indentar com a tecla Tab',
+	"fullScreen": "Alternar ecrã completo",
+	"viewSource": "Ver origem HTML",
+	"print": "Imprimir",
+	"newPage": "Nova página",
+	/* Error messages */
+	'systemShortcut': 'A acção "${0}" apenas está disponível no navegador utilizando um atalho de teclado. Utilize ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/pt/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/pt/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5aeea59b4c21202273c7ba290f9cba255429d36
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/pt/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Tamanho",
+	fontName: "Fonte",
+	formatBlock: "Formatar",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "espaço simples",
+	cursive: "cursiva",
+	fantasy: "fantasy",
+	noFormat: "Nenhum",
+	p: "Parágrafo",
+	h1: "Título",
+	h2: "Subtítulo",
+	h3: "Sub-subtítulo",
+	pre: "Pré-formatado",
+	1: "extra-extra-pequeno",
+	2: "extra-pequeno",
+	3: "pequena",
+	4: "médio",
+	5: "grande",
+	6: "extra-grande",
+	7: "extra-extra-grande"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/pt/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/pt/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..00d9a28bfd7a3a08f941e40dcbe4cdd307cdaed7
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/pt/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Propriedades de Link",
+	insertImageTitle: "Propriedades de Imagem",
+	url: "URL:",
+	text: "Descrição:",
+	target: "Destino:",
+	set: "Configurar",
+	currentWindow: "Janela Atual",
+	parentWindow: "Janela Pai",
+	topWindow: "Primeira Janela",
+	newWindow: "Nova Janela"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/pt/commands.js b/src/main/resources/static/dijit/_editor/nls/pt/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..932b82b0a70536541463fb113fea5af3e730a593
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/pt/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Negrito',
+	'copy': 'Copiar',
+	'cut': 'Recortar',
+	'delete': 'Excluir',
+	'indent': 'Recuar',
+	'insertHorizontalRule': 'Régua Horizontal',
+	'insertOrderedList': 'Lista Numerada',
+	'insertUnorderedList': 'Lista com Marcadores',
+	'italic': 'Itálico',
+	'justifyCenter': 'Alinhar pelo Centro',
+	'justifyFull': 'Justificar',
+	'justifyLeft': 'Alinhar pela Esquerda',
+	'justifyRight': 'Alinhar pela Direita',
+	'outdent': 'Não-chanfrado',
+	'paste': 'Colar',
+	'redo': 'Refazer',
+	'removeFormat': 'Remover Formato',
+	'selectAll': 'Selecionar Todos',
+	'strikethrough': 'Tachado',
+	'subscript': 'Subscrito',
+	'superscript': 'Sobrescrito',
+	'underline': 'Sublinhado',
+	'undo': 'Desfazer',
+	'unlink': 'Remover Link',
+	'createLink': 'Criar Link',
+	'toggleDir': 'Comutar Direção',
+	'insertImage': 'Inserir Imagem',
+	'insertTable': 'Inserir/Editar Tabela',
+	'toggleTableBorder': 'Alternar Moldura da Tabela',
+	'deleteTable': 'Excluir Tabela',
+	'tableProp': 'Propriedade da Tabela',
+	'htmlToggle': 'Origem HTML',
+	'foreColor': 'Cor do Primeiro Plano',
+	'hiliteColor': 'Cor de segundo plano',
+	'plainFormatBlock': 'Estilo de Parágrafo',
+	'formatBlock': 'Estilo de Parágrafo',
+	'fontSize': 'Tamanho da Fonte',
+	'fontName': 'Nome da Fonte',
+	'tabIndent': 'Recuo de Guia',
+	"fullScreen": "Comutar Tela Cheia",
+	"viewSource": "Visualizar Origem HTML",
+	"print": "Impressão",
+	"newPage": "Nova Página",
+	/* Error messages */
+	'systemShortcut': 'A ação "${0}" está disponível em seu navegador apenas usando um atalho do teclado. Use ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ro/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/ro/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..46b5d51c4c0d46001b283223a5084e055bbef425
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ro/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Mărime",
+	fontName: "Font",
+	formatBlock: "Format",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "Nimic",
+	p: "Paragraf",
+	h1: "Titlu",
+	h2: "Subtitlu",
+	h3: "Sub-subtitlu",
+	pre: "Preformatat",
+	1: "xxs (xx-small)",
+	2: "xs (x-small)",
+	3: "s (small)",
+	4: "m (medium)",
+	5: "l (large)",
+	6: "xl (x-large)",
+	7: "xxl (xx-large)"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ro/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/ro/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..74cc8518752f351b87896c88524bc58c7f9202ea
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ro/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Proprietăţi legătură",
+	insertImageTitle: "Proprietăţi imagine",
+	url: "URL:",
+	text: "Descriere:",
+	target: "Destinaţie:",
+	set: "Setare",
+	currentWindow: "Fereastra curentă",
+	parentWindow: "Fereastra părinte",
+	topWindow: "Fereastra cea mai de sus",
+	newWindow: "Fereastra nouă"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ro/commands.js b/src/main/resources/static/dijit/_editor/nls/ro/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..f1e1043b0204c7896cc755883fd7dfa5149445d4
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ro/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Aldin',
+	'copy': 'Copiere',
+	'cut': 'Tăiere',
+	'delete': 'Åžtergere',
+	'indent': 'MicÅŸorare indent',
+	'insertHorizontalRule': 'Linie delimitatoare',
+	'insertOrderedList': 'Listă numerotată',
+	'insertUnorderedList': 'Listă cu marcator',
+	'italic': 'Cursiv',
+	'justifyCenter': 'Aliniere centru',
+	'justifyFull': 'Aliniere stânga-dreapta',
+	'justifyLeft': 'Aliniere stânga',
+	'justifyRight': 'Aliniere dreapta',
+	'outdent': 'Mărire indent',
+	'paste': 'Lipire',
+	'redo': 'Refacere acţiune',
+	'removeFormat': 'Înlăturare format',
+	'selectAll': 'Selectează tot',
+	'strikethrough': 'Tăiere text cu o linie',
+	'subscript': 'Scriere indice inferior',
+	'superscript': 'Scriere indice superior',
+	'underline': 'Subliniere',
+	'undo': 'Anulare acţiune',
+	'unlink': 'Înlăturare legătură',
+	'createLink': 'Creare legătură',
+	'toggleDir': 'Comutare direcţie',
+	'insertImage': 'Inserare imagine',
+	'insertTable': 'Inserare/Editare tabelă',
+	'toggleTableBorder': 'Comutare bordură tabelă',
+	'deleteTable': 'Ştergere tabelă',
+	'tableProp': 'Proprietate tabelă',
+	'htmlToggle': 'Sursă HTML',
+	'foreColor': 'Culoare de prim-plan',
+	'hiliteColor': 'Culoare de fundal',
+	'plainFormatBlock': 'Stil paragraf',
+	'formatBlock': 'Stil paragraf',
+	'fontSize': 'Dimensiune font',
+	'fontName': 'Nume font',
+	'tabIndent': 'Indentare Tab',
+	"fullScreen": "Comutare ecran complet",
+	"viewSource": "Vizualizara sursă HTML",
+	"print": "Tipărire",
+	"newPage": "Pagină nouă",
+	/* Error messages */
+	'systemShortcut': 'Acţiunea "${0}" este disponibilă în browser doar utilizând o comandă rapidă de la tastatură. Utilizaţi ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ru/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/ru/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5a16d6bdd79c829a49cb96d1c9b15f37e71042f
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ru/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Размер",
+	fontName: "Шрифт",
+	formatBlock: "Формат",
+	serif: "� за�ечками",
+	"sans-serif": "без за�ечек",
+	monospace: "непропорциональный",
+	cursive: "кур�ив",
+	fantasy: "арти�тиче�кий",
+	noFormat: "�ет",
+	p: "�бзац",
+	h1: "Заголовок",
+	h2: "Подзаголовок",
+	h3: "Вложенный подзаголовок",
+	pre: "Заранее отформатированный",
+	1: "�амый маленький",
+	2: "очень маленький",
+	3: "маленький",
+	4: "�редний",
+	5: "большой",
+	6: "очень большой",
+	7: "�амый большой"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ru/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/ru/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..8227862578724fbaf6a0f354e59616e2186d9fc4
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ru/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Свой�тва ��ылки",
+	insertImageTitle: "Свой�тва изображени�",
+	url: "URL:",
+	text: "Опи�ание:",
+	target: "Целевой объект:",
+	set: "Задать",
+	currentWindow: "Текущее окно",
+	parentWindow: "Родитель�кое окно",
+	topWindow: "Верхнее окно",
+	newWindow: "�овое окно"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/ru/commands.js b/src/main/resources/static/dijit/_editor/nls/ru/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..5323ebd2919f71c6e02f7046856c703dfee118f0
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/ru/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Полужирный',
+	'copy': 'Копировать',
+	'cut': 'Вырезать',
+	'delete': 'Удалить',
+	'indent': 'От�туп',
+	'insertHorizontalRule': 'Горизонтальна� линейка',
+	'insertOrderedList': '�умерованный �пи�ок',
+	'insertUnorderedList': 'Спи�ок � маркерами',
+	'italic': 'Кур�ив',
+	'justifyCenter': 'Выровн�ть по центру',
+	'justifyFull': 'По ширине',
+	'justifyLeft': 'Выровн�ть по левому краю',
+	'justifyRight': 'Выровн�ть по правому краю',
+	'outdent': 'Вт�жка',
+	'paste': 'В�тавить',
+	'redo': 'Повторить',
+	'removeFormat': 'Удалить формат',
+	'selectAll': 'Выбрать в�е',
+	'strikethrough': 'Перечеркивание',
+	'subscript': '�ижний индек�',
+	'superscript': 'Верхний индек�',
+	'underline': 'Подчеркивание',
+	'undo': 'Отменить',
+	'unlink': 'Удалить ��ылку',
+	'createLink': 'Создать ��ылку',
+	'toggleDir': 'Изменить направление',
+	'insertImage': 'В�тавить изображение',
+	'insertTable': 'В�тавить/изменить таблицу',
+	'toggleTableBorder': 'Переключить рамку таблицы',
+	'deleteTable': 'Удалить таблицу',
+	'tableProp': 'Свой�тва таблицы',
+	'htmlToggle': 'Код HTML',
+	'foreColor': 'Цвет тек�та',
+	'hiliteColor': 'Цвет фона',
+	'plainFormatBlock': 'Стиль абзаца',
+	'formatBlock': 'Стиль абзаца',
+	'fontSize': 'Размер шрифта',
+	'fontName': '�азвание шрифта',
+	'tabIndent': 'Табул�ци�',
+	"fullScreen": "Переключить полно�кранный режим",
+	"viewSource": "Показать и�ходный код HTML",
+	"print": "Печать",
+	"newPage": "Создать �траницу",
+	/* Error messages */
+	'systemShortcut': 'Дей�твие "${0}" можно выполнить в браузере только путем нажати� клавиш ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/sk/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/sk/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..e468ac54f11905c79633f8ed8a94e55b8dbbd57c
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sk/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Veľkosť",
+	fontName: "Písmo",
+	formatBlock: "Formát",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "Žiadny",
+	p: "Odsek",
+	h1: "Hlavi�ka",
+	h2: "Podhlavi�ka",
+	h3: "Pod-podhlavi�ka",
+	pre: "Predformátované",
+	1: "xx-small",
+	2: "x-small",
+	3: "small",
+	4: "medium",
+	5: "large",
+	6: "x-large",
+	7: "xx-large"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/sk/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/sk/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..1084921c385762ccde6d507f69e6686ee76e3949
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sk/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Vlastnosti prepojenia",
+	insertImageTitle: "Vlastnosti obrázka",
+	url: "Adresa URL:",
+	text: "Opis:",
+	target: "Cieľ:",
+	set: "Nastaviť",
+	currentWindow: "Aktuálne okno",
+	parentWindow: "Rodi�ovské okno",
+	topWindow: "Najvyššie okno",
+	newWindow: "Nové okno"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/sk/commands.js b/src/main/resources/static/dijit/_editor/nls/sk/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb0bf1dae064f698355c05381a681a7b4af53592
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sk/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Tu�né',
+	'copy': 'Kopírovať',
+	'cut': 'Vystrihnúť',
+	'delete': 'Vymazať',
+	'indent': 'Odsadiť',
+	'insertHorizontalRule': 'Vodorovná �iara',
+	'insertOrderedList': 'Číslovaný zoznam',
+	'insertUnorderedList': 'Zoznam s odrážkami',
+	'italic': 'Kurzíva',
+	'justifyCenter': 'Zarovnať na stred',
+	'justifyFull': 'Zarovnať k okrajom',
+	'justifyLeft': 'Zarovnať vľavo',
+	'justifyRight': 'Zarovnať vpravo',
+	'outdent': 'Zmenšiť odsadenie',
+	'paste': 'Prilepiť',
+	'redo': 'Znova',
+	'removeFormat': 'Odstrániť formátovanie',
+	'selectAll': 'Vybrať všetko',
+	'strikethrough': 'Pre�iarknuť',
+	'subscript': 'Dolný index',
+	'superscript': 'Horný index',
+	'underline': 'Pod�iarknuť',
+	'undo': 'Späť',
+	'unlink': 'Odstrániť prepojenie',
+	'createLink': 'Vytvoriť prepojenie',
+	'toggleDir': 'Prepnúť smer',
+	'insertImage': 'Vložiť obrázok',
+	'insertTable': 'Vložiť/upraviť tabuľku',
+	'toggleTableBorder': 'Prepnúť ohrani�enie tabuľky',
+	'deleteTable': 'Odstrániť tabuľku',
+	'tableProp': 'Vlastnosť tabuľky',
+	'htmlToggle': 'Zdrojový kód HTML',
+	'foreColor': 'Farba popredia',
+	'hiliteColor': 'Farba pozadia',
+	'plainFormatBlock': 'Štýl odseku',
+	'formatBlock': 'Štýl odseku',
+	'fontSize': 'Veľkosť písma',
+	'fontName': 'Názov písma',
+	'tabIndent': 'Odsadenie tabulátora',
+	"fullScreen": "Prepnúť na celú obrazovku",
+	"viewSource": "Zobraziť zdrojový kód HTML",
+	"print": "Vytla�iť",
+	"newPage": "Nová stránka",
+	/* Error messages */
+	'systemShortcut': 'Akcia "${0}" je vo vašom prehliada�i dostupná iba prostredníctvom klávesovej skratky. Stla�te ${1}.',
+	'ctrlKey':'Ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/sl/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/sl/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..db7f76e9cbf7c0b51dc763b040e34afc67a05005
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sl/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Velikost",
+	fontName: "Pisava",
+	formatBlock: "Oblika",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "Brez",
+	p: "Odstavek",
+	h1: "Naslovni slog",
+	h2: "Podnaslovni slog",
+	h3: "Pod-podnaslovni slog",
+	pre: "Vnaprej oblikovan",
+	1: "xx-majhno",
+	2: "x-majhno",
+	3: "majhno",
+	4: "srednje",
+	5: "veliko",
+	6: "x-veliko",
+	7: "xx-veliko"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/sl/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/sl/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..db74c3a796040c745377e97465f00d336751b233
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sl/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Lastnosti povezave",
+	insertImageTitle: "Lastnosti slike",
+	url: "URL:",
+	text: "Opis:",
+	target: "Cilj:",
+	set: "Nastavi",
+	currentWindow: "Trenutno okno",
+	parentWindow: "Nadrejeno okno",
+	topWindow: "Okno na vrhu",
+	newWindow: "Novo okno"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/sl/commands.js b/src/main/resources/static/dijit/_editor/nls/sl/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e742a3712714a4e6fb084e10df029c51cb6da53
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sl/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Krepko',
+	'copy': 'Prekopiraj',
+	'cut': 'Izreži',
+	'delete': 'Izbriši',
+	'indent': 'Zamik',
+	'insertHorizontalRule': 'Vodoravno ravnilo',
+	'insertOrderedList': 'Oštevil�en seznam',
+	'insertUnorderedList': 'Naštevni seznam',
+	'italic': 'Leže�e',
+	'justifyCenter': 'Poravnaj na sredino',
+	'justifyFull': 'Poravnaj obojestransko',
+	'justifyLeft': 'Poravnaj levo',
+	'justifyRight': 'Poravnaj desno',
+	'outdent': 'Primakni',
+	'paste': 'Prilepi',
+	'redo': 'Znova uveljavi',
+	'removeFormat': 'Odstrani oblikovanje',
+	'selectAll': 'Izberi vse',
+	'strikethrough': 'Pre�rtano',
+	'subscript': 'Podpisano',
+	'superscript': 'Nadpisano',
+	'underline': 'Pod�rtano',
+	'undo': 'Razveljavi',
+	'unlink': 'Odstrani povezavo',
+	'createLink': 'Ustvari povezavo',
+	'toggleDir': 'Preklopi smer',
+	'insertImage': 'Vstavi sliko',
+	'insertTable': 'Vstavi/uredi tabelo',
+	'toggleTableBorder': 'Preklopi na obrobo tabele',
+	'deleteTable': 'Izbriši tabelo',
+	'tableProp': 'Lastnost tabele',
+	'htmlToggle': 'Izvorna koda HTML',
+	'foreColor': 'Barva ospredja',
+	'hiliteColor': 'Barva ozadja',
+	'plainFormatBlock': 'Slog odstavka',
+	'formatBlock': 'Slog odstavka',
+	'fontSize': 'Velikost pisave',
+	'fontName': 'Ime pisave',
+	'tabIndent': 'Zamik tabulatorja',
+	"fullScreen": "Preklopi na celozaslonski na�in",
+	"viewSource": "Prikaži izvorno kodo HTML",
+	"print": "Natisni",
+	"newPage": "Nova stran",
+	/* Error messages */
+	'systemShortcut': 'Dejanje "${0}" lahko v vašem brskalniku uporabite samo z bližnjico na tipkovnici. Uporabite ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/sr/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/sr/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..7385f028a6bfc20def9908640b08fa838006aa39
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sr/FontChoice.js
@@ -0,0 +1,29 @@
+define({      
+//begin v1.x content
+	fontSize: "Veli�ina",
+	fontName: "Font",
+	formatBlock: "Format",
+
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "jednorazma�ni",
+	cursive: "kurziv",
+	fantasy: "fantazija",
+
+	noFormat: "Bez formata",
+	p: "Pasus",
+	h1: "Naslov",
+	h2: "Podnaslov",
+	h3: "Pod-podnaslov",
+	pre: "Preformatirano",
+
+	1: "xx-malo",
+	2: "x-malo",
+	3: "malo",
+	4: "srednje",
+	5: "veliko",
+	6: "x-veliko",
+	7: "xx-veliko"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/sr/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/sr/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..ccda3db9646ef623e81914bbe64b12e46b6a69d6
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sr/LinkDialog.js
@@ -0,0 +1,15 @@
+define({      
+//begin v1.x content
+	createLinkTitle: "Svojstva linka",
+	insertImageTitle: "Svojstva slike",
+	url: "URL:",
+	text: "Opis:",
+	target: "Cilj:",
+	set: "Podesi:",
+	currentWindow: "Aktuelni prozor",
+	parentWindow: "Nadređeni prozor",
+	topWindow: "Najviši prozor",
+	newWindow: "Novi prozor"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/sr/commands.js b/src/main/resources/static/dijit/_editor/nls/sr/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4ec1bfb1fd582383a03ae7f35abab412701bc28
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sr/commands.js
@@ -0,0 +1,52 @@
+define({      
+//begin v1.x content
+	'bold': 'Podebljano',
+	'copy': 'Kopiraj',
+	'cut': 'Iseci',
+	'delete': 'Izbriši',
+	'indent': 'Uvla�enje ',
+	'insertHorizontalRule': 'Horizontalna linija vodilja',
+	'insertOrderedList': 'Numerisana lista',
+	'insertUnorderedList': 'Lista sa znakovima za nabrajanje',
+	'italic': 'Kurzivno',
+	'justifyCenter': 'Poravnaj po centru',
+	'justifyFull': 'Poravnaj obostrano',
+	'justifyLeft': 'Poravnaj levo',
+	'justifyRight': 'Poravnaj desno',
+	'outdent': 'Izvla�enje',
+	'paste': 'Nalepi',
+	'redo': 'Ponovi radnju',
+	'removeFormat': 'Ukloni format',
+	'selectAll': 'Izaberi sve',
+	'strikethrough': 'Precrtani tekst',
+	'subscript': 'Indeksni tekst',
+	'superscript': 'Eksponentni tekst',
+	'underline': 'Podvu�eno',
+	'undo': 'Opozovi radnju',
+	'unlink': 'Ukloni link',
+	'createLink': 'Kreiraj link',
+	'toggleDir': 'Uklju�i/isklju�i smer',
+	'insertImage': 'Umetni sliku',
+	'insertTable': 'Umetni/uredi tabelu',
+	'toggleTableBorder': 'Uklju�i/isklju�i ivicu tabele',
+	'deleteTable': 'Izbriši tabelu',
+	'tableProp': 'Svojstva tabele',
+	'htmlToggle': 'HTML izvor',
+	'foreColor': 'Boja prednjeg plana',
+	'hiliteColor': 'Boja pozadine',
+	'plainFormatBlock': 'Stil pasusa',
+	'formatBlock': 'Stil pasusa',
+	'fontSize': 'Veli�ina fonta',
+	'fontName': 'Ime fonta',
+	'tabIndent': 'Uvla�enje kartice',
+	"fullScreen": "Uklju�i/isklju�i prikaz preko celog ekrana",
+	"viewSource": "Prikaži HTML izvor",
+	"print": "Å tampaj",
+	"newPage": "Nova stranica",
+	/* Error messages */
+	'systemShortcut': 'Radnja „${0}“ je dostupna u pregleda�u samo pomoću tasterskih pre�ica. Koristite ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/_editor/nls/sv/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/sv/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..e16369d8f065f9a480acfd69fac32cc23da8740f
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sv/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Storlek ",
+	fontName: "Teckensnitt",
+	formatBlock: "Format",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "Inget",
+	p: "Stycke",
+	h1: "Rubrik 1",
+	h2: "Rubrik 2",
+	h3: "Rubrik 3",
+	pre: "Förformaterad",
+	1: "XXS",
+	2: "XS",
+	3: "S",
+	4: "M",
+	5: "L",
+	6: "XL",
+	7: "XXL"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/sv/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/sv/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..776e99651aa2c831ec9991f7c7ed51434bebc39f
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sv/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Länkegenskaper",
+	insertImageTitle: "Bildegenskaper",
+	url: "URL-adress:",
+	text: "Beskrivning:",
+	target: "MÃ¥l:",
+	set: "Använd",
+	currentWindow: "Aktuellt fönster",
+	parentWindow: "Överordnat fönster",
+	topWindow: "Översta fönstret",
+	newWindow: "Nytt fönster"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/sv/commands.js b/src/main/resources/static/dijit/_editor/nls/sv/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..b583c4983f4c861d50c116b4b141f9e808bc7135
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/sv/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Halvfet',
+	'copy': 'Kopiera',
+	'cut': 'Klipp ut',
+	'delete': 'Ta bort',
+	'indent': 'Indrag',
+	'insertHorizontalRule': 'Horisontell linje',
+	'insertOrderedList': 'Numrerad lista',
+	'insertUnorderedList': 'Punktlista',
+	'italic': 'Kursiv',
+	'justifyCenter': 'Centrera',
+	'justifyFull': 'Marginaljustera',
+	'justifyLeft': 'Vänsterjustera',
+	'justifyRight': 'Högerjustera',
+	'outdent': 'Utdrag',
+	'paste': 'Klistra in',
+	'redo': 'Gör om',
+	'removeFormat': 'Ta bort format',
+	'selectAll': 'Markera allt',
+	'strikethrough': 'Genomstruken',
+	'subscript': 'Nedsänkt',
+	'superscript': 'Upphöjt',
+	'underline': 'Understruken',
+	'undo': 'Ã…ngra',
+	'unlink': 'Ta bort länk',
+	'createLink': 'Skapa länk',
+	'toggleDir': 'Växla riktning',
+	'insertImage': 'Infoga bild',
+	'insertTable': 'Infoga/redigera tabell',
+	'toggleTableBorder': 'Växla tabellinjer',
+	'deleteTable': 'Ta bort tabell',
+	'tableProp': 'Tabellegenskap',
+	'htmlToggle': 'HTML-källkod',
+	'foreColor': 'Förgrundsfärg',
+	'hiliteColor': 'Bakgrundsfärg',
+	'plainFormatBlock': 'Styckeformat',
+	'formatBlock': 'Styckeformat',
+	'fontSize': 'Teckenstorlek',
+	'fontName': 'Teckensnitt',
+	'tabIndent': 'Tabbindrag',
+	"fullScreen": "Växla helskärm",
+	"viewSource": "Visa HTML-kod",
+	"print": "Skriv ut",
+	"newPage": "Ny sida",
+	/* Error messages */
+	'systemShortcut': 'Åtgärden ${0} är endast tillgänglig i webbläsaren via ett tangentbordskommando. Använd ${1}.',
+	'ctrlKey':'Ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/th/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/th/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d2c3a9872aa1afccd98e3deb021b2cf61d9d996
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/th/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "ขนาด",
+	fontName: "ฟอนต์",
+	formatBlock: "รูป�บบ",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+	noFormat: "ไม่มี",
+	p: "ย่อหน้า",
+	h1: "ส่วนหัว",
+	h2: "ส่วนหัวย่อย",
+	h3: "ส่วนย่อยของส่วนหัวย่อย",
+	pre: "�าร�ำหนดรูป�บบล่วงหน้า",
+	1: "xx-small",
+	2: "x-small",
+	3: "small",
+	4: "medium",
+	5: "large",
+	6: "x-large",
+	7: "xx-large"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/th/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/th/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..30f00af109c40277b2e28675bac315075be0c473
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/th/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "คุณสมบัติลิง�์",
+	insertImageTitle: "คุณสมบัติรูปภาพ",
+	url: "URL:",
+	text: "คำอธิบาย:",
+	target: "เป้าหมาย:",
+	set: "เซ็ต",
+	currentWindow: "หน้าต่างปัจจุบัน",
+	parentWindow: "หน้าต่างหลั�",
+	topWindow: "หน้าต่างบนสุด",
+	newWindow: "หน้าต่างใหม่"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/th/commands.js b/src/main/resources/static/dijit/_editor/nls/th/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..29e79988954960c09da7053aa824c9833e27cdc0
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/th/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'ตัวหนา',
+	'copy': 'คัดลอ�',
+	'cut': 'ตัด',
+	'delete': 'ลบ',
+	'indent': 'เพิ่ม�ารเยื้อง',
+	'insertHorizontalRule': 'ไม้บรรทัด�นวนอน',
+	'insertOrderedList': 'ลำดับเลข',
+	'insertUnorderedList': 'หัวข้อย่อย',
+	'italic': 'ตัวเอียง',
+	'justifyCenter': 'จัด�นว�ึ่ง�ลาง',
+	'justifyFull': 'ชิดขอบ',
+	'justifyLeft': 'จัดชิดซ้าย',
+	'justifyRight': 'จัดชิดขวา',
+	'outdent': 'ลด�ารเยื้อง',
+	'paste': 'วาง',
+	'redo': 'ทำซ้ำ',
+	'removeFormat': 'ลบรูป�บบออ�',
+	'selectAll': 'เลือ�ทั้งหมด',
+	'strikethrough': 'ขีดทับ',
+	'subscript': 'ตัวห้อย',
+	'superscript': 'ตัวย�',
+	'underline': 'ขีดเส้นใต้',
+	'undo': 'เลิ�ทำ',
+	'unlink': 'ลบลิง�์ออ�',
+	'createLink': 'สร้างลิง�์',
+	'toggleDir': 'สลับทิศทาง',
+	'insertImage': '�ทร�รูปภาพ',
+	'insertTable': '�ทร�/��้ไขตาราง',
+	'toggleTableBorder': 'สลับเส้นขอบตาราง',
+	'deleteTable': 'ลบตาราง',
+	'tableProp': 'คุณสมบัติตาราง',
+	'htmlToggle': 'ซอร์ส HTML',
+	'foreColor': 'สีพื้นหน้า',
+	'hiliteColor': 'สีพื้นหลัง',
+	'plainFormatBlock': 'ลั�ษณะย่อหน้า',
+	'formatBlock': 'ลั�ษณะย่อหน้า',
+	'fontSize': 'ขนาดฟอนต์',
+	'fontName': 'ชื่อฟอนต์',
+	'tabIndent': 'เยื้อง�ท็บ',
+	"fullScreen": "สลับจอภาพ�บบเต็ม",
+	"viewSource": "ดูซอร์ส HTML",
+	"print": "พิมพ์",
+	"newPage": "หน้าใหม่",
+	/* Error messages */
+	'systemShortcut': '�อ็�ชัน "${0}" ใช้งานได้เฉพาะ�ับเบราว์เซอร์ของคุณโดยใช้�ป้นพิมพ์ลัด ใช้ ${1}',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/tr/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/tr/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..07cea0299721c9496d975f586612098cebaa9fcc
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/tr/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Boyut",
+	fontName: "Yazı Tipi",
+	formatBlock: "Biçim",
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "tek aralıklı",
+	cursive: "el yazısı",
+	fantasy: "fantazi",
+	noFormat: "Yok",
+	p: "Paragraf",
+	h1: "Başlık",
+	h2: "Alt Başlık",
+	h3: "Alt Alt Başlık",
+	pre: "Önceden Biçimlendirilmiş",
+	1: "xx-küçük",
+	2: "x-küçük",
+	3: "küçük",
+	4: "orta",
+	5: "büyük",
+	6: "x-büyük",
+	7: "xx-büyük"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/tr/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/tr/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..c30e77cb75b1165ebfbca88434dfb8d546114124
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/tr/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Bağlantı Özellikleri",
+	insertImageTitle: "Resim Özellikleri",
+	url: "URL:",
+	text: "Açıklama:",
+	target: "Hedef:",
+	set: "Ayarla",
+	currentWindow: "Geçerli Pencere",
+	parentWindow: "Ãœst Pencere",
+	topWindow: "En Ãœst Pencere",
+	newWindow: "Yeni Pencere"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/tr/commands.js b/src/main/resources/static/dijit/_editor/nls/tr/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..4536ccf84cbe967cdf8fc344e1c8ee7658e84b82
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/tr/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'Kalın',
+	'copy': 'Kopyala',
+	'cut': 'Kes',
+	'delete': 'Sil',
+	'indent': 'Girinti',
+	'insertHorizontalRule': 'Yatay Kural',
+	'insertOrderedList': 'Numaralı Liste',
+	'insertUnorderedList': 'Madde Ä°ÅŸaretli Liste',
+	'italic': 'Ä°talik',
+	'justifyCenter': 'Ortaya Hizala',
+	'justifyFull': 'Yasla',
+	'justifyLeft': 'Sola Hizala',
+	'justifyRight': 'SaÄŸa Hizala',
+	'outdent': 'Çıkıntı',
+	'paste': 'Yapıştır',
+	'redo': 'Yinele',
+	'removeFormat': 'Biçimi Kaldır',
+	'selectAll': 'Tümünü Seç',
+	'strikethrough': 'Üstü Çizili',
+	'subscript': 'Alt Simge',
+	'superscript': 'Ãœst Simge',
+	'underline': 'Altı Çizili',
+	'undo': 'Geri Al',
+	'unlink': 'Bağlantıyı Kaldır',
+	'createLink': 'Bağlantı Oluştur',
+	'toggleDir': 'Yönü Değiştir',
+	'insertImage': 'Resim Ekle',
+	'insertTable': 'Tablo Ekle/Düzenle',
+	'toggleTableBorder': 'Tablo Kenarlığını Göster/Gizle',
+	'deleteTable': 'Tabloyu Sil',
+	'tableProp': 'Tablo Özelliği',
+	'htmlToggle': 'HTML Kaynağı',
+	'foreColor': 'Ön Plan Rengi',
+	'hiliteColor': 'Arka Plan Rengi',
+	'plainFormatBlock': 'Paragraf Stili',
+	'formatBlock': 'Paragraf Stili',
+	'fontSize': 'Yazı Tipi Boyutu',
+	'fontName': 'Yazı Tipi Adı',
+	'tabIndent': 'Sekme Girintisi',
+	"fullScreen": "Tam Ekranı Aç/Kapat",
+	"viewSource": "HTML Kaynağını Görüntüle",
+	"print": "Yazdır",
+	"newPage": "Yeni Sayfa",
+	/* Error messages */
+	'systemShortcut': '"${0}" işlemi yalnızca tarayıcınızda bir klavye kısayoluyla birlikte kullanılabilir. Şunu kullanın: ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/uk/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/uk/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..938d5996789557ec455b5b40985f700f8cb46351
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/uk/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "Розмір",
+	fontName: "Шрифт",
+	formatBlock: "Формат",
+	serif: "із за�ічками",
+	"sans-serif": "без за�ічок",
+	monospace: "непропорційний",
+	cursive: "кур�ив",
+	fantasy: "вишуканий",
+	noFormat: "�емає",
+	p: "�бзац",
+	h1: "Заголовок",
+	h2: "Підзаголовок",
+	h3: "Вкладений підзаголовок",
+	pre: "Попередній формат",
+	1: "найменший",
+	2: "дуже малий",
+	3: "малий",
+	4: "�ередній",
+	5: "великий",
+	6: "дуже великий",
+	7: "найбільший"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/uk/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/uk/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..f110690d3f1b6c6f8988268a1f6ca48ea6de4337
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/uk/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "Вла�тиво�ті по�иланн�",
+	insertImageTitle: "Вла�тиво�ті зображенн�",
+	url: "URL:",
+	text: "Опи�:",
+	target: "Призначенн�:",
+	set: "В�тановити",
+	currentWindow: "Поточне вікно",
+	parentWindow: "Батьків�ьке вікно",
+	topWindow: "�айвище вікно",
+	newWindow: "�ове вікно"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/uk/commands.js b/src/main/resources/static/dijit/_editor/nls/uk/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..3d580870cfd217bc875aa64ca483be240f261c02
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/uk/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': '�апівжирний',
+	'copy': 'Копіювати',
+	'cut': 'Вирізати',
+	'delete': 'Видалити',
+	'indent': 'Від�туп',
+	'insertHorizontalRule': 'Горизонтальне правило',
+	'insertOrderedList': '�умерований �пи�ок',
+	'insertUnorderedList': 'Спи�ок з маркерами',
+	'italic': 'Кур�ив',
+	'justifyCenter': 'По центру',
+	'justifyFull': 'Вирівн�ти',
+	'justifyLeft': 'По лівому краю',
+	'justifyRight': 'По правому краю',
+	'outdent': 'Зменшити від�туп',
+	'paste': 'В�тавити',
+	'redo': 'Повторити',
+	'removeFormat': 'Видалити формат',
+	'selectAll': 'Вибрати в�і',
+	'strikethrough': 'Закре�лений',
+	'subscript': '�адр�дковий знак',
+	'superscript': '�адр�дковий знак',
+	'underline': 'Підкре�лений',
+	'undo': 'Ска�увати',
+	'unlink': 'Видаліть по�иланн�',
+	'createLink': 'Створити по�иланн�',
+	'toggleDir': 'Перемкнути напр�мок',
+	'insertImage': 'В�тавити зображенн�',
+	'insertTable': 'В�тавити/змінити таблицю',
+	'toggleTableBorder': 'Перемкнути рамки таблиці',
+	'deleteTable': 'Видалити таблицю',
+	'tableProp': 'Вла�тиві�ть таблиці',
+	'htmlToggle': 'Вихідний тек�т HTML',
+	'foreColor': 'Колір тек�ту',
+	'hiliteColor': 'Колір фону',
+	'plainFormatBlock': 'Формат абзацу',
+	'formatBlock': 'Формат абзацу',
+	'fontSize': 'Розмір шрифту',
+	'fontName': '�азва шрифту',
+	'tabIndent': 'Табул�ці�',
+	"fullScreen": "Повноекранний режим",
+	"viewSource": "Перегл�нути вихідний тек�т HTML",
+	"print": "Друк",
+	"newPage": "Створити �торінку",
+	/* Error messages */
+	'systemShortcut': 'Ді� "${0}" до�тупна у вашому браузері лише за допомогою клавіш швидкого до�тупу. Викори�товуйте ${1}.',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/zh-tw/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/zh-tw/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..63089f60c796a814dc374fd88dccea35ebab3277
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/zh-tw/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "大�",
+	fontName: "å­—åž‹",
+	formatBlock: "格�",
+	serif: "新細明體",
+	"sans-serif": "新細明體",
+	monospace: "等寬",
+	cursive: "Cursive",
+	fantasy: "Fantasy",
+	noFormat: "ç„¡",
+	p: "段�",
+	h1: "標題",
+	h2: "�標題",
+	h3: "次�標題",
+	pre: "�先格�化",
+	1: "最�",
+	2: "較�",
+	3: "å°�",
+	4: "中",
+	5: "大",
+	6: "較大",
+	7: "最大"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/zh-tw/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/zh-tw/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..efc092eed26882cc4bf14cf4efe7924c99290f4d
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/zh-tw/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "��內容",
+	insertImageTitle: "影�內容",
+	url: "URL：",
+	text: "說明：",
+	target: "目標：",
+	set: "設定",
+	currentWindow: "�行視窗",
+	parentWindow: "上層視窗",
+	topWindow: "最上�的視窗",
+	newWindow: "新視窗"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/zh-tw/commands.js b/src/main/resources/static/dijit/_editor/nls/zh-tw/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..8019339bcbf81d16ef49ca53a50e40a121010209
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/zh-tw/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': 'ç²—é«”',
+	'copy': '複製',
+	'cut': '剪下',
+	'delete': '刪除',
+	'indent': '縮排',
+	'insertHorizontalRule': '水平尺�',
+	'insertOrderedList': '編號清單',
+	'insertUnorderedList': '項目符號清單',
+	'italic': '斜體',
+	'justifyCenter': '置中�齊',
+	'justifyFull': '�齊',
+	'justifyLeft': '�左�齊',
+	'justifyRight': '���齊',
+	'outdent': '凸排',
+	'paste': '貼上',
+	'redo': '��',
+	'removeFormat': '移除格�',
+	'selectAll': '全�',
+	'strikethrough': '刪除線',
+	'subscript': '下標',
+	'superscript': '上標',
+	'underline': '底線',
+	'undo': '復原',
+	'unlink': '移除��',
+	'createLink': '建立��',
+	'toggleDir': '切�方�',
+	'insertImage': '�入影�',
+	'insertTable': '�入/編輯表格',
+	'toggleTableBorder': '切�表格邊框',
+	'deleteTable': '刪除表格',
+	'tableProp': '表格內容',
+	'htmlToggle': 'HTML 原始檔',
+	'foreColor': '�景�色',
+	'hiliteColor': '背景�色',
+	'plainFormatBlock': '段�樣�',
+	'formatBlock': '段�樣�',
+	'fontSize': '字型大�',
+	'fontName': '字型�稱',
+	'tabIndent': '標籤縮排',
+	"fullScreen": "切�全螢幕",
+	"viewSource": "檢視 HTML 原始檔",
+	"print": "列�",
+	"newPage": "新��",
+	/* Error messages */
+	'systemShortcut': '"${0}" 動作在您的�覽器中，�能使用�盤快速�。請使用 ${1}。',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/zh/FontChoice.js b/src/main/resources/static/dijit/_editor/nls/zh/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..9ae6934d22db64efbb4aec54b994392afab04c12
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/zh/FontChoice.js
@@ -0,0 +1,25 @@
+define(
+({
+	fontSize: "大�",
+	fontName: "字体",
+	formatBlock: "格�",
+	serif: "有衬线",
+	"sans-serif": "无衬线",
+	monospace: "等宽字体",
+	cursive: "�书",
+	fantasy: "虚线",
+	noFormat: "æ— ",
+	p: "段�",
+	h1: "标题",
+	h2: "副标题",
+	h3: "二级�标题",
+	pre: "预设有格�的",
+	1: "XX ��",
+	2: "X ��",
+	3: "��",
+	4: "中�",
+	5: "大�",
+	6: "X 大�",
+	7: "XX 大�"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/zh/LinkDialog.js b/src/main/resources/static/dijit/_editor/nls/zh/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..7afad32fe042cc788d6f8dc051ce65b91f922c62
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/zh/LinkDialog.js
@@ -0,0 +1,14 @@
+define(
+({
+	createLinkTitle: "链接属性",
+	insertImageTitle: "图�属性",
+	url: "URL：",
+	text: "说明：",
+	target: "目标：",
+	set: "集",
+	currentWindow: "当�窗�",
+	parentWindow: "父窗�",
+	topWindow: "最顶层窗�",
+	newWindow: "新建窗�"
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/nls/zh/commands.js b/src/main/resources/static/dijit/_editor/nls/zh/commands.js
new file mode 100644
index 0000000000000000000000000000000000000000..734a7449c48ecf5c99fd4280f7794b428b3cc0a5
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/nls/zh/commands.js
@@ -0,0 +1,51 @@
+define(
+({
+	'bold': '粗体',
+	'copy': '�制',
+	'cut': '剪切',
+	'delete': '删除',
+	'indent': '增加缩进',
+	'insertHorizontalRule': '水平线',
+	'insertOrderedList': '编�列表',
+	'insertUnorderedList': '符�列表',
+	'italic': '斜体',
+	'justifyCenter': '居中',
+	'justifyFull': '对�',
+	'justifyLeft': '左对�',
+	'justifyRight': '�对�',
+	'outdent': '�少缩进',
+	'paste': '粘贴',
+	'redo': '��',
+	'removeFormat': '除去格�',
+	'selectAll': '全选',
+	'strikethrough': '删除线',
+	'subscript': '下标',
+	'superscript': '上标',
+	'underline': '下划线',
+	'undo': '撤销',
+	'unlink': '除去链接',
+	'createLink': '创建链接',
+	'toggleDir': '切�方�',
+	'insertImage': '�入图�',
+	'insertTable': '�入/编辑表',
+	'toggleTableBorder': '切�表边框',
+	'deleteTable': '删除表',
+	'tableProp': '表属性',
+	'htmlToggle': 'HTML �代�',
+	'foreColor': '�景色',
+	'hiliteColor': '背景色',
+	'plainFormatBlock': '段�样�',
+	'formatBlock': '段�样�',
+	'fontSize': '字体大�',
+	'fontName': '字体�称',
+	'tabIndent': '制表符缩进',
+	"fullScreen": "切�全�",
+	"viewSource": "查看 HTML �代�",
+	"print": "打�",
+	"newPage": "新建页�",
+	/* Error messages */
+	'systemShortcut': '�能通过使用键盘快�键在�览器中执行 "${0}" �作。请使用 ${1}。',
+	'ctrlKey':'ctrl+${0}',
+	'appleKey':'\u2318${0}' // "command" or open-apple key on Macintosh
+})
+);
diff --git a/src/main/resources/static/dijit/_editor/plugins/AlwaysShowToolbar.js b/src/main/resources/static/dijit/_editor/plugins/AlwaysShowToolbar.js
new file mode 100644
index 0000000000000000000000000000000000000000..ee71706fd9e6f468be1af16c5131003eedbf1468
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/AlwaysShowToolbar.js
@@ -0,0 +1,201 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add domClass.remove
+	"dojo/dom-construct", // domConstruct.place
+	"dojo/dom-geometry",
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dojo/sniff", // has("ie") has("opera")
+	"dojo/_base/window", // win.body
+	"../_Plugin"
+], function(declare, domClass, domConstruct, domGeometry, lang, on, has, win, _Plugin){
+
+	// module:
+	//		dijit/_editor/plugins/AlwaysShowToolbar
+
+	return declare("dijit._editor.plugins.AlwaysShowToolbar", _Plugin, {
+		// summary:
+		//		This plugin is required for Editors in auto-expand mode.
+		//		It handles the auto-expansion as the user adds/deletes text,
+		//		and keeps the editor's toolbar visible even when the top of the editor
+		//		has scrolled off the top of the viewport (usually when editing a long
+		//		document).
+		// description:
+		//		Specify this in extraPlugins (or plugins) parameter and also set
+		//		height to "".
+		// example:
+		//	|	<script type="dojo/require">
+		//	|		AlwaysShowToolbar: "dijit/_editor/plugins/AlwaysShowToolbar"
+		//	|	</script>
+		//	|	<div data-dojo-type="dijit/Editor" height=""
+		//	|			data-dojo-props="extraPlugins: [AlwaysShowToolbar]">
+
+		// _handleScroll: Boolean
+		//		Enables/disables the handler for scroll events
+		_handleScroll: true,
+
+		setEditor: function(e){
+			// Overrides _Plugin.setEditor().
+			if(!e.iframe){
+				console.log('Port AlwaysShowToolbar plugin to work with Editor without iframe');
+				return;
+			}
+
+			this.editor = e;
+
+			e.onLoadDeferred.then(lang.hitch(this, this.enable));
+		},
+
+		enable: function(d){
+			// summary:
+			//		Enable plugin.  Called when Editor has finished initializing.
+			// tags:
+			//		private
+
+			this._updateHeight();
+			this.own(
+				on(window, 'scroll', lang.hitch(this, "globalOnScrollHandler")),
+				this.editor.on('NormalizedDisplayChanged', lang.hitch(this, "_updateHeight"))
+			);
+			return d;
+		},
+
+		_updateHeight: function(){
+			// summary:
+			//		Updates the height of the editor area to fit the contents.
+			var e = this.editor;
+			if(!e.isLoaded){
+				return;
+			}
+			if(e.height){
+				return;
+			}
+
+			var height = domGeometry.getMarginSize(e.editNode).h;
+			if(has("opera")){
+				height = e.editNode.scrollHeight;
+			}
+			// console.debug('height',height);
+			// alert(this.editNode);
+
+			//height maybe zero in some cases even though the content is not empty,
+			//we try the height of body instead
+			if(!height){
+				height = domGeometry.getMarginSize(e.document.body).h;
+			}
+
+			if(this._fixEnabled){
+				// #16204: add toolbar height when it is fixed aka "stuck to the top of the screen" to prevent content from cutting off during autosizing.
+				// Seems like _updateHeight should be taking the intitial margin height from a more appropriate node that includes the marginTop set in globalOnScrollHandler.
+				height += domGeometry.getMarginSize(this.editor.header).h;
+			}
+
+			if(height == 0){
+				console.debug("Can not figure out the height of the editing area!");
+				return; //prevent setting height to 0
+			}
+			if(has("ie") <= 7 && this.editor.minHeight){
+				var min = parseInt(this.editor.minHeight);
+				if(height < min){
+					height = min;
+				}
+			}
+			if(height != this._lastHeight){
+				this._lastHeight = height;
+				// this.editorObject.style.height = this._lastHeight + "px";
+				domGeometry.setMarginBox(e.iframe, { h: this._lastHeight });
+			}
+		},
+
+		// _lastHeight: Integer
+		//		Height in px of the editor at the last time we did sizing
+		_lastHeight: 0,
+
+		globalOnScrollHandler: function(){
+			// summary:
+			//		Handler for scroll events that bubbled up to `<html>`
+			// tags:
+			//		private
+
+			var isIE6 = has("ie") < 7;
+			if(!this._handleScroll){
+				return;
+			}
+			var tdn = this.editor.header;
+			if(!this._scrollSetUp){
+				this._scrollSetUp = true;
+				this._scrollThreshold = domGeometry.position(tdn, true).y;
+			}
+
+			var scrollPos = domGeometry.docScroll(this.editor.ownerDocument).y;
+			var s = tdn.style;
+
+			if(scrollPos > this._scrollThreshold && scrollPos < this._scrollThreshold + this._lastHeight){
+				// console.debug(scrollPos);
+				if(!this._fixEnabled){
+					var tdnbox = domGeometry.getMarginSize(tdn);
+					this.editor.iframe.style.marginTop = tdnbox.h + "px";
+
+					if(isIE6){
+						s.left = domGeometry.position(tdn).x;
+						if(tdn.previousSibling){
+							this._IEOriginalPos = ['after', tdn.previousSibling];
+						}else if(tdn.nextSibling){
+							this._IEOriginalPos = ['before', tdn.nextSibling];
+						}else{
+							this._IEOriginalPos = ['last', tdn.parentNode];
+						}
+						this.editor.ownerDocumentBody.appendChild(tdn);
+						domClass.add(tdn, 'dijitIEFixedToolbar');
+					}else{
+						s.position = "fixed";
+						s.top = "0px";
+					}
+
+					domGeometry.setMarginBox(tdn, { w: tdnbox.w });
+					s.zIndex = 2000;
+					this._fixEnabled = true;
+				}
+				// if we're showing the floating toolbar, make sure that if
+				// we've scrolled past the bottom of the editor that we hide
+				// the toolbar for this instance of the editor.
+
+				// TODO: when we get multiple editor toolbar support working
+				// correctly, ensure that we check this against the scroll
+				// position of the bottom-most editor instance.
+				var eHeight = (this.height) ? parseInt(this.editor.height) : this.editor._lastHeight;
+				s.display = (scrollPos > this._scrollThreshold + eHeight) ? "none" : "";
+			}else if(this._fixEnabled){
+				this.editor.iframe.style.marginTop = '';
+				s.position = "";
+				s.top = "";
+				s.zIndex = "";
+				s.display = "";
+				if(isIE6){
+					s.left = "";
+					domClass.remove(tdn, 'dijitIEFixedToolbar');
+					if(this._IEOriginalPos){
+						domConstruct.place(tdn, this._IEOriginalPos[1], this._IEOriginalPos[0]);
+						this._IEOriginalPos = null;
+					}else{
+						domConstruct.place(tdn, this.editor.iframe, 'before');
+					}
+				}
+				s.width = "";
+				this._fixEnabled = false;
+			}
+		},
+
+		destroy: function(){
+			// Overrides _Plugin.destroy().   TODO: call this.inherited() rather than repeating code.
+			this._IEOriginalPos = null;
+			this._handleScroll = false;
+			this.inherited(arguments);
+
+			if(has("ie") < 7){
+				domClass.remove(this.editor.header, 'dijitIEFixedToolbar');
+			}
+		}
+	});
+
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/EnterKeyHandling.js b/src/main/resources/static/dijit/_editor/plugins/EnterKeyHandling.js
new file mode 100644
index 0000000000000000000000000000000000000000..2311bbd38801b3e66511044e5762b2b169e9fda5
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/EnterKeyHandling.js
@@ -0,0 +1,626 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-construct", // domConstruct.destroy domConstruct.place
+	"dojo/keys", // keys.ENTER
+	"dojo/_base/lang",
+	"dojo/on",
+	"dojo/sniff", // has("ie") has("mozilla") has("webkit")
+	"dojo/_base/window", // win.withGlobal
+	"dojo/window", // winUtils.scrollIntoView
+	"../_Plugin",
+	"../RichText",
+	"../range"
+], function(declare, domConstruct, keys, lang, on, has, win, winUtils, _Plugin, RichText, rangeapi){
+
+	// module:
+	//		dijit/_editor/plugins/EnterKeyHandling
+
+	return declare("dijit._editor.plugins.EnterKeyHandling", _Plugin, {
+		// summary:
+		//		This plugin tries to make all browsers behave consistently with regard to
+		//		how ENTER behaves in the editor window.  It traps the ENTER key and alters
+		//		the way DOM is constructed in certain cases to try to commonize the generated
+		//		DOM and behaviors across browsers.
+		//
+		// description:
+		//		This plugin has three modes:
+		//
+		//		- blockNodeForEnter=BR
+		//		- blockNodeForEnter=DIV
+		//		- blockNodeForEnter=P
+		//
+		//		In blockNodeForEnter=P, the ENTER key starts a new
+		//		paragraph, and shift-ENTER starts a new line in the current paragraph.
+		//		For example, the input:
+		//
+		//	|	first paragraph <shift-ENTER>
+		//	|	second line of first paragraph <ENTER>
+		//	|	second paragraph
+		//
+		//		will generate:
+		//
+		//	|	<p>
+		//	|		first paragraph
+		//	|		<br/>
+		//	|		second line of first paragraph
+		//	|	</p>
+		//	|	<p>
+		//	|		second paragraph
+		//	|	</p>
+		//
+		//		In BR and DIV mode, the ENTER key conceptually goes to a new line in the
+		//		current paragraph, and users conceptually create a new paragraph by pressing ENTER twice.
+		//		For example, if the user enters text into an editor like this:
+		//
+		//	|		one <ENTER>
+		//	|		two <ENTER>
+		//	|		three <ENTER>
+		//	|		<ENTER>
+		//	|		four <ENTER>
+		//	|		five <ENTER>
+		//	|		six <ENTER>
+		//
+		//		It will appear on the screen as two 'paragraphs' of three lines each.  Markupwise, this generates:
+		//
+		//		BR:
+		//	|		one<br/>
+		//	|		two<br/>
+		//	|		three<br/>
+		//	|		<br/>
+		//	|		four<br/>
+		//	|		five<br/>
+		//	|		six<br/>
+		//
+		//		DIV:
+		//	|		<div>one</div>
+		//	|		<div>two</div>
+		//	|		<div>three</div>
+		//	|		<div>&nbsp;</div>
+		//	|		<div>four</div>
+		//	|		<div>five</div>
+		//	|		<div>six</div>
+
+		// blockNodeForEnter: String
+		//		This property decides the behavior of Enter key. It can be either P,
+		//		DIV, BR, or empty (which means disable this feature). Anything else
+		//		will trigger errors.  The default is 'BR'
+		//
+		//		See class description for more details.
+		blockNodeForEnter: 'BR',
+
+		constructor: function(args){
+			if(args){
+				if("blockNodeForEnter" in args){
+					args.blockNodeForEnter = args.blockNodeForEnter.toUpperCase();
+				}
+				lang.mixin(this, args);
+			}
+		},
+
+		setEditor: function(editor){
+			// Overrides _Plugin.setEditor().
+			if(this.editor === editor){
+				return;
+			}
+			this.editor = editor;
+			if(this.blockNodeForEnter == 'BR'){
+				// While Moz has a mode tht mostly works, it's still a little different,
+				// So, try to just have a common mode and be consistent.  Which means
+				// we need to enable customUndo, if not already enabled.
+				this.editor.customUndo = true;
+				editor.onLoadDeferred.then(lang.hitch(this, function(d){
+					this.own(on(editor.document, "keydown", lang.hitch(this, function(e){
+						if(e.keyCode == keys.ENTER){
+							// Just do it manually.  The handleEnterKey has a shift mode that
+							// Always acts like <br>, so just use it.
+							var ne = lang.mixin({}, e);
+							ne.shiftKey = true;
+							if(!this.handleEnterKey(ne)){
+								e.stopPropagation();
+								e.preventDefault();
+							}
+						}
+					})));
+					if(has("ie") >= 9 && has("ie") <= 10){
+						this.own(on(editor.document, "paste", lang.hitch(this, function(e){
+							setTimeout(lang.hitch(this, function(){
+								// Use the old range/selection code to kick IE 9 into updating
+								// its range by moving it back, then forward, one 'character'.
+								var r = this.editor.document.selection.createRange();
+								r.move('character', -1);
+								r.select();
+								r.move('character', 1);
+								r.select();
+							}), 0);
+						})));
+					}
+					return d;
+				}));
+			}else if(this.blockNodeForEnter){
+				// add enter key handler
+				var h = lang.hitch(this, "handleEnterKey");
+				editor.addKeyHandler(13, 0, 0, h); //enter
+				editor.addKeyHandler(13, 0, 1, h); //shift+enter
+				this.own(this.editor.on('KeyPressed', lang.hitch(this, 'onKeyPressed')));
+			}
+		},
+		onKeyPressed: function(){
+			// summary:
+			//		Handler for after the user has pressed a key, and the display has been updated.
+			//		Connected to RichText's onKeyPressed() method.
+			// tags:
+			//		private
+			if(this._checkListLater){
+				if(this.editor.selection.isCollapsed()){
+					var liparent = this.editor.selection.getAncestorElement('LI');
+					if(!liparent){
+						// circulate the undo detection code by calling RichText::execCommand directly
+						RichText.prototype.execCommand.call(this.editor, 'formatblock', this.blockNodeForEnter);
+						// set the innerHTML of the new block node
+						var block = this.editor.selection.getAncestorElement(this.blockNodeForEnter);
+						if(block){
+							block.innerHTML = this.bogusHtmlContent;
+							if(has("ie") <= 9){
+								// move to the start by moving backwards one char
+								var r = this.editor.document.selection.createRange();
+								r.move('character', -1);
+								r.select();
+							}
+						}else{
+							console.error('onKeyPressed: Cannot find the new block node'); // FIXME
+						}
+					}else{
+						if(has("mozilla")){
+							if(liparent.parentNode.parentNode.nodeName == 'LI'){
+								liparent = liparent.parentNode.parentNode;
+							}
+						}
+						var fc = liparent.firstChild;
+						if(fc && fc.nodeType == 1 && (fc.nodeName == 'UL' || fc.nodeName == 'OL')){
+							liparent.insertBefore(fc.ownerDocument.createTextNode('\xA0'), fc);
+							var newrange = rangeapi.create(this.editor.window);
+							newrange.setStart(liparent.firstChild, 0);
+							var selection = rangeapi.getSelection(this.editor.window, true);
+							selection.removeAllRanges();
+							selection.addRange(newrange);
+						}
+					}
+				}
+				this._checkListLater = false;
+			}
+			if(this._pressedEnterInBlock){
+				// the new created is the original current P, so we have previousSibling below
+				if(this._pressedEnterInBlock.previousSibling){
+					this.removeTrailingBr(this._pressedEnterInBlock.previousSibling);
+				}
+				delete this._pressedEnterInBlock;
+			}
+		},
+
+		// bogusHtmlContent: [private] String
+		//		HTML to stick into a new empty block
+		bogusHtmlContent: '&#160;', // &nbsp;
+
+		// blockNodes: [private] Regex
+		//		Regex for testing if a given tag is a block level (display:block) tag
+		blockNodes: /^(?:P|H1|H2|H3|H4|H5|H6|LI)$/,
+
+		handleEnterKey: function(e){
+			// summary:
+			//		Handler for enter key events when blockNodeForEnter is DIV or P.
+			// description:
+			//		Manually handle enter key event to make the behavior consistent across
+			//		all supported browsers. See class description for details.
+			// tags:
+			//		private
+
+			var selection, range, newrange, startNode, endNode, brNode, doc = this.editor.document, br, rs, txt;
+			if(e.shiftKey){        // shift+enter always generates <br>
+				var parent = this.editor.selection.getParentElement();
+				var header = rangeapi.getAncestor(parent, this.blockNodes);
+				if(header){
+					if(header.tagName == 'LI'){
+						return true; // let browser handle
+					}
+					selection = rangeapi.getSelection(this.editor.window);
+					range = selection.getRangeAt(0);
+					if(!range.collapsed){
+						range.deleteContents();
+						selection = rangeapi.getSelection(this.editor.window);
+						range = selection.getRangeAt(0);
+					}
+					if(rangeapi.atBeginningOfContainer(header, range.startContainer, range.startOffset)){
+						br = doc.createElement('br');
+						newrange = rangeapi.create(this.editor.window);
+						header.insertBefore(br, header.firstChild);
+						newrange.setStartAfter(br);
+						selection.removeAllRanges();
+						selection.addRange(newrange);
+					}else if(rangeapi.atEndOfContainer(header, range.startContainer, range.startOffset)){
+						newrange = rangeapi.create(this.editor.window);
+						br = doc.createElement('br');
+						header.appendChild(br);
+						header.appendChild(doc.createTextNode('\xA0'));
+						newrange.setStart(header.lastChild, 0);
+						selection.removeAllRanges();
+						selection.addRange(newrange);
+					}else{
+						rs = range.startContainer;
+						if(rs && rs.nodeType == 3){
+							// Text node, we have to split it.
+							txt = rs.nodeValue;
+							startNode = doc.createTextNode(txt.substring(0, range.startOffset));
+							endNode = doc.createTextNode(txt.substring(range.startOffset));
+							brNode = doc.createElement("br");
+
+							if(endNode.nodeValue == "" && has("webkit")){
+								endNode = doc.createTextNode('\xA0')
+							}
+							domConstruct.place(startNode, rs, "after");
+							domConstruct.place(brNode, startNode, "after");
+							domConstruct.place(endNode, brNode, "after");
+							domConstruct.destroy(rs);
+							newrange = rangeapi.create(this.editor.window);
+							newrange.setStart(endNode, 0);
+							selection.removeAllRanges();
+							selection.addRange(newrange);
+							return false;
+						}
+						return true; // let browser handle
+					}
+				}else{
+					selection = rangeapi.getSelection(this.editor.window);
+					if(selection.rangeCount){
+						range = selection.getRangeAt(0);
+						if(range && range.startContainer){
+							if(!range.collapsed){
+								range.deleteContents();
+								selection = rangeapi.getSelection(this.editor.window);
+								range = selection.getRangeAt(0);
+							}
+							rs = range.startContainer;
+							if(rs && rs.nodeType == 3){
+								// Text node, we have to split it.
+
+								var offset = range.startOffset;
+								if(rs.length < offset){
+									//We are not splitting the right node, try to locate the correct one
+									ret = this._adjustNodeAndOffset(rs, offset);
+									rs = ret.node;
+									offset = ret.offset;
+								}
+								txt = rs.nodeValue;
+
+								startNode = doc.createTextNode(txt.substring(0, offset));
+								endNode = doc.createTextNode(txt.substring(offset));
+								brNode = doc.createElement("br");
+
+								if(!endNode.length){
+									// Create dummy text with a &nbsp to go after the BR, to prevent IE crash.
+									// See https://bugs.dojotoolkit.org/ticket/12008 for details.
+									endNode = doc.createTextNode('\xA0');
+								}
+
+								if(startNode.length){
+									domConstruct.place(startNode, rs, "after");
+								}else{
+									startNode = rs;
+								}
+								domConstruct.place(brNode, startNode, "after");
+								domConstruct.place(endNode, brNode, "after");
+								domConstruct.destroy(rs);
+								newrange = rangeapi.create(this.editor.window);
+								newrange.setStart(endNode, 0);
+								newrange.setEnd(endNode, endNode.length);
+								selection.removeAllRanges();
+								selection.addRange(newrange);
+								this.editor.selection.collapse(true);
+							}else{
+								var targetNode;
+								if(range.startOffset >= 0){
+									targetNode = rs.childNodes[range.startOffset];
+								}
+								var brNode = doc.createElement("br");
+								var endNode = doc.createTextNode('\xA0');
+								if(!targetNode){
+									rs.appendChild(brNode);
+									rs.appendChild(endNode);
+								}else{
+									domConstruct.place(brNode, targetNode, "before");
+									domConstruct.place(endNode, brNode, "after");
+								}
+								newrange = rangeapi.create(this.editor.window);
+								newrange.setStart(endNode, 0);
+								newrange.setEnd(endNode, endNode.length);
+								selection.removeAllRanges();
+								selection.addRange(newrange);
+								this.editor.selection.collapse(true);
+							}
+							// \xA0 dummy text node remains, but is stripped before get("value")
+							// by RichText._stripTrailingEmptyNodes().  Still, could we just use a plain
+							// space (" ") instead?
+						}
+					}else{
+						// don't change this: do not call this.execCommand, as that may have other logic in subclass
+						RichText.prototype.execCommand.call(this.editor, 'inserthtml', '<br>');
+					}
+				}
+				return false;
+			}
+			var _letBrowserHandle = true;
+
+			// first remove selection
+			selection = rangeapi.getSelection(this.editor.window);
+			range = selection.getRangeAt(0);
+			if(!range.collapsed){
+				range.deleteContents();
+				selection = rangeapi.getSelection(this.editor.window);
+				range = selection.getRangeAt(0);
+			}
+
+			var block = rangeapi.getBlockAncestor(range.endContainer, null, this.editor.editNode);
+			var blockNode = block.blockNode;
+
+			// if this is under a LI or the parent of the blockNode is LI, just let browser to handle it
+			if((this._checkListLater = (blockNode && (blockNode.nodeName == 'LI' || blockNode.parentNode.nodeName == 'LI')))){
+				if(has("mozilla")){
+					// press enter in middle of P may leave a trailing <br/>, let's remove it later
+					this._pressedEnterInBlock = blockNode;
+				}
+				// if this li only contains spaces, set the content to empty so the browser will outdent this item
+				if(/^(\s|&nbsp;|&#160;|\xA0|<span\b[^>]*\bclass=['"]Apple-style-span['"][^>]*>(\s|&nbsp;|&#160;|\xA0)<\/span>)?(<br>)?$/.test(blockNode.innerHTML)){
+					// empty LI node
+					blockNode.innerHTML = '';
+					if(has("webkit")){ // WebKit tosses the range when innerHTML is reset
+						newrange = rangeapi.create(this.editor.window);
+						newrange.setStart(blockNode, 0);
+						selection.removeAllRanges();
+						selection.addRange(newrange);
+					}
+					this._checkListLater = false; // nothing to check since the browser handles outdent
+				}
+				return true;
+			}
+
+			// text node directly under body, let's wrap them in a node
+			if(!block.blockNode || block.blockNode === this.editor.editNode){
+				try{
+					RichText.prototype.execCommand.call(this.editor, 'formatblock', this.blockNodeForEnter);
+				}catch(e2){ /*squelch FF3 exception bug when editor content is a single BR*/
+				}
+				// get the newly created block node
+				// FIXME
+				block = {blockNode: this.editor.selection.getAncestorElement(this.blockNodeForEnter),
+					blockContainer: this.editor.editNode};
+				if(block.blockNode){
+					if(block.blockNode != this.editor.editNode &&
+						(!(block.blockNode.textContent || block.blockNode.innerHTML).replace(/^\s+|\s+$/g, "").length)){
+						this.removeTrailingBr(block.blockNode);
+						return false;
+					}
+				}else{    // we shouldn't be here if formatblock worked
+					block.blockNode = this.editor.editNode;
+				}
+				selection = rangeapi.getSelection(this.editor.window);
+				range = selection.getRangeAt(0);
+			}
+
+			var newblock = doc.createElement(this.blockNodeForEnter);
+			newblock.innerHTML = this.bogusHtmlContent;
+			this.removeTrailingBr(block.blockNode);
+			var endOffset = range.endOffset;
+			var node = range.endContainer;
+			if(node.length < endOffset){
+				//We are not checking the right node, try to locate the correct one
+				var ret = this._adjustNodeAndOffset(node, endOffset);
+				node = ret.node;
+				endOffset = ret.offset;
+			}
+			if(rangeapi.atEndOfContainer(block.blockNode, node, endOffset)){
+				if(block.blockNode === block.blockContainer){
+					block.blockNode.appendChild(newblock);
+				}else{
+					domConstruct.place(newblock, block.blockNode, "after");
+				}
+				_letBrowserHandle = false;
+				// lets move caret to the newly created block
+				newrange = rangeapi.create(this.editor.window);
+				newrange.setStart(newblock, 0);
+				selection.removeAllRanges();
+				selection.addRange(newrange);
+				if(this.editor.height){
+					winUtils.scrollIntoView(newblock);
+				}
+			}else if(rangeapi.atBeginningOfContainer(block.blockNode,
+				range.startContainer, range.startOffset)){
+				domConstruct.place(newblock, block.blockNode, block.blockNode === block.blockContainer ? "first" : "before");
+				if(newblock.nextSibling && this.editor.height){
+					// position input caret - mostly WebKit needs this
+					newrange = rangeapi.create(this.editor.window);
+					newrange.setStart(newblock.nextSibling, 0);
+					selection.removeAllRanges();
+					selection.addRange(newrange);
+					// browser does not scroll the caret position into view, do it manually
+					winUtils.scrollIntoView(newblock.nextSibling);
+				}
+				_letBrowserHandle = false;
+			}else{ //press enter in the middle of P/DIV/Whatever/
+				if(block.blockNode === block.blockContainer){
+					block.blockNode.appendChild(newblock);
+				}else{
+					domConstruct.place(newblock, block.blockNode, "after");
+				}
+				_letBrowserHandle = false;
+
+				// Clone any block level styles.
+				if(block.blockNode.style){
+					if(newblock.style){
+						if(block.blockNode.style.cssText){
+							newblock.style.cssText = block.blockNode.style.cssText;
+						}
+					}
+				}
+
+				// Okay, we probably have to split.
+				rs = range.startContainer;
+				var firstNodeMoved;
+				if(rs && rs.nodeType == 3){
+					// Text node, we have to split it.
+					var nodeToMove, tNode;
+					endOffset = range.endOffset;
+					if(rs.length < endOffset){
+						//We are not splitting the right node, try to locate the correct one
+						ret = this._adjustNodeAndOffset(rs, endOffset);
+						rs = ret.node;
+						endOffset = ret.offset;
+					}
+
+					txt = rs.nodeValue;
+					startNode = doc.createTextNode(txt.substring(0, endOffset));
+					endNode = doc.createTextNode(txt.substring(endOffset, txt.length));
+
+					// Place the split, then remove original nodes.
+					domConstruct.place(startNode, rs, "before");
+					domConstruct.place(endNode, rs, "after");
+					domConstruct.destroy(rs);
+
+					// Okay, we split the text.  Now we need to see if we're
+					// parented to the block element we're splitting and if
+					// not, we have to split all the way up.  Ugh.
+					var parentC = startNode.parentNode;
+					while(parentC !== block.blockNode){
+						var tg = parentC.tagName;
+						var newTg = doc.createElement(tg);
+						// Clone over any 'style' data.
+						if(parentC.style){
+							if(newTg.style){
+								if(parentC.style.cssText){
+									newTg.style.cssText = parentC.style.cssText;
+								}
+							}
+						}
+						// If font also need to clone over any font data.
+						if(parentC.tagName === "FONT"){
+							if(parentC.color){
+								newTg.color = parentC.color;
+							}
+							if(parentC.face){
+								newTg.face = parentC.face;
+							}
+							if(parentC.size){  // this check was necessary on IE
+								newTg.size = parentC.size;
+							}
+						}
+
+						nodeToMove = endNode;
+						while(nodeToMove){
+							tNode = nodeToMove.nextSibling;
+							newTg.appendChild(nodeToMove);
+							nodeToMove = tNode;
+						}
+						domConstruct.place(newTg, parentC, "after");
+						startNode = parentC;
+						endNode = newTg;
+						parentC = parentC.parentNode;
+					}
+
+					// Lastly, move the split out tags to the new block.
+					// as they should now be split properly.
+					nodeToMove = endNode;
+					if(nodeToMove.nodeType == 1 || (nodeToMove.nodeType == 3 && nodeToMove.nodeValue)){
+						// Non-blank text and non-text nodes need to clear out that blank space
+						// before moving the contents.
+						newblock.innerHTML = "";
+					}
+					firstNodeMoved = nodeToMove;
+					while(nodeToMove){
+						tNode = nodeToMove.nextSibling;
+						newblock.appendChild(nodeToMove);
+						nodeToMove = tNode;
+					}
+				}
+
+				//lets move caret to the newly created block
+				newrange = rangeapi.create(this.editor.window);
+				var nodeForCursor;
+				var innerMostFirstNodeMoved = firstNodeMoved;
+				if(this.blockNodeForEnter !== 'BR'){
+					while(innerMostFirstNodeMoved){
+						nodeForCursor = innerMostFirstNodeMoved;
+						tNode = innerMostFirstNodeMoved.firstChild;
+						innerMostFirstNodeMoved = tNode;
+					}
+					if(nodeForCursor && nodeForCursor.parentNode){
+						newblock = nodeForCursor.parentNode;
+						newrange.setStart(newblock, 0);
+						selection.removeAllRanges();
+						selection.addRange(newrange);
+						if(this.editor.height){
+							winUtils.scrollIntoView(newblock);
+						}
+						if(has("mozilla")){
+							// press enter in middle of P may leave a trailing <br/>, let's remove it later
+							this._pressedEnterInBlock = block.blockNode;
+						}
+					}else{
+						_letBrowserHandle = true;
+					}
+				}else{
+					newrange.setStart(newblock, 0);
+					selection.removeAllRanges();
+					selection.addRange(newrange);
+					if(this.editor.height){
+						winUtils.scrollIntoView(newblock);
+					}
+					if(has("mozilla")){
+						// press enter in middle of P may leave a trailing <br/>, let's remove it later
+						this._pressedEnterInBlock = block.blockNode;
+					}
+				}
+			}
+			return _letBrowserHandle;
+		},
+
+		_adjustNodeAndOffset: function(/*DomNode*/node, /*Int*/offset){
+			// summary:
+			//		In the case there are multiple text nodes in a row the offset may not be within the node.  If the offset is larger than the node length, it will attempt to find
+			//		the next text sibling until it locates the text node in which the offset refers to
+			// node:
+			//		The node to check.
+			// offset:
+			//		The position to find within the text node
+			// tags:
+			//		private.
+			while(node.length < offset && node.nextSibling && node.nextSibling.nodeType == 3){
+				//Adjust the offset and node in the case of multiple text nodes in a row
+				offset = offset - node.length;
+				node = node.nextSibling;
+			}
+			return {"node": node, "offset": offset};
+		},
+
+		removeTrailingBr: function(container){
+			// summary:
+			//		If last child of container is a `<br>`, then remove it.
+			// tags:
+			//		private
+			var para = /P|DIV|LI/i.test(container.tagName) ?
+				container : this.editor.selection.getParentOfType(container, ['P', 'DIV', 'LI']);
+
+			if(!para){
+				return;
+			}
+			if(para.lastChild){
+				if((para.childNodes.length > 1 && para.lastChild.nodeType == 3 && /^[\s\xAD]*$/.test(para.lastChild.nodeValue)) ||
+					para.lastChild.tagName == 'BR'){
+
+					domConstruct.destroy(para.lastChild);
+				}
+			}
+			if(!para.childNodes.length){
+				para.innerHTML = this.bogusHtmlContent;
+			}
+		}
+	});
+
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/FontChoice.js b/src/main/resources/static/dijit/_editor/plugins/FontChoice.js
new file mode 100644
index 0000000000000000000000000000000000000000..e617889d96d76374db7e99c586c8250297722dee
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/FontChoice.js
@@ -0,0 +1,606 @@
+define([
+	"require",
+	"dojo/_base/array", // array.indexOf array.map
+	"dojo/_base/declare", // declare
+	"dojo/dom-construct", // domConstruct.place
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/_base/lang", // lang.delegate lang.hitch lang.isString
+	"dojo/store/Memory", // MemoryStore
+	"../../registry", // registry.getUniqueId
+	"../../_Widget",
+	"../../_TemplatedMixin",
+	"../../_WidgetsInTemplateMixin",
+	"../../form/FilteringSelect",
+	"../_Plugin",
+	"../range",
+	"dojo/i18n!../nls/FontChoice"
+], function(require, array, declare, domConstruct, i18n, lang, MemoryStore,
+	registry, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin, FilteringSelect, _Plugin, rangeapi){
+
+	// module:
+	//		dijit/_editor/plugins/FontChoice
+
+	var _FontDropDown = declare("dijit._editor.plugins._FontDropDown",
+		[_Widget, _TemplatedMixin, _WidgetsInTemplateMixin], {
+			// summary:
+			//		Base class for widgets that contains a label (like "Font:")
+			//		and a FilteringSelect drop down to pick a value.
+			//		Used as Toolbar entry.
+
+			// label: [public] String
+			//		The label to apply to this particular FontDropDown.
+			label: "",
+
+			// plainText: [public] boolean
+			//		Flag to indicate that the returned label should be plain text
+			//		instead of an example.
+			plainText: false,
+
+			// templateString: [public] String
+			//		The template used to construct the labeled dropdown.
+			templateString: "<span style='white-space: nowrap' class='dijit dijitReset dijitInline'>" +
+				"<label class='dijitLeft dijitInline' for='${selectId}'>${label}</label>" +
+				"<input data-dojo-type='../../form/FilteringSelect' required='false' " +
+				"data-dojo-props='labelType:\"html\", labelAttr:\"label\", searchAttr:\"name\"' " +
+				"class='${comboClass}' " +
+				"tabIndex='-1' id='${selectId}' data-dojo-attach-point='select' value=''/>" +
+				"</span>",
+
+			// contextRequire: [public] Function
+			//		The context require that is used to resolve modules in template.
+			contextRequire: require,
+
+			postMixInProperties: function(){
+				// summary:
+				//		Over-ride to set specific properties.
+				this.inherited(arguments);
+
+				this.strings = i18n.getLocalization("dijit._editor", "FontChoice");
+
+				// Set some substitution variables used in the template
+				this.label = this.strings[this.command];
+
+				// _WidgetBase sets the id after postMixInProperties(), but we need it now.
+				// Alternative is to have a buildRendering() method and move this.selectId setting there,
+				// or alternately get rid of selectId variable and just access ${id} in template?
+				this.id = registry.getUniqueId(this.declaredClass.replace(/\./g, "_"));
+
+				this.selectId = this.id + "_select";	// used in template
+
+				this.inherited(arguments);
+			},
+
+			postCreate: function(){
+				// summary:
+				//		Over-ride for the default postCreate action
+				//		This establishes the filtering selects and the like.
+
+				// Initialize the list of items in the drop down by creating data store with items like:
+				// {value: 1, name: "xx-small", label: "<font size=1>xx-small</font-size>" }
+				this.select.set("store", new MemoryStore({
+					idProperty: "value",
+					data: array.map(this.values, function(value){
+						var name = this.strings[value] || value;
+						return {
+							label: this.getLabel(value, name),
+							name: name,
+							value: value
+						};
+					}, this)
+				}));
+
+				this.select.set("value", "", false);
+				this.disabled = this.select.get("disabled");
+			},
+
+			_setValueAttr: function(value, priorityChange){
+				// summary:
+				//		Over-ride for the default action of setting the
+				//		widget value, maps the input to known values
+				// value: Object|String
+				//		The value to set in the select.
+				// priorityChange:
+				//		Optional parameter used to tell the select whether or not to fire
+				//		onChange event.
+
+				// if the value is not a permitted value, just set empty string to prevent showing the warning icon
+				priorityChange = priorityChange !== false;
+				this.select.set('value', array.indexOf(this.values, value) < 0 ? "" : value, priorityChange);
+				if(!priorityChange){
+					// Clear the last state in case of updateState calls.  Ref: #10466
+					this.select._lastValueReported = null;
+				}
+			},
+
+			_getValueAttr: function(){
+				// summary:
+				//		Allow retrieving the value from the composite select on
+				//		call to button.get("value");
+				return this.select.get('value');
+			},
+
+			focus: function(){
+				// summary:
+				//		Over-ride for focus control of this widget.  Delegates focus down to the
+				//		filtering select.
+				this.select.focus();
+			},
+
+			_setDisabledAttr: function(value){
+				// summary:
+				//		Over-ride for the button's 'disabled' attribute so that it can be
+				//		disabled programmatically.
+
+				// Save off ths disabled state so the get retrieves it correctly
+				//without needing to have a function proxy it.
+				this._set("disabled", value);
+				this.select.set("disabled", value);
+			}
+		});
+
+
+	var _FontNameDropDown = declare("dijit._editor.plugins._FontNameDropDown", _FontDropDown, {
+		// summary:
+		//		Dropdown to select a font; goes in editor toolbar.
+
+		// generic: [const] Boolean
+		//		Use generic (web standard) font names
+		generic: false,
+
+		// command: [public] String
+		//		The editor 'command' implemented by this plugin.
+		command: "fontName",
+
+		comboClass: "dijitFontNameCombo",
+
+		postMixInProperties: function(){
+			// summary:
+			//		Over-ride for the default posr mixin control
+			if(!this.values){
+				this.values = this.generic ?
+					["serif", "sans-serif", "monospace", "cursive", "fantasy"] : // CSS font-family generics
+					["Arial", "Times New Roman", "Comic Sans MS", "Courier New"];
+			}
+			this.inherited(arguments);
+		},
+
+		getLabel: function(value, name){
+			// summary:
+			//		Function used to generate the labels of the format dropdown
+			//		will return a formatted, or plain label based on the value
+			//		of the plainText option.
+			// value: String
+			//		The 'insert value' associated with a name
+			// name: String
+			//		The text name of the value
+			if(this.plainText){
+				return name;
+			}else{
+				return "<div style='font-family: " + value + "'>" + name + "</div>";
+			}
+		},
+
+		_setValueAttr: function(value, priorityChange){
+			// summary:
+			//		Over-ride for the default action of setting the
+			//		widget value, maps the input to known values
+
+			priorityChange = priorityChange !== false;
+			if(this.generic){
+				var map = {
+					"Arial": "sans-serif",
+					"Helvetica": "sans-serif",
+					"Myriad": "sans-serif",
+					"Times": "serif",
+					"Times New Roman": "serif",
+					"Comic Sans MS": "cursive",
+					"Apple Chancery": "cursive",
+					"Courier": "monospace",
+					"Courier New": "monospace",
+					"Papyrus": "fantasy",
+					"Estrangelo Edessa": "cursive", // Windows 7
+					"Gabriola": "fantasy" // Windows 7
+				};
+				value = map[value] || value;
+			}
+			this.inherited(arguments, [value, priorityChange]);
+		}
+	});
+
+	var _FontSizeDropDown = declare("dijit._editor.plugins._FontSizeDropDown", _FontDropDown, {
+		// summary:
+		//		Dropdown to select a font size; goes in editor toolbar.
+
+		// command: [public] String
+		//		The editor 'command' implemented by this plugin.
+		command: "fontSize",
+
+		comboClass: "dijitFontSizeCombo",
+
+		// values: [public] Number[]
+		//		The HTML font size values supported by this plugin
+		values: [1, 2, 3, 4, 5, 6, 7], // sizes according to the old HTML FONT SIZE
+
+		getLabel: function(value, name){
+			// summary:
+			//		Function used to generate the labels of the format dropdown
+			//		will return a formatted, or plain label based on the value
+			//		of the plainText option.
+			//		We're stuck using the deprecated FONT tag to correspond
+			//		with the size measurements used by the editor
+			// value: String
+			//		The 'insert value' associated with a name
+			// name: String
+			//		The text name of the value
+			if(this.plainText){
+				return name;
+			}else{
+				return "<font size=" + value + "'>" + name + "</font>";
+			}
+		},
+
+		_setValueAttr: function(value, priorityChange){
+			// summary:
+			//		Over-ride for the default action of setting the
+			//		widget value, maps the input to known values
+			priorityChange = priorityChange !== false;
+			if(value.indexOf && value.indexOf("px") != -1){
+				var pixels = parseInt(value, 10);
+				value = {10: 1, 13: 2, 16: 3, 18: 4, 24: 5, 32: 6, 48: 7}[pixels] || value;
+			}
+
+			this.inherited(arguments, [value, priorityChange]);
+		}
+	});
+
+
+	var _FormatBlockDropDown = declare("dijit._editor.plugins._FormatBlockDropDown", _FontDropDown, {
+		// summary:
+		//		Dropdown to select a format (like paragraph or heading); goes in editor toolbar.
+
+		// command: [public] String
+		//		The editor 'command' implemented by this plugin.
+		command: "formatBlock",
+
+		comboClass: "dijitFormatBlockCombo",
+
+		// values: [public] Array
+		//		The HTML format tags supported by this plugin
+		values: ["noFormat", "p", "h1", "h2", "h3", "pre"],
+
+		postCreate: function(){
+			// Init and set the default value to no formatting.  Update state will adjust it
+			// as needed.
+			this.inherited(arguments);
+			this.set("value", "noFormat", false);
+		},
+
+		getLabel: function(value, name){
+			// summary:
+			//		Function used to generate the labels of the format dropdown
+			//		will return a formatted, or plain label based on the value
+			//		of the plainText option.
+			// value: String
+			//		The 'insert value' associated with a name
+			// name: String
+			//		The text name of the value
+			if(this.plainText || value == "noFormat"){
+				return name;
+			}else{
+				return "<" + value + ">" + name + "</" + value + ">";
+			}
+		},
+
+		_execCommand: function(editor, command, choice){
+			// summary:
+			//		Over-ride for default exec-command label.
+			//		Allows us to treat 'none' as special.
+			if(choice === "noFormat"){
+				var start;
+				var end;
+				var sel = rangeapi.getSelection(editor.window);
+				if(sel && sel.rangeCount > 0){
+					var range = sel.getRangeAt(0);
+					var node, tag;
+					if(range){
+						start = range.startContainer;
+						end = range.endContainer;
+
+						// find containing nodes of start/end.
+						while(start && start !== editor.editNode &&
+							start !== editor.document.body &&
+							start.nodeType !== 1){
+							start = start.parentNode;
+						}
+
+						while(end && end !== editor.editNode &&
+							end !== editor.document.body &&
+							end.nodeType !== 1){
+							end = end.parentNode;
+						}
+
+						var processChildren = lang.hitch(this, function(node, ary){
+							if(node.childNodes && node.childNodes.length){
+								var i;
+								for(i = 0; i < node.childNodes.length; i++){
+									var c = node.childNodes[i];
+									if(c.nodeType == 1){
+										if(editor.selection.inSelection(c)){
+											var tag = c.tagName ? c.tagName.toLowerCase() : "";
+											if(array.indexOf(this.values, tag) !== -1){
+												ary.push(c);
+											}
+											processChildren(c, ary);
+										}
+									}
+								}
+							}
+						});
+
+						var unformatNodes = lang.hitch(this, function(nodes){
+							// summary:
+							//		Internal function to clear format nodes.
+							// nodes:
+							//		The array of nodes to strip formatting from.
+							if(nodes && nodes.length){
+								editor.beginEditing();
+								while(nodes.length){
+									this._removeFormat(editor, nodes.pop());
+								}
+								editor.endEditing();
+							}
+						});
+
+						var clearNodes = [];
+						if(start == end){
+							//Contained within the same block, may be collapsed, but who cares, see if we
+							// have a block element to remove.
+							var block;
+							node = start;
+							while(node && node !== editor.editNode && node !== editor.document.body){
+								if(node.nodeType == 1){
+									tag = node.tagName ? node.tagName.toLowerCase() : "";
+									if(array.indexOf(this.values, tag) !== -1){
+										block = node;
+										break;
+									}
+								}
+								node = node.parentNode;
+							}
+
+							//Also look for all child nodes in the selection that may need to be
+							//cleared of formatting
+							processChildren(start, clearNodes);
+							if(block){
+								clearNodes = [block].concat(clearNodes);
+							}
+							unformatNodes(clearNodes);
+						}else{
+							// Probably a multi select, so we have to process it.  Whee.
+							node = start;
+							while(editor.selection.inSelection(node)){
+								if(node.nodeType == 1){
+									tag = node.tagName ? node.tagName.toLowerCase() : "";
+									if(array.indexOf(this.values, tag) !== -1){
+										clearNodes.push(node);
+									}
+									processChildren(node, clearNodes);
+								}
+								node = node.nextSibling;
+							}
+							unformatNodes(clearNodes);
+						}
+						editor.onDisplayChanged();
+					}
+				}
+			}else{
+				editor.execCommand(command, choice);
+			}
+		},
+
+		_removeFormat: function(editor, node){
+			// summary:
+			//		function to remove the block format node.
+			// node:
+			//		The block format node to remove (and leave the contents behind)
+			if(editor.customUndo){
+				// So of course IE doesn't work right with paste-overs.
+				// We have to do this manually, which is okay since IE already uses
+				// customUndo and we turned it on for WebKit.  WebKit pasted funny,
+				// so couldn't use the execCommand approach
+				while(node.firstChild){
+					domConstruct.place(node.firstChild, node, "before");
+				}
+				node.parentNode.removeChild(node);
+			}else{
+				// Everyone else works fine this way, a paste-over and is native
+				// undo friendly.
+				editor.selection.selectElementChildren(node);
+				var html = editor.selection.getSelectedHtml();
+				editor.selection.selectElement(node);
+				editor.execCommand("inserthtml", html || "");
+			}
+		}
+	});
+
+	// TODO: for 2.0, split into FontChoice plugin into three separate classes,
+	// one for each command (and change registry below)
+	var FontChoice = declare("dijit._editor.plugins.FontChoice", _Plugin, {
+		// summary:
+		//		This plugin provides three drop downs for setting style in the editor
+		//		(font, font size, and format block), as controlled by command.
+		//
+		// description:
+		//		The commands provided by this plugin are:
+		//
+		//		- fontName: Provides a drop down to select from a list of font names
+		//		- fontSize: Provides a drop down to select from a list of font sizes
+		//		- formatBlock: Provides a drop down to select from a list of block styles
+		//		  which can easily be added to an editor by including one or more of the above commands
+		//		  in the `plugins` attribute as follows:
+		//
+		//	|	plugins="['fontName','fontSize',...]"
+		//
+		//		It is possible to override the default dropdown list by providing an Array for the `custom` property when
+		//		instantiating this plugin, e.g.
+		//
+		//	|	plugins="[{name:'dijit._editor.plugins.FontChoice', command:'fontName', values:['Verdana','Myriad','Garamond']},...]"
+		//
+		//		Alternatively, for `fontName` only, `generic:true` may be specified to provide a dropdown with
+		//		[CSS generic font families](http://www.w3.org/TR/REC-CSS2/fonts.html#generic-font-families).
+		//
+		//		Note that the editor is often unable to properly handle font styling information defined outside
+		//		the context of the current editor instance, such as pre-populated HTML.
+
+		// useDefaultCommand: [protected] Boolean
+		//		Override _Plugin.useDefaultCommand...
+		//		processing is handled by this plugin, not by dijit/Editor.
+		useDefaultCommand: false,
+
+		_initButton: function(){
+			// summary:
+			//		Overrides _Plugin._initButton(), to initialize the FilteringSelect+label in toolbar,
+			//		rather than a simple button.
+			// tags:
+			//		protected
+
+			// Create the widget to go into the toolbar (the so-called "button")
+			var clazz = {
+					fontName: _FontNameDropDown,
+					fontSize: _FontSizeDropDown,
+					formatBlock: _FormatBlockDropDown
+				}[this.command],
+				params = this.params;
+
+			// For back-compat reasons support setting custom values via "custom" parameter
+			// rather than "values" parameter.   Remove in 2.0.
+			if(this.params.custom){
+				params.values = this.params.custom;
+			}
+
+			var editor = this.editor;
+			this.button = new clazz(lang.delegate({dir: editor.dir, lang: editor.lang}, params));
+
+			// Reflect changes to the drop down in the editor
+			this.own(this.button.select.on("change", lang.hitch(this, function(choice){
+				// User invoked change, since all internal updates set priorityChange to false and will
+				// not trigger an onChange event.
+
+				if(this.editor.focused){
+					// put focus back in the iframe, unless focus has somehow been shifted out of the editor completely
+					this.editor.focus();
+				}
+
+				if(this.command == "fontName" && choice.indexOf(" ") != -1){
+					choice = "'" + choice + "'";
+				}
+
+				// Invoke, the editor already normalizes commands called through its
+				// execCommand.
+				if(this.button._execCommand){
+					this.button._execCommand(this.editor, this.command, choice);
+				}else{
+					this.editor.execCommand(this.command, choice);
+				}
+			})));
+		},
+
+		updateState: function(){
+			// summary:
+			//		Overrides _Plugin.updateState().  This controls updating the menu
+			//		options to the right values on state changes in the document (that trigger a
+			//		test of the actions.)
+			//		It set value of drop down in toolbar to reflect font/font size/format block
+			//		of text at current caret position.
+			// tags:
+			//		protected
+			var _e = this.editor;
+			var _c = this.command;
+			if(!_e || !_e.isLoaded || !_c.length){
+				return;
+			}
+
+			if(this.button){
+				var disabled = this.get("disabled");
+				this.button.set("disabled", disabled);
+				if(disabled){
+					return;
+				}
+				var value;
+				try{
+					value = _e.queryCommandValue(_c) || "";
+				}catch(e){
+					//Firefox may throw error above if the editor is just loaded, ignore it
+					value = "";
+				}
+
+				// strip off single quotes, if any
+				var quoted = lang.isString(value) && (value.match(/'([^']*)'/) || value.match(/"([^"]*)"/));
+				if(quoted){
+					value = quoted[1];
+				}
+
+				if(_c === "formatBlock"){
+					if(!value || value == "p"){
+						// Some browsers (WebKit) doesn't actually get the tag info right.
+						// and IE returns paragraph when in a DIV!, so incorrect a lot,
+						// so we have double-check it.
+						value = null;
+						var elem;
+						// Try to find the current element where the caret is.
+						var sel = rangeapi.getSelection(this.editor.window);
+						if(sel && sel.rangeCount > 0){
+							var range = sel.getRangeAt(0);
+							if(range){
+								elem = range.endContainer;
+							}
+						}
+
+						// Okay, now see if we can find one of the formatting types we're in.
+						while(elem && elem !== _e.editNode && elem !== _e.document){
+							var tg = elem.tagName ? elem.tagName.toLowerCase() : "";
+							if(tg && array.indexOf(this.button.values, tg) > -1){
+								value = tg;
+								break;
+							}
+							elem = elem.parentNode;
+						}
+						if(!value){
+							// Still no value, so lets select 'none'.
+							value = "noFormat";
+						}
+					}else{
+						// Check that the block format is one allowed, if not,
+						// null it so that it gets set to empty.
+						if(array.indexOf(this.button.values, value) < 0){
+							value = "noFormat";
+						}
+					}
+				}
+				if(value !== this.button.get("value")){
+					// Set the value, but denote it is not a priority change, so no
+					// onchange fires.
+					this.button.set('value', value, false);
+				}
+			}
+		}
+	});
+
+	// Register these plugins
+	array.forEach(["fontName", "fontSize", "formatBlock"], function(name){
+		_Plugin.registry[name] = function(args){
+			return new FontChoice({
+				command: name,
+				plainText: args.plainText
+			});
+		};
+	});
+
+	// Make all classes available through AMD, and return main class
+	FontChoice._FontDropDown = _FontDropDown;
+	FontChoice._FontNameDropDown = _FontNameDropDown;
+	FontChoice._FontSizeDropDown = _FontSizeDropDown;
+	FontChoice._FormatBlockDropDown = _FormatBlockDropDown;
+	return FontChoice;
+
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/FullScreen.js b/src/main/resources/static/dijit/_editor/plugins/FullScreen.js
new file mode 100644
index 0000000000000000000000000000000000000000..6ec4844279940383304cca4270b54ffc13c1016f
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/FullScreen.js
@@ -0,0 +1,454 @@
+define([
+	"dojo/aspect",
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add domClass.remove
+	"dojo/dom-geometry",
+	"dojo/dom-style",
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/keys", // keys.F11 keys.TAB
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on", // on()
+	"dojo/sniff", // has("ie"), has("quirks")
+	"dojo/_base/window", // win.body
+	"dojo/window", // winUtils.getBox winUtils.scrollIntoView
+	"../../focus", // focus.focus(), focus.curNode
+	"../_Plugin",
+	"../../form/ToggleButton",
+	"../../registry", // registry.getEnclosingWidget()
+	"dojo/i18n!../nls/commands"
+], function(aspect, declare, domClass, domGeometry, domStyle, i18n, keys, lang, on, has, win, winUtils,
+			focus, _Plugin, ToggleButton, registry){
+
+	// module:
+	//		dijit/_editor/plugins/FullScreen
+
+	var FullScreen = declare("dijit._editor.plugins.FullScreen", _Plugin, {
+		// summary:
+		//		This plugin provides FullScreen capability to the editor.  When
+		//		toggled on, it will render the editor into the full window and
+		//		overlay everything.  It also binds to the hotkey: CTRL-SHIFT-F11
+		//		for toggling fullscreen mode.
+
+		// zIndex: [public] Number
+		//		zIndex value used for overlaying the full page.
+		//		default is 500.
+		zIndex: 500,
+
+		// _origState: [private] Object
+		//		The original view state of the editor.
+		_origState: null,
+
+		// _origiFrameState: [private] Object
+		//		The original view state of the iframe of the editor.
+		_origiFrameState: null,
+
+		// _resizeHandle: [private] Object
+		//		Connection point used for handling resize when window resizes.
+		_resizeHandle: null,
+
+		// isFullscreen: [const] boolean
+		//		Read-Only variable used to denote of the editor is in fullscreen mode or not.
+		isFullscreen: false,
+
+		toggle: function(){
+			// summary:
+			//		Function to allow programmatic toggling of the view.
+			this.button.set("checked", !this.button.get("checked"));
+		},
+
+		_initButton: function(){
+			// summary:
+			//		Over-ride for creation of the resize button.
+			var strings = i18n.getLocalization("dijit._editor", "commands"),
+				editor = this.editor;
+			this.button = new ToggleButton({
+				label: strings["fullScreen"],
+				ownerDocument: editor.ownerDocument,
+				dir: editor.dir,
+				lang: editor.lang,
+				showLabel: false,
+				iconClass: this.iconClassPrefix + " " + this.iconClassPrefix + "FullScreen",
+				tabIndex: "-1",
+				onChange: lang.hitch(this, "_setFullScreen")
+			});
+		},
+
+		setEditor: function(editor){
+			// summary:
+			//		Over-ride for the setting of the editor.
+			// editor: Object
+			//		The editor to configure for this plugin to use.
+			this.editor = editor;
+			this._initButton();
+
+			this.editor.addKeyHandler(keys.F11, true, true, lang.hitch(this, function(e){
+				// Enable the CTRL-SHIFT-F11 hotkey for fullscreen mode.
+				this.toggle();
+				e.stopPropagation();
+				e.preventDefault();
+				this.editor.defer("focus", 250);
+				return true;
+			}));
+			this.own(on(this.editor.domNode, "keydown", lang.hitch(this, "_containFocus")));
+		},
+
+		_containFocus: function(e){
+			// summary:
+			//		When in Full Screen mode, it's good to try and retain focus in the editor
+			//		so this function is intended to try and constrain the TAB key.
+			// e: Event
+			//		The key event.
+			// tags:
+			//		private
+			if(this.isFullscreen){
+				var ed = this.editor;
+				if(!ed.isTabIndent &&
+					ed._fullscreen_oldOnKeyDown &&
+					e.keyCode === keys.TAB){
+					// If we're in fullscreen mode, we want to take over how tab moves focus a bit.
+					// to keep it within the editor since it's hiding the rest of the page.
+					// IE hates changing focus IN the event handler, so need to put calls
+					// in a timeout.  Gotta love IE.
+					// Also need to check for alternate view nodes if present and active.
+					var f = focus.curNode;
+					var avn = this._getAltViewNode();
+					if(f == ed.iframe ||
+						(avn && f === avn)){
+						setTimeout(lang.hitch(this, function(){
+							ed.toolbar.focus();
+						}), 10);
+					}else{
+						if(avn && domStyle.get(ed.iframe, "display") === "none"){
+							setTimeout(lang.hitch(this, function(){
+								focus.focus(avn);
+							}), 10);
+						}else{
+							setTimeout(lang.hitch(this, function(){
+								ed.focus();
+							}), 10);
+						}
+					}
+					event.stopPropagation();
+					event.preventDefault();
+				}else if(ed._fullscreen_oldOnKeyDown){
+					// Only call up when it's a different function.  Traps corner case event issue
+					// on IE which caused stack overflow on handler cleanup.
+					ed._fullscreen_oldOnKeyDown(e);
+				}
+			}
+		},
+
+		_resizeEditor: function(){
+			// summary:
+			//		Function to handle resizing the editor as the viewport
+			//		resizes (window scaled)
+			// tags:
+			//		private
+			var vp = winUtils.getBox(this.editor.ownerDocument);
+			domGeometry.setMarginBox(this.editor.domNode, {
+				w: vp.w,
+				h: vp.h
+			});
+
+			//Adjust the internal heights too, as they can be a bit off.
+			var hHeight = this.editor.getHeaderHeight();
+			var fHeight = this.editor.getFooterHeight();
+			var extents = domGeometry.getPadBorderExtents(this.editor.domNode);
+			var fcpExtents = domGeometry.getPadBorderExtents(this.editor.iframe.parentNode);
+			var fcmExtents = domGeometry.getMarginExtents(this.editor.iframe.parentNode);
+
+			var cHeight = vp.h - (hHeight + extents.h + fHeight);
+			domGeometry.setMarginBox(this.editor.iframe.parentNode, {
+				h: cHeight,
+				w: vp.w
+			});
+			domGeometry.setMarginBox(this.editor.iframe, {
+				h: cHeight - (fcpExtents.h + fcmExtents.h)
+			});
+		},
+
+		_getAltViewNode: function(){
+			// summary:
+			//		This function is intended as a hook point for setting an
+			//		alternate view node for when in full screen mode and the
+			//		editable iframe is hidden.
+			// tags:
+			//		protected.
+		},
+
+		_setFullScreen: function(full){
+			// summary:
+			//		Function to handle toggling between full screen and
+			//		regular view.
+			// tags:
+			//		private
+
+			//Alias this for shorter code.
+			var ed = this.editor;
+			var body = ed.ownerDocumentBody;
+			var editorParent = ed.domNode.parentNode;
+
+			var vp = winUtils.getBox(ed.ownerDocument);
+
+			this.isFullscreen = full;
+
+			if(full){
+				//Parent classes can royally screw up this plugin, so we
+				//have to set everything to position static.
+				while(editorParent && editorParent !== body){
+					domClass.add(editorParent, "dijitForceStatic");
+					editorParent = editorParent.parentNode;
+				}
+
+				// Save off the resize function.  We want to kill its behavior.
+				this._editorResizeHolder = this.editor.resize;
+				ed.resize = function(){
+				};
+
+				// Try to constrain focus control.
+				ed._fullscreen_oldOnKeyDown = ed.onKeyDown;
+				ed.onKeyDown = lang.hitch(this, this._containFocus);
+
+				this._origState = {};
+				this._origiFrameState = {};
+
+				// Store the basic editor state we have to restore later.
+				// Not using domStyle.get here, had problems, didn't
+				// give me stuff like 100%, gave me pixel calculated values.
+				// Need the exact original values.
+				var domNode = ed.domNode,
+					rawStyle = domNode && domNode.style || {};
+				this._origState = {
+					width: rawStyle.width || "",
+					height: rawStyle.height || "",
+					top: domStyle.get(domNode, "top") || "",
+					left: domStyle.get(domNode, "left") || "",
+					position: domStyle.get(domNode, "position") || "static",
+					marginBox: domGeometry.getMarginBox(ed.domNode)
+				};
+
+				// Store the iframe state we have to restore later.
+				// Not using domStyle.get here, had problems, didn't
+				// give me stuff like 100%, gave me pixel calculated values.
+				// Need the exact original values.
+				var iframe = ed.iframe,
+					iframeStyle = iframe && iframe.style || {};
+
+				var bc = domStyle.get(ed.iframe, "backgroundColor");
+				this._origiFrameState = {
+					backgroundColor: bc || "transparent",
+					width: iframeStyle.width || "auto",
+					height: iframeStyle.height || "auto",
+					zIndex: iframeStyle.zIndex || ""
+				};
+
+				// Okay, size everything.
+				domStyle.set(ed.domNode, {
+					position: "absolute",
+					top: "0px",
+					left: "0px",
+					zIndex: this.zIndex,
+					width: vp.w + "px",
+					height: vp.h + "px"
+				});
+
+				domStyle.set(ed.iframe, {
+					height: "100%",
+					width: "100%",
+					zIndex: this.zIndex,
+					backgroundColor: bc !== "transparent" &&
+						bc !== "rgba(0, 0, 0, 0)" ? bc : "white"
+				});
+
+				domStyle.set(ed.iframe.parentNode, {
+					height: "95%",
+					width: "100%"
+				});
+
+				// Store the overflow state we have to restore later.
+				// IE had issues, so have to check that it's defined.  Ugh.
+				if(body.style && body.style.overflow){
+					this._oldOverflow = domStyle.get(body, "overflow");
+				}else{
+					this._oldOverflow = "";
+				}
+
+				if(has("ie") && !has("quirks")){
+					// IE will put scrollbars in anyway, html (parent of body)
+					// also controls them in standards mode, so we have to
+					// remove them, argh.
+					if(body.parentNode &&
+						body.parentNode.style &&
+						body.parentNode.style.overflow){
+						this._oldBodyParentOverflow = body.parentNode.style.overflow;
+					}else{
+						try{
+							this._oldBodyParentOverflow = domStyle.get(body.parentNode, "overflow");
+						}catch(e){
+							this._oldBodyParentOverflow = "scroll";
+						}
+					}
+					domStyle.set(body.parentNode, "overflow", "hidden");
+				}
+				domStyle.set(body, "overflow", "hidden");
+
+				var resizer = function(){
+					// function to handle resize events.
+					// Will check current VP and only resize if
+					// different.
+					var vp = winUtils.getBox(ed.ownerDocument);
+					if("_prevW" in this && "_prevH" in this){
+						// No actual size change, ignore.
+						if(vp.w === this._prevW && vp.h === this._prevH){
+							return;
+						}
+					}else{
+						this._prevW = vp.w;
+						this._prevH = vp.h;
+					}
+					if(this._resizer){
+						clearTimeout(this._resizer);
+						delete this._resizer;
+					}
+					// Timeout it to help avoid spamming resize on IE.
+					// Works for all browsers.
+					this._resizer = setTimeout(lang.hitch(this, function(){
+						delete this._resizer;
+						this._resizeEditor();
+					}), 10);
+				};
+				this._resizeHandle = on(window, "resize", lang.hitch(this, resizer));
+
+				// Also monitor for direct calls to resize and adapt editor.
+				this._resizeHandle2 = aspect.after(ed, "onResize", lang.hitch(this, function(){
+					if(this._resizer){
+						clearTimeout(this._resizer);
+						delete this._resizer;
+					}
+					this._resizer = setTimeout(lang.hitch(this, function(){
+						delete this._resizer;
+						this._resizeEditor();
+					}), 10);
+				}));
+
+				// Call it once to work around IE glitchiness.  Safe for other browsers too.
+				this._resizeEditor();
+				var dn = this.editor.toolbar.domNode;
+				setTimeout(function(){
+					winUtils.scrollIntoView(dn);
+				}, 250);
+			}else{
+				if(this._resizeHandle){
+					// Cleanup resizing listeners
+					this._resizeHandle.remove();
+					this._resizeHandle = null;
+				}
+				if(this._resizeHandle2){
+					// Cleanup resizing listeners
+					this._resizeHandle2.remove();
+					this._resizeHandle2 = null;
+				}
+				if(this._rst){
+					clearTimeout(this._rst);
+					this._rst = null;
+				}
+
+				//Remove all position static class assigns.
+				while(editorParent && editorParent !== body){
+					domClass.remove(editorParent, "dijitForceStatic");
+					editorParent = editorParent.parentNode;
+				}
+
+				// Restore resize function
+				if(this._editorResizeHolder){
+					this.editor.resize = this._editorResizeHolder;
+				}
+
+				if(!this._origState && !this._origiFrameState){
+					// If we actually didn't toggle, then don't do anything.
+					return;
+				}
+				if(ed._fullscreen_oldOnKeyDown){
+					ed.onKeyDown = ed._fullscreen_oldOnKeyDown;
+					delete ed._fullscreen_oldOnKeyDown;
+				}
+
+				// Add a timeout to make sure we don't have a resize firing in the
+				// background at the time of minimize.
+				var self = this;
+				setTimeout(function(){
+					// Restore all the editor state.
+					var mb = self._origState.marginBox;
+					var oh = self._origState.height;
+					if(has("ie") && !has("quirks")){
+						body.parentNode.style.overflow = self._oldBodyParentOverflow;
+						delete self._oldBodyParentOverflow;
+					}
+					domStyle.set(body, "overflow", self._oldOverflow);
+					delete self._oldOverflow;
+
+					domStyle.set(ed.domNode, self._origState);
+					domStyle.set(ed.iframe.parentNode, {
+						height: "",
+						width: ""
+					});
+					domStyle.set(ed.iframe, self._origiFrameState);
+					delete self._origState;
+					delete self._origiFrameState;
+					// In case it is contained in a layout and the layout changed size,
+					// go ahead and call resize.
+					var pWidget = registry.getEnclosingWidget(ed.domNode.parentNode);
+					if(pWidget && pWidget.resize){
+						pWidget.resize();
+					}else{
+						if(!oh || oh.indexOf("%") < 0){
+							// Resize if the original size wasn't set
+							// or wasn't in percent.  Timeout is to avoid
+							// an IE crash in unit testing.
+							setTimeout(lang.hitch(this, function(){
+								ed.resize({h: mb.h});
+							}), 0);
+						}
+					}
+					winUtils.scrollIntoView(self.editor.toolbar.domNode);
+				}, 100);
+			}
+		},
+
+		updateState: function(){
+			// summary:
+			//		Over-ride for button state control for disabled to work.
+			this.button.set("disabled", this.get("disabled"));
+		},
+
+		destroy: function(){
+			// summary:
+			//		Over-ride to ensure the resize handle gets cleaned up.
+			if(this._resizeHandle){
+				// Cleanup resizing listeners
+				this._resizeHandle.remove();
+				this._resizeHandle = null;
+			}
+			if(this._resizeHandle2){
+				// Cleanup resizing listeners
+				this._resizeHandle2.remove();
+				this._resizeHandle2 = null;
+			}
+			if(this._resizer){
+				clearTimeout(this._resizer);
+				this._resizer = null;
+			}
+			this.inherited(arguments);
+		}
+	});
+
+	// Register this plugin.
+	// For back-compat accept "fullscreen" (all lowercase) too, remove in 2.0
+	_Plugin.registry["fullScreen"] = _Plugin.registry["fullscreen"] = function(args){
+		return new FullScreen({
+			zIndex: ("zIndex" in args) ? args.zIndex : 500
+		});
+	};
+
+	return FullScreen;
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/LinkDialog.js b/src/main/resources/static/dijit/_editor/plugins/LinkDialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..08de8c0cf9597f43fb61f28f3aa2b565254892f1
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/LinkDialog.js
@@ -0,0 +1,606 @@
+define([
+	"require",
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.get
+	"dojo/keys", // keys.ENTER
+	"dojo/_base/lang", // lang.delegate lang.hitch lang.trim
+	"dojo/on",
+	"dojo/sniff", // has("ie")
+	"dojo/query", // query
+	"dojo/string", // string.substitute
+	"../_Plugin",
+	"../../form/DropDownButton",
+	"../range"
+], function(require, declare, domAttr, keys, lang, on, has, query, string,
+	_Plugin, DropDownButton, rangeapi){
+
+	// module:
+	//		dijit/_editor/plugins/LinkDialog
+
+	var LinkDialog = declare("dijit._editor.plugins.LinkDialog", _Plugin, {
+		// summary:
+		//		This plugin provides the basis for an 'anchor' (link) dialog and an extension of it
+		//		provides the image link dialog.
+		// description:
+		//		The command provided by this plugin is:
+		//
+		//		- createLink
+
+		// Override _Plugin.buttonClass.   This plugin is controlled by a DropDownButton
+		// (which triggers a TooltipDialog).
+		buttonClass: DropDownButton,
+
+		// Override _Plugin.useDefaultCommand... processing is handled by this plugin, not by dijit/Editor.
+		useDefaultCommand: false,
+
+		// urlRegExp: [protected] String
+		//		Used for validating input as correct URL.  While file:// urls are not terribly
+		//		useful, they are technically valid.
+		urlRegExp: "((https?|ftps?|file)\\://|\./|\.\./|/|)(/[a-zA-Z]{1,1}:/|)(((?:(?:[\\da-zA-Z](?:[-\\da-zA-Z]{0,61}[\\da-zA-Z])?)\\.)*(?:[a-zA-Z](?:[-\\da-zA-Z]{0,80}[\\da-zA-Z])?)\\.?)|(((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])|(0[xX]0*[\\da-fA-F]?[\\da-fA-F]\\.){3}0[xX]0*[\\da-fA-F]?[\\da-fA-F]|(0+[0-3][0-7][0-7]\\.){3}0+[0-3][0-7][0-7]|(0|[1-9]\\d{0,8}|[1-3]\\d{9}|4[01]\\d{8}|42[0-8]\\d{7}|429[0-3]\\d{6}|4294[0-8]\\d{5}|42949[0-5]\\d{4}|429496[0-6]\\d{3}|4294967[01]\\d{2}|42949672[0-8]\\d|429496729[0-5])|0[xX]0*[\\da-fA-F]{1,8}|([\\da-fA-F]{1,4}\\:){7}[\\da-fA-F]{1,4}|([\\da-fA-F]{1,4}\\:){6}((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])))(\\:\\d+)?(/(?:[^?#\\s/]+/)*(?:[^?#\\s/]{0,}(?:\\?[^?#\\s/]*)?(?:#.*)?)?)?",
+
+		// emailRegExp: [protected] String
+		//		Used for validating input as correct email address.  Taken from dojox.validate
+		emailRegExp: "<?(mailto\\:)([!#-'*+\\-\\/-9=?A-Z^-~]+[.])*[!#-'*+\\-\\/-9=?A-Z^-~]+" /*username*/ + "@" +
+			"((?:(?:[\\da-zA-Z](?:[-\\da-zA-Z]{0,61}[\\da-zA-Z])?)\\.)+(?:[a-zA-Z](?:[-\\da-zA-Z]{0,6}[\\da-zA-Z])?)\\.?)|localhost|^[^-][a-zA-Z0-9_-]*>?", // host.
+
+		// htmlTemplate: [protected] String
+		//		String used for templating the HTML to insert at the desired point.
+		htmlTemplate: "<a href=\"${urlInput}\" _djrealurl=\"${urlInput}\"" +
+			" target=\"${targetSelect}\"" +
+			">${textInput}</a>",
+
+		// tag: [protected] String
+		//		Tag used for the link type.
+		tag: "a",
+
+		// _hostRxp [private] RegExp
+		//		Regular expression used to validate url fragments (ip address, hostname, etc)
+		_hostRxp: /^((([^\[:]+):)?([^@]+)@)?(\[([^\]]+)\]|([^\[:]*))(:([0-9]+))?$/,
+
+		// _userAtRxp [private] RegExp
+		//		Regular expression used to validate e-mail address fragment.
+		_userAtRxp: /^([!#-'*+\-\/-9=?A-Z^-~]+[.])*[!#-'*+\-\/-9=?A-Z^-~]+@/i,
+
+		// linkDialogTemplate: [protected] String
+		//		Template for contents of TooltipDialog to pick URL
+		linkDialogTemplate: [
+			"<table role='presentation'><tr><td>",
+			"<label for='${id}_urlInput'>${url}</label>",
+			"</td><td>",
+			"<input data-dojo-type='dijit.form.ValidationTextBox' required='true' " +
+				"id='${id}_urlInput' name='urlInput' data-dojo-props='intermediateChanges:true'/>",
+			"</td></tr><tr><td>",
+			"<label for='${id}_textInput'>${text}</label>",
+			"</td><td>",
+			"<input data-dojo-type='dijit.form.ValidationTextBox' required='true' id='${id}_textInput' " +
+				"name='textInput' data-dojo-props='intermediateChanges:true'/>",
+			"</td></tr><tr><td>",
+			"<label for='${id}_targetSelect'>${target}</label>",
+			"</td><td>",
+			"<select id='${id}_targetSelect' name='targetSelect' data-dojo-type='dijit.form.Select'>",
+			"<option selected='selected' value='_self'>${currentWindow}</option>",
+			"<option value='_blank'>${newWindow}</option>",
+			"<option value='_top'>${topWindow}</option>",
+			"<option value='_parent'>${parentWindow}</option>",
+			"</select>",
+			"</td></tr><tr><td colspan='2'>",
+			"<button data-dojo-type='dijit.form.Button' type='submit' id='${id}_setButton'>${set}</button>",
+			"<button data-dojo-type='dijit.form.Button' type='button' id='${id}_cancelButton'>${buttonCancel}</button>",
+			"</td></tr></table>"
+		].join(""),
+
+		_initButton: function(){
+			this.inherited(arguments);
+
+			// Setup to lazy create TooltipDialog first time the button is clicked
+			this.button.loadDropDown = lang.hitch(this, "_loadDropDown");
+
+			this._connectTagEvents();
+		},
+		_loadDropDown: function(callback){
+			// Called the first time the button is pressed.  Initialize TooltipDialog.
+			require([
+				"dojo/i18n", // i18n.getLocalization
+				"../../TooltipDialog",
+				"../../registry", // registry.byId, registry.getUniqueId
+				"../../form/Button", // used by template
+				"../../form/Select", // used by template
+				"../../form/ValidationTextBox", // used by template
+				"dojo/i18n!../../nls/common",
+				"dojo/i18n!../nls/LinkDialog"
+			], lang.hitch(this, function(i18n, TooltipDialog, registry){
+				var _this = this;
+				this.tag = this.command == 'insertImage' ? 'img' : 'a';
+				var messages = lang.delegate(i18n.getLocalization("dijit", "common", this.lang),
+					i18n.getLocalization("dijit._editor", "LinkDialog", this.lang));
+				var dropDown = (this.dropDown = this.button.dropDown = new TooltipDialog({
+					title: messages[this.command + "Title"],
+					ownerDocument: this.editor.ownerDocument,
+					dir: this.editor.dir,
+					execute: lang.hitch(this, "setValue"),
+					onOpen: function(){
+						_this._onOpenDialog();
+						TooltipDialog.prototype.onOpen.apply(this, arguments);
+					},
+					onCancel: function(){
+						setTimeout(lang.hitch(_this, "_onCloseDialog"), 0);
+					}
+				}));
+				messages.urlRegExp = this.urlRegExp;
+				messages.id = registry.getUniqueId(this.editor.id);
+				this._uniqueId = messages.id;
+				this._setContent(dropDown.title +
+					"<div style='border-bottom: 1px black solid;padding-bottom:2pt;margin-bottom:4pt'></div>" +
+					string.substitute(this.linkDialogTemplate, messages));
+				dropDown.startup();
+				this._urlInput = registry.byId(this._uniqueId + "_urlInput");
+				this._textInput = registry.byId(this._uniqueId + "_textInput");
+				this._setButton = registry.byId(this._uniqueId + "_setButton");
+				this.own(registry.byId(this._uniqueId + "_cancelButton").on("click", lang.hitch(this.dropDown, "onCancel")));
+				if(this._urlInput){
+					this.own(this._urlInput.on("change", lang.hitch(this, "_checkAndFixInput")));
+				}
+				if(this._textInput){
+					this.own(this._textInput.on("change", lang.hitch(this, "_checkAndFixInput")));
+				}
+
+				// Build up the dual check for http/https/file:, and mailto formats.
+				this._urlRegExp = new RegExp("^" + this.urlRegExp + "$", "i");
+				this._emailRegExp = new RegExp("^" + this.emailRegExp + "$", "i");
+				this._urlInput.isValid = lang.hitch(this, function(){
+					// Function over-ride of isValid to test if the input matches a url or a mailto style link.
+					var value = this._urlInput.get("value");
+					return this._urlRegExp.test(value) || this._emailRegExp.test(value);
+				});
+
+				// Listen for enter and execute if valid.
+				this.own(on(dropDown.domNode, "keydown", lang.hitch(this, lang.hitch(this, function(e){
+					if(e && e.keyCode == keys.ENTER && !e.shiftKey && !e.metaKey && !e.ctrlKey && !e.altKey){
+						if(!this._setButton.get("disabled")){
+							dropDown.onExecute();
+							dropDown.execute(dropDown.get('value'));
+						}
+					}
+				}))));
+
+				callback();
+			}));
+		},
+
+		_checkAndFixInput: function(){
+			// summary:
+			//		A function to listen for onChange events and test the input contents
+			//		for valid information, such as valid urls with http/https/ftp and if
+			//		not present, try and guess if the input url is relative or not, and if
+			//		not, append http:// to it.  Also validates other fields as determined by
+			//		the internal _isValid function.
+			var self = this;
+			var url = this._urlInput.get("value");
+			var fixupUrl = function(url){
+				var appendHttp = false;
+				var appendMailto = false;
+				if(url && url.length > 1){
+					url = lang.trim(url);
+					if(url.indexOf("mailto:") !== 0){
+						if(url.indexOf("/") > 0){
+							if(url.indexOf("://") === -1){
+								// Check that it doesn't start with /, ./, or ../, which would
+								// imply 'target server relativeness'
+								if(url.charAt(0) !== '/' && url.indexOf("./") && url.indexOf("../") !== 0){
+									if(self._hostRxp.test(url)){
+										appendHttp = true;
+									}
+								}
+							}
+						}else if(self._userAtRxp.test(url)){
+							// If it looks like a foo@, append a mailto.
+							appendMailto = true;
+						}
+					}
+				}
+				if(appendHttp){
+					self._urlInput.set("value", "http://" + url);
+				}
+				if(appendMailto){
+					self._urlInput.set("value", "mailto:" + url);
+				}
+				self._setButton.set("disabled", !self._isValid());
+			};
+			if(this._delayedCheck){
+				clearTimeout(this._delayedCheck);
+				this._delayedCheck = null;
+			}
+			this._delayedCheck = setTimeout(function(){
+				fixupUrl(url);
+			}, 250);
+		},
+
+		_connectTagEvents: function(){
+			// summary:
+			//		Over-ridable function that connects tag specific events.
+			this.editor.onLoadDeferred.then(lang.hitch(this, function(){
+				this.own(on(this.editor.editNode, "dblclick", lang.hitch(this, "_onDblClick")));
+			}));
+		},
+
+		_isValid: function(){
+			// summary:
+			//		Internal function to allow validating of the inputs
+			//		for a link to determine if set should be disabled or not
+			// tags:
+			//		protected
+			return this._urlInput.isValid() && this._textInput.isValid();
+		},
+
+		_setContent: function(staticPanel){
+			// summary:
+			//		Helper for _initButton above.   Not sure why it's a separate method.
+			this.dropDown.set({
+				parserScope: "dojo", // make parser search for dojoType/data-dojo-type even if page is multi-version
+				content: staticPanel
+			});
+		},
+
+		_checkValues: function(args){
+			// summary:
+			//		Function to check the values in args and 'fix' them up as needed.
+			// args: Object
+			//		Content being set.
+			// tags:
+			//		protected
+			if(args && args.urlInput){
+				args.urlInput = args.urlInput.replace(/"/g, "&quot;");
+			}
+			return args;
+		},
+
+		setValue: function(args){
+			// summary:
+			//		Callback from the dialog when user presses "set" button.
+			// tags:
+			//		private
+
+			// TODO: prevent closing popup if the text is empty
+			this._onCloseDialog();
+			if(has("ie") < 9){ //see #4151
+				var sel = rangeapi.getSelection(this.editor.window);
+				var range = sel.getRangeAt(0);
+				var a = range.endContainer;
+				if(a.nodeType === 3){
+					// Text node, may be the link contents, so check parent.
+					// This plugin doesn't really support nested HTML elements
+					// in the link, it assumes all link content is text.
+					a = a.parentNode;
+				}
+				if(a && (a.nodeName && a.nodeName.toLowerCase() !== this.tag)){
+					// Still nothing, one last thing to try on IE, as it might be 'img'
+					// and thus considered a control.
+					a = this.editor.selection.getSelectedElement(this.tag);
+				}
+				if(a && (a.nodeName && a.nodeName.toLowerCase() === this.tag)){
+					// Okay, we do have a match.  IE, for some reason, sometimes pastes before
+					// instead of removing the targeted paste-over element, so we unlink the
+					// old one first.  If we do not the <a> tag remains, but it has no content,
+					// so isn't readily visible (but is wrong for the action).
+					if(this.editor.queryCommandEnabled("unlink")){
+						// Select all the link children, then unlink.  The following insert will
+						// then replace the selected text.
+						this.editor.selection.selectElementChildren(a);
+						this.editor.execCommand("unlink");
+					}
+				}
+			}
+			// make sure values are properly escaped, etc.
+			args = this._checkValues(args);
+			this.editor.execCommand('inserthtml',
+				string.substitute(this.htmlTemplate, args));
+
+			// IE sometimes leaves a blank link, so we need to fix it up.
+			// Go ahead and do this for everyone just to avoid blank links
+			// in the page.
+			query("a", this.editor.document).forEach(function(a){
+				if(!a.innerHTML && !domAttr.has(a, "name")){
+					// Remove empty anchors that do not have "name" set.
+					// Empty ones with a name set could be a hidden hash
+					// anchor.
+					a.parentNode.removeChild(a);
+				}
+			}, this);
+		},
+
+		_onCloseDialog: function(){
+			// summary:
+			//		Handler for close event on the dialog
+
+			if(this.editor.focused){
+				// put focus back in the edit area, unless the dialog closed because the user clicked somewhere else
+				this.editor.focus();
+			}
+		},
+
+		_getCurrentValues: function(a){
+			// summary:
+			//		Over-ride for getting the values to set in the dropdown.
+			// a:
+			//		The anchor/link to process for data for the dropdown.
+			// tags:
+			//		protected
+			var url, text, target;
+			if(a && a.tagName.toLowerCase() === this.tag){
+				url = a.getAttribute('_djrealurl') || a.getAttribute('href');
+				target = a.getAttribute('target') || "_self";
+				text = a.textContent || a.innerText;
+				this.editor.selection.selectElement(a, true);
+			}else{
+				text = this.editor.selection.getSelectedText();
+			}
+			return {urlInput: url || '', textInput: text || '', targetSelect: target || ''}; //Object;
+		},
+
+		_onOpenDialog: function(){
+			// summary:
+			//		Handler for when the dialog is opened.
+			//		If the caret is currently in a URL then populate the URL's info into the dialog.
+			var a, b, fc;
+			if(has("ie")){
+				// IE, even IE10, is difficult to select the element in, using the range unified
+				// API seems to work reasonably well.
+				var sel = rangeapi.getSelection(this.editor.window);
+				if(sel.rangeCount){
+					var range = sel.getRangeAt(0);
+					a = range.endContainer;
+					if(a.nodeType === 3){
+						// Text node, may be the link contents, so check parent.
+						// This plugin doesn't really support nested HTML elements
+						// in the link, it assumes all link content is text.
+						a = a.parentNode;
+					}
+					if(a && (a.nodeName && a.nodeName.toLowerCase() !== this.tag)){
+						// Still nothing, one last thing to try on IE, as it might be 'img'
+						// and thus considered a control.
+						a = this.editor.selection.getSelectedElement(this.tag);
+					}
+					if(!a || (a.nodeName && a.nodeName.toLowerCase() !== this.tag)){
+						// Try another lookup, IE's selection is just terrible.
+						b = this.editor.selection.getAncestorElement(this.tag);
+						if(b && (b.nodeName && b.nodeName.toLowerCase() == this.tag)){
+							// Looks like we found an A tag, use it and make sure just it is
+							// selected.
+							a = b;
+							this.editor.selection.selectElement(a);
+						}else if(range.startContainer === range.endContainer){
+							// STILL nothing.  Trying one more thing.  Lets look at the first child.
+							// It might be an anchor tag in a div by itself or the like.  If it is,
+							// we'll use it otherwise we give up.  The selection is not easily
+							// determinable to be on an existing anchor tag.
+							fc = range.startContainer.firstChild;
+							if(fc && (fc.nodeName && fc.nodeName.toLowerCase() == this.tag)){
+								a = fc;
+								this.editor.selection.selectElement(a);
+							}
+						}
+					}
+				}
+			}else{
+				a = this.editor.selection.getAncestorElement(this.tag);
+			}
+			this.dropDown.reset();
+			this._setButton.set("disabled", true);
+			this.dropDown.set("value", this._getCurrentValues(a));
+		},
+
+		_onDblClick: function(e){
+			// summary:
+			//		Function to define a behavior on double clicks on the element
+			//		type this dialog edits to select it and pop up the editor
+			//		dialog.
+			// e: Object
+			//		The double-click event.
+			// tags:
+			//		protected.
+			if(e && e.target){
+				var t = e.target;
+				var tg = t.tagName ? t.tagName.toLowerCase() : "";
+				if(tg === this.tag && domAttr.get(t, "href")){
+					var editor = this.editor;
+
+					this.editor.selection.selectElement(t);
+					editor.onDisplayChanged();
+
+					// Call onNormalizedDisplayChange() now, rather than on timer.
+					// On IE, when focus goes to the first <input> in the TooltipDialog, the editor loses it's selection.
+					// Later if onNormalizedDisplayChange() gets called via the timer it will disable the LinkDialog button
+					// (actually, all the toolbar buttons), at which point clicking the <input> will close the dialog,
+					// since (for unknown reasons) focus.js ignores disabled controls.
+					if(editor._updateTimer){
+						editor._updateTimer.remove();
+						delete editor._updateTimer;
+					}
+					editor.onNormalizedDisplayChanged();
+
+					var button = this.button;
+					setTimeout(function(){
+						// Focus shift outside the event handler.
+						// IE doesn't like focus changes in event handles.
+						button.set("disabled", false);
+						button.loadAndOpenDropDown().then(function(){
+							if(button.dropDown.focus){
+								button.dropDown.focus();
+							}
+						});
+					}, 10);
+				}
+			}
+		}
+	});
+
+	var ImgLinkDialog = declare("dijit._editor.plugins.ImgLinkDialog", [LinkDialog], {
+		// summary:
+		//		This plugin extends LinkDialog and adds in a plugin for handling image links.
+		//		provides the image link dialog.
+		// description:
+		//		The command provided by this plugin is:
+		//
+		//		- insertImage
+
+		// linkDialogTemplate: [protected] String
+		//		Over-ride for template since img dialog doesn't need target that anchor tags may.
+		linkDialogTemplate: [
+			"<table role='presentation'><tr><td>",
+			"<label for='${id}_urlInput'>${url}</label>",
+			"</td><td>",
+			"<input dojoType='dijit.form.ValidationTextBox' regExp='${urlRegExp}' " +
+				"required='true' id='${id}_urlInput' name='urlInput' data-dojo-props='intermediateChanges:true'/>",
+			"</td></tr><tr><td>",
+			"<label for='${id}_textInput'>${text}</label>",
+			"</td><td>",
+			"<input data-dojo-type='dijit.form.ValidationTextBox' required='false' id='${id}_textInput' " +
+				"name='textInput' data-dojo-props='intermediateChanges:true'/>",
+			"</td></tr><tr><td>",
+			"</td><td>",
+			"</td></tr><tr><td colspan='2'>",
+			"<button data-dojo-type='dijit.form.Button' type='submit' id='${id}_setButton'>${set}</button>",
+			"<button data-dojo-type='dijit.form.Button' type='button' id='${id}_cancelButton'>${buttonCancel}</button>",
+			"</td></tr></table>"
+		].join(""),
+
+		// htmlTemplate: [protected] String
+		//		String used for templating the `<img>` HTML to insert at the desired point.
+		htmlTemplate: "<img src=\"${urlInput}\" _djrealurl=\"${urlInput}\" alt=\"${textInput}\" />",
+
+		// tag: [protected] String
+		//		Tag used for the link type (img).
+		tag: "img",
+
+		_getCurrentValues: function(img){
+			// summary:
+			//		Over-ride for getting the values to set in the dropdown.
+			// a:
+			//		The anchor/link to process for data for the dropdown.
+			// tags:
+			//		protected
+			var url, text;
+			if(img && img.tagName.toLowerCase() === this.tag){
+				url = img.getAttribute('_djrealurl') || img.getAttribute('src');
+				text = img.getAttribute('alt');
+				this.editor.selection.selectElement(img, true);
+			}else{
+				text = this.editor.selection.getSelectedText();
+			}
+			return {urlInput: url || '', textInput: text || ''}; //Object
+		},
+
+		_isValid: function(){
+			// summary:
+			//		Over-ride for images.  You can have alt text of blank, it is valid.
+			// tags:
+			//		protected
+			return this._urlInput.isValid();
+		},
+
+		_connectTagEvents: function(){
+			// summary:
+			//		Over-ridable function that connects tag specific events.
+			this.inherited(arguments);
+			this.editor.onLoadDeferred.then(lang.hitch(this, function(){
+				// Use onmousedown instead of onclick.  Seems that IE eats the first onclick
+				// to wrap it in a selector box, then the second one acts as onclick.  See #10420
+				this.own(on(this.editor.editNode, "mousedown", lang.hitch(this, "_selectTag")));
+			}));
+		},
+
+		_selectTag: function(e){
+			// summary:
+			//		A simple event handler that lets me select an image if it is clicked on.
+			//		makes it easier to select images in a standard way across browsers.  Otherwise
+			//		selecting an image for edit becomes difficult.
+			// e: Event
+			//		The mousedown event.
+			// tags:
+			//		private
+			if(e && e.target){
+				var t = e.target;
+				var tg = t.tagName ? t.tagName.toLowerCase() : "";
+				if(tg === this.tag){
+					this.editor.selection.selectElement(t);
+				}
+			}
+		},
+
+		_checkValues: function(args){
+			// summary:
+			//		Function to check the values in args and 'fix' them up as needed
+			//		(special characters in the url or alt text)
+			// args: Object
+			//		Content being set.
+			// tags:
+			//		protected
+			if(args && args.urlInput){
+				args.urlInput = args.urlInput.replace(/"/g, "&quot;");
+			}
+			if(args && args.textInput){
+				args.textInput = args.textInput.replace(/"/g, "&quot;");
+			}
+			return args;
+		},
+
+		_onDblClick: function(e){
+			// summary:
+			//		Function to define a behavior on double clicks on the element
+			//		type this dialog edits to select it and pop up the editor
+			//		dialog.
+			// e: Object
+			//		The double-click event.
+			// tags:
+			//		protected.
+			if(e && e.target){
+				var t = e.target;
+				var tg = t.tagName ? t.tagName.toLowerCase() : "";
+				if(tg === this.tag && domAttr.get(t, "src")){
+					var editor = this.editor;
+
+					this.editor.selection.selectElement(t);
+					editor.onDisplayChanged();
+
+					// Call onNormalizedDisplayChange() now, rather than on timer.
+					// On IE, when focus goes to the first <input> in the TooltipDialog, the editor loses it's selection.
+					// Later if onNormalizedDisplayChange() gets called via the timer it will disable the LinkDialog button
+					// (actually, all the toolbar buttons), at which point clicking the <input> will close the dialog,
+					// since (for unknown reasons) focus.js ignores disabled controls.
+					if(editor._updateTimer){
+						editor._updateTimer.remove();
+						delete editor._updateTimer;
+					}
+					editor.onNormalizedDisplayChanged();
+
+					var button = this.button;
+					setTimeout(function(){
+						// Focus shift outside the event handler.
+						// IE doesn't like focus changes in event handles.
+						button.set("disabled", false);
+						button.loadAndOpenDropDown().then(function(){
+							if(button.dropDown.focus){
+								button.dropDown.focus();
+							}
+						});
+					}, 10);
+				}
+			}
+		}
+	});
+
+	// Register these plugins
+	_Plugin.registry["createLink"] = function(){
+		return new LinkDialog({command: "createLink"});
+	};
+	_Plugin.registry["insertImage"] = function(){
+		return new ImgLinkDialog({command: "insertImage"});
+	};
+
+
+	// Export both LinkDialog and ImgLinkDialog
+	// TODO for 2.0: either return both classes in a hash, or split this file into two separate files.
+	// Then the documentation for the module can be applied to the hash, and will show up in the API doc.
+	LinkDialog.ImgLinkDialog = ImgLinkDialog;
+	return LinkDialog;
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/NewPage.js b/src/main/resources/static/dijit/_editor/plugins/NewPage.js
new file mode 100644
index 0000000000000000000000000000000000000000..cf8d20fc38a1fafeb9c72d11005f7e5f0427331d
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/NewPage.js
@@ -0,0 +1,76 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/_base/lang", // lang.hitch
+	"../_Plugin",
+	"../../form/Button",
+	"dojo/i18n!../nls/commands"
+], function(declare, i18n, lang, _Plugin, Button){
+
+	// module:
+	//		dijit/_editor/plugins/NewPage
+
+	var NewPage = declare("dijit._editor.plugins.NewPage", _Plugin, {
+		// summary:
+		//		This plugin provides a simple 'new page' capability.  In other
+		//		words, set content to some default user defined string.
+
+		// content: [public] String
+		//		The default content to insert into the editor as the new page.
+		//		The default is the `<br>` tag, a single blank line.
+		content: "<br>",
+
+		_initButton: function(){
+			// summary:
+			//		Over-ride for creation of the Print button.
+			var strings = i18n.getLocalization("dijit._editor", "commands"),
+				editor = this.editor;
+			this.button = new Button({
+				label: strings["newPage"],
+				ownerDocument: editor.ownerDocument,
+				dir: editor.dir,
+				lang: editor.lang,
+				showLabel: false,
+				iconClass: this.iconClassPrefix + " " + this.iconClassPrefix + "NewPage",
+				tabIndex: "-1",
+				onClick: lang.hitch(this, "_newPage")
+			});
+		},
+
+		setEditor: function(/*dijit/Editor*/ editor){
+			// summary:
+			//		Tell the plugin which Editor it is associated with.
+			// editor: Object
+			//		The editor object to attach the newPage capability to.
+			this.editor = editor;
+			this._initButton();
+		},
+
+		updateState: function(){
+			// summary:
+			//		Over-ride for button state control for disabled to work.
+			this.button.set("disabled", this.get("disabled"));
+		},
+
+		_newPage: function(){
+			// summary:
+			//		Function to set the content to blank.
+			// tags:
+			//		private
+			this.editor.beginEditing();
+			this.editor.set("value", this.content);
+			this.editor.endEditing();
+			this.editor.focus();
+		}
+	});
+
+	// Register this plugin.
+	// For back-compat accept "newpage" (all lowercase) too, remove in 2.0
+	_Plugin.registry["newPage"] = _Plugin.registry["newpage"] = function(args){
+		return new NewPage({
+			content: ("content" in args) ? args.content : "<br>"
+		});
+	};
+
+	return NewPage;
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/Print.js b/src/main/resources/static/dijit/_editor/plugins/Print.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed7c40e27a4b87e9d1408c91d08f2ee60c7eb668
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/Print.js
@@ -0,0 +1,121 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/_base/lang", // lang.hitch
+	"dojo/sniff", // has("chrome") has("opera")
+	"../../focus", // focus.focus()
+	"../_Plugin",
+	"../../form/Button",
+	"dojo/i18n!../nls/commands"
+], function(declare, i18n, lang, has, focus, _Plugin, Button){
+
+	// module:
+	//		dijit/_editor/plugins/Print
+
+	var Print = declare("dijit._editor.plugins.Print", _Plugin, {
+		// summary:
+		//		This plugin provides Print capability to the editor.  When
+		//		clicked, the document in the editor frame will be printed.
+
+		_initButton: function(){
+			// summary:
+			//		Over-ride for creation of the Print button.
+			var strings = i18n.getLocalization("dijit._editor", "commands"),
+				editor = this.editor;
+			this.button = new Button({
+				label: strings["print"],
+				ownerDocument: editor.ownerDocument,
+				dir: editor.dir,
+				lang: editor.lang,
+				showLabel: false,
+				iconClass: this.iconClassPrefix + " " + this.iconClassPrefix + "Print",
+				tabIndex: "-1",
+				onClick: lang.hitch(this, "_print")
+			});
+		},
+
+		setEditor: function(/*dijit/Editor*/ editor){
+			// summary:
+			//		Tell the plugin which Editor it is associated with.
+			// editor: Object
+			//		The editor object to attach the print capability to.
+			this.editor = editor;
+			this._initButton();
+
+			// Set up a check that we have a print function
+			// and disable button if we do not.
+			this.editor.onLoadDeferred.then(
+				lang.hitch(this, function(){
+					if(!this.editor.iframe.contentWindow["print"]){
+						this.button.set("disabled", true);
+					}
+				})
+			);
+		},
+
+		updateState: function(){
+			// summary:
+			//		Over-ride for button state control for disabled to work.
+			var disabled = this.get("disabled");
+			if(!this.editor.iframe.contentWindow["print"]){
+				disabled = true;
+			}
+			this.button.set("disabled", disabled);
+		},
+
+		_print: function(){
+			// summary:
+			//		Function to trigger printing of the editor document
+			// tags:
+			//		private
+			var edFrame = this.editor.iframe;
+			if(edFrame.contentWindow["print"]){
+				// IE requires the frame to be focused for
+				// print to work, but since this is okay for all
+				// no special casing.
+				if(!has("opera") && !has("chrome")){
+					focus.focus(edFrame);
+					edFrame.contentWindow.print();
+				}else{
+					// Neither Opera nor Chrome 3 et you print single frames.
+					// So, open a new 'window', print it, and close it.
+					// Also, can't use size 0x0, have to use 1x1
+					var edDoc = this.editor.document;
+					var content = this.editor.get("value");
+					content = "<html><head><meta http-equiv='Content-Type' " +
+						"content='text/html; charset='UTF-8'></head><body>" +
+						content + "</body></html>";
+					var win = window.open("javascript: ''",
+						"",
+						"status=0,menubar=0,location=0,toolbar=0," +
+							"width=1,height=1,resizable=0,scrollbars=0");
+					win.document.open();
+					win.document.write(content);
+					win.document.close();
+
+					var styleNodes = edDoc.getElementsByTagName("style");
+					if(styleNodes){
+						// Clone over any editor view styles, since we can't print the iframe
+						// directly.
+						var i;
+						for(i = 0; i < styleNodes.length; i++){
+							var style = styleNodes[i].innerHTML;
+							var sNode = win.document.createElement("style");
+							sNode.appendChild(win.document.createTextNode(style));
+							win.document.getElementsByTagName("head")[0].appendChild(sNode);
+						}
+					}
+					win.print();
+					win.close();
+				}
+			}
+		}
+	});
+
+	// Register this plugin.
+	_Plugin.registry["print"] = function(){
+		return new Print({command: "print"});
+	};
+
+	return Print;
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/TabIndent.js b/src/main/resources/static/dijit/_editor/plugins/TabIndent.js
new file mode 100644
index 0000000000000000000000000000000000000000..34cc143e7e9a024a7d4bf98b3e7ecdc92049603c
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/TabIndent.js
@@ -0,0 +1,60 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/_base/kernel", // kernel.experimental
+	"../_Plugin",
+	"../../form/ToggleButton"
+], function(declare, kernel, _Plugin, ToggleButton){
+
+	// module:
+	//		dijit/_editor/plugins/TabIndent
+
+	kernel.experimental("dijit._editor.plugins.TabIndent");
+
+
+	var TabIndent = declare("dijit._editor.plugins.TabIndent", _Plugin, {
+		// summary:
+		//		This plugin is used to allow the use of the tab and shift-tab keys
+		//		to indent/outdent list items.  This overrides the default behavior
+		//		of moving focus from/to the toolbar
+
+		// Override _Plugin.useDefaultCommand... processing is handled by this plugin, not by dijit/Editor.
+		useDefaultCommand: false,
+
+		// Override _Plugin.buttonClass to use a ToggleButton for this plugin rather than a vanilla Button
+		buttonClass: ToggleButton,
+
+		command: "tabIndent",
+
+		_initButton: function(){
+			// Override _Plugin._initButton() to setup listener on button click
+			this.inherited(arguments);
+
+			var e = this.editor;
+			this.own(this.button.on("change", function(val){
+				e.set("isTabIndent", val);
+			}));
+
+			// Set initial checked state of button based on Editor.isTabIndent
+			this.updateState();
+		},
+
+		updateState: function(){
+			// Overrides _Plugin.updateState().
+			// Ctrl-m in the editor will switch tabIndent mode on/off, so we need to react to that.
+			var disabled = this.get("disabled");
+			this.button.set("disabled", disabled);
+			if(disabled){
+				return;
+			}
+			this.button.set('checked', this.editor.isTabIndent, false);
+		}
+	});
+
+	// Register this plugin.
+	_Plugin.registry["tabIndent"] = function(){
+		return new TabIndent({command: "tabIndent"});
+	};
+
+
+	return TabIndent;
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/TextColor.js b/src/main/resources/static/dijit/_editor/plugins/TextColor.js
new file mode 100644
index 0000000000000000000000000000000000000000..810536add5cded474b598f789015677786ce8b4b
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/TextColor.js
@@ -0,0 +1,129 @@
+define([
+	"require",
+	"dojo/colors", // colors.fromRgb
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang",
+	"../_Plugin",
+	"../../form/DropDownButton"
+], function(require, colors, declare, lang, _Plugin, DropDownButton){
+
+	// module:
+	//		dijit/_editor/plugins/TextColor
+
+	var TextColor = declare("dijit._editor.plugins.TextColor", _Plugin, {
+		// summary:
+		//		This plugin provides dropdown color pickers for setting text color and background color
+		// description:
+		//		The commands provided by this plugin are:
+		//
+		//		- foreColor - sets the text color
+		//		- hiliteColor - sets the background color
+
+		// Override _Plugin.buttonClass to use DropDownButton (with ColorPalette) to control this plugin
+		buttonClass: DropDownButton,
+				
+		// colorPicker: String|Constructor
+		//		The color picker dijit to use, defaults to dijit/ColorPalette
+		colorPicker: "dijit/ColorPalette",
+
+		// useDefaultCommand: Boolean
+		//		False as we do not use the default editor command/click behavior.
+		useDefaultCommand: false,
+
+		_initButton: function(){
+			this.command = this.name;
+
+			this.inherited(arguments);
+
+			// Setup to lazy load ColorPalette first time the button is clicked
+			var self = this;
+			this.button.loadDropDown = function(callback){
+				function onColorPaletteLoad(ColorPalette){
+					self.button.dropDown = new ColorPalette({
+						dir: self.editor.dir,
+						ownerDocument: self.editor.ownerDocument,
+						value: self.value,
+						onChange: function(color){
+							self.editor.execCommand(self.command, color);
+						},
+						onExecute: function(){
+							self.editor.execCommand(self.command, this.get("value"));
+						}
+					});
+					callback();
+				}
+				if(typeof self.colorPicker == "string"){
+					require([self.colorPicker], onColorPaletteLoad);
+				}else{
+					onColorPaletteLoad(self.colorPicker);
+				}
+			};
+		},
+
+		updateState: function(){
+			// summary:
+			//		Overrides _Plugin.updateState().  This updates the ColorPalette
+			//		to show the color of the currently selected text.
+			// tags:
+			//		protected
+
+			var _e = this.editor;
+			var _c = this.command;
+			if(!_e || !_e.isLoaded || !_c.length){
+				return;
+			}
+
+			if(this.button){
+				var disabled = this.get("disabled");
+				this.button.set("disabled", disabled);
+				if(disabled){
+					return;
+				}
+
+				var value;
+				try{
+					value = _e.queryCommandValue(_c) || "";
+				}catch(e){
+					//Firefox may throw error above if the editor is just loaded, ignore it
+					value = "";
+				}
+			}
+
+			if(value == ""){
+				value = "#000000";
+			}
+			if(value == "transparent"){
+				value = "#ffffff";
+			}
+
+			if(typeof value == "string"){
+				//if RGB value, convert to hex value
+				if(value.indexOf("rgb") > -1){
+					value = colors.fromRgb(value).toHex();
+				}
+			}else{    //it's an integer(IE returns an MS access #)
+				value = ((value & 0x0000ff) << 16) | (value & 0x00ff00) | ((value & 0xff0000) >>> 16);
+				value = value.toString(16);
+				value = "#000000".slice(0, 7 - value.length) + value;
+
+			}
+
+			this.value = value;
+
+			var dropDown = this.button.dropDown;
+			if(dropDown && dropDown.get && value !== dropDown.get('value')){
+				dropDown.set('value', value, false);
+			}
+		}
+	});
+
+	// Register this plugin.
+	_Plugin.registry["foreColor"] = function(args){
+		return new TextColor(args);
+	};
+	_Plugin.registry["hiliteColor"] = function(args){
+		return new TextColor(args);
+	};
+
+	return TextColor;
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/ToggleDir.js b/src/main/resources/static/dijit/_editor/plugins/ToggleDir.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f1de44231263a8b4469b09494dbb3ea81288a98
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/ToggleDir.js
@@ -0,0 +1,63 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-style", // domStyle.getComputedStyle
+	"dojo/_base/kernel", // kernel.experimental
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"../_Plugin",
+	"../../form/ToggleButton"
+], function(declare, domStyle, kernel, lang, on, _Plugin, ToggleButton){
+
+	// module:
+	//		dijit/_editor/plugins/ToggleDir
+
+	var ToggleDir = declare("dijit._editor.plugins.ToggleDir", _Plugin, {
+		// summary:
+		//		This plugin is used to toggle direction of the edited document,
+		//		independent of what direction the whole page is.
+
+		// Override _Plugin.useDefaultCommand: processing is done in this plugin
+		// rather than by sending commands to the Editor
+		useDefaultCommand: false,
+
+		command: "toggleDir",
+
+		// Override _Plugin.buttonClass to use a ToggleButton for this plugin rather than a vanilla Button
+		buttonClass: ToggleButton,
+
+		_initButton: function(){
+			this.inherited(arguments);
+
+			var button = this.button,
+				editorLtr = this.editor.isLeftToRight();
+
+			this.own(this.button.on("change", lang.hitch(this, function(checked){
+				this.editor.set("textDir", editorLtr ^ checked ? "ltr" : "rtl");
+			})));
+
+			// Button should be checked if the editor's textDir is opposite of the editor's dir.
+			// Note that the arrow in the icon points in opposite directions depending on the editor's dir.
+			var editorDir = editorLtr ? "ltr" : "rtl";
+			function setButtonChecked(textDir){
+				button.set("checked", textDir && textDir !== editorDir, false);
+			}
+			setButtonChecked(this.editor.get("textDir"));
+			this.editor.watch("textDir", function(name, oval, nval){
+				setButtonChecked(nval);
+			});
+		},
+
+		updateState: function(){
+			// summary:
+			//		Over-ride for button state control for disabled to work.
+			this.button.set("disabled", this.get("disabled"));
+		}
+	});
+
+	// Register this plugin.
+	_Plugin.registry["toggleDir"] = function(){
+		return new ToggleDir({command: "toggleDir"});
+	};
+
+	return ToggleDir;
+});
diff --git a/src/main/resources/static/dijit/_editor/plugins/ViewSource.js b/src/main/resources/static/dijit/_editor/plugins/ViewSource.js
new file mode 100644
index 0000000000000000000000000000000000000000..ad9aa539ef19d6f3f1148aa585ed85c609ff4d22
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/plugins/ViewSource.js
@@ -0,0 +1,551 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/aspect", // Aspect commands for advice
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/dom-construct", // domConstruct.create domConstruct.place
+	"dojo/dom-geometry", // domGeometry.setMarginBox domGeometry.position
+	"dojo/dom-style", // domStyle.set
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/keys", // keys.F12
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on", // on()
+	"dojo/sniff", // has("ie")
+	"dojo/window", // winUtils.getBox
+	"../../focus", // focus.focus()
+	"../_Plugin",
+	"../../form/ToggleButton",
+	"../..", // dijit._scopeName
+	"../../registry", // registry.getEnclosingWidget()
+	"dojo/i18n!../nls/commands"
+], function(array, aspect, declare, domAttr, domConstruct, domGeometry, domStyle, i18n, keys, lang, on, has, winUtils,
+			focus, _Plugin, ToggleButton, dijit, registry){
+
+	// module:
+	//		dijit/_editor/plugins/ViewSource
+
+	var ViewSource = declare("dijit._editor.plugins.ViewSource", _Plugin, {
+		// summary:
+		//		This plugin provides a simple view source capability.  When view
+		//		source mode is enabled, it disables all other buttons/plugins on the RTE.
+		//		It also binds to the hotkey: CTRL-SHIFT-F11 for toggling ViewSource mode.
+
+		// stripScripts: [public] Boolean
+		//		Boolean flag used to indicate if script tags should be stripped from the document.
+		//		Defaults to true.
+		stripScripts: true,
+
+		// stripComments: [public] Boolean
+		//		Boolean flag used to indicate if comment tags should be stripped from the document.
+		//		Defaults to true.
+		stripComments: true,
+
+		// stripComments: [public] Boolean
+		//		Boolean flag used to indicate if iframe tags should be stripped from the document.
+		//		Defaults to true.
+		stripIFrames: true,
+
+		// readOnly: [const] Boolean
+		//		Boolean flag used to indicate if the source view should be readonly or not.
+		//		Cannot be changed after initialization of the plugin.
+		//		Defaults to false.
+		readOnly: false,
+
+		// _fsPlugin: [private] Object
+		//		Reference to a registered fullscreen plugin so that viewSource knows
+		//		how to scale.
+		_fsPlugin: null,
+
+		toggle: function(){
+			// summary:
+			//		Function to allow programmatic toggling of the view.
+
+			// For Webkit, we have to focus a very particular way.
+			// when swapping views, otherwise focus doesn't shift right
+			// but can't focus this way all the time, only for VS changes.
+			// If we did it all the time, buttons like bold, italic, etc
+			// break.
+			if(has("webkit")){
+				this._vsFocused = true;
+			}
+			this.button.set("checked", !this.button.get("checked"));
+
+		},
+
+		_initButton: function(){
+			// summary:
+			//		Over-ride for creation of the resize button.
+			var strings = i18n.getLocalization("dijit._editor", "commands"),
+				editor = this.editor;
+			this.button = new ToggleButton({
+				label: strings["viewSource"],
+				ownerDocument: editor.ownerDocument,
+				dir: editor.dir,
+				lang: editor.lang,
+				showLabel: false,
+				iconClass: this.iconClassPrefix + " " + this.iconClassPrefix + "ViewSource",
+				tabIndex: "-1",
+				onChange: lang.hitch(this, "_showSource")
+			});
+
+			// Make sure readonly mode doesn't make the wrong cursor appear over the button.
+			this.button.set("readOnly", false);
+		},
+
+
+		setEditor: function(/*dijit/Editor*/ editor){
+			// summary:
+			//		Tell the plugin which Editor it is associated with.
+			// editor: Object
+			//		The editor object to attach the print capability to.
+			this.editor = editor;
+			this._initButton();
+
+			this.editor.addKeyHandler(keys.F12, true, true, lang.hitch(this, function(e){
+				// Move the focus before switching
+				// It'll focus back.  Hiding a focused
+				// node causes issues.
+				this.button.focus();
+				this.toggle();
+				e.stopPropagation();
+				e.preventDefault();
+
+				// Call the focus shift outside of the handler.
+				setTimeout(lang.hitch(this, function(){
+					// Focus the textarea... unless focus has moved outside of the editor completely during the timeout.
+					// Since we override focus, so we just need to call it.
+					if(this.editor.focused){
+						this.editor.focus();
+					}
+				}), 100);
+			}));
+		},
+
+		_showSource: function(source){
+			// summary:
+			//		Function to toggle between the source and RTE views.
+			// source: boolean
+			//		Boolean value indicating if it should be in source mode or not.
+			// tags:
+			//		private
+			var ed = this.editor;
+			var edPlugins = ed._plugins;
+			var html;
+			this._sourceShown = source;
+			var self = this;
+			try{
+				if(!this.sourceArea){
+					this._createSourceView();
+				}
+				if(source){
+					// Update the QueryCommandEnabled function to disable everything but
+					// the source view mode.  Have to over-ride a function, then kick all
+					// plugins to check their state.
+					ed._sourceQueryCommandEnabled = ed.queryCommandEnabled;
+					ed.queryCommandEnabled = function(cmd){
+						return cmd.toLowerCase() === "viewsource";
+					};
+					this.editor.onDisplayChanged();
+					html = ed.get("value");
+					html = this._filter(html);
+					ed.set("value", html);
+					array.forEach(edPlugins, function(p){
+						// Turn off any plugins not controlled by queryCommandenabled.
+						if(p && !(p instanceof ViewSource) && p.isInstanceOf(_Plugin)){
+							p.set("disabled", true)
+						}
+					});
+
+					// We actually do need to trap this plugin and adjust how we
+					// display the textarea.
+					if(this._fsPlugin){
+						this._fsPlugin._getAltViewNode = function(){
+							return self.sourceArea;
+						};
+					}
+
+					this.sourceArea.value = html;
+
+					// Since neither iframe nor textarea have margin, border, or padding,
+					// just set sizes equal.
+					this.sourceArea.style.height = ed.iframe.style.height;
+					this.sourceArea.style.width = ed.iframe.style.width;
+
+					// Hide the iframe and show the HTML source <textarea>.  But don't use display:none because
+					// that loses scroll position, and also causes weird problems on FF (see #18607).
+					ed.iframe.parentNode.style.position = "relative";
+					domStyle.set(ed.iframe, {
+						position: "absolute",
+						top: 0,
+						visibility: "hidden"
+					});
+					domStyle.set(this.sourceArea, {
+						display: "block"
+					});
+
+					var resizer = function(){
+						// function to handle resize events.
+						// Will check current VP and only resize if
+						// different.
+						var vp = winUtils.getBox(ed.ownerDocument);
+
+						if("_prevW" in this && "_prevH" in this){
+							// No actual size change, ignore.
+							if(vp.w === this._prevW && vp.h === this._prevH){
+								return;
+							}else{
+								this._prevW = vp.w;
+								this._prevH = vp.h;
+							}
+						}else{
+							this._prevW = vp.w;
+							this._prevH = vp.h;
+						}
+						if(this._resizer){
+							clearTimeout(this._resizer);
+							delete this._resizer;
+						}
+						// Timeout it to help avoid spamming resize on IE.
+						// Works for all browsers.
+						this._resizer = setTimeout(lang.hitch(this, function(){
+							delete this._resizer;
+							this._resize();
+						}), 10);
+					};
+					this._resizeHandle = on(window, "resize", lang.hitch(this, resizer));
+
+					//Call this on a delay once to deal with IE glitchiness on initial size.
+					setTimeout(lang.hitch(this, this._resize), 100);
+
+					//Trigger a check for command enablement/disablement.
+					this.editor.onNormalizedDisplayChanged();
+
+					this.editor.__oldGetValue = this.editor.getValue;
+					this.editor.getValue = lang.hitch(this, function(){
+						var txt = this.sourceArea.value;
+						txt = this._filter(txt);
+						return txt;
+					});
+
+					this._setListener = aspect.after(this.editor, "setValue", lang.hitch(this, function(htmlTxt){
+						htmlTxt = htmlTxt || "";
+						htmlTxt = this._filter(htmlTxt);
+						this.sourceArea.value = htmlTxt;
+					}), true);
+				}else{
+					// First check that we were in source view before doing anything.
+					// corner case for being called with a value of false and we hadn't
+					// actually been in source display mode.
+					if(!ed._sourceQueryCommandEnabled){
+						return;
+					}
+
+					// Remove the set listener.
+					this._setListener.remove();
+					delete this._setListener;
+
+					this._resizeHandle.remove();
+					delete this._resizeHandle;
+
+					if(this.editor.__oldGetValue){
+						this.editor.getValue = this.editor.__oldGetValue;
+						delete this.editor.__oldGetValue;
+					}
+
+					// Restore all the plugin buttons state.
+					ed.queryCommandEnabled = ed._sourceQueryCommandEnabled;
+					if(!this._readOnly){
+						html = this.sourceArea.value;
+						html = this._filter(html);
+						ed.beginEditing();
+						ed.set("value", html);
+						ed.endEditing();
+					}
+
+					array.forEach(edPlugins, function(p){
+						// Turn back on any plugins we turned off.
+						if(p && p.isInstanceOf(_Plugin)){
+							p.set("disabled", false);
+						}
+					});
+
+					domStyle.set(this.sourceArea, "display", "none");
+					domStyle.set(ed.iframe, {
+						position: "relative",
+						visibility: "visible"
+					});
+					delete ed._sourceQueryCommandEnabled;
+
+					//Trigger a check for command enablement/disablement.
+					this.editor.onDisplayChanged();
+				}
+				// Call a delayed resize to wait for some things to display in header/footer.
+				setTimeout(lang.hitch(this, function(){
+					// Make resize calls.
+					var parent = ed.domNode.parentNode;
+					if(parent){
+						var container = registry.getEnclosingWidget(parent);
+						if(container && container.resize){
+							container.resize();
+						}
+					}
+					ed.resize();
+				}), 300);
+			}catch(e){
+				console.log(e);
+			}
+		},
+
+		updateState: function(){
+			// summary:
+			//		Over-ride for button state control for disabled to work.
+			this.button.set("disabled", this.get("disabled"));
+		},
+
+		_resize: function(){
+			// summary:
+			//		Internal function to resize the source view
+			// tags:
+			//		private
+			var ed = this.editor;
+			var tbH = ed.getHeaderHeight();
+			var fH = ed.getFooterHeight();
+			var eb = domGeometry.position(ed.domNode);
+
+			// Styles are now applied to the internal source container, so we have
+			// to subtract them off.
+			var containerPadding = domGeometry.getPadBorderExtents(ed.iframe.parentNode);
+			var containerMargin = domGeometry.getMarginExtents(ed.iframe.parentNode);
+
+			var extents = domGeometry.getPadBorderExtents(ed.domNode);
+			var edb = {
+				w: eb.w - extents.w,
+				h: eb.h - (tbH + extents.h + fH)
+			};
+
+			// Fullscreen gets odd, so we need to check for the FS plugin and
+			// adapt.
+			if(this._fsPlugin && this._fsPlugin.isFullscreen){
+				// Okay, probably in FS, adjust.
+				var vp = winUtils.getBox(ed.ownerDocument);
+				edb.w = (vp.w - extents.w);
+				edb.h = (vp.h - (tbH + extents.h + fH));
+			}
+
+			domGeometry.setMarginBox(this.sourceArea, {
+				w: Math.round(edb.w - (containerPadding.w + containerMargin.w)),
+				h: Math.round(edb.h - (containerPadding.h + containerMargin.h))
+			});
+		},
+
+		_createSourceView: function(){
+			// summary:
+			//		Internal function for creating the source view area.
+			// tags:
+			//		private
+			var ed = this.editor;
+			var edPlugins = ed._plugins;
+			this.sourceArea = domConstruct.create("textarea");
+			if(this.readOnly){
+				domAttr.set(this.sourceArea, "readOnly", true);
+				this._readOnly = true;
+			}
+			domStyle.set(this.sourceArea, {
+				padding: "0px",
+				margin: "0px",
+				borderWidth: "0px",
+				borderStyle: "none"
+			});
+			domAttr.set(this.sourceArea, "aria-label", this.editor.id);
+
+			domConstruct.place(this.sourceArea, ed.iframe, "before");
+
+			if(has("ie") && ed.iframe.parentNode.lastChild !== ed.iframe){
+				// There's some weirdo div in IE used for focus control
+				// But is messed up scaling the textarea if we don't config
+				// it some so it doesn't have a varying height.
+				domStyle.set(ed.iframe.parentNode.lastChild, {
+					width: "0px",
+					height: "0px",
+					padding: "0px",
+					margin: "0px",
+					borderWidth: "0px",
+					borderStyle: "none"
+				});
+			}
+
+			// We also need to take over editor focus a bit here, so that focus calls to
+			// focus the editor will focus to the right node when VS is active.
+			ed._viewsource_oldFocus = ed.focus;
+			var self = this;
+			ed.focus = function(){
+				if(self._sourceShown){
+					self.setSourceAreaCaret();
+				}else{
+					try{
+						if(this._vsFocused){
+							delete this._vsFocused;
+							// Must focus edit node in this case (webkit only) or
+							// focus doesn't shift right, but in normal
+							// cases we focus with the regular function.
+							focus.focus(ed.editNode);
+						}else{
+							ed._viewsource_oldFocus();
+						}
+					}catch(e){
+						console.log("ViewSource focus code error: " + e);
+					}
+				}
+			};
+
+			var i, p;
+			for(i = 0; i < edPlugins.length; i++){
+				// We actually do need to trap this plugin and adjust how we
+				// display the textarea.
+				p = edPlugins[i];
+				if(p && (p.declaredClass === "dijit._editor.plugins.FullScreen" ||
+					p.declaredClass === (dijit._scopeName +
+						"._editor.plugins.FullScreen"))){
+					this._fsPlugin = p;
+					break;
+				}
+			}
+			if(this._fsPlugin){
+				// Found, we need to over-ride the alt-view node function
+				// on FullScreen with our own, chain up to parent call when appropriate.
+				this._fsPlugin._viewsource_getAltViewNode = this._fsPlugin._getAltViewNode;
+				this._fsPlugin._getAltViewNode = function(){
+					return self._sourceShown ? self.sourceArea : this._viewsource_getAltViewNode();
+				};
+			}
+
+			// Listen to the source area for key events as well, as we need to be able to hotkey toggle
+			// it from there too.
+			this.own(on(this.sourceArea, "keydown", lang.hitch(this, function(e){
+				if(this._sourceShown && e.keyCode == keys.F12 && e.ctrlKey && e.shiftKey){
+					this.button.focus();
+					this.button.set("checked", false);
+					setTimeout(lang.hitch(this, function(){
+						ed.focus();
+					}), 100);
+					e.stopPropagation();
+					e.preventDefault();
+				}
+			})));
+		},
+
+		_stripScripts: function(html){
+			// summary:
+			//		Strips out script tags from the HTML used in editor.
+			// html: String
+			//		The HTML to filter
+			// tags:
+			//		private
+			if(html){
+				// Look for closed and unclosed (malformed) script attacks.
+				html = html.replace(/<\s*script[^>]*>((.|\s)*?)<\\?\/\s*script\s*>/ig, "");
+				html = html.replace(/<\s*script\b([^<>]|\s)*>?/ig, "");
+				html = html.replace(/<[^>]*=(\s|)*[("|')]javascript:[^$1][(\s|.)]*[$1][^>]*>/ig, "");
+			}
+			return html;
+		},
+
+		_stripComments: function(html){
+			// summary:
+			//		Strips out comments from the HTML used in editor.
+			// html: String
+			//		The HTML to filter
+			// tags:
+			//		private
+			if(html){
+				html = html.replace(/<!--(.|\s){1,}?-->/g, "");
+			}
+			return html;
+		},
+
+		_stripIFrames: function(html){
+			// summary:
+			//		Strips out iframe tags from the content, to avoid iframe script
+			//		style injection attacks.
+			// html: String
+			//		The HTML to filter
+			// tags:
+			//		private
+			if(html){
+				html = html.replace(/<\s*iframe[^>]*>((.|\s)*?)<\\?\/\s*iframe\s*>/ig, "");
+			}
+			return html;
+		},
+
+		_filter: function(html){
+			// summary:
+			//		Internal function to perform some filtering on the HTML.
+			// html: String
+			//		The HTML to filter
+			// tags:
+			//		private
+			if(html){
+				if(this.stripScripts){
+					html = this._stripScripts(html);
+				}
+				if(this.stripComments){
+					html = this._stripComments(html);
+				}
+				if(this.stripIFrames){
+					html = this._stripIFrames(html);
+				}
+			}
+			return html;
+		},
+
+		setSourceAreaCaret: function(){
+			// summary:
+			//		Internal function to set the caret in the sourceArea
+			//		to 0x0
+			var elem = this.sourceArea;
+			focus.focus(elem);
+			if(this._sourceShown && !this.readOnly){
+				if(elem.setSelectionRange){
+					elem.setSelectionRange(0, 0);
+				}else if(this.sourceArea.createTextRange){
+					// IE
+					var range = elem.createTextRange();
+					range.collapse(true);
+					range.moveStart("character", -99999); // move to 0
+					range.moveStart("character", 0); // delta from 0 is the correct position
+					range.moveEnd("character", 0);
+					range.select();
+				}
+			}
+		},
+
+		destroy: function(){
+			if(this._resizer){
+				clearTimeout(this._resizer);
+				delete this._resizer;
+			}
+			if(this._resizeHandle){
+				this._resizeHandle.remove();
+				delete this._resizeHandle;
+			}
+			if(this._setListener){
+				this._setListener.remove();
+				delete this._setListener;
+			}
+			this.inherited(arguments);
+		}
+	});
+
+	// Register this plugin.
+	// For back-compat accept "viewsource" (all lowercase) too, remove in 2.0
+	_Plugin.registry["viewSource"] = _Plugin.registry["viewsource"] = function(args){
+		return new ViewSource({
+			readOnly: ("readOnly" in args) ? args.readOnly : false,
+			stripComments: ("stripComments" in args) ? args.stripComments : true,
+			stripScripts: ("stripScripts" in args) ? args.stripScripts : true,
+			stripIFrames: ("stripIFrames" in args) ? args.stripIFrames : true
+		});
+	};
+
+	return ViewSource;
+});
diff --git a/src/main/resources/static/dijit/_editor/range.js b/src/main/resources/static/dijit/_editor/range.js
new file mode 100644
index 0000000000000000000000000000000000000000..f2d586856fd4752de34c94ba9ed79ee43cfcf690
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/range.js
@@ -0,0 +1,559 @@
+define([
+	"dojo/_base/array", // array.every
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang" // lang.isArray
+], function(array, declare, lang){
+
+	// module:
+	//		dijit/_editor/range
+
+	var rangeapi = {
+		// summary:
+		//		W3C range API
+
+		getIndex: function(/*DomNode*/ node, /*DomNode*/ parent){
+			var ret = [], retR = [];
+			var onode = node;
+
+			var pnode, n;
+			while(node != parent){
+				var i = 0;
+				pnode = node.parentNode;
+				while((n = pnode.childNodes[i++])){
+					if(n === node){
+						--i;
+						break;
+					}
+				}
+				//if(i>=pnode.childNodes.length){
+				//console.debug("Error finding index of a node in dijit/range.getIndex()");
+				//}
+				ret.unshift(i);
+				retR.unshift(i - pnode.childNodes.length);
+				node = pnode;
+			}
+
+			//normalized() can not be called so often to prevent
+			//invalidating selection/range, so we have to detect
+			//here that any text nodes in a row
+			if(ret.length > 0 && onode.nodeType == 3){
+				n = onode.previousSibling;
+				while(n && n.nodeType == 3){
+					ret[ret.length - 1]--;
+					n = n.previousSibling;
+				}
+				n = onode.nextSibling;
+				while(n && n.nodeType == 3){
+					retR[retR.length - 1]++;
+					n = n.nextSibling;
+				}
+			}
+
+			return {o: ret, r:retR};
+		},
+
+		getNode: function(/*Array*/ index, /*DomNode*/ parent){
+			if(!lang.isArray(index) || index.length == 0){
+				return parent;
+			}
+			var node = parent;
+			//	if(!node)debugger
+			array.every(index, function(i){
+				if(i >= 0 && i < node.childNodes.length){
+					node = node.childNodes[i];
+				}else{
+					node = null;
+					//console.debug('Error: can not find node with index',index,'under parent node',parent );
+					return false; //terminate array.every
+				}
+				return true; //carry on the every loop
+			});
+
+			return node;
+		},
+
+		getCommonAncestor: function(n1, n2, root){
+			root = root || n1.ownerDocument.body;
+			var getAncestors = function(n){
+				var as = [];
+				while(n){
+					as.unshift(n);
+					if(n !== root){
+						n = n.parentNode;
+					}else{
+						break;
+					}
+				}
+				return as;
+			};
+			var n1as = getAncestors(n1);
+			var n2as = getAncestors(n2);
+
+			var m = Math.min(n1as.length, n2as.length);
+			var com = n1as[0]; //at least, one element should be in the array: the root (BODY by default)
+			for(var i = 1; i < m; i++){
+				if(n1as[i] === n2as[i]){
+					com = n1as[i]
+				}else{
+					break;
+				}
+			}
+			return com;
+		},
+
+		getAncestor: function(/*DomNode*/ node, /*RegEx?*/ regex, /*DomNode?*/ root){
+			root = root || node.ownerDocument.body;
+			while(node && node !== root){
+				var name = node.nodeName.toUpperCase();
+				if(regex.test(name)){
+					return node;
+				}
+
+				node = node.parentNode;
+			}
+			return null;
+		},
+
+		BlockTagNames: /^(?:P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|DT|DE)$/,
+
+		getBlockAncestor: function(/*DomNode*/ node, /*RegEx?*/ regex, /*DomNode?*/ root){
+			root = root || node.ownerDocument.body;
+			regex = regex || rangeapi.BlockTagNames;
+			var block = null, blockContainer;
+			while(node && node !== root){
+				var name = node.nodeName.toUpperCase();
+				if(!block && regex.test(name)){
+					block = node;
+				}
+				if(!blockContainer && (/^(?:BODY|TD|TH|CAPTION)$/).test(name)){
+					blockContainer = node;
+				}
+
+				node = node.parentNode;
+			}
+			return {blockNode:block, blockContainer:blockContainer || node.ownerDocument.body};
+		},
+
+		atBeginningOfContainer: function(/*DomNode*/ container, /*DomNode*/ node, /*Int*/ offset){
+			var atBeginning = false;
+			var offsetAtBeginning = (offset == 0);
+			if(!offsetAtBeginning && node.nodeType == 3){ //if this is a text node, check whether the left part is all space
+				if(/^[\s\xA0]+$/.test(node.nodeValue.substr(0, offset))){
+					offsetAtBeginning = true;
+				}
+			}
+			if(offsetAtBeginning){
+				var cnode = node;
+				atBeginning = true;
+				while(cnode && cnode !== container){
+					if(cnode.previousSibling){
+						atBeginning = false;
+						break;
+					}
+					cnode = cnode.parentNode;
+				}
+			}
+			return atBeginning;
+		},
+
+		atEndOfContainer: function(/*DomNode*/ container, /*DomNode*/ node, /*Int*/ offset){
+			var atEnd = false;
+			var offsetAtEnd = (offset == (node.length || node.childNodes.length));
+			if(!offsetAtEnd && node.nodeType == 3){ //if this is a text node, check whether the right part is all space
+				if(/^[\s\xA0]+$/.test(node.nodeValue.substr(offset))){
+					offsetAtEnd = true;
+				}
+			}
+			if(offsetAtEnd){
+				var cnode = node;
+				atEnd = true;
+				while(cnode && cnode !== container){
+					if(cnode.nextSibling){
+						atEnd = false;
+						break;
+					}
+					cnode = cnode.parentNode;
+				}
+			}
+			return atEnd;
+		},
+
+		adjacentNoneTextNode: function(startnode, next){
+			var node = startnode;
+			var len = (0 - startnode.length) || 0;
+			var prop = next ? 'nextSibling' : 'previousSibling';
+			while(node){
+				if(node.nodeType != 3){
+					break;
+				}
+				len += node.length;
+				node = node[prop];
+			}
+			return [node,len];
+		},
+
+		create: function(/*Window?*/ win){	// TODO: for 2.0, replace optional window param w/mandatory window or document param
+			win = win || window;
+			if(win.getSelection){
+				return win.document.createRange();
+			}else{//IE
+				return new W3CRange();
+			}
+		},
+
+		getSelection: function(/*Window*/ window, /*Boolean?*/ ignoreUpdate){
+			if(window.getSelection){
+				return window.getSelection();
+			}else{//IE
+				var s = new ie.selection(window);
+				if(!ignoreUpdate){
+					s._getCurrentSelection();
+				}
+				return s;
+			}
+		}
+	};
+
+	// TODO: convert to has() test?   But remember IE9 issues with quirks vs. standards in main frame vs. iframe.
+	if(!window.getSelection){
+		var ie = rangeapi.ie = {
+			cachedSelection: {},
+			selection: function(window){
+				this._ranges = [];
+				this.addRange = function(r, /*boolean*/ internal){
+					this._ranges.push(r);
+					if(!internal){
+						r._select();
+					}
+					this.rangeCount = this._ranges.length;
+				};
+				this.removeAllRanges = function(){
+					//don't detach, the range may be used later
+					//				for(var i=0;i<this._ranges.length;i++){
+					//					this._ranges[i].detach();
+					//				}
+					this._ranges = [];
+					this.rangeCount = 0;
+				};
+				var _initCurrentRange = function(){
+					var r = window.document.selection.createRange();
+					var type = window.document.selection.type.toUpperCase();
+					if(type == "CONTROL"){
+						//TODO: multiple range selection(?)
+						return new W3CRange(ie.decomposeControlRange(r));
+					}else{
+						return new W3CRange(ie.decomposeTextRange(r));
+					}
+				};
+				this.getRangeAt = function(i){
+					return this._ranges[i];
+				};
+				this._getCurrentSelection = function(){
+					this.removeAllRanges();
+					var r = _initCurrentRange();
+					if(r){
+						this.addRange(r, true);
+						this.isCollapsed = r.collapsed;
+					}else{
+						this.isCollapsed = true;
+					}
+				};
+			},
+			decomposeControlRange: function(range){
+				var firstnode = range.item(0), lastnode = range.item(range.length - 1);
+				var startContainer = firstnode.parentNode, endContainer = lastnode.parentNode;
+				var startOffset = rangeapi.getIndex(firstnode, startContainer).o[0];
+				var endOffset = rangeapi.getIndex(lastnode, endContainer).o[0] + 1;
+				return [startContainer, startOffset,endContainer, endOffset];
+			},
+			getEndPoint: function(range, end){
+				var atmrange = range.duplicate();
+				atmrange.collapse(!end);
+				var cmpstr = 'EndTo' + (end ? 'End' : 'Start');
+				var parentNode = atmrange.parentElement();
+
+				var startnode, startOffset, lastNode;
+				if(parentNode.childNodes.length > 0){
+					array.every(parentNode.childNodes, function(node, i){
+						var calOffset;
+						if(node.nodeType != 3){
+							atmrange.moveToElementText(node);
+
+							if(atmrange.compareEndPoints(cmpstr, range) > 0){
+								//startnode = node.previousSibling;
+								if(lastNode && lastNode.nodeType == 3){
+									//where shall we put the start? in the text node or after?
+									startnode = lastNode;
+									calOffset = true;
+								}else{
+									startnode = parentNode;
+									startOffset = i;
+									return false;
+								}
+							}else{
+								if(i == parentNode.childNodes.length - 1){
+									startnode = parentNode;
+									startOffset = parentNode.childNodes.length;
+									return false;
+								}
+							}
+						}else{
+							if(i == parentNode.childNodes.length - 1){//at the end of this node
+								startnode = node;
+								calOffset = true;
+							}
+						}
+						//			try{
+						if(calOffset && startnode){
+							var prevnode = rangeapi.adjacentNoneTextNode(startnode)[0];
+							if(prevnode){
+								startnode = prevnode.nextSibling;
+							}else{
+								startnode = parentNode.firstChild; //firstChild must be a text node
+							}
+							var prevnodeobj = rangeapi.adjacentNoneTextNode(startnode);
+							prevnode = prevnodeobj[0];
+							var lenoffset = prevnodeobj[1];
+							if(prevnode){
+								atmrange.moveToElementText(prevnode);
+								atmrange.collapse(false);
+							}else{
+								atmrange.moveToElementText(parentNode);
+							}
+							atmrange.setEndPoint(cmpstr, range);
+							startOffset = atmrange.text.length - lenoffset;
+
+							return false;
+						}
+						//			}catch(e){ debugger }
+						lastNode = node;
+						return true;
+					});
+				}else{
+					startnode = parentNode;
+					startOffset = 0;
+				}
+
+				//if at the end of startnode and we are dealing with start container, then
+				//move the startnode to nextSibling if it is a text node
+				//TODO: do this for end container?
+				if(!end && startnode.nodeType == 1 && startOffset == startnode.childNodes.length){
+					var nextnode = startnode.nextSibling;
+					if(nextnode && nextnode.nodeType == 3){
+						startnode = nextnode;
+						startOffset = 0;
+					}
+				}
+				return [startnode, startOffset];
+			},
+			setEndPoint: function(range, container, offset){
+				//text node
+				var atmrange = range.duplicate(), node, len;
+				if(container.nodeType != 3){ //normal node
+					if(offset > 0){
+						node = container.childNodes[offset - 1];
+						if(node){
+							if(node.nodeType == 3){
+								container = node;
+								offset = node.length;
+								//pass through
+							}else{
+								if(node.nextSibling && node.nextSibling.nodeType == 3){
+									container = node.nextSibling;
+									offset = 0;
+									//pass through
+								}else{
+									atmrange.moveToElementText(node.nextSibling ? node : container);
+									var parent = node.parentNode;
+									var tempNode = parent.insertBefore(node.ownerDocument.createTextNode(' '), node.nextSibling);
+									atmrange.collapse(false);
+									parent.removeChild(tempNode);
+								}
+							}
+						}
+					}else{
+						atmrange.moveToElementText(container);
+						atmrange.collapse(true);
+					}
+				}
+				if(container.nodeType == 3){
+					var prevnodeobj = rangeapi.adjacentNoneTextNode(container);
+					var prevnode = prevnodeobj[0];
+					len = prevnodeobj[1];
+					if(prevnode){
+						atmrange.moveToElementText(prevnode);
+						atmrange.collapse(false);
+						//if contentEditable is not inherit, the above collapse won't make the end point
+						//in the correctly position: it always has a -1 offset, so compensate it
+						if(prevnode.contentEditable != 'inherit'){
+							len++;
+						}
+					}else{
+						atmrange.moveToElementText(container.parentNode);
+						atmrange.collapse(true);
+
+						// Correct internal cursor position
+						// http://bugs.dojotoolkit.org/ticket/15578
+						atmrange.move('character', 1);
+						atmrange.move('character', -1);
+					}
+
+					offset += len;
+					if(offset > 0){
+						if(atmrange.move('character', offset) != offset){
+							console.error('Error when moving!');
+						}
+					}
+				}
+
+				return atmrange;
+			},
+			decomposeTextRange: function(range){
+				var tmpary = ie.getEndPoint(range);
+				var startContainer = tmpary[0], startOffset = tmpary[1];
+				var endContainer = tmpary[0], endOffset = tmpary[1];
+
+				if(range.htmlText.length){
+					if(range.htmlText == range.text){ //in the same text node
+						endOffset = startOffset + range.text.length;
+					}else{
+						tmpary = ie.getEndPoint(range, true);
+						endContainer = tmpary[0],endOffset = tmpary[1];
+						//					if(startContainer.tagName == "BODY"){
+						//						startContainer = startContainer.firstChild;
+						//					}
+					}
+				}
+				return [startContainer, startOffset, endContainer, endOffset];
+			},
+			setRange: function(range, startContainer, startOffset, endContainer, endOffset, collapsed){
+				var start = ie.setEndPoint(range, startContainer, startOffset);
+
+				range.setEndPoint('StartToStart', start);
+				if(!collapsed){
+					var end = ie.setEndPoint(range, endContainer, endOffset);
+				}
+				range.setEndPoint('EndToEnd', end || start);
+
+				return range;
+			}
+		};
+
+		var W3CRange = rangeapi.W3CRange = declare(null, {
+			constructor: function(){
+				if(arguments.length>0){
+					this.setStart(arguments[0][0],arguments[0][1]);
+					this.setEnd(arguments[0][2],arguments[0][3]);
+				}else{
+					this.commonAncestorContainer = null;
+					this.startContainer = null;
+					this.startOffset = 0;
+					this.endContainer = null;
+					this.endOffset = 0;
+					this.collapsed = true;
+				}
+			},
+			_updateInternal: function(){
+				if(this.startContainer !== this.endContainer){
+					this.commonAncestorContainer = rangeapi.getCommonAncestor(this.startContainer, this.endContainer);
+				}else{
+					this.commonAncestorContainer = this.startContainer;
+				}
+				this.collapsed = (this.startContainer === this.endContainer) && (this.startOffset == this.endOffset);
+			},
+			setStart: function(node, offset){
+				offset=parseInt(offset);
+				if(this.startContainer === node && this.startOffset == offset){
+					return;
+				}
+				delete this._cachedBookmark;
+
+				this.startContainer = node;
+				this.startOffset = offset;
+				if(!this.endContainer){
+					this.setEnd(node, offset);
+				}else{
+					this._updateInternal();
+				}
+			},
+			setEnd: function(node, offset){
+				offset=parseInt(offset);
+				if(this.endContainer === node && this.endOffset == offset){
+					return;
+				}
+				delete this._cachedBookmark;
+
+				this.endContainer = node;
+				this.endOffset = offset;
+				if(!this.startContainer){
+					this.setStart(node, offset);
+				}else{
+					this._updateInternal();
+				}
+			},
+			setStartAfter: function(node, offset){
+				this._setPoint('setStart', node, offset, 1);
+			},
+			setStartBefore: function(node, offset){
+				this._setPoint('setStart', node, offset, 0);
+			},
+			setEndAfter: function(node, offset){
+				this._setPoint('setEnd', node, offset, 1);
+			},
+			setEndBefore: function(node, offset){
+				this._setPoint('setEnd', node, offset, 0);
+			},
+			_setPoint: function(what, node, offset, ext){
+				var index = rangeapi.getIndex(node, node.parentNode).o;
+				this[what](node.parentNode, index.pop()+ext);
+			},
+			_getIERange: function(){
+				var r = (this._body || this.endContainer.ownerDocument.body).createTextRange();
+				ie.setRange(r, this.startContainer, this.startOffset, this.endContainer, this.endOffset, this.collapsed);
+				return r;
+			},
+			getBookmark: function(){
+				this._getIERange();
+				return this._cachedBookmark;
+			},
+			_select: function(){
+				var r = this._getIERange();
+				r.select();
+			},
+			deleteContents: function(){
+				var s = this.startContainer, r = this._getIERange();
+				if(s.nodeType === 3 && !this.startOffset){
+					//if the range starts at the beginning of a
+					//text node, move it to before the textnode
+					//to make sure the range is still valid
+					//after deleteContents() finishes
+					this.setStartBefore(s);
+				}
+				r.pasteHTML('');
+				this.endContainer = this.startContainer;
+				this.endOffset = this.startOffset;
+				this.collapsed = true;
+			},
+			cloneRange: function(){
+				var r = new W3CRange([this.startContainer,this.startOffset,
+					this.endContainer,this.endOffset]);
+				r._body = this._body;
+				return r;
+			},
+			detach: function(){
+				this._body = null;
+				this.commonAncestorContainer = null;
+				this.startContainer = null;
+				this.startOffset = 0;
+				this.endContainer = null;
+				this.endOffset = 0;
+				this.collapsed = true;
+			}
+		});
+	} //if(!window.getSelection)
+
+	// remove for 2.0
+	lang.setObject("dijit.range", rangeapi);
+
+	return rangeapi;
+});
diff --git a/src/main/resources/static/dijit/_editor/selection.js b/src/main/resources/static/dijit/_editor/selection.js
new file mode 100644
index 0000000000000000000000000000000000000000..982e455403577ce1362599868f3c6c756c3a1bf4
--- /dev/null
+++ b/src/main/resources/static/dijit/_editor/selection.js
@@ -0,0 +1,379 @@
+define([
+	"dojo/dom", // dom.byId
+	"dojo/_base/lang",
+	"dojo/sniff", // has("ie") has("opera")
+	"dojo/_base/window", // win.body win.doc win.doc.createElement win.doc.selection win.doc.selection.createRange win.doc.selection.type.toLowerCase win.global win.global.getSelection
+	"../main"		// for exporting symbols to dijit._editor.selection
+], function(dom, lang, has, win, dijit){
+
+// module:
+//		dijit/_editor/selection
+
+var selection = {
+	// summary:
+	//		Deprecated text selection API.  Will be removed in 2.0.  New code should use dijit/selection.
+
+	getType: function(){
+		// summary:
+		//		Get the selection type (like win.doc.select.type in IE).
+		if(win.doc.getSelection){
+			// W3C path
+			var stype = "text";
+
+			// Check if the actual selection is a CONTROL (IMG, TABLE, HR, etc...).
+			var oSel;
+			try{
+				oSel = win.global.getSelection();
+			}catch(e){ /*squelch*/ }
+
+			if(oSel && oSel.rangeCount == 1){
+				var oRange = oSel.getRangeAt(0);
+				if(	(oRange.startContainer == oRange.endContainer) &&
+					((oRange.endOffset - oRange.startOffset) == 1) &&
+					(oRange.startContainer.nodeType != 3 /* text node*/)
+				){
+					stype = "control";
+				}
+			}
+			return stype; //String
+		}else{
+			// IE6-8
+			return win.doc.selection.type.toLowerCase();
+		}
+	},
+
+	getSelectedText: function(){
+		// summary:
+		//		Return the text (no html tags) included in the current selection or null if no text is selected
+		if(win.doc.getSelection){
+			// W3C path
+			var selection = win.global.getSelection();
+			return selection ? selection.toString() : ""; //String
+		}else{
+			// IE6-8
+			if(dijit._editor.selection.getType() == 'control'){
+				return null;
+			}
+			return win.doc.selection.createRange().text;
+		}
+	},
+
+	getSelectedHtml: function(){
+		// summary:
+		//		Return the html text of the current selection or null if unavailable
+		if(win.doc.getSelection){
+			// W3C path
+			var selection = win.global.getSelection();
+			if(selection && selection.rangeCount){
+				var i;
+				var html = "";
+				for(i = 0; i < selection.rangeCount; i++){
+					//Handle selections spanning ranges, such as Opera
+					var frag = selection.getRangeAt(i).cloneContents();
+					var div = win.doc.createElement("div");
+					div.appendChild(frag);
+					html += div.innerHTML;
+				}
+				return html; //String
+			}
+			return null;
+		}else{
+			// IE6-8
+			if(dijit._editor.selection.getType() == 'control'){
+				return null;
+			}
+			return win.doc.selection.createRange().htmlText;
+		}
+	},
+
+	getSelectedElement: function(){
+		// summary:
+		//		Retrieves the selected element (if any), just in the case that
+		//		a single element (object like and image or a table) is
+		//		selected.
+		if(dijit._editor.selection.getType() == "control"){
+			if(win.doc.getSelection){
+				// W3C path
+				var selection = win.global.getSelection();
+				return selection.anchorNode.childNodes[ selection.anchorOffset ];
+			}else{
+				// IE6-8
+				var range = win.doc.selection.createRange();
+				if(range && range.item){
+					return win.doc.selection.createRange().item(0);
+				}
+			}
+		}
+		return null;
+	},
+
+	getParentElement: function(){
+		// summary:
+		//		Get the parent element of the current selection
+		if(dijit._editor.selection.getType() == "control"){
+			var p = this.getSelectedElement();
+			if(p){ return p.parentNode; }
+		}else{
+			if(win.doc.getSelection){
+				var selection = win.global.getSelection();
+				if(selection){
+					var node = selection.anchorNode;
+					while(node && (node.nodeType != 1)){ // not an element
+						node = node.parentNode;
+					}
+					return node;
+				}
+			}else{
+				var r = win.doc.selection.createRange();
+				r.collapse(true);
+				return r.parentElement();
+			}
+		}
+		return null;
+	},
+
+	hasAncestorElement: function(/*String*/ tagName /* ... */){
+		// summary:
+		//		Check whether current selection has a  parent element which is
+		//		of type tagName (or one of the other specified tagName)
+		// tagName: String
+		//		The tag name to determine if it has an ancestor of.
+		return this.getAncestorElement.apply(this, arguments) != null; //Boolean
+	},
+
+	getAncestorElement: function(/*String*/ tagName /* ... */){
+		// summary:
+		//		Return the parent element of the current selection which is of
+		//		type tagName (or one of the other specified tagName)
+		// tagName: String
+		//		The tag name to determine if it has an ancestor of.
+		var node = this.getSelectedElement() || this.getParentElement();
+		return this.getParentOfType(node, arguments); //DOMNode
+	},
+
+	isTag: function(/*DomNode*/ node, /*String[]*/ tags){
+		// summary:
+		//		Function to determine if a node is one of an array of tags.
+		// node:
+		//		The node to inspect.
+		// tags:
+		//		An array of tag name strings to check to see if the node matches.
+		if(node && node.tagName){
+			var _nlc = node.tagName.toLowerCase();
+			for(var i=0; i<tags.length; i++){
+				var _tlc = String(tags[i]).toLowerCase();
+				if(_nlc == _tlc){
+					return _tlc; // String
+				}
+			}
+		}
+		return "";
+	},
+
+	getParentOfType: function(/*DomNode*/ node, /*String[]*/ tags){
+		// summary:
+		//		Function to locate a parent node that matches one of a set of tags
+		// node:
+		//		The node to inspect.
+		// tags:
+		//		An array of tag name strings to check to see if the node matches.
+		while(node){
+			if(this.isTag(node, tags).length){
+				return node; // DOMNode
+			}
+			node = node.parentNode;
+		}
+		return null;
+	},
+
+	collapse: function(/*Boolean*/ beginning){
+		// summary:
+		//		Function to collapse (clear), the current selection
+		// beginning: Boolean
+		//		Indicates whether to collapse the cursor to the beginning of the selection or end.
+		if(win.doc.getSelection){
+			// W3C path
+			var selection = win.global.getSelection();
+			if(selection.removeAllRanges){ // Mozilla
+				if(beginning){
+					selection.collapseToStart();
+				}else{
+					selection.collapseToEnd();
+				}
+			}else{ // Safari
+				// pulled from WebCore/ecma/kjs_window.cpp, line 2536
+				selection.collapse(beginning);
+			}
+		}else{
+			// IE6-8
+			var range = win.doc.selection.createRange();
+			range.collapse(beginning);
+			range.select();
+		}
+	},
+
+	remove: function(){
+		// summary:
+		//		Function to delete the currently selected content from the document.
+		var sel = win.doc.selection;
+		if(win.doc.getSelection){
+			// W3C path
+			sel = win.global.getSelection();
+			sel.deleteFromDocument();
+			return sel; //Selection
+		}else{
+			// IE6-8
+			if(sel.type.toLowerCase() != "none"){
+				sel.clear();
+			}
+			return sel; //Selection
+		}
+	},
+
+	selectElementChildren: function(/*DomNode*/ element, /*Boolean?*/ nochangefocus){
+		// summary:
+		//		clear previous selection and select the content of the node
+		//		(excluding the node itself)
+		// element: DOMNode
+		//		The element you wish to select the children content of.
+		// nochangefocus: Boolean
+		//		Indicates if the focus should change or not.
+		var doc = win.doc;
+		var range;
+		element = dom.byId(element);
+		if(win.doc.getSelection){
+			// W3C
+			var selection = win.global.getSelection();
+			if(has("opera")){
+				//Opera's selectAllChildren doesn't seem to work right
+				//against <body> nodes and possibly others ... so
+				//we use the W3C range API
+				if(selection.rangeCount){
+					range = selection.getRangeAt(0);
+				}else{
+					range = doc.createRange();
+				}
+				range.setStart(element, 0);
+				range.setEnd(element,(element.nodeType == 3) ? element.length : element.childNodes.length);
+				selection.addRange(range);
+			}else{
+				selection.selectAllChildren(element);
+			}
+		}else{
+			// IE6-8
+			range = element.ownerDocument.body.createTextRange();
+			range.moveToElementText(element);
+			if(!nochangefocus){
+				try{
+					range.select(); // IE throws an exception here if the widget is hidden.  See #5439
+				}catch(e){ /* squelch */}
+			}
+		}
+	},
+
+	selectElement: function(/*DomNode*/ element, /*Boolean?*/ nochangefocus){
+		// summary:
+		//		clear previous selection and select element (including all its children)
+		// element: DOMNode
+		//		The element to select.
+		// nochangefocus: Boolean
+		//		Boolean indicating if the focus should be changed.  IE only.
+		var range;
+		element = dom.byId(element);	// TODO: remove for 2.0 or sooner, spec listed above doesn't allow for string
+		var doc = element.ownerDocument;
+		var global = win.global;	// TODO: use winUtils.get(doc)?
+		if(doc.getSelection){
+			// W3C path
+			var selection = global.getSelection();
+			range = doc.createRange();
+			if(selection.removeAllRanges){ // Mozilla
+				// FIXME: does this work on Safari?
+				if(has("opera")){
+					//Opera works if you use the current range on
+					//the selection if present.
+					if(selection.getRangeAt(0)){
+						range = selection.getRangeAt(0);
+					}
+				}
+				range.selectNode(element);
+				selection.removeAllRanges();
+				selection.addRange(range);
+			}
+		}else{
+			// IE6-8
+			try{
+				var tg = element.tagName ? element.tagName.toLowerCase() : "";
+				if(tg === "img" || tg === "table"){
+					range = win.body(doc).createControlRange();
+				}else{
+					range = win.body(doc).createRange();
+				}
+				range.addElement(element);
+				if(!nochangefocus){
+					range.select();
+				}
+			}catch(e){
+				this.selectElementChildren(element, nochangefocus);
+			}
+		}
+	},
+
+	inSelection: function(node){
+		// summary:
+		//		This function determines if 'node' is
+		//		in the current selection.
+		// tags:
+		//		public
+		if(node){
+			var newRange;
+			var doc = win.doc;
+			var range;
+
+			if(win.doc.getSelection){
+				// WC3
+				var sel = win.global.getSelection();
+				if(sel && sel.rangeCount > 0){
+					range = sel.getRangeAt(0);
+				}
+				if(range && range.compareBoundaryPoints && doc.createRange){
+					try{
+						newRange = doc.createRange();
+						newRange.setStart(node, 0);
+						if(range.compareBoundaryPoints(range.START_TO_END, newRange) === 1){
+							return true;
+						}
+					}catch(e){ /* squelch */}
+				}
+			}else{
+				// IE6-8, so we can't use the range object as the pseudo
+				// range doesn't implement the boundary checking, we have to
+				// use IE specific crud.
+				range = doc.selection.createRange();
+				try{
+					newRange = node.ownerDocument.body.createControlRange();
+					if(newRange){
+						newRange.addElement(node);
+					}
+				}catch(e1){
+					try{
+						newRange = node.ownerDocument.body.createTextRange();
+						newRange.moveToElementText(node);
+					}catch(e2){/* squelch */}
+				}
+				if(range && newRange){
+					// We can finally compare similar to W3C
+					if(range.compareEndPoints("EndToStart", newRange) === 1){
+						return true;
+					}
+				}
+			}
+		}
+		return false; // Boolean
+	}
+};
+
+
+lang.setObject("dijit._editor.selection", selection);
+
+return selection;
+});
diff --git a/src/main/resources/static/dijit/_tree/dndSource.js b/src/main/resources/static/dijit/_tree/dndSource.js
new file mode 100644
index 0000000000000000000000000000000000000000..e4db35119516ababdeef4db5194dc9bbf506b876
--- /dev/null
+++ b/src/main/resources/static/dijit/_tree/dndSource.js
@@ -0,0 +1,20 @@
+define([
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/lang", // lang.setObject
+	"../tree/dndSource"
+], function(kernel, lang, dndSource){
+	// module:
+	//		dijit/_tree/dndSource
+
+	/*=====
+	return {
+		// summary:
+		//		Deprecated module, use dijit/tree/dndSource instead.
+	};
+	=====*/
+
+	// TODO: remove this file in 2.0
+	kernel.deprecated("dijit._tree.dndSource has been moved to dijit.tree.dndSource, use that instead", "", "2.0");
+
+	lang.setObject("dijit._tree.dndSource", dndSource);
+});
diff --git a/src/main/resources/static/dijit/a11y.js b/src/main/resources/static/dijit/a11y.js
new file mode 100644
index 0000000000000000000000000000000000000000..64c0ab2313388408ca013ad6516fe4b470d85bac
--- /dev/null
+++ b/src/main/resources/static/dijit/a11y.js
@@ -0,0 +1,191 @@
+define([
+	"dojo/_base/array", // array.forEach array.map
+	"dojo/dom",			// dom.byId
+	"dojo/dom-attr", // domAttr.attr domAttr.has
+	"dojo/dom-style", // domStyle.style
+	"dojo/_base/lang", // lang.mixin()
+	"dojo/sniff", // has("ie") has("extend-dojo")
+	"./main"	// for exporting methods to dijit namespace
+], function(array, dom, domAttr, domStyle, lang, has, dijit){
+
+	// module:
+	//		dijit/a11y
+
+	var undefined;
+
+	var a11y = {
+		// summary:
+		//		Accessibility utility functions (keyboard, tab stops, etc.)
+
+		_isElementShown: function(/*Element*/ elem){
+			var s = domStyle.get(elem);
+			return (s.visibility != "hidden")
+				&& (s.visibility != "collapsed")
+				&& (s.display != "none")
+				&& (domAttr.get(elem, "type") != "hidden");
+		},
+
+		hasDefaultTabStop: function(/*Element*/ elem){
+			// summary:
+			//		Tests if element is tab-navigable even without an explicit tabIndex setting
+
+			// No explicit tabIndex setting, need to investigate node type
+			switch(elem.nodeName.toLowerCase()){
+				case "a":
+					// An <a> w/out a tabindex is only navigable if it has an href
+					return domAttr.has(elem, "href");
+				case "area":
+				case "button":
+				case "input":
+				case "object":
+				case "select":
+				case "textarea":
+					// These are navigable by default
+					return true;
+				case "iframe":
+					// If it's an editor <iframe> then it's tab navigable.
+					var body;
+					try{
+						// non-IE
+						var contentDocument = elem.contentDocument;
+						if("designMode" in contentDocument && contentDocument.designMode == "on"){
+							return true;
+						}
+						body = contentDocument.body;
+					}catch(e1){
+						// contentWindow.document isn't accessible within IE7/8
+						// if the iframe.src points to a foreign url and this
+						// page contains an element, that could get focus
+						try{
+							body = elem.contentWindow.document.body;
+						}catch(e2){
+							return false;
+						}
+					}
+					return body && (body.contentEditable == 'true' ||
+						(body.firstChild && body.firstChild.contentEditable == 'true'));
+				default:
+					return elem.contentEditable == 'true';
+			}
+		},
+
+		effectiveTabIndex: function(/*Element*/ elem){
+			// summary:
+			//		Returns effective tabIndex of an element, either a number, or undefined if element isn't focusable.
+
+			if(domAttr.get(elem, "disabled")){
+				return undefined;
+			}else if(domAttr.has(elem, "tabIndex")){
+				// Explicit tab index setting
+				return +domAttr.get(elem, "tabIndex");// + to convert string --> number
+			}else{
+				// No explicit tabIndex setting, so depends on node type
+				return a11y.hasDefaultTabStop(elem) ? 0 : undefined;
+			}
+		},
+
+		isTabNavigable: function(/*Element*/ elem){
+			// summary:
+			//		Tests if an element is tab-navigable
+
+			return a11y.effectiveTabIndex(elem) >= 0;
+		},
+
+		isFocusable: function(/*Element*/ elem){
+			// summary:
+			//		Tests if an element is focusable by tabbing to it, or clicking it with the mouse.
+
+			return a11y.effectiveTabIndex(elem) >= -1;
+		},
+
+		_getTabNavigable: function(/*DOMNode*/ root){
+			// summary:
+			//		Finds descendants of the specified root node.
+			// description:
+			//		Finds the following descendants of the specified root node:
+			//
+			//		- the first tab-navigable element in document order
+			//		  without a tabIndex or with tabIndex="0"
+			//		- the last tab-navigable element in document order
+			//		  without a tabIndex or with tabIndex="0"
+			//		- the first element in document order with the lowest
+			//		  positive tabIndex value
+			//		- the last element in document order with the highest
+			//		  positive tabIndex value
+			var first, last, lowest, lowestTabindex, highest, highestTabindex, radioSelected = {};
+
+			function radioName(node){
+				// If this element is part of a radio button group, return the name for that group.
+				return node && node.tagName.toLowerCase() == "input" &&
+					node.type && node.type.toLowerCase() == "radio" &&
+					node.name && node.name.toLowerCase();
+			}
+
+			var shown = a11y._isElementShown, effectiveTabIndex = a11y.effectiveTabIndex;
+			var walkTree = function(/*DOMNode*/ parent){
+				for(var child = parent.firstChild; child; child = child.nextSibling){
+					// Skip text elements, hidden elements, and also non-HTML elements (those in custom namespaces) in IE,
+					// since show() invokes getAttribute("type"), which crash on VML nodes in IE.
+					if(child.nodeType != 1 || (has("ie") <= 9 && child.scopeName !== "HTML") || !shown(child)){
+						continue;
+					}
+
+					var tabindex = effectiveTabIndex(child);
+					if(tabindex >= 0){
+						if(tabindex == 0){
+							if(!first){
+								first = child;
+							}
+							last = child;
+						}else if(tabindex > 0){
+							if(!lowest || tabindex < lowestTabindex){
+								lowestTabindex = tabindex;
+								lowest = child;
+							}
+							if(!highest || tabindex >= highestTabindex){
+								highestTabindex = tabindex;
+								highest = child;
+							}
+						}
+						var rn = radioName(child);
+						if(domAttr.get(child, "checked") && rn){
+							radioSelected[rn] = child;
+						}
+					}
+					if(child.nodeName.toUpperCase() != 'SELECT'){
+						walkTree(child);
+					}
+				}
+			};
+			if(shown(root)){
+				walkTree(root);
+			}
+			function rs(node){
+				// substitute checked radio button for unchecked one, if there is a checked one with the same name.
+				return radioSelected[radioName(node)] || node;
+			}
+
+			return { first: rs(first), last: rs(last), lowest: rs(lowest), highest: rs(highest) };
+		},
+
+		getFirstInTabbingOrder: function(/*String|DOMNode*/ root, /*Document?*/ doc){
+			// summary:
+			//		Finds the descendant of the specified root node
+			//		that is first in the tabbing order
+			var elems = a11y._getTabNavigable(dom.byId(root, doc));
+			return elems.lowest ? elems.lowest : elems.first; // DomNode
+		},
+
+		getLastInTabbingOrder: function(/*String|DOMNode*/ root, /*Document?*/ doc){
+			// summary:
+			//		Finds the descendant of the specified root node
+			//		that is last in the tabbing order
+			var elems = a11y._getTabNavigable(dom.byId(root, doc));
+			return elems.last ? elems.last : elems.highest; // DomNode
+		}
+	};
+
+	has("extend-dojo") && lang.mixin(dijit, a11y);
+
+	return a11y;
+});
diff --git a/src/main/resources/static/dijit/a11yclick.js b/src/main/resources/static/dijit/a11yclick.js
new file mode 100644
index 0000000000000000000000000000000000000000..147f71cf7607d0774ff6039d46b2ef0f6716a8d9
--- /dev/null
+++ b/src/main/resources/static/dijit/a11yclick.js
@@ -0,0 +1,139 @@
+define([
+	"dojo/keys", // keys.ENTER keys.SPACE
+	"dojo/mouse",
+	"dojo/on",
+	"dojo/touch" // touch support for click is now there
+], function(keys, mouse, on, touch){
+
+	// module:
+	//		dijit/a11yclick
+
+	/*=====
+	return {
+		// summary:
+		//		Custom press, release, and click synthetic events
+		//		which trigger on a left mouse click, touch, or space/enter keyup.
+
+		click: function(node, listener){
+			// summary:
+			//		Logical click operation for mouse, touch, or keyboard (space/enter key)
+		},
+		press: function(node, listener){
+			// summary:
+			//		Mousedown (left button), touchstart, or keydown (space or enter) corresponding to logical click operation.
+		},
+		release: function(node, listener){
+			// summary:
+			//		Mouseup (left button), touchend, or keyup (space or enter) corresponding to logical click operation.
+		},
+		move: function(node, listener){
+			// summary:
+			//		Mouse cursor or a finger is dragged over the given node.
+		}
+	};
+	=====*/
+
+	function clickKey(/*Event*/ e){
+		// Test if this keyboard event should be tracked as the start (if keydown) or end (if keyup) of a click event.
+		// Only track for nodes marked to be tracked, and not for buttons or inputs,
+		// since buttons handle keyboard click natively, and text inputs should not
+		// prevent typing spaces or newlines.
+		if((e.keyCode === keys.ENTER || e.keyCode === keys.SPACE) && !/input|button|textarea/i.test(e.target.nodeName)){
+
+			// Test if a node or its ancestor has been marked with the dojoClick property to indicate special processing
+			for(var node = e.target; node; node = node.parentNode){
+				if(node.dojoClick){ return true; }
+			}
+		}
+	}
+
+	var lastKeyDownNode;
+
+	on(document, "keydown", function(e){
+		//console.log("a11yclick: onkeydown, e.target = ", e.target, ", lastKeyDownNode was ", lastKeyDownNode, ", equality is ", (e.target === lastKeyDownNode));
+		if(clickKey(e)){
+			// needed on IE for when focus changes between keydown and keyup - otherwise dropdown menus do not work
+			lastKeyDownNode = e.target;
+
+			// Prevent viewport scrolling on space key in IE<9.
+			// (Reproducible on test_Button.html on any of the first dijit/form/Button examples)
+			e.preventDefault();
+		}else{
+			lastKeyDownNode = null;
+		}
+	});
+
+	on(document, "keyup", function(e){
+		//console.log("a11yclick: onkeyup, e.target = ", e.target, ", lastKeyDownNode was ", lastKeyDownNode, ", equality is ", (e.target === lastKeyDownNode));
+		if(clickKey(e) && e.target == lastKeyDownNode){	// === breaks greasemonkey
+			//need reset here or have problems in FF when focus returns to trigger element after closing popup/alert
+			lastKeyDownNode = null;
+
+			on.emit(e.target, "click", {
+				cancelable: true,
+				bubbles: true,
+				ctrlKey: e.ctrlKey,
+				shiftKey: e.shiftKey,
+				metaKey: e.metaKey,
+				altKey: e.altKey,
+				_origType: e.type
+			});
+		}
+	});
+
+	// I want to return a hash of the synthetic events, but for backwards compatibility the main return value
+	// needs to be the click event.   Change for 2.0.
+
+	var click = function(node, listener){
+		// Set flag on node so that keydown/keyup above emits click event.
+		// Also enables fast click processing from dojo/touch.
+		node.dojoClick = true;
+
+		return on(node, "click", listener);
+	};
+	click.click = click;	// forward compatibility with 2.0
+
+	click.press =  function(node, listener){
+		var touchListener = on(node, touch.press, function(evt){
+			if(evt.type == "mousedown" && !mouse.isLeft(evt)){
+				// Ignore right click
+				return;
+			}
+			listener(evt);
+		}), keyListener = on(node, "keydown", function(evt){
+			if(evt.keyCode === keys.ENTER || evt.keyCode === keys.SPACE){
+				listener(evt);
+			}
+		});
+		return {
+			remove: function(){
+				touchListener.remove();
+				keyListener.remove();
+			}
+		};
+	};
+
+	click.release =  function(node, listener){
+		var touchListener = on(node, touch.release, function(evt){
+			if(evt.type == "mouseup" && !mouse.isLeft(evt)){
+				// Ignore right click
+				return;
+			}
+			listener(evt);
+		}), keyListener = on(node, "keyup", function(evt){
+			if(evt.keyCode === keys.ENTER || evt.keyCode === keys.SPACE){
+				listener(evt);
+			}
+		});
+		return {
+			remove: function(){
+				touchListener.remove();
+				keyListener.remove();
+			}
+		};
+	};
+
+	click.move = touch.move;	// just for convenience
+
+	return click;
+});
diff --git a/src/main/resources/static/dijit/bench/benchReceive.php b/src/main/resources/static/dijit/bench/benchReceive.php
new file mode 100644
index 0000000000000000000000000000000000000000..50539c57ba24123af4a6da91c859874e1b340b41
--- /dev/null
+++ b/src/main/resources/static/dijit/bench/benchReceive.php
@@ -0,0 +1,129 @@
+<?php
+/*
+
+	benchReceive.php - example way to handle incoming benchmark data,
+	or how to use JSON php class to mangle data.  No benchmark data
+	is stored currently.
+
+--
+-- Table structure for table `benchmarks`
+--
+
+CREATE TABLE `benchmarks` (
+  `id` int(11) NOT NULL auto_increment,
+  `useragent` varchar(242) NOT NULL default '',
+  `dojover` varchar(96) NOT NULL default '',
+  `testNum` int(11) NOT NULL default '0',
+  `dijit` varchar(64) NOT NULL default '',
+  `testCount` int(11) NOT NULL default '0',
+  `testAverage` float NOT NULL default '0',
+  `testMethod` varchar(10) NOT NULL default '',
+  `testTime` bigint(20) NOT NULL default '0',
+  `dataSet` varchar(64) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  KEY `dijit` (`dijit`,`testAverage`),
+  KEY `dataSet` (`dataSet`)
+) TYPE=MyISAM;
+
+--
+-- [end table struct] --
+
+*/
+
+if(is_array($_POST)){
+
+	$username = '';
+	$password = '';
+	$dataBase = '';
+	$table    = '';
+
+	mysql_connect("localhost",$username,$password);
+	mysql_select_db($dataBase);
+
+	require("../../dojo/tests/resources/JSON.php");
+	$json = new Services_JSON();
+
+	// see "escape()" call in benchTest.html
+	$string = $json->decode(urldecode($_POST['key']));
+	// $string = $json->decode($_POST['key']);
+
+	print "<h1>Thank YOU!</h1>";
+	print "
+		<p>Your results have been added to our database. No
+		personal information outside of what you see here
+		has been stored.
+		</p>
+
+		<p>You can <a href= \"javascript:history.back()\">go back</a>
+		and run more tests, or even better, load up another browser
+		and the submit your tests again!
+		</p>
+
+		<p>again ... thanks for your time.</p>
+
+		";
+
+	print "<h3>Results Submitted:</h3>";
+	print "<pre style=\"font:6pt Terminal,sans-serif; border:1px solid #cecece; background-color:#ededed; padding:20px; \">";
+
+		$ua = $string->clientNavigator;
+		$dojov = $string->dojoVersion;
+
+		print "Client: ".$ua."\n";
+		print "Dojo v".$dojov."\n";
+
+		if(is_array($string->dataSet)){
+			print "\nTest Results:";
+			// should client serialize a key, or is this safer?
+			$dataSet = md5(serialize($string));
+			foreach ($string->dataSet as $test){
+				$data = array(
+					'dataSet' => $dataSet,
+					'useragent' => $ua,
+					'dojover' => $dojov,
+					'testNum' => $test->testNum,
+					'testMethod' => $test->testMethod,
+					'testTime' => $test->testTime,
+					'testAverage' => $test->testAverage,
+					'testCount' => $test->testCount,
+					'dijit' => $test->dijit
+				);
+				print_r($data);
+				add_rec($table,$data);
+			}
+		}
+
+		if(is_array($string->errors)){
+			// not saving errors at this point
+			print "\nErrors:";
+			foreach ($string->errors as $error){
+				print_r($error);
+			}
+		}
+	print "</pre>";
+}
+
+function add_rec($table, $data){
+
+	if(!is_array($data)){ return FALSE; }
+
+	$keys = array_keys($data);
+	$values = array_values($data);
+	$field=0;
+
+	for($field;$field<sizeof($data);$field++){
+		if(!ereg("^[0-9].*$",$keys[$field])){
+			$sqlfields = $sqlfields.$keys[$field]."=\"".$values[$field]."\", ";
+       		}
+	}
+	$sqlfields = (substr($sqlfields,0,(strlen($sqlfields)-2)));
+
+	if($query = mysql_query("insert into $table set $sqlfields")){
+		$id = mysql_insert_id();
+		return ($id);
+	}else{
+		return FALSE;
+	}
+}
+
+?>
diff --git a/src/main/resources/static/dijit/bench/benchTool.html b/src/main/resources/static/dijit/bench/benchTool.html
new file mode 100644
index 0000000000000000000000000000000000000000..2ba8861b49437ccabf3ac1487e55fb4ae92902cc
--- /dev/null
+++ b/src/main/resources/static/dijit/bench/benchTool.html
@@ -0,0 +1,228 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>Dojo interactive benchmark tool</title>
+
+	<!-- make display better on mobile, so that results appear under the controls rather than to the right of them -->
+	<meta name="viewport" content="width=device-width, initial-scale=1.0"/> 
+
+	<style>
+		@import "../../dijit/themes/claro/claro.css";
+		@import "../themes/claro/document.css";
+		@import "../../dijit/tests/css/dijitTests.css";
+
+		#resultsContainer, #testControl, #submitControl {
+			margin: 20px;
+			padding:12px;
+			background-color:#fff;
+			-moz-border-radius:8pt 8pt;
+			-webkit-border-radius:7pt;
+			border:2px solid #ededed;
+		}
+
+		#resultsContainer {
+			padding-top: 0;
+		}
+
+		#results {  overflow:auto; min-height:100px; border:1px solid #ccc; color:darkred; padding:8px;  }
+
+		.runHolder, .submitButton {
+			border:1px solid #ccc; padding:3px;
+			-moz-border-radius:8pt 8pt;
+			-webkit-border-radius:7pt;
+			text-align:center;
+			cursor:pointer; background-color:#ededed; display:block; width:125px;
+		}
+
+	</style>
+
+
+	<script type="text/javascript" src="../../dojo/dojo.js"></script>
+	<script type="text/javascript">
+		// basic stats are located at http://dante.dojotoolkit.org/benchmarks/
+
+		dojo.require("dojo.fx");
+		dojo.require("dijit.dijit");
+		dojo.require("dijit.form.ComboBox");
+		dojo.require("dojo.parser");
+
+		// setup global variables
+		var masterResults = { clientNavigator: navigator.userAgent, dataSet: [], errors: [] };
+		var isRunning = false;
+		var theCount, theClass, runner = null;
+		var testCount = 0;
+
+		dojo.ready(function(){
+			theCount = dojo.byId('countNode');
+			runner = dojo.byId('runner');
+			masterResults.dojoVersion = dojo.version.toString();
+			
+			dojo.parser.parse();	// instantiate the ComboBox
+			theClass = dijit.byId('classNode');
+		});
+
+
+		function _toggleRunMsg(){
+			var newMsg = (isRunning) ? " Run Test " : " Running ...";
+			dojo.fx.chain([
+				dojo.fadeOut({
+					node:runner,
+					duration:200,
+					onEnd: function(){
+						runner.innerHTML = newMsg;
+						isRunning=!isRunning;
+					}
+				}),
+				dojo.fadeIn({ node:runner, duration: 200 })
+			]).play();
+		}
+
+		function runTest(){
+			if(isRunning){ return; }
+			_toggleRunMsg();
+			setTimeout(function(){ _runRealTest(); },1000);
+		}
+
+		function _runRealTest(){
+
+			// Remove widgets from previous run
+			dojo.forEach(dijit.findWidgets(dojo.byId("widgetsContainer")), function(widget){
+				widget.destroyRecursive();
+			});
+
+			var count = theCount.value,
+				aclass = theClass.get("value"),
+				theMethod = dojo.query("input[name=theMethod]").filter(function(node){ return node.checked; }).attr("value")[0],
+				tmpNode = document.createElement('div'),
+				startTimer;
+			try{
+				dojo.require(/dojox\.mobile\.[A-Z]/.test(aclass) ? "dojox.mobile._base" : aclass);
+				dojo.ready(function(){
+					var i;
+					switch(theMethod){
+						case "parse" :
+						case "fastparse" :
+							var tmpString = [];
+							var tag = /Button/.test(aclass) ? "button" : (/Text/.test(aclass) ? "input" : "div");
+							for(i=0; i<count; i++){
+								tmpString.push(
+								'<', tag, ' ',
+								 (theMethod == 'fastparse' ? 'data-dojo-type="' : 'dojoType="'),
+								aclass, '"></', tag, '>');
+							}
+							tmpNode.innerHTML = tmpString.join("");
+							startTimer = new Date().getTime();
+							dojo.parser.parse(tmpNode);
+							break;
+						case "create" :
+							var construction = dojo.getObject(aclass);
+							startTimer = new Date().getTime();
+							for(i=0; i<count; i++){
+								var tmp = new construction({});
+								tmpNode.appendChild(tmp.domNode);
+							}
+							break;
+					}
+
+					// Render the widgets in a visible <div> as part of benchmark
+					dojo.byId("widgetsContainer").appendChild(tmpNode);
+					
+					// [Some] browsers defer rendering until after JS finishes running
+					// so use a setTimeout(, 0) to make sure widgets render.
+					setTimeout(function(){
+						var endTime = new Date().getTime() - startTimer;
+	
+						var average = (endTime / count);
+						var msg = "It took: "+endTime+"ms to "+theMethod+" "+count+" "+aclass+" widgets"+
+							"<br>(average: "+average+" ms/widget)<br><br>";
+	
+						masterResults.dataSet.push({
+							testNum: ++testCount,
+							dijit: aclass,
+							testCount: count,
+							testAverage: average,
+							testMethod: theMethod,
+							testTime: endTime
+						});
+
+						dojo.byId("results").innerHTML += msg;
+						
+						dojo.byId("mailto").href = "mailto:?subject=test results&body=" +
+							encodeURIComponent(dojo.byId("results").innerText || dojo.byId("results").textContent);
+
+						setTimeout(function(){ _toggleRunMsg(); },250);
+					}, 0);
+
+				});
+			}catch(e){
+
+				setTimeout(function(){ _toggleRunMsg(); },250);
+				console.error("Ooops:", e);
+			}
+
+		}
+
+		function doDebug(){
+			dojo.byId('hiddenHolder').value = dojo.toJson(masterResults);
+			return true;
+		}
+
+	</script>
+</head>
+<body class="claro">
+	<h1 class="testTitle">Dojo Benchmark Tool</h1>
+
+	<div id="testControl">
+
+		Class:
+			<select data-dojo-type="dijit/form/ComboBox"
+					data-dojo-props='name:"dijit", id:"classNode", value:"dijit.form.Button", style:{width:"200px"}'>
+				<option>dijit.form.Button</option>
+				<option>dojox.mobile.Button</option>
+				<option>dijit.form.TextBox</option>
+				<option>dojox.mobile.app.TextBox</option>
+			</select>
+		<br><br>
+		Count: <input type="text" name="count" id="countNode" value="100" size="4" ><br><br>
+
+		Method:
+			<br>
+			<label for="parse">
+				<input type="radio" name="theMethod" value="parse" id="parse" checked="on"> Parse with 1.x dojoType syntax
+			</label>
+			<br>
+			<label for="fastparse">
+				<input type="radio" name="theMethod" value="fastparse" id="fastparse"> Parse with 2.0 data-dojo-type syntax
+			</label>
+			<br>
+			<label for="create">
+				<input type="radio" name="theMethod" value="create" id="create"> Create programatically
+			</label>
+
+		<br><br>
+		<span onclick="runTest()" class="runHolder"><span id="runner"> Run Test </span></span>
+
+	</div>
+
+	<div id="resultsContainer"><h3>Results:</h3><div id="results"></div></div>
+
+	<div id="submitControl">
+		<p>
+		* The results of these tests are important to us.  Please feel free to submit your dataSet
+		to Dojotoolkit.org. Your privacy will be respected.
+		</p>
+		<div id="hiddenResults">
+			<form id="resultForm" action="http://dante.dojotoolkit.org/benchmarks/submit.php"
+				method="POST" onsubmit="doDebug()">
+				<input type="hidden" id="hiddenHolder" value="" name="key">
+				<input type="submit" value=" Submit Data " class="submitButton">
+			</form>
+		</div>
+		
+		<p>Alternately, <a id="mailto">mail results</a> to any email address.</p>
+	</div>
+
+	<div id="widgetsContainer" style="clear: both;"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/bench/button.html b/src/main/resources/static/dijit/bench/button.html
new file mode 100644
index 0000000000000000000000000000000000000000..a28f902e68e803129b6c5ab20309168d6822c7b3
--- /dev/null
+++ b/src/main/resources/static/dijit/bench/button.html
@@ -0,0 +1,184 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+	<head>
+		<title>button test</title>
+
+		<style type="text/css">
+			@import "../themes/tundra/tundra.css";
+			th { background: #ccccff; }
+			td { align: left; }
+		</style>
+
+		<script type="text/javascript"> djConfig = { isDebug: true, parseOnLoad: true }; </script>
+		<script type="text/javascript" src="../../dojo/dojo.js"></script>
+		<script>
+			dojo.require("dojo.parser");
+			dojo.require("dijit.form.Button");
+		</script>
+
+		<script type="text/javascript">
+				oldTime = new Date();
+				dojo.ready(function(){
+					var time = new Date().getTime() - oldTime;
+					var p = document.createElement("p");
+					p.appendChild(document.createTextNode("Widgets loaded in " + time + "ms"));
+					document.getElementById("results").appendChild(p);
+				});
+
+		</script>
+	</head>
+
+	<body class="tundra">
+
+		<h1>Test of instantiating many buttons</h1>
+
+		<p>
+		<strong style="color:red">Warning:</strong> these benchmarks will take a number of seconds to run. Other system activity will cause these benchmarks to skew.
+		</p>
+
+		<p>
+		The results should not be compared between browsers for they are run on different systems,
+		however results for the same browser are relative to each other.
+		</p>
+
+		<button data-dojo-type="dijit/form/Button">hello world 0</button>
+		<button data-dojo-type="dijit/form/Button">hello world 1</button>
+		<button data-dojo-type="dijit/form/Button">hello world 2</button>
+		<button data-dojo-type="dijit/form/Button">hello world 3</button>
+		<button data-dojo-type="dijit/form/Button">hello world 4</button>
+		<button data-dojo-type="dijit/form/Button">hello world 5</button>
+		<button data-dojo-type="dijit/form/Button">hello world 6</button>
+		<button data-dojo-type="dijit/form/Button">hello world 7</button>
+		<button data-dojo-type="dijit/form/Button">hello world 8</button>
+		<button data-dojo-type="dijit/form/Button">hello world 9</button>
+
+		<button data-dojo-type="dijit/form/Button">hello world 10</button>
+		<button data-dojo-type="dijit/form/Button">hello world 11</button>
+		<button data-dojo-type="dijit/form/Button">hello world 12</button>
+		<button data-dojo-type="dijit/form/Button">hello world 13</button>
+		<button data-dojo-type="dijit/form/Button">hello world 14</button>
+		<button data-dojo-type="dijit/form/Button">hello world 15</button>
+		<button data-dojo-type="dijit/form/Button">hello world 16</button>
+		<button data-dojo-type="dijit/form/Button">hello world 17</button>
+		<button data-dojo-type="dijit/form/Button">hello world 18</button>
+		<button data-dojo-type="dijit/form/Button">hello world 19</button>
+
+		<button data-dojo-type="dijit/form/Button">hello world 20</button>
+		<button data-dojo-type="dijit/form/Button">hello world 21</button>
+		<button data-dojo-type="dijit/form/Button">hello world 22</button>
+		<button data-dojo-type="dijit/form/Button">hello world 23</button>
+		<button data-dojo-type="dijit/form/Button">hello world 24</button>
+		<button data-dojo-type="dijit/form/Button">hello world 25</button>
+		<button data-dojo-type="dijit/form/Button">hello world 26</button>
+		<button data-dojo-type="dijit/form/Button">hello world 27</button>
+		<button data-dojo-type="dijit/form/Button">hello world 28</button>
+		<button data-dojo-type="dijit/form/Button">hello world 29</button>
+
+		<button data-dojo-type="dijit/form/Button">hello world 30</button>
+		<button data-dojo-type="dijit/form/Button">hello world 31</button>
+		<button data-dojo-type="dijit/form/Button">hello world 32</button>
+		<button data-dojo-type="dijit/form/Button">hello world 33</button>
+		<button data-dojo-type="dijit/form/Button">hello world 34</button>
+		<button data-dojo-type="dijit/form/Button">hello world 35</button>
+		<button data-dojo-type="dijit/form/Button">hello world 36</button>
+		<button data-dojo-type="dijit/form/Button">hello world 37</button>
+		<button data-dojo-type="dijit/form/Button">hello world 38</button>
+		<button data-dojo-type="dijit/form/Button">hello world 39</button>
+
+		<button data-dojo-type="dijit/form/Button">hello world 40</button>
+		<button data-dojo-type="dijit/form/Button">hello world 41</button>
+		<button data-dojo-type="dijit/form/Button">hello world 42</button>
+		<button data-dojo-type="dijit/form/Button">hello world 43</button>
+		<button data-dojo-type="dijit/form/Button">hello world 44</button>
+		<button data-dojo-type="dijit/form/Button">hello world 45</button>
+		<button data-dojo-type="dijit/form/Button">hello world 46</button>
+		<button data-dojo-type="dijit/form/Button">hello world 47</button>
+		<button data-dojo-type="dijit/form/Button">hello world 48</button>
+		<button data-dojo-type="dijit/form/Button">hello world 49</button>
+
+		<button data-dojo-type="dijit/form/Button">hello world 50</button>
+		<button data-dojo-type="dijit/form/Button">hello world 51</button>
+		<button data-dojo-type="dijit/form/Button">hello world 52</button>
+		<button data-dojo-type="dijit/form/Button">hello world 53</button>
+		<button data-dojo-type="dijit/form/Button">hello world 54</button>
+		<button data-dojo-type="dijit/form/Button">hello world 55</button>
+		<button data-dojo-type="dijit/form/Button">hello world 56</button>
+		<button data-dojo-type="dijit/form/Button">hello world 57</button>
+		<button data-dojo-type="dijit/form/Button">hello world 58</button>
+		<button data-dojo-type="dijit/form/Button">hello world 59</button>
+
+		<button data-dojo-type="dijit/form/Button">hello world 60</button>
+		<button data-dojo-type="dijit/form/Button">hello world 61</button>
+		<button data-dojo-type="dijit/form/Button">hello world 62</button>
+		<button data-dojo-type="dijit/form/Button">hello world 63</button>
+		<button data-dojo-type="dijit/form/Button">hello world 64</button>
+		<button data-dojo-type="dijit/form/Button">hello world 65</button>
+		<button data-dojo-type="dijit/form/Button">hello world 66</button>
+		<button data-dojo-type="dijit/form/Button">hello world 67</button>
+		<button data-dojo-type="dijit/form/Button">hello world 68</button>
+		<button data-dojo-type="dijit/form/Button">hello world 69</button>
+
+		<button data-dojo-type="dijit/form/Button">hello world 70</button>
+		<button data-dojo-type="dijit/form/Button">hello world 71</button>
+		<button data-dojo-type="dijit/form/Button">hello world 72</button>
+		<button data-dojo-type="dijit/form/Button">hello world 73</button>
+		<button data-dojo-type="dijit/form/Button">hello world 74</button>
+		<button data-dojo-type="dijit/form/Button">hello world 75</button>
+		<button data-dojo-type="dijit/form/Button">hello world 76</button>
+		<button data-dojo-type="dijit/form/Button">hello world 77</button>
+		<button data-dojo-type="dijit/form/Button">hello world 78</button>
+		<button data-dojo-type="dijit/form/Button">hello world 79</button>
+
+		<button data-dojo-type="dijit/form/Button">hello world 80</button>
+		<button data-dojo-type="dijit/form/Button">hello world 81</button>
+		<button data-dojo-type="dijit/form/Button">hello world 82</button>
+		<button data-dojo-type="dijit/form/Button">hello world 83</button>
+		<button data-dojo-type="dijit/form/Button">hello world 84</button>
+		<button data-dojo-type="dijit/form/Button">hello world 85</button>
+		<button data-dojo-type="dijit/form/Button">hello world 86</button>
+		<button data-dojo-type="dijit/form/Button">hello world 87</button>
+		<button data-dojo-type="dijit/form/Button">hello world 88</button>
+		<button data-dojo-type="dijit/form/Button">hello world 89</button>
+
+		<button data-dojo-type="dijit/form/Button">hello world 90</button>
+		<button data-dojo-type="dijit/form/Button">hello world 91</button>
+		<button data-dojo-type="dijit/form/Button">hello world 92</button>
+		<button data-dojo-type="dijit/form/Button">hello world 93</button>
+		<button data-dojo-type="dijit/form/Button">hello world 94</button>
+		<button data-dojo-type="dijit/form/Button">hello world 95</button>
+		<button data-dojo-type="dijit/form/Button">hello world 96</button>
+		<button data-dojo-type="dijit/form/Button">hello world 97</button>
+		<button data-dojo-type="dijit/form/Button">hello world 98</button>
+		<button data-dojo-type="dijit/form/Button">hello world 99</button>
+
+
+		<h2>Result</h2>
+		(divide by 100 to get time per widget)
+		<div id="results"></div>
+
+		<h2>Typical results</h2>
+
+		<table border=1>
+		<thead>
+			<tr>
+				<th>IE6
+				<th>IE7
+				<th>Safari
+				<th>Gecko (on PC)
+				<th>Gecko (on intel mac)
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>25812 (258ms/widget)
+				<td>10391 (103ms/widget)
+				<td>1934 (19ms/widget)
+				<td>1344 (13ms/widget)
+				<td>2937 (29ms/widget)
+			</tr>
+		</tbody>
+		</table>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/bench/create_widgets.html b/src/main/resources/static/dijit/bench/create_widgets.html
new file mode 100644
index 0000000000000000000000000000000000000000..205ca74960c07377d15d8289decbd285028e8fec
--- /dev/null
+++ b/src/main/resources/static/dijit/bench/create_widgets.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>PROGRAMMATIC - Dojo Widget Creation Test</title>
+		<script type="text/javascript" src="../../dojo/dojo.js"></script>
+		<script type="text/javascript">
+			var queryCount = location.search.match(/count=(\d*)/);
+			var count = (queryCount ? parseInt(queryCount[1]) : 100);
+			var queryClass = location.search.match(/class=([a-zA-Z\.]*)/);
+			var className = (queryClass ? queryClass[1] : "form.Button");
+
+			dojo.require("dijit." + className);
+			dojo.require("dojo.parser");
+			logMessage = window.alert;
+
+			var constructor = dojo.getObject("dijit."+className);
+			function makeEm(){
+				var container = dojo.byId("buttonContainer");
+				var t0 = new Date().getTime();
+				for(var i = 1; i <= count; i++){
+					var it =
+						new constructor(
+								{label:"Button "+i, onclick:'logMessage("clicked simple")'}
+							);
+					container.appendChild(it.domNode);
+					it.domNode.style.display = '';
+				}
+				var t1 = new Date().getTime();
+				dojo.byId("results").innerHTML = "It took " + (t1 - t0) + " msec to create " + count + " "+className+" instances programmatically.";
+			}
+			dojo.ready(makeEm);
+		</script>
+
+		<style type="text/css">
+			@import "../themes/tundra/tundra.css";
+
+			#buttonContainer {
+				border: 1px solid black;
+				width: 100%;
+			}
+
+			#results {
+				color: darkred;
+			}
+		</style>
+	</head>
+	<body class=tundra>
+		<script language='javascript'>
+			document.write("<h2>Currently Creating "+count+" "+className+" instances</h2>");
+		</script>
+		Pass <code>?count=<i><b>100</b></i></code> in the query string to change the number of widgets.<br>
+		Pass <code>?class=<i><b>form.Button</b></i></code> in the query string to change the widget class.
+		<h3 id="results"></h3>
+
+		<div id="buttonContainer" class='box'></div>
+		<br>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/bench/test_button-results.html b/src/main/resources/static/dijit/bench/test_button-results.html
new file mode 100644
index 0000000000000000000000000000000000000000..c9fa5201ba890ce4225eedcf6114f28da06a7de1
--- /dev/null
+++ b/src/main/resources/static/dijit/bench/test_button-results.html
@@ -0,0 +1,66 @@
+<html>
+<style>
+	th	{	vertical-align:bottom;	}
+	td {
+		padding:10px;
+		text-align:right;
+	}
+	.computer	{	vertical-align:top;	}
+</style>
+<body>
+<h3>Widget instantiation timing test results</h3>
+
+<table>
+
+<tr><th rowspan=2>Computer/OS</th><th rowspan=2>Browser</th><th colspan=3>Parsing</th><th colspan=3>Programmatic</th></tr>
+<tr>														<th>100</th><th>500</th><th>1000</th><th>100</th><th>500</th><th>1000</th></tr>
+<tr><td class='computer' rowspan=3>MacBook Pro 2.16<br> OS 10.4 2GB RAM</td>
+	<td>FF (2.0.0.3)</td>
+	<td>303</td><td>1724</td><td>3505</td>
+	<td>195</td><td>1006</td><td>2266</td>
+</tr>
+<tr><td>Safari (2.04)</td>
+	<td>192</td><td>1460</td><td>4463</td>
+	<td>142</td><td>895</td><td>2403</td>
+</tr>
+<tr><td>WebKit Nightly (21223)</td>
+	<td>110</td><td>540</td><td>1096</td>
+	<td>85</td><td>458</td><td>940</td>
+</tr>
+
+
+<tr><td class='computer' rowspan=2>Dell Precision 2.13 PPro<br> XP SP 2 - 2GB RAM</td>
+	<td>FF (2.0.0.3)</td>
+	<td>282</td><td>1266</td><td>2484</td>
+	<td>250</td><td>890</td><td>1766</td>
+</tr>
+
+<tr>
+	<td>IE7 (7.0.5730.11)</td>
+	<td>303</td><td>2079</td><td>5172</td>
+	<td>203</td><td>1140</td><td>2422</td>
+</tr>
+
+<tr><td><!--browser--></td>
+	<td><!--100 parse--></td><td><!--500 parse--></td><td><!--1000 parse--></td>
+	<td><!--100 code--></td><td><!--500 code--></td><td><!--1000 code--></td>
+</tr>
+</table>
+
+
+<H3>If you want to play:</H3>
+<p></p>
+<ol>
+	<li> Run the following tests:
+		<ul>
+			<li><a href='http://dojotoolkit.org/~owen/bench/dojo/dijit/bench/test_Button-parse.php?count=100'>http://dojotoolkit.org/~owen/bench/dojo/dijit/bench/test_Button-parse.php?count=100</a></li>
+			<li><a href='http://dojotoolkit.org/~owen/bench/dojo/dijit/bench/test_Button-programmatic.html?count=100'>http://dojotoolkit.org/~owen/bench/dojo/dijit/bench/test_Button-programmatic.html?count=100</a></li>
+		</ul>
+		<br>
+		Change the "count=" to 100, 500, 1000 for each.
+		<br><br>
+		Restart the browser between each test/count.  Run each test 3 times and record the smallest number.
+	</li>
+	<li>Record your tests in the copy of this file in SVN:  <code>dijit/bench/test_Button-results.html</code>  and check it in.  Reference ticket #2968.</li>
+</ol>
+</body>
diff --git a/src/main/resources/static/dijit/bench/widget_construction_test.php b/src/main/resources/static/dijit/bench/widget_construction_test.php
new file mode 100644
index 0000000000000000000000000000000000000000..74a5ca4a31d969e28eda071f5531ea8fab489d69
--- /dev/null
+++ b/src/main/resources/static/dijit/bench/widget_construction_test.php
@@ -0,0 +1,185 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<html>
+	<head>
+		<title>test of various synchronous page searching methods</title>
+		<style type="text/css">
+			@import "../themes/claro/document.css";
+			@import "../themes/tundra/tundra.css";
+		</style>
+		<script type="text/javascript" src="../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+		<script type="text/javascript">
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+			dojo.require("dijit._WidgetBase");
+			dojo.require("dijit._TemplatedMixin");
+
+			/* dummy widget for benchmarking purposes */
+			dojo.declare(
+				"SimpleButton",
+				[ dijit._WidgetBase, dijit._TemplatedMixin ],
+				{
+					label: "",
+
+					templateString: "<button data-dojo-attach-event='onclick:onClick'>${label}</button>",
+
+					onClick: function(){
+						this.domNode.style.backgroundColor="green";
+					},
+					postCreate: function(){
+					}
+				}
+			);
+		</script>
+	</head>
+	<body>
+		<h1 style="font-size: 40px; line-height: 50px;">This page contains a huge number of nodes, most of which are "chaff".</h1>
+		<h3>Here's the relative timings for this page</h3>
+		<div id="profileOutputTable"></div>
+		<!--
+		<h3>And some comparison data</h3>
+		<table border=1>
+		<thead>
+			<tr>
+				<th>IE
+				<th>Safari
+				<th>Gecko (on PC)
+				<th>Gecko (on intel mac)
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>4890
+				<td>3242
+				<td>3094
+				<td>3782
+			</tr>
+		</tbody>
+		</table>
+		-->
+
+
+<?
+	$containerDepth = 30;
+	$leadingChaff = 100;
+	$trailingChaff = 100;
+	$items = 100;
+?>
+<?
+	function generateChaff($iters){
+		for($i=0;$i<$iters;$i++){ ?>
+			<pre class="highlighted"><code><span class="hl-reserved">var </span><span class="hl-identifier">dlg</span><span class="hl-default"> = </span><span class="hl-reserved">new </span><span class="hl-identifier">blah</span><span class="hl-default">.</span><span class="hl-identifier">ext</span><span class="hl-default">.</span><span class="hl-identifier">LayoutDialog</span><span class="hl-brackets">(</span><span class="hl-identifier">config</span><span class="hl-code">.</span><span class="hl-identifier">id</span><span class="hl-code"> || </span><span class="hl-identifier">blah</span><span class="hl-code">.</span><span class="hl-identifier">util</span><span class="hl-code">.</span><span class="hl-identifier">Dom</span><span class="hl-code">.</span><span class="hl-identifier">generateId</span><span class="hl-brackets">()</span><span class="hl-code">, </span><span class="hl-brackets">{
+				</span><span title="autoCreate" class="hl-identifier">autoCreate</span><span class="hl-code"> : </span><span class="hl-reserved">true</span><span class="hl-code">,
+				</span><span title="minWidth" class="hl-identifier">minWidth</span><span class="hl-code">:</span><span class="hl-number">400</span><span class="hl-code">,
+				</span><span title="minHeight" class="hl-identifier">minHeight</span><span class="hl-code">:</span><span class="hl-number">300</span><span class="hl-code">,
+				</span>
+				<span title="syncHeightBeforeShow" class="hl-identifier">syncHeightBeforeShow</span><span class="hl-code">: </span><span class="hl-reserved">true</span><span class="hl-code">,
+				</span><span title="shadow" class="hl-identifier">shadow</span><span class="hl-code">:</span><span class="hl-reserved">true</span><span class="hl-code">,
+				</span><span title="fixedcenter" class="hl-identifier">fixedcenter</span><span class="hl-code">: </span><span class="hl-reserved">true</span><span class="hl-code">,
+				</span><span title="center" class="hl-identifier">center</span><span class="hl-code">:</span><span class="hl-brackets">{</span><span class="hl-identifier">autoScroll</span><span class="hl-code">:</span><span class="hl-reserved">false</span><span class="hl-brackets">}</span><span class="hl-code">,
+				</span><span title="east"  class="hl-identifier">east</span><span class="hl-code">:</span><span class="hl-brackets">{</span><span class="hl-identifier">split</span><span class="hl-code">:</span><span class="hl-reserved">true</span><span class="hl-code">,</span><span class="hl-identifier">initialSize</span><span class="hl-code">:</span><span class="hl-number">150</span><span class="hl-code">,</span><span class="hl-identifier">minSize</span><span class="hl-code">:</span><span class="hl-number">150</span><span class="hl-code">,</span><span class="hl-identifier">maxSize</span><span class="hl-code">:</span><span class="hl-number">250</span><span class="hl-brackets">}
+			})</span><span class="hl-default">;
+			</span><span class="hl-identifier">dlg</span><span class="hl-default">.</span><span class="hl-identifier">setTitle</span><span class="hl-brackets">(</span><span class="hl-quotes">'</span><span class="hl-string">Choose an Image</span><span class="hl-quotes">'</span><span class="hl-brackets">)</span><span class="hl-default">;
+			</span><span class="hl-identifier">dlg</span><span class="hl-default">.</span><span class="hl-identifier">getEl</span><span class="hl-brackets">()</span><span class="hl-default">.</span><span class="hl-identifier">addClass</span><span class="hl-brackets">(</span><span class="hl-quotes">'</span><span class="hl-string">ychooser-dlg</span><span class="hl-quotes">'</span><span class="hl-brackets">)</span><span class="hl-default">;</span></code></pre><br />
+			<pre class="highlighted"><code><span class="hl-reserved">var </span><span class="hl-identifier">animated</span><span class="hl-default"> = </span><span class="hl-reserved">new </span><span class="hl-identifier">blah</span><span class="hl-default">.</span><span class="hl-identifier">ext</span><span class="hl-default">.</span><span class="hl-identifier">Resizable</span><span class="hl-brackets">(</span><span class="hl-quotes">'</span><span class="hl-string">animated</span><span class="hl-quotes">'</span><span class="hl-code">, </span><span class="hl-brackets">{
+			    </span><span title="east" class="hl-identifier">width</span><span class="hl-code">: </span><span class="hl-number">200</span><span class="hl-code">,
+			    </span><span title="east" class="hl-identifier">height</span><span class="hl-code">: </span><span class="hl-number">100</span><span class="hl-code">,
+			    </span><span title="east" class="hl-identifier">minWidth</span><span class="hl-code">:</span><span class="hl-number">100</span><span class="hl-code">,
+			    </span><span class="hl-identifier">minHeight</span><span class="hl-code">:</span><span class="hl-number">50</span><span class="hl-code">,
+			    </span><span class="hl-identifier">animate</span><span class="hl-code">:</span><span class="hl-reserved">true</span><span class="hl-code">,
+			    </span><span class="hl-identifier">easing</span><span class="hl-code">: </span><span class="hl-identifier">YAHOO</span><span class="hl-code">.</span><span class="hl-identifier">util</span><span class="hl-code">.</span><span class="hl-identifier">Easing</span><span class="hl-code">.</span><span class="hl-identifier">backIn</span><span class="hl-code">,
+			    </span><span class="hl-identifier">duration</span><span class="hl-code">:</span><span class="hl-number">.6
+			</span><span class="hl-brackets">})</span><span class="hl-default">;</span></code></pre>
+			<h4>The standard Lorem Ipsum passage, used since the 1500s</h4>
+			<p>
+			"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
+			eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
+			ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+			aliquip ex ea commodo consequat. Duis aute irure dolor in
+			reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+			pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+			culpa qui officia deserunt mollit anim id est laborum."
+			</p>
+
+			<h4>Section 1.10.32 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC</h4>
+
+			<p>
+			"Sed ut perspiciatis unde omnis iste natus error sit voluptatem
+			accusantium doloremque laudantium, totam rem aperiam, eaque ipsa
+			quae ab illo inventore veritatis et quasi architecto beatae vitae
+			dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit
+			aspernatur aut odit aut fugit, sed quia consequuntur magni dolores
+			eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam
+			est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci
+			velit, sed quia non numquam eius modi tempora incidunt ut labore et
+			dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam,
+			quis nostrum exercitationem ullam corporis suscipit laboriosam,
+			nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure
+			reprehenderit qui in ea voluptate velit esse quam nihil molestiae
+			consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla
+			pariatur?"
+			</p>
+
+			<h4>1914 translation by H. Rackham</h4>
+
+			<p>
+			"But I must explain to you how all this mistaken idea of denouncing
+			pleasure and praising pain was born and I will give you a complete
+			account of the system, and expound the actual teachings of the
+			great explorer of the truth, the master-builder of human happiness.
+			No one rejects, dislikes, or avoids pleasure itself, because it is
+			pleasure, but because those who do not know how to pursue pleasure
+			rationally encounter consequences that are extremely painful. Nor
+			again is there anyone who loves or pursues or desires to obtain
+			pain of itself, because it is pain, but because occasionally
+			circumstances occur in which toil and pain can procure him some
+			great pleasure. To take a trivial example, which of us ever
+			undertakes laborious physical exercise, except to obtain some
+			advantage from it? But who has any right to find fault with a man
+			who chooses to enjoy a pleasure that has no annoying consequences,
+			or one who avoids a pain that produces no resultant pleasure?"
+			</p>
+		<? }
+	} // end generateChaff
+	$widgetName = "SimpleButton";
+?>
+<? generateChaff($leadingChaff); ?>
+<hr>
+<? for($i=0;$i<$containerDepth;$i++){ ?>
+	<table border="1" cellpadding="0" cellspacing="0" width="100%">
+	<!--
+	<table>
+	-->
+		<tr>
+			<td>
+			<br>
+			chaff!
+			<br>
+<? } ?>
+<? for($i=0;$i<$items;$i++){ ?>
+			<div data-dojo-type="<?= $widgetName ?>" label="item2 <?= $i ?>">item2 <?= $i ?></div>
+<? } ?>
+<? for($i=0;$i<$containerDepth;$i++){ ?>
+			</td>
+		</tr>
+	</table>
+<? } ?>
+<? generateChaff($trailingChaff);  ?>
+<? for($i=0;$i<$items;$i++){ ?>
+	<div data-dojo-type="<?= $widgetName ?>" label="item2 <?= $i ?>"><span>item <?= $i ?></span></div>
+<? } ?>
+
+<script type="text/javascript">
+
+		oldTime = new Date();
+		dojo.ready(function(){
+			var time = new Date().getTime() - oldTime;
+			var p = document.createElement("p");
+			alert("Widgets loaded in " + time + "ms");
+		});
+
+</script>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/bower.json b/src/main/resources/static/dijit/bower.json
new file mode 100644
index 0000000000000000000000000000000000000000..f1f1b33ee81740b10babf3c2603b0bf610740e97
--- /dev/null
+++ b/src/main/resources/static/dijit/bower.json
@@ -0,0 +1,22 @@
+{
+	"name": "dijit",
+	"main": "main.js",
+	"moduleType": [ "amd" ],
+	"licenses": [ "BSD-3-Clause", "AFL-2.1" ],
+	"ignore": [
+		".*",
+		"tests"
+	],
+	"keywords": [ "JavaScript", "Dojo", "Toolkit", "Dijit" ],
+	"authors": [],
+	"homepage": "http://dojotoolkit.org/",
+	"repository":{
+		"type": "git",
+		"url": "https://github.com/dojo/dijit.git"
+	},
+	"dependencies": {
+		"dojo": "1.12.0-pre"
+	},
+	"devDependencies": {
+	}
+}
diff --git a/src/main/resources/static/dijit/dijit-all.js b/src/main/resources/static/dijit/dijit-all.js
new file mode 100644
index 0000000000000000000000000000000000000000..d576c2c155ebc1650d91442ed8f7984a6f2027e3
--- /dev/null
+++ b/src/main/resources/static/dijit/dijit-all.js
@@ -0,0 +1,75 @@
+define([
+	"./main",
+	"./dijit",
+	"./ColorPalette",
+	"./Declaration",
+	"./Dialog",
+	"./DialogUnderlay",
+	"./TooltipDialog",
+	"./Editor",
+	"./_editor/plugins/FontChoice",
+	"./_editor/plugins/LinkDialog",
+	"./Menu",
+	"./MenuItem",
+	"./PopupMenuItem",
+	"./CheckedMenuItem",
+	"./MenuBar",
+	"./MenuBarItem",
+	"./PopupMenuBarItem",
+	"./MenuSeparator",
+	"./ProgressBar",
+	"./TitlePane",
+	"./Toolbar",
+	"./Tooltip",
+	"./Tree",
+	"./InlineEditBox",
+	"./form/Form",
+	"./form/Button",
+	"./form/DropDownButton",
+	"./form/ComboButton",
+	"./form/ToggleButton",
+	"./form/CheckBox",
+	"./form/RadioButton",
+	"./form/TextBox",
+	"./form/ValidationTextBox",
+	"./form/CurrencyTextBox",
+	"./form/DateTextBox",
+	"./form/TimeTextBox",
+	"./form/NumberSpinner",
+	"./form/NumberTextBox",
+	"./form/ComboBox",
+	"./form/FilteringSelect",
+	"./form/MultiSelect",
+	"./form/Select",
+	"./form/HorizontalSlider",
+	"./form/VerticalSlider",
+	"./form/HorizontalRule",
+	"./form/VerticalRule",
+	"./form/HorizontalRuleLabels",
+	"./form/VerticalRuleLabels",
+	"./form/SimpleTextarea",
+	"./form/Textarea",
+	"./layout/AccordionContainer",
+	"./layout/ContentPane",
+	"./layout/BorderContainer",
+	"./layout/LayoutContainer",
+	"./layout/LinkPane",
+	"./layout/SplitContainer",
+	"./layout/StackContainer",
+	"./layout/TabContainer"
+], function(dijit){
+
+	// module:
+	//		dijit/dijit-all
+
+	/*=====
+	return {
+		// summary:
+		//		A rollup that includes every dijit. You probably don't need this.
+	};
+	=====*/
+
+	console.warn("dijit-all may include much more code than your application actually requires. We strongly recommend that you investigate a custom build or the web build tool");
+
+	return dijit;
+});
diff --git a/src/main/resources/static/dijit/dijit.js b/src/main/resources/static/dijit/dijit.js
new file mode 100644
index 0000000000000000000000000000000000000000..2df446baefbe677a1a3946c5f247780122bfd53a
--- /dev/null
+++ b/src/main/resources/static/dijit/dijit.js
@@ -0,0 +1,26 @@
+define([
+	"./main",
+	"./_base",
+	"dojo/parser",
+	"./_Widget",
+	"./_TemplatedMixin",
+	"./_Container",
+	"./layout/_LayoutWidget",
+	"./form/_FormWidget",
+	"./form/_FormValueWidget"
+], function(dijit){
+
+	// module:
+	//		dijit/dijit
+
+	/*=====
+	return {
+		// summary:
+		//		A roll-up for common dijit methods
+		//		All the stuff in _base (these are the function that are guaranteed available without an explicit dojo.require)
+		//		And some other stuff that we tend to pull in all the time anyway
+	};
+	=====*/
+
+	return dijit;
+});
diff --git a/src/main/resources/static/dijit/dijit.profile.js b/src/main/resources/static/dijit/dijit.profile.js
new file mode 100644
index 0000000000000000000000000000000000000000..bdebb299c74f3b4a7024330eebb107ba5bce264e
--- /dev/null
+++ b/src/main/resources/static/dijit/dijit.profile.js
@@ -0,0 +1,38 @@
+var profile = (function(){
+	var testResourceRe = /^dijit\/tests\//,
+	nodeModulesRe = /\/node_modules\//,
+
+		copyOnly = function(filename, mid){
+			var list = {
+				"dijit/dijit.profile":1,
+				"dijit/package.json":1,
+				"dijit/themes/claro/compile":1
+			};
+			return (mid in list) ||
+				(/^dijit\/resources\//.test(mid) && !/\.css$/.test(filename)) ||
+				/(png|jpg|jpeg|gif|tiff)$/.test(filename) ||
+				nodeModulesRe.test(mid);
+		};
+
+	return {
+		resourceTags:{
+			test: function(filename, mid){
+				return testResourceRe.test(mid) || mid=="dijit/robot" || mid=="dijit/robotx";
+			},
+
+			copyOnly: function(filename, mid){
+				return copyOnly(filename, mid);
+			},
+
+			amd: function(filename, mid){
+				return !testResourceRe.test(mid) && !copyOnly(filename, mid) && /\.js$/.test(filename);
+			},
+
+			miniExclude: function(filename, mid){
+				return /^dijit\/bench\//.test(mid) ||
+					/^dijit\/themes\/themeTest/.test(mid) ||
+					nodeModulesRe.test(mid);
+			}
+		}
+	};
+})();
diff --git a/src/main/resources/static/dijit/focus.js b/src/main/resources/static/dijit/focus.js
new file mode 100644
index 0000000000000000000000000000000000000000..9caf20c10262b038238ff7469d5f3593d5ad2220
--- /dev/null
+++ b/src/main/resources/static/dijit/focus.js
@@ -0,0 +1,371 @@
+define([
+	"dojo/aspect",
+	"dojo/_base/declare", // declare
+	"dojo/dom", // domAttr.get dom.isDescendant
+	"dojo/dom-attr", // domAttr.get dom.isDescendant
+	"dojo/dom-class",
+	"dojo/dom-construct", // connect to domConstruct.empty, domConstruct.destroy
+	"dojo/Evented",
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dojo/domReady",
+	"dojo/sniff", // has("ie")
+	"dojo/Stateful",
+	"dojo/_base/window", // win.body
+	"dojo/window", // winUtils.get
+	"./a11y",	// a11y.isTabNavigable
+	"./registry",	// registry.byId
+	"./main"		// to set dijit.focus
+], function(aspect, declare, dom, domAttr, domClass, domConstruct, Evented, lang, on, domReady, has, Stateful, win, winUtils,
+			a11y, registry, dijit){
+
+	// module:
+	//		dijit/focus
+
+	// Time of the last focusin event
+	var lastFocusin;
+
+	// Time of the last touch/mousedown or focusin event
+	var lastTouchOrFocusin;
+
+	var FocusManager = declare([Stateful, Evented], {
+		// summary:
+		//		Tracks the currently focused node, and which widgets are currently "active".
+		//		Access via require(["dijit/focus"], function(focus){ ... }).
+		//
+		//		A widget is considered active if it or a descendant widget has focus,
+		//		or if a non-focusable node of this widget or a descendant was recently clicked.
+		//
+		//		Call focus.watch("curNode", callback) to track the current focused DOMNode,
+		//		or focus.watch("activeStack", callback) to track the currently focused stack of widgets.
+		//
+		//		Call focus.on("widget-blur", func) or focus.on("widget-focus", ...) to monitor when
+		//		when widgets become active/inactive
+		//
+		//		Finally, focus(node) will focus a node, suppressing errors if the node doesn't exist.
+
+		// curNode: DomNode
+		//		Currently focused item on screen
+		curNode: null,
+
+		// activeStack: dijit/_WidgetBase[]
+		//		List of currently active widgets (focused widget and it's ancestors)
+		activeStack: [],
+
+		constructor: function(){
+			// Don't leave curNode/prevNode pointing to bogus elements
+			var check = lang.hitch(this, function(node){
+				if(dom.isDescendant(this.curNode, node)){
+					this.set("curNode", null);
+				}
+				if(dom.isDescendant(this.prevNode, node)){
+					this.set("prevNode", null);
+				}
+			});
+			aspect.before(domConstruct, "empty", check);
+			aspect.before(domConstruct, "destroy", check);
+		},
+
+		registerIframe: function(/*DomNode*/ iframe){
+			// summary:
+			//		Registers listeners on the specified iframe so that any click
+			//		or focus event on that iframe (or anything in it) is reported
+			//		as a focus/click event on the `<iframe>` itself.
+			// description:
+			//		Currently only used by editor.
+			// returns:
+			//		Handle with remove() method to deregister.
+			return this.registerWin(iframe.contentWindow, iframe);
+		},
+
+		registerWin: function(/*Window?*/targetWindow, /*DomNode?*/ effectiveNode){
+			// summary:
+			//		Registers listeners on the specified window (either the main
+			//		window or an iframe's window) to detect when the user has clicked somewhere
+			//		or focused somewhere.
+			// description:
+			//		Users should call registerIframe() instead of this method.
+			// targetWindow:
+			//		If specified this is the window associated with the iframe,
+			//		i.e. iframe.contentWindow.
+			// effectiveNode:
+			//		If specified, report any focus events inside targetWindow as
+			//		an event on effectiveNode, rather than on evt.target.
+			// returns:
+			//		Handle with remove() method to deregister.
+
+			// TODO: make this function private in 2.0; Editor/users should call registerIframe(),
+
+			// Listen for blur and focus events on targetWindow's document.
+			var _this = this,
+				body = targetWindow.document && targetWindow.document.body;
+
+			if(body){
+				// Listen for touches or mousedowns... could also use dojo/touch.press here.
+				var event = has("pointer-events") ? "pointerdown" : has("MSPointer") ? "MSPointerDown" :
+					has("touch-events") ? "mousedown, touchstart" : "mousedown";
+				var mdh = on(targetWindow.document, event, function(evt){
+					// workaround weird IE bug where the click is on an orphaned node
+					// (first time clicking a Select/DropDownButton inside a TooltipDialog).
+					// actually, strangely this is happening on latest chrome too.
+					if(evt && evt.target && evt.target.parentNode == null){
+						return;
+					}
+
+					_this._onTouchNode(effectiveNode || evt.target, "mouse");
+				});
+
+				var fih = on(body, 'focusin', function(evt){
+					// When you refocus the browser window, IE gives an event with an empty srcElement
+					if(!evt.target.tagName) { return; }
+
+					// IE reports that nodes like <body> have gotten focus, even though they have tabIndex=-1,
+					// ignore those events
+					var tag = evt.target.tagName.toLowerCase();
+					if(tag == "#document" || tag == "body"){ return; }
+
+					if(a11y.isFocusable(evt.target)){
+						_this._onFocusNode(effectiveNode || evt.target);
+					}else{
+						// Previous code called _onTouchNode() for any activate event on a non-focusable node.   Can
+						// probably just ignore such an event as it will be handled by onmousedown handler above, but
+						// leaving the code for now.
+						_this._onTouchNode(effectiveNode || evt.target);
+					}
+				});
+
+				var foh = on(body, 'focusout', function(evt){
+					_this._onBlurNode(effectiveNode || evt.target);
+				});
+
+				return {
+					remove: function(){
+						mdh.remove();
+						fih.remove();
+						foh.remove();
+						mdh = fih = foh = null;
+						body = null;	// prevent memory leak (apparent circular reference via closure)
+					}
+				};
+			}
+		},
+
+		_onBlurNode: function(/*DomNode*/ node){
+			// summary:
+			//		Called when focus leaves a node.
+			//		Usually ignored, _unless_ it *isn't* followed by touching another node,
+			//		which indicates that we tabbed off the last field on the page,
+			//		in which case every widget is marked inactive
+
+			var now = (new Date()).getTime();
+
+			// IE9+ and chrome have a problem where focusout events come after the corresponding focusin event.
+			// For chrome problem see https://bugs.dojotoolkit.org/ticket/17668.
+			// IE problem happens when moving focus from the Editor's <iframe> to a normal DOMNode.
+			if(now < lastFocusin + 100){
+				return;
+			}
+
+			// If the blur event isn't followed by a focus event, it means the user clicked on something unfocusable,
+			// so clear focus.
+			if(this._clearFocusTimer){
+				clearTimeout(this._clearFocusTimer);
+			}
+			this._clearFocusTimer = setTimeout(lang.hitch(this, function(){
+				this.set("prevNode", this.curNode);
+				this.set("curNode", null);
+			}), 0);
+
+			// Unset timer to zero-out widget stack; we'll reset it below if appropriate.
+			if(this._clearActiveWidgetsTimer){
+				clearTimeout(this._clearActiveWidgetsTimer);
+			}
+
+			if(now < lastTouchOrFocusin + 100){
+				// This blur event is coming late (after the call to _onTouchNode() rather than before.
+				// So let _onTouchNode() handle setting the widget stack.
+				// See https://bugs.dojotoolkit.org/ticket/17668
+				return;
+			}
+
+			// If the blur event isn't followed (or preceded) by a focus or touch event then mark all widgets as inactive.
+			this._clearActiveWidgetsTimer = setTimeout(lang.hitch(this, function(){
+				delete this._clearActiveWidgetsTimer;
+				this._setStack([]);
+			}), 0);
+		},
+
+		_onTouchNode: function(/*DomNode*/ node, /*String*/ by){
+			// summary:
+			//		Callback when node is focused or touched.
+			//		Note that _onFocusNode() calls _onTouchNode().
+			// node:
+			//		The node that was touched.
+			// by:
+			//		"mouse" if the focus/touch was caused by a mouse down event
+
+			// Keep track of time of last focusin or touch event.
+			lastTouchOrFocusin = (new Date()).getTime();
+
+			if(this._clearActiveWidgetsTimer){
+				// forget the recent blur event
+				clearTimeout(this._clearActiveWidgetsTimer);
+				delete this._clearActiveWidgetsTimer;
+			}
+
+			// if the click occurred on the scrollbar of a dropdown, treat it as a click on the dropdown,
+			// even though the scrollbar is technically on the popup wrapper (see #10631)
+			if(domClass.contains(node, "dijitPopup")){
+				node = node.firstChild;
+			}
+
+			// compute stack of active widgets (ex: ComboButton --> Menu --> MenuItem)
+			var newStack=[];
+			try{
+				while(node){
+					var popupParent = domAttr.get(node, "dijitPopupParent");
+					if(popupParent){
+						node=registry.byId(popupParent).domNode;
+					}else if(node.tagName && node.tagName.toLowerCase() == "body"){
+						// is this the root of the document or just the root of an iframe?
+						if(node === win.body()){
+							// node is the root of the main document
+							break;
+						}
+						// otherwise, find the iframe this node refers to (can't access it via parentNode,
+						// need to do this trick instead). window.frameElement is supported in IE/FF/Webkit
+						node=winUtils.get(node.ownerDocument).frameElement;
+					}else{
+						// if this node is the root node of a widget, then add widget id to stack,
+						// except ignore clicks on disabled widgets (actually focusing a disabled widget still works,
+						// to support MenuItem)
+						var id = node.getAttribute && node.getAttribute("widgetId"),
+							widget = id && registry.byId(id);
+						if(widget && !(by == "mouse" && widget.get("disabled"))){
+							newStack.unshift(id);
+						}
+						node=node.parentNode;
+					}
+				}
+			}catch(e){ /* squelch */ }
+
+			this._setStack(newStack, by);
+		},
+
+		_onFocusNode: function(/*DomNode*/ node){
+			// summary:
+			//		Callback when node is focused
+
+			if(!node){
+				return;
+			}
+
+			if(node.nodeType == 9){
+				// Ignore focus events on the document itself.  This is here so that
+				// (for example) clicking the up/down arrows of a spinner
+				// (which don't get focus) won't cause that widget to blur. (FF issue)
+				return;
+			}
+
+			// Keep track of time of last focusin event.
+			lastFocusin = (new Date()).getTime();
+
+			// There was probably a blur event right before this event, but since we have a new focus,
+			// forget about the blur
+			if(this._clearFocusTimer){
+				clearTimeout(this._clearFocusTimer);
+				delete this._clearFocusTimer;
+			}
+
+			this._onTouchNode(node);
+
+			if(node == this.curNode){ return; }
+			this.set("prevNode", this.curNode);
+			this.set("curNode", node);
+		},
+
+		_setStack: function(/*String[]*/ newStack, /*String*/ by){
+			// summary:
+			//		The stack of active widgets has changed.  Send out appropriate events and records new stack.
+			// newStack:
+			//		array of widget id's, starting from the top (outermost) widget
+			// by:
+			//		"mouse" if the focus/touch was caused by a mouse down event
+
+			var oldStack = this.activeStack, lastOldIdx = oldStack.length - 1, lastNewIdx = newStack.length - 1;
+
+			if(newStack[lastNewIdx] == oldStack[lastOldIdx]){
+				// no changes, return now to avoid spurious notifications about changes to activeStack
+				return;
+			}
+
+			this.set("activeStack", newStack);
+
+			var widget, i;
+
+			// for all elements that have gone out of focus, set focused=false
+			for(i = lastOldIdx; i >= 0 && oldStack[i] != newStack[i]; i--){
+				widget = registry.byId(oldStack[i]);
+				if(widget){
+					widget._hasBeenBlurred = true;		// TODO: used by form widgets, should be moved there
+					widget.set("focused", false);
+					if(widget._focusManager == this){
+						widget._onBlur(by);
+					}
+					this.emit("widget-blur", widget, by);
+				}
+			}
+
+			// for all element that have come into focus, set focused=true
+			for(i++; i <= lastNewIdx; i++){
+				widget = registry.byId(newStack[i]);
+				if(widget){
+					widget.set("focused", true);
+					if(widget._focusManager == this){
+						widget._onFocus(by);
+					}
+					this.emit("widget-focus", widget, by);
+				}
+			}
+		},
+
+		focus: function(node){
+			// summary:
+			//		Focus the specified node, suppressing errors if they occur
+			if(node){
+				try{ node.focus(); }catch(e){/*quiet*/}
+			}
+		}
+	});
+
+	var singleton = new FocusManager();
+
+	// register top window and all the iframes it contains
+	domReady(function(){
+		var handle = singleton.registerWin(winUtils.get(document));
+		if(has("ie")){
+			on(window, "unload", function(){
+				if(handle){	// because this gets called twice when doh.robot is running
+					handle.remove();
+					handle = null;
+				}
+			});
+		}
+	});
+
+	// Setup dijit.focus as a pointer to the singleton but also (for backwards compatibility)
+	// as a function to set focus.   Remove for 2.0.
+	dijit.focus = function(node){
+		singleton.focus(node);	// indirection here allows dijit/_base/focus.js to override behavior
+	};
+	for(var attr in singleton){
+		if(!/^_/.test(attr)){
+			dijit.focus[attr] = typeof singleton[attr] == "function" ? lang.hitch(singleton, attr) : singleton[attr];
+		}
+	}
+	singleton.watch(function(attr, oldVal, newVal){
+		dijit.focus[attr] = newVal;
+	});
+
+	return singleton;
+});
diff --git a/src/main/resources/static/dijit/form/Button.js b/src/main/resources/static/dijit/form/Button.js
new file mode 100644
index 0000000000000000000000000000000000000000..17ee0662995d48e7621e3725fa0fa1ac062c6579
--- /dev/null
+++ b/src/main/resources/static/dijit/form/Button.js
@@ -0,0 +1,124 @@
+define([
+	"require",
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.toggle
+	"dojo/has", // has("dijit-legacy-requires")
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/lang", // lang.trim
+	"dojo/ready",
+	"./_FormWidget",
+	"./_ButtonMixin",
+	"dojo/text!./templates/Button.html",
+	"../a11yclick"	// template uses ondijitclick
+], function(require, declare, domClass, has, kernel, lang, ready, _FormWidget, _ButtonMixin, template){
+
+	// module:
+	//		dijit/form/Button
+
+	// Back compat w/1.6, remove for 2.0
+	if(has("dijit-legacy-requires")){
+		ready(0, function(){
+			var requires = ["dijit/form/DropDownButton", "dijit/form/ComboButton", "dijit/form/ToggleButton"];
+			require(requires);	// use indirection so modules not rolled into a build
+		});
+	}
+
+	var Button = declare("dijit.form.Button" + (has("dojo-bidi") ? "_NoBidi" : ""), [_FormWidget, _ButtonMixin], {
+		// summary:
+		//		Basically the same thing as a normal HTML button, but with special styling.
+		// description:
+		//		Buttons can display a label, an icon, or both.
+		//		A label should always be specified (through innerHTML) or the label
+		//		attribute.  It can be hidden via showLabel=false.
+		// example:
+		// |	<button data-dojo-type="dijit/form/Button" onClick="...">Hello world</button>
+		//
+		// example:
+		// |	var button1 = new Button({label: "hello world", onClick: foo});
+		// |	dojo.body().appendChild(button1.domNode);
+
+		// showLabel: Boolean
+		//		Set this to true to hide the label text and display only the icon.
+		//		(If showLabel=false then iconClass must be specified.)
+		//		Especially useful for toolbars.
+		//		If showLabel=true, the label will become the title (a.k.a. tooltip/hint) of the icon.
+		//
+		//		The exception case is for computers in high-contrast mode, where the label
+		//		will still be displayed, since the icon doesn't appear.
+		showLabel: true,
+
+		// iconClass: String
+		//		Class to apply to DOMNode in button to make it display an icon
+		iconClass: "dijitNoIcon",
+		_setIconClassAttr: { node: "iconNode", type: "class" },
+
+		baseClass: "dijitButton",
+
+		templateString: template,
+
+		// Map widget attributes to DOMNode attributes.
+		_setValueAttr: "valueNode",
+		_setNameAttr: function(name){
+			// avoid breaking existing subclasses where valueNode undefined.  Perhaps in 2.0 require it to be defined?
+			if(this.valueNode){
+				this.valueNode.setAttribute("name", name);
+			}
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+			this._setLabelFromContainer();
+		},
+
+		_setLabelFromContainer: function(){
+			if(this.containerNode && !this.label){
+				// When markup was set as srcNodeRef.innerHTML, copy it to this.label, in case someone tries to
+				// reference that variable.  Alternately, could have a _getLabelAttr() method to return
+				// this.containerNode.innerHTML.
+				this.label = lang.trim(this.containerNode.innerHTML);
+				this.onLabelSet();		// set this.titleNode.title etc. according to label
+			}
+		},
+
+		_setShowLabelAttr: function(val){
+			if(this.containerNode){
+				domClass.toggle(this.containerNode, "dijitDisplayNone", !val);
+			}
+			this._set("showLabel", val);
+		},
+
+		setLabel: function(/*String*/ content){
+			// summary:
+			//		Deprecated.  Use set('label', ...) instead.
+			kernel.deprecated("dijit.form.Button.setLabel() is deprecated.  Use set('label', ...) instead.", "", "2.0");
+			this.set("label", content);
+		},
+
+		onLabelSet: function(){
+			this.inherited(arguments);
+			if(!this.showLabel && !("title" in this.params)){
+				this.titleNode.title = lang.trim(this.containerNode.innerText || this.containerNode.textContent || '');
+			}
+		}
+	});
+
+	if(has("dojo-bidi")){
+		Button = declare("dijit.form.Button", Button, {
+			onLabelSet: function(){
+				this.inherited(arguments);
+				if(this.titleNode.title){
+					this.applyTextDir(this.titleNode, this.titleNode.title);
+				}
+			},
+
+			_setTextDirAttr: function(/*String*/ textDir){
+				if(this._created && this.textDir != textDir){
+					this._set("textDir", textDir);
+					this._setLabelAttr(this.label); // call applyTextDir on both focusNode and titleNode
+				}
+			}
+		});
+	}
+
+	return Button;
+});
diff --git a/src/main/resources/static/dijit/form/CheckBox.js b/src/main/resources/static/dijit/form/CheckBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..0fc69a67c47b2bdf6bb740549d3aecd98797a356
--- /dev/null
+++ b/src/main/resources/static/dijit/form/CheckBox.js
@@ -0,0 +1,117 @@
+define([
+	"require",
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/has",		// has("dijit-legacy-requires")
+	"dojo/query", // query
+	"dojo/ready",
+	"./ToggleButton",
+	"./_CheckBoxMixin",
+	"dojo/text!./templates/CheckBox.html",
+	"dojo/NodeList-dom", // NodeList.addClass/removeClass
+	"../a11yclick"	// template uses ondijitclick
+], function(require, declare, domAttr, has, query, ready, ToggleButton, _CheckBoxMixin, template){
+
+	// module:
+	//		dijit/form/CheckBox
+
+	// Back compat w/1.6, remove for 2.0
+	if(has("dijit-legacy-requires")){
+		ready(0, function(){
+			var requires = ["dijit/form/RadioButton"];
+			require(requires);	// use indirection so modules not rolled into a build
+		});
+	}
+
+	return declare("dijit.form.CheckBox", [ToggleButton, _CheckBoxMixin], {
+		// summary:
+		//		Same as an HTML checkbox, but with fancy styling.
+		//
+		// description:
+		//		User interacts with real html inputs.
+		//		On onclick (which occurs by mouse click, space-bar, or
+		//		using the arrow keys to switch the selected radio button),
+		//		we update the state of the checkbox/radio.
+		//
+		//		There are two modes:
+		//
+		//		1. High contrast mode
+		//		2. Normal mode
+		//
+		//		In case 1, the regular html inputs are shown and used by the user.
+		//		In case 2, the regular html inputs are invisible but still used by
+		//		the user. They are turned quasi-invisible and overlay the background-image.
+
+		templateString: template,
+
+		baseClass: "dijitCheckBox",
+
+		_setValueAttr: function(/*String|Boolean*/ newValue, /*Boolean*/ priorityChange){
+			// summary:
+			//		Handler for value= attribute to constructor, and also calls to
+			//		set('value', val).
+			// description:
+			//		During initialization, just saves as attribute to the `<input type=checkbox>`.
+			//
+			//		After initialization,
+			//		when passed a boolean, controls whether or not the CheckBox is checked.
+			//		If passed a string, changes the value attribute of the CheckBox (the one
+			//		specified as "value" when the CheckBox was constructed
+			//		(ex: `<input data-dojo-type="dijit/CheckBox" value="chicken">`).
+			//
+			//		`widget.set('value', string)` will check the checkbox and change the value to the
+			//		specified string.
+			//
+			//		`widget.set('value', boolean)` will change the checked state.
+
+			if(typeof newValue == "string"){
+				this.inherited(arguments);
+				newValue = true;
+			}
+			if(this._created){
+				this.set('checked', newValue, priorityChange);
+			}
+		},
+		_getValueAttr: function(){
+			// summary:
+			//		Hook so get('value') works.
+			// description:
+			//		If the CheckBox is checked, returns the value attribute.
+			//		Otherwise returns false.
+			return this.checked && this._get("value");
+		},
+
+		// Override behavior from Button, since we don't have an iconNode or valueNode
+		_setIconClassAttr: null,
+		_setNameAttr: "focusNode",
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+
+			// Need to set initial checked state via node.setAttribute so that form submit works
+			// and IE8 radio button tab order is preserved.
+			// domAttr.set(node, "checked", bool) doesn't work on IE until node has been attached
+			// to <body>, see #8666
+			this.checkedAttrSetting = "";
+		},
+
+		 _fillContent: function(){
+			// Override Button::_fillContent() since it doesn't make sense for CheckBox,
+			// since CheckBox doesn't even have a container
+		},
+
+		_onFocus: function(){
+			if(this.id){
+				query("label[for='"+this.id+"']").addClass("dijitFocusedLabel");
+			}
+			this.inherited(arguments);
+		},
+
+		_onBlur: function(){
+			if(this.id){
+				query("label[for='"+this.id+"']").removeClass("dijitFocusedLabel");
+			}
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/ComboBox.js b/src/main/resources/static/dijit/form/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..00f74e5d093187169b4629817f5f4c510fc160bb
--- /dev/null
+++ b/src/main/resources/static/dijit/form/ComboBox.js
@@ -0,0 +1,27 @@
+define([
+	"dojo/_base/declare", // declare
+	"./ValidationTextBox",
+	"./ComboBoxMixin"
+], function(declare, ValidationTextBox, ComboBoxMixin){
+
+	// module:
+	//		dijit/form/ComboBox
+
+	return declare("dijit.form.ComboBox", [ValidationTextBox, ComboBoxMixin], {
+		// summary:
+		//		Auto-completing text box
+		//
+		// description:
+		//		The drop down box's values are populated from an class called
+		//		a data provider, which returns a list of values based on the characters
+		//		that the user has typed into the input box.
+		//		If OPTION tags are used as the data provider via markup,
+		//		then the OPTION tag's child text node is used as the widget value
+		//		when selected.  The OPTION tag's value attribute is ignored.
+		//		To set the default value when using OPTION tags, specify the selected
+		//		attribute on 1 of the child OPTION tags.
+		//
+		//		Some of the options to the ComboBox are actually arguments to the data
+		//		provider.
+	});
+});
diff --git a/src/main/resources/static/dijit/form/ComboBoxMixin.js b/src/main/resources/static/dijit/form/ComboBoxMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d2e630445abb7860af07b4257610cd533cc0672
--- /dev/null
+++ b/src/main/resources/static/dijit/form/ComboBoxMixin.js
@@ -0,0 +1,147 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/Deferred",
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/lang", // lang.mixin
+	"dojo/store/util/QueryResults",
+	"./_AutoCompleterMixin",
+	"./_ComboBoxMenu",
+	"../_HasDropDown",
+	"dojo/text!./templates/DropDownBox.html"
+], function(declare, Deferred, kernel, lang, QueryResults, _AutoCompleterMixin, _ComboBoxMenu, _HasDropDown, template){
+
+
+	// module:
+	//		dijit/form/ComboBoxMixin
+
+	return declare("dijit.form.ComboBoxMixin", [_HasDropDown, _AutoCompleterMixin], {
+		// summary:
+		//		Provides main functionality of ComboBox widget
+
+		// dropDownClass: [protected extension] Function String
+		//		Dropdown widget class used to select a date/time.
+		//		Subclasses should specify this.
+		dropDownClass: _ComboBoxMenu,
+
+		// hasDownArrow: Boolean
+		//		Set this textbox to have a down arrow button, to display the drop down list.
+		//		Defaults to true.
+		hasDownArrow: true,
+
+		templateString: template,
+
+		baseClass: "dijitTextBox dijitComboBox",
+
+		/*=====
+		// store: [const] dojo/store/api/Store|dojo/data/api/Read
+		//		Reference to data provider object used by this ComboBox.
+		//
+		//		Should be dojo/store/api/Store, but dojo/data/api/Read supported
+		//		for backwards compatibility.
+		store: null,
+		=====*/
+
+		// Set classes like dijitDownArrowButtonHover depending on
+		// mouse action over button node
+		cssStateNodes: {
+			"_buttonNode": "dijitDownArrowButton"
+		},
+
+		_setHasDownArrowAttr: function(/*Boolean*/ val){
+			this._set("hasDownArrow", val);
+			this._buttonNode.style.display = val ? "" : "none";
+		},
+
+		_showResultList: function(){
+			// hide the tooltip
+			this.displayMessage("");
+			this.inherited(arguments);
+		},
+
+		_setStoreAttr: function(store){
+			// For backwards-compatibility, accept dojo.data store in addition to dojo/store/api/Store.  Remove in 2.0.
+			if(!store.get){
+				lang.mixin(store, {
+					_oldAPI: true,
+					get: function(id){
+						// summary:
+						//		Retrieves an object by it's identity. This will trigger a fetchItemByIdentity.
+						//		Like dojo/store/DataStore.get() except returns native item.
+						var deferred = new Deferred();
+						this.fetchItemByIdentity({
+							identity: id,
+							onItem: function(object){
+								deferred.resolve(object);
+							},
+							onError: function(error){
+								deferred.reject(error);
+							}
+						});
+						return deferred.promise;
+					},
+					query: function(query, options){
+						// summary:
+						//		Queries the store for objects.   Like dojo/store/DataStore.query()
+						//		except returned Deferred contains array of native items.
+						var deferred = new Deferred(function(){ fetchHandle.abort && fetchHandle.abort(); });
+						deferred.total = new Deferred();
+						var fetchHandle = this.fetch(lang.mixin({
+							query: query,
+							onBegin: function(count){
+								deferred.total.resolve(count);
+							},
+							onComplete: function(results){
+								deferred.resolve(results);
+							},
+							onError: function(error){
+								deferred.reject(error);
+							}
+						}, options));
+						return QueryResults(deferred);
+					}
+				});
+			}
+			this._set("store", store);
+		},
+
+		postMixInProperties: function(){
+			// Since _setValueAttr() depends on this.store, _setStoreAttr() needs to execute first.
+			// Unfortunately, without special code, it ends up executing second.
+			var store = this.params.store || this.store;
+			if(store){
+				this._setStoreAttr(store);
+			}
+
+			this.inherited(arguments);
+
+			// User may try to access this.store.getValue() etc.  in a custom labelFunc() function.
+			// It's not available with the new data store for handling inline <option> tags, so add it.
+			if(!this.params.store && this.store && !this.store._oldAPI){
+				var clazz = this.declaredClass;
+				lang.mixin(this.store, {
+					getValue: function(item, attr){
+						kernel.deprecated(clazz + ".store.getValue(item, attr) is deprecated for builtin store.  Use item.attr directly", "", "2.0");
+						return item[attr];
+					},
+					getLabel: function(item){
+						kernel.deprecated(clazz + ".store.getLabel(item) is deprecated for builtin store.  Use item.label directly", "", "2.0");
+						return item.name;
+					},
+					fetch: function(args){
+						kernel.deprecated(clazz + ".store.fetch() is deprecated for builtin store.", "Use store.query()", "2.0");
+						var shim = ["dojo/data/ObjectStore"];	// indirection so it doesn't get rolled into a build
+						require(shim, lang.hitch(this, function(ObjectStore){
+							new ObjectStore({objectStore: this}).fetch(args);
+						}));
+					}
+				});
+			}
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			this.focusNode.setAttribute("aria-autocomplete", this.autoComplete ? "both" : "list");
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/ComboButton.js b/src/main/resources/static/dijit/form/ComboButton.js
new file mode 100644
index 0000000000000000000000000000000000000000..bcefb8dada2f21c3aa06a3d52baed8f82b5b977c
--- /dev/null
+++ b/src/main/resources/static/dijit/form/ComboButton.js
@@ -0,0 +1,84 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/keys", // keys
+	"../focus", // focus.focus()
+	"./DropDownButton",
+	"dojo/text!./templates/ComboButton.html",
+	"../a11yclick"	// template uses ondijitclick
+], function(declare, keys, focus, DropDownButton, template){
+
+	// module:
+	//		dijit/form/ComboButton
+
+	return declare("dijit.form.ComboButton", DropDownButton, {
+		// summary:
+		//		A combination button and drop-down button.
+		//		Users can click one side to "press" the button, or click an arrow
+		//		icon to display the drop down.
+		//
+		// example:
+		// |	<button data-dojo-type="dijit/form/ComboButton" onClick="...">
+		// |		<span>Hello world</span>
+		// |		<div data-dojo-type="dijit/Menu">...</div>
+		// |	</button>
+		//
+		// example:
+		// |	var button1 = new ComboButton({label: "hello world", onClick: foo, dropDown: "myMenu"});
+		// |	dojo.body().appendChild(button1.domNode);
+		//
+
+		templateString: template,
+
+		// Map widget attributes to DOMNode attributes.
+		_setIdAttr: "", // override _FormWidgetMixin which puts id on the focusNode
+		_setTabIndexAttr: ["focusNode", "titleNode"],
+		_setTitleAttr: "titleNode",
+
+		// optionsTitle: String
+		//		Text that describes the options menu (accessibility)
+		optionsTitle: "",
+
+		baseClass: "dijitComboButton",
+
+		// Set classes like dijitButtonContentsHover or dijitArrowButtonActive depending on
+		// mouse action over specified node
+		cssStateNodes: {
+			"buttonNode": "dijitButtonNode",
+			"titleNode": "dijitButtonContents",
+			"_popupStateNode": "dijitDownArrowButton"
+		},
+
+		_focusedNode: null,
+
+		_onButtonKeyDown: function(/*Event*/ evt){
+			// summary:
+			//		Handler for right arrow key when focus is on left part of button
+			if(evt.keyCode == keys[this.isLeftToRight() ? "RIGHT_ARROW" : "LEFT_ARROW"]){
+				focus.focus(this._popupStateNode);
+				evt.stopPropagation();
+				evt.preventDefault();
+			}
+		},
+
+		_onArrowKeyDown: function(/*Event*/ evt){
+			// summary:
+			//		Handler for left arrow key when focus is on right part of button
+			if(evt.keyCode == keys[this.isLeftToRight() ? "LEFT_ARROW" : "RIGHT_ARROW"]){
+				focus.focus(this.titleNode);
+				evt.stopPropagation();
+				evt.preventDefault();
+			}
+		},
+
+		focus: function(/*String*/ position){
+			// summary:
+			//		Focuses this widget to according to position, if specified,
+			//		otherwise on arrow node
+			// position:
+			//		"start" or "end"
+			if(!this.disabled){
+				focus.focus(position == "start" ? this.titleNode : this._popupStateNode);
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/CurrencyTextBox.js b/src/main/resources/static/dijit/form/CurrencyTextBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..338c3e2b1835300df8e2042dc1b3342684a13100
--- /dev/null
+++ b/src/main/resources/static/dijit/form/CurrencyTextBox.js
@@ -0,0 +1,81 @@
+define([
+	"dojo/currency", // currency._mixInDefaults currency.format currency.parse currency.regexp
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang", // lang.hitch
+	"./NumberTextBox"
+], function(currency, declare, lang, NumberTextBox){
+
+	// module:
+	//		dijit/form/CurrencyTextBox
+
+	var CurrencyTextBox = declare("dijit.form.CurrencyTextBox", NumberTextBox, {
+		// summary:
+		//		A validating currency textbox
+		// description:
+		//		CurrencyTextBox is similar to `dijit/form/NumberTextBox` but has a few
+		//		extra features related to currency:
+		//
+		//		1. After specifying the currency type (american dollars, euros, etc.) it automatically
+		//			sets parse/format options such as how many decimal places to show.
+		//		2. The currency mark (dollar sign, euro mark, etc.) is displayed when the field is blurred
+		//			but erased during editing, so that the user can just enter a plain number.
+
+		// currency: [const] String
+		//		the [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code, a three letter sequence like "USD"
+		currency: "",
+
+		/*=====
+		// constraints: CurrencyTextBox.__Constraints
+		//		Despite the name, this parameter specifies both constraints on the input
+		//		(including minimum/maximum allowed values) as well as
+		//		formatting options.  See `dijit/form/CurrencyTextBox.__Constraints` for details.
+		constraints: {},
+		======*/
+
+		baseClass: "dijitTextBox dijitCurrencyTextBox",
+
+		// Override NumberTextBox._formatter to deal with currencies, ex: converts "123.45" to "$123.45"
+		_formatter: currency.format,
+
+		_parser: currency.parse,
+
+		_regExpGenerator: currency.regexp,
+
+		parse: function(/*String*/ value, /*Object*/ constraints){
+			// summary:
+			//		Parses string value as a Currency, according to the constraints object
+			// tags:
+			//		protected extension
+			var v = this.inherited(arguments);
+			if(isNaN(v) && /\d+/.test(value)){ // currency parse failed, but it could be because they are using NumberTextBox format so try its parse
+				v = lang.hitch(lang.delegate(this, { _parser: NumberTextBox.prototype._parser }), "inherited")(arguments);
+			}
+			return v;
+		},
+
+		_setConstraintsAttr: function(/*Object*/ constraints){
+			if(!constraints.currency && this.currency){
+				constraints.currency = this.currency;
+			}
+			this.inherited(arguments, [ currency._mixInDefaults(lang.mixin(constraints, { exponent: false })) ]); // get places
+		}
+	});
+
+	/*=====
+	 CurrencyTextBox.__Constraints = declare([NumberTextBox.__Constraints, currency.__FormatOptions, currency.__ParseOptions], {
+		 // summary:
+		 //		Specifies both the rules on valid/invalid values (minimum, maximum,
+		 //		number of required decimal places), and also formatting options for
+		 //		displaying the value when the field is not focused (currency symbol,
+		 //		etc.)
+		 // description:
+		 //		Follows the pattern of `dijit/form/NumberTextBox.__Constraints`.
+		 //		In general developers won't need to set this parameter.
+		 // example:
+		 //		To ensure that the user types in the cents (for example, 1.00 instead of just 1):
+		 //	|		{fractional:true}
+	 });
+	 =====*/
+
+	return CurrencyTextBox;
+});
diff --git a/src/main/resources/static/dijit/form/DataList.js b/src/main/resources/static/dijit/form/DataList.js
new file mode 100644
index 0000000000000000000000000000000000000000..407f6b0133b78cd6ec3c019b645ec99ede650c5e
--- /dev/null
+++ b/src/main/resources/static/dijit/form/DataList.js
@@ -0,0 +1,70 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.byId
+	"dojo/_base/lang", // lang.trim
+	"dojo/query", // query
+	"dojo/store/Memory",
+	"../registry"	// registry.add registry.remove
+], function(declare, dom, lang, query, MemoryStore, registry){
+
+	// module:
+	//		dijit/form/DataList
+
+	function toItem(/*DOMNode*/ option){
+		// summary:
+		//		Convert `<option>` node to hash
+		return {
+			id: option.value,
+			value: option.value,
+			name: lang.trim(option.innerText || option.textContent || '')
+		};
+	}
+
+	return declare("dijit.form.DataList", MemoryStore, {
+		// summary:
+		//		Inefficient but small data store specialized for inlined data via OPTION tags
+		//
+		// description:
+		//		Provides a store for inlined data like:
+		//
+		//	|	<datalist>
+		//	|		<option value="AL">Alabama</option>
+		//	|		...
+
+		constructor: function(params, srcNodeRef){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String
+			//		Attach widget to this DOM node.
+
+			// store pointer to original DOM tree
+			this.domNode = dom.byId(srcNodeRef);
+
+			lang.mixin(this, params);
+			if(this.id){
+				registry.add(this); // add to registry so it can be easily found by id
+			}
+			this.domNode.style.display = "none";
+
+			this.inherited(arguments, [{
+				data: query("option", this.domNode).map(toItem)
+			}]);
+		},
+
+		destroy: function(){
+			registry.remove(this.id);
+		},
+
+		fetchSelectedItem: function(){
+			// summary:
+			//		Get the option marked as selected, like `<option selected>`.
+			//		Not part of dojo.data API.
+			var option = query("> option[selected]", this.domNode)[0] || query("> option", this.domNode)[0];
+			return option && toItem(option);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/DateTextBox.js b/src/main/resources/static/dijit/form/DateTextBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..4defb6278a637d2f679bd724dd710e7ce241ed74
--- /dev/null
+++ b/src/main/resources/static/dijit/form/DateTextBox.js
@@ -0,0 +1,32 @@
+define([
+	"dojo/_base/declare", // declare
+	"../Calendar",
+	"./_DateTimeTextBox"
+], function(declare, Calendar, _DateTimeTextBox){
+
+	// module:
+	//		dijit/form/DateTextBox
+
+	return declare("dijit.form.DateTextBox", _DateTimeTextBox, {
+		// summary:
+		//		A validating, serializable, range-bound date text box with a drop down calendar
+		// example:
+		// |	new DateTextBox({value: new Date(2009, 0, 20)})
+		// example:
+		// |	<input data-dojo-type='dijit/form/DateTextBox' value='2009-01-20'>
+
+		baseClass: "dijitTextBox dijitComboBox dijitDateTextBox",
+		popupClass: Calendar,
+		_selector: "date",
+
+		// Prevent scrollbar on Calendar dropdown.  On iPad it often gets a scrollbar unnecessarily because Viewport
+		// thinks the keyboard is showing.  Even if the keyboard is showing, it disappears when the calendar gets focus.
+		maxHeight: Infinity,
+
+		// value: Date
+		//		The value of this widget as a JavaScript Date object, with only year/month/day specified.
+		//		If specified in markup, use the format specified in `stamp.fromISOString`.
+		//		set("value", ...) accepts either a Date object or a string.
+		value: new Date("")	// value.toString()="NaN"
+	});
+});
diff --git a/src/main/resources/static/dijit/form/DropDownButton.js b/src/main/resources/static/dijit/form/DropDownButton.js
new file mode 100644
index 0000000000000000000000000000000000000000..5516384df164adaf5723e0934b30f0ab0f753887
--- /dev/null
+++ b/src/main/resources/static/dijit/form/DropDownButton.js
@@ -0,0 +1,104 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/_base/kernel",
+	"dojo/_base/lang", // hitch
+	"dojo/query", // query
+	"../registry", // registry.byNode
+	"../popup", // dijit.popup2.hide
+	"./Button",
+	"../_Container",
+	"../_HasDropDown",
+	"dojo/text!./templates/DropDownButton.html",
+	"../a11yclick"	// template uses ondijitclick
+], function(declare, kernel, lang, query, registry, popup, Button, _Container, _HasDropDown, template){
+
+	// module:
+	//		dijit/form/DropDownButton
+
+	return declare("dijit.form.DropDownButton", [Button, _Container, _HasDropDown], {
+		// summary:
+		//		A button with a drop down
+		//
+		// example:
+		// |	<button data-dojo-type="dijit/form/DropDownButton">
+		// |		Hello world
+		// |		<div data-dojo-type="dijit/Menu">...</div>
+		// |	</button>
+		//
+		// example:
+		// |	var button1 = new DropDownButton({ label: "hi", dropDown: new dijit.Menu(...) });
+		// |	win.body().appendChild(button1);
+		//
+
+		baseClass: "dijitDropDownButton",
+
+		templateString: template,
+
+		_fillContent: function(){
+			// Overrides _TemplatedMixin#_fillContent().
+			// My inner HTML possibly contains both the button label and/or a drop down widget, like
+			// <DropDownButton>  <span>push me</span>  <Menu> ... </Menu> </DropDownButton>
+
+			var source = this.srcNodeRef;
+			var dest = this.containerNode;
+			if(source && dest){
+				while(source.hasChildNodes()){
+					var child = source.firstChild;
+					if(child.hasAttribute && (child.hasAttribute("data-dojo-type") || child.hasAttribute("dojoType") ||
+							child.hasAttribute("data-" + kernel._scopeName + "-type") ||
+							child.hasAttribute(kernel._scopeName + "Type"))){
+						// The parser hasn't gotten to this node yet, so save it in a wrapper <div>
+						// and then grab the instantiated widget in startup().
+						this.dropDownContainer = this.ownerDocument.createElement("div");
+						this.dropDownContainer.appendChild(child);
+					}else{
+						dest.appendChild(child);
+					}
+				}
+			}
+		},
+
+		startup: function(){
+			if(this._started){
+				return;
+			}
+
+			// the child widget from srcNodeRef is the dropdown widget.  Insert it in the page DOM,
+			// make it invisible, and store a reference to pass to the popup code.
+			if(!this.dropDown && this.dropDownContainer){
+				this.dropDown = registry.byNode(this.dropDownContainer.firstChild);
+				delete this.dropDownContainer;
+			}
+			if(this.dropDown){
+				popup.hide(this.dropDown);
+			}
+
+			this.inherited(arguments);
+		},
+
+		isLoaded: function(){
+			// Returns whether or not we are loaded - if our dropdown has an href,
+			// then we want to check that.
+			var dropDown = this.dropDown;
+			return (!!dropDown && (!dropDown.href || dropDown.isLoaded));
+		},
+
+		loadDropDown: function(/*Function*/ callback){
+			// Default implementation assumes that drop down already exists,
+			// but hasn't loaded it's data (ex: ContentPane w/href).
+			// App must override if the drop down is lazy-created.
+			var dropDown = this.dropDown;
+			var handler = dropDown.on("load", lang.hitch(this, function(){
+				handler.remove();
+				callback();
+			}));
+			dropDown.refresh();		// tell it to load
+		},
+
+		isFocusable: function(){
+			// Overridden so that focus is handled by the _HasDropDown mixin, not by
+			// the _FormWidget mixin.
+			return this.inherited(arguments) && !this._mouseDown;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/FilteringSelect.js b/src/main/resources/static/dijit/form/FilteringSelect.js
new file mode 100644
index 0000000000000000000000000000000000000000..f2665965812672109f6480a27fb0ee93b073c217
--- /dev/null
+++ b/src/main/resources/static/dijit/form/FilteringSelect.js
@@ -0,0 +1,235 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang", // lang.mixin
+	"dojo/when",
+	"./MappedTextBox",
+	"./ComboBoxMixin"
+], function(declare, lang, when, MappedTextBox, ComboBoxMixin){
+
+	// module:
+	//		dijit/form/FilteringSelect
+
+	return declare("dijit.form.FilteringSelect", [MappedTextBox, ComboBoxMixin], {
+		// summary:
+		//		An enhanced version of the HTML SELECT tag, populated dynamically
+		//
+		// description:
+		//		An enhanced version of the HTML SELECT tag, populated dynamically. It works
+		//		very nicely with very large data sets because it can load and page data as needed.
+		//		It also resembles ComboBox, but does not allow values outside of the provided ones.
+		//		If OPTION tags are used as the data provider via markup, then the
+		//		OPTION tag's child text node is used as the displayed value when selected
+		//		while the OPTION tag's value attribute is used as the widget value on form submit.
+		//		To set the default value when using OPTION tags, specify the selected
+		//		attribute on 1 of the child OPTION tags.
+		//
+		//		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)
+
+		// required: Boolean
+		//		True (default) if user is required to enter a value into this field.
+		required: true,
+
+		_lastDisplayedValue: "",
+
+		_isValidSubset: function(){
+			return this._opened;
+		},
+
+		isValid: function(){
+			// Overrides ValidationTextBox.isValid()
+			return !!this.item || (!this.required && this.get('displayedValue') == ""); // #5974
+		},
+
+		_refreshState: function(){
+			if(!this.searchTimer){ // state will be refreshed after results are returned
+				this.inherited(arguments);
+			}
+		},
+
+		_callbackSetLabel: function(
+						/*Array*/ result,
+						/*Object*/ query,
+						/*Object*/ options,
+						/*Boolean?*/ priorityChange){
+			// summary:
+			//		Callback from dojo.store after lookup of user entered value finishes
+
+			// setValue does a synchronous lookup,
+			// so it calls _callbackSetLabel directly,
+			// and so does not pass dataObject
+			// still need to test against _lastQuery in case it came too late
+			if((query && query[this.searchAttr] !== this._lastQuery) || (!query && result.length && this.store.getIdentity(result[0]) != this._lastQuery)){
+				return;
+			}
+			if(!result.length){
+				//#3268: don't modify display value on bad input
+				//#3285: change CSS to indicate error
+				this.set("value", '', priorityChange || (priorityChange === undefined && !this.focused), this.textbox.value, null);
+			}else{
+				this.set('item', result[0], priorityChange);
+			}
+		},
+
+		_openResultList: function(/*Object*/ results, /*Object*/ query, /*Object*/ options){
+			// Callback when a data store query completes.
+			// Overrides ComboBox._openResultList()
+
+			// #3285: tap into search callback to see if user's query resembles a match
+			if(query[this.searchAttr] !== this._lastQuery){
+				return;
+			}
+			this.inherited(arguments);
+
+			if(this.item === undefined){ // item == undefined for keyboard search
+				// If the search returned no items that means that the user typed
+				// in something invalid (and they can't make it valid by typing more characters),
+				// so flag the FilteringSelect as being in an invalid state
+				this.validate(true);
+			}
+		},
+
+		_getValueAttr: function(){
+			// summary:
+			//		Hook for get('value') to work.
+
+			// don't get the textbox value but rather the previously set hidden value.
+			// Use this.valueNode.value which isn't always set for other MappedTextBox widgets until blur
+			return this.valueNode.value;
+		},
+
+		_getValueField: function(){
+			// Overrides ComboBox._getValueField()
+			return "value";
+		},
+
+		_setValueAttr: function(/*String*/ value, /*Boolean?*/ priorityChange, /*String?*/ displayedValue, /*item?*/ item){
+			// summary:
+			//		Hook so set('value', value) works.
+			// description:
+			//		Sets the value of the select.
+			//		Also sets the label to the corresponding value by reverse lookup.
+			if(!this._onChangeActive){ priorityChange = null; }
+
+			if(item === undefined){
+				if(value === null || value === ''){
+					value = '';
+					if(!lang.isString(displayedValue)){
+						this._setDisplayedValueAttr(displayedValue||'', priorityChange);
+						return;
+					}
+				}
+
+				var self = this;
+				this._lastQuery = value;
+				when(this.store.get(value), function(item){
+					self._callbackSetLabel(item? [item] : [], undefined, undefined, priorityChange);
+				});
+			}else{
+				this.valueNode.value = value;
+				this.inherited(arguments, [value, priorityChange, displayedValue, item]);
+			}
+		},
+
+		_setItemAttr: function(/*item*/ item, /*Boolean?*/ priorityChange, /*String?*/ displayedValue){
+			// summary:
+			//		Set the displayed valued in the input box, and the hidden value
+			//		that gets submitted, based on a dojo.data store item.
+			// description:
+			//		Users shouldn't call this function; they should be calling
+			//		set('item', value)
+			// tags:
+			//		private
+			this.inherited(arguments);
+			this._lastDisplayedValue = this.textbox.value;
+		},
+
+		_getDisplayQueryString: function(/*String*/ text){
+			return text.replace(/([\\\*\?])/g, "\\$1");
+		},
+
+		_setDisplayedValueAttr: function(/*String*/ label, /*Boolean?*/ priorityChange){
+			// summary:
+			//		Hook so set('displayedValue', label) works.
+			// description:
+			//		Sets textbox to display label. Also performs reverse lookup
+			//		to set the hidden value.  label should corresponding to item.searchAttr.
+
+			if(label == null){ label = ''; }
+
+			// This is called at initialization along with every custom setter.
+			// Usually (or always?) the call can be ignored.   If it needs to be
+			// processed then at least make sure that the XHR request doesn't trigger an onChange()
+			// event, even if it returns after creation has finished
+			if(!this._created){
+				if(!("displayedValue" in this.params)){
+					return;
+				}
+				priorityChange = false;
+			}
+
+			// Do a reverse lookup to map the specified displayedValue to the hidden value.
+			// Note that if there's a custom labelFunc() this code
+			if(this.store){
+				this.closeDropDown();
+				var query = lang.clone(this.query); // #6196: populate query with user-specifics
+
+				// Generate query
+				var qs = this._getDisplayQueryString(label), q;
+				if(this.store._oldAPI){
+					// remove this branch for 2.0
+					q = qs;
+				}else{
+					// Query on searchAttr is a regex for benefit of dojo/store/Memory,
+					// but with a toString() method to help dojo/store/JsonRest.
+					// Search string like "Co*" converted to regex like /^Co.*$/i.
+					q = this._patternToRegExp(qs);
+					q.toString = function(){ return qs; };
+				}
+				this._lastQuery = query[this.searchAttr] = q;
+
+				// If the label is not valid, the callback will never set it,
+				// so the last valid value will get the warning textbox.   Set the
+				// textbox value now so that the impending warning will make
+				// sense to the user
+				this.textbox.value = label;
+				this._lastDisplayedValue = label;
+				this._set("displayedValue", label);	// for watch("displayedValue") notification
+				var _this = this;
+				var options = {
+					queryOptions: {
+						ignoreCase: this.ignoreCase,
+						deep: true
+					}
+				};
+				lang.mixin(options, this.fetchProperties);
+				this._fetchHandle = this.store.query(query, options);
+				when(this._fetchHandle, function(result){
+					_this._fetchHandle = null;
+					_this._callbackSetLabel(result || [], query, options, priorityChange);
+				}, function(err){
+					_this._fetchHandle = null;
+					if(!_this._cancelingQuery){	// don't treat canceled query as an error
+						console.error('dijit.form.FilteringSelect: ' + err.toString());
+					}
+				});
+			}
+		},
+
+		undo: function(){
+			this.set('displayedValue', this._lastDisplayedValue);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/Form.js b/src/main/resources/static/dijit/form/Form.js
new file mode 100644
index 0000000000000000000000000000000000000000..5dc743609a8171ceb8bec9712a66b48308a67298
--- /dev/null
+++ b/src/main/resources/static/dijit/form/Form.js
@@ -0,0 +1,168 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/sniff", // has("ie")
+	"../_Widget",
+	"../_TemplatedMixin",
+	"./_FormMixin",
+	"../layout/_ContentPaneResizeMixin"
+], function(declare, domAttr, kernel, has, _Widget, _TemplatedMixin, _FormMixin, _ContentPaneResizeMixin){
+
+	// module:
+	//		dijit/form/Form
+
+
+	return declare("dijit.form.Form", [_Widget, _TemplatedMixin, _FormMixin, _ContentPaneResizeMixin], {
+		// summary:
+		//		Widget corresponding to HTML form tag, for validation and serialization
+		//
+		// example:
+		//	|	<form data-dojo-type="dijit/form/Form" id="myForm">
+		//	|		Name: <input type="text" name="name" />
+		//	|	</form>
+		//	|	// Example assumes you have required dijit/registry
+		//	|	myObj = {name: "John Doe"};
+		//	|	registry.byId('myForm').set('value', myObj);
+		//	|
+		//	|	myObj=registry.byId('myForm').get('value');
+
+		// HTML <FORM> attributes
+
+		// name: String?
+		//		Name of form for scripting.
+		name: "",
+
+		// action: String?
+		//		Server-side form handler.
+		action: "",
+
+		// method: String?
+		//		HTTP method used to submit the form, either "GET" or "POST".
+		method: "",
+
+		// encType: String?
+		//		Encoding type for the form, ex: application/x-www-form-urlencoded.
+		encType: "",
+
+		// accept-charset: String?
+		//		List of supported charsets.
+		"accept-charset": "",
+
+		// accept: String?
+		//		List of MIME types for file upload.
+		accept: "",
+
+		// target: String?
+		//		Target frame for the document to be opened in.
+		target: "",
+
+		templateString: "<form data-dojo-attach-point='containerNode' data-dojo-attach-event='onreset:_onReset,onsubmit:_onSubmit' ${!nameAttrSetting}></form>",
+
+		postMixInProperties: function(){
+			// Setup name=foo string to be referenced from the template (but only if a name has been specified)
+			// Unfortunately we can't use _setNameAttr to set the name due to IE limitations, see #8660
+			this.nameAttrSetting = this.name ? ("name='" + this.name + "'") : "";
+			this.inherited(arguments);
+		},
+
+		execute: function(/*Object*/ /*===== formContents =====*/){
+			// summary:
+			//		Deprecated: use submit()
+			// tags:
+			//		deprecated
+		},
+
+		onExecute: function(){
+			// summary:
+			//		Deprecated: use onSubmit()
+			// tags:
+			//		deprecated
+		},
+
+		_setEncTypeAttr: function(/*String*/ value){
+			domAttr.set(this.domNode, "encType", value);
+			if(has("ie")){
+				this.domNode.encoding = value;
+			}
+			this._set("encType", value);
+		},
+
+		reset: function(/*Event?*/ e){
+			// summary:
+			//		restores all widget values back to their init values,
+			//		calls onReset() which can cancel the reset by returning false
+
+			// create fake event so we can know if preventDefault() is called
+			var faux = {
+				returnValue: true, // the IE way
+				preventDefault: function(){ // not IE
+					this.returnValue = false;
+				},
+				stopPropagation: function(){
+				},
+				currentTarget: e ? e.target : this.domNode,
+				target: e ? e.target : this.domNode
+			};
+			// if return value is not exactly false, and haven't called preventDefault(), then reset
+			if(!(this.onReset(faux) === false) && faux.returnValue){
+				this.inherited(arguments, []);
+			}
+		},
+
+		onReset: function(/*Event?*/ /*===== e =====*/){
+			// summary:
+			//		Callback when user resets the form. This method is intended
+			//		to be over-ridden. When the `reset` method is called
+			//		programmatically, the return value from `onReset` is used
+			//		to compute whether or not resetting should proceed
+			// tags:
+			//		callback
+			return true; // Boolean
+		},
+
+		_onReset: function(e){
+			this.reset(e);
+			e.stopPropagation();
+			e.preventDefault();
+			return false;
+		},
+
+		_onSubmit: function(e){
+			var fp = this.constructor.prototype;
+			// TODO: remove this if statement beginning with 2.0
+			if(this.execute != fp.execute || this.onExecute != fp.onExecute){
+				kernel.deprecated("dijit.form.Form:execute()/onExecute() are deprecated. Use onSubmit() instead.", "", "2.0");
+				this.onExecute();
+				this.execute(this.getValues());
+			}
+			if(this.onSubmit(e) === false){ // only exactly false stops submit
+				e.stopPropagation();
+				e.preventDefault();
+			}
+		},
+
+		onSubmit: function(/*Event?*/ /*===== e =====*/){
+			// summary:
+			//		Callback when user submits the form.
+			// description:
+			//		This method is intended to be over-ridden, but by default it checks and
+			//		returns the validity of form elements. When the `submit`
+			//		method is called programmatically, the return value from
+			//		`onSubmit` is used to compute whether or not submission
+			//		should proceed
+			// tags:
+			//		extension
+
+			return this.isValid(); // Boolean
+		},
+
+		submit: function(){
+			// summary:
+			//		programmatically submit form if and only if the `onSubmit` returns true
+			if(!(this.onSubmit() === false)){
+				this.containerNode.submit();
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/HorizontalRule.js b/src/main/resources/static/dijit/form/HorizontalRule.js
new file mode 100644
index 0000000000000000000000000000000000000000..715223b4e509bc1f720cb5ee64d4d1bd3e5c1fa2
--- /dev/null
+++ b/src/main/resources/static/dijit/form/HorizontalRule.js
@@ -0,0 +1,67 @@
+define([
+	"dojo/_base/declare", // declare
+	"../_Widget",
+	"../_TemplatedMixin"
+], function(declare, _Widget, _TemplatedMixin){
+
+	// module:
+	//		dijit/form/HorizontalRule
+
+	return declare("dijit.form.HorizontalRule", [_Widget, _TemplatedMixin], {
+		// summary:
+		//		Hash marks for `dijit/form/HorizontalSlider`
+
+		templateString: '<div class="dijitRuleContainer dijitRuleContainerH"></div>',
+
+		// count: Integer
+		//		Number of hash marks to generate
+		count: 3,
+
+		// container: String
+		//		For HorizontalSlider, this is either "topDecoration" or "bottomDecoration",
+		//		and indicates whether this rule goes above or below the slider.
+		container: "containerNode",
+
+		// ruleStyle: String
+		//		CSS style to apply to individual hash marks
+		ruleStyle: "",
+
+		_positionPrefix: '<div class="dijitRuleMark dijitRuleMarkH" style="left:',
+		_positionSuffix: '%;',
+		_suffix: '"></div>',
+
+		_genHTML: function(pos){
+			return this._positionPrefix + pos + this._positionSuffix + this.ruleStyle + this._suffix;
+		},
+
+		// _isHorizontal: [protected extension] Boolean
+		//		VerticalRule will override this...
+		_isHorizontal: true,
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			var innerHTML;
+			if(this.count == 1){
+				innerHTML = this._genHTML(50, 0);
+			}else{
+				var i;
+				var interval = 100 / (this.count - 1);
+				if(!this._isHorizontal || this.isLeftToRight()){
+					innerHTML = this._genHTML(0, 0);
+					for(i = 1; i < this.count - 1; i++){
+						innerHTML += this._genHTML(interval * i, i);
+					}
+					innerHTML += this._genHTML(100, this.count - 1);
+				}else{
+					innerHTML = this._genHTML(100, 0);
+					for(i = 1; i < this.count - 1; i++){
+						innerHTML += this._genHTML(100 - interval * i, i);
+					}
+					innerHTML += this._genHTML(0, this.count - 1);
+				}
+			}
+			this.domNode.innerHTML = innerHTML;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/HorizontalRuleLabels.js b/src/main/resources/static/dijit/form/HorizontalRuleLabels.js
new file mode 100644
index 0000000000000000000000000000000000000000..f5ff3a4b2d05ef2ce0215138570752f5b599a797
--- /dev/null
+++ b/src/main/resources/static/dijit/form/HorizontalRuleLabels.js
@@ -0,0 +1,123 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/has",
+	"dojo/number", // number.format
+	"dojo/query", // query
+	"dojo/_base/lang", // lang
+	"./HorizontalRule"
+], function(declare, has, number, query, lang, HorizontalRule){
+
+	// module:
+	//		dijit/form/HorizontalRuleLabels
+
+	var HorizontalRuleLabels = declare("dijit.form.HorizontalRuleLabels", HorizontalRule, {
+		// summary:
+		//		Labels for `dijit/form/HorizontalSlider`
+
+		templateString: '<div class="dijitRuleContainer dijitRuleContainerH dijitRuleLabelsContainer dijitRuleLabelsContainerH"></div>',
+
+		// labelStyle: String
+		//		CSS style to apply to individual text labels
+		labelStyle: "",
+
+		// labels: String[]?
+		//		Array of text labels to render - evenly spaced from left-to-right or bottom-to-top.
+		//		Alternately, minimum and maximum can be specified, to get numeric labels.
+		labels: [],
+
+		// numericMargin: Integer
+		//		Number of generated numeric labels that should be rendered as '' on the ends when labels[] are not specified
+		numericMargin: 0,
+
+		// numericMinimum: Integer
+		//		Leftmost label value for generated numeric labels when labels[] are not specified
+		minimum: 0,
+
+		// numericMaximum: Integer
+		//		Rightmost label value for generated numeric labels when labels[] are not specified
+		maximum: 1,
+
+		// constraints: Object
+		//		pattern, places, lang, et al (see dojo.number) for generated numeric labels when labels[] are not specified
+		constraints: {pattern: "#%"},
+
+		_positionPrefix: '<div class="dijitRuleLabelContainer dijitRuleLabelContainerH" style="left:',
+		_labelPrefix: '"><div class="dijitRuleLabel dijitRuleLabelH">',
+		_suffix: '</div></div>',
+
+		_calcPosition: function(pos){
+			// summary:
+			//		Returns the value to be used in HTML for the label as part of the left: attribute
+			// tags:
+			//		protected extension
+			return pos;
+		},
+
+		_genHTML: function(pos, ndx){
+			var label = this.labels[ndx];
+			return this._positionPrefix + this._calcPosition(pos) + this._positionSuffix + this.labelStyle +
+				this._genDirectionHTML(label) +
+				this._labelPrefix + label + this._suffix;
+		},
+
+		_genDirectionHTML: function(label){
+			// extension point for bidi code
+			return "";
+		},
+
+		getLabels: function(){
+			// summary:
+			//		Overridable function to return array of labels to use for this slider.
+			//		Can specify a getLabels() method instead of a labels[] array, or min/max attributes.
+			// tags:
+			//		protected extension
+
+			// if the labels array was not specified directly, then see if <li> children were
+			var labels = this.labels;
+			if(!labels.length && this.srcNodeRef){
+				// for markup creation, labels are specified as child elements
+				labels = query("> li", this.srcNodeRef).map(function(node){
+					return String(node.innerHTML);
+				});
+			}
+			// if the labels were not specified directly and not as <li> children, then calculate numeric labels
+			if(!labels.length && this.count > 1){
+				labels = [];	// avoid modifying labels[] array in the prototype
+				var start = this.minimum;
+				var inc = (this.maximum - start) / (this.count - 1);
+				for(var i = 0; i < this.count; i++){
+					labels.push((i < this.numericMargin || i >= (this.count - this.numericMargin)) ? '' : number.format(start, this.constraints));
+					start += inc;
+				}
+			}
+			return labels;
+		},
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			this.labels = this.getLabels();
+			this.count = this.labels.length;
+		}
+	});
+
+	if(has("dojo-bidi")){
+		HorizontalRuleLabels.extend({
+			_setTextDirAttr: function(textDir){
+				if(this.textDir != textDir){
+					this._set("textDir", textDir);
+					query(".dijitRuleLabelContainer", this.domNode).forEach(
+						lang.hitch(this, function(labelNode){
+							labelNode.style.direction = this.getTextDir(labelNode.innerText || labelNode.textContent || "");
+						})
+					);
+				}
+			},
+
+			_genDirectionHTML: function(label){
+				return (this.textDir ? ("direction:" + this.getTextDir(label) + ";") : "")
+			}
+		});
+	}
+
+	return HorizontalRuleLabels;
+});
diff --git a/src/main/resources/static/dijit/form/HorizontalSlider.js b/src/main/resources/static/dijit/form/HorizontalSlider.js
new file mode 100644
index 0000000000000000000000000000000000000000..66e450645e6d6e82ed805f7441c49ba7752f991e
--- /dev/null
+++ b/src/main/resources/static/dijit/form/HorizontalSlider.js
@@ -0,0 +1,390 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dnd/move",
+	"dojo/_base/fx", // fx.animateProperty
+	"dojo/dom-geometry", // domGeometry.position
+	"dojo/dom-style", // domStyle.getComputedStyle
+	"dojo/keys", // keys.DOWN_ARROW keys.END keys.HOME keys.LEFT_ARROW keys.PAGE_DOWN keys.PAGE_UP keys.RIGHT_ARROW keys.UP_ARROW
+	"dojo/_base/lang", // lang.hitch
+	"dojo/sniff", // has("ie") has("mozilla")
+	"dojo/dnd/Moveable", // Moveable
+	"dojo/dnd/Mover", // Mover Mover.prototype.destroy.apply
+	"dojo/query", // query
+	"dojo/mouse", // mouse.wheel
+	"dojo/on",
+	"../_base/manager", // defaultDuration
+	"../focus", // focus.focus()
+	"../typematic",
+	"./Button",
+	"./_FormValueWidget",
+	"../_Container",
+	"dojo/text!./templates/HorizontalSlider.html"
+], function(array, declare, move, fx, domGeometry, domStyle, keys, lang, has, Moveable, Mover, query, mouse, on,
+			manager, focus, typematic, Button, _FormValueWidget, _Container, template){
+
+	// module:
+	//		dijit/form/HorizontalSlider
+
+	var _SliderMover = declare("dijit.form._SliderMover", Mover, {
+		onMouseMove: function(e){
+			var widget = this.widget;
+			var abspos = widget._abspos;
+			if(!abspos){
+				abspos = widget._abspos = domGeometry.position(widget.sliderBarContainer, true);
+				widget._setPixelValue_ = lang.hitch(widget, "_setPixelValue");
+				widget._isReversed_ = widget._isReversed();
+			}
+			var pixelValue = e[widget._mousePixelCoord] - abspos[widget._startingPixelCoord];
+			widget._setPixelValue_(widget._isReversed_ ? (abspos[widget._pixelCount] - pixelValue) : pixelValue, abspos[widget._pixelCount], false);
+		},
+
+		destroy: function(e){
+			Mover.prototype.destroy.apply(this, arguments);
+			var widget = this.widget;
+			widget._abspos = null;
+			widget._setValueAttr(widget.value, true);
+		}
+	});
+
+	var HorizontalSlider = declare("dijit.form.HorizontalSlider", [_FormValueWidget, _Container], {
+		// summary:
+		//		A form widget that allows one to select a value with a horizontally draggable handle
+
+		templateString: template,
+
+		// Overrides FormValueWidget.value to indicate numeric value
+		value: 0,
+
+		// showButtons: [const] Boolean
+		//		Show increment/decrement buttons at the ends of the slider?
+		showButtons: true,
+
+		// minimum: [const] Integer
+		//		The minimum value the slider can be set to.
+		minimum: 0,
+
+		// maximum: [const] Integer
+		//		The maximum value the slider can be set to.
+		maximum: 100,
+
+		// discreteValues: Integer
+		//		If specified, indicates that the slider handle has only 'discreteValues' possible positions,
+		//		and that after dragging the handle, it will snap to the nearest possible position.
+		//		Thus, the slider has only 'discreteValues' possible values.
+		//
+		//		For example, if minimum=10, maxiumum=30, and discreteValues=3, then the slider handle has
+		//		three possible positions, representing values 10, 20, or 30.
+		//
+		//		If discreteValues is not specified or if it's value is higher than the number of pixels
+		//		in the slider bar, then the slider handle can be moved freely, and the slider's value will be
+		//		computed/reported based on pixel position (in this case it will likely be fractional,
+		//		such as 123.456789).
+		discreteValues: Infinity,
+
+		// pageIncrement: Integer
+		//		If discreteValues is also specified, this indicates the amount of clicks (ie, snap positions)
+		//		that the slider handle is moved via pageup/pagedown keys.
+		//		If discreteValues is not specified, it indicates the number of pixels.
+		pageIncrement: 2,
+
+		// clickSelect: Boolean
+		//		If clicking the slider bar changes the value or not
+		clickSelect: true,
+
+		// slideDuration: Number
+		//		The time in ms to take to animate the slider handle from 0% to 100%,
+		//		when clicking the slider bar to make the handle move.
+		slideDuration: manager.defaultDuration,
+
+		// Map widget attributes to DOMNode attributes.
+		_setIdAttr: "", // Override _FormWidget which sends id to focusNode
+		_setNameAttr: "valueNode", // Override default behavior to send to focusNode
+
+		baseClass: "dijitSlider",
+
+		// Apply CSS classes to up/down arrows and handle per mouse state
+		cssStateNodes: {
+			incrementButton: "dijitSliderIncrementButton",
+			decrementButton: "dijitSliderDecrementButton",
+			focusNode: "dijitSliderThumb"
+		},
+
+		_mousePixelCoord: "pageX",
+		_pixelCount: "w",
+		_startingPixelCoord: "x",
+		_handleOffsetCoord: "left",
+		_progressPixelSize: "width",
+
+		_onKeyUp: function(/*Event*/ e){
+			if(this.disabled || this.readOnly || e.altKey || e.ctrlKey || e.metaKey){
+				return;
+			}
+			this._setValueAttr(this.value, true);
+		},
+
+		_onKeyDown: function(/*Event*/ e){
+			if(this.disabled || this.readOnly || e.altKey || e.ctrlKey || e.metaKey){
+				return;
+			}
+			switch(e.keyCode){
+				case keys.HOME:
+					this._setValueAttr(this.minimum, false);
+					break;
+				case keys.END:
+					this._setValueAttr(this.maximum, false);
+					break;
+				// this._descending === false: if ascending vertical (min on top)
+				// (this._descending || this.isLeftToRight()): if left-to-right horizontal or descending vertical
+				case ((this._descending || this.isLeftToRight()) ? keys.RIGHT_ARROW : keys.LEFT_ARROW):
+				case (this._descending === false ? keys.DOWN_ARROW : keys.UP_ARROW):
+				case (this._descending === false ? keys.PAGE_DOWN : keys.PAGE_UP):
+					this.increment(e);
+					break;
+				case ((this._descending || this.isLeftToRight()) ? keys.LEFT_ARROW : keys.RIGHT_ARROW):
+				case (this._descending === false ? keys.UP_ARROW : keys.DOWN_ARROW):
+				case (this._descending === false ? keys.PAGE_UP : keys.PAGE_DOWN):
+					this.decrement(e);
+					break;
+				default:
+					return;
+			}
+			e.stopPropagation();
+			e.preventDefault();
+		},
+
+		_onHandleClick: function(e){
+			if(this.disabled || this.readOnly){
+				return;
+			}
+			if(!has("ie")){
+				// make sure you get focus when dragging the handle
+				// (but don't do on IE because it causes a flicker on mouse up (due to blur then focus)
+				focus.focus(this.sliderHandle);
+			}
+			e.stopPropagation();
+			e.preventDefault();
+		},
+
+		_isReversed: function(){
+			// summary:
+			//		Returns true if direction is from right to left
+			// tags:
+			//		protected extension
+			return !this.isLeftToRight();
+		},
+
+		_onBarClick: function(e){
+			if(this.disabled || this.readOnly || !this.clickSelect){
+				return;
+			}
+			focus.focus(this.sliderHandle);
+			e.stopPropagation();
+			e.preventDefault();
+			var abspos = domGeometry.position(this.sliderBarContainer, true);
+			var pixelValue = e[this._mousePixelCoord] - abspos[this._startingPixelCoord];
+			this._setPixelValue(this._isReversed() ? (abspos[this._pixelCount] - pixelValue) : pixelValue, abspos[this._pixelCount], true);
+			this._movable.onMouseDown(e);
+		},
+
+		_setPixelValue: function(/*Number*/ pixelValue, /*Number*/ maxPixels, /*Boolean?*/ priorityChange){
+			if(this.disabled || this.readOnly){
+				return;
+			}
+			var count = this.discreteValues;
+			if(count <= 1 || count == Infinity){
+				count = maxPixels;
+			}
+			count--;
+			var pixelsPerValue = maxPixels / count;
+			var wholeIncrements = Math.round(pixelValue / pixelsPerValue);
+			this._setValueAttr(Math.max(Math.min((this.maximum - this.minimum) * wholeIncrements / count + this.minimum, this.maximum), this.minimum), priorityChange);
+		},
+
+		_setValueAttr: function(/*Number*/ value, /*Boolean?*/ priorityChange){
+			// summary:
+			//		Hook so set('value', value) works.
+			this._set("value", value);
+			this.valueNode.value = value;
+			this.focusNode.setAttribute("aria-valuenow", value);
+			this.inherited(arguments);
+			var percent = this.maximum > this.minimum ? ((value - this.minimum) / (this.maximum - this.minimum)) : 0;
+			var progressBar = (this._descending === false) ? this.remainingBar : this.progressBar;
+			var remainingBar = (this._descending === false) ? this.progressBar : this.remainingBar;
+			if(this._inProgressAnim && this._inProgressAnim.status != "stopped"){
+				this._inProgressAnim.stop(true);
+			}
+			if(priorityChange && this.slideDuration > 0 && progressBar.style[this._progressPixelSize]){
+				// animate the slider
+				var _this = this;
+				var props = {};
+				var start = parseFloat(progressBar.style[this._progressPixelSize]);
+				var duration = this.slideDuration * (percent - start / 100);
+				if(duration == 0){
+					return;
+				}
+				if(duration < 0){
+					duration = 0 - duration;
+				}
+				props[this._progressPixelSize] = { start: start, end: percent * 100, units: "%" };
+				this._inProgressAnim = fx.animateProperty({ node: progressBar, duration: duration,
+					onAnimate: function(v){
+						remainingBar.style[_this._progressPixelSize] = (100 - parseFloat(v[_this._progressPixelSize])) + "%";
+					},
+					onEnd: function(){
+						delete _this._inProgressAnim;
+					},
+					properties: props
+				});
+				this._inProgressAnim.play();
+			}else{
+				progressBar.style[this._progressPixelSize] = (percent * 100) + "%";
+				remainingBar.style[this._progressPixelSize] = ((1 - percent) * 100) + "%";
+			}
+		},
+
+		_bumpValue: function(signedChange, /*Boolean?*/ priorityChange){
+			if(this.disabled || this.readOnly || (this.maximum <= this.minimum)){
+				return;
+			}
+			var s = domStyle.getComputedStyle(this.sliderBarContainer);
+			var c = domGeometry.getContentBox(this.sliderBarContainer, s);
+			var count = this.discreteValues;
+			if(count <= 1 || count == Infinity){
+				count = c[this._pixelCount];
+			}
+			count--;
+			// the division is imprecise so the expression has to be rounded to avoid long floating numbers
+			var value = Math.round((this.value - this.minimum) * count / (this.maximum - this.minimum)) + signedChange;
+			if(value < 0){
+				value = 0;
+			}
+			if(value > count){
+				value = count;
+			}
+			value = value * (this.maximum - this.minimum) / count + this.minimum;
+			this._setValueAttr(value, priorityChange);
+		},
+
+		_onClkBumper: function(val){
+			if(this.disabled || this.readOnly || !this.clickSelect){
+				return;
+			}
+			this._setValueAttr(val, true);
+		},
+
+		_onClkIncBumper: function(){
+			this._onClkBumper(this._descending === false ? this.minimum : this.maximum);
+		},
+
+		_onClkDecBumper: function(){
+			this._onClkBumper(this._descending === false ? this.maximum : this.minimum);
+		},
+
+		decrement: function(/*Event*/ e){
+			// summary:
+			//		Decrement slider
+			// tags:
+			//		private
+			this._bumpValue(e.keyCode == keys.PAGE_DOWN ? -this.pageIncrement : -1);
+		},
+
+		increment: function(/*Event*/ e){
+			// summary:
+			//		Increment slider
+			// tags:
+			//		private
+			this._bumpValue(e.keyCode == keys.PAGE_UP ? this.pageIncrement : 1);
+		},
+
+		_mouseWheeled: function(/*Event*/ evt){
+			// summary:
+			//		Event handler for mousewheel where supported
+
+			if(!this.focused){
+				// If use is scrolling over page and we happen to get the mouse wheel event, just ignore it.
+				return;
+			}
+
+			evt.stopPropagation();
+			evt.preventDefault();
+			this._bumpValue(evt.wheelDelta < 0 ? -1 : 1, true); // negative scroll acts like a decrement
+		},
+
+		startup: function(){
+			if(this._started){
+				return;
+			}
+
+			array.forEach(this.getChildren(), function(child){
+				if(this[child.container] != this.containerNode){
+					this[child.container].appendChild(child.domNode);
+				}
+			}, this);
+
+			this.inherited(arguments);
+		},
+
+		_typematicCallback: function(/*Number*/ count, /*Object*/ button, /*Event*/ e){
+			if(count == -1){
+				this._setValueAttr(this.value, true);
+			}else{
+				this[(button == (this._descending ? this.incrementButton : this.decrementButton)) ? "decrement" : "increment"](e);
+			}
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			if(this.showButtons){
+				this.incrementButton.style.display = "";
+				this.decrementButton.style.display = "";
+			}
+
+			// find any associated label element and add to slider focusnode.
+			var label = query('label[for="' + this.id + '"]');
+			if(label.length){
+				if(!label[0].id){
+					label[0].id = this.id + "_label";
+				}
+				this.focusNode.setAttribute("aria-labelledby", label[0].id);
+			}
+
+			this.focusNode.setAttribute("aria-valuemin", this.minimum);
+			this.focusNode.setAttribute("aria-valuemax", this.maximum);
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			if(this.showButtons){
+				this.own(
+					typematic.addMouseListener(this.decrementButton, this, "_typematicCallback", 25, 500),
+					typematic.addMouseListener(this.incrementButton, this, "_typematicCallback", 25, 500)
+				);
+			}
+			this.own(
+				on(this.domNode, mouse.wheel, lang.hitch(this, "_mouseWheeled"))
+			);
+
+			// define a custom constructor for a SliderMover that points back to me
+			var mover = declare(_SliderMover, {
+				widget: this
+			});
+			this._movable = new Moveable(this.sliderHandle, {mover: mover});
+
+			this._layoutHackIE7();
+		},
+
+		destroy: function(){
+			this._movable.destroy();
+			if(this._inProgressAnim && this._inProgressAnim.status != "stopped"){
+				this._inProgressAnim.stop(true);
+			}
+			this.inherited(arguments);
+		}
+	});
+
+	HorizontalSlider._Mover = _SliderMover;	// for monkey patching
+
+	return HorizontalSlider;
+});
diff --git a/src/main/resources/static/dijit/form/MappedTextBox.js b/src/main/resources/static/dijit/form/MappedTextBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..955fa29fd44f6e5df6dd73085ddcc20a1208f6ea
--- /dev/null
+++ b/src/main/resources/static/dijit/form/MappedTextBox.js
@@ -0,0 +1,85 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/sniff", // has("msapp")
+	"dojo/dom-construct", // domConstruct.place
+	"./ValidationTextBox"
+], function(declare, has, domConstruct, ValidationTextBox){
+
+	// module:
+	//		dijit/form/MappedTextBox
+
+	return declare("dijit.form.MappedTextBox", ValidationTextBox, {
+		// summary:
+		//		A dijit/form/ValidationTextBox subclass which provides a base class for widgets that have
+		//		a visible formatted display value, and a serializable
+		//		value in a hidden input field which is actually sent to the server.
+		// description:
+		//		The visible display may
+		//		be locale-dependent and interactive.  The value sent to the server is stored in a hidden
+		//		input field which uses the `name` attribute declared by the original widget.  That value sent
+		//		to the server is defined by the dijit/form/MappedTextBox.serialize() method and is typically
+		//		locale-neutral.
+		// tags:
+		//		protected
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+
+			// We want the name attribute to go to the hidden <input>, not the displayed <input>,
+			// so override _FormWidget.postMixInProperties() setting of nameAttrSetting for IE.
+			this.nameAttrSetting = "";
+		},
+
+		// Remap name attribute to be mapped to hidden node created in buildRendering(), rather than this.focusNode
+		_setNameAttr: "valueNode",
+
+		serialize: function(val /*=====, options =====*/){
+			// summary:
+			//		Overridable function used to convert the get('value') result to a canonical
+			//		(non-localized) string.  For example, will print dates in ISO format, and
+			//		numbers the same way as they are represented in javascript.
+			// val: anything
+			// options: Object?
+			// tags:
+			//		protected extension
+			return val.toString ? val.toString() : ""; // String
+		},
+
+		toString: function(){
+			// summary:
+			//		Returns widget as a printable string using the widget's value
+			// tags:
+			//		protected
+			var val = this.filter(this.get('value')); // call filter in case value is nonstring and filter has been customized
+			return val != null ? (typeof val == "string" ? val : this.serialize(val, this.constraints)) : ""; // String
+		},
+
+		validate: function(){
+			// Overrides `dijit/form/TextBox.validate`
+			this.valueNode.value = this.toString();
+			return this.inherited(arguments);
+		},
+
+		buildRendering: function(){
+			// Overrides `dijit/_TemplatedMixin/buildRendering`
+
+			this.inherited(arguments);
+
+			// Create a hidden <input> node with the serialized value used for submit
+			// (as opposed to the displayed value).
+			// Passing in name as markup rather than relying on _setNameAttr custom setter above
+			// to make query(input[name=...]) work on IE. (see #8660).
+			// But not doing that for Windows 8 Store apps because it causes a security exception (see #16452).
+			this.valueNode = domConstruct.place("<input type='hidden'" +
+				((this.name && !has("msapp")) ? ' name="' + this.name.replace(/"/g, "&quot;") + '"' : "") + "/>",
+				this.textbox, "after");
+		},
+
+		reset: function(){
+			// Overrides `dijit/form/ValidationTextBox.reset` to
+			// reset the hidden textbox value to ''
+			this.valueNode.value = '';
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/MultiSelect.js b/src/main/resources/static/dijit/form/MultiSelect.js
new file mode 100644
index 0000000000000000000000000000000000000000..71295130d2105b6df270e8755b9539e4bb4b15b7
--- /dev/null
+++ b/src/main/resources/static/dijit/form/MultiSelect.js
@@ -0,0 +1,169 @@
+define([
+	"dojo/_base/array", // indexOf, map, forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-geometry", // domGeometry.setMarginBox
+	"dojo/sniff",	// has("android")
+	"dojo/query", // query
+	"./_FormValueWidget",
+	"dojo/NodeList-dom"	// orphan()
+], function(array, declare, domGeometry, has, query, _FormValueWidget){
+
+	// module:
+	//		dijit/form/MultiSelect
+
+	var MultiSelect = declare("dijit.form.MultiSelect" + (has("dojo-bidi") ? "_NoBidi" : ""), _FormValueWidget, {
+		// summary:
+		//		Widget version of a `<select multiple=multiple>` element,
+		//		for selecting multiple options.
+
+		// size: Number
+		//		Number of elements to display on a page
+		//		NOTE: may be removed in version 2.0, since elements may have variable height;
+		//		set the size via style="..." or CSS class names instead.
+		size: 7,
+
+		baseClass: "dijitMultiSelect",
+
+		templateString: "<select multiple='multiple' ${!nameAttrSetting} data-dojo-attach-point='containerNode,focusNode' data-dojo-attach-event='onchange: _onChange'></select>",
+
+		addSelected: function(/*dijit/form/MultiSelect*/ select){
+			// summary:
+			//		Move the selected nodes of a passed Select widget
+			//		instance to this Select widget.
+			//
+			// example:
+			// |	// move all the selected values from "bar" to "foo"
+			// |	dijit.byId("foo").addSelected(dijit.byId("bar"));
+
+			select.getSelected().forEach(function(n){
+				this.containerNode.appendChild(n);
+				// scroll to bottom to see item
+				// cannot use scrollIntoView since <option> tags don't support all attributes
+				// does not work on IE due to a bug where <select> always shows scrollTop = 0
+				this.domNode.scrollTop = this.domNode.offsetHeight; // overshoot will be ignored
+				// scrolling the source select is trickier esp. on safari who forgets to change the scrollbar size
+				var oldscroll = select.domNode.scrollTop;
+				select.domNode.scrollTop = 0;
+				select.domNode.scrollTop = oldscroll;
+			}, this);
+			this._set('value', this.get('value'));
+		},
+
+		getSelected: function(){
+			// summary:
+			//		Access the NodeList of the selected options directly
+			return query("option", this.containerNode).filter(function(n){
+				return n.selected; // Boolean
+			}); // dojo/NodeList
+		},
+
+		_getValueAttr: function(){
+			// summary:
+			//		Hook so get('value') works.
+			// description:
+			//		Returns an array of the selected options' values.
+
+			// Don't call getSelect.map() because it doesn't return a real array,
+			// and that messes up dojo.toJson() calls like in the Form.html test
+			return array.map(this.getSelected(), function(n){
+				return n.value;
+			});
+		},
+
+		// Set multiple so parent form widget knows that I return multiple values.
+		// Also adding a no-op custom setter; otherwise the multiple property is applied to the <select> node
+		// which causes problem on Android < 4.4 with all but the first selected item being deselected.
+		multiple: true,
+		_setMultipleAttr: function(val){
+		},
+
+		_setValueAttr: function(/*String[]*/ values){
+			// summary:
+			//		Hook so set('value', values) works.
+			// description:
+			//		Set the value(s) of this Select based on passed values
+
+			if(has("android")){
+				// Workaround bizarre Android bug where deselecting one option selects another one.
+				// See https://code.google.com/p/android/issues/detail?id=68285.
+				// Could use this code path for all browsers but I worry about IE memory leaks.
+				query("option", this.containerNode).orphan().forEach(function(n){
+					var option = n.ownerDocument.createElement("option");
+					option.value = n.value;
+					option.selected = (array.indexOf(values, n.value) != -1);
+					option.text = n.text;
+					option.originalText = n.originalText;	// for bidi support, see has("dojo-bidi") block below
+					this.containerNode.appendChild(option);
+				}, this);
+			}else {
+				query("option", this.containerNode).forEach(function(n){
+					n.selected = (array.indexOf(values, n.value) != -1);
+				});
+			}
+
+			this.inherited(arguments);
+		},
+
+		invertSelection: function(/*Boolean?*/ onChange){
+			// summary:
+			//		Invert the selection
+			// onChange: Boolean
+			//		If false, onChange is not fired.
+			var val = [];
+			query("option", this.containerNode).forEach(function(n){
+				if(!n.selected){
+					val.push(n.value);
+				}
+			});
+			this._setValueAttr(val, !(onChange === false || onChange == null));
+		},
+
+		_onChange: function(/*Event*/){
+			this._handleOnChange(this.get('value'), true);
+		},
+
+		// for layout widgets:
+		resize: function(/*Object*/ size){
+			if(size){
+				domGeometry.setMarginBox(this.domNode, size);
+			}
+		},
+
+		postCreate: function(){
+			this._set('value', this.get('value'));
+			this.inherited(arguments);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		MultiSelect = declare("dijit.form.MultiSelect", MultiSelect, {
+			addSelected: function(/*dijit/form/MultiSelect*/ select){
+				select.getSelected().forEach(function(n){
+					n.text = this.enforceTextDirWithUcc(this.restoreOriginalText(n), n.text);
+				}, this);
+				this.inherited(arguments);
+			},
+
+			_setTextDirAttr: function(textDir){
+				// to insure the code executed only when _BidiSupport loaded, and only
+				// when there was a change in textDir
+				if((this.textDir != textDir || !this._created) && this.enforceTextDirWithUcc){
+					this._set("textDir", textDir);
+
+					query("option", this.containerNode).forEach(function(option){
+						// If the value wasn't defined explicitly, it the same object as
+						// option.text. Since the option.text will be modified (by wrapping of UCC)
+						// we want to save the original option.value for form submission.
+						if(!this._created && option.value === option.text){
+							option.value = option.text;
+						}
+						// apply the bidi support
+						option.text = this.enforceTextDirWithUcc(option, option.originalText || option.text);
+					}, this);
+				}
+			}
+		});
+	}
+
+	return MultiSelect;
+});
diff --git a/src/main/resources/static/dijit/form/NumberSpinner.js b/src/main/resources/static/dijit/form/NumberSpinner.js
new file mode 100644
index 0000000000000000000000000000000000000000..9251db97fb9d2718454f374350583a2c8e95c4d4
--- /dev/null
+++ b/src/main/resources/static/dijit/form/NumberSpinner.js
@@ -0,0 +1,72 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/keys", // keys.END keys.HOME
+	"./_Spinner",
+	"./NumberTextBox"
+], function(declare, keys, _Spinner, NumberTextBox){
+
+	// module:
+	//		dijit/form/NumberSpinner
+
+	return declare("dijit.form.NumberSpinner", [_Spinner, NumberTextBox.Mixin], {
+		// summary:
+		//		Extends NumberTextBox to add up/down arrows and pageup/pagedown for incremental change to the value
+		//
+		// description:
+		//		A `dijit/form/NumberTextBox` extension to provide keyboard accessible value selection
+		//		as well as icons for spinning direction. When using the keyboard, the typematic rules
+		//		apply, meaning holding the key will gradually increase or decrease the value and
+		//		accelerate.
+		//
+		// example:
+		//	| new NumberSpinner({ constraints:{ max:300, min:100 }}, "someInput");
+
+		baseClass: "dijitTextBox dijitSpinner dijitNumberTextBox",
+
+		adjust: function(/*Object*/ val, /*Number*/ delta){
+			// summary:
+			//		Change Number val by the given amount
+			// tags:
+			//		protected
+
+			var tc = this.constraints,
+				v = isNaN(val),
+				gotMax = !isNaN(tc.max),
+				gotMin = !isNaN(tc.min)
+				;
+			if(v && delta != 0){ // blank or invalid value and they want to spin, so create defaults
+				val = (delta > 0) ?
+					gotMin ? tc.min : gotMax ? tc.max : 0 :
+					gotMax ? this.constraints.max : gotMin ? tc.min : 0
+				;
+			}
+			var newval = val + delta;
+			if(v || isNaN(newval)){
+				return val;
+			}
+			if(gotMax && (newval > tc.max)){
+				newval = tc.max;
+			}
+			if(gotMin && (newval < tc.min)){
+				newval = tc.min;
+			}
+			return newval;
+		},
+
+		_onKeyDown: function(e){
+			if(this.disabled || this.readOnly){
+				return;
+			}
+			if((e.keyCode == keys.HOME || e.keyCode == keys.END) && !(e.ctrlKey || e.altKey || e.metaKey)
+				&& typeof this.get('value') != 'undefined' /* gibberish, so HOME and END are default editing keys*/){
+				var value = this.constraints[(e.keyCode == keys.HOME ? "min" : "max")];
+				if(typeof value == "number"){
+					this._setValueAttr(value, false);
+				}
+				// eat home or end key whether we change the value or not
+				e.stopPropagation();
+				e.preventDefault();
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/NumberTextBox.js b/src/main/resources/static/dijit/form/NumberTextBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..377efbf2e18dbbe87e7291c1c15be46d669d5a0e
--- /dev/null
+++ b/src/main/resources/static/dijit/form/NumberTextBox.js
@@ -0,0 +1,412 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang", // lang.hitch lang.mixin
+	"dojo/i18n", // i18n.normalizeLocale, i18n.getLocalization
+	"dojo/string", // string.rep
+	"dojo/number", // number._realNumberRegexp number.format number.parse number.regexp
+	"./RangeBoundTextBox"
+], function(declare, lang, i18n, string, number, RangeBoundTextBox){
+
+	// module:
+	//		dijit/form/NumberTextBox
+
+	// A private helper function to determine decimal information
+	// Returns an object with "sep" and "places" properties
+	var getDecimalInfo = function(constraints){
+		var constraints = constraints || {},
+			bundle = i18n.getLocalization("dojo.cldr", "number", i18n.normalizeLocale(constraints.locale)),
+			pattern = constraints.pattern ? constraints.pattern : bundle[(constraints.type || "decimal")+"Format"];
+
+		// The number of places in the constraint can be specified in several ways,
+		// the resolution order is:
+		//
+		// 1. If constraints.places is a number, use that
+		// 2. If constraints.places is a string, which specifies a range, use the range max (e.g. 0,4)
+		// 3. If a pattern is specified, use the implicit number of places in the pattern.
+		// 4. If neither constraints.pattern or constraints.places is specified, use the locale default pattern
+		var places;
+		if(typeof constraints.places == "number"){
+			places = constraints.places;
+		}else if(typeof constraints.places === "string" && constraints.places.length > 0){
+			places = constraints.places.replace(/.*,/, "");
+		}else{
+			places = (pattern.indexOf(".") != -1 ? pattern.split(".")[1].replace(/[^#0]/g, "").length : 0);
+		}
+
+		return { sep: bundle.decimal, places: places };
+	};
+
+	var NumberTextBoxMixin = declare("dijit.form.NumberTextBoxMixin", null, {
+		// summary:
+		//		A mixin for all number textboxes
+		// tags:
+		//		protected
+
+		// Override ValidationTextBox.pattern.... we use a reg-ex generating function rather
+		// than a straight regexp to deal with locale (plus formatting options too?)
+		pattern: function(constraints){
+			// if focused, accept either currency data or NumberTextBox format
+			return '(' + (this.focused && this.editOptions ? this._regExpGenerator(lang.delegate(constraints, this.editOptions)) + '|' : '')
+				+ this._regExpGenerator(constraints) + ')';
+		},
+
+		/*=====
+		// constraints: NumberTextBox.__Constraints
+		//		Despite the name, this parameter specifies both constraints on the input
+		//		(including minimum/maximum allowed values) as well as
+		//		formatting options like places (the number of digits to display after
+		//		the decimal point).
+		constraints: {},
+		======*/
+
+		// value: Number
+		//		The value of this NumberTextBox as a Javascript Number (i.e., not a String).
+		//		If the displayed value is blank, the value is NaN, and if the user types in
+		//		an gibberish value (like "hello world"), the value is undefined
+		//		(i.e. get('value') returns undefined).
+		//
+		//		Symmetrically, set('value', NaN) will clear the displayed value,
+		//		whereas set('value', undefined) will have no effect.
+		value: NaN,
+
+		// editOptions: [protected] Object
+		//		Properties to mix into constraints when the value is being edited.
+		//		This is here because we edit the number in the format "12345", which is
+		//		different than the display value (ex: "12,345")
+		editOptions: { pattern: '#.######' },
+
+		/*=====
+		_formatter: function(value, options){
+			// summary:
+			//		_formatter() is called by format().  It's the base routine for formatting a number,
+			//		as a string, for example converting 12345 into "12,345".
+			// value: Number
+			//		The number to be converted into a string.
+			// options: number.__FormatOptions?
+			//		Formatting options
+			// tags:
+			//		protected extension
+
+			return "12345";		// String
+		},
+		 =====*/
+		_formatter: number.format,
+
+		/*=====
+		_regExpGenerator: function(constraints){
+			// summary:
+			//		Generate a localized regular expression as a string, according to constraints.
+			// constraints: number.__ParseOptions
+			//		Formatting options
+			// tags:
+			//		protected
+
+			return "(\d*).(\d*)";	// string
+		},
+		=====*/
+		_regExpGenerator: number.regexp,
+
+		// _decimalInfo: Object
+		// summary:
+		//		An object containing decimal related properties relevant to this TextBox.
+		// tags:
+		//		private
+		_decimalInfo: getDecimalInfo(),
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			this._set("type", "text"); // in case type="number" was specified which messes up parse/format
+		},
+
+		_setConstraintsAttr: function(/*Object*/ constraints){
+			var places = typeof constraints.places == "number"? constraints.places : 0;
+			if(places){ places++; } // decimal rounding errors take away another digit of precision
+			if(typeof constraints.max != "number"){
+				constraints.max = 9 * Math.pow(10, 15-places);
+			}
+			if(typeof constraints.min != "number"){
+				constraints.min = -9 * Math.pow(10, 15-places);
+			}
+			this.inherited(arguments, [ constraints ]);
+			if(this.focusNode && this.focusNode.value && !isNaN(this.value)){
+				this.set('value', this.value);
+			}
+			// Capture decimal information based on the constraint locale and pattern.
+			this._decimalInfo = getDecimalInfo(constraints);
+		},
+
+		_onFocus: function(){
+			if(this.disabled || this.readOnly){ return; }
+			var val = this.get('value');
+			if(typeof val == "number" && !isNaN(val)){
+				var formattedValue = this.format(val, this.constraints);
+				if(formattedValue !== undefined){
+					this.textbox.value = formattedValue;
+				}
+			}
+			this.inherited(arguments);
+		},
+
+		format: function(/*Number*/ value, /*number.__FormatOptions*/ constraints){
+			// summary:
+			//		Formats the value as a Number, according to constraints.
+			// tags:
+			//		protected
+
+			var formattedValue = String(value);
+			if(typeof value != "number"){ return formattedValue; }
+			if(isNaN(value)){ return ""; }
+			// check for exponential notation that dojo/number.format() chokes on
+			if(!("rangeCheck" in this && this.rangeCheck(value, constraints)) && constraints.exponent !== false && /\de[-+]?\d/i.test(formattedValue)){
+				return formattedValue;
+			}
+			if(this.editOptions && this.focused){
+				constraints = lang.mixin({}, constraints, this.editOptions);
+			}
+			return this._formatter(value, constraints);
+		},
+
+		/*=====
+		_parser: function(value, constraints){
+			// summary:
+			//		Parses the string value as a Number, according to constraints.
+			// value: String
+			//		String representing a number
+			// constraints: number.__ParseOptions
+			//		Formatting options
+			// tags:
+			//		protected
+
+			return 123.45;		// Number
+		},
+		=====*/
+		_parser: number.parse,
+
+		parse: function(/*String*/ value, /*number.__FormatOptions*/ constraints){
+			// summary:
+			//		Replaceable function to convert a formatted string to a number value
+			// tags:
+			//		protected extension
+			var parserOptions = lang.mixin({}, constraints, (this.editOptions && this.focused) ? this.editOptions : {})
+			if(this.focused && parserOptions.places != null /* or undefined */){
+				var places = parserOptions.places;
+				var maxPlaces = typeof places === "number" ? places : Number(places.split(",").pop()); // handle number and range
+				parserOptions.places = "0," + maxPlaces;
+			}
+			var v = this._parser(value, parserOptions);
+			if(this.editOptions && this.focused && isNaN(v)){
+				v = this._parser(value, constraints); // parse w/o editOptions: not technically needed but is nice for the user
+			}
+			return v;
+		},
+
+		_getDisplayedValueAttr: function(){
+			var v = this.inherited(arguments);
+			return isNaN(v) ? this.textbox.value : v;
+		},
+
+		filter: function(/*Number*/ value){
+			// summary:
+			//		This is called with both the display value (string), and the actual value (a number).
+			//		When called with the actual value it does corrections so that '' etc. are represented as NaN.
+			//		Otherwise it dispatches to the superclass's filter() method.
+			//
+			//		See `dijit/form/TextBox.filter()` for more details.
+			if(value == null  /* or undefined */ || typeof value == "string" && value ==''){
+				return NaN;
+			}else if(typeof value == "number" && !isNaN(value) && value != 0){
+				value = number.round(value, this._decimalInfo.places);
+			}
+			return this.inherited(arguments, [value]);
+		},
+
+		serialize: function(/*Number*/ value, /*Object?*/ options){
+			// summary:
+			//		Convert value (a Number) into a canonical string (ie, how the number literal is written in javascript/java/C/etc.)
+			// tags:
+			//		protected
+			return (typeof value != "number" || isNaN(value)) ? '' : this.inherited(arguments);
+		},
+
+		_setBlurValue: function(){
+			var val = lang.hitch(lang.delegate(this, { focused: true }), "get")('value'); // parse with editOptions
+			this._setValueAttr(val, true);
+		},
+
+		_setValueAttr: function(/*Number*/ value, /*Boolean?*/ priorityChange, /*String?*/ formattedValue){
+			// summary:
+			//		Hook so set('value', ...) works.
+			if(value !== undefined && formattedValue === undefined){
+				formattedValue = String(value);
+				if(typeof value == "number"){
+					if(isNaN(value)){ formattedValue = '' }
+					// check for exponential notation that number.format chokes on
+					else if(("rangeCheck" in this && this.rangeCheck(value, this.constraints)) || this.constraints.exponent === false || !/\de[-+]?\d/i.test(formattedValue)){
+						formattedValue = undefined; // lets format compute a real string value
+					}
+				}else if(!value){ // 0 processed in if branch above, ''|null|undefined flows through here
+					formattedValue = '';
+					value = NaN;
+				}else{ // non-numeric values
+					value = undefined;
+				}
+			}
+			this.inherited(arguments, [value, priorityChange, formattedValue]);
+		},
+
+		_getValueAttr: function(){
+			// summary:
+			//		Hook so get('value') works.
+			//		Returns Number, NaN for '', or undefined for unparseable text
+			var v = this.inherited(arguments); // returns Number for all values accepted by parse() or NaN for all other displayed values
+
+			// If the displayed value of the textbox is gibberish (ex: "hello world"), this.inherited() above
+			// returns NaN; this if() branch converts the return value to undefined.
+			// Returning undefined prevents user text from being overwritten when doing _setValueAttr(_getValueAttr()).
+			// A blank displayed value is still returned as NaN.
+			if(isNaN(v) && this.textbox.value !== ''){
+				if(this.constraints.exponent !== false && /\de[-+]?\d/i.test(this.textbox.value) && (new RegExp("^"+number._realNumberRegexp(lang.delegate(this.constraints))+"$").test(this.textbox.value))){	// check for exponential notation that parse() rejected (erroneously?)
+					var n = Number(this.textbox.value);
+					return isNaN(n) ? undefined : n; // return exponential Number or undefined for random text (may not be possible to do with the above RegExp check)
+				}else{
+					return undefined; // gibberish
+				}
+			}else{
+				return v; // Number or NaN for ''
+			}
+		},
+
+		isValid: function(/*Boolean*/ isFocused){
+			// Overrides dijit/form/RangeBoundTextBox.isValid() to check that the editing-mode value is valid since
+			// it may not be formatted according to the regExp validation rules
+			if(!this.focused || this._isEmpty(this.textbox.value)){
+				return this.inherited(arguments);
+			}else{
+				var v = this.get('value');
+				if(!isNaN(v) && this.rangeCheck(v, this.constraints)){
+					if(this.constraints.exponent !== false && /\de[-+]?\d/i.test(this.textbox.value)){ // exponential, parse doesn't like it
+						return true; // valid exponential number in range
+					}else{
+						return this.inherited(arguments);
+					}
+				}else{
+					return false;
+				}
+			}
+		},
+
+		_isValidSubset: function(){
+			// Overrides dijit/form/ValidationTextBox._isValidSubset()
+			//
+			// The inherited method only checks that the computed regex pattern is valid, which doesn't
+			// take into account that numbers are a special case. Specifically:
+			//
+			//  (1) An arbitrary amount of leading or trailing zero's can be ignored.
+			//  (2) Since numeric input always occurs in the order of most significant to least significant
+			//      digits, the maximum and minimum possible values for partially inputted numbers can easily
+			//      be determined by using the number of remaining digit spaces available.
+			//
+			// For example, if an input has a maxLength of 5, and a min value of greater than 100, then the subset
+			// is invalid if there are 3 leading 0s. It remains valid for the first two.
+			//
+			// Another example is if the min value is 1.1. Once a value of 1.0 is entered, no additional trailing digits
+			// could possibly satisify the min requirement.
+			//
+			// See ticket #17923
+			var hasMinConstraint = (typeof this.constraints.min == "number"),
+				hasMaxConstraint = (typeof this.constraints.max == "number"),
+				curVal = this.get('value');
+
+			// If there is no parsable number, or there are no min or max bounds, then we can safely
+			// skip all remaining checks
+			if(isNaN(curVal) || (!hasMinConstraint && !hasMaxConstraint)){
+				return this.inherited(arguments);
+			}
+
+			// This block picks apart the values in the text box to be used later to compute the min and max possible
+			// values based on the current value and the remaining available digits.
+			//
+			// Warning: The use of a "num|0" expression, can be confusing. See the link below
+			// for an explanation.
+			//
+			// http://stackoverflow.com/questions/12125421/why-does-a-shift-by-0-truncate-the-decimal
+			var integerDigits = curVal|0,
+				valNegative = curVal < 0,
+				// Check if the current number has a decimal based on its locale
+				hasDecimal = this.textbox.value.indexOf(this._decimalInfo.sep) != -1,
+				// Determine the max digits based on the textbox length. If no length is
+				// specified, chose a huge number to account for crazy formatting.
+				maxDigits = this.maxLength || 20,
+				// Determine the remaining digits, based on the max digits
+				remainingDigitsCount = maxDigits - this.textbox.value.length,
+				// avoid approximation issues by capturing the decimal portion of the value as the user-entered string
+				fractionalDigitStr = hasDecimal ? this.textbox.value.split(this._decimalInfo.sep)[1].replace(/[^0-9]/g, "") : "";
+
+			// Create a normalized value string in the form of #.###
+			var normalizedValueStr = hasDecimal ? integerDigits+"."+fractionalDigitStr : integerDigits+"";
+
+			// The min and max values for the field can be determined using the following
+			// logic:
+			//
+			//  If the number is positive:
+			//      min value = the current value
+			//      max value = the current value with 9s appended for all remaining possible digits
+			//  else
+			//      min value = the current value with 9s appended for all remaining possible digits
+			//      max value = the current value
+			//
+			var ninePaddingStr = string.rep("9", remainingDigitsCount),
+			    minPossibleValue = curVal,
+			    maxPossibleValue = curVal;
+			if (valNegative){
+				minPossibleValue = Number(normalizedValueStr+ninePaddingStr);
+			} else{
+				maxPossibleValue = Number(normalizedValueStr+ninePaddingStr);
+			}
+
+			return !((hasMinConstraint && maxPossibleValue < this.constraints.min)
+					|| (hasMaxConstraint && minPossibleValue > this.constraints.max));
+		}
+	});
+
+	var NumberTextBox = declare("dijit.form.NumberTextBox", [RangeBoundTextBox, NumberTextBoxMixin], {
+		// summary:
+		//		A TextBox for entering numbers, with formatting and range checking
+		// description:
+		//		NumberTextBox is a textbox for entering and displaying numbers, supporting
+		//		the following main features:
+		//
+		//		1. Enforce minimum/maximum allowed values (as well as enforcing that the user types
+		//			a number rather than a random string)
+		//		2. NLS support (altering roles of comma and dot as "thousands-separator" and "decimal-point"
+		//			depending on locale).
+		//		3. Separate modes for editing the value and displaying it, specifically that
+		//			the thousands separator character (typically comma) disappears when editing
+		//			but reappears after the field is blurred.
+		//		4. Formatting and constraints regarding the number of places (digits after the decimal point)
+		//			allowed on input, and number of places displayed when blurred (see `constraints` parameter).
+
+		baseClass: "dijitTextBox dijitNumberTextBox"
+	});
+
+	NumberTextBox.Mixin = NumberTextBoxMixin;	// for monkey patching
+
+	/*=====
+	 NumberTextBox.__Constraints = declare([RangeBoundTextBox.__Constraints, number.__FormatOptions, number.__ParseOptions], {
+		 // summary:
+		 //		Specifies both the rules on valid/invalid values (minimum, maximum,
+		 //		number of required decimal places), and also formatting options for
+		 //		displaying the value when the field is not focused.
+		 // example:
+		 //		Minimum/maximum:
+		 //		To specify a field between 0 and 120:
+		 //	|		{min:0,max:120}
+		 //		To specify a field that must be an integer:
+		 //	|		{fractional:false}
+		 //		To specify a field where 0 to 3 decimal places are allowed on input:
+		 //	|		{places:'0,3'}
+	 });
+	 =====*/
+
+	return NumberTextBox;
+});
diff --git a/src/main/resources/static/dijit/form/RadioButton.js b/src/main/resources/static/dijit/form/RadioButton.js
new file mode 100644
index 0000000000000000000000000000000000000000..105c04d7558cdb27ac1439496b9e09b380934b5f
--- /dev/null
+++ b/src/main/resources/static/dijit/form/RadioButton.js
@@ -0,0 +1,16 @@
+define([
+	"dojo/_base/declare", // declare
+	"./CheckBox",
+	"./_RadioButtonMixin"
+], function(declare, CheckBox, _RadioButtonMixin){
+
+	// module:
+	//		dijit/form/RadioButton
+
+	return declare("dijit.form.RadioButton", [CheckBox, _RadioButtonMixin], {
+		// summary:
+		//		Same as an HTML radio, but with fancy styling.
+
+		baseClass: "dijitRadio"
+	});
+});
diff --git a/src/main/resources/static/dijit/form/RangeBoundTextBox.js b/src/main/resources/static/dijit/form/RangeBoundTextBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..8e26f46f61e91dafe42d29bbbd7f5d65cba85fce
--- /dev/null
+++ b/src/main/resources/static/dijit/form/RangeBoundTextBox.js
@@ -0,0 +1,100 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/i18n", // i18n.getLocalization
+	"./MappedTextBox",
+	"dojo/i18n!./nls/validate"
+], function(declare, i18n, MappedTextBox){
+
+	// module:
+	//		dijit/form/RangeBoundTextBox
+
+
+	var RangeBoundTextBox = declare("dijit.form.RangeBoundTextBox", MappedTextBox, {
+		// summary:
+		//		Base class for textbox form widgets which defines a range of valid values.
+
+		// rangeMessage: String
+		//		The message to display if value is out-of-range
+		rangeMessage: "",
+
+		/*=====
+		// constraints: RangeBoundTextBox.__Constraints
+		constraints: {},
+		======*/
+
+		rangeCheck: function(/*Number*/ primitive, /*dijit/form/RangeBoundTextBox.__Constraints*/ constraints){
+			// summary:
+			//		Overridable function used to validate the range of the numeric input value.
+			// tags:
+			//		protected
+			return	("min" in constraints? (this.compare(primitive,constraints.min) >= 0) : true) &&
+				("max" in constraints? (this.compare(primitive,constraints.max) <= 0) : true); // Boolean
+		},
+
+		isInRange: function(/*Boolean*/ /*===== isFocused =====*/){
+			// summary:
+			//		Tests if the value is in the min/max range specified in constraints
+			// tags:
+			//		protected
+			return this.rangeCheck(this.get('value'), this.constraints);
+		},
+
+		_isDefinitelyOutOfRange: function(){
+			// summary:
+			//		Returns true if the value is out of range and will remain
+			//		out of range even if the user types more characters
+			var val = this.get('value');
+			if(val == null){ return false; } // not yet valid enough to compare to
+			var outOfRange = false;
+			if("min" in this.constraints){
+				var min = this.constraints.min;
+				outOfRange = this.compare(val, ((typeof min == "number") && min >= 0 && val != 0) ? 0 : min) < 0;
+			}
+			if(!outOfRange && ("max" in this.constraints)){
+				var max = this.constraints.max;
+				outOfRange = this.compare(val, ((typeof max != "number") || max > 0) ? max : 0) > 0;
+			}
+			return outOfRange;
+		},
+
+		_isValidSubset: function(){
+			// summary:
+			//		Overrides `dijit/form/ValidationTextBox._isValidSubset()`.
+			//		Returns true if the input is syntactically valid, and either within
+			//		range or could be made in range by more typing.
+			return this.inherited(arguments) && !this._isDefinitelyOutOfRange();
+		},
+
+		isValid: function(/*Boolean*/ isFocused){
+			// Overrides dijit/form/ValidationTextBox.isValid() to check that the value is also in range.
+			return this.inherited(arguments) &&
+				((this._isEmpty(this.textbox.value) && !this.required) || this.isInRange(isFocused)); // Boolean
+		},
+
+		getErrorMessage: function(/*Boolean*/ isFocused){
+			// Overrides dijit/form/ValidationTextBox.getErrorMessage() to print "out of range" message if appropriate
+			var v = this.get('value');
+			if(v != null /* and !undefined */ && v !== '' && (typeof v != "number" || !isNaN(v)) && !this.isInRange(isFocused)){ // don't check isInRange w/o a real value
+				return this.rangeMessage; // String
+			}
+			return this.inherited(arguments);
+		},
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			if(!this.rangeMessage){
+				this.messages = i18n.getLocalization("dijit.form", "validate", this.lang);
+				this.rangeMessage = this.messages.rangeMessage;
+			}
+		}
+	});
+	/*=====
+	RangeBoundTextBox.__Constraints = declare(null, {
+		// min: Number
+		//		Minimum signed value.  Default is -Infinity
+		// max: Number
+		//		Maximum signed value.  Default is +Infinity
+	});
+	=====*/
+	return RangeBoundTextBox;
+});
diff --git a/src/main/resources/static/dijit/form/Select.js b/src/main/resources/static/dijit/form/Select.js
new file mode 100644
index 0000000000000000000000000000000000000000..99f269f5a328f6a0d8711e787ca86ff53d623c87
--- /dev/null
+++ b/src/main/resources/static/dijit/form/Select.js
@@ -0,0 +1,448 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/dom-class", // domClass.add domClass.remove domClass.toggle
+	"dojo/dom-geometry", // domGeometry.setMarginBox
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/keys",
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dojo/sniff", // has("ie")
+	"./_FormSelectWidget",
+	"../_HasDropDown",
+	"../DropDownMenu",
+	"../MenuItem",
+	"../MenuSeparator",
+	"../Tooltip",
+	"../_KeyNavMixin",
+	"../registry", // registry.byNode
+	"dojo/text!./templates/Select.html",
+	"dojo/i18n!./nls/validate"
+], function(array, declare, domAttr, domClass, domGeometry, i18n, keys, lang, on, has,
+			_FormSelectWidget, _HasDropDown, DropDownMenu, MenuItem, MenuSeparator, Tooltip, _KeyNavMixin, registry, template){
+
+	// module:
+	//		dijit/form/Select
+
+	var _SelectMenu = declare("dijit.form._SelectMenu", DropDownMenu, {
+		// summary:
+		//		An internally-used menu for dropdown that allows us a vertical scrollbar
+
+		// Override Menu.autoFocus setting so that opening a Select highlights the current value.
+		autoFocus: true,
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			this.domNode.setAttribute("role", "listbox");
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// stop mousemove from selecting text on IE to be consistent with other browsers
+			this.own(on(this.domNode, "selectstart", function(evt){
+				evt.preventDefault();
+				evt.stopPropagation();
+			}));
+		},
+
+		focus: function(){
+			// summary:
+			//		Overridden so that the previously selected value will be focused instead of only the first item
+			var found = false,
+				val = this.parentWidget.value;
+			if(lang.isArray(val)){
+				val = val[val.length - 1];
+			}
+			if(val){ // if focus selected
+				array.forEach(this.parentWidget._getChildren(), function(child){
+					if(child.option && (val === child.option.value)){ // find menu item widget with this value
+						found = true;
+						this.focusChild(child, false); // focus previous selection
+					}
+				}, this);
+			}
+			if(!found){
+				this.inherited(arguments); // focus first item by default
+			}
+		}
+	});
+
+	var Select = declare("dijit.form.Select" + (has("dojo-bidi") ? "_NoBidi" : ""), [_FormSelectWidget, _HasDropDown, _KeyNavMixin], {
+		// summary:
+		//		This is a "styleable" select box - it is basically a DropDownButton which
+		//		can take a `<select>` as its input.
+
+		baseClass: "dijitSelect dijitValidationTextBox",
+
+		templateString: template,
+
+		_buttonInputDisabled: has("ie") ? "disabled" : "", // allows IE to disallow focus, but Firefox cannot be disabled for mousedown events
+
+		// required: Boolean
+		//		Can be true or false, default is false.
+		required: false,
+
+		// state: [readonly] String
+		//		"Incomplete" if this select is required but unset (i.e. blank value), "" otherwise
+		state: "",
+
+		// message: String
+		//		Currently displayed error/prompt message
+		message: "",
+
+		// tooltipPosition: String[]
+		//		See description of `dijit/Tooltip.defaultPosition` for details on this parameter.
+		tooltipPosition: [],
+
+		// emptyLabel: string
+		//		What to display in an "empty" dropdown
+		emptyLabel: "&#160;", // &nbsp;
+
+		// _isLoaded: Boolean
+		//		Whether or not we have been loaded
+		_isLoaded: false,
+
+		// _childrenLoaded: Boolean
+		//		Whether or not our children have been loaded
+		_childrenLoaded: false,
+
+		// labelType: String
+		//		Specifies how to interpret the labelAttr in the data store items.
+		//		Can be "html" or "text".
+		labelType: "html",
+
+		_fillContent: function(){
+			// summary:
+			//		Set the value to be the first, or the selected index
+			this.inherited(arguments);
+			// set value from selected option
+			if(this.options.length && !this.value && this.srcNodeRef){
+				var si = this.srcNodeRef.selectedIndex || 0; // || 0 needed for when srcNodeRef is not a SELECT
+				this._set("value", this.options[si >= 0 ? si : 0].value);
+			}
+			// Create the dropDown widget
+			this.dropDown = new _SelectMenu({ id: this.id + "_menu", parentWidget: this });
+			domClass.add(this.dropDown.domNode, this.baseClass.replace(/\s+|$/g, "Menu "));
+		},
+
+		_getMenuItemForOption: function(/*_FormSelectWidget.__SelectOption*/ option){
+			// summary:
+			//		For the given option, return the menu item that should be
+			//		used to display it.  This can be overridden as needed
+			if(!option.value && !option.label){
+				// We are a separator (no label set for it)
+				return new MenuSeparator({ownerDocument: this.ownerDocument});
+			}else{
+				// Just a regular menu option
+				var click = lang.hitch(this, "_setValueAttr", option);
+				var item = new MenuItem({
+					option: option,
+					label: (this.labelType === 'text' ? (option.label || '').toString()
+						.replace(/&/g, '&amp;').replace(/</g, '&lt;') :
+						option.label) || this.emptyLabel,
+					onClick: click,
+					ownerDocument: this.ownerDocument,
+					dir: this.dir,
+					textDir: this.textDir,
+					disabled: option.disabled || false
+				});
+				item.focusNode.setAttribute("role", "option");
+				return item;
+			}
+		},
+
+		_addOptionItem: function(/*_FormSelectWidget.__SelectOption*/ option){
+			// summary:
+			//		For the given option, add an option to our dropdown.
+			//		If the option doesn't have a value, then a separator is added
+			//		in that place.
+			if(this.dropDown){
+				this.dropDown.addChild(this._getMenuItemForOption(option));
+			}
+		},
+
+		_getChildren: function(){
+			if(!this.dropDown){
+				return [];
+			}
+			return this.dropDown.getChildren();
+		},
+
+		focus: function(){
+			// Override _KeyNavMixin::focus(), which calls focusFirstChild().
+			// We just want the standard form widget behavior.
+			if(!this.disabled && this.focusNode.focus){
+				try{
+					this.focusNode.focus();
+				}catch(e){
+					/*squelch errors from hidden nodes*/
+				}
+			}
+		},
+
+		focusChild: function(/*dijit/_WidgetBase*/ widget){
+			// summary:
+			//		Sets the value to the given option, used during search by letter.
+			// widget:
+			//		Reference to option's widget
+			// tags:
+			//		protected
+			if(widget){
+				this.set('value', widget.option);
+			}
+		},
+
+		_getFirst: function(){
+			// summary:
+			//		Returns the first child widget.
+			// tags:
+			//		abstract extension
+			var children = this._getChildren();
+			return children.length ? children[0] : null;
+		},
+
+		_getLast: function(){
+			// summary:
+			//		Returns the last child widget.
+			// tags:
+			//		abstract extension
+			var children = this._getChildren();
+			return children.length ? children[children.length-1] : null;
+		},
+
+		childSelector: function(/*DOMNode*/ node){
+			// Implement _KeyNavMixin.childSelector, to identify focusable child nodes.
+			// If we allowed a dojo/query dependency from this module this could more simply be a string "> *"
+			// instead of this function.
+
+			var node = registry.byNode(node);
+			return node && node.getParent() == this.dropDown;
+		},
+
+		onKeyboardSearch: function(/*dijit/_WidgetBase*/ item, /*Event*/ evt, /*String*/ searchString, /*Number*/ numMatches){
+			// summary:
+			//		When a key is pressed that matches a child item,
+			//		this method is called so that a widget can take appropriate action is necessary.
+			// tags:
+			//		protected
+			if(item){
+				this.focusChild(item);
+			}
+		},
+
+		_loadChildren: function(/*Boolean*/ loadMenuItems){
+			// summary:
+			//		Resets the menu and the length attribute of the button - and
+			//		ensures that the label is appropriately set.
+			// loadMenuItems: Boolean
+			//		actually loads the child menu items - we only do this when we are
+			//		populating for showing the dropdown.
+
+			if(loadMenuItems === true){
+				// this.inherited destroys this.dropDown's child widgets (MenuItems).
+				// Avoid this.dropDown (Menu widget) having a pointer to a destroyed widget (which will cause
+				// issues later in _setSelected). (see #10296)
+				if(this.dropDown){
+					delete this.dropDown.focusedChild;
+					this.focusedChild = null;
+				}
+				if(this.options.length){
+					this.inherited(arguments);
+				}else{
+					// Drop down menu is blank but add one blank entry just so something appears on the screen
+					// to let users know that they are no choices (mimicing native select behavior)
+					array.forEach(this._getChildren(), function(child){
+						child.destroyRecursive();
+					});
+					var item = new MenuItem({
+						ownerDocument: this.ownerDocument,
+						label: this.emptyLabel
+					});
+					this.dropDown.addChild(item);
+				}
+			}else{
+				this._updateSelection();
+			}
+
+			this._isLoaded = false;
+			this._childrenLoaded = true;
+
+			if(!this._loadingStore){
+				// Don't call this if we are loading - since we will handle it later
+				this._setValueAttr(this.value, false);
+			}
+		},
+
+		_refreshState: function(){
+			if(this._started){
+				this.validate(this.focused);
+			}
+		},
+
+		startup: function(){
+			this.inherited(arguments);
+			this._refreshState(); // after all _set* methods have run
+		},
+
+		_setValueAttr: function(value){
+			this.inherited(arguments);
+			domAttr.set(this.valueNode, "value", this.get("value"));
+			this._refreshState();	// to update this.state
+		},
+
+		_setNameAttr: "valueNode",
+
+		_setDisabledAttr: function(/*Boolean*/ value){
+			this.inherited(arguments);
+			this._refreshState();	// to update this.state
+		},
+
+		_setRequiredAttr: function(/*Boolean*/ value){
+			this._set("required", value);
+			this.focusNode.setAttribute("aria-required", value);
+			this._refreshState();	// to update this.state
+		},
+
+		_setOptionsAttr: function(/*Array*/ options){
+			this._isLoaded = false;
+			this._set('options', options);
+		},
+
+		_setDisplay: function(/*String*/ newDisplay){
+			// summary:
+			//		sets the display for the given value (or values)
+
+			var lbl = (this.labelType === 'text' ? (newDisplay || '')
+					.replace(/&/g, '&amp;').replace(/</g, '&lt;') :
+					newDisplay) || this.emptyLabel;
+			this.containerNode.innerHTML = '<span role="option" aria-selected="true" class="dijitReset dijitInline ' + this.baseClass.replace(/\s+|$/g, "Label ") + '">' + lbl + '</span>';
+		},
+
+		validate: function(/*Boolean*/ isFocused){
+			// summary:
+			//		Called by oninit, onblur, and onkeypress, and whenever required/disabled state changes
+			// description:
+			//		Show missing or invalid messages if appropriate, and highlight textbox field.
+			//		Used when a select is initially set to no value and the user is required to
+			//		set the value.
+
+			var isValid = this.disabled || this.isValid(isFocused);
+			this._set("state", isValid ? "" : (this._hasBeenBlurred ? "Error" : "Incomplete"));
+			this.focusNode.setAttribute("aria-invalid", isValid ? "false" : "true");
+			var message = isValid ? "" : this._missingMsg;
+			if(message && this.focused && this._hasBeenBlurred){
+				Tooltip.show(message, this.domNode, this.tooltipPosition, !this.isLeftToRight());
+			}else{
+				Tooltip.hide(this.domNode);
+			}
+			this._set("message", message);
+			return isValid;
+		},
+
+		isValid: function(/*Boolean*/ /*===== isFocused =====*/){
+			// summary:
+			//		Whether or not this is a valid value.  The only way a Select
+			//		can be invalid is when it's required but nothing is selected.
+			return (!this.required || this.value === 0 || !(/^\s*$/.test(this.value || ""))); // handle value is null or undefined
+		},
+
+		reset: function(){
+			// summary:
+			//		Overridden so that the state will be cleared.
+			this.inherited(arguments);
+			Tooltip.hide(this.domNode);
+			this._refreshState();	// to update this.state
+		},
+
+		postMixInProperties: function(){
+			// summary:
+			//		set the missing message
+			this.inherited(arguments);
+			this._missingMsg = i18n.getLocalization("dijit.form", "validate", this.lang).missingMessage;
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// stop mousemove from selecting text on IE to be consistent with other browsers
+			this.own(on(this.domNode, "selectstart", function(evt){
+				evt.preventDefault();
+				evt.stopPropagation();
+			}));
+
+			this.domNode.setAttribute("aria-expanded", "false");
+
+			// Prevent _KeyNavMixin from calling stopPropagation() on left and right arrow keys, thus breaking
+			// navigation when Select inside Toolbar.
+			var keyNavCodes = this._keyNavCodes;
+			delete keyNavCodes[keys.LEFT_ARROW];
+			delete keyNavCodes[keys.RIGHT_ARROW];
+		},
+
+		_setStyleAttr: function(/*String||Object*/ value){
+			this.inherited(arguments);
+			domClass.toggle(this.domNode, this.baseClass.replace(/\s+|$/g, "FixedWidth "), !!this.domNode.style.width);
+		},
+
+		isLoaded: function(){
+			return this._isLoaded;
+		},
+
+		loadDropDown: function(/*Function*/ loadCallback){
+			// summary:
+			//		populates the menu
+			this._loadChildren(true);
+			this._isLoaded = true;
+			loadCallback();
+		},
+
+		destroy: function(preserveDom){
+			if(this.dropDown && !this.dropDown._destroyed){
+				this.dropDown.destroyRecursive(preserveDom);
+				delete this.dropDown;
+			}
+			Tooltip.hide(this.domNode);	// in case Select (or enclosing Dialog) destroyed while tooltip shown
+			this.inherited(arguments);
+		},
+
+		_onFocus: function(){
+			this.validate(true);	// show tooltip if second focus of required tooltip, but no selection
+			// Note: not calling superclass _onFocus() to avoid _KeyNavMixin::_onFocus() setting tabIndex --> -1
+		},
+
+		_onBlur: function(){
+			Tooltip.hide(this.domNode);
+			this.inherited(arguments);
+			this.validate(false);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		Select = declare("dijit.form.Select", Select, {
+			_setDisplay: function(/*String*/ newDisplay){
+				this.inherited(arguments);
+				this.applyTextDir(this.containerNode);
+			}
+		});
+	}
+
+	Select._Menu = _SelectMenu;	// for monkey patching
+
+	// generic event helper to ensure the dropdown items are loaded before the real event handler is called
+	function _onEventAfterLoad(method){
+		return function(evt){
+			if(!this._isLoaded){
+				this.loadDropDown(lang.hitch(this, method, evt));
+			}else{
+				this.inherited(method, arguments);
+			}
+		};
+	}
+	Select.prototype._onContainerKeydown = _onEventAfterLoad("_onContainerKeydown");
+	Select.prototype._onContainerKeypress = _onEventAfterLoad("_onContainerKeypress");
+
+	return Select;
+});
diff --git a/src/main/resources/static/dijit/form/SimpleTextarea.js b/src/main/resources/static/dijit/form/SimpleTextarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..5017b084e9964a69c61005ba11fe1550eba0708b
--- /dev/null
+++ b/src/main/resources/static/dijit/form/SimpleTextarea.js
@@ -0,0 +1,90 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add
+	"dojo/sniff", // has("ie") has("opera")
+	"./TextBox"
+], function(declare, domClass, has, TextBox){
+
+	// module:
+	//		dijit/form/SimpleTextarea
+
+	return declare("dijit.form.SimpleTextarea", TextBox, {
+		// summary:
+		//		A simple textarea that degrades, and responds to
+		//		minimal LayoutContainer usage, and works with dijit/form/Form.
+		//		Doesn't automatically size according to input, like Textarea.
+		//
+		// example:
+		//	|	<textarea data-dojo-type="dijit/form/SimpleTextarea" name="foo" value="bar" rows=30 cols=40></textarea>
+		//
+		// example:
+		//	|	new SimpleTextarea({ rows:20, cols:30 }, "foo");
+
+		baseClass: "dijitTextBox dijitTextArea",
+
+		// rows: Number
+		//		The number of rows of text.
+		rows: "3",
+
+		// rows: Number
+		//		The number of characters per line.
+		cols: "20",
+
+		templateString: "<textarea ${!nameAttrSetting} data-dojo-attach-point='focusNode,containerNode,textbox' autocomplete='off'></textarea>",
+
+		postMixInProperties: function(){
+			// Copy value from srcNodeRef, unless user specified a value explicitly (or there is no srcNodeRef)
+			// TODO: parser will handle this in 2.0
+			if(!this.value && this.srcNodeRef){
+				this.value = this.srcNodeRef.value;
+			}
+			this.inherited(arguments);
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			if(has("ie") && this.cols){ // attribute selectors is not supported in IE6
+				domClass.add(this.textbox, "dijitTextAreaCols");
+			}
+		},
+
+		filter: function(/*String*/ value){
+			// Override TextBox.filter to deal with newlines... specifically (IIRC) this is for IE which writes newlines
+			// as \r\n instead of just \n
+			if(value){
+				value = value.replace(/\r/g, "");
+			}
+			return this.inherited(arguments);
+		},
+
+		_onInput: function(/*Event?*/ e){
+			// Override TextBox._onInput() to enforce maxLength restriction
+			if(this.maxLength){
+				var maxLength = parseInt(this.maxLength);
+				var value = this.textbox.value.replace(/\r/g, '');
+				var overflow = value.length - maxLength;
+				if(overflow > 0){
+					var textarea = this.textbox;
+					if(textarea.selectionStart){
+						var pos = textarea.selectionStart;
+						var cr = 0;
+						if(has("opera")){
+							cr = (this.textbox.value.substring(0, pos).match(/\r/g) || []).length;
+						}
+						this.textbox.value = value.substring(0, pos - overflow - cr) + value.substring(pos - cr);
+						textarea.setSelectionRange(pos - overflow, pos - overflow);
+					}else if(this.ownerDocument.selection){ //IE
+						textarea.focus();
+						var range = this.ownerDocument.selection.createRange();
+						// delete overflow characters
+						range.moveStart("character", -overflow);
+						range.text = '';
+						// show cursor
+						range.select();
+					}
+				}
+			}
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/Slider.js b/src/main/resources/static/dijit/form/Slider.js
new file mode 100644
index 0000000000000000000000000000000000000000..128741f5fa6b4c02129214751c0e30afd9b2d24f
--- /dev/null
+++ b/src/main/resources/static/dijit/form/Slider.js
@@ -0,0 +1,23 @@
+define([
+	"dojo/_base/kernel", // kernel.deprecated
+	"./HorizontalSlider",
+	"./VerticalSlider",
+	"./HorizontalRule",
+	"./VerticalRule",
+	"./HorizontalRuleLabels",
+	"./VerticalRuleLabels"
+], function(kernel){
+
+	// module:
+	//		dijit/form/Slider
+
+	kernel.deprecated("Call require() for HorizontalSlider / VerticalRule, explicitly rather than 'dijit.form.Slider' itself", "", "2.0");
+
+	/*=====
+	 return {
+		 // summary:
+		 //		Rollup of all the the Slider related widgets
+		 //		For back-compat, remove for 2.0
+	 };
+	 =====*/
+});
diff --git a/src/main/resources/static/dijit/form/TextBox.js b/src/main/resources/static/dijit/form/TextBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..561f83c5ffec3be777597f0557eea8547db91af7
--- /dev/null
+++ b/src/main/resources/static/dijit/form/TextBox.js
@@ -0,0 +1,175 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-construct", // domConstruct.create
+	"dojo/dom-style", // domStyle.getComputedStyle
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dojo/sniff", // has("ie") has("mozilla")
+	"./_FormValueWidget",
+	"./_TextBoxMixin",
+	"dojo/text!./templates/TextBox.html",
+	"../main"	// to export dijit._setSelectionRange, remove in 2.0
+], function(declare, domConstruct, domStyle, kernel, lang, on, has,
+			_FormValueWidget, _TextBoxMixin, template, dijit){
+
+	// module:
+	//		dijit/form/TextBox
+
+	var TextBox = declare("dijit.form.TextBox" + (has("dojo-bidi") ? "_NoBidi" : ""), [_FormValueWidget, _TextBoxMixin], {
+		// summary:
+		//		A base class for textbox form inputs
+
+		templateString: template,
+		_singleNodeTemplate: '<input class="dijit dijitReset dijitLeft dijitInputField" data-dojo-attach-point="textbox,focusNode" autocomplete="off" type="${type}" ${!nameAttrSetting} />',
+
+		_buttonInputDisabled: has("ie") ? "disabled" : "", // allows IE to disallow focus, but Firefox cannot be disabled for mousedown events
+
+		baseClass: "dijitTextBox",
+
+		postMixInProperties: function(){
+			var type = this.type.toLowerCase();
+			if(this.templateString && this.templateString.toLowerCase() == "input" || ((type == "hidden" || type == "file") && this.templateString == this.constructor.prototype.templateString)){
+				this.templateString = this._singleNodeTemplate;
+			}
+			this.inherited(arguments);
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			if(has("ie") < 9){
+				// IE INPUT tag fontFamily has to be set directly using STYLE
+				// the defer gives IE a chance to render the TextBox and to deal with font inheritance
+				this.defer(function(){
+					try{
+						var s = domStyle.getComputedStyle(this.domNode); // can throw an exception if widget is immediately destroyed
+						if(s){
+							var ff = s.fontFamily;
+							if(ff){
+								var inputs = this.domNode.getElementsByTagName("INPUT");
+								if(inputs){
+									for(var i=0; i < inputs.length; i++){
+										inputs[i].style.fontFamily = ff;
+									}
+								}
+							}
+						}
+					}catch(e){/*when used in a Dialog, and this is called before the dialog is
+					 shown, s.fontFamily would trigger "Invalid Argument" error.*/}
+				});
+			}
+		},
+
+		_setPlaceHolderAttr: function(v){
+			this._set("placeHolder", v);
+			if(!this._phspan){
+				this._attachPoints.push('_phspan');
+				this._phspan = domConstruct.create('span', {
+					// dijitInputField class gives placeHolder same padding as the input field
+					// parent node already has dijitInputField class but it doesn't affect this <span>
+					// since it's position: absolute.
+					className: 'dijitPlaceHolder dijitInputField'
+				}, this.textbox, 'after');
+				this.own(
+					on(this._phspan, "mousedown", function(evt){ evt.preventDefault(); }),
+					on(this._phspan, "touchend, pointerup, MSPointerUp", lang.hitch(this, function(){
+						// If the user clicks placeholder rather than the <input>, need programmatic focus.  Normally this
+						// is done in _FormWidgetMixin._onFocus() but after [30663] it's done on a delay, which is ineffective.
+						this.focus();
+					}))
+				);
+			}
+			this._phspan.innerHTML="";
+			this._phspan.appendChild(this._phspan.ownerDocument.createTextNode(v));
+			this._updatePlaceHolder();
+		},
+
+		_onInput: function(/*Event*/ evt){
+			// summary:
+			//		Called AFTER the input event has happened
+			//		See if the placeHolder text should be removed or added while editing.
+			this.inherited(arguments);
+			this._updatePlaceHolder();
+		},
+
+		_updatePlaceHolder: function(){
+			if(this._phspan){
+				this._phspan.style.display = (this.placeHolder && !this.textbox.value) ? "" : "none";
+			}
+		},
+
+		_setValueAttr: function(value, /*Boolean?*/ priorityChange, /*String?*/ formattedValue){
+			this.inherited(arguments);
+			this._updatePlaceHolder();
+		},
+
+		getDisplayedValue: function(){
+			// summary:
+			//		Deprecated.  Use get('displayedValue') instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated(this.declaredClass+"::getDisplayedValue() is deprecated. Use get('displayedValue') instead.", "", "2.0");
+			return this.get('displayedValue');
+		},
+
+		setDisplayedValue: function(/*String*/ value){
+			// summary:
+			//		Deprecated.  Use set('displayedValue', ...) instead.
+			// tags:
+			//		deprecated
+			kernel.deprecated(this.declaredClass+"::setDisplayedValue() is deprecated. Use set('displayedValue', ...) instead.", "", "2.0");
+			this.set('displayedValue', value);
+		},
+
+		_onBlur: function(e){
+			if(this.disabled){ return; }
+			this.inherited(arguments);
+			this._updatePlaceHolder();
+
+			if(has("mozilla")){
+				if(this.selectOnClick){
+					// clear selection so that the next mouse click doesn't reselect
+					this.textbox.selectionStart = this.textbox.selectionEnd = undefined;
+				}
+			}
+		},
+
+		_onFocus: function(/*String*/ by){
+			if(this.disabled || this.readOnly){ return; }
+			this.inherited(arguments);
+			this._updatePlaceHolder();
+		}
+	});
+
+	if(has("ie") < 9){
+		TextBox.prototype._isTextSelected = function(){
+			var range = this.ownerDocument.selection.createRange();
+			var parent = range.parentElement();
+			return parent == this.textbox && range.text.length > 0;
+		};
+
+		// Overrides definition of _setSelectionRange from _TextBoxMixin (TODO: move to _TextBoxMixin.js?)
+		dijit._setSelectionRange = _TextBoxMixin._setSelectionRange = function(/*DomNode*/ element, /*Number?*/ start, /*Number?*/ stop){
+			if(element.createTextRange){
+				var r = element.createTextRange();
+				r.collapse(true);
+				r.moveStart("character", -99999); // move to 0
+				r.moveStart("character", start); // delta from 0 is the correct position
+				r.moveEnd("character", stop-start);
+				r.select();
+			}
+		}
+	}
+
+	if(has("dojo-bidi")){
+		TextBox = declare("dijit.form.TextBox", TextBox, {
+			_setPlaceHolderAttr: function(v){
+				this.inherited(arguments);
+				this.applyTextDir(this._phspan);
+			}
+		});
+	}
+
+	return TextBox;
+});
diff --git a/src/main/resources/static/dijit/form/Textarea.js b/src/main/resources/static/dijit/form/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..3550e5ed1837c7e4e3089937473e8a6e37543250
--- /dev/null
+++ b/src/main/resources/static/dijit/form/Textarea.js
@@ -0,0 +1,37 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-style", // domStyle.set
+	"./_ExpandingTextAreaMixin",
+	"./SimpleTextarea"
+], function(declare, domStyle, _ExpandingTextAreaMixin, SimpleTextarea){
+
+	// module:
+	//		dijit/form/Textarea
+
+	return declare("dijit.form.Textarea", [SimpleTextarea, _ExpandingTextAreaMixin], {
+		// summary:
+		//		A textarea widget that adjusts it's height according to the amount of data.
+		//
+		// description:
+		//		A textarea that dynamically expands/contracts (changing it's height) as
+		//		the user types, to display all the text without requiring a scroll bar.
+		//
+		//		Takes nearly all the parameters (name, value, etc.) that a vanilla textarea takes.
+		//		Rows is not supported since this widget adjusts the height.
+
+
+		// TODO: for 2.0, rename this to ExpandingTextArea, and rename SimpleTextarea to TextArea
+
+		baseClass: "dijitTextBox dijitTextArea dijitExpandingTextArea",
+
+		// Override SimpleTextArea.cols to default to width:100%, for backward compatibility
+		cols: "",
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			// tweak textarea style to reduce browser differences
+			domStyle.set(this.textbox, { overflowY: 'hidden', overflowX: 'auto', boxSizing: 'border-box', MsBoxSizing: 'border-box', WebkitBoxSizing: 'border-box', MozBoxSizing: 'border-box' });
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/TimeTextBox.js b/src/main/resources/static/dijit/form/TimeTextBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..26f2987ad781657e8053a9ff715262b01d919dc8
--- /dev/null
+++ b/src/main/resources/static/dijit/form/TimeTextBox.js
@@ -0,0 +1,82 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/keys", // keys.DOWN_ARROW keys.ENTER keys.ESCAPE keys.TAB keys.UP_ARROW
+	"dojo/_base/lang", // lang.hitch
+	"../_TimePicker",
+	"./_DateTimeTextBox"
+], function(declare, keys, lang, _TimePicker, _DateTimeTextBox){
+
+	// module:
+	//		dijit/form/TimeTextBox
+
+
+	var TimeTextBox = declare("dijit.form.TimeTextBox", _DateTimeTextBox, {
+		// summary:
+		//		A validating, serializable, range-bound time text box with a drop down time picker
+
+		baseClass: "dijitTextBox dijitComboBox dijitTimeTextBox",
+		popupClass: _TimePicker,
+		_selector: "time",
+
+/*=====
+		// constraints: TimeTextBox.__Constraints
+		//		Despite the name, this parameter specifies both constraints on the input
+		//		(including minimum/maximum allowed values) as well as
+		//		formatting options.  See `dijit/form/TimeTextBox.__Constraints` for details.
+		constraints:{},
+=====*/
+
+		// value: Date
+		//		The value of this widget as a JavaScript Date object.  Note that the date portion implies time zone and daylight savings rules.
+		//
+		//		Example:
+		// |	new dijit/form/TimeTextBox({value: stamp.fromISOString("T12:59:59", new Date())})
+		//
+		//		When passed to the parser in markup, must be specified according to locale-independent
+		//		`stamp.fromISOString` format.
+		//
+		//		Example:
+		// |	<input data-dojo-type='dijit/form/TimeTextBox' value='T12:34:00'>
+		value: new Date(""),		// value.toString()="NaN"
+		//FIXME: in markup, you have no control over daylight savings
+
+		// Add scrollbars if necessary so that dropdown doesn't cover the <input>
+		maxHeight: -1,
+
+		openDropDown: function(/*Function*/ callback){
+			this.inherited(arguments);
+
+			// For screen readers, as user arrows through values, populate <input> with latest value.
+			this.dropDown.on("input", lang.hitch(this, function(){
+				this.set('value', this.dropDown.get("value"), false);
+			}));
+		},
+
+		_onInput: function(){
+			this.inherited(arguments);
+
+			// set this.filterString to the filter to apply to the drop down list;
+			// it will be used in openDropDown()
+			var val = this.get('displayedValue');
+			this.filterString = (val && !this.parse(val, this.constraints)) ? val.toLowerCase() : "";
+
+			// close the drop down and reopen it, in order to filter the items shown in the list
+			// and also since the drop down may need to be repositioned if the number of list items has changed
+			// and it's being displayed above the <input>
+			if(this._opened){
+				this.closeDropDown();
+			}
+			this.openDropDown();
+		}
+	});
+
+	/*=====
+	 TimeTextBox.__Constraints = declare([_DateTimeTextBox.__Constraints, _TimePicker.__Constraints], {
+		 // summary:
+		 //		Specifies both the rules on valid/invalid values (first/last time allowed),
+		 //		and also formatting options for how the time is displayed.
+	 });
+	 =====*/
+
+	return TimeTextBox;
+});
diff --git a/src/main/resources/static/dijit/form/ToggleButton.js b/src/main/resources/static/dijit/form/ToggleButton.js
new file mode 100644
index 0000000000000000000000000000000000000000..f61390c22d3e93342700cae9f88d0f3eb0960139
--- /dev/null
+++ b/src/main/resources/static/dijit/form/ToggleButton.js
@@ -0,0 +1,26 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/_base/kernel", // kernel.deprecated
+	"./Button",
+	"./_ToggleButtonMixin"
+], function(declare, kernel, Button, _ToggleButtonMixin){
+
+	// module:
+	//		dijit/form/ToggleButton
+
+
+	return declare("dijit.form.ToggleButton", [Button, _ToggleButtonMixin], {
+		// summary:
+		//		A templated button widget that can be in two states (checked or not).
+		//		Can be base class for things like tabs or checkbox or radio buttons.
+
+		baseClass: "dijitToggleButton",
+
+		setChecked: function(/*Boolean*/ checked){
+			// summary:
+			//		Deprecated.  Use set('checked', true/false) instead.
+			kernel.deprecated("setChecked("+checked+") is deprecated. Use set('checked',"+checked+") instead.", "", "2.0");
+			this.set('checked', checked);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/ValidationTextBox.js b/src/main/resources/static/dijit/form/ValidationTextBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..54cfd2e7ade108bacf2c7abd0861e02f5b541b88
--- /dev/null
+++ b/src/main/resources/static/dijit/form/ValidationTextBox.js
@@ -0,0 +1,339 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/lang",
+	"dojo/i18n", // i18n.getLocalization
+	"./TextBox",
+	"../Tooltip",
+	"dojo/text!./templates/ValidationTextBox.html",
+	"dojo/i18n!./nls/validate"
+], function(declare, kernel, lang, i18n, TextBox, Tooltip, template){
+
+	// module:
+	//		dijit/form/ValidationTextBox
+
+
+	var ValidationTextBox = declare("dijit.form.ValidationTextBox", TextBox, {
+		// summary:
+		//		Base class for textbox widgets with the ability to validate content of various types and provide user feedback.
+
+		templateString: template,
+
+		// required: Boolean
+		//		User is required to enter data into this field.
+		required: false,
+
+		// promptMessage: String
+		//		If defined, display this hint string immediately on focus to the textbox, if empty.
+		//		Also displays if the textbox value is Incomplete (not yet valid but will be with additional input).
+		//		Think of this like a tooltip that tells the user what to do, not an error message
+		//		that tells the user what they've done wrong.
+		//
+		//		Message disappears when user starts typing.
+		promptMessage: "",
+
+		// invalidMessage: String
+		//		The message to display if value is invalid.
+		//		The translated string value is read from the message file by default.
+		//		Set to "" to use the promptMessage instead.
+		invalidMessage: "$_unset_$",
+
+		// missingMessage: String
+		//		The message to display if value is empty and the field is required.
+		//		The translated string value is read from the message file by default.
+		//		Set to "" to use the invalidMessage instead.
+		missingMessage: "$_unset_$",
+
+		// message: String
+		//		Currently error/prompt message.
+		//		When using the default tooltip implementation, this will only be
+		//		displayed when the field is focused.
+		message: "",
+
+		// constraints: ValidationTextBox.__Constraints
+		//		Despite the name, this parameter specifies both constraints on the input as well as
+		//		formatting options.  See `dijit/form/ValidationTextBox.__Constraints` for details.
+		constraints:{},
+
+		// pattern: [extension protected] String|Function(constraints) returning a string.
+		//		This defines the regular expression used to validate the input.
+		//		Do not add leading ^ or $ characters since the widget adds these.
+		//		A function may be used to generate a valid pattern when dependent on constraints or other runtime factors.
+		//		set('pattern', String|Function).
+		pattern: ".*",
+
+		// regExp: Deprecated [extension protected] String.  Use "pattern" instead.
+		regExp: "",
+
+		regExpGen: function(/*__Constraints*/ /*===== constraints =====*/){
+			// summary:
+			//		Deprecated.  Use set('pattern', Function) instead.
+		},
+
+		// state: [readonly] String
+		//		Shows current state (ie, validation result) of input (""=Normal, Incomplete, or Error)
+		state: "",
+
+		// tooltipPosition: String[]
+		//		See description of `dijit/Tooltip.defaultPosition` for details on this parameter.
+		tooltipPosition: [],
+
+		_deprecateRegExp: function(attr, value){
+			if(value != ValidationTextBox.prototype[attr]){
+				kernel.deprecated("ValidationTextBox id="+this.id+", set('" + attr + "', ...) is deprecated.  Use set('pattern', ...) instead.", "", "2.0");
+				this.set('pattern', value);
+			}
+		},
+		_setRegExpGenAttr: function(/*Function*/ newFcn){
+			this._deprecateRegExp("regExpGen", newFcn);
+			this._set("regExpGen", this._computeRegexp); // backward compat with this.regExpGen(this.constraints)
+		},
+		_setRegExpAttr: function(/*String*/ value){
+			this._deprecateRegExp("regExp", value);
+		},
+
+		_setValueAttr: function(){
+			// summary:
+			//		Hook so set('value', ...) works.
+			this.inherited(arguments);
+			this._refreshState();
+		},
+
+		validator: function(/*anything*/ value, /*__Constraints*/ constraints){
+			// summary:
+			//		Overridable function used to validate the text input against the regular expression.
+			// tags:
+			//		protected
+			return (new RegExp("^(?:" + this._computeRegexp(constraints) + ")"+(this.required?"":"?")+"$")).test(value) &&
+				(!this.required || !this._isEmpty(value)) &&
+				(this._isEmpty(value) || this.parse(value, constraints) !== undefined); // Boolean
+		},
+
+		_isValidSubset: function(){
+			// summary:
+			//		Returns true if the value is either already valid or could be made valid by appending characters.
+			//		This is used for validation while the user [may be] still typing.
+			return this.textbox.value.search(this._partialre) == 0;
+		},
+
+		isValid: function(/*Boolean*/ /*===== isFocused =====*/){
+			// summary:
+			//		Tests if value is valid.
+			//		Can override with your own routine in a subclass.
+			// tags:
+			//		protected
+			return this.validator(this.textbox.value, this.get('constraints'));
+		},
+
+		_isEmpty: function(value){
+			// summary:
+			//		Checks for whitespace
+			return (this.trim ? /^\s*$/ : /^$/).test(value); // Boolean
+		},
+
+		getErrorMessage: function(/*Boolean*/ /*===== isFocused =====*/){
+			// summary:
+			//		Return an error message to show if appropriate
+			// tags:
+			//		protected
+			var invalid = this.invalidMessage == "$_unset_$" ? this.messages.invalidMessage :
+				!this.invalidMessage ? this.promptMessage : this.invalidMessage;
+			var missing = this.missingMessage == "$_unset_$" ? this.messages.missingMessage :
+				!this.missingMessage ? invalid : this.missingMessage;
+			return (this.required && this._isEmpty(this.textbox.value)) ? missing : invalid; // String
+		},
+
+		getPromptMessage: function(/*Boolean*/ /*===== isFocused =====*/){
+			// summary:
+			//		Return a hint message to show when widget is first focused
+			// tags:
+			//		protected
+			return this.promptMessage; // String
+		},
+
+		_maskValidSubsetError: true,
+		validate: function(/*Boolean*/ isFocused){
+			// summary:
+			//		Called by oninit, onblur, and onkeypress.
+			// description:
+			//		Show missing or invalid messages if appropriate, and highlight textbox field.
+			// tags:
+			//		protected
+			var message = "";
+			var isValid = this.disabled || this.isValid(isFocused);
+			if(isValid){ this._maskValidSubsetError = true; }
+			var isEmpty = this._isEmpty(this.textbox.value);
+			var isValidSubset = !isValid && isFocused && this._isValidSubset();
+			this._set("state", isValid ? "" : (((((!this._hasBeenBlurred || isFocused) && isEmpty) || isValidSubset) && (this._maskValidSubsetError || (isValidSubset && !this._hasBeenBlurred && isFocused))) ? "Incomplete" : "Error"));
+			this.focusNode.setAttribute("aria-invalid", this.state == "Error" ? "true" : "false");
+
+			if(this.state == "Error"){
+				this._maskValidSubsetError = isFocused && isValidSubset; // we want the error to show up after a blur and refocus
+				message = this.getErrorMessage(isFocused);
+			}else if(this.state == "Incomplete"){
+				message = this.getPromptMessage(isFocused); // show the prompt whenever the value is not yet complete
+				this._maskValidSubsetError = !this._hasBeenBlurred || isFocused; // no Incomplete warnings while focused
+			}else if(isEmpty){
+				message = this.getPromptMessage(isFocused); // show the prompt whenever there's no error and no text
+			}
+			this.set("message", message);
+
+			return isValid;
+		},
+
+		displayMessage: function(/*String*/ message){
+			// summary:
+			//		Overridable method to display validation errors/hints.
+			//		By default uses a tooltip.
+			// tags:
+			//		extension
+			if(message && this.focused){
+				Tooltip.show(message, this.domNode, this.tooltipPosition, !this.isLeftToRight());
+			}else{
+				Tooltip.hide(this.domNode);
+			}
+		},
+
+		_refreshState: function(){
+			// Overrides TextBox._refreshState()
+			if(this._created){ // should instead be this._started but that would require all programmatic ValidationTextBox instantiations to call startup()
+				this.validate(this.focused);
+			}
+			this.inherited(arguments);
+		},
+
+		//////////// INITIALIZATION METHODS ///////////////////////////////////////
+
+		constructor: function(params /*===== , srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified, replace srcNodeRef with my generated DOM tree.
+
+			this.constraints = lang.clone(this.constraints);
+			this.baseClass += ' dijitValidationTextBox';
+		},
+
+		startup: function(){
+			this.inherited(arguments);
+			this._refreshState(); // after all _set* methods have run
+		},
+
+		_setConstraintsAttr: function(/*__Constraints*/ constraints){
+			if(!constraints.locale && this.lang){
+				constraints.locale = this.lang;
+			}
+			this._set("constraints", constraints);
+			this._refreshState();
+		},
+
+		_setPatternAttr: function(/*String|Function*/ pattern){
+			this._set("pattern", pattern); // don't set on INPUT to avoid native HTML5 validation
+			this._refreshState();
+		},
+
+		_computeRegexp: function(/*__Constraints*/ constraints){
+			// summary:
+			//		Hook to get the current regExp and to compute the partial validation RE.
+
+			var p = this.pattern;
+			if(typeof p == "function"){
+				p = p.call(this, constraints);
+			}
+			if(p != this._lastRegExp){
+				var partialre = "";
+				this._lastRegExp = p;
+				// parse the regexp and produce a new regexp that matches valid subsets
+				// if the regexp is .* then there's no use in matching subsets since everything is valid
+				if(p != ".*"){
+					p.replace(/\\.|\[\]|\[.*?[^\\]{1}\]|\{.*?\}|\(\?[=:!]|./g,
+					function(re){
+						switch(re.charAt(0)){
+							case '{':
+							case '+':
+							case '?':
+							case '*':
+							case '^':
+							case '$':
+							case '|':
+							case '(':
+								partialre += re;
+								break;
+							case ")":
+								partialre += "|$)";
+								break;
+							 default:
+								partialre += "(?:"+re+"|$)";
+								break;
+						}
+					});
+				}
+				try{ // this is needed for now since the above regexp parsing needs more test verification
+					"".search(partialre);
+				}catch(e){ // should never be here unless the original RE is bad or the parsing is bad
+					partialre = this.pattern;
+					console.warn('RegExp error in ' + this.declaredClass + ': ' + this.pattern);
+				} // should never be here unless the original RE is bad or the parsing is bad
+				this._partialre = "^(?:" + partialre + ")$";
+			}
+			return p;
+		},
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			this.messages = i18n.getLocalization("dijit.form", "validate", this.lang);
+			this._setConstraintsAttr(this.constraints); // this needs to happen now (and later) due to codependency on _set*Attr calls attachPoints
+		},
+
+		_setDisabledAttr: function(/*Boolean*/ value){
+			this.inherited(arguments);	// call FormValueWidget._setDisabledAttr()
+			this._refreshState();
+		},
+
+		_setRequiredAttr: function(/*Boolean*/ value){
+			this._set("required", value);
+			this.focusNode.setAttribute("aria-required", value);
+			this._refreshState();
+		},
+
+		_setMessageAttr: function(/*String*/ message){
+			this._set("message", message);
+			this.displayMessage(message);
+		},
+
+		reset:function(){
+			// Overrides dijit/form/TextBox.reset() by also
+			// hiding errors about partial matches
+			this._maskValidSubsetError = true;
+			this.inherited(arguments);
+		},
+
+		_onBlur: function(){
+			// the message still exists but for back-compat, and to erase the tooltip
+			// (if the message is being displayed as a tooltip), call displayMessage('')
+			this.displayMessage('');
+
+			this.inherited(arguments);
+		},
+
+		destroy: function(){
+			Tooltip.hide(this.domNode);	// in case tooltip show when ValidationTextBox (or enclosing Dialog) destroyed
+			this.inherited(arguments);
+		}
+	});
+
+	/*=====
+	 ValidationTextBox.__Constraints = {
+		 // locale: String
+		 //		locale used for validation, picks up value from this widget's lang attribute
+		 // _flags_: anything
+		 //		various flags passed to pattern function
+	 };
+	 =====*/
+
+	return ValidationTextBox;
+});
diff --git a/src/main/resources/static/dijit/form/VerticalRule.js b/src/main/resources/static/dijit/form/VerticalRule.js
new file mode 100644
index 0000000000000000000000000000000000000000..4f0397ee26e6d4b5898006170cbcfff5fdff0847
--- /dev/null
+++ b/src/main/resources/static/dijit/form/VerticalRule.js
@@ -0,0 +1,28 @@
+define([
+	"dojo/_base/declare", // declare
+	"./HorizontalRule"
+], function(declare, HorizontalRule){
+
+	// module:
+	//		dijit/form/VerticalRule
+
+	return declare("dijit.form.VerticalRule", HorizontalRule, {
+		// summary:
+		//		Hash marks for the `dijit/form/VerticalSlider`
+
+		templateString: '<div class="dijitRuleContainer dijitRuleContainerV"></div>',
+		_positionPrefix: '<div class="dijitRuleMark dijitRuleMarkV" style="top:',
+
+	/*=====
+		// container: String
+		//		This is either "leftDecoration" or "rightDecoration",
+		//		to indicate whether this rule goes to the left or to the right of the slider.
+		//		Note that on RTL system, "leftDecoration" would actually go to the right, and vice-versa.
+		container: "",
+	=====*/
+
+		// Overrides HorizontalRule._isHorizontal
+		_isHorizontal: false
+
+	});
+});
diff --git a/src/main/resources/static/dijit/form/VerticalRuleLabels.js b/src/main/resources/static/dijit/form/VerticalRuleLabels.js
new file mode 100644
index 0000000000000000000000000000000000000000..d9b121f0b7542c59db870121b67a1504a523940e
--- /dev/null
+++ b/src/main/resources/static/dijit/form/VerticalRuleLabels.js
@@ -0,0 +1,26 @@
+define([
+	"dojo/_base/declare", // declare
+	"./HorizontalRuleLabels"
+], function(declare, HorizontalRuleLabels){
+
+	// module:
+	//		dijit/form/VerticalRuleLabels
+
+	return declare("dijit.form.VerticalRuleLabels", HorizontalRuleLabels, {
+		// summary:
+		//		Labels for the `dijit/form/VerticalSlider`
+
+		templateString: '<div class="dijitRuleContainer dijitRuleContainerV dijitRuleLabelsContainer dijitRuleLabelsContainerV"></div>',
+
+		_positionPrefix: '<div class="dijitRuleLabelContainer dijitRuleLabelContainerV" style="top:',
+		_labelPrefix: '"><span class="dijitRuleLabel dijitRuleLabelV">',
+
+		_calcPosition: function(pos){
+			// Overrides HorizontalRuleLabel._calcPosition()
+			return 100-pos;
+		},
+
+		// needed to prevent labels from being reversed in RTL mode
+		_isHorizontal: false
+	});
+});
diff --git a/src/main/resources/static/dijit/form/VerticalSlider.js b/src/main/resources/static/dijit/form/VerticalSlider.js
new file mode 100644
index 0000000000000000000000000000000000000000..dbdae856250af529e2041815073e480e78b778d1
--- /dev/null
+++ b/src/main/resources/static/dijit/form/VerticalSlider.js
@@ -0,0 +1,33 @@
+define([
+	"dojo/_base/declare", // declare
+	"./HorizontalSlider",
+	"dojo/text!./templates/VerticalSlider.html"
+], function(declare, HorizontalSlider, template){
+
+	// module:
+	//		dijit/form/VerticalSlider
+
+	return declare("dijit.form.VerticalSlider", HorizontalSlider, {
+		// summary:
+		//		A form widget that allows one to select a value with a vertically draggable handle
+
+		templateString: template,
+		_mousePixelCoord: "pageY",
+		_pixelCount: "h",
+		_startingPixelCoord: "y",
+		_handleOffsetCoord: "top",
+		_progressPixelSize: "height",
+
+		// _descending: Boolean
+		//		Specifies if the slider values go from high-on-top (true), or low-on-top (false)
+		//		TODO: expose this in 1.2 - the css progress/remaining bar classes need to be reversed
+		_descending: true,
+
+		_isReversed: function(){
+			// summary:
+			//		Overrides HorizontalSlider._isReversed.
+			//		Indicates if values are high on top (with low numbers on the bottom).
+			return this._descending;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_AutoCompleterMixin.js b/src/main/resources/static/dijit/form/_AutoCompleterMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..77b2f69ee5fd70b0689589402161d21e9ef42a66
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_AutoCompleterMixin.js
@@ -0,0 +1,594 @@
+define([
+	"dojo/aspect",
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.get
+	"dojo/keys",
+	"dojo/_base/lang", // lang.clone lang.hitch
+	"dojo/query", // query
+	"dojo/regexp", // regexp.escapeString
+	"dojo/sniff", // has("ie")
+	"./DataList",
+	"./_TextBoxMixin", // defines _TextBoxMixin.selectInputText
+	"./_SearchMixin"
+], function(aspect, declare, domAttr, keys, lang, query, regexp, has, DataList, _TextBoxMixin, SearchMixin){
+
+	// module:
+	//		dijit/form/_AutoCompleterMixin
+
+	var AutoCompleterMixin = declare("dijit.form._AutoCompleterMixin", SearchMixin, {
+		// summary:
+		//		A mixin that implements the base functionality for `dijit/form/ComboBox`/`dijit/form/FilteringSelect`
+		// description:
+		//		All widgets that mix in dijit/form/_AutoCompleterMixin must extend `dijit/form/_FormValueWidget`.
+		// tags:
+		//		protected
+
+		// item: Object
+		//		This is the item returned by the dojo/store/api/Store implementation that
+		//		provides the data for this ComboBox, it's the currently selected item.
+		item: null,
+
+		// autoComplete: Boolean
+		//		If user types in a partial string, and then tab out of the `<input>` box,
+		//		automatically copy the first entry displayed in the drop down list to
+		//		the `<input>` field
+		autoComplete: true,
+
+		// highlightMatch: String
+		//		One of: "first", "all" or "none".
+		//
+		//		If the ComboBox/FilteringSelect opens with the search results and the searched
+		//		string can be found, it will be highlighted.  If set to "all"
+		//		then will probably want to change `queryExpr` parameter to '*${0}*'
+		//
+		//		Highlighting is only performed when `labelType` is "text", so as to not
+		//		interfere with any HTML markup an HTML label might contain.
+		highlightMatch: "first",
+
+		// labelAttr: String?
+		//		The entries in the drop down list come from this attribute in the
+		//		dojo.data items.
+		//		If not specified, the searchAttr attribute is used instead.
+		labelAttr: "",
+
+		// labelType: String
+		//		Specifies how to interpret the labelAttr in the data store items.
+		//		Can be "html" or "text".
+		labelType: "text",
+
+		// Flags to _HasDropDown to limit height of drop down to make it fit in viewport
+		maxHeight: -1,
+
+		// For backwards compatibility let onClick events propagate, even clicks on the down arrow button
+		_stopClickEvents: false,
+
+		_getCaretPos: function(/*DomNode*/ element){
+			// khtml 3.5.2 has selection* methods as does webkit nightlies from 2005-06-22
+			var pos = 0;
+			if(typeof(element.selectionStart) == "number"){
+				// FIXME: this is totally borked on Moz < 1.3. Any recourse?
+				pos = element.selectionStart;
+			}else if(has("ie")){
+				// in the case of a mouse click in a popup being handled,
+				// then the document.selection is not the textarea, but the popup
+				// var r = document.selection.createRange();
+				// hack to get IE 6 to play nice. What a POS browser.
+				var tr = element.ownerDocument.selection.createRange().duplicate();
+				var ntr = element.createTextRange();
+				tr.move("character", 0);
+				ntr.move("character", 0);
+				try{
+					// If control doesn't have focus, you get an exception.
+					// Seems to happen on reverse-tab, but can also happen on tab (seems to be a race condition - only happens sometimes).
+					// There appears to be no workaround for this - googled for quite a while.
+					ntr.setEndPoint("EndToEnd", tr);
+					pos = String(ntr.text).replace(/\r/g, "").length;
+				}catch(e){
+					// If focus has shifted, 0 is fine for caret pos.
+				}
+			}
+			return pos;
+		},
+
+		_setCaretPos: function(/*DomNode*/ element, /*Number*/ location){
+			location = parseInt(location);
+			_TextBoxMixin.selectInputText(element, location, location);
+		},
+
+		_setDisabledAttr: function(/*Boolean*/ value){
+			// Additional code to set disabled state of ComboBox node.
+			// Overrides _FormValueWidget._setDisabledAttr() or ValidationTextBox._setDisabledAttr().
+			this.inherited(arguments);
+			this.domNode.setAttribute("aria-disabled", value ? "true" : "false");
+		},
+
+		_onKey: function(/*Event*/ evt){
+			// summary:
+			//		Handles keyboard events
+
+			if(evt.charCode >= 32){
+				return;
+			} // alphanumeric reserved for searching
+
+			var key = evt.charCode || evt.keyCode;
+
+			// except for cutting/pasting case - ctrl + x/v
+			if(key == keys.ALT || key == keys.CTRL || key == keys.META || key == keys.SHIFT){
+				return; // throw out spurious events
+			}
+
+			var pw = this.dropDown;
+			var highlighted = null;
+			this._abortQuery();
+
+			// _HasDropDown will do some of the work:
+			//
+			//	1. when drop down is not yet shown:
+			//		- if user presses the down arrow key, call loadDropDown()
+			//	2. when drop down is already displayed:
+			//		- on ESC key, call closeDropDown()
+			//		- otherwise, call dropDown.handleKey() to process the keystroke
+			this.inherited(arguments);
+
+			if(evt.altKey || evt.ctrlKey || evt.metaKey){
+				return;
+			} // don't process keys with modifiers  - but we want shift+TAB
+
+			if(this._opened){
+				highlighted = pw.getHighlightedOption();
+			}
+			switch(key){
+				case keys.PAGE_DOWN:
+				case keys.DOWN_ARROW:
+				case keys.PAGE_UP:
+				case keys.UP_ARROW:
+					// Keystroke caused ComboBox_menu to move to a different item.
+					// Copy new item to <input> box.
+					if(this._opened){
+						this._announceOption(highlighted);
+					}
+					evt.stopPropagation();
+					evt.preventDefault();
+					break;
+
+				case keys.ENTER:
+					// prevent submitting form if user presses enter. Also
+					// prevent accepting the value if either Next or Previous
+					// are selected
+					if(highlighted){
+						// only stop event on prev/next
+						if(highlighted == pw.nextButton){
+							this._nextSearch(1);
+							// prevent submit
+							evt.stopPropagation();
+							evt.preventDefault();
+							break;
+						}else if(highlighted == pw.previousButton){
+							this._nextSearch(-1);
+							// prevent submit
+							evt.stopPropagation();
+							evt.preventDefault();
+							break;
+						}
+						// prevent submit if ENTER was to choose an item
+						evt.stopPropagation();
+						evt.preventDefault();
+					}else{
+						// Update 'value' (ex: KY) according to currently displayed text
+						this._setBlurValue(); // set value if needed
+						this._setCaretPos(this.focusNode, this.focusNode.value.length); // move cursor to end and cancel highlighting
+					}
+				// fall through
+
+				case keys.TAB:
+					var newvalue = this.get('displayedValue');
+					//	if the user had More Choices selected fall into the
+					//	_onBlur handler
+					if(pw && (newvalue == pw._messages["previousMessage"] || newvalue == pw._messages["nextMessage"])){
+						break;
+					}
+					if(highlighted){
+						this._selectOption(highlighted);
+					}
+				// fall through
+
+				case keys.ESCAPE:
+					if(this._opened){
+						this._lastQuery = null; // in case results come back later
+						this.closeDropDown();
+					}
+					break;
+			}
+		},
+
+		_autoCompleteText: function(/*String*/ text){
+			// summary:
+			//		Fill in the textbox with the first item from the drop down
+			//		list, and highlight the characters that were
+			//		auto-completed. For example, if user typed "CA" and the
+			//		drop down list appeared, the textbox would be changed to
+			//		"California" and "ifornia" would be highlighted.
+
+			var fn = this.focusNode;
+
+			// IE7: clear selection so next highlight works all the time
+			_TextBoxMixin.selectInputText(fn, fn.value.length);
+			// does text autoComplete the value in the textbox?
+			var caseFilter = this.ignoreCase ? 'toLowerCase' : 'substr';
+			if(text[caseFilter](0).indexOf(this.focusNode.value[caseFilter](0)) == 0){
+				var cpos = this.autoComplete ? this._getCaretPos(fn) : fn.value.length;
+				// only try to extend if we added the last character at the end of the input
+				if((cpos + 1) > fn.value.length){
+					// only add to input node as we would overwrite Capitalisation of chars
+					// actually, that is ok
+					fn.value = text;//.substr(cpos);
+					// visually highlight the autocompleted characters
+					_TextBoxMixin.selectInputText(fn, cpos);
+				}
+			}else{
+				// text does not autoComplete; replace the whole value and highlight
+				fn.value = text;
+				_TextBoxMixin.selectInputText(fn);
+			}
+		},
+
+		_openResultList: function(/*Object*/ results, /*Object*/ query, /*Object*/ options){
+			// summary:
+			//		Callback when a search completes.
+			// description:
+			//		1. generates drop-down list and calls _showResultList() to display it
+			//		2. if this result list is from user pressing "more choices"/"previous choices"
+			//			then tell screen reader to announce new option
+			var wasSelected = this.dropDown.getHighlightedOption();
+			this.dropDown.clearResultList();
+			if(!results.length && options.start == 0){ // if no results and not just the previous choices button
+				this.closeDropDown();
+				return;
+			}
+			this._nextSearch = this.dropDown.onPage = lang.hitch(this, function(direction){
+				results.nextPage(direction !== -1);
+				this.focus();
+			});
+
+			// Fill in the textbox with the first item from the drop down list,
+			// and highlight the characters that were auto-completed. For
+			// example, if user typed "CA" and the drop down list appeared, the
+			// textbox would be changed to "California" and "ifornia" would be
+			// highlighted.
+
+			this.dropDown.createOptions(
+				results,
+				options,
+				lang.hitch(this, "_getMenuLabelFromItem")
+			);
+
+			// show our list (only if we have content, else nothing)
+			this._showResultList();
+
+			// #4091:
+			//		tell the screen reader that the paging callback finished by
+			//		shouting the next choice
+			if("direction" in options){
+				if(options.direction){
+					this.dropDown.highlightFirstOption();
+				}else if(!options.direction){
+					this.dropDown.highlightLastOption();
+				}
+				if(wasSelected){
+					this._announceOption(this.dropDown.getHighlightedOption());
+				}
+			}else if(this.autoComplete && !this._prev_key_backspace
+				// when the user clicks the arrow button to show the full list,
+				// startSearch looks for "*".
+				// it does not make sense to autocomplete
+				// if they are just previewing the options available.
+				&& !/^[*]+$/.test(query[this.searchAttr].toString())){
+				this._announceOption(this.dropDown.containerNode.firstChild.nextSibling); // 1st real item
+			}
+		},
+
+		_showResultList: function(){
+			// summary:
+			//		Display the drop down if not already displayed, or if it is displayed, then
+			//		reposition it if necessary (reposition may be necessary if drop down's height changed).
+			this.closeDropDown(true);
+			this.openDropDown();
+			this.domNode.setAttribute("aria-expanded", "true");
+		},
+
+		loadDropDown: function(/*Function*/ /*===== callback =====*/){
+			// Overrides _HasDropDown.loadDropDown().
+			// This is called when user has pressed button icon or pressed the down arrow key
+			// to open the drop down.
+			this._startSearchAll();
+		},
+
+		isLoaded: function(){
+			// signal to _HasDropDown that it needs to call loadDropDown() to load the
+			// drop down asynchronously before displaying it
+			return false;
+		},
+
+		closeDropDown: function(){
+			// Overrides _HasDropDown.closeDropDown().  Closes the drop down (assuming that it's open).
+			// This method is the callback when the user types ESC or clicking
+			// the button icon while the drop down is open.  It's also called by other code.
+			this._abortQuery();
+			if(this._opened){
+				this.inherited(arguments);
+				this.domNode.setAttribute("aria-expanded", "false");
+			}
+		},
+
+		_setBlurValue: function(){
+			// if the user clicks away from the textbox OR tabs away, set the
+			// value to the textbox value
+			// #4617:
+			//		if value is now more choices or previous choices, revert
+			//		the value
+			var newvalue = this.get('displayedValue');
+			var pw = this.dropDown;
+			if(pw && (newvalue == pw._messages["previousMessage"] || newvalue == pw._messages["nextMessage"])){
+				this._setValueAttr(this._lastValueReported, true);
+			}else if(typeof this.item == "undefined"){
+				// Update 'value' (ex: KY) according to currently displayed text
+				this.item = null;
+				this.set('displayedValue', newvalue);
+			}else{
+				if(this.value != this._lastValueReported){
+					this._handleOnChange(this.value, true);
+				}
+				this._refreshState();
+			}
+			// Remove aria-activedescendant since it may not be removed if they select with arrows then blur with mouse
+			this.focusNode.removeAttribute("aria-activedescendant");
+		},
+
+		_setItemAttr: function(/*item*/ item, /*Boolean?*/ priorityChange, /*String?*/ displayedValue){
+			// summary:
+			//		Set the displayed valued in the input box, and the hidden value
+			//		that gets submitted, based on a dojo.data store item.
+			// description:
+			//		Users shouldn't call this function; they should be calling
+			//		set('item', value)
+			// tags:
+			//		private
+			var value = '';
+			if(item){
+				if(!displayedValue){
+					displayedValue = this.store._oldAPI ? // remove getValue() for 2.0 (old dojo.data API)
+						this.store.getValue(item, this.searchAttr) : item[this.searchAttr];
+				}
+				value = this._getValueField() != this.searchAttr ? this.store.getIdentity(item) : displayedValue;
+			}
+			this.set('value', value, priorityChange, displayedValue, item);
+		},
+
+		_announceOption: function(/*Node*/ node){
+			// summary:
+			//		a11y code that puts the highlighted option in the textbox.
+			//		This way screen readers will know what is happening in the
+			//		menu.
+
+			if(!node){
+				return;
+			}
+			// pull the text value from the item attached to the DOM node
+			var newValue;
+			if(node == this.dropDown.nextButton ||
+				node == this.dropDown.previousButton){
+				newValue = node.innerHTML;
+				this.item = undefined;
+				this.value = '';
+			}else{
+				var item = this.dropDown.items[node.getAttribute("item")];
+				newValue = (this.store._oldAPI ? // remove getValue() for 2.0 (old dojo.data API)
+					this.store.getValue(item, this.searchAttr) : item[this.searchAttr]).toString();
+				this.set('item', item, false, newValue);
+			}
+			// get the text that the user manually entered (cut off autocompleted text)
+			this.focusNode.value = this.focusNode.value.substring(0, this._lastInput.length);
+			// set up ARIA activedescendant
+			this.focusNode.setAttribute("aria-activedescendant", domAttr.get(node, "id"));
+			// autocomplete the rest of the option to announce change
+			this._autoCompleteText(newValue);
+		},
+
+		_selectOption: function(/*DomNode*/ target){
+			// summary:
+			//		Menu callback function, called when an item in the menu is selected.
+			this.closeDropDown();
+			if(target){
+				this._announceOption(target);
+			}
+			this._setCaretPos(this.focusNode, this.focusNode.value.length);
+			this._handleOnChange(this.value, true);
+			// Remove aria-activedescendant since the drop down is no loner visible
+			// after closeDropDown() but _announceOption() adds it back in
+			this.focusNode.removeAttribute("aria-activedescendant");
+		},
+
+		_startSearchAll: function(){
+			this._startSearch('');
+		},
+
+		_startSearchFromInput: function(){
+			this.item = undefined; // undefined means item needs to be set
+			this.inherited(arguments);
+		},
+
+		_startSearch: function(/*String*/ key){
+			// summary:
+			//		Starts a search for elements matching key (key=="" means to return all items),
+			//		and calls _openResultList() when the search completes, to display the results.
+			if(!this.dropDown){
+				var popupId = this.id + "_popup",
+					dropDownConstructor = lang.isString(this.dropDownClass) ?
+						lang.getObject(this.dropDownClass, false) : this.dropDownClass;
+				this.dropDown = new dropDownConstructor({
+					onChange: lang.hitch(this, this._selectOption),
+					id: popupId,
+					dir: this.dir,
+					textDir: this.textDir
+				});
+			}
+			this._lastInput = key; // Store exactly what was entered by the user.
+			this.inherited(arguments);
+		},
+
+		_getValueField: function(){
+			// summary:
+			//		Helper for postMixInProperties() to set this.value based on data inlined into the markup.
+			//		Returns the attribute name in the item (in dijit/form/_ComboBoxDataStore) to use as the value.
+			return this.searchAttr;
+		},
+
+		//////////// INITIALIZATION METHODS ///////////////////////////////////////
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			if(!this.store && this.srcNodeRef){
+				var srcNodeRef = this.srcNodeRef;
+				// if user didn't specify store, then assume there are option tags
+				this.store = new DataList({}, srcNodeRef);
+
+				// if there is no value set and there is an option list, set
+				// the value to the first value to be consistent with native Select
+				// Firefox and Safari set value
+				// IE6 and Opera set selectedIndex, which is automatically set
+				// by the selected attribute of an option tag
+				// IE6 does not set value, Opera sets value = selectedIndex
+				if(!("value" in this.params)){
+					var item = (this.item = this.store.fetchSelectedItem());
+					if(item){
+						var valueField = this._getValueField();
+						// remove getValue() for 2.0 (old dojo.data API)
+						this.value = this.store._oldAPI ? this.store.getValue(item, valueField) : item[valueField];
+					}
+				}
+			}
+		},
+
+		postCreate: function(){
+			// summary:
+			//		Subclasses must call this method from their postCreate() methods
+			// tags:
+			//		protected
+
+			// find any associated label element and add to ComboBox node.
+			var label = query('label[for="' + this.id + '"]');
+			if(label.length){
+				if(!label[0].id){
+					label[0].id = this.id + "_label";
+				}
+				this.domNode.setAttribute("aria-labelledby", label[0].id);
+
+			}
+			this.inherited(arguments);
+			aspect.after(this, "onSearch", lang.hitch(this, "_openResultList"), true);
+		},
+
+		_getMenuLabelFromItem: function(/*Item*/ item){
+			var label = this.labelFunc(item, this.store),
+				labelType = this.labelType;
+			// If labelType is not "text" we don't want to screw any markup ot whatever.
+			if(this.highlightMatch != "none" && this.labelType == "text" && this._lastInput){
+				label = this.doHighlight(label, this._lastInput);
+				labelType = "html";
+			}
+			return {html: labelType == "html", label: label};
+		},
+
+		doHighlight: function(/*String*/ label, /*String*/ find){
+			// summary:
+			//		Highlights the string entered by the user in the menu.  By default this
+			//		highlights the first occurrence found. Override this method
+			//		to implement your custom highlighting.
+			// tags:
+			//		protected
+
+			var
+			// Add (g)lobal modifier when this.highlightMatch == "all" and (i)gnorecase when this.ignoreCase == true
+				modifiers = (this.ignoreCase ? "i" : "") + (this.highlightMatch == "all" ? "g" : ""),
+				i = this.queryExpr.indexOf("${0}");
+			find = regexp.escapeString(find); // escape regexp special chars
+			//If < appears in label, and user presses t, we don't want to highlight the t in the escaped "&lt;"
+			//first find out every occurrences of "find", wrap each occurrence in a pair of "\uFFFF" characters (which
+			//should not appear in any string). then html escape the whole string, and replace '\uFFFF" with the
+			//HTML highlight markup.
+			return this._escapeHtml(label.replace(
+				new RegExp((i == 0 ? "^" : "") + "(" + find + ")" + (i == (this.queryExpr.length - 4) ? "$" : ""), modifiers),
+				'\uFFFF$1\uFFFF')).replace(
+				/\uFFFF([^\uFFFF]+)\uFFFF/g, '<span class="dijitComboBoxHighlightMatch">$1</span>'
+			); // returns String, (almost) valid HTML (entities encoded)
+		},
+
+		_escapeHtml: function(/*String*/ str){
+			// TODO Should become dojo.html.entities(), when exists use instead
+			// summary:
+			//		Adds escape sequences for special characters in XML: `&<>"'`
+			str = String(str).replace(/&/gm, "&amp;").replace(/</gm, "&lt;")
+				.replace(/>/gm, "&gt;").replace(/"/gm, "&quot;"); //balance"
+			return str; // string
+		},
+
+		reset: function(){
+			// Overrides the _FormWidget.reset().
+			// Additionally reset the .item (to clean up).
+			this.item = null;
+			this.inherited(arguments);
+		},
+
+		labelFunc: function(item, store){
+			// summary:
+			//		Computes the label to display based on the dojo.data store item.
+			// item: Object
+			//		The item from the store
+			// store: dojo/store/api/Store
+			//		The store.
+			// returns:
+			//		The label that the ComboBox should display
+			// tags:
+			//		private
+
+			// Use toString() because XMLStore returns an XMLItem whereas this
+			// method is expected to return a String (#9354).
+			// Remove getValue() for 2.0 (old dojo.data API)
+			return (store._oldAPI ? store.getValue(item, this.labelAttr || this.searchAttr) :
+				item[this.labelAttr || this.searchAttr]).toString(); // String
+		},
+
+		_setValueAttr: function(/*String*/ value, /*Boolean?*/ priorityChange, /*String?*/ displayedValue, /*item?*/ item){
+			// summary:
+			//		Hook so set('value', value) works.
+			// description:
+			//		Sets the value of the select.
+			this._set("item", item || null); // value not looked up in store
+			if(value == null /* or undefined */){
+				value = '';
+			} // null translates to blank
+			this.inherited(arguments);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		AutoCompleterMixin.extend({
+			_setTextDirAttr: function(/*String*/ textDir){
+				// summary:
+				//		Setter for textDir, needed for the dropDown's textDir update.
+				// description:
+				//		Users shouldn't call this function; they should be calling
+				//		set('textDir', value)
+				// tags:
+				//		private
+				this.inherited(arguments);
+				// update the drop down also (_ComboBoxMenuMixin)
+				if(this.dropDown){
+					this.dropDown._set("textDir", textDir);
+				}
+			}
+		});
+	}
+
+	return AutoCompleterMixin;
+});
diff --git a/src/main/resources/static/dijit/form/_ButtonMixin.js b/src/main/resources/static/dijit/form/_ButtonMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..124aecf5b717cbb2c1f8b9152b9e32724eb58892
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_ButtonMixin.js
@@ -0,0 +1,120 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.setSelectable
+	"dojo/has",
+	"../registry"        // registry.byNode
+], function(declare, dom, has, registry){
+
+	// module:
+	//		dijit/form/_ButtonMixin
+
+	var ButtonMixin = declare("dijit.form._ButtonMixin" + (has("dojo-bidi") ? "_NoBidi" : ""), null, {
+		// summary:
+		//		A mixin to add a thin standard API wrapper to a normal HTML button
+		// description:
+		//		A label should always be specified (through innerHTML) or the label attribute.
+		//
+		//		Attach points:
+		//
+		//		- focusNode (required): this node receives focus
+		//		- valueNode (optional): this node's value gets submitted with FORM elements
+		//		- containerNode (optional): this node gets the innerHTML assignment for label
+		// example:
+		// |	<button data-dojo-type="dijit/form/Button" onClick="...">Hello world</button>
+		// example:
+		// |	var button1 = new Button({label: "hello world", onClick: foo});
+		// |	dojo.body().appendChild(button1.domNode);
+
+		// label: HTML String
+		//		Content to display in button.
+		label: "",
+
+		// type: [const] String
+		//		Type of button (submit, reset, button, checkbox, radio)
+		type: "button",
+
+		__onClick: function(/*Event*/ e){
+			// summary:
+			//		Internal function to divert the real click onto the hidden INPUT that has a native default action associated with it
+			// type:
+			//		private
+			e.stopPropagation();
+			e.preventDefault();
+			if(!this.disabled){
+				// cannot use on.emit since button default actions won't occur
+				this.valueNode.click(e);
+			}
+			return false;
+		},
+
+		_onClick: function(/*Event*/ e){
+			// summary:
+			//		Internal function to handle click actions
+			if(this.disabled){
+				e.stopPropagation();
+				e.preventDefault();
+				return false;
+			}
+			if(this.onClick(e) === false){
+				e.preventDefault();
+			}
+			var cancelled = e.defaultPrevented;
+
+			// Signal Form/Dialog to submit/close.  For 2.0, consider removing this code and instead making the Form/Dialog
+			// listen for bubbled click events where evt.target.type == "submit" && !evt.defaultPrevented.
+			if(!cancelled && this.type == "submit" && !(this.valueNode || this.focusNode).form){
+				for(var node = this.domNode; node.parentNode; node = node.parentNode){
+					var widget = registry.byNode(node);
+					if(widget && typeof widget._onSubmit == "function"){
+						widget._onSubmit(e);
+						e.preventDefault(); // action has already occurred
+						cancelled = true;
+						break;
+					}
+				}
+			}
+
+			return !cancelled;
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+			dom.setSelectable(this.focusNode, false);
+		},
+
+		onClick: function(/*Event*/ /*===== e =====*/){
+			// summary:
+			//		Callback for when button is clicked.
+			//		If type="submit", return true to perform submit, or false to cancel it.
+			// type:
+			//		callback
+			return true;		// Boolean
+		},
+
+		_setLabelAttr: function(/*String*/ content){
+			// summary:
+			//		Hook for set('label', ...) to work.
+			// description:
+			//		Set the label (text) of the button; takes an HTML string.
+			this._set("label", content);
+			var labelNode = this.containerNode || this.focusNode;
+			labelNode.innerHTML = content;
+			this.onLabelSet();
+		},
+
+		onLabelSet: function(){
+		}
+	});
+
+	if(has("dojo-bidi")){
+		ButtonMixin = declare("dijit.form._ButtonMixin", ButtonMixin, {
+			onLabelSet: function(){
+				this.inherited(arguments);
+				var labelNode = this.containerNode || this.focusNode;
+				this.applyTextDir(labelNode);
+			}
+		});
+	}
+
+	return ButtonMixin;
+});
diff --git a/src/main/resources/static/dijit/form/_CheckBoxMixin.js b/src/main/resources/static/dijit/form/_CheckBoxMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..a9e8563361712b21a0a7061313b7bcf1a5222a44
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_CheckBoxMixin.js
@@ -0,0 +1,77 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr" // domAttr.set
+], function(declare, domAttr){
+
+	// module:
+	//		dijit/form/_CheckBoxMixin
+
+	return declare("dijit.form._CheckBoxMixin", null, {
+		// summary:
+		//		Mixin to provide widget functionality corresponding to an HTML checkbox
+		//
+		// description:
+		//		User interacts with real html inputs.
+		//		On onclick (which occurs by mouse click, space-bar, or
+		//		using the arrow keys to switch the selected radio button),
+		//		we update the state of the checkbox/radio.
+		//
+
+		// type: [private] String
+		//		type attribute on `<input>` node.
+		//		Overrides `dijit/form/Button.type`.  Users should not change this value.
+		type: "checkbox",
+
+		// value: String
+		//		As an initialization parameter, equivalent to value field on normal checkbox
+		//		(if checked, the value is passed as the value when form is submitted).
+		value: "on",
+
+		// readOnly: Boolean
+		//		Should this widget respond to user input?
+		//		In markup, this is specified as "readOnly".
+		//		Similar to disabled except readOnly form values are submitted.
+		readOnly: false,
+
+		// aria-pressed for toggle buttons, and aria-checked for checkboxes
+		_aria_attr: "aria-checked",
+
+		_setReadOnlyAttr: function(/*Boolean*/ value){
+			this._set("readOnly", value);
+			domAttr.set(this.focusNode, 'readOnly', value);
+		},
+
+		// Override dijit/form/Button._setLabelAttr() since we don't even have a containerNode.
+		// Normally users won't try to set label, except when CheckBox or RadioButton is the child of a dojox/layout/TabContainer
+		_setLabelAttr: undefined,
+
+		_getSubmitValue: function(/*String*/ value){
+			return (value == null || value === "") ? "on" : value;
+		},
+
+		_setValueAttr: function(newValue){
+			newValue = this._getSubmitValue(newValue);	// "on" to match browser native behavior when value unspecified
+			this._set("value", newValue);
+			domAttr.set(this.focusNode, "value", newValue);
+		},
+
+		reset: function(){
+			this.inherited(arguments);
+			// Handle unlikely event that the <input type=checkbox> value attribute has changed
+			this._set("value", this._getSubmitValue(this.params.value));
+			domAttr.set(this.focusNode, 'value', this.value);
+		},
+
+		_onClick: function(/*Event*/ e){
+			// summary:
+			//		Internal function to handle click actions - need to check
+			//		readOnly, since button no longer does that check.
+			if(this.readOnly){
+				e.stopPropagation();
+				e.preventDefault();
+				return false;
+			}
+			return this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_ComboBoxMenu.js b/src/main/resources/static/dijit/form/_ComboBoxMenu.js
new file mode 100644
index 0000000000000000000000000000000000000000..2da48b2f2a4539e612b3686b161c1d1ff2b8ec5f
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_ComboBoxMenu.js
@@ -0,0 +1,134 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add domClass.remove
+	"dojo/dom-style", // domStyle.get
+	"dojo/keys", // keys.DOWN_ARROW keys.PAGE_DOWN keys.PAGE_UP keys.UP_ARROW
+	"../_WidgetBase",
+	"../_TemplatedMixin",
+	"./_ComboBoxMenuMixin",
+	"./_ListMouseMixin"
+], function(declare, domClass, domStyle, keys,
+			_WidgetBase, _TemplatedMixin, _ComboBoxMenuMixin, _ListMouseMixin){
+
+
+	// module:
+	//		dijit/form/_ComboBoxMenu
+
+	return declare("dijit.form._ComboBoxMenu",[_WidgetBase, _TemplatedMixin, _ListMouseMixin, _ComboBoxMenuMixin], {
+		// summary:
+		//		Focus-less menu for internal use in `dijit/form/ComboBox`
+		//		Abstract methods that must be defined externally:
+		//
+		//		- onChange: item was explicitly chosen (mousedown somewhere on the menu and mouseup somewhere on the menu)
+		//		- onPage: next(1) or previous(-1) button pressed
+		// tags:
+		//		private
+
+		// TODO for 2.0 or earlier: stop putting stuff inside this.containerNode.   Switch to using this.domNode
+		// or a different attach point.    See _TemplatedMixin::searchContainerNode.
+		templateString: "<div class='dijitReset dijitMenu' data-dojo-attach-point='containerNode' style='overflow: auto; overflow-x: hidden;' role='listbox'>"
+				+"<div class='dijitMenuItem dijitMenuPreviousButton' data-dojo-attach-point='previousButton' role='option'></div>"
+				+"<div class='dijitMenuItem dijitMenuNextButton' data-dojo-attach-point='nextButton' role='option'></div>"
+				+"</div>",
+
+		baseClass: "dijitComboBoxMenu",
+
+		postCreate: function(){
+			this.inherited(arguments);
+			if(!this.isLeftToRight()){
+				domClass.add(this.previousButton, "dijitMenuItemRtl");
+				domClass.add(this.nextButton, "dijitMenuItemRtl");
+			}
+			this.containerNode.setAttribute("role","listbox");
+		},
+
+		_createMenuItem: function(){
+			// note: not using domConstruct.create() because need to specify document
+			var item = this.ownerDocument.createElement("div");
+			item.className = "dijitReset dijitMenuItem" +(this.isLeftToRight() ? "" : " dijitMenuItemRtl");
+			item.setAttribute("role", "option");
+			return item;
+		},
+
+		onHover: function(/*DomNode*/ node){
+			// summary:
+			//		Add hover CSS
+			domClass.add(node, "dijitMenuItemHover");
+		},
+
+		onUnhover: function(/*DomNode*/ node){
+			// summary:
+			//		Remove hover CSS
+			domClass.remove(node, "dijitMenuItemHover");
+		},
+
+		onSelect: function(/*DomNode*/ node){
+			// summary:
+			//		Add selected CSS
+			domClass.add(node, "dijitMenuItemSelected");
+		},
+
+		onDeselect: function(/*DomNode*/ node){
+			// summary:
+			//		Remove selected CSS
+			domClass.remove(node, "dijitMenuItemSelected");
+		},
+
+		_page: function(/*Boolean*/ up){
+			// summary:
+			//		Handles page-up and page-down keypresses
+
+			var scrollamount = 0;
+			var oldscroll = this.domNode.scrollTop;
+			var height = domStyle.get(this.domNode, "height");
+			// if no item is highlighted, highlight the first option
+			if(!this.getHighlightedOption()){
+				this.selectNextNode();
+			}
+			while(scrollamount<height){
+				var highlighted_option = this.getHighlightedOption();
+				if(up){
+					// stop at option 1
+					if(!highlighted_option.previousSibling ||
+						highlighted_option.previousSibling.style.display == "none"){
+						break;
+					}
+					this.selectPreviousNode();
+				}else{
+					// stop at last option
+					if(!highlighted_option.nextSibling ||
+						highlighted_option.nextSibling.style.display == "none"){
+						break;
+					}
+					this.selectNextNode();
+				}
+				// going backwards
+				var newscroll = this.domNode.scrollTop;
+				scrollamount += (newscroll-oldscroll)*(up ? -1:1);
+				oldscroll = newscroll;
+			}
+		},
+
+		handleKey: function(evt){
+			// summary:
+			//		Handle keystroke event forwarded from ComboBox, returning false if it's
+			//		a keystroke I recognize and process, true otherwise.
+			switch(evt.keyCode){
+				case keys.DOWN_ARROW:
+					this.selectNextNode();
+					return false;
+				case keys.PAGE_DOWN:
+					this._page(false);
+					return false;
+				case keys.UP_ARROW:
+					this.selectPreviousNode();
+					return false;
+				case keys.PAGE_UP:
+					this._page(true);
+					return false;
+				default:
+					return true;
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_ComboBoxMenuMixin.js b/src/main/resources/static/dijit/form/_ComboBoxMenuMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..4fd836758a8abd347b70245ffee1b408b7debda1
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_ComboBoxMenuMixin.js
@@ -0,0 +1,201 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/has",
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/i18n!./nls/ComboBox"
+], function(array, declare, domAttr, has, i18n){
+
+	// module:
+	//		dijit/form/_ComboBoxMenuMixin
+
+	var ComboBoxMenuMixin = declare("dijit.form._ComboBoxMenuMixin" + (has("dojo-bidi") ? "_NoBidi" : ""), null, {
+		// summary:
+		//		Focus-less menu for internal use in `dijit/form/ComboBox`
+		// tags:
+		//		private
+
+		// _messages: Object
+		//		Holds "next" and "previous" text for paging buttons on drop down
+		_messages: null,
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			this._messages = i18n.getLocalization("dijit.form", "ComboBox", this.lang);
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			// fill in template with i18n messages
+			this.previousButton.innerHTML = this._messages["previousMessage"];
+			this.nextButton.innerHTML = this._messages["nextMessage"];
+		},
+
+		_setValueAttr: function(/*Object*/ value){
+			this._set("value", value);
+			this.onChange(value);
+		},
+
+		onClick: function(/*DomNode*/ node){
+			if(node == this.previousButton){
+				this._setSelectedAttr(null);
+				this.onPage(-1);
+			}else if(node == this.nextButton){
+				this._setSelectedAttr(null);
+				this.onPage(1);
+			}else{
+				this.onChange(node);
+			}
+		},
+
+		// stubs
+		onChange: function(/*Number*/ /*===== direction =====*/){
+			// summary:
+			//		Notifies ComboBox/FilteringSelect that user selected an option.
+			// tags:
+			//		callback
+		},
+
+		onPage: function(/*Number*/ /*===== direction =====*/){
+			// summary:
+			//		Notifies ComboBox/FilteringSelect that user clicked to advance to next/previous page.
+			// tags:
+			//		callback
+		},
+
+		onClose: function(){
+			// summary:
+			//		Callback from dijit.popup code to this widget, notifying it that it closed
+			// tags:
+			//		private
+			this._setSelectedAttr(null);
+		},
+
+		_createOption: function(/*Object*/ item, labelFunc){
+			// summary:
+			//		Creates an option to appear on the popup menu subclassed by
+			//		`dijit/form/FilteringSelect`.
+
+			var menuitem = this._createMenuItem();
+			var labelObject = labelFunc(item);
+			if(labelObject.html){
+				menuitem.innerHTML = labelObject.label;
+			}else{
+				menuitem.appendChild(
+					menuitem.ownerDocument.createTextNode(labelObject.label)
+				);
+			}
+			// #3250: in blank options, assign a normal height
+			if(menuitem.innerHTML == ""){
+				menuitem.innerHTML = "&#160;";	// &nbsp;
+			}
+
+			return menuitem;
+		},
+
+		createOptions: function(results, options, labelFunc){
+			// summary:
+			//		Fills in the items in the drop down list
+			// results:
+			//		Array of items
+			// options:
+			//		The options to the query function of the store
+			//
+			// labelFunc:
+			//		Function to produce a label in the drop down list from a dojo.data item
+
+			this.items = results;
+
+			// display "Previous . . ." button
+			this.previousButton.style.display = (options.start == 0) ? "none" : "";
+			domAttr.set(this.previousButton, "id", this.id + "_prev");
+			// create options using _createOption function defined by parent
+			// ComboBox (or FilteringSelect) class
+			// #2309:
+			//		iterate over cache nondestructively
+			array.forEach(results, function(item, i){
+				var menuitem = this._createOption(item, labelFunc);
+				menuitem.setAttribute("item", i);	// index to this.items; use indirection to avoid mem leak
+				domAttr.set(menuitem, "id", this.id + i);
+				this.nextButton.parentNode.insertBefore(menuitem, this.nextButton);
+			}, this);
+			// display "Next . . ." button
+			var displayMore = false;
+			// Try to determine if we should show 'more'...
+			if(results.total && !results.total.then && results.total != -1){
+				if((options.start + options.count) < results.total){
+					displayMore = true;
+				}else if((options.start + options.count) > results.total && options.count == results.length){
+					// Weird return from a data store, where a start + count > maxOptions
+					// implies maxOptions isn't really valid and we have to go into faking it.
+					// And more or less assume more if count == results.length
+					displayMore = true;
+				}
+			}else if(options.count == results.length){
+				//Don't know the size, so we do the best we can based off count alone.
+				//So, if we have an exact match to count, assume more.
+				displayMore = true;
+			}
+
+			this.nextButton.style.display = displayMore ? "" : "none";
+			domAttr.set(this.nextButton, "id", this.id + "_next");
+		},
+
+		clearResultList: function(){
+			// summary:
+			//		Clears the entries in the drop down list, but of course keeps the previous and next buttons.
+			var container = this.containerNode;
+			while(container.childNodes.length > 2){
+				container.removeChild(container.childNodes[container.childNodes.length - 2]);
+			}
+			this._setSelectedAttr(null);
+		},
+
+		highlightFirstOption: function(){
+			// summary:
+			//		Highlight the first real item in the list (not Previous Choices).
+			this.selectFirstNode();
+		},
+
+		highlightLastOption: function(){
+			// summary:
+			//		Highlight the last real item in the list (not More Choices).
+			this.selectLastNode();
+		},
+
+		selectFirstNode: function(){
+			this.inherited(arguments);
+			if(this.getHighlightedOption() == this.previousButton){
+				this.selectNextNode();
+			}
+		},
+
+		selectLastNode: function(){
+			this.inherited(arguments);
+			if(this.getHighlightedOption() == this.nextButton){
+				this.selectPreviousNode();
+			}
+		},
+
+		getHighlightedOption: function(){
+			return this.selected;
+		}
+	});
+
+	if(has("dojo-bidi")){
+		ComboBoxMenuMixin = declare("dijit.form._ComboBoxMenuMixin", ComboBoxMenuMixin, {
+			_createOption: function(){
+				var menuitem = this.inherited(arguments);
+
+				// update menuitem.dir if BidiSupport was required
+				this.applyTextDir(menuitem);
+
+				return menuitem;
+			}
+		});
+	}
+
+	return ComboBoxMenuMixin;
+});
diff --git a/src/main/resources/static/dijit/form/_DateTimeTextBox.js b/src/main/resources/static/dijit/form/_DateTimeTextBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..a03aa9ecb6fc82c0d7dfd30d3cea5312afa7738d
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_DateTimeTextBox.js
@@ -0,0 +1,296 @@
+define([
+	"dojo/date", // date date.compare
+	"dojo/date/locale", // locale.regexp
+	"dojo/date/stamp", // stamp.fromISOString stamp.toISOString
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang", // lang.getObject
+	"./RangeBoundTextBox",
+	"../_HasDropDown",
+	"dojo/text!./templates/DropDownBox.html"
+], function(date, locale, stamp, declare, lang, RangeBoundTextBox, _HasDropDown, template){
+
+	// module:
+	//		dijit/form/_DateTimeTextBox
+
+	new Date("X"); // workaround for #11279, new Date("") == NaN
+
+	var _DateTimeTextBox = declare("dijit.form._DateTimeTextBox", [RangeBoundTextBox, _HasDropDown], {
+		// summary:
+		//		Base class for validating, serializable, range-bound date or time text box.
+
+		templateString: template,
+
+		// hasDownArrow: [const] Boolean
+		//		Set this textbox to display a down arrow button, to open the drop down list.
+		hasDownArrow: true,
+
+		// Set classes like dijitDownArrowButtonHover depending on mouse action over button node
+		cssStateNodes: {
+			"_buttonNode": "dijitDownArrowButton"
+		},
+
+		/*=====
+		// constraints: _DateTimeTextBox.__Constraints
+		//		Despite the name, this parameter specifies both constraints on the input
+		//		(including starting/ending dates/times allowed) as well as
+		//		formatting options like whether the date is displayed in long (ex: December 25, 2005)
+		//		or short (ex: 12/25/2005) format.  See `dijit/form/_DateTimeTextBox.__Constraints` for details.
+		constraints: {},
+		======*/
+
+		// The constraints without the min/max properties. Used by the compare() method
+		_unboundedConstraints: {},
+
+		// Override ValidationTextBox.pattern.... we use a reg-ex generating function rather
+		// than a straight regexp to deal with locale  (plus formatting options too?)
+		pattern: locale.regexp,
+
+		// datePackage: String
+		//		JavaScript namespace to find calendar routines.	 If unspecified, uses Gregorian calendar routines
+		//		at dojo/date and dojo/date/locale.
+		datePackage: "",
+		//		TODO: for 2.0, replace datePackage with dateModule and dateLocalModule attributes specifying MIDs,
+		//		or alternately just get rid of this completely and tell user to use module ID remapping
+		//		via require
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			this._set("type", "text"); // in case type="date"|"time" was specified which messes up parse/format
+		},
+
+		// Override _FormWidget.compare() to work for dates/times
+		compare: function(/*Date*/ val1, /*Date*/ val2){
+			var isInvalid1 = this._isInvalidDate(val1);
+			var isInvalid2 = this._isInvalidDate(val2);
+			if (isInvalid1 || isInvalid2){
+				return (isInvalid1 && isInvalid2) ? 0 : (!isInvalid1 ? 1 : -1);
+			}
+			// Format and parse the values before comparing them to make sure that only the parts of the
+			// date that will make the "round trip" get compared.
+			var fval1 = this.format(val1, this._unboundedConstraints),
+				fval2 = this.format(val2, this._unboundedConstraints),
+				pval1 = this.parse(fval1, this._unboundedConstraints),
+				pval2 = this.parse(fval2, this._unboundedConstraints);
+
+			return fval1 == fval2 ? 0 : date.compare(pval1, pval2, this._selector);
+		},
+
+		// flag to _HasDropDown to make drop down Calendar width == <input> width
+		autoWidth: true,
+
+		format: function(/*Date*/ value, /*locale.__FormatOptions*/ constraints){
+			// summary:
+			//		Formats the value as a Date, according to specified locale (second argument)
+			// tags:
+			//		protected
+			if(!value){ return ''; }
+			return this.dateLocaleModule.format(value, constraints);
+		},
+
+		"parse": function(/*String*/ value, /*locale.__FormatOptions*/ constraints){
+			// summary:
+			//		Parses as string as a Date, according to constraints
+			// tags:
+			//		protected
+
+			return this.dateLocaleModule.parse(value, constraints) || (this._isEmpty(value) ? null : undefined);	 // Date
+		},
+
+		// Overrides ValidationTextBox.serialize() to serialize a date in canonical ISO format.
+		serialize: function(/*anything*/ val, /*Object?*/ options){
+			if(val.toGregorian){
+				val = val.toGregorian();
+			}
+			return stamp.toISOString(val, options);
+		},
+
+		// dropDownDefaultValue: Date
+		//		The default value to focus in the popupClass widget when the textbox value is empty.
+		dropDownDefaultValue : new Date(),
+
+		// value: Date
+		//		The value of this widget as a JavaScript Date object.  Use get("value") / set("value", val) to manipulate.
+		//		When passed to the parser in markup, must be specified according to `dojo/date/stamp.fromISOString()`
+		value: new Date(""),	// value.toString()="NaN"
+
+		_blankValue: null,	// used by filter() when the textbox is blank
+
+		// popupClass: [protected extension] String
+		//		Name of the popup widget class used to select a date/time.
+		//		Subclasses should specify this.
+		popupClass: "", // default is no popup = text only
+
+
+		// _selector: [protected extension] String
+		//		Specifies constraints.selector passed to dojo.date functions, should be either
+		//		"date" or "time".
+		//		Subclass must specify this.
+		_selector: "",
+
+		constructor: function(params /*===== , srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified, replace srcNodeRef with my generated DOM tree
+
+			params = params || {};
+			this.dateModule = params.datePackage ? lang.getObject(params.datePackage, false) : date;
+			this.dateClassObj = this.dateModule.Date || Date;
+			if(!(this.dateClassObj instanceof Date)){
+				this.value = new this.dateClassObj(this.value);
+			}
+			this.dateLocaleModule = params.datePackage ? lang.getObject(params.datePackage+".locale", false) : locale;
+			this._set('pattern', this.dateLocaleModule.regexp);
+			this._invalidDate = this.constructor.prototype.value.toString();
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			if(!this.hasDownArrow){
+				this._buttonNode.style.display = "none";
+			}
+
+			// If hasDownArrow is false, we basically just want to treat the whole widget as the
+			// button.
+			if(!this.hasDownArrow){
+				this._buttonNode = this.domNode;
+				this.baseClass += " dijitComboBoxOpenOnClick";
+			}
+		},
+
+		_setConstraintsAttr: function(/*Object*/ constraints){
+			constraints.selector = this._selector;
+			constraints.fullYear = true; // see #5465 - always format with 4-digit years
+			var fromISO = stamp.fromISOString;
+			if(typeof constraints.min == "string"){
+				constraints.min = fromISO(constraints.min);
+				if(!(this.dateClassObj instanceof Date)){
+					constraints.min = new this.dateClassObj(constraints.min);
+				}
+			}
+			if(typeof constraints.max == "string"){
+				constraints.max = fromISO(constraints.max);
+				if(!(this.dateClassObj instanceof Date)){
+					constraints.max = new this.dateClassObj(constraints.max);
+				}
+			}
+			this.inherited(arguments);
+			this._unboundedConstraints = lang.mixin({}, this.constraints, {min: null, max: null});
+		},
+
+		_isInvalidDate: function(/*Date*/ value){
+			// summary:
+			//		Runs various tests on the value, checking for invalid conditions
+			// tags:
+			//		private
+			return !value || isNaN(value) || typeof value != "object" || value.toString() == this._invalidDate;
+		},
+
+		_setValueAttr: function(/*Date|String*/ value, /*Boolean?*/ priorityChange, /*String?*/ formattedValue){
+			// summary:
+			//		Sets the date on this textbox. Note: value can be a JavaScript Date literal or a string to be parsed.
+			if(value !== undefined){
+				if(typeof value == "string"){
+					value = stamp.fromISOString(value);
+				}
+				if(this._isInvalidDate(value)){
+					value = null;
+				}
+				if(value instanceof Date && !(this.dateClassObj instanceof Date)){
+					value = new this.dateClassObj(value);
+				}
+			}
+			this.inherited(arguments, [value, priorityChange, formattedValue]);
+			if(this.value instanceof Date){
+				this.filterString = "";
+			}
+
+			// Set the dropdown's value to match, unless we are being updated due to the user navigating the TimeTextBox
+			// dropdown via up/down arrow keys.
+			if(priorityChange !== false && this.dropDown){
+				this.dropDown.set('value', value, false);
+			}
+		},
+
+		_set: function(attr, value){
+			// Avoid spurious watch() notifications when value is changed to new Date object w/the same value
+			if(attr == "value"){
+				if(value instanceof Date && !(this.dateClassObj instanceof Date)){
+					value = new this.dateClassObj(value);
+				}
+				var oldValue = this._get("value");
+				if(oldValue instanceof this.dateClassObj && this.compare(value, oldValue) == 0){
+					return;
+				}
+			}
+			this.inherited(arguments);
+		},
+
+		_setDropDownDefaultValueAttr: function(/*Date*/ val){
+			if(this._isInvalidDate(val)){
+				// convert null setting into today's date, since there needs to be *some* default at all times.
+				 val = new this.dateClassObj();
+			}
+			this._set("dropDownDefaultValue", val);
+		},
+
+		openDropDown: function(/*Function*/ callback){
+			// rebuild drop down every time, so that constraints get copied (#6002)
+			if(this.dropDown){
+				this.dropDown.destroy();
+			}
+			var PopupProto = lang.isString(this.popupClass) ? lang.getObject(this.popupClass, false) : this.popupClass,
+				textBox = this,
+				value = this.get("value");
+			this.dropDown = new PopupProto({
+				onChange: function(value){
+					// this will cause InlineEditBox and other handlers to do stuff so make sure it's last
+					textBox.set('value', value, true);
+				},
+				id: this.id + "_popup",
+				dir: textBox.dir,
+				lang: textBox.lang,
+				value: value,
+				textDir: textBox.textDir,
+				currentFocus: !this._isInvalidDate(value) ? value : this.dropDownDefaultValue,
+				constraints: textBox.constraints,
+				filterString: textBox.filterString, // for TimeTextBox, to filter times shown
+				datePackage: textBox.datePackage,
+				isDisabledDate: function(/*Date*/ date){
+					// summary:
+					//		disables dates outside of the min/max of the _DateTimeTextBox
+					return !textBox.rangeCheck(date, textBox.constraints);
+				}
+			});
+
+			this.inherited(arguments);
+		},
+
+		_getDisplayedValueAttr: function(){
+			return this.textbox.value;
+		},
+
+		_setDisplayedValueAttr: function(/*String*/ value, /*Boolean?*/ priorityChange){
+			this._setValueAttr(this.parse(value, this.constraints), priorityChange, value);
+		}
+	});
+
+
+	/*=====
+	 _DateTimeTextBox.__Constraints = declare([RangeBoundTextBox.__Constraints, locale.__FormatOptions], {
+		 // summary:
+		 //		Specifies both the rules on valid/invalid values (first/last date/time allowed),
+		 //		and also formatting options for how the date/time is displayed.
+		 // example:
+		 //		To restrict to dates within 2004, displayed in a long format like "December 25, 2005":
+		 //	|		{min:'2004-01-01',max:'2004-12-31', formatLength:'long'}
+	 });
+	 =====*/
+
+	return _DateTimeTextBox;
+});
diff --git a/src/main/resources/static/dijit/form/_ExpandingTextAreaMixin.js b/src/main/resources/static/dijit/form/_ExpandingTextAreaMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..652fe72733752988428048e1dc64ba9e7e6a75d7
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_ExpandingTextAreaMixin.js
@@ -0,0 +1,130 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-construct", // domConstruct.create
+	"dojo/has",
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dojo/_base/window", // win.body
+	"../Viewport"
+], function(declare, domConstruct, has, lang, on, win, Viewport){
+
+	// module:
+	//		dijit/form/_ExpandingTextAreaMixin
+
+	// feature detection, true for mozilla and webkit
+	has.add("textarea-needs-help-shrinking", function(){
+		var body = win.body(),	// note: if multiple documents exist, doesn't matter which one we use
+			te = domConstruct.create('textarea', {
+			rows:"5",
+			cols:"20",
+			value: ' ',
+			style: {zoom:1, fontSize:"12px", height:"96px", overflow:'hidden', visibility:'hidden', position:'absolute', border:"5px solid white", margin:"0", padding:"0", boxSizing: 'border-box', MsBoxSizing: 'border-box', WebkitBoxSizing: 'border-box', MozBoxSizing: 'border-box' }
+		}, body, "last");
+		var needsHelpShrinking = te.scrollHeight >= te.clientHeight;
+		body.removeChild(te);
+		return needsHelpShrinking;
+	});
+
+	return declare("dijit.form._ExpandingTextAreaMixin", null, {
+		// summary:
+		//		Mixin for textarea widgets to add auto-expanding capability
+
+		_setValueAttr: function(){
+			this.inherited(arguments);
+			this.resize();
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+			var textarea = this.textbox;
+			textarea.style.overflowY = "hidden";
+			this.own(on(textarea, "focus, resize", lang.hitch(this, "_resizeLater")));
+		},
+
+		startup: function(){ 
+			this.inherited(arguments);
+			this.own(Viewport.on("resize", lang.hitch(this, "_resizeLater")));
+			this._resizeLater();
+		},
+
+		_onInput: function(e){
+			this.inherited(arguments);
+			this.resize();
+		},
+
+		_estimateHeight: function(){
+			// summary:
+			//		Approximate the height when the textarea is invisible with the number of lines in the text.
+			//		Fails when someone calls setValue with a long wrapping line, but the layout fixes itself when the user clicks inside so . . .
+			//		In IE, the resize event is supposed to fire when the textarea becomes visible again and that will correct the size automatically.
+			//
+			var textarea = this.textbox;
+			// #rows = #newlines+1
+			textarea.rows = (textarea.value.match(/\n/g) || []).length + 1;
+		},
+
+		_resizeLater: function(){
+			this.defer("resize");
+		},
+
+		resize: function(){
+			// summary:
+			//		Resizes the textarea vertically (should be called after a style/value change)
+
+			var textarea = this.textbox;
+
+			function textareaScrollHeight(){
+				var empty = false;
+				if(textarea.value === ''){
+					textarea.value = ' ';
+					empty = true;
+				}
+				var sh = textarea.scrollHeight;
+				if(empty){ textarea.value = ''; }
+				return sh;
+			}
+
+			if(textarea.style.overflowY == "hidden"){ textarea.scrollTop = 0; }
+			if(this.busyResizing){ return; }
+			this.busyResizing = true;
+			if(textareaScrollHeight() || textarea.offsetHeight){
+				var newH = textareaScrollHeight() + Math.max(textarea.offsetHeight - textarea.clientHeight, 0);
+				var newHpx = newH + "px";
+				if(newHpx != textarea.style.height){
+					textarea.style.height = newHpx;
+					textarea.rows = 1; // rows can act like a minHeight if not cleared
+				}
+				if(has("textarea-needs-help-shrinking")){
+					var	origScrollHeight = textareaScrollHeight(),
+						newScrollHeight = origScrollHeight,
+						origMinHeight = textarea.style.minHeight,
+						decrement = 4, // not too fast, not too slow
+						thisScrollHeight,
+						origScrollTop = textarea.scrollTop;
+					textarea.style.minHeight = newHpx; // maintain current height
+					textarea.style.height = "auto"; // allow scrollHeight to change
+					while(newH > 0){
+						textarea.style.minHeight = Math.max(newH - decrement, 4) + "px";
+						thisScrollHeight = textareaScrollHeight();
+						var change = newScrollHeight - thisScrollHeight;
+						newH -= change;
+						if(change < decrement){
+							break; // scrollHeight didn't shrink
+						}
+						newScrollHeight = thisScrollHeight;
+						decrement <<= 1;
+					}
+					textarea.style.height = newH + "px";
+					textarea.style.minHeight = origMinHeight;
+					textarea.scrollTop = origScrollTop;
+				}
+				textarea.style.overflowY = textareaScrollHeight() > textarea.clientHeight ? "auto" : "hidden";
+				if(textarea.style.overflowY == "hidden"){ textarea.scrollTop = 0; }
+			}else{
+				// hidden content of unknown size
+				this._estimateHeight();
+			}
+			this.busyResizing = false;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_FormMixin.js b/src/main/resources/static/dijit/form/_FormMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..029d362ebb7e7b642400bdb28b4d086aff689d56
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_FormMixin.js
@@ -0,0 +1,454 @@
+define([
+	"dojo/_base/array", // array.every array.filter array.forEach array.indexOf array.map
+	"dojo/_base/declare", // declare
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/lang", // lang.hitch lang.isArray
+	"dojo/on",
+	"dojo/window" // winUtils.scrollIntoView
+], function(array, declare, kernel, lang, on, winUtils){
+
+	// module:
+	//		dijit/form/_FormMixin
+
+	return declare("dijit.form._FormMixin", null, {
+		// summary:
+		//		Mixin for containers of form widgets (i.e. widgets that represent a single value
+		//		and can be children of a `<form>` node or `dijit/form/Form` widget)
+		// description:
+		//		Can extract all the form widgets
+		//		values and combine them into a single javascript object, or alternately
+		//		take such an object and set the values for all the contained
+		//		form widgets
+
+	/*=====
+		// value: Object
+		//		Name/value hash for each child widget with a name and value.
+		//		Child widgets without names are not part of the hash.
+		//
+		//		If there are multiple child widgets w/the same name, value is an array,
+		//		unless they are radio buttons in which case value is a scalar (since only
+		//		one radio button can be checked at a time).
+		//
+		//		If a child widget's name is a dot separated list (like a.b.c.d), it's a nested structure.
+		//
+		//		Example:
+		//	|	{ name: "John Smith", interests: ["sports", "movies"] }
+	=====*/
+
+		// state: [readonly] String
+		//		Will be "Error" if one or more of the child widgets has an invalid value,
+		//		"Incomplete" if not all of the required child widgets are filled in.  Otherwise, "",
+		//		which indicates that the form is ready to be submitted.
+		state: "",
+
+		// TODO:
+		//	* Repeater
+		//	* better handling for arrays.  Often form elements have names with [] like
+		//	* people[3].sex (for a list of people [{name: Bill, sex: M}, ...])
+
+
+		_getDescendantFormWidgets: function(/*dijit/_WidgetBase[]?*/ children){
+			// summary:
+			//		Returns all form widget descendants, searching through non-form child widgets like BorderContainer
+			var res = [];
+			array.forEach(children || this.getChildren(), function(child){
+				if("value" in child){
+					res.push(child);
+				}else{
+					res = res.concat(this._getDescendantFormWidgets(child.getChildren()));
+				}
+			}, this);
+			return res;
+		},
+
+		reset: function(){
+			array.forEach(this._getDescendantFormWidgets(), function(widget){
+				if(widget.reset){
+					widget.reset();
+				}
+			});
+		},
+
+		validate: function(){
+			// summary:
+			//		returns if the form is valid - same as isValid - but
+			//		provides a few additional (ui-specific) features:
+			//
+			//		1. it will highlight any sub-widgets that are not valid
+			//		2. it will call focus() on the first invalid sub-widget
+			var didFocus = false;
+			return array.every(array.map(this._getDescendantFormWidgets(), function(widget){
+				// Need to set this so that "required" widgets get their
+				// state set.
+				widget._hasBeenBlurred = true;
+				var valid = widget.disabled || !widget.validate || widget.validate();
+				if(!valid && !didFocus){
+					// Set focus of the first non-valid widget
+					winUtils.scrollIntoView(widget.containerNode || widget.domNode);
+					widget.focus();
+					didFocus = true;
+				}
+				return valid;
+			}), function(item){ return item; });
+		},
+
+		setValues: function(val){
+			kernel.deprecated(this.declaredClass+"::setValues() is deprecated. Use set('value', val) instead.", "", "2.0");
+			return this.set('value', val);
+		},
+		_setValueAttr: function(/*Object*/ obj){
+			// summary:
+			//		Fill in form values from according to an Object (in the format returned by get('value'))
+
+			// generate map from name --> [list of widgets with that name]
+			var map = { };
+			array.forEach(this._getDescendantFormWidgets(), function(widget){
+				if(!widget.name){ return; }
+				var entry = map[widget.name] || (map[widget.name] = [] );
+				entry.push(widget);
+			});
+
+			for(var name in map){
+				if(!map.hasOwnProperty(name)){
+					continue;
+				}
+				var widgets = map[name],						// array of widgets w/this name
+					values = lang.getObject(name, false, obj);	// list of values for those widgets
+
+				if(values === undefined){
+					continue;
+				}
+				values = [].concat(values);
+				if(typeof widgets[0].checked == 'boolean'){
+					// for checkbox/radio, values is a list of which widgets should be checked
+					array.forEach(widgets, function(w){
+						w.set('value', array.indexOf(values, w._get('value')) != -1);
+					});
+				}else if(widgets[0].multiple){
+					// it takes an array (e.g. multi-select)
+					widgets[0].set('value', values);
+				}else{
+					// otherwise, values is a list of values to be assigned sequentially to each widget
+					array.forEach(widgets, function(w, i){
+						w.set('value', values[i]);
+					});
+				}
+			}
+
+			/***
+			 *	TODO: code for plain input boxes (this shouldn't run for inputs that are part of widgets)
+
+			array.forEach(this.containerNode.elements, function(element){
+				if(element.name == ''){return};	// like "continue"
+				var namePath = element.name.split(".");
+				var myObj=obj;
+				var name=namePath[namePath.length-1];
+				for(var j=1,len2=namePath.length;j<len2;++j){
+					var p=namePath[j - 1];
+					// repeater support block
+					var nameA=p.split("[");
+					if(nameA.length > 1){
+						if(typeof(myObj[nameA[0]]) == "undefined"){
+							myObj[nameA[0]]=[ ];
+						} // if
+
+						nameIndex=parseInt(nameA[1]);
+						if(typeof(myObj[nameA[0]][nameIndex]) == "undefined"){
+							myObj[nameA[0]][nameIndex] = { };
+						}
+						myObj=myObj[nameA[0]][nameIndex];
+						continue;
+					} // repeater support ends
+
+					if(typeof(myObj[p]) == "undefined"){
+						myObj=undefined;
+						break;
+					};
+					myObj=myObj[p];
+				}
+
+				if(typeof(myObj) == "undefined"){
+					return;		// like "continue"
+				}
+				if(typeof(myObj[name]) == "undefined" && this.ignoreNullValues){
+					return;		// like "continue"
+				}
+
+				// TODO: widget values (just call set('value', ...) on the widget)
+
+				// TODO: maybe should call dojo.getNodeProp() instead
+				switch(element.type){
+					case "checkbox":
+						element.checked = (name in myObj) &&
+							array.some(myObj[name], function(val){ return val == element.value; });
+						break;
+					case "radio":
+						element.checked = (name in myObj) && myObj[name] == element.value;
+						break;
+					case "select-multiple":
+						element.selectedIndex=-1;
+						array.forEach(element.options, function(option){
+							option.selected = array.some(myObj[name], function(val){ return option.value == val; });
+						});
+						break;
+					case "select-one":
+						element.selectedIndex="0";
+						array.forEach(element.options, function(option){
+							option.selected = option.value == myObj[name];
+						});
+						break;
+					case "hidden":
+					case "text":
+					case "textarea":
+					case "password":
+						element.value = myObj[name] || "";
+						break;
+				}
+			});
+			*/
+
+			// Note: no need to call this._set("value", ...) as the child updates will trigger onChange events
+			// which I am monitoring.
+		},
+
+		getValues: function(){
+			kernel.deprecated(this.declaredClass+"::getValues() is deprecated. Use get('value') instead.", "", "2.0");
+			return this.get('value');
+		},
+		_getValueAttr: function(){
+			// summary:
+			//		Returns Object representing form values.   See description of `value` for details.
+			// description:
+
+			// The value is updated into this.value every time a child has an onChange event,
+			// so in the common case this function could just return this.value.   However,
+			// that wouldn't work when:
+			//
+			// 1. User presses return key to submit a form.  That doesn't fire an onchange event,
+			// and even if it did it would come too late due to the defer(...) in _handleOnChange()
+			//
+			// 2. app for some reason calls this.get("value") while the user is typing into a
+			// form field.   Not sure if that case needs to be supported or not.
+
+			// get widget values
+			var obj = { };
+			array.forEach(this._getDescendantFormWidgets(), function(widget){
+				var name = widget.name;
+				if(!name || widget.disabled){ return; }
+
+				// Single value widget (checkbox, radio, or plain <input> type widget)
+				var value = widget.get('value');
+
+				// Store widget's value(s) as a scalar, except for checkboxes which are automatically arrays
+				if(typeof widget.checked == 'boolean'){
+					if(/Radio/.test(widget.declaredClass)){
+						// radio button
+						if(value !== false){
+							lang.setObject(name, value, obj);
+						}else{
+							// give radio widgets a default of null
+							value = lang.getObject(name, false, obj);
+							if(value === undefined){
+								lang.setObject(name, null, obj);
+							}
+						}
+					}else{
+						// checkbox/toggle button
+						var ary=lang.getObject(name, false, obj);
+						if(!ary){
+							ary=[];
+							lang.setObject(name, ary, obj);
+						}
+						if(value !== false){
+							ary.push(value);
+						}
+					}
+				}else{
+					var prev=lang.getObject(name, false, obj);
+					if(typeof prev != "undefined"){
+						if(lang.isArray(prev)){
+							prev.push(value);
+						}else{
+							lang.setObject(name, [prev, value], obj);
+						}
+					}else{
+						// unique name
+						lang.setObject(name, value, obj);
+					}
+				}
+			});
+
+			/***
+			 * code for plain input boxes (see also domForm.formToObject, can we use that instead of this code?
+			 * but it doesn't understand [] notation, presumably)
+			var obj = { };
+			array.forEach(this.containerNode.elements, function(elm){
+				if(!elm.name)	{
+					return;		// like "continue"
+				}
+				var namePath = elm.name.split(".");
+				var myObj=obj;
+				var name=namePath[namePath.length-1];
+				for(var j=1,len2=namePath.length;j<len2;++j){
+					var nameIndex = null;
+					var p=namePath[j - 1];
+					var nameA=p.split("[");
+					if(nameA.length > 1){
+						if(typeof(myObj[nameA[0]]) == "undefined"){
+							myObj[nameA[0]]=[ ];
+						} // if
+						nameIndex=parseInt(nameA[1]);
+						if(typeof(myObj[nameA[0]][nameIndex]) == "undefined"){
+							myObj[nameA[0]][nameIndex] = { };
+						}
+					}else if(typeof(myObj[nameA[0]]) == "undefined"){
+						myObj[nameA[0]] = { }
+					} // if
+
+					if(nameA.length == 1){
+						myObj=myObj[nameA[0]];
+					}else{
+						myObj=myObj[nameA[0]][nameIndex];
+					} // if
+				} // for
+
+				if((elm.type != "select-multiple" && elm.type != "checkbox" && elm.type != "radio") || (elm.type == "radio" && elm.checked)){
+					if(name == name.split("[")[0]){
+						myObj[name]=elm.value;
+					}else{
+						// can not set value when there is no name
+					}
+				}else if(elm.type == "checkbox" && elm.checked){
+					if(typeof(myObj[name]) == 'undefined'){
+						myObj[name]=[ ];
+					}
+					myObj[name].push(elm.value);
+				}else if(elm.type == "select-multiple"){
+					if(typeof(myObj[name]) == 'undefined'){
+						myObj[name]=[ ];
+					}
+					for(var jdx=0,len3=elm.options.length; jdx<len3; ++jdx){
+						if(elm.options[jdx].selected){
+							myObj[name].push(elm.options[jdx].value);
+						}
+					}
+				} // if
+				name=undefined;
+			}); // forEach
+			***/
+			return obj;
+		},
+
+		isValid: function(){
+			// summary:
+			//		Returns true if all of the widgets are valid.
+			//		Deprecated, will be removed in 2.0.  Use get("state") instead.
+
+			return this.state == "";
+		},
+
+		onValidStateChange: function(/*Boolean*/ /*===== isValid =====*/){
+			// summary:
+			//		Stub function to connect to if you want to do something
+			//		(like disable/enable a submit button) when the valid
+			//		state changes on the form as a whole.
+			//
+			//		Deprecated.  Will be removed in 2.0.  Use watch("state", ...) instead.
+		},
+
+		_getState: function(){
+			// summary:
+			//		Compute what this.state should be based on state of children
+			var states = array.map(this._descendants, function(w){
+				return w.get("state") || "";
+			});
+
+			return array.indexOf(states, "Error") >= 0 ? "Error" :
+				array.indexOf(states, "Incomplete") >= 0 ? "Incomplete" : "";
+		},
+
+		disconnectChildren: function(){
+			// summary:
+			//		Deprecated method.   Applications no longer need to call this.   Remove for 2.0.
+		},
+
+		connectChildren: function(/*Boolean*/ inStartup){
+			// summary:
+			//		You can call this function directly, ex. in the event that you
+			//		programmatically add a widget to the form *after* the form has been
+			//		initialized.
+
+			// TODO: rename for 2.0
+
+			this._descendants = this._getDescendantFormWidgets();
+
+			// To get notifications from children they need to be started.   Children didn't used to need to be started,
+			// so for back-compat, start them here
+			array.forEach(this._descendants, function(child){
+				if(!child._started){ child.startup(); }
+			});
+
+			if(!inStartup){
+				this._onChildChange();
+			}
+		},
+
+		_onChildChange: function(/*String*/ attr){
+			// summary:
+			//		Called when child's value or disabled state changes
+
+			// The unit tests expect state update to be synchronous, so update it immediately.
+			if(!attr || attr == "state" || attr == "disabled"){
+				this._set("state", this._getState());
+			}
+
+			// Use defer() to collapse value changes in multiple children into a single
+			// update to my value.   Multiple updates will occur on:
+			//	1. Form.set()
+			//	2. Form.reset()
+			//	3. user selecting a radio button (which will de-select another radio button,
+			//		 causing two onChange events)
+			if(!attr || attr == "value" || attr == "disabled" || attr == "checked"){
+				if(this._onChangeDelayTimer){
+					this._onChangeDelayTimer.remove();
+				}
+				this._onChangeDelayTimer = this.defer(function(){
+					delete this._onChangeDelayTimer;
+					this._set("value", this.get("value"));
+				}, 10);
+			}
+		},
+
+		startup: function(){
+			this.inherited(arguments);
+
+			// Set initial this.value and this.state.   Don't emit watch() notifications.
+			this._descendants = this._getDescendantFormWidgets();
+			this.value = this.get("value");
+			this.state = this._getState();
+
+			// Initialize value and valid/invalid state tracking.
+			var self = this;
+			this.own(
+				on(
+					this.containerNode,
+					"attrmodified-state, attrmodified-disabled, attrmodified-value, attrmodified-checked",
+					function(evt){
+						if(evt.target == self.domNode){
+							return;	// ignore events that I fire on myself because my children changed
+						}
+						self._onChildChange(evt.type.replace("attrmodified-", ""));
+					}
+				)
+			);
+
+			// Make state change call onValidStateChange(), will be removed in 2.0
+			this.watch("state", function(attr, oldVal, newVal){ this.onValidStateChange(newVal == ""); });
+		},
+
+		destroy: function(){
+			this.inherited(arguments);
+		}
+
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_FormSelectWidget.js b/src/main/resources/static/dijit/form/_FormSelectWidget.js
new file mode 100644
index 0000000000000000000000000000000000000000..be3edffd8d9df0ffccb919af0ac763a7641985d1
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_FormSelectWidget.js
@@ -0,0 +1,762 @@
+define([
+	"dojo/_base/array", // array.filter array.forEach array.map array.some
+	"dojo/_base/Deferred",
+	"dojo/aspect", // aspect.after
+	"dojo/data/util/sorter", // util.sorter.createSortFunction
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.setSelectable
+	"dojo/dom-class", // domClass.toggle
+	"dojo/_base/kernel",	// _scopeName
+	"dojo/_base/lang", // lang.delegate lang.isArray lang.isObject lang.hitch
+	"dojo/query", // query
+	"dojo/when",
+	"dojo/store/util/QueryResults",
+	"./_FormValueWidget"
+], function(array, Deferred, aspect, sorter, declare, dom, domClass, kernel, lang, query, when,
+			QueryResults, _FormValueWidget){
+
+	// module:
+	//		dijit/form/_FormSelectWidget
+
+	/*=====
+	var __SelectOption = {
+		// value: String
+		//		The value of the option.  Setting to empty (or missing) will
+		//		place a separator at that location
+		// label: String
+		//		The label for our option.  It can contain html tags.
+		// selected: Boolean
+		//		Whether or not we are a selected option
+		// disabled: Boolean
+		//		Whether or not this specific option is disabled
+	};
+	=====*/
+
+	var _FormSelectWidget = declare("dijit.form._FormSelectWidget", _FormValueWidget, {
+		// summary:
+		//		Extends _FormValueWidget in order to provide "select-specific"
+		//		values - i.e., those values that are unique to `<select>` elements.
+		//		This also provides the mechanism for reading the elements from
+		//		a store, if desired.
+
+		// multiple: [const] Boolean
+		//		Whether or not we are multi-valued
+		multiple: false,
+
+		// options: __SelectOption[]
+		//		The set of options for our select item.  Roughly corresponds to
+		//		the html `<option>` tag.
+		options: null,
+
+		// store: dojo/store/api/Store
+		//		A store to use for getting our list of options - rather than reading them
+		//		from the `<option>` html tags.   Should support getIdentity().
+		//		For back-compat store can also be a dojo/data/api/Identity.
+		store: null,
+		_setStoreAttr: function(val){
+			if(this._created){		// don't repeat work that will happen in postCreate()
+				this._deprecatedSetStore(val);
+			}
+		},
+
+		// query: object
+		//		A query to use when fetching items from our store
+		query: null,
+		_setQueryAttr: function(query){
+			if(this._created){		// don't repeat work that will happen in postCreate()
+				this._deprecatedSetStore(this.store, this.selectedValue, {query: query});
+			}
+		},
+
+		// queryOptions: object
+		//		Query options to use when fetching from the store
+		queryOptions: null,
+		_setQueryOptionsAttr: function(queryOptions){
+			if(this._created){		// don't repeat work that will happen in postCreate()
+				this._deprecatedSetStore(this.store, this.selectedValue, {queryOptions: queryOptions});
+			}
+		},
+
+		// labelAttr: String?
+		//		The entries in the drop down list come from this attribute in the dojo.store items.
+		//		If ``store`` is set, labelAttr must be set too, unless store is an old-style
+		//		dojo.data store rather than a new dojo/store.
+		labelAttr: "",
+
+		// onFetch: Function
+		//		A callback to do with an onFetch - but before any items are actually
+		//		iterated over (i.e. to filter even further what you want to add)
+		onFetch: null,
+
+		// sortByLabel: Boolean
+		//		Flag to sort the options returned from a store by the label of
+		//		the store.
+		sortByLabel: true,
+
+
+		// loadChildrenOnOpen: Boolean
+		//		By default loadChildren is called when the items are fetched from the
+		//		store.  This property allows delaying loadChildren (and the creation
+		//		of the options/menuitems) until the user clicks the button to open the
+		//		dropdown.
+		loadChildrenOnOpen: false,
+
+		// onLoadDeferred: [readonly] dojo.Deferred
+		//		This is the `dojo.Deferred` returned by setStore().
+		//		Calling onLoadDeferred.then() registers your
+		//		callback to be called only once, when the prior setStore completes.
+		onLoadDeferred: null,
+
+		getOptions: function(/*anything*/ valueOrIdx){
+			// summary:
+			//		Returns a given option (or options).
+			// valueOrIdx:
+			//		If passed in as a string, that string is used to look up the option
+			//		in the array of options - based on the value property.
+			//		(See dijit/form/_FormSelectWidget.__SelectOption).
+			//
+			//		If passed in a number, then the option with the given index (0-based)
+			//		within this select will be returned.
+			//
+			//		If passed in a dijit/form/_FormSelectWidget.__SelectOption, the same option will be
+			//		returned if and only if it exists within this select.
+			//
+			//		If passed an array, then an array will be returned with each element
+			//		in the array being looked up.
+			//
+			//		If not passed a value, then all options will be returned
+			//
+			// returns:
+			//		The option corresponding with the given value or index.
+			//		null is returned if any of the following are true:
+			//
+			//		- A string value is passed in which doesn't exist
+			//		- An index is passed in which is outside the bounds of the array of options
+			//		- A dijit/form/_FormSelectWidget.__SelectOption is passed in which is not a part of the select
+
+			// NOTE: the compare for passing in a dijit/form/_FormSelectWidget.__SelectOption checks
+			//		if the value property matches - NOT if the exact option exists
+			// NOTE: if passing in an array, null elements will be placed in the returned
+			//		array when a value is not found.
+			var opts = this.options || [];
+
+			if(valueOrIdx == null){
+				return opts; // __SelectOption[]
+			}
+			if(lang.isArrayLike(valueOrIdx)){
+				return array.map(valueOrIdx, "return this.getOptions(item);", this); // __SelectOption[]
+			}
+			if(lang.isString(valueOrIdx)){
+				valueOrIdx = { value: valueOrIdx };
+			}
+			if(lang.isObject(valueOrIdx)){
+				// We were passed an option - so see if it's in our array (directly),
+				// and if it's not, try and find it by value.
+
+				if(!array.some(opts, function(option, idx){
+					for(var a in valueOrIdx){
+						if(!(a in option) || option[a] != valueOrIdx[a]){ // == and not === so that 100 matches '100'
+							return false;
+						}
+					}
+					valueOrIdx = idx;
+					return true; // stops iteration through opts
+				})){
+					valueOrIdx = -1;
+				}
+			}
+			if(valueOrIdx >= 0 && valueOrIdx < opts.length){
+				return opts[valueOrIdx]; // __SelectOption
+			}
+			return null; // null
+		},
+
+		addOption: function(/*__SelectOption|__SelectOption[]*/ option){
+			// summary:
+			//		Adds an option or options to the end of the select.  If value
+			//		of the option is empty or missing, a separator is created instead.
+			//		Passing in an array of options will yield slightly better performance
+			//		since the children are only loaded once.
+			array.forEach(lang.isArrayLike(option) ? option : [option], function(i){
+				if(i && lang.isObject(i)){
+					this.options.push(i);
+				}
+			}, this);
+			this._loadChildren();
+		},
+
+		removeOption: function(/*String|__SelectOption|Number|Array*/ valueOrIdx){
+			// summary:
+			//		Removes the given option or options.  You can remove by string
+			//		(in which case the value is removed), number (in which case the
+			//		index in the options array is removed), or select option (in
+			//		which case, the select option with a matching value is removed).
+			//		You can also pass in an array of those values for a slightly
+			//		better performance since the children are only loaded once.
+			//		For numeric option values, specify {value: number} as the argument.
+			var oldOpts = this.getOptions(lang.isArrayLike(valueOrIdx) ? valueOrIdx : [valueOrIdx]);
+			array.forEach(oldOpts, function(option){
+				// We can get null back in our array - if our option was not found.  In
+				// that case, we don't want to blow up...
+				if(option){
+					this.options = array.filter(this.options, function(node){
+						return (node.value !== option.value || node.label !== option.label);
+					});
+					this._removeOptionItem(option);
+				}
+			}, this);
+			this._loadChildren();
+		},
+
+		updateOption: function(/*__SelectOption|__SelectOption[]*/ newOption){
+			// summary:
+			//		Updates the values of the given option.  The option to update
+			//		is matched based on the value of the entered option.  Passing
+			//		in an array of new options will yield better performance since
+			//		the children will only be loaded once.
+			array.forEach(lang.isArrayLike(newOption) ? newOption : [newOption], function(i){
+				var oldOpt = this.getOptions({ value: i.value }), k;
+				if(oldOpt){
+					for(k in i){
+						oldOpt[k] = i[k];
+					}
+				}
+			}, this);
+			this._loadChildren();
+		},
+
+		setStore: function(store, selectedValue, fetchArgs){
+			kernel.deprecated(this.declaredClass+"::setStore(store, selectedValue, fetchArgs) is deprecated. Use set('query', fetchArgs.query), set('queryOptions', fetchArgs.queryOptions), set('store', store), or set('value', selectedValue) instead.", "", "2.0");
+			this._deprecatedSetStore(store, selectedValue, fetchArgs);
+		},
+
+		_deprecatedSetStore: function(store, selectedValue, fetchArgs){
+			// summary:
+			//		Sets the store you would like to use with this select widget.
+			//		The selected value is the value of the new store to set.  This
+			//		function returns the original store, in case you want to reuse
+			//		it or something.
+			// store: dojo/store/api/Store
+			//		The dojo.store you would like to use - it MUST implement getIdentity()
+			//		and MAY implement observe().
+			//		For backwards-compatibility this can also be a data.data store, in which case
+			//		it MUST implement dojo/data/api/Identity,
+			//		and MAY implement dojo/data/api/Notification.
+			// selectedValue: anything?
+			//		The value that this widget should set itself to *after* the store
+			//		has been loaded
+			// fetchArgs: Object?
+			//		Hash of parameters to set filter on store, etc.
+			//
+			//		- query: new value for Select.query,
+			//		- queryOptions: new value for Select.queryOptions,
+			//		- onFetch: callback function for each item in data (Deprecated)
+			var oStore = this.store;
+			fetchArgs = fetchArgs || {};
+
+			if(oStore !== store){
+				// Our store has changed, so cancel any listeners on old store (remove for 2.0)
+				var h;
+				while((h = this._notifyConnections.pop())){
+					h.remove();
+				}
+
+				// For backwards-compatibility, accept dojo.data store in addition to dojo.store.store.  Remove in 2.0.
+				if(!store.get){
+					lang.mixin(store, {
+						_oldAPI: true,
+						get: function(id){
+							// summary:
+							//		Retrieves an object by it's identity. This will trigger a fetchItemByIdentity.
+							//		Like dojo.store.DataStore.get() except returns native item.
+							var deferred = new Deferred();
+							this.fetchItemByIdentity({
+								identity: id,
+								onItem: function(object){
+									deferred.resolve(object);
+								},
+								onError: function(error){
+									deferred.reject(error);
+								}
+							});
+							return deferred.promise;
+						},
+						query: function(query, options){
+							// summary:
+							//		Queries the store for objects.   Like dojo/store/DataStore.query()
+							//		except returned Deferred contains array of native items.
+							var deferred = new Deferred(function(){
+								if(fetchHandle.abort){
+									fetchHandle.abort();
+								}
+							});
+							deferred.total = new Deferred();
+							var fetchHandle = this.fetch(lang.mixin({
+								query: query,
+								onBegin: function(count){
+									deferred.total.resolve(count);
+								},
+								onComplete: function(results){
+									deferred.resolve(results);
+								},
+								onError: function(error){
+									deferred.reject(error);
+								}
+							}, options));
+							return new QueryResults(deferred);
+						}
+					});
+
+					if(store.getFeatures()["dojo.data.api.Notification"]){
+						this._notifyConnections = [
+							aspect.after(store, "onNew", lang.hitch(this, "_onNewItem"), true),
+							aspect.after(store, "onDelete", lang.hitch(this, "_onDeleteItem"), true),
+							aspect.after(store, "onSet", lang.hitch(this, "_onSetItem"), true)
+						];
+					}
+				}
+				this._set("store", store);			// Our store has changed, so update our notifications
+			}
+
+			// Remove existing options (if there are any)
+			if(this.options && this.options.length){
+				this.removeOption(this.options);
+			}
+
+			// Cancel listener for updates to old (dojo.data) store
+			if(this._queryRes && this._queryRes.close){
+				this._queryRes.close();
+			}
+
+			// Cancel listener for updates to new (dojo.store) store
+			if(this._observeHandle && this._observeHandle.remove){
+				this._observeHandle.remove();
+				this._observeHandle = null;
+			}
+
+			// If user has specified new query and query options along with this new store, then use them.
+			if(fetchArgs.query){
+				this._set("query", fetchArgs.query);
+			}
+			if(fetchArgs.queryOptions){
+				this._set("queryOptions", fetchArgs.queryOptions);
+			}
+
+			// Add our new options
+			if(store && store.query){
+				this._loadingStore = true;
+				this.onLoadDeferred = new Deferred();
+
+				// Run query
+				// Save result in this._queryRes so we can cancel the listeners we register below
+				this._queryRes = store.query(this.query, this.queryOptions);
+				when(this._queryRes, lang.hitch(this, function(items){
+
+					if(this.sortByLabel && !fetchArgs.sort && items.length){
+						if(store.getValue){
+							// Old dojo.data API to access items, remove for 2.0
+							items.sort(sorter.createSortFunction([
+								{
+									attribute: store.getLabelAttributes(items[0])[0]
+								}
+							], store));
+						}else{
+							// TODO: remove sortByLabel completely for 2.0?  It can be handled by queryOptions: {sort: ... }.
+							var labelAttr = this.labelAttr;
+							items.sort(function(a, b){
+								return a[labelAttr] > b[labelAttr] ? 1 : b[labelAttr] > a[labelAttr] ? -1 : 0;
+							});
+						}
+					}
+
+					if(fetchArgs.onFetch){
+						items = fetchArgs.onFetch.call(this, items, fetchArgs);
+					}
+
+					// TODO: Add these guys as a batch, instead of separately
+					array.forEach(items, function(i){
+						this._addOptionForItem(i);
+					}, this);
+
+					// Register listener for store updates
+					if(this._queryRes.observe){
+						// observe returns yet another handle that needs its own explicit gc
+						this._observeHandle = this._queryRes.observe(lang.hitch(this, function(object, deletedFrom, insertedInto){
+							if(deletedFrom == insertedInto){
+								this._onSetItem(object);
+							}else{
+								if(deletedFrom != -1){
+									this._onDeleteItem(object);
+								}
+								if(insertedInto != -1){
+									this._onNewItem(object);
+								}
+							}
+						}), true);
+					}
+
+					// Set our value (which might be undefined), and then tweak
+					// it to send a change event with the real value
+					this._loadingStore = false;
+					this.set("value", "_pendingValue" in this ? this._pendingValue : selectedValue);
+					delete this._pendingValue;
+
+					if(!this.loadChildrenOnOpen){
+						this._loadChildren();
+					}else{
+						this._pseudoLoadChildren(items);
+					}
+					this.onLoadDeferred.resolve(true);
+					this.onSetStore();
+				}), lang.hitch(this, function(err){
+					console.error('dijit.form.Select: ' + err.toString());
+					this.onLoadDeferred.reject(err);
+				}));
+			}
+			return oStore;	// dojo/data/api/Identity
+		},
+
+		_setValueAttr: function(/*anything*/ newValue, /*Boolean?*/ priorityChange){
+			// summary:
+			//		set the value of the widget.
+			//		If a string is passed, then we set our value from looking it up.
+			if(!this._onChangeActive){
+				priorityChange = null;
+			}
+			if(this._loadingStore){
+				// Our store is loading - so save our value, and we'll set it when
+				// we're done
+				this._pendingValue = newValue;
+				return;
+			}
+			if(newValue == null){
+				return;
+			}
+			if(lang.isArrayLike(newValue)){
+				newValue = array.map(newValue, function(value){
+					return lang.isObject(value) ? value : { value: value };
+				}); // __SelectOption[]
+			}else if(lang.isObject(newValue)){
+				newValue = [newValue];
+			}else{
+				newValue = [
+					{ value: newValue }
+				];
+			}
+			newValue = array.filter(this.getOptions(newValue), function(i){
+				return i && i.value;
+			});
+			var opts = this.getOptions() || [];
+			if(!this.multiple && (!newValue[0] || !newValue[0].value) && !!opts.length){
+				newValue[0] = opts[0];
+			}
+			array.forEach(opts, function(opt){
+				opt.selected = array.some(newValue, function(v){
+					return v.value === opt.value;
+				});
+			});
+			var val = array.map(newValue, function(opt){
+				return opt.value;
+			});
+
+			if(typeof val == "undefined" || typeof val[0] == "undefined"){
+				return;
+			} // not fully initialized yet or a failed value lookup
+			var disp = array.map(newValue, function(opt){
+				return opt.label;
+			});
+			this._setDisplay(this.multiple ? disp : disp[0]);
+			this.inherited(arguments, [ this.multiple ? val : val[0], priorityChange ]);
+			this._updateSelection();
+		},
+
+		_getDisplayedValueAttr: function(){
+			// summary:
+			//		returns the displayed value of the widget
+			var ret = array.map([].concat(this.get('selectedOptions')), function(v){
+				if(v && "label" in v){
+					return v.label;
+				}else if(v){
+					return v.value;
+				}
+				return null;
+			}, this);
+			return this.multiple ? ret : ret[0];
+		},
+
+		_setDisplayedValueAttr: function(label){
+			// summary:
+			//		Sets the displayed value of the widget
+			this.set('value', this.getOptions(typeof label == "string" ? { label: label } : label));
+		},
+
+		_loadChildren: function(){
+			// summary:
+			//		Loads the children represented by this widget's options.
+			//		reset the menu to make it populatable on the next click
+			if(this._loadingStore){
+				return;
+			}
+			array.forEach(this._getChildren(), function(child){
+				child.destroyRecursive();
+			});
+			// Add each menu item
+			array.forEach(this.options, this._addOptionItem, this);
+
+			// Update states
+			this._updateSelection();
+		},
+
+		_updateSelection: function(){
+			// summary:
+			//		Sets the "selected" class on the item for styling purposes
+			this.focusedChild = null;
+			this._set("value", this._getValueFromOpts());
+			var val = [].concat(this.value);
+			if(val && val[0]){
+				var self = this;
+				array.forEach(this._getChildren(), function(child){
+					var isSelected = array.some(val, function(v){
+						return child.option && (v === child.option.value);
+					});
+					if(isSelected && !self.multiple){
+						self.focusedChild = child;
+					}
+					domClass.toggle(child.domNode, this.baseClass.replace(/\s+|$/g, "SelectedOption "), isSelected);
+					child.domNode.setAttribute("aria-selected", isSelected ? "true" : "false");
+				}, this);
+			}
+		},
+
+		_getValueFromOpts: function(){
+			// summary:
+			//		Returns the value of the widget by reading the options for
+			//		the selected flag
+			var opts = this.getOptions() || [];
+			if(!this.multiple && opts.length){
+				// Mirror what a select does - choose the first one
+				var opt = array.filter(opts, function(i){
+					return i.selected;
+				})[0];
+				if(opt && opt.value){
+					return opt.value;
+				}else{
+					opts[0].selected = true;
+					return opts[0].value;
+				}
+			}else if(this.multiple){
+				// Set value to be the sum of all selected
+				return array.map(array.filter(opts, function(i){
+					return i.selected;
+				}), function(i){
+					return i.value;
+				}) || [];
+			}
+			return "";
+		},
+
+		// Internal functions to call when we have store notifications come in
+		_onNewItem: function(/*item*/ item, /*Object?*/ parentInfo){
+			if(!parentInfo || !parentInfo.parent){
+				// Only add it if we are top-level
+				this._addOptionForItem(item);
+			}
+		},
+		_onDeleteItem: function(/*item*/ item){
+			var store = this.store;
+			this.removeOption({value: store.getIdentity(item) });
+		},
+		_onSetItem: function(/*item*/ item){
+			this.updateOption(this._getOptionObjForItem(item));
+		},
+
+		_getOptionObjForItem: function(item){
+			// summary:
+			//		Returns an option object based off the given item.  The "value"
+			//		of the option item will be the identity of the item, the "label"
+			//		of the option will be the label of the item.
+
+			// remove getLabel() call for 2.0 (it's to support the old dojo.data API)
+			var store = this.store,
+				label = (this.labelAttr && this.labelAttr in item) ? item[this.labelAttr] : store.getLabel(item),
+				value = (label ? store.getIdentity(item) : null);
+			return {value: value, label: label, item: item}; // __SelectOption
+		},
+
+		_addOptionForItem: function(/*item*/ item){
+			// summary:
+			//		Creates (and adds) the option for the given item
+			var store = this.store;
+			if(store.isItemLoaded && !store.isItemLoaded(item)){
+				// We are not loaded - so let's load it and add later.
+				// Remove for 2.0 (it's the old dojo.data API)
+				store.loadItem({item: item, onItem: function(i){
+					this._addOptionForItem(i);
+				},
+					scope: this});
+				return;
+			}
+			var newOpt = this._getOptionObjForItem(item);
+			this.addOption(newOpt);
+		},
+
+		constructor: function(params /*===== , srcNodeRef =====*/){
+			// summary:
+			//		Create the widget.
+			// params: Object|null
+			//		Hash of initialization parameters for widget, including scalar values (like title, duration etc.)
+			//		and functions, typically callbacks like onClick.
+			//		The hash can contain any of the widget's properties, excluding read-only properties.
+			// srcNodeRef: DOMNode|String?
+			//		If a srcNodeRef (DOM node) is specified, replace srcNodeRef with my generated DOM tree
+
+			//		Saves off our value, if we have an initial one set so we
+			//		can use it if we have a store as well (see startup())
+			this._oValue = (params || {}).value || null;
+			this._notifyConnections = [];	// remove for 2.0
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			dom.setSelectable(this.focusNode, false);
+		},
+
+		_fillContent: function(){
+			// summary:
+			//		Loads our options and sets up our dropdown correctly.  We
+			//		don't want any content, so we don't call any inherit chain
+			//		function.
+			if(!this.options){
+				this.options =
+					this.srcNodeRef
+						? query("> *", this.srcNodeRef).map(
+						function(node){
+							if(node.getAttribute("type") === "separator"){
+								return { value: "", label: "", selected: false, disabled: false };
+							}
+							return {
+								value: (node.getAttribute("data-" + kernel._scopeName + "-value") || node.getAttribute("value")),
+								label: String(node.innerHTML),
+								// FIXME: disabled and selected are not valid on complex markup children (which is why we're
+								// looking for data-dojo-value above.  perhaps we should data-dojo-props="" this whole thing?)
+								// decide before 1.6
+								selected: node.getAttribute("selected") || false,
+								disabled: node.getAttribute("disabled") || false
+							};
+						},
+						this)
+						: [];
+			}
+			if(!this.value){
+				this._set("value", this._getValueFromOpts());
+			}else if(this.multiple && typeof this.value == "string"){
+				this._set("value", this.value.split(","));
+			}
+		},
+
+		postCreate: function(){
+			// summary:
+			//		sets up our event handling that we need for functioning
+			//		as a select
+			this.inherited(arguments);
+
+			// Make our event connections for updating state
+			aspect.after(this, "onChange", lang.hitch(this, "_updateSelection"));
+
+			//		Connects in our store, if we have one defined
+			var store = this.store;
+			if(store && (store.getIdentity || store.getFeatures()["dojo.data.api.Identity"])){
+				// Temporarily set our store to null so that it will get set
+				// and connected appropriately
+				this.store = null;
+				this._deprecatedSetStore(store, this._oValue, {query: this.query, queryOptions: this.queryOptions});
+			}
+
+			this._storeInitialized = true;
+		},
+
+		startup: function(){
+			// summary:
+			this._loadChildren();
+			this.inherited(arguments);
+		},
+
+		destroy: function(){
+			// summary:
+			//		Clean up our connections
+
+			var h;
+			while((h = this._notifyConnections.pop())){
+				h.remove();
+			}
+
+			// Cancel listener for store updates
+			if(this._queryRes && this._queryRes.close){
+				this._queryRes.close();
+			}
+
+			// Cancel listener for updates to new (dojo.store) store
+			if(this._observeHandle && this._observeHandle.remove){
+				this._observeHandle.remove();
+				this._observeHandle = null;
+			}
+
+			this.inherited(arguments);
+		},
+
+		_addOptionItem: function(/*__SelectOption*/ /*===== option =====*/){
+			// summary:
+			//		User-overridable function which, for the given option, adds an
+			//		item to the select.  If the option doesn't have a value, then a
+			//		separator is added in that place.  Make sure to store the option
+			//		in the created option widget.
+		},
+
+		_removeOptionItem: function(/*__SelectOption*/ /*===== option =====*/){
+			// summary:
+			//		User-overridable function which, for the given option, removes
+			//		its item from the select.
+		},
+
+		_setDisplay: function(/*String or String[]*/ /*===== newDisplay =====*/){
+			// summary:
+			//		Overridable function which will set the display for the
+			//		widget.  newDisplay is either a string (in the case of
+			//		single selects) or array of strings (in the case of multi-selects)
+		},
+
+		_getChildren: function(){
+			// summary:
+			//		Overridable function to return the children that this widget contains.
+			return [];
+		},
+
+		_getSelectedOptionsAttr: function(){
+			// summary:
+			//		hooks into this.attr to provide a mechanism for getting the
+			//		option items for the current value of the widget.
+			return this.getOptions({ selected: true });
+		},
+
+		_pseudoLoadChildren: function(/*item[]*/ /*===== items =====*/){
+			// summary:
+			//		a function that will "fake" loading children, if needed, and
+			//		if we have set to not load children until the widget opens.
+			// items:
+			//		An array of items that will be loaded, when needed
+		},
+
+		onSetStore: function(){
+			// summary:
+			//		a function that can be connected to in order to receive a
+			//		notification that the store has finished loading and all options
+			//		from that store are available
+		}
+	});
+
+	/*=====
+	_FormSelectWidget.__SelectOption = __SelectOption;
+	=====*/
+
+	return _FormSelectWidget;
+});
diff --git a/src/main/resources/static/dijit/form/_FormValueMixin.js b/src/main/resources/static/dijit/form/_FormValueMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..03adfe2fbcd088dabc846a2949bddddcd191b13b
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_FormValueMixin.js
@@ -0,0 +1,74 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/keys", // keys.ESCAPE
+	"dojo/_base/lang",
+	"dojo/on",
+	"./_FormWidgetMixin"
+], function(declare, domAttr, keys, lang, on, _FormWidgetMixin){
+
+	// module:
+	//		dijit/form/_FormValueMixin
+
+	return declare("dijit.form._FormValueMixin", _FormWidgetMixin, {
+		// summary:
+		//		Mixin for widgets corresponding to native HTML elements such as `<input>` or `<select>`
+		//		that have user changeable values.
+		// description:
+		//		Each _FormValueMixin represents a single input value, and has a (possibly hidden) `<input>` element,
+		//		to which it serializes it's input value, so that form submission (either normal submission or via FormBind?)
+		//		works as expected.
+
+		// readOnly: Boolean
+		//		Should this widget respond to user input?
+		//		In markup, this is specified as "readOnly".
+		//		Similar to disabled except readOnly form values are submitted.
+		readOnly: false,
+
+		_setReadOnlyAttr: function(/*Boolean*/ value){
+			domAttr.set(this.focusNode, 'readOnly', value);
+			this._set("readOnly", value);
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// Update our reset value if it hasn't yet been set (because this.set()
+			// is only called when there *is* a value)
+			if(this._resetValue === undefined){
+				this._lastValueReported = this._resetValue = this.value;
+			}
+		},
+
+		_setValueAttr: function(/*anything*/ newValue, /*Boolean?*/ priorityChange){
+			// summary:
+			//		Hook so set('value', value) works.
+			// description:
+			//		Sets the value of the widget.
+			//		If the value has changed, then fire onChange event, unless priorityChange
+			//		is specified as null (or false?)
+			this._handleOnChange(newValue, priorityChange);
+		},
+
+		_handleOnChange: function(/*anything*/ newValue, /*Boolean?*/ priorityChange){
+			// summary:
+			//		Called when the value of the widget has changed.  Saves the new value in this.value,
+			//		and calls onChange() if appropriate.   See _FormWidget._handleOnChange() for details.
+			this._set("value", newValue);
+			this.inherited(arguments);
+		},
+
+		undo: function(){
+			// summary:
+			//		Restore the value to the last value passed to onChange
+			this._setValueAttr(this._lastValueReported, false);
+		},
+
+		reset: function(){
+			// summary:
+			//		Reset the widget's value to what it was at initialization time
+			this._hasBeenBlurred = false;
+			this._setValueAttr(this._resetValue, true);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_FormValueWidget.js b/src/main/resources/static/dijit/form/_FormValueWidget.js
new file mode 100644
index 0000000000000000000000000000000000000000..55df51df16c1cd2f9322f92457b2abd94856597a
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_FormValueWidget.js
@@ -0,0 +1,51 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/sniff", // has("ie")
+	"./_FormWidget",
+	"./_FormValueMixin"
+], function(declare, has, _FormWidget, _FormValueMixin){
+
+	// module:
+	//		dijit/form/_FormValueWidget
+
+	return declare("dijit.form._FormValueWidget", [_FormWidget, _FormValueMixin], {
+		// summary:
+		//		Base class for widgets corresponding to native HTML elements such as `<input>` or `<select>`
+		//		that have user changeable values.
+		// description:
+		//		Each _FormValueWidget represents a single input value, and has a (possibly hidden) `<input>` element,
+		//		to which it serializes it's input value, so that form submission (either normal submission or via FormBind?)
+		//		works as expected.
+
+		// Don't attempt to mixin the 'type', 'name' attributes here programatically -- they must be declared
+		// directly in the template as read by the parser in order to function. IE is known to specifically
+		// require the 'name' attribute at element creation time.  See #8484, #8660.
+
+		_layoutHackIE7: function(){
+			// summary:
+			//		Work around table sizing bugs on IE7 by forcing redraw
+
+			if(has("ie") == 7){ // fix IE7 layout bug when the widget is scrolled out of sight
+				var domNode = this.domNode;
+				var parent = domNode.parentNode;
+				var pingNode = domNode.firstChild || domNode; // target node most unlikely to have a custom filter
+				var origFilter = pingNode.style.filter; // save custom filter, most likely nothing
+				var _this = this;
+				while(parent && parent.clientHeight == 0){ // search for parents that haven't rendered yet
+					(function ping(){
+						var disconnectHandle = _this.connect(parent, "onscroll",
+							function(){
+								_this.disconnect(disconnectHandle); // only call once
+								pingNode.style.filter = (new Date()).getMilliseconds(); // set to anything that's unique
+								_this.defer(function(){
+									pingNode.style.filter = origFilter;
+								}); // restore custom filter, if any
+							}
+						);
+					})();
+					parent = parent.parentNode;
+				}
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_FormWidget.js b/src/main/resources/static/dijit/form/_FormWidget.js
new file mode 100644
index 0000000000000000000000000000000000000000..ffb2d73c8bfbfbbd8fd0ffd6fb53db119ddc2b73
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_FormWidget.js
@@ -0,0 +1,67 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/sniff", // has("dijit-legacy-requires"), has("msapp")
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/ready",
+	"../_Widget",
+	"../_CssStateMixin",
+	"../_TemplatedMixin",
+	"./_FormWidgetMixin"
+], function(declare, has, kernel, ready, _Widget, _CssStateMixin, _TemplatedMixin, _FormWidgetMixin){
+
+	// module:
+	//		dijit/form/_FormWidget
+
+	// Back compat w/1.6, remove for 2.0
+	if(has("dijit-legacy-requires")){
+		ready(0, function(){
+			var requires = ["dijit/form/_FormValueWidget"];
+			require(requires);	// use indirection so modules not rolled into a build
+		});
+	}
+
+	return declare("dijit.form._FormWidget", [_Widget, _TemplatedMixin, _CssStateMixin, _FormWidgetMixin], {
+		// summary:
+		//		Base class for widgets corresponding to native HTML elements such as `<checkbox>` or `<button>`,
+		//		which can be children of a `<form>` node or a `dijit/form/Form` widget.
+		//
+		// description:
+		//		Represents a single HTML element.
+		//		All these widgets should have these attributes just like native HTML input elements.
+		//		You can set them during widget construction or afterwards, via `dijit/_WidgetBase.set()`.
+		//
+		//		They also share some common methods.
+
+		setDisabled: function(/*Boolean*/ disabled){
+			// summary:
+			//		Deprecated.  Use set('disabled', ...) instead.
+			kernel.deprecated("setDisabled(" + disabled + ") is deprecated. Use set('disabled'," + disabled + ") instead.", "", "2.0");
+			this.set('disabled', disabled);
+		},
+
+		setValue: function(/*String*/ value){
+			// summary:
+			//		Deprecated.  Use set('value', ...) instead.
+			kernel.deprecated("dijit.form._FormWidget:setValue(" + value + ") is deprecated.  Use set('value'," + value + ") instead.", "", "2.0");
+			this.set('value', value);
+		},
+
+		getValue: function(){
+			// summary:
+			//		Deprecated.  Use get('value') instead.
+			kernel.deprecated(this.declaredClass + "::getValue() is deprecated. Use get('value') instead.", "", "2.0");
+			return this.get('value');
+		},
+
+		postMixInProperties: function(){
+			// Setup name=foo string to be referenced from the template (but only if a name has been specified).
+			// Unfortunately we can't use _setNameAttr to set the name in IE due to IE limitations, see #8484, #8660.
+			// But when IE6 and IE7 are desupported, then we probably don't need this anymore, so should remove it in 2.0.
+			// Also, don't do this for Windows 8 Store Apps because it causes a security exception (see #16452).
+			// Regarding escaping, see heading "Attribute values" in
+			// http://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.3.2
+			this.nameAttrSetting = (this.name && !has("msapp")) ? ('name="' + this.name.replace(/"/g, "&quot;") + '"') : '';
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_FormWidgetMixin.js b/src/main/resources/static/dijit/form/_FormWidgetMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..8e780d629f8d234c95e08fd61098a62e2cc50931
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_FormWidgetMixin.js
@@ -0,0 +1,249 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/dom-style", // domStyle.get
+	"dojo/_base/lang", // lang.hitch lang.isArray
+	"dojo/mouse", // mouse.isLeft
+	"dojo/on",
+	"dojo/sniff", // has("webkit")
+	"dojo/window", // winUtils.scrollIntoView
+	"../a11y"    // a11y.hasDefaultTabStop
+], function(array, declare, domAttr, domStyle, lang, mouse, on, has, winUtils, a11y){
+
+	// module:
+	//		dijit/form/_FormWidgetMixin
+
+	return declare("dijit.form._FormWidgetMixin", null, {
+		// summary:
+		//		Mixin for widgets corresponding to native HTML elements such as `<checkbox>` or `<button>`,
+		//		which can be children of a `<form>` node or a `dijit/form/Form` widget.
+		//
+		// description:
+		//		Represents a single HTML element.
+		//		All these widgets should have these attributes just like native HTML input elements.
+		//		You can set them during widget construction or afterwards, via `dijit/_WidgetBase.set()`.
+		//
+		//		They also share some common methods.
+
+		// name: [const] String
+		//		Name used when submitting form; same as "name" attribute or plain HTML elements
+		name: "",
+
+		// alt: String
+		//		Corresponds to the native HTML `<input>` element's attribute.
+		alt: "",
+
+		// value: String
+		//		Corresponds to the native HTML `<input>` element's attribute.
+		value: "",
+
+		// type: [const] String
+		//		Corresponds to the native HTML `<input>` element's attribute.
+		type: "text",
+
+		// type: String
+		//		Apply aria-label in markup to the widget's focusNode
+		"aria-label": "focusNode",
+
+		// tabIndex: String
+		//		Order fields are traversed when user hits the tab key
+		tabIndex: "0",
+		_setTabIndexAttr: "focusNode", // force copy even when tabIndex default value, needed since Button is <span>
+
+		// disabled: Boolean
+		//		Should this widget respond to user input?
+		//		In markup, this is specified as "disabled='disabled'", or just "disabled".
+		disabled: false,
+
+		// intermediateChanges: Boolean
+		//		Fires onChange for each value change or only on demand
+		intermediateChanges: false,
+
+		// scrollOnFocus: Boolean
+		//		On focus, should this widget scroll into view?
+		scrollOnFocus: true,
+
+		// Override _WidgetBase mapping id to this.domNode, needs to be on focusNode so <label> etc.
+		// works with screen reader
+		_setIdAttr: "focusNode",
+
+		_setDisabledAttr: function(/*Boolean*/ value){
+			this._set("disabled", value);
+
+			// Set disabled property if focusNode is an <input>, but aria-disabled attribute if focusNode is a <span>.
+			// Can't use "disabled" in this.focusNode as a test because on IE, that's true for all nodes.
+			if(/^(button|input|select|textarea|optgroup|option|fieldset)$/i.test(this.focusNode.tagName)){
+				domAttr.set(this.focusNode, 'disabled', value);
+			}else{
+				this.focusNode.setAttribute("aria-disabled", value ? "true" : "false");
+			}
+
+			// And also set disabled on the hidden <input> node
+			if(this.valueNode){
+				domAttr.set(this.valueNode, 'disabled', value);
+			}
+
+			if(value){
+				// reset these, because after the domNode is disabled, we can no longer receive
+				// mouse related events, see #4200
+				this._set("hovering", false);
+				this._set("active", false);
+
+				// clear tab stop(s) on this widget's focusable node(s)  (ComboBox has two focusable nodes)
+				var attachPointNames = "tabIndex" in this.attributeMap ? this.attributeMap.tabIndex :
+					("_setTabIndexAttr" in this) ? this._setTabIndexAttr : "focusNode";
+				array.forEach(lang.isArray(attachPointNames) ? attachPointNames : [attachPointNames], function(attachPointName){
+					var node = this[attachPointName];
+					// complex code because tabIndex=-1 on a <div> doesn't work on FF
+					if(has("webkit") || a11y.hasDefaultTabStop(node)){    // see #11064 about webkit bug
+						node.setAttribute('tabIndex', "-1");
+					}else{
+						node.removeAttribute('tabIndex');
+					}
+				}, this);
+			}else{
+				if(this.tabIndex != ""){
+					this.set('tabIndex', this.tabIndex);
+				}
+			}
+		},
+
+		_onFocus: function(/*String*/ by){
+			// If user clicks on the widget, even if the mouse is released outside of it,
+			// this widget's focusNode should get focus (to mimic native browser behavior).
+			// Browsers often need help to make sure the focus via mouse actually gets to the focusNode.
+			// TODO: consider removing all of this for 2.0 or sooner, see #16622 etc.
+			if(by == "mouse" && this.isFocusable()){
+				// IE exhibits strange scrolling behavior when refocusing a node so only do it when !focused.
+				var focusHandle = this.own(on(this.focusNode, "focus", function(){
+					mouseUpHandle.remove();
+					focusHandle.remove();
+				}))[0];
+				// Set a global event to handle mouseup, so it fires properly
+				// even if the cursor leaves this.domNode before the mouse up event.
+				var event = has("pointer-events") ? "pointerup" : has("MSPointer") ? "MSPointerUp" :
+					has("touch-events") ? "touchend, mouseup" :		// seems like overkill but see #16622, #16725
+					"mouseup";
+				var mouseUpHandle = this.own(on(this.ownerDocumentBody, event, lang.hitch(this, function(evt){
+					mouseUpHandle.remove();
+					focusHandle.remove();
+					// if here, then the mousedown did not focus the focusNode as the default action
+					if(this.focused){
+						if(evt.type == "touchend"){
+							this.defer("focus"); // native focus hasn't occurred yet
+						}else{
+							this.focus(); // native focus already occurred on mousedown
+						}
+					}
+				})))[0];
+			}
+			if(this.scrollOnFocus){
+				this.defer(function(){
+					winUtils.scrollIntoView(this.domNode);
+				}); // without defer, the input caret position can change on mouse click
+			}
+			this.inherited(arguments);
+		},
+
+		isFocusable: function(){
+			// summary:
+			//		Tells if this widget is focusable or not.  Used internally by dijit.
+			// tags:
+			//		protected
+			return !this.disabled && this.focusNode && (domStyle.get(this.domNode, "display") != "none");
+		},
+
+		focus: function(){
+			// summary:
+			//		Put focus on this widget
+			if(!this.disabled && this.focusNode.focus){
+				try{
+					this.focusNode.focus();
+				}catch(e){
+				}
+				/*squelch errors from hidden nodes*/
+			}
+		},
+
+		compare: function(/*anything*/ val1, /*anything*/ val2){
+			// summary:
+			//		Compare 2 values (as returned by get('value') for this widget).
+			// tags:
+			//		protected
+			if(typeof val1 == "number" && typeof val2 == "number"){
+				return (isNaN(val1) && isNaN(val2)) ? 0 : val1 - val2;
+			}else if(val1 > val2){
+				return 1;
+			}else if(val1 < val2){
+				return -1;
+			}else{
+				return 0;
+			}
+		},
+
+		onChange: function(/*===== newValue =====*/){
+			// summary:
+			//		Callback when this widget's value is changed.
+			// tags:
+			//		callback
+		},
+
+		// _onChangeActive: [private] Boolean
+		//		Indicates that changes to the value should call onChange() callback.
+		//		This is false during widget initialization, to avoid calling onChange()
+		//		when the initial value is set.
+		_onChangeActive: false,
+
+		_handleOnChange: function(/*anything*/ newValue, /*Boolean?*/ priorityChange){
+			// summary:
+			//		Called when the value of the widget is set.  Calls onChange() if appropriate
+			// newValue:
+			//		the new value
+			// priorityChange:
+			//		For a slider, for example, dragging the slider is priorityChange==false,
+			//		but on mouse up, it's priorityChange==true.  If intermediateChanges==false,
+			//		onChange is only called form priorityChange=true events.
+			// tags:
+			//		private
+			if(this._lastValueReported == undefined && (priorityChange === null || !this._onChangeActive)){
+				// this block executes not for a change, but during initialization,
+				// and is used to store away the original value (or for ToggleButton, the original checked state)
+				this._resetValue = this._lastValueReported = newValue;
+			}
+			this._pendingOnChange = this._pendingOnChange
+				|| (typeof newValue != typeof this._lastValueReported)
+				|| (this.compare(newValue, this._lastValueReported) != 0);
+			if((this.intermediateChanges || priorityChange || priorityChange === undefined) && this._pendingOnChange){
+				this._lastValueReported = newValue;
+				this._pendingOnChange = false;
+				if(this._onChangeActive){
+					if(this._onChangeHandle){
+						this._onChangeHandle.remove();
+					}
+					// defer allows hidden value processing to run and
+					// also the onChange handler can safely adjust focus, etc
+					this._onChangeHandle = this.defer(
+						function(){
+							this._onChangeHandle = null;
+							this.onChange(newValue);
+						}); // try to collapse multiple onChange's fired faster than can be processed
+				}
+			}
+		},
+
+		create: function(){
+			// Overrides _Widget.create()
+			this.inherited(arguments);
+			this._onChangeActive = true;
+		},
+
+		destroy: function(){
+			if(this._onChangeHandle){ // destroy called before last onChange has fired
+				this._onChangeHandle.remove();
+				this.onChange(this._lastValueReported);
+			}
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_ListBase.js b/src/main/resources/static/dijit/form/_ListBase.js
new file mode 100644
index 0000000000000000000000000000000000000000..98436f6a37d6337e71989b8a5d6c52e799048704
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_ListBase.js
@@ -0,0 +1,139 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/on",
+	"dojo/window" // winUtils.scrollIntoView
+], function(declare, on, winUtils){
+
+	// module:
+	//		dijit/form/_ListBase
+
+	return declare("dijit.form._ListBase", null, {
+		// summary:
+		//		Focus-less menu to handle UI events consistently.
+		//		Abstract methods that must be defined externally:
+		//
+		//		- onSelect: item is active (mousedown but not yet mouseup, or keyboard arrow selected but no Enter)
+		//		- onDeselect:  cancels onSelect
+		// tags:
+		//		private
+
+		// selected: DOMNode
+		//		currently selected node
+		selected: null,
+
+		_listConnect: function(/*String|Function*/ eventType, /*String*/ callbackFuncName){
+			// summary:
+			//		Connects 'containerNode' to specified method of this object
+			//		and automatically registers for 'disconnect' on widget destroy.
+			// description:
+			//		Provide widget-specific analog to 'connect'.
+			//		The callback function is called with the normal event object,
+			//		but also a second parameter is passed that indicates which list item
+			//		actually received the event.
+			// returns:
+			//		A handle that can be passed to `disconnect` in order to disconnect
+			//		before the widget is destroyed.
+			// tags:
+			//		private
+
+			var self = this;
+			return self.own(on(self.containerNode,
+				on.selector(
+					function(eventTarget, selector, target){
+						return eventTarget.parentNode == target;
+					},
+					eventType
+				),
+				function(evt){
+					self[callbackFuncName](evt, this);
+				}
+			));
+		},
+
+		selectFirstNode: function(){
+			// summary:
+			//		Select the first displayed item in the list.
+			var first = this.containerNode.firstChild;
+			while(first && first.style.display == "none"){
+				first = first.nextSibling;
+			}
+			this._setSelectedAttr(first, true);
+		},
+
+		selectLastNode: function(){
+			// summary:
+			//		Select the last displayed item in the list
+			var last = this.containerNode.lastChild;
+			while(last && last.style.display == "none"){
+				last = last.previousSibling;
+			}
+			this._setSelectedAttr(last, true);
+		},
+
+		selectNextNode: function(){
+			// summary:
+			//		Select the item just below the current selection.
+			//		If nothing selected, select first node.
+			var selectedNode = this.selected;
+			if(!selectedNode){
+				this.selectFirstNode();
+			}else{
+				var next = selectedNode.nextSibling;
+				while(next && next.style.display == "none"){
+					next = next.nextSibling;
+				}
+				if(!next){
+					this.selectFirstNode();
+				}else{
+					this._setSelectedAttr(next, true);
+				}
+			}
+		},
+
+		selectPreviousNode: function(){
+			// summary:
+			//		Select the item just above the current selection.
+			//		If nothing selected, select last node (if
+			//		you select Previous and try to keep scrolling up the list).
+			var selectedNode = this.selected;
+			if(!selectedNode){
+				this.selectLastNode();
+			}else{
+				var prev = selectedNode.previousSibling;
+				while(prev && prev.style.display == "none"){
+					prev = prev.previousSibling;
+				}
+				if(!prev){
+					this.selectLastNode();
+				}else{
+					this._setSelectedAttr(prev, true);
+				}
+			}
+		},
+
+		_setSelectedAttr: function(/*DomNode*/ node, /*Boolean*/ scroll){
+			// summary:
+			//		Does the actual select.
+			// node:
+			//		The option to select
+			// scroll:
+			//		If necessary, scroll node into view.  Set to false for mouse/touch to
+			//		avoid jumping problems on mobile/RTL, see https://bugs.dojotoolkit.org/ticket/17739.
+			if(this.selected != node){
+				var selectedNode = this.selected;
+				if(selectedNode){
+					this.onDeselect(selectedNode);
+				}
+				if(node){
+					if(scroll){
+						winUtils.scrollIntoView(node);
+					}
+					this.onSelect(node);
+				}
+				this._set("selected", node);
+			}else if(node){
+				this.onSelect(node);
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_ListMouseMixin.js b/src/main/resources/static/dijit/form/_ListMouseMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..001781ced44b723e62a265e6a78c414fe11d8171
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_ListMouseMixin.js
@@ -0,0 +1,93 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/on",
+	"dojo/touch",
+	"./_ListBase"
+], function(declare, on, touch, _ListBase){
+
+	// module:
+	//		dijit/form/_ListMouseMixin
+
+	return declare("dijit.form._ListMouseMixin", _ListBase, {
+		// summary:
+		//		A mixin to handle mouse or touch events for a focus-less menu
+		//		Abstract methods that must be defined externally:
+		//
+		//		- onClick: item was chosen (mousedown somewhere on the menu and mouseup somewhere on the menu)
+		// tags:
+		//		private
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// Add flag to use normalized click handling from dojo/touch
+			this.domNode.dojoClick = true;
+
+			this._listConnect("click", "_onClick");
+			this._listConnect("mousedown", "_onMouseDown");
+			this._listConnect("mouseup", "_onMouseUp");
+			this._listConnect("mouseover", "_onMouseOver");
+			this._listConnect("mouseout", "_onMouseOut");
+		},
+
+		_onClick: function(/*Event*/ evt, /*DomNode*/ target){
+			this._setSelectedAttr(target, false);
+			if(this._deferredClick){
+				this._deferredClick.remove();
+			}
+			this._deferredClick = this.defer(function(){
+				this._deferredClick = null;
+				this.onClick(target);
+			});
+		},
+
+		_onMouseDown: function(/*Event*/ evt, /*DomNode*/ target){
+			if(this._hoveredNode){
+				this.onUnhover(this._hoveredNode);
+				this._hoveredNode = null;
+			}
+			this._isDragging = true;
+			this._setSelectedAttr(target, false);
+		},
+
+		_onMouseUp: function(/*Event*/ evt, /*DomNode*/ target){
+			this._isDragging = false;
+			var selectedNode = this.selected;
+			var hoveredNode = this._hoveredNode;
+			if(selectedNode && target == selectedNode){
+				this.defer(function(){
+					this._onClick(evt, selectedNode);
+				});
+			}else if(hoveredNode){ // drag to select
+				this.defer(function(){
+					this._onClick(evt, hoveredNode);
+				});
+			}
+		},
+
+		_onMouseOut: function(/*Event*/ evt, /*DomNode*/ target){
+			if(this._hoveredNode){
+				this.onUnhover(this._hoveredNode);
+				this._hoveredNode = null;
+			}
+			if(this._isDragging){
+				this._cancelDrag = (new Date()).getTime() + 1000; // cancel in 1 second if no _onMouseOver fires
+			}
+		},
+
+		_onMouseOver: function(/*Event*/ evt, /*DomNode*/ target){
+			if(this._cancelDrag){
+				var time = (new Date()).getTime();
+				if(time > this._cancelDrag){
+					this._isDragging = false;
+				}
+				this._cancelDrag = null;
+			}
+			this._hoveredNode = target;
+			this.onHover(target);
+			if(this._isDragging){
+				this._setSelectedAttr(target, false);
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_RadioButtonMixin.js b/src/main/resources/static/dijit/form/_RadioButtonMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a4e06c4565a80dacfa42d462af461db041e3e63
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_RadioButtonMixin.js
@@ -0,0 +1,112 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr", // domAttr.set
+	"dojo/_base/lang", // lang.hitch
+	"dojo/query!css2", // query
+	"../registry"    // registry.getEnclosingWidget
+], function(array, declare, domAttr, lang, query, registry){
+
+	// module:
+	//		dijit/form/_RadioButtonMixin
+
+	return declare("dijit.form._RadioButtonMixin", null, {
+		// summary:
+		//		Mixin to provide widget functionality for an HTML radio button
+
+		// type: [private] String
+		//		type attribute on `<input>` node.
+		//		Users should not change this value.
+		type: "radio",
+
+		_getRelatedWidgets: function(){
+			// Private function needed to help iterate over all radio buttons in a group.
+			var ary = [];
+			query("input[type=radio]", this.focusNode.form || this.ownerDocument).forEach(// can't use name= since query doesn't support [] in the name
+				lang.hitch(this, function(inputNode){
+					if(inputNode.name == this.name && inputNode.form == this.focusNode.form){
+						var widget = registry.getEnclosingWidget(inputNode);
+						if(widget){
+							ary.push(widget);
+						}
+					}
+				})
+			);
+			return ary;
+		},
+
+		_setCheckedAttr: function(/*Boolean*/ value){
+			// If I am being checked then have to deselect currently checked radio button
+			this.inherited(arguments);
+			if(!this._created){
+				return;
+			}
+			if(value){
+				array.forEach(this._getRelatedWidgets(), lang.hitch(this, function(widget){
+					if(widget != this && widget.checked){
+						widget.set('checked', false);
+					}
+				}));
+			}
+		},
+
+		_getSubmitValue: function(/*String*/ value){
+			return value == null ? "on" : value;
+		},
+
+		_onClick: function(/*Event*/ e){
+			if(this.checked || this.disabled){ // nothing to do
+				e.stopPropagation();
+				e.preventDefault();
+				return false;
+			}
+
+			if(this.readOnly){ // ignored by some browsers so we have to resync the DOM elements with widget values
+				e.stopPropagation();
+				e.preventDefault();
+				array.forEach(this._getRelatedWidgets(), lang.hitch(this, function(widget){
+					domAttr.set(this.focusNode || this.domNode, 'checked', widget.checked);
+				}));
+				return false;
+			}
+
+			// RadioButton has some unique logic since it must enforce only a single button being checked at once
+			// For this reason the "_onClick" method does not call this.inherited
+
+			var canceled = false;
+			var previouslyCheckedButton;
+
+			array.some(this._getRelatedWidgets(), function(radioButton){
+				if(radioButton.checked){
+					previouslyCheckedButton = radioButton;
+					return true;
+				}
+				return false;
+			});
+
+			// We want to set the post-click values correctly for any event handlers, but since
+			// the event handlers could revert them, we don't want to fully update the widget state
+			// yet and trigger notifications
+			this.checked = true;
+			previouslyCheckedButton && (previouslyCheckedButton.checked = false);
+
+			// Call event handlers
+			// If event handler prevents it, the clicked radio button will not be checked
+			if(this.onClick(e) === false || e.defaultPrevented){
+				canceled = true;
+			}
+
+			// Reset internal state to how it was before the click
+			this.checked = false;
+			previouslyCheckedButton && (previouslyCheckedButton.checked = true);
+
+			if(canceled){
+				e.preventDefault();
+			}else{
+				this.set('checked', true);
+			}
+
+			return !canceled;
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_SearchMixin.js b/src/main/resources/static/dijit/form/_SearchMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..73ca23810bae7a6225876fb7dc315f58d3611985
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_SearchMixin.js
@@ -0,0 +1,279 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/keys", // keys
+	"dojo/_base/lang", // lang.clone lang.hitch
+	"dojo/query", // query
+	"dojo/string", // string.substitute
+	"dojo/when",
+	"../registry"	// registry.byId
+], function(declare, keys, lang, query, string, when, registry){
+
+	// module:
+	//		dijit/form/_SearchMixin
+
+
+	return declare("dijit.form._SearchMixin", null, {
+		// summary:
+		//		A mixin that implements the base functionality to search a store based upon user-entered text such as
+		//		with `dijit/form/ComboBox` or `dijit/form/FilteringSelect`
+		// tags:
+		//		protected
+
+		// pageSize: Integer
+		//		Argument to data provider.
+		//		Specifies maximum number of search results to return per query
+		pageSize: Infinity,
+
+		// store: [const] dojo/store/api/Store
+		//		Reference to data provider object used by this ComboBox.
+		//		The store must accept an object hash of properties for its query. See `query` and `queryExpr` for details.
+		store: null,
+
+		// fetchProperties: Object
+		//		Mixin to the store's fetch.
+		//		For example, to set the sort order of the ComboBox menu, pass:
+		//	|	{ sort: [{attribute:"name",descending: true}] }
+		//		To override the default queryOptions so that deep=false, do:
+		//	|	{ queryOptions: {ignoreCase: true, deep: false} }
+		fetchProperties:{},
+
+		// query: Object
+		//		A query that can be passed to `store` to initially filter the items.
+		//		ComboBox overwrites any reference to the `searchAttr` and sets it to the `queryExpr` with the user's input substituted.
+		query: {},
+
+		// list: [const] String
+		//		Alternate to specifying a store.  Id of a dijit/form/DataList widget.
+		list: "",
+		_setListAttr: function(list){
+			// Avoid having list applied to the DOM node, since it has native meaning in modern browsers
+			this._set("list", list);
+		},
+
+		// searchDelay: Integer
+		//		Delay in milliseconds between when user types something and we start
+		//		searching based on that value
+		searchDelay: 200,
+
+		// searchAttr: String
+		//		Search for items in the data store where this attribute (in the item)
+		//		matches what the user typed
+		searchAttr: "name",
+
+		// queryExpr: String
+		//		This specifies what query is sent to the data store,
+		//		based on what the user has typed.  Changing this expression will modify
+		//		whether the results are only exact matches, a "starting with" match,
+		//		etc.
+		//		`${0}` will be substituted for the user text.
+		//		`*` is used for wildcards.
+		//		`${0}*` means "starts with", `*${0}*` means "contains", `${0}` means "is"
+		queryExpr: "${0}*",
+
+		// ignoreCase: Boolean
+		//		Set true if the query should ignore case when matching possible items
+		ignoreCase: true,
+
+		_patternToRegExp: function(pattern){
+			// summary:
+			//		Helper function to convert a simple pattern to a regular expression for matching.
+			// description:
+			//		Returns a regular expression object that conforms to the defined conversion rules.
+			//		For example:
+			//
+			//		- ca*   -> /^ca.*$/
+			//		- *ca*  -> /^.*ca.*$/
+			//		- *c\*a*  -> /^.*c\*a.*$/
+			//		- *c\*a?*  -> /^.*c\*a..*$/
+			//
+			//		and so on.
+			// pattern: string
+			//		A simple matching pattern to convert that follows basic rules:
+			//
+			//		- * Means match anything, so ca* means match anything starting with ca
+			//		- ? Means match single character.  So, b?b will match to bob and bab, and so on.
+			//		- \ is an escape character.  So for example, \* means do not treat * as a match, but literal character *.
+			//
+			//		To use a \ as a character in the string, it must be escaped.  So in the pattern it should be
+			//		represented by \\ to be treated as an ordinary \ character instead of an escape.
+
+			return new RegExp("^" + pattern.replace(/(\\.)|(\*)|(\?)|\W/g, function(str, literal, star, question){
+				return star ? ".*" : question ? "." : literal ? literal : "\\" + str;
+			}) + "$", this.ignoreCase ? "mi" : "m");
+		},
+
+		_abortQuery: function(){
+			// stop in-progress query
+			if(this.searchTimer){
+				this.searchTimer = this.searchTimer.remove();
+			}
+			if(this._queryDeferHandle){
+				this._queryDeferHandle = this._queryDeferHandle.remove();
+			}
+			if(this._fetchHandle){
+				if(this._fetchHandle.abort){
+					this._cancelingQuery = true;
+					this._fetchHandle.abort();
+					this._cancelingQuery = false;
+				}
+				if(this._fetchHandle.cancel){
+					this._cancelingQuery = true;
+					this._fetchHandle.cancel();
+					this._cancelingQuery = false;
+				}
+				this._fetchHandle = null;
+			}
+		},
+
+		_processInput: function(/*Event*/ evt){
+			// summary:
+			//		Handles input (keyboard/paste) events
+			if(this.disabled || this.readOnly){ return; }
+			var key = evt.charOrCode;
+
+			this._prev_key_backspace = false;
+
+			if (key == keys.DELETE || key == keys.BACKSPACE) {
+				this._prev_key_backspace = true;
+				this._maskValidSubsetError = true;
+			}
+
+			// need to wait a tad before start search so that the event
+			// bubbles through DOM and we have value visible
+			if(!this.store){
+				this.onSearch();
+			}else{
+				this.searchTimer = this.defer("_startSearchFromInput", 1);
+			}
+		},
+
+		onSearch: function(/*===== results, query, options =====*/){
+			// summary:
+			//		Callback when a search completes.
+			//
+			// results: Object
+			//		An array of items from the originating _SearchMixin's store.
+			//
+			// query: Object
+			//		A copy of the originating _SearchMixin's query property.
+			//
+			// options: Object
+			//		The additional parameters sent to the originating _SearchMixin's store, including: start, count, queryOptions.
+			//
+			// tags:
+			//		callback
+		},
+
+		_startSearchFromInput: function(){
+			this._startSearch(this.focusNode.value);
+		},
+
+		_startSearch: function(/*String*/ text){
+			// summary:
+			//		Starts a search for elements matching text (text=="" means to return all items),
+			//		and calls onSearch(...) when the search completes, to display the results.
+
+			this._abortQuery();
+			var
+				_this = this,
+				// Setup parameters to be passed to store.query().
+				// Create a new query to prevent accidentally querying for a hidden
+				// value from FilteringSelect's keyField
+				query = lang.clone(this.query), // #5970
+				options = {
+					start: 0,
+					count: this.pageSize,
+					queryOptions: {		// remove for 2.0
+						ignoreCase: this.ignoreCase,
+						deep: true
+					}
+				},
+				qs = string.substitute(this.queryExpr, [text.replace(/([\\\*\?])/g, "\\$1")]),
+				q,
+				startQuery = function(){
+					var resPromise = _this._fetchHandle = _this.store.query(query, options);
+					if(_this.disabled || _this.readOnly || (q !== _this._lastQuery)){
+						return;
+					} // avoid getting unwanted notify
+					when(resPromise, function(res){
+						_this._fetchHandle = null;
+						if(!_this.disabled && !_this.readOnly && (q === _this._lastQuery)){ // avoid getting unwanted notify
+							when(resPromise.total, function(total){
+								res.total = total;
+								var pageSize = _this.pageSize;
+								if(isNaN(pageSize) || pageSize > res.total){ pageSize = res.total; }
+								// Setup method to fetching the next page of results
+								res.nextPage = function(direction){
+									//	tell callback the direction of the paging so the screen
+									//	reader knows which menu option to shout
+									options.direction = direction = direction !== false;
+									options.count = pageSize;
+									if(direction){
+										options.start += res.length;
+										if(options.start >= res.total){
+											options.count = 0;
+										}
+									}else{
+										options.start -= pageSize;
+										if(options.start < 0){
+											options.count = Math.max(pageSize + options.start, 0);
+											options.start = 0;
+										}
+									}
+									if(options.count <= 0){
+										res.length = 0;
+										_this.onSearch(res, query, options);
+									}else{
+										startQuery();
+									}
+								};
+								_this.onSearch(res, query, options);
+							});
+						}
+					}, function(err){
+						_this._fetchHandle = null;
+						if(!_this._cancelingQuery){	// don't treat canceled query as an error
+							console.error(_this.declaredClass + ' ' + err.toString());
+						}
+					});
+				};
+
+			lang.mixin(options, this.fetchProperties);
+
+			// Generate query
+			if(this.store._oldAPI){
+				// remove this branch for 2.0
+				q = qs;
+			}else{
+				// Query on searchAttr is a regex for benefit of dojo/store/Memory,
+				// but with a toString() method to help dojo/store/JsonRest.
+				// Search string like "Co*" converted to regex like /^Co.*$/i.
+				q = this._patternToRegExp(qs);
+				q.toString = function(){ return qs; };
+			}
+
+			// set _lastQuery, *then* start the timeout
+			// otherwise, if the user types and the last query returns before the timeout,
+			// _lastQuery won't be set and their input gets rewritten
+			this._lastQuery = query[this.searchAttr] = q;
+			this._queryDeferHandle = this.defer(startQuery, this.searchDelay);
+		},
+
+		//////////// INITIALIZATION METHODS ///////////////////////////////////////
+
+		constructor: function(){
+			this.query={};
+			this.fetchProperties={};
+		},
+
+		postMixInProperties: function(){
+			if(!this.store){
+				var list = this.list;
+				if(list){
+					this.store = registry.byId(list);
+				}
+			}
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_Spinner.js b/src/main/resources/static/dijit/form/_Spinner.js
new file mode 100644
index 0000000000000000000000000000000000000000..cd542025a5851e512f6d41e64dcf9b49cdbef5e1
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_Spinner.js
@@ -0,0 +1,172 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/keys", // keys keys.DOWN_ARROW keys.PAGE_DOWN keys.PAGE_UP keys.UP_ARROW
+	"dojo/_base/lang", // lang.hitch
+	"dojo/sniff", // has("mozilla")
+	"dojo/mouse", // mouse.wheel
+	"dojo/on",
+	"../typematic",
+	"./RangeBoundTextBox",
+	"dojo/text!./templates/Spinner.html",
+	"./_TextBoxMixin"    // selectInputText
+], function(declare, keys, lang, has, mouse, on, typematic, RangeBoundTextBox, template, _TextBoxMixin){
+
+	// module:
+	//		dijit/form/_Spinner
+
+	return declare("dijit.form._Spinner", RangeBoundTextBox, {
+		// summary:
+		//		Mixin for validation widgets with a spinner.
+		// description:
+		//		This class basically (conceptually) extends `dijit/form/ValidationTextBox`.
+		//		It modifies the template to have up/down arrows, and provides related handling code.
+
+		// defaultTimeout: Number
+		//		Number of milliseconds before a held arrow key or up/down button becomes typematic
+		defaultTimeout: 500,
+
+		// minimumTimeout: Number
+		//		minimum number of milliseconds that typematic event fires when held key or button is held
+		minimumTimeout: 10,
+
+		// timeoutChangeRate: Number
+		//		Fraction of time used to change the typematic timer between events.
+		//		1.0 means that each typematic event fires at defaultTimeout intervals.
+		//		Less than 1.0 means that each typematic event fires at an increasing faster rate.
+		timeoutChangeRate: 0.90,
+
+		// smallDelta: Number
+		//		Adjust the value by this much when spinning using the arrow keys/buttons
+		smallDelta: 1,
+
+		// largeDelta: Number
+		//		Adjust the value by this much when spinning using the PgUp/Dn keys
+		largeDelta: 10,
+
+		templateString: template,
+
+		baseClass: "dijitTextBox dijitSpinner",
+
+		// Set classes like dijitUpArrowButtonHover or dijitDownArrowButtonActive depending on
+		// mouse action over specified node
+		cssStateNodes: {
+			"upArrowNode": "dijitUpArrowButton",
+			"downArrowNode": "dijitDownArrowButton"
+		},
+
+		adjust: function(val /*=====, delta =====*/){
+			// summary:
+			//		Overridable function used to adjust a primitive value(Number/Date/...) by the delta amount specified.
+			//		The val is adjusted in a way that makes sense to the object type.
+			// val: Object
+			// delta: Number
+			// tags:
+			//		protected extension
+			return val;
+		},
+
+		_arrowPressed: function(/*Node*/ nodePressed, /*Number*/ direction, /*Number*/ increment){
+			// summary:
+			//		Handler for arrow button or arrow key being pressed
+			if(this.disabled || this.readOnly){
+				return;
+			}
+			this._setValueAttr(this.adjust(this.get('value'), direction * increment), false);
+			_TextBoxMixin.selectInputText(this.textbox, this.textbox.value.length);
+		},
+
+		_arrowReleased: function(/*Node*/ /*===== node =====*/){
+			// summary:
+			//		Handler for arrow button or arrow key being released
+			this._wheelTimer = null;
+		},
+
+		_typematicCallback: function(/*Number*/ count, /*DOMNode*/ node, /*Event*/ evt){
+			var inc = this.smallDelta;
+			if(node == this.textbox){
+				var key = evt.keyCode;
+				inc = (key == keys.PAGE_UP || key == keys.PAGE_DOWN) ? this.largeDelta : this.smallDelta;
+				node = (key == keys.UP_ARROW || key == keys.PAGE_UP) ? this.upArrowNode : this.downArrowNode;
+			}
+			if(count == -1){
+				this._arrowReleased(node);
+			}
+			else{
+				this._arrowPressed(node, (node == this.upArrowNode) ? 1 : -1, inc);
+			}
+		},
+
+		_wheelTimer: null,
+		_mouseWheeled: function(/*Event*/ evt){
+			// summary:
+			//		Mouse wheel listener where supported
+
+			if(!this.focused){
+				// If use is scrolling over page and we happen to get the mouse wheel event, just ignore it.
+				return;
+			}
+
+			evt.stopPropagation();
+			evt.preventDefault();
+			// FIXME: Safari bubbles
+
+			// be nice to DOH and scroll as much as the event says to
+			var wheelDelta = evt.wheelDelta / 120;
+			if(Math.floor(wheelDelta) != wheelDelta){
+				// If not an int multiple of 120, then its touchpad scrolling.
+				// This can change very fast so just assume 1 wheel click to make it more manageable.
+				wheelDelta = evt.wheelDelta > 0 ? 1 : -1;
+			}
+			var scrollAmount = evt.detail ? (evt.detail * -1) : wheelDelta;
+			if(scrollAmount !== 0){
+				var node = this[(scrollAmount > 0 ? "upArrowNode" : "downArrowNode" )];
+
+				this._arrowPressed(node, scrollAmount, this.smallDelta);
+
+				if(this._wheelTimer){
+					this._wheelTimer.remove();
+				}
+				this._wheelTimer = this.defer(function(){
+					this._arrowReleased(node);
+				}, 50);
+			}
+		},
+
+		_setConstraintsAttr: function(/*Object*/ constraints){
+			this.inherited(arguments);
+			if(this.focusNode){ // not set when called from postMixInProperties
+				if(this.constraints.min !== undefined){
+					this.focusNode.setAttribute("aria-valuemin", this.constraints.min);
+				}else{
+					this.focusNode.removeAttribute("aria-valuemin");
+				}
+				if(this.constraints.max !== undefined){
+					this.focusNode.setAttribute("aria-valuemax", this.constraints.max);
+				}else{
+					this.focusNode.removeAttribute("aria-valuemax");
+				}
+			}
+		},
+
+		_setValueAttr: function(/*Number*/ value, /*Boolean?*/ priorityChange){
+			// summary:
+			//		Hook so set('value', ...) works.
+
+			this.focusNode.setAttribute("aria-valuenow", value);
+			this.inherited(arguments);
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// extra listeners
+			this.own(
+				on(this.domNode, mouse.wheel, lang.hitch(this, "_mouseWheeled")),
+				typematic.addListener(this.upArrowNode, this.textbox, {keyCode: keys.UP_ARROW, ctrlKey: false, altKey: false, shiftKey: false, metaKey: false}, this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout, this.minimumTimeout),
+				typematic.addListener(this.downArrowNode, this.textbox, {keyCode: keys.DOWN_ARROW, ctrlKey: false, altKey: false, shiftKey: false, metaKey: false}, this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout, this.minimumTimeout),
+				typematic.addListener(this.upArrowNode, this.textbox, {keyCode: keys.PAGE_UP, ctrlKey: false, altKey: false, shiftKey: false, metaKey: false}, this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout, this.minimumTimeout),
+				typematic.addListener(this.downArrowNode, this.textbox, {keyCode: keys.PAGE_DOWN, ctrlKey: false, altKey: false, shiftKey: false, metaKey: false}, this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout, this.minimumTimeout)
+			);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/_TextBoxMixin.js b/src/main/resources/static/dijit/form/_TextBoxMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..2937fed2f654bf684c867da233a7f0d4318a4e80
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_TextBoxMixin.js
@@ -0,0 +1,546 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.byId
+	"dojo/sniff",	// has("ie"), has("dojo-bidi")
+	"dojo/keys", // keys.ALT keys.CAPS_LOCK keys.CTRL keys.META keys.SHIFT
+	"dojo/_base/lang", // lang.mixin
+	"dojo/on", // on
+	"../main"    // for exporting dijit._setSelectionRange, dijit.selectInputText
+], function(array, declare, dom, has, keys, lang, on, dijit){
+
+	// module:
+	//		dijit/form/_TextBoxMixin
+
+	var _TextBoxMixin = declare("dijit.form._TextBoxMixin" + (has("dojo-bidi") ? "_NoBidi" : ""), null, {
+		// summary:
+		//		A mixin for textbox form input widgets
+
+		// trim: Boolean
+		//		Removes leading and trailing whitespace if true.  Default is false.
+		trim: false,
+
+		// uppercase: Boolean
+		//		Converts all characters to uppercase if true.  Default is false.
+		uppercase: false,
+
+		// lowercase: Boolean
+		//		Converts all characters to lowercase if true.  Default is false.
+		lowercase: false,
+
+		// propercase: Boolean
+		//		Converts the first character of each word to uppercase if true.
+		propercase: false,
+
+		// maxLength: String
+		//		HTML INPUT tag maxLength declaration.
+		maxLength: "",
+
+		// selectOnClick: [const] Boolean
+		//		If true, all text will be selected when focused with mouse
+		selectOnClick: false,
+
+		// placeHolder: String
+		//		Defines a hint to help users fill out the input field (as defined in HTML 5).
+		//		This should only contain plain text (no html markup).
+		placeHolder: "",
+
+		_getValueAttr: function(){
+			// summary:
+			//		Hook so get('value') works as we like.
+			// description:
+			//		For `dijit/form/TextBox` this basically returns the value of the `<input>`.
+			//
+			//		For `dijit/form/MappedTextBox` subclasses, which have both
+			//		a "displayed value" and a separate "submit value",
+			//		This treats the "displayed value" as the master value, computing the
+			//		submit value from it via this.parse().
+			return this.parse(this.get('displayedValue'), this.constraints);
+		},
+
+		_setValueAttr: function(value, /*Boolean?*/ priorityChange, /*String?*/ formattedValue){
+			// summary:
+			//		Hook so set('value', ...) works.
+			//
+			// description:
+			//		Sets the value of the widget to "value" which can be of
+			//		any type as determined by the widget.
+			//
+			// value:
+			//		The visual element value is also set to a corresponding,
+			//		but not necessarily the same, value.
+			//
+			// formattedValue:
+			//		If specified, used to set the visual element value,
+			//		otherwise a computed visual value is used.
+			//
+			// priorityChange:
+			//		If true, an onChange event is fired immediately instead of
+			//		waiting for the next blur event.
+
+			var filteredValue;
+			if(value !== undefined){
+				// TODO: this is calling filter() on both the display value and the actual value.
+				// I added a comment to the filter() definition about this, but it should be changed.
+				filteredValue = this.filter(value);
+				if(typeof formattedValue != "string"){
+					if(filteredValue !== null && ((typeof filteredValue != "number") || !isNaN(filteredValue))){
+						formattedValue = this.filter(this.format(filteredValue, this.constraints));
+					}else{
+						formattedValue = '';
+					}
+					// Ensure the filtered value does not change after being formatted. See track #17955.
+					//
+					// This check is only applied when the formatted value is not specified by the caller in order to allow the 
+					// behavior to be overriden. This is needed whenever value synonyms cannot be determined using parse/compare. For
+					// example, dijit/form/FilteringSelect determines the formatted value asynchronously and applies it using a 
+					// callback to this method.
+					//
+					// TODO: Should developers be warned that they broke the round trip on format?
+					if (this.compare(filteredValue, this.filter(this.parse(formattedValue, this.constraints))) != 0){
+						formattedValue = null;
+					}
+				}
+			}
+			if(formattedValue != null /* and !undefined */ && ((typeof formattedValue) != "number" || !isNaN(formattedValue)) && this.textbox.value != formattedValue){
+				this.textbox.value = formattedValue;
+				this._set("displayedValue", this.get("displayedValue"));
+			}
+
+			this.inherited(arguments, [filteredValue, priorityChange]);
+		},
+
+		// displayedValue: String
+		//		For subclasses like ComboBox where the displayed value
+		//		(ex: Kentucky) and the serialized value (ex: KY) are different,
+		//		this represents the displayed value.
+		//
+		//		Setting 'displayedValue' through set('displayedValue', ...)
+		//		updates 'value', and vice-versa.  Otherwise 'value' is updated
+		//		from 'displayedValue' periodically, like onBlur etc.
+		//
+		//		TODO: move declaration to MappedTextBox?
+		//		Problem is that ComboBox references displayedValue,
+		//		for benefit of FilteringSelect.
+		displayedValue: "",
+
+		_getDisplayedValueAttr: function(){
+			// summary:
+			//		Hook so get('displayedValue') works.
+			// description:
+			//		Returns the displayed value (what the user sees on the screen),
+			//		after filtering (ie, trimming spaces etc.).
+			//
+			//		For some subclasses of TextBox (like ComboBox), the displayed value
+			//		is different from the serialized value that's actually
+			//		sent to the server (see `dijit/form/ValidationTextBox.serialize()`)
+
+			// TODO: maybe we should update this.displayedValue on every keystroke so that we don't need
+			// this method
+			// TODO: this isn't really the displayed value when the user is typing
+			return this.filter(this.textbox.value);
+		},
+
+		_setDisplayedValueAttr: function(/*String*/ value){
+			// summary:
+			//		Hook so set('displayedValue', ...) works.
+			// description:
+			//		Sets the value of the visual element to the string "value".
+			//		The widget value is also set to a corresponding,
+			//		but not necessarily the same, value.
+
+			if(value == null /* or undefined */){
+				value = ''
+			}
+			else if(typeof value != "string"){
+				value = String(value)
+			}
+
+			this.textbox.value = value;
+
+			// sets the serialized value to something corresponding to specified displayedValue
+			// (if possible), and also updates the textbox.value, for example converting "123"
+			// to "123.00"
+			this._setValueAttr(this.get('value'), undefined);
+
+			this._set("displayedValue", this.get('displayedValue'));
+		},
+
+		format: function(value /*=====, constraints =====*/){
+			// summary:
+			//		Replaceable function to convert a value to a properly formatted string.
+			// value: String
+			// constraints: Object
+			// tags:
+			//		protected extension
+			return value == null /* or undefined */ ? "" : (value.toString ? value.toString() : value);
+		},
+
+		parse: function(value /*=====, constraints =====*/){
+			// summary:
+			//		Replaceable function to convert a formatted string to a value
+			// value: String
+			// constraints: Object
+			// tags:
+			//		protected extension
+
+			return value;	// String
+		},
+
+		_refreshState: function(){
+			// summary:
+			//		After the user types some characters, etc., this method is
+			//		called to check the field for validity etc.  The base method
+			//		in `dijit/form/TextBox` does nothing, but subclasses override.
+			// tags:
+			//		protected
+		},
+
+		 onInput: function(/*Event*/ /*===== evt =====*/){
+			 // summary:
+			 //		Connect to this function to receive notifications of various user data-input events.
+			 //		Return false to cancel the event and prevent it from being processed.
+			 //		Note that although for historical reasons this method is called `onInput()`, it doesn't
+			 //		correspond to the standard DOM "input" event, because it occurs before the input has been processed.
+			 // event:
+			 //		keydown | keypress | cut | paste | compositionend
+			 // tags:
+			 //		callback
+		 },
+
+		_onInput: function(/*Event*/ evt){
+			// summary:
+			//		Called AFTER the input event has happened and this.textbox.value has new value.
+
+			this._lastInputEventValue = this.textbox.value;
+
+			// For Combobox, this needs to be called w/the keydown/keypress event that was passed to onInput().
+			// As a backup, use the "input" event itself.
+			this._processInput(this._lastInputProducingEvent || evt);
+			delete this._lastInputProducingEvent;
+
+			if(this.intermediateChanges){
+				this._handleOnChange(this.get('value'), false);
+			}
+		},
+
+		_processInput: function(/*Event*/ /*===== evt =====*/){
+			// summary:
+			//		Default action handler for user input events.
+			//		Called after the "input" event (i.e. after this.textbox.value has been updated),
+			//		but `evt` is the keydown/keypress/etc. event that triggered the "input" event.
+			// tags:
+			//		protected
+
+			this._refreshState();
+
+			// In case someone is watch()'ing for changes to displayedValue
+			this._set("displayedValue", this.get("displayedValue"));
+		},
+
+		postCreate: function(){
+			// setting the value here is needed since value="" in the template causes "undefined"
+			// and setting in the DOM (instead of the JS object) helps with form reset actions
+			this.textbox.setAttribute("value", this.textbox.value); // DOM and JS values should be the same
+
+			this.inherited(arguments);
+
+			// normalize input events to reduce spurious event processing
+			//	keydown: do not forward modifier keys
+			//		       set charOrCode to numeric keycode
+			//	keypress: do not forward numeric charOrCode keys (already sent through onkeydown)
+			//	paste, cut, compositionend: set charOrCode to 229 (IME)
+			function handleEvent(e){
+				var charOrCode;
+
+				// Filter out keydown events that will be followed by keypress events.  Note that chrome/android
+				// w/word suggestion has keydown/229 events on typing with no corresponding keypress events.
+				if(e.type == "keydown" && e.keyCode != 229){
+					charOrCode = e.keyCode;
+					switch(charOrCode){ // ignore state keys
+						case keys.SHIFT:
+						case keys.ALT:
+						case keys.CTRL:
+						case keys.META:
+						case keys.CAPS_LOCK:
+						case keys.NUM_LOCK:
+						case keys.SCROLL_LOCK:
+							return;
+					}
+					if(!e.ctrlKey && !e.metaKey && !e.altKey){ // no modifiers
+						switch(charOrCode){ // ignore location keys
+							case keys.NUMPAD_0:
+							case keys.NUMPAD_1:
+							case keys.NUMPAD_2:
+							case keys.NUMPAD_3:
+							case keys.NUMPAD_4:
+							case keys.NUMPAD_5:
+							case keys.NUMPAD_6:
+							case keys.NUMPAD_7:
+							case keys.NUMPAD_8:
+							case keys.NUMPAD_9:
+							case keys.NUMPAD_MULTIPLY:
+							case keys.NUMPAD_PLUS:
+							case keys.NUMPAD_ENTER:
+							case keys.NUMPAD_MINUS:
+							case keys.NUMPAD_PERIOD:
+							case keys.NUMPAD_DIVIDE:
+								return;
+						}
+						if((charOrCode >= 65 && charOrCode <= 90) || (charOrCode >= 48 && charOrCode <= 57) || charOrCode == keys.SPACE){
+							return; // keypress will handle simple non-modified printable keys
+						}
+						var named = false;
+						for(var i in keys){
+							if(keys[i] === e.keyCode){
+								named = true;
+								break;
+							}
+						}
+						if(!named){
+							return;
+						} // only allow named ones through
+					}
+				}
+
+				charOrCode = e.charCode >= 32 ? String.fromCharCode(e.charCode) : e.charCode;
+				if(!charOrCode){
+					charOrCode = (e.keyCode >= 65 && e.keyCode <= 90) || (e.keyCode >= 48 && e.keyCode <= 57) || e.keyCode == keys.SPACE ? String.fromCharCode(e.keyCode) : e.keyCode;
+				}
+				if(!charOrCode){
+					charOrCode = 229; // IME
+				}
+				if(e.type == "keypress"){
+					if(typeof charOrCode != "string"){
+						return;
+					}
+					if((charOrCode >= 'a' && charOrCode <= 'z') || (charOrCode >= 'A' && charOrCode <= 'Z') || (charOrCode >= '0' && charOrCode <= '9') || (charOrCode === ' ')){
+						if(e.ctrlKey || e.metaKey || e.altKey){
+							return;
+						} // can only be stopped reliably in keydown
+					}
+				}
+
+				// create fake event to set charOrCode and to know if preventDefault() was called
+				var faux = { faux: true }, attr;
+				for(attr in e){
+					if(!/^(layer[XY]|returnValue|keyLocation)$/.test(attr)){ // prevent WebKit warnings
+						var v = e[attr];
+						if(typeof v != "function" && typeof v != "undefined"){
+							faux[attr] = v;
+						}
+					}
+				}
+				lang.mixin(faux, {
+					charOrCode: charOrCode,
+					_wasConsumed: false,
+					preventDefault: function(){
+						faux._wasConsumed = true;
+						e.preventDefault();
+					},
+					stopPropagation: function(){
+						e.stopPropagation();
+					}
+				});
+
+				this._lastInputProducingEvent = faux;
+
+				// Give web page author a chance to consume the event.  Note that onInput() may be called multiple times
+				// for same keystroke: once for keypress event and once for input event.
+				//console.log(faux.type + ', charOrCode = (' + (typeof charOrCode) + ') ' + charOrCode + ', ctrl ' + !!faux.ctrlKey + ', alt ' + !!faux.altKey + ', meta ' + !!faux.metaKey + ', shift ' + !!faux.shiftKey);
+				if(this.onInput(faux) === false){ // return false means stop
+					faux.preventDefault();
+					faux.stopPropagation();
+				}
+				if(faux._wasConsumed){
+					return;
+				} // if preventDefault was called
+
+				// IE8 doesn't emit the "input" event at all, and IE9 doesn't emit it for backspace, delete, cut, etc.
+				// Since the code below (and perhaps user code) depends on that event, emit it synthetically.
+				// See http://benalpert.com/2013/06/18/a-near-perfect-oninput-shim-for-ie-8-and-9.html.
+				if(has("ie") <= 9){
+					switch(e.keyCode){
+					case keys.TAB:
+					case keys.ESCAPE:
+					case keys.DOWN_ARROW:
+					case keys.UP_ARROW:
+					case keys.LEFT_ARROW:
+					case keys.RIGHT_ARROW:
+						// These keys may alter the <input>'s value indirectly, but we don't want to emit an "input"
+						// event.  For example, the up/down arrows in TimeTextBox or ComboBox will cause the next
+						// dropdown item's value to be copied to the <input>.
+						break;
+					default:
+						if(e.keyCode == keys.ENTER && this.textbox.tagName.toLowerCase() != "textarea"){
+							break;
+						}
+						this.defer(function(){
+							if(this.textbox.value !== this._lastInputEventValue){
+								on.emit(this.textbox, "input", {bubbles: true});
+							}
+						});
+					}
+				}
+			}
+			this.own(
+				on(this.textbox, "keydown, keypress, paste, cut, compositionend", lang.hitch(this, handleEvent)),
+				on(this.textbox, "input", lang.hitch(this, "_onInput")),
+
+				// Allow keypress to bubble to this.domNode, so that TextBox.on("keypress", ...) works,
+				// but prevent it from further propagating, so that typing into a TextBox inside a Toolbar doesn't
+				// trigger the Toolbar's letter key navigation.
+				on(this.domNode, "keypress", function(e){ e.stopPropagation(); })
+			);
+		},
+
+		_blankValue: '', // if the textbox is blank, what value should be reported
+		filter: function(val){
+			// summary:
+			//		Auto-corrections (such as trimming) that are applied to textbox
+			//		value on blur or form submit.
+			// description:
+			//		For MappedTextBox subclasses, this is called twice
+			//
+			//		- once with the display value
+			//		- once the value as set/returned by set('value', ...)
+			//
+			//		and get('value'), ex: a Number for NumberTextBox.
+			//
+			//		In the latter case it does corrections like converting null to NaN.  In
+			//		the former case the NumberTextBox.filter() method calls this.inherited()
+			//		to execute standard trimming code in TextBox.filter().
+			//
+			//		TODO: break this into two methods in 2.0
+			//
+			// tags:
+			//		protected extension
+			if(val === null){
+				return this._blankValue;
+			}
+			if(typeof val != "string"){
+				return val;
+			}
+			if(this.trim){
+				val = lang.trim(val);
+			}
+			if(this.uppercase){
+				val = val.toUpperCase();
+			}
+			if(this.lowercase){
+				val = val.toLowerCase();
+			}
+			if(this.propercase){
+				val = val.replace(/[^\s]+/g, function(word){
+					return word.substring(0, 1).toUpperCase() + word.substring(1);
+				});
+			}
+			return val;
+		},
+
+		_setBlurValue: function(){
+			// Format the displayed value, for example (for NumberTextBox) convert 1.4 to 1.400,
+			// or (for CurrencyTextBox) 2.50 to $2.50
+
+			this._setValueAttr(this.get('value'), true);
+		},
+
+		_onBlur: function(e){
+			if(this.disabled){
+				return;
+			}
+			this._setBlurValue();
+			this.inherited(arguments);
+		},
+
+		_isTextSelected: function(){
+			return this.textbox.selectionStart != this.textbox.selectionEnd;
+		},
+
+		_onFocus: function(/*String*/ by){
+			if(this.disabled || this.readOnly){
+				return;
+			}
+
+			// Select all text on focus via click if nothing already selected.
+			// Since mouse-up will clear the selection, need to defer selection until after mouse-up.
+			// Don't do anything on focus by tabbing into the widget since there's no associated mouse-up event.
+			if(this.selectOnClick && by == "mouse"){
+				// Use on.once() to only select all text on first click only; otherwise users would have no way to clear
+				// the selection.
+				this._selectOnClickHandle = on.once(this.domNode, "mouseup, touchend", lang.hitch(this, function(evt){
+					// Check if the user selected some text manually (mouse-down, mouse-move, mouse-up)
+					// and if not, then select all the text
+					if(!this._isTextSelected()){
+						_TextBoxMixin.selectInputText(this.textbox);
+					}
+				}));
+				this.own(this._selectOnClickHandle);
+
+				// in case the mouseup never comes
+				this.defer(function(){
+					if(this._selectOnClickHandle){
+						this._selectOnClickHandle.remove();
+						this._selectOnClickHandle = null;
+					}
+				}, 500); // if mouseup not received soon, then treat it as some gesture
+			}
+			// call this.inherited() before refreshState(), since this.inherited() will possibly scroll the viewport
+			// (to scroll the TextBox into view), which will affect how _refreshState() positions the tooltip
+			this.inherited(arguments);
+
+			this._refreshState();
+		},
+
+		reset: function(){
+			// Overrides `dijit/_FormWidget/reset()`.
+			// Additionally resets the displayed textbox value to ''
+			this.textbox.value = '';
+			this.inherited(arguments);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		_TextBoxMixin = declare("dijit.form._TextBoxMixin", _TextBoxMixin, {
+			_setValueAttr: function(){
+				this.inherited(arguments);
+				this.applyTextDir(this.focusNode);
+			},
+			_setDisplayedValueAttr: function(){
+				this.inherited(arguments);
+				this.applyTextDir(this.focusNode);
+			},
+			_onInput: function(){
+				this.applyTextDir(this.focusNode);
+				this.inherited(arguments);
+			}
+		});
+	}
+
+	_TextBoxMixin._setSelectionRange = dijit._setSelectionRange = function(/*DomNode*/ element, /*Number?*/ start, /*Number?*/ stop){
+		if(element.setSelectionRange){
+			element.setSelectionRange(start, stop);
+		}
+	};
+
+	_TextBoxMixin.selectInputText = dijit.selectInputText = function(/*DomNode*/ element, /*Number?*/ start, /*Number?*/ stop){
+		// summary:
+		//		Select text in the input element argument, from start (default 0), to stop (default end).
+
+		// TODO: use functions in _editor/selection.js?
+		element = dom.byId(element);
+		if(isNaN(start)){
+			start = 0;
+		}
+		if(isNaN(stop)){
+			stop = element.value ? element.value.length : 0;
+		}
+		try{
+			element.focus();
+			_TextBoxMixin._setSelectionRange(element, start, stop);
+		}catch(e){ /* squelch random errors (esp. on IE) from unexpected focus changes or DOM nodes being hidden */
+		}
+	};
+
+	return _TextBoxMixin;
+});
diff --git a/src/main/resources/static/dijit/form/_ToggleButtonMixin.js b/src/main/resources/static/dijit/form/_ToggleButtonMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f21ab6de8bd701e1117814e2e1b007e9b8a5041
--- /dev/null
+++ b/src/main/resources/static/dijit/form/_ToggleButtonMixin.js
@@ -0,0 +1,69 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-attr" // domAttr.set
+], function(declare, domAttr){
+
+	// module:
+	//		dijit/form/_ToggleButtonMixin
+
+	return declare("dijit.form._ToggleButtonMixin", null, {
+		// summary:
+		//		A mixin to provide functionality to allow a button that can be in two states (checked or not).
+
+		// checked: Boolean
+		//		Corresponds to the native HTML `<input>` element's attribute.
+		//		In markup, specified as "checked='checked'" or just "checked".
+		//		True if the button is depressed, or the checkbox is checked,
+		//		or the radio button is selected, etc.
+		checked: false,
+
+		// aria-pressed for toggle buttons, and aria-checked for checkboxes
+		_aria_attr: "aria-pressed",
+
+		_onClick: function(/*Event*/ evt){
+			var original = this.checked;
+			this._set('checked', !original); // partially set the toggled value, assuming the toggle will work, so it can be overridden in the onclick handler
+			var ret = this.inherited(arguments); // the user could reset the value here
+			this.set('checked', ret ? this.checked : original); // officially set the toggled or user value, or reset it back
+			return ret;
+		},
+
+		_setCheckedAttr: function(/*Boolean*/ value, /*Boolean?*/ priorityChange){
+			this._set("checked", value);
+			var node = this.focusNode || this.domNode;
+			if(this._created){ // IE is not ready to handle checked attribute (affects tab order)
+				// needlessly setting "checked" upsets IE's tab order
+				if(domAttr.get(node, "checked") != !!value){
+					domAttr.set(node, "checked", !!value); // "mixed" -> true
+				}
+			}
+			node.setAttribute(this._aria_attr, String(value)); // aria values should be strings
+			this._handleOnChange(value, priorityChange);
+		},
+
+		postCreate: function(){ // use postCreate instead of startup so users forgetting to call startup are OK
+			this.inherited(arguments);
+			var node = this.focusNode || this.domNode;
+			if(this.checked){
+				// need this here instead of on the template so IE8 tab order works
+				node.setAttribute('checked', 'checked');
+			}
+
+			// Update our reset value if it hasn't yet been set (because this.set()
+			// is only called when there *is* a value)
+			if(this._resetValue === undefined){
+				this._lastValueReported = this._resetValue = this.checked;
+			}
+		},
+
+		reset: function(){
+			// summary:
+			//		Reset the widget's value to what it was at initialization time
+
+			this._hasBeenBlurred = false;
+
+			// set checked state to original setting
+			this.set('checked', this.params.checked || false);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/form/nls/ComboBox.js b/src/main/resources/static/dijit/form/nls/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..48cd037994470e12c58d9d25d76a61f098e679df
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ComboBox.js
@@ -0,0 +1,47 @@
+define({ root:
+//begin v1.x content
+({
+		previousMessage: "Previous choices",
+		nextMessage: "More choices"
+})
+//end v1.x content
+,
+"bs": true,
+"mk": true,
+"sr": true,
+"zh": true,
+"zh-tw": true,
+"uk": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"id": true,
+"hu": true,
+"hr": true,
+"he": true,
+"fr": true,
+"fi": true,
+"eu": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"bg": true,
+"az": true,
+"ar": true
+});
diff --git a/src/main/resources/static/dijit/form/nls/Textarea.js b/src/main/resources/static/dijit/form/nls/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..6710bb73a03b5e332328f6b794ec1af60a3fc303
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/Textarea.js
@@ -0,0 +1,50 @@
+define({ root:
+//begin v1.x content
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'edit area',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'edit area frame'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+//end v1.x content
+,
+"bs": true,
+"mk": true,
+"sr": true,
+"zh": true,
+"zh-tw": true,
+"uk": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"id": true,
+"hu": true,
+"hr": true,
+"he": true,
+"fr": true,
+"fi": true,
+"eu": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"bg": true,
+"az": true,
+"ar": true
+});
diff --git a/src/main/resources/static/dijit/form/nls/ar/ComboBox.js b/src/main/resources/static/dijit/form/nls/ar/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..b386667e097d1606ee5a5f5a5d4a1a5a10969ea5
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ar/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "الاختيارات السابقة",
+		nextMessage: "مزيد من الاختيارات"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ar/Textarea.js b/src/main/resources/static/dijit/form/nls/ar/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..cf1cb7f9977792511166434f93e6606695100445
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ar/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'مساحة التحرير',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'اطار مساحة التحرير'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ar/validate.js b/src/main/resources/static/dijit/form/nls/ar/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ed6df1f7bd17857c343e29f2409fa63cdb6c279
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ar/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "القيمة التي تم ادخالها غير صحيحة.",
+	missingMessage: "يجب ادخال هذه القيمة.",
+	rangeMessage: "هذه القيمة ليس بالمدى الصحيح."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/az/ComboBox.js b/src/main/resources/static/dijit/form/nls/az/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb3526cf5cefa1d8c00fe9afa4f47359449504ef
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/az/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+	"previousMessage" : "�vvəlki variantlar",
+	"nextMessage" : "BaÅŸqa variantlar"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/az/Textarea.js b/src/main/resources/static/dijit/form/nls/az/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..563a245a8883a0fe646dd45c0fec9e66c80500ea
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/az/Textarea.js
@@ -0,0 +1,7 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	"iframeEditTitle" : "Redaktə sahəsi",
+	"iframeFocusTitle" : "Redaktə sahəsi çərçivəsi"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/az/validate.js b/src/main/resources/static/dijit/form/nls/az/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..f2478f686403d5cc6096362cfc0dcba4f96c4fc1
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/az/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	"rangeMessage" : "Bu dəyər aralıq xaricində.",
+	"invalidMessage" : "Girilən dəyər keçərli deyil.",
+	"missingMessage" : "Bu deyər lazımlı."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/bg/ComboBox.js b/src/main/resources/static/dijit/form/nls/bg/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0bf13f632e10a67776f8bc5b847792d70ceefe1
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/bg/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+	previousMessage: "Предишни избори",
+	nextMessage: "Повече избори"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/bg/Textarea.js b/src/main/resources/static/dijit/form/nls/bg/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..d571dc52fda66e261465f414826d00634a7cc613
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/bg/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'зона за редактиране',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'рамка на зоната за редактиране'  // secondary title for editable IFRAME when focus is on outer container
+	//  to let user know that focus has moved out of editing area and to the
+	//  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/bg/validate.js b/src/main/resources/static/dijit/form/nls/bg/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..c25e121ab45237e59e29d0e5b90114517c1b03ab
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/bg/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Въведената �тойно�т е невалидна.",
+	missingMessage: "Тази �тойно�т �е изи�ква.",
+	rangeMessage: "Тази �тойно�т е извън обхват."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/bs/ComboBox.js b/src/main/resources/static/dijit/form/nls/bs/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..04db1f82c505275fb2e911c3a2a5ec9d9a0c87f2
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/bs/ComboBox.js
@@ -0,0 +1,7 @@
+define({      
+//begin v1.x content
+		previousMessage: "Prethodni izbori",
+		nextMessage: "Još izbora"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/bs/Textarea.js b/src/main/resources/static/dijit/form/nls/bs/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..484af3d4c981bfe92e6401a92cc5263fb3c6a42a
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/bs/Textarea.js
@@ -0,0 +1,10 @@
+define({      
+//begin v1.x content
+// used by both the editor and textarea widgets to provide information to screen reader users
+	iframeEditTitle: 'podru�je uređivanja',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'okvir podru�ja uređivanja'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/bs/validate.js b/src/main/resources/static/dijit/form/nls/bs/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5383539c937cf37cbaef26082379c5298a0787e
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/bs/validate.js
@@ -0,0 +1,8 @@
+define({      
+//begin v1.x content
+	invalidMessage: "Unešena vrijednost je neispravna",
+	missingMessage: "Ova vrijednost je obavezna",
+	rangeMessage: "Ova vrijednost je izvan raspona."
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/ca/ComboBox.js b/src/main/resources/static/dijit/form/nls/ca/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..837fb01fa26a4da462d1e2e8f0239a8ae9b00956
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ca/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Opcions anteriors",
+		nextMessage: "Més opcions"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ca/Textarea.js b/src/main/resources/static/dijit/form/nls/ca/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..e7ccfaa329b243a86e17bd2d2a05588f1e7c9548
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ca/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'àrea d\'edició',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'Marc de l\'àrea d\'edició'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ca/validate.js b/src/main/resources/static/dijit/form/nls/ca/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..a4c43f174e601478c41197abc5672b52b5b418f0
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ca/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "El valor introduït no és vàlid",
+	missingMessage: "Aquest valor és necessari",
+	rangeMessage: "Aquest valor és fora de l'interval"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/cs/ComboBox.js b/src/main/resources/static/dijit/form/nls/cs/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..901f9d66cf76cfd77a933ae0bf58b910dd702515
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/cs/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Předchozí volby",
+		nextMessage: "Další volby"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/cs/Textarea.js b/src/main/resources/static/dijit/form/nls/cs/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..185a195573999b17bc5dcf415fd3769bd0119c37
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/cs/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'oblast úprav',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'rámec oblasti úprav'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/cs/validate.js b/src/main/resources/static/dijit/form/nls/cs/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..725186bb6d7452412a0afb5b8b4f1a3adc72cb23
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/cs/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Zadaná hodnota není platná.",
+	missingMessage: "Tato hodnota je vyžadována.",
+	rangeMessage: "Tato hodnota je mimo rozsah."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/da/ComboBox.js b/src/main/resources/static/dijit/form/nls/da/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..91c1a0f7bb8f8c49c165d2bcb6229a2b23b5cb91
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/da/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Forrige valg",
+		nextMessage: "Flere valg"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/da/Textarea.js b/src/main/resources/static/dijit/form/nls/da/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..c7be129ba73ed65eb5639a7a83ab03eeb57d2fa1
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/da/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'redigeringsområde',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'ramme om redigeringsområde'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/da/validate.js b/src/main/resources/static/dijit/form/nls/da/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..d18f8d858b1ffd040786574a04af331558d8f010
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/da/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Den angivne værdi er ugyldig.",
+	missingMessage: "Værdien er påkrævet.",
+	rangeMessage: "Værdien er uden for intervallet."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/de/ComboBox.js b/src/main/resources/static/dijit/form/nls/de/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..fccc2d659a388eb8a97083e9c345269faa496679
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/de/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Vorherige Auswahl",
+		nextMessage: "Weitere Auswahlmöglichkeiten"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/de/Textarea.js b/src/main/resources/static/dijit/form/nls/de/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..34942003e7a8445a32f005577a7bde5900417967
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/de/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'Editierbereich',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'Rahmen für Editierbereich'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/de/validate.js b/src/main/resources/static/dijit/form/nls/de/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..947fcdf2e2908fe694fe5d20dc713e7e278d1818
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/de/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Der eingegebene Wert ist ungültig. ",
+	missingMessage: "Dieser Wert ist erforderlich.",
+	rangeMessage: "Dieser Wert liegt außerhalb des gültigen Bereichs. "
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/el/ComboBox.js b/src/main/resources/static/dijit/form/nls/el/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..18535f6e0b56e13066d0fe6019bc986225e74b6e
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/el/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Π�οηγο�μενες επιλογές",
+		nextMessage: "Πε�ισσότε�ες επιλογές"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/el/Textarea.js b/src/main/resources/static/dijit/form/nls/el/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..493dd2952911406a52b37c6a4ac4aeabd3ab3220
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/el/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'πε�ιοχή επεξε�γασίας',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'πλαίσιο πε�ιοχής επεξε�γασίας'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/el/validate.js b/src/main/resources/static/dijit/form/nls/el/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..cdee696b4a05d6eefbccfac29a025fe8a5be4af6
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/el/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Η τιμή που καταχω�ήσατε δεν είναι έγκυ�η.",
+	missingMessage: "Η τιμή αυτή π�έπει απα�αίτητα να καθο�ιστεί.",
+	rangeMessage: "Η τιμή αυτή δεν ανήκει στο ε��ος έγκυ�ων τιμών."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/es/ComboBox.js b/src/main/resources/static/dijit/form/nls/es/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..5c8198b424c07f47c7264f95b99ba437605624f2
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/es/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Opciones anteriores",
+		nextMessage: "Más opciones"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/es/Textarea.js b/src/main/resources/static/dijit/form/nls/es/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..6bf2c772457bc25bdc6db0df19d3b00bb8e50b11
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/es/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'área de edición',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'marco del área de edición'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/es/validate.js b/src/main/resources/static/dijit/form/nls/es/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..d23a1a75b6729d7672967e3da0bb69e4b5e29739
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/es/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "El valor especificado no es válido.",
+	missingMessage: "Este valor es necesario.",
+	rangeMessage: "Este valor está fuera del intervalo."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/eu/ComboBox.js b/src/main/resources/static/dijit/form/nls/eu/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..10a5773a7aff5505e4e3a4c1a808106031a89514
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/eu/ComboBox.js
@@ -0,0 +1,7 @@
+define({      
+//begin v1.x content
+		previousMessage: "Aurreko aukerak",
+		nextMessage: "Aukera gehiago"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/eu/Textarea.js b/src/main/resources/static/dijit/form/nls/eu/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e1c9c4adab6ac5ab273edb1afca25d71fc0dbc9
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/eu/Textarea.js
@@ -0,0 +1,10 @@
+define({      
+//begin v1.x content
+// used by both the editor and textarea widgets to provide information to screen reader users
+	iframeEditTitle: 'editatu area',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'editatu arearen markoa'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/eu/validate.js b/src/main/resources/static/dijit/form/nls/eu/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb0d49fe26368d5696b63796c395f61f006b38ab
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/eu/validate.js
@@ -0,0 +1,8 @@
+define({      
+//begin v1.x content
+	invalidMessage: "Sartutako balioak ez du balio.",
+	missingMessage: "Balio hau beharrezkoa da.",
+	rangeMessage: "Balio hau barrutitik kanpora dago."
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/fi/ComboBox.js b/src/main/resources/static/dijit/form/nls/fi/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..80ad09dfa760b946d0095ce8f4950e24bd5e6feb
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/fi/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Edelliset valinnat",
+		nextMessage: "Lisää valintoja"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/fi/Textarea.js b/src/main/resources/static/dijit/form/nls/fi/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..78486fe857cc49f79022799d71cdb1c20cd252b4
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/fi/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'muokkausalue',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'muokkausalueen kehys'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/fi/validate.js b/src/main/resources/static/dijit/form/nls/fi/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc8f2b9ff0e850d62d7596bdeb819e61b856675c
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/fi/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Annettu arvo ei kelpaa.",
+	missingMessage: "Tämä arvo on pakollinen.",
+	rangeMessage: "Tämä arvo on sallitun alueen ulkopuolella."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/fr/ComboBox.js b/src/main/resources/static/dijit/form/nls/fr/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b6aa1cb0cb1f6af7be8002c652ce294557c2bce
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/fr/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Choix précédents",
+		nextMessage: "Plus de choix"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/fr/Textarea.js b/src/main/resources/static/dijit/form/nls/fr/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..aea2e022808bbc936c00853f27a94215a032354d
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/fr/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'zone d\'édition',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'cadre de la zone d\'édition'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/fr/validate.js b/src/main/resources/static/dijit/form/nls/fr/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..dbc07fdc511d21a8730dfbf6eab03dd325138a29
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/fr/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "La valeur indiquée n'est pas correcte.",
+	missingMessage: "Cette valeur est requise.",
+	rangeMessage: "Cette valeur n'est pas comprise dans la plage autorisée."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/he/ComboBox.js b/src/main/resources/static/dijit/form/nls/he/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..2341def942b773ff983186f8a4a48078b7c4c0e7
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/he/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "ה�פשרויות הקודמות",
+		nextMessage: "�פשרויות נוספות"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/he/Textarea.js b/src/main/resources/static/dijit/form/nls/he/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..9ab626ec9aa24a67c2769bf1c799c3f74af8d241
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/he/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: '�זור עריכה',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'מסגרת �זור עריכה'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/he/validate.js b/src/main/resources/static/dijit/form/nls/he/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..96d1d50e28bf2d54e84572d8d4339a62f87c2706
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/he/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "הערך שצוין �ינו חוקי.",
+	missingMessage: "זהו ערך דרוש.",
+	rangeMessage: "הערך מחוץ לטווח."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/hr/ComboBox.js b/src/main/resources/static/dijit/form/nls/hr/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..262b0bdaca60e9de51ec167bfcb2c4befe5b59a1
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/hr/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Prethodni izbori",
+		nextMessage: "Više izbora"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/hr/Textarea.js b/src/main/resources/static/dijit/form/nls/hr/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..3d8a46f358a23f77af14d30939957177b42aeb3d
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/hr/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'podru�je uređivanja',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'okvir podru�ja uređivanja'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/hr/validate.js b/src/main/resources/static/dijit/form/nls/hr/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..3b3b16fdba256ae4934b0f79ccee62da39d0f6be
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/hr/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Unesena vrijednost nije važeća.",
+	missingMessage: "Potrebna je ova vrijednost.",
+	rangeMessage: "Ova vrijednost je izvan raspona."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/hu/ComboBox.js b/src/main/resources/static/dijit/form/nls/hu/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..5e28de95e9c4678e188df78ad9de803fd35b81ee
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/hu/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Előző menüpontok",
+		nextMessage: "További menüpontok"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/hu/Textarea.js b/src/main/resources/static/dijit/form/nls/hu/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..ba2c065088042b0e9fe3510c27a62963d3cf7bbb
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/hu/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'szerkesztési terület',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'szerkesztési terület keret'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/hu/validate.js b/src/main/resources/static/dijit/form/nls/hu/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1449e98e08ae04b6ee5aee9df33458ab5643b3f
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/hu/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "A megadott érték érvénytelen.",
+	missingMessage: "Meg kell adni egy értéket.",
+	rangeMessage: "Az érték kívül van a megengedett tartományon."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/id/ComboBox.js b/src/main/resources/static/dijit/form/nls/id/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb870e4c55ca7b2d5858aa13b2bc1800d56f8498
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/id/ComboBox.js
@@ -0,0 +1,7 @@
+define(
+({
+	previousMessage: "Pilihan sebelumnya",
+	nextMessage: "Pilihan lain"
+})
+);
+
diff --git a/src/main/resources/static/dijit/form/nls/id/Textarea.js b/src/main/resources/static/dijit/form/nls/id/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..68f9d104d717dd18288511b491f119bee895d025
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/id/Textarea.js
@@ -0,0 +1,10 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'edit area',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'edit bingkai area'  // secondary title for editable IFRAME when focus is on outer container
+	//  to let user know that focus has moved out of editing area and to the
+	//  parent element of the editing area
+})
+);
+
diff --git a/src/main/resources/static/dijit/form/nls/id/validate.js b/src/main/resources/static/dijit/form/nls/id/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..a6cba403d4ab2dd0165b645272bb9edd12fe129c
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/id/validate.js
@@ -0,0 +1,8 @@
+define(
+({
+	invalidMessage: "Nilai yang dimasukkan tidak valid.",
+	missingMessage: "Nilai ini diperlukan.",
+	rangeMessage: "Nilai ini di luar batas."
+})
+);
+
diff --git a/src/main/resources/static/dijit/form/nls/it/ComboBox.js b/src/main/resources/static/dijit/form/nls/it/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..2aa200f2cf76613a1f640fac8a52016e3f0e3b18
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/it/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Scelte precedenti",
+		nextMessage: "Scelte successive"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/it/Textarea.js b/src/main/resources/static/dijit/form/nls/it/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..5da4f6b05948fcca26752177c6ba5430ba8f334a
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/it/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'modifica area',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'modifica frame area'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/it/validate.js b/src/main/resources/static/dijit/form/nls/it/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..659da6316c1be5f95f1e07ae6fd5e56371bfa7a0
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/it/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Il valore immesso non è valido.",
+	missingMessage: "Questo valore è obbligatorio.",
+	rangeMessage: "Questo valore è fuori dall'intervallo consentito."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ja/ComboBox.js b/src/main/resources/static/dijit/form/nls/ja/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..c17383176bcb964eb8abd5f9a75233181d601411
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ja/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "以���択項目",
+		nextMessage: "追加��択項目"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ja/Textarea.js b/src/main/resources/static/dijit/form/nls/ja/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a7148296f77f27a54dfb6edef6d04d1f7027574
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ja/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: '編集域',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: '編集域フレーム'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ja/validate.js b/src/main/resources/static/dijit/form/nls/ja/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..cafeb188096c2b85ba20d971f13c55c1d47ea125
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ja/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "入力��値�無効��。",
+	missingMessage: "��値�必須��。",
+	rangeMessage: "��値�範囲外��。"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/kk/ComboBox.js b/src/main/resources/static/dijit/form/nls/kk/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..3a91db78aff3c61cd1ed37e8c5817706835250a7
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/kk/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "�лдыңғы нұ�қалар",
+		nextMessage: "Ба�қа нұ�қалар"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/kk/Textarea.js b/src/main/resources/static/dijit/form/nls/kk/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..ec434909974c97fee282de405e187ae806363937
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/kk/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'өңдеу аумағы',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'өңдеу аумағының жақтауы'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/kk/validate.js b/src/main/resources/static/dijit/form/nls/kk/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..97b12402643266d2e108bd2ffd3b21f40ff1a64b
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/kk/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Енгізілген мән жарамды еме�.",
+	missingMessage: "Бұл мән міндетті.",
+	rangeMessage: "Бұл мән ауқымнан ты�."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ko/ComboBox.js b/src/main/resources/static/dijit/form/nls/ko/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ea11884489bf95ea7adbead1168e63a0fd06878
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ko/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "�전 선�사항",
+		nextMessage: "기타 선�사항"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ko/Textarea.js b/src/main/resources/static/dijit/form/nls/ko/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cbe4512750075ca1c6e196ea2ad27160f98b256
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ko/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: '편집 �역',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: '편집 �역 프레임'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ko/validate.js b/src/main/resources/static/dijit/form/nls/ko/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..062171e63df57e0ad3264437edf2f12011d384a7
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ko/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "입력� 값� 올바르지 않습니다.",
+	missingMessage: "� 값� 필수입니다.",
+	rangeMessage: "� 값� 범위를 벗어납니다."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/mk/ComboBox.js b/src/main/resources/static/dijit/form/nls/mk/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..bc721b79e636314a3093b6d28edeada9eeba230f
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/mk/ComboBox.js
@@ -0,0 +1,7 @@
+define({      
+//begin v1.x content
+		previousMessage: "Претходни избори",
+		nextMessage: "Повеќе избори"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/mk/Textarea.js b/src/main/resources/static/dijit/form/nls/mk/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..0d16950d004341a9290f8d457900eea4a95a3b0c
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/mk/Textarea.js
@@ -0,0 +1,10 @@
+define({      
+//begin v1.x content
+// used by both the editor and textarea widgets to provide information to screen reader users
+	iframeEditTitle: 'уреди обла�т',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'уреди рамка на обла�т'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/mk/validate.js b/src/main/resources/static/dijit/form/nls/mk/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..c6142e330c80cd4934378b3c043f61798ef0205d
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/mk/validate.js
@@ -0,0 +1,8 @@
+define({      
+//begin v1.x content
+	invalidMessage: "Вне�ената вредно�т не е важечка.",
+	missingMessage: "Вредно�та е задолжителна.",
+	rangeMessage: "Вредно�та е надвор од оп�егот."
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/nb/ComboBox.js b/src/main/resources/static/dijit/form/nls/nb/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..ab880752c19c8fc8da580b6809e19c7202a3d568
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/nb/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Tidligere valg",
+		nextMessage: "Flere valg"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/nb/Textarea.js b/src/main/resources/static/dijit/form/nls/nb/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..54042b31204bbf17c336f6aa48e3b7205b659de2
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/nb/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'redigeringsområde',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'ramme for redigeringsområde'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/nb/validate.js b/src/main/resources/static/dijit/form/nls/nb/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..d13d55ef6319ab6266c805b055a397977ebc33be
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/nb/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Den angitte verdien er ikke gyldig.",
+	missingMessage: "Denne verdien er obligatorisk.",
+	rangeMessage: "Denne verdien er utenfor gyldig område."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/nl/ComboBox.js b/src/main/resources/static/dijit/form/nls/nl/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..301c44a1bc8922115b0ebeb6a0b0b36fc5b354ff
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/nl/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Eerdere opties",
+		nextMessage: "Meer opties"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/nl/Textarea.js b/src/main/resources/static/dijit/form/nls/nl/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..83573fba7f1fcdb1c3c7b9b7f7ea14f418bd9661
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/nl/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'veld bewerken',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'veldkader bewerken'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/nl/validate.js b/src/main/resources/static/dijit/form/nls/nl/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..ab86fe9da7049e13d82bdec442a9f385c19cb158
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/nl/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "De opgegeven waarde is ongeldig.",
+	missingMessage: "Deze waarde is verplicht.",
+	rangeMessage: "Deze waarde is niet toegestaan."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/pl/ComboBox.js b/src/main/resources/static/dijit/form/nls/pl/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c02bf001e03f627fada22c588e0d09fd59b697a
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/pl/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Poprzednie wybory",
+		nextMessage: "Więcej wyborów"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/pl/Textarea.js b/src/main/resources/static/dijit/form/nls/pl/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..d231bba245fc0f774181d9ccad958766b625e2a7
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/pl/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'edycja obszaru',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'edycja ramki obszaru'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/pl/validate.js b/src/main/resources/static/dijit/form/nls/pl/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..3646632b5b7362a082b79fa96f967328c28ce23b
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/pl/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Wprowadzona wartość jest nieprawidłowa.",
+	missingMessage: "Ta wartość jest wymagana.",
+	rangeMessage: "Ta wartość jest spoza zakresu."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/pt-pt/ComboBox.js b/src/main/resources/static/dijit/form/nls/pt-pt/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..e051cee9308e3458c4e59b58b926568819018dfc
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/pt-pt/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Opções anteriores",
+		nextMessage: "Mais opções"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/pt-pt/Textarea.js b/src/main/resources/static/dijit/form/nls/pt-pt/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..faeb1563c0d80a238df0f3d01bc8753bdb1b3f5f
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/pt-pt/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'área de edição',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'painel da área de edição'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/pt-pt/validate.js b/src/main/resources/static/dijit/form/nls/pt-pt/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..cd20691688f112f912f0cade444c99763f33159c
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/pt-pt/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "O valor introduzido não é válido.",
+	missingMessage: "Este valor é requerido.",
+	rangeMessage: "Este valor encontra-se fora do intervalo."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/pt/ComboBox.js b/src/main/resources/static/dijit/form/nls/pt/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..e051cee9308e3458c4e59b58b926568819018dfc
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/pt/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Opções anteriores",
+		nextMessage: "Mais opções"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/pt/Textarea.js b/src/main/resources/static/dijit/form/nls/pt/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..f73ee86bb7f2f050910242b6a00df6371f638c41
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/pt/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'editar área',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'editar quadro da área'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/pt/validate.js b/src/main/resources/static/dijit/form/nls/pt/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..ec912677fe19144f5d481f74c07c9d06567fc624
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/pt/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "O valor inserido não é válido.",
+	missingMessage: "Este valor é necessário.",
+	rangeMessage: "Este valor está fora do intervalo. "
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ro/ComboBox.js b/src/main/resources/static/dijit/form/nls/ro/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..4824deee4d84a642325dfe1f4c04e3a04c990276
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ro/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Alegeri anterioare",
+		nextMessage: "Mai multe alegeri"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ro/Textarea.js b/src/main/resources/static/dijit/form/nls/ro/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..69f8f1d4ff006a33daab316c1c38e1454d21686f
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ro/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'zonă de editare',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'cadru zonă de editare'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ro/validate.js b/src/main/resources/static/dijit/form/nls/ro/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f7183f27430bbe63de8860b053f2fba84a85291
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ro/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Valoarea introdusă nu este validă.",
+	missingMessage: "Această valoare este necesară.",
+	rangeMessage: "Această valoare este în afara intervalului. "
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ru/ComboBox.js b/src/main/resources/static/dijit/form/nls/ru/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..d474ac7e34b7e518a517f6efbeb4ffc8120fbb10
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ru/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Предыдущие варианты",
+		nextMessage: "Следующие варианты"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ru/Textarea.js b/src/main/resources/static/dijit/form/nls/ru/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..8eda38e84e61cd0d34c7082b4b5679291ebe9475
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ru/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'обла�ть редактировани�',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'фрейм обла�ти редактировани�'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/ru/validate.js b/src/main/resources/static/dijit/form/nls/ru/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b8e5795f5f5d78912acf6eb9496ae514c573d86
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/ru/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Указано недопу�тимое значение.",
+	missingMessage: "Это об�зательное значение.",
+	rangeMessage: "Это значение вне диапазона."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/sk/ComboBox.js b/src/main/resources/static/dijit/form/nls/sk/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..ccead72a1978f75d8228363eb5fd69c518d0f6d7
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sk/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Predchádzajúce možnosti",
+		nextMessage: "Viac možností"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/sk/Textarea.js b/src/main/resources/static/dijit/form/nls/sk/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..43408b2e3144bca6de048573283835cde8d07431
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sk/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'upraviť oblasť',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'upraviť rámec oblasti'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/sk/validate.js b/src/main/resources/static/dijit/form/nls/sk/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..f45138b4e90b5330e66d37f55b40efe0f8666d29
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sk/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Zadaná hodnota nie je platná.",
+	missingMessage: "Táto hodnota je povinná.",
+	rangeMessage: "Táto hodnota je mimo rozsah."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/sl/ComboBox.js b/src/main/resources/static/dijit/form/nls/sl/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..fcf38c68e9adae0aabe321c0198831e2b029c6a4
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sl/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Prejšnje izbire",
+		nextMessage: "Dodatne izbire"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/sl/Textarea.js b/src/main/resources/static/dijit/form/nls/sl/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..54fc8eb4b8ba305657ad389ab7dfaaa04a53fdfb
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sl/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'urejevalno podro�je',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'okvir urejevalnega podro�ja'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/sl/validate.js b/src/main/resources/static/dijit/form/nls/sl/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..74c3c5279d4f1c9b0d8cd594e30be15cc4990d0d
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sl/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Vnesena vrednost ni veljavna.",
+	missingMessage: "Ta vrednost je zahtevana.",
+	rangeMessage: "Ta vrednost je izven obmo�ja."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/sr/ComboBox.js b/src/main/resources/static/dijit/form/nls/sr/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..5fe388f58dd17634f117168171dfc06a673dca1e
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sr/ComboBox.js
@@ -0,0 +1,7 @@
+define({      
+//begin v1.x content
+		previousMessage: "Prethodne opcije",
+		nextMessage: "Više opcija"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/sr/Textarea.js b/src/main/resources/static/dijit/form/nls/sr/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..591f88dc6d1e029b3669839f92545bc8c97ae5ac
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sr/Textarea.js
@@ -0,0 +1,10 @@
+define({      
+//begin v1.x content
+// used by both the editor and textarea widgets to provide information to screen reader users
+	iframeEditTitle: 'oblast za uređivanje',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'okvir oblasti za uređivanje'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/sr/validate.js b/src/main/resources/static/dijit/form/nls/sr/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..3afbe756992fe5bd4f3cc4cee7a04ae0e6bf403a
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sr/validate.js
@@ -0,0 +1,8 @@
+define({      
+//begin v1.x content
+	invalidMessage: "Uneta vrednost nije važeća.",
+	missingMessage: "Ova vrednost je potrebna.",
+	rangeMessage: "Ova vrednost je van opsega."
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/form/nls/sv/ComboBox.js b/src/main/resources/static/dijit/form/nls/sv/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..a12c29a4cd47fa119bb062381865158e39209487
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sv/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Tidigare val",
+		nextMessage: "Fler val"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/sv/Textarea.js b/src/main/resources/static/dijit/form/nls/sv/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..74fcb6b007852198e3a31e97dcdbff69db85e0ea
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sv/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'redigeringsområde',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'redigeringsområdesram'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/sv/validate.js b/src/main/resources/static/dijit/form/nls/sv/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..cdf08161aa83c8f0345397f79bd1befde5e15b9b
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/sv/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Angivet värde är inte giltigt.",
+	missingMessage: "Värdet krävs.",
+	rangeMessage: "Värdet ligger utanför intervallet."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/th/ComboBox.js b/src/main/resources/static/dijit/form/nls/th/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..f130a80322d0ec4cff2337fd28443a7d29949bd0
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/th/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "�ารเลือ��่อนหน้า",
+		nextMessage: "�ารเลือ�เพิ่มเติม"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/th/Textarea.js b/src/main/resources/static/dijit/form/nls/th/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..24f2df13ff57b740d2782aac19b8a37ba0733ad5
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/th/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'พื้นที่��้ไข',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: '�รอบพื้นที่��้ไข'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/th/validate.js b/src/main/resources/static/dijit/form/nls/th/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..2dceb9fb05158a3181b18cb525bd1b044c1ec979
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/th/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "ค่าที่ป้อนไม่ถู�ต้อง",
+	missingMessage: "จำเป็นต้องมีค่านี้",
+	rangeMessage: "ค่านี้เ�ินช่วง"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/tr/ComboBox.js b/src/main/resources/static/dijit/form/nls/tr/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..7481b63dc2b84a13eaf0077d6061ef5d15880c04
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/tr/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "Önceki seçenekler",
+		nextMessage: "Diğer seçenekler"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/tr/Textarea.js b/src/main/resources/static/dijit/form/nls/tr/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..f8c26481e40321af3403775ea3d2e391412c0778
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/tr/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'düzenleme alanı',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'düzenleme alanı çerçevesi'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/tr/validate.js b/src/main/resources/static/dijit/form/nls/tr/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b54854f714754dee0de17d71991dc6e1c9f7517
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/tr/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Girilen değer geçersiz.",
+	missingMessage: "Bu deÄŸer gerekli.",
+	rangeMessage: "Bu değer aralık dışında."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/uk/ComboBox.js b/src/main/resources/static/dijit/form/nls/uk/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..8c93285f07fa48efb9c3b8e35f645d60a2c73393
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/uk/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+	previousMessage: "Попередні варіанти",
+	nextMessage: "Додаткові варіанти"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/uk/Textarea.js b/src/main/resources/static/dijit/form/nls/uk/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff409535103ebaba558cd8ed488eade5af2226b7
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/uk/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: 'обла�ть редагуванн�',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: 'фрейм обла�ті редагуванн�'  // secondary title for editable IFRAME when focus is on outer container
+	//  to let user know that focus has moved out of editing area and to the
+	//  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/uk/validate.js b/src/main/resources/static/dijit/form/nls/uk/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..f1863ab6209214148941b4d65f2ed433deb5e784
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/uk/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "Введено невірне значенн�.",
+	missingMessage: "Це значенн� є обов'�зковим.",
+	rangeMessage: "Це значенн� за межами діапазону."
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/validate.js b/src/main/resources/static/dijit/form/nls/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..e562afc9e722bbe0accfd4a08409ccde8ec86091
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/validate.js
@@ -0,0 +1,48 @@
+define({ root:
+//begin v1.x content
+({
+	invalidMessage: "The value entered is not valid.",
+	missingMessage: "This value is required.",
+	rangeMessage: "This value is out of range."
+})
+//end v1.x content
+,
+"bs": true,
+"mk": true,
+"sr": true,
+"zh": true,
+"zh-tw": true,
+"uk": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"id": true,
+"hu": true,
+"hr": true,
+"he": true,
+"fr": true,
+"fi": true,
+"eu": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"bg": true,
+"az": true,
+"ar": true
+});
diff --git a/src/main/resources/static/dijit/form/nls/zh-tw/ComboBox.js b/src/main/resources/static/dijit/form/nls/zh-tw/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..e7ec1d2db6c8df77883773f301f8493e07962fa4
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/zh-tw/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "�一個�擇項",
+		nextMessage: "其他�擇項"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/zh-tw/Textarea.js b/src/main/resources/static/dijit/form/nls/zh-tw/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..3df55f3c96e6c924a79f86f4ab55ac0025cd6ae9
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/zh-tw/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: '編輯�',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: '編輯�框'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/zh-tw/validate.js b/src/main/resources/static/dijit/form/nls/zh-tw/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..42d5049faa2ecd24bcee1c7cc3fa8b7235d163c8
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/zh-tw/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "輸入的值無效。",
+	missingMessage: "必須�供此值。",
+	rangeMessage: "此值超出範�。"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/zh/ComboBox.js b/src/main/resources/static/dijit/form/nls/zh/ComboBox.js
new file mode 100644
index 0000000000000000000000000000000000000000..0baa7462a032dac99cd15c9cab99170a49147ecc
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/zh/ComboBox.js
@@ -0,0 +1,6 @@
+define(
+({
+		previousMessage: "先�选项",
+		nextMessage: "更多选项"
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/zh/Textarea.js b/src/main/resources/static/dijit/form/nls/zh/Textarea.js
new file mode 100644
index 0000000000000000000000000000000000000000..838ea72a93b86aba08a743371aad469b090fa40f
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/zh/Textarea.js
@@ -0,0 +1,9 @@
+define(
+// used by both the editor and textarea widgets to provide information to screen reader users
+({
+	iframeEditTitle: '编辑区域',  // primary title for editable IFRAME, for screen readers when focus is in the editing area
+	iframeFocusTitle: '编辑区域框'  // secondary title for editable IFRAME when focus is on outer container
+									 //  to let user know that focus has moved out of editing area and to the
+									 //  parent element of the editing area
+})
+);
diff --git a/src/main/resources/static/dijit/form/nls/zh/validate.js b/src/main/resources/static/dijit/form/nls/zh/validate.js
new file mode 100644
index 0000000000000000000000000000000000000000..05538e205a9c3c85d2efdf86121f678f662f1a78
--- /dev/null
+++ b/src/main/resources/static/dijit/form/nls/zh/validate.js
@@ -0,0 +1,7 @@
+define(
+({
+	invalidMessage: "输入的值无效。",
+	missingMessage: "该值是必需的。",
+	rangeMessage: "此值超出范围。"
+})
+);
diff --git a/src/main/resources/static/dijit/form/templates/Button.html b/src/main/resources/static/dijit/form/templates/Button.html
new file mode 100644
index 0000000000000000000000000000000000000000..98574f95971fa8002ac0b62e9f29df718cd4fe8c
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/Button.html
@@ -0,0 +1,18 @@
+<span class="dijit dijitReset dijitInline" role="presentation"
+	><span class="dijitReset dijitInline dijitButtonNode"
+		data-dojo-attach-event="ondijitclick:__onClick" role="presentation"
+		><span class="dijitReset dijitStretch dijitButtonContents"
+			data-dojo-attach-point="titleNode,focusNode"
+			role="button" aria-labelledby="${id}_label"
+			><span class="dijitReset dijitInline dijitIcon" data-dojo-attach-point="iconNode"></span
+			><span class="dijitReset dijitToggleButtonIconChar">&#x25CF;</span
+			><span class="dijitReset dijitInline dijitButtonText"
+				id="${id}_label"
+				data-dojo-attach-point="containerNode"
+			></span
+		></span
+	></span
+	><input ${!nameAttrSetting} type="${type}" value="${value}" class="dijitOffScreen"
+		data-dojo-attach-event="onclick:_onClick"
+		tabIndex="-1" aria-hidden="true" data-dojo-attach-point="valueNode"
+/></span>
diff --git a/src/main/resources/static/dijit/form/templates/CheckBox.html b/src/main/resources/static/dijit/form/templates/CheckBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..5122fe2aac1e8dcc57f62ac49a30b6d0cd18021a
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/CheckBox.html
@@ -0,0 +1,7 @@
+<div class="dijit dijitReset dijitInline" role="presentation"
+	><input
+	 	${!nameAttrSetting} type="${type}" role="${type}" aria-checked="false" ${checkedAttrSetting}
+		class="dijitReset dijitCheckBoxInput"
+		data-dojo-attach-point="focusNode"
+	 	data-dojo-attach-event="ondijitclick:_onClick"
+/></div>
diff --git a/src/main/resources/static/dijit/form/templates/ComboButton.html b/src/main/resources/static/dijit/form/templates/ComboButton.html
new file mode 100644
index 0000000000000000000000000000000000000000..51d5746e3ae3c8e4a21cd50eb87013e3e012cd7a
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/ComboButton.html
@@ -0,0 +1,24 @@
+<table class="dijit dijitReset dijitInline dijitLeft"
+	cellspacing='0' cellpadding='0' role="presentation"
+	><tbody role="presentation"><tr role="presentation"
+		><td class="dijitReset dijitStretch dijitButtonNode" data-dojo-attach-point="buttonNode" data-dojo-attach-event="ondijitclick:__onClick,onkeydown:_onButtonKeyDown"
+		><div id="${id}_button" class="dijitReset dijitButtonContents"
+			data-dojo-attach-point="titleNode"
+			role="button" aria-labelledby="${id}_label"
+			><div class="dijitReset dijitInline dijitIcon" data-dojo-attach-point="iconNode" role="presentation"></div
+			><div class="dijitReset dijitInline dijitButtonText" id="${id}_label" data-dojo-attach-point="containerNode" role="presentation"></div
+		></div
+		></td
+		><td id="${id}_arrow" class='dijitReset dijitRight dijitButtonNode dijitArrowButton'
+			data-dojo-attach-point="_popupStateNode,focusNode,_buttonNode"
+			data-dojo-attach-event="onkeydown:_onArrowKeyDown"
+			title="${optionsTitle}"
+			role="button" aria-haspopup="true"
+			><div class="dijitReset dijitArrowButtonInner" role="presentation"></div
+			><div class="dijitReset dijitArrowButtonChar" role="presentation">&#9660;</div
+		></td
+		><td style="display:none !important;"
+			><input ${!nameAttrSetting} type="${type}" value="${value}" data-dojo-attach-point="valueNode"
+				class="dijitOffScreen" aria-hidden="true" data-dojo-attach-event="onclick:_onClick"
+		/></td></tr></tbody
+></table>
diff --git a/src/main/resources/static/dijit/form/templates/DropDownBox.html b/src/main/resources/static/dijit/form/templates/DropDownBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..282f559785e4662fdaa9d9fdeb9b7fd238a57c50
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/DropDownBox.html
@@ -0,0 +1,18 @@
+<div class="dijit dijitReset dijitInline dijitLeft"
+	id="widget_${id}"
+	role="combobox"
+	aria-haspopup="true"
+	data-dojo-attach-point="_popupStateNode"
+	><div class='dijitReset dijitRight dijitButtonNode dijitArrowButton dijitDownArrowButton dijitArrowButtonContainer'
+		data-dojo-attach-point="_buttonNode" role="presentation"
+		><input class="dijitReset dijitInputField dijitArrowButtonInner" value="&#9660; " type="text" tabIndex="-1" readonly="readonly" role="button presentation" aria-hidden="true"
+			${_buttonInputDisabled}
+	/></div
+	><div class='dijitReset dijitValidationContainer'
+		><input class="dijitReset dijitInputField dijitValidationIcon dijitValidationInner" value="&#935; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
+	/></div
+	><div class="dijitReset dijitInputField dijitInputContainer"
+		><input class='dijitReset dijitInputInner' ${!nameAttrSetting} type="${type}" autocomplete="off"
+			data-dojo-attach-point="textbox,focusNode" role="textbox"
+	/></div
+></div>
diff --git a/src/main/resources/static/dijit/form/templates/DropDownButton.html b/src/main/resources/static/dijit/form/templates/DropDownButton.html
new file mode 100644
index 0000000000000000000000000000000000000000..dedcb8a2a75651bde78e01cb4bfe182ea1b07643
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/DropDownButton.html
@@ -0,0 +1,20 @@
+<span class="dijit dijitReset dijitInline"
+	><span class='dijitReset dijitInline dijitButtonNode'
+		data-dojo-attach-event="ondijitclick:__onClick" data-dojo-attach-point="_buttonNode"
+		><span class="dijitReset dijitStretch dijitButtonContents"
+			data-dojo-attach-point="focusNode,titleNode,_arrowWrapperNode,_popupStateNode"
+			role="button" aria-haspopup="true" aria-labelledby="${id}_label"
+			><span class="dijitReset dijitInline dijitIcon"
+				data-dojo-attach-point="iconNode"
+			></span
+			><span class="dijitReset dijitInline dijitButtonText"
+				data-dojo-attach-point="containerNode"
+				id="${id}_label"
+			></span
+			><span class="dijitReset dijitInline dijitArrowButtonInner"></span
+			><span class="dijitReset dijitInline dijitArrowButtonChar">&#9660;</span
+		></span
+	></span
+	><input ${!nameAttrSetting} type="${type}" value="${value}" class="dijitOffScreen" tabIndex="-1"
+		data-dojo-attach-event="onclick:_onClick" data-dojo-attach-point="valueNode" aria-hidden="true"
+/></span>
diff --git a/src/main/resources/static/dijit/form/templates/HorizontalSlider.html b/src/main/resources/static/dijit/form/templates/HorizontalSlider.html
new file mode 100644
index 0000000000000000000000000000000000000000..b926c7d886d53722d37299182419257357643c61
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/HorizontalSlider.html
@@ -0,0 +1,38 @@
+<table class="dijit dijitReset dijitSlider dijitSliderH" cellspacing="0" cellpadding="0" border="0" rules="none" data-dojo-attach-event="onkeydown:_onKeyDown, onkeyup:_onKeyUp"
+	role="presentation"
+	><tr class="dijitReset"
+		><td class="dijitReset" colspan="2"></td
+		><td data-dojo-attach-point="topDecoration" class="dijitReset dijitSliderDecoration dijitSliderDecorationT dijitSliderDecorationH"></td
+		><td class="dijitReset" colspan="2"></td
+	></tr
+	><tr class="dijitReset"
+		><td class="dijitReset dijitSliderButtonContainer dijitSliderButtonContainerH"
+			><div class="dijitSliderDecrementIconH" style="display:none" data-dojo-attach-point="decrementButton"><span class="dijitSliderButtonInner">-</span></div
+		></td
+		><td class="dijitReset"
+			><div class="dijitSliderBar dijitSliderBumper dijitSliderBumperH dijitSliderLeftBumper" data-dojo-attach-event="press:_onClkDecBumper"></div
+		></td
+		><td class="dijitReset"
+			><input data-dojo-attach-point="valueNode" type="hidden" ${!nameAttrSetting}
+			/><div class="dijitReset dijitSliderBarContainerH" role="presentation" data-dojo-attach-point="sliderBarContainer"
+				><div role="presentation" data-dojo-attach-point="progressBar" class="dijitSliderBar dijitSliderBarH dijitSliderProgressBar dijitSliderProgressBarH" data-dojo-attach-event="press:_onBarClick"
+					><div class="dijitSliderMoveable dijitSliderMoveableH"
+						><div data-dojo-attach-point="sliderHandle,focusNode" class="dijitSliderImageHandle dijitSliderImageHandleH" data-dojo-attach-event="press:_onHandleClick" role="slider"></div
+					></div
+				></div
+				><div role="presentation" data-dojo-attach-point="remainingBar" class="dijitSliderBar dijitSliderBarH dijitSliderRemainingBar dijitSliderRemainingBarH" data-dojo-attach-event="press:_onBarClick"></div
+			></div
+		></td
+		><td class="dijitReset"
+			><div class="dijitSliderBar dijitSliderBumper dijitSliderBumperH dijitSliderRightBumper" data-dojo-attach-event="press:_onClkIncBumper"></div
+		></td
+		><td class="dijitReset dijitSliderButtonContainer dijitSliderButtonContainerH"
+			><div class="dijitSliderIncrementIconH" style="display:none" data-dojo-attach-point="incrementButton"><span class="dijitSliderButtonInner">+</span></div
+		></td
+	></tr
+	><tr class="dijitReset"
+		><td class="dijitReset" colspan="2"></td
+		><td data-dojo-attach-point="containerNode,bottomDecoration" class="dijitReset dijitSliderDecoration dijitSliderDecorationB dijitSliderDecorationH"></td
+		><td class="dijitReset" colspan="2"></td
+	></tr
+></table>
diff --git a/src/main/resources/static/dijit/form/templates/Select.html b/src/main/resources/static/dijit/form/templates/Select.html
new file mode 100644
index 0000000000000000000000000000000000000000..4901aa866ca1f0c2f8e5852b1770f551200c1f42
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/Select.html
@@ -0,0 +1,18 @@
+<table class="dijit dijitReset dijitInline dijitLeft"
+	data-dojo-attach-point="_buttonNode,tableNode,focusNode,_popupStateNode" cellspacing='0' cellpadding='0'
+	role="listbox" aria-haspopup="true"
+	><tbody role="presentation"><tr role="presentation"
+		><td class="dijitReset dijitStretch dijitButtonContents" role="presentation"
+			><div class="dijitReset dijitInputField dijitButtonText"  data-dojo-attach-point="containerNode,textDirNode" role="presentation"></div
+			><div class="dijitReset dijitValidationContainer"
+				><input class="dijitReset dijitInputField dijitValidationIcon dijitValidationInner" value="&#935; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
+			/></div
+			><input type="hidden" ${!nameAttrSetting} data-dojo-attach-point="valueNode" value="${value}" aria-hidden="true"
+		/></td
+		><td class="dijitReset dijitRight dijitButtonNode dijitArrowButton dijitDownArrowButton dijitArrowButtonContainer"
+			data-dojo-attach-point="titleNode" role="presentation"
+			><input class="dijitReset dijitInputField dijitArrowButtonInner" value="&#9660; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
+				${_buttonInputDisabled}
+		/></td
+	></tr></tbody
+></table>
diff --git a/src/main/resources/static/dijit/form/templates/Spinner.html b/src/main/resources/static/dijit/form/templates/Spinner.html
new file mode 100644
index 0000000000000000000000000000000000000000..3f2186a72bf00a528b2f99eac59e4272e247cccd
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/Spinner.html
@@ -0,0 +1,27 @@
+<div class="dijit dijitReset dijitInline dijitLeft"
+	id="widget_${id}" role="presentation"
+	><div class="dijitReset dijitButtonNode dijitSpinnerButtonContainer"
+		><input class="dijitReset dijitInputField dijitSpinnerButtonInner" type="text" tabIndex="-1" readonly="readonly" role="presentation"
+		/><div class="dijitReset dijitLeft dijitButtonNode dijitArrowButton dijitUpArrowButton"
+			data-dojo-attach-point="upArrowNode"
+			><div class="dijitArrowButtonInner"
+				><input class="dijitReset dijitInputField" value="&#9650; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
+					${_buttonInputDisabled}
+			/></div
+		></div
+		><div class="dijitReset dijitLeft dijitButtonNode dijitArrowButton dijitDownArrowButton"
+			data-dojo-attach-point="downArrowNode"
+			><div class="dijitArrowButtonInner"
+				><input class="dijitReset dijitInputField" value="&#9660; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
+					${_buttonInputDisabled}
+			/></div
+		></div
+	></div
+	><div class='dijitReset dijitValidationContainer'
+		><input class="dijitReset dijitInputField dijitValidationIcon dijitValidationInner" value="&#935; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
+	/></div
+	><div class="dijitReset dijitInputField dijitInputContainer"
+		><input class='dijitReset dijitInputInner' data-dojo-attach-point="textbox,focusNode" type="${type}" data-dojo-attach-event="onkeydown:_onKeyDown"
+			role="spinbutton" autocomplete="off" ${!nameAttrSetting}
+	/></div
+></div>
diff --git a/src/main/resources/static/dijit/form/templates/TextBox.html b/src/main/resources/static/dijit/form/templates/TextBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..fd543c6959f5233092a5a1a5a25446076c577501
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/TextBox.html
@@ -0,0 +1,6 @@
+<div class="dijit dijitReset dijitInline dijitLeft" id="widget_${id}" role="presentation"
+	><div class="dijitReset dijitInputField dijitInputContainer"
+		><input class="dijitReset dijitInputInner" data-dojo-attach-point='textbox,focusNode' autocomplete="off"
+			${!nameAttrSetting} type='${type}'
+	/></div
+></div>
diff --git a/src/main/resources/static/dijit/form/templates/ValidationTextBox.html b/src/main/resources/static/dijit/form/templates/ValidationTextBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..d49dd8c596215cea8e465279eec1a902e2110032
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/ValidationTextBox.html
@@ -0,0 +1,10 @@
+<div class="dijit dijitReset dijitInline dijitLeft"
+	id="widget_${id}" role="presentation"
+	><div class='dijitReset dijitValidationContainer'
+		><input class="dijitReset dijitInputField dijitValidationIcon dijitValidationInner" value="&#935; " type="text" tabIndex="-1" readonly="readonly" role="presentation"
+	/></div
+	><div class="dijitReset dijitInputField dijitInputContainer"
+		><input class="dijitReset dijitInputInner" data-dojo-attach-point='textbox,focusNode' autocomplete="off"
+			${!nameAttrSetting} type='${type}'
+	/></div
+></div>
diff --git a/src/main/resources/static/dijit/form/templates/VerticalSlider.html b/src/main/resources/static/dijit/form/templates/VerticalSlider.html
new file mode 100644
index 0000000000000000000000000000000000000000..574ed3d534d06b67dba3902db5c07b4f107d9df8
--- /dev/null
+++ b/src/main/resources/static/dijit/form/templates/VerticalSlider.html
@@ -0,0 +1,46 @@
+<table class="dijit dijitReset dijitSlider dijitSliderV" cellspacing="0" cellpadding="0" border="0" rules="none" data-dojo-attach-event="onkeydown:_onKeyDown,onkeyup:_onKeyUp"
+	role="presentation"
+	><tr class="dijitReset"
+		><td class="dijitReset"></td
+		><td class="dijitReset dijitSliderButtonContainer dijitSliderButtonContainerV"
+			><div class="dijitSliderIncrementIconV" style="display:none" data-dojo-attach-point="decrementButton"><span class="dijitSliderButtonInner">+</span></div
+		></td
+		><td class="dijitReset"></td
+	></tr
+	><tr class="dijitReset"
+		><td class="dijitReset"></td
+		><td class="dijitReset"
+			><center><div class="dijitSliderBar dijitSliderBumper dijitSliderBumperV dijitSliderTopBumper" data-dojo-attach-event="press:_onClkIncBumper"></div></center
+		></td
+		><td class="dijitReset"></td
+	></tr
+	><tr class="dijitReset"
+		><td data-dojo-attach-point="leftDecoration" class="dijitReset dijitSliderDecoration dijitSliderDecorationL dijitSliderDecorationV"></td
+		><td class="dijitReset dijitSliderDecorationC" style="height:100%;"
+			><input data-dojo-attach-point="valueNode" type="hidden" ${!nameAttrSetting}
+			/><center class="dijitReset dijitSliderBarContainerV" role="presentation" data-dojo-attach-point="sliderBarContainer"
+				><div role="presentation" data-dojo-attach-point="remainingBar" class="dijitSliderBar dijitSliderBarV dijitSliderRemainingBar dijitSliderRemainingBarV" data-dojo-attach-event="press:_onBarClick"><!--#5629--></div
+				><div role="presentation" data-dojo-attach-point="progressBar" class="dijitSliderBar dijitSliderBarV dijitSliderProgressBar dijitSliderProgressBarV" data-dojo-attach-event="press:_onBarClick"
+					><div class="dijitSliderMoveable dijitSliderMoveableV" style="vertical-align:top;"
+						><div data-dojo-attach-point="sliderHandle,focusNode" class="dijitSliderImageHandle dijitSliderImageHandleV" data-dojo-attach-event="press:_onHandleClick" role="slider"></div
+					></div
+				></div
+			></center
+		></td
+		><td data-dojo-attach-point="containerNode,rightDecoration" class="dijitReset dijitSliderDecoration dijitSliderDecorationR dijitSliderDecorationV"></td
+	></tr
+	><tr class="dijitReset"
+		><td class="dijitReset"></td
+		><td class="dijitReset"
+			><center><div class="dijitSliderBar dijitSliderBumper dijitSliderBumperV dijitSliderBottomBumper" data-dojo-attach-event="press:_onClkDecBumper"></div></center
+		></td
+		><td class="dijitReset"></td
+	></tr
+	><tr class="dijitReset"
+		><td class="dijitReset"></td
+		><td class="dijitReset dijitSliderButtonContainer dijitSliderButtonContainerV"
+			><div class="dijitSliderDecrementIconV" style="display:none" data-dojo-attach-point="incrementButton"><span class="dijitSliderButtonInner">-</span></div
+		></td
+		><td class="dijitReset"></td
+	></tr
+></table>
diff --git a/src/main/resources/static/dijit/hccss.js b/src/main/resources/static/dijit/hccss.js
new file mode 100644
index 0000000000000000000000000000000000000000..4925e6b353e0bf397172999f0804526cb28924d2
--- /dev/null
+++ b/src/main/resources/static/dijit/hccss.js
@@ -0,0 +1,21 @@
+define(["dojo/dom-class", "dojo/hccss", "dojo/domReady", "dojo/_base/window"], function(domClass, has, domReady, win){
+
+	// module:
+	//		dijit/hccss
+
+	/*=====
+	return function(){
+		// summary:
+		//		Test if computer is in high contrast mode, and sets `dijit_a11y` flag on `<body>` if it is.
+		//		Deprecated, use ``dojo/hccss`` instead.
+	};
+	=====*/
+
+	domReady(function(){
+		if(has("highcontrast")){
+			domClass.add(win.body(), "dijit_a11y");
+		}
+	});
+
+	return has;
+});
diff --git a/src/main/resources/static/dijit/icons/commonIcons.css b/src/main/resources/static/dijit/icons/commonIcons.css
new file mode 100644
index 0000000000000000000000000000000000000000..2424b48bbe09d9317fb2cc74c23f0a0ea2aeee41
--- /dev/null
+++ b/src/main/resources/static/dijit/icons/commonIcons.css
@@ -0,0 +1,171 @@
+/* Dijit widget common icons*/
+
+/*commonIcons.css is located in dijit/icons
+
+commonIconsRtl.css is TBD. This needs to be reviewed to determine in Rtl is reqd. 
+
+The 16 x 16px icons in these sprites are action and object type images which can be used in the following widgets: accordionContainer, menu, tab, titlepane, tree, and all button widgets and error validation contexts. */
+
+.dijitIconSave,
+.dijitIconPrint,
+.dijitIconCut,
+.dijitIconCopy,
+.dijitIconClear,
+.dijitIconDelete,
+.dijitIconUndo,
+.dijitIconEdit,
+.dijitIconNewTask,
+.dijitIconEditTask,
+.dijitIconEditProperty,
+.dijitIconTask,
+.dijitIconFilter,
+.dijitIconConfigure,
+.dijitIconSearch,
+.dijitIconApplication,
+.dijitIconBookmark,
+.dijitIconChart,
+.dijitIconConnector,
+.dijitIconDatabase,
+.dijitIconDocuments,
+.dijitIconMail,
+.dijitLeaf,
+.dijitIconFile,
+.dijitIconFunction,
+.dijitIconKey,
+.dijitIconPackage,
+.dijitIconSample,
+.dijitIconTable,
+.dijitIconUsers,
+.dijitFolderClosed,
+.dijitIconFolderClosed,
+.dijitFolderOpened,
+.dijitIconFolderOpen,
+.dijitIconError {
+	background-image: url('images/commonIconsObjActEnabled.png'); /* Contains both object and action icons in a sprite image for the enabled state.  */
+	width: 16px;
+	height: 16px;
+}
+
+.dj_ie6 .dijitIconSave,
+.dj_ie6 .dijitIconPrint,
+.dj_ie6 .dijitIconCut,
+.dj_ie6 .dijitIconCopy,
+.dj_ie6 .dijitIconClear,
+.dj_ie6 .dijitIconDelete,
+.dj_ie6 .dijitIconUndo,
+.dj_ie6 .dijitIconEdit,
+.dj_ie6 .dijitIconNewTask,
+.dj_ie6 .dijitIconEditTask,
+.dj_ie6 .dijitIconEditProperty,
+.dj_ie6 .dijitIconTask,
+.dj_ie6 .dijitIconFilter,
+.dj_ie6 .dijitIconConfigure,
+.dj_ie6 .dijitIconSearch,
+.dj_ie6 .dijitIconApplication,
+.dj_ie6 .dijitIconBookmark,
+.dj_ie6 .dijitIconChart,
+.dj_ie6 .dijitIconConnector,
+.dj_ie6 .dijitIconDatabase,
+.dj_ie6 .dijitIconDocuments,
+.dj_ie6 .dijitIconMail,
+.dj_ie6 .dijitLeaf,
+.dj_ie6 .dijitIconFile,
+.dj_ie6 .dijitIconFunction,
+.dj_ie6 .dijitIconKey,
+.dj_ie6 .dijitIconPackage,
+.dj_ie6 .dijitIconSample,
+.dj_ie6 .dijitIconTable,
+.dj_ie6 .dijitIconUsers,
+.dj_ie6 .dijitFolderClosed,
+.dj_ie6 .dijitIconFolderClosed,
+.dj_ie6 .dijitFolderOpened,
+.dj_ie6 .dijitIconFolderOpen,
+.dj_ie6 .dijitIconError {
+	background-image: url('images/commonIconsObjActEnabled8bit.png');
+}
+
+.dijitDisabled .dijitIconSave,
+.dijitDisabled .dijitIconPrint,
+.dijitDisabled .dijitIconCut,
+.dijitDisabled .dijitIconCopy,
+.dijitDisabled .dijitIconClear,
+.dijitDisabled .dijitIconDelete,
+.dijitDisabled .dijitIconUndo,
+.dijitDisabled .dijitIconEdit,
+.dijitDisabled .dijitIconNewTask,
+.dijitDisabled .dijitIconEditTask,
+.dijitDisabled .dijitIconEditProperty,
+.dijitDisabled .dijitIconTask,
+.dijitDisabled .dijitIconFilter,
+.dijitDisabled .dijitIconConfigure,
+.dijitDisabled .dijitIconSearch,
+.dijitDisabled .dijitIconApplication,
+.dijitDisabled .dijitIconBookmark,
+.dijitDisabled .dijitIconChart,
+.dijitDisabled .dijitIconConnector,
+.dijitDisabled .dijitIconDatabase,
+.dijitDisabled .dijitIconDocuments,
+.dijitDisabled .dijitIconMail,
+.dijitDisabled .dijitLeaf,
+.dijitDisabled .dijitIconFile,
+.dijitDisabled .dijitIconFunction,
+.dijitDisabled .dijitIconKey,
+.dijitDisabled .dijitIconPackage,
+.dijitDisabled .dijitIconSample,
+.dijitDisabled .dijitIconTable,
+.dijitDisabled .dijitIconUsers,
+.dijitDisabled .dijitFolderClosed,
+.dijitDisabled .dijitIconFolderClosed,
+.dijitDisabled .dijitFolderOpened,
+.dijitDisabled .dijitIconFolderOpen,
+.dijitDisabled .dijitIconError {
+	background-image: url('images/commonIconsObjActDisabled.png'); /* Contains both object and action icons as a sprite image for the disabled state. These would be used by buttons and menus.   */
+}
+
+/*Action icons*/
+.dijitIconSave { background-position: 0; }
+.dijitIconPrint { background-position: -16px; }
+.dijitIconCut { background-position: -32px; }
+.dijitIconCopy { background-position: -48px; }
+.dijitIconClear { background-position: -64px; }
+.dijitIconDelete { background-position: -80px; }
+.dijitIconUndo { background-position: -96px; }
+.dijitIconEdit { background-position: -112px; }
+.dijitIconNewTask { background-position: -128px; }
+.dijitIconEditTask { background-position: -144px; }
+.dijitIconEditProperty { background-position: -160px; }
+.dijitIconTask { background-position: -176px; }
+.dijitIconFilter { background-position: -192px; }
+.dijitIconConfigure { background-position: -208px; }
+.dijitIconSearch { background-position: -224px; }
+.dijitIconError { background-position: -496px; } 
+
+/*Object icons*/
+.dijitIconApplication { background-position: -240px; }
+.dijitIconBookmark { background-position: -256px; }
+.dijitIconChart { background-position: -272px; }
+.dijitIconConnector { background-position: -288px; }
+.dijitIconDatabase { background-position: -304px; }
+.dijitIconDocuments { background-position: -320px; }
+.dijitIconMail { background-position: -336px; }
+.dijitIconFile, .dijitLeaf { background-position: -352px; }
+.dijitIconFunction { background-position: -368px; }
+.dijitIconKey { background-position: -384px; }
+.dijitIconPackage{ background-position: -400px; }
+.dijitIconSample { background-position: -416px; }
+.dijitIconTable { background-position: -432px; }
+.dijitIconUsers { background-position: -448px; }
+
+
+/*Tree folder icons*/
+.dijitIconFolderClosed, .dijitFolderClosed { background-position: -464px; }
+.dijitIconFolderOpen, .dijitFolderOpened { background-position: -480px; }
+
+/*Loading animation*/
+.dijitIconLoading {
+	background: url('images/loadingAnimation.gif') no-repeat;
+	height: 20px;
+	width: 20px;
+}
+
+
diff --git a/src/main/resources/static/dijit/icons/commonIcons_rtl.css b/src/main/resources/static/dijit/icons/commonIcons_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..88271378003a7efa3d8bdaf70ea9572dad1a9d5f
--- /dev/null
+++ b/src/main/resources/static/dijit/icons/commonIcons_rtl.css
@@ -0,0 +1,127 @@
+/* Dijit widget common icons*/
+
+/*commonIcons_rtl.css is located in dijit/icons
+
+The 16 x 16px icons in these sprites are action and object type images which can be used in the following widgets: accordionContainer, menu, tab, titlepane, tree, and all button widgets and error validation contexts. */
+
+.dijitRtl .dijitIconSave,
+.dijitRtl .dijitIconPrint,
+.dijitRtl .dijitIconCut,
+.dijitRtl .dijitIconCopy,
+.dijitRtl .dijitIconClear,
+.dijitRtl .dijitIconDelete,
+.dijitRtl .dijitIconUndo,
+.dijitRtl .dijitIconEdit,
+.dijitRtl .dijitIconNewTask,
+.dijitRtl .dijitIconEditTask,
+.dijitRtl .dijitIconEditProperty,
+.dijitRtl .dijitIconTask,
+.dijitRtl .dijitIconFilter,
+.dijitRtl .dijitIconConfigure,
+.dijitRtl .dijitIconSearch,
+.dijitRtl .dijitIconApplication,
+.dijitRtl .dijitIconBookmark,
+.dijitRtl .dijitIconChart,
+.dijitRtl .dijitIconConnector,
+.dijitRtl .dijitIconDatabase,
+.dijitRtl .dijitIconDocuments,
+.dijitRtl .dijitIconMail,
+.dijitRtl .dijitLeaf,
+.dijitRtl .dijitIconFile,
+.dijitRtl .dijitIconFunction,
+.dijitRtl .dijitIconKey,
+.dijitRtl .dijitIconPackage,
+.dijitRtl .dijitIconSample,
+.dijitRtl .dijitIconTable,
+.dijitRtl .dijitIconUsers,
+.dijitRtl .dijitFolderClosed,
+.dijitRtl .dijitIconFolderClosed,
+.dijitRtl .dijitFolderOpened,
+.dijitRtl .dijitIconFolderOpen,
+.dijitRtl .dijitIconError { 
+	background-image: url('images/commonIconsObjActEnabled_rtl.png'); /* Contains both object and action icons in a sprite image for the enabled state.  */
+	width: 16px;
+	height: 16px;
+}
+
+.dj_ie6 .dijitRtl .dijitIconSave,
+.dj_ie6 .dijitRtl .dijitIconPrint,
+.dj_ie6 .dijitRtl .dijitIconCut,
+.dj_ie6 .dijitRtl .dijitIconCopy,
+.dj_ie6 .dijitRtl .dijitIconClear,
+.dj_ie6 .dijitRtl .dijitIconDelete,
+.dj_ie6 .dijitRtl .dijitIconUndo,
+.dj_ie6 .dijitRtl .dijitIconEdit,
+.dj_ie6 .dijitRtl .dijitIconNewTask,
+.dj_ie6 .dijitRtl .dijitIconEditTask,
+.dj_ie6 .dijitRtl .dijitIconEditProperty,
+.dj_ie6 .dijitRtl .dijitIconTask,
+.dj_ie6 .dijitRtl .dijitIconFilter,
+.dj_ie6 .dijitRtl .dijitIconConfigure,
+.dj_ie6 .dijitRtl .dijitIconSearch,
+.dj_ie6 .dijitRtl .dijitIconApplication,
+.dj_ie6 .dijitRtl .dijitIconBookmark,
+.dj_ie6 .dijitRtl .dijitIconChart,
+.dj_ie6 .dijitRtl .dijitIconConnector,
+.dj_ie6 .dijitRtl .dijitIconDatabase,
+.dj_ie6 .dijitRtl .dijitIconDocuments,
+.dj_ie6 .dijitRtl .dijitIconMail,
+.dj_ie6 .dijitRtl .dijitLeaf,
+.dj_ie6 .dijitRtl .dijitIconFile,
+.dj_ie6 .dijitRtl .dijitIconFunction,
+.dj_ie6 .dijitRtl .dijitIconKey,
+.dj_ie6 .dijitRtl .dijitIconPackage,
+.dj_ie6 .dijitRtl .dijitIconSample,
+.dj_ie6 .dijitRtl .dijitIconTable,
+.dj_ie6 .dijitRtl .dijitIconUsers,
+.dj_ie6 .dijitRtl .dijitFolderClosed,
+.dj_ie6 .dijitRtl .dijitIconFolderClosed,
+.dj_ie6 .dijitRtl .dijitFolderOpened,
+.dj_ie6 .dijitRtl .dijitIconFolderOpen,
+.dj_ie6 .dijitRtl .dijitIconError {
+	background-image: url('images/commonIconsObjActEnabled8bit_rtl.png');
+}
+
+.dijitRtl .dijitDisabled .dijitIconSave,
+.dijitRtl .dijitDisabled .dijitIconPrint,
+.dijitRtl .dijitDisabled .dijitIconCut,
+.dijitRtl .dijitDisabled .dijitIconCopy,
+.dijitRtl .dijitDisabled .dijitIconClear,
+.dijitRtl .dijitDisabled .dijitIconDelete,
+.dijitRtl .dijitDisabled .dijitIconUndo,
+.dijitRtl .dijitDisabled .dijitIconEdit,
+.dijitRtl .dijitDisabled .dijitIconNewTask,
+.dijitRtl .dijitDisabled .dijitIconEditTask,
+.dijitRtl .dijitDisabled .dijitIconEditProperty,
+.dijitRtl .dijitDisabled .dijitIconTask,
+.dijitRtl .dijitDisabled .dijitIconFilter,
+.dijitRtl .dijitDisabled .dijitIconConfigure,
+.dijitRtl .dijitDisabled .dijitIconSearch,
+.dijitRtl .dijitDisabled .dijitIconApplication,
+.dijitRtl .dijitDisabled .dijitIconBookmark,
+.dijitRtl .dijitDisabled .dijitIconChart,
+.dijitRtl .dijitDisabled .dijitIconConnector,
+.dijitRtl .dijitDisabled .dijitIconDatabase,
+.dijitRtl .dijitDisabled .dijitIconDocuments,
+.dijitRtl .dijitDisabled .dijitIconMail,
+.dijitRtl .dijitDisabled .dijitLeaf,
+.dijitRtl .dijitDisabled .dijitIconFile,
+.dijitRtl .dijitDisabled .dijitIconFunction,
+.dijitRtl .dijitDisabled .dijitIconKey,
+.dijitRtl .dijitDisabled .dijitIconPackage,
+.dijitRtl .dijitDisabled .dijitIconSample,
+.dijitRtl .dijitDisabled .dijitIconTable,
+.dijitRtl .dijitDisabled .dijitIconUsers,
+.dijitRtl .dijitDisabled .dijitFolderClosed,
+.dijitRtl .dijitDisabled .dijitIconFolderClosed,
+.dijitRtl .dijitDisabled .dijitFolderOpened,
+.dijitRtl .dijitDisabled .dijitIconFolderOpen,
+.dijitRtl .dijitDisabled .dijitIconError {
+	background-image: url('images/commonIconsObjActDisabled_rtl.png'); /* Contains both object and action icons as a sprite image for the disabled state. These would be used by buttons and menus.   */
+}
+
+
+/*Loading animation*/
+.dijitRtl .dijitIconLoading {
+	background-image: url('images/loadingAnimation_rtl.gif');
+}
diff --git a/src/main/resources/static/dijit/icons/editorIcons.css b/src/main/resources/static/dijit/icons/editorIcons.css
new file mode 100644
index 0000000000000000000000000000000000000000..8e24a5f69da74a8af4271e6a3d03b33d3c81ca4c
--- /dev/null
+++ b/src/main/resources/static/dijit/icons/editorIcons.css
@@ -0,0 +1,78 @@
+/* Dijit Editor icons*/
+
+/*editorIcons.css  is located in dijit/images 
+
+editorIcons.css contains references to the dijit editor widget icons. There are 46 icons used to map to the related editor functionality in the editor's toolbar.
+
+*/
+
+
+.dijitEditorIcon {
+	background-image: url('images/editorIconsEnabled.png'); /* editor icons sprite image for the enabled state */
+	background-repeat: no-repeat;
+	width: 18px;
+	height: 18px;
+	text-align: center;
+}
+.dijitDisabled .dijitEditorIcon {
+	background-image: url('images/editorIconsDisabled.png'); /* editor icons sprite image for the disabled state */
+}
+
+
+.dijitEditorIconSep { background-position: 0; }
+.dijitEditorIconSave { background-position: -18px; }
+.dijitEditorIconPrint { background-position: -36px; }
+.dijitEditorIconCut { background-position: -54px; }
+.dijitEditorIconCopy { background-position: -72px; }
+.dijitEditorIconPaste { background-position: -90px; }
+.dijitEditorIconDelete { background-position: -108px; }
+.dijitEditorIconCancel { background-position: -126px; }
+.dijitEditorIconUndo { background-position: -144px; }
+.dijitEditorIconRedo { background-position: -162px; }
+.dijitEditorIconSelectAll { background-position: -180px; }
+.dijitEditorIconBold { background-position: -198px; }
+.dijitEditorIconItalic { background-position: -216px; }
+.dijitEditorIconUnderline { background-position: -234px; }
+.dijitEditorIconStrikethrough { background-position: -252px; }
+.dijitEditorIconSuperscript { background-position: -270px; }
+.dijitEditorIconSubscript { background-position: -288px; }
+.dijitEditorIconJustifyCenter { background-position: -306px; }
+.dijitEditorIconJustifyFull { background-position: -324px; }
+.dijitEditorIconJustifyLeft { background-position: -342px; }
+.dijitEditorIconJustifyRight { background-position: -360px; }
+.dijitEditorIconIndent { background-position: -378px; }
+.dijitEditorIconOutdent { background-position: -396px; }
+.dijitEditorIconListBulletIndent { background-position: -414px; }
+.dijitEditorIconListBulletOutdent { background-position: -432px; }
+.dijitEditorIconListNumIndent { background-position: -450px; }
+.dijitEditorIconListNumOutdent { background-position: -468px; }
+.dijitEditorIconTabIndent { background-position: -486px; }
+.dijitEditorIconLeftToRight { background-position: -504px; }
+.dijitEditorIconRightToLeft, .dijitEditorIconToggleDir { background-position: -522px; }
+.dijitEditorIconBackColor { background-position: -540px; }
+.dijitEditorIconForeColor { background-position: -558px; }
+.dijitEditorIconHiliteColor { background-position: -576px; }
+.dijitEditorIconNewPage { background-position: -594px; }
+.dijitEditorIconInsertImage { background-position: -612px; }
+.dijitEditorIconInsertTable { background-position: -630px; }
+.dijitEditorIconSpace { background-position: -648px; }
+.dijitEditorIconInsertHorizontalRule { background-position: -666px; }
+.dijitEditorIconInsertOrderedList { background-position: -684px; }
+.dijitEditorIconInsertUnorderedList { background-position: -702px; }
+.dijitEditorIconCreateLink { background-position: -720px; }
+.dijitEditorIconUnlink { background-position: -738px; }
+.dijitEditorIconViewSource { background-position: -756px; }
+.dijitEditorIconRemoveFormat { background-position: -774px; }
+.dijitEditorIconFullScreen { background-position: -792px; }
+.dijitEditorIconWikiword { background-position: -810px; }
+/* .dijitEditorIconToggleDir { background-position: -540px; ;} - 03172010: This icon was not in dijit.editor but is in dojox.editor. */
+
+/* no longer in the editor toolbar:  .dijitEditorIconToggleDir { background-position: -540px;  padding: 0; margin: 0; color:#555555;
+									font-family:verdana,arial,sans-serif; font-weight: 800; font-size: 70%; */
+
+
+
+
+
+
+
diff --git a/src/main/resources/static/dijit/icons/editorIcons_rtl.css b/src/main/resources/static/dijit/icons/editorIcons_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..b22906dccc3c096909374c212c11355473b38460
--- /dev/null
+++ b/src/main/resources/static/dijit/icons/editorIcons_rtl.css
@@ -0,0 +1,23 @@
+/* Dijit Editor RTL icons*/
+
+/*editorIcons_rtl.css is located in dijit/images 
+
+editorIcons_rtl.css contains references to the dijit editor widget icons. There are 46 icons used to map to the related editor functionality in the editor's toolbar.
+
+*/
+
+
+/* Editor */
+.dijitEditorRtl .dijitEditorIcon {
+	background-image: url('images/editorIconsEnabled_rtl.png'); /* editor icons sprite image for the enabled right to left state */
+}
+.dijitEditorRtlDisabled .dijitEditorIcon {
+	background-image: url('images/editorIconsDisabled_rtl.png'); /* editor icons sprite image for the disabled right to left state */
+}
+
+/* Toolbar */
+.dijitToolbarRtl .dijitToolbarSeparator {
+	background-image: url('images/editorIconsEnabled_rtl.png');
+}
+
+/* took this information above from editorRtl.css - good or bad? */
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/icons/images/commonIconsObjActDisabled.png b/src/main/resources/static/dijit/icons/images/commonIconsObjActDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..a348e3c104983e70dcea360dd8e79803bab9c9e7
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/commonIconsObjActDisabled.png differ
diff --git a/src/main/resources/static/dijit/icons/images/commonIconsObjActDisabled_rtl.png b/src/main/resources/static/dijit/icons/images/commonIconsObjActDisabled_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5e9ac8b22ee3c5ff96c1b1b874f67a53b5b95f8
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/commonIconsObjActDisabled_rtl.png differ
diff --git a/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled.png b/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..be14bf0ac7affef85c5bba678051ec8d6fff28c9
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled.png differ
diff --git a/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled8bit.png b/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled8bit.png
new file mode 100644
index 0000000000000000000000000000000000000000..20092f229926f9cb51caf5dbd7c67101af5fc068
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled8bit.png differ
diff --git a/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled8bit_rtl.png b/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled8bit_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e504ff5f2cfc3a186123435b6941f8b7bf35b10
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled8bit_rtl.png differ
diff --git a/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled_rtl.png b/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..23ff1a3764aac5bff62cf01934225a8992aa863c
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/commonIconsObjActEnabled_rtl.png differ
diff --git a/src/main/resources/static/dijit/icons/images/editorIconsDisabled.png b/src/main/resources/static/dijit/icons/images/editorIconsDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..98160f43e9cbcb7eba40c091a485c13ace774cc7
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/editorIconsDisabled.png differ
diff --git a/src/main/resources/static/dijit/icons/images/editorIconsDisabled_rtl.png b/src/main/resources/static/dijit/icons/images/editorIconsDisabled_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..a657ef951ab0e58249b31fd9140bd9816d38b3ce
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/editorIconsDisabled_rtl.png differ
diff --git a/src/main/resources/static/dijit/icons/images/editorIconsEnabled.png b/src/main/resources/static/dijit/icons/images/editorIconsEnabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfc03b58894484cb6442f73d12b47eb66dce0031
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/editorIconsEnabled.png differ
diff --git a/src/main/resources/static/dijit/icons/images/editorIconsEnabled_rtl.png b/src/main/resources/static/dijit/icons/images/editorIconsEnabled_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed1768a914d319b772a34b60a2cc7786aae37381
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/editorIconsEnabled_rtl.png differ
diff --git a/src/main/resources/static/dijit/icons/images/loadingAnimation.gif b/src/main/resources/static/dijit/icons/images/loadingAnimation.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f297fcb9dddb4b7617a1bb31cff716631108c89d
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/loadingAnimation.gif differ
diff --git a/src/main/resources/static/dijit/icons/images/loadingAnimation_rtl.gif b/src/main/resources/static/dijit/icons/images/loadingAnimation_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a1aaf625c597e36b5d50bcae3c12dbd8257b391b
Binary files /dev/null and b/src/main/resources/static/dijit/icons/images/loadingAnimation_rtl.gif differ
diff --git a/src/main/resources/static/dijit/layout/AccordionContainer.js b/src/main/resources/static/dijit/layout/AccordionContainer.js
new file mode 100644
index 0000000000000000000000000000000000000000..6669e457455ca2f6a1d6d422cf64ff6d6180f3d0
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/AccordionContainer.js
@@ -0,0 +1,552 @@
+define([
+	"require",
+	"dojo/_base/array", // array.forEach array.map
+	"dojo/_base/declare", // declare
+	"dojo/_base/fx", // fx.Animation
+	"dojo/dom", // dom.setSelectable
+	"dojo/dom-attr", // domAttr.attr
+	"dojo/dom-class", // domClass.remove
+	"dojo/dom-construct", // domConstruct.place
+	"dojo/dom-geometry",
+	"dojo/keys", // keys
+	"dojo/_base/lang", // lang.getObject lang.hitch
+	"dojo/sniff", // has("ie") has("dijit-legacy-requires")
+	"dojo/topic", // publish
+	"../focus", // focus.focus()
+	"../_base/manager", // manager.defaultDuration
+	"dojo/ready",
+	"../_Widget",
+	"../_Container",
+	"../_TemplatedMixin",
+	"../_CssStateMixin",
+	"./StackContainer",
+	"./ContentPane",
+	"dojo/text!./templates/AccordionButton.html",
+	"../a11yclick" // AccordionButton template uses ondijitclick; not for keyboard, but for responsive touch.
+], function(require, array, declare, fx, dom, domAttr, domClass, domConstruct, domGeometry, keys, lang, has, topic,
+			focus, manager, ready, _Widget, _Container, _TemplatedMixin, _CssStateMixin, StackContainer, ContentPane, template){
+
+	// module:
+	//		dijit/layout/AccordionContainer
+
+
+	// Design notes:
+	//
+	// An AccordionContainer is a StackContainer, but each child (typically ContentPane)
+	// is wrapped in a _AccordionInnerContainer.   This is hidden from the caller.
+	//
+	// The resulting markup will look like:
+	//
+	//	<div class=dijitAccordionContainer>
+	//		<div class=dijitAccordionInnerContainer>	(one pane)
+	//				<div class=dijitAccordionTitle>		(title bar) ... </div>
+	//				<div class=dijtAccordionChildWrapper>   (content pane) </div>
+	//		</div>
+	//	</div>
+	//
+	// Normally the dijtAccordionChildWrapper is hidden for all but one child (the shown
+	// child), so the space for the content pane is all the title bars + the one dijtAccordionChildWrapper,
+	// which on claro has a 1px border plus a 2px bottom margin.
+	//
+	// During animation there are two dijtAccordionChildWrapper's shown, so we need
+	// to compensate for that.
+
+	function size(widget, dim){
+		widget.resize ? widget.resize(dim) : domGeometry.setMarginBox(widget.domNode, dim);
+	}
+
+	var AccordionButton = declare("dijit.layout._AccordionButton", [_Widget, _TemplatedMixin, _CssStateMixin], {
+		// summary:
+		//		The title bar to click to open up an accordion pane.
+		//		Internal widget used by AccordionContainer.
+		// tags:
+		//		private
+
+		templateString: template,
+
+		// label: String
+		//		Title of the pane
+		label: "",
+		_setLabelAttr: {node: "titleTextNode", type: "innerHTML" },
+
+		// title: String
+		//		Tooltip that appears on hover
+		title: "",
+		_setTitleAttr: {node: "titleTextNode", type: "attribute", attribute: "title"},
+
+		// iconClassAttr: String
+		//		CSS class for icon to left of label
+		iconClassAttr: "",
+		_setIconClassAttr: { node: "iconNode", type: "class" },
+
+		baseClass: "dijitAccordionTitle",
+
+		getParent: function(){
+			// summary:
+			//		Returns the AccordionContainer parent.
+			// tags:
+			//		private
+			return this.parent;
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			var titleTextNodeId = this.id.replace(' ', '_');
+			domAttr.set(this.titleTextNode, "id", titleTextNodeId + "_title");
+			this.focusNode.setAttribute("aria-labelledby", domAttr.get(this.titleTextNode, "id"));
+			dom.setSelectable(this.domNode, false);
+		},
+
+		getTitleHeight: function(){
+			// summary:
+			//		Returns the height of the title dom node.
+			return domGeometry.getMarginSize(this.domNode).h;	// Integer
+		},
+
+		// TODO: maybe the parent should set these methods directly rather than forcing the code
+		// into the button widget?
+		_onTitleClick: function(){
+			// summary:
+			//		Callback when someone clicks my title.
+			var parent = this.getParent();
+			parent.selectChild(this.contentWidget, true);
+			focus.focus(this.focusNode);
+		},
+
+		_onTitleKeyDown: function(/*Event*/ evt){
+			return this.getParent()._onKeyDown(evt, this.contentWidget);
+		},
+
+		_setSelectedAttr: function(/*Boolean*/ isSelected){
+			this._set("selected", isSelected);
+			this.focusNode.setAttribute("aria-expanded", isSelected ? "true" : "false");
+			this.focusNode.setAttribute("aria-selected", isSelected ? "true" : "false");
+			this.focusNode.setAttribute("tabIndex", isSelected ? "0" : "-1");
+		}
+	});
+
+	if(has("dojo-bidi")){
+		AccordionButton.extend({
+			_setLabelAttr: function(label){
+				this._set("label", label);
+				domAttr.set(this.titleTextNode, "innerHTML", label);
+				this.applyTextDir(this.titleTextNode);
+			},
+
+			_setTitleAttr: function(title){
+				this._set("title", title);
+				domAttr.set(this.titleTextNode, "title", title);
+				this.applyTextDir(this.titleTextNode);
+			}
+		});
+	}
+
+	var AccordionInnerContainer = declare("dijit.layout._AccordionInnerContainer" + (has("dojo-bidi") ? "_NoBidi" : ""), [_Widget, _CssStateMixin], {
+		// summary:
+		//		Internal widget placed as direct child of AccordionContainer.containerNode.
+		//		When other widgets are added as children to an AccordionContainer they are wrapped in
+		//		this widget.
+
+		/*=====
+		 // buttonWidget: Function|String
+		 //		Class to use to instantiate title
+		 //		(Wish we didn't have a separate widget for just the title but maintaining it
+		 //		for backwards compatibility, is it worth it?)
+		 buttonWidget: null,
+		 =====*/
+
+		/*=====
+		 // contentWidget: dijit/_WidgetBase
+		 //		Pointer to the real child widget
+		 contentWidget: null,
+		 =====*/
+
+		baseClass: "dijitAccordionInnerContainer",
+
+		// tell nested layout widget that we will take care of sizing
+		isLayoutContainer: true,
+
+		buildRendering: function(){
+			// Builds a template like:
+			//	<div class=dijitAccordionInnerContainer>
+			//		Button
+			//		<div class=dijitAccordionChildWrapper>
+			//			ContentPane
+			//		</div>
+			//	</div>
+
+			// Create wrapper div, placed where the child is now
+			this.domNode = domConstruct.place("<div class='" + this.baseClass +
+				"' role='presentation'>", this.contentWidget.domNode, "after");
+
+			// wrapper div's first child is the button widget (ie, the title bar)
+			var child = this.contentWidget,
+				cls = lang.isString(this.buttonWidget) ? lang.getObject(this.buttonWidget) : this.buttonWidget;
+			this.button = child._buttonWidget = (new cls({
+				contentWidget: child,
+				label: child.title,
+				title: child.tooltip,
+				dir: child.dir,
+				lang: child.lang,
+				textDir: child.textDir || this.textDir,
+				iconClass: child.iconClass,
+				id: child.id + "_button",
+				parent: this.parent
+			})).placeAt(this.domNode);
+
+			// and then the actual content widget (changing it from prior-sibling to last-child),
+			// wrapped by a <div class=dijitAccordionChildWrapper>
+			this.containerNode = domConstruct.place("<div class='dijitAccordionChildWrapper' role='tabpanel' style='display:none'>", this.domNode);
+			this.containerNode.setAttribute("aria-labelledby", this.button.id);
+
+			domConstruct.place(this.contentWidget.domNode, this.containerNode);
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// Map changes in content widget's title etc. to changes in the button
+			var button = this.button,
+				cw = this.contentWidget;
+			this._contentWidgetWatches = [
+				cw.watch('title', lang.hitch(this, function(name, oldValue, newValue){
+					button.set("label", newValue);
+				})),
+				cw.watch('tooltip', lang.hitch(this, function(name, oldValue, newValue){
+					button.set("title", newValue);
+				})),
+				cw.watch('iconClass', lang.hitch(this, function(name, oldValue, newValue){
+					button.set("iconClass", newValue);
+				}))
+			];
+		},
+
+		_setSelectedAttr: function(/*Boolean*/ isSelected){
+			this._set("selected", isSelected);
+			this.button.set("selected", isSelected);
+			if(isSelected){
+				var cw = this.contentWidget;
+				if(cw.onSelected){
+					cw.onSelected();
+				}
+			}
+		},
+
+		startup: function(){
+			// Called by _Container.addChild()
+			this.contentWidget.startup();
+		},
+
+		destroy: function(){
+			this.button.destroyRecursive();
+
+			array.forEach(this._contentWidgetWatches || [], function(w){
+				w.unwatch();
+			});
+
+			delete this.contentWidget._buttonWidget;
+			delete this.contentWidget._wrapperWidget;
+
+			this.inherited(arguments);
+		},
+
+		destroyDescendants: function(/*Boolean*/ preserveDom){
+			// since getChildren isn't working for me, have to code this manually
+			this.contentWidget.destroyRecursive(preserveDom);
+		}
+	});
+
+	if(has("dojo-bidi")){
+		AccordionInnerContainer = declare("dijit.layout._AccordionInnerContainer", AccordionInnerContainer, {
+			postCreate: function(){
+				this.inherited(arguments);
+
+				// Map changes in content widget's textdir to changes in the button
+				var button = this.button;
+				this._contentWidgetWatches.push(
+					this.contentWidget.watch("textDir", function(name, oldValue, newValue){
+						button.set("textDir", newValue);
+					})
+				);
+			}
+		});
+	}
+
+	var AccordionContainer = declare("dijit.layout.AccordionContainer", StackContainer, {
+		// summary:
+		//		Holds a set of panes where every pane's title is visible, but only one pane's content is visible at a time,
+		//		and switching between panes is visualized by sliding the other panes up/down.
+		// example:
+		//	|	<div data-dojo-type="dijit/layout/AccordionContainer">
+		//	|		<div data-dojo-type="dijit/layout/ContentPane" title="pane 1">
+		//	|		</div>
+		//	|		<div data-dojo-type="dijit/layout/ContentPane" title="pane 2">
+		//	|			<p>This is some text</p>
+		//	|		</div>
+		//	|	</div>
+
+		// duration: Integer
+		//		Amount of time (in ms) it takes to slide panes
+		duration: manager.defaultDuration,
+
+		// buttonWidget: [const] String
+		//		The name of the widget used to display the title of each pane
+		buttonWidget: AccordionButton,
+
+		/*=====
+		 // _verticalSpace: Number
+		 //		Pixels of space available for the open pane
+		 //		(my content box size minus the cumulative size of all the title bars)
+		 _verticalSpace: 0,
+		 =====*/
+		baseClass: "dijitAccordionContainer",
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			this.domNode.style.overflow = "hidden";		// TODO: put this in dijit.css
+			this.domNode.setAttribute("role", "tablist");
+		},
+
+		startup: function(){
+			if(this._started){
+				return;
+			}
+			this.inherited(arguments);
+			if(this.selectedChildWidget){
+				this.selectedChildWidget._wrapperWidget.set("selected", true);
+			}
+		},
+
+		layout: function(){
+			// Implement _LayoutWidget.layout() virtual method.
+			// Set the height of the open pane based on what room remains.
+
+			var openPane = this.selectedChildWidget;
+
+			if(!openPane){
+				return;
+			}
+
+			// space taken up by title, plus wrapper div (with border/margin) for open pane
+			var wrapperDomNode = openPane._wrapperWidget.domNode,
+				wrapperDomNodeMargin = domGeometry.getMarginExtents(wrapperDomNode),
+				wrapperDomNodePadBorder = domGeometry.getPadBorderExtents(wrapperDomNode),
+				wrapperContainerNode = openPane._wrapperWidget.containerNode,
+				wrapperContainerNodeMargin = domGeometry.getMarginExtents(wrapperContainerNode),
+				wrapperContainerNodePadBorder = domGeometry.getPadBorderExtents(wrapperContainerNode),
+				mySize = this._contentBox;
+
+			// get cumulative height of all the unselected title bars
+			var totalCollapsedHeight = 0;
+			array.forEach(this.getChildren(), function(child){
+				if(child != openPane){
+					// Using domGeometry.getMarginSize() rather than domGeometry.position() since claro has 1px bottom margin
+					// to separate accordion panes.  Not sure that works perfectly, it's probably putting a 1px
+					// margin below the bottom pane (even though we don't want one).
+					totalCollapsedHeight += domGeometry.getMarginSize(child._wrapperWidget.domNode).h;
+				}
+			});
+			this._verticalSpace = mySize.h - totalCollapsedHeight - wrapperDomNodeMargin.h
+				- wrapperDomNodePadBorder.h - wrapperContainerNodeMargin.h - wrapperContainerNodePadBorder.h
+				- openPane._buttonWidget.getTitleHeight();
+
+			// Memo size to make displayed child
+			this._containerContentBox = {
+				h: this._verticalSpace,
+				w: this._contentBox.w - wrapperDomNodeMargin.w - wrapperDomNodePadBorder.w
+					- wrapperContainerNodeMargin.w - wrapperContainerNodePadBorder.w
+			};
+
+			if(openPane){
+				size(openPane, this._containerContentBox);
+			}
+		},
+
+		_setupChild: function(child){
+			// Overrides _LayoutWidget._setupChild().
+			// Put wrapper widget around the child widget, showing title
+
+			child._wrapperWidget = AccordionInnerContainer({
+				contentWidget: child,
+				buttonWidget: this.buttonWidget,
+				id: child.id + "_wrapper",
+				dir: child.dir,
+				lang: child.lang,
+				textDir: child.textDir || this.textDir,
+				parent: this
+			});
+
+			this.inherited(arguments);
+
+			// Since we are wrapping children in AccordionInnerContainer, replace the default
+			// wrapper that we created in StackContainer.
+			domConstruct.place(child.domNode, child._wrapper, "replace");
+		},
+
+		removeChild: function(child){
+			// Overrides _LayoutWidget.removeChild().
+
+			// Destroy wrapper widget first, before StackContainer.getChildren() call.
+			// Replace wrapper widget with true child widget (ContentPane etc.).
+			// This step only happens if the AccordionContainer has been started; otherwise there's no wrapper.
+			// (TODO: since StackContainer destroys child._wrapper, maybe it can do this step too?)
+			if(child._wrapperWidget){
+				domConstruct.place(child.domNode, child._wrapperWidget.domNode, "after");
+				child._wrapperWidget.destroy();
+				delete child._wrapperWidget;
+			}
+
+			domClass.remove(child.domNode, "dijitHidden");
+
+			this.inherited(arguments);
+		},
+
+		getChildren: function(){
+			// Overrides _Container.getChildren() to return content panes rather than internal AccordionInnerContainer panes
+			return array.map(this.inherited(arguments), function(child){
+				return child.declaredClass == "dijit.layout._AccordionInnerContainer" ? child.contentWidget : child;
+			}, this);
+		},
+
+		destroy: function(){
+			if(this._animation){
+				this._animation.stop();
+			}
+			array.forEach(this.getChildren(), function(child){
+				// If AccordionContainer has been started, then each child has a wrapper widget which
+				// also needs to be destroyed.
+				if(child._wrapperWidget){
+					child._wrapperWidget.destroy();
+				}else{
+					child.destroyRecursive();
+				}
+			});
+			this.inherited(arguments);
+		},
+
+		_showChild: function(child){
+			// Override StackContainer._showChild() to set visibility of _wrapperWidget.containerNode
+			child._wrapperWidget.containerNode.style.display = "block";
+			return this.inherited(arguments);
+		},
+
+		_hideChild: function(child){
+			// Override StackContainer._showChild() to set visibility of _wrapperWidget.containerNode
+			child._wrapperWidget.containerNode.style.display = "none";
+			this.inherited(arguments);
+		},
+
+		_transition: function(/*dijit/_WidgetBase?*/ newWidget, /*dijit/_WidgetBase?*/ oldWidget, /*Boolean*/ animate){
+			// Overrides StackContainer._transition() to provide sliding of title bars etc.
+
+			if(has("ie") < 8){
+				// workaround animation bugs by not animating; not worth supporting animation for IE6 & 7
+				animate = false;
+			}
+
+			if(this._animation){
+				// there's an in-progress animation.  speedily end it so we can do the newly requested one
+				this._animation.stop(true);
+				delete this._animation;
+			}
+
+			var self = this;
+
+			if(newWidget){
+				newWidget._wrapperWidget.set("selected", true);
+
+				var d = this._showChild(newWidget);	// prepare widget to be slid in
+
+				// Size the new widget, in case this is the first time it's being shown,
+				// or I have been resized since the last time it was shown.
+				// Note that page must be visible for resizing to work.
+				if(this.doLayout){
+					size(newWidget, this._containerContentBox);
+				}
+			}
+
+			if(oldWidget){
+				oldWidget._wrapperWidget.set("selected", false);
+				if(!animate){
+					this._hideChild(oldWidget);
+				}
+			}
+
+			if(animate){
+				var newContents = newWidget._wrapperWidget.containerNode,
+					oldContents = oldWidget._wrapperWidget.containerNode;
+
+				// During the animation we will be showing two dijitAccordionChildWrapper nodes at once,
+				// which on claro takes up 4px extra space (compared to stable AccordionContainer).
+				// Have to compensate for that by immediately shrinking the pane being closed.
+				var wrapperContainerNode = newWidget._wrapperWidget.containerNode,
+					wrapperContainerNodeMargin = domGeometry.getMarginExtents(wrapperContainerNode),
+					wrapperContainerNodePadBorder = domGeometry.getPadBorderExtents(wrapperContainerNode),
+					animationHeightOverhead = wrapperContainerNodeMargin.h + wrapperContainerNodePadBorder.h;
+
+				oldContents.style.height = (self._verticalSpace - animationHeightOverhead) + "px";
+
+				this._animation = new fx.Animation({
+					node: newContents,
+					duration: this.duration,
+					curve: [1, this._verticalSpace - animationHeightOverhead - 1],
+					onAnimate: function(value){
+						value = Math.floor(value);	// avoid fractional values
+						newContents.style.height = value + "px";
+						oldContents.style.height = (self._verticalSpace - animationHeightOverhead - value) + "px";
+					},
+					onEnd: function(){
+						delete self._animation;
+						newContents.style.height = "auto";
+						oldWidget._wrapperWidget.containerNode.style.display = "none";
+						oldContents.style.height = "auto";
+						self._hideChild(oldWidget);
+					}
+				});
+				this._animation.onStop = this._animation.onEnd;
+				this._animation.play();
+			}
+
+			return d;	// If child has an href, promise that fires when the widget has finished loading
+		},
+
+		// note: we are treating the container as controller here
+		_onKeyDown: function(/*Event*/ e, /*dijit/_WidgetBase*/ fromTitle){
+			// summary:
+			//		Handle keydown events
+			// description:
+			//		This is called from a handler on AccordionContainer.domNode
+			//		(setup in StackContainer), and is also called directly from
+			//		the click handler for accordion labels
+			if(this.disabled || e.altKey || !(fromTitle || e.ctrlKey)){
+				return;
+			}
+			var c = e.keyCode;
+			if((fromTitle && (c == keys.LEFT_ARROW || c == keys.UP_ARROW)) ||
+				(e.ctrlKey && c == keys.PAGE_UP)){
+				this._adjacent(false)._buttonWidget._onTitleClick();
+				e.stopPropagation();
+				e.preventDefault();
+			}else if((fromTitle && (c == keys.RIGHT_ARROW || c == keys.DOWN_ARROW)) ||
+				(e.ctrlKey && (c == keys.PAGE_DOWN || c == keys.TAB))){
+				this._adjacent(true)._buttonWidget._onTitleClick();
+				e.stopPropagation();
+				e.preventDefault();
+			}
+		}
+	});
+
+	// Back compat w/1.6, remove for 2.0
+	if(has("dijit-legacy-requires")){
+		ready(0, function(){
+			var requires = ["dijit/layout/AccordionPane"];
+			require(requires);	// use indirection so modules not rolled into a build
+		});
+	}
+
+	// For monkey patching
+	AccordionContainer._InnerContainer = AccordionInnerContainer;
+	AccordionContainer._Button = AccordionButton;
+
+	return AccordionContainer;
+});
diff --git a/src/main/resources/static/dijit/layout/AccordionPane.js b/src/main/resources/static/dijit/layout/AccordionPane.js
new file mode 100644
index 0000000000000000000000000000000000000000..51ce92172ece60b063894948c99d7bed8a0cee83
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/AccordionPane.js
@@ -0,0 +1,25 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/_base/kernel", // kernel.deprecated
+	"./ContentPane"
+], function(declare, kernel, ContentPane){
+
+	// module:
+	//		dijit/layout/AccordionPane
+
+	return declare("dijit.layout.AccordionPane", ContentPane, {
+		// summary:
+		//		Deprecated widget.   Use `dijit/layout/ContentPane` instead.
+		// tags:
+		//		deprecated
+
+		constructor: function(){
+			kernel.deprecated("dijit.layout.AccordionPane deprecated, use ContentPane instead", "", "2.0");
+		},
+
+		onSelected: function(){
+			// summary:
+			//		called when this pane is selected
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/layout/BorderContainer.js b/src/main/resources/static/dijit/layout/BorderContainer.js
new file mode 100644
index 0000000000000000000000000000000000000000..2ec9fc394e4fdd38f41a3c6c6dc6b70cdee8e098
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/BorderContainer.js
@@ -0,0 +1,480 @@
+define([
+	"dojo/_base/array", // array.filter array.forEach array.map
+	"dojo/cookie", // cookie
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add domClass.remove domClass.toggle
+	"dojo/dom-construct", // domConstruct.destroy domConstruct.place
+	"dojo/dom-geometry", // domGeometry.marginBox
+	"dojo/dom-style", // domStyle.style
+	"dojo/keys",
+	"dojo/_base/lang", // getObject() hitch() delegate()
+	"dojo/on",
+	"dojo/touch",
+	"../_WidgetBase",
+	"../_Widget",
+	"../_TemplatedMixin",
+	"./LayoutContainer",
+	"./utils"        // layoutUtils.layoutChildren
+], function(array, cookie, declare, domClass, domConstruct, domGeometry, domStyle, keys, lang, on, touch,
+			_WidgetBase, _Widget, _TemplatedMixin, LayoutContainer, layoutUtils){
+
+	// module:
+	//		dijit/layout/BorderContainer
+
+	var _Splitter = declare("dijit.layout._Splitter", [_Widget, _TemplatedMixin ], {
+		// summary:
+		//		A draggable spacer between two items in a `dijit/layout/BorderContainer`.
+		// description:
+		//		This is instantiated by `dijit/layout/BorderContainer`.  Users should not
+		//		create it directly.
+		// tags:
+		//		private
+
+		/*=====
+		 // container: [const] dijit/layout/BorderContainer
+		 //		Pointer to the parent BorderContainer
+		 container: null,
+
+		 // child: [const] dijit/layout/_LayoutWidget
+		 //		Pointer to the pane associated with this splitter
+		 child: null,
+
+		 // region: [const] String
+		 //		Region of pane associated with this splitter.
+		 //		"top", "bottom", "left", "right".
+		 region: null,
+		 =====*/
+
+		// live: [const] Boolean
+		//		If true, the child's size changes and the child widget is redrawn as you drag the splitter;
+		//		otherwise, the size doesn't change until you drop the splitter (by mouse-up)
+		live: true,
+
+		templateString: '<div class="dijitSplitter" data-dojo-attach-event="onkeydown:_onKeyDown,press:_startDrag,onmouseenter:_onMouse,onmouseleave:_onMouse" tabIndex="0" role="separator"><div class="dijitSplitterThumb"></div></div>',
+
+		constructor: function(){
+			this._handlers = [];
+		},
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+
+			this.horizontal = /top|bottom/.test(this.region);
+			this._factor = /top|left/.test(this.region) ? 1 : -1;
+			this._cookieName = this.container.id + "_" + this.region;
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			domClass.add(this.domNode, "dijitSplitter" + (this.horizontal ? "H" : "V"));
+
+			if(this.container.persist){
+				// restore old size
+				var persistSize = cookie(this._cookieName);
+				if(persistSize){
+					this.child.domNode.style[this.horizontal ? "height" : "width"] = persistSize;
+				}
+			}
+		},
+
+		_computeMaxSize: function(){
+			// summary:
+			//		Return the maximum size that my corresponding pane can be set to
+
+			var dim = this.horizontal ? 'h' : 'w',
+				childSize = domGeometry.getMarginBox(this.child.domNode)[dim],
+				center = array.filter(this.container.getChildren(), function(child){
+					return child.region == "center";
+				})[0];
+
+			// Can expand until center is crushed.  But always leave room for center's padding + border,
+			//  otherwise on the next call domGeometry methods start to lie about size.
+			var spaceAvailable = domGeometry.getContentBox(center.domNode)[dim] - 10;
+
+			return Math.min(this.child.maxSize, childSize + spaceAvailable);
+		},
+
+		_startDrag: function(e){
+			if(!this.cover){
+				this.cover = domConstruct.place("<div class=dijitSplitterCover></div>", this.child.domNode, "after");
+			}
+			domClass.add(this.cover, "dijitSplitterCoverActive");
+
+			// Safeguard in case the stop event was missed.  Shouldn't be necessary if we always get the mouse up.
+			if(this.fake){
+				domConstruct.destroy(this.fake);
+			}
+			if(!(this._resize = this.live)){ //TODO: disable live for IE6?
+				// create fake splitter to display at old position while we drag
+				(this.fake = this.domNode.cloneNode(true)).removeAttribute("id");
+				domClass.add(this.domNode, "dijitSplitterShadow");
+				domConstruct.place(this.fake, this.domNode, "after");
+			}
+			domClass.add(this.domNode, "dijitSplitterActive dijitSplitter" + (this.horizontal ? "H" : "V") + "Active");
+			if(this.fake){
+				domClass.remove(this.fake, "dijitSplitterHover dijitSplitter" + (this.horizontal ? "H" : "V") + "Hover");
+			}
+
+			//Performance: load data info local vars for onmousevent function closure
+			var factor = this._factor,
+				isHorizontal = this.horizontal,
+				axis = isHorizontal ? "pageY" : "pageX",
+				pageStart = e[axis],
+				splitterStyle = this.domNode.style,
+				dim = isHorizontal ? 'h' : 'w',
+				childCS = domStyle.getComputedStyle(this.child.domNode),
+				childStart = domGeometry.getMarginBox(this.child.domNode, childCS)[dim],
+				max = this._computeMaxSize(),
+				min = Math.max(this.child.minSize, domGeometry.getPadBorderExtents(this.child.domNode, childCS)[dim] + 10),
+				region = this.region,
+				splitterAttr = region == "top" || region == "bottom" ? "top" : "left", // style attribute of splitter to adjust
+				splitterStart = parseInt(splitterStyle[splitterAttr], 10),
+				resize = this._resize,
+				layoutFunc = lang.hitch(this.container, "_layoutChildren", this.child.id),
+				de = this.ownerDocument;
+
+			this._handlers = this._handlers.concat([
+				on(de, touch.move, this._drag = function(e, forceResize){
+					var delta = e[axis] - pageStart,
+						childSize = factor * delta + childStart,
+						boundChildSize = Math.max(Math.min(childSize, max), min);
+
+					if(resize || forceResize){
+						layoutFunc(boundChildSize);
+					}
+					// TODO: setting style directly (usually) sets content box size, need to set margin box size
+					splitterStyle[splitterAttr] = delta + splitterStart + factor * (boundChildSize - childSize) + "px";
+				}),
+				on(de, "dragstart", function(e){
+					e.stopPropagation();
+					e.preventDefault();
+				}),
+				on(this.ownerDocumentBody, "selectstart", function(e){
+					e.stopPropagation();
+					e.preventDefault();
+				}),
+				on(de, touch.release, lang.hitch(this, "_stopDrag"))
+			]);
+			e.stopPropagation();
+			e.preventDefault();
+		},
+
+		_onMouse: function(e){
+			// summary:
+			//		Handler for onmouseenter / onmouseleave events
+			var o = (e.type == "mouseover" || e.type == "mouseenter");
+			domClass.toggle(this.domNode, "dijitSplitterHover", o);
+			domClass.toggle(this.domNode, "dijitSplitter" + (this.horizontal ? "H" : "V") + "Hover", o);
+		},
+
+		_stopDrag: function(e){
+			try{
+				if(this.cover){
+					domClass.remove(this.cover, "dijitSplitterCoverActive");
+				}
+				if(this.fake){
+					domConstruct.destroy(this.fake);
+				}
+				domClass.remove(this.domNode, "dijitSplitterActive dijitSplitter"
+					+ (this.horizontal ? "H" : "V") + "Active dijitSplitterShadow");
+				this._drag(e); //TODO: redundant with onmousemove?
+				this._drag(e, true);
+			}finally{
+				this._cleanupHandlers();
+				delete this._drag;
+			}
+
+			if(this.container.persist){
+				cookie(this._cookieName, this.child.domNode.style[this.horizontal ? "height" : "width"], {expires: 365});
+			}
+		},
+
+		_cleanupHandlers: function(){
+			var h;
+			while(h = this._handlers.pop()){
+				h.remove();
+			}
+		},
+
+		_onKeyDown: function(/*Event*/ e){
+			// should we apply typematic to this?
+			this._resize = true;
+			var horizontal = this.horizontal;
+			var tick = 1;
+			switch(e.keyCode){
+				case horizontal ? keys.UP_ARROW : keys.LEFT_ARROW:
+					tick *= -1;
+//				break;
+				case horizontal ? keys.DOWN_ARROW : keys.RIGHT_ARROW:
+					break;
+				default:
+//				this.inherited(arguments);
+					return;
+			}
+			var childSize = domGeometry.getMarginSize(this.child.domNode)[ horizontal ? 'h' : 'w' ] + this._factor * tick;
+			this.container._layoutChildren(this.child.id, Math.max(Math.min(childSize, this._computeMaxSize()), this.child.minSize));
+			e.stopPropagation();
+			e.preventDefault();
+		},
+
+		destroy: function(){
+			this._cleanupHandlers();
+			delete this.child;
+			delete this.container;
+			delete this.cover;
+			delete this.fake;
+			this.inherited(arguments);
+		}
+	});
+
+	var _Gutter = declare("dijit.layout._Gutter", [_Widget, _TemplatedMixin], {
+		// summary:
+		//		Just a spacer div to separate side pane from center pane.
+		//		Basically a trick to lookup the gutter/splitter width from the theme.
+		// description:
+		//		Instantiated by `dijit/layout/BorderContainer`.  Users should not
+		//		create directly.
+		// tags:
+		//		private
+
+		templateString: '<div class="dijitGutter" role="presentation"></div>',
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			this.horizontal = /top|bottom/.test(this.region);
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			domClass.add(this.domNode, "dijitGutter" + (this.horizontal ? "H" : "V"));
+		}
+	});
+
+	var BorderContainer = declare("dijit.layout.BorderContainer", LayoutContainer, {
+		// summary:
+		//		A BorderContainer is a `dijit/LayoutContainer` that can have draggable splitters between the children,
+		//		in order to adjust their sizes.
+		//
+		//		In addition, it automatically adds some space between the children even
+		//		if they don't have a draggable splitter between them, and space between the edge of the BorderContainer
+		//		and the children that are adjacent to the edge.  Note that the intended style is that all the children
+		//		have borders, but (despite the name) the BorderContainer itself does not.
+		//
+		//		See `BorderContainer.ChildWidgetProperties` for details on the properties that can be set on
+		//		children of a `BorderContainer`.
+
+		// gutters: [const] Boolean
+		//		Give each pane a border and margin.
+		//		Margin determined by domNode.paddingLeft.
+		//		When false, only resizable panes have a gutter (i.e. draggable splitter) for resizing.
+		gutters: true,
+
+		// liveSplitters: [const] Boolean
+		//		Specifies whether splitters resize as you drag (true) or only upon mouseup (false)
+		liveSplitters: true,
+
+		// persist: Boolean
+		//		Save splitter positions in a cookie.
+		persist: false,
+
+		baseClass: "dijitBorderContainer",
+
+		// _splitterClass: Function||String
+		//		Optional hook to override the default Splitter widget used by BorderContainer
+		_splitterClass: _Splitter,
+
+		postMixInProperties: function(){
+			// change class name to indicate that BorderContainer is being used purely for
+			// layout (like LayoutContainer) rather than for pretty formatting.
+			if(!this.gutters){
+				this.baseClass += "NoGutter";
+			}
+			this.inherited(arguments);
+		},
+
+		_setupChild: function(/*dijit/_WidgetBase*/ child){
+			// Override LayoutContainer._setupChild().
+
+			this.inherited(arguments);
+
+			var region = child.region, ltr = child.isLeftToRight();
+			if(region == "leading"){
+				region = ltr ? "left" : "right";
+			}
+			if(region == "trailing"){
+				region = ltr ? "right" : "left";
+			}
+
+			if(region){
+				// Create draggable splitter for resizing pane,
+				// or alternately if splitter=false but BorderContainer.gutters=true then
+				// insert dummy div just for spacing
+				if(region != "center" && (child.splitter || this.gutters) && !child._splitterWidget){
+					var _Splitter = child.splitter ? this._splitterClass : _Gutter;
+					if(lang.isString(_Splitter)){
+						_Splitter = lang.getObject(_Splitter);	// for back-compat, remove in 2.0
+					}
+					var splitter = new _Splitter({
+						id: child.id + "_splitter",
+						container: this,
+						child: child,
+						region: region,
+						live: this.liveSplitters
+					});
+					splitter.isSplitter = true;
+					child._splitterWidget = splitter;
+
+					// Make the tab order match the visual layout by placing the splitter before or after the pane,
+					// depending on where the splitter is visually compared to the pane.
+					var before = region == "bottom" || region == (this.isLeftToRight() ? "right" : "left");
+					domConstruct.place(splitter.domNode, child.domNode, before ? "before" : "after");
+
+					// Splitters aren't added as Contained children, so we need to call startup explicitly
+					splitter.startup();
+				}
+			}
+		},
+
+		layout: function(){
+			// Implement _LayoutWidget.layout() virtual method.
+			this._layoutChildren();
+		},
+
+		removeChild: function(/*dijit/_WidgetBase*/ child){
+			// Override _LayoutWidget.removeChild().
+
+			var splitter = child._splitterWidget;
+			if(splitter){
+				splitter.destroy();
+				delete child._splitterWidget;
+			}
+
+			this.inherited(arguments);
+		},
+
+		getChildren: function(){
+			// Override _LayoutWidget.getChildren() to only return real children, not the splitters.
+			return array.filter(this.inherited(arguments), function(widget){
+				return !widget.isSplitter;
+			});
+		},
+
+		// TODO: remove in 2.0
+		getSplitter: function(/*String*/region){
+			// summary:
+			//		Returns the widget responsible for rendering the splitter associated with region
+			// tags:
+			//		deprecated
+			return array.filter(this.getChildren(), function(child){
+				return child.region == region;
+			})[0]._splitterWidget;
+		},
+
+		resize: function(newSize, currentSize){
+			// Overrides _LayoutWidget.resize().
+
+			// resetting potential padding to 0px to provide support for 100% width/height + padding
+			// TODO: this hack doesn't respect the box model and is a temporary fix
+			if(!this.cs || !this.pe){
+				var node = this.domNode;
+				this.cs = domStyle.getComputedStyle(node);
+				this.pe = domGeometry.getPadExtents(node, this.cs);
+				this.pe.r = domStyle.toPixelValue(node, this.cs.paddingRight);
+				this.pe.b = domStyle.toPixelValue(node, this.cs.paddingBottom);
+
+				domStyle.set(node, "padding", "0px");
+			}
+
+			this.inherited(arguments);
+		},
+
+		_layoutChildren: function(/*String?*/ changedChildId, /*Number?*/ changedChildSize){
+			// summary:
+			//		This is the main routine for setting size/position of each child.
+			// description:
+			//		With no arguments, measures the height of top/bottom panes, the width
+			//		of left/right panes, and then sizes all panes accordingly.
+			//
+			//		With changedRegion specified (as "left", "top", "bottom", or "right"),
+			//		it changes that region's width/height to changedRegionSize and
+			//		then resizes other regions that were affected.
+			// changedChildId:
+			//		Id of the child which should be resized because splitter was dragged.
+			// changedChildSize:
+			//		The new width/height (in pixels) to make specified child
+
+			if(!this._borderBox || !this._borderBox.h){
+				// We are currently hidden, or we haven't been sized by our parent yet.
+				// Abort.   Someone will resize us later.
+				return;
+			}
+
+			// Combining the externally specified children with splitters and gutters
+			var childrenAndSplitters = [];
+			array.forEach(this._getOrderedChildren(), function(pane){
+				childrenAndSplitters.push(pane);
+				if(pane._splitterWidget){
+					childrenAndSplitters.push(pane._splitterWidget);
+				}
+			});
+
+			// Compute the box in which to lay out my children
+			var dim = {
+				l: this.pe.l,
+				t: this.pe.t,
+				w: this._borderBox.w - this.pe.w,
+				h: this._borderBox.h - this.pe.h
+			};
+
+			// Layout the children, possibly changing size due to a splitter drag
+			layoutUtils.layoutChildren(this.domNode, dim, childrenAndSplitters,
+				changedChildId, changedChildSize);
+		},
+
+		destroyRecursive: function(){
+			// Destroy splitters first, while getChildren() still works
+			array.forEach(this.getChildren(), function(child){
+				var splitter = child._splitterWidget;
+				if(splitter){
+					splitter.destroy();
+				}
+				delete child._splitterWidget;
+			});
+
+			// Then destroy the real children, and myself
+			this.inherited(arguments);
+		}
+	});
+
+	BorderContainer.ChildWidgetProperties = {
+		// summary:
+		//		These properties can be specified for the children of a BorderContainer.
+
+		// splitter: [const] Boolean
+		//		Parameter for children where region != "center".
+		//		If true, enables user to resize the widget by putting a draggable splitter between
+		//		this widget and the region=center widget.
+		splitter: false,
+
+		// minSize: [const] Number
+		//		Specifies a minimum size (in pixels) for this widget when resized by a splitter.
+		minSize: 0,
+
+		// maxSize: [const] Number
+		//		Specifies a maximum size (in pixels) for this widget when resized by a splitter.
+		maxSize: Infinity
+	};
+	lang.mixin(BorderContainer.ChildWidgetProperties, LayoutContainer.ChildWidgetProperties);
+
+	// Since any widget can be specified as a BorderContainer child, mix it
+	// into the base widget class.  (This is a hack, but it's effective.)
+	// This is for the benefit of the parser.   Remove for 2.0.  Also, hide from doc viewer.
+	lang.extend(_WidgetBase, /*===== {} || =====*/ BorderContainer.ChildWidgetProperties);
+
+	// For monkey patching
+	BorderContainer._Splitter = _Splitter;
+	BorderContainer._Gutter = _Gutter;
+
+	return BorderContainer;
+});
diff --git a/src/main/resources/static/dijit/layout/ContentPane.js b/src/main/resources/static/dijit/layout/ContentPane.js
new file mode 100644
index 0000000000000000000000000000000000000000..301ffcb1630eade16828ceb5d6f642f1b72d912a
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/ContentPane.js
@@ -0,0 +1,665 @@
+define([
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/lang", // lang.mixin lang.delegate lang.hitch lang.isFunction lang.isObject
+	"../_Widget",
+	"../_Container",
+	"./_ContentPaneResizeMixin",
+	"dojo/string", // string.substitute
+	"dojo/html", // html._ContentSetter
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/_base/Deferred", // Deferred
+	"dojo/dom", // dom.byId
+	"dojo/dom-attr", // domAttr.attr
+	"dojo/dom-construct", // empty()
+	"dojo/_base/xhr", // xhr.get
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/when",
+	"dojo/i18n!../nls/loading"
+], function(kernel, lang, _Widget, _Container, _ContentPaneResizeMixin, string, html, array, declare,
+			Deferred, dom, domAttr, domConstruct, xhr, i18n, when){
+
+	// module:
+	//		dijit/layout/ContentPane
+
+	return declare("dijit.layout.ContentPane", [_Widget, _Container, _ContentPaneResizeMixin], {
+		// summary:
+		//		A widget containing an HTML fragment, specified inline
+		//		or by uri.  Fragment may include widgets.
+		//
+		// description:
+		//		This widget embeds a document fragment in the page, specified
+		//		either by uri, javascript generated markup or DOM reference.
+		//		Any widgets within this content are instantiated and managed,
+		//		but laid out according to the HTML structure.  Unlike IFRAME,
+		//		ContentPane embeds a document fragment as would be found
+		//		inside the BODY tag of a full HTML document.  It should not
+		//		contain the HTML, HEAD, or BODY tags.
+		//		For more advanced functionality with scripts and
+		//		stylesheets, see dojox/layout/ContentPane.  This widget may be
+		//		used stand alone or as a base class for other widgets.
+		//		ContentPane is useful as a child of other layout containers
+		//		such as BorderContainer or TabContainer, but note that those
+		//		widgets can contain any widget as a child.
+		//
+		// example:
+		//		Some quick samples:
+		//		To change the innerHTML:
+		// |		cp.set('content', '<b>new content</b>')`
+		//		Or you can send it a NodeList:
+		// |		cp.set('content', dojo.query('div [class=selected]', userSelection))
+		//		To do an ajax update:
+		// |		cp.set('href', url)
+
+		// href: String
+		//		The href of the content that displays now.
+		//		Set this at construction if you want to load data externally when the
+		//		pane is shown.  (Set preload=true to load it immediately.)
+		//		Changing href after creation doesn't have any effect; Use set('href', ...);
+		href: "",
+
+		// content: String|DomNode|NodeList|dijit/_Widget
+		//		The innerHTML of the ContentPane.
+		//		Note that the initialization parameter / argument to set("content", ...)
+		//		can be a String, DomNode, Nodelist, or _Widget.
+		content: "",
+
+		// extractContent: Boolean
+		//		Extract visible content from inside of `<body> .... </body>`.
+		//		I.e., strip `<html>` and `<head>` (and it's contents) from the href
+		extractContent: false,
+
+		// parseOnLoad: Boolean
+		//		Parse content and create the widgets, if any.
+		parseOnLoad: true,
+
+		// parserScope: String
+		//		Flag passed to parser.  Root for attribute names to search for.   If scopeName is dojo,
+		//		will search for data-dojo-type (or dojoType).  For backwards compatibility
+		//		reasons defaults to dojo._scopeName (which is "dojo" except when
+		//		multi-version support is used, when it will be something like dojo16, dojo20, etc.)
+		parserScope: kernel._scopeName,
+
+		// preventCache: Boolean
+		//		Prevent caching of data from href's by appending a timestamp to the href.
+		preventCache: false,
+
+		// preload: Boolean
+		//		Force load of data on initialization even if pane is hidden.
+		preload: false,
+
+		// refreshOnShow: Boolean
+		//		Refresh (re-download) content when pane goes from hidden to shown
+		refreshOnShow: false,
+
+		// loadingMessage: String
+		//		Message that shows while downloading
+		loadingMessage: "<span class='dijitContentPaneLoading'><span class='dijitInline dijitIconLoading'></span>${loadingState}</span>",
+
+		// errorMessage: String
+		//		Message that shows if an error occurs
+		errorMessage: "<span class='dijitContentPaneError'><span class='dijitInline dijitIconError'></span>${errorState}</span>",
+
+		// isLoaded: [readonly] Boolean
+		//		True if the ContentPane has data in it, either specified
+		//		during initialization (via href or inline content), or set
+		//		via set('content', ...) / set('href', ...)
+		//
+		//		False if it doesn't have any content, or if ContentPane is
+		//		still in the process of downloading href.
+		isLoaded: false,
+
+		baseClass: "dijitContentPane",
+
+		/*======
+		 // ioMethod: dojo/_base/xhr.get|dojo._base/xhr.post
+		 //		Function that should grab the content specified via href.
+		 ioMethod: dojo.xhrGet,
+		 ======*/
+
+		// ioArgs: Object
+		//		Parameters to pass to xhrGet() request, for example:
+		// |	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="href: './bar', ioArgs: {timeout: 500}">
+		ioArgs: {},
+
+		// onLoadDeferred: [readonly] dojo.Deferred
+		//		This is the `dojo.Deferred` returned by set('href', ...) and refresh().
+		//		Calling onLoadDeferred.then() registers your
+		//		callback to be called only once, when the prior set('href', ...) call or
+		//		the initial href parameter to the constructor finishes loading.
+		//
+		//		This is different than an onLoad() handler which gets called any time any href
+		//		or content is loaded.
+		onLoadDeferred: null,
+
+		// Cancel _WidgetBase's _setTitleAttr because we don't want the title attribute (used to specify
+		// tab labels) to be copied to ContentPane.domNode... otherwise a tooltip shows up over the
+		// entire pane.
+		_setTitleAttr: null,
+
+		// Flag to parser that I'll parse my contents, so it shouldn't.
+		stopParser: true,
+
+		// template: [private] Boolean
+		//		Flag from the parser that this ContentPane is inside a template
+		//		so the contents are pre-parsed.
+		// TODO: this declaration can be commented out in 2.0
+		template: false,
+
+		markupFactory: function(params, node, ctor){
+			var self = new ctor(params, node);
+
+			// If a parse has started but is waiting for modules to load, then return a Promise for when the parser
+			// finishes.  Don't return a promise though for the case when content hasn't started loading because the
+			// ContentPane is hidden and it has an href (ex: hidden pane of a TabContainer).   In that case we consider
+			// that initialization has already finished.
+			return !self.href && self._contentSetter && self._contentSetter.parseDeferred && !self._contentSetter.parseDeferred.isFulfilled() ?
+				self._contentSetter.parseDeferred.then(function(){
+					return self;
+				}) : self;
+		},
+
+		create: function(params, srcNodeRef){
+			// Convert a srcNodeRef argument into a content parameter, so that the original contents are
+			// processed in the same way as contents set via set("content", ...), calling the parser etc.
+			// Avoid modifying original params object since that breaks NodeList instantiation, see #11906.
+			if((!params || !params.template) && srcNodeRef && !("href" in params) && !("content" in params)){
+				srcNodeRef = dom.byId(srcNodeRef);
+				var df = srcNodeRef.ownerDocument.createDocumentFragment();
+				while(srcNodeRef.firstChild){
+					df.appendChild(srcNodeRef.firstChild);
+				}
+				params = lang.delegate(params, {content: df});
+			}
+			this.inherited(arguments, [params, srcNodeRef]);
+		},
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+			var messages = i18n.getLocalization("dijit", "loading", this.lang);
+			this.loadingMessage = string.substitute(this.loadingMessage, messages);
+			this.errorMessage = string.substitute(this.errorMessage, messages);
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			// Since we have no template we need to set this.containerNode ourselves, to make getChildren() work.
+			// For subclasses of ContentPane that do have a template, does nothing.
+			if(!this.containerNode){
+				this.containerNode = this.domNode;
+			}
+
+			// remove the title attribute so it doesn't show up when hovering
+			// over a node  (TODO: remove in 2.0, no longer needed after #11490)
+			this.domNode.removeAttribute("title");
+		},
+
+		startup: function(){
+			// summary:
+			//		Call startup() on all children including non _Widget ones like dojo/dnd/Source objects
+
+			// This starts all the widgets
+			this.inherited(arguments);
+
+			// And this catches stuff like dojo/dnd/Source
+			if(this._contentSetter){
+				array.forEach(this._contentSetter.parseResults, function(obj){
+					if(!obj._started && !obj._destroyed && lang.isFunction(obj.startup)){
+						obj.startup();
+						obj._started = true;
+					}
+				}, this);
+			}
+		},
+
+		_startChildren: function(){
+			// summary:
+			//		Called when content is loaded.   Calls startup on each child widget.   Similar to ContentPane.startup()
+			//		itself, but avoids marking the ContentPane itself as "restarted" (see #15581).
+
+			// This starts all the widgets
+			array.forEach(this.getChildren(), function(obj){
+				if(!obj._started && !obj._destroyed && lang.isFunction(obj.startup)){
+					obj.startup();
+					obj._started = true;
+				}
+			});
+
+			// And this catches stuff like dojo/dnd/Source
+			if(this._contentSetter){
+				array.forEach(this._contentSetter.parseResults, function(obj){
+					if(!obj._started && !obj._destroyed && lang.isFunction(obj.startup)){
+						obj.startup();
+						obj._started = true;
+					}
+				}, this);
+			}
+		},
+
+		setHref: function(/*String|Uri*/ href){
+			// summary:
+			//		Deprecated.   Use set('href', ...) instead.
+			kernel.deprecated("dijit.layout.ContentPane.setHref() is deprecated. Use set('href', ...) instead.", "", "2.0");
+			return this.set("href", href);
+		},
+		_setHrefAttr: function(/*String|Uri*/ href){
+			// summary:
+			//		Hook so set("href", ...) works.
+			// description:
+			//		Reset the (external defined) content of this pane and replace with new url
+			//		Note: It delays the download until widget is shown if preload is false.
+			// href:
+			//		url to the page you want to get, must be within the same domain as your mainpage
+
+			// Cancel any in-flight requests (a set('href', ...) will cancel any in-flight set('href', ...))
+			this.cancel();
+
+			this.onLoadDeferred = new Deferred(lang.hitch(this, "cancel"));
+			this.onLoadDeferred.then(lang.hitch(this, "onLoad"));
+
+			this._set("href", href);
+
+			// _setHrefAttr() is called during creation and by the user, after creation.
+			// Assuming preload == false, only in the second case do we actually load the URL;
+			// otherwise it's done in startup(), and only if this widget is shown.
+			if(this.preload || (this._created && this._isShown())){
+				this._load();
+			}else{
+				// Set flag to indicate that href needs to be loaded the next time the
+				// ContentPane is made visible
+				this._hrefChanged = true;
+			}
+
+			return this.onLoadDeferred;		// Deferred
+		},
+
+		setContent: function(/*String|DomNode|Nodelist*/data){
+			// summary:
+			//		Deprecated.   Use set('content', ...) instead.
+			kernel.deprecated("dijit.layout.ContentPane.setContent() is deprecated.  Use set('content', ...) instead.", "", "2.0");
+			this.set("content", data);
+		},
+		_setContentAttr: function(/*String|DomNode|Nodelist*/data){
+			// summary:
+			//		Hook to make set("content", ...) work.
+			//		Replaces old content with data content, include style classes from old content
+			// data:
+			//		the new Content may be String, DomNode or NodeList
+			//
+			//		if data is a NodeList (or an array of nodes) nodes are copied
+			//		so you can import nodes from another document implicitly
+
+			// clear href so we can't run refresh and clear content
+			// refresh should only work if we downloaded the content
+			this._set("href", "");
+
+			// Cancel any in-flight requests (a set('content', ...) will cancel any in-flight set('href', ...))
+			this.cancel();
+
+			// Even though user is just setting content directly, still need to define an onLoadDeferred
+			// because the _onLoadHandler() handler is still getting called from setContent()
+			this.onLoadDeferred = new Deferred(lang.hitch(this, "cancel"));
+			if(this._created){
+				// For back-compat reasons, call onLoad() for set('content', ...)
+				// calls but not for content specified in srcNodeRef (ie: <div data-dojo-type=ContentPane>...</div>)
+				// or as initialization parameter (ie: new ContentPane({content: ...})
+				this.onLoadDeferred.then(lang.hitch(this, "onLoad"));
+			}
+
+			this._setContent(data || "");
+
+			this._isDownloaded = false; // mark that content is from a set('content') not a set('href')
+
+			return this.onLoadDeferred;	// Deferred
+		},
+		_getContentAttr: function(){
+			// summary:
+			//		Hook to make get("content") work
+			return this.containerNode.innerHTML;
+		},
+
+		cancel: function(){
+			// summary:
+			//		Cancels an in-flight download of content
+			if(this._xhrDfd && (this._xhrDfd.fired == -1)){
+				this._xhrDfd.cancel();
+			}
+			delete this._xhrDfd; // garbage collect
+
+			this.onLoadDeferred = null;
+		},
+
+		destroy: function(){
+			this.cancel();
+			this.inherited(arguments);
+		},
+
+		destroyRecursive: function(/*Boolean*/ preserveDom){
+			// summary:
+			//		Destroy the ContentPane and its contents
+
+			// if we have multiple controllers destroying us, bail after the first
+			if(this._beingDestroyed){
+				return;
+			}
+			this.inherited(arguments);
+		},
+
+		_onShow: function(){
+			// summary:
+			//		Called when the ContentPane is made visible
+			// description:
+			//		For a plain ContentPane, this is called on initialization, from startup().
+			//		If the ContentPane is a hidden pane of a TabContainer etc., then it's
+			//		called whenever the pane is made visible.
+			//
+			//		Does necessary processing, including href download and layout/resize of
+			//		child widget(s)
+
+			this.inherited(arguments);
+
+			if(this.href){
+				if(!this._xhrDfd && // if there's an href that isn't already being loaded
+					(!this.isLoaded || this._hrefChanged || this.refreshOnShow)
+					){
+					return this.refresh();	// If child has an href, promise that fires when the load is complete
+				}
+			}
+		},
+
+		refresh: function(){
+			// summary:
+			//		[Re]download contents of href and display
+			// description:
+			//		1. cancels any currently in-flight requests
+			//		2. posts "loading..." message
+			//		3. sends XHR to download new data
+
+			// Cancel possible prior in-flight request
+			this.cancel();
+
+			this.onLoadDeferred = new Deferred(lang.hitch(this, "cancel"));
+			this.onLoadDeferred.then(lang.hitch(this, "onLoad"));
+			this._load();
+			return this.onLoadDeferred;		// If child has an href, promise that fires when refresh is complete
+		},
+
+		_load: function(){
+			// summary:
+			//		Load/reload the href specified in this.href
+
+			// display loading message
+			this._setContent(this.onDownloadStart(), true);
+
+			var self = this;
+			var getArgs = {
+				preventCache: (this.preventCache || this.refreshOnShow),
+				url: this.href,
+				handleAs: "text"
+			};
+			if(lang.isObject(this.ioArgs)){
+				lang.mixin(getArgs, this.ioArgs);
+			}
+
+			var hand = (this._xhrDfd = (this.ioMethod || xhr.get)(getArgs)),
+				returnedHtml;
+
+			hand.then(
+				function(html){
+					returnedHtml = html;
+					try{
+						self._isDownloaded = true;
+						return self._setContent(html, false);
+					}catch(err){
+						self._onError('Content', err); // onContentError
+					}
+				},
+				function(err){
+					if(!hand.canceled){
+						// show error message in the pane
+						self._onError('Download', err); // onDownloadError
+					}
+					delete self._xhrDfd;
+					return err;
+				}
+			).then(function(){
+					self.onDownloadEnd();
+					delete self._xhrDfd;
+					return returnedHtml;
+				});
+
+			// Remove flag saying that a load is needed
+			delete this._hrefChanged;
+		},
+
+		_onLoadHandler: function(data){
+			// summary:
+			//		This is called whenever new content is being loaded
+			this._set("isLoaded", true);
+			try{
+				this.onLoadDeferred.resolve(data);
+			}catch(e){
+				console.error('Error ' + this.widgetId + ' running custom onLoad code: ' + e.message);
+			}
+		},
+
+		_onUnloadHandler: function(){
+			// summary:
+			//		This is called whenever the content is being unloaded
+			this._set("isLoaded", false);
+			try{
+				this.onUnload();
+			}catch(e){
+				console.error('Error ' + this.widgetId + ' running custom onUnload code: ' + e.message);
+			}
+		},
+
+		destroyDescendants: function(/*Boolean*/ preserveDom){
+			// summary:
+			//		Destroy all the widgets inside the ContentPane and empty containerNode
+
+			// Make sure we call onUnload (but only when the ContentPane has real content)
+			if(this.isLoaded){
+				this._onUnloadHandler();
+			}
+
+			// Even if this.isLoaded == false there might still be a "Loading..." message
+			// to erase, so continue...
+
+			// For historical reasons we need to delete all widgets under this.containerNode,
+			// even ones that the user has created manually.
+			var setter = this._contentSetter;
+			array.forEach(this.getChildren(), function(widget){
+				if(widget.destroyRecursive){
+					// All widgets will hit this branch
+					widget.destroyRecursive(preserveDom);
+				}else if(widget.destroy){
+					// Things like dojo/dnd/Source have destroy(), not destroyRecursive()
+					widget.destroy(preserveDom);
+				}
+				widget._destroyed = true;
+			});
+			if(setter){
+				// Most of the widgets in setter.parseResults have already been destroyed, but
+				// things like Menu that have been moved to <body> haven't yet
+				array.forEach(setter.parseResults, function(widget){
+					if(!widget._destroyed){
+						if(widget.destroyRecursive){
+							// All widgets will hit this branch
+							widget.destroyRecursive(preserveDom);
+						}else if(widget.destroy){
+							// Things like dojo/dnd/Source have destroy(), not destroyRecursive()
+							widget.destroy(preserveDom);
+						}
+						widget._destroyed = true;
+					}
+				});
+				delete setter.parseResults;
+			}
+
+			// And then clear away all the DOM nodes
+			if(!preserveDom){
+				domConstruct.empty(this.containerNode);
+			}
+
+			// Delete any state information we have about current contents
+			delete this._singleChild;
+		},
+
+		_setContent: function(/*String|DocumentFragment*/ cont, /*Boolean*/ isFakeContent){
+			// summary:
+			//		Insert the content into the container node
+			// returns:
+			//		Returns a Deferred promise that is resolved when the content is parsed.
+
+			cont = this.preprocessContent(cont);
+			// first get rid of child widgets
+			this.destroyDescendants();
+
+			// html.set will take care of the rest of the details
+			// we provide an override for the error handling to ensure the widget gets the errors
+			// configure the setter instance with only the relevant widget instance properties
+			// NOTE: unless we hook into attr, or provide property setters for each property,
+			// we need to re-configure the ContentSetter with each use
+			var setter = this._contentSetter;
+			if(!(setter && setter instanceof html._ContentSetter)){
+				setter = this._contentSetter = new html._ContentSetter({
+					node: this.containerNode,
+					_onError: lang.hitch(this, this._onError),
+					onContentError: lang.hitch(this, function(e){
+						// fires if a domfault occurs when we are appending this.errorMessage
+						// like for instance if domNode is a UL and we try append a DIV
+						var errMess = this.onContentError(e);
+						try{
+							this.containerNode.innerHTML = errMess;
+						}catch(e){
+							console.error('Fatal ' + this.id + ' could not change content due to ' + e.message, e);
+						}
+					})/*,
+					 _onError */
+				});
+			}
+
+			var setterParams = lang.mixin({
+				cleanContent: this.cleanContent,
+				extractContent: this.extractContent,
+				parseContent: !cont.domNode && this.parseOnLoad,
+				parserScope: this.parserScope,
+				startup: false,
+				dir: this.dir,
+				lang: this.lang,
+				textDir: this.textDir
+			}, this._contentSetterParams || {});
+
+			var p = setter.set((lang.isObject(cont) && cont.domNode) ? cont.domNode : cont, setterParams);
+
+			// dojox/layout/html/_base::_ContentSetter.set() returns a Promise that indicates when everything is completed.
+			// dojo/html::_ContentSetter.set() currently returns the DOMNode, but that will be changed for 2.0.
+			// So, if set() returns a promise then use it, otherwise fallback to waiting on setter.parseDeferred
+			var self = this;
+			return when(p && p.then ? p : setter.parseDeferred, function(){
+				// setter params must be pulled afresh from the ContentPane each time
+				delete self._contentSetterParams;
+
+				if(!isFakeContent){
+					if(self._started){
+						// Startup each top level child widget (and they will start their children, recursively)
+						self._startChildren();
+
+						// Call resize() on each of my child layout widgets,
+						// or resize() on my single child layout widget...
+						// either now (if I'm currently visible) or when I become visible
+						self._scheduleLayout();
+					}
+					self._onLoadHandler(cont);
+				}
+			});
+		},
+
+		preprocessContent: function(/*String|DocumentFragment*/ content){
+			// summary:
+			//		Hook, called after content has loaded, before being processed.
+			// description:
+			//		A subclass should preprocess the content and return the preprocessed content.
+			//		See https://bugs.dojotoolkit.org/ticket/9622
+			// returns:
+			//		Returns preprocessed content, either a String or DocumentFragment
+			return content;
+		},
+
+		_onError: function(type, err, consoleText){
+			this.onLoadDeferred.reject(err);
+
+			// shows user the string that is returned by on[type]Error
+			// override on[type]Error and return your own string to customize
+			var errText = this['on' + type + 'Error'].call(this, err);
+			if(consoleText){
+				console.error(consoleText, err);
+			}else if(errText){// a empty string won't change current content
+				this._setContent(errText, true);
+			}
+		},
+
+		// EVENT's, should be overide-able
+		onLoad: function(/*===== data =====*/){
+			// summary:
+			//		Event hook, is called after everything is loaded and widgetified
+			// tags:
+			//		callback
+		},
+
+		onUnload: function(){
+			// summary:
+			//		Event hook, is called before old content is cleared
+			// tags:
+			//		callback
+		},
+
+		onDownloadStart: function(){
+			// summary:
+			//		Called before download starts.
+			// description:
+			//		The string returned by this function will be the html
+			//		that tells the user we are loading something.
+			//		Override with your own function if you want to change text.
+			// tags:
+			//		extension
+			return this.loadingMessage;
+		},
+
+		onContentError: function(/*Error*/ /*===== error =====*/){
+			// summary:
+			//		Called on DOM faults, require faults etc. in content.
+			//
+			//		In order to display an error message in the pane, return
+			//		the error message from this method, as an HTML string.
+			//
+			//		By default (if this method is not overriden), it returns
+			//		nothing, so the error message is just printed to the console.
+			// tags:
+			//		extension
+		},
+
+		onDownloadError: function(/*Error*/ /*===== error =====*/){
+			// summary:
+			//		Called when download error occurs.
+			//
+			//		In order to display an error message in the pane, return
+			//		the error message from this method, as an HTML string.
+			//
+			//		Default behavior (if this method is not overriden) is to display
+			//		the error message inside the pane.
+			// tags:
+			//		extension
+			return this.errorMessage;
+		},
+
+		onDownloadEnd: function(){
+			// summary:
+			//		Called when download is finished.
+			// tags:
+			//		callback
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/layout/LayoutContainer.js b/src/main/resources/static/dijit/layout/LayoutContainer.js
new file mode 100644
index 0000000000000000000000000000000000000000..e4c92844d8a9a87a344ff32982c096dccbe08aa5
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/LayoutContainer.js
@@ -0,0 +1,157 @@
+define([
+	"dojo/_base/array",
+	"dojo/_base/declare", // declare
+	"dojo/dom-class",
+	"dojo/dom-style",
+	"dojo/_base/lang",
+	"../_WidgetBase",
+	"./_LayoutWidget",
+	"./utils" // layoutUtils.layoutChildren
+], function(array, declare, domClass, domStyle, lang, _WidgetBase, _LayoutWidget, layoutUtils){
+
+	// module:
+	//		dijit/layout/LayoutContainer
+
+	var LayoutContainer = declare("dijit.layout.LayoutContainer", _LayoutWidget, {
+		// summary:
+		//		A LayoutContainer is a box with a specified size, such as style="width: 500px; height: 500px;",
+		//		that contains a child widget marked region="center" and optionally children widgets marked
+		//		region equal to "top", "bottom", "leading", "trailing", "left" or "right".
+		//		Children along the edges will be laid out according to width or height dimensions. The remaining
+		//		space is designated for the center region.
+		//
+		//		The outer size must be specified on the LayoutContainer node.  Width must be specified for the sides
+		//		and height for the top and bottom, respectively.  No dimensions should be specified on the center;
+		//		it will fill the remaining space.  Regions named "leading" and "trailing" may be used just like
+		//		"left" and "right" except that they will be reversed in right-to-left environments.
+		//
+		//		For complex layouts, multiple children can be specified for a single region.   In this case, the
+		//		layoutPriority flag on the children determines which child is closer to the edge (low layoutPriority)
+		//		and which child is closer to the center (high layoutPriority).   layoutPriority can also be used
+		//		instead of the design attribute to control layout precedence of horizontal vs. vertical panes.
+		//
+		//		See `LayoutContainer.ChildWidgetProperties` for details on the properties that can be set on
+		//		children of a `LayoutContainer`.
+		//
+		//		If layoutPriority is not set, lays out each child in the natural order the children occur in.
+		//		Basically each child is laid out into the "remaining space", where "remaining space" is initially
+		//		the content area of this widget, but is reduced to a smaller rectangle each time a child is added.
+
+		// design: String
+		//		Which design is used for the layout:
+		//
+		//		- "headline" (default) where the top and bottom extend the full width of the container
+		//		- "sidebar" where the left and right sides extend from top to bottom.
+		//
+		//		However, a `layoutPriority` setting on child panes overrides the `design` attribute on the parent.
+		//		In other words, if the top and bottom sections have a lower `layoutPriority` than the left and right
+		//		panes, the top and bottom panes will extend the entire width of the box.
+		design: "headline",
+
+		baseClass: "dijitLayoutContainer",
+
+		startup: function(){
+			if(this._started){
+				return;
+			}
+			array.forEach(this.getChildren(), this._setupChild, this);
+			this.inherited(arguments);
+		},
+
+		_setupChild: function(/*dijit/_WidgetBase*/ child){
+			// Override _LayoutWidget._setupChild().
+
+			this.inherited(arguments);
+
+			var region = child.region;
+			if(region){
+				domClass.add(child.domNode, this.baseClass + "Pane");
+			}
+		},
+
+		_getOrderedChildren: function(){
+			// summary:
+			//		Return list of my children in the order that I want layoutChildren()
+			//		to process them (i.e. from the outside to the inside)
+
+			var wrappers = array.map(this.getChildren(), function(child, idx){
+				return {
+					pane: child,
+					weight: [
+						child.region == "center" ? Infinity : 0,
+						child.layoutPriority,
+						(this.design == "sidebar" ? 1 : -1) * (/top|bottom/.test(child.region) ? 1 : -1),
+						idx
+					]
+				};
+			}, this);
+			wrappers.sort(function(a, b){
+				var aw = a.weight, bw = b.weight;
+				for(var i = 0; i < aw.length; i++){
+					if(aw[i] != bw[i]){
+						return aw[i] - bw[i];
+					}
+				}
+				return 0;
+			});
+
+			return array.map(wrappers, function(w){ return w.pane; });
+		},
+
+		layout: function(){
+			layoutUtils.layoutChildren(this.domNode, this._contentBox, this._getOrderedChildren());
+		},
+
+		addChild: function(/*dijit/_WidgetBase*/ child, /*Integer?*/ insertIndex){
+			this.inherited(arguments);
+			if(this._started){
+				this.layout();
+			}
+		},
+
+		removeChild: function(/*dijit/_WidgetBase*/ child){
+			this.inherited(arguments);
+			if(this._started){
+				this.layout();
+			}
+
+			// Clean up whatever style changes we made to the child pane.
+			// Unclear how height and width should be handled.
+			domClass.remove(child.domNode, this.baseClass + "Pane");
+			domStyle.set(child.domNode, {
+				top: "auto",
+				bottom: "auto",
+				left: "auto",
+				right: "auto",
+				position: "static"
+			});
+			domStyle.set(child.domNode, /top|bottom/.test(child.region) ? "width" : "height", "auto");
+		}
+	});
+
+	LayoutContainer.ChildWidgetProperties = {
+		// summary:
+		//		These properties can be specified for the children of a LayoutContainer.
+
+		// region: [const] String
+		//		Values: "top", "bottom", "leading", "trailing", "left", "right", "center".
+		//		See the `dijit/layout/LayoutContainer` description for details.
+		region: '',
+
+		// layoutAlign: [const deprecated] String
+		//		Synonym for region, except using "client" instead of "center".  Deprecated; use region instead.
+		layoutAlign: '',
+
+		// layoutPriority: [const] Number
+		//		Children with a higher layoutPriority will be placed closer to the LayoutContainer center,
+		//		between children with a lower layoutPriority.
+		layoutPriority: 0
+	};
+
+	// Since any widget can be specified as a LayoutContainer child, mix it
+	// into the base widget class.  (This is a hack, but it's effective.)
+	// This is for the benefit of the parser.   Remove for 2.0.  Also, hide from doc viewer.
+	lang.extend(_WidgetBase, /*===== {} || =====*/ LayoutContainer.ChildWidgetProperties);
+
+	return LayoutContainer;
+});
diff --git a/src/main/resources/static/dijit/layout/LinkPane.js b/src/main/resources/static/dijit/layout/LinkPane.js
new file mode 100644
index 0000000000000000000000000000000000000000..cf624c010c5e79621b1c80a2247e430be28b424b
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/LinkPane.js
@@ -0,0 +1,44 @@
+define([
+	"./ContentPane",
+	"../_TemplatedMixin",
+	"dojo/_base/declare" // declare
+], function(ContentPane, _TemplatedMixin, declare){
+
+	// module:
+	//		dijit/layout/LinkPane
+
+
+	return declare("dijit.layout.LinkPane", [ContentPane, _TemplatedMixin], {
+		// summary:
+		//		A ContentPane with an href where (when declared in markup)
+		//		the title is specified as innerHTML rather than as a title attribute.
+		// description:
+		//		LinkPane is just a ContentPane that is declared in markup similarly
+		//		to an anchor.  The anchor's body (the words between `<a>` and `</a>`)
+		//		become the title of the widget (used for TabContainer, AccordionContainer, etc.)
+		// example:
+		//	| <a href="foo.html">my title</a>
+
+		// I'm using a template because the user may specify the input as
+		// <a href="foo.html">title</a>, in which case we need to get rid of the
+		// <a> because we don't want a link.
+		templateString: '<div class="dijitLinkPane" data-dojo-attach-point="containerNode"></div>',
+
+		postMixInProperties: function(){
+			// If user has specified node contents, they become the title
+			// (the link must be plain text)
+			if(this.srcNodeRef){
+				this.title += this.srcNodeRef.innerHTML;
+			}
+			this.inherited(arguments);
+		},
+
+		_fillContent: function(){
+			// Overrides _Templated._fillContent().
+
+			// _Templated._fillContent() relocates srcNodeRef innerHTML to templated container node,
+			// but in our case the srcNodeRef innerHTML is the title, so shouldn't be
+			// copied
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/layout/ScrollingTabController.js b/src/main/resources/static/dijit/layout/ScrollingTabController.js
new file mode 100644
index 0000000000000000000000000000000000000000..912a52738d480d0b71b0d7355d9d5987cdf77e02
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/ScrollingTabController.js
@@ -0,0 +1,511 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add domClass.contains
+	"dojo/dom-geometry", // domGeometry.contentBox
+	"dojo/dom-style", // domStyle.style
+	"dojo/_base/fx", // Animation
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"dojo/query", // query
+	"dojo/sniff", // has("ie"), has("trident"), has("edge"), has("webkit"), has("quirks")
+	"../registry", // registry.byId()
+	"dojo/text!./templates/ScrollingTabController.html",
+	"dojo/text!./templates/_ScrollingTabControllerButton.html",
+	"./TabController",
+	"./utils", // marginBox2contextBox, layoutChildren
+	"../_WidgetsInTemplateMixin",
+	"../Menu",
+	"../MenuItem",
+	"../form/Button",
+	"../_HasDropDown",
+	"dojo/NodeList-dom", // NodeList.style
+	"../a11yclick"	// template uses ondijitclick (not for keyboard support, but for responsive touch support)
+], function(array, declare, domClass, domGeometry, domStyle, fx, lang, on, query, has,
+	registry, tabControllerTemplate, buttonTemplate, TabController, layoutUtils, _WidgetsInTemplateMixin,
+	Menu, MenuItem, Button, _HasDropDown){
+
+	// module:
+	//		dijit/layout/ScrollingTabController
+
+	var ScrollingTabController = declare("dijit.layout.ScrollingTabController", [TabController, _WidgetsInTemplateMixin], {
+		// summary:
+		//		Set of tabs with left/right arrow keys and a menu to switch between tabs not
+		//		all fitting on a single row.
+		//		Works only for horizontal tabs (either above or below the content, not to the left
+		//		or right).
+		// tags:
+		//		private
+
+		baseClass: "dijitTabController dijitScrollingTabController",
+
+		templateString: tabControllerTemplate,
+
+		// useMenu: [const] Boolean
+		//		True if a menu should be used to select tabs when they are too
+		//		wide to fit the TabContainer, false otherwise.
+		useMenu: true,
+
+		// useSlider: [const] Boolean
+		//		True if a slider should be used to select tabs when they are too
+		//		wide to fit the TabContainer, false otherwise.
+		useSlider: true,
+
+		// tabStripClass: [const] String
+		//		The css class to apply to the tab strip, if it is visible.
+		tabStripClass: "",
+
+		// _minScroll: Number
+		//		The distance in pixels from the edge of the tab strip which,
+		//		if a scroll animation is less than, forces the scroll to
+		//		go all the way to the left/right.
+		_minScroll: 5,
+
+		// Override default behavior mapping class to DOMNode
+		_setClassAttr: { node: "containerNode", type: "class" },
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			var n = this.domNode;
+
+			this.scrollNode = this.tablistWrapper;
+			this._initButtons();
+
+			if(!this.tabStripClass){
+				this.tabStripClass = "dijitTabContainer" +
+					this.tabPosition.charAt(0).toUpperCase() +
+					this.tabPosition.substr(1).replace(/-.*/, "") +
+					"None";
+				domClass.add(n, "tabStrip-disabled")
+			}
+
+			domClass.add(this.tablistWrapper, this.tabStripClass);
+		},
+
+		onStartup: function(){
+			this.inherited(arguments);
+
+			// TabController is hidden until it finishes drawing, to give
+			// a less visually jumpy instantiation.   When it's finished, set visibility to ""
+			// to that the tabs are hidden/shown depending on the container's visibility setting.
+			domStyle.set(this.domNode, "visibility", "");
+			this._postStartup = true;
+
+			// changes to the tab button label or iconClass will have changed the width of the
+			// buttons, so do a resize
+			this.own(on(this.containerNode, "attrmodified-label, attrmodified-iconclass", lang.hitch(this, function(evt){
+				if(this._dim){
+					this.resize(this._dim);
+				}
+			})));
+		},
+
+		onAddChild: function(page, insertIndex){
+			this.inherited(arguments);
+
+			// Increment the width of the wrapper when a tab is added
+			// This makes sure that the buttons never wrap.
+			// The value 200 is chosen as it should be bigger than most
+			// Tab button widths.
+			domStyle.set(this.containerNode, "width",
+				(domStyle.get(this.containerNode, "width") + 200) + "px");
+		},
+
+		onRemoveChild: function(page, insertIndex){
+			// null out _selectedTab because we are about to delete that dom node
+			var button = this.pane2button(page.id);
+			if(this._selectedTab === button.domNode){
+				this._selectedTab = null;
+			}
+
+			this.inherited(arguments);
+		},
+
+		_initButtons: function(){
+			// summary:
+			//		Creates the buttons used to scroll to view tabs that
+			//		may not be visible if the TabContainer is too narrow.
+
+			// Make a list of the buttons to display when the tab labels become
+			// wider than the TabContainer, and hide the other buttons.
+			// Also gets the total width of the displayed buttons.
+			this._btnWidth = 0;
+			this._buttons = query("> .tabStripButton", this.domNode).filter(function(btn){
+				if((this.useMenu && btn == this._menuBtn.domNode) ||
+					(this.useSlider && (btn == this._rightBtn.domNode || btn == this._leftBtn.domNode))){
+					this._btnWidth += domGeometry.getMarginSize(btn).w;
+					return true;
+				}else{
+					domStyle.set(btn, "display", "none");
+					return false;
+				}
+			}, this);
+		},
+
+		_getTabsWidth: function(){
+			var children = this.getChildren();
+			if(children.length){
+				var leftTab = children[this.isLeftToRight() ? 0 : children.length - 1].domNode,
+					rightTab = children[this.isLeftToRight() ? children.length - 1 : 0].domNode;
+				return rightTab.offsetLeft + rightTab.offsetWidth - leftTab.offsetLeft;
+			}else{
+				return 0;
+			}
+		},
+
+		_enableBtn: function(width){
+			// summary:
+			//		Determines if the tabs are wider than the width of the TabContainer, and
+			//		thus that we need to display left/right/menu navigation buttons.
+			var tabsWidth = this._getTabsWidth();
+			width = width || domStyle.get(this.scrollNode, "width");
+			return tabsWidth > 0 && width < tabsWidth;
+		},
+
+		resize: function(dim){
+			// summary:
+			//		Hides or displays the buttons used to scroll the tab list and launch the menu
+			//		that selects tabs.
+
+			// Save the dimensions to be used when a child is renamed.
+			this._dim = dim;
+
+			// Set my height to be my natural height (tall enough for one row of tab labels),
+			// and my content-box width based on margin-box width specified in dim parameter.
+			// But first reset scrollNode.height in case it was set by layoutChildren() call
+			// in a previous run of this method.
+			this.scrollNode.style.height = "auto";
+			var cb = this._contentBox = layoutUtils.marginBox2contentBox(this.domNode, {h: 0, w: dim.w});
+			cb.h = this.scrollNode.offsetHeight;
+			domGeometry.setContentSize(this.domNode, cb);
+
+			// Show/hide the left/right/menu navigation buttons depending on whether or not they
+			// are needed.
+			var enable = this._enableBtn(this._contentBox.w);
+			this._buttons.style("display", enable ? "" : "none");
+
+			// Position and size the navigation buttons and the tablist
+			this._leftBtn.region = "left";
+			this._rightBtn.region = "right";
+			this._menuBtn.region = this.isLeftToRight() ? "right" : "left";
+			layoutUtils.layoutChildren(this.domNode, this._contentBox,
+				[this._menuBtn, this._leftBtn, this._rightBtn, {domNode: this.scrollNode, region: "center"}]);
+
+			// set proper scroll so that selected tab is visible
+			if(this._selectedTab){
+				if(this._anim && this._anim.status() == "playing"){
+					this._anim.stop();
+				}
+				this.scrollNode.scrollLeft = this._convertToScrollLeft(this._getScrollForSelectedTab());
+			}
+
+			// Enable/disabled left right buttons depending on whether or not user can scroll to left or right
+			this._setButtonClass(this._getScroll());
+
+			this._postResize = true;
+
+			// Return my size so layoutChildren() can use it.
+			// Also avoids IE9 layout glitch on browser resize when scroll buttons present
+			return {h: this._contentBox.h, w: dim.w};
+		},
+
+		_getScroll: function(){
+			// summary:
+			//		Returns the current scroll of the tabs where 0 means
+			//		"scrolled all the way to the left" and some positive number, based on #
+			//		of pixels of possible scroll (ex: 1000) means "scrolled all the way to the right"
+			return (this.isLeftToRight() || has("ie") < 8 || (has("trident") && has("quirks")) || has("webkit")) ?
+				this.scrollNode.scrollLeft :
+				domStyle.get(this.containerNode, "width") - domStyle.get(this.scrollNode, "width")
+					+ (has("trident") || has("edge") ? -1 : 1) * this.scrollNode.scrollLeft;
+		},
+
+		_convertToScrollLeft: function(val){
+			// summary:
+			//		Given a scroll value where 0 means "scrolled all the way to the left"
+			//		and some positive number, based on # of pixels of possible scroll (ex: 1000)
+			//		means "scrolled all the way to the right", return value to set this.scrollNode.scrollLeft
+			//		to achieve that scroll.
+			//
+			//		This method is to adjust for RTL funniness in various browsers and versions.
+			if(this.isLeftToRight() || has("ie") < 8 || (has("trident") && has("quirks")) || has("webkit")){
+				return val;
+			}else{
+				var maxScroll = domStyle.get(this.containerNode, "width") - domStyle.get(this.scrollNode, "width");
+				return (has("trident") || has("edge") ? -1 : 1) * (val - maxScroll);
+			}
+		},
+
+		onSelectChild: function(/*dijit/_WidgetBase*/ page, /*Boolean*/ tabContainerFocused){
+			// summary:
+			//		Smoothly scrolls to a tab when it is selected.
+
+			var tab = this.pane2button(page.id);
+			if(!tab){
+				return;
+			}
+
+			var node = tab.domNode;
+
+			// Save the selection
+			if(node != this._selectedTab){
+				this._selectedTab = node;
+
+				// Scroll to the selected tab, except on startup, when scrolling is handled in resize()
+				if(this._postResize){
+					var sl = this._getScroll();
+
+					if(sl > node.offsetLeft ||
+						sl + domStyle.get(this.scrollNode, "width") <
+							node.offsetLeft + domStyle.get(node, "width")){
+						var anim = this.createSmoothScroll();
+						if(tabContainerFocused){
+							anim.onEnd = function(){
+								// Focus is on hidden tab or previously selected tab label.  Move to current tab label.
+								tab.focus();
+							};
+						}
+						anim.play();
+					}else if(tabContainerFocused){
+						// Focus is on hidden tab or previously selected tab label.  Move to current tab label.
+						tab.focus();
+					}
+				}
+			}
+
+			this.inherited(arguments);
+		},
+
+		_getScrollBounds: function(){
+			// summary:
+			//		Returns the minimum and maximum scroll setting to show the leftmost and rightmost
+			//		tabs (respectively)
+			var children = this.getChildren(),
+				scrollNodeWidth = domStyle.get(this.scrollNode, "width"), // about 500px
+				containerWidth = domStyle.get(this.containerNode, "width"), // 50,000px
+				maxPossibleScroll = containerWidth - scrollNodeWidth, // scrolling until right edge of containerNode visible
+				tabsWidth = this._getTabsWidth();
+
+			if(children.length && tabsWidth > scrollNodeWidth){
+				// Scrolling should happen
+				return {
+					min: this.isLeftToRight() ? 0 : children[children.length - 1].domNode.offsetLeft,
+					max: this.isLeftToRight() ?
+						(children[children.length - 1].domNode.offsetLeft + children[children.length - 1].domNode.offsetWidth) - scrollNodeWidth :
+						maxPossibleScroll
+				};
+			}else{
+				// No scrolling needed, all tabs visible, we stay either scrolled to far left or far right (depending on dir)
+				var onlyScrollPosition = this.isLeftToRight() ? 0 : maxPossibleScroll;
+				return {
+					min: onlyScrollPosition,
+					max: onlyScrollPosition
+				};
+			}
+		},
+
+		_getScrollForSelectedTab: function(){
+			// summary:
+			//		Returns the scroll value setting so that the selected tab
+			//		will appear in the center
+			var w = this.scrollNode,
+				n = this._selectedTab,
+				scrollNodeWidth = domStyle.get(this.scrollNode, "width"),
+				scrollBounds = this._getScrollBounds();
+
+			// TODO: scroll minimal amount (to either right or left) so that
+			// selected tab is fully visible, and just return if it's already visible?
+			var pos = (n.offsetLeft + domStyle.get(n, "width") / 2) - scrollNodeWidth / 2;
+			pos = Math.min(Math.max(pos, scrollBounds.min), scrollBounds.max);
+
+			// TODO:
+			// If scrolling close to the left side or right side, scroll
+			// all the way to the left or right.  See this._minScroll.
+			// (But need to make sure that doesn't scroll the tab out of view...)
+			return pos;
+		},
+
+		createSmoothScroll: function(x){
+			// summary:
+			//		Creates a dojo._Animation object that smoothly scrolls the tab list
+			//		either to a fixed horizontal pixel value, or to the selected tab.
+			// description:
+			//		If an number argument is passed to the function, that horizontal
+			//		pixel position is scrolled to.  Otherwise the currently selected
+			//		tab is scrolled to.
+			// x: Integer?
+			//		An optional pixel value to scroll to, indicating distance from left.
+
+			// Calculate position to scroll to
+			if(arguments.length > 0){
+				// position specified by caller, just make sure it's within bounds
+				var scrollBounds = this._getScrollBounds();
+				x = Math.min(Math.max(x, scrollBounds.min), scrollBounds.max);
+			}else{
+				// scroll to center the current tab
+				x = this._getScrollForSelectedTab();
+			}
+
+			if(this._anim && this._anim.status() == "playing"){
+				this._anim.stop();
+			}
+
+			var self = this,
+				w = this.scrollNode,
+				anim = new fx.Animation({
+					beforeBegin: function(){
+						if(this.curve){
+							delete this.curve;
+						}
+						var oldS = w.scrollLeft,
+							newS = self._convertToScrollLeft(x);
+						anim.curve = new fx._Line(oldS, newS);
+					},
+					onAnimate: function(val){
+						w.scrollLeft = val;
+					}
+				});
+			this._anim = anim;
+
+			// Disable/enable left/right buttons according to new scroll position
+			this._setButtonClass(x);
+
+			return anim; // dojo/_base/fx/Animation
+		},
+
+		_getBtnNode: function(/*Event*/ e){
+			// summary:
+			//		Gets a button DOM node from a mouse click event.
+			// e:
+			//		The mouse click event.
+			var n = e.target;
+			while(n && !domClass.contains(n, "tabStripButton")){
+				n = n.parentNode;
+			}
+			return n;
+		},
+
+		doSlideRight: function(/*Event*/ e){
+			// summary:
+			//		Scrolls the menu to the right.
+			// e:
+			//		The mouse click event.
+			this.doSlide(1, this._getBtnNode(e));
+		},
+
+		doSlideLeft: function(/*Event*/ e){
+			// summary:
+			//		Scrolls the menu to the left.
+			// e:
+			//		The mouse click event.
+			this.doSlide(-1, this._getBtnNode(e));
+		},
+
+		doSlide: function(/*Number*/ direction, /*DomNode*/ node){
+			// summary:
+			//		Scrolls the tab list to the left or right by 75% of the widget width.
+			// direction:
+			//		If the direction is 1, the widget scrolls to the right, if it is -1,
+			//		it scrolls to the left.
+
+			if(node && domClass.contains(node, "dijitTabDisabled")){
+				return;
+			}
+
+			var sWidth = domStyle.get(this.scrollNode, "width");
+			var d = (sWidth * 0.75) * direction;
+
+			var to = this._getScroll() + d;
+
+			this._setButtonClass(to);
+
+			this.createSmoothScroll(to).play();
+		},
+
+		_setButtonClass: function(/*Number*/ scroll){
+			// summary:
+			//		Disables the left scroll button if the tabs are scrolled all the way to the left,
+			//		or the right scroll button in the opposite case.
+			// scroll: Integer
+			//		amount of horizontal scroll
+
+			var scrollBounds = this._getScrollBounds();
+			this._leftBtn.set("disabled", scroll <= scrollBounds.min);
+			this._rightBtn.set("disabled", scroll >= scrollBounds.max);
+		}
+	});
+
+
+	var ScrollingTabControllerButtonMixin = declare("dijit.layout._ScrollingTabControllerButtonMixin", null, {
+		baseClass: "dijitTab tabStripButton",
+
+		templateString: buttonTemplate,
+
+		// Override inherited tabIndex: 0 from dijit/form/Button, because user shouldn't be
+		// able to tab to the left/right/menu buttons
+		tabIndex: "",
+
+		// Similarly, override FormWidget.isFocusable() because clicking a button shouldn't focus it
+		// either (this override avoids focus() call in FormWidget.js)
+		isFocusable: function(){
+			return false;
+		}
+	});
+
+	// Class used in template
+	declare("dijit.layout._ScrollingTabControllerButton", [Button, ScrollingTabControllerButtonMixin]);
+
+	// Class used in template
+	declare("dijit.layout._ScrollingTabControllerMenuButton", [Button, _HasDropDown, ScrollingTabControllerButtonMixin], {
+		// id of the TabContainer itself
+		containerId: "",
+
+		// -1 so user can't tab into the button, but so that button can still be focused programatically.
+		// Because need to move focus to the button (or somewhere) before the menu is hidden or IE6 will crash.
+		tabIndex: "-1",
+
+		isLoaded: function(){
+			// recreate menu every time, in case the TabContainer's list of children (or their icons/labels) have changed
+			return false;
+		},
+
+		loadDropDown: function(callback){
+			this.dropDown = new Menu({
+				id: this.containerId + "_menu",
+				ownerDocument: this.ownerDocument,
+				dir: this.dir,
+				lang: this.lang,
+				textDir: this.textDir
+			});
+			var container = registry.byId(this.containerId);
+			array.forEach(container.getChildren(), function(page){
+				var menuItem = new MenuItem({
+					id: page.id + "_stcMi",
+					label: page.title,
+					iconClass: page.iconClass,
+					disabled: page.disabled,
+					ownerDocument: this.ownerDocument,
+					dir: page.dir,
+					lang: page.lang,
+					textDir: page.textDir || container.textDir,
+					onClick: function(){
+						container.selectChild(page);
+					}
+				});
+				this.dropDown.addChild(menuItem);
+			}, this);
+			callback();
+		},
+
+		closeDropDown: function(/*Boolean*/ focus){
+			this.inherited(arguments);
+			if(this.dropDown){
+				this._popupStateNode.removeAttribute("aria-owns");	// remove ref to node that we are about to delete
+				this.dropDown.destroyRecursive();
+				delete this.dropDown;
+			}
+		}
+	});
+
+	return ScrollingTabController;
+});
diff --git a/src/main/resources/static/dijit/layout/SplitContainer.js b/src/main/resources/static/dijit/layout/SplitContainer.js
new file mode 100644
index 0000000000000000000000000000000000000000..452fb8137f8ac669e3898e0eedf1421935c3ab25
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/SplitContainer.js
@@ -0,0 +1,591 @@
+define([
+	"dojo/_base/array", // array.forEach array.indexOf array.some
+	"dojo/cookie", // cookie
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.setSelectable
+	"dojo/dom-class", // domClass.add
+	"dojo/dom-construct", // domConstruct.create domConstruct.destroy
+	"dojo/dom-geometry", // domGeometry.marginBox domGeometry.position
+	"dojo/dom-style", // domStyle.style
+	"dojo/_base/event", // event.stop
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/lang", // lang.extend lang.hitch
+	"dojo/on",
+	"dojo/sniff", // has("mozilla")
+	"../registry",	// registry.getUniqueId()
+	"../_WidgetBase",
+	"./_LayoutWidget"
+], function(array, cookie, declare, dom, domClass, domConstruct, domGeometry, domStyle,
+			event, kernel, lang, on, has, registry, _WidgetBase, _LayoutWidget){
+
+// module:
+//		dijit/layout/SplitContainer
+
+//
+// FIXME: make it prettier
+// FIXME: active dragging upwards doesn't always shift other bars (direction calculation is wrong in this case)
+// FIXME: sizeWidth should be a CSS attribute (at 7 because css wants it to be 7 until we fix to css)
+//
+
+var SplitContainer = declare("dijit.layout.SplitContainer", _LayoutWidget, {
+	// summary:
+	//		Deprecated.  Use `dijit/layout/BorderContainer` instead.
+	// description:
+	//		A Container widget with sizing handles in-between each child.
+	//		Contains multiple children widgets, all of which are displayed side by side
+	//		(either horizontally or vertically); there's a bar between each of the children,
+	//		and you can adjust the relative size of each child by dragging the bars.
+	//
+	//		You must specify a size (width and height) for the SplitContainer.
+	//
+	//		See `SplitContainer.ChildWidgetProperties` for details on the properties that can be set on
+	//		children of a `SplitContainer`.
+	// tags:
+	//		deprecated
+
+	constructor: function(){
+		kernel.deprecated("dijit.layout.SplitContainer is deprecated", "use BorderContainer with splitter instead", 2.0);
+	},
+
+	// activeSizing: Boolean
+	//		If true, the children's size changes as you drag the bar;
+	//		otherwise, the sizes don't change until you drop the bar (by mouse-up)
+	activeSizing: false,
+
+	// sizerWidth: Integer
+	//		Size in pixels of the bar between each child
+	sizerWidth: 7,
+
+	// orientation: String
+	//		either 'horizontal' or vertical; indicates whether the children are
+	//		arranged side-by-side or up/down.
+	orientation: 'horizontal',
+
+	// persist: Boolean
+	//		Save splitter positions in a cookie
+	persist: true,
+
+	baseClass: "dijitSplitContainer",
+
+	postMixInProperties: function(){
+		this.inherited("postMixInProperties",arguments);
+		this.isHorizontal = (this.orientation == 'horizontal');
+	},
+
+	postCreate: function(){
+		this.inherited(arguments);
+		this.sizers = [];
+
+		// overflow has to be explicitly hidden for splitContainers using gekko (trac #1435)
+		// to keep other combined css classes from inadvertantly making the overflow visible
+		if(has("mozilla")){
+			this.domNode.style.overflow = '-moz-scrollbars-none'; // hidden doesn't work
+		}
+
+		// create the fake dragger
+		if(typeof this.sizerWidth == "object"){
+			try{ //FIXME: do this without a try/catch
+				this.sizerWidth = parseInt(this.sizerWidth.toString());
+			}catch(e){ this.sizerWidth = 7; }
+		}
+		var sizer = this.ownerDocument.createElement('div');
+		this.virtualSizer = sizer;
+		sizer.style.position = 'relative';
+
+		// #1681: work around the dreaded 'quirky percentages in IE' layout bug
+		// If the splitcontainer's dimensions are specified in percentages, it
+		// will be resized when the virtualsizer is displayed in _showSizingLine
+		// (typically expanding its bounds unnecessarily). This happens because
+		// we use position: relative for .dijitSplitContainer.
+		// The workaround: instead of changing the display style attribute,
+		// switch to changing the zIndex (bring to front/move to back)
+
+		sizer.style.zIndex = 10;
+		sizer.className = this.isHorizontal ? 'dijitSplitContainerVirtualSizerH' : 'dijitSplitContainerVirtualSizerV';
+		this.domNode.appendChild(sizer);
+		dom.setSelectable(sizer, false);
+	},
+
+	destroy: function(){
+		delete this.virtualSizer;
+		if(this._ownconnects){
+			var h;
+			while(h = this._ownconnects.pop()){ h.remove(); }
+		}
+		this.inherited(arguments);
+	},
+	startup: function(){
+		if(this._started){ return; }
+
+		array.forEach(this.getChildren(), function(child, i, children){
+			// attach the children and create the draggers
+			this._setupChild(child);
+
+			if(i < children.length-1){
+				this._addSizer();
+			}
+		}, this);
+
+		if(this.persist){
+			this._restoreState();
+		}
+
+		this.inherited(arguments);
+	},
+
+	_setupChild: function(/*dijit/_WidgetBase*/ child){
+		this.inherited(arguments);
+		child.domNode.style.position = "absolute";
+		domClass.add(child.domNode, "dijitSplitPane");
+	},
+
+	_onSizerMouseDown: function(e){
+		if(e.target.id){
+			for(var i=0;i<this.sizers.length;i++){
+				if(this.sizers[i].id == e.target.id){
+					break;
+				}
+			}
+			if(i<this.sizers.length){
+				this.beginSizing(e,i);
+			}
+		}
+	},
+	_addSizer: function(index){
+		index = index === undefined ? this.sizers.length : index;
+
+		// TODO: use a template for this!!!
+		var sizer = this.ownerDocument.createElement('div');
+		sizer.id=registry.getUniqueId('dijit_layout_SplitterContainer_Splitter');
+		this.sizers.splice(index,0,sizer);
+		this.domNode.appendChild(sizer);
+
+		sizer.className = this.isHorizontal ? 'dijitSplitContainerSizerH' : 'dijitSplitContainerSizerV';
+
+		// add the thumb div
+		var thumb = this.ownerDocument.createElement('div');
+		thumb.className = 'thumb';
+		sizer.appendChild(thumb);
+
+		// FIXME: are you serious? why aren't we using mover start/stop combo?
+		this.connect(sizer, "onmousedown", '_onSizerMouseDown');
+
+		dom.setSelectable(sizer, false);
+	},
+
+	removeChild: function(widget){
+		// summary:
+		//		Remove sizer, but only if widget is really our child and
+		//		we have at least one sizer to throw away
+		if(this.sizers.length){
+			var i = array.indexOf(this.getChildren(), widget);
+			if(i != -1){
+				if(i == this.sizers.length){
+					i--;
+				}
+				domConstruct.destroy(this.sizers[i]);
+				this.sizers.splice(i,1);
+			}
+		}
+
+		// Remove widget and repaint
+		this.inherited(arguments);
+		if(this._started){
+			this.layout();
+		}
+	},
+
+	addChild: function(/*dijit/_WidgetBase*/ child, /*Integer?*/ insertIndex){
+		// summary:
+		//		Add a child widget to the container
+		// child:
+		//		a widget to add
+		// insertIndex:
+		//		position in the "stack" to add the child widget
+
+		// SplitContainer puts all the child widgets first, and all the splitters at the end.
+		// (This is not ideal for accessibility but not going to fix because the widget is deprecated.)
+		// So, just need to maintain that order so that _Container.addChild() puts the widgets where expected.
+		if(typeof insertIndex == "undefined" || insertIndex == "last"){
+			insertIndex = this.getChildren().length;
+		}
+
+		this.inherited(arguments, [child, insertIndex]);
+
+		if(this._started){
+			// Do the stuff that startup() does for each widget
+			var children = this.getChildren();
+			if(children.length > 1){
+				this._addSizer(insertIndex);
+			}
+
+			// and then reposition (ie, shrink) every pane to make room for the new guy
+			this.layout();
+		}
+	},
+
+	layout: function(){
+		// summary:
+		//		Do layout of panels
+
+		// base class defines this._contentBox on initial creation and also
+		// on resize
+		this.paneWidth = this._contentBox.w;
+		this.paneHeight = this._contentBox.h;
+
+		var children = this.getChildren();
+		if(!children.length){ return; }
+
+		//
+		// calculate space
+		//
+
+		var space = this.isHorizontal ? this.paneWidth : this.paneHeight;
+		if(children.length > 1){
+			space -= this.sizerWidth * (children.length - 1);
+		}
+
+		//
+		// calculate total of SizeShare values
+		//
+		var outOf = 0;
+		array.forEach(children, function(child){
+			outOf += child.sizeShare;
+		});
+
+		//
+		// work out actual pixels per sizeshare unit
+		//
+		var pixPerUnit = space / outOf;
+
+		//
+		// set the SizeActual member of each pane
+		//
+		var totalSize = 0;
+		array.forEach(children.slice(0, children.length - 1), function(child){
+			var size = Math.round(pixPerUnit * child.sizeShare);
+			child.sizeActual = size;
+			totalSize += size;
+		});
+
+		children[children.length-1].sizeActual = space - totalSize;
+
+		//
+		// make sure the sizes are ok
+		//
+		this._checkSizes();
+
+		//
+		// now loop, positioning each pane and letting children resize themselves
+		//
+
+		var pos = 0;
+		var size = children[0].sizeActual;
+		this._movePanel(children[0], pos, size);
+		children[0].position = pos;
+		pos += size;
+
+		// if we don't have any sizers, our layout method hasn't been called yet
+		// so bail until we are called..TODO: REVISIT: need to change the startup
+		// algorithm to guaranteed the ordering of calls to layout method
+		if(!this.sizers){
+			return;
+		}
+
+		array.some(children.slice(1), function(child, i){
+			// error-checking
+			if(!this.sizers[i]){
+				return true;
+			}
+			// first we position the sizing handle before this pane
+			this._moveSlider(this.sizers[i], pos, this.sizerWidth);
+			this.sizers[i].position = pos;
+			pos += this.sizerWidth;
+
+			size = child.sizeActual;
+			this._movePanel(child, pos, size);
+			child.position = pos;
+			pos += size;
+		}, this);
+	},
+
+	_movePanel: function(panel, pos, size){
+		var box;
+		if(this.isHorizontal){
+			panel.domNode.style.left = pos + 'px';	// TODO: resize() takes l and t parameters too, don't need to set manually
+			panel.domNode.style.top = 0;
+			box = {w: size, h: this.paneHeight};
+			if(panel.resize){
+				panel.resize(box);
+			}else{
+				domGeometry.setMarginBox(panel.domNode, box);
+			}
+		}else{
+			panel.domNode.style.left = 0;	// TODO: resize() takes l and t parameters too, don't need to set manually
+			panel.domNode.style.top = pos + 'px';
+			box = {w: this.paneWidth, h: size};
+			if(panel.resize){
+				panel.resize(box);
+			}else{
+				domGeometry.setMarginBox(panel.domNode, box);
+			}
+		}
+	},
+
+	_moveSlider: function(slider, pos, size){
+		if(this.isHorizontal){
+			slider.style.left = pos + 'px';
+			slider.style.top = 0;
+			domGeometry.setMarginBox(slider, { w: size, h: this.paneHeight });
+		}else{
+			slider.style.left = 0;
+			slider.style.top = pos + 'px';
+			domGeometry.setMarginBox(slider, { w: this.paneWidth, h: size });
+		}
+	},
+
+	_growPane: function(growth, pane){
+		if(growth > 0){
+			if(pane.sizeActual > pane.sizeMin){
+				if((pane.sizeActual - pane.sizeMin) > growth){
+
+					// stick all the growth in this pane
+					pane.sizeActual = pane.sizeActual - growth;
+					growth = 0;
+				}else{
+					// put as much growth in here as we can
+					growth -= pane.sizeActual - pane.sizeMin;
+					pane.sizeActual = pane.sizeMin;
+				}
+			}
+		}
+		return growth;
+	},
+
+	_checkSizes: function(){
+
+		var totalMinSize = 0;
+		var totalSize = 0;
+		var children = this.getChildren();
+
+		array.forEach(children, function(child){
+			totalSize += child.sizeActual;
+			totalMinSize += child.sizeMin;
+		});
+
+		// only make adjustments if we have enough space for all the minimums
+
+		if(totalMinSize <= totalSize){
+
+			var growth = 0;
+
+			array.forEach(children, function(child){
+				if(child.sizeActual < child.sizeMin){
+					growth += child.sizeMin - child.sizeActual;
+					child.sizeActual = child.sizeMin;
+				}
+			});
+
+			if(growth > 0){
+				var list = this.isDraggingLeft ? children.reverse() : children;
+				array.forEach(list, function(child){
+					growth = this._growPane(growth, child);
+				}, this);
+			}
+		}else{
+			array.forEach(children, function(child){
+				child.sizeActual = Math.round(totalSize * (child.sizeMin / totalMinSize));
+			});
+		}
+	},
+
+	beginSizing: function(e, i){
+		// summary:
+		//		Begin dragging the splitter between child[i] and child[i+1]
+
+		var children = this.getChildren();
+
+		this.paneBefore = children[i];
+		this.paneAfter = children[i+1];
+
+		this.paneBefore.sizeBeforeDrag = this.paneBefore.sizeActual;
+		this.paneAfter.sizeBeforeDrag = this.paneAfter.sizeActual;
+		this.paneAfter.positionBeforeDrag = this.paneAfter.position;
+
+		this.isSizing = true;
+		this.sizingSplitter = this.sizers[i];
+		this.sizingSplitter.positionBeforeDrag = domStyle.get(this.sizingSplitter,(this.isHorizontal ? "left" : "top"));
+
+		if(!this.cover){
+			this.cover = domConstruct.create('div', {
+				style: {
+					position:'absolute',
+					zIndex:5,
+					top: 0,
+					left: 0,
+					width: "100%",
+					height: "100%"
+				}
+			}, this.domNode);
+		}else{
+			this.cover.style.zIndex = 5;
+		}
+		this.sizingSplitter.style.zIndex = 6;
+
+		// startPoint is the e.pageX or e.pageY at start of drag
+		this.startPoint = this.lastPoint = (this.isHorizontal ? e.pageX : e.pageY);
+
+		// Calculate maximum to the left or right that splitter is allowed to be dragged
+		// minDelta is negative to indicate left/upward drag where end.pageX < start.pageX.
+		this.maxDelta = this.paneAfter.sizeActual - this.paneAfter.sizeMin;
+		this.minDelta = -1 * (this.paneBefore.sizeActual - this.paneBefore.sizeMin);
+
+		if(!this.activeSizing){
+			this._showSizingLine();
+		}
+
+		// attach mouse events
+		this._ownconnects = [
+			on(this.ownerDocument.documentElement, "mousemove", lang.hitch(this, "changeSizing")),
+			on(this.ownerDocument.documentElement, "mouseup", lang.hitch(this, "endSizing"))
+		];
+
+		event.stop(e);
+	},
+
+	changeSizing: function(e){
+		// summary:
+		//		Called on mousemove while dragging the splitter
+
+		if(!this.isSizing){ return; }
+
+		// lastPoint is the most recent e.pageX or e.pageY during the drag
+		this.lastPoint = this.isHorizontal ? e.pageX : e.pageY;
+		var delta = Math.max(Math.min(this.lastPoint - this.startPoint, this.maxDelta), this.minDelta);
+
+		if(this.activeSizing){
+			this._updateSize(delta);
+		}else{
+			this._moveSizingLine(delta);
+		}
+		event.stop(e);
+	},
+
+	endSizing: function(){
+		if(!this.isSizing){ return; }
+		if(this.cover){
+			this.cover.style.zIndex = -1;
+		}
+		if(!this.activeSizing){
+			this._hideSizingLine();
+		}
+
+		var delta = Math.max(Math.min(this.lastPoint - this.startPoint, this.maxDelta), this.minDelta);
+		this._updateSize(delta);
+
+		this.isSizing = false;
+
+		if(this.persist){
+			this._saveState(this);
+		}
+
+		var h;
+		while(h = this._ownconnects.pop()){ h.remove(); }
+	},
+
+	_updateSize: function(/*Number*/ delta){
+		// summary:
+		//		Resets sizes of panes before and after splitter being dragged.
+		//		Called during a drag, for active sizing, or at the end of a drag otherwise.
+		// delta: Number
+		//		Change in slider position compared to start of drag.   But note that
+		//		this function may be called multiple times during drag.
+
+		this.paneBefore.sizeActual = this.paneBefore.sizeBeforeDrag + delta;
+		this.paneAfter.position	= this.paneAfter.positionBeforeDrag + delta;
+		this.paneAfter.sizeActual = this.paneAfter.sizeBeforeDrag - delta;
+
+		array.forEach(this.getChildren(), function(child){
+			child.sizeShare = child.sizeActual;
+		});
+
+		if(this._started){
+			this.layout();
+		}
+	},
+
+	_showSizingLine: function(){
+		// summary:
+		//		Show virtual splitter, for non-active resizing
+
+		this._moveSizingLine(0);
+
+		domGeometry.setMarginBox(this.virtualSizer,
+			this.isHorizontal ? { w: this.sizerWidth, h: this.paneHeight } : { w: this.paneWidth, h: this.sizerWidth });
+
+		this.virtualSizer.style.display = 'block';
+	},
+
+	_hideSizingLine: function(){
+		this.virtualSizer.style.display = 'none';
+	},
+
+	_moveSizingLine: function(/*Number*/ delta){
+		// summary:
+		//		Called for non-active resizing, to move the virtual splitter without adjusting the size of the panes
+		var pos = delta + this.sizingSplitter.positionBeforeDrag;
+		domStyle.set(this.virtualSizer,(this.isHorizontal ? "left" : "top"),pos+"px");
+	},
+
+	_getCookieName: function(i){
+		return this.id + "_" + i;
+	},
+
+	_restoreState: function(){
+		array.forEach(this.getChildren(), function(child, i){
+			var cookieName = this._getCookieName(i);
+			var cookieValue = cookie(cookieName);
+			if(cookieValue){
+				var pos = parseInt(cookieValue);
+				if(typeof pos == "number"){
+					child.sizeShare = pos;
+				}
+			}
+		}, this);
+	},
+
+	_saveState: function(){
+		if(!this.persist){
+			return;
+		}
+		array.forEach(this.getChildren(), function(child, i){
+			cookie(this._getCookieName(i), child.sizeShare, {expires:365});
+		}, this);
+	}
+});
+
+SplitContainer.ChildWidgetProperties = {
+	// summary:
+	//		These properties can be specified for the children of a SplitContainer.
+
+	// sizeMin: [deprecated] Integer
+	//		Minimum size (width or height) of a child of a SplitContainer.
+	//		The value is relative to other children's sizeShare properties.
+	sizeMin: 10,
+
+	// sizeShare: [deprecated] Integer
+	//		Size (width or height) of a child of a SplitContainer.
+	//		The value is relative to other children's sizeShare properties.
+	//		For example, if there are two children and each has sizeShare=10, then
+	//		each takes up 50% of the available space.
+	sizeShare: 10
+};
+
+// Since any widget can be specified as a SplitContainer child, mix them
+// into the base widget class.  (This is a hack, but it's effective.)
+// This is for the benefit of the parser.   Remove for 2.0.  Also, hide from doc viewer.
+lang.extend(_WidgetBase, /*===== {} || =====*/ SplitContainer.ChildWidgetProperties);
+
+return SplitContainer;
+
+});
diff --git a/src/main/resources/static/dijit/layout/StackContainer.js b/src/main/resources/static/dijit/layout/StackContainer.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b005fa0cee9cfae597e9f005b1ff84f46f96845
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/StackContainer.js
@@ -0,0 +1,411 @@
+define([
+	"dojo/_base/array", // array.forEach array.indexOf array.some
+	"dojo/cookie", // cookie
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add domClass.replace
+	"dojo/dom-construct",
+	"dojo/has", // has("dijit-legacy-requires")
+	"dojo/_base/lang", // lang.extend
+	"dojo/on",
+	"dojo/ready",
+	"dojo/topic", // publish
+	"dojo/when",
+	"../registry", // registry.byId
+	"../_WidgetBase",
+	"./_LayoutWidget"
+], function(array, cookie, declare, domClass, domConstruct, has, lang, on, ready, topic, when, registry, _WidgetBase, _LayoutWidget){
+
+	// module:
+	//		dijit/layout/StackContainer
+
+	// Back compat w/1.6, remove for 2.0
+	if(has("dijit-legacy-requires")){
+		ready(0, function(){
+			var requires = ["dijit/layout/StackController"];
+			require(requires);	// use indirection so modules not rolled into a build
+		});
+	}
+
+	var StackContainer = declare("dijit.layout.StackContainer", _LayoutWidget, {
+		// summary:
+		//		A container that has multiple children, but shows only
+		//		one child at a time
+		//
+		// description:
+		//		A container for widgets (ContentPanes, for example) That displays
+		//		only one Widget at a time.
+		//
+		//		Publishes topics [widgetId]-addChild, [widgetId]-removeChild, and [widgetId]-selectChild
+		//
+		//		Can be base class for container, Wizard, Show, etc.
+		//
+		//		See `StackContainer.ChildWidgetProperties` for details on the properties that can be set on
+		//		children of a `StackContainer`.
+
+		// doLayout: Boolean
+		//		If true, change the size of my currently displayed child to match my size
+		doLayout: true,
+
+		// persist: Boolean
+		//		Remembers the selected child across sessions
+		persist: false,
+
+		baseClass: "dijitStackContainer",
+
+		/*=====
+		// selectedChildWidget: [readonly] dijit._Widget
+		//		References the currently selected child widget, if any.
+		//		Adjust selected child with selectChild() method.
+		selectedChildWidget: null,
+		=====*/
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			domClass.add(this.domNode, "dijitLayoutContainer");
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+			this.own(
+				on(this.domNode, "keydown", lang.hitch(this, "_onKeyDown"))
+			);
+		},
+
+		startup: function(){
+			if(this._started){
+				return;
+			}
+
+			var children = this.getChildren();
+
+			// Setup each page panel to be initially hidden
+			array.forEach(children, this._setupChild, this);
+
+			// Figure out which child to initially display, defaulting to first one
+			if(this.persist){
+				this.selectedChildWidget = registry.byId(cookie(this.id + "_selectedChild"));
+			}else{
+				array.some(children, function(child){
+					if(child.selected){
+						this.selectedChildWidget = child;
+					}
+					return child.selected;
+				}, this);
+			}
+			var selected = this.selectedChildWidget;
+			if(!selected && children[0]){
+				selected = this.selectedChildWidget = children[0];
+				selected.selected = true;
+			}
+
+			// Publish information about myself so any StackControllers can initialize.
+			// This needs to happen before this.inherited(arguments) so that for
+			// TabContainer, this._contentBox doesn't include the space for the tab labels.
+			topic.publish(this.id + "-startup", {children: children, selected: selected, textDir: this.textDir});
+
+			// Startup each child widget, and do initial layout like setting this._contentBox,
+			// then calls this.resize() which does the initial sizing on the selected child.
+			this.inherited(arguments);
+		},
+
+		resize: function(){
+			// Overrides _LayoutWidget.resize()
+			// Resize is called when we are first made visible (it's called from startup()
+			// if we are initially visible). If this is the first time we've been made
+			// visible then show our first child.
+			if(!this._hasBeenShown){
+				this._hasBeenShown = true;
+				var selected = this.selectedChildWidget;
+				if(selected){
+					this._showChild(selected);
+				}
+			}
+			this.inherited(arguments);
+		},
+
+		_setupChild: function(/*dijit/_WidgetBase*/ child){
+			// Overrides _LayoutWidget._setupChild()
+
+			// For aria support, wrap child widget in a <div role="tabpanel">
+			var childNode = child.domNode,
+				wrapper = domConstruct.place(
+					"<div role='tabpanel' class='" + this.baseClass + "ChildWrapper dijitHidden'>",
+					child.domNode,
+					"replace"),
+				label = child["aria-label"] || child.title || child.label;
+			if(label){
+				// setAttribute() escapes special chars, and if() statement avoids setting aria-label="undefined"
+				wrapper.setAttribute("aria-label", label);
+			}
+			domConstruct.place(childNode, wrapper);
+			child._wrapper = wrapper;	// to set the aria-labelledby in StackController
+
+			this.inherited(arguments);
+
+			// child may have style="display: none" (at least our test cases do), so remove that
+			if(childNode.style.display == "none"){
+				childNode.style.display = "block";
+			}
+
+			// remove the title attribute so it doesn't show up when i hover over a node
+			child.domNode.removeAttribute("title");
+		},
+
+		addChild: function(/*dijit/_WidgetBase*/ child, /*Integer?*/ insertIndex){
+			// Overrides _Container.addChild() to do layout and publish events
+
+			this.inherited(arguments);
+
+			if(this._started){
+				topic.publish(this.id + "-addChild", child, insertIndex);	// publish
+
+				// in case the tab titles have overflowed from one line to two lines
+				// (or, if this if first child, from zero lines to one line)
+				// TODO: w/ScrollingTabController this is no longer necessary, although
+				// ScrollTabController.resize() does need to get called to show/hide
+				// the navigation buttons as appropriate, but that's handled in ScrollingTabController.onAddChild().
+				// If this is updated to not layout [except for initial child added / last child removed], update
+				// "childless startup" test in StackContainer.html to check for no resize event after second addChild()
+				this.layout();
+
+				// if this is the first child, then select it
+				if(!this.selectedChildWidget){
+					this.selectChild(child);
+				}
+			}
+		},
+
+		removeChild: function(/*dijit/_WidgetBase*/ page){
+			// Overrides _Container.removeChild() to do layout and publish events
+
+			var idx = array.indexOf(this.getChildren(), page);
+
+			this.inherited(arguments);
+
+			// Remove the child widget wrapper we use to set aria roles.  This won't affect the page itself since it's
+			// already been detached from page._wrapper via the this.inherited(arguments) call above.
+			domConstruct.destroy(page._wrapper);
+			delete page._wrapper;
+
+			if(this._started){
+				// This will notify any tablists to remove a button; do this first because it may affect sizing.
+				topic.publish(this.id + "-removeChild", page);
+			}
+
+			// If all our children are being destroyed than don't run the code below (to select another page),
+			// because we are deleting every page one by one
+			if(this._descendantsBeingDestroyed){
+				return;
+			}
+
+			// Select new page to display, also updating TabController to show the respective tab.
+			// Do this before layout call because it can affect the height of the TabController.
+			if(this.selectedChildWidget === page){
+				this.selectedChildWidget = undefined;
+				if(this._started){
+					var children = this.getChildren();
+					if(children.length){
+						this.selectChild(children[Math.max(idx - 1, 0)]);
+					}
+				}
+			}
+
+			if(this._started){
+				// In case the tab titles now take up one line instead of two lines
+				// (note though that ScrollingTabController never overflows to multiple lines),
+				// or the height has changed slightly because of addition/removal of tab which close icon
+				this.layout();
+			}
+		},
+
+		selectChild: function(/*dijit/_WidgetBase|String*/ page, /*Boolean*/ animate){
+			// summary:
+			//		Show the given widget (which must be one of my children)
+			// page:
+			//		Reference to child widget or id of child widget
+
+			var d;
+
+			page = registry.byId(page);
+
+			if(this.selectedChildWidget != page){
+				// Deselect old page and select new one
+				d = this._transition(page, this.selectedChildWidget, animate);
+				this._set("selectedChildWidget", page);
+				topic.publish(this.id + "-selectChild", page, this._focused);	// publish
+
+				if(this.persist){
+					cookie(this.id + "_selectedChild", this.selectedChildWidget.id);
+				}
+			}
+
+			// d may be null, or a scalar like true.  Return a promise in all cases
+			return when(d || true);		// Promise
+		},
+
+		_transition: function(newWidget, oldWidget /*===== ,  animate =====*/){
+			// summary:
+			//		Hide the old widget and display the new widget.
+			//		Subclasses should override this.
+			// newWidget: dijit/_WidgetBase
+			//		The newly selected widget.
+			// oldWidget: dijit/_WidgetBase
+			//		The previously selected widget.
+			// animate: Boolean
+			//		Used by AccordionContainer to turn on/off slide effect.
+			// tags:
+			//		protected extension
+			if(oldWidget){
+				this._hideChild(oldWidget);
+			}
+			var d = this._showChild(newWidget);
+
+			// Size the new widget, in case this is the first time it's being shown,
+			// or I have been resized since the last time it was shown.
+			// Note that page must be visible for resizing to work.
+			if(newWidget.resize){
+				if(this.doLayout){
+					newWidget.resize(this._containerContentBox || this._contentBox);
+				}else{
+					// the child should pick it's own size but we still need to call resize()
+					// (with no arguments) to let the widget lay itself out
+					newWidget.resize();
+				}
+			}
+
+			return d;	// If child has an href, promise that fires when the child's href finishes loading
+		},
+
+		_adjacent: function(/*Boolean*/ forward){
+			// summary:
+			//		Gets the next/previous child widget in this container from the current selection.
+
+			// TODO: remove for 2.0 if this isn't being used.   Otherwise, fix to skip disabled tabs.
+
+			var children = this.getChildren();
+			var index = array.indexOf(children, this.selectedChildWidget);
+			index += forward ? 1 : children.length - 1;
+			return children[ index % children.length ]; // dijit/_WidgetBase
+		},
+
+		forward: function(){
+			// summary:
+			//		Advance to next page.
+			return this.selectChild(this._adjacent(true), true);
+		},
+
+		back: function(){
+			// summary:
+			//		Go back to previous page.
+			return this.selectChild(this._adjacent(false), true);
+		},
+
+		_onKeyDown: function(e){
+			topic.publish(this.id + "-containerKeyDown", { e: e, page: this});	// publish
+		},
+
+		layout: function(){
+			// Implement _LayoutWidget.layout() virtual method.
+			var child = this.selectedChildWidget;
+			if(child && child.resize){
+				if(this.doLayout){
+					child.resize(this._containerContentBox || this._contentBox);
+				}else{
+					child.resize();
+				}
+			}
+		},
+
+		_showChild: function(/*dijit/_WidgetBase*/ page){
+			// summary:
+			//		Show the specified child by changing it's CSS, and call _onShow()/onShow() so
+			//		it can do any updates it needs regarding loading href's etc.
+			// returns:
+			//		Promise that fires when page has finished showing, or true if there's no href
+			var children = this.getChildren();
+			page.isFirstChild = (page == children[0]);
+			page.isLastChild = (page == children[children.length - 1]);
+			page._set("selected", true);
+
+			if(page._wrapper){	// false if not started yet
+				domClass.replace(page._wrapper, "dijitVisible", "dijitHidden");
+			}
+
+			return (page._onShow && page._onShow()) || true;
+		},
+
+		_hideChild: function(/*dijit/_WidgetBase*/ page){
+			// summary:
+			//		Hide the specified child by changing it's CSS, and call _onHide() so
+			//		it's notified.
+			page._set("selected", false);
+
+			if(page._wrapper){	// false if not started yet
+				domClass.replace(page._wrapper, "dijitHidden", "dijitVisible");
+			}
+
+			page.onHide && page.onHide();
+		},
+
+		closeChild: function(/*dijit/_WidgetBase*/ page){
+			// summary:
+			//		Callback when user clicks the [X] to remove a page.
+			//		If onClose() returns true then remove and destroy the child.
+			// tags:
+			//		private
+			var remove = !page.onClose || page.onClose(this, page);
+			if(remove){
+				this.removeChild(page);
+				// makes sure we can clean up executeScripts in ContentPane onUnLoad
+				page.destroyRecursive();
+			}
+		},
+
+		destroyDescendants: function(/*Boolean*/ preserveDom){
+			this._descendantsBeingDestroyed = true;
+			this.selectedChildWidget = undefined;
+			array.forEach(this.getChildren(), function(child){
+				if(!preserveDom){
+					this.removeChild(child);
+				}
+				child.destroyRecursive(preserveDom);
+			}, this);
+			this._descendantsBeingDestroyed = false;
+		}
+	});
+
+	StackContainer.ChildWidgetProperties = {
+		// summary:
+		//		These properties can be specified for the children of a StackContainer.
+
+		// selected: Boolean
+		//		Specifies that this widget should be the initially displayed pane.
+		//		Note: to change the selected child use `dijit/layout/StackContainer.selectChild`
+		selected: false,
+
+		// disabled: Boolean
+		//		Specifies that the button to select this pane should be disabled.
+		//		Doesn't affect programmatic selection of the pane, nor does it deselect the pane if it is currently selected.
+		disabled: false,
+
+		// closable: Boolean
+		//		True if user can close (destroy) this child, such as (for example) clicking the X on the tab.
+		closable: false,
+
+		// iconClass: String
+		//		CSS Class specifying icon to use in label associated with this pane.
+		iconClass: "dijitNoIcon",
+
+		// showTitle: Boolean
+		//		When true, display title of this widget as tab label etc., rather than just using
+		//		icon specified in iconClass
+		showTitle: true
+	};
+
+	// Since any widget can be specified as a StackContainer child, mix them
+	// into the base widget class.  (This is a hack, but it's effective.)
+	// This is for the benefit of the parser.   Remove for 2.0.  Also, hide from doc viewer.
+	lang.extend(_WidgetBase, /*===== {} || =====*/ StackContainer.ChildWidgetProperties);
+
+	return StackContainer;
+});
diff --git a/src/main/resources/static/dijit/layout/StackController.js b/src/main/resources/static/dijit/layout/StackController.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb7f146ab699a38ca1211c5267d3e7b85eb69104
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/StackController.js
@@ -0,0 +1,410 @@
+define([
+	"dojo/_base/array", // array.forEach array.indexOf array.map
+	"dojo/_base/declare", // declare
+	"dojo/dom-class",
+	"dojo/dom-construct",
+	"dojo/keys", // keys
+	"dojo/_base/lang", // lang.getObject
+	"dojo/on",
+	"dojo/topic",
+	"../focus", // focus.focus()
+	"../registry", // registry.byId
+	"../_Widget",
+	"../_TemplatedMixin",
+	"../_Container",
+	"../form/ToggleButton",
+	"dojo/touch"	// for normalized click handling, see dojoClick property setting in postCreate()
+], function(array, declare, domClass, domConstruct, keys, lang, on, topic,
+			focus, registry, _Widget, _TemplatedMixin,_Container, ToggleButton){
+
+	// module:
+	//		dijit/layout/StackController
+
+	var StackButton = declare("dijit.layout._StackButton", ToggleButton, {
+		// summary:
+		//		Internal widget used by StackContainer.
+		// description:
+		//		The button-like or tab-like object you click to select or delete a page
+		// tags:
+		//		private
+
+		// Override _FormWidget.tabIndex.
+		// StackContainer buttons are not in the tab order by default.
+		// Probably we should be calling this.startupKeyNavChildren() instead.
+		tabIndex: "-1",
+
+		// closeButton: Boolean
+		//		When true, display close button for this tab
+		closeButton: false,
+
+		_aria_attr: "aria-selected",
+
+		buildRendering: function(/*Event*/ evt){
+			this.inherited(arguments);
+			(this.focusNode || this.domNode).setAttribute("role", "tab");
+		}
+	});
+
+
+	var StackController = declare("dijit.layout.StackController", [_Widget, _TemplatedMixin, _Container], {
+		// summary:
+		//		Set of buttons to select a page in a `dijit/layout/StackContainer`
+		// description:
+		//		Monitors the specified StackContainer, and whenever a page is
+		//		added, deleted, or selected, updates itself accordingly.
+
+		baseClass: "dijitStackController",
+
+		templateString: "<span role='tablist' data-dojo-attach-event='onkeydown'></span>",
+
+		// containerId: [const] String
+		//		The id of the page container that I point to
+		containerId: "",
+
+		// buttonWidget: [const] Constructor
+		//		The button widget to create to correspond to each page
+		buttonWidget: StackButton,
+
+		// buttonWidgetCloseClass: String
+		//		CSS class of [x] close icon, used by event delegation code to tell when close button was clicked
+		buttonWidgetCloseClass: "dijitStackCloseButton",
+
+		pane2button: function(/*String*/ id){
+			// summary:
+			//		Returns the button corresponding to the pane w/the given id.
+			// tags:
+			//		protected
+			return registry.byId(this.id + "_" + id);
+		},
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// Listen to notifications from StackContainer.  This is tricky because the StackContainer may not have
+			// been created yet, so abstracting it through topics.
+			// Note: for TabContainer we can do this through bubbled events instead of topics; maybe that's
+			// all we support for 2.0?
+			this.own(
+				topic.subscribe(this.containerId + "-startup", lang.hitch(this, "onStartup")),
+				topic.subscribe(this.containerId + "-addChild", lang.hitch(this, "onAddChild")),
+				topic.subscribe(this.containerId + "-removeChild", lang.hitch(this, "onRemoveChild")),
+				topic.subscribe(this.containerId + "-selectChild", lang.hitch(this, "onSelectChild")),
+				topic.subscribe(this.containerId + "-containerKeyDown", lang.hitch(this, "onContainerKeyDown"))
+			);
+
+			// Listen for click events to select or close tabs.
+			// No need to worry about ENTER/SPACE key handling: tabs are selected via left/right arrow keys,
+			// and closed via shift-F10 (to show the close menu).
+			// Also, add flag to use normalized click handling from dojo/touch
+			this.containerNode.dojoClick = true;
+			this.own(on(this.containerNode, 'click', lang.hitch(this, function(evt){
+				var button = registry.getEnclosingWidget(evt.target);
+				if(button != this.containerNode && !button.disabled && button.page){
+					for(var target = evt.target; target !== this.containerNode; target = target.parentNode){
+						if(domClass.contains(target, this.buttonWidgetCloseClass)){
+							this.onCloseButtonClick(button.page);
+							break;
+						}else if(target == button.domNode){
+							this.onButtonClick(button.page);
+							break;
+						}
+					}
+				}
+			})));
+		},
+
+		onStartup: function(/*Object*/ info){
+			// summary:
+			//		Called after StackContainer has finished initializing
+			// tags:
+			//		private
+			this.textDir = info.textDir;
+			array.forEach(info.children, this.onAddChild, this);
+			if(info.selected){
+				// Show button corresponding to selected pane (unless selected
+				// is null because there are no panes)
+				this.onSelectChild(info.selected);
+			}
+
+			// Reflect events like page title changes to tab buttons
+			var containerNode = registry.byId(this.containerId).containerNode,
+				pane2button = lang.hitch(this, "pane2button"),
+				paneToButtonAttr = {
+					"title": "label",
+					"showtitle": "showLabel",
+					"iconclass": "iconClass",
+					"closable": "closeButton",
+					"tooltip": "title",
+					"disabled": "disabled",
+					"textdir": "textdir"
+				},
+				connectFunc = function(attr, buttonAttr){
+					return on(containerNode, "attrmodified-" + attr, function(evt){
+						var button = pane2button(evt.detail && evt.detail.widget && evt.detail.widget.id);
+						if(button){
+							button.set(buttonAttr, evt.detail.newValue);
+						}
+					});
+				};
+			for(var attr in paneToButtonAttr){
+				this.own(connectFunc(attr, paneToButtonAttr[attr]));
+			}
+		},
+
+		destroy: function(preserveDom){
+			// Since the buttons are internal to the StackController widget, destroy() should remove them.
+			// When #5796 is fixed for 2.0 can get rid of this function completely.
+			this.destroyDescendants(preserveDom);
+			this.inherited(arguments);
+		},
+
+		onAddChild: function(/*dijit/_WidgetBase*/ page, /*Integer?*/ insertIndex){
+			// summary:
+			//		Called whenever a page is added to the container.
+			//		Create button corresponding to the page.
+			// tags:
+			//		private
+
+			// create an instance of the button widget
+			// (remove typeof buttonWidget == string support in 2.0)
+			var Cls = lang.isString(this.buttonWidget) ? lang.getObject(this.buttonWidget) : this.buttonWidget;
+			var button = new Cls({
+				id: this.id + "_" + page.id,
+				name: this.id + "_" + page.id, // note: must match id used in pane2button()
+				label: page.title,
+				disabled: page.disabled,
+				ownerDocument: this.ownerDocument,
+				dir: page.dir,
+				lang: page.lang,
+				textDir: page.textDir || this.textDir,
+				showLabel: page.showTitle,
+				iconClass: page.iconClass,
+				closeButton: page.closable,
+				title: page.tooltip,
+				page: page
+			});
+
+			this.addChild(button, insertIndex);
+			page.controlButton = button;	// this value might be overwritten if two tabs point to same container
+			if(!this._currentChild){
+				// If this is the first child then StackContainer will soon publish that it's selected,
+				// but before that StackContainer calls layout(), and before layout() is called the
+				// StackController needs to have the proper height... which means that the button needs
+				// to be marked as selected now.   See test_TabContainer_CSS.html for test.
+				this.onSelectChild(page);
+			}
+
+			// Add this StackController button to the list of things that labels that StackContainer pane.
+			// Also, if there's an aria-labelledby parameter for the pane, then the aria-label parameter is unneeded.
+			var labelledby = page._wrapper.getAttribute("aria-labelledby") ?
+				page._wrapper.getAttribute("aria-labelledby") + " " + button.id : button.id;
+			page._wrapper.removeAttribute("aria-label");
+			page._wrapper.setAttribute("aria-labelledby", labelledby);
+		},
+
+		onRemoveChild: function(/*dijit/_WidgetBase*/ page){
+			// summary:
+			//		Called whenever a page is removed from the container.
+			//		Remove the button corresponding to the page.
+			// tags:
+			//		private
+
+			if(this._currentChild === page){
+				this._currentChild = null;
+			}
+
+			var button = this.pane2button(page.id);
+			if(button){
+				this.removeChild(button);
+				button.destroy();
+			}
+			delete page.controlButton;
+		},
+
+		onSelectChild: function(/*dijit/_WidgetBase*/ page){
+			// summary:
+			//		Called when a page has been selected in the StackContainer, either by me or by another StackController
+			// tags:
+			//		private
+
+			if(!page){
+				return;
+			}
+
+			if(this._currentChild){
+				var oldButton = this.pane2button(this._currentChild.id);
+				oldButton.set('checked', false);
+				oldButton.focusNode.setAttribute("tabIndex", "-1");
+			}
+
+			var newButton = this.pane2button(page.id);
+			newButton.set('checked', true);
+			this._currentChild = page;
+			newButton.focusNode.setAttribute("tabIndex", "0");
+			var container = registry.byId(this.containerId);
+		},
+
+		onButtonClick: function(/*dijit/_WidgetBase*/ page){
+			// summary:
+			//		Called whenever one of my child buttons is pressed in an attempt to select a page
+			// tags:
+			//		private
+
+			var button = this.pane2button(page.id);
+
+			// For TabContainer where the tabs are <span>, need to set focus explicitly when left/right arrow
+			focus.focus(button.focusNode);
+
+			if(this._currentChild && this._currentChild.id === page.id){
+				//In case the user clicked the checked button, keep it in the checked state because it remains to be the selected stack page.
+				button.set('checked', true);
+			}
+			var container = registry.byId(this.containerId);
+			container.selectChild(page);
+		},
+
+		onCloseButtonClick: function(/*dijit/_WidgetBase*/ page){
+			// summary:
+			//		Called whenever one of my child buttons [X] is pressed in an attempt to close a page
+			// tags:
+			//		private
+
+			var container = registry.byId(this.containerId);
+			container.closeChild(page);
+			if(this._currentChild){
+				var b = this.pane2button(this._currentChild.id);
+				if(b){
+					focus.focus(b.focusNode || b.domNode);
+				}
+			}
+		},
+
+		// TODO: this is a bit redundant with forward, back api in StackContainer
+		adjacent: function(/*Boolean*/ forward){
+			// summary:
+			//		Helper for onkeydown to find next/previous button
+			// tags:
+			//		private
+
+			if(!this.isLeftToRight() && (!this.tabPosition || /top|bottom/.test(this.tabPosition))){
+				forward = !forward;
+			}
+			// find currently focused button in children array
+			var children = this.getChildren();
+			var idx = array.indexOf(children, this.pane2button(this._currentChild.id)),
+				current = children[idx];
+
+			// Pick next/previous non-disabled button to focus on.   If we get back to the original button it means
+			// that all buttons must be disabled, so return current child to avoid an infinite loop.
+			var child;
+			do{
+				idx = (idx + (forward ? 1 : children.length - 1)) % children.length;
+				child = children[idx];
+			}while(child.disabled && child != current);
+
+			return child; // dijit/_WidgetBase
+		},
+
+		onkeydown: function(/*Event*/ e, /*Boolean?*/ fromContainer){
+			// summary:
+			//		Handle keystrokes on the page list, for advancing to next/previous button
+			//		and closing the current page if the page is closable.
+			// tags:
+			//		private
+
+			if(this.disabled || e.altKey){
+				return;
+			}
+			var forward = null;
+			if(e.ctrlKey || !e._djpage){
+				switch(e.keyCode){
+					case keys.LEFT_ARROW:
+					case keys.UP_ARROW:
+						if(!e._djpage){
+							forward = false;
+						}
+						break;
+					case keys.PAGE_UP:
+						if(e.ctrlKey){
+							forward = false;
+						}
+						break;
+					case keys.RIGHT_ARROW:
+					case keys.DOWN_ARROW:
+						if(!e._djpage){
+							forward = true;
+						}
+						break;
+					case keys.PAGE_DOWN:
+						if(e.ctrlKey){
+							forward = true;
+						}
+						break;
+					case keys.HOME:
+						// Navigate to first non-disabled child
+						var children = this.getChildren();
+						for(var idx = 0; idx < children.length; idx++){
+							var child = children[idx];
+							if(!child.disabled){
+								this.onButtonClick(child.page);
+								break;
+							}
+						}
+						e.stopPropagation();
+						e.preventDefault();
+						break;
+					case keys.END:
+						// Navigate to last non-disabled child
+						var children = this.getChildren();
+						for(var idx = children.length - 1; idx >= 0; idx--){
+							var child = children[idx];
+							if(!child.disabled){
+								this.onButtonClick(child.page);
+								break;
+							}
+						}
+						e.stopPropagation();
+						e.preventDefault();
+						break;
+					case keys.DELETE:
+					case "W".charCodeAt(0):    // ctrl-W
+						if(this._currentChild.closable &&
+							(e.keyCode == keys.DELETE || e.ctrlKey)){
+							this.onCloseButtonClick(this._currentChild);
+
+							// avoid browser tab closing
+							e.stopPropagation();
+							e.preventDefault();
+						}
+						break;
+					case keys.TAB:
+						if(e.ctrlKey){
+							this.onButtonClick(this.adjacent(!e.shiftKey).page);
+							e.stopPropagation();
+							e.preventDefault();
+						}
+						break;
+				}
+				// handle next/previous page navigation (left/right arrow, etc.)
+				if(forward !== null){
+					this.onButtonClick(this.adjacent(forward).page);
+					e.stopPropagation();
+					e.preventDefault();
+				}
+			}
+		},
+
+		onContainerKeyDown: function(/*Object*/ info){
+			// summary:
+			//		Called when there was a keydown on the container
+			// tags:
+			//		private
+			info.e._djpage = info.page;
+			this.onkeydown(info.e);
+		}
+	});
+
+	StackController.StackButton = StackButton;	// for monkey patching
+
+	return StackController;
+});
diff --git a/src/main/resources/static/dijit/layout/TabContainer.js b/src/main/resources/static/dijit/layout/TabContainer.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca1017ae4134e4077fc0fdd028a3fe566609cae4
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/TabContainer.js
@@ -0,0 +1,77 @@
+define([
+	"dojo/_base/lang", // lang.getObject
+	"dojo/_base/declare", // declare
+	"./_TabContainerBase",
+	"./TabController",
+	"./ScrollingTabController"
+], function(lang, declare, _TabContainerBase, TabController, ScrollingTabController){
+
+	// module:
+	//		dijit/layout/TabContainer
+
+
+	return declare("dijit.layout.TabContainer", _TabContainerBase, {
+		// summary:
+		//		A Container with tabs to select each child (only one of which is displayed at a time).
+		// description:
+		//		A TabContainer is a container that has multiple panes, but shows only
+		//		one pane at a time.  There are a set of tabs corresponding to each pane,
+		//		where each tab has the name (aka title) of the pane, and optionally a close button.
+		//
+		//		See `StackContainer.ChildWidgetProperties` for details on the properties that can be set on
+		//		children of a `TabContainer`.
+
+		// useMenu: [const] Boolean
+		//		True if a menu should be used to select tabs when they are too
+		//		wide to fit the TabContainer, false otherwise.
+		useMenu: true,
+
+		// useSlider: [const] Boolean
+		//		True if a slider should be used to select tabs when they are too
+		//		wide to fit the TabContainer, false otherwise.
+		useSlider: true,
+
+		// controllerWidget: Class
+		//		An optional parameter to override the widget used to display the tab labels
+		controllerWidget: "",
+
+		_makeController: function(/*DomNode*/ srcNode){
+			// summary:
+			//		Instantiate tablist controller widget and return reference to it.
+			//		Callback from _TabContainerBase.postCreate().
+			// tags:
+			//		protected extension
+
+			// "string" branch for back-compat, remove for 2.0
+			var cls = this.baseClass + "-tabs" + (this.doLayout ? "" : " dijitTabNoLayout"),
+				TabController = typeof this.controllerWidget == "string" ? lang.getObject(this.controllerWidget) :
+						this.controllerWidget;
+
+			return new TabController({
+				id: this.id + "_tablist",
+				ownerDocument: this.ownerDocument,
+				dir: this.dir,
+				lang: this.lang,
+				textDir: this.textDir,
+				tabPosition: this.tabPosition,
+				doLayout: this.doLayout,
+				containerId: this.id,
+				"class": cls,
+				nested: this.nested,
+				useMenu: this.useMenu,
+				useSlider: this.useSlider,
+				tabStripClass: this.tabStrip ? this.baseClass + (this.tabStrip ? "":"No") + "Strip": null
+			}, srcNode);
+		},
+
+		postMixInProperties: function(){
+			this.inherited(arguments);
+
+			// Scrolling controller only works for horizontal non-nested tabs
+			if(!this.controllerWidget){
+				this.controllerWidget = (this.tabPosition == "top" || this.tabPosition == "bottom") && !this.nested ?
+							ScrollingTabController : TabController;
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/layout/TabController.js b/src/main/resources/static/dijit/layout/TabController.js
new file mode 100644
index 0000000000000000000000000000000000000000..721b73ee20b2d779508e53ec17ab81a5b68bd543
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/TabController.js
@@ -0,0 +1,182 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.setSelectable
+	"dojo/dom-attr", // domAttr.attr
+	"dojo/dom-class", // domClass.toggle
+	"dojo/has",
+	"dojo/i18n", // i18n.getLocalization
+	"dojo/_base/lang", // lang.hitch lang.trim
+	"./StackController",
+	"../registry",
+	"../Menu",
+	"../MenuItem",
+	"dojo/text!./templates/_TabButton.html",
+	"dojo/i18n!../nls/common"
+], function(declare, dom, domAttr, domClass, has, i18n, lang, StackController, registry, Menu, MenuItem, template){
+
+	// module:
+	//		dijit/layout/TabController
+
+	var TabButton = declare("dijit.layout._TabButton" + (has("dojo-bidi") ? "_NoBidi" : ""), StackController.StackButton, {
+		// summary:
+		//		A tab (the thing you click to select a pane).
+		// description:
+		//		Contains the title of the pane, and optionally a close-button to destroy the pane.
+		//		This is an internal widget and should not be instantiated directly.
+		// tags:
+		//		private
+
+		// baseClass: String
+		//		The CSS class applied to the domNode.
+		baseClass: "dijitTab",
+
+		// Apply dijitTabCloseButtonHover when close button is hovered
+		cssStateNodes: {
+			closeNode: "dijitTabCloseButton"
+		},
+
+		templateString: template,
+
+		// Button superclass maps name to a this.valueNode, but we don't have a this.valueNode attach point
+		_setNameAttr: "focusNode",
+
+		// Override _FormWidget.scrollOnFocus.
+		// Don't scroll the whole tab container into view when the button is focused.
+		scrollOnFocus: false,
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			dom.setSelectable(this.containerNode, false);
+		},
+
+		startup: function(){
+			this.inherited(arguments);
+			var n = this.domNode;
+
+			// Required to give IE6 a kick, as it initially hides the
+			// tabs until they are focused on.
+			this.defer(function(){
+				n.className = n.className;
+			}, 1);
+		},
+
+		_setCloseButtonAttr: function(/*Boolean*/ disp){
+			// summary:
+			//		Hide/show close button
+			this._set("closeButton", disp);
+			domClass.toggle(this.domNode, "dijitClosable", disp);
+			this.closeNode.style.display = disp ? "" : "none";
+			if(disp){
+				var _nlsResources = i18n.getLocalization("dijit", "common");
+				if(this.closeNode){
+					domAttr.set(this.closeNode, "title", _nlsResources.itemClose);
+				}
+			}
+		},
+
+		_setDisabledAttr: function(/*Boolean*/ disabled){
+			// summary:
+			//		Make tab selected/unselectable
+
+			this.inherited(arguments);
+
+			// Don't show tooltip for close button when tab is disabled
+			if(this.closeNode){
+				if(disabled){
+					domAttr.remove(this.closeNode, "title");
+				}else{
+					var _nlsResources = i18n.getLocalization("dijit", "common");
+					domAttr.set(this.closeNode, "title", _nlsResources.itemClose);
+				}
+			}
+		},
+
+		_setLabelAttr: function(/*String*/ content){
+			// summary:
+			//		Hook for set('label', ...) to work.
+			// description:
+			//		takes an HTML string.
+			//		Inherited ToggleButton implementation will Set the label (text) of the button;
+			//		Need to set the alt attribute of icon on tab buttons if no label displayed
+			this.inherited(arguments);
+			if(!this.showLabel && !this.params.title){
+				this.iconNode.alt = lang.trim(this.containerNode.innerText || this.containerNode.textContent || '');
+			}
+		}
+	});
+
+	if(has("dojo-bidi")){
+		TabButton = declare("dijit.layout._TabButton", TabButton, {
+			_setLabelAttr: function(/*String*/ content){
+				this.inherited(arguments);
+				this.applyTextDir(this.iconNode, this.iconNode.alt);
+			}
+		});
+	}
+
+	var TabController = declare("dijit.layout.TabController", StackController, {
+		// summary:
+		//		Set of tabs (the things with titles and a close button, that you click to show a tab panel).
+		//		Used internally by `dijit/layout/TabContainer`.
+		// description:
+		//		Lets the user select the currently shown pane in a TabContainer or StackContainer.
+		//		TabController also monitors the TabContainer, and whenever a pane is
+		//		added or deleted updates itself accordingly.
+		// tags:
+		//		private
+
+		baseClass: "dijitTabController",
+
+		templateString: "<div role='tablist' data-dojo-attach-event='onkeydown:onkeydown'></div>",
+
+		// tabPosition: String
+		//		Defines where tabs go relative to the content.
+		//		"top", "bottom", "left-h", "right-h"
+		tabPosition: "top",
+
+		// buttonWidget: Constructor
+		//		The tab widget to create to correspond to each page
+		buttonWidget: TabButton,
+
+		// buttonWidgetCloseClass: String
+		//		Class of [x] close icon, used by event delegation code to tell when close button was clicked
+		buttonWidgetCloseClass: "dijitTabCloseButton",
+
+		postCreate: function(){
+			this.inherited(arguments);
+
+			// Setup a close menu to be shared between all the closable tabs (excluding disabled tabs)
+			var closeMenu = new Menu({
+				id: this.id + "_Menu",
+				ownerDocument: this.ownerDocument,
+				dir: this.dir,
+				lang: this.lang,
+				textDir: this.textDir,
+				targetNodeIds: [this.domNode],
+				selector: function(node){
+					return domClass.contains(node, "dijitClosable") && !domClass.contains(node, "dijitTabDisabled");
+				}
+			});
+			this.own(closeMenu);
+
+			var _nlsResources = i18n.getLocalization("dijit", "common"),
+				controller = this;
+			closeMenu.addChild(new MenuItem({
+				label: _nlsResources.itemClose,
+				ownerDocument: this.ownerDocument,
+				dir: this.dir,
+				lang: this.lang,
+				textDir: this.textDir,
+				onClick: function(evt){
+					var button = registry.byNode(this.getParent().currentTarget);
+					controller.onCloseButtonClick(button.page);
+				}
+			}));
+		}
+	});
+
+	TabController.TabButton = TabButton;	// for monkey patching
+
+	return TabController;
+});
diff --git a/src/main/resources/static/dijit/layout/_ContentPaneResizeMixin.js b/src/main/resources/static/dijit/layout/_ContentPaneResizeMixin.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f69554956d5b806b021ceb6468629ac2373c611
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/_ContentPaneResizeMixin.js
@@ -0,0 +1,236 @@
+define([
+	"dojo/_base/array", // array.filter array.forEach
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.contains domClass.toggle
+	"dojo/dom-geometry", // domGeometry.contentBox domGeometry.marginBox
+	"dojo/dom-style",
+	"dojo/_base/lang", // lang.mixin
+	"dojo/query", // query
+	"../registry", // registry.byId
+	"../Viewport",
+	"./utils" // marginBox2contextBox
+], function(array, declare, domClass, domGeometry, domStyle, lang, query,
+			registry, Viewport, layoutUtils){
+
+	// module:
+	//		dijit/layout/_ContentPaneResizeMixin
+
+	return declare("dijit.layout._ContentPaneResizeMixin", null, {
+		// summary:
+		//		Resize() functionality of ContentPane.   If there's a single layout widget
+		//		child then it will call resize() with the same dimensions as the ContentPane.
+		//		Otherwise just calls resize on each child.
+		//
+		//		Also implements basic startup() functionality, where starting the parent
+		//		will start the children
+
+		// doLayout: Boolean
+		//		- false - don't adjust size of children
+		//		- true - if there is a single visible child widget, set it's size to however big the ContentPane is
+		doLayout: true,
+
+		// isLayoutContainer: [protected] Boolean
+		//		Indicates that this widget will call resize() on it's child widgets
+		//		when they become visible.
+		isLayoutContainer: true,
+
+		startup: function(){
+			// summary:
+			//		See `dijit/layout/_LayoutWidget.startup()` for description.
+			//		Although ContentPane doesn't extend _LayoutWidget, it does implement
+			//		the same API.
+
+			if(this._started){
+				return;
+			}
+
+			var parent = this.getParent();
+			this._childOfLayoutWidget = parent && parent.isLayoutContainer;
+
+			// I need to call resize() on my child/children (when I become visible), unless
+			// I'm the child of a layout widget in which case my parent will call resize() on me and I'll do it then.
+			this._needLayout = !this._childOfLayoutWidget;
+
+			this.inherited(arguments);
+
+			if(this._isShown()){
+				this._onShow();
+			}
+
+			if(!this._childOfLayoutWidget){
+				// Since my parent isn't a layout container, and my style *may be* width=height=100%
+				// or something similar (either set directly or via a CSS class),
+				// monitor when viewport size changes so that I can re-layout.
+				// This is more for subclasses of ContentPane than ContentPane itself, although it
+				// could be useful for a ContentPane if it has a single child widget inheriting ContentPane's size.
+				this.own(Viewport.on("resize", lang.hitch(this, "resize")));
+			}
+		},
+
+		_checkIfSingleChild: function(){
+			// summary:
+			//		Test if we have exactly one visible widget as a child,
+			//		and if so assume that we are a container for that widget,
+			//		and should propagate startup() and resize() calls to it.
+			//		Skips over things like data stores since they aren't visible.
+
+			if(!this.doLayout){ return; }
+
+			var candidateWidgets = [],
+				otherVisibleNodes = false;
+
+			query("> *", this.containerNode).some(function(node){
+				var widget = registry.byNode(node);
+				if(widget && widget.resize){
+					candidateWidgets.push(widget);
+				}else if(!/script|link|style/i.test(node.nodeName) && node.offsetHeight){
+					otherVisibleNodes = true;
+				}
+			});
+
+			this._singleChild = candidateWidgets.length == 1 && !otherVisibleNodes ?
+				candidateWidgets[0] : null;
+
+			// So we can set overflow: hidden to avoid a safari bug w/scrollbars showing up (#9449)
+			domClass.toggle(this.containerNode, this.baseClass + "SingleChild", !!this._singleChild);
+		},
+
+		resize: function(changeSize, resultSize){
+			// summary:
+			//		See `dijit/layout/_LayoutWidget.resize()` for description.
+			//		Although ContentPane doesn't extend _LayoutWidget, it does implement
+			//		the same API.
+
+			this._resizeCalled = true;
+
+			this._scheduleLayout(changeSize, resultSize);
+		},
+
+		_scheduleLayout: function(changeSize, resultSize){
+			// summary:
+			//		Resize myself, and call resize() on each of my child layout widgets, either now
+			//		(if I'm currently visible) or when I become visible
+			if(this._isShown()){
+				this._layout(changeSize, resultSize);
+			}else{
+				this._needLayout = true;
+				this._changeSize = changeSize;
+				this._resultSize = resultSize;
+			}
+		},
+
+		_layout: function(changeSize, resultSize){
+			// summary:
+			//		Resize myself according to optional changeSize/resultSize parameters, like a layout widget.
+			//		Also, since I am an isLayoutContainer widget, each of my children expects me to
+			//		call resize() or layout() on it.
+			//
+			//		Should be called on initialization and also whenever we get new content
+			//		(from an href, or from set('content', ...))... but deferred until
+			//		the ContentPane is visible
+
+			delete this._needLayout;
+
+			// For the TabContainer --> BorderContainer --> ContentPane case, _onShow() is
+			// never called directly, so resize() is our trigger to do the initial href download (see [20099]).
+			// However, don't load href for closed TitlePanes.
+			if(!this._wasShown && this.open !== false){
+				this._onShow();
+			}
+
+			// Set margin box size, unless it wasn't specified, in which case use current size.
+			if(changeSize){
+				domGeometry.setMarginBox(this.domNode, changeSize);
+			}
+
+			// Compute content box size of containerNode in case we [later] need to size our single child.
+			var cn = this.containerNode;
+			if(cn === this.domNode){
+				// If changeSize or resultSize was passed to this method and this.containerNode ==
+				// this.domNode then we can compute the content-box size without querying the node,
+				// which is more reliable (similar to LayoutWidget.resize) (see for example #9449).
+				var mb = resultSize || {};
+				lang.mixin(mb, changeSize || {}); // changeSize overrides resultSize
+				if(!("h" in mb) || !("w" in mb)){
+					mb = lang.mixin(domGeometry.getMarginBox(cn), mb); // just use domGeometry.setMarginBox() to fill in missing values
+				}
+				this._contentBox = layoutUtils.marginBox2contentBox(cn, mb);
+			}else{
+				this._contentBox = domGeometry.getContentBox(cn);
+			}
+
+			this._layoutChildren();
+		},
+
+		_layoutChildren: function(){
+			// Call _checkIfSingleChild() again in case app has manually mucked w/the content
+			// of the ContentPane (rather than changing it through the set("content", ...) API.
+			this._checkIfSingleChild();
+
+			if(this._singleChild && this._singleChild.resize){
+				var cb = this._contentBox || domGeometry.getContentBox(this.containerNode);
+
+				// note: if widget has padding this._contentBox will have l and t set,
+				// but don't pass them to resize() or it will doubly-offset the child
+				this._singleChild.resize({w: cb.w, h: cb.h});
+			}else{
+				// All my child widgets are independently sized (rather than matching my size),
+				// but I still need to call resize() on each child to make it layout.
+				var children = this.getChildren(),
+					widget,
+					i = 0;
+				while(widget = children[i++]){
+					if(widget.resize){
+						widget.resize();
+					}
+				}
+			}
+		},
+
+		_isShown: function(){
+			// summary:
+			//		Returns true if the content is currently shown.
+			// description:
+			//		If I am a child of a layout widget then it actually returns true if I've ever been visible,
+			//		not whether I'm currently visible, since that's much faster than tracing up the DOM/widget
+			//		tree every call, and at least solves the performance problem on page load by deferring loading
+			//		hidden ContentPanes until they are first shown
+
+			if(this._childOfLayoutWidget){
+				// If we are TitlePane, etc - we return that only *IF* we've been resized
+				if(this._resizeCalled && "open" in this){
+					return this.open;
+				}
+				return this._resizeCalled;
+			}else if("open" in this){
+				return this.open;		// for TitlePane, etc.
+			}else{
+				var node = this.domNode, parent = this.domNode.parentNode;
+				return (node.style.display != 'none') && (node.style.visibility != 'hidden') && !domClass.contains(node, "dijitHidden") &&
+					parent && parent.style && (parent.style.display != 'none');
+			}
+		},
+
+		_onShow: function(){
+			// summary:
+			//		Called when the ContentPane is made visible
+			// description:
+			//		For a plain ContentPane, this is called on initialization, from startup().
+			//		If the ContentPane is a hidden pane of a TabContainer etc., then it's
+			//		called whenever the pane is made visible.
+			//
+			//		Does layout/resize of child widget(s)
+
+			// Need to keep track of whether ContentPane has been shown (which is different than
+			// whether or not it's currently visible).
+			this._wasShown = true;
+
+			if(this._needLayout){
+				// If a layout has been scheduled for when we become visible, do it now
+				this._layout(this._changeSize, this._resultSize);
+			}
+
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/layout/_LayoutWidget.js b/src/main/resources/static/dijit/layout/_LayoutWidget.js
new file mode 100644
index 0000000000000000000000000000000000000000..6e3719577bfafe144d7915d60025e835d7aaf6ef
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/_LayoutWidget.js
@@ -0,0 +1,190 @@
+define([
+	"dojo/_base/lang", // lang.mixin
+	"../_Widget",
+	"../_Container",
+	"../_Contained",
+	"../Viewport",
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add domClass.remove
+	"dojo/dom-geometry", // domGeometry.marginBox
+	"dojo/dom-style" // domStyle.getComputedStyle
+], function(lang, _Widget, _Container, _Contained, Viewport,
+	declare, domClass, domGeometry, domStyle){
+
+	// module:
+	//		dijit/layout/_LayoutWidget
+
+
+	return declare("dijit.layout._LayoutWidget", [_Widget, _Container, _Contained], {
+		// summary:
+		//		Base class for a _Container widget which is responsible for laying out its children.
+		//		Widgets which mixin this code must define layout() to manage placement and sizing of the children.
+
+		// baseClass: [protected extension] String
+		//		This class name is applied to the widget's domNode
+		//		and also may be used to generate names for sub nodes,
+		//		for example dijitTabContainer-content.
+		baseClass: "dijitLayoutContainer",
+
+		// isLayoutContainer: [protected] Boolean
+		//		Indicates that this widget is going to call resize() on its
+		//		children widgets, setting their size, when they become visible.
+		isLayoutContainer: true,
+
+		// Cancel _WidgetBase's _setTitleAttr because we don't want the title property (used to specify
+		// tab labels) to be set as an attribute on this.domNode... otherwise a tooltip shows up over the
+		// entire widget.
+		_setTitleAttr: null,
+
+		buildRendering: function(){
+			this.inherited(arguments);
+			domClass.add(this.domNode, "dijitContainer");
+		},
+
+		startup: function(){
+			// summary:
+			//		Called after all the widgets have been instantiated and their
+			//		dom nodes have been inserted somewhere under <body>.
+			//
+			//		Widgets should override this method to do any initialization
+			//		dependent on other widgets existing, and then call
+			//		this superclass method to finish things off.
+			//
+			//		startup() in subclasses shouldn't do anything
+			//		size related because the size of the widget hasn't been set yet.
+
+			if(this._started){ return; }
+
+			// Need to call inherited first - so that child widgets get started
+			// up correctly
+			this.inherited(arguments);
+
+			// If I am a not being controlled by a parent layout widget...
+			var parent = this.getParent && this.getParent();
+			if(!(parent && parent.isLayoutContainer)){
+				// Do recursive sizing and layout of all my descendants
+				// (passing in no argument to resize means that it has to glean the size itself)
+				this.resize();
+
+				// Since my parent isn't a layout container, and my style *may be* width=height=100%
+				// or something similar (either set directly or via a CSS class),
+				// monitor when viewport size changes so that I can re-layout.
+				this.own(Viewport.on("resize", lang.hitch(this, "resize")));
+			}
+		},
+
+		resize: function(changeSize, resultSize){
+			// summary:
+			//		Call this to resize a widget, or after its size has changed.
+			// description:
+			//		####Change size mode:
+			//
+			//		When changeSize is specified, changes the marginBox of this widget
+			//		and forces it to re-layout its contents accordingly.
+			//		changeSize may specify height, width, or both.
+			//
+			//		If resultSize is specified it indicates the size the widget will
+			//		become after changeSize has been applied.
+			//
+			//		####Notification mode:
+			//
+			//		When changeSize is null, indicates that the caller has already changed
+			//		the size of the widget, or perhaps it changed because the browser
+			//		window was resized.  Tells widget to re-layout its contents accordingly.
+			//
+			//		If resultSize is also specified it indicates the size the widget has
+			//		become.
+			//
+			//		In either mode, this method also:
+			//
+			//		1. Sets this._borderBox and this._contentBox to the new size of
+			//			the widget.  Queries the current domNode size if necessary.
+			//		2. Calls layout() to resize contents (and maybe adjust child widgets).
+			// changeSize: Object?
+			//		Sets the widget to this margin-box size and position.
+			//		May include any/all of the following properties:
+			//	|	{w: int, h: int, l: int, t: int}
+			// resultSize: Object?
+			//		The margin-box size of this widget after applying changeSize (if
+			//		changeSize is specified).  If caller knows this size and
+			//		passes it in, we don't need to query the browser to get the size.
+			//	|	{w: int, h: int}
+
+			var node = this.domNode;
+
+			// set margin box size, unless it wasn't specified, in which case use current size
+			if(changeSize){
+				domGeometry.setMarginBox(node, changeSize);
+			}
+
+			// If either height or width wasn't specified by the user, then query node for it.
+			// But note that setting the margin box and then immediately querying dimensions may return
+			// inaccurate results, so try not to depend on it.
+			var mb = resultSize || {};
+			lang.mixin(mb, changeSize || {});	// changeSize overrides resultSize
+			if( !("h" in mb) || !("w" in mb) ){
+				mb = lang.mixin(domGeometry.getMarginBox(node), mb);	// just use domGeometry.marginBox() to fill in missing values
+			}
+
+			// Compute and save the size of my border box and content box
+			// (w/out calling domGeometry.getContentBox() since that may fail if size was recently set)
+			var cs = domStyle.getComputedStyle(node);
+			var me = domGeometry.getMarginExtents(node, cs);
+			var be = domGeometry.getBorderExtents(node, cs);
+			var bb = (this._borderBox = {
+				w: mb.w - (me.w + be.w),
+				h: mb.h - (me.h + be.h)
+			});
+			var pe = domGeometry.getPadExtents(node, cs);
+			this._contentBox = {
+				l: domStyle.toPixelValue(node, cs.paddingLeft),
+				t: domStyle.toPixelValue(node, cs.paddingTop),
+				w: bb.w - pe.w,
+				h: bb.h - pe.h
+			};
+
+			// Callback for widget to adjust size of its children
+			this.layout();
+		},
+
+		layout: function(){
+			// summary:
+			//		Widgets override this method to size and position their contents/children.
+			//		When this is called this._contentBox is guaranteed to be set (see resize()).
+			//
+			//		This is called after startup(), and also when the widget's size has been
+			//		changed.
+			// tags:
+			//		protected extension
+		},
+
+		_setupChild: function(/*dijit/_WidgetBase*/child){
+			// summary:
+			//		Common setup for initial children and children which are added after startup
+			// tags:
+			//		protected extension
+
+			var cls = this.baseClass + "-child "
+				+ (child.baseClass ? this.baseClass + "-" + child.baseClass : "");
+			domClass.add(child.domNode, cls);
+		},
+
+		addChild: function(/*dijit/_WidgetBase*/ child, /*Integer?*/ insertIndex){
+			// Overrides _Container.addChild() to call _setupChild()
+			this.inherited(arguments);
+			if(this._started){
+				this._setupChild(child);
+			}
+		},
+
+		removeChild: function(/*dijit/_WidgetBase*/ child){
+			// Overrides _Container.removeChild() to remove class added by _setupChild()
+			var cls = this.baseClass + "-child"
+					+ (child.baseClass ?
+						" " + this.baseClass + "-" + child.baseClass : "");
+			domClass.remove(child.domNode, cls);
+
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/layout/_TabContainerBase.js b/src/main/resources/static/dijit/layout/_TabContainerBase.js
new file mode 100644
index 0000000000000000000000000000000000000000..68e60cf0ad610e01cfaee4fd195ea8ba4b5f3875
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/_TabContainerBase.js
@@ -0,0 +1,154 @@
+define([
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add
+	"dojo/dom-geometry", // domGeometry.contentBox
+	"dojo/dom-style", // domStyle.style
+	"./StackContainer",
+	"./utils", // marginBox2contextBox, layoutChildren
+	"../_TemplatedMixin",
+	"dojo/text!./templates/TabContainer.html"
+], function(declare, domClass, domGeometry, domStyle, StackContainer, layoutUtils, _TemplatedMixin, template){
+
+	// module:
+	//		dijit/layout/_TabContainerBase
+
+	return declare("dijit.layout._TabContainerBase", [StackContainer, _TemplatedMixin], {
+		// summary:
+		//		Abstract base class for TabContainer.   Must define _makeController() to instantiate
+		//		and return the widget that displays the tab labels
+		// description:
+		//		A TabContainer is a container that has multiple panes, but shows only
+		//		one pane at a time.  There are a set of tabs corresponding to each pane,
+		//		where each tab has the name (aka title) of the pane, and optionally a close button.
+
+		// tabPosition: String
+		//		Defines where tabs go relative to tab content.
+		//		"top", "bottom", "left-h", "right-h"
+		tabPosition: "top",
+
+		baseClass: "dijitTabContainer",
+
+		// tabStrip: [const] Boolean
+		//		Defines whether the tablist gets an extra class for layouting, putting a border/shading
+		//		around the set of tabs.   Not supported by claro theme.
+		tabStrip: false,
+
+		// nested: [const] Boolean
+		//		If true, use styling for a TabContainer nested inside another TabContainer.
+		//		For tundra etc., makes tabs look like links, and hides the outer
+		//		border since the outer TabContainer already has a border.
+		nested: false,
+
+		templateString: template,
+
+		postMixInProperties: function(){
+			// set class name according to tab position, ex: dijitTabContainerTop
+			this.baseClass += this.tabPosition.charAt(0).toUpperCase() + this.tabPosition.substr(1).replace(/-.*/, "");
+
+			this.srcNodeRef && domStyle.set(this.srcNodeRef, "visibility", "hidden");
+
+			this.inherited(arguments);
+		},
+
+		buildRendering: function(){
+			this.inherited(arguments);
+
+			// Create the tab list that will have a tab (a.k.a. tab button) for each tab panel
+			this.tablist = this._makeController(this.tablistNode);
+
+			if(!this.doLayout){
+				domClass.add(this.domNode, "dijitTabContainerNoLayout");
+			}
+
+			if(this.nested){
+				/* workaround IE's lack of support for "a > b" selectors by
+				 * tagging each node in the template.
+				 */
+				domClass.add(this.domNode, "dijitTabContainerNested");
+				domClass.add(this.tablist.containerNode, "dijitTabContainerTabListNested");
+				domClass.add(this.tablistSpacer, "dijitTabContainerSpacerNested");
+				domClass.add(this.containerNode, "dijitTabPaneWrapperNested");
+			}else{
+				domClass.add(this.domNode, "tabStrip-" + (this.tabStrip ? "enabled" : "disabled"));
+			}
+		},
+
+		_setupChild: function(/*dijit/_WidgetBase*/ tab){
+			// Overrides StackContainer._setupChild().
+			domClass.add(tab.domNode, "dijitTabPane");
+			this.inherited(arguments);
+		},
+
+		removeChild: function(/*dijit/_WidgetBase*/ child) {
+			// Overrides StackContainer.removeChild().
+			domClass.remove(child.domNode, "dijitTabPane");
+			this.inherited(arguments);
+		},
+
+		startup: function(){
+			if(this._started){
+				return;
+			}
+
+			// wire up the tablist and its tabs
+			this.tablist.startup();
+
+			this.inherited(arguments);
+		},
+
+		layout: function(){
+			// Overrides StackContainer.layout().
+			// Configure the content pane to take up all the space except for where the tabs are
+
+			if(!this._contentBox || typeof(this._contentBox.l) == "undefined"){
+				return;
+			}
+
+			var sc = this.selectedChildWidget;
+
+			if(this.doLayout){
+				// position and size the titles and the container node
+				var titleAlign = this.tabPosition.replace(/-h/, "");
+				this.tablist.region = titleAlign;
+				var children = [this.tablist, {
+					domNode: this.tablistSpacer,
+					region: titleAlign
+				}, {
+					domNode: this.containerNode,
+					region: "center"
+				}];
+				layoutUtils.layoutChildren(this.domNode, this._contentBox, children);
+
+				// Compute size to make each of my children.
+				// children[2] is the margin-box size of this.containerNode, set by layoutChildren() call above
+				this._containerContentBox = layoutUtils.marginBox2contentBox(this.containerNode, children[2]);
+
+				if(sc && sc.resize){
+					sc.resize(this._containerContentBox);
+				}
+			}else{
+				// just layout the tab controller, so it can position left/right buttons etc.
+				if(this.tablist.resize){
+					//make the tabs zero width so that they don't interfere with width calc, then reset
+					var s = this.tablist.domNode.style;
+					s.width = "0";
+					var width = domGeometry.getContentBox(this.domNode).w;
+					s.width = "";
+					this.tablist.resize({w: width});
+				}
+
+				// and call resize() on the selected pane just to tell it that it's been made visible
+				if(sc && sc.resize){
+					sc.resize();
+				}
+			}
+		},
+
+		destroy: function(preserveDom){
+			if(this.tablist){
+				this.tablist.destroy(preserveDom);
+			}
+			this.inherited(arguments);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/layout/templates/AccordionButton.html b/src/main/resources/static/dijit/layout/templates/AccordionButton.html
new file mode 100644
index 0000000000000000000000000000000000000000..1c110e14a5648d7c513f832272389cd2220482a9
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/templates/AccordionButton.html
@@ -0,0 +1,10 @@
+<div data-dojo-attach-event='ondijitclick:_onTitleClick' class='dijitAccordionTitle' role="presentation">
+	<div data-dojo-attach-point='titleNode,focusNode' data-dojo-attach-event='onkeydown:_onTitleKeyDown'
+			class='dijitAccordionTitleFocus' role="tab" aria-expanded="false"
+		><span class='dijitInline dijitAccordionArrow' role="presentation"></span
+		><span class='arrowTextUp' role="presentation">+</span
+		><span class='arrowTextDown' role="presentation">-</span
+		><span role="presentation" class="dijitInline dijitIcon" data-dojo-attach-point="iconNode"></span>
+		<span role="presentation" data-dojo-attach-point='titleTextNode, textDirNode' class='dijitAccordionText'></span>
+	</div>
+</div>
diff --git a/src/main/resources/static/dijit/layout/templates/ScrollingTabController.html b/src/main/resources/static/dijit/layout/templates/ScrollingTabController.html
new file mode 100644
index 0000000000000000000000000000000000000000..f72817d90cb425e819642e8afcdd10d8865ae791
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/templates/ScrollingTabController.html
@@ -0,0 +1,22 @@
+<div class="dijitTabListContainer-${tabPosition}" style="visibility:hidden">
+	<div data-dojo-type="dijit.layout._ScrollingTabControllerMenuButton"
+		 class="tabStripButton-${tabPosition}"
+		 id="${id}_menuBtn"
+		 data-dojo-props="containerId: '${containerId}', iconClass: 'dijitTabStripMenuIcon',
+					dropDownPosition: ['below-alt', 'above-alt']"
+		 data-dojo-attach-point="_menuBtn" showLabel="false" title="">&#9660;</div>
+	<div data-dojo-type="dijit.layout._ScrollingTabControllerButton"
+		 class="tabStripButton-${tabPosition}"
+		 id="${id}_leftBtn"
+		 data-dojo-props="iconClass:'dijitTabStripSlideLeftIcon', showLabel:false, title:''"
+		 data-dojo-attach-point="_leftBtn" data-dojo-attach-event="onClick: doSlideLeft">&#9664;</div>
+	<div data-dojo-type="dijit.layout._ScrollingTabControllerButton"
+		 class="tabStripButton-${tabPosition}"
+		 id="${id}_rightBtn"
+		 data-dojo-props="iconClass:'dijitTabStripSlideRightIcon', showLabel:false, title:''"
+		 data-dojo-attach-point="_rightBtn" data-dojo-attach-event="onClick: doSlideRight">&#9654;</div>
+	<div class='dijitTabListWrapper' data-dojo-attach-point='tablistWrapper'>
+		<div role='tablist' data-dojo-attach-event='onkeydown:onkeydown'
+			 data-dojo-attach-point='containerNode' class='nowrapTabStrip'></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/layout/templates/TabContainer.html b/src/main/resources/static/dijit/layout/templates/TabContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..4630dbcbab6255d745ed6f70b76cd47c53dae0a2
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/templates/TabContainer.html
@@ -0,0 +1,5 @@
+<div class="dijitTabContainer">
+	<div class="dijitTabListWrapper" data-dojo-attach-point="tablistNode"></div>
+	<div data-dojo-attach-point="tablistSpacer" class="dijitTabSpacer ${baseClass}-spacer"></div>
+	<div class="dijitTabPaneWrapper ${baseClass}-container" data-dojo-attach-point="containerNode"></div>
+</div>
diff --git a/src/main/resources/static/dijit/layout/templates/_ScrollingTabControllerButton.html b/src/main/resources/static/dijit/layout/templates/_ScrollingTabControllerButton.html
new file mode 100644
index 0000000000000000000000000000000000000000..e80fa43c3c481a7a94fffdba12c7340830bb5f39
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/templates/_ScrollingTabControllerButton.html
@@ -0,0 +1,4 @@
+<div data-dojo-attach-event="ondijitclick:_onClick" class="dijitTabInnerDiv dijitTabContent dijitButtonContents"  data-dojo-attach-point="focusNode" role="button">
+	<span role="presentation" class="dijitInline dijitTabStripIcon" data-dojo-attach-point="iconNode"></span>
+	<span data-dojo-attach-point="containerNode,titleNode" class="dijitButtonText"></span>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/layout/templates/_TabButton.html b/src/main/resources/static/dijit/layout/templates/_TabButton.html
new file mode 100644
index 0000000000000000000000000000000000000000..507b571cbdb07452de8f32f30dad4d258da8e13e
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/templates/_TabButton.html
@@ -0,0 +1,8 @@
+<div role="presentation" data-dojo-attach-point="titleNode,innerDiv,tabContent" class="dijitTabInner dijitTabContent">
+	<span role="presentation" class="dijitInline dijitIcon dijitTabButtonIcon" data-dojo-attach-point="iconNode"></span>
+	<span data-dojo-attach-point='containerNode,focusNode' class='tabLabel'></span>
+	<span class="dijitInline dijitTabCloseButton dijitTabCloseIcon" data-dojo-attach-point='closeNode'
+		  role="presentation">
+		<span data-dojo-attach-point='closeText' class='dijitTabCloseText'>[x]</span
+				></span>
+</div>
diff --git a/src/main/resources/static/dijit/layout/utils.js b/src/main/resources/static/dijit/layout/utils.js
new file mode 100644
index 0000000000000000000000000000000000000000..a36caed785da7e7585c2a8820482fc4b5a39a91e
--- /dev/null
+++ b/src/main/resources/static/dijit/layout/utils.js
@@ -0,0 +1,151 @@
+define([
+	"dojo/_base/array", // array.filter array.forEach
+	"dojo/dom-class", // domClass.add domClass.remove
+	"dojo/dom-geometry", // domGeometry.marginBox
+	"dojo/dom-style", // domStyle.getComputedStyle
+	"dojo/_base/lang" // lang.mixin, lang.setObject
+], function(array, domClass, domGeometry, domStyle, lang){
+
+	// module:
+	//		dijit/layout/utils
+
+	function capitalize(word){
+		return word.substring(0,1).toUpperCase() + word.substring(1);
+	}
+
+	function size(widget, dim){
+		// size the child
+		var newSize = widget.resize ? widget.resize(dim) : domGeometry.setMarginBox(widget.domNode, dim);
+
+		// record child's size
+		if(newSize){
+			// if the child returned it's new size then use that
+			lang.mixin(widget, newSize);
+		}else{
+			// otherwise, call getMarginBox(), but favor our own numbers when we have them.
+			// the browser lies sometimes
+			lang.mixin(widget, domGeometry.getMarginBox(widget.domNode));
+			lang.mixin(widget, dim);
+		}
+	}
+
+	var utils = {
+		// summary:
+		//		Utility functions for doing layout
+
+		marginBox2contentBox: function(/*DomNode*/ node, /*Object*/ mb){
+			// summary:
+			//		Given the margin-box size of a node, return its content box size.
+			//		Functions like domGeometry.contentBox() but is more reliable since it doesn't have
+			//		to wait for the browser to compute sizes.
+			var cs = domStyle.getComputedStyle(node);
+			var me = domGeometry.getMarginExtents(node, cs);
+			var pb = domGeometry.getPadBorderExtents(node, cs);
+			return {
+				l: domStyle.toPixelValue(node, cs.paddingLeft),
+				t: domStyle.toPixelValue(node, cs.paddingTop),
+				w: mb.w - (me.w + pb.w),
+				h: mb.h - (me.h + pb.h)
+			};
+		},
+
+
+		layoutChildren: function(/*DomNode*/ container, /*Object*/ dim, /*Widget[]*/ children,
+				/*String?*/ changedRegionId, /*Number?*/ changedRegionSize){
+			// summary:
+			//		Layout a bunch of child dom nodes within a parent dom node
+			// container:
+			//		parent node
+			// dim:
+			//		{l, t, w, h} object specifying dimensions of container into which to place children
+			// children:
+			//		An array of Widgets or at least objects containing:
+			//
+			//		- domNode: pointer to DOM node to position
+			//		- region or layoutAlign: position to place DOM node
+			//		- resize(): (optional) method to set size of node
+			//		- id: (optional) Id of widgets, referenced from resize object, below.
+			//
+			//		The widgets in this array should be ordered according to how they should be laid out
+			//		(each element will be processed in order, and take up as much remaining space as needed),
+			//		with the center widget last.
+			// changedRegionId:
+			//		If specified, the slider for the region with the specified id has been dragged, and thus
+			//		the region's height or width should be adjusted according to changedRegionSize
+			// changedRegionSize:
+			//		See changedRegionId.
+
+			// copy dim because we are going to modify it
+			dim = lang.mixin({}, dim);
+
+			domClass.add(container, "dijitLayoutContainer");
+
+			// Move "client" elements to the end of the array for layout.  a11y dictates that the author
+			// needs to be able to put them in the document in tab-order, but this algorithm requires that
+			// client be last.    TODO: remove for 2.0, all dijit client code already sends children as last item.
+			children = array.filter(children, function(item){ return item.region != "center" && item.layoutAlign != "client"; })
+				.concat(array.filter(children, function(item){ return item.region == "center" || item.layoutAlign == "client"; }));
+
+			// set positions/sizes
+			array.forEach(children, function(child){
+				var elm = child.domNode,
+					pos = (child.region || child.layoutAlign);
+				if(!pos){
+					throw new Error("No region setting for " + child.id)
+				}
+
+				// set elem to upper left corner of unused space; may move it later
+				var elmStyle = elm.style;
+				elmStyle.left = dim.l+"px";
+				elmStyle.top = dim.t+"px";
+				elmStyle.position = "absolute";
+
+				domClass.add(elm, "dijitAlign" + capitalize(pos));
+
+				// Size adjustments to make to this child widget
+				var sizeSetting = {};
+
+				// Check for optional size adjustment due to splitter drag (height adjustment for top/bottom align
+				// panes and width adjustment for left/right align panes.
+				if(changedRegionId && changedRegionId == child.id){
+					sizeSetting[child.region == "top" || child.region == "bottom" ? "h" : "w"] = changedRegionSize;
+				}
+
+				if(pos == "leading"){
+					pos = child.isLeftToRight() ? "left" : "right";
+				}
+				if(pos == "trailing"){
+					pos = child.isLeftToRight() ? "right" : "left";
+				}
+
+				// set size && adjust record of remaining space.
+				// note that setting the width of a <div> may affect its height.
+				if(pos == "top" || pos == "bottom"){
+					sizeSetting.w = dim.w;
+					size(child, sizeSetting);
+					dim.h -= child.h;
+					if(pos == "top"){
+						dim.t += child.h;
+					}else{
+						elmStyle.top = dim.t + dim.h + "px";
+					}
+				}else if(pos == "left" || pos == "right"){
+					sizeSetting.h = dim.h;
+					size(child, sizeSetting);
+					dim.w -= child.w;
+					if(pos == "left"){
+						dim.l += child.w;
+					}else{
+						elmStyle.left = dim.l + dim.w + "px";
+					}
+				}else if(pos == "client" || pos == "center"){
+					size(child, dim);
+				}
+			});
+		}
+	};
+
+	lang.setObject("dijit.layout.utils", utils);	// remove for 2.0
+
+	return utils;
+});
diff --git a/src/main/resources/static/dijit/main.js b/src/main/resources/static/dijit/main.js
new file mode 100644
index 0000000000000000000000000000000000000000..43cc44cac684a02a4708ed2e9a34f5051691aa6b
--- /dev/null
+++ b/src/main/resources/static/dijit/main.js
@@ -0,0 +1,16 @@
+define([
+	"dojo/_base/kernel"
+], function(dojo){
+	// module:
+	//		dijit/main
+
+/*=====
+return {
+	// summary:
+	//		The dijit package main module.
+	//		Deprecated.   Users should access individual modules (ex: dijit/registry) directly.
+};
+=====*/
+
+	return dojo.dijit;
+});
diff --git a/src/main/resources/static/dijit/nls/ar/common.js b/src/main/resources/static/dijit/nls/ar/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..eefe10f215c48e3abf213dd7ea34a3b2e02046f3
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ar/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "حسنا",
+	buttonCancel: "الغاء",
+	buttonSave: "ح�ظ",
+	itemClose: "اغلاق"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ar/loading.js b/src/main/resources/static/dijit/nls/ar/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..564c19b74a0cb936f5ad926f82330da2703c601c
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ar/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "جاري التحميل...",
+	errorState: "ع�وا، حدث خطأ"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/az/common.js b/src/main/resources/static/dijit/nls/az/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..44bea5868f3d02838ccf62fcb59ec030517649e8
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/az/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	"buttonOk" : "Ok",
+	"buttonCancel" : "Ləğv et",
+	"buttonSave" : "Saxla",
+	"itemClose" : "BaÄŸla"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/az/loading.js b/src/main/resources/static/dijit/nls/az/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..26818e2cd78eb60f92c3b40c32c55b42fdfde995
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/az/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	"loadingState" : "Yüklənir...",
+	"errorState" : "Problem yarandı"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/bg/common.js b/src/main/resources/static/dijit/nls/bg/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..156167770eedcefe66e91f3fbffc0701cdde9eb5
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/bg/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "ОК",
+	buttonCancel: "Отмени",
+	buttonSave: "Запази",
+	itemClose: "Затвори"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/bg/loading.js b/src/main/resources/static/dijit/nls/bg/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..3fe6f8ad4da1f7fa120d6b8cf7cf26fbb169ca43
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/bg/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Зареждане...",
+	errorState: "Съжал�ваме, възникна грешка"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/bs/common.js b/src/main/resources/static/dijit/nls/bs/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..28e0d831887632d2e20e258a6377d34c0cb3c954
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/bs/common.js
@@ -0,0 +1,9 @@
+define({      
+//begin v1.x content
+	buttonOk: "OK",
+	buttonCancel: "Odustani",
+	buttonSave: "Spremi",
+	itemClose: "Zatvori"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/nls/bs/loading.js b/src/main/resources/static/dijit/nls/bs/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..09706770bff70ad6d93e0d626cfc159b489b03d8
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/bs/loading.js
@@ -0,0 +1,7 @@
+define({      
+//begin v1.x content
+	loadingState: "U�itavanje...",
+	errorState: "Izvinite, došlo je do greške"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/nls/ca/common.js b/src/main/resources/static/dijit/nls/ca/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..60041a8833f9ca57b7e3168a218d352be67e8dc8
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ca/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "D'acord",
+	buttonCancel: "Cancel·la",
+	buttonSave: "Desa",
+	itemClose: "Tanca"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ca/loading.js b/src/main/resources/static/dijit/nls/ca/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..6efcf91d8efc403a7013dce98a7d15a66f57bb62
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ca/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "S'està carregant...",
+	errorState: "Ens sap greu. S'ha produït un error."
+})
+);
diff --git a/src/main/resources/static/dijit/nls/common.js b/src/main/resources/static/dijit/nls/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a31c60031834201ec18ad114b467bf5d27c46f3
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/common.js
@@ -0,0 +1,49 @@
+define({ root:
+//begin v1.x content
+({
+	buttonOk: "OK",
+	buttonCancel: "Cancel",
+	buttonSave: "Save",
+	itemClose: "Close"
+})
+//end v1.x content
+,
+"bs": true,
+"mk": true,
+"sr": true,
+"zh": true,
+"zh-tw": true,
+"uk": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"id": true,
+"hu": true,
+"hr": true,
+"he": true,
+"fr": true,
+"fi": true,
+"eu": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"bg": true,
+"az": true,
+"ar": true
+});
diff --git a/src/main/resources/static/dijit/nls/cs/common.js b/src/main/resources/static/dijit/nls/cs/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..82ec2a501d72d044c4b183c1e1399043ee9beb85
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/cs/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Storno",
+	buttonSave: "Uložit",
+	itemClose: "Zavřít"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/cs/loading.js b/src/main/resources/static/dijit/nls/cs/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3324928da0bfda30c07eb53557d43c27190d9e6
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/cs/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Probíhá na�ítání...",
+	errorState: "Omlouváme se, došlo k chybě"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/da/common.js b/src/main/resources/static/dijit/nls/da/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..2ede91677eb4e76c8d74fa4cc112d1af8c4aed95
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/da/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Annullér",
+	buttonSave: "Gem",
+	itemClose: "Luk"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/da/loading.js b/src/main/resources/static/dijit/nls/da/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..103ce8ce82b9cb54b790fb5d34419a25f0abda83
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/da/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Indlæser...",
+	errorState: "Der er opstået en fejl"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/de/common.js b/src/main/resources/static/dijit/nls/de/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..df36d76d3496daa3ad4b92511a1890f8d41d8e9b
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/de/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Abbrechen",
+	buttonSave: "Speichern",
+	itemClose: "Schließen"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/de/loading.js b/src/main/resources/static/dijit/nls/de/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..dc5926f83c2f3dc606dea94fa503174c075c887d
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/de/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Wird geladen...",
+	errorState: "Es ist ein Fehler aufgetreten."
+})
+);
diff --git a/src/main/resources/static/dijit/nls/el/common.js b/src/main/resources/static/dijit/nls/el/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0097ca41ed39ffd1f3c957e710484b20309dd4c
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/el/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "ΟΚ",
+	buttonCancel: "Ακ��ωση",
+	buttonSave: "Αποθήκευση",
+	itemClose: "Κλείσιμο"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/el/loading.js b/src/main/resources/static/dijit/nls/el/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..3bb46ad49a512110050617170b74af7b9b29efa6
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/el/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Φό�τωση...",
+	errorState: "Σας ζητο�με συγνώμη, πα�ουσιάστηκε σφάλμα"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/es/common.js b/src/main/resources/static/dijit/nls/es/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..b2602d148698ffbf90ae107720b20c2824a6d147
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/es/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "Aceptar",
+	buttonCancel: "Cancelar",
+	buttonSave: "Guardar",
+	itemClose: "Cerrar"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/es/loading.js b/src/main/resources/static/dijit/nls/es/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..42b4949d3b5a4b0f98fc07ad1c2ba17445007f23
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/es/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Cargando...",
+	errorState: "Lo siento, se ha producido un error"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/eu/common.js b/src/main/resources/static/dijit/nls/eu/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..3af1ab1545dc99b95d6ae71d60c19d0098b32095
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/eu/common.js
@@ -0,0 +1,9 @@
+define({      
+//begin v1.x content
+	buttonOk: "Ados",
+	buttonCancel: "Utzi",
+	buttonSave: "Gorde",
+	itemClose: "Itxi"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/nls/eu/loading.js b/src/main/resources/static/dijit/nls/eu/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..2ed59df34057ad7c289f595d80412bf027b14cd3
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/eu/loading.js
@@ -0,0 +1,7 @@
+define({      
+//begin v1.x content
+	loadingState: "Kargatzen...",
+	errorState: "Barkatu, errorea gertatu da"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/nls/fi/common.js b/src/main/resources/static/dijit/nls/fi/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..405729ed71ac07ad1d590d64d016494ccecceecb
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/fi/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Peruuta",
+	buttonSave: "Tallenna",
+	itemClose: "Sulje"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/fi/loading.js b/src/main/resources/static/dijit/nls/fi/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..2306af7026fc67243d50c2959ac2b0fd7d83857b
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/fi/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Lataus on meneillään...",
+	errorState: "On ilmennyt virhe."
+})
+);
diff --git a/src/main/resources/static/dijit/nls/fr/common.js b/src/main/resources/static/dijit/nls/fr/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..edf4192d8d4f524ff5072c27a5c906da9342f629
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/fr/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Annuler",
+	buttonSave: "Enregistrer",
+	itemClose: "Fermer"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/fr/loading.js b/src/main/resources/static/dijit/nls/fr/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa5cbde9ee293777218894732f70ec365c780e98
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/fr/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Chargement...",
+	errorState: "Une erreur est survenue"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/he/common.js b/src/main/resources/static/dijit/nls/he/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..94b04d0ae376a674277625820e1a5b06047ab0c0
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/he/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "�ישור",
+	buttonCancel: "ביטול",
+	buttonSave: "שמירה",
+	itemClose: "סגירה"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/he/loading.js b/src/main/resources/static/dijit/nls/he/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5cc1f6097a00e45dc6fab7f1bc6b3c4b81e01a9
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/he/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "טעינה...�",
+	errorState: "�ירעה שגי�ה"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/hr/common.js b/src/main/resources/static/dijit/nls/hr/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..efdd4cbb381b7eee9c70a607a60d04cbfd9f2884
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/hr/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Opoziv",
+	buttonSave: "Spremi",
+	itemClose: "Zatvori"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/hr/loading.js b/src/main/resources/static/dijit/nls/hr/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ea326cde2c6709b89d4728d72086767f6de511a
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/hr/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "U�itavanje...",
+	errorState: "Žao nam je, došlo je do greške"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/hu/common.js b/src/main/resources/static/dijit/nls/hu/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..0b98e771ec8ac14a1505121900cb97e0f5ea7cba
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/hu/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Mégse",
+	buttonSave: "Mentés",
+	itemClose: "Bezárás"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/hu/loading.js b/src/main/resources/static/dijit/nls/hu/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..71167332834c10289e1c39e8e3fd3058a90a7ea7
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/hu/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Betöltés...",
+	errorState: "Sajnálom, hiba történt"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/id/common.js b/src/main/resources/static/dijit/nls/id/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..fd869820573764dfd1fc9c24c03eb898c26bbd75
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/id/common.js
@@ -0,0 +1,9 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Batal",
+	buttonSave: "Simpan",
+	itemClose: "Tutup"
+})
+);
+
diff --git a/src/main/resources/static/dijit/nls/id/loading.js b/src/main/resources/static/dijit/nls/id/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..453ff734ae32ba5b40895f32980edb9bc9e76755
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/id/loading.js
@@ -0,0 +1,7 @@
+define(
+({
+	loadingState: "Memuatkan...",
+	errorState: "Maaf, terjadi kesalahan"
+})
+);
+
diff --git a/src/main/resources/static/dijit/nls/it/common.js b/src/main/resources/static/dijit/nls/it/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..30943b58d0fcc17e018b36b54370579c96d57d34
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/it/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "Ok",
+	buttonCancel: "Annulla",
+	buttonSave: "Salva",
+	itemClose: "Chiudi"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/it/loading.js b/src/main/resources/static/dijit/nls/it/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..4acf89ea31887e2dc4181e3d8c6fc02de12f65ad
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/it/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Caricamento in corso...",
+	errorState: "Si è verificato un errore"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ja/common.js b/src/main/resources/static/dijit/nls/ja/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..5fc5156a33b2b7e4af225efd779d02f795944ddd
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ja/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "キャンセル",
+	buttonSave: "�存",
+	itemClose: "閉�る"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ja/loading.js b/src/main/resources/static/dijit/nls/ja/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..700b287972f593063257c52cb2a1775769112843
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ja/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "ロード中...",
+	errorState: "エラー�発生����。"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/kk/common.js b/src/main/resources/static/dijit/nls/kk/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..9cf8cf57e1d8510296f3f10772e05ed2cd111851
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/kk/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Болдырмау",
+	buttonSave: "Сақтау",
+	itemClose: "Жабу"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/kk/loading.js b/src/main/resources/static/dijit/nls/kk/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..00bb8573503b073f9d79390dd1e185069288946b
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/kk/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Қотарылуда...",
+	errorState: "Кешіріңіз, қате орын алды"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ko/common.js b/src/main/resources/static/dijit/nls/ko/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..847f14e07b4fde65e220899b9e70487a22e97e9a
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ko/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "확�",
+	buttonCancel: "취소",
+	buttonSave: "저장",
+	itemClose: "닫기"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ko/loading.js b/src/main/resources/static/dijit/nls/ko/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..c9c1c048eb5e11fb914f9768e2c45fd3b9eef925
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ko/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "로드 중...",
+	errorState: "죄송합니다. 오류가 발�했습니다."
+})
+);
diff --git a/src/main/resources/static/dijit/nls/loading.js b/src/main/resources/static/dijit/nls/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..d755082823f818d9f3533d338c72f07d0b126d3d
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/loading.js
@@ -0,0 +1,47 @@
+define({ root:
+//begin v1.x content
+({
+	loadingState: "Loading...",
+	errorState: "Sorry, an error occurred"
+})
+//end v1.x content
+,
+"bs": true,
+"mk": true,
+"sr": true,
+"zh": true,
+"zh-tw": true,
+"uk": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"id": true,
+"hu": true,
+"hr": true,
+"he": true,
+"fr": true,
+"fi": true,
+"eu": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"bg": true,
+"az": true,
+"ar": true
+});
diff --git a/src/main/resources/static/dijit/nls/mk/common.js b/src/main/resources/static/dijit/nls/mk/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..198424995cfae4f0b7c09fd581f47ae21a706719
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/mk/common.js
@@ -0,0 +1,9 @@
+define({      
+//begin v1.x content
+	buttonOk: "OK",
+	buttonCancel: "Откажи",
+	buttonSave: "Зачувај",
+	itemClose: "Затвори"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/nls/mk/loading.js b/src/main/resources/static/dijit/nls/mk/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..37db3f93840c6643c139485e3ccc6c8eb201bc4a
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/mk/loading.js
@@ -0,0 +1,7 @@
+define({      
+//begin v1.x content
+	loadingState: "Вчитување...",
+	errorState: "Се појави грешка"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/nls/nb/common.js b/src/main/resources/static/dijit/nls/nb/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..096cfe5e4cb381fc0363f2d9802bbde3017af0ce
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/nb/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Avbryt",
+	buttonSave: "Lagre",
+	itemClose: "Lukk"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/nb/loading.js b/src/main/resources/static/dijit/nls/nb/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..e2f8f775d9cd53ea4cdf6d254acf4784ab557982
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/nb/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Laster inn...",
+	errorState: "Det oppsto en feil"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/nl/common.js b/src/main/resources/static/dijit/nls/nl/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..25ead1089afa0059cfcd2d9ecd373fc558f30896
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/nl/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Annuleren",
+	buttonSave: "Opslaan",
+	itemClose: "Sluiten"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/nl/loading.js b/src/main/resources/static/dijit/nls/nl/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..d91cfbe0c2daf7362229b03ca1042be179e3c23c
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/nl/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Bezig met laden...",
+	errorState: "Er is een fout opgetreden"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/pl/common.js b/src/main/resources/static/dijit/nls/pl/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..8021edacb4663b5598d0c4f5d14018a99ae770af
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/pl/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Anuluj",
+	buttonSave: "Zapisz",
+	itemClose: "Zamknij"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/pl/loading.js b/src/main/resources/static/dijit/nls/pl/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..fff2dc1be6060cbc5d24daf190bb5f27de7f8e22
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/pl/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "�adowanie...",
+	errorState: "Niestety, wystąpił błąd"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/pt-pt/common.js b/src/main/resources/static/dijit/nls/pt-pt/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..7780946488308d07ea67a80272d4a5044c5de426
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/pt-pt/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Cancelar",
+	buttonSave: "Guardar",
+	itemClose: "Fechar"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/pt-pt/loading.js b/src/main/resources/static/dijit/nls/pt-pt/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..0c6f4652f6591d8cb7ce121676d55d6120b3867b
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/pt-pt/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "A carregar...",
+	errorState: "Lamentamos, mas ocorreu um erro"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/pt/common.js b/src/main/resources/static/dijit/nls/pt/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5fd2e34c807827fc9586897b2d22f197861611c
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/pt/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Cancelar",
+	buttonSave: "Salvar",
+	itemClose: "Fechar"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/pt/loading.js b/src/main/resources/static/dijit/nls/pt/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..a7fe7c8a32fca037c40e8bc51046d4f61c45dc07
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/pt/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Carregando...",
+	errorState: "Desculpe, ocorreu um erro"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ro/common.js b/src/main/resources/static/dijit/nls/ro/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..d81cd413baea1e251bdc9e671a1a7512f32e7ec4
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ro/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Anulare",
+	buttonSave: "Salvare",
+	itemClose: "ÃŽnchidere"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ro/loading.js b/src/main/resources/static/dijit/nls/ro/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..c88838e2468f3ee0753ef58640f369419d5bb598
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ro/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Încărcare...",
+	errorState: "Ne pare rău, a apărut o eroare "
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ru/common.js b/src/main/resources/static/dijit/nls/ru/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..8c69199fe5ef00a54eebf731ffa01fd0194357ac
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ru/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Отмена",
+	buttonSave: "Сохранить",
+	itemClose: "Закрыть"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/ru/loading.js b/src/main/resources/static/dijit/nls/ru/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1bc1faf57039f30aba601abbd20c82fe9938ed3
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/ru/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Загрузка...",
+	errorState: "Извините, возникла ошибка"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/sk/common.js b/src/main/resources/static/dijit/nls/sk/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..4bf3bd60bf745a5b4ba11ec9fffb13a6c9834f18
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/sk/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Zrušiť",
+	buttonSave: "Uložiť",
+	itemClose: "Zatvoriť"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/sk/loading.js b/src/main/resources/static/dijit/nls/sk/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..044f58059354ddbf37cb6b25c5801548a28836db
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/sk/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Zavádza sa...",
+	errorState: "Ľutujeme, ale vyskytla sa chyba"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/sl/common.js b/src/main/resources/static/dijit/nls/sl/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..31df38b52f69df1397669b25b9eff756e3923f01
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/sl/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "V redu",
+	buttonCancel: "Prekli�i",
+	buttonSave: "Shrani",
+	itemClose: "Zapri"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/sl/loading.js b/src/main/resources/static/dijit/nls/sl/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..d1f5ee6cea3984dc4e6b93d5864b355b592fce65
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/sl/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Nalaganje ...",
+	errorState: "Oprostite, prišlo je do napake."
+})
+);
diff --git a/src/main/resources/static/dijit/nls/sr/common.js b/src/main/resources/static/dijit/nls/sr/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..ee2417eebf316e6540c5afd4db2ba44029f475bb
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/sr/common.js
@@ -0,0 +1,9 @@
+define({      
+//begin v1.x content
+	buttonOk: "U redu",
+	buttonCancel: "Otkaži",
+	buttonSave: "Sa�uvaj",
+	itemClose: "Zatvori"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/nls/sr/loading.js b/src/main/resources/static/dijit/nls/sr/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..03a709b3f0f270ea207016ad5a67e3d274c9bb9b
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/sr/loading.js
@@ -0,0 +1,7 @@
+define({      
+//begin v1.x content
+	loadingState: "U�itavanje...",
+	errorState: "Nažalost, došlo je do greške"
+//end v1.x content
+});
+
diff --git a/src/main/resources/static/dijit/nls/sv/common.js b/src/main/resources/static/dijit/nls/sv/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..0a372f4e3aed66a6c6b3d5f8725cd3c9419b7057
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/sv/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Avbryt",
+	buttonSave: "Spara",
+	itemClose: "Stäng"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/sv/loading.js b/src/main/resources/static/dijit/nls/sv/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..e9f9bf76972ac9b598c48bd4624c53fb57d79b73
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/sv/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Läser in...",
+	errorState: "Det har inträffat ett fel."
+})
+);
diff --git a/src/main/resources/static/dijit/nls/th/common.js b/src/main/resources/static/dijit/nls/th/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..d364693200af02fafbad037e56139baf65b97129
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/th/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "ต�ลง",
+	buttonCancel: "ย�เลิ�",
+	buttonSave: "บันทึ�",
+	itemClose: "ปิด"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/th/loading.js b/src/main/resources/static/dijit/nls/th/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..d9b472337557aa72f0529e7acad3a84ebe3bc237
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/th/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "�ำลังโหลด...",
+	errorState: "ขออภัย เ�ิดข้อผิดพลาด"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/tr/common.js b/src/main/resources/static/dijit/nls/tr/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..0c203cc9a7142ebc24a3cdb1c35dd5a0e8ba6ad9
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/tr/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "Tamam",
+	buttonCancel: "Ä°ptal",
+	buttonSave: "Kaydet",
+	itemClose: "Kapat"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/tr/loading.js b/src/main/resources/static/dijit/nls/tr/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..9bccb3e68949ae50a2cf6da069f1c21469afdea2
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/tr/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Yükleniyor...",
+	errorState: "Üzgünüz, bir hata oluştu"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/uk/common.js b/src/main/resources/static/dijit/nls/uk/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..1239aa1cd8fa4f19bf90e84ede2fde6b853f69e1
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/uk/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "OK",
+	buttonCancel: "Ска�увати",
+	buttonSave: "Зберегти",
+	itemClose: "Закрити"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/uk/loading.js b/src/main/resources/static/dijit/nls/uk/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..6f74f7415780e2fabb923cfee5ae1a9c80aa5df3
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/uk/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "Завантаженн�...",
+	errorState: "Стала�� помилка"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/zh-tw/common.js b/src/main/resources/static/dijit/nls/zh-tw/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..802ff9969540392b5b0e53171ba5072f81a945a8
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/zh-tw/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "確定",
+	buttonCancel: "�消",
+	buttonSave: "儲存",
+	itemClose: "關閉"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/zh-tw/loading.js b/src/main/resources/static/dijit/nls/zh-tw/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a2573e1f5c562f945ba0e87d9e530638619b67f
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/zh-tw/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "載入中...",
+	errorState: "抱歉，發生錯誤"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/zh/common.js b/src/main/resources/static/dijit/nls/zh/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..ba0b13c6f8779fde7427cdb7eb6aa7cc2b602c86
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/zh/common.js
@@ -0,0 +1,8 @@
+define(
+({
+	buttonOk: "确定",
+	buttonCancel: "�消",
+	buttonSave: "�存",
+	itemClose: "关闭"
+})
+);
diff --git a/src/main/resources/static/dijit/nls/zh/loading.js b/src/main/resources/static/dijit/nls/zh/loading.js
new file mode 100644
index 0000000000000000000000000000000000000000..0202c210ff7c5b1f42adb8502243a4f705ba7dc2
--- /dev/null
+++ b/src/main/resources/static/dijit/nls/zh/loading.js
@@ -0,0 +1,6 @@
+define(
+({
+	loadingState: "正在加载...",
+	errorState: "对�起，�生了错误"
+})
+);
diff --git a/src/main/resources/static/dijit/package.json b/src/main/resources/static/dijit/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..3185daad04dde12c5d385279fb98ac3ca80d054e
--- /dev/null
+++ b/src/main/resources/static/dijit/package.json
@@ -0,0 +1,21 @@
+{
+	"name": "dijit",
+	"version": "1.12.0-pre",
+	"directories": {
+		"lib": "."
+	},
+	"main": "main",
+	"dependencies": {
+		"dojo": "1.12.0-pre"
+	},
+	"description": "Dijit provides a complete collection of user interface controls based on Dojo, giving you the power to create web applications that are highly optimized for usability, performance, internationalization, accessibility, but above all deliver an incredible user experience.",
+	"license" : "BSD-3-Clause OR AFL-2.1",
+	"bugs": "http://bugs.dojotoolkit.org/",
+	"keywords": [ "JavaScript", "Dojo", "Widget" ],
+	"homepage": "http://dojotoolkit.org/",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/dojo/dijit.git"
+	},
+	"dojoBuild": "dijit.profile.js"
+}
diff --git a/src/main/resources/static/dijit/place.js b/src/main/resources/static/dijit/place.js
new file mode 100644
index 0000000000000000000000000000000000000000..f2d17c489cca5a4f66e54874249b2efeb4162c8e
--- /dev/null
+++ b/src/main/resources/static/dijit/place.js
@@ -0,0 +1,407 @@
+define([
+	"dojo/_base/array", // array.forEach array.map array.some
+	"dojo/dom-geometry", // domGeometry.position
+	"dojo/dom-style", // domStyle.getComputedStyle
+	"dojo/_base/kernel", // kernel.deprecated
+	"dojo/_base/window", // win.body
+	"./Viewport", // getEffectiveBox
+	"./main"	// dijit (defining dijit.place to match API doc)
+], function(array, domGeometry, domStyle, kernel, win, Viewport, dijit){
+
+	// module:
+	//		dijit/place
+
+
+	function _place(/*DomNode*/ node, choices, layoutNode, aroundNodeCoords){
+		// summary:
+		//		Given a list of spots to put node, put it at the first spot where it fits,
+		//		of if it doesn't fit anywhere then the place with the least overflow
+		// choices: Array
+		//		Array of elements like: {corner: 'TL', pos: {x: 10, y: 20} }
+		//		Above example says to put the top-left corner of the node at (10,20)
+		// layoutNode: Function(node, aroundNodeCorner, nodeCorner, size)
+		//		for things like tooltip, they are displayed differently (and have different dimensions)
+		//		based on their orientation relative to the parent.	 This adjusts the popup based on orientation.
+		//		It also passes in the available size for the popup, which is useful for tooltips to
+		//		tell them that their width is limited to a certain amount.	 layoutNode() may return a value expressing
+		//		how much the popup had to be modified to fit into the available space.	 This is used to determine
+		//		what the best placement is.
+		// aroundNodeCoords: Object
+		//		Size of aroundNode, ex: {w: 200, h: 50}
+
+		// get {x: 10, y: 10, w: 100, h:100} type obj representing position of
+		// viewport over document
+		var view = Viewport.getEffectiveBox(node.ownerDocument);
+
+		// This won't work if the node is inside a <div style="position: relative">,
+		// so reattach it to <body>.	 (Otherwise, the positioning will be wrong
+		// and also it might get cutoff.)
+		if(!node.parentNode || String(node.parentNode.tagName).toLowerCase() != "body"){
+			win.body(node.ownerDocument).appendChild(node);
+		}
+
+		var best = null;
+		array.some(choices, function(choice){
+			var corner = choice.corner;
+			var pos = choice.pos;
+			var overflow = 0;
+
+			// calculate amount of space available given specified position of node
+			var spaceAvailable = {
+				w: {
+					'L': view.l + view.w - pos.x,
+					'R': pos.x - view.l,
+					'M': view.w
+				}[corner.charAt(1)],
+				h: {
+					'T': view.t + view.h - pos.y,
+					'B': pos.y - view.t,
+					'M': view.h
+				}[corner.charAt(0)]
+			};
+
+			// Clear left/right position settings set earlier so they don't interfere with calculations,
+			// specifically when layoutNode() (a.k.a. Tooltip.orient()) measures natural width of Tooltip
+			var s = node.style;
+			s.left = s.right = "auto";
+
+			// configure node to be displayed in given position relative to button
+			// (need to do this in order to get an accurate size for the node, because
+			// a tooltip's size changes based on position, due to triangle)
+			if(layoutNode){
+				var res = layoutNode(node, choice.aroundCorner, corner, spaceAvailable, aroundNodeCoords);
+				overflow = typeof res == "undefined" ? 0 : res;
+			}
+
+			// get node's size
+			var style = node.style;
+			var oldDisplay = style.display;
+			var oldVis = style.visibility;
+			if(style.display == "none"){
+				style.visibility = "hidden";
+				style.display = "";
+			}
+			var bb = domGeometry.position(node);
+			style.display = oldDisplay;
+			style.visibility = oldVis;
+
+			// coordinates and size of node with specified corner placed at pos,
+			// and clipped by viewport
+			var
+				startXpos = {
+					'L': pos.x,
+					'R': pos.x - bb.w,
+					'M': Math.max(view.l, Math.min(view.l + view.w, pos.x + (bb.w >> 1)) - bb.w) // M orientation is more flexible
+				}[corner.charAt(1)],
+				startYpos = {
+					'T': pos.y,
+					'B': pos.y - bb.h,
+					'M': Math.max(view.t, Math.min(view.t + view.h, pos.y + (bb.h >> 1)) - bb.h)
+				}[corner.charAt(0)],
+				startX = Math.max(view.l, startXpos),
+				startY = Math.max(view.t, startYpos),
+				endX = Math.min(view.l + view.w, startXpos + bb.w),
+				endY = Math.min(view.t + view.h, startYpos + bb.h),
+				width = endX - startX,
+				height = endY - startY;
+
+			overflow += (bb.w - width) + (bb.h - height);
+
+			if(best == null || overflow < best.overflow){
+				best = {
+					corner: corner,
+					aroundCorner: choice.aroundCorner,
+					x: startX,
+					y: startY,
+					w: width,
+					h: height,
+					overflow: overflow,
+					spaceAvailable: spaceAvailable
+				};
+			}
+
+			return !overflow;
+		});
+
+		// In case the best position is not the last one we checked, need to call
+		// layoutNode() again.
+		if(best.overflow && layoutNode){
+			layoutNode(node, best.aroundCorner, best.corner, best.spaceAvailable, aroundNodeCoords);
+		}
+
+		// And then position the node.  Do this last, after the layoutNode() above
+		// has sized the node, due to browser quirks when the viewport is scrolled
+		// (specifically that a Tooltip will shrink to fit as though the window was
+		// scrolled to the left).
+
+		var top = best.y,
+			side = best.x,
+			body = win.body(node.ownerDocument);
+
+		if(/relative|absolute/.test(domStyle.get(body, "position"))){
+			// compensate for margin on <body>, see #16148
+			top -= domStyle.get(body, "marginTop");
+			side -= domStyle.get(body, "marginLeft");
+		}
+
+		var s = node.style;
+		s.top = top + "px";
+		s.left = side + "px";
+		s.right = "auto";	// needed for FF or else tooltip goes to far left
+
+		return best;
+	}
+
+	var reverse = {
+		// Map from corner to kitty-corner
+		"TL": "BR",
+		"TR": "BL",
+		"BL": "TR",
+		"BR": "TL"
+	};
+
+	var place = {
+		// summary:
+		//		Code to place a DOMNode relative to another DOMNode.
+		//		Load using require(["dijit/place"], function(place){ ... }).
+
+		at: function(node, pos, corners, padding, layoutNode){
+			// summary:
+			//		Positions node kitty-corner to the rectangle centered at (pos.x, pos.y) with width and height of
+			//		padding.x * 2 and padding.y * 2, or zero if padding not specified.  Picks first corner in corners[]
+			//		where node is fully visible, or the corner where it's most visible.
+			//
+			//		Node is assumed to be absolutely or relatively positioned.
+			// node: DOMNode
+			//		The node to position
+			// pos: dijit/place.__Position
+			//		Object like {x: 10, y: 20}
+			// corners: String[]
+			//		Array of Strings representing order to try corners of the node in, like ["TR", "BL"].
+			//		Possible values are:
+			//
+			//		- "BL" - bottom left
+			//		- "BR" - bottom right
+			//		- "TL" - top left
+			//		- "TR" - top right
+			// padding: dijit/place.__Position?
+			//		Optional param to set padding, to put some buffer around the element you want to position.
+			//		Defaults to zero.
+			// layoutNode: Function(node, aroundNodeCorner, nodeCorner)
+			//		For things like tooltip, they are displayed differently (and have different dimensions)
+			//		based on their orientation relative to the parent.  This adjusts the popup based on orientation.
+			// example:
+			//		Try to place node's top right corner at (10,20).
+			//		If that makes node go (partially) off screen, then try placing
+			//		bottom left corner at (10,20).
+			//	|	place(node, {x: 10, y: 20}, ["TR", "BL"])
+			var choices = array.map(corners, function(corner){
+				var c = {
+					corner: corner,
+					aroundCorner: reverse[corner],	// so TooltipDialog.orient() gets aroundCorner argument set
+					pos: {x: pos.x,y: pos.y}
+				};
+				if(padding){
+					c.pos.x += corner.charAt(1) == 'L' ? padding.x : -padding.x;
+					c.pos.y += corner.charAt(0) == 'T' ? padding.y : -padding.y;
+				}
+				return c;
+			});
+
+			return _place(node, choices, layoutNode);
+		},
+
+		around: function(
+			/*DomNode*/		node,
+			/*DomNode|dijit/place.__Rectangle*/ anchor,
+			/*String[]*/	positions,
+			/*Boolean*/		leftToRight,
+			/*Function?*/	layoutNode){
+
+			// summary:
+			//		Position node adjacent or kitty-corner to anchor
+			//		such that it's fully visible in viewport.
+			// description:
+			//		Place node such that corner of node touches a corner of
+			//		aroundNode, and that node is fully visible.
+			// anchor:
+			//		Either a DOMNode or a rectangle (object with x, y, width, height).
+			// positions:
+			//		Ordered list of positions to try matching up.
+			//
+			//		- before: places drop down to the left of the anchor node/widget, or to the right in the case
+			//			of RTL scripts like Hebrew and Arabic; aligns either the top of the drop down
+			//			with the top of the anchor, or the bottom of the drop down with bottom of the anchor.
+			//		- after: places drop down to the right of the anchor node/widget, or to the left in the case
+			//			of RTL scripts like Hebrew and Arabic; aligns either the top of the drop down
+			//			with the top of the anchor, or the bottom of the drop down with bottom of the anchor.
+			//		- before-centered: centers drop down to the left of the anchor node/widget, or to the right
+			//			in the case of RTL scripts like Hebrew and Arabic
+			//		- after-centered: centers drop down to the right of the anchor node/widget, or to the left
+			//			in the case of RTL scripts like Hebrew and Arabic
+			//		- above-centered: drop down is centered above anchor node
+			//		- above: drop down goes above anchor node, left sides aligned
+			//		- above-alt: drop down goes above anchor node, right sides aligned
+			//		- below-centered: drop down is centered above anchor node
+			//		- below: drop down goes below anchor node
+			//		- below-alt: drop down goes below anchor node, right sides aligned
+			// layoutNode: Function(node, aroundNodeCorner, nodeCorner)
+			//		For things like tooltip, they are displayed differently (and have different dimensions)
+			//		based on their orientation relative to the parent.	 This adjusts the popup based on orientation.
+			// leftToRight:
+			//		True if widget is LTR, false if widget is RTL.   Affects the behavior of "above" and "below"
+			//		positions slightly.
+			// example:
+			//	|	placeAroundNode(node, aroundNode, ['below', 'above-alt']);
+			//		This will try to position node such that node's top-left corner is at the same position
+			//		as the bottom left corner of the aroundNode (ie, put node below
+			//		aroundNode, with left edges aligned).	If that fails it will try to put
+			//		the bottom-right corner of node where the top right corner of aroundNode is
+			//		(ie, put node above aroundNode, with right edges aligned)
+			//
+
+			// If around is a DOMNode (or DOMNode id), convert to coordinates.
+			var aroundNodePos;
+			if(typeof anchor == "string" || "offsetWidth" in anchor || "ownerSVGElement" in anchor){
+				aroundNodePos = domGeometry.position(anchor, true);
+
+				// For above and below dropdowns, subtract width of border so that popup and aroundNode borders
+				// overlap, preventing a double-border effect.  Unfortunately, difficult to measure the border
+				// width of either anchor or popup because in both cases the border may be on an inner node.
+				if(/^(above|below)/.test(positions[0])){
+					var anchorBorder = domGeometry.getBorderExtents(anchor),
+						anchorChildBorder = anchor.firstChild ? domGeometry.getBorderExtents(anchor.firstChild) : {t:0,l:0,b:0,r:0},
+						nodeBorder =  domGeometry.getBorderExtents(node),
+						nodeChildBorder = node.firstChild ? domGeometry.getBorderExtents(node.firstChild) : {t:0,l:0,b:0,r:0};
+					aroundNodePos.y += Math.min(anchorBorder.t + anchorChildBorder.t, nodeBorder.t + nodeChildBorder.t);
+					aroundNodePos.h -=  Math.min(anchorBorder.t + anchorChildBorder.t, nodeBorder.t+ nodeChildBorder.t) +
+						Math.min(anchorBorder.b + anchorChildBorder.b, nodeBorder.b + nodeChildBorder.b);
+				}
+			}else{
+				aroundNodePos = anchor;
+			}
+
+			// Compute position and size of visible part of anchor (it may be partially hidden by ancestor nodes w/scrollbars)
+			if(anchor.parentNode){
+				// ignore nodes between position:relative and position:absolute
+				var sawPosAbsolute = domStyle.getComputedStyle(anchor).position == "absolute";
+				var parent = anchor.parentNode;
+				while(parent && parent.nodeType == 1 && parent.nodeName != "BODY"){  //ignoring the body will help performance
+					var parentPos = domGeometry.position(parent, true),
+						pcs = domStyle.getComputedStyle(parent);
+					if(/relative|absolute/.test(pcs.position)){
+						sawPosAbsolute = false;
+					}
+					if(!sawPosAbsolute && /hidden|auto|scroll/.test(pcs.overflow)){
+						var bottomYCoord = Math.min(aroundNodePos.y + aroundNodePos.h, parentPos.y + parentPos.h);
+						var rightXCoord = Math.min(aroundNodePos.x + aroundNodePos.w, parentPos.x + parentPos.w);
+						aroundNodePos.x = Math.max(aroundNodePos.x, parentPos.x);
+						aroundNodePos.y = Math.max(aroundNodePos.y, parentPos.y);
+						aroundNodePos.h = bottomYCoord - aroundNodePos.y;
+						aroundNodePos.w = rightXCoord - aroundNodePos.x;
+					}
+					if(pcs.position == "absolute"){
+						sawPosAbsolute = true;
+					}
+					parent = parent.parentNode;
+				}
+			}
+
+			var x = aroundNodePos.x,
+				y = aroundNodePos.y,
+				width = "w" in aroundNodePos ? aroundNodePos.w : (aroundNodePos.w = aroundNodePos.width),
+				height = "h" in aroundNodePos ? aroundNodePos.h : (kernel.deprecated("place.around: dijit/place.__Rectangle: { x:"+x+", y:"+y+", height:"+aroundNodePos.height+", width:"+width+" } has been deprecated.  Please use { x:"+x+", y:"+y+", h:"+aroundNodePos.height+", w:"+width+" }", "", "2.0"), aroundNodePos.h = aroundNodePos.height);
+
+			// Convert positions arguments into choices argument for _place()
+			var choices = [];
+			function push(aroundCorner, corner){
+				choices.push({
+					aroundCorner: aroundCorner,
+					corner: corner,
+					pos: {
+						x: {
+							'L': x,
+							'R': x + width,
+							'M': x + (width >> 1)
+						}[aroundCorner.charAt(1)],
+						y: {
+							'T': y,
+							'B': y + height,
+							'M': y + (height >> 1)
+						}[aroundCorner.charAt(0)]
+					}
+				})
+			}
+			array.forEach(positions, function(pos){
+				var ltr =  leftToRight;
+				switch(pos){
+					case "above-centered":
+						push("TM", "BM");
+						break;
+					case "below-centered":
+						push("BM", "TM");
+						break;
+					case "after-centered":
+						ltr = !ltr;
+						// fall through
+					case "before-centered":
+						push(ltr ? "ML" : "MR", ltr ? "MR" : "ML");
+						break;
+					case "after":
+						ltr = !ltr;
+						// fall through
+					case "before":
+						push(ltr ? "TL" : "TR", ltr ? "TR" : "TL");
+						push(ltr ? "BL" : "BR", ltr ? "BR" : "BL");
+						break;
+					case "below-alt":
+						ltr = !ltr;
+						// fall through
+					case "below":
+						// first try to align left borders, next try to align right borders (or reverse for RTL mode)
+						push(ltr ? "BL" : "BR", ltr ? "TL" : "TR");
+						push(ltr ? "BR" : "BL", ltr ? "TR" : "TL");
+						break;
+					case "above-alt":
+						ltr = !ltr;
+						// fall through
+					case "above":
+						// first try to align left borders, next try to align right borders (or reverse for RTL mode)
+						push(ltr ? "TL" : "TR", ltr ? "BL" : "BR");
+						push(ltr ? "TR" : "TL", ltr ? "BR" : "BL");
+						break;
+					default:
+						// To assist dijit/_base/place, accept arguments of type {aroundCorner: "BL", corner: "TL"}.
+						// Not meant to be used directly.  Remove for 2.0.
+						push(pos.aroundCorner, pos.corner);
+				}
+			});
+
+			var position = _place(node, choices, layoutNode, {w: width, h: height});
+			position.aroundNodePos = aroundNodePos;
+
+			return position;
+		}
+	};
+
+	/*=====
+	place.__Position = {
+		// x: Integer
+		//		horizontal coordinate in pixels, relative to document body
+		// y: Integer
+		//		vertical coordinate in pixels, relative to document body
+	};
+	place.__Rectangle = {
+		// x: Integer
+		//		horizontal offset in pixels, relative to document body
+		// y: Integer
+		//		vertical offset in pixels, relative to document body
+		// w: Integer
+		//		width in pixels.   Can also be specified as "width" for backwards-compatibility.
+		// h: Integer
+		//		height in pixels.   Can also be specified as "height" for backwards-compatibility.
+	};
+	=====*/
+
+	return dijit.place = place;	// setting dijit.place for back-compat, remove for 2.0
+});
diff --git a/src/main/resources/static/dijit/popup.js b/src/main/resources/static/dijit/popup.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca3861e7588c14e6d5dd6ae100be5f94cb759584
--- /dev/null
+++ b/src/main/resources/static/dijit/popup.js
@@ -0,0 +1,441 @@
+define([
+	"dojo/_base/array", // array.forEach array.some
+	"dojo/aspect",
+	"dojo/_base/declare", // declare
+	"dojo/dom", // dom.isDescendant
+	"dojo/dom-attr", // domAttr.set
+	"dojo/dom-construct", // domConstruct.create domConstruct.destroy
+	"dojo/dom-geometry", // domGeometry.isBodyLtr
+	"dojo/dom-style", // domStyle.set
+	"dojo/has", // has("config-bgIframe")
+	"dojo/keys",
+	"dojo/_base/lang", // lang.hitch
+	"dojo/on",
+	"./place",
+	"./BackgroundIframe",
+	"./Viewport",
+	"./main",    // dijit (defining dijit.popup to match API doc)
+	"dojo/touch"		// use of dojoClick
+], function(array, aspect, declare, dom, domAttr, domConstruct, domGeometry, domStyle, has, keys, lang, on,
+			place, BackgroundIframe, Viewport, dijit){
+
+	// module:
+	//		dijit/popup
+
+	/*=====
+	 var __OpenArgs = {
+		 // popup: Widget
+		 //		widget to display
+		 // parent: Widget
+		 //		the button etc. that is displaying this popup
+		 // around: DomNode
+		 //		DOM node (typically a button); place popup relative to this node.  (Specify this *or* "x" and "y" parameters.)
+		 // x: Integer
+		 //		Absolute horizontal position (in pixels) to place node at.  (Specify this *or* "around" parameter.)
+		 // y: Integer
+		 //		Absolute vertical position (in pixels) to place node at.  (Specify this *or* "around" parameter.)
+		 // orient: Object|String
+		 //		When the around parameter is specified, orient should be a list of positions to try, ex:
+		 //	|	[ "below", "above" ]
+		 //		For backwards compatibility it can also be an (ordered) hash of tuples of the form
+		 //		(around-node-corner, popup-node-corner), ex:
+		 //	|	{ "BL": "TL", "TL": "BL" }
+		 //		where BL means "bottom left" and "TL" means "top left", etc.
+		 //
+		 //		dijit/popup.open() tries to position the popup according to each specified position, in order,
+		 //		until the popup appears fully within the viewport.
+		 //
+		 //		The default value is ["below", "above"]
+		 //
+		 //		When an (x,y) position is specified rather than an around node, orient is either
+		 //		"R" or "L".  R (for right) means that it tries to put the popup to the right of the mouse,
+		 //		specifically positioning the popup's top-right corner at the mouse position, and if that doesn't
+		 //		fit in the viewport, then it tries, in order, the bottom-right corner, the top left corner,
+		 //		and the top-right corner.
+		 // onCancel: Function
+		 //		callback when user has canceled the popup by:
+		 //
+		 //		1. hitting ESC or
+		 //		2. by using the popup widget's proprietary cancel mechanism (like a cancel button in a dialog);
+		 //		   i.e. whenever popupWidget.onCancel() is called, args.onCancel is called
+		 // onClose: Function
+		 //		callback whenever this popup is closed
+		 // onExecute: Function
+		 //		callback when user "executed" on the popup/sub-popup by selecting a menu choice, etc. (top menu only)
+		 // padding: place.__Position
+		 //		adding a buffer around the opening position. This is only useful when around is not set.
+		 // maxHeight: Integer
+		 //		The max height for the popup.  Any popup taller than this will have scrollbars.
+		 //		Set to Infinity for no max height.  Default is to limit height to available space in viewport,
+		 //		above or below the aroundNode or specified x/y position.
+	 };
+	 =====*/
+
+	function destroyWrapper(){
+		// summary:
+		//		Function to destroy wrapper when popup widget is destroyed.
+		//		Left in this scope to avoid memory leak on IE8 on refresh page, see #15206.
+		if(this._popupWrapper){
+			domConstruct.destroy(this._popupWrapper);
+			delete this._popupWrapper;
+		}
+	}
+
+	var PopupManager = declare(null, {
+		// summary:
+		//		Used to show drop downs (ex: the select list of a ComboBox)
+		//		or popups (ex: right-click context menus).
+
+		// _stack: dijit/_WidgetBase[]
+		//		Stack of currently popped up widgets.
+		//		(someone opened _stack[0], and then it opened _stack[1], etc.)
+		_stack: [],
+
+		// _beginZIndex: Number
+		//		Z-index of the first popup.   (If first popup opens other
+		//		popups they get a higher z-index.)
+		_beginZIndex: 1000,
+
+		_idGen: 1,
+
+		_repositionAll: function(){
+			// summary:
+			//		If screen has been scrolled, reposition all the popups in the stack.
+			//		Then set timer to check again later.
+
+			if(this._firstAroundNode){	// guard for when clearTimeout() on IE doesn't work
+				var oldPos = this._firstAroundPosition,
+					newPos = domGeometry.position(this._firstAroundNode, true),
+					dx = newPos.x - oldPos.x,
+					dy = newPos.y - oldPos.y;
+
+				if(dx || dy){
+					this._firstAroundPosition = newPos;
+					for(var i = 0; i < this._stack.length; i++){
+						var style = this._stack[i].wrapper.style;
+						style.top = (parseFloat(style.top) + dy) + "px";
+						if(style.right == "auto"){
+							style.left = (parseFloat(style.left) + dx) + "px";
+						}else{
+							style.right = (parseFloat(style.right) - dx) + "px";
+						}
+					}
+				}
+
+				this._aroundMoveListener = setTimeout(lang.hitch(this, "_repositionAll"), dx || dy ? 10 : 50);
+			}
+		},
+
+		_createWrapper: function(/*Widget*/ widget){
+			// summary:
+			//		Initialization for widgets that will be used as popups.
+			//		Puts widget inside a wrapper DIV (if not already in one),
+			//		and returns pointer to that wrapper DIV.
+
+			var wrapper = widget._popupWrapper,
+				node = widget.domNode;
+
+			if(!wrapper){
+				// Create wrapper <div> for when this widget [in the future] will be used as a popup.
+				// This is done early because of IE bugs where creating/moving DOM nodes causes focus
+				// to go wonky, see tests/robot/Toolbar.html to reproduce
+				wrapper = domConstruct.create("div", {
+					"class": "dijitPopup",
+					style: { display: "none"},
+					role: "region",
+					"aria-label": widget["aria-label"] || widget.label || widget.name || widget.id
+				}, widget.ownerDocumentBody);
+				wrapper.appendChild(node);
+
+				var s = node.style;
+				s.display = "";
+				s.visibility = "";
+				s.position = "";
+				s.top = "0px";
+
+				widget._popupWrapper = wrapper;
+				aspect.after(widget, "destroy", destroyWrapper, true);
+
+				// Workaround iOS problem where clicking a Menu can focus an <input> (or click a button) behind it.
+				// Need to be careful though that you can still focus <input>'s and click <button>'s in a TooltipDialog.
+				// Also, be careful not to break (native) scrolling of dropdown like ComboBox's options list.
+				if("ontouchend" in document) {
+					on(wrapper, "touchend", function (evt){
+						if(!/^(input|button|textarea)$/i.test(evt.target.tagName)) {
+							evt.preventDefault();
+						}
+					});
+				}
+
+				// Calling evt.preventDefault() suppresses the native click event on most browsers.  However, it doesn't
+				// suppress the synthetic click event emitted by dojo/touch.  In order for clicks in popups to work
+				// consistently, always use dojo/touch in popups.  See #18150.
+				wrapper.dojoClick = true;
+			}
+
+			return wrapper;
+		},
+
+		moveOffScreen: function(/*Widget*/ widget){
+			// summary:
+			//		Moves the popup widget off-screen.
+			//		Do not use this method to hide popups when not in use, because
+			//		that will create an accessibility issue: the offscreen popup is
+			//		still in the tabbing order.
+
+			// Create wrapper if not already there
+			var wrapper = this._createWrapper(widget);
+
+			// Besides setting visibility:hidden, move it out of the viewport, see #5776, #10111, #13604
+			var ltr = domGeometry.isBodyLtr(widget.ownerDocument),
+				style = {
+					visibility: "hidden",
+					top: "-9999px",
+					display: ""
+				};
+			style[ltr ? "left" : "right"] = "-9999px";
+			style[ltr ? "right" : "left"] = "auto";
+			domStyle.set(wrapper, style);
+
+			return wrapper;
+		},
+
+		hide: function(/*Widget*/ widget){
+			// summary:
+			//		Hide this popup widget (until it is ready to be shown).
+			//		Initialization for widgets that will be used as popups
+			//
+			//		Also puts widget inside a wrapper DIV (if not already in one)
+			//
+			//		If popup widget needs to layout it should
+			//		do so when it is made visible, and popup._onShow() is called.
+
+			// Create wrapper if not already there
+			var wrapper = this._createWrapper(widget);
+
+			domStyle.set(wrapper, {
+				display: "none",
+				height: "auto",			// Open() may have limited the height to fit in the viewport,
+				overflowY: "visible",	// and set overflowY to "auto".
+				border: ""				// Open() may have moved border from popup to wrapper.
+			});
+
+			// Open() may have moved border from popup to wrapper.  Move it back.
+			var node = widget.domNode;
+			if("_originalStyle" in node){
+				node.style.cssText = node._originalStyle;
+			}
+		},
+
+		getTopPopup: function(){
+			// summary:
+			//		Compute the closest ancestor popup that's *not* a child of another popup.
+			//		Ex: For a TooltipDialog with a button that spawns a tree of menus, find the popup of the button.
+			var stack = this._stack;
+			for(var pi = stack.length - 1; pi > 0 && stack[pi].parent === stack[pi - 1].widget; pi--){
+				/* do nothing, just trying to get right value for pi */
+			}
+			return stack[pi];
+		},
+
+		open: function(/*__OpenArgs*/ args){
+			// summary:
+			//		Popup the widget at the specified position
+			//
+			// example:
+			//		opening at the mouse position
+			//		|		popup.open({popup: menuWidget, x: evt.pageX, y: evt.pageY});
+			//
+			// example:
+			//		opening the widget as a dropdown
+			//		|		popup.open({parent: this, popup: menuWidget, around: this.domNode, onClose: function(){...}});
+			//
+			//		Note that whatever widget called dijit/popup.open() should also listen to its own _onBlur callback
+			//		(fired from _base/focus.js) to know that focus has moved somewhere else and thus the popup should be closed.
+
+			var stack = this._stack,
+				widget = args.popup,
+				node = widget.domNode,
+				orient = args.orient || ["below", "below-alt", "above", "above-alt"],
+				ltr = args.parent ? args.parent.isLeftToRight() : domGeometry.isBodyLtr(widget.ownerDocument),
+				around = args.around,
+				id = (args.around && args.around.id) ? (args.around.id + "_dropdown") : ("popup_" + this._idGen++);
+
+			// If we are opening a new popup that isn't a child of a currently opened popup, then
+			// close currently opened popup(s).   This should happen automatically when the old popups
+			// gets the _onBlur() event, except that the _onBlur() event isn't reliable on IE, see [22198].
+			while(stack.length && (!args.parent || !dom.isDescendant(args.parent.domNode, stack[stack.length - 1].widget.domNode))){
+				this.close(stack[stack.length - 1].widget);
+			}
+
+			// Get pointer to popup wrapper, and create wrapper if it doesn't exist.  Remove display:none (but keep
+			// off screen) so we can do sizing calculations.
+			var wrapper = this.moveOffScreen(widget);
+
+			if(widget.startup && !widget._started){
+				widget.startup(); // this has to be done after being added to the DOM
+			}
+
+			// Limit height to space available in viewport either above or below aroundNode (whichever side has more
+			// room), adding scrollbar if necessary. Can't add scrollbar to widget because it may be a <table> (ex:
+			// dijit/Menu), so add to wrapper, and then move popup's border to wrapper so scroll bar inside border.
+			var maxHeight, popupSize = domGeometry.position(node);
+			if("maxHeight" in args && args.maxHeight != -1){
+				maxHeight = args.maxHeight || Infinity;	// map 0 --> infinity for back-compat of _HasDropDown.maxHeight
+			}else{
+				var viewport = Viewport.getEffectiveBox(this.ownerDocument),
+					aroundPos = around ? domGeometry.position(around, false) : {y: args.y - (args.padding||0), h: (args.padding||0) * 2};
+				maxHeight = Math.floor(Math.max(aroundPos.y, viewport.h - (aroundPos.y + aroundPos.h)));
+			}
+			if(popupSize.h > maxHeight){
+				// Get style of popup's border.  Unfortunately domStyle.get(node, "border") doesn't work on FF or IE,
+				// and domStyle.get(node, "borderColor") etc. doesn't work on FF, so need to use fully qualified names.
+				var cs = domStyle.getComputedStyle(node),
+					borderStyle = cs.borderLeftWidth + " " + cs.borderLeftStyle + " " + cs.borderLeftColor;
+				domStyle.set(wrapper, {
+					overflowY: "scroll",
+					height: maxHeight + "px",
+					border: borderStyle	// so scrollbar is inside border
+				});
+				node._originalStyle = node.style.cssText;
+				node.style.border = "none";
+			}
+
+			domAttr.set(wrapper, {
+				id: id,
+				style: {
+					zIndex: this._beginZIndex + stack.length
+				},
+				"class": "dijitPopup " + (widget.baseClass || widget["class"] || "").split(" ")[0] + "Popup",
+				dijitPopupParent: args.parent ? args.parent.id : ""
+			});
+
+			if(stack.length == 0 && around){
+				// First element on stack. Save position of aroundNode and setup listener for changes to that position.
+				this._firstAroundNode = around;
+				this._firstAroundPosition = domGeometry.position(around, true);
+				this._aroundMoveListener = setTimeout(lang.hitch(this, "_repositionAll"), 50);
+			}
+
+			if(has("config-bgIframe") && !widget.bgIframe){
+				// setting widget.bgIframe triggers cleanup in _WidgetBase.destroyRendering()
+				widget.bgIframe = new BackgroundIframe(wrapper);
+			}
+
+			// position the wrapper node and make it visible
+			var layoutFunc = widget.orient ? lang.hitch(widget, "orient") : null,
+				best = around ?
+					place.around(wrapper, around, orient, ltr, layoutFunc) :
+					place.at(wrapper, args, orient == 'R' ? ['TR', 'BR', 'TL', 'BL'] : ['TL', 'BL', 'TR', 'BR'], args.padding,
+						layoutFunc);
+
+			wrapper.style.visibility = "visible";
+			node.style.visibility = "visible";	// counteract effects from _HasDropDown
+
+			var handlers = [];
+
+			// provide default escape and tab key handling
+			// (this will work for any widget, not just menu)
+			handlers.push(on(wrapper, "keydown", lang.hitch(this, function(evt){
+				if(evt.keyCode == keys.ESCAPE && args.onCancel){
+					evt.stopPropagation();
+					evt.preventDefault();
+					args.onCancel();
+				}else if(evt.keyCode == keys.TAB){
+					evt.stopPropagation();
+					evt.preventDefault();
+					var topPopup = this.getTopPopup();
+					if(topPopup && topPopup.onCancel){
+						topPopup.onCancel();
+					}
+				}
+			})));
+
+			// watch for cancel/execute events on the popup and notify the caller
+			// (for a menu, "execute" means clicking an item)
+			if(widget.onCancel && args.onCancel){
+				handlers.push(widget.on("cancel", args.onCancel));
+			}
+
+			handlers.push(widget.on(widget.onExecute ? "execute" : "change", lang.hitch(this, function(){
+				var topPopup = this.getTopPopup();
+				if(topPopup && topPopup.onExecute){
+					topPopup.onExecute();
+				}
+			})));
+
+			stack.push({
+				widget: widget,
+				wrapper: wrapper,
+				parent: args.parent,
+				onExecute: args.onExecute,
+				onCancel: args.onCancel,
+				onClose: args.onClose,
+				handlers: handlers
+			});
+
+			if(widget.onOpen){
+				// TODO: in 2.0 standardize onShow() (used by StackContainer) and onOpen() (used here)
+				widget.onOpen(best);
+			}
+
+			return best;
+		},
+
+		close: function(/*Widget?*/ popup){
+			// summary:
+			//		Close specified popup and any popups that it parented.
+			//		If no popup is specified, closes all popups.
+
+			var stack = this._stack;
+
+			// Basically work backwards from the top of the stack closing popups
+			// until we hit the specified popup, but IIRC there was some issue where closing
+			// a popup would cause others to close too.  Thus if we are trying to close B in [A,B,C]
+			// closing C might close B indirectly and then the while() condition will run where stack==[A]...
+			// so the while condition is constructed defensively.
+			while((popup && array.some(stack, function(elem){
+				return elem.widget == popup;
+			})) ||
+				(!popup && stack.length)){
+				var top = stack.pop(),
+					widget = top.widget,
+					onClose = top.onClose;
+
+				if (widget.bgIframe) {
+					// push the iframe back onto the stack.
+					widget.bgIframe.destroy();
+					delete widget.bgIframe;
+				}
+
+				if(widget.onClose){
+					// TODO: in 2.0 standardize onHide() (used by StackContainer) and onClose() (used here).
+					// Actually, StackContainer also calls onClose(), but to mean that the pane is being deleted
+					// (i.e. that the TabContainer's tab's [x] icon was clicked)
+					widget.onClose();
+				}
+
+				var h;
+				while(h = top.handlers.pop()){
+					h.remove();
+				}
+
+				// Hide the widget and it's wrapper unless it has already been destroyed in above onClose() etc.
+				if(widget && widget.domNode){
+					this.hide(widget);
+				}
+
+				if(onClose){
+					onClose();
+				}
+			}
+
+			if(stack.length == 0 && this._aroundMoveListener){
+				clearTimeout(this._aroundMoveListener);
+				this._firstAroundNode = this._firstAroundPosition = this._aroundMoveListener = null;
+			}
+		}
+	});
+
+	return (dijit.popup = new PopupManager());
+});
diff --git a/src/main/resources/static/dijit/registry.js b/src/main/resources/static/dijit/registry.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e9e1ef07554243e9f2d0037576e2c67f41b8929
--- /dev/null
+++ b/src/main/resources/static/dijit/registry.js
@@ -0,0 +1,159 @@
+define([
+	"dojo/_base/array", // array.forEach array.map
+	"dojo/_base/window", // win.body
+	"./main"	// dijit._scopeName
+], function(array, win, dijit){
+
+	// module:
+	//		dijit/registry
+
+	var _widgetTypeCtr = {}, hash = {};
+
+	var registry =  {
+		// summary:
+		//		Registry of existing widget on page, plus some utility methods.
+
+		// length: Number
+		//		Number of registered widgets
+		length: 0,
+
+		add: function(widget){
+			// summary:
+			//		Add a widget to the registry. If a duplicate ID is detected, a error is thrown.
+			// widget: dijit/_WidgetBase
+			//		Any dijit/_WidgetBase subclass.
+			if(hash[widget.id]){
+				throw new Error("Tried to register widget with id==" + widget.id + " but that id is already registered");
+			}
+			hash[widget.id] = widget;
+			this.length++;
+		},
+
+		remove: function(/*String*/ id){
+			// summary:
+			//		Remove a widget from the registry. Does not destroy the widget; simply
+			//		removes the reference.
+			if(hash[id]){
+				delete hash[id];
+				this.length--;
+			}
+		},
+
+		byId: function(/*String|Widget*/ id){
+			// summary:
+			//		Find a widget by it's id.
+			//		If passed a widget then just returns the widget.
+			return typeof id == "string" ? hash[id] : id;	// dijit/_WidgetBase
+		},
+
+		byNode: function(/*DOMNode*/ node){
+			// summary:
+			//		Returns the widget corresponding to the given DOMNode
+			return hash[node.getAttribute("widgetId")]; // dijit/_WidgetBase
+		},
+
+		toArray: function(){
+			// summary:
+			//		Convert registry into a true Array
+			//
+			// example:
+			//		Work with the widget .domNodes in a real Array
+			//		|	array.map(registry.toArray(), function(w){ return w.domNode; });
+
+			var ar = [];
+			for(var id in hash){
+				ar.push(hash[id]);
+			}
+			return ar;	// dijit/_WidgetBase[]
+		},
+
+		getUniqueId: function(/*String*/widgetType){
+			// summary:
+			//		Generates a unique id for a given widgetType
+
+			var id;
+			do{
+				id = widgetType + "_" +
+					(widgetType in _widgetTypeCtr ?
+						++_widgetTypeCtr[widgetType] : _widgetTypeCtr[widgetType] = 0);
+			}while(hash[id]);
+			return dijit._scopeName == "dijit" ? id : dijit._scopeName + "_" + id; // String
+		},
+
+		findWidgets: function(root, skipNode){
+			// summary:
+			//		Search subtree under root returning widgets found.
+			//		Doesn't search for nested widgets (ie, widgets inside other widgets).
+			// root: DOMNode
+			//		Node to search under.
+			// skipNode: DOMNode
+			//		If specified, don't search beneath this node (usually containerNode).
+
+			var outAry = [];
+
+			function getChildrenHelper(root){
+				for(var node = root.firstChild; node; node = node.nextSibling){
+					if(node.nodeType == 1){
+						var widgetId = node.getAttribute("widgetId");
+						if(widgetId){
+							var widget = hash[widgetId];
+							if(widget){	// may be null on page w/multiple dojo's loaded
+								outAry.push(widget);
+							}
+						}else if(node !== skipNode){
+							getChildrenHelper(node);
+						}
+					}
+				}
+			}
+
+			getChildrenHelper(root);
+			return outAry;
+		},
+
+		_destroyAll: function(){
+			// summary:
+			//		Code to destroy all widgets and do other cleanup on page unload
+
+			// Clean up focus manager lingering references to widgets and nodes
+			dijit._curFocus = null;
+			dijit._prevFocus = null;
+			dijit._activeStack = [];
+
+			// Destroy all the widgets, top down
+			array.forEach(registry.findWidgets(win.body()), function(widget){
+				// Avoid double destroy of widgets like Menu that are attached to <body>
+				// even though they are logically children of other widgets.
+				if(!widget._destroyed){
+					if(widget.destroyRecursive){
+						widget.destroyRecursive();
+					}else if(widget.destroy){
+						widget.destroy();
+					}
+				}
+			});
+		},
+
+		getEnclosingWidget: function(/*DOMNode*/ node){
+			// summary:
+			//		Returns the widget whose DOM tree contains the specified DOMNode, or null if
+			//		the node is not contained within the DOM tree of any widget
+			while(node){
+				var id = node.nodeType == 1 && node.getAttribute("widgetId");
+				if(id){
+					return hash[id];
+				}
+				node = node.parentNode;
+			}
+			return null;
+		},
+
+		// In case someone needs to access hash.
+		// Actually, this is accessed from WidgetSet back-compatibility code
+		_hash: hash
+	};
+
+	dijit.registry = registry;
+
+	return registry;
+});
diff --git a/src/main/resources/static/dijit/robot.js b/src/main/resources/static/dijit/robot.js
new file mode 100644
index 0000000000000000000000000000000000000000..b6ce9017d2d8127cbd5a9f59de352034986842d9
--- /dev/null
+++ b/src/main/resources/static/dijit/robot.js
@@ -0,0 +1,8 @@
+define([
+	"dojo/robot"
+], function(){
+	// module:
+	//		dijit/robot
+	// summary:
+	//		Used to have code needed by robot test harness, but no longer
+});
diff --git a/src/main/resources/static/dijit/robotx.js b/src/main/resources/static/dijit/robotx.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ee25a4e4d98821fdad259c24edaeffc5eb90350
--- /dev/null
+++ b/src/main/resources/static/dijit/robotx.js
@@ -0,0 +1,25 @@
+define([
+	"dojo/_base/kernel", // kernel.experimental
+	"dojo/robotx"		// includes doh/robot, dojo/robot, and dojo/robotx, all of which affect and return doh/robot module
+], function(kernel, robot){
+
+	// module:
+	//		dijit/robotx
+	// summary:
+	//		Loads doh/robot, dojo/robot, dojo/robotx, and
+	//		sets dijit global in main window to point to the dijit loaded in the iframe.
+	//		TODO: Remove for 2.0.    Tests shouldn't reference a dijit global at all, and should load dojo/robotx
+	//		in preference to this file.
+
+	kernel.experimental("dijit.robotx");
+
+	var __updateDocument = robot._updateDocument;
+
+	robot._updateDocument = function(){
+		__updateDocument();
+		var win = kernel.global;
+		if(win.dijit){
+			window.dijit = win.dijit; // window reference needed for IE
+		}
+	};
+});
diff --git a/src/main/resources/static/dijit/selection.js b/src/main/resources/static/dijit/selection.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ce83628f2c0fed9a847488fe9d3aaf8ddc73531
--- /dev/null
+++ b/src/main/resources/static/dijit/selection.js
@@ -0,0 +1,525 @@
+define([
+	"dojo/_base/array",
+	"dojo/dom", // dom.byId
+	"dojo/_base/lang",
+	"dojo/sniff", // has("ie") has("opera")
+	"dojo/_base/window",
+	"dijit/focus"
+], function(array, dom, lang, has, baseWindow, focus){
+
+	// module:
+	//		dijit/selection
+
+	// Note that this class is using feature detection, but doesn't use has() because sometimes on IE the outer window
+	// may be running in standards mode (ie, IE9 mode) but an iframe may be in compatibility mode.   So the code path
+	// used will vary based on the window.
+
+	var SelectionManager = function(win){
+		// summary:
+		//		Class for monitoring / changing the selection (typically highlighted text) in a given window
+		// win: Window
+		//		The window to monitor/adjust the selection on.
+
+		var doc = win.document;
+
+		this.getType = function(){
+			// summary:
+			//		Get the selection type (like doc.select.type in IE).
+			if(doc.getSelection){
+				// W3C path
+				var stype = "text";
+
+				// Check if the actual selection is a CONTROL (IMG, TABLE, HR, etc...).
+				var oSel;
+				try{
+					oSel = win.getSelection();
+				}catch(e){ /*squelch*/ }
+
+				if(oSel && oSel.rangeCount == 1){
+					var oRange = oSel.getRangeAt(0);
+					if(	(oRange.startContainer == oRange.endContainer) &&
+						((oRange.endOffset - oRange.startOffset) == 1) &&
+						(oRange.startContainer.nodeType != 3 /* text node*/)
+						){
+						stype = "control";
+					}
+				}
+				return stype; //String
+			}else{
+				// IE6-8
+				return doc.selection.type.toLowerCase();
+			}
+		};
+
+		this.getSelectedText = function(){
+			// summary:
+			//		Return the text (no html tags) included in the current selection or null if no text is selected
+			if(doc.getSelection){
+				// W3C path
+				var selection = win.getSelection();
+				return selection ? selection.toString() : ""; //String
+			}else{
+				// IE6-8
+				if(this.getType() == 'control'){
+					return null;
+				}
+				return doc.selection.createRange().text;
+			}
+		};
+
+		this.getSelectedHtml = function(){
+			// summary:
+			//		Return the html text of the current selection or null if unavailable
+			if(doc.getSelection){
+				// W3C path
+				var selection = win.getSelection();
+				if(selection && selection.rangeCount){
+					var i;
+					var html = "";
+					for(i = 0; i < selection.rangeCount; i++){
+						//Handle selections spanning ranges, such as Opera
+						var frag = selection.getRangeAt(i).cloneContents();
+						var div = doc.createElement("div");
+						div.appendChild(frag);
+						html += div.innerHTML;
+					}
+					return html; //String
+				}
+				return null;
+			}else{
+				// IE6-8
+				if(this.getType() == 'control'){
+					return null;
+				}
+				return doc.selection.createRange().htmlText;
+			}
+		};
+
+		this.getSelectedElement = function(){
+			// summary:
+			//		Retrieves the selected element (if any), just in the case that
+			//		a single element (object like and image or a table) is
+			//		selected.
+			if(this.getType() == "control"){
+				if(doc.getSelection){
+					// W3C path
+					var selection = win.getSelection();
+					return selection.anchorNode.childNodes[ selection.anchorOffset ];
+				}else{
+					// IE6-8
+					var range = doc.selection.createRange();
+					if(range && range.item){
+						return doc.selection.createRange().item(0);
+					}
+				}
+			}
+			return null;
+		};
+
+		this.getParentElement = function(){
+			// summary:
+			//		Get the parent element of the current selection
+			if(this.getType() == "control"){
+				var p = this.getSelectedElement();
+				if(p){ return p.parentNode; }
+			}else{
+				if(doc.getSelection){
+					var selection = doc.getSelection();
+					if(selection){
+						var node = selection.anchorNode;
+						while(node && (node.nodeType != 1)){ // not an element
+							node = node.parentNode;
+						}
+						return node;
+					}
+				}else{
+					var r = doc.selection.createRange();
+					r.collapse(true);
+					return r.parentElement();
+				}
+			}
+			return null;
+		};
+
+		this.hasAncestorElement = function(/*String*/ tagName /* ... */){
+			// summary:
+			//		Check whether current selection has a  parent element which is
+			//		of type tagName (or one of the other specified tagName)
+			// tagName: String
+			//		The tag name to determine if it has an ancestor of.
+			return this.getAncestorElement.apply(this, arguments) != null; //Boolean
+		};
+
+		this.getAncestorElement = function(/*String*/ tagName /* ... */){
+			// summary:
+			//		Return the parent element of the current selection which is of
+			//		type tagName (or one of the other specified tagName)
+			// tagName: String
+			//		The tag name to determine if it has an ancestor of.
+			var node = this.getSelectedElement() || this.getParentElement();
+			return this.getParentOfType(node, arguments); //DOMNode
+		};
+
+		this.isTag = function(/*DomNode*/ node, /*String[]*/ tags){
+			// summary:
+			//		Function to determine if a node is one of an array of tags.
+			// node:
+			//		The node to inspect.
+			// tags:
+			//		An array of tag name strings to check to see if the node matches.
+			if(node && node.tagName){
+				var _nlc = node.tagName.toLowerCase();
+				for(var i=0; i<tags.length; i++){
+					var _tlc = String(tags[i]).toLowerCase();
+					if(_nlc == _tlc){
+						return _tlc; // String
+					}
+				}
+			}
+			return "";
+		};
+
+		this.getParentOfType = function(/*DomNode*/ node, /*String[]*/ tags){
+			// summary:
+			//		Function to locate a parent node that matches one of a set of tags
+			// node:
+			//		The node to inspect.
+			// tags:
+			//		An array of tag name strings to check to see if the node matches.
+			while(node){
+				if(this.isTag(node, tags).length){
+					return node; // DOMNode
+				}
+				node = node.parentNode;
+			}
+			return null;
+		};
+
+		this.collapse = function(/*Boolean*/ beginning){
+			// summary:
+			//		Function to collapse (clear), the current selection
+			// beginning: Boolean
+			//		Indicates whether to collapse the cursor to the beginning of the selection or end.
+			if(doc.getSelection){
+				// W3C path
+				var selection = win.getSelection();
+				if(selection.removeAllRanges){ // Mozilla
+					if(beginning){
+						selection.collapseToStart();
+					}else{
+						selection.collapseToEnd();
+					}
+				}else{ // Safari
+					// pulled from WebCore/ecma/kjs_window.cpp, line 2536
+					selection.collapse(beginning);
+				}
+			}else{
+				// IE6-8
+				var range = doc.selection.createRange();
+				range.collapse(beginning);
+				range.select();
+			}
+		};
+
+		this.remove = function(){
+			// summary:
+			//		Function to delete the currently selected content from the document.
+			var sel = doc.selection;
+			if(doc.getSelection){
+				// W3C path
+				sel = win.getSelection();
+				sel.deleteFromDocument();
+				return sel; //Selection
+			}else{
+				// IE6-8
+				if(sel.type.toLowerCase() != "none"){
+					sel.clear();
+				}
+				return sel; //Selection
+			}
+		};
+
+		this.selectElementChildren = function(/*DomNode*/ element, /*Boolean?*/ nochangefocus){
+			// summary:
+			//		clear previous selection and select the content of the node
+			//		(excluding the node itself)
+			// element: DOMNode
+			//		The element you wish to select the children content of.
+			// nochangefocus: Boolean
+			//		Indicates if the focus should change or not.
+
+			var range;
+			element = dom.byId(element);
+			if(doc.getSelection){
+				// W3C
+				var selection = win.getSelection();
+				if(has("opera")){
+					//Opera's selectAllChildren doesn't seem to work right
+					//against <body> nodes and possibly others ... so
+					//we use the W3C range API
+					if(selection.rangeCount){
+						range = selection.getRangeAt(0);
+					}else{
+						range = doc.createRange();
+					}
+					range.setStart(element, 0);
+					range.setEnd(element,(element.nodeType == 3) ? element.length : element.childNodes.length);
+					selection.addRange(range);
+				}else{
+					selection.selectAllChildren(element);
+				}
+			}else{
+				// IE6-8
+				range = element.ownerDocument.body.createTextRange();
+				range.moveToElementText(element);
+				if(!nochangefocus){
+					try{
+						range.select(); // IE throws an exception here if the widget is hidden.  See #5439
+					}catch(e){ /* squelch */}
+				}
+			}
+		};
+
+		this.selectElement = function(/*DomNode*/ element, /*Boolean?*/ nochangefocus){
+			// summary:
+			//		clear previous selection and select element (including all its children)
+			// element: DOMNode
+			//		The element to select.
+			// nochangefocus: Boolean
+			//		Boolean indicating if the focus should be changed.  IE only.
+			var range;
+			element = dom.byId(element);	// TODO: remove for 2.0 or sooner, spec listed above doesn't allow for string
+			if(doc.getSelection){
+				// W3C path
+				var selection = doc.getSelection();
+				range = doc.createRange();
+				if(selection.removeAllRanges){ // Mozilla
+					// FIXME: does this work on Safari?
+					if(has("opera")){
+						//Opera works if you use the current range on
+						//the selection if present.
+						if(selection.getRangeAt(0)){
+							range = selection.getRangeAt(0);
+						}
+					}
+					range.selectNode(element);
+					selection.removeAllRanges();
+					selection.addRange(range);
+				}
+			}else{
+				// IE6-8
+				try{
+					var tg = element.tagName ? element.tagName.toLowerCase() : "";
+					if(tg === "img" || tg === "table"){
+						range = baseWindow.body(doc).createControlRange();
+					}else{
+						range = baseWindow.body(doc).createRange();
+					}
+					range.addElement(element);
+					if(!nochangefocus){
+						range.select();
+					}
+				}catch(e){
+					this.selectElementChildren(element, nochangefocus);
+				}
+			}
+		};
+
+		this.inSelection = function(node){
+			// summary:
+			//		This function determines if 'node' is
+			//		in the current selection.
+			// tags:
+			//		public
+			if(node){
+				var newRange;
+				var range;
+
+				if(doc.getSelection){
+					// WC3
+					var sel = win.getSelection();
+					if(sel && sel.rangeCount > 0){
+						range = sel.getRangeAt(0);
+					}
+					if(range && range.compareBoundaryPoints && doc.createRange){
+						try{
+							newRange = doc.createRange();
+							newRange.setStart(node, 0);
+							if(range.compareBoundaryPoints(range.START_TO_END, newRange) === 1){
+								return true;
+							}
+						}catch(e){ /* squelch */}
+					}
+				}else{
+					// IE6-8, so we can't use the range object as the pseudo
+					// range doesn't implement the boundary checking, we have to
+					// use IE specific crud.
+					range = doc.selection.createRange();
+					try{
+						newRange = node.ownerDocument.body.createTextRange();
+						newRange.moveToElementText(node);
+					}catch(e2){/* squelch */}
+					if(range && newRange){
+						// We can finally compare similar to W3C
+						if(range.compareEndPoints("EndToStart", newRange) === 1){
+							return true;
+						}
+					}
+				}
+			}
+			return false; // Boolean
+		};
+
+		this.getBookmark = function(){
+			// summary:
+			//		Retrieves a bookmark that can be used with moveToBookmark to reselect the currently selected range.
+
+			// TODO: merge additional code from Editor._getBookmark into this method
+
+			var bm, rg, tg, sel = doc.selection, cf = focus.curNode;
+
+			if(doc.getSelection){
+				// W3C Range API for selections.
+				sel = win.getSelection();
+				if(sel){
+					if(sel.isCollapsed){
+						tg = cf? cf.tagName : "";
+						if(tg){
+							// Create a fake rangelike item to restore selections.
+							tg = tg.toLowerCase();
+							if(tg == "textarea" ||
+								(tg == "input" && (!cf.type || cf.type.toLowerCase() == "text"))){
+								sel = {
+									start: cf.selectionStart,
+									end: cf.selectionEnd,
+									node: cf,
+									pRange: true
+								};
+								return {isCollapsed: (sel.end <= sel.start), mark: sel}; //Object.
+							}
+						}
+						bm = {isCollapsed:true};
+						if(sel.rangeCount){
+							bm.mark = sel.getRangeAt(0).cloneRange();
+						}
+					}else{
+						rg = sel.getRangeAt(0);
+						bm = {isCollapsed: false, mark: rg.cloneRange()};
+					}
+				}
+			}else if(sel){
+				// If the current focus was a input of some sort and no selection, don't bother saving
+				// a native bookmark.  This is because it causes issues with dialog/page selection restore.
+				// So, we need to create pseudo bookmarks to work with.
+				tg = cf ? cf.tagName : "";
+				tg = tg.toLowerCase();
+				if(cf && tg && (tg == "button" || tg == "textarea" || tg == "input")){
+					if(sel.type && sel.type.toLowerCase() == "none"){
+						return {
+							isCollapsed: true,
+							mark: null
+						}
+					}else{
+						rg = sel.createRange();
+						return {
+							isCollapsed: rg.text && rg.text.length?false:true,
+							mark: {
+								range: rg,
+								pRange: true
+							}
+						};
+					}
+				}
+				bm = {};
+
+				//'IE' way for selections.
+				try{
+					// createRange() throws exception when dojo in iframe
+					// and nothing selected, see #9632
+					rg = sel.createRange();
+					bm.isCollapsed = !(sel.type == 'Text' ? rg.htmlText.length : rg.length);
+				}catch(e){
+					bm.isCollapsed = true;
+					return bm;
+				}
+				if(sel.type.toUpperCase() == 'CONTROL'){
+					if(rg.length){
+						bm.mark=[];
+						var i=0,len=rg.length;
+						while(i<len){
+							bm.mark.push(rg.item(i++));
+						}
+					}else{
+						bm.isCollapsed = true;
+						bm.mark = null;
+					}
+				}else{
+					bm.mark = rg.getBookmark();
+				}
+			}else{
+				console.warn("No idea how to store the current selection for this browser!");
+			}
+			return bm; // Object
+		};
+
+		this.moveToBookmark = function(/*Object*/ bookmark){
+			// summary:
+			//		Moves current selection to a bookmark.
+			// bookmark:
+			//		This should be a returned object from getBookmark().
+
+			// TODO: merge additional code from Editor._moveToBookmark into this method
+
+			var mark = bookmark.mark;
+			if(mark){
+				if(doc.getSelection){
+					// W3C Range API (FF, WebKit, Opera, etc)
+					var sel = win.getSelection();
+					if(sel && sel.removeAllRanges){
+						if(mark.pRange){
+							var n = mark.node;
+							n.selectionStart = mark.start;
+							n.selectionEnd = mark.end;
+						}else{
+							sel.removeAllRanges();
+							sel.addRange(mark);
+						}
+					}else{
+						console.warn("No idea how to restore selection for this browser!");
+					}
+				}else if(doc.selection && mark){
+					//'IE' way.
+					var rg;
+					if(mark.pRange){
+						rg = mark.range;
+					}else if(lang.isArray(mark)){
+						rg = doc.body.createControlRange();
+						//rg.addElement does not have call/apply method, so can not call it directly
+						//rg is not available in "range.addElement(item)", so can't use that either
+						array.forEach(mark, function(n){
+							rg.addElement(n);
+						});
+					}else{
+						rg = doc.body.createTextRange();
+						rg.moveToBookmark(mark);
+					}
+					rg.select();
+				}
+			}
+		};
+
+		this.isCollapsed = function(){
+			// summary:
+			//		Returns true if there is no text selected
+			return this.getBookmark().isCollapsed;
+		};
+	};
+
+	// singleton on the main window
+	var selection = new SelectionManager(window);
+
+	// hook for editor to use class
+	selection.SelectionManager = SelectionManager;
+
+	return selection;
+});
diff --git a/src/main/resources/static/dijit/templates/Calendar.html b/src/main/resources/static/dijit/templates/Calendar.html
new file mode 100644
index 0000000000000000000000000000000000000000..5a2fa2b87bfe5dc2a81d3f78e626dddc6eb24800
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/Calendar.html
@@ -0,0 +1,30 @@
+<div class="dijitCalendarContainer dijitInline" role="presentation" aria-labelledby="${id}_mddb ${id}_year">
+	<div class="dijitReset dijitCalendarMonthContainer" role="presentation">
+		<div class='dijitReset dijitCalendarArrow dijitCalendarDecrementArrow' data-dojo-attach-point="decrementMonth">
+			<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarDecrease" role="presentation"/>
+			<span data-dojo-attach-point="decreaseArrowNode" class="dijitA11ySideArrow">-</span>
+		</div>
+		<div class='dijitReset dijitCalendarArrow dijitCalendarIncrementArrow' data-dojo-attach-point="incrementMonth">
+			<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarIncrease" role="presentation"/>
+			<span data-dojo-attach-point="increaseArrowNode" class="dijitA11ySideArrow">+</span>
+		</div>
+		<div data-dojo-attach-point="monthNode" class="dijitInline"></div>
+	</div>
+	<table cellspacing="0" cellpadding="0" role="grid" data-dojo-attach-point="gridNode">
+		<thead>
+			<tr role="row">
+				${!dayCellsHtml}
+			</tr>
+		</thead>
+		<tbody data-dojo-attach-point="dateRowsNode" data-dojo-attach-event="ondijitclick: _onDayClick" class="dijitReset dijitCalendarBodyContainer">
+				${!dateRowsHtml}
+		</tbody>
+	</table>
+	<div class="dijitReset dijitCalendarYearContainer" role="presentation">
+		<div class="dijitCalendarYearLabel">
+			<span data-dojo-attach-point="previousYearLabelNode" class="dijitInline dijitCalendarPreviousYear" role="button"></span>
+			<span data-dojo-attach-point="currentYearLabelNode" class="dijitInline dijitCalendarSelectedYear" role="button" id="${id}_year"></span>
+			<span data-dojo-attach-point="nextYearLabelNode" class="dijitInline dijitCalendarNextYear" role="button"></span>
+		</div>
+	</div>
+</div>
diff --git a/src/main/resources/static/dijit/templates/CheckedMenuItem.html b/src/main/resources/static/dijit/templates/CheckedMenuItem.html
new file mode 100644
index 0000000000000000000000000000000000000000..9584bf1fe567804d0864128e06d59158ed22a2d4
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/CheckedMenuItem.html
@@ -0,0 +1,9 @@
+<tr class="dijitReset" data-dojo-attach-point="focusNode" role="${role}" tabIndex="-1" aria-checked="${checked}">
+	<td class="dijitReset dijitMenuItemIconCell" role="presentation">
+		<span class="dijitInline dijitIcon dijitMenuItemIcon dijitCheckedMenuItemIcon" data-dojo-attach-point="iconNode"></span>
+		<span class="dijitMenuItemIconChar dijitCheckedMenuItemIconChar">${!checkedChar}</span>
+	</td>
+	<td class="dijitReset dijitMenuItemLabel" colspan="2" data-dojo-attach-point="containerNode,labelNode,textDirNode"></td>
+	<td class="dijitReset dijitMenuItemAccelKey" style="display: none" data-dojo-attach-point="accelKeyNode"></td>
+	<td class="dijitReset dijitMenuArrowCell" role="presentation">&#160;</td>
+</tr>
diff --git a/src/main/resources/static/dijit/templates/ColorPalette.html b/src/main/resources/static/dijit/templates/ColorPalette.html
new file mode 100644
index 0000000000000000000000000000000000000000..82361d539511562699e3abc51ef1238b1a19a3f3
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/ColorPalette.html
@@ -0,0 +1,5 @@
+<div class="dijitInline dijitColorPalette" role="grid">
+	<table data-dojo-attach-point="paletteTableNode" class="dijitPaletteTable" cellSpacing="0" cellPadding="0" role="presentation">
+		<tbody data-dojo-attach-point="gridNode"></tbody>
+	</table>
+</div>
diff --git a/src/main/resources/static/dijit/templates/Dialog.html b/src/main/resources/static/dijit/templates/Dialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..fbebe4c217c0e82d592e9b3c816ec652bef42c27
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/Dialog.html
@@ -0,0 +1,12 @@
+<div class="dijitDialog" role="dialog" aria-labelledby="${id}_title">
+	<div data-dojo-attach-point="titleBar" class="dijitDialogTitleBar">
+		<span data-dojo-attach-point="titleNode" class="dijitDialogTitle" id="${id}_title"
+				role="heading" level="1"></span>
+		<span data-dojo-attach-point="closeButtonNode" class="dijitDialogCloseIcon" data-dojo-attach-event="ondijitclick: onCancel" title="${buttonCancel}" role="button" tabindex="-1">
+			<span data-dojo-attach-point="closeText" class="closeText" title="${buttonCancel}">x</span>
+		</span>
+	</div>
+	<div data-dojo-attach-point="containerNode" class="dijitDialogPaneContent"></div>
+	${!actionBarTemplate}
+</div>
+
diff --git a/src/main/resources/static/dijit/templates/Fieldset.html b/src/main/resources/static/dijit/templates/Fieldset.html
new file mode 100644
index 0000000000000000000000000000000000000000..50fd1222fc32aee0b6f15e4f9fd417e2285ed994
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/Fieldset.html
@@ -0,0 +1,16 @@
+<fieldset>
+	<legend data-dojo-attach-event="ondijitclick:_onTitleClick, onkeydown:_onTitleKey"
+			data-dojo-attach-point="titleBarNode, titleNode">
+		<span data-dojo-attach-point="arrowNode" class="dijitInline dijitArrowNode" role="presentation"></span
+		><span data-dojo-attach-point="arrowNodeInner" class="dijitArrowNodeInner"></span
+		><span data-dojo-attach-point="titleNode, focusNode" class="dijitFieldsetLegendNode" id="${id}_titleNode"></span>
+	</legend>
+	<div class="dijitFieldsetContentOuter" data-dojo-attach-point="hideNode" role="presentation">
+		<div class="dijitReset" data-dojo-attach-point="wipeNode" role="presentation">
+			<div class="dijitFieldsetContentInner" data-dojo-attach-point="containerNode" role="region"
+				 	id="${id}_pane" aria-labelledby="${id}_titleNode">
+				<!-- nested divs because wipeIn()/wipeOut() doesn't work right on node w/padding etc.  Put padding on inner div. -->
+			</div>
+		</div>
+	</div>
+</fieldset>
diff --git a/src/main/resources/static/dijit/templates/InlineEditBox.html b/src/main/resources/static/dijit/templates/InlineEditBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..6aac77ee1cb85318fa61909cd6e81d9021ef4117
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/InlineEditBox.html
@@ -0,0 +1,9 @@
+<span data-dojo-attach-point="editNode" role="presentation" class="dijitReset dijitInline dijitOffScreen"
+	><span data-dojo-attach-point="editorPlaceholder"></span
+	><span data-dojo-attach-point="buttonContainer"
+		><button data-dojo-type="./form/Button" data-dojo-props="label: '${buttonSave}', 'class': 'saveButton'"
+			data-dojo-attach-point="saveButton" data-dojo-attach-event="onClick:save"></button
+		><button data-dojo-type="./form/Button"  data-dojo-props="label: '${buttonCancel}', 'class': 'cancelButton'"
+			data-dojo-attach-point="cancelButton" data-dojo-attach-event="onClick:cancel"></button
+	></span
+></span>
diff --git a/src/main/resources/static/dijit/templates/Menu.html b/src/main/resources/static/dijit/templates/Menu.html
new file mode 100644
index 0000000000000000000000000000000000000000..a9f635b2606b6ec5628bf9ebfb5c783d42615ad2
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/Menu.html
@@ -0,0 +1,4 @@
+<table class="dijit dijitMenu dijitMenuPassive dijitReset dijitMenuTable" role="menu" tabIndex="${tabIndex}"
+	   cellspacing="0">
+	<tbody class="dijitReset" data-dojo-attach-point="containerNode"></tbody>
+</table>
diff --git a/src/main/resources/static/dijit/templates/MenuBar.html b/src/main/resources/static/dijit/templates/MenuBar.html
new file mode 100644
index 0000000000000000000000000000000000000000..ed54429052b1e6424fa361d951a28bbb5e37860f
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/MenuBar.html
@@ -0,0 +1,2 @@
+<div class="dijitMenuBar dijitMenuPassive" data-dojo-attach-point="containerNode" role="menubar" tabIndex="${tabIndex}"
+	 ></div>
diff --git a/src/main/resources/static/dijit/templates/MenuBarItem.html b/src/main/resources/static/dijit/templates/MenuBarItem.html
new file mode 100644
index 0000000000000000000000000000000000000000..0195329cc7c4d111fd1fcdfa522d31f22b1022d0
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/MenuBarItem.html
@@ -0,0 +1,4 @@
+<div class="dijitReset dijitInline dijitMenuItem dijitMenuItemLabel" data-dojo-attach-point="focusNode"
+	 	role="menuitem" tabIndex="-1">
+	<span data-dojo-attach-point="containerNode,textDirNode"></span>
+</div>
diff --git a/src/main/resources/static/dijit/templates/MenuItem.html b/src/main/resources/static/dijit/templates/MenuItem.html
new file mode 100644
index 0000000000000000000000000000000000000000..457f467b77f041ef23fbf0170f8b8ad36453d93a
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/MenuItem.html
@@ -0,0 +1,14 @@
+<tr class="dijitReset" data-dojo-attach-point="focusNode" role="menuitem" tabIndex="-1">
+	<td class="dijitReset dijitMenuItemIconCell" role="presentation">
+		<span role="presentation" class="dijitInline dijitIcon dijitMenuItemIcon" data-dojo-attach-point="iconNode"></span>
+	</td>
+	<td class="dijitReset dijitMenuItemLabel" colspan="2" data-dojo-attach-point="containerNode,textDirNode"
+		role="presentation"></td>
+	<td class="dijitReset dijitMenuItemAccelKey" style="display: none" data-dojo-attach-point="accelKeyNode"></td>
+	<td class="dijitReset dijitMenuArrowCell" role="presentation">
+		<span data-dojo-attach-point="arrowWrapper" style="visibility: hidden">
+			<span class="dijitInline dijitIcon dijitMenuExpand"></span>
+			<span class="dijitMenuExpandA11y">+</span>
+		</span>
+	</td>
+</tr>
diff --git a/src/main/resources/static/dijit/templates/MenuSeparator.html b/src/main/resources/static/dijit/templates/MenuSeparator.html
new file mode 100644
index 0000000000000000000000000000000000000000..3d4155b929fe5bb77f3234c95292cfadb7c0af33
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/MenuSeparator.html
@@ -0,0 +1,10 @@
+<tr class="dijitMenuSeparator" role="separator">
+	<td class="dijitMenuSeparatorIconCell">
+		<div class="dijitMenuSeparatorTop"></div>
+		<div class="dijitMenuSeparatorBottom"></div>
+	</td>
+	<td colspan="3" class="dijitMenuSeparatorLabelCell">
+		<div class="dijitMenuSeparatorTop dijitMenuSeparatorLabel"></div>
+		<div class="dijitMenuSeparatorBottom"></div>
+	</td>
+</tr>
diff --git a/src/main/resources/static/dijit/templates/ProgressBar.html b/src/main/resources/static/dijit/templates/ProgressBar.html
new file mode 100644
index 0000000000000000000000000000000000000000..bac261a12f1afe76e2e018c5a696da85d87c54c3
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/ProgressBar.html
@@ -0,0 +1,9 @@
+<div class="dijitProgressBar dijitProgressBarEmpty" role="progressbar"
+	><div  data-dojo-attach-point="internalProgress" class="dijitProgressBarFull"
+		><div class="dijitProgressBarTile" role="presentation"></div
+		><span style="visibility:hidden">&#160;</span
+	></div
+	><div data-dojo-attach-point="labelNode" class="dijitProgressBarLabel" id="${id}_label"></div
+	><span data-dojo-attach-point="indeterminateHighContrastImage"
+		   class="dijitInline dijitProgressBarIndeterminateHighContrastImage"></span
+></div>
diff --git a/src/main/resources/static/dijit/templates/TitlePane.html b/src/main/resources/static/dijit/templates/TitlePane.html
new file mode 100644
index 0000000000000000000000000000000000000000..d482514920da6792b3580247c4328de344470675
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/TitlePane.html
@@ -0,0 +1,17 @@
+<div>
+	<div data-dojo-attach-event="ondijitclick:_onTitleClick, onkeydown:_onTitleKey"
+			class="dijitTitlePaneTitle" data-dojo-attach-point="titleBarNode" id="${id}_titleBarNode">
+		<div class="dijitTitlePaneTitleFocus" data-dojo-attach-point="focusNode">
+			<span data-dojo-attach-point="arrowNode" class="dijitInline dijitArrowNode" role="presentation"></span
+			><span data-dojo-attach-point="arrowNodeInner" class="dijitArrowNodeInner"></span
+			><span data-dojo-attach-point="titleNode" class="dijitTitlePaneTextNode"></span>
+		</div>
+	</div>
+	<div class="dijitTitlePaneContentOuter" data-dojo-attach-point="hideNode" role="presentation">
+		<div class="dijitReset" data-dojo-attach-point="wipeNode" role="presentation">
+			<div class="dijitTitlePaneContentInner" data-dojo-attach-point="containerNode" role="region" id="${id}_pane" aria-labelledby="${id}_titleBarNode">
+				<!-- nested divs because wipeIn()/wipeOut() doesn't work right on node w/padding etc.  Put padding on inner div. -->
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/main/resources/static/dijit/templates/Tooltip.html b/src/main/resources/static/dijit/templates/Tooltip.html
new file mode 100644
index 0000000000000000000000000000000000000000..e08d1a891c26a3a490b53d15e5bb430daadc0f4f
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/Tooltip.html
@@ -0,0 +1,4 @@
+<div class="dijitTooltip dijitTooltipLeft" id="dojoTooltip" data-dojo-attach-event="mouseenter:onMouseEnter,mouseleave:onMouseLeave"
+	><div class="dijitTooltipConnector" data-dojo-attach-point="connectorNode"></div
+	><div class="dijitTooltipContainer dijitTooltipContents" data-dojo-attach-point="containerNode" role='alert'></div
+></div>
diff --git a/src/main/resources/static/dijit/templates/TooltipDialog.html b/src/main/resources/static/dijit/templates/TooltipDialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..0ec136f0ba0249b738e74ad36df74adb9e232e88
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/TooltipDialog.html
@@ -0,0 +1,9 @@
+<div role="alertdialog" tabIndex="-1">
+	<div class="dijitTooltipContainer" role="presentation">
+		<div data-dojo-attach-point="contentsNode" class="dijitTooltipContents dijitTooltipFocusNode">
+			<div data-dojo-attach-point="containerNode"></div>
+			${!actionBarTemplate}
+		</div>
+	</div>
+	<div class="dijitTooltipConnector" role="presentation" data-dojo-attach-point="connectorNode"></div>
+</div>
diff --git a/src/main/resources/static/dijit/templates/Tree.html b/src/main/resources/static/dijit/templates/Tree.html
new file mode 100644
index 0000000000000000000000000000000000000000..778f5d7648b501efcde463764b7e27708c9b4399
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/Tree.html
@@ -0,0 +1,6 @@
+<div role="tree">
+	<div class="dijitInline dijitTreeIndent" style="position: absolute; top: -9999px" data-dojo-attach-point="indentDetector"></div>
+	<div class="dijitTreeExpando dijitTreeExpandoLoading" data-dojo-attach-point="rootLoadingIndicator"></div>
+	<div data-dojo-attach-point="containerNode" class="dijitTreeContainer" role="presentation">
+	</div>
+</div>
diff --git a/src/main/resources/static/dijit/templates/TreeNode.html b/src/main/resources/static/dijit/templates/TreeNode.html
new file mode 100644
index 0000000000000000000000000000000000000000..1e6e1c60a25041cb2bac81dbb5e74d9b6969fc7b
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/TreeNode.html
@@ -0,0 +1,14 @@
+<div class="dijitTreeNode" role="presentation"
+	><div data-dojo-attach-point="rowNode" class="dijitTreeRow" role="presentation"
+		><span data-dojo-attach-point="expandoNode" class="dijitInline dijitTreeExpando" role="presentation"></span
+		><span data-dojo-attach-point="expandoNodeText" class="dijitExpandoText" role="presentation"></span
+		><span data-dojo-attach-point="contentNode"
+			class="dijitTreeContent" role="presentation">
+			<span role="presentation" class="dijitInline dijitIcon dijitTreeIcon" data-dojo-attach-point="iconNode"></span
+			><span data-dojo-attach-point="labelNode,focusNode" class="dijitTreeLabel" role="treeitem"
+				   tabindex="-1" aria-selected="false" id="${id}_label"></span>
+		</span
+	></div>
+	<div data-dojo-attach-point="containerNode" class="dijitTreeNodeContainer" role="presentation"
+		 style="display: none;" aria-labelledby="${id}_label"></div>
+</div>
diff --git a/src/main/resources/static/dijit/templates/actionBar.html b/src/main/resources/static/dijit/templates/actionBar.html
new file mode 100644
index 0000000000000000000000000000000000000000..d428709e061aef4666b6a81c4480265daf45c4c8
--- /dev/null
+++ b/src/main/resources/static/dijit/templates/actionBar.html
@@ -0,0 +1,5 @@
+<div class='dijitDialogPaneActionBar' data-dojo-attach-point="actionBarNode">
+	<button data-dojo-type='dijit/form/Button' type='submit' data-dojo-attach-point="okButton"></button>
+	<button data-dojo-type='dijit/form/Button' type='button'
+			data-dojo-attach-point="cancelButton" data-dojo-attach-event='click:onCancel'></button>
+</div>
diff --git a/src/main/resources/static/dijit/tests/AsyncMemoryStore.js b/src/main/resources/static/dijit/tests/AsyncMemoryStore.js
new file mode 100644
index 0000000000000000000000000000000000000000..e06af636a5520ad33bd129a3c80a2bf4d6392d8c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/AsyncMemoryStore.js
@@ -0,0 +1,61 @@
+define([
+	"dojo/_base/declare",
+	"dojo/Deferred",
+	"dojo/store/Memory",
+	"dojo/store/util/QueryResults",
+	"dojo/store/util/SimpleQueryEngine"
+], function(declare, Deferred, Memory, QueryResults, SimpleQueryEngine){
+
+	// module:
+	//		dijit/tests/AsyncMemoryStore
+
+	return declare(null, {
+		// summary:
+		//		Wrapper on dojo/store/Memory that makes functions async (for testing)
+
+		queryEngine: SimpleQueryEngine,
+
+		constructor: function(hash){
+			this.store = new Memory(hash);
+		},
+
+		get: function(id){
+			var d = new Deferred(), store = this.store;
+			try{
+				d.resolve(store.get(id));
+			}catch(e){
+				d.reject(e);
+			}
+			return d;
+		},
+
+		getIdentity: function(object){
+			return this.store.getIdentity(object);
+		},
+
+		put: function(object, directives){
+			return this.store.put(object, directives);
+		},
+
+		add: function(object, directives){
+			return this.store.add(object, directives);
+		},
+
+		remove: function(id){
+			return this.store.remove(id);
+
+		},
+
+		query: function(query, options){
+			var d = new Deferred(), store = this.store;
+			setTimeout(function(){
+				try{
+					d.resolve(store.query(query, options));
+				}catch(e){
+					d.reject(e);
+				}
+			}, 10);
+			return QueryResults(d);
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/tests/Bidi.html b/src/main/resources/static/dijit/tests/Bidi.html
new file mode 100644
index 0000000000000000000000000000000000000000..e39f6f6ca70aa7095c396a2e07b812d59380f3cc
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/Bidi.html
@@ -0,0 +1,374 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>Multi-directional document test</title>
+
+	<script type="text/javascript" src="boilerplate.js" data-dojo-config="extraLocale: ['en','ar','he'], isDebug: true"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+
+			"dojo/_base/array",
+			"dojo/dom",
+			"dojo/dom-geometry",
+			"dojo/json",
+			"dojo/on",
+			"dojo/parser",
+			"dojo/query",
+			"dojo/data/ItemFileReadStore",
+
+			"dijit/registry",
+
+			"dijit/Tree",
+			"dijit/tree/ForestStoreModel",
+
+			"dijit/Menu",
+			"dijit/MenuItem",
+			"dijit/PopupMenuItem",
+
+			"dijit/form/Button",
+			"dijit/form/DropDownButton",
+			"dijit/form/ComboButton",
+			"dijit/form/ToggleButton",
+	
+			"dijit/ColorPalette",
+			"dijit/Toolbar",
+			"dijit/TooltipDialog",
+	
+			"dijit/form/TextBox",
+			"dijit/form/DateTextBox",
+			"dijit/form/NumberSpinner",
+			"dijit/form/ComboBox",
+	
+			"dijit/layout/TabContainer",
+			"dijit/layout/ContentPane",
+				
+			"dojo/domReady!"
+		], function(doh, array, dom, domGeom, json, on, parser, query, ItemFileReadStore, registry){
+		
+
+			function checkLeft(/*Widget*/ left, /*Widget*/ right){
+				if(left.domNode) left = left.domNode;
+				if(right.domNode) right = right.domNode;
+	
+				var lp = domGeom.position(left, true),
+					rp = domGeom.position(right, true);
+	
+				doh.t(lp.x+lp.w-0.1 <= rp.x,
+					left.id + " to left of " + right.id + json.stringify(lp) + json.stringify(rp)
+				);
+			}
+
+			doh.register("setup", [
+				function parse(){
+					parser.parse();
+				},
+				{
+					name: "wait for tab container load",
+					timeout: 5000,
+					runTest: function(){
+						return registry.byId("ltr_tc_cp").onLoadDeferred;
+					}
+				},
+				{
+					name: "wait for tree load",
+					timeout: 5000,
+					runTest: function(){
+						return registry.byId("ltr_tc_tree").onLoadDeferred;
+					}
+				}
+			]);
+
+			doh.register("Test bidi toolbar", [
+				{
+					name: "toolbar checkLeft",
+					runTest: function(){
+						//Check that the order of the menu buttons is correct
+						checkLeft(registry.byId("ltr_ToolbarCutButton"), registry.byId("ltr_ToolbarDropDown"));
+						checkLeft(registry.byId("ltr_ToolbarDropDown"), registry.byId("ltr_ToolbarColorDropDown"));
+						checkLeft(registry.byId("ltr_ToolbarColorDropDown"), registry.byId("ltr_ToolbarComboButton"));
+						checkLeft(registry.byId("rtl_ToolbarComboButton"), registry.byId("rtl_ToolbarColorDropDown"));
+						checkLeft(registry.byId("rtl_ToolbarColorDropDown"), registry.byId("rtl_ToolbarDropDown"));
+						checkLeft(registry.byId("rtl_ToolbarDropDown"), registry.byId("rtl_ToolbarCutButton"));
+					}
+				},
+				{
+					name: "ltr_ToolbarDropDown",
+					runTest: function(){
+						registry.byId("ltr_ToolbarDropDown").openDropDown();
+
+						checkLeft(dom.byId("ltr_l1"), registry.byId("ltr_i1"));
+						checkLeft(dom.byId("ltr_l2"), registry.byId("ltr_i2"));
+						checkLeft(dom.byId("ltr_l3"), registry.byId("ltr_i3"));
+
+						doh.is("ltr", dom.byId("widget_ltr_i1").dir);
+						doh.is("ltr", dom.byId("widget_ltr_i2").dir);
+						doh.is("ltr", dom.byId("widget_ltr_i3").dir);
+						doh.is("ltr", registry.byId("ltr_button").dir);
+					}
+				},
+				{
+					name: "rtl_ToolbarDropDown",
+					runTest: function(){
+						registry.byId("rtl_ToolbarDropDown").openDropDown();
+
+						checkLeft(registry.byId("rtl_i1"), dom.byId("rtl_l1"));
+						checkLeft(registry.byId("rtl_i2"), dom.byId("rtl_l2"));
+						checkLeft(registry.byId("rtl_i3"), dom.byId("rtl_l3"));
+
+						doh.is("rtl", dom.byId("widget_rtl_i1").dir);
+						doh.is("rtl", dom.byId("widget_rtl_i2").dir);
+						doh.is("rtl", dom.byId("widget_rtl_i3").dir);
+						doh.is("rtl", registry.byId("rtl_button").dir);
+					}
+				},
+				{
+					name: "ltr_ToolbarMenuDropDown",
+					runTest: function(){
+						registry.byId("ltr_ToolbarComboButton").openDropDown();
+
+						var icon = registry.byId("ltr_mi1").iconNode;
+						var label = registry.byId("ltr_mi1").containerNode;
+						checkLeft(icon, label);
+					}
+				},
+				{
+					name: "ltr_Toolbar_nested_menu",
+					runTest: function(){
+						on.emit(registry.byId("ltr_popup_mi1").domNode, "click",  {
+							bubbles: true,
+							cancelable: true,
+							which: 1
+						});
+						var icon = registry.byId("ltr_popup_mi1").iconNode;
+						var label = registry.byId("ltr_popup_mi1").containerNode;
+						checkLeft(icon, label);
+					}
+				},
+				{
+					name: "rtl_ToolbarMenuDropDown",
+					runTest: function(){
+						registry.byId("rtl_ToolbarComboButton").openDropDown();
+
+						var icon = registry.byId("rtl_mi1").iconNode;
+						var label = registry.byId("rtl_mi1").containerNode;
+						checkLeft(label, icon);
+					}
+				},
+				{
+					name: "rtl_Toolbar_nested_menu",
+					runTest: function(){
+						on.emit(registry.byId("rtl_popup_mi1").domNode, "click",  {
+							bubbles: true,
+							cancelable: true,
+							which: 1
+						});
+
+						var icon = registry.byId("rtl_popup_mi1").iconNode;
+						var label = registry.byId("rtl_popup_mi1").containerNode;
+						checkLeft(label, icon);
+					}
+				}
+			]);
+
+			doh.register("Test bidi tab container", [
+				{
+					name: "ltr TabContainer",
+					runTest: function(){
+						// Check that the order of the tabs is correct
+						checkLeft(registry.byId("ltr_tc_tablist_ltr_tc_cp"), registry.byId("ltr_tc_tablist_ltr_tc_tree"));
+
+						// Check the fields on each of the first tabs
+						doh.is("ltr", registry.byId("ltr_tc_cp").dir);
+
+						var combo = query("input[value='dijit']", dom.byId("ltr_tc_cp"))[0];
+						var arrow = query(".dijitButtonNode", dom.byId("ltr_tc_cp"))[0];
+						checkLeft(combo, arrow);
+					}
+				},
+				{
+					name: "rtl TabContainer",
+					runTest: function(){
+						// Check that the order of the tabs is correct
+						checkLeft(registry.byId("rtl_tc_tablist_rtl_tc_tree"), registry.byId("rtl_tc_tablist_rtl_tc_cp"));
+
+						// Check the fields on each of the first tabs
+						doh.is("rtl", registry.byId("rtl_tc_cp").dir);
+
+						combo = query("input[value='dijit']", dom.byId("rtl_tc_cp"))[0];
+						arrow = query(".dijitButtonNode", dom.byId("rtl_tc_cp"))[0];
+						checkLeft(arrow, combo);
+					}
+				}
+			]);
+
+			doh.register("Tree", [
+				{
+					name: "ltr_tree",
+					runTest: function(){
+						registry.byId("ltr_tc").selectChild("ltr_tc_tree");
+
+						var rowNodes = query(".dijitTreeRow", dom.byId("ltr_tc_tree"));
+
+						array.forEach(rowNodes, function(rowNode){
+							var expando = query(".dijitTreeExpando", rowNode)[0];
+							var label = query(".dijitTreeContent", rowNode)[0];
+							checkLeft(expando, label);
+						});
+					}
+				},
+				{
+					name: "rtl_tree",
+					runTest: function(){
+						registry.byId("rtl_tc").selectChild("rtl_tc_tree");
+
+						var rowNodes = query(".dijitTreeRow", dom.byId("rtl_tc_tree"));
+
+						array.forEach(rowNodes, function(rowNode){
+							var expando = query(".dijitTreeExpando", rowNode)[0];
+							var label = query(".dijitTreeContent", rowNode)[0];
+							checkLeft(label, expando);
+						});
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body>
+
+	<h1 class="testTitle">Multi-directional document test</h1>
+
+	<div data-dojo-id="continentStore" data-dojo-type="dojo/data/ItemFileReadStore" data-dojo-props='url:"_data/countries.json"'></div>
+	<div data-dojo-id="continentModel" data-dojo-type="dijit/tree/ForestStoreModel" data-dojo-props='store:continentStore, query:{type:"continent"},
+		rootId:"continentRoot", rootLabel:"Continents", childrenAttrs:["children"]'></div>
+
+	<div id="right" dir="rtl" lang="ar-eg" style="float: right; width: 500px;">
+		<h2>RTL</h2>
+
+		<div data-dojo-type="dijit/Toolbar"
+				><div id="rtl_ToolbarCutButton" data-dojo-type="dijit/form/Button" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut", showLabel:false'>Cut</div
+				><div id="rtl_ToolbarDropDown" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"plusIcon", showLabel:true'>
+					<span>שיח</span>
+					<div data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Enter Login information"'>
+						<table>
+							<tr>
+								<td><label id="rtl_l1">ש�:</label></td>
+								<td><input id="rtl_i1" data-dojo-type="dijit/form/TextBox"/></td>
+							</tr>
+							<tr>
+								<td><label id="rtl_l2">ת�ריך:</label></td>
+								<td><input id="rtl_i2" data-dojo-type="dijit/form/DateTextBox"/></td>
+							</tr>
+							<tr>
+								<td><label id="rtl_l3">גיל:</label></td>
+								<td><input id="rtl_i3" data-dojo-type="dijit/form/NumberSpinner"/></td>
+							</tr>
+							<tr>
+								<td colspan="2" style="text-align:center;">
+									<button id="rtl_button" data-dojo-type="dijit/form/Button" data-dojo-props='type:"submit", name:"submit"'>כניסה</button>
+								</td>
+							</tr>
+						</table>
+					</div
+				></div
+				><div id="rtl_ToolbarColorDropDown" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconBackColor", showLabel:true'>
+					<span>لوحة الألوان</span>
+					<div id="rtl_colorPalette" data-dojo-type="dijit/ColorPalette" data-dojo-props='style:"display:none;", palette:"7x10", onChange:function(){ console.log(this.value); }'></div>
+				</div
+				><div id="rtl_ToolbarComboButton" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options", iconClass:"plusIcon", showLabel:true'>
+					<span>القائمة</span>
+					<div data-dojo-type="dijit/Menu" data-dojo-props='style:"display:none;"'>
+						<div id="rtl_mi1" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave"'>ح�ظ</div>
+						<div data-dojo-type="dijit/MenuItem">ح�ظ ك</div>
+						<div id="rtl_popup_mi1" data-dojo-type="dijit/PopupMenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconForeColor"'>
+							<span>�رعية</span>
+							<div data-dojo-type="dijit/Menu">
+								<div data-dojo-type="dijit/MenuItem">Submenu Item One</div>
+								<div data-dojo-type="dijit/MenuItem">Submenu Item Two</div>
+								<div data-dojo-type="dijit/PopupMenuItem">
+									<span>Deeper Submenu</span>
+									<div data-dojo-type="dijit/Menu">
+										<div data-dojo-type="dijit/MenuItem">Sub-sub-menu Item One</div>
+										<div data-dojo-type="dijit/MenuItem">Sub-sub-menu Item Two</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div
+		></div>
+		<div id="rtl_tc" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 450px; height: 300px; margin-top: 1em;"'>
+			<div id="rtl_tc_cp" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"رابط", closable:true, href:"layout/doc0.html"'></div>
+			<div id="rtl_tc_tree" data-dojo-type="dijit/Tree" data-dojo-props='model:continentModel, openOnClick:true, title:"×¢×¥", closable:true'></div>
+		</div>
+	</div>
+
+	<div id="left" dir="ltr" lang="en-us" style="width: 500px; float: left;">
+		<h2>LTR</h2>
+
+		<div data-dojo-type="dijit/Toolbar"
+				><div id="ltr_ToolbarCutButton" data-dojo-type="dijit/form/Button" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut", showLabel:false'>Cut</div
+				><div id="ltr_ToolbarDropDown" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"plusIcon", showLabel:true'>
+					<span>TooltipDialog</span>
+					<div data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Enter Login information"'>
+						<table>
+							<tr>
+								<td><label id="ltr_l1">Name:</label></td>
+								<td><input id="ltr_i1" data-dojo-type="dijit/form/TextBox"/></td>
+							</tr>
+							<tr>
+								<td><label id="ltr_l2">Date:</label></td>
+								<td><input id="ltr_i2" data-dojo-type="dijit/form/DateTextBox"/></td>
+							</tr>
+							<tr>
+								<td><label id="ltr_l3">Age:</label></td>
+								<td><input id="ltr_i3" data-dojo-type="dijit/form/NumberSpinner"/></td>
+							</tr>
+							<tr>
+								<td colspan="2" style="text-align:center;">
+									<button id="ltr_button" data-dojo-type="dijit/form/Button" data-dojo-props='type:"submit", name:"submit"'>Login</button></td>
+							</tr>
+						</table>
+					</div
+				></div
+				><div id="ltr_ToolbarColorDropDown" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconBackColor", showLabel:true'>
+					<span>ColorPalette</span>
+					<div id="ltr_colorPalette" data-dojo-type="dijit/ColorPalette" data-dojo-props='style:"display:none;", palette:"7x10", onChange:function(){ console.log(this.value); }'></div>
+				</div
+				><div id="ltr_ToolbarComboButton" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options", iconClass:"plusIcon", showLabel:true'>
+					<span>Menu</span>
+					<div data-dojo-type="dijit/Menu" data-dojo-props='style:"display none;"'>
+						<div id="ltr_mi1" data-dojo-type="dijit/MenuItem"  data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave"'>Save</div>
+						<div data-dojo-type="dijit/MenuItem">Save As</div>
+						<div id="ltr_popup_mi1" data-dojo-type="dijit/PopupMenuItem">
+							<span>Enabled Submenu</span>
+							<div data-dojo-type="dijit/Menu">
+								<div data-dojo-type="dijit/MenuItem">Submenu Item One</div>
+								<div data-dojo-type="dijit/MenuItem">Submenu Item Two</div>
+								<div data-dojo-type="dijit/PopupMenuItem">
+									<span>Deeper Submenu</span>
+									<div data-dojo-type="dijit/Menu">
+										<div data-dojo-type="dijit/MenuItem">Sub-sub-menu Item One</div>
+										<div data-dojo-type="dijit/MenuItem">Sub-sub-menu Item Two</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div
+		></div>
+
+		<div id="ltr_tc" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 450px; height: 300px; margin-top: 1em;"'>
+			<div id="ltr_tc_cp" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Href", closable:true, href:"layout/doc0.html"'></div>
+			<div id="ltr_tc_tree" data-dojo-type="dijit/Tree" data-dojo-props='model:continentModel, openOnClick:true, title:"Tree", closable:true'></div>
+		</div>
+
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/CalendarLite.html b/src/main/resources/static/dijit/tests/CalendarLite.html
new file mode 100644
index 0000000000000000000000000000000000000000..4228b88b9c4163ff7810078f8d5d86b3c2a6ab21
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/CalendarLite.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>CalendarLite Widget Test</title>
+
+		<script src="boilerplate.js"></script>
+
+		<script type="text/javascript">
+			require(["doh/runner", "dojo/date/stamp", "dojo/dom", "dijit/CalendarLite", "dojo/query", "dojo/domReady!"],
+					function(doh, stamp, dom, CalendarLite, query){
+
+				doh.register("CalendarLite", [
+					function create(){
+						cal = new CalendarLite({
+							id: "cal",
+							value: "1999-12-31",
+							onChange: function myHandler(id,newValue){
+								console.debug("onChange for id = " + id + ", value: " + newValue);
+							}
+						}, dom.byId("calendar1"));
+
+						doh.is("1999-12-31", stamp.toISOString(cal.get("value"), {selector: "date"}), "value");
+						doh.is("December", cal.gridNode.getAttribute("summary"));
+					},
+
+					function change(){
+						cal.set("value", "2000-11-30");
+						doh.is("2000-11-30", stamp.toISOString(cal.get("value"), {selector: "date"}), "value");
+						doh.is("November", cal.gridNode.getAttribute("summary"));
+
+						//Verify default dayOffset is for locale.
+						doh.is(-1, cal.get('dayOffset'), "CalendarLite should default to -1 if no value specified");
+					},
+
+					function createWithSummary(){
+						cal2 = new CalendarLite({
+							id: "cal2",
+							value: "1999-12-31",
+							summary: "explicit summary"
+						}, dom.byId("calendar2"));
+
+						doh.is("explicit summary", cal2.gridNode.getAttribute("summary"));
+					},
+
+					function createWithFirstDayOfWeek(){
+						cal3 = new CalendarLite({
+							id: "cal3",
+							value: "1999-12-31",
+							dayOffset: 3
+						}, dom.byId("calendar3"));
+
+						var firstCol = query('thead tr[role="row"] > *', cal3.domNode);
+						doh.is("W", firstCol[0].textContent || firstCol[0].innerText ,
+								"W should be first column heading with offset of 3");
+					}
+
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+	<body role="main">
+
+		<h1 class="testTitle">Dijit CalendarLite Test</h1>
+
+		<label for="before">before:</label><input value="input" id="before"/>
+		<input id="calendar1"/>
+		<label for="after">between:</label><input value="input" id="between"/>
+		<input id="calendar2"/>
+		<label for="after">after:</label><input value="input" id="after"/>
+		<input id="calendar3"/>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/ConfirmDialog.html b/src/main/resources/static/dijit/tests/ConfirmDialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..2962a02bf5eac357d93baa2b1bd30c2ec0170ae9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/ConfirmDialog.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>ConfirmDialog Widget Automated (non-robot) Tests</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/declare", "dojo/dom", "dojo/dom-geometry", "dojo/dom-style", "dojo/window",
+			"dijit/focus", "dijit/registry", "dijit/ConfirmDialog", "dijit/DialogUnderlay", "dijit/_WidgetBase",
+			"dijit/tests/helpers", "dojo/domReady!"
+		], function(doh, declare, dom, domGeom, domStyle, winUtils,
+					focus, registry, ConfirmDialog, DialogUnderlay, _WidgetBase, helpers){
+
+			doh.register("resize", [
+				{
+					name: "create",
+					timeout: 10000,
+					runTest: function () {
+						// Create and show ConfirmDialog
+						dlg1 = new ConfirmDialog({
+							id: "dlg1",
+							title: "ConfirmDialog 1",
+							content: "<input id='dlg1_inputA'><br>" +
+							"<input id='dlg1_inputB'><br>" +
+							"<input id='dlg1_inputC'><br>" +
+							"<input id='dlg1_inputD'><br>" +
+							"<input id='dlg1_inputE'><br>" +
+							"<input id='dlg1_inputF'><br>" +
+							"<input id='dlg1_inputG'><br>" +
+							"<input id='dlg1_inputH'><br>"
+						});
+
+						return dlg1.show().then(function() {
+							doh.t(helpers.isVisible(dlg1), "ConfirmDialog 1 is visible");
+						});
+					}
+				},
+
+				{
+					name: "resize",
+					timeout: 10000,
+					runTest: function(){
+						dlg1.resize({h: 150, w: 300});
+
+						var domPos = domGeom.position(dlg1.domNode);
+						doh.is(150, domPos.h, "domNode.h");
+						doh.is(300, domPos.w, "domNode.w");
+
+						// dialog should show title, containerNode, then finally actionBar
+						var titlePos = domGeom.position(dlg1.titleBar),
+							containerPos = domGeom.position(dlg1.containerNode),
+							actionBarPos = domGeom.position(dlg1.actionBarNode);
+						doh.t(Math.abs(titlePos.h + containerPos.h + actionBarPos.h - 148) < 1, "heights add up");
+						doh.t(titlePos.h > 0, "title has height");
+						doh.t(containerPos.h > 0, "container has height");
+						doh.t(actionBarPos.h > 0, "container has height");
+
+						// and the containerNode should have a scroll bar
+						doh.is("auto", dlg1.containerNode.style.overflow, "overflow style");
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body>
+	<h1 class="testTitle">Dijit ConfirmDialog Automated (non-robot) tests</h1>
+</body>
+</html>
+
+
diff --git a/src/main/resources/static/dijit/tests/Destroyable.html b/src/main/resources/static/dijit/tests/Destroyable.html
new file mode 100644
index 0000000000000000000000000000000000000000..cfa1aca6f712ed5ff92990fd8fc44ec22476f1b5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/Destroyable.html
@@ -0,0 +1,177 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Destroyable unit test</title>
+
+<script src="boilerplate.js"></script>
+
+<script type="text/javascript">
+require([
+	"doh/runner",
+	"dojo/aspect", "dojo/_base/declare", "dojo/Deferred", "dojo/dom", "dojo/dom-construct",
+	"dojo/_base/lang", "dojo/on", "dojo/Stateful",
+	"dijit/Destroyable", "dojo/domReady!"
+], function(doh, aspect, declare, Deferred, dom, domConstruct, lang, on, Stateful, Destroyable){
+	doh.register("Destroyable", [
+		function general(){
+			var SupportingWidget = declare([], {
+				destroyCalls: 0,
+				constructor: function(name){
+					this.name = name;
+				},
+				destroy: function(){
+					this.destroyCalls++;
+				}
+			});
+			var watchMe = new Stateful({
+				name: "watchMe",
+				x: 0
+			});
+			var DestroyableSubClass = declare(Destroyable, {
+				// number of times my button was clicked
+				clicks: 0,
+
+				// number of times watchMe changed value of x
+				watches: 0,
+
+				constructor: function(){
+					var self = this;
+					this.domNode = domConstruct.create("button");
+					this.own(
+						// setup an event handler (to be destroyed when I'm destroyed)
+						on(this.domNode, "click", function(){ self.clicks++; }),
+
+						// watch external watchMe class (to be unwatch()'d when I'm destroyed)
+						watchMe.watch("x", function(name, oVal, nVal){ self.watches++; })
+					);
+
+					// Setup two supporting widgets, to be destroyed when I'm destroyed
+					this.own(this.sw1 = new SupportingWidget("sw1"));
+					this.own(this.sw2 = new SupportingWidget("sw2"));
+				}
+			});
+
+			var destroyable1 = new DestroyableSubClass();
+			dom.byId("container").appendChild(destroyable1.domNode);
+
+			// make sure event handler was setup
+			destroyable1.domNode.click();
+			doh.is(1, destroyable1.clicks, "one click");
+
+			// make sure watch handler was setup
+			watchMe.set("x", 1);
+			doh.is(1, destroyable1.watches, "one watch notification");
+
+			// manually destroy one of the supporting widgets
+			destroyable1.sw1.destroy();
+			doh.is(1, destroyable1.sw1.destroyCalls);
+			
+			// Destroy the Destroyable instance itself.   destroyable1 should:
+			// 		- destroy the sw2 supporting widget, but not try to re-destroy sw1
+			//		- disconnect the watch() listener on watchMe
+			//		- disconnect the click event handler on destroyable1.domNode
+			destroyable1.destroy();
+			doh.is(1, destroyable1.sw1.destroyCalls, "sw1 wasn't redestroyed");
+			doh.is(1, destroyable1.sw2.destroyCalls, "sw2 was destroyed");
+			
+			destroyable1.domNode.click();
+			doh.is(1, destroyable1.clicks, "no new click notification");
+			watchMe.set("x", 2);
+			doh.is(1, destroyable1.watches, "no new watch notification");
+		},
+
+		function multipleDestroyFunctions(){
+			var destroyRecursiveCount = 0;
+			var destroyCount = 0;
+			var W1 = declare([Destroyable], {
+				destroyRecursive: function() {
+					destroyRecursiveCount++;
+					this.destroy();
+					this.inherited(arguments);
+				},
+				destroy: function() {
+					destroyCount++;
+					this.inherited(arguments);
+				}
+			});
+			var W2 = declare([Destroyable], {
+				test: function() {
+					var w1 = new W1();
+					this.own(w1);
+					w1.destroy();
+				},
+				destroy: function() {
+					this.inherited(arguments);
+				}
+			});
+			var W3 = declare([Destroyable], {
+				test: function() {
+					var w1 = new W1();
+					this.own(w1);
+					w1.destroyRecursive();
+				},
+				destroy: function() {
+					this.inherited(arguments);
+				}
+			});
+			var w2 = new W2();
+			w2.test();
+			w2.destroy();
+			doh.is(0, destroyRecursiveCount, "destroyRecursive was not called as expected");
+			doh.is(1, destroyCount, "destroy was not called as expected");
+			destroyRecursiveCount = 0;
+			destroyCount = 0;
+			var w3 = new W3();
+			w3.test();
+			w3.destroy();
+			doh.is(1, destroyRecursiveCount, "destroyRecursive was not called as expected");
+			doh.is(1, destroyCount, "destroy was not called as expected");
+		},
+
+		function owningPromises(){
+			var cancels = 0;
+			var W1 = declare(Destroyable, {
+				constructor: function(){
+					this.p1 = new Deferred(function(){ console.log("cancel p1"); cancels++; });
+					this.p2 = new Deferred(function(){ console.log("cancel p2"); cancels++; });
+					this.p3 = new Deferred(function(){ console.log("cancel p3"); cancels++; });
+					this.p4 = new Deferred(function(){ console.log("cancel p4"); cancels++; });
+					this.own(this.p1, this.p2, this.p3, this.p4);
+				}
+			});
+
+			var w1 = new W1();
+
+			w1.p1.resolve(true);
+			aspect.after(w1.p1, "cancel", function(){
+				throw new Error("p1 shouldn't have been canceled");
+			}, true);
+
+			w1.p2.reject(new Error("I was rejected"));
+			aspect.after(w1.p2, "cancel", function(){
+				throw new Error("p2 shouldn't have been canceled");
+			}, true);
+
+			w1.p3.cancel();
+			doh.is(1, cancels, "one promise canceled manually before destroy");
+
+			// Destroying the widget should only cancel p4; it's the only Promise that hasn't been dealt with already.
+			// OTOH if Destroyable is broken, one of the asserts above may go off during the destroy() call.
+			w1.destroy();
+
+			doh.is(2, cancels, "only p4 canceled on widget destroy");
+		}
+
+	]);	// doh.register()
+
+	doh.run();
+});	// require()
+
+</script>
+</head>
+<body>
+<h1>dijit/Destroyable Unit Test</h1>
+<div id="container"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/Dialog.html b/src/main/resources/static/dijit/tests/Dialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..6c3b5c919d6a07ab3d1ad6e8b9499cf18c905742
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/Dialog.html
@@ -0,0 +1,687 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Dialog Widget Automated (non-robot) Tests</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/declare", "dojo/dom", "dojo/dom-geometry", "dojo/dom-style", "dojo/window",
+			"dijit/focus", "dijit/registry", "dijit/Dialog", "dijit/DialogUnderlay", "dijit/_WidgetBase",
+			"dijit/tests/helpers", "dojo/domReady!"
+		], function(doh, declare, dom, domGeom, domStyle, winUtils,
+					focus, registry, Dialog, DialogUnderlay, _WidgetBase, helpers){
+			// Non robot tests to see if nested dialogs work correctly
+			// when obscured dialogs are destroyed/hidden, on race conditions of
+			// multiple dialogs fading in/out at once, etc.
+
+			doh.register("setup", function(){
+				// Start focus on a button on the page (although we aren't going
+				// to click the button)
+				var d = new doh.Deferred();
+
+				setTimeout(d.getTestErrback(function(){
+					dom.byId("button").focus();
+
+					setTimeout(d.getTestCallback(function(){
+						doh.is("button", focus.curNode.id, "focus is on the main page");
+					}), 100);
+				}), 300);
+
+				return d;
+			});
+
+			doh.register("out-of-order dialog hide/destroy", [
+				{
+					name: "open first dialog",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred(),
+							dlg1;
+
+						// Create and show first dialog
+						dlg1 = new Dialog({
+							id: "dlg1",
+							title: "dialog 1",
+							content:
+								"<input id='dlg1_inputA'><br>" +
+								"<input id='dlg1_inputB'><br>" +
+								"<input id='dlg1_inputC'><br>" +
+								"<input id='dlg1_inputD'><br>" +
+								"<input id='dlg1_inputE'><br>" +
+								"<input id='dlg1_inputF'><br>" +
+								"<input id='dlg1_inputG'><br>" +
+								"<input id='dlg1_inputH'><br>"
+						});
+						dlg1.show().then(d.getTestCallback(function(){
+							doh.t(helpers.isVisible(dlg1), "dialog 1 is visible");
+
+							var dialog1Z = domStyle.get(dlg1.domNode, "zIndex"),
+								underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+
+							doh.t(dialog1Z > underlayZ, "dialog1 (zIndex=" + dialog1Z +
+								") above underlay (zIndex=" + underlayZ + ")");
+
+							doh.is("dlg1_inputA", focus.curNode.id, "focus is on the first field");
+
+							// For back-compat, startup() should be called on children even if Dialog.startup()
+							// isn't called explicitly.							
+							doh.t(dlg1._started, "dlg1 started");
+						}));
+
+						return d;
+					}
+				},
+				{
+					name: "open second dialog",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred(),
+							dlg1 = registry.byId("dlg1"),
+							dlg2;
+
+						// Create and show second dialog
+						dlg2 = new Dialog({
+							id: "dlg2",
+							title: "dialog 2",
+							content:
+								"<input id='dlg2_inputA'><br>" +
+								"<input id='dlg2_inputB'><br>" +
+								"<input id='dlg2_inputC'><br>" +
+								"<input id='dlg2_inputD'><br>" +
+								"<input id='dlg2_inputE'><br>" +
+								"<input id='dlg2_inputF'><br>"
+						});
+						dlg2.show().then(d.getTestCallback(function(){
+							doh.t(helpers.isVisible(dlg2), "dialog 2 is visible");
+
+							var dialog1Z = domStyle.get(dlg1.domNode, "zIndex"),
+								dialog2Z = domStyle.get(dlg2.domNode, "zIndex"),
+								underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+
+							doh.t(underlayZ > dialog1Z, "underlay (zIndex=" + underlayZ +
+								") above dialog1 (zIndex=" + dialog1Z + ")");
+							doh.t(dialog2Z > underlayZ, "dialog2 (zIndex=" + dialog2Z +
+								") above underlay (zIndex=" + underlayZ + ")");
+
+							doh.is("dlg2_inputA", focus.curNode.id, "focus is on the first field");
+						}));
+
+						return d;
+					}
+				},
+				{
+					name: "destroy first dialog",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred(),
+							dlg1 = registry.byId("dlg1"),
+							dlg2 = registry.byId("dlg2");
+
+						dlg1.destroy();
+
+						setTimeout(d.getTestCallback(function(){
+							doh.t(helpers.isVisible(dlg2), "dialog 2 is still visible");
+							doh.t(helpers.isVisible(DialogUnderlay._singleton), "underlay is still visible");
+
+							doh.is("dlg2_inputA", focus.curNode.id, "dialog 2 still has focus");
+
+							var dialog2Z = domStyle.get(dlg2.domNode, "zIndex"),
+								underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+
+							doh.t(dialog2Z > underlayZ, "dialog2 (zIndex=" + dialog2Z +
+								") above underlay (zIndex=" + underlayZ + ")");
+
+						}), 2000);
+
+						return d;
+					}
+				},
+				{
+					name: "open third dialog",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred(),
+							dlg2 = registry.byId("dlg2"),
+							dlg3;
+
+						// Create and show third dialog
+						dlg3 = new Dialog({
+							id: "dlg3",
+							title: "dialog 3",
+							content:
+								"<input id='dlg3_inputA'><br>" +
+								"<input id='dlg3_inputB'><br>" +
+								"<input id='dlg3_inputC'><br>" +
+								"<input id='dlg3_inputD'><br>"
+
+						});
+						dlg3.show().then(d.getTestCallback(function(){
+							doh.t(helpers.isVisible(dlg3), "dialog 3 is visible");
+
+							// Even though a dialog was deleted, the zIndex of the dialog 3
+							// should be above dialog 2.    This test is to make sure we don't
+							// merely use _dialogStack.length to compute zIndex
+							var dialog2Z = domStyle.get(dlg2.domNode, "zIndex"),
+								dialog3Z = domStyle.get(dlg3.domNode, "zIndex"),
+								underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+							doh.t(underlayZ > dialog2Z, "underlay (zIndex=" + underlayZ +
+								") above dialog2 (zIndex=" + dialog2Z + ")");
+							doh.t(dialog3Z > underlayZ, "dialog3 (zIndex=" + dialog3Z +
+								") above underlay (zIndex=" + underlayZ + ")");
+
+							doh.is("dlg3_inputA", focus.curNode.id, "focus is on the first field");
+						}));
+
+						return d;
+					}
+				},
+				{
+					name: "open fourth dialog",
+					timeout: 30000,
+					runTest: function(){
+						var d = new doh.Deferred(),
+							dlg3 = registry.byId("dlg3"),
+							dlg4;
+
+						// Create and show fourth dialog
+						dlg4 = new Dialog({
+							id: "dlg4",
+							title: "dialog 4",
+							content:
+								"<input id='dlg4_inputA'><br>" +
+								"<input id='dlg4_inputB'>"
+						});
+						dlg4.show().then(d.getTestCallback(function(){
+							doh.t(helpers.isVisible(dlg4), "dialog 4 is visible");
+
+							var dialog3Z = domStyle.get(dlg3.domNode, "zIndex"),
+								dialog4Z = domStyle.get(dlg4.domNode, "zIndex"),
+								underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+							doh.t(underlayZ > dialog3Z, "underlay (zIndex=" + underlayZ +
+								") above dialog3 (zIndex=" + dialog3Z + ")");
+							doh.t(dialog4Z > underlayZ, "dialog4 (zIndex=" + dialog4Z +
+								") above underlay (zIndex=" + underlayZ + ")");
+
+							doh.is("dlg4_inputA", focus.curNode.id, "focus is on the first field");
+						}));
+
+						return d;
+					}
+				},
+				{
+					name: "hide third dialog",
+					timeout: 40000,
+					runTest: function(){
+						var d = new doh.Deferred(),
+							dlg3 = registry.byId("dlg3"),
+							dlg4 = registry.byId("dlg4");
+
+						dlg3.hide().then(d.getTestCallback(function(){
+							doh.t(helpers.isVisible(dlg4), "dialog 4 is still visible");
+							doh.t(helpers.isVisible(DialogUnderlay._singleton), "underlay is still visible");
+
+							doh.is("dlg4_inputA", focus.curNode.id, "dialog 4 still has focus");
+
+							var dialog4Z = domStyle.get(dlg4.domNode, "zIndex"),
+								underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+
+							doh.t(dialog4Z > underlayZ, "dialog4 (zIndex=" + dialog4Z +
+								") above underlay (zIndex=" + underlayZ + ")");
+
+						}));
+
+						return d;
+					}
+				},
+				{
+					name: "close fourth dialog",
+					timeout: 30000,
+					runTest: function(){
+						var d = new doh.Deferred(),
+							dlg2 = registry.byId("dlg2"),
+							dlg3 = registry.byId("dlg3"),
+							dlg4 = registry.byId("dlg4");
+
+						// Closing fourth dialog should move focus to second dialog, since we already destroyed the
+						// third dialog.  Delay needed for IE9+ where focus shift is asynchronous.
+						dlg4.hide().then(function(){
+							setTimeout(d.getTestCallback(function(){
+								doh.t(helpers.isHidden(dlg4), "dialog 4 is hidden");
+								doh.t(helpers.isHidden(dlg3), "dialog 3 is hidden");
+								doh.t(helpers.isVisible(dlg2), "dialog 2 is visible");
+
+								var dialog2Z = domStyle.get(dlg2.domNode, "zIndex"),
+										underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+								doh.t(dialog2Z > underlayZ, "dialog2 (zIndex=" + dialog2Z +
+										") above underlay (zIndex=" + underlayZ + ")");
+
+								doh.is("dlg2_inputA", focus.curNode.id, "focus is on the first field");
+							}));
+						});
+
+						return d;
+					}
+				},
+				{
+					name: "close second dialog",
+					timeout: 30000,
+					runTest: function(){
+						var d = new doh.Deferred(),
+							dlg2 = registry.byId("dlg2");
+
+						// Since we already destroyed first dialog, closing second dialog should hide underlay and
+						// revert focus to the main page.  Need the setTimeout() for IE9+ where focus change is not
+						// instant.
+						dlg2.hide().then(function(){
+							setTimeout(d.getTestCallback(function(){
+								doh.t(helpers.isHidden(dlg2), "dialog 4 is hidden");
+								doh.t(helpers.isHidden(DialogUnderlay._singleton), "underlay hidden");
+
+								doh.is("button", focus.curNode.id, "focus is on the main page");
+							}));
+						});
+
+						return d;
+					}
+				}
+			]);
+
+			var dlgA, dlgB;
+			doh.register("concurrent hide show (multiple dialogs)", {
+				name: "concurrent hide show",
+				timeout: 20000,
+				setUp: function(){
+					// Create and show first dialog
+					dlgA = new Dialog({
+						id: "dlgA",
+						title: "Dialog A",
+						content:
+							"<button type='button'>OK</button>"
+					});
+					dlgB = new Dialog({
+						id: "dlgB",
+						title: "dialog B",
+						content:
+							"<button type='button'>OK</button>"
+					});
+					dlgA.show();
+					
+				},
+				runTest: function(){
+					var d = new doh.Deferred(),
+						cnt=0;
+
+					handle = setInterval(d.getTestErrback(function(){
+						var hidden = cnt%2 ? dlgA : dlgB,
+							shown = cnt%2 ? dlgB : dlgA;
+						
+						if(cnt > 10){
+							clearInterval(handle);
+							handle = null;
+							d.callback(true);
+							return;
+						}
+						
+						doh.t(helpers.isVisible(shown), shown.title + " visible");
+						doh.t(helpers.isHidden(hidden), hidden.title + " hidden");
+						doh.t(helpers.isVisible(DialogUnderlay._singleton), "underlay visible");
+
+						var shownZ = domStyle.get(shown.domNode, "zIndex"),
+							underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+						doh.t(shownZ > underlayZ, "visible dialog (zIndex=" + shownZ +
+							") above underlay (zIndex=" + underlayZ + ")");
+
+						hidden.show();
+						shown.hide();
+
+						cnt++;
+					}), 1000);
+					
+					return d;
+				},
+				tearDown: function(){
+					dlgA.hide();
+					dlgB.hide();
+					if(handle){
+						clearInterval(handle);
+					}
+				}
+			});
+
+			var slow, fast;
+			doh.register("fast double show", [
+				function create(){
+					console.log("creating slow, fast");
+					var d = new doh.Deferred();
+					slow = new Dialog({
+						id: "slow",
+						title: "Dialog C",
+						content:
+							"Hello world " +
+							"<button type='button' id='slowOK' onfocus='window.slowFocused=true;'>OK</button>" +
+							"<button type='button' id='slowCancel'>Cancel</button>",
+						duration: 500
+					});
+					fast = new Dialog({
+						id: "fast",
+						title: "dialog D",
+						content:
+							"<button type='button'>OK</button>",
+						duration: 100
+					});
+					
+				},
+				{
+					name: "show Dialog C then show Dialog D before Dialog C fade-in completes",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						slow.show();
+						
+						setTimeout(d.getTestErrback(function(){
+							fast.show();
+						}), slow.duration / 2);
+						
+						setTimeout(d.getTestCallback(function(){
+							doh.t(helpers.isVisible(slow), "dialog C visible");
+							doh.t(helpers.isVisible(fast), "dialog D visible");
+							doh.f(window.slowFocused, "dialog C never got focus")
+						}), slow.duration * 2);
+						return d;
+					}
+				},
+				{
+					name: "close dialogD",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						fast.hide();
+						
+						setTimeout(d.getTestCallback(function(){
+							doh.is("slowOK", focus.curNode.id, "focused to dialog C");
+							doh.t(window.slowFocused, "onfocus handler working");
+						}), fast.duration * 2);
+
+						return d;
+					}
+				},
+				{
+					name: "close dialogC",
+					timeout: 20000,
+					runTest: function(){
+						return slow.hide();
+					}
+				}
+			]);
+
+			doh.register("fast double hide", [
+				function create(){
+					var d = new doh.Deferred();
+
+					// Create a test dialog
+					dlg = new Dialog({
+						id: "doubleHide",
+						title: "Double Hide",
+						content: "Hello World",
+						duration: 100
+					});
+
+					// First show it
+					var secondHideCalled;
+					dlg.show().then(d.getTestErrback(function(){
+						// Then call hide(), as though user had clicked close icon.
+						// Return from this test when this hide() call completes.
+						dlg.hide().then(d.getTestCallback(function(){
+							doh.t(secondHideCalled, "hide() was called while hide() in progress and no problems");
+							dlg.hide();	// this should also have no effect
+						}));
+
+						// While first hide() is in progress, call hide() a few more times to make sure it
+						// doesn't break anything
+						dlg.hide();	// should do nothing
+						setTimeout(d.getTestErrback(function(){
+							dlg.hide();	// should also do nothing
+							secondHideCalled = true;
+						}), 10);
+					}));
+					return d;
+				}
+			]);
+
+			doh.register("concurrent show hide (single dialog)", [
+				function show(){
+					var d = new doh.Deferred();
+
+					var onShowCtr = 0,
+						dlg = new Dialog({
+							id: "show",
+							title: "onShow Dialog",
+							content:"Hello world ",
+							onShow: function(){ onShowCtr++; }
+						});
+
+					doh.is(1, Dialog._dialogStack.length, "initially, no dialogs in stack");
+					dlg.show();
+					doh.is(1, onShowCtr, "onShow first time");
+					dlg.hide();
+					doh.is(1, onShowCtr, "onHide first time");
+					dlg.show();
+					doh.is(2, onShowCtr, "onShow second time");
+					dlg.hide().then(d.getTestCallback(function(){
+						doh.is(2, onShowCtr, "onHide second time");
+						doh.is(1, Dialog._dialogStack.length, "at end, no dialogs in stack");
+					}));
+
+					return d;
+				}
+			]);
+
+			doh.register("zero duration", [
+				{
+					name: "open",
+					timeout: 10000,
+					runTest: function(){
+						dlg1 = new Dialog({
+							id: "dlg1",
+							title: "dialog 1",
+							duration: 0,
+							content: "<input id='dlg1_inputA'>"
+						});
+
+						var promise = dlg1.show();
+						doh.t(promise.isResolved(), "resolved");
+						doh.t(helpers.isVisible(dlg1), "dialog visible");
+					}
+				},
+				{
+					name: "close",
+					timeout: 10000,
+					runTest: function(){
+						var promise = dlg1.hide();
+						doh.t(promise.isResolved(), "resolved");
+						doh.t(helpers.isHidden(dlg1), "dialog hidden");
+					}
+				}
+			]);
+
+			doh.register("show/hide return", [
+				{
+					name: "open",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						dlg5 = new Dialog({
+							id: "dlg5",
+							title: "dialog 1",
+							content: "<input id='dlg1_inputA'>"
+						});
+
+						// This tests that show() returns a promise.
+						dlg5.show().then(d.getTestCallback(function(){
+							// And this tests that it still returns a promise even when the Dialog is already shown.
+							var promise = dlg5.show();
+							doh.t(promise.isResolved(), "resolved");
+							doh.t(helpers.isVisible(dlg5), "dialog visible");
+						}));
+						
+						return d;
+					}
+				},
+				{
+					name: "close",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// This tests that hide() returns a promise.
+						dlg5.hide().then(d.getTestCallback(function(){
+							// And this tests that it still returns a promise even when the Dialog is already hidden.
+							var promise = dlg5.hide();
+							doh.t(promise.isResolved(), "resolved");
+							doh.t(helpers.isHidden(dlg5), "dialog hidden");
+						}));
+
+						return d;
+					}
+				}
+			]);
+
+			LayoutWidget = declare(_WidgetBase, {
+				resize: function(dim){
+					this._resized = true;
+					this._resizeArg = dim;
+				}
+			});
+
+			doh.register("sizing", [
+				{
+					name: "href",
+					timeout: 10000,
+					runTest: function(){
+						hrefDlg = new Dialog({
+							id: "bigHref",
+							title: "big dialog with href",
+							href: "loremIpsum"
+						});
+
+						return hrefDlg.show().then(function(){
+							var dlgPos = domGeom.position(hrefDlg.domNode),
+								viewport = winUtils.getBox();
+							doh.t(dlgPos.h < viewport.h, "viewport height");
+							doh.t(dlgPos.y > 0, "position");
+						});
+					}
+				},
+				{
+					name: "resize",
+					timeout: 10000,
+					runTest: function(){
+						hrefDlg.resize({h: 200, w: 300});
+
+						var domPos = domGeom.position(hrefDlg.domNode);
+						doh.is(200, domPos.h, "domNode.h");
+						doh.is(300, domPos.w, "domNode.w");
+
+						// containerNode should be slightly smaller
+						var containerPos = domGeom.position(hrefDlg.containerNode);
+						doh.t(containerPos.h > 150 && containerPos.h < 190, "containerNode.h " + containerPos.h);
+						doh.is(298, containerPos.w, "containerNode.w");
+						doh.is("auto", hrefDlg.containerNode.style.overflow, "overflow style")
+					}
+				},
+				{
+					name: "single layout child",
+					timeout: 10000,
+					runTest: function(){
+						single = new Dialog({
+							id: "singleLayoutChild",
+							title: "single layout child",
+							content: "<div data-dojo-type=LayoutWidget data-dojo-id=layout1></div>"
+						});
+
+						// resize() should be called on the child layout widget, but without any size specified,
+						// because the Dialog itself doesn't have a size specified
+						single.show();
+						doh.t(layout1._resized, "resized");
+						doh.is(undefined, layout1._resizeArg, "resize arg");
+
+						// Calling resize on the Dialog should resize the single layout child widget
+						single.resize({h: 200, w: 300});
+						doh.isNot(undefined, layout1._resizeArg, "resize arg");
+						doh.t(layout1._resizeArg.h > 150 && layout1._resizeArg.h < 190, "single child resize() call param");
+					}
+				},
+				{
+					name: "multiple layout children",
+					timeout: 10000,
+					runTest: function(){
+						multiple = new Dialog({
+							id: "multipleLayoutChildren",
+							title: "multiple layout children",
+							content:
+								"<div data-dojo-type=LayoutWidget data-dojo-id=layout2></div>" +
+								"<div data-dojo-type=LayoutWidget data-dojo-id=layout3></div>"
+						});
+
+						// resize() should be called on each child layout widget, but without any size specified
+						multiple.show();
+						doh.t(layout2._resized, "layout2 resized");
+						doh.is(undefined, layout2._resizeArg, "layout2 resize arg");
+						doh.t(layout3._resized, "layout3 resized");
+						doh.is(undefined, layout3._resizeArg, "layout3 resize arg");
+
+						// Calling resize on the Dialog might resize the layout child widgets, but they still
+						// shouldn't get a size specified
+						multiple.resize({h: 200, w: 300});
+						doh.is(undefined, layout2._resizeArg, "layout2 resize arg after dialog resize");
+						doh.is(undefined, layout3._resizeArg, "layout3 resize arg after dialog resize");
+					}
+				},
+
+				// titlebar is optional for back-compat and to support dojox.image.LightboxDialog
+				{
+					name: "no titlebar node",
+					timeout: 10000,
+					runTest: function() {
+						noTbDialog = new Dialog({
+							id: "noTbDialog",
+							templateString: '<div style="border: 1px solid black">' +
+								'<span data-dojo-attach-point="closeButtonNode" role="button" tabindex="-1">x</span>' +
+								'<div data-dojo-attach-point="containerNode"></div>' +
+							"</div>",
+							content: "custom template w/no titlebar"
+						});
+
+						return noTbDialog.show().then(function () {
+							noTbDialog.resize({h: 200, w: 300});
+
+							var domPos = domGeom.position(noTbDialog.domNode);
+							doh.is(200, domPos.h, "domNode.h");
+							doh.is(300, domPos.w, "domNode.w");
+
+							// containerNode should be slightly smaller
+							var containerPos = domGeom.position(noTbDialog.containerNode);
+							doh.is(198, containerPos.h, "containerNode.h");
+							doh.is(298, containerPos.w, "containerNode.w");
+						});
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body>
+	<h1 class="testTitle">Dijit Dialog Automated (non-robot) tests</h1>
+	<button id="button">focus point</button>
+</body>
+</html>
+
+
diff --git a/src/main/resources/static/dijit/tests/Fieldset.html b/src/main/resources/static/dijit/tests/Fieldset.html
new file mode 100644
index 0000000000000000000000000000000000000000..db572a9dddd964b4006d6df8f50da2687343e553
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/Fieldset.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Fieldset Widget Automated (non-robot) Tests</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom", "dojo/on", "dojo/parser",
+			"dijit/Fieldset",
+			"dojo/domReady!"
+		], function(doh, dom, on, parser, Fieldset){
+
+			doh.register("declarative", function(){
+				var d = new doh.Deferred();
+
+				parser.parse();
+
+				doh.t(!!fs1, "widget created");
+				doh.t(fs1.open, "open");
+				doh.is("Declarative", fs1.titleNode.innerHTML);
+
+				var labelNodeId = fs1.containerNode.getAttribute("aria-labelledby");
+				doh.is("Declarative", document.getElementById(labelNodeId).innerHTML);
+
+				on.emit(fs1.titleNode, "click", {bubbles: true});
+				setTimeout(d.getTestCallback(function(){
+					doh.f(fs1.open, "closed");
+					doh.is("none", fs1.hideNode.style.display, "hidden");
+				}), 500);
+
+				return d;
+			});
+
+			doh.register("programmatic", function(){
+				var fsProg = (new Fieldset({
+					id: 'fsProg',
+					title: 'Programmatic',
+					content: '<p>I was created programmatically!</p>'
+				})).placeAt(document.body);
+				doh.t(!!fsProg, "widget created");
+			});
+
+			doh.run();
+		});
+	</script>
+</head>
+<body>
+	<h1 class="testTitle">Fieldset Automated (non-robot) tests</h1>
+	<fieldset id="fs1" data-dojo-id="fs1" data-dojo-type="dijit/Fieldset">
+		<legend>Declarative</legend>
+		<p>Some content</p>
+	</fieldset>
+	<fieldset id="fs2" data-dojo-id="fs2" data-dojo-type="dijit/Fieldset" data-dojo-props="toggleable: false">
+		<legend>Not Toggleable</legend>
+		<p>Some content</p>
+	</fieldset>
+</body>
+</html>
+
+
diff --git a/src/main/resources/static/dijit/tests/Menu.html b/src/main/resources/static/dijit/tests/Menu.html
new file mode 100644
index 0000000000000000000000000000000000000000..123273e419129642fa309810130541ab9047351f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/Menu.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Menu Automated (non-robot) Tests</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom", "dojo/dom-class", "dojo/on", "dojo/parser", "dojo/query",
+			"dijit/registry", "dijit/RadioMenuItem",
+			"dojo/NodeList-dom",	// allows NodeList.attr()
+			"dijit/DropDownMenu", "dijit/MenuSeparator",			// used only by parser
+			"dojo/domReady!"
+		], function(doh, dom, domClass, on, parser, query, registry, RadioMenuItem){
+
+			doh.register("parse", function parse(){
+				return parser.parse();
+			});
+
+			doh.register("RadioMenuItem", [
+				function click(){
+					// initial conditions
+					doh.is("g1r2, g2r2", query(".dijitRadioMenuItemChecked").attr("id").join(", "), "initially checked");
+
+					// click to change selected value in group 1; group 2 shouldn't change
+					on.emit(dom.byId("g1r3"), "click", {bubbles: true, cancelable: true});
+					doh.is("g1r3, g2r2", query(".dijitRadioMenuItemChecked").attr("id").join(", "), "clicked g1r3");
+
+					// click to change selected value in group 2; group 1 shouldn't change
+					on.emit(dom.byId("g2r1"), "click", {bubbles: true, cancelable: true});
+					doh.is("g1r3, g2r1", query(".dijitRadioMenuItemChecked").attr("id").join(", "), "clicked g2r1");
+
+					// click currently selected node; shouldn't change anything
+					on.emit(dom.byId("g1r3"), "click", {bubbles: true, cancelable: true});
+					doh.is("g1r3, g2r1", query(".dijitRadioMenuItemChecked").attr("id").join(", "), "clicked g1r3 again");
+				},
+				function set(){
+					// change selected item in group 1
+					g1r1.set("checked", true);
+					doh.is("g1r1, g2r1", query(".dijitRadioMenuItemChecked").attr("id").join(", "), "set g2r1");
+
+					// clear selected item in group 1
+					g1r1.set("checked", false);
+					doh.is("g2r1", query(".dijitRadioMenuItemChecked").attr("id").join(", "), "cleared g2r1");
+				},
+				function destroySelected(){
+					// Test to make sure that destroying the selected node and recreating it doesn't throw an exception
+					g1r1.set("checked", true);
+					g1r1.destroyRecursive();
+					var reincarnated = new RadioMenuItem({
+						id: "g1r1",
+						group: "g1",
+						checked: true,
+						label: "reincarnated"
+					});
+					registry.byId("menu").addChild(reincarnated, 2);
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro">
+	<h1 class="testTitle">Menu Automated (non-robot) tests</h1>
+	<div id="menu" data-dojo-type="dijit/DropDownMenu">
+		<div id="g1r1" data-dojo-id="g1r1" data-dojo-type="dijit/RadioMenuItem"
+			 data-dojo-props="group: 'g1'">red</div>
+		<div id="g1r2" data-dojo-id="g1r2" data-dojo-type="dijit/RadioMenuItem"
+			 data-dojo-props="group: 'g1', checked:true">yellow</div>
+		<div id="g1r3" data-dojo-id="g1r3" data-dojo-type="dijit/RadioMenuItem"
+			 data-dojo-props="group: 'g1', checked:false /*set to false for testing*/">green</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div id="g2r1" data-dojo-id="g2r1" data-dojo-type="dijit/RadioMenuItem"
+			 data-dojo-props="group: 'g2'">small</div>
+		<div id="g2r2" data-dojo-id="g2r2" data-dojo-type="dijit/RadioMenuItem"
+			 data-dojo-props="group: 'g2', checked:true">normal</div>
+		<div id="g2r3" data-dojo-id="g2r3" data-dojo-type="dijit/RadioMenuItem"
+			 data-dojo-props="group: 'g2'">large</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/NodeList-instantiate.html b/src/main/resources/static/dijit/tests/NodeList-instantiate.html
new file mode 100644
index 0000000000000000000000000000000000000000..b2f9165673b9ec45ea53abcc978e374ab1631ee5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/NodeList-instantiate.html
@@ -0,0 +1,159 @@
+<html>
+	<head>
+		<title>dojo.NodeList.instantiate() tests</title>
+
+		<style type="text/css">
+			@import "../themes/claro/document.css";
+			@import "css/dijitTests.css";
+			#container { height: 200px; }
+		</style>
+
+		<!-- required: a default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<!-- not needed, for testing alternate themes -->
+		<script type="text/javascript" src="_testCommon.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("doh.runner");
+			dojo.require("dojo.on");
+			dojo.require("dijit._WidgetBase");
+			dojo.require("dijit.form.Button");
+			dojo.require("dijit.layout.TabContainer");
+			dojo.require("dijit.layout.ContentPane");
+
+	    	dojo.ready(function(){
+
+				// declare a simple widget to use as a base test:
+				dojo.declare("TestWidget", dijit._WidgetBase, {
+					message: "",
+					postCreate:function(){
+						this.inherited(arguments);
+						this.own(dojo.on(this.domNode, "click", dojo.hitch(this, "workit")));
+						dojo.style(this.domNode, {
+							cursor: "pointer",
+							color: "#333"
+						});
+						this.domNode.innerHTML += this.message +" ("+this.id +")";
+						console.log('created', this.id);
+					},
+					workit: function(){
+						dojo.place(this.domNode, this.domNode.parentNode, "end");
+					}
+				});
+		
+				doh.register("Instantiate", [
+					function testWidget(){
+						dojo.query("#list1 li").instantiate(TestWidget, {}).connect("onclick", console.log);
+	
+						var li = dijit.byId("TestWidget_0");
+						doh.t(li, "TestWidget_0 exists");
+						doh.is("pointer", dojo.style("TestWidget_0", "cursor"));
+						doh.is("inner (TestWidget_0)", li.domNode.innerHTML);
+					},
+					
+					function testWidget2(){
+						dojo.query("#list2 li").instantiate(TestWidget, { message: "woot" });
+	
+						li = dijit.byId("TestWidget_12");
+						doh.t(li, "TestWidget_12 exists");
+						doh.is("pointer", dojo.style("TestWidget_12", "cursor"));
+						doh.is("innerwoot (TestWidget_12)", li.domNode.innerHTML);
+					},
+	
+					function TabContainer(){
+						// make a tab container from some div, and all it's children div's
+						dojo.query("#container")
+							.forEach(function(n){
+								dojo.query("div", n)
+									// create contentpanes from the children and style them
+									.instantiate(dijit.layout.ContentPane, {})
+									.forEach(function(wn, idx){
+										dojo.mixin(dijit.byNode(wn), { title: "tab" + (idx + 1) })
+									})
+								;
+							})
+							.instantiate(dijit.layout.TabContainer, {})
+						;
+						// should we add auto-startup calling?
+						dijit.byId("container").startup();
+	
+						var tc = dijit.byId("container");
+						doh.t(tc, "Tab container exists");
+						
+						var tabs = tc.tablist.getChildren();
+						doh.is(3, tabs.length);
+						dojo.forEach(tabs, function(tab, i){
+							doh.is("tab" + (i + 1), tab.label);
+						});
+	
+						var children = tc.getChildren();
+						doh.is(3, children.length);
+						dojo.forEach(children, function(child, i){ doh.is("pane"+(i+1), child.domNode.innerHTML); })
+					},
+	
+					function Buttons(){
+						// bunches of buttons, use you imagination on how to relate them to something
+						dojo.query("#buttonTest").forEach(function(n){
+							dojo.query("button", n).instantiate(dijit.form.Button, {
+								onClick:function(){
+									this.containerNode.innerHTML = this.label + " was clicked";
+								}
+							});
+						});
+	
+						var b1 = dijit.byId("b1");
+						doh.t(b1, "button 1 exists");
+						doh.is("button 1", b1.label);
+						
+						var b2 = dijit.byId("b2");
+						doh.t(b2, "button 2 exists");
+						doh.is("button 2", b2.label);
+						
+						var b3 = dijit.byId("b3");
+						doh.t(b3, "button 3 exists");
+						doh.is("button 3", b3.label);
+						
+						var b4 = dijit.byId("b4");
+						doh.t(b4, "button 4 exists");
+						doh.is("button 4", b4.label);
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+	<body class="claro">
+
+		<h1>dojo.NodeList.instantiate() tests</h1>
+
+		<h2>Some simple widgets:</h2>
+		<ul id="list1"
+			><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li
+		></ul>
+		<ul id="list2"
+			><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li><li>inner</li
+		></ul>
+
+		<h2>A TabContainer:</h2>
+		<div id="container"
+			><div>pane1</div
+			><div>pane2</div
+			><div>pane3</div
+		></div>
+
+		<h2>Some Buttons</h2>
+		<div id="buttonTest"
+			><button id="b1">button 1</button
+			><button id="b2">button 2</button
+			><button id="b3">button 3</button
+			><button id="b4">button 4</button
+		></div>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/ProgressBar.html b/src/main/resources/static/dijit/tests/ProgressBar.html
new file mode 100644
index 0000000000000000000000000000000000000000..97512b0e63ed48a228e29be67ef6b6d7439c05f2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/ProgressBar.html
@@ -0,0 +1,363 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>Dojo Toolkit - ProgressBar test</title>
+
+	<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"/>
+
+	<script src="boilerplate.js"></script>
+
+	<style type="text/css">
+		body {
+			margin: 1em;
+		}
+		.smallred .dijitProgressBarTile {
+			background:red;
+		}
+		.smallred .dijitProgressBarLabel {
+			display:none;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/Deferred", "dojo/dom", "dojo/dom-class", "dojo/dom-geometry", "dojo/on", "dojo/parser", "dojo/query", "dojo/string",
+			"dijit/registry", "dijit/ProgressBar", "dojo/domReady!"
+		], function(doh, Deferred, dom, domClass, domGeometry, on, parser, query, string, registry, ProgressBar){
+
+			var dir = domGeometry.isBodyLtr() ? "ltr" : "rtl";
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			doh.register("other setup", function(){
+				// Stuff from the original test file.   Not sure if this is needed now that
+				// the test is automated.
+
+				// note that programmatic instantiation doesn't pull any parameters from the srcNodeRef, not even id
+				var theBar = new ProgressBar({
+					id: "testBar",
+					width: 400,
+					maximum: 256,
+					duration: 2000,
+					dir: dir,
+					report: function(percent){
+						return string.substitute("${0} out of ${1} max chars", [this.get('value'), this.maximum]);
+					}
+				}, dom.byId("testBar"));
+
+				dom.byId("test").value="";
+				dom.byId("progressValue").value = registry.byId("setTestBar").value;
+				dom.byId("maximum").value = registry.byId("setTestBar").maximum;
+				on(dom.byId("test"), "keyup", keyUpHandler);
+				on(dom.byId("set"), "click", setParameters);
+				on(dom.byId("startTimer"), "click", function(){ remoteProgress(registry.byId("timerBar")); } );
+
+				// test 7
+				new ProgressBar({
+					style: "width:400px",
+					indeterminate: true,
+					dir: dir
+				}, "pi");
+			});
+
+			doh.register("ProgressBar",[
+				{
+					name: "set valid value",
+					runTest: function(){
+						var progressBar = registry.byId("setTestBar");
+						progressBar.set({maximum: 100, value: 58});
+
+						doh.is("58", progressBar.progress);
+						doh.is("58%", dom.byId("setTestBar_label").innerHTML);
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+
+						var width = visualProgress.style.width;
+						width = width.substring(0, width.length-1);
+						doh.t(57 < width <= 58); //IE thinks the width is 57.99
+					}
+				},
+				{
+					name: "aria roles and attribute",
+					runTest: function(){
+						var progressBar = registry.byId("setTestBar");
+						doh.is("progressbar", progressBar.domNode.getAttribute("role"), "ProgressBar needs role=progressbar");
+						doh.is(58, progressBar.domNode.getAttribute("aria-valuenow"), "expect aria-valuenow of 58");
+						doh.is(0, progressBar.domNode.getAttribute("aria-valuemin"), "expect aria-valuemin of 0");
+						doh.is(100, progressBar.domNode.getAttribute("aria-valuemax"), "expect aria-valuemax of 100");
+						doh.is("setTestBar_label", progressBar.domNode.getAttribute("aria-labelledby"), "expect aria-labelledby on progressbar");
+						progressBar = registry.byId("pi");
+						doh.f(progressBar.domNode.getAttribute("aria-valuenow"), "indeterminate progressbars should not have aria-valuenow");
+					}
+				},
+				{
+					name: "set value too high",
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var progressBar = registry.byId("setTestBar");
+						progressBar.set({maximum: 100, value: 101});
+
+						doh.is("100", progressBar.progress);
+						doh.is("100%", dom.byId("setTestBar_label").innerHTML);
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("100%", visualProgress.style.width);
+					}
+				},
+				{
+					name: "set zero value",
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var progressBar = registry.byId("setTestBar");
+						progressBar.set({maximum: 100, value: 0});
+
+						doh.is("0", progressBar.progress);
+						doh.is("0%", dom.byId("setTestBar_label").innerHTML);
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("0%", visualProgress.style.width);
+					}
+				},
+				{
+					name: "set max value",
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var progressBar = registry.byId("setTestBar");
+						progressBar.set({maximum: 100, value: 100});
+
+						doh.is("100", progressBar.progress);
+						doh.is("100%", dom.byId("setTestBar_label").innerHTML);
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("100%", visualProgress.style.width);
+					}
+				},
+				{
+					name: "report callback",
+					runTest: function(){
+						var progressBar = registry.byId("testBar");
+						progressBar.set({value: 79});
+						doh.is("79", progressBar.progress);
+						doh.is("79 out of 256 max chars", dom.byId("testBar_label").innerHTML);
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						width = visualProgress.style.width;
+						doh.is("30.8", width.substring(0,4));
+					}
+				},
+				{
+					name: "default maximum",
+					runTest: function(){
+						var progressBar = registry.byId("implied1");
+						doh.is("50", progressBar.progress);
+						doh.is("50%", dom.byId("implied1_label").innerHTML);
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("50%", visualProgress.style.width);
+
+						progressBar = registry.byId("implied2");
+						doh.is("50", progressBar.progress);
+						doh.is("50%", dom.byId("implied2_label").innerHTML);
+						visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("50%", visualProgress.style.width);
+					}
+				},
+				{
+					name: "set indeterminate, no label",
+					runTest: function(){
+						var progressBar = registry.byId("indeterminateBar");
+						progressBar.set({indeterminate: true, label: ''});
+
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("100%", visualProgress.style.width);
+						doh.t(domClass.contains(progressBar.domNode, "dijitProgressBarIndeterminate"), "has class dijitProgressBarIndeterminate");
+					}
+				},
+				{
+					name: "set determinate, no label",
+					runTest: function(){
+						var progressBar = registry.byId("indeterminateBar");
+						progressBar.set({indeterminate: false, label: ''});
+						doh.is("50%", dom.byId("indeterminateBar_label").innerHTML);
+
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("50%", visualProgress.style.width);
+						doh.f(domClass.contains(progressBar.domNode, "dijitProgressBarIndeterminate"), "doesn't have class dijitProgressBarIndeterminate");
+					}
+				},
+				{
+					name: "set indeterminate, custom label",
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var progressBar = registry.byId("indeterminateBar");
+						progressBar.set({indeterminate: true, label: 'Loading...'});
+
+						doh.is("Loading...", dom.byId("indeterminateBar_label").innerHTML);
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("100%", visualProgress.style.width);
+						doh.t(domClass.contains(progressBar.domNode, "dijitProgressBarIndeterminate"), "has class dijitProgressBarIndeterminate");
+					}
+				},
+				{
+					name: "set determinate, custom label",
+					runTest: function(){
+						var progressBar = registry.byId("indeterminateBar");
+						progressBar.set({indeterminate: false, label: 'Loading...'});
+
+						doh.is("Loading...", dom.byId("indeterminateBar_label").innerHTML);
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("50%", visualProgress.style.width);
+						doh.f(domClass.contains(progressBar.domNode, "dijitProgressBarIndeterminate"), "doesn't have class dijitProgressBarIndeterminate");
+					}
+				},
+				{
+					name: "programmatic indeterminate",
+					runTest: function(){
+						var progressBar = registry.byId("pi");
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("100%", visualProgress.style.width);
+
+						doh.t(domClass.contains(progressBar.domNode, "dijitProgressBarIndeterminate"), "has class dijitProgressBarIndeterminate");
+
+						progressBar = registry.byId("timerBar");
+						doh.t(80 < progressBar.progress <= 100, "Timer progress was " + progressBar.progress);
+					}
+				},
+				{
+					name: "set zero maximum",
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var progressBar = registry.byId("setTestBar");
+						progressBar.set({maximum: 0, value: 0});
+
+						doh.is("0", progressBar.progress);
+						doh.is("0%", dom.byId("setTestBar_label").innerHTML);
+						var visualProgress = query("div.dijitProgressBarFull", progressBar.domNode)[0];
+						doh.is("0%", visualProgress.style.width);
+					}
+				},
+				{
+					name: "programmatic instantiation without params",
+					runTest: function(doh){
+						var pb, success;
+						try{
+							pb = new ProgressBar();
+							pb.destroyRecursive();
+							success = true;
+						}catch(e){}
+						doh.t(success, "Instantiation w/o params should not throw");
+					}
+				}
+			]);
+
+			doh.run();
+
+			// An example of polling on a separate (heartbeat) server thread.  This is useful when the progress
+			// is entirely server bound and there is no existing interaction with the server to determine status.
+
+			// We don't have a server to run against, but a simple heartbeat implementation might look something
+			// like this:
+
+			// function getProgressReport(){
+			//	var dataSource = "http://dojotoolkit.org";
+			//	return dojo.xhrGet({url: dataSource, handleAs: "json", content: {key: "progress"}});
+			// }
+
+			// Instead, we'll just tick off intervals of 10
+
+			var fakeProgress = 0;
+			function getProgressReport(){
+				var deferred = new Deferred();
+				fakeProgress = Math.min(fakeProgress + 10, 100);
+				deferred.resolve(fakeProgress+"%");
+				return deferred;
+			}
+
+			function remoteProgress(bar){
+				var _timer = setInterval(function(){
+					var report = getProgressReport();
+					report.then(function(response){
+						bar.set({value: response});
+						if(response == "100%"){
+							clearInterval(_timer);
+							_timer = null;
+						}
+					});
+				}, 3000); // on 3 second intervals
+			}
+
+			function setParameters(){
+				registry.byId("setTestBar").set({maximum: dom.byId("maximum").value, value: dom.byId("progressValue").value});
+			}
+
+			function keyUpHandler(){
+				registry.byId("testBar").set({value:dom.byId("test").value.length});
+				registry.byId("testBarInt").set({value:dom.byId("test").value.length});
+				registry.byId("smallTestBar").set({value:dom.byId("test").value.length});
+			}
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<script type=dojo/require>
+		registry: "dijit/registry"
+	</script>
+
+	<h1 class="testTitle">Dijit ProgressBar Tests</h1>
+
+	<h3>Test 1</h3>
+	<label for="progressValue">Progress Value </label><input type="text" name="progressValue" id="progressValue" />
+	<br>
+	<label for="maximum">Max Progress Value </label><input type="text" name="maximum" id="maximum" />
+	<br>
+	<input type="button" name="set" id="set" value="set!" />
+	<br>
+	<div id="setTestBar" data-dojo-type="dijit/ProgressBar" data-dojo-props='style:"width:400px",
+		maximum:200, value:"20" '></div>
+
+	<h3>Test 2</h3>
+	<label for="test">Write here: </label><input type="text" value="" name="test" maxLength="256" id="test" style="width:300px"/>
+	<br />
+	<br />
+	<div id="testBar" style='width:300px'></div>
+	<br />
+	Small, without text and background image:
+	<br />
+	<div id="smallTestBar" data-dojo-type="dijit/ProgressBar" data-dojo-props='style:"width:400px; height:10px", "class":"smallred", maximum:256'></div>
+	<br />
+	Show decimal place:
+	<div id="testBarInt" data-dojo-type="dijit/ProgressBar" data-dojo-props='places:1, style:"width:400px",
+		maximum:256'></div>
+
+	<h3>Test 3</h3>
+	No explicit maximum (both 50%)
+	<div id="implied1" data-dojo-type="dijit/ProgressBar" data-dojo-props='style:"width:400px",
+		value:"50" '></div>
+	<br />
+	<div id="implied2" data-dojo-type="dijit/ProgressBar" data-dojo-props='style:"width:400px",
+		value:"50%" '></div>
+
+	<h3>Test 4</h3>
+	<input type="button" name="startTimer" id="startTimer" value="Start Timer" />
+	<div id="timerBar" data-dojo-type="dijit/ProgressBar" data-dojo-props='style:"width:400px", maximum:100, value:"0" '></div>
+
+	<h3>Test 5 - indeterminate progess</h3>
+	<input id="indeterminateButton1" type="button" value="Make Indeterminate (default blank label)"
+		onclick="registry.byId('indeterminateBar').set({indeterminate: true, label: ''});" />
+	<input id="labelButton1" type="button" value="Make Determinate (default percentage label)"
+		onclick="registry.byId('indeterminateBar').set({indeterminate: false, label: ''});" />
+	<input id="indeterminateButton2" type="button" value="Make Indeterminate With Label"
+		onclick="registry.byId('indeterminateBar').set({indeterminate: true, label: 'Loading...'});" />
+	<input  id="labelButton2" type="button" value="Make Determinate With Label"
+		onclick="registry.byId('indeterminateBar').set({indeterminate: false, label: 'Loading...'});" />
+	
+	<div id="indeterminateBar" data-dojo-type="dijit/ProgressBar" data-dojo-props='style:"width:400px", value:"50" '></div>
+
+	<h3>Test 6 - programatic indeterminate</h3>
+	<div id="pi"></div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/Tooltip-placement.html b/src/main/resources/static/dijit/tests/Tooltip-placement.html
new file mode 100644
index 0000000000000000000000000000000000000000..fe4e212423d282786a8c100a12673a48465c44ec
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/Tooltip-placement.html
@@ -0,0 +1,599 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dojo Tooltip Placement Test</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<style type="text/css">
+		div {font-size:9px}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom", "dojo/dom-geometry", "dojo/dom-style", "dojo/query", "dojo/sniff", "dojo/window",
+			"dijit/Tooltip",
+			"dojo/domReady!"
+		], function(doh, dom, domGeom, domStyle, query, has, winUtils, Tooltip){
+			doh.register("setup", function(){
+				Tooltip._MasterTooltip.prototype.duration = 0.05; // speed up tooltip fading
+				var view = winUtils.getBox();
+				var width = view.w;
+				var height = view.h;
+
+				if(width < 600){
+					//Make the larger tooltips smaller so they fit on the page and pass all tests
+					dom.byId("test2").setAttribute("promptMessage", "really really really really really really really really really really really really really really really really really really really really");
+					dom.byId("test5").setAttribute("promptMessage", "really really really really really really really really really really really really really really really really really really really really");
+					dom.byId("test12").setAttribute("promptMessage", "really really really really really really really really really really really really really really really really really really really really");
+					dom.byId("test17").setAttribute("promptMessage", "really really really really really really really really really really really really really really really really really really really really");
+					dom.byId("test19").setAttribute("promptMessage", "really really really really really really really really really really really really really really really really really really really really");
+				}else if(width > 1200){
+					//Make a shorter tooltip longer in order to span the whole width
+					dom.byId("test1").setAttribute("promptMessage", "really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really<br><br><br><br><br><br><br><br><br><br><br><br><br><br>a");
+					dom.byId("test4").setAttribute("promptMessage", "really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really<br><br><br><br><br><br><br><br><br>a");
+					dom.byId("test10").setAttribute("promptMessage", "really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really<br><br><br><br><br><br><br><br><br>a");
+					dom.byId("test20").setAttribute("promptMessage", "really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really<br><br><br><br><br><br><br><br><br>a");
+				}
+				
+				if(height < 600){
+					//Make the taller tooltips shorter
+					for(var i=1;i<22;i++){
+						if(i==7){
+							//skip
+						}else{
+							dom.byId("test"+i+"_tall_skinny").setAttribute("promptMessage", "<br><br><br><br>a");
+						}
+					}
+				}
+				
+				domStyle.set("test1", "width", width*(0.3)+"px");
+				domStyle.set("test1_tall_skinny", "width", width*(0.3)+"px");
+				domStyle.set("test2", "width", width*(0.6)+"px");
+				domStyle.set("test2_tall_skinny", "width", width*(0.6)+"px");
+				domStyle.set("test3", "width", width*(0.9)+"px");
+				domStyle.set("test3_tall_skinny", "width", width*(0.9)+"px");
+				domStyle.set("test4", "width", width*(0.3)+"px");
+				domStyle.set("test4_tall_skinny", "width", width*(0.3)+"px");
+				domStyle.set("test5", "width", width*(0.6)+"px");
+				domStyle.set("test5_tall_skinny", "width", width*(0.6)+"px");
+				domStyle.set("test6", "width", width*(0.9)+"px");
+				domStyle.set("test6_tall_skinny", "width", width*(0.9)+"px");
+				domStyle.set("test7", "width", width*(1.1)+"px");
+				domStyle.set("test8", "width", width*(0.2)+"px");
+				domStyle.set("test8_tall_skinny", "width", width*(0.2)+"px");
+				domStyle.set("test9", "width", width*(0.3)+"px");
+				domStyle.set("test9_tall_skinny", "width", width*(0.3)+"px");
+				domStyle.set("test10", "width", width*(0.6)+"px");
+				domStyle.set("test10_tall_skinny", "width", width*(0.6)+"px");
+				domStyle.set("test11", "width", width*(0.9)+"px");
+				domStyle.set("test11_tall_skinny", "width", width*(0.9)+"px");
+				domStyle.set("test12", "width", width*(0.3)+"px");
+				domStyle.set("test12_tall_skinny", "width", width*(0.3)+"px");
+				domStyle.set("test13", "width", width*(0.6)+"px");
+				domStyle.set("test13_tall_skinny", "width", width*(0.6)+"px");
+				domStyle.set("test14", "width", width*(0.9)+"px");
+				domStyle.set("test14_tall_skinny", "width", width*(0.9)+"px");
+				domStyle.set("test15", "width", width*(0.9)+"px");
+				domStyle.set("test15_tall_skinny", "width", width*(0.9)+"px");
+				domStyle.set("test16", "width", width*(0.3)+"px");
+				domStyle.set("test16_tall_skinny", "width", width*(0.3)+"px");
+				domStyle.set("test17", "width", width*(0.6)+"px");
+				domStyle.set("test17_tall_skinny", "width", width*(0.6)+"px");
+				domStyle.set("test18", "width", width*(0.9)+"px");
+				domStyle.set("test18_tall_skinny", "width", width*(0.9)+"px");
+				domStyle.set("test19", "width", width*(0.3)+"px");
+				domStyle.set("test19_tall_skinny", "width", width*(0.3)+"px");
+				domStyle.set("test20", "width", width*(0.6)+"px");
+				domStyle.set("test20_tall_skinny", "width", width*(0.6)+"px");
+				domStyle.set("test21", "width", width*(0.9)+"px");
+				domStyle.set("test21_tall_skinny", "width", width*(0.9)+"px");
+			});
+
+			//Verify the following is true:
+			//	1. The tooltip is displayed to the right or the left of the textbox
+			//	2. The tooltip arrow is next to the textbox
+			//	3. The user can view the entire tooltip on the screen OR the tooltip is displayed on the side with the largest width available
+			//	4. If the tooltip is not completely visible, verify that it uses all available height
+			function testRightOrLeft(textbox, verifyFullWidthIsUtilized){
+				verifyTooltipArrowPosition(textbox);
+
+				var textboxPos = domGeom.position(textbox);
+				var tooltipContainerPos = domGeom.position(query(".dijitTooltip")[0]);
+				
+				var xDiff = textboxPos.x - tooltipContainerPos.x - tooltipContainerPos.w;
+				var toTheLeft = xDiff >= -0.5 && xDiff < 2;
+
+				xDiff = tooltipContainerPos.x - textboxPos.x - textboxPos.w;
+				var toTheRight = xDiff >= -0.5 && xDiff < 2;
+
+				doh.t(toTheLeft || toTheRight, "The tooltip was not to the left or right");
+
+				var tooltip = Tooltip._masterTT.containerNode;
+				var tooltipPos = domGeom.position(tooltip);
+
+				var view = winUtils.getBox();
+				var isIE6 = has("ie") < 7;
+				//verify the entire width is utilized.  Small tooltips will not utilize the entire width.
+				if(verifyFullWidthIsUtilized && !isIE6 && !has("opera")){
+					if(toTheLeft){
+						doh.t(tooltipContainerPos.w + 3/*space in between arrow and textbox*/ >= textboxPos.x, "The entire width was not utilized to the left");					
+					}else{
+						doh.t(tooltipContainerPos.w + 3/*space in between arrow and textbox*/ >= view.w - tooltipContainerPos.x, "The entire width was not utilized to the right");
+					}
+				}
+			
+				//If we cannot view the entire tooltip, verify they side with the most space was chosen and the entire height was utilized.
+				var canViewEntireTooltip = (tooltipContainerPos.x + tooltipContainerPos.w <= view.w+1) && 
+										   (tooltipPos.y + tooltipPos.h <= view.h+1);			
+				if(!canViewEntireTooltip && !isIE6 && !has("opera")){
+					if(toTheLeft){
+						//verify there is more space on the left than the right
+						doh.t(textboxPos.x >= (view.w - textboxPos.x - textboxPos.w), "There is not more space on the left than the right");
+					}else{
+						doh.t(textboxPos.x <= (view.w - textboxPos.x - textboxPos.w), "There is not more space on the right than the left");
+					}
+					//verify the entire height is utilized
+					doh.t(tooltipPos.h >= view.h, "The entire height was not utilized. Tooltip height="+tooltipPos.h+". View height="+view.h);
+				}
+			}
+			
+			function toTheLeftOrRight(textbox){
+				var textboxPos = domGeom.position(textbox);
+				var tooltipContainerPos = domGeom.position(query(".dijitTooltip")[0]);
+				
+				var xDiff = textboxPos.x - tooltipContainerPos.x - tooltipContainerPos.w;
+				var toTheLeft = xDiff >= -1 && xDiff < 2;
+
+				xDiff = tooltipContainerPos.x - textboxPos.x - textboxPos.w;
+				var toTheRight = xDiff >= -1 && xDiff < 2;
+
+				doh.t(toTheLeft || toTheRight, "The tooltip was not to the left or right");
+			}
+			
+			//Verify the tooltip arrow is next to the textbox
+			function verifyTooltipArrowPosition(textbox){
+				var textboxPos = domGeom.position(textbox);
+				var tooltipConnectorPos = domGeom.position(query(".dijitTooltipConnector")[0]);
+				
+				var middleOfTextbox = textboxPos.y + (textboxPos.h / 2);
+				var middleOfTooltipConnector = tooltipConnectorPos.y + (tooltipConnectorPos.h /2);
+
+				var yDiff = middleOfTextbox - middleOfTooltipConnector;
+				var yAxisValid = yDiff <= 2 && yDiff >= -1.5; //tooltip arrow is at a similar y coord as the box
+				doh.t(yAxisValid, "Y axis is invalid. yDiff was: "+yDiff);
+			}
+			
+			// Test for when the tooltip has large words or nowrap so that it can't be displayed properly,
+			// given the space available.   Verify the following is true:
+			//	   1. The tooltip arrow is next to the textbox
+			// Note that tooltip text may be cut off if there wasn't enough room to display the tooltip
+			// to the left/right of the anchor node
+			function testNoWrapOrLargeWords(textbox){
+				verifyTooltipArrowPosition(textbox);
+			}
+		
+			function testAboveBelow(textbox, verifyConnectorPosition){
+				var textboxPos = domGeom.position(textbox);
+				var tooltipConnectorPos = domGeom.position(query(".dijitTooltipConnector")[0]);
+				var tooltipContainerPos = domGeom.position(query(".dijitTooltip")[0]);
+
+				if(verifyConnectorPosition){
+					var xAxisValid = textboxPos.x <= tooltipConnectorPos.x && tooltipConnectorPos.x <= (textboxPos.x + textboxPos.w);
+					doh.t(xAxisValid, "X axis is invalid");
+				}
+			
+				//verify the tooltip is above or below the textbox
+				var yDiff = textboxPos.y - tooltipContainerPos.y - tooltipContainerPos.h;
+				var above = yDiff >= -0.5 && yDiff < 1;
+	
+				yDiff = tooltipContainerPos.y - textboxPos.y - textboxPos.h;
+				var below = yDiff >= -0.5 && yDiff < 1;
+
+				doh.t(above || below, "above || below, yDiff == " + yDiff);
+			}
+
+			for(var i=1; i<=21; i++){
+				if(i==7){ continue; }
+				(function(i){
+					// Need the closure to run tests on each node, rather than repeating on "test21" node
+					var node = dom.byId("test"+i),
+						skinnyNode = dom.byId("test"+i+"_tall_skinny"),
+						nowrapTest = (i==3 || i==6 || i==8 || i==9 || i==13 || i==16 || i==21);
+					doh.register("test" + i, [
+						{
+							name: "test"+i+"_tall_skinny",
+							runTest: function(){
+								var d = new doh.Deferred();
+								winUtils.scrollIntoView(skinnyNode);
+								Tooltip.show(skinnyNode.getAttribute("promptMessage"), skinnyNode);
+								setTimeout(d.getTestCallback(function(){
+									// use timeout to wait for fade out of tooltip from old position, and fade in to new position
+									testRightOrLeft(skinnyNode, false);
+								}), 100);
+								return d;
+							}
+						},
+						{
+							name: "test"+i,
+							runTest: function(){
+								var d = new doh.Deferred();
+								winUtils.scrollIntoView(node);
+								Tooltip.show(node.getAttribute("promptMessage"), node);
+								setTimeout(d.getTestCallback(function(){
+									// use timeout to wait for fade out of tooltip from old position, and fade in to new position
+									if(nowrapTest){
+										// For nowrap tests  we should only verify the arrow is pointing to the textbox
+										testNoWrapOrLargeWords(node);
+									}else{
+										testRightOrLeft(node, true);
+									}
+								}), 100);
+								return d;
+							}
+						},
+						{
+							name: "test"+i+"_lrs",
+							runTest: function(){
+								var d = new doh.Deferred();
+								Tooltip.show("!", node);
+								setTimeout(d.getTestCallback(function(){
+									// use timeout to wait for fade out of tooltip from old position, and fade in to new position
+									testRightOrLeft(node, false);
+								}), 100);
+								return d;
+							}
+						},
+						{
+							name: "test"+i+"_abs",
+							runTest: function(){
+								var d = new doh.Deferred();
+								winUtils.scrollIntoView(node);
+								Tooltip.hide(node);	// needed since show() below matches node & content of show() above
+								Tooltip.show("!", node, ["below", "above"]);
+								setTimeout(d.getTestCallback(function(){
+									// use timeout to wait for fade out of tooltip from old position, and fade in to new position
+									testAboveBelow(node, true);
+								}), 100);
+								return d;
+							}
+						},
+						{
+							name: "test"+i+"_ab",
+							runTest: function(){
+								var d = new doh.Deferred();
+								Tooltip.show(node.getAttribute("promptMessage"), node, ["below", "above"]);
+								setTimeout(d.getTestCallback(function(){
+									// use timeout to wait for fade out of tooltip from old position, and fade in to new position
+									if(nowrapTest){
+										// For nowrap tests we should only verify the arrow is pointing to the textbox
+										// (in most cases it's off the screen)
+										testAboveBelow(node, false);
+									}else{
+										testAboveBelow(node, true);
+									}
+								}), 100);
+								return d;
+							}
+						},
+						{
+							name: "test"+i+"_ab_tall_skinny",
+							runTest: function(){
+								var d = new doh.Deferred();
+								winUtils.scrollIntoView(skinnyNode);
+								Tooltip.show(skinnyNode.getAttribute("promptMessage"), skinnyNode, ["below", "above"]);
+								setTimeout(d.getTestCallback(function(){
+									// use timeout to wait for fade out of tooltip from old position, and fade in to new position
+									testAboveBelow(skinnyNode, true);
+								}), 100);
+								return d;
+							}
+						}
+					]);
+				})(i);	// end closure
+			}
+
+			doh.register("anchor inside overflowed div", [
+				{
+					name: "test22",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var node = dom.byId("test22");
+						var cp = dom.byId("test22_cp");
+						winUtils.scrollIntoView(cp);
+						Tooltip.hide(node);	// needed since show() below matches node & content of show() above
+						Tooltip.show(node.getAttribute("promptMessage"), node);
+						setTimeout(d.getTestCallback(function(){
+							// use timeout to wait for fade out of tooltip from old position, and fade in to new position
+							toTheLeftOrRight(cp, true);
+						}), 100);
+						return d;
+					}
+				},
+				{
+					name: "test23",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var node = dom.byId("test23");
+						var cp = dom.byId("test23_cp");
+						Tooltip.show(node.getAttribute("promptMessage"), node, null, true);
+						setTimeout(d.getTestCallback(function(){
+							// use timeout to wait for fade out of tooltip from old position, and fade in to new position
+							toTheLeftOrRight(cp, true);
+						}), 100);
+						return d;
+					}
+				}
+			]);
+
+			if(has("svg")){
+				doh.register("svg tooltip", [
+					{
+						name: "setup",
+						runTest: function(){
+							document.body.insertAdjacentHTML("beforeend",
+								"<div id='svgWrapper' style='position: relative; top: 100px; left: 100px;'>" +
+									"<svg xmlns='http://www.w3.org/2000/svg' version='1.1'>" +
+										"<rect id='theRectangle' width='300' height='100' " +
+											"style='fill:rgb(0,0,255);stroke-width:1;stroke:rgb(0,0,0)' />" +
+									"</svg>" +
+								"</div>"
+							);
+							winUtils.scrollIntoView("svgWrapper");
+						}
+					},
+					{
+						name: "display",
+						runTest: function(){
+							var d = new doh.Deferred();
+							var cp = dom.byId("theRectangle");
+							Tooltip.show("SVG tooltip", cp, null, true);
+							setTimeout(d.getTestCallback(function(){
+								// use timeout to wait for fade out of tooltip from old position, and fade in to new position
+								toTheLeftOrRight(cp, true);
+							}), 100);
+							return d;
+						}
+					}
+				]);
+			}
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro">
+<table>
+
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test1" promptMessage='really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really<br><br><br><br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>	
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test1_tall_skinny" name="test1_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test2" promptMessage='really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really reallyreally really really really really really really really really really really really really reallyreally really really really really really really really really really really really really reallyreally really really really really really really really really really really really really reallyreally really really really really really really really really really really really really reallyreally really really really really really really really really really really really really reallyreally really really really really really really really really really really really really reallyreally really really really really really really really really really really really really reallyreally really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really really really really really really really really really really really really reallybig'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test2_tall_skinny" name="test2_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test3" promptMessage='reallyreallylonggermanwordreallyreallyreallyreallyreallyreallyreallylongword big'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test3_tall_skinny" name="test3_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test4" promptMessage='really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really<br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test4_tall_skinny" name="test4_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test5" promptMessage='really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallybig'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test5_tall_skinny" name="test5_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test6" promptMessage="<div style='white-space: nowrap'>really really really really big</div>"/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test6_tall_skinny" name="test6_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test7" name="test7"/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test8" promptMessage="<div style='white-space: nowrap'>really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really<br><br><br><br><br><br><br><br><br><br><br><br><br><br>a</div>"/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test8_tall_skinny" name="test8_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<br><br>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test9" promptMessage='reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongword'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test9_tall_skinny" name="test9_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test10" promptMessage='really really really really really really really really really really really really really really really really really really really<br><br><br><br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test10_tall_skinny" name="test10_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test11" promptMessage='a a a a a a a a a a a a a a a a a a a a a a a a a a a a<br><br><br><br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test11_tall_skinny" name="test11_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test12" promptMessage='really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really really big'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test12_tall_skinny" name="test12_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test13" promptMessage="<div style='white-space: nowrap'>really really really really really really really really really really really really really really really really really big</div>"/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test13_tall_skinny" name="test13_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test14" promptMessage='really really really really really really really really really really really really really really really really really really really really really really really big'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test14_tall_skinny" name="test14_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test15" promptMessage='a a a a a a a a a a a a a a a a a a<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test15_tall_skinny" name="test15_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<br>
+	</td>
+	</tr>	
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test16" promptMessage='reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongword big word really big word'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test16_tall_skinny" name="test16_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test17" promptMessage='really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really really big'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test17_tall_skinny" name="test17_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test18" promptMessage='a a a a a a a a a a a a a a a a a a a a a a<br><br><br><br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:right;">
+		<input type="text" id="test18_tall_skinny" name="test18_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test19" promptMessage='really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really reallyreally really really really really really really really really really really really really really really really really big'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test19_tall_skinny" name="test19_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test20" promptMessage='really really really really really really really really really really really really really really really really really really really<br><br><br><br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test20_tall_skinny" name="test20_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test21" promptMessage='reallyreallyreallyreallyreallyreallylongword<br><br><br><br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+	<tr>
+	<td style="text-align:left;">
+		<input type="text" id="test21_tall_skinny" name="test21_tall_skinny" promptMessage='<br><br><br><br><br><br><br><br><br><br><br>a'/>
+	</td>
+	</tr>
+</table>
+
+<div id="test22_cp" style="height:90px; width:100px; padding:0px; overflow: auto;">
+   <input type="text" id="test22" style="fontSize:100pt" promptMessage='test overflow'/>
+<br><br><br><br><br>
+</div>
+
+<table width='100%' align='left'><tr><td width='95%'></td><td style="width:5%">
+<div id="test23_cp" dir='rtl' style="height:100px; width:100px; border:1px; overflow:scroll">
+   <input type="text" id="test23" dir='rtl' style="fontSize:20pt" promptMessage='test overflow'/>
+</div>
+</td></tr></table>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/TooltipDialog.html b/src/main/resources/static/dijit/tests/TooltipDialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..d5ff3a59e4d162b645d95a0f0a1aabb8d618c297
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/TooltipDialog.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TooltipDialog non-robot Automated Test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/dom-class", "dojo/dom-geometry", "dojo/_base/window",
+			"dijit/popup", "dijit/form/DropDownButton", "dijit/TooltipDialog",
+			"dojo/domReady!"
+		], function(doh, domClass, domGeometry, win, popup, DropDownButton, TooltipDialog){
+			doh.register("TooltipDialog", [
+				function create(){
+					td = new TooltipDialog({
+						id:"mytooltip",
+						content: "hello world"
+					});
+					button = new DropDownButton({
+						id: "tooltipDropDownButton",
+						label: "show tooltip",
+						dropDown: td
+					});
+					button.placeAt(win.body());
+				},
+				function openAround(){
+					button.openDropDown();
+					doh.t(domClass.contains(td.domNode, "dijitTooltipBelow"), "dijitTooltipBelow");
+					button.closeDropDown();
+				},
+				function openAt(){
+					popup.open({
+						popup: td,
+						x: 10,
+						y: 15
+					});
+
+					var popupCoords = domGeometry.position(td.domNode);
+					doh.is(10, popupCoords.x, "popup x coord");
+					doh.is(15, popupCoords.y, "popup y coord");
+					doh.t(domClass.contains(td.domNode, "dijitTooltipBelow"), "dijitTooltipBelow");
+					doh.t(domClass.contains(td.domNode, "dijitTooltipABLeft"), "dijitTooltipABLeft");
+
+					popup.close(td);
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_AttachMixin.html b/src/main/resources/static/dijit/tests/_AttachMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..2031b7039b4ddba3dad43e1de44075020e00cd2e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_AttachMixin.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>_AttachMixin Test</title>
+
+		<script src="boilerplate.js"></script>
+
+		<style type="text/css">
+			/* Make our tests stand out as easily identifiable content */
+			.testcontainer {
+				border: 10px yellow;
+				border-style: dashed;
+				padding: 1em;
+				margin: 1em;
+			}
+			.testcontainer > p {
+				padding: 0 1em;
+				font-weight: bold;
+			}
+		</style>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/_base/declare", "dojo/dom", "dojo/html", "dojo/on", "dojo/parser",
+				"dijit/registry", "dijit/_WidgetBase", "dijit/_AttachMixin", "dijit/_TemplatedMixin",
+				"dijit/form/Button", "dijit/Editor", "dojo/domReady!"
+			], function(doh, declare, dom, html, on, parser,
+				registry, _WidgetBase, _AttachMixin, _TemplatedMixin, Button, Editor) {
+
+				doh.register("_AttachMixin", [
+					function basic() {
+						
+						/*** TEST _AttachMixin on a simple _WidgetBase ***/
+						var WidgetWithAttachMagic = declare([ _WidgetBase, _AttachMixin ], {
+							postCreate: function() {
+								html.set(this.heading, "I am an attach point, hear me raar!");
+								this.field.value = "Value is objective.";
+							},
+							_fieldChanged: function(e) {
+								html.set(this.heading, "Oooh! Saucy! Now I am '" + e.target.value + "'");
+							}
+						});
+
+						var mydijit = new WidgetWithAttachMagic({}, dom.byId("attachMe"));
+						mydijit.startup();
+						
+						doh.t(mydijit.heading, "heading");
+						doh.t(mydijit.field, "field");
+						doh.is("I am an attach point, hear me raar!", mydijit.heading.innerHTML, "Initial value");
+						
+						// Simulate a change
+						mydijit.field.value = 'something new';
+						on.emit(mydijit.field, "keyup", {bubbles: true});
+						
+						doh.is("Oooh! Saucy! Now I am 'something new'", mydijit.heading.innerHTML, "Post-op value");
+					},
+
+					function attachScope() {
+						/*** Test an inner dijit's attach-point and attach-event behaviour being attached to a
+						 * different widget instance, in this case the outer one.
+						 */
+						var InnerDijit = declare([ _WidgetBase, _TemplatedMixin ], {
+							declaredClass: "InnerDijit",	// for debugging
+							templateString: "<div><input data-dojo-attach-point='field' data-dojo-attach-event='onkeyup: inputKeyUp'></div>"
+						});
+						
+						var OuterDijit = declare([ _WidgetBase, _TemplatedMixin ], {
+							declaredClass: "OuterDijit",	// for debugging
+							templateString:
+									"<div>" +
+										"<h2 data-dojo-attach-point='heading'>Initial value</h2>" +
+										"<div data-dojo-attach-point='content'></div>" +
+									"</div>",
+							buildRendering: function() {
+								this.inherited(arguments);
+								this.iw = new InnerDijit({
+									attachScope: this // Cause attach points in inner dijit to attach to us
+								});
+								// NB don't own as we will do a destroy test later this.own(id);
+								this.iw.placeAt(this.content, 'last');
+							},
+							// This handler is attached to the field in our inner dijit
+							inputKeyUp: function(e) {
+								var target = e.target;
+								html.set(this.heading, "Event: " + e.type + " value: " + target.value);
+							}
+						});
+						
+						var od = new OuterDijit({}, dom.byId('destthree'));
+						od.startup();
+
+						// Confirm that the outer dijit has attached points both
+						//  from its own template, and the inner dijit.
+						doh.t(od.heading, "heading");
+						doh.t(od.field, "field");
+						doh.is("Initial value", od.heading.innerHTML, "Initial value");
+						
+						// Simulate a change on the field in the inner dijit
+						od.field.value = 'something new';
+						on.emit(od.field, "keyup", {bubbles: true});
+						
+						// Confirm the change ran the event handler in the outer dijit
+						doh.is("Event: keyup value: something new", od.heading.innerHTML, "Post-op value");
+						
+						// Now destroy the inner dijit and ensure its attach points on the parent
+						//  were removed.
+						od.iw.destroy();
+						delete od.iw;
+						doh.t(od.heading, "heading remains"); // heading remains
+						doh.f(od.field, "inner content was detached");  // inner content was detached
+					},
+
+					function containerNode(){
+						// Test that code inside of containerNode isn't scanned
+						var WidgetWithAttachMagic = declare([ _WidgetBase, _AttachMixin ]);
+						var cd = new WidgetWithAttachMagic({}, dom.byId("attachMeFive"));
+						doh.t(cd.heading, "heading attach point set up");
+						doh.f("mybutton" in cd, "attach point inside containerNode ignored");
+					}
+				]);
+				
+				doh.run();
+			});
+		</script>
+	</head>
+	<body>
+
+		<h1 class="testTitle">Dijit _AttachMixin Test</h1>
+
+		<div class="testcontainer">
+			<p>This markup may have come from a server side templating engine like Catalyst. 
+			The aim is to allow us to use data-dojo-attach-* magic on the content.<br>
+			Change the input value to see attach event and attach point at work.</p>
+			<div id="attachMe">
+				<h2 data-dojo-attach-point="heading"></h2>
+				<label for="${id}_field">You say "Hello":</label>
+				<input id="${id}_field" placeHolder="I say 'Goodbye'"
+					   data-dojo-attach-point="field"
+					   data-dojo-attach-event="onkeyup: _fieldChanged">
+			</div>
+		</div>
+		
+		<div class="testcontainer">
+			<p>This test shows an inner dijit being created with attachScope referencing its enclosing dijit.</p>
+			<div id="destthree"></div>
+		</div>
+
+		<!-- Test that data-dojo-attach-point etc. inside containerNode are ignored -->
+		<div class="testcontainer">
+			<p>This tests that nodes inside of data-dojo-attach-point="containerNode" are ignored<br>
+			<div id="attachMeFive">
+				<h2 data-dojo-attach-point='heading'></h2>
+				<div data-dojo-attach-point='containerNode'>
+					<span data-dojo-type='AnotherAttachPointWidget'>
+						<button data-dojo-attach-point='mybutton'
+							data-dojo-attach-event='onClick: _buttonClicked'>A button
+						</button>
+					</span>
+				</div>
+			</div>
+		</div>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/BidiSupportModule/BidiSupportTest.js b/src/main/resources/static/dijit/tests/_BidiSupport/BidiSupportModule/BidiSupportTest.js
new file mode 100644
index 0000000000000000000000000000000000000000..7806beeb9fc61c0da245040049a6f3f1c3cb3804
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/BidiSupportModule/BidiSupportTest.js
@@ -0,0 +1,178 @@
+define(["doh/main", "dojo/has"], function(doh, has){
+
+	has.add("dojo-bidi", true);
+
+	require(["dijit/_Widget"], function(_Widget){
+		doh.register("dijit.tests._BidiSupport.BidiSupportModule.BidiSupportTest", [
+			{
+				name:"1. checkContextual(), dir = LTR",
+
+				runTest:function(){
+					var bidi = new _Widget({textDir:"ltr", dir:"ltr"});
+
+					doh.is("ltr", bidi._checkContextual("Hello"),"Hello");
+					doh.is("rtl", bidi._checkContextual("\u05e9\u05dc\u05d5\u05dd"),"\u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi._checkContextual("123 Hello"),"123 Hello");
+					doh.is("rtl", bidi._checkContextual("123 \u05e9\u05dc\u05d5\u05dd"),"123 \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi._checkContextual("_Hello"),"_Hello");
+					doh.is("rtl", bidi._checkContextual("_\u05e9\u05dc\u05d5\u05dd"),"_\u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi._checkContextual("!!$%@ Hello"), "!!$%@ Hello");
+					doh.is("rtl", bidi._checkContextual("!!$%@ \u05e9\u05dc\u05d5\u05dd"), "!!$%@ \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi._checkContextual("Hello \u05e9\u05dc\u05d5\u05dd"), "Hello \u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi._checkContextual("\u05e9\u05dc\u05d5\u05dd Hello"),"\u05e9\u05dc\u05d5\u05dd Hello");
+					doh.is("ltr", bidi._checkContextual(""),"");
+					doh.is("ltr", bidi._checkContextual("123 > 456"),"123 > 456");
+					doh.is("ltr", bidi._checkContextual("%^$^&)( )_($!"),"%^$^&)( )_($!");
+				}
+			},
+			{
+				name:"2. checkContextual(), dir = RTL",
+
+				runTest:function(){
+					var bidi = new _Widget({textDir:"ltr",dir:"rtl"});
+
+					doh.is("ltr", bidi._checkContextual("Hello"),"Hello");
+					doh.is("rtl", bidi._checkContextual("\u05e9\u05dc\u05d5\u05dd"),"\u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi._checkContextual("123 Hello"),"123 Hello");
+					doh.is("rtl", bidi._checkContextual("123 \u05e9\u05dc\u05d5\u05dd"),"123 \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi._checkContextual("_Hello"),"_Hello");
+					doh.is("rtl", bidi._checkContextual("_\u05e9\u05dc\u05d5\u05dd"),"_\u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi._checkContextual("!!$%@ Hello"), "!!$%@ Hello");
+					doh.is("rtl", bidi._checkContextual("!!$%@ \u05e9\u05dc\u05d5\u05dd"), "!!$%@ \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi._checkContextual("Hello \u05e9\u05dc\u05d5\u05dd"), "Hello \u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi._checkContextual("\u05e9\u05dc\u05d5\u05dd Hello"),"\u05e9\u05dc\u05d5\u05dd Hello");
+					doh.is("rtl", bidi._checkContextual(""),"");
+					doh.is("rtl", bidi._checkContextual("123 > 456"),"123 > 456");
+					doh.is("rtl", bidi._checkContextual("%^$^&)( )_($!"),"%^$^&)( )_($!");
+				}
+			},
+			{
+				name:"3. getTextDir(), textDir = LTR, dir = LTR",
+
+				runTest:function(){
+					var bidi = new _Widget({textDir:"ltr",dir:"ltr"});
+
+					doh.is("ltr", bidi.getTextDir("Hello"),"Hello");
+					doh.is("ltr", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd"),"\u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("123 Hello"),"123 Hello");
+					doh.is("ltr", bidi.getTextDir("123 \u05e9\u05dc\u05d5\u05dd"),"123 \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("_Hello"),"_Hello");
+					doh.is("ltr", bidi.getTextDir("_\u05e9\u05dc\u05d5\u05dd"),"_\u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("!!$%@ Hello"), "!!$%@ Hello");
+					doh.is("ltr", bidi.getTextDir("!!$%@ \u05e9\u05dc\u05d5\u05dd"), "!!$%@ \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("Hello \u05e9\u05dc\u05d5\u05dd"), "Hello \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd Hello"),"\u05e9\u05dc\u05d5\u05dd Hello");
+					doh.is("ltr", bidi.getTextDir(""),"");
+					doh.is("ltr", bidi.getTextDir("123 > 456"),"123 > 456");
+					doh.is("ltr", bidi.getTextDir("%^$^&)( )_($!"),"%^$^&)( )_($!");
+				}
+			},
+			{
+				name:"4. getTextDir(), textDir = LTR, dir = RTL",
+
+				runTest:function(){
+					var bidi = new _Widget({textDir:"ltr",dir:"rtl"});
+
+					doh.is("ltr", bidi.getTextDir("Hello"),"Hello");
+					doh.is("ltr", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd"),"\u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("123 Hello"),"123 Hello");
+					doh.is("ltr", bidi.getTextDir("123 \u05e9\u05dc\u05d5\u05dd"),"123 \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("_Hello"),"_Hello");
+					doh.is("ltr", bidi.getTextDir("_\u05e9\u05dc\u05d5\u05dd"),"_\u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("!!$%@ Hello"), "!!$%@ Hello");
+					doh.is("ltr", bidi.getTextDir("!!$%@ \u05e9\u05dc\u05d5\u05dd"), "!!$%@ \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("Hello \u05e9\u05dc\u05d5\u05dd"), "Hello \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd Hello"),"\u05e9\u05dc\u05d5\u05dd Hello");
+					doh.is("ltr", bidi.getTextDir(""),"");
+					doh.is("ltr", bidi.getTextDir("123 > 456"),"123 > 456");
+					doh.is("ltr", bidi.getTextDir("%^$^&)( )_($!"),"%^$^&)( )_($!");
+				}
+			},
+			{
+				name:"5. getTextDir(), textDir = RTL, dir = LTR",
+
+				runTest:function(){
+					var bidi = new _Widget({textDir:"rtl",dir:"ltr"});
+
+					doh.is("rtl", bidi.getTextDir("Hello"),"Hello");
+					doh.is("rtl", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd"),"\u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("123 Hello"),"123 Hello");
+					doh.is("rtl", bidi.getTextDir("123 \u05e9\u05dc\u05d5\u05dd"),"123 \u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("_Hello"),"_Hello");
+					doh.is("rtl", bidi.getTextDir("_\u05e9\u05dc\u05d5\u05dd"),"_\u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("!!$%@ Hello"), "!!$%@ Hello");
+					doh.is("rtl", bidi.getTextDir("!!$%@ \u05e9\u05dc\u05d5\u05dd"), "!!$%@ \u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("Hello \u05e9\u05dc\u05d5\u05dd"), "Hello \u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd Hello"),"\u05e9\u05dc\u05d5\u05dd Hello");
+					doh.is("rtl", bidi.getTextDir(""),"");
+					doh.is("rtl", bidi.getTextDir("123 > 456"),"123 > 456");
+					doh.is("rtl", bidi.getTextDir("%^$^&)( )_($!"),"%^$^&)( )_($!");
+				}
+			},
+			{
+				name:"6. getTextDir(), textDir = RTL, dir = RTL",
+
+				runTest:function(){
+					var bidi = new _Widget({textDir:"rtl",dir:"rtl"});
+
+					doh.is("rtl", bidi.getTextDir("Hello"),"Hello");
+					doh.is("rtl", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd"),"\u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("123 Hello"),"123 Hello");
+					doh.is("rtl", bidi.getTextDir("123 \u05e9\u05dc\u05d5\u05dd"),"123 \u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("_Hello"),"_Hello");
+					doh.is("rtl", bidi.getTextDir("_\u05e9\u05dc\u05d5\u05dd"),"_\u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("!!$%@ Hello"), "!!$%@ Hello");
+					doh.is("rtl", bidi.getTextDir("!!$%@ \u05e9\u05dc\u05d5\u05dd"), "!!$%@ \u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("Hello \u05e9\u05dc\u05d5\u05dd"), "Hello \u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd Hello"),"\u05e9\u05dc\u05d5\u05dd Hello");
+					doh.is("rtl", bidi.getTextDir(""),"");
+					doh.is("rtl", bidi.getTextDir("123 > 456"),"123 > 456");
+					doh.is("rtl", bidi.getTextDir("%^$^&)( )_($!"),"%^$^&)( )_($!");
+				}
+			},
+			{
+				name:"7. getTextDir(), textDir = AUTO, dir = LTR",
+
+				runTest:function(){
+					var bidi = new _Widget({textDir:"auto",dir:"ltr"});
+
+					doh.is("ltr", bidi.getTextDir("Hello"),"Hello");
+					doh.is("ltr", bidi.getTextDir("123 Hello"),"123 Hello");
+					doh.is("rtl", bidi.getTextDir("123 \u05e9\u05dc\u05d5\u05dd"),"123 \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("_Hello"),"_Hello");
+					doh.is("rtl", bidi.getTextDir("_\u05e9\u05dc\u05d5\u05dd"),"_\u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("!!$%@ Hello"), "!!$%@ Hello");
+					doh.is("rtl", bidi.getTextDir("!!$%@ \u05e9\u05dc\u05d5\u05dd"), "!!$%@ \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("Hello \u05e9\u05dc\u05d5\u05dd"), "Hello \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir(""),"");
+					doh.is("ltr", bidi.getTextDir("123 > 456"),"123 > 456");
+					doh.is("rtl", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd"),"\u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd Hello"),"\u05e9\u05dc\u05d5\u05dd Hello");
+					doh.is("ltr", bidi.getTextDir("%^$^&)( )_($!"),"%^$^&)( )_($!");
+				}
+			},
+			{
+				name:"8. getTextDir(), textDir = AUTO, dir = RTL",
+
+				runTest:function(){
+					var bidi = new _Widget({textDir:"auto",dir:"rtl"});
+
+					doh.is("ltr", bidi.getTextDir("Hello"),"Hello");
+					doh.is("ltr", bidi.getTextDir("123 Hello"),"123 Hello");
+					doh.is("rtl", bidi.getTextDir("123 \u05e9\u05dc\u05d5\u05dd"),"123 \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("_Hello"),"_Hello");
+					doh.is("rtl", bidi.getTextDir("_\u05e9\u05dc\u05d5\u05dd"),"_\u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("!!$%@ \u05e9\u05dc\u05d5\u05dd"), "!!$%@ \u05e9\u05dc\u05d5\u05dd");
+					doh.is("ltr", bidi.getTextDir("!!$%@ Hello"), "!!$%@ Hello");
+					doh.is("ltr", bidi.getTextDir("Hello \u05e9\u05dc\u05d5\u05dd"), "Hello \u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir(""),"");
+					doh.is("rtl", bidi.getTextDir("123 > 456"),"123 > 456");
+					doh.is("rtl", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd"),"\u05e9\u05dc\u05d5\u05dd");
+					doh.is("rtl", bidi.getTextDir("\u05e9\u05dc\u05d5\u05dd Hello"),"\u05e9\u05dc\u05d5\u05dd Hello");
+					doh.is("rtl", bidi.getTextDir("%^$^&)( )_($!"),"%^$^&)( )_($!");
+
+				}
+			}
+		]);
+	});
+});
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/BidiSupportModule/module.js b/src/main/resources/static/dijit/tests/_BidiSupport/BidiSupportModule/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..e06d876cd7ace087bbe75350ad83586506eebece
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/BidiSupportModule/module.js
@@ -0,0 +1,3 @@
+define([
+	"./BidiSupportTest"
+], 1);
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/BidiSupportModule/runTests.html b/src/main/resources/static/dijit/tests/_BidiSupport/BidiSupportModule/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..030cf838ae5a58a5663404e51f3655ab34dc74a9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/BidiSupportModule/runTests.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>textDirTests Unit Test Runner</title>
+		<meta http-equiv="REFRESH" content="0;url=../../../../util/doh/runner.html?testModule=dijit.tests._BidiSupport.BidiSupportModule.module">
+	</head>
+	<body>
+		Redirecting to D.O.H runner.
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/_data/categoriesHeb.json b/src/main/resources/static/dijit/tests/_BidiSupport/_data/categoriesHeb.json
new file mode 100644
index 0000000000000000000000000000000000000000..1f81657c10d65c439b0d3255e9b85fecbb7db527
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/_data/categoriesHeb.json
@@ -0,0 +1,12 @@
+{
+	"identifier": "id",
+	"label": "name",
+	"items": [
+		{ "id": "0", "name":"Foods!", "numberOfItems":1, "children":[ {"_reference": "1"},  {"_reference": "2"},  {"_reference": "3"} ] },
+			{ "id": "1", "name":"\u05E4\u05D9\u05E8\u05D5\u05EA!", "numberOfItems":1, "children":[ {"_reference": "4"} ] },
+				{ "id": "4","name":"Citrus!", "numberOfItems":1, "items":[ {"_reference": "5"} ] },
+					{ "id": "5", "name":"\u05EA\u05E4\u05D5\u05D6!"},
+		{ "id": "2", "name":"Vegetables!", "numberOfItems":0},
+		{ "id": "3", "name":"Cereals!", "numberOfItems":0}
+	]
+}
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/_data/countriesHeb.json b/src/main/resources/static/dijit/tests/_BidiSupport/_data/countriesHeb.json
new file mode 100644
index 0000000000000000000000000000000000000000..2f481b0ca850a4c9d99354da76d78ab8b7959464
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/_data/countriesHeb.json
@@ -0,0 +1,46 @@
+{
+	"identifier": "id",
+	"label": "name",
+	"items": [
+			{ "id": "AF", "name":"Africa!", "type":"continent", "population":"900 million", "area": "30,221,532 sq km",
+					"timezone": "-1 UTC to +4 UTC",
+					"children":[{"_reference":"EG"}, {"_reference":"KE"}, {"_reference":"SD"}] },
+				{ "id": "EG", "name":"\u05DE\u05E6\u05E8\u05D9\u05DD!", "type":"country" },
+				{ "id": "KE", "name":"Kenya!", "type":"country",
+						"children":[{"_reference":"Nairobi!"}, {"_reference":"Mombasa!"}] },
+					{ "id": "Nairobi!", "name":"Nairobi!", "type":"city" },
+					{ "id": "Mombasa!", "name":"Mombasa!", "type":"city" },
+				{ "id": "SD", "name":"Sudan", "type":"country",
+						"children":{"_reference":"Khartoum"} },
+					{ "id": "Khartoum", "name":"Khartoum", "type":"city" },
+				{ "id": "AS", "name":"Asia!", "type":"continent",
+						"children":[{"_reference":"CN"}, {"_reference":"IN"}, {"_reference":"RU"}, {"_reference":"MN"}] },
+					{ "id": "CN", "name":"China!", "type":"country" },
+					{ "id": "IN", "name":"India!", "type":"country" },
+					{ "id": "RU", "name":"Russia!", "type":"country" },
+					{ "id": "MN", "name":"Mongolia!", "type":"country" },
+				{ "id": "OC", "name":"\u05D0\u05D5\u05E7\u05D0\u05E0\u05D9\u05D4!", "type":"continent", "population":"21 million",
+						"children":{"_reference":"AU"}},
+				{ "id": "AU", "name":"Australia!", "type":"country", "population":"21 million"},
+				{ "id": "EU", "name":"Europe", "type":"continent",
+						"children":[{"_reference":"DE"}, {"_reference":"FR"}, {"_reference":"ES"}, {"_reference":"IT"}] },
+				{ "id": "DE", "name":"\u05D2\u05E8\u05DE\u05E0\u05D9\u05D4!", "type":"country" },
+				{ "id": "FR", "name":"France!", "type":"country" },
+				{ "id": "ES", "name":"Spain!", "type":"country" },
+				{ "id": "IT", "name":"Italy!", "type":"country" },
+			{ "id": "NA", "name":"\u05D0\u05DE\u05E8\u05D9\u05E7\u05D4 \u05E6\u05E4\u05D5\u05E0\u05D9\u05EA!", "type":"continent",
+					"children":[{"_reference":"MX"}, {"_reference":"CA"}, {"_reference":"US"}] },
+				{ "id": "MX", "name":"Mexico!", "type":"country",  "population":"108 million", "area":"1,972,550 sq km",
+						"children":[{"_reference":"Mexico City!"}, {"_reference":"\u05D2\u05D5\u05D0\u05D3\u05DC\u05D2\u05E8\u05D4!"}] },
+					{ "id": "Mexico City!", "name":"Mexico City!", "type":"city", "population":"19 million", "timezone":"-6 UTC"},
+					{ "id": "\u05D2\u05D5\u05D0\u05D3\u05DC\u05D2\u05E8\u05D4!", "name":"\u05D2\u05D5\u05D0\u05D3\u05DC\u05D2\u05E8\u05D4!", "type":"city", "population":"4 million", "timezone":"-6 UTC" },
+				{ "id": "CA", "name":"\u05E7\u05E0\u05D3\u05D4!", "type":"country",  "population":"33 million", "area":"9,984,670 sq km",
+						"children":[{"_reference":"Ottawa!"}, {"_reference":"\u05D8\u05D5\u05E8\u05D5\u05E0\u05D8\u05D5!"}] },
+					{ "id": "Ottawa!", "name":"Ottawa!", "type":"city", "population":"0.9 million", "timezone":"-5 UTC"},
+					{ "id": "\u05D8\u05D5\u05E8\u05D5\u05E0\u05D8\u05D5!", "name":"\u05D8\u05D5\u05E8\u05D5\u05E0\u05D8\u05D5!", "type":"city", "population":"2.5 million", "timezone":"-5 UTC" },
+				{ "id": "US", "name":"United States of America!", "type":"country" },
+			{ "id": "SA", "name":"South America!", "type":"continent",
+					"children":[{"_reference":"BR"}, {"_reference":"AR"}] },
+				{ "id": "BR", "name":"Brazil!", "type":"country", "population":"186 million" },
+				{ "id": "AR", "name":"Argentina!", "type":"country", "population":"40 million" }
+]}
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/dynamicallyChangeTextDir/DynamicChangeTextDir.html b/src/main/resources/static/dijit/tests/_BidiSupport/dynamicallyChangeTextDir/DynamicChangeTextDir.html
new file mode 100644
index 0000000000000000000000000000000000000000..7d7652640e8b0c02f1cd7b95fb812d34575f5932
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/dynamicallyChangeTextDir/DynamicChangeTextDir.html
@@ -0,0 +1,546 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Textarea with _BidiSupport</title>
+
+		<style type="text/css">
+			@import "../../../../dojo/resources/dojo.css";
+			@import "../../../../dijit/themes/tundra/tundra.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.form.Textarea");
+			dojo.require("dijit.form.TextBox");
+			dojo.require("dijit.form.SimpleTextarea");
+			dojo.require("dijit.layout.ContentPane");
+			dojo.require("dijit.layout.TabContainer");
+			dojo.require("dojo.parser");
+			dojo.require("doh.runner");
+			dojo.require("dijit.form.ComboBox");
+
+			dojo.ready(function(){
+				doh.register("parse", function(){
+					dojo.parser.parse();
+
+					programmaticTextareaLTR = new dijit.form.Textarea({
+						id: "blankTaP",
+						name: "blankTaP",
+						style:{width:"30em"},
+						textDir:"ltr",
+						value: ""
+					}, "blankTaP");
+
+					programmaticTextareaRTL = new dijit.form.Textarea({
+						id: "filledTaP",
+						name: "filledTaP",
+						style:{width:"30em"},
+						textDir:"ltr",
+						value: "created programmatically!"
+					}, "filledTaP");
+
+					programmaticSTaB = new dijit.form.SimpleTextarea({
+						id: "blankSTaP",
+						name: "blankSTaP",
+						style:{width:"30em"},
+						rows:"2",
+						textDir:"ltr",
+						value: ""
+					}, "blankSTaP");
+
+					programmaticSTaF = new dijit.form.SimpleTextarea({
+						id: "filledSTaP",
+						name: "filledSTaP",
+						style:{width:"30em"},
+						rows:"2",
+						textDir:"ltr",
+						value: "created programmatically!"
+					}, "filledSTaP");
+
+					programmaticTextBoxB = new dijit.form.TextBox({
+						id: "blankTbP",
+						name: "blankTbP",
+						style:{width:"30em"},
+						textDir:"ltr",
+						value: ""
+					}, "blankTbP");
+
+					programmaticTextBoxF = new dijit.form.TextBox({
+						id: "filledTbP",
+						name: "filledTbP",
+						style:{width:"30em"},
+						textDir:"ltr",
+						value: "\u05e0\u05d5\u05e6\u05e8\u0020\u05e4\u05e8\u05d5\u05d2\u05de\u05e8\u05d8\u05d9\u0021"
+					}, "filledTbP");
+				});
+
+				var blankTaP
+					, filledTaP
+					, blankTaM
+					, filledlTaM
+					, comboBM
+					, blankTbM
+					, filledTbM
+					, blankStaM
+					, filledStaM
+					, blankTbP
+					, filledTbP
+					, blankSTaP
+					, filledSTaP
+					, combo;
+
+				dijit.byId("comboBM").toggleDropDown();
+				dijit.byId("comboBM").closeDropDown();
+
+				doh.register("test dynamic change of textDir initial", [
+					{
+						name: "initial textDir of all the widgets",
+
+						setUp: function(){
+							blankTaP = dijit.byId("blankTaP");
+							filledTaP = dijit.byId("filledTaP");
+							blankTaM = dijit.byId("blankTaM");
+							filledlTaM = dijit.byId("filledlTaM");
+							comboBM = dijit.byId("comboBM");
+							blankTbM = dijit.byId("blankTbM");
+							filledTbM = dijit.byId("filledTbM");
+							blankStaM = dijit.byId("blankStaM");
+							filledStaM = dijit.byId("filledStaM");
+							blankTbP = dijit.byId("blankTbP");
+							filledTbP = dijit.byId("filledTbP");
+							blankSTaP = dijit.byId("blankSTaP");
+							filledSTaP = dijit.byId("filledSTaP");
+
+							combo = dijit.byId("comboBM");
+						},
+
+						runTest: function(){
+							doh.is("ltr",blankTaP.textDir, "direction of : blankTaP");
+							doh.is("ltr",filledTaP.textDir, "direction of : filledTaP");
+							doh.is("ltr",blankTaM.textDir, "direction of : blankTaM");
+							doh.is("ltr",filledlTaM.textDir, "direction of : filledlTaM");
+							doh.is("ltr",comboBM.textDir, "direction of : comboBM");
+							doh.is("ltr",blankTbM.textDir, "direction of : blankTbM");
+							doh.is("ltr",filledTbM.textDir, "direction of : filledTbM");
+							doh.is("ltr",blankStaM.textDir, "direction of : blankStaM");
+							doh.is("ltr",filledStaM.textDir, "direction of : filledStaM");
+							doh.is("ltr",blankTbP.textDir, "direction of : blankTbP");
+							doh.is("ltr",filledTbP.textDir, "direction of : filledTbP");
+							doh.is("ltr",blankSTaP.textDir, "direction of : blankSTaP");
+							doh.is("ltr",filledSTaP.textDir, "direction of : filledSTaP");
+
+							doh.is("ltr",combo.dropDown.textDir, "direction of : combo.dropDown");
+
+							var d = new doh.Deferred();
+
+							combo.toggleDropDown();
+							setTimeout(d.getTestCallback(function(){
+								//combo.toggleDropDown();
+								dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+									// so it will check only the options
+									if(node.item){
+										doh.is("ltr", node.dir, node.textContent);
+									}
+								});
+							}), 100);
+							return d;
+						},
+
+						tearDown:function(){
+							combo.closeDropDown();
+						}
+					}
+				]);
+
+				doh.register("test dynamic change of textDir to RTL", [
+					{
+						name: "set textDir dynamically to RTL",
+
+						setUp: function(){
+							var buttonRTL = dojo.byId("swithchTD_RTL");
+							buttonRTL.click();
+						},
+
+						runTest: function(){
+
+							doh.is("rtl",blankTaP.textDir, "direction of : blankTaP");
+							doh.is("rtl",filledTaP.textDir, "direction of : filledTaP");
+							doh.is("rtl",blankTaM.textDir, "direction of : blankTaM");
+							doh.is("rtl",filledlTaM.textDir, "direction of : filledlTaM");
+							doh.is("rtl",comboBM.textDir, "direction of : comboBM");
+							doh.is("rtl",blankTbM.textDir, "direction of : blankTbM");
+							doh.is("rtl",filledTbM.textDir, "direction of : filledTbM");
+							doh.is("rtl",blankStaM.textDir, "direction of : blankStaM");
+							doh.is("rtl",filledStaM.textDir, "direction of : filledStaM");
+							doh.is("rtl",blankTbP.textDir, "direction of : blankTbP");
+							doh.is("rtl",filledTbP.textDir, "direction of : filledTbP");
+							doh.is("rtl",blankSTaP.textDir, "direction of : blankSTaP");
+							doh.is("rtl",filledSTaP.textDir, "direction of : filledSTaP");
+
+							doh.is("rtl",combo.dropDown.textDir, "direction of : combo.dropDown");
+						}
+					},
+					{
+						name: "check focusNode.dir == RTL",
+
+						runTest: function(){
+
+							doh.is("rtl",blankTaP.focusNode.dir, "direction of : blankTaP");
+							doh.is("rtl",filledTaP.focusNode.dir, "direction of : filledTaP");
+							doh.is("rtl",blankTaM.focusNode.dir, "direction of : blankTaM");
+							doh.is("rtl",filledlTaM.focusNode.dir, "direction of : filledlTaM");
+							doh.is("rtl",comboBM.focusNode.dir, "direction of : comboBM");
+							doh.is("rtl",blankTbM.focusNode.dir, "direction of : blankTbM");
+							doh.is("rtl",filledTbM.focusNode.dir, "direction of : filledTbM");
+							doh.is("rtl",blankStaM.focusNode.dir, "direction of : blankStaM");
+							doh.is("rtl",filledStaM.focusNode.dir, "direction of : filledStaM");
+							doh.is("rtl",blankTbP.focusNode.dir, "direction of : blankTbP");
+							doh.is("rtl",filledTbP.focusNode.dir, "direction of : filledTbP");
+							doh.is("rtl",blankSTaP.focusNode.dir, "direction of : blankSTaP");
+							doh.is("rtl",filledSTaP.focusNode.dir, "direction of : filledSTaP");
+
+							var d = new doh.Deferred();
+
+							combo.toggleDropDown();
+							setTimeout(d.getTestCallback(function(){
+								//combo.toggleDropDown();
+								dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+									// so it will check only the options
+									if(node.item){
+										doh.is("rtl", node.dir, node.textContent);
+									}
+								});
+							}), 100);
+							return d;
+						},
+
+						tearDown:function(){
+							combo.closeDropDown();
+						}
+
+					}
+				]);
+
+				doh.register("test dynamic change of textDir to LTR", [
+					{
+						name: "set textDir dynamically to LTR",
+
+						setUp: function(){
+							var buttonLTR = dojo.byId("swithchTD_LTR");
+							buttonLTR.click();
+						},
+
+						runTest: function(){
+
+							doh.is("ltr",blankTaP.textDir, "direction of : blankTaP");
+							doh.is("ltr",filledTaP.textDir, "direction of : filledTaP");
+							doh.is("ltr",blankTaM.textDir, "direction of : blankTaM");
+							doh.is("ltr",filledlTaM.textDir, "direction of : filledlTaM");
+							doh.is("ltr",comboBM.textDir, "direction of : comboBM");
+							doh.is("ltr",blankTbM.textDir, "direction of : blankTbM");
+							doh.is("ltr",filledTbM.textDir, "direction of : filledTbM");
+							doh.is("ltr",blankStaM.textDir, "direction of : blankStaM");
+							doh.is("ltr",filledStaM.textDir, "direction of : filledStaM");
+							doh.is("ltr",blankTbP.textDir, "direction of : blankTbP");
+							doh.is("ltr",filledTbP.textDir, "direction of : filledTbP");
+							doh.is("ltr",blankSTaP.textDir, "direction of : blankSTaP");
+							doh.is("ltr",filledSTaP.textDir, "direction of : filledSTaP");
+
+							doh.is("ltr",combo.dropDown.textDir, "direction of : combo.dropDown");
+						}
+					},
+					{
+						name: "check focusNode.dir == LTR",
+
+						runTest: function(){
+
+							doh.is("ltr",blankTaP.focusNode.dir, "direction of : blankTaP");
+							doh.is("ltr",filledTaP.focusNode.dir, "direction of : filledTaP");
+							doh.is("ltr",blankTaM.focusNode.dir, "direction of : blankTaM");
+							doh.is("ltr",filledlTaM.focusNode.dir, "direction of : filledlTaM");
+							doh.is("ltr",comboBM.focusNode.dir, "direction of : comboBM");
+							doh.is("ltr",blankTbM.focusNode.dir, "direction of : blankTbM");
+							doh.is("ltr",filledTbM.focusNode.dir, "direction of : filledTbM");
+							doh.is("ltr",blankStaM.focusNode.dir, "direction of : blankStaM");
+							doh.is("ltr",filledStaM.focusNode.dir, "direction of : filledStaM");
+							doh.is("ltr",blankTbP.focusNode.dir, "direction of : blankTbP");
+							doh.is("ltr",filledTbP.focusNode.dir, "direction of : filledTbP");
+							doh.is("ltr",blankSTaP.focusNode.dir, "direction of : blankSTaP");
+							doh.is("ltr",filledSTaP.focusNode.dir, "direction of : filledSTaP");
+
+
+							var d = new doh.Deferred();
+
+							combo.toggleDropDown();
+							setTimeout(d.getTestCallback(function(){
+								//combo.toggleDropDown();
+								dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+									// so it will check only the options
+									if(node.item){
+										doh.is("ltr", node.dir, node.textContent);
+									}
+								});
+							}), 100);
+							return d;
+						},
+
+						tearDown:function(){
+							combo.closeDropDown();
+						}
+					}
+				]);
+
+				doh.register("test dynamic change of textDir", [
+					{
+						name: "set textDir dynamically to auto",
+
+						setUp: function(){
+							var buttonAUTO = dojo.byId("switchTD_AUTO");
+							buttonAUTO.click();
+						},
+
+						runTest: function(){
+
+							doh.is("auto",blankTaP.textDir, "direction of : blankTaP");
+							doh.is("auto",filledTaP.textDir, "direction of : filledTaP");
+							doh.is("auto",blankTaM.textDir, "direction of : blankTaM");
+							doh.is("auto",filledlTaM.textDir, "direction of : filledlTaM");
+							doh.is("auto",comboBM.textDir, "direction of : comboBM");
+							doh.is("auto",blankTbM.textDir, "direction of : blankTbM");
+							doh.is("auto",filledTbM.textDir, "direction of : filledTbM");
+							doh.is("auto",blankStaM.textDir, "direction of : blankStaM");
+							doh.is("auto",filledStaM.textDir, "direction of : filledStaM");
+							doh.is("auto",blankTbP.textDir, "direction of : blankTbP");
+							doh.is("auto",filledTbP.textDir, "direction of : filledTbP");
+							doh.is("auto",blankSTaP.textDir, "direction of : blankSTaP");
+							doh.is("auto",filledSTaP.textDir, "direction of : filledSTaP");
+
+							doh.is("auto",combo.dropDown.textDir, "direction of : combo.dropDown");
+						}
+					},
+					{
+						name: "check focusNode.dir of textDir == AUTO",
+
+						runTest: function(){
+
+							doh.is(filledTaP._checkContextual(filledTaP.value),filledTaP.focusNode.dir, "direction of : filledTaP");
+							doh.is(filledlTaM._checkContextual(filledlTaM.value),filledlTaM.focusNode.dir, "direction of : filledlTaM");
+							doh.is(comboBM._checkContextual(comboBM.displayedValue),comboBM.focusNode.dir, "direction of : comboBM");
+							doh.is(filledTbM._checkContextual(filledTbM.value),filledTbM.focusNode.dir, "direction of : filledTbM");
+							doh.is(filledStaM._checkContextual(filledStaM.value),filledStaM.focusNode.dir, "direction of : filledStaM");
+							doh.is(filledTbP._checkContextual(filledTbP.value),filledTbP.focusNode.dir, "direction of : filledTbP");
+							doh.is(filledSTaP._checkContextual(filledSTaP.value),filledSTaP.focusNode.dir, "direction of : filledSTaP");
+
+							var d = new doh.Deferred();
+
+							combo.toggleDropDown();
+							setTimeout(d.getTestCallback(function(){
+								var contextualDir;
+
+								dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+									// so it will check only the options
+									if(node.item){
+											contextualDir = this.getTextDir(node.innerText || node.textContent || "");
+											doh.is(contextualDir, node.dir, node.innerText || node.textContent || "");
+									}
+								},combo);
+							}), 100);
+							return d;
+						},
+
+						tearDown:function(){
+							combo.closeDropDown();
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+	<body class="tundra" data-dojo-textdir="ltr">
+		<h1 class="testTitle">Dynamically changed textDir.</h1>
+
+		<h2 class="testTitle">Textarea</h2>
+		<div class="testExample">
+			<table>
+				<tr>
+					<th>
+						<label for="filledlTaM">dijit.form.Textarea, initially filled, markup created</label>
+						<br>
+						<textarea data-dojo-type="dijit/form/Textarea" id="filledlTaM" data-dojo-props='textDir:"ltr", style:{width:"30em"}'>Hello world!</textarea>
+						<br>
+					</th>
+					<th>
+						<label >dijit.form.Textarea, initially filled, programmatically created:</label>
+						<br>
+						<textarea id="filledTaP"></textarea>
+						<br>
+					</th>
+				</tr>
+				<tr>
+					<th>
+						<label for="blankTaM">dijit.form.Textarea, initially blank:</label>
+						<br>
+						<textarea data-dojo-type="dijit/form/Textarea" id="blankTaM" data-dojo-props='textDir:"ltr", style:{width:"30em"}'></textarea>
+						<br>
+					</th>
+					<th>
+						<label for="blankTaP">dijit.form.Textarea, initially blank, programmatically created:</label>
+						<br>
+						<textarea id="blankTaP"></textarea>
+						<br>
+					</th>
+				</tr>
+			</table>
+		</div>
+		<br>
+		<br>
+
+		<h2 class="testTitle">TextBox</h2>
+		<div class="testExample">
+			<table>
+				<tr>
+					<th>
+						<label for="filledTbM">dijit.form.TextBox, initially filled, markup created:</label>
+						<br>
+						<input data-dojo-type="dijit/form/TextBox" id="filledTbM" data-dojo-props='name:"filledTbM", value:"blah.", style:{width:"30em"},textDir:"ltr"'/>
+						<br>
+					</th>
+					<th>
+						<label >dijit.form.TextBox, initially filled, programmatically created:</label>
+						<br>
+						<textarea id="filledTbP"></textarea>
+						<br>
+					</th>
+				</tr>
+				<tr>
+					<th>
+						<label for="blankTbM">dijit.form.TextBox, initially blank, markup created:</label>
+						<br>
+						<input data-dojo-type="dijit/form/TextBox" id="blankTbM" data-dojo-props='name:"blankTbM", style:{width:"30em"}, value:"", textDir:"ltr"'/>
+						<br>
+					</th>
+					<th>
+						<label for="blankTaP">dijit.form.Textarea, initially blank, programmatically created:</label>
+						<br>
+						<textarea id="blankTbP"></textarea>
+						<br>
+					</th>
+				</tr>
+			</table>
+		</div>
+		<br>
+		<br>
+		<h2 class="testTitle">SimpleTextarea</h2>
+		<br>
+		<div class="testExample">
+			<table>
+				<tr>
+					<th>
+						<label>dijit.form.SimpleTextarea, initially filled, markup created</label>
+						<br>
+						<textarea id="filledStaM" data-dojo-type="dijit/form/SimpleTextarea"
+							data-dojo-props='name:"filledStaM",rows:"2", style:{width:"30em"}
+							'>&#1513;&#1500;&#1493;&#1501; &#1506;&#1493;&#1500;&#1501;, &#1513;&#1500;&#1493;&#1501; &#1500;&#1499;&#1493;&#1500;&#1501; &#1488;&#1497;&#1503; &#1497;&#1493;&#1514;&#1512; &#1499;&#1497;&#1507; &#1502;&#1491;&#1493;&#1490;'&#1493;!
+						</textarea>
+						<br>
+					</th>
+					<th>
+						<label >dijit.form.SimpleTextarea, initially filled, programmatically created:</label>
+						<br>
+						<textarea id="filledSTaP"></textarea>
+						<br>
+					</th>
+				</tr>
+				<tr>
+					<th>
+						<label for="blankTbM">dijit.form.SimpleTextarea, initially blank, markup created:</label>
+						<br>
+						<textarea id="blankStaM" data-dojo-type="dijit/form/SimpleTextarea"
+							data-dojo-props='name:"blankStaM",rows:"2", style:{width:"30em"},
+							textDir:"ltr"'>
+						</textarea>
+					</th>
+					<th>
+						<label>dijit.form.Textarea, initially blank, programmatically created:</label>
+						<br>
+						<textarea id="blankSTaP"></textarea>
+						<br>
+					</th>
+				</tr>
+			</table>
+		</div>
+				<br>
+		<br>
+		<label for="comboBM">dijit.form.ComboBox, markup</label>
+		<br>
+		<select id="comboBM"
+			data-dojo-type="dijit/form/ComboBox"
+			data-dojo-props='name:"comboBM",
+			textDir:"ltr"'>
+				<option >Apples!</option>
+				<option >Oranges!</option>
+				<option selected>Pears!</option>
+				<option >&#1513;&#1500;&#1493;&#1501; &#1500;&#1499;&#1501;!</option>
+				<option >&#1514;&#1508;&#1493;&#1495; &#1488;&#1491;&#1502;&#1492;!</option>
+		</select>
+		<br>
+		<br>
+		<br>
+
+		<input id="swithchTD_RTL" type="button" value="change textDir 2 RTL"
+			onclick="dijit.byId('blankTaP').set('textDir','rtl');
+				dijit.byId('filledTaP').set('textDir','rtl');
+				dijit.byId('blankTaM').set('textDir','rtl');
+				dijit.byId('filledlTaM').set('textDir','rtl');
+				dijit.byId('comboBM').set('textDir','rtl');
+				dijit.byId('blankTbM').set('textDir','rtl');
+				dijit.byId('filledTbM').set('textDir','rtl');
+				dijit.byId('blankStaM').set('textDir','rtl');
+				dijit.byId('filledStaM').set('textDir','rtl');
+				dijit.byId('blankTbP').set('textDir','rtl');
+				dijit.byId('filledTbP').set('textDir','rtl');
+				dijit.byId('blankSTaP').set('textDir','rtl');
+				dijit.byId('filledSTaP').set('textDir','rtl');
+			"/>
+
+		<input id="swithchTD_LTR" type="button" value="change textDir 2 LTR"
+			onclick="dijit.byId('blankTaP').set('textDir','ltr');
+				dijit.byId('filledTaP').set('textDir','ltr');
+				dijit.byId('blankTaM').set('textDir','ltr');
+				dijit.byId('filledlTaM').set('textDir','ltr');
+				dijit.byId('comboBM').set('textDir','ltr');
+				dijit.byId('blankTbM').set('textDir','ltr');
+				dijit.byId('filledTbM').set('textDir','ltr');
+				dijit.byId('blankStaM').set('textDir','ltr');
+				dijit.byId('filledStaM').set('textDir','ltr');
+				dijit.byId('blankTbP').set('textDir','ltr');
+				dijit.byId('filledTbP').set('textDir','ltr');
+				dijit.byId('blankSTaP').set('textDir','ltr');
+				dijit.byId('filledSTaP').set('textDir','ltr');
+			"/>
+
+		<input id="switchTD_AUTO" type="button" value="change textDir 2 AUTO"
+			onclick="dijit.byId('blankTaP').set('textDir','auto');
+				dijit.byId('filledTaP').set('textDir','auto');
+				dijit.byId('blankTaM').set('textDir','auto');
+				dijit.byId('filledlTaM').set('textDir','auto');
+				dijit.byId('comboBM').set('textDir','auto');
+				dijit.byId('blankTbM').set('textDir','auto');
+				dijit.byId('filledTbM').set('textDir','auto');
+				dijit.byId('blankStaM').set('textDir','auto');
+				dijit.byId('filledStaM').set('textDir','auto');
+				dijit.byId('blankTbP').set('textDir','auto');
+				dijit.byId('filledTbP').set('textDir','auto');
+				dijit.byId('blankSTaP').set('textDir','auto');
+				dijit.byId('filledSTaP').set('textDir','auto');
+			"/>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/dynamicallyChangeTextDir/module.js b/src/main/resources/static/dijit/tests/_BidiSupport/dynamicallyChangeTextDir/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..0006ccb4488a2bf5e2fdec20e2a7dc16cd3503f5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/dynamicallyChangeTextDir/module.js
@@ -0,0 +1,5 @@
+define(["doh/main", "require"], function(doh, require){
+
+	doh.register("_BidiSupport.dynamicallyChangeTextDir.DynamicChangeTextDir", require.toUrl("./DynamicChangeTextDir.html"), 999999);
+
+});
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/dynamicallyChangeTextDir/runTests.html b/src/main/resources/static/dijit/tests/_BidiSupport/dynamicallyChangeTextDir/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..4cf5e974ce9f0763ad236a4fbc2a5bfe1e7e8c3c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/dynamicallyChangeTextDir/runTests.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>Dijit Unit Test Runner</title>
+		<meta http-equiv="REFRESH" content="0;url=../../../../util/doh/runner.html?testModule=dijit.tests._BidiSupport.dynamicallyChangeTextDir.module"></head>
+	<body>
+		Redirecting to D.O.H runner.
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/Button.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/Button.html
new file mode 100644
index 0000000000000000000000000000000000000000..852b9799a734de1441a37f9889af2a9c2aef8f8f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/Button.html
@@ -0,0 +1,400 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Dojo Button Widget Test</title>
+
+		<style type="text/css">
+			@import "../../../themes/claro/document.css";
+			@import "../../css/dijitTests.css";
+
+			/* group multiple buttons in a row */
+			.box {
+				display: block;
+				text-align: center;
+			}
+			BUTTON, INPUT,
+			.box .dijit {
+				margin-right: 10px;
+				vertical-align: middle;
+			}
+		</style>
+
+		<!-- required: the default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, has: { 'dojo-bidi': true }"></script>
+
+		<script language="JavaScript" type="text/javascript">
+
+			require([
+				"doh/runner",
+				"dojo/dom",
+				"dojo/parser",
+				"dijit/registry",
+				"dijit/form/Button",
+				"dijit/Menu",
+				"dijit/MenuItem",
+				"dijit/form/DropDownButton",
+				"dojo/domReady!"
+			], function(doh, dom, parser, registry, Button, Menu, MenuItem, DropDownButton){
+
+				var createButton = function(){
+					var widget = new Button({label: "Button LTR ...", id: "progbLtr", textDir: "ltr"});
+					widget.placeAt("buttonContainer");	// place in page
+					var widget2 = new Button({label: "Button RTL ...", id: "progbRtl", textDir: "rtl"});
+					widget2.placeAt("buttonContainer");	// place in page
+					var widget3 = new Button({label: "START AUTO \u05e9\u05dc\u05d5\u05dd\u0021\u0021!...", id: "progbAuto1", textDir: "auto"});
+					widget3.placeAt("buttonContainer");	// place in page
+					var widget4 = new Button({label: "\u05e9\u05dc\u05d5\u05dd\u0021\u0021 AUTO END...", id: "progbAuto2"});
+					widget4.set('textDir','auto');
+					widget4.placeAt("buttonContainer");	// place in page
+				};
+
+				var createDropDownButton = function(){
+					var menu = new Menu({ });
+					menu.domNode.style.display="none";
+					var menuItem1 = new MenuItem({
+						label: "Cut!",
+						iconClass:"registryEditorIcon registryEditorIconCut",
+						id:"progCut",
+						textDir:"ltr"
+					});
+					menu.addChild(menuItem1);
+
+					var menuItem2 = new MenuItem({
+						label: "Copy!",
+						iconClass:"registryEditorIcon registryEditorIconCopy",
+						id:"progCopy",
+						textDir:"rtl"
+					});
+					menu.addChild(menuItem2);
+
+					var menuItem3 = new MenuItem({
+						label: "Paste \u05e9\u05dc\u05d5\u05dd\u0021\u0021!...",
+						iconClass:"registryEditorIcon registryEditorIconPaste",
+						id:"progPaste",
+						textDir:"auto"
+					});
+					menu.addChild(menuItem3);
+
+					var menuItem4 = new MenuItem({
+						label: "\u05e9\u05dc\u05d5\u05dd\u0021\u0021!... Save!",
+						iconClass:"registryEditorIcon registryEditorIconSave",
+						id:"progSave",
+						textDir:"auto"
+						});
+					menu.addChild(menuItem4);
+
+					var params = {
+						label: "hello!",
+						name: "programmatic2",
+						dropDown: menu,
+						id: "progButton",
+						textDir:"auto"
+					};
+					var widget = new DropDownButton(params);
+					widget.startup();
+					dom.byId("dropdownButtonContainer").appendChild(widget.domNode);
+				};
+
+				doh.register("registry.tests._BidiSupport.form.Button", [
+
+					function parse(){
+						return parser.parse();
+					},
+
+					function test_LTR_TextDir(){
+						doh.is(registry.byId("bltr").get("textDir"), "ltr");
+						doh.is(registry.byId("bltr").containerNode.dir, "ltr");
+					},
+
+					function test_LTR_TextDir_RTL_dir(){
+						doh.is(registry.byId("bltr_rtl").get("textDir"), "ltr");
+						doh.is(registry.byId("bltr_rtl").containerNode.dir, "ltr");
+					},
+
+					function test_RTL_TextDir_LTR_dir(){
+						doh.is(registry.byId("brtl_ltr").get("textDir"), "rtl");
+						doh.is(registry.byId("brtl_ltr").containerNode.dir, "rtl");
+					},
+
+					function test_RTL_TextDir(){
+						doh.is(registry.byId("brtl").get("textDir"), "rtl");
+						doh.is(registry.byId("brtl").containerNode.dir, "rtl");
+					},
+
+					function test_AUTO_TextDir(){
+						doh.is(registry.byId("bauto_ltr").get("textDir"), "auto");
+						doh.is(registry.byId("bauto_ltr").containerNode.dir, "ltr");
+						doh.is(registry.byId("bauto_rtl").get("textDir"), "auto");
+						doh.is(registry.byId("bauto_rtl").containerNode.dir, "rtl");
+					},
+
+					function test_ToggleButton_TextDirLTR(){
+						doh.is(registry.byId("togltr").get("textDir"), "ltr");
+						doh.is(registry.byId("togltr").containerNode.dir, "ltr");
+					},
+
+					function test_ToggleButton_TextDirRTL(){
+						doh.is(registry.byId("togrtl").get("textDir"), "rtl");
+						doh.is(registry.byId("togrtl").containerNode.dir, "rtl");
+					},
+
+					function test_ToggleButton_TextDirAUTO(){
+						doh.is(registry.byId("togauto_ltr").get("textDir"), "auto");
+						doh.is(registry.byId("togauto_ltr").containerNode.dir, "ltr");
+						doh.is(registry.byId("togauto_rtl").get("textDir"), "auto");
+						doh.is(registry.byId("togauto_rtl").containerNode.dir, "rtl");
+					},
+
+					function test_programmat_button(){
+						createButton();
+						doh.is(registry.byId("progbLtr").get("textDir"), "ltr");
+						doh.is(registry.byId("progbLtr").containerNode.dir, "ltr");
+						doh.is(registry.byId("progbRtl").get("textDir"), "rtl");
+						doh.is(registry.byId("progbRtl").containerNode.dir, "rtl");
+						doh.is(registry.byId("progbAuto1").get("textDir"), "auto");
+						doh.is(registry.byId("progbAuto1").containerNode.dir, "ltr");
+						doh.is(registry.byId("progbAuto2").get("textDir"), "auto");
+						doh.is(registry.byId("progbAuto2").containerNode.dir, "rtl");
+					},
+
+					function test_changeLabel_forAUTO(){
+						var item = registry.byId("bauto_rtl");
+						doh.is(item.get("textDir"), "auto");
+						doh.is(item.containerNode.dir, "rtl");
+						item.set("label", "");
+						doh.is(item.containerNode.dir, "ltr");
+						item.set("label", "new label '\u05e9\u05d9\u05de\u05d5\u05e9\u0020\u05d1\u05ea\u05d2\u05d9\u05d5\u05ea\u002e'");
+						doh.is(item.containerNode.dir, "ltr");
+						item.set("label", "'\u05e9\u05d9\u05de\u05d5\u05e9\u0020\u05d1\u05ea\u05d2\u05d9\u05d5\u05ea\u002e'");
+						doh.is(item.containerNode.dir, "rtl");
+					},
+
+					function test_DropDownButton_LTR_TextDir(){
+						doh.is(registry.byId("bltr_cut").get("textDir"), "ltr");
+						doh.is(registry.byId("bltr_cut").textDirNode.dir, "ltr");
+						doh.is(registry.byId("bltr_copy").get("textDir"), "ltr");
+						doh.is(registry.byId("bltr_copy").textDirNode.dir, "ltr");
+						doh.is(registry.byId("bltr_paste").get("textDir"), "rtl");
+						doh.is(registry.byId("bltr_paste").textDirNode.dir, "rtl");
+					},
+
+					function test_DropDownButton_RTL_TextDir(){
+						doh.is(registry.byId("brtl_cut").get("textDir"), "rtl");
+						doh.is(registry.byId("brtl_cut").textDirNode.dir, "rtl");
+						doh.is(registry.byId("brtl_copy").get("textDir"), "ltr");
+						doh.is(registry.byId("brtl_copy").textDirNode.dir, "ltr");
+						doh.is(registry.byId("brtl_paste").get("textDir"), "rtl");
+						doh.is(registry.byId("brtl_paste").textDirNode.dir, "rtl");
+					},
+
+					function test_DropDownButton_AUTO_TextDir(){
+						doh.is(registry.byId("bauto_cut").get("textDir"), "auto");
+						doh.is(registry.byId("bauto_cut").textDirNode.dir, "ltr");
+						doh.is(registry.byId("bauto_copy").get("textDir"), "auto");
+						doh.is(registry.byId("bauto_copy").textDirNode.dir, "rtl");
+					},
+
+					function test_ComboButton_TextDirLTR(){
+						doh.is(registry.byId("comboltr_cut").get("textDir"), "ltr");
+						doh.is(registry.byId("comboltr_cut").textDirNode.dir, "ltr");
+						doh.is(registry.byId("comboltr_copy").get("textDir"), "ltr");
+						doh.is(registry.byId("comboltr_copy").textDirNode.dir, "ltr");
+						doh.is(registry.byId("comboltr_paste").get("textDir"), "rtl");
+						doh.is(registry.byId("comboltr_paste").textDirNode.dir, "rtl");
+					},
+
+					function test_ComboButton_TextDirRTL(){
+						doh.is(registry.byId("combortl_cut").get("textDir"), "rtl");
+						doh.is(registry.byId("combortl_cut").textDirNode.dir, "rtl");
+						doh.is(registry.byId("combortl_copy").get("textDir"), "ltr");
+						doh.is(registry.byId("combortl_copy").textDirNode.dir, "ltr");
+						doh.is(registry.byId("combortl_paste").get("textDir"), "rtl");
+						doh.is(registry.byId("combortl_paste").textDirNode.dir, "rtl");
+					},
+
+					function test_ComboButton_TextDirAUTO(){
+						doh.is(registry.byId("comboauto_cut").get("textDir"), "auto");
+						doh.is(registry.byId("comboauto_cut").textDirNode.dir, "ltr");
+						doh.is(registry.byId("comboauto_copy").get("textDir"), "auto");
+						doh.is(registry.byId("comboauto_copy").textDirNode.dir, "rtl");
+					},
+
+					function test_programmat_DropDownButton(){
+						createDropDownButton ();
+						doh.is(registry.byId("progCut").get("textDir"), "ltr");
+						doh.is(registry.byId("progCut").textDirNode.dir, "ltr");
+						doh.is(registry.byId("progCopy").get("textDir"), "rtl");
+						doh.is(registry.byId("progCopy").textDirNode.dir, "rtl");
+						doh.is(registry.byId("progPaste").get("textDir"), "auto");
+						doh.is(registry.byId("progPaste").textDirNode.dir, "ltr");
+						doh.is(registry.byId("progSave").get("textDir"), "auto");
+						doh.is(registry.byId("progSave").textDirNode.dir, "rtl");
+					},
+
+					function test_DropDownButton_changeLabel_forAUTO(){
+						var item = registry.byId("bauto_copy");
+						doh.is(item.get("textDir"), "auto");
+						doh.is(item.textDirNode.dir, "rtl");
+						item.set("label", "");
+						doh.is(item.textDirNode.dir, "ltr");
+						item.set("label", "new label '\u05e9\u05d9\u05de\u05d5\u05e9\u0020\u05d1\u05ea\u05d2\u05d9\u05d5\u05ea\u002e'");
+						doh.is(item.textDirNode.dir, "ltr");
+						item.set("label", "'\u05e9\u05d9\u05de\u05d5\u05e9\u0020\u05d1\u05ea\u05d2\u05d9\u05d5\u05ea\u002e'");
+						doh.is(item.textDirNode.dir, "rtl");
+					},
+
+					function test_deepMenu(){
+						doh.is(registry.byId("level3_cut").get("textDir"), "auto");
+						doh.is(registry.byId("level3_cut").textDirNode.dir, "ltr");
+						doh.is(registry.byId("level4_cut").get("textDir"), "auto");
+						doh.is(registry.byId("level4_cut").textDirNode.dir, "rtl");
+					}
+				]);
+				doh.run();
+			});
+	</script>
+	</head>
+<body class="claro">
+	<h1 class="testTitle">registry Button Test</h1>
+	<h2>Simple buttons</h2>
+
+	<p class="box">
+		<button data-dojo-type="dijit/form/Button" id="bltr" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon", value:"Button LTR ...", textDir:"ltr"'>
+			Button LTR ...
+		</button>
+
+		<button data-dojo-type="dijit/form/Button" id="bltr_rtl" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon", value:"Button LTR RTL ...", textDir:"ltr", dir:"rtl"'>
+			Button LTR RTL ...
+		</button>
+
+		<button data-dojo-type="dijit/form/Button" id="brtl_ltr" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon", value:"Button RTL LTR ...", textDir:"rtl", dir:"ltr"'>
+			Button LTR RTL ...
+		</button>
+
+		<button data-dojo-type="dijit/form/Button" id="brtl" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon", value:"Button RTL ...", textDir:"rtl"'>
+			Button RTL ...
+		</button>
+
+		<button data-dojo-type="dijit/form/Button" id="bauto_ltr" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon", value:"START AUTO &#1495;&#1491;&#1513;!...", textDir:"auto"'>
+			START AUTO &#1495;&#1491;&#1513;!...
+		</button>
+
+		<button data-dojo-type="dijit/form/Button" id="bauto_rtl" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon", value:"&#1495;&#1491;&#1513; AUTO END...", textDir:"auto"'>
+			&#1495;&#1491;&#1513; AUTO END...
+		</button>
+
+		<button id="togltr" checked data-dojo-type="dijit/form/ToggleButton" data-dojo-props='
+			iconClass:"dijitCheckBoxIcon", textDir:"ltr"'>
+			Toggle Button LTR ...
+		</button>
+
+		<button id="togrtl" checked data-dojo-type="dijit/form/ToggleButton" data-dojo-props='
+			iconClass:"dijitCheckBoxIcon", textDir:"rtl"'>
+			Toggle Button RTL ...
+		</button>
+
+		<button id="togauto_ltr" checked data-dojo-type="dijit/form/ToggleButton" data-dojo-props='
+			iconClass:"dijitCheckBoxIcon", textDir:"auto"'>
+			START AUTO &#1495;&#1491;&#1513;!...
+		</button>
+
+		<button id="togauto_rtl" checked data-dojo-type="dijit/form/ToggleButton" data-dojo-props='
+			iconClass:"dijitCheckBoxIcon", textDir:"auto"'>
+			&#1495;&#1491;&#1513; AUTO END...
+		</button>
+
+		<button id="dropltr" title="edit title" value="Edit" data-dojo-type="dijit/form/DropDownButton" data-dojo-textdir="ltr" data-dojo-props='iconClass:"noteIcon"'>
+			<span>Edit<b>!</b></span>
+			<span id="bltr_editMenu" data-dojo-type="dijit/Menu">
+				<span id="bltr_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>Cut!</span>
+				<span id="bltr_copy" data-dojo-type="dijit/MenuItem" data-dojo-textdir="ltr" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>Copy!</span>
+				<span id="bltr_paste" data-dojo-type="dijit/MenuItem" data-dojo-textdir="rtl" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste"'>Paste!</span>
+			</span>
+		</button>
+
+		<button id="droprtl" title="edit title" value="Edit" data-dojo-type="dijit/form/DropDownButton" data-dojo-textdir="rtl" data-dojo-props='iconClass:"noteIcon"'>
+			<span>Edit<b>!</b></span>
+			<span id="brtl_editMenu" data-dojo-type="dijit/Menu">
+				<span id="brtl_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>Cut!</span>
+				<span id="brtl_copy" data-dojo-type="dijit/MenuItem" data-dojo-textdir="ltr" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>Copy!</span>
+				<span id="brtl_paste" data-dojo-type="dijit/MenuItem" data-dojo-textdir="rtl" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste"'>Paste!</span>
+			</span>
+		</button>
+
+		<button id="dropauto" title="edit title" value="Edit" data-dojo-type="dijit/form/DropDownButton" data-dojo-textdir="auto" data-dojo-props='iconClass:"noteIcon"'>
+			<span>Edit<b>!</b></span>
+			<span id="bauto_editMenu" data-dojo-type="dijit/Menu">
+				<span id="bauto_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>START AUTO &#1495;&#1491;&#1513; Cut!</span>
+				<span id="bauto_copy" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>&#1495;&#1491;&#1513; Copy! AUTO END</span>
+			</span>
+		</button>
+
+		<button id="comboltr" title="edit title" value="Edit" data-dojo-type="dijit/form/ComboButton" data-dojo-textdir="ltr" data-dojo-props='optionsTitle:"save options"'>
+			<span>Edit<b>!</b></span>
+			<span id="comboltr_editMenu" data-dojo-type="dijit/Menu">
+				<span id="comboltr_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>Cut!</span>
+				<span id="comboltr_copy" data-dojo-type="dijit/MenuItem" data-dojo-textdir="ltr" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>Copy!</span>
+				<span id="comboltr_paste" data-dojo-type="dijit/MenuItem" data-dojo-textdir="rtl" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste"'>Paste!</span>
+			</span>
+		</button>
+
+		<button id="combortl" title="edit title" value="Edit" data-dojo-type="dijit/form/ComboButton" data-dojo-textdir="rtl" data-dojo-props='optionsTitle:"save options"'>
+			<span>Edit<b>!</b></span>
+			<span id="combortl_editMenu" data-dojo-type="dijit/Menu">
+				<span id="combortl_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>Cut!</span>
+				<span id="combortl_copy" data-dojo-type="dijit/MenuItem" data-dojo-textdir="ltr" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>Copy!</span>
+				<span id="combortl_paste" data-dojo-type="dijit/MenuItem" data-dojo-textdir="rtl" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste"'>Paste!</span>
+			</span>
+		</button>
+
+		<button id="comboauto" title="edit title" value="Edit" data-dojo-type="dijit/form/ComboButton" data-dojo-textdir="auto" data-dojo-props='optionsTitle:"save options"'>
+			<span>Edit<b>!</b></span>
+			<span id="comboauto_editMenu" data-dojo-type="dijit/Menu">
+				<span id="comboauto_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>START AUTO &#1495;&#1491;&#1513; Cut!</span>
+				<span id="comboauto_copy" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>&#1495;&#1491;&#1513; Copy! AUTO END</span>
+			</span>
+		</button>
+
+		<button id="deepedit" title="edit title" value="Edit" data-dojo-type="dijit/form/DropDownButton" data-dojo-textdir="auto" data-dojo-props='iconClass:"noteIcon"'>
+			<span>Edit<b>!</b></span>
+			<span id="deepeditMenu" data-dojo-type="dijit/Menu">
+				<span id="level1_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>Cut!</span>
+				<span id="level1_copy" data-dojo-type="dijit/MenuItem" data-dojo-textdir="ltr" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>Copy!</span>
+				<span id="level1_paste" data-dojo-type="dijit/MenuItem" data-dojo-textdir="rtl" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste"'>Paste!</span>
+				<span data-dojo-type="dijit/MenuSeparator"></span>
+				<span data-dojo-type="dijit/PopupMenuItem">
+					<span>Submenu!</span>
+					<span id="submenu2" data-dojo-type="dijit/Menu">
+						<span id="level2_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>Cut!</span>
+						<span id="level2_copy" data-dojo-type="dijit/MenuItem" data-dojo-textdir="ltr" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>Copy!</span>
+						<span id="level2_paste" data-dojo-type="dijit/MenuItem" data-dojo-textdir="rtl" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste"'>Paste!</span>
+						<span data-dojo-type="dijit/PopupMenuItem">
+							<span>Deeper Submenu!</span>
+							<span id="submenu4" data-dojo-type="dijit/Menu">
+								<span id="level3_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>START AUTO &#1495;&#1491;&#1513; Cut!</span>
+								<span id="level3_copy" data-dojo-type="dijit/MenuItem" data-dojo-textdir="ltr" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>Copy!</span>
+								<span id="level3_paste" data-dojo-type="dijit/MenuItem" data-dojo-textdir="rtl" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste"'>Paste!</span>
+								<span data-dojo-type="dijit/PopupMenuItem">
+									<span>Deeper deeper Submenu!</span>
+									<span id="submenu5" data-dojo-type="dijit/Menu">
+										<span id="level4_cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut"'>&#1495;&#1491;&#1513; Cut! AUTO END</span>
+										<span id="level4_copy" data-dojo-type="dijit/MenuItem" data-dojo-textdir="ltr" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy"'>Copy!</span>
+										<span id="level4_paste" data-dojo-type="dijit/MenuItem" data-dojo-textdir="rtl" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste"'>Paste!</span>
+									</span>
+								</span>
+							</span>
+						</span>
+					</span>
+				</span>
+			</span>
+		</button>
+	</p>
+	<p id="buttonContainer" style="display: none;"></p>
+	<p id="dropdownButtonContainer" style="display: none;"></p>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/RadioButton.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/RadioButton.html
new file mode 100755
index 0000000000000000000000000000000000000000..69c4bc31eb5f8a437c56f570aa85f2992c7333a3
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/RadioButton.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Dijit RadioButton Bidi test</title>
+		<link rel="stylesheet" href="../../../themes/claro/claro.css">
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+				data-dojo-config="isDebug: true, async: true, has: { 'dojo-bidi': true }"></script>
+
+		<script>
+			require([
+				"doh/runner",
+				"dojo/parser",
+				"dijit/registry",
+				"dijit/form/RadioButton",
+				"dojo/domReady!"
+			], function(doh, parser, registry){
+				doh.register("basic", [
+					{
+						name: "creation",
+						runTest: function(){
+							// then() calls in parser() make it asynchronous even when module already loaded
+							return parser.parse().then(function(){
+								doh.t(registry.byId("radio"), "created");
+							});
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+	<body>
+		<div data-dojo-type="dijit/form/RadioButton" id="radio"></div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/module.js b/src/main/resources/static/dijit/tests/_BidiSupport/form/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..d4bc1f60e59d2c4b8c7893c796863a7b31a42739
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/module.js
@@ -0,0 +1,33 @@
+define(["doh/main", "require", "dojo/sniff"], function(doh, require, has){
+
+	var test_robot = has("trident") || has("ff") || has("chrome") < 45;
+
+	doh.register("_BidiSupport.form.test_PlaceholderInput.", require.toUrl("./test_PlaceholderInput.html"), 999999);
+
+	doh.register("_BidiSupport.form.multiSelect", require.toUrl("./multiSelect.html"), 999999);
+
+	doh.register("_BidiSupport.form.noTextDirTextWidgets", require.toUrl("./noTextDirTextWidgets.html"), 999999);
+
+	doh.register("_BidiSupport.form.Button", require.toUrl("./Button.html"), 999999);
+
+	doh.register("_BidiSupport.form.RadioButton", require.toUrl("./RadioButton.html"), 999999);
+
+	doh.register("_BidiSupport.form.Select", require.toUrl("./test_Select.html"), 999999);
+
+	doh.register("_BidiSupport.form.Slider", require.toUrl("./test_Slider.html"), 999999);
+
+	if(test_robot){
+		doh.register("_BidiSupport.form.robot.Textarea", require.toUrl("./robot/Textarea.html"), 999999);
+
+		doh.register("_BidiSupport.form.robot.SimpleComboBoxes", require.toUrl("./robot/SimpleComboBoxes.html"), 999999);
+
+		doh.register("_BidiSupport.form.robot.SimpleTextarea", require.toUrl("./robot/SimpleTextarea.html"), 999999);
+
+		doh.register("_BidiSupport.form.robot.TextBoxes", require.toUrl("./robot/TextBoxes.html"), 999999);
+
+		doh.register("_BidiSupport.form.robot.InlineEditBox", require.toUrl("./robot/InlineEditBox.html"), 999999);
+	}
+
+	doh.register("_BidiSupport.form.TimeTextBox", require.toUrl("./test_TimeTextBox.html?mode=test"), 999999);
+
+});
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/multiSelect.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/multiSelect.html
new file mode 100644
index 0000000000000000000000000000000000000000..18c5d13de7e862381430e7edb5fe96718607d120
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/multiSelect.html
@@ -0,0 +1,385 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Testing MultiSelect form widget | The Dojo Toolkit</title>
+
+	<style type="text/css">
+		@import "../../../../dijit/tests/css/dijitTests.css";
+		#select1, #select2, #select3 {
+			width:255px;
+			height:300px;
+			overflow:auto;
+		}
+		div#sel1, div#sel2,div#sel3 {
+			float: left;
+
+		}
+		div#leftRightButtons,div#leftRightButtons2 {
+			float: left;
+			padding: 10em 0.5em 0 0.5em;
+		}
+	</style>
+
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: true, has: { 'dojo-bidi': true }"></script>
+
+	<!-- only needed for alternate theme testing: -->
+	<script type="text/javascript" src="../../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		var globalId = null;
+
+		dojo.require("dijit.form.MultiSelect");
+
+		// needed for tests:
+		dojo.require("dijit.form.Form");
+		dojo.require("dijit.form.Button");
+		dojo.require("dijit.layout.SplitContainer");
+
+		dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+		dojo.require("doh.runner");
+
+		dojo.ready(function(){
+
+			// ref a clonable node, then split it between two selects
+			var c = dojo.query(".clone")[0];
+			var l = -1;
+			opt = function(){
+				return dojo.byId((++l%2 == 0 ? "select1":"select2" ));
+			};
+
+			// turn any non-data-dojo-type selects into widgets programatically:
+			dojo.query("select").forEach(function(n){
+				if(!dijit.byNode(n)){
+					var textDir = n.id == "select3" ? "" : (n.id == "select1" ? "rtl" : "auto");
+					var foo = new dijit.form.MultiSelect({ textDir: textDir ,name: n.name }, n);
+				}
+			});
+
+			// programatic
+			var myWidget = new dijit.form.MultiSelect({textDir: "auto"});
+			myWidget.placeAt(dojo.body());
+			globalId = myWidget.id;
+
+			// listen to the "move items" buttons
+			dojo.query("button.switch")
+				.connect("onclick",function(e){
+					switch(e.target.id.toString()){
+						case "button21" : dijit.byId("select1").addSelected(dijit.byId("select2")); break;
+						case "button12" : dijit.byId("select2").addSelected(dijit.byId("select1")); break;
+						case "button32" : dijit.byId("select2").addSelected(dijit.byId("select3")); break;
+						case "button23" : dijit.byId("select3").addSelected(dijit.byId("select2")); break;
+						case "up" : dijit.byId("select4").addSelected(dijit.byId(globalId)); break;
+						case "down" : dijit.byId(globalId).addSelected(dijit.byId("select4")); break;
+					}
+			});
+
+			// listen to the invert buttons
+			dojo.query("button.invert")
+				.connect("onclick",function(e){
+					switch(e.target.id.toString()){
+						case "i1" : dijit.byId("select1").invertSelection(); break;
+						case "i2" : dijit.byId("select2").invertSelection(); break;
+						case "i3" : dijit.byId("select4").invertSelection(); break;
+						case "i4" : dijit.byId("select3").invertSelection(); break;
+					}
+			});
+
+			// there is only one debug button
+			dojo.query(".debug").connect("onclick",function(e){
+				console.log('select1 value:',dijit.byId("select1").get('value') + '/' + dijit.byId("select1").value);
+				console.log('select2 value:',dijit.byId("select2").get('value') + '/' + dijit.byId("select2").value);
+				console.log('select3 value:',dijit.byId("select3").get('value') + '/' + dijit.byId("select3").value);
+				console.log('select4 value:',dijit.byId("select4").get('value') + '/' + dijit.byId("select4").value);
+			});
+
+			dojo.connect(dojo.byId("formSubmit"), "onclick", function(e){
+				// see what the real form says about our widgets:
+				var vals = dojo.formToJson("test");
+				console.log(vals);
+			});
+
+			// Testing:
+			var originalList = [
+				"Tennessee...",
+				"\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...",
+				"Washington...",
+				"Florida...",
+				"California..."
+			];
+			var valueList = [
+				"Tennessee...",
+				"\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...",
+				"WA",
+				"FL",
+				"CA"
+			];
+			var lreList = [
+				"\u202ATennessee...\u202C",
+				"\u202A\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...\u202C",
+				"\u202AWashington...\u202C",
+				"\u202AFlorida...\u202C",
+				"\u202ACalifornia...\u202C"
+			];
+			var rleList = [
+				"\u202BTennessee...\u202C",
+				"\u202B\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...\u202C",
+				"\u202BWashington...\u202C",
+				"\u202BFlorida...\u202C",
+				"\u202BCalifornia...\u202C"
+			];
+			var autoList = [
+				"\u202ATennessee...\u202C",
+				"\u202B\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...\u202C",
+				"\u202AWashington...\u202C",
+				"\u202AFlorida...\u202C",
+				"\u202ACalifornia...\u202C"
+			];
+			doh.register("parse", {
+				name: "parse",
+				timeout: 5000,
+				runTest: function() {
+					dojo.parser.parse();
+				}
+			});
+			var select1 = dijit.byId("select1"),
+				select2 = dijit.byId("select2"),
+				select3 = dijit.byId("select3"),
+				select4 = dijit.byId("select4"),
+				select5 = dijit.byId(globalId),
+
+				button12 = dojo.byId("button12"),
+				button21 = dojo.byId("button21"),
+				button32 = dojo.byId("button32"),
+				button23 = dojo.byId("button23"),
+				buttonUp = dojo.byId("up"),
+				buttonDown = dojo.byId("down"),
+
+				bidiLtr, bidiRtl, bidiAuto;
+
+			doh.register("test multiSelect", [
+				{
+					name:"initial direction of the Lists",
+
+					runTest:function(){
+						doh.is("rtl", select1.textDir, "textDir of - " + select1.id);
+						doh.is("auto", select2.textDir, "textDir of - " + select2.id);
+						doh.is("rtl", select4.textDir, "textDir of - " + select4.id);
+						doh.is("auto", select5.textDir, "textDir of - " + select5.id);
+					}
+				},
+				{
+					name:"test options: select1, select4",
+
+					runTest:function(){
+						var select1 = dijit.byId("select1"), select4 = dijit.byId("select4");
+						var select1OptionsArr = select1.containerNode.options;
+						var select4OptionsArr = select4.containerNode.options;
+						for(var index = 0; index < select1.containerNode.options.length; index++){
+
+							doh.is(rleList[index], select1OptionsArr[index].text, "select1 - option.text: " + (index + 1));
+							doh.is(valueList[index], select1OptionsArr[index].value, "select1 - option.value: " + (index + 1));
+
+							doh.is(rleList[index], select4OptionsArr[index].text, "select4 - option.text: " + (index + 1));
+							doh.is(valueList[index], select4OptionsArr[index].value, "select4 - option.value: " + (index + 1));
+
+						}
+					}
+				},
+				{
+					name:"set value: select1, select2",
+
+					runTest:function(){
+
+						var select1OptionsArr = select1.containerNode.options;
+						var select2OptionsArr = select2.containerNode.options;
+
+						select1.set("value", ["Tennessee...","\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...","FL","CA"]);
+						button12.click();
+
+						// Florida button21
+						doh.is(rleList[2], select1OptionsArr[0].text, "select1 - option.text: " + 1);
+						doh.is(valueList[2], select1OptionsArr[0].value, "select1 - option.value: " + 1);
+
+						doh.is(autoList[0], select2OptionsArr[0].text, "select2 - option.text: " + 1);
+						doh.is(valueList[0], select2OptionsArr[0].value, "select2 - option.value: " + 1);
+
+						doh.is(autoList[1], select2OptionsArr[1].text, "select2 - option.text: " + 2);
+						doh.is(valueList[1], select2OptionsArr[1].value, "select2 - option.value: " + 2);
+
+						doh.is(autoList[3], select2OptionsArr[2].text, "select2 - option.text: " + 3);
+						doh.is(valueList[3], select2OptionsArr[2].value, "select2 - option.value: " + 3);
+
+						doh.is(autoList[4], select2OptionsArr[3].text, "select2 - option.text: " + 4);
+						doh.is(valueList[4], select2OptionsArr[3].value, "select2 - option.value: " + 4);
+
+					}
+				},
+				{
+					name:"set value: select2, select3",
+
+					runTest:function(){
+
+						var d = new doh.Deferred();
+
+						//select1.set("value", ["Tennessee...","\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...","FL","CA"]);
+						button23.click();
+
+						var select3OptionsArr = select3.containerNode.options;
+
+						doh.is(originalList[0], select3OptionsArr[0].text, "select3 - option.text: " + 1);
+						doh.is(valueList[0], select3OptionsArr[0].value, "select3 - option.value: " + 1);
+
+						doh.is(originalList[1], select3OptionsArr[1].text, "select3 - option.text: " + 2);
+						doh.is(valueList[1], select3OptionsArr[1].value, "select3 - option.value: " + 2);
+
+						doh.is(originalList[3], select3OptionsArr[2].text, "select3 - option.text: " + 3);
+						doh.is(valueList[3], select3OptionsArr[2].value, "select3 - option.value: " + 3);
+
+						doh.is(originalList[4], select3OptionsArr[3].text, "select3 - option.text: " + 4);
+						doh.is(valueList[4], select3OptionsArr[3].value, "select3 - option.value: " + 4);
+
+						select3.set("value", ["\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...","FL","CA"]);
+						button32.click();
+
+						var select2OptionsArr = select2.containerNode.options;
+
+						setTimeout(d.getTestCallback(function(){
+							doh.is(autoList[1], select2OptionsArr[0].text, "select2 - option.text: " + 1);
+							doh.is(valueList[1], select2OptionsArr[0].value, "select2 - option.value: " + 1);
+
+							doh.is(autoList[3], select2OptionsArr[1].text, "select2 - option.text: " + 2);
+							doh.is(valueList[3], select2OptionsArr[1].value, "select2 - option.value: " + 2);
+
+							doh.is(autoList[4], select2OptionsArr[2].text, "select2 - option.text: " + 3);
+							doh.is(valueList[4], select2OptionsArr[2].value, "select2 - option.value: " + 3);
+						}), 100);
+						return d;
+
+					}
+				},
+				{
+					name:"set value: select4, select5",
+
+					runTest:function(){
+
+						var d = new doh.Deferred();
+
+						select4.set("value", ["Tennessee...","\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...","FL","CA"]);
+						buttonDown.click();
+
+						var select5OptionsArr = select5.containerNode.options;
+
+						doh.is(autoList[0], select5OptionsArr[0].text, "select5 - option.text: " + 1);
+						doh.is(valueList[0], select5OptionsArr[0].value, "select5 - option.value: " + 1);
+
+						doh.is(autoList[1], select5OptionsArr[1].text, "select5 - option.text: " + 2);
+						doh.is(valueList[1], select5OptionsArr[1].value, "select5 - option.value: " + 2);
+
+						doh.is(autoList[3], select5OptionsArr[2].text, "select5 - option.text: " + 3);
+						doh.is(valueList[3], select5OptionsArr[2].value, "select5 - option.value: " + 3);
+
+						doh.is(autoList[4], select5OptionsArr[3].text, "select5 - option.text: " + 4);
+						doh.is(valueList[4], select5OptionsArr[3].value, "select5 - option.value: " + 4);
+
+						select5.set("value", ["\u05d5\u05d9\u05e8\u05d2\u0027\u05d9\u05e0\u05d9\u05d4...","FL","CA"]);
+						buttonUp.click();
+
+						var select4OptionsArr = select4.containerNode.options;
+
+						setTimeout(d.getTestCallback(function(){
+							doh.is(rleList[2], select4OptionsArr[0].text, "select4 - option.text: " + 1);
+							doh.is(valueList[2], select4OptionsArr[0].value, "select4 - option.value: " + 1);
+
+							doh.is(rleList[1], select4OptionsArr[1].text, "select4 - option.text: " + 2);
+							doh.is(valueList[1], select4OptionsArr[1].value, "select4 - option.value: " + 2);
+
+							doh.is(rleList[3], select4OptionsArr[2].text, "select4 - option.text: " + 3);
+							doh.is(valueList[3], select4OptionsArr[2].value, "select4 - option.value: " + 3);
+
+							doh.is(rleList[4], select4OptionsArr[3].text, "select4 - option.text: " + 3);
+							doh.is(valueList[4], select4OptionsArr[3].value, "select4 - option.value: " + 3);
+						}), 100);
+						return d;
+
+					}
+				}
+			]);
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" style="padding:20px">
+
+	<h1 class="testTitle">dijit.form.MultiSelect:</h1>
+	<p>Select one or more items in First or Second list and move them between lists using the buttons provided.</p>
+	<form action="#" method="get" id="test" onsubmit="return false">
+
+		<div>
+			<div id="sel1" role="presentation">
+				<label for="select1">First list:</label><br>
+				<select id="select1" multiple size="7"  tabindex="1" name="first">
+					<option selected>Tennessee...</option>
+					<option >&#1493;&#1497;&#1512;&#1490;'&#1497;&#1504;&#1497;&#1492;...</option>
+					<option value="WA">Washington...</option>
+					<option value="FL">Florida...</option>
+					<option value="CA">California...</option>
+				</select>
+			</div>
+			<div id="leftRightButtons" role="presentation">
+				<span>
+					<button class="switch" id="button21" title="Move Items to First list">&lt;</button>
+					<button class="switch" id="button12" title="Move Items to Second list">&gt;</button>
+				</span>
+			</div>
+			<div id="sel2" role="presentation">
+				<label for="select2">Second list:</label><br>
+				<select id="select2" multiple size="7" name="second">
+				</select>
+			</div>
+			<div id="leftRightButtons2" role="presentation">
+				<span>
+					<button class="switch" id="button32" title="Move Items to Third list">&lt;</button>
+					<button class="switch" id="button23" title="Move Items to Second list">&gt;</button>
+				</span>
+			</div>
+			<div id="sel3" role="presentation">
+				<label for="select3">Third list:</label><br>
+				<select id="select3" multiple size="7" name="third">
+				</select>
+			</div>
+		</div>
+
+		<br style="clear: both;"/><br>
+
+		<button class='invert' id="i1">invert first list</button>
+		<button class="invert" id="i2">invert second list</button>
+		<button class="invert" id="i4">invert third list</button>
+		<button id="formSubmit" type="submit">Submit</button>
+		<button class="debug">call get('value')</button>
+
+		<h3><label for="select4">markup:</label></h3>
+
+		<select id="select4" multiple data-dojo-type="dijit.form.MultiSelect"
+			data-dojo-props='textDir:"rtl",name:"select4",
+			style:{height:"200px", width:"175px", border:"5px solid #ededed"}' name="fourth">
+
+			<option selected>Tennessee...</option>
+			<option >&#1493;&#1497;&#1512;&#1490;'&#1497;&#1504;&#1497;&#1492;...</option>
+			<option value="WA">Washington...</option>
+			<option value="FL">Florida...</option>
+			<option value="CA">California...</option>
+		</select>
+	<br><br>
+	<button class="switch" id="up">move up</button>
+	<button class="switch" id="down">move Down</button>
+	<br>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/noTextDirTextWidgets.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/noTextDirTextWidgets.html
new file mode 100644
index 0000000000000000000000000000000000000000..53f1f8286cf79988e9345904226f287490b05408
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/noTextDirTextWidgets.html
@@ -0,0 +1,435 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>DOH input fields witout textDir support Tests</title>
+
+		<style type="text/css">
+			@import "../../../../dijit/themes/tundra/tundra.css";
+			@import "../../../../dojo/resources/dojo.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="async: true, isDebug: true, has: { 'dojo-bidi': true }"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner",
+				"dojo/dom",
+				"dojo/parser",
+				"dijit/registry",
+				"dojo/domReady!"
+			], function(doh, dom, parser, registry){
+
+				doh.register("parse", {
+					name: "parse",
+					timeout: 10000,
+					runTest: function() {
+						// Parse is asynchronous because it pulls in modules like DateTextBox, so return its promise
+						return parser.parse();
+					}
+				});
+
+				doh.register("initial direction of the textBoxes", [
+					{
+						name: "Group 1",
+
+						runTest: function(){
+
+							var textBox1 = registry.byId("local_1"),
+								textBox2 = registry.byId("local_12"),
+								textBox3 = registry.byId("local_2"),
+								textBox4 = registry.byId("local_22");
+
+							doh.is("rtl", textBox1.textDir, "textDir of - " + textBox1.id);
+							doh.is("", textBox1.dir, "dir of - " + textBox1.id);
+							doh.t(textBox1.focusNode.dir === textBox1.textDir, "textDir != dir of - " + textBox1.id);
+
+							doh.is("ltr", textBox2.textDir, "textDir of - " + textBox2.id);
+							doh.is("", textBox2.dir, "dir of - " + textBox2.id);
+							doh.t(textBox2.focusNode.dir === textBox2.textDir, "textDir != dir of - " + textBox2.id);
+
+							doh.is("rtl", textBox3.textDir, "textDir of - " + textBox3.id);
+							doh.is("rtl", textBox3.dir, "dir of - " + textBox3.id);
+							doh.t(textBox3.focusNode.dir === textBox3.textDir, "textDir != dir of - " + textBox3.id);
+
+							doh.is("ltr", textBox4.textDir, "textDir of - " + textBox4.id);
+							doh.is("rtl", textBox4.dir, "dir of - " + textBox4.id);
+							doh.t(textBox4.focusNode.dir === textBox4.textDir, "textDir != dir of - " + textBox4.id);
+						}
+					},
+					{
+						name: "Group 2",
+
+						runTest: function(){
+
+							var textBox1 = registry.byId("localLong_1"),
+								textBox2 = registry.byId("localLong_12"),
+								textBox3 = registry.byId("localLong_2"),
+								textBox4 = registry.byId("localLong_22");
+
+							doh.is("rtl", textBox1.textDir, "textDir of - " + textBox1.id);
+							doh.is("ltr", textBox1.dir, "dir of - " + textBox1.id);
+							doh.t(textBox1.focusNode.dir === textBox1.textDir, "textDir != dir of - " + textBox1.id);
+
+							doh.is("ltr", textBox2.textDir, "textDir of - " + textBox2.id);
+							doh.is("", textBox2.dir, "dir of - " + textBox2.id);
+							doh.t(textBox2.focusNode.dir === textBox2.textDir, "textDir != dir of - " + textBox2.id);
+
+							doh.is("rtl", textBox3.textDir, "textDir of - " + textBox3.id);
+							doh.is("rtl", textBox3.dir, "dir of - " + textBox3.id);
+							doh.t(textBox3.focusNode.dir === textBox3.textDir, "textDir != dir of - " + textBox3.id);
+
+							doh.is("ltr", textBox4.textDir, "textDir of - " + textBox4.id);
+							doh.is("rtl", textBox4.dir, "dir of - " + textBox4.id);
+							doh.t(textBox4.focusNode.dir === textBox4.textDir, "textDir != dir of - " + textBox4.id);
+						}
+					},
+					{
+						name: "Group 3",
+
+						runTest: function(){
+
+							var textBox1 = registry.byId("integerspinner_1"),
+								textBox2 = registry.byId("integerspinner_12"),
+								textBox3 = registry.byId("integerspinner_2"),
+								textBox4 = registry.byId("integerspinner_22");
+
+							doh.is("rtl", textBox1.textDir, "textDir of - " + textBox1.id);
+							doh.is("", textBox1.dir, "dir of - " + textBox1.id);
+							doh.t(textBox1.focusNode.dir === textBox1.textDir, "textDir != dir of - " + textBox1.id);
+
+							doh.is("ltr", textBox2.textDir, "textDir of - " + textBox2.id);
+							doh.is("", textBox2.dir, "dir of - " + textBox2.id);
+							doh.t(textBox2.focusNode.dir === textBox2.textDir, "textDir != dir of - " + textBox2.id);
+
+							doh.is("rtl", textBox3.textDir, "textDir of - " + textBox3.id);
+							doh.is("rtl", textBox3.dir, "dir of - " + textBox3.id);
+							doh.t(textBox3.focusNode.dir === textBox3.textDir, "textDir != dir of - " + textBox3.id);
+
+							doh.is("ltr", textBox4.textDir, "textDir of - " + textBox4.id);
+							doh.is("rtl", textBox4.dir, "dir of - " + textBox4.id);
+							doh.t(textBox4.focusNode.dir === textBox4.textDir, "textDir != dir of - " + textBox4.id);
+						}
+					},
+					{
+						name: "Group 4",
+
+						runTest: function(){
+
+							var textBox1 = registry.byId("curren_1"),
+								textBox2 = registry.byId("curren_12"),
+								textBox3 = registry.byId("curren_2"),
+								textBox4 = registry.byId("curren_22");
+
+							doh.is("rtl", textBox1.textDir, "textDir of - " + textBox1.id);
+							doh.is("", textBox1.dir, "dir of - " + textBox1.id);
+							doh.t(textBox1.focusNode.dir === textBox1.textDir, "textDir != dir of - " + textBox1.id);
+
+							doh.is("ltr", textBox2.textDir, "textDir of - " + textBox2.id);
+							doh.is("", textBox2.dir, "dir of - " + textBox2.id);
+							doh.t(textBox2.focusNode.dir === textBox2.textDir, "textDir != dir of - " + textBox2.id);
+
+							doh.is("rtl", textBox3.textDir, "textDir of - " + textBox3.id);
+							doh.is("rtl", textBox3.dir, "dir of - " + textBox3.id);
+							doh.t(textBox3.focusNode.dir === textBox3.textDir, "textDir != dir of - " + textBox3.id);
+
+							doh.is("ltr", textBox4.textDir, "textDir of - " + textBox4.id);
+							doh.is("rtl", textBox4.dir, "dir of - " + textBox4.id);
+							doh.t(textBox4.focusNode.dir === textBox4.textDir, "textDir != dir of - " + textBox4.id);
+						}
+					},
+					{
+						name: "Group 5",
+
+						runTest: function(){
+
+							var textBox1 = registry.byId("q1"),
+								textBox2 = registry.byId("q2"),
+								textBox3 = registry.byId("q3"),
+								textBox4 = registry.byId("q4");
+
+							doh.is("rtl", textBox1.textDir, "textDir of - " + textBox1.id);
+							doh.is("ltr", textBox1.dir, "dir of - " + textBox1.id);
+							doh.t(textBox1.focusNode.dir === textBox1.textDir, "textDir != dir of - " + textBox1.id);
+
+							doh.is("ltr", textBox2.textDir, "textDir of - " + textBox2.id);
+							doh.is("ltr", textBox2.dir, "dir of - " + textBox2.id);
+							doh.t(textBox2.focusNode.dir === textBox2.textDir, "textDir != dir of - " + textBox2.id);
+
+							doh.is("rtl", textBox3.textDir, "textDir of - " + textBox3.id);
+							doh.is("rtl", textBox3.dir, "dir of - " + textBox3.id);
+							doh.t(textBox3.focusNode.dir === textBox3.textDir, "textDir != dir of - " + textBox3.id);
+
+							doh.is("ltr", textBox4.textDir, "textDir of - " + textBox4.id);
+							doh.is("rtl", textBox4.dir, "dir of - " + textBox4.id);
+							doh.t(textBox4.focusNode.dir === textBox4.textDir, "textDir != dir of - " + textBox4.id);
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+
+	<body class="tundra">
+		<h1 class="testTitle">Test DateTextBox Widget with _BidiSupport</h1>
+		<div class="dojoTitlePaneLabel">
+			<label for="local_1">Group 1: Date (local format) </label>
+		</div>
+		<div class="testExample">
+			<table>
+				<tr>
+					<th>
+						<label for="local_1"><b>dir = </b>ltr, <b>textDir = </b>rtl</label><br>
+						<input id="local_1" data-dojo-type="dijit/form/DateTextBox"
+							data-dojo-props='name: "noDOMvalue", value: "2008-12-31", type: "text", textDir: "rtl"'/>
+					</th>
+					<th>
+						<label for="local_12"><b>dir = </b>ltr, <b>textDir = </b>ltr</label><br>
+						<input id="local_12" data-dojo-type="dijit/form/DateTextBox"
+							data-dojo-props='name: "noDOMvalue12", value: "2008-12-31", type: "text", textDir: "ltr"'/>
+					</th>
+				</tr>
+				<tr>
+					<th>
+						<label for="local_2"><b>dir = </b>rtl, <b>textDir = </b>rtl</label><br>
+						<input id="local_2" data-dojo-type="dijit/form/DateTextBox"
+							data-dojo-props='name: "noDOMvalue2", value: "2008-12-31", type: "text", dir: "rtl", textDir: "rtl"'/>
+					</th>
+					<th>
+						<label for="local_22"><b>dir = </b>rtl, <b>textDir = </b>ltr</label><br>
+						<input id="local_22" data-dojo-type="dijit/form/DateTextBox"
+							data-dojo-props='name: "noDOMvalue22", value: "2008-12-31", type: "text", dir: "rtl", textDir: "ltr"'/>
+					</th>
+				</tr>
+			</table>
+		</div>
+		<div class="dojoTitlePaneLabel">
+			<label for="localLong_1">Group 2: Date (local format - long) </label>
+		</div>
+		<div class="testExample">
+			<table>
+				<tr>
+					<th>
+						<label for="localLong_1"><b>dir = </b>ltr, <b>textDir = </b>rtl</label><br>
+						<input id="localLong_1" data-dojo-id="localLong_1" data-dojo-type="dijit/form/DateTextBox"
+							data-dojo-props='type: "text", name: "date1", value: "2005-12-30",
+							constraints: {min: "2004-01-01", max: "2006-12-31", formatLength: "long"},
+							required: true,
+							trim: true,
+							dir: "ltr", textDir: "rtl",
+							invalidMessage: "Invalid date."'/>
+					</th>
+					<th>
+						<label for="localLong_12"><b>dir = </b>ltr, <b>textDir = </b>ltr</label><br>
+						<input id="localLong_12" data-dojo-id="localLong_12" data-dojo-type="dijit/form/DateTextBox"
+							data-dojo-props='type: "text", name: "date12", value: "2005-12-30",
+							constraints: {min: "2004-01-01", max: "2006-12-31", formatLength: "long"},
+							required: true,
+							trim: true,
+							invalidMessage: "Invalid date." ,
+							textDir: "ltr"'/>
+					</th>
+				</tr>
+				<tr>
+					<th>
+						<label for="localLong_2"><b>dir = </b>rtl, <b>textDir = </b>rtl</label><br>
+						<input id="localLong_2" data-dojo-id="localLong_2" data-dojo-type="dijit/form/DateTextBox"
+							data-dojo-props='type: "text", name: "date2", value: "2005-12-30",
+							constraints: {min: "2004-01-01",max: "2006-12-31",formatLength: "long"},
+							required: true,
+							trim: true,
+							invalidMessage: "Invalid date." ,
+							dir: "rtl",
+							textDir: "rtl" '/>
+					</th>
+					<th>
+						<label for="localLong_22"><b>dir = </b>rtl, <b>textDir = </b>ltr</label><br>
+						<input id="localLong_22" data-dojo-id="localLong_12" data-dojo-type="dijit/form/DateTextBox"
+							data-dojo-props='type: "text", name: "date12", value: "2005-12-30",
+							constraints: {min: "2004-01-01",max: "2006-12-31",formatLength: "long"},
+							required: true,
+							trim: true,
+							invalidMessage: "Invalid date." ,
+							dir: "rtl",
+							textDir: "ltr"'/>
+					</th>
+				</tr>
+			</table>
+		</div>
+
+		<br>
+		<h1 class="testTitle">Test NumberSpinner Widget with _BidiSupport</h1>
+		<div class="dojoTitlePaneLabel">
+			<label >Group 3 </label>
+		</div>
+
+		Try typing values, and use the up/down arrow keys and/or the arrow push	buttons
+
+		<div class="testExample">
+			<table>
+				<tr>
+					<th>
+						<label for="integerspinner_1"><b>dir = </b>ltr, <b>textDir = </b>rtl </label><br>
+						<input id="integerspinner_1" data-dojo-type="dijit/form/NumberSpinner"
+							data-dojo-props='
+							value: 900,
+							"class": "bigFont",
+							constraints: {max: 1550,places: 0},
+							name: "integerspinner_1",
+							textDir: "rtl"'/>
+					</th>
+					<th>
+						<label for="integerspinner_12"><b>dir = </b>ltr, <b>textDir = </b>ltr </label><br>
+						<input id="integerspinner_12" data-dojo-type="dijit/form/NumberSpinner"
+							data-dojo-props='
+							value: 900,
+							"class": "bigFont",
+							constraints: {max: 1550,places: 0},
+							name: "integerspinner_12",
+							textDir: "ltr"'/>
+					</th>
+				</tr>
+				<tr>
+					<th>
+						<label for="integerspinner_2"><b>dir = </b>rtl, <b>textDir = </b>rtl </label><br>
+						<input id="integerspinner_2" data-dojo-type="dijit/form/NumberSpinner"
+							data-dojo-props='
+							value: 900,
+							"class": "bigFont",
+							constraints: {max: 1550,places: 0},
+							dir: "rtl",
+							textDir: "rtl",
+							name: "integerspinner_2"'/>
+					</th>
+					<th>
+						<label for="integerspinner_22"><b>dir = </b>rtl, <b>textDir = </b>ltr </label><br>
+						<input id="integerspinner_22" data-dojo-type="dijit/form/NumberSpinner"
+							data-dojo-props='
+							value: 900,
+							"class": "bigFont",
+							constraints: {max: 1550,places: 0},
+							dir: "rtl",
+							textDir: "ltr",
+							name: "integerspinner_22"'/>
+					</th>
+				</tr>
+			</table>
+		</div>
+
+		<br>
+		<br>
+
+		<h1 class="testTitle">Test CurrencyTextBox Widget with _BidiSupport</h1>
+		<div class="dojoTitlePaneLabel">
+			<label >Group 4</label>
+		</div>
+		<div class="testExample">
+			<table>
+				<tr>
+					<th>
+						<label for="curren_1"><b>dir = </b>ltr, <b>textDir = </b>rtl </label><br>
+						<input id="curren_1" data-dojo-type="dijit/form/CurrencyTextBox"
+							data-dojo-props='name: "curren_1", "class": "medium", value: 54775.53,
+							required: true,
+							constraints: {fractional: true},
+							currency: "USD",
+							textDir: "rtl",
+							invalidMessage: "Invalid amount. Cents are MANDATORY."'/>
+					</th>
+					<th>
+						<label for="curren_12"><b>dir = </b>ltr, <b>textDir = </b>ltr</label><br>
+						<input id="curren_12" data-dojo-type="dijit/form/CurrencyTextBox"
+							data-dojo-props='name: "curren_12", "class": "medium", value: 54775.53,
+							required: true,
+							constraints: {fractional: true},
+							currency: "USD",
+							invalidMessage: "Invalid amount. Cents are MANDATORY.",
+							textDir: "ltr"'/>
+					</th>
+				</tr>
+				<tr>
+					<th>
+						<label for="curren_2"><b>dir = </b>rtl, <b>textDir = </b>rtl </label><br>
+						<input id="curren_2" data-dojo-type="dijit/form/CurrencyTextBox"
+							data-dojo-props='name: "curren_2", "class": "medium", value: 54775.53,
+								required: true,
+								constraints: {fractional: true},
+								currency: "USD",
+								invalidMessage: "Invalid amount. Cents are MANDATORY.",
+								textDir: "rtl",
+								dir: "rtl"'/>
+					</th>
+					<th>
+						<label for="curren_22"><b>dir = </b>rtl, <b>textDir = </b>ltr </label><br>
+						<input id="curren_22" data-dojo-type="dijit/form/CurrencyTextBox"
+								data-dojo-props='name: "curren_22", "class": "medium", value: 54775.53,
+								required: true,
+								constraints: {fractional: true},
+								currency: "USD",
+								invalidMessage: "Invalid amount. Cents are MANDATORY.",
+								textDir: "ltr",
+								dir: "rtl"'/>
+					</th>
+				</tr>
+			</table>
+		</div>
+
+		<h1 class="testTitle">Test TimeTextBox Widget with _BidiSupport</h1>
+		<div class="dojoTitlePaneLabel">
+			<label >Group 5 </label>
+		</div>
+		<div class="testExample">
+			<table>
+				<tr>
+					<th>
+						<label for="q1"><b>dir = </b>ltr, <b>textDir = </b>rtl </label><br>
+						<input id="q1" data-dojo-type="dijit/form/TimeTextBox"
+							data-dojo-props='type: "text", name: "time1", value: "T17:45:00",
+							constraints: {formatLength: "medium"},
+							required: true,
+							invalidMessage: "Invalid time.",
+							textDir: "rtl",
+							dir: "ltr"'/>
+					</th>
+					<th>
+						<label for="q2"><b>dir = </b>ltr, <b>textDir = </b>ltr</label><br>
+						<input id="q2" data-dojo-type="dijit/form/TimeTextBox"
+							data-dojo-props='type: "text", name: "time2", value: "T17: 45: 00",
+							constraints: {formatLength: "medium"},
+							required: true,
+							invalidMessage: "Invalid time.",
+							textDir: "ltr",
+							dir: "ltr"'/>
+					</th>
+				</tr>
+				<tr>
+					<th>
+						<label for="q3"><b>dir = </b>rtl, <b>textDir = </b>rtl </label><br>
+						<input id="q3" data-dojo-type="dijit/form/TimeTextBox"
+							data-dojo-props='type: "text", name: "time3", value: "T17:45:00",
+							constraints: {formatLength: "medium"},
+							required: true,
+							invalidMessage: "Invalid time.",
+							textDir: "rtl",
+							dir: "rtl"'/>
+					</th>
+					<th>
+						<label for="q4"><b>dir = </b>rtl, <b>textDir = </b>ltr </label><br>
+						<input id="q4" data-dojo-type="dijit/form/TimeTextBox"
+							data-dojo-props='type: "text", name: "time4", value: "T17:45:00",
+							constraints: {formatLength: "medium"},
+							required: true,
+							invalidMessage: "Invalid time.",
+							textDir: "ltr",
+							dir: "rtl"'/>
+					</th>
+				</tr>
+			</table>
+		</div>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/InlineEditBox.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/InlineEditBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..02e2c1fadf0841ee05e6a51739a7f82453afaf85
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/InlineEditBox.html
@@ -0,0 +1,264 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>doh.robot InlineEditBox textDir Tests</title>
+
+		<style>
+			@import "../../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../../dojo/dojo.js">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_InlineEditBox.html');
+				var textbox;
+				var inlineBox;
+
+				function moveAndClick(node){
+					doh.robot.mouseMoveAt(node, 500, 1);
+					doh.robot.mouseClick({left: true}, 500);
+				}
+
+				doh.register("InlineEditBox with TextBox", [
+					{
+						name: "write in English in 'ltrInlineEditBox'",
+						timeout: 10000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							inlineBox = dijit.byId("P0");
+							moveAndClick(inlineBox.domNode);
+							doh.robot.typeKeys("Hello!!!", 1000, 1200);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								textBox = inlineBox.wrapperWidget.editWidget;
+								doh.is('ltr', textBox.get("textDir"), "direction of :" + inlineBox.id);
+								doh.is('ltr', textBox.focusNode.dir, "direction of :" + inlineBox.id);
+								inlineBox.save(true);
+							}), 800);
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'rtlInlineEditBox'",
+						timeout:10000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							inlineBox = dijit.byId("P1");
+							moveAndClick(inlineBox.domNode);
+							doh.robot.setClipboard("\u05d5\u05e2\u05db\u05e9\u05d9\u05d5!",'text/html');
+							var modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+							doh.robot.keyPress("a", 400, modifier);
+							doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+							doh.robot.keyPress("v", 400, modifier);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								textBox = inlineBox.wrapperWidget.editWidget;
+								doh.is('rtl', textBox.get("textDir"), "direction of :" + inlineBox.id);
+								doh.is('rtl', textBox.focusNode.dir, "direction of :" + inlineBox.id);
+								inlineBox.save(true);
+							}), 800);
+							return d;
+						}
+					},
+					{
+						name: "initial text direction in 'autoInlineEditBox'",
+						timeout: 10000,
+
+						runTest: function(){
+							inlineBox = dijit.byId("P2");
+							doh.is('ltr', inlineBox.displayNode.dir, "direction of :" + inlineBox.id);
+						}
+
+					},
+					{
+						name: "change Value in 'autoInlineEditBox'",
+						timeout: 10000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							inlineBox = dijit.byId("P2");
+
+							doh.robot.mouseMoveAt(function(){ return dojo.byId('button'); }, 500, 1000);
+							doh.robot.mouseClick({left: true}, 500);
+							moveAndClick(inlineBox.domNode);
+							doh.robot.sequence(d.getTestCallback(function(){
+								textBox = inlineBox.wrapperWidget.editWidget;
+								doh.is('auto', textBox.get("textDir"), "direction of :" + inlineBox.id);
+								doh.is('rtl', textBox.focusNode.dir, "direction of :" + inlineBox.id);
+								inlineBox.save(true);
+							}), 800);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("InlineEditBox with TextArea", [
+						{
+						name: "write in English in 'ltrInlineEditBox'",
+						timeout: 10000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							inlineBox = dijit.byId("P3");
+							moveAndClick(inlineBox.domNode);
+							doh.robot.typeKeys("Hello!!!", 1000, 1200);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								textBox = inlineBox.wrapperWidget.editWidget;
+								doh.is('ltr', textBox.get("textDir"), "direction of :" + inlineBox.id);
+								doh.is('ltr', textBox.focusNode.dir, "direction of :" + inlineBox.id);
+								inlineBox.save(true);
+							}), 800);
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'rtlInlineEditBox'",
+						timeout: 10000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							inlineBox = dijit.byId("P4");
+							moveAndClick(inlineBox.domNode);
+							doh.robot.setClipboard("\u05d5\u05e2\u05db\u05e9\u05d9\u05d5!",'text/html');
+							var modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+							doh.robot.keyPress("a", 400, modifier);
+							doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+							doh.robot.keyPress("v", 400, modifier);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								textBox = inlineBox.wrapperWidget.editWidget;
+								doh.is('rtl', textBox.get("textDir"), "direction of :" + inlineBox.id);
+								doh.is('rtl', textBox.focusNode.dir, "direction of :" + inlineBox.id);
+								inlineBox.save(true);
+							}), 800);
+							return d;
+						}
+					},
+					{
+						name: "initial text direction in 'autoInlineEditBox'",
+						timeout: 10000,
+
+						runTest: function(){
+							var inlineBox = dijit.byId("P5");
+							doh.is('ltr', inlineBox.domNode.dir, "direction of :" + inlineBox.id);
+						}
+
+					},
+					{
+						name: "change Value in 'autoInlineEditBox'",
+						timeout: 10000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = dijit.byId("P5");
+							doh.robot.mouseMoveAt(function(){ return dojo.byId('Button1'); }, 500, 1000);
+
+							doh.robot.mouseClick({left: true}, 500);
+							moveAndClick(inlineBox.domNode);
+							doh.robot.sequence(d.getTestCallback(function(){
+								textBox = inlineBox.wrapperWidget.editWidget;
+								doh.is('auto', textBox.get("textDir"), "direction of :" + inlineBox.id);
+								doh.is('rtl', textBox.focusNode.dir, "direction of :" + inlineBox.id);
+								inlineBox.save(true);
+							}), 800);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("InlineEditBox with ComboBox", [
+						{
+						name: "test LTR ComboBox",
+						timeout: 10000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							inlineBox = dijit.byId("combo1");
+							moveAndClick(inlineBox.domNode);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 300);
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 300);
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 300);
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 300);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var combo = inlineBox.wrapperWidget.editWidget;
+								doh.is('ltr', combo.get("textDir"), "direction of :" + inlineBox.id);
+								dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+									if(node.item){
+										doh.is("ltr", node.dir, node.textContent);
+									}
+								});
+								inlineBox.save(true);
+							}), 900);
+							return d;
+						}
+					},
+					{
+						name: "test RTL ComboBox",
+						timeout: 10000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							inlineBox = dijit.byId("combo2");
+							moveAndClick(inlineBox.domNode);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 300);
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 300);
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 300);
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 300);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var combo = inlineBox.wrapperWidget.editWidget;
+								doh.is('rtl', combo.get("textDir"), "direction of :" + inlineBox.id);
+								dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+									if(node.item){
+										doh.is("rtl", node.dir, node.textContent);
+									}
+								});
+								inlineBox.save(true);
+							}), 900);
+							return d;
+						}
+					},
+					{
+						name: "test AUTO ComboBox",
+						timeout: 10000,
+
+						runTest: function(){
+								var d = new doh.Deferred();
+								inlineBox = dijit.byId("combo3");
+								moveAndClick(inlineBox.domNode);
+								doh.robot.keyPress(dojo.keys.DOWN_ARROW, 300);
+								doh.robot.keyPress(dojo.keys.UP_ARROW, 300);
+								doh.robot.keyPress(dojo.keys.UP_ARROW, 300);
+								doh.robot.keyPress(dojo.keys.UP_ARROW, 300);
+
+								doh.robot.sequence(d.getTestCallback(function(){
+									var combo = inlineBox.wrapperWidget.editWidget;
+									doh.is('auto', combo.get("textDir"), "direction of :" + inlineBox.id);
+									dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+										if(node.item){
+											var contextualDir = combo.getTextDir(node.innerText || node.textContent || "");
+											doh.is(contextualDir, node.dir, node.innerText || node.textContent || "");
+										}
+									});
+									inlineBox.save(true);
+								}), 900);
+							return d;
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/SimpleComboBoxes.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/SimpleComboBoxes.html
new file mode 100644
index 0000000000000000000000000000000000000000..c9ee9921f1e359174cfb66b2dd58c620723180ad
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/SimpleComboBoxes.html
@@ -0,0 +1,437 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>doh.robot ComboBox textDir Tests</title>
+
+		<style>
+			@import "../../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../../dojo/dojo.js">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+
+			dojo.ready(function(){
+				var combo;
+
+				doh.robot.initRobot('../test_SimpleComboBoxes.html');
+
+				doh.register("Test LTR combo box", [
+					{
+						name: "check drop down items text direction.",
+						timeout: 6000,
+
+						setUp: function(){
+							combo = dijit.byId("fruitLtr");
+							doh.t(!!combo, "found fruitLtr");
+							modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+						},
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Open drop down
+							doh.robot.sequence(d.getTestErrback(function(){
+								// delay is needed to work around IE bug
+								combo.focusNode.focus();
+							}), 50);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 100);
+
+							var handle = dojo.connect(combo, "openDropDown", function(){
+								handle.remove();
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.t(!!combo.dropDown, "dropdown exists");
+									dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+										// so it will check only the options
+										if(node.item){
+											doh.is("ltr", node.dir, node.textContent);
+										}
+									});
+								}), 50);
+							});
+
+							return d;
+						},
+
+						tearDown: function(){
+							combo.closeDropDown();
+						}
+					},
+					{
+						name: "paste English in 'fruitLtr'",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress("a", 300, modifier);
+							doh.robot.keyPress(dojo.keys.DELETE, 300, {});
+							doh.robot.typeKeys("Hi!!!", 1, 300);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("ltr", combo.focusNode.dir,"direction of : " + combo.id);
+							}), 300);
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'fruitLtr'",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.setClipboard("\u05e9\u05dc\u05d5\u05dd\u0021",'text/html');
+							doh.robot.keyPress("a", 300, modifier);
+							doh.robot.keyPress(dojo.keys.DELETE, 300, {});
+							doh.robot.keyPress("v", 300, modifier);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("ltr", combo.focusNode.dir,"direction of : " + combo.id);
+							}), 300);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Test RTL combo box", [
+					{
+						name: "check drop down items text direction.",
+						timeout: 3000,
+
+						setUp: function(){
+							combo = dijit.byId("fruitRtl");
+							doh.t(!!combo, "found fruitRtl");
+						},
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							// Open drop down
+							combo.focusNode.focus();
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 100);
+
+							var handle = dojo.connect(combo, "openDropDown", function(){
+								handle.remove();
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.t(!!combo.dropDown, "dropdown exists");
+									dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+										// so it will check only the options
+										if(node.item){
+											doh.is("rtl", node.dir, node.textContent);
+										}
+									});
+								}), 50);
+							});
+
+							return d;
+						},
+
+						tearDown: function(){
+							combo.closeDropDown();
+						}
+					},
+					{
+						name: "paste English in 'fruitRtl'",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress("a", 300, modifier);
+							doh.robot.keyPress(dojo.keys.DELETE, 300, {});
+							doh.robot.typeKeys("Hi!!!", 1, 300);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("rtl", combo.focusNode.dir,"direction of : " + combo.id);
+							}), 300);
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'fruitRtl'",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.setClipboard("\u05e9\u05dc\u05d5\u05dd\u0021",'text/html');
+							doh.robot.keyPress("a", 300, modifier);
+							doh.robot.keyPress(dojo.keys.DELETE, 300, {});
+							doh.robot.keyPress("v", 300, modifier);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("rtl", combo.focusNode.dir,"direction of : " + combo.id);
+							}), 300);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Test AUTO ComboBox", [
+					{
+						name: "check drop down items text direction.",
+						timeout: 60000,
+
+						setUp: function(){
+							combo = dijit.byId("fruitContextual");
+							doh.t(!!combo, "found fruitContextual");
+							modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+						},
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Create drop down
+							combo.focusNode.focus();
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 100);
+
+							var handle = dojo.connect(combo, "openDropDown", function(){
+								handle.remove();
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.t(!!combo.dropDown, "dropdown exists");
+									dojo.forEach(combo.dropDown.domNode.childNodes, function(node){
+										// so it will check only the options
+										if(node.item){
+											var contextualDir = this.getTextDir(node.innerText || node.textContent || "");
+											doh.is(contextualDir, node.dir, node.innerText || node.textContent || "");
+										}
+									}, combo);
+								}), 50);
+							});
+
+							return d;
+						},
+
+						tearDown: function(){
+							combo.closeDropDown();
+						}
+					},
+					{
+						name: "input field text direction for each item in the menu.",
+						timeout: 6000,
+
+						setUp: function(){
+							combo = dijit.byId("fruitContextual");
+							doh.t(!!combo, "found fruitContextual");
+							modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+						},
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							combo.focusNode.focus();
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 100);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("ltr", combo.focusNode.dir, combo.id);
+							}), 200);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 300);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("ltr", combo.focusNode.dir, combo.id);
+							}), 200);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("ltr", combo.focusNode.dir, combo.id);
+							}), 200);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("ltr", combo.focusNode.dir, combo.id);
+							}), 200);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("rtl", combo.focusNode.dir, combo.id);
+							}), 200);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("rtl", combo.focusNode.dir, combo.id);
+							}), 200);
+
+							return d;
+						},
+
+						tearDown: function(){
+							combo.closeDropDown();
+						}
+					},
+					{
+						name: "text direction cut/paste English",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.setClipboard("I am pasted!!!",'text/html');
+
+							doh.robot.keyPress("a", 500, modifier);
+							doh.robot.keyPress(dojo.keys.DELETE, 500, {});
+
+							doh.robot.keyPress("v", 500, modifier);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("ltr", combo.focusNode.dir,"direction of : " + combo.id);
+							}), 300);
+
+							return d;
+						}
+					},
+					{
+						name: "text direction cut/paste Hebrew before English",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.setClipboard("\u05d0\u05e0\u05d9\u003a\u0020",'text/html');
+
+							dojo.isMac ? doh.robot.keyPress("a", 100, {ctrl:true}): doh.robot.keyPress(dojo.keys.HOME, 100, {});
+
+							doh.robot.keyPress("v", 400, modifier);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("rtl", combo.focusNode.dir,"direction of : " + combo.id);
+							}), 700);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Test AUTO ComboBox", [
+					{
+						name: "test auto-completion popup and input field for 'auto'",
+						timeout: 30000,
+
+						setUp: function(){
+							autoCompleted = dijit.byId("fruitContextualAC");
+							doh.t(!!autoCompleted, "found fruitContextualAC");
+						},
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							autoCompleted.focusNode.focus();
+
+							// Filter drop down list to entries starting with ":"
+							doh.robot.sequence(function(){ autoCompleted.set("value", null); }, 400);
+							doh.robot.keyPress(":", 100);
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("ltr", autoCompleted.focusNode.dir, "input field of fruitContextualAC");
+								var entries = dojo.query("div", dojo.byId("fruitContextualAC_popup"));
+								doh.is("ltr", entries[1].dir, "list #1 - :");
+								doh.is("rtl", entries[2].dir, "list #2 - :");
+							}), 900);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("rtl", autoCompleted.focusNode.dir, "input field of fruitContextualAC");
+							}), 200);
+
+							doh.robot.sequence(function(){ autoCompleted.set("value", null); }, 400);
+							doh.robot.keyPress("@", 100);
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("ltr", autoCompleted.focusNode.dir, "input field of fruitContextualAC");
+								var entries = dojo.query("div", dojo.byId("fruitContextualAC_popup"));
+								doh.is("ltr", entries[1].dir, "list #1 - @");
+							}), 900);
+
+							doh.robot.sequence(function(){ autoCompleted.set("value", null); }, 400);
+							doh.robot.keyPress("*", 100);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("rtl", autoCompleted.focusNode.dir, "input field of fruitContextualAC");
+								var entries = dojo.query("div", dojo.byId("fruitContextualAC_popup"));
+								doh.is("rtl", entries[1].dir, "list #1 - *");
+							}), 900);
+
+							return d;
+						}
+					},
+					{
+						name: "test auto-completion popup and input field for autoComplete:false",
+						timeout: 12000,
+
+						setUp: function(){
+							notAutoCompleted = dijit.byId("fruitContextual");
+							doh.t(!!notAutoCompleted, "found fruitContextual");
+						},
+
+						runTest: function(){
+							var d = new doh.Deferred();
+							notAutoCompleted.focusNode.focus();
+
+							// Filter drop down list to entries starting with ":"
+							doh.robot.sequence(function(){ notAutoCompleted.set("value", null); }, 400);
+							doh.robot.keyPress(":", 300);
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is(notAutoCompleted.isLeftToRight() ? "ltr" : "rtl",
+										notAutoCompleted.focusNode.dir, "false autoComplete - :");
+								var entries = dojo.query("div", dojo.byId("fruitContextual_popup"));
+								doh.is("ltr", entries[1].dir, "list #1 - :");
+								doh.is("rtl", entries[2].dir, "list #2 - :");
+							}), 900);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("ltr", notAutoCompleted.focusNode.dir, "input field of fruitContextual - :");
+							}), 200);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("rtl", notAutoCompleted.focusNode.dir, "input field of fruitContextual - :");
+							}), 200);
+
+							// Filter drop down list to entries starting with "@"
+							doh.robot.sequence(function(){
+								notAutoCompleted.set("value", null);
+							}, 400);
+							doh.robot.keyPress("@", 100);
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is(notAutoCompleted.isLeftToRight() ? "ltr" : "rtl",
+										notAutoCompleted.focusNode.dir, "false autoComplete - @");
+								var entries = dojo.query("div", dojo.byId("fruitContextual_popup"));
+								doh.is("ltr", entries[1].dir, "list #1 - @");
+							}), 900);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("ltr", notAutoCompleted.focusNode.dir, "input field of fruitContextual - :");
+							}), 200);
+
+
+							// Filter drop down list to entries starting with "*"
+							doh.robot.sequence(function(){ notAutoCompleted.set("value", null); }, 400);
+							doh.robot.keyPress("*", 100);
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is(notAutoCompleted.isLeftToRight() ? "ltr" : "rtl",
+										notAutoCompleted.focusNode.dir, "false autoComplete - *");
+								var entries = dojo.query("div", dojo.byId("fruitContextual_popup"));
+								doh.is("rtl", entries[1].dir, "list #1 - *");
+							}), 900);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("rtl", notAutoCompleted.focusNode.dir, "input field of fruitContextual - :");
+							}), 200);
+
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/SimpleTextarea.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/SimpleTextarea.html
new file mode 100644
index 0000000000000000000000000000000000000000..974fd31f5007a20969380f172d7a3ab237e014ce
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/SimpleTextarea.html
@@ -0,0 +1,388 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>doh.robot SimpleTextarea textDir Tests</title>
+
+		<style>
+			@import "../../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../../dojo/dojo.js">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_SimpleTextarea.html');
+				var textarea;
+
+				var focusThenRun = function(widget, fcn){
+					if(!widget.focused){
+						var handler = widget.connect(widget, '_onFocus', function(){
+							widget.disconnect(handler);
+							setTimeout(fcn, 1);
+						});
+						widget.focus();
+					}else{
+						fcn();
+					}
+				};
+
+				doh.register("LTR textarea", [
+					{
+						name: "initial text direction of filled 'ltrSimpleTexarea'",
+
+						setUp: function(){
+							textarea = dijit.byId("ltrSimpleTexarea");
+							modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+						},
+
+						runTest: function(){
+							doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+						}
+					},
+					{
+						name: "write in English in 'ltrSimpleTexarea'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.typeKeys("Hi this is my new value, and it's on English!!!", 1, 300);
+
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 800);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'ltrSimpleTexarea'",
+						timeout: 4000,
+
+						setUp: function(){
+							textarea = dijit.byId("ltrSimpleTexarea");
+						},
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("\u05d5\u05e2\u05db\u05e9\u05d9\u05d5\u0020\u05e7\u05e6\u05ea\u0020\u05d8\u05e7\u05e1\u05d8\u0020\u05d1\u05e2\u05d9\u05d1\u05e8\u05d9\u05ea\u0021\u0021\u0021\u000a\u05d0\u05e4\u05d9\u05dc\u05d5\u0020\u05e0\u05db\u05ea\u05d5\u05d1\u0020\u05e9\u05d5\u05e8\u05d4\u0020\u05e9\u05e0\u05d9\u05d9\u05d4\u002e\u0020\u0020\u0020",'text/html');
+
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.keyPress("v", 300, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 400);
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("RTL textarea", [
+					{
+						name: "initial text direction of filled 'rtlSimpleTexarea'",
+
+						setUp: function(){
+							textarea = dijit.byId("rtlSimpleTexarea");
+						},
+
+						runTest: function(){
+							doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+						}
+					},
+					{
+						name: "write in English in 'rtlSimpleTexarea'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.typeKeys("Hi this is my new value, and it's on English!!!", 1, 300);
+
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 800);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'rtlSimpleTexarea'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("\u05d5\u05e2\u05db\u05e9\u05d9\u05d5\u0020\u05e7\u05e6\u05ea\u0020\u05d8\u05e7\u05e1\u05d8\u0020\u05d1\u05e2\u05d9\u05d1\u05e8\u05d9\u05ea\u0021\u0021\u0021\u000a\u05d0\u05e4\u05d9\u05dc\u05d5\u0020\u05e0\u05db\u05ea\u05d5\u05d1\u0020\u05e9\u05d5\u05e8\u05d4\u0020\u05e9\u05e0\u05d9\u05d9\u05d4\u002e\u0020\u0020\u0020",'text/html');
+
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.keyPress("v", 300, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 400);
+							});
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Contextual textarea", [
+					{
+						name: "initial text direction of filled 'contextualSimpleTexarea'",
+
+						setUp: function(){
+							textarea = dijit.byId("contextualSimpleTexarea");
+						},
+
+						runTest: function(){
+							doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+						}
+					},
+					{
+						name: "write in English in 'contextualSimpleTexarea'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.typeKeys("Hi this is my new value, and it's on English!!!", 1, 400);
+
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 500);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "text direction paste Hebrew before English",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred(),
+								modifier = dojo.isMac ? {meta: true} : {ctrl: true},
+								textarea = dijit.byId("contextualSimpleTexarea");
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("\u05d0\u05e0\u05d9\u0020\u05d0\u05d5\u05de\u05e8\u05ea\u003a\u0020");
+
+								dojo.isMac ? doh.robot.keyPress("a", 100, {ctrl:true}): doh.robot.keyPress(dojo.keys.HOME, 100, {});
+
+								doh.robot.keyPress("v", 400, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 800);
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("programmaticAuto textarea in the border container", [
+					{
+						name: "initial text direction of filled 'programmaticAuto'",
+
+						setUp: function(){
+							textarea = dijit.byId("programmaticAuto");
+							modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+						},
+
+						runTest: function(){
+							doh.is("auto",textarea.textDir,"direction of :" + textarea.id);
+						}
+					},
+					{
+						name: "write in English in 'programmaticAuto'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.typeKeys("Hi this is my new value, and it's on English!!!", 1, 300);
+
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 800);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'programmaticAuto'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("\u05d5\u05e2\u05db\u05e9\u05d9\u05d5\u0020\u05e7\u05e6\u05ea\u0020\u05d8\u05e7\u05e1\u05d8\u0020\u05d1\u05e2\u05d9\u05d1\u05e8\u05d9\u05ea\u0021\u0021\u0021\u000a\u05d0\u05e4\u05d9\u05dc\u05d5\u0020\u05e0\u05db\u05ea\u05d5\u05d1\u0020\u05e9\u05d5\u05e8\u05d4\u0020\u05e9\u05e0\u05d9\u05d9\u05d4\u002e\u0020\u0020\u0020",'text/html');
+
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.keyPress("v", 300, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 400);
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("programmaticRTL textarea in the border container", [
+					{
+						name: "initial text direction of filled 'programmaticRTL'",
+
+						setUp: function(){
+							textarea = dijit.byId("programmaticRTL");
+						},
+
+						runTest: function(){
+							doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+						}
+					},
+					{
+						name: "write in English in 'programmaticRTL'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.typeKeys("Hi this is my new value, and it's on English!!!", 1, 300);
+
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 800);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'programmaticRTL'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("\u05d5\u05e2\u05db\u05e9\u05d9\u05d5\u0020\u05e7\u05e6\u05ea\u0020\u05d8\u05e7\u05e1\u05d8\u0020\u05d1\u05e2\u05d9\u05d1\u05e8\u05d9\u05ea\u0021\u0021\u0021\u000a\u05d0\u05e4\u05d9\u05dc\u05d5\u0020\u05e0\u05db\u05ea\u05d5\u05d1\u0020\u05e9\u05d5\u05e8\u05d4\u0020\u05e9\u05e0\u05d9\u05d9\u05d4\u002e\u0020\u0020\u0020",'text/html');
+
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.keyPress("v", 300, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 400);
+							});
+							return d;
+						}
+					}
+				]);
+
+				doh.register("programmaticLTR textarea in the border container", [
+					{
+						name: "initial text direction of filled 'programmaticLTR'",
+
+						setUp: function(){
+							textarea = dijit.byId("programmaticLTR");
+						},
+
+						runTest: function(){
+							doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+						}
+					},
+					{
+						name: "write in English in 'programmaticLTR'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.typeKeys("Hi this is my new value, and it's on English!!!", 1, 400);
+
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 500);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "text direction paste Hebrew before English",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred(),
+								modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("\u05d5\u05e2\u05db\u05e9\u05d9\u05d5\u0020\u05e7\u05e6\u05ea\u0020\u05d8\u05e7\u05e1\u05d8\u0020\u05d1\u05e2\u05d9\u05d1\u05e8\u05d9\u05ea\u0021\u0021\u0021\u000a\u05d0\u05e4\u05d9\u05dc\u05d5\u0020\u05e0\u05db\u05ea\u05d5\u05d1\u0020\u05e9\u05d5\u05e8\u05d4\u0020\u05e9\u05e0\u05d9\u05d9\u05d4\u002e\u0020\u0020\u0020",'text/html');
+
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.keyPress("v", 400, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 800);
+
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/TextBoxes.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/TextBoxes.html
new file mode 100644
index 0000000000000000000000000000000000000000..f86c39dea8df9c18c5cc53169bf0c1665fb76f2a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/TextBoxes.html
@@ -0,0 +1,282 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>doh.robot TextBox textDir Tests</title>
+
+		<title>doh.robot Bidi Test</title>
+
+		<style>
+			@import "../../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../../dojo/dojo.js">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_TextBoxes.html');
+
+				// execute some test as soon as the widget gets focus
+				var focusThenRun = function(widget, fcn){
+					if(!widget.focused){
+						var handler = widget.connect(widget, '_onFocus', function(){
+							widget.disconnect(handler);
+							setTimeout(fcn, 1);
+						});
+						widget.focus();
+					}else{
+						fcn();
+					}
+				};
+				var pos, range, textBox, modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+
+				doh.register("LTR textBox", [
+					{
+						name: "initial text direction of empty 'ltrTextBox'",
+
+						setUp: function(){
+							textBox = dijit.byId("ltrTextBox");
+						},
+
+						runTest: function(){
+							doh.is("ltr",textBox.focusNode.dir,"direction of :" + textBox.id);
+						}
+					},
+					{
+						name: "write in English in 'ltrTextBox'",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textBox, function(){
+								doh.robot.typeKeys('Hello', 1, 300);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textBox.focusNode.dir, "direction of :" + textBox.id);
+								}), 400);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'ltrTextBox'",
+						timeout: 5000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textBox, function(){
+								doh.robot.setClipboard("\u05e9\u05dc\u05d5\u05dd\u0021",'text/html');
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress("v", 300, modifier);
+								// select text from the left side of the textbox
+								doh.robot.mouseMoveAt(textBox.focusNode, 500, 1, 5, textBox.focusNode.offsetHeight >> 1);
+								doh.robot.mousePress({left:true}, 500);
+								doh.robot.mouseMoveAt(textBox.focusNode, 500, 1000, 20, textBox.focusNode.offsetHeight >> 1);
+								doh.robot.mouseRelease({left:true}, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textBox.focusNode.dir,"direction of :" + textBox.id);
+									// verify text was selected from the left side of the textbox
+									if(textBox.focusNode.selectionEnd){
+										doh.t(textBox.focusNode.selectionEnd > textBox.focusNode.selectionStart, "selected text " + textBox.focusNode.selectionStart + '. ' + textBox.focusNode.selectionEnd);
+									}else{
+										range = dojo.global.window.document.selection.createRange();
+										pos = range.getBoundingClientRect();
+										doh.t(pos.right > pos.left, "selected text " + pos.left + '. ' + pos.right);
+									}
+								}), 400);
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("RTL textBox", [
+					{
+						name: "initial text direction of empty 'rtlTextBox'",
+
+						setUp: function(){
+							textBox = dijit.byId("rtlTextBox");
+							textBox.domNode.scrollIntoView();
+						},
+
+						runTest: function(){
+							doh.is("rtl",textBox.focusNode.dir,"direction of :" + textBox.id);
+						}
+					},
+					{
+						name: "write in English in 'rtlTextBox'",
+						timeout: 5000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textBox, function(){
+								doh.robot.typeKeys('Hello', 1, 300);
+								// select text from the right side of the textbox
+								doh.robot.mouseMoveAt(textBox.focusNode, 50, 100, textBox.focusNode.offsetWidth-5, textBox.focusNode.offsetHeight >> 1);
+								doh.robot.mousePress({left:true}, 500);
+								doh.robot.mouseMoveAt(textBox.focusNode, 50, 1000, textBox.focusNode.offsetWidth-20, textBox.focusNode.offsetHeight >> 1);
+								doh.robot.mouseRelease({left:true}, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textBox.focusNode.dir,"direction of :" + textBox.id);
+									// verify text was selected from the right side of the textbox
+									if(textBox.focusNode.selectionEnd){
+										doh.t(textBox.focusNode.selectionEnd > textBox.focusNode.selectionStart, "selected text " + textBox.focusNode.selectionStart + '. ' + textBox.focusNode.selectionEnd);
+									}else{
+										range = dojo.global.window.document.selection.createRange();
+										pos = range.getBoundingClientRect();
+										doh.t(pos.right > pos.left, "selected text " + pos.left + '. ' + pos.right);
+									}
+								}), 400);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'rtlTextBox'",
+						timeout: 4000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textBox, function(){
+								doh.robot.setClipboard("\u05e9\u05dc\u05d5\u05dd\u0021",'text/html');
+
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress("v", 300, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textBox.focusNode.dir,"direction of :" + textBox.id);
+								}), 400);
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Contextual textBox", [
+					{
+						name: "initial text direction of empty 'contextualTextBox'",
+
+						setUp: function(){
+							textBox = dijit.byId("contextualTextBox");
+							textBox.domNode.scrollIntoView();
+						},
+
+						runTest: function(){
+							doh.is("auto",textBox.textDir,"textDir of :" + textBox.id);
+						}
+					},
+					{
+						name: "write in English in 'contextualTextBox'",
+						timeout: 5000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textBox, function(){
+								doh.robot.setClipboard("Hello",'text/html');
+
+								doh.robot.keyPress("v", 600, modifier);
+								// select text from the left side of the textbox
+								doh.robot.mouseMoveAt(textBox.focusNode, 50, 100, 5, textBox.focusNode.offsetHeight >> 1);
+								doh.robot.mousePress({left:true}, 500);
+								doh.robot.mouseMoveAt(textBox.focusNode, 50, 1000, 20, textBox.focusNode.offsetHeight >> 1);
+								doh.robot.mouseRelease({left:true}, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textBox.focusNode.dir,"direction of :" + textBox.id);
+									// verify text was selected from the left side of the textbox
+									if(textBox.focusNode.selectionEnd){
+										doh.t(textBox.focusNode.selectionEnd > textBox.focusNode.selectionStart, "selected text " + textBox.focusNode.selectionStart + '. ' + textBox.focusNode.selectionEnd);
+									}else{
+										range = dojo.global.window.document.selection.createRange();
+										pos = range.getBoundingClientRect();
+										doh.t(pos.right > pos.left, "selected text " + pos.left + '. ' + pos.right);
+									}
+								}), 300);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "text direction paste Hebrew before English",
+						timeout: 5000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textBox, function(){
+								doh.robot.setClipboard("\u05d0\u05e0\u05d9\u0020\u05d0\u05d5\u05de\u05e8\u05ea\u003a\u0020",'text/html');
+
+								dojo.isMac ? doh.robot.keyPress("a", 100, {ctrl:true}): doh.robot.keyPress(dojo.keys.HOME, 100, {});
+
+								doh.robot.keyPress("v", 400, modifier);
+								// select text from the right side of the textbox
+								doh.robot.mouseMoveAt(textBox.focusNode, 50, 100, textBox.focusNode.offsetWidth-5, textBox.focusNode.offsetHeight >> 1);
+								doh.robot.mousePress({left:true}, 500);
+								doh.robot.mouseMoveAt(textBox.focusNode, 50, 1000, textBox.focusNode.offsetWidth-20, textBox.focusNode.offsetHeight >> 1);
+								doh.robot.mouseRelease({left:true}, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textBox.focusNode.dir,"direction of :" + textBox.id);
+									// verify text was selected from the right side of the textbox
+									if(textBox.focusNode.selectionEnd){
+										doh.t(textBox.focusNode.selectionEnd > textBox.focusNode.selectionStart, "selected text " + textBox.focusNode.selectionStart + '. ' + textBox.focusNode.selectionEnd);
+									}else{
+										range = dojo.global.window.document.selection.createRange();
+										pos = range.getBoundingClientRect();
+										doh.t(pos.right > pos.left, "selected text " + pos.left + '. ' + pos.right);
+									}
+								}), 400);
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("test the programmatic textBox in the tab container", [
+					{
+						name: "initial direction of the textBoxs",
+
+						setUp: function(){
+							textBox1 = dijit.byId("programmatic1");
+							textBox2 = dijit.byId("programmatic2");
+							textBox3 = dijit.byId("programmatic3");
+						},
+
+						runTest: function(){
+							doh.is("ltr",textBox1.focusNode.dir,"Initial direction of - 'programmatic'");
+							doh.is("rtl",textBox2.focusNode.dir,"Initial direction of - 'programmatic'");
+							doh.is("ltr",textBox3.focusNode.dir,"Initial direction of - 'programmatic'");
+						}
+					},
+					{
+						name: "direction of textBoxs after change value button in second tab is pressed",
+
+						runTest: function(){
+							var button = dojo.byId("changeValue");
+
+							button.click();
+
+							doh.is("ltr",textBox1.focusNode.dir,"Initial direction of - 'programmatic'");
+							doh.is("rtl",textBox2.focusNode.dir,"Initial direction of - 'programmatic'");
+							doh.is("rtl",textBox3.focusNode.dir,"Initial direction of - 'programmatic'");
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/Textarea.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/Textarea.html
new file mode 100644
index 0000000000000000000000000000000000000000..a11b81994ee84f46d36f18220d1e12e9c940e33d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/robot/Textarea.html
@@ -0,0 +1,265 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>doh.robot Textarea textDir Tests</title>
+
+		<style>
+			@import "../../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../../dojo/dojo.js">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_Textarea.html');
+				var textarea;
+
+				// execute some test as soon as the widget gets focus
+				var focusThenRun = function(widget, fcn){
+					if(!widget.focused){
+						var handler = widget.connect(widget, '_onFocus', function(){
+							widget.disconnect(handler);
+							setTimeout(fcn, 1);
+						});
+						widget.focus();
+					}else{
+						fcn();
+					}
+				};
+
+				doh.register("LTR textarea", [
+					{
+						name: "initial text direction of empty 'blankL'",
+
+						setUp: function(){
+							textarea = dijit.byId("blankL");
+							modifier = dojo.isMac ? {meta: true} : {ctrl: true};
+						},
+
+						runTest: function(){
+							doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+						}
+					},
+					{
+						name: "write in English in 'blankL'",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.typeKeys('Hello!', 1, 300);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 400);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'blankL'",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("\u05e9\u05dc\u05d5\u05dd\u0021",'text/html');
+
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.keyPress("v", 300, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 400);
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("RTL textarea", [
+					{
+						name: "initial text direction of empty 'blankR'",
+
+						setUp: function(){
+							textarea = dijit.byId("blankR");
+						},
+
+						runTest: function(){
+							doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+						}
+					},
+					{
+						name: "write in English in 'blankR'",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.typeKeys('Hello!', 1, 300);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 400);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "paste Hebrew in 'blankR'",
+						timeout: 3000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("\u05e9\u05dc\u05d5\u05dd\u0021",'text/html');
+
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.keyPress("v", 300, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 400);
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Contextual textarea", [
+					{
+						name: "initial text direction of empty 'blankA'",
+
+						setUp: function(){
+							textarea = dijit.byId("blankA");
+						},
+
+						runTest: function(){
+							doh.is(textarea.isLeftToRight() ? "ltr" : "rtl", textarea.focusNode.dir,
+									"direction of :" + textarea.id);
+						}
+					},
+					{
+						name: "text direction cut/paste English",
+						timeout: 6000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("Hello again I'm pasted!!!",'text/html');
+
+								doh.robot.keyPress("a", 400, modifier);
+								doh.robot.keyPress(dojo.keys.DELETE, 100, {});
+
+								doh.robot.keyPress("v", 400, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("ltr",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 900);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "text direction paste Hebrew before English",
+						timeout: 6000,
+
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							focusThenRun(textarea, function(){
+								doh.robot.setClipboard("\u05d0\u05e0\u05d9\u0020\u05d0\u05d5\u05de\u05e8\u05ea\u003a\u0020",'text/html');
+
+								dojo.isMac ? doh.robot.keyPress("a", 100, {ctrl:true}): doh.robot.keyPress(dojo.keys.HOME, 100, {});
+
+								doh.robot.keyPress("v", 400, modifier);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("rtl",textarea.focusNode.dir,"direction of :" + textarea.id);
+								}), 400);
+							});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Test the programmatic textareas in the tab container", [
+					{
+						name: "initial direction of the textareas",
+
+						setUp: function(){
+							textareaL = dijit.byId("programmaticLTR");
+							textareaR = dijit.byId("programmaticRTL");
+							textareaA = dijit.byId("programmaticAuto");
+						},
+						runTest: function(){
+							doh.is("ltr",textareaL.focusNode.dir,"Initial direction of - 'programmaticLTR'");
+							doh.is("rtl",textareaR.focusNode.dir,"Initial direction of - 'programmaticRTL'");
+							doh.is("ltr",textareaA.focusNode.dir,"Initial direction of - 'programmaticAUTO'");
+						}
+					},
+					{
+						name: "direction of textareas after Hebrew button in second tab is pressed",
+
+						runTest: function(){
+							var id = "buttonHebrew";
+							var buttonHebrew = dojo.byId("buttonHebrew");
+
+							buttonHebrew.click();
+
+							doh.is("ltr",textareaL.focusNode.dir,"Initial direction of - 'programmaticLTR'");
+							doh.is("rtl",textareaR.focusNode.dir,"Initial direction of - 'programmaticRTL'");
+							doh.is("rtl",textareaA.focusNode.dir,"Initial direction of - 'programmaticAUTO'");
+						}
+					},
+					{
+						name: "direction of textareas after English button in second tab is pressed",
+
+						runTest: function(){
+							var buttonEnglish = dojo.byId("buttonEnglish");
+
+							buttonEnglish.click();
+
+							doh.is("ltr",textareaL.focusNode.dir,"Initial direction of - 'programmaticLTR'");
+							doh.is("rtl",textareaR.focusNode.dir,"Initial direction of - 'programmaticRTL'");
+							doh.is("ltr",textareaA.focusNode.dir,"Initial direction of - 'programmaticAUTO'");
+						}
+					}
+				]);
+
+				doh.register("Test the large textareas", [
+					{
+						name: "initial direction of the textareas",
+
+						setUp: function(){
+							textareaL = dijit.byId("largeTextAreaLTR");
+							textareaR = dijit.byId("largeTextAreaRTL");
+						},
+
+						runTest: function(){
+							doh.is("ltr",textareaL.focusNode.dir,"Initial direction of - 'programmaticLTR'");
+							doh.is("rtl",textareaR.focusNode.dir,"Initial direction of - 'programmaticRTL'");
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/runTests.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..c09abc4b6089f785ef27d51f38ba27f51d413545
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/runTests.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>Dijit Unit Test Runner</title>
+		<meta http-equiv="REFRESH" content="0;url=../../../../util/doh/runner.html?testModule=dijit.tests._BidiSupport.form.module"></head>
+	<body>
+		Redirecting to D.O.H runner.
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/test_InlineEditBox.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_InlineEditBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..c46c0af78c800a2d167ea0670d480de95d0b25ab
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_InlineEditBox.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Inline Edit Box Test</title>
+
+		<style type="text/css">
+			@import "../../../../dijit/themes/claro/document.css";
+			@import "../../../../dijit/tests/css/dijitTests.css";
+		</style>
+
+		<!-- required: a default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true, has: { 'dojo-bidi': true }"></script>
+
+		<script type="text/javascript">
+			dojo.require("dojo.data.ItemFileReadStore");
+			dojo.require("dijit.InlineEditBox");
+			dojo.require("dijit.form.Textarea");
+			dojo.require("dijit.form.TextBox");
+			dojo.require("dijit.form.DateTextBox");
+			dojo.require("dijit.form.CurrencyTextBox");
+			dojo.require("dojo.currency");
+			dojo.require("dijit.form.ComboBox");
+			dojo.require("dijit.form.FilteringSelect");
+			dojo.require("dijit.form.NumberSpinner");
+
+			dojo.require("dijit.Editor");
+			dojo.require("dijit._editor.plugins.AlwaysShowToolbar");
+
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+
+			function myHandler(newValue){
+				this._onChangeValue = newValue;	// used by robot test file
+				console.debug("onChange for id = " + this.id + ", value: " + newValue);
+			}
+		</script>
+	</head>
+	<body class="claro">
+
+		<h1 class="testTitle">Dijit InlineEditBox Bidi Test</h1>
+
+
+		<span data-dojo-id="productStore" data-dojo-type="dojo/data/ItemFileReadStore" >
+			<script type="dojo/method">
+				this._jsonData = {
+					identifier: 'name',
+					label: 'name',
+					items: [
+						{ name: "refrigerator..." },
+						{ name: "\u05d0\u05e0\u05d9\u0020\u05d0\u05d5\u05de\u05e8\u05ea\u003a\u0020" },
+						{ name: "stove \u05d0\u05e0\u05d9\u0020\u05d0\u05d5\u05de\u05e8\u05ea\u003a\u0020 ..." },
+						{ name: "\u05d0\u05e0\u05d9\u0020\u05d0\u05d5\u05de\u05e8\u05ea\u003a\u0020 heater ..." }
+					]
+				};
+			</script>
+		</span>
+
+		<h2>InlineEditBox with TextBox</h2>
+			<h3>TextDit LTR: </h3>
+			<span id="P0" data-dojo-type="dijit/InlineEditBox" data-dojo-props='textDir:"ltr", value:"", onChange:myHandler, autoSave:true, title:"test"'>
+			</span>
+			<h3>TextDir RTL: </h3>
+			<span id="P1" data-dojo-type="dijit/InlineEditBox" data-dojo-props='textDir:"rtl", value:"&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!!", onChange:myHandler, autoSave:true, title:"test"'>
+				</span>
+			<h3>TextDir AUTO: </h3>
+				<span id="P2" data-dojo-type="dijit/InlineEditBox" data-dojo-props='textDir:"auto", value:"Hello!", onChange:myHandler, autoSave:true, title:"test"'>
+				</span>
+			<input id="button" type="button" onclick="dijit.byId('P2').set('value', '&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!')"  value = "change value"/>
+
+
+		<h2>InlineEditBox with Textarea</h2>
+		<h3>TextDir LTR</h3>
+			<span id="P3" data-dojo-type="dijit/InlineEditBox" data-dojo-props='autoSave:true, textDir:"ltr", editor:"dijit.form.Textarea", value: "Text Area test &#1506;&#1512;&#1498; !!!", title:"additional details"'></span>
+			<h3>TextDir RTL</h3>
+			<span id="P4" data-dojo-type="dijit/InlineEditBox" data-dojo-props='autoSave:true, textDir:"rtl", editor:"dijit.form.Textarea", value: "Text Area test &#1506;&#1512;&#1498; !!!", title:"additional details"'></span>
+			<h3>TextDir AUTO</h3>
+			<span id="P5" data-dojo-type="dijit/InlineEditBox" data-dojo-props='autoSave:true, textDir:"auto", editor:"dijit.form.Textarea", value: "Text Area test &#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!!!", title:"additional details"'></span>
+			<input id="Button1" type="button" onclick="dijit.byId('P5').set('value', '&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!')"  value = "change value"/>
+
+
+		<h2>InlineEditBox with Combobox</h2>
+		<h3>TextDir LTR</h3>
+		<span id="combo1" data-dojo-type="dijit/InlineEditBox" data-dojo-props='textDir:"ltr", editor:"dijit.form.ComboBox",
+					editorParams:{searchAttr: "name", store: productStore, autocomplete: false, hasDownArrow: false},
+					width:"200px", autoSave:false, title:"item name"'>refrigerators...</span>
+		<h3>TextDir RTL</h3>
+		<span id="combo2" data-dojo-type="dijit/InlineEditBox" data-dojo-props='textDir:"rtl", editor:"dijit.form.ComboBox",
+					editorParams:{searchAttr: "name", store: productStore, autocomplete: false, hasDownArrow: false},
+					width:"200px", autoSave:false, title:"item name"'>refrigerators...</span>
+		<h3>TextDir AUTO</h3>
+		<span id="combo3" data-dojo-type="dijit/InlineEditBox" data-dojo-props='textDir:"auto", editor:"dijit.form.ComboBox",
+					editorParams:{searchAttr: "name", store: productStore, autocomplete: false, hasDownArrow: false},
+					width:"200px", autoSave:false, title:"item name"'>refrigerators...</span>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/test_PlaceholderInput.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_PlaceholderInput.html
new file mode 100644
index 0000000000000000000000000000000000000000..31001d8eb7fdf69914a8b5b213102fb379d4b4d9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_PlaceholderInput.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Placeholder input</title>
+
+		<style type="text/css">
+			@import "../../../../dijit/themes/tundra/tundra.css";
+			@import "../../../../dojo/resources/dojo.css";
+		</style>
+
+	<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="async: false, has: { 'dojo-bidi': true }"></script>
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom",
+			"dojo/query",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/form/TextBox",
+			"dojo/domReady!"
+		], function(doh, dom, query, parser, registry){
+
+				doh.register("parse", function(){
+					return parser.parse();
+				});
+
+				doh.register("Input tests", [
+					{
+						name: "Bidi",
+						runTest: function(){
+							var spanPlaceHolder = query("span.dijitPlaceHolder")[0];
+							doh.is("rtl", spanPlaceHolder.dir, "placeholder span 'dir' attribute should be set to 'rtl'");
+						}
+					}
+				]);
+
+				doh.register("log", function(){
+					dom.byId('failures').innerHTML = doh._failureCount;
+					dom.byId('errors').innerHTML = doh._errorCount;
+				});
+
+				doh.run();
+		});
+	</script>
+	</head>
+	<body>
+		<br><br>
+		<label >TextBox with Placeholder, textDir="auto"</label>
+		<input id="inputPlaceholder" data-dojo-type="dijit/form/TextBox" placeHolder="&#1513;placeholder!" data-dojo-props='textDir:"auto"' name="placeHolder" value=""/>
+
+		<br>Errors:&nbsp;<span id="errors">?</span>
+		<br>Failures:&nbsp;<span id="failures">?</span>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/test_Select.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_Select.html
new file mode 100644
index 0000000000000000000000000000000000000000..7bb234d8a7ee6519309c203a4de41919ccc80657
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_Select.html
@@ -0,0 +1,299 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Bidi BTD in Select</title>
+
+		<!-- required: the default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+
+		<style>
+			@import url(../../../themes/claro/document.css);
+			@import url(../../css/dijitTests.css);
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, has: { 'dojo-bidi': true }"></script>
+
+		<!-- only needed for alternate theme testing: -->
+		<script type="text/javascript" src="../../_testCommon.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner",
+				"dojo/parser",
+				"dijit/registry",
+				"dijit/form/Select",
+				"dijit/form/Button",
+				"dijit/form/Form",
+				"dijit/Dialog",
+				"dojo/domReady!"
+			], function(doh, parser, registry, Select){
+	
+				var numOptions = 0;
+				var numChanges = 0;
+				var addNum = 10;
+	
+				function testSelectWidget(element, formDir,elementTextDir,isfirstChildLatin){
+					doh.is(registry.byId(element).get("textDir"), elementTextDir);
+					doh.is(registry.byId(element).dir, formDir);
+					var t_dir = elementTextDir;
+					if(t_dir == "auto")
+						t_dir = isfirstChildLatin? "ltr" : "rtl";
+					doh.is(registry.byId(element).containerNode.dir, t_dir);
+				}
+	
+				function testDropdownList(elementName){
+					var element = registry.byId(elementName);
+					var elementTextDir = element.get("textDir");
+					var itemTextDir = elementTextDir;
+					element.loadDropDown(function(){});
+					var list = element.dropDown.getChildren();
+					dojo.forEach(list, function(entry){
+						if(elementTextDir == "auto"){
+							itemTextDir = element._checkContextual(entry.label.replace(/<[^>]*>/gm," "));
+						}
+						doh.is(itemTextDir,entry.textDirNode.dir);
+					});
+				}
+
+				var programmatic1 = new Select({
+					options: [
+						{ label: 'foo!', value: 'foo!'},
+						{ label: 'bar', value: 'bar' },
+						{ label: 'x !', value: 'x !', selected: true  },
+						{ label: '\u05D0\u05D1\u05D2!', value: '\u05D0\u05D1\u05D2!' }
+					]
+				});
+				programmatic1.placeAt('testProgramatic1');
+				programmatic1.set("textDir",'ltr');
+
+				var programmatic2 = new Select({
+					options: [
+						{ label: 'foo!', value: 'foo!'},
+						{ label: 'bar', value: 'bar' },
+						{ label: 'x !', value: 'x !', selected: true  },
+						{ label: '\u05D0\u05D1\u05D2!', value: '\u05D0\u05D1\u05D2!' }
+					]
+				});
+				programmatic2.placeAt('testProgramatic2');
+				programmatic2.set("textDir",'rtl');
+
+				var programmatic3 = new Select({
+					options: [
+						{ label: 'foo!', value: 'foo!'},
+						{ label: 'bar', value: 'bar' },
+						{ label: 'x !', value: 'x !', selected: true  },
+						{ label: '\u05D0\u05D1\u05D2!', value: '\u05D0\u05D1\u05D2!' }
+					]
+				});
+				programmatic3.placeAt('testProgramatic3');
+				programmatic3.set("textDir",'auto');
+
+				doh.register("parse", function(){
+					return parser.parse();
+				});
+
+				doh.register("dijit.tests._BidiSupport.form.Select in LTR form", [
+					{name:"LTR form, Auto/Hebrew", runTest:function(){testSelectWidget("s10","ltr","auto",false);}},
+					{name:"LTR form, Auto/English",runTest:function(){testSelectWidget("s11","ltr","auto",true);}},
+					{name:"LTR form, LTR",runTest:function(){testSelectWidget("s12","ltr","ltr",true);}},
+					{name:"LTR form, RTL",runTest:function(){testSelectWidget("s13","ltr","rtl",true);}}
+				]);
+
+				doh.register("Bidi dropdown list in Select, LTR form", [
+					{name:"LTR form, Auto/Hebrew", runTest:function(){testDropdownList("s10");}},
+					{name:"LTR form, Auto/English",runTest:function(){testDropdownList("s11");}},
+					{name:"LTR form, LTR",runTest:function(){testDropdownList("s12");}},
+					{name:"LTR form, RTL",runTest:function(){testDropdownList("s13");}}
+				]);
+
+				doh.register("dijit.tests._BidiSupport.form.Select in RTL form", [
+					{name:"RTL form, Auto/Hebrew", runTest:function(){testSelectWidget("s10R","rtl","auto",false);}},
+					{name:"RTL form, Auto/English",runTest:function(){testSelectWidget("s11R","rtl","auto",true);}},
+					{name:"RTL form, LTR",runTest:function(){testSelectWidget("s12R","rtl","ltr",true);}},
+					{name:"RTL form, RTL",runTest:function(){testSelectWidget("s13R","rtl","rtl",true);}}
+				]);
+
+				doh.register("Bidi dropdown list in Select, RTL form", [
+					{name:"LTR form, Auto/Hebrew", runTest:function(){testDropdownList("s10R");}},
+					{name:"LTR form, Auto/English",runTest:function(){testDropdownList("s11R");}},
+					{name:"LTR form, LTR",runTest:function(){testDropdownList("s12R");}},
+					{name:"LTR form, RTL",runTest:function(){testDropdownList("s13R");}}
+				]);
+
+				doh.register("dijit.tests._BidiSupport.form.Select, rich text (auto)", [
+					{name:"Rich text Auto/English Select",runTest:function(){testSelectWidget("s4","ltr","auto",true);}},
+					{name:"Rich text Auto/Hebrew Select", runTest:function(){testSelectWidget("s5","ltr","auto",false);}},
+					{name:"Rich text Auto/English Dropdown",runTest:function(){testDropdownList("s4");}},
+					{name:"Rich text Auto/Hebrew Dropdown", runTest:function(){testDropdownList("s5");}}
+
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+	<body class="claro">
+		<h1 id="_title" class="testTitle">Test: dijit/form/Select <i>BIDI</i></h1>
+
+		<form id="form" data-dojo-id="formL" data-dojo-type="dijit/form/Form" method="get"
+				onSubmit="return this.validate();">
+		<div dir="ltr">
+			<h2>dijit/form/Select LTR form</h2>
+			<h4 class="testSubtitle">Setting Defaults</h4>
+
+			<label for="s10">Test AUTO: </label>
+			<select id="s10" data-dojo-id="s10" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s10" , textDir:"auto", style:{width:"150px"}'>
+				<option value="TN">START &#1495;&#1491;&#1513;!</option>
+				<option value="TM" selected="selected">&#1495;&#1491;&#1513; END !</option>
+				<option value="VA">Hello AUTO!!</option>
+				<option value="WA">&#1495;&#1491;&#1513;.</option>
+				<option value="FL">NEW!</option>
+			</select>
+			<select id="s11" data-dojo-id="s11" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s11" , textDir:"auto", style:{width:"150px"}'>
+				<option value="TN">START &#1495;&#1491;&#1513;!</option>
+				<option value="TM">&#1495;&#1491;&#1513; END !</option>
+				<option value="VA" selected="selected">Hello AUTO!!</option>
+				<option value="WA">&#1495;&#1491;&#1513;.</option>
+				<option value="FL">NEW!</option>
+			</select>
+			<br>
+			<label for="s12">Test LTR: </label>
+			<select id="s12" data-dojo-id="s12" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s12" , textDir:"ltr", style:{width:"150px"}'>
+				<option value="TN">START &#1495;&#1491;&#1513;!</option>
+				<option value="TM">&#1495;&#1491;&#1513; END !</option>
+				<option value="VA" selected="selected">Hello LTR!!</option>
+				<option value="WA">&#1495;&#1491;&#1513;.</option>
+				<option value="FL">NEW!</option>
+			</select>
+
+			<label for="s13">Test RTL: </label>
+			<select id="s13" data-dojo-id="s13" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s13" , textDir:"rtl", style:{width:"150px"}'>
+				<option value="TN">START &#1495;&#1491;&#1513;!</option>
+				<option value="TM">&#1495;&#1491;&#1513; END !</option>
+				<option value="VA" selected="selected">Hello RTL!!</option>
+				<option value="WA">&#1495;&#1491;&#1513;.</option>
+				<option value="FL">NEW!</option>
+			</select>
+
+			<hr>
+			<h4 class="testSubtitle"> </h4>
+			<label>Rich Text (AUTO):
+			<span id="s4" data-dojo-id="s4" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s4", value:"AK" , textDir:"auto", style:{width:"150px"}'>
+				<span data-dojo-value="AL"><b>Alabama.</b></span>
+				<span data-dojo-value="AK"><span style="color:red;">A</span><span style="color:orange;">l</span><span style="color:yellow;">a</span><span style="color:green;">s</span><span style="color:blue;">k</span><span style="color:purple;">a.</span></span>
+				<span data-dojo-value="AZ"><i>Arizona.</i></span>
+				<span data-dojo-value="IL"><b><i>&#1495;&#1491;&#1513;.</i></b></span>
+				<span data-dojo-value="AR"><span class="ark">Arkansas.</span></span>
+				<span data-dojo-value="CA"><span style="font-size:25%">C</span><span style="font-size:50%">a</span><span style="font-size:75%">l</span><span style="font-size:90%">i</span><span style="font-size:100%">f</span><span style="font-size:125%">o</span><span style="font-size:133%">r</span><span style="font-size:150%">n</span><span style="font-size:175%">i</span><span style="font-size:200%">a.</span></span>
+				<button value="NM" disabled="disabled">New<br>&nbsp;&nbsp;Mexico</button>
+			</span></label>
+			&nbsp;&nbsp;
+			<label>
+			<span id="s5" data-dojo-id="s5" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s5", value:"IL" , textDir:"auto", style:{width:"150px"}'>
+				<span data-dojo-value="AL"><b>Alabama.</b></span>
+				<span data-dojo-value="AK"><span style="color:red;">A</span><span style="color:orange;">l</span><span style="color:yellow;">a</span><span style="color:green;">s</span><span style="color:blue;">k</span><span style="color:purple;">a.</span></span>
+				<span data-dojo-value="AZ"><i>Arizona.</i></span>
+				<span data-dojo-value="IL"><b><i>&#1495;&#1491;&#1513;.</i></b></span>
+				<span data-dojo-value="AR"><span class="ark">Arkansas.</span></span>
+				<span data-dojo-value="CA"><span style="font-size:25%">C</span><span style="font-size:50%">a</span><span style="font-size:75%">l</span><span style="font-size:90%">i</span><span style="font-size:100%">f</span><span style="font-size:125%">o</span><span style="font-size:133%">r</span><span style="font-size:150%">n</span><span style="font-size:175%">i</span><span style="font-size:200%">a.</span></span>
+				<button value="NM" disabled="disabled">New<br>&nbsp;&nbsp;Mexico</button>
+			</span></label>
+
+
+		</div>
+		</form>
+
+<!------------------------>
+		<form id="formR" data-dojo-id="form" data-dojo-type="dijit/form/Form" method="get" >
+		<div dir="rtl">
+			<h2>dijit/form/Select RTL form</h2>
+			<h4 class="testSubtitle">Setting Defaults</h4>
+
+			<label for="s10R">Test AUTO: </label>
+			<select id="s10R" data-dojo-id="s10R" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s10R" , textDir:"auto"'>
+				<option value="TN">START &#1495;&#1491;&#1513;!</option>
+				<option value="TM" selected="selected">&#1495;&#1491;&#1513; END !</option>
+				<option value="VA">Hello AUTO!!</option>
+				<option value="WA">&#1495;&#1491;&#1513;.</option>
+				<option value="FL">NEW!</option>
+			</select>
+			<select id="s11R" data-dojo-id="s11" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s11R" , textDir:"auto"'>
+				<option value="TN">START &#1495;&#1491;&#1513;!</option>
+				<option value="TM">&#1495;&#1491;&#1513; END !</option>
+				<option value="VA" selected="selected">Hello AUTO!!</option>
+				<option value="WA">&#1495;&#1491;&#1513;.</option>
+				<option value="FL">NEW!</option>
+			</select>
+			<br>
+			<label for="s12R">Test LTR: </label>
+			<select id="s12R" data-dojo-id="s12R" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s12R" , textDir:"ltr"'>
+				<option value="TN">START &#1495;&#1491;&#1513;!</option>
+				<option value="TM">&#1495;&#1491;&#1513; END !</option>
+				<option value="VA" selected="selected">Hello LTR!!</option>
+				<option value="WA">&#1495;&#1491;&#1513;.</option>
+				<option value="FL">NEW!</option>
+			</select>
+			<br>
+			<label for="s13R">Test RTL: </label>
+			<select id="s13R" data-dojo-id="s13R" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s13R" , textDir:"rtl"'>
+				<option value="TN">START &#1495;&#1491;&#1513;!</option>
+				<option value="TM">&#1495;&#1491;&#1513; END !</option>
+				<option value="VA" selected="selected">Hello RTL!!</option>
+				<option value="WA">&#1495;&#1491;&#1513;.</option>
+				<option value="FL">NEW!</option>
+			</select>
+
+			<hr>
+			<h4 class="testSubtitle"> </h4>
+			<label>Rich Text (AUTO):
+			<span id="s4R" data-dojo-id="s4R" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s4R", value:"AK" , textDir:"auto"'>
+				<span data-dojo-value="AL"><b>Alabama.</b></span>
+				<span data-dojo-value="AK"><span style="color:red;">A</span><span style="color:orange;">l</span><span style="color:yellow;">a</span><span style="color:green;">s</span><span style="color:blue;">k</span><span style="color:purple;">a.</span></span>
+				<span data-dojo-value="AZ"><i>Arizona.</i></span>
+				<span data-dojo-value="IL"><b><i>&#1495;&#1491;&#1513;.</i></b></span>
+				<span data-dojo-value="AR"><span class="ark">Arkansas.</span></span>
+				<span data-dojo-value="CA"><span style="font-size:25%">C</span><span style="font-size:50%">a</span><span style="font-size:75%">l</span><span style="font-size:90%">i</span><span style="font-size:100%">f</span><span style="font-size:125%">o</span><span style="font-size:133%">r</span><span style="font-size:150%">n</span><span style="font-size:175%">i</span><span style="font-size:200%">a.</span></span>
+				<button value="NM" disabled="disabled">New<br>&nbsp;&nbsp;Mexico</button>
+			</span></label>
+			&nbsp;&nbsp;
+			<label>
+			<span id="s5R" data-dojo-id="s5" data-dojo-type="dijit/form/Select" data-dojo-props='name:"s5R", value:"IL" , textDir:"auto"'>
+				<span data-dojo-value="AL"><b>Alabama.</b></span>
+				<span data-dojo-value="AK"><span style="color:red;">A</span><span style="color:orange;">l</span><span style="color:yellow;">a</span><span style="color:green;">s</span><span style="color:blue;">k</span><span style="color:purple;">a.</span></span>
+				<span data-dojo-value="AZ"><i>Arizona.</i></span>
+				<span data-dojo-value="IL"><b><i>&#1495;&#1491;&#1513;.</i></b></span>
+				<span data-dojo-value="AR"><span class="ark">Arkansas.</span></span>
+				<span data-dojo-value="CA"><span style="font-size:25%">C</span><span style="font-size:50%">a</span><span style="font-size:75%">l</span><span style="font-size:90%">i</span><span style="font-size:100%">f</span><span style="font-size:125%">o</span><span style="font-size:133%">r</span><span style="font-size:150%">n</span><span style="font-size:175%">i</span><span style="font-size:200%">a.</span></span>
+				<button value="NM" disabled="disabled">New<br>&nbsp;&nbsp;Mexico</button>
+			</span></label>
+
+		</div>
+		</form>
+
+
+<!------------------------>
+		<hr>
+		<h4 class="testSubtitle">Widgets created programmatically:</h4><br>
+		<span id="testProgramatic1">LTR:&nbsp;</span>
+		<span id="testProgramatic2">&nbsp;&nbsp;RTL:&nbsp;</span>
+		<span id="testProgramatic3">&nbsp;&nbsp;AUTO:&nbsp;</span>
+
+		<!-- testing that tooltip disappears when dialog is closed -->
+		<div data-dojo-type="dijit/Dialog" id="dlg1">
+			<div data-dojo-type="dijit/form/Select" id="dlg1Select"required="true"></div>
+			<div data-dojo-type="dijit/form/Button" id="dlg1ValidateBtn">
+				<script type=dojo/method data-dojo-event="onClick">
+					var dlg1 = dijit.byId("dlg1");
+					if(dlg1.validate()){
+						dlg1.hide();
+					}
+				</script>
+				validate and close
+			</div>
+		</div>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/test_SimpleComboBoxes.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_SimpleComboBoxes.html
new file mode 100644
index 0000000000000000000000000000000000000000..73d67723fd292195be599de82c462ada844ff2ba
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_SimpleComboBoxes.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+
+<html>
+	<head >
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>ComboBox with _BidiSupport</title>
+
+	<style>
+		@import "../../../themes/claro/document.css";
+		@import "../../../../util/doh/robot/robot.css";
+		@import "../../css/dijitTests.css";
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+
+		<script type="text/JavaScript">
+			dojo.require("dijit.form.ComboBox");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+		</script>
+	</head>
+	<body class="claro">
+		<label for="fruitLtr"> <b>I'm a LTR ComboBox </b> </label>
+		<br>
+		<select id="fruitLtr"
+			data-dojo-type="dijit/form/ComboBox"
+			data-dojo-props='name:"fruitLtr",
+			textDir:"ltr"'>
+				<option >Apples!</option>
+				<option >Oranges!</option>
+				<option selected>Pears!</option>
+				<option >&#1513;&#1500;&#1493;&#1501; &#1500;&#1499;&#1501;!</option>
+				<option >&#1514;&#1508;&#1493;&#1495; &#1488;&#1491;&#1502;&#1492;!</option>
+		</select>
+		<br>
+		<label for="fruitRtl"> <b>I'm a RTL ComboBox </b> </label>
+		<br>
+		<select id="fruitRtl"
+			data-dojo-type="dijit/form/ComboBox"
+			data-dojo-props='name:"fruitRtl",
+			textDir:"rtl"'>
+				<option >Apples!</option>
+				<option >Oranges!</option>
+				<option selected>Pears!</option>
+				<option >&#1513;&#1500;&#1493;&#1501; &#1500;&#1499;&#1501;!</option>
+				<option >&#1514;&#1508;&#1493;&#1495; &#1488;&#1491;&#1502;&#1492;!</option>
+		</select>
+		<br>
+		<label for="fruitContextual"> <b>I'm a Contextual ComboBox </b> </label>
+		<br>
+		<select id="fruitContextual"
+			data-dojo-type="dijit/form/ComboBox"
+			data-dojo-props='name:"fruitContextual",
+			autoComplete:false,
+			textDir:"auto"'>
+				<option >@Apples!</option>
+				<option >:Oranges!</option>
+				<option selected>Pears!</option>
+				<option >*&#1514;&#1508;&#1493;&#1495; &#1488;&#1491;&#1502;&#1492;!</option>
+				<option >:&#1513;&#1500;&#1493;&#1501; &#1500;&#1499;&#1501;!</option>
+		</select>
+		<br>
+		<label for="fruitContextualAC"> <b>I'm a Contextual ComboBox </b> </label>
+		<br>
+		<select id="fruitContextualAC"
+			data-dojo-type="dijit/form/ComboBox"
+			data-dojo-props='name:"fruitContextualAc",
+			textDir:"auto"'>
+				<option >@Apples!</option>
+				<option >:Oranges!</option>
+				<option selected>Pears!</option>
+				<option >:&#1513;&#1500;&#1493;&#1501; &#1500;&#1499;&#1501;!</option>
+				<option >*&#1514;&#1508;&#1493;&#1495; &#1488;&#1491;&#1502;&#1492;!</option>
+		</select>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/test_SimpleTextarea.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_SimpleTextarea.html
new file mode 100644
index 0000000000000000000000000000000000000000..5d6a944be763425dfd69fb40a2d2a605f1548f1d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_SimpleTextarea.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>SimpleTextarea with _BidiSupport</title>
+
+		<style type="text/css">
+			@import "../../../../dojo/resources/dojo.css";
+			@import "../../../../dijit/themes/claro/claro.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.form.SimpleTextarea");
+		</script>
+	</head>
+
+	<body class="claro" style="padding:20px">
+
+		<h1 class="testTitle">SimpleTextarea with _BidiSupport</h1>
+		<p>The value of the textDir setted in all examples, in the text box widget itself.</p>
+		<label for="ltrSimpleTexarea" >
+			<b>I'm a LTR SimpleTextarea </b>
+		</label>
+		<br>
+		<textarea id="ltrSimpleTexarea" data-dojo-type="dijit/form/SimpleTextarea"
+			data-dojo-props='name:"ltrSimpleTexarea",rows:"4", cols:"50",
+			textDir:"ltr"'>Lorem ipsum dolor sit amet, consectetuer adipiscing elit!
+		</textarea>
+		<br>
+		<br>
+		<label for="rtlSimpleTexarea" >
+			<b>I'm a RTL SimpleTextarea </b>
+		</label>
+		<br>
+		<textarea id="rtlSimpleTexarea" data-dojo-type="dijit/form/SimpleTextarea"
+			data-dojo-props='name:"rtlSimpleTexarea",rows:"4", cols:"50",
+			textDir:"rtl"'>Lorem ipsum dolor sit amet, consectetuer adipiscing elit!
+		</textarea>
+		<br>
+		<br>
+		<label for="contextualSimpleTexarea" >
+			<b>I'm a contextual SimpleTexarea </b>
+		</label>
+		<br>
+		<textarea id="contextualSimpleTexarea" data-dojo-type="dijit/form/SimpleTextarea"
+			data-dojo-props='name:"contextualSimpleTexarea",rows:"4", cols:"50",
+			textDir:"auto"
+			'> &#1492;&#1496;&#1511;&#1505;&#1496; &#1502;&#1493;&#1510;&#1490; &#1499;&#1502;&#1493; &#1513;&#1510;&#1512;&#1497;&#1498;
+&#1493;&#1488;&#1504;&#1497; &#1511;&#1493;&#1504;&#1496;&#1511;&#1505;&#1496;&#1493;&#1488;&#1500;&#1497;!</textarea>
+		<br>
+		<h2>Initially empty and programmatically created - Simple Textareas</h2>
+
+		<label>textDir="ltr":</label>
+		<textarea id="programmaticLTR"></textarea>
+
+		<br>
+		<label>textDir="rtl":</label>
+		<textarea id="programmaticRTL"></textarea>
+
+		<br>
+		<label>textDir="auto":</label>
+		<textarea id="programmaticAuto"></textarea>
+
+		<script type="text/javascript">
+			// See if we can make a widget in script
+			dojo.ready(function(){
+				programmaticTextareaLTR = new dijit.form.SimpleTextarea({
+					id: "programmaticLTR",
+					name: "programmaticTextAreaLTR",
+					cols: "60",
+					textDir:"ltr",
+					value: "",
+					style: "border:5px solid gray;padding:11px;margin:7px;"
+				}, "programmaticLTR");
+
+				programmaticTextareaRTL = new dijit.form.SimpleTextarea({
+					id: "programmaticRTL",
+					name: "programmaticTextAreaRTL",
+					cols: "60",
+					textDir:"rtl",
+					value: "",
+					style: "border:5px solid gray;padding:11px;margin:7px;"
+				}, "programmaticRTL");
+
+				programmaticTextareaAuto = new dijit.form.SimpleTextarea({
+					id: "programmaticAuto",
+					name: "programmaticTextAreaAuto",
+					cols: "60",
+					textDir:"auto",
+					value: "",
+					style: "border:5px solid gray;padding:11px;margin:7px;"
+				}, "programmaticAuto");
+
+			});
+		</script>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/test_Slider.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_Slider.html
new file mode 100644
index 0000000000000000000000000000000000000000..ddc5c7a1090bffa1e9979cec6859af1a43ca8a45
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_Slider.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Dojo Slider Widget Demo</title>
+
+		<style type="text/css">
+			@import "../../../themes/claro/document.css";
+			@import "../../css/dijitTests.css";
+		</style>
+
+		<!-- required: the default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="async: true, isDebug: true, parseOnLoad: true, has: { 'dojo-bidi': true }"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner",
+				"dojo/dom",
+				"dojo/number",
+				"dojo/parser",
+				"dojo/query",
+				"dijit/registry",
+				"dijit/form/VerticalSlider",
+				"dijit/form/VerticalRule",
+				"dijit/form/VerticalRuleLabels",
+				"dojo/domReady!"
+			], function(doh, dom, number, parser, query, registry, VerticalSlider, VerticalRule, VerticalRuleLabels){
+
+
+				doh.register("setup", [
+					function parse(){
+						return parser.parse();
+					},
+					function programmatic(){
+						// programmatic vertical slider and labels
+						var node;
+						// setup the rules
+						var sliderRules = new VerticalRule({
+							count:11,
+							style:{width:"5px"}
+						});
+
+						// setup RuleLabels
+						var sliderRuleLabels = new VerticalRuleLabels({
+							labels: ["תגlowest!","low!", "mid!", "high!","תגhighest!"],
+							textDir: "ltr",
+							id: "rulerLabels2"
+						});
+
+						// and setup the slider
+						var sliderProps = {
+							value:1400,
+							name:"programmaticSlider",
+							slideDuration:0,
+							onChange:function(val){ dom.byId('sliderProgInput').value=val; },
+							style:{height:"165px"},
+							minimum:1000,
+							maximum:3000,
+							discreteValues:11,
+							intermediateChanges:"true",
+							showButtons:"true"
+						};
+
+						sliderProps.id = sliderProps.name = "programmaticSliderNoSrc";
+
+						var theSlider = new VerticalSlider(sliderProps, node);
+						node = theSlider.containerNode;
+						theSlider.placeAt("form1");
+						sliderRules.placeAt(node);
+						sliderRuleLabels.placeAt(node);
+
+						// and start them all
+						theSlider.startup();
+						sliderRules.startup();
+						sliderRuleLabels.startup();
+
+						//attach handler to Horizontal ruler
+						var slider1 = registry.byId("slider1");
+						slider1.watch("value", function(name, oldVal, newVal){
+							dom.byId("slider1input").value = number.format(newVal/100,{places:1,pattern:"#%"});
+						});
+					}
+				]);
+
+				doh.register("tests._BidiSupport.form.RulerLabelBidi", [
+					{
+						name: "Slider Bidi",
+						runTest: function(){
+							query(" > div",dom.byId('rulerLabels1')).forEach(function(node, index, arr){
+								doh.is("rtl", node.style.direction, "hoprizontal: label node had 'direction' style corresponding to 'textDir'");
+							});
+							registry.byId("rulerLabels2").set('textDir',"auto");
+							var verticalLabel = query("div.dijitRuleLabelContainerV")[0];
+							doh.is("rtl", verticalLabel.style.direction, "vertical: label node had 'direction' style corresponding to 'textDir'");
+						}
+					}
+				]);
+
+				doh.register("log", function(){
+					dom.byId('failures').innerHTML = doh._failureCount;
+					dom.byId('errors').innerHTML = doh._errorCount;
+				});
+
+				doh.run();
+			});
+		</script>
+	</head>
+
+	<body class="claro">
+		<h1 class="testTitle">Slider</h1>
+		Also try using the arrow keys, buttons, or clicking on the progress bar to move the slider.
+		<br>
+		<!--    to test form submission, you'll need to create an action handler similar to
+			http://www.utexas.edu/teamweb/cgi-bin/generic.cgi -->
+		<form id="form1" action="" name="example" method="post">
+		<br>initial value=10, min=0, max=100, pageIncrement=100, onChange event triggers input box value change immediately<br>
+		<strong>Horizontal Slider Example, "rtl" base text direction</strong>
+		<br>
+		<div id="slider1" data-dojo-type="dijit/form/HorizontalSlider" data-dojo-props='name:"horizontal1",
+			value:10,
+			maximum:100,
+			minimum:0,
+			pageIncrement:100,
+			showButtons:true,
+			intermediateChanges:true,
+			slideDuration:500,
+			style:{width:"50%", height:"20px"}
+			' >
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"topDecoration", count:6, style:{height:"5px"}'></div>
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"bottomDecoration", count:5, style:{height:"5px"}'></div>
+				<ol id="rulerLabels1" data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='textDir:"rtl", container:"bottomDecoration", style:{height:"1em",fontSize:"75%"}'>
+					<li>תגlowest!</li>
+					<li>תגnormal!</li>
+					<li>תגhighest!</li>
+				</ol>
+		</div>
+		Slider1 Value:<input readonly id="slider1input" size="4" value="10.0%"/>
+		<br>
+		<br>initial value=10, min=0, max=100, onChange event triggers input box value change when you mouse up or tab away<br>
+		<h1>Fancy HTML labels (no slide animation), "rtl" base text direction:</h1>
+		<div id="slider3" data-dojo-type="dijit/form/HorizontalSlider" data-dojo-props='name:"horizontal2",
+			title:"Fancy HTML Labels",
+			minimum:1,
+			value:2,
+			maximum:3,
+			discreteValues:3,
+			showButtons:false,
+			intermediateChanges:true,
+			slideDuration:0,
+			style:"width:300px; height: 30px;"
+			'>
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"bottomDecoration", count:3, style:{height:"5px"}'></div>
+				<ol data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='textDir:"rtl", container:"bottomDecoration", style:{height:"1em", fontSize:"75%"}'>
+					<li><img width=10 height=10 src="../../images/note.gif"/><br><span style="font-size: small">תגsmall!</span></li>
+					<li><img width=15 height=15 src="../../images/note.gif"/><br><span style="font-size: small">תגmedium!</span></li>
+					<li><img width=20 height=20 src="../../images/note.gif"/><br><span style="font-size: small">תגlarge!</span></li>
+				</ol>
+		</div>
+		<br><br>
+		<h2>Completely programmatic VerticalSlider and VerticalRule, "auto" base text direction</h2>
+		<h3>min:1000, max:3000, 11 discrete values, no animation</h3>
+
+		<div id="programmaticSlider"></div>
+		Programmatic Value:<input readonly id="sliderProgInput" size="5" value="1400"/>
+		</form>
+		<br>Errors:&nbsp;<span id="errors">?</span>
+		<br>Failures:&nbsp;<span id="failures">?</span>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/test_TextBoxes.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_TextBoxes.html
new file mode 100644
index 0000000000000000000000000000000000000000..330cb456cd6a7ce5c5e0fca6e01af0f4c223f4df
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_TextBoxes.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+
+<html >
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>TextBox with _BidiSupport</title>
+
+		<style type="text/css">
+			@import "../../../../dijit/themes/tundra/tundra.css";
+			@import "../../../../dojo/resources/dojo.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+
+		<script type="text/JavaScript">
+			dojo.require("dijit.form.TextBox");
+			dojo.require("dojo.parser");
+		</script>
+
+	</head>
+	<body class="tundra">
+		<label for="ltrTextBox" >
+			<b> I'm a LTR TexBox</b>
+		</label><br>
+		<input data-dojo-type="dijit/form/TextBox" id="ltrTextBox" data-dojo-props='name:"ltrTextBox", value:"", textDir:"ltr"'/>
+
+		<br>
+		<label for="rtlTextBox" >
+			<b>I'm a RTL TexBox </b>
+		</label><br>
+		<input data-dojo-type="dijit/form/TextBox" id="rtlTextBox" data-dojo-props='name:"rtlTextBox", value:"",textDir:"rtl"'/>
+
+		<br>
+		<label for="contextualTextBox" >
+			<b> And I'm a suprising contextual TexBox!!! </b>
+		</label><br>
+		<input data-dojo-type="dijit/form/TextBox" id="contextualTextBox" data-dojo-props='name:"contextualTextBox", value:"",textDir:"auto"'/>
+
+		<br>
+		<br>
+
+		<label for="programmatic1">dijit.form.Textarea programmatically created with custom styling:</label><br>
+		<input id="programmatic1"/>
+		<label for="programmatic2">dijit.form.Textarea programmatically created with custom styling:</label><br>
+		<input id="programmatic2"/>
+		<label for="programmatic3">dijit.form.Textarea programmatically created with custom styling:</label><br>
+		<input id="programmatic3"/>
+
+		<input id="changeValue" type="button" onclick="programmaticTextBox1.set('value', '&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!');programmaticTextBox2.set('value', '&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!');programmaticTextBox3.set('value', '&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!');" value="change value"/>
+
+		<script type="text/javascript">
+			dojo.ready(function(){
+				programmaticTextBox1 = new dijit.form.TextBox({
+					id: "programmatic1",
+					name: "programmaticTextbox1",
+					textDir: "ltr",
+					value: "created programatically with custom border, padding, margin! textDir=auto!",
+					style: {border:"5px solid gray", padding:"11px", margin:"7px"}
+				}, "programmatic1");
+
+				programmaticTextBox2 = new dijit.form.TextBox({
+					id: "programmatic2",
+					name: "programmaticTextbox2",
+					textDir: "rtl",
+					value: "created programatically with custom border, padding, margin! textDir=auto!",
+					style: {border:"5px solid gray", padding:"11px", margin:"7px"}
+				}, "programmatic2");
+
+
+				programmaticTextBox3 = new dijit.form.TextBox({
+					id: "programmatic3",
+					name: "programmaticTextbox3",
+					textDir: "auto",
+					value: "created programatically with custom border, padding, margin! textDir=auto!",
+					style: {border:"5px solid gray", padding:"11px", margin:"7px"}
+				}, "programmatic3");
+
+			});
+		</script>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/test_Textarea.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_Textarea.html
new file mode 100644
index 0000000000000000000000000000000000000000..1ae5e89b1ed3569b7e7dfe9f77fbc4464e0cc574
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_Textarea.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Textarea with _BidiSupport</title>
+
+		<style type="text/css">
+			@import "../../../../dojo/resources/dojo.css";
+			@import "../../../../dijit/themes/claro/claro.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.dijit");
+			dojo.require("dijit.form.Textarea");
+			dojo.require("dojo.parser");
+		</script>
+
+	</head>
+	<body class="claro" >
+		<h1 class="testTitle">Textarea Widget Test with _BidiSupport</h1>
+		<h2>Various dijit.form.Textarea widgets. Type something inside</h2>
+		<label for="blankL">dijit.form.Textarea, initially blank, textDir="ltr":</label>
+		<br>
+		<textarea data-dojo-type="dijit/form/Textarea" id="blankL" data-dojo-props='textDir:"ltr", style:{width:"50em"}'></textarea>
+		<br>
+		<label for="blankR">dijit.form.Textarea, initially blank, textDir="rtl":</label>
+		<br>
+		<textarea data-dojo-type="dijit/form/Textarea" id="blankR" data-dojo-props='textDir:"rtl", style:{width:"50em"}'></textarea>
+		<br>
+		<label for="blankA">dijit.form.Textarea, initially blank, textDir="auto":</label>
+		<br>
+		<textarea data-dojo-type="dijit/form/Textarea" id="blankA" data-dojo-props='textDir:"auto", style:{width:"50em"}'></textarea>
+		<br>
+
+		<label for="programmaticLTR">dijit.form.Textarea in TabContainer, programmatically created with custom styling:</label><br>
+
+		<label>textDir="ltr":</label>
+		<textarea id="programmaticLTR"></textarea><br>
+
+		<label >textDir="rtl":</label>
+		<textarea id="programmaticRTL"></textarea><br>
+
+		<label >textDir="auto":</label>
+		<textarea id="programmaticAuto"></textarea>
+
+		<br>
+		<input id="buttonHebrew" type="button" value="change value - Hebrew"
+			onclick="programmaticTextareaLTR.set('value', '&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!'); programmaticTextareaRTL.set('value', '&#1506;&#1512;&#1498; &#1495;&#1491;&#64298;!'); programmaticTextareaAuto.set('value', '&#1506;&#1512;&#1498; &#1495;&#1491;&#64298;!');"
+		/>
+
+		<br>
+		<input id="buttonEnglish" type="button" value="change value - English"
+			onclick="programmaticTextareaLTR.set('value', 'New Value!'); programmaticTextareaRTL.set('value', 'New Value!'); programmaticTextareaAuto.set('value', 'New Value!');"
+		/>
+
+		<br>
+		<script type="text/javascript">
+			// See if we can make a widget in script
+			dojo.ready(function(){
+				programmaticTextareaLTR = new dijit.form.Textarea({
+					id: "programmaticLTR",
+					name: "programmaticTextAreaLTR",
+					cols: "60",
+					textDir:"ltr",
+					value: "created programatically!",
+					style: "border:5px solid gray;padding:11px;margin:7px;"
+				}, "programmaticLTR");
+
+				programmaticTextareaRTL = new dijit.form.Textarea({
+					id: "programmaticRTL",
+					name: "programmaticTextAreaRTL",
+					cols: "60",
+					textDir:"rtl",
+					value: "created programatically!",
+					style: "border:5px solid gray;padding:11px;margin:7px;"
+				}, "programmaticRTL");
+
+				programmaticTextareaAuto = new dijit.form.Textarea({
+					id: "programmaticAuto",
+					name: "programmaticTextAreaAuto",
+					cols: "60",
+					textDir:"auto",
+					value: "created programatically!",
+					style: "border:5px solid gray;padding:11px;margin:7px;"
+				}, "programmaticAuto");
+
+			});
+		</script>
+		<br>
+
+		<label for="largeTextAreaLTR">dijit.form.Textarea, initially full with English text <b>textDir = "ltr"</b>:</label>
+		<br>
+		<textarea data-dojo-type="dijit/form/Textarea" id="largeTextAreaLTR" data-dojo-props='name:"largeTextAreaLTR",
+			textDir:"ltr", style:{width:"50em"}'> This is a textarea with a LOT of content.
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+This is the end.</textarea>
+		<br>
+		<br>
+		<label for="largeTextAreaRTL">dijit.form.Textarea, initially full with Hebrew text <b>textDir = "rtl"</b>:</label>
+		<br>
+		<textarea data-dojo-type="dijit/form/Textarea" id="largeTextAreaRTL" data-dojo-props='name:"largeTextAreaRTL",
+			textDir:"rtl", style:{width:"50em"}'> &#1494;&#1492;&#1493; &#1496;&#1511;&#1505;&#1496; &#1488;&#1512;&#1493;&#1498; &#1489;&#1506;&#1497;&#1489;&#1512;&#1497;&#1514;!!!
+
+&#1500;&#1493;&#1512;&#1501; &#1488;&#1497;&#1508;&#1505;&#1493;&#1501; &#1491;&#1493;&#1500;&#1493;&#1512; &#1505;&#1497;&#1496; &#1488;&#1502;&#1496;, &#1511;&#1493;&#1504;&#1505;&#1511;&#1496;&#1493;&#1512;&#1512; &#1488;&#1491;&#1497;&#1508;&#1497;&#1505;&#1497;&#1504;&#1490; &#1488;&#1500;&#1497;&#1514; &#1505;&#1495;&#1496;&#1497;&#1512; &#1489;&#1500;&#1493;&#1489;&#1511;. &#1514;&#1510;&#1496;&#1504;&#1508;&#1500; &#1489;&#1500;&#1497;&#1504;&#1491;&#1493; &#1500;&#1502;&#1512;&#1511;&#1500; &#1488;&#1505; &#1500;&#1499;&#1497;&#1502;&#1508;&#1493;, &#1491;&#1493;&#1500;, &#1510;&#1493;&#1496; &#1493;&#1502;&#1506;&#1497;&#1493;&#1496; - &#1500;&#1508;&#1514;&#1497;&#1506;&#1501; &#1489;&#1512;&#1513;&#1490; - &#1493;&#1500;&#1514;&#1497;&#1506;&#1501; &#1490;&#1491;&#1491;&#1497;&#1513;. &#1511;&#1493;&#1493;&#1497;&#1494; &#1491;&#1493;&#1502;&#1493;&#1512; &#1500;&#1497;&#1488;&#1502;&#1493;&#1501; &#1489;&#1500;&#1497;&#1504;&#1498; &#1512;&#1493;&#1490;&#1510;&#1492;. &#1500;&#1508;&#1502;&#1506;&#1496; &#1502;&#1493;&#1505;&#1503; &#1502;&#1504;&#1514;. &#1490;&#1493;&#1500;&#1512; &#1502;&#1493;&#1504;&#1508;&#1512;&#1512; &#1505;&#1493;&#1489;&#1512;&#1496; &#1500;&#1493;&#1512;&#1501; &#1513;&#1489;&#1510;&#1511; &#1497;&#1492;&#1493;&#1500;, &#1500;&#1499;&#1504;&#1493;&#1509; &#1489;&#1506;&#1512;&#1497;&#1512; &#1490;&#1511; &#1500;&#1497;&#1509;, &#1493;&#1513;&#1489;&#1506;&#1490;&#1496; &#1500;&#1497;&#1489;&#1501; &#1505;&#1493;&#1500;&#1490;&#1511;. &#1489;&#1512;&#1488;&#1497;&#1496; &#1493;&#1500;&#1495;&#1514; &#1510;&#1493;&#1512;&#1511; &#1502;&#1493;&#1504;&#1495;&#1507;, &#1489;&#1490;&#1493;&#1512;&#1502;&#1497; &#1502;&#1490;&#1502;&#1513;. &#1514;&#1512;&#1489;&#1504;&#1498; &#1493;&#1505;&#1514;&#1506;&#1491; &#1500;&#1499;&#1504;&#1493; &#1505;&#1514;&#1513;&#1501; &#1492;&#1513;&#1502;&#1492; - &#1500;&#1514;&#1499;&#1497; &#1502;&#1493;&#1512;&#1490;&#1501; &#1489;&#1493;&#1512;&#1511;? &#1500;&#1514;&#1497;&#1490; &#1497;&#1513;&#1489;&#1506;&#1505;.
+
+&#1500;&#1493;&#1512;&#1501; &#1488;&#1497;&#1508;&#1505;&#1493;&#1501; &#1491;&#1493;&#1500;&#1493;&#1512; &#1505;&#1497;&#1496; &#1488;&#1502;&#1496;, &#1511;&#1493;&#1504;&#1505;&#1511;&#1496;&#1493;&#1512;&#1512; &#1488;&#1491;&#1497;&#1508;&#1497;&#1505;&#1497;&#1504;&#1490; &#1488;&#1500;&#1497;&#1514; &#1505;&#1495;&#1496;&#1497;&#1512; &#1489;&#1500;&#1493;&#1489;&#1511;. &#1514;&#1510;&#1496;&#1504;&#1508;&#1500; &#1489;&#1500;&#1497;&#1504;&#1491;&#1493; &#1500;&#1502;&#1512;&#1511;&#1500; &#1488;&#1505; &#1500;&#1499;&#1497;&#1502;&#1508;&#1493;, &#1491;&#1493;&#1500;, &#1510;&#1493;&#1496; &#1493;&#1502;&#1506;&#1497;&#1493;&#1496; - &#1500;&#1508;&#1514;&#1497;&#1506;&#1501; &#1489;&#1512;&#1513;&#1490; - &#1493;&#1500;&#1514;&#1497;&#1506;&#1501; &#1490;&#1491;&#1491;&#1497;&#1513;. &#1511;&#1493;&#1493;&#1497;&#1494; &#1491;&#1493;&#1502;&#1493;&#1512; &#1500;&#1497;&#1488;&#1502;&#1493;&#1501; &#1489;&#1500;&#1497;&#1504;&#1498; &#1512;&#1493;&#1490;&#1510;&#1492;. &#1500;&#1508;&#1502;&#1506;&#1496; &#1502;&#1493;&#1505;&#1503; &#1502;&#1504;&#1514;. &#1490;&#1493;&#1500;&#1512; &#1502;&#1493;&#1504;&#1508;&#1512;&#1512; &#1505;&#1493;&#1489;&#1512;&#1496; &#1500;&#1493;&#1512;&#1501; &#1513;&#1489;&#1510;&#1511; &#1497;&#1492;&#1493;&#1500;, &#1500;&#1499;&#1504;&#1493;&#1509; &#1489;&#1506;&#1512;&#1497;&#1512; &#1490;&#1511; &#1500;&#1497;&#1509;, &#1493;&#1513;&#1489;&#1506;&#1490;&#1496; &#1500;&#1497;&#1489;&#1501; &#1505;&#1493;&#1500;&#1490;&#1511;. &#1489;&#1512;&#1488;&#1497;&#1496; &#1493;&#1500;&#1495;&#1514; &#1510;&#1493;&#1512;&#1511; &#1502;&#1493;&#1504;&#1495;&#1507;, &#1489;&#1490;&#1493;&#1512;&#1502;&#1497; &#1502;&#1490;&#1502;&#1513;. &#1514;&#1512;&#1489;&#1504;&#1498; &#1493;&#1505;&#1514;&#1506;&#1491; &#1500;&#1499;&#1504;&#1493; &#1505;&#1514;&#1513;&#1501; &#1492;&#1513;&#1502;&#1492; - &#1500;&#1514;&#1499;&#1497; &#1502;&#1493;&#1512;&#1490;&#1501; &#1489;&#1493;&#1512;&#1511;? &#1500;&#1514;&#1497;&#1490; &#1497;&#1513;&#1489;&#1506;&#1505;.
+
+&#1500;&#1493;&#1512;&#1501; &#1488;&#1497;&#1508;&#1505;&#1493;&#1501; &#1491;&#1493;&#1500;&#1493;&#1512; &#1505;&#1497;&#1496; &#1488;&#1502;&#1496;, &#1511;&#1493;&#1504;&#1505;&#1511;&#1496;&#1493;&#1512;&#1512; &#1488;&#1491;&#1497;&#1508;&#1497;&#1505;&#1497;&#1504;&#1490; &#1488;&#1500;&#1497;&#1514; &#1505;&#1495;&#1496;&#1497;&#1512; &#1489;&#1500;&#1493;&#1489;&#1511;. &#1514;&#1510;&#1496;&#1504;&#1508;&#1500; &#1489;&#1500;&#1497;&#1504;&#1491;&#1493; &#1500;&#1502;&#1512;&#1511;&#1500; &#1488;&#1505; &#1500;&#1499;&#1497;&#1502;&#1508;&#1493;, &#1491;&#1493;&#1500;, &#1510;&#1493;&#1496; &#1493;&#1502;&#1506;&#1497;&#1493;&#1496; - &#1500;&#1508;&#1514;&#1497;&#1506;&#1501; &#1489;&#1512;&#1513;&#1490; - &#1493;&#1500;&#1514;&#1497;&#1506;&#1501; &#1490;&#1491;&#1491;&#1497;&#1513;. &#1511;&#1493;&#1493;&#1497;&#1494; &#1491;&#1493;&#1502;&#1493;&#1512; &#1500;&#1497;&#1488;&#1502;&#1493;&#1501; &#1489;&#1500;&#1497;&#1504;&#1498; &#1512;&#1493;&#1490;&#1510;&#1492;. &#1500;&#1508;&#1502;&#1506;&#1496; &#1502;&#1493;&#1505;&#1503; &#1502;&#1504;&#1514;. &#1490;&#1493;&#1500;&#1512; &#1502;&#1493;&#1504;&#1508;&#1512;&#1512; &#1505;&#1493;&#1489;&#1512;&#1496; &#1500;&#1493;&#1512;&#1501; &#1513;&#1489;&#1510;&#1511; &#1497;&#1492;&#1493;&#1500;, &#1500;&#1499;&#1504;&#1493;&#1509; &#1489;&#1506;&#1512;&#1497;&#1512; &#1490;&#1511; &#1500;&#1497;&#1509;, &#1493;&#1513;&#1489;&#1506;&#1490;&#1496; &#1500;&#1497;&#1489;&#1501; &#1505;&#1493;&#1500;&#1490;&#1511;. &#1489;&#1512;&#1488;&#1497;&#1496; &#1493;&#1500;&#1495;&#1514; &#1510;&#1493;&#1512;&#1511; &#1502;&#1493;&#1504;&#1495;&#1507;, &#1489;&#1490;&#1493;&#1512;&#1502;&#1497; &#1502;&#1490;&#1502;&#1513;. &#1514;&#1512;&#1489;&#1504;&#1498; &#1493;&#1505;&#1514;&#1506;&#1491; &#1500;&#1499;&#1504;&#1493; &#1505;&#1514;&#1513;&#1501; &#1492;&#1513;&#1502;&#1492; - &#1500;&#1514;&#1499;&#1497; &#1502;&#1493;&#1512;&#1490;&#1501; &#1489;&#1493;&#1512;&#1511;? &#1500;&#1514;&#1497;&#1490; &#1497;&#1513;&#1489;&#1506;&#1505;.
+
+&#1500;&#1493;&#1512;&#1501; &#1488;&#1497;&#1508;&#1505;&#1493;&#1501; &#1491;&#1493;&#1500;&#1493;&#1512; &#1505;&#1497;&#1496; &#1488;&#1502;&#1496;, &#1511;&#1493;&#1504;&#1505;&#1511;&#1496;&#1493;&#1512;&#1512; &#1488;&#1491;&#1497;&#1508;&#1497;&#1505;&#1497;&#1504;&#1490; &#1488;&#1500;&#1497;&#1514; &#1505;&#1495;&#1496;&#1497;&#1512; &#1489;&#1500;&#1493;&#1489;&#1511;. &#1514;&#1510;&#1496;&#1504;&#1508;&#1500; &#1489;&#1500;&#1497;&#1504;&#1491;&#1493; &#1500;&#1502;&#1512;&#1511;&#1500; &#1488;&#1505; &#1500;&#1499;&#1497;&#1502;&#1508;&#1493;, &#1491;&#1493;&#1500;, &#1510;&#1493;&#1496; &#1493;&#1502;&#1506;&#1497;&#1493;&#1496; - &#1500;&#1508;&#1514;&#1497;&#1506;&#1501; &#1489;&#1512;&#1513;&#1490; - &#1493;&#1500;&#1514;&#1497;&#1506;&#1501; &#1490;&#1491;&#1491;&#1497;&#1513;. &#1511;&#1493;&#1493;&#1497;&#1494; &#1491;&#1493;&#1502;&#1493;&#1512; &#1500;&#1497;&#1488;&#1502;&#1493;&#1501; &#1489;&#1500;&#1497;&#1504;&#1498; &#1512;&#1493;&#1490;&#1510;&#1492;. &#1500;&#1508;&#1502;&#1506;&#1496; &#1502;&#1493;&#1505;&#1503; &#1502;&#1504;&#1514;. &#1490;&#1493;&#1500;&#1512; &#1502;&#1493;&#1504;&#1508;&#1512;&#1512; &#1505;&#1493;&#1489;&#1512;&#1496; &#1500;&#1493;&#1512;&#1501; &#1513;&#1489;&#1510;&#1511; &#1497;&#1492;&#1493;&#1500;, &#1500;&#1499;&#1504;&#1493;&#1509; &#1489;&#1506;&#1512;&#1497;&#1512; &#1490;&#1511; &#1500;&#1497;&#1509;, &#1493;&#1513;&#1489;&#1506;&#1490;&#1496; &#1500;&#1497;&#1489;&#1501; &#1505;&#1493;&#1500;&#1490;&#1511;. &#1489;&#1512;&#1488;&#1497;&#1496; &#1493;&#1500;&#1495;&#1514; &#1510;&#1493;&#1512;&#1511; &#1502;&#1493;&#1504;&#1495;&#1507;, &#1489;&#1490;&#1493;&#1512;&#1502;&#1497; &#1502;&#1490;&#1502;&#1513;. &#1514;&#1512;&#1489;&#1504;&#1498; &#1493;&#1505;&#1514;&#1506;&#1491; &#1500;&#1499;&#1504;&#1493; &#1505;&#1514;&#1513;&#1501; &#1492;&#1513;&#1502;&#1492; - &#1500;&#1514;&#1499;&#1497; &#1502;&#1493;&#1512;&#1490;&#1501; &#1489;&#1493;&#1512;&#1511;? &#1500;&#1514;&#1497;&#1490; &#1497;&#1513;&#1489;&#1506;&#1505;.
+
+&#1505;&#1493;&#1507; &#1492;&#1496;&#1511;&#1505;&#1496;.</textarea>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/form/test_TimeTextBox.html b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_TimeTextBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..d7edc3f9b5c364ffe1388edd36496ec5a69da224
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/form/test_TimeTextBox.html
@@ -0,0 +1,310 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Bidi TimeTextBox</title>
+
+	<script type="text/javascript" src="../../boilerplate.js"
+			data-dojo-config="parseOnLoad: true, has: { 'dojo-bidi': true }"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array",
+			"dojo/dom-class",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/form/TimeTextBox",
+			"dijit/form/Button",
+			"dojo/domReady!"
+		], function(doh, array, domClass, parser, registry, TimeTextBox){
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			function testWidget(element, guiDir, textDir, isfirstChildLatin){
+				doh.is(textDir, registry.byId(element).get("textDir"), "widget textDir");
+				doh.is(guiDir, registry.byId(element).dir.toLowerCase(), "GUI dir");
+				doh.is(guiDir.toLowerCase() == "ltr", registry.byId(element).isLeftToRight(), "isLeftToRight()");
+				if(textDir == "auto"){
+					textDir = isfirstChildLatin? "ltr" : "rtl";
+				}
+				doh.is(textDir, registry.byId(element).focusNode.dir, "focusNode textDir");
+				doh[guiDir.toLowerCase() == "rtl" ? "t" : "f"](domClass.contains(registry.byId(element).domNode, "dijitTimeTextBoxRtl"), "dijitTimeTextBoxRtl");
+			}
+
+			function testDropDownList(widgetId){
+				var widget = registry.byId(widgetId);
+				widget.openDropDown();
+				var widgetTextDir = widget.get("textDir");
+				var itemTextDir = widgetTextDir;
+				var list = widget.dropDown.getChildren();
+				var correct = true;
+				array.forEach(list, function(child){
+					if(widgetTextDir == "auto"){
+						itemTextDir = widget._checkContextual(child.label.replace(/<[^>]*>/gm," "));
+					}
+					correct &= itemTextDir == child.textDirNode.dir;
+				});
+				widget.closeDropDown();
+				doh.t(correct, "child textDir");
+			}
+
+			doh.register("setup", function(){
+				//change textDir dynamically
+				var btnLtr = registry.byId("btn1");
+				btnLtr.on("click", function(){
+					registry.byId("q1").set("textDir", "ltr");
+
+				});
+				var btnRtl = registry.byId("btn2");
+				btnRtl.on("click", function(){
+					registry.byId("q1").set("textDir", "rtl");
+
+				});
+				var btnAuto = registry.byId("btn3");
+				btnAuto.on("click", function(){
+					registry.byId("q1").set("textDir", "auto");
+
+				});
+
+				var programmatic1 = new TimeTextBox({});
+				programmatic1.placeAt('testProgramatic1');
+				programmatic1.set("textDir",'ltr');
+
+				var programmatic2 = new TimeTextBox({});
+				programmatic2.placeAt('testProgramatic2');
+				programmatic2.set("textDir",'rtl');
+
+				var programmatic3 = new TimeTextBox({});
+				programmatic3.placeAt('testProgramatic3');
+				programmatic3.set("textDir",'auto');
+			});
+
+			doh.register("LTR GUI, LTR textDir", [
+				{
+					name:"textbox",
+					runTest:function(){
+						testWidget("q1", "ltr", "ltr", true);
+					}
+				},
+				{
+					name:"dropdown",
+					runTest:function(){
+						testDropDownList("q1");
+					}
+				}
+			]);
+
+			doh.register("LTR GUI, RTL textDir", [
+				{
+					name:"textbox",
+					runTest:function(){
+						testWidget("q2", "ltr", "rtl", true);
+					}
+				},
+				{
+					name:"dropdown",
+					runTest:function(){
+						testDropDownList("q2");
+					}
+				}
+			]);
+
+			doh.register("LTR GUI, auto textDir with LTR text", [
+				{
+					name:"textbox",
+					runTest:function(){
+						testWidget("q3", "ltr", "auto", true);
+					}
+				},
+				{
+					name:"dropdown",
+					runTest:function(){
+						testDropDownList("q3");
+					}
+				}
+			]);
+
+			doh.register("LTR GUI, auto textDir with RTL text", [
+				{
+					name:"textbox",
+					runTest:function(){
+						testWidget("q4", "ltr", "auto", false);
+					}
+				},
+				{
+					name:"dropdown",
+					runTest:function(){
+						testDropDownList("q4");
+					}
+				}
+			]);
+
+			doh.register("RTL GUI, LTR textDir", [
+				{
+					name:"textbox",
+					runTest:function(){
+						testWidget("q5", "rtl", "ltr", true);
+					}
+				},
+				{
+					name:"dropdown",
+					runTest:function(){
+						testDropDownList("q5");
+					}
+				}
+			]);
+
+			doh.register("RTL GUI, RTL textDir", [
+				{
+					name:"textbox",
+					runTest:function(){
+						testWidget("q6", "rtl", "rtl", true);
+					}
+				},
+				{
+					name:"dropdown",
+					runTest:function(){
+						testDropDownList("q6");
+					}
+				}
+			]);
+
+			doh.register("RTL GUI, auto textDir with LTR text", [
+				{
+					name:"textbox",
+					runTest:function(){
+						testWidget("q7", "rtl", "auto", true);
+					}
+				},
+				{
+					name:"dropdown",
+					runTest:function(){
+						testDropDownList("q7");
+					}
+				}
+			]);
+
+			doh.register("RTL GUI, auto textDir with RTL text", [
+				{
+					name:"textbox",
+					runTest:function(){
+						testWidget("q8", "rtl", "auto", false);
+					}
+				},
+				{
+					name:"dropdown",
+					runTest:function(){
+						testDropDownList("q8");
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body>
+
+	<h1 class="testTitle">TimeTextBox</h1>
+	<br>
+	<table border="1">
+		<tr>
+			<td colspan="2" rowspan="2"></td>
+			<th colspan="4" align="right"><h2><div align=center><font size="5">Base text direction</font></div></h2></th>
+		</tr>
+		<tr>
+			<td>  <font size=4 color=red> LTR </font></td>
+			<td>  <font size=4 color=red> RTL </font></td>
+			<td>  <font size=4 color=red> Auto/LTR </font></td>
+			<td>  <font size=4 color=red> Auto/RTL </font></td>
+		</tr>
+		<tr>
+
+			<th rowspan="2" ><h2><div align=center><font size="5">GUI direction</font></div></h2></th>
+			<td >  <font size=4 color=blue>LTR</font></td>
+			<td>
+				<input dir="ltr" id="q1" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1a", value:"T10:30:00", textDir:"ltr",
+					constraints:{formatLength:"short"},
+					required:true,
+					invalidMessage:"" '/>
+			</td>
+			<td>
+				<input dir="ltr" id="q2" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1a", value:"T11:30:00", textDir:"rtl",
+					constraints:{formatLength:"short"},
+					required:true,
+					invalidMessage:"" '/>
+			</td>
+			<td>
+				<input dir="ltr" id="q3" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1a", value:"T12:30:00", textDir:"auto",
+					constraints:{formatLength:"short"},
+					required:true,
+					invalidMessage:"" '/>
+			</td>
+			<td>
+				<input dir="LTR" id="q4" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1a", value:"T12:30:00", textDir:"auto",
+					constraints:{formatLength:"short"},
+					lang:"ar",
+					required:true,
+					invalidMessage:"" '/>
+			</td>
+		</tr>
+		<tr>
+			<td >  <font size=4 color=blue>RTL</font></td>
+			<td>
+				<input dir="RTL" id="q5" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1a", value:"T10:30:00", textDir:"ltr",
+					constraints:{formatLength:"short"},
+					required:true,
+					invalidMessage:"" '/>
+			</td>
+			<td>
+				<input dir="rtl" id="q6" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1a", value:"T11:30:00", textDir:"rtl",
+					constraints:{formatLength:"short"},
+					required:true,
+					invalidMessage:"" '/>
+			</td>
+			<td>
+				<input dir="rtl" id="q7" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1a", value:"T12:30:00", textDir:"auto",
+					constraints:{formatLength:"short"},
+					required:true,
+					invalidMessage:"" '/>
+			</td>
+			<td>
+				<input dir="rtl" id="q8" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1a", value:"T12:30:00", textDir:"auto",
+					constraints:{formatLength:"short"},
+					lang:"ar",
+					required:true,
+					invalidMessage:"" '/>
+			</td>
+		</tr>
+	</table>
+
+	<br>
+
+	<h4 class="testSubtitle">Buttons to change BTD dynamically (for LTR-LTR cell)</h4><br>
+		<button data-dojo-type="dijit/form/Button" id="btn1" data-dojo-props='label:"Set textDir to ltr"'></button>
+		<button data-dojo-type="dijit/form/Button" id="btn2" data-dojo-props='label:"Set textDir to rtl"'></button>
+		<button data-dojo-type="dijit/form/Button" id="btn3" data-dojo-props='label:"Set textDir to auto"'></button>
+	<br>
+	<br>
+	<br>
+	<hr>
+	<h4 class="testSubtitle">Widgets created programmatically:</h4><br>
+
+	<span id="testProgramatic1">LTR:&nbsp;</span>
+	<span id="testProgramatic2">&nbsp;&nbsp;RTL:&nbsp;</span>
+	<span id="testProgramatic3">&nbsp;&nbsp;AUTO:&nbsp;</span>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/Inher-ComplexMarkupContainers.html b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/Inher-ComplexMarkupContainers.html
new file mode 100644
index 0000000000000000000000000000000000000000..bbb1a44cdec1caa82964d7927b19571f99a53eb4
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/Inher-ComplexMarkupContainers.html
@@ -0,0 +1,259 @@
+<!DOCTYPE html>
+
+<html data-dojo-textdir="rtl">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>DOH complex inheritance test</title>
+
+		<style type="text/css">
+			@import "../../../../dojo/resources/dojo.css";
+			@import "../../../../dijit/themes/claro/claro.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.layout.AccordionContainer");
+			dojo.require("dijit.layout.ContentPane");
+			dojo.require("dijit.layout.BorderContainer");
+			dojo.require("dijit.layout.TabContainer");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+			dojo.require("dijit.form.FilteringSelect");
+			dojo.require("dijit.form.SimpleTextarea");
+			dojo.require("dijit.form.Textarea");
+			dojo.require("dijit.form.TextBox");
+			dojo.require("doh.runner");
+
+			dojo.ready(function(){
+
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+
+				doh.register("before MarkupAccordion textBox", [
+					{
+						name: "text direction of 'beforeMarkupAccordion'",
+
+						setUp: function(){
+							textBox = dijit.byId("beforeMarkupAccordion");
+						},
+
+						runTest: function(){
+							doh.is("rtl",textBox.focusNode.dir,"direction of :" + textBox.id);
+							textBox.set('value','\u05e9\u05d9\u05de\u05d5\u05e9\u0020\u05d1\u05ea\u05d2\u05d9\u05d5\u05ea\u002e');
+							doh.is("rtl",textBox.focusNode.dir,"direction of :" + textBox.id);
+						}
+					}
+				]);
+
+				doh.register("test 'A Simple Pane'.", [
+					{
+						name:"check combo textDir.",
+
+						runTest:function(){
+							combo = dijit.byId("selectInPane");
+							doh.is("rtl", combo.textDir, combo.id);
+						}
+					},
+					{
+						name: "check input field text direction",
+
+						runTest: function(){
+							var textBox = dijit.byId("simpleTextbox");
+
+							doh.is("rtl", textBox.textDir,textBox.id);
+						}
+					}
+				]);
+
+				doh.register("test 'BorderContainer Pane'", [
+					{
+						name: "textDir of the panes",
+
+						runTest: function(){
+							var bContainer = dijit.byId("borderContainerPane"),
+								cPane1 = dijit.byId("contentPane1"),
+								cPane2 = dijit.byId("contentPane2");
+
+							doh.is("auto",bContainer.textDir,"'borderContainerPane' textDir");
+							doh.is("ltr",cPane1.textDir,"'contentPane1' textDir");
+							doh.is("auto",cPane2.textDir,"'contentPane2' textDir");
+
+						}
+					},
+					{
+						name: "textDir of textBoxes in the 'contentPane1' textDir='ltr'",
+
+						runTest: function(){
+							var select = dijit.byId("selectL"),
+								input1 = dijit.byId("inputLHeb"),
+								input2 = dijit.byId("inputLEn");
+
+							doh.is("ltr",select.textDir,"'selectL' textDir");
+							doh.is("ltr",input1.textDir,"'inputLHeb' textDir");
+							doh.is("ltr",input2.textDir,"'inputLEn' textDir");
+						}
+					},
+					{
+						name: "textDir of textBoxes in the 'contentPane2' textDir='auto'",
+
+						runTest: function(){
+							var selectA = dijit.byId("selectA"),
+								input1 = dijit.byId("inputAHeb"),
+								input2 = dijit.byId("inputAEn");
+
+							doh.is("auto",selectA.textDir,"'selectA' textDir");
+							doh.is("auto",input1.textDir,"'inputAHeb' textDir");
+							doh.is("auto",input2.textDir,"'inputAEn' textDir");
+
+							doh.is("",selectA.dir,"'selectA' dir");
+							doh.is("rtl",input1.focusNode.dir,"'inputAHeb' textDir");
+							doh.is("ltr",input2.focusNode.dir,"'inputAEn' textDir");
+						}
+					}
+				]);
+
+				doh.register("test 'Tags & panes with TextBoxesAreas'", [
+					{
+						name: "textDir of the panes",
+
+						runTest: function(){
+							doh.is("auto",dijit.byId("embeddedLayoutPane").textDir,"'embeddedLayoutPane' textDir");
+							doh.is("ltr",dijit.byId("bContainer").textDir,"'bContainer' textDir");
+							doh.is("ltr",dijit.byId("contentPane3").textDir,"'contentPane3' textDir");
+							doh.is("auto",dijit.byId("contentPane4").textDir,"'contentPane4' textDir");
+							doh.is("auto",dijit.byId("tContainer").textDir,"'tContainer' textDir");
+							doh.is("rtl",dijit.byId("contentPane5").textDir,"'contentPane5' textDir");
+							doh.is("auto",dijit.byId("contentPane6").textDir,"'contentPane6' textDir");
+						}
+					},
+					{
+						name: "textDir of textBoxes",
+
+						runTest: function(){
+							doh.is("ltr",dijit.byId("ltrSimpleTexarea").textDir,"'ltrSimpleTexarea' textDir");
+							doh.is("ltr",dijit.byId("ltrSimpleTexarea").focusNode.dir,"'ltrSimpleTexarea' dir");
+
+							doh.is("auto",dijit.byId("autoSimpleTexarea").textDir,"'autoSimpleTexarea' textDir");
+							doh.is("rtl",dijit.byId("autoSimpleTexarea").focusNode.dir,"'autoSimpleTexarea' dir");
+
+							doh.is("rtl",dijit.byId("rtlSimpleTexarea").textDir,"'rtlSimpleTexarea' textDir");
+							doh.is("rtl",dijit.byId("rtlSimpleTexarea").focusNode.dir,"'rtlSimpleTexarea' dir");
+
+
+
+							doh.is("auto",dijit.byId("texarea1").textDir,"'texarea1' textDir");
+							doh.is("rtl",dijit.byId("texarea1").focusNode.dir,"'texarea1' dir");
+
+							doh.is("auto",dijit.byId("texarea2").textDir,"'texarea2' textDir");
+							doh.is("ltr",dijit.byId("texarea2").focusNode.dir,"'texarea2' dir");
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+
+	</head>
+	<body class="claro" data-dojo-textdir="rtl">
+
+		<h1 class="testTitle">AccordionContainer Tests textDir="rtl" - defined in body tag.</h1>
+		<h2>Accordion from markup:</h2>
+							<input id="beforeMarkupAccordion" data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"ltrMSimpleTexarea",
+							value:"Markup Testing.", rows:"1", cols:"20"'/>
+
+		<div id="markupAccordion" data-dojo-type="dijit/layout/AccordionContainer" data-dojo-props='style:"width:500px; height:600px; overflow:hidden"' >
+			<div id="pane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:"true",	title:"A Simple Pane"'>
+				<select id= "selectInPane" data-dojo-type="dijit/form/FilteringSelect">
+					<option value="1">foo.</option>
+					<option value="2">&#1489;&#1512;.</option>
+					<option value="3">baz.</option>
+				</select>
+				<p>
+					<input id="simpleTextbox" data-dojo-type="dijit/form/TextBox" data-dojo-props='value:"&#1513;&#1500;&#1493;&#1501;!"'/>
+				</p>
+			</div>
+
+			<div data-dojo-textdir="auto">
+				<div id="borderContainerPane" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='title:"BorderContainer Pane"'>
+					<div id="contentPane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:50%", splitter:"true", textDir:"ltr"'>
+						<p>
+							This Pane ovverrides the body defined textDir="rtl" to textDir="ltr".
+							See some examples:
+						</p>
+						<select id="selectL" data-dojo-type="dijit/form/FilteringSelect">
+							<option value="1">foo.</option>
+							<option value="2">&#1489;&#1512;.</option>
+							<option value="3">baz.</option>
+						</select>
+						<p>
+							<input id="inputLHeb" data-dojo-type="dijit/form/TextBox" data-dojo-props='value:"&#1513;&#1500;&#1493;&#1501;!"'/>
+						</p>
+						<p>
+							<input id="inputLEn" data-dojo-type="dijit/form/TextBox" data-dojo-props='value:"Hello!"'/>
+						</p>
+					</div>
+					<div id="contentPane2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+						<p>
+							This Pane inherits its textDir from the dijit.layout.BorderContainer, and now textDir="auto".
+							See some examples:
+						</p>
+						<select id="selectA" data-dojo-type="dijit/form/FilteringSelect">
+							<option value="1">foo.</option>
+							<option value="2">&#1489;&#1512;.</option>
+							<option value="3">baz.</option>
+						</select>
+						<p>
+							<input id="inputAHeb" data-dojo-type="dijit/form/TextBox" data-dojo-props='value:"&#1513;&#1500;&#1493;&#1501;!"'/>
+						</p>
+						<p>
+							<input id="inputAEn" data-dojo-type="dijit/form/TextBox" data-dojo-props='value:"Hello!"'/>
+						</p>
+					</div>
+				</div>
+			</div>
+
+			<div id="embeddedLayoutPane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tags & panes with TextBoxesAreas",
+				textDir:"auto"'>
+				<p>
+					Here's a BorderContainer: textDir= contextual
+				</p>
+				<div data-dojo-textdir="ltr">
+					<div id="bContainer" data-dojo-type ="dijit.layout.BorderContainer" data-dojo-props='style:"height:200px; width:300px" '>
+						<div id="contentPane3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:125px", splitter:"true"'>
+							Left Pane:
+							<textarea id="ltrSimpleTexarea" data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props='name:"ltrSimpleTexarea",
+								rows:"8", cols:"13"'> Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt.
+							</textarea>
+						</div>
+						<div id="contentPane4" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center",textDir:"auto"'>
+							Right Pane:
+							<textarea id="autoSimpleTexarea" data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props='name:"autoSimpleTexarea", rows:"8", cols:"13"
+								'> &#1500;&#1493;&#1512;&#1501; &#1488;&#1497;&#1508;&#1505;&#1493;&#1501; &#1491;&#1493;&#1500;&#1493;&#1512; &#1505;&#1497;&#1496; &#1488;&#1502;&#1496;, &#1511;&#1493;&#1504;&#1505;&#1511;&#1496;&#1493;&#1512;&#1512; &#1488;&#1491;&#1497;&#1508;&#1497;&#1505;&#1497;&#1504;&#1490; &#1488;&#1500;&#1497;&#1514; &#1502;&#1493;&#1505;&#1503; &#1502;&#1504;&#1514;.
+							</textarea>
+						</div>
+					</div>
+				</div>
+				<p>
+					And a TabContainer:
+				</p>
+				<div id="tContainer" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"height:170px; width:450px"' >
+					<div id="contentPane5" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1 textDir=rtl", textDir:"rtl"'>
+						<textarea id="rtlSimpleTexarea" data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props='name:"rtlSimpleTexarea",
+							rows:"4", cols:"15" '>jhkjkh.</textarea>
+					</div>
+					<div id="contentPane6" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2 textDir=inherited from ContentPane"' >
+						<textarea id="texarea1" data-dojo-type="dijit/form/Textarea" data-dojo-props='name:"texarea1", rows:"4", cols:"14"
+							'>&#1502;&#1489;&#1495;&#1503;.</textarea>
+						<textarea id="texarea2" data-dojo-type="dijit/form/Textarea" data-dojo-props='name:"texarea2", rows:"4", cols:"14"
+							'>Test.</textarea>
+					</div>
+				</div>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/Inher-MarkupContainers.html b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/Inher-MarkupContainers.html
new file mode 100644
index 0000000000000000000000000000000000000000..7cedae8a176b247952bd34da9c2a8b32f252a6e9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/Inher-MarkupContainers.html
@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>DOH markup containers simple inheritance</title>
+
+		<style type="text/css">
+			@import "../../../../dijit/themes/tundra/tundra.css";
+			@import "../../../../dojo/resources/dojo.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.form.TextBox");
+			dojo.require("dijit.form.ComboBox");
+			dojo.require("dijit.layout.AccordionContainer");
+			dojo.require("dijit.layout.ContentPane");
+			dojo.require("dijit.layout.BorderContainer");
+			dojo.require("dijit.layout.TabContainer");
+			dojo.require("dijit.form.FilteringSelect");
+			dojo.require("dijit.form.Textarea");
+			dojo.require("doh.runner");
+
+			dojo.ready(function(){
+
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+
+				doh.register("dijit.tests._BidiSupport.inheritance.Inher-MarkupContainers", [
+					function test_ltrFilterSelectInheritAccordion(){
+						dijit.byId("filter1").set("value","1");
+						doh.is("ltr", dijit.byId("filter1").focusNode.dir, "option 1 of filter1");
+					},
+					function test_rtlFilterSelectInheritAccordion(){
+						dijit.byId("filter1").set("value","2");
+						doh.is("rtl", dijit.byId("filter1").focusNode.dir, "option 2 of filter1");
+					},
+					function test_ltrTextareaInheritPane1(){
+						dijit.byId("ltrTextBox1").set("value","Hello!!");
+						doh.is("ltr", dijit.byId("ltrTextBox1").focusNode.dir,"ltrTextBox1 : Hello!!");
+					},
+					function test_ltrTextareaInheritPane2(){
+						dijit.byId("ltrTextBox1").set("value","\u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+						doh.is("ltr", dijit.byId("ltrTextBox1").focusNode.dir,"ltrTextBox1: \u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+					},
+					function test_autoComboBoxInheritTableLtr(){
+						dijit.byId("autoTextBox1").set("value","Hello!!");
+						doh.is("ltr", dijit.byId("autoTextBox1").focusNode.dir,"autoTextBox1: Hello!!");
+					},
+					function test_autoComboBoxInheritTableRtl(){
+						dijit.byId("autoTextBox1").set("value","\u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+						doh.is("rtl", dijit.byId("autoTextBox1").focusNode.dir,"autoTextBox1: \u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+					},
+					function test_rtlTextareaInheritPane1(){
+						dijit.byId("rtlTextBox1").set("value","\u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+						doh.is("rtl", dijit.byId("rtlTextBox1").focusNode.dir,"rtlTextBox1: \u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+					},
+					function test_rtlTextareaInheritPane2(){
+						dijit.byId("rtlTextBox1").set("value","\u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+						doh.is("rtl", dijit.byId("rtlTextBox1").focusNode.dir,"rtlTextBox1: \u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+					},
+					function test_autoSimpleTextareaInheritPane1(){
+						doh.is("ltr", dijit.byId("ltrSimpleTexarea").focusNode.dir, "ltrSimpleTexarea: ltrSimpleTexarea");
+					},
+					function test_autoSimpleTextareaInheritPane2(){
+						doh.is("rtl", dijit.byId("autoSimpleTexarea").focusNode.dir, "autoSimpleTexarea: autoSimpleTexarea");
+					},
+					function test_RtrSimpleTexBoxInheritTabContainer(){
+						doh.is("rtl", dijit.byId("rtlSimpleTexarea").focusNode.dir, "rtlSimpleTexarea");
+						dijit.byId("rtlSimpleTexarea").set("value","Hello!!");
+						doh.is("rtl", dijit.byId("rtlSimpleTexarea").focusNode.dir,"rtlSimpleTexarea: Hello!!");
+					},
+					function test_autoSimpleTexBoxInheritTabContainersPaneRtl(){
+						doh.is("rtl", dijit.byId("ltrTexarea").focusNode.dir, "ltrTexarea");
+					},
+					function test_autoSimpleTexBoxInheritTabContainersPaneRtl(){
+						doh.is("ltr", dijit.byId("trTexarea").focusNode.dir, "trTexarea");
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+	<body class="tundra" data-dojo-textdir="rtl" >
+		<div id="markupAccordion" data-dojo-type="dijit/layout/AccordionContainer" data-dojo-props='style:"width:400px; height:300px;", textDir :"auto"' data-dojo-textdir="auto">
+
+			<div data-dojo-type="dijit/layout/BorderContainer" id="borderContainerPane" data-dojo-props=' textDir:"rtl",title:"BorderContainer Pane"' data-dojo-textdir="rtl">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:100px", splitter:true, textDir:"ltr"'>
+					<input id="ltrTextBox1" data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"ltrTextBox1", type:"text", value:""'/>
+				</div>
+
+				<div data-dojo-type="dijit/layout/ContentPane"data-dojo-props='region:"center"' data-dojo-textdir="auto" >
+					<input id="autoTextBox1" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text", name:"autoTextBox1", value:""'/>
+				</div>
+
+				<input id="rtlTextBox1" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text", name:"rtlTextBox1", value:""'/>
+			</div>
+
+
+			<div id="pane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:"true", title:"A Simple Pane"'>
+				<select data-dojo-type="dijit/form/FilteringSelect" id="filter1">
+					<option value="1" selected>foo.</option>
+					<option value="2">&#1489;&#1512;.</option>
+					<option value="3">baz.</option>
+				</select>
+			</div>
+
+			<div data-dojo-type="dijit/layout/ContentPane" id="embeddedLayoutPane" data-dojo-props='title:"Tags & panes with TextBoxesAreas"'>
+				<p>
+					Here's a BorderContainer: textDir= contextual
+				</p>
+				<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='style:"height:200px; width:300px", textDir :"auto"' data-dojo-textdir="auto">
+					<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:125px", splitter:"true"'>
+						Left Pane:
+						<textarea id="ltrSimpleTexarea" data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props='name:"ltrSimpleTexarea", rows:"8", cols:"13"
+							'> Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt.
+						</textarea>
+					</div>
+					<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+						Right Pane:
+						<textarea id="autoSimpleTexarea" data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props='name:"autoSimpleTexarea", rows:"8", cols:"13"
+							'> &#1500;&#1493;&#1512;&#1501; &#1488;&#1497;&#1508;&#1505;&#1493;&#1501; &#1491;&#1493;&#1500;&#1493;&#1512; &#1505;&#1497;&#1496; &#1488;&#1502;&#1496;, &#1511;&#1493;&#1504;&#1505;&#1511;&#1496;&#1493;&#1512;&#1512; &#1488;&#1491;&#1497;&#1508;&#1497;&#1505;&#1497;&#1504;&#1490; &#1488;&#1500;&#1497;&#1514; &#1502;&#1493;&#1505;&#1503; &#1502;&#1504;&#1514;.
+						</textarea>
+					</div>
+				</div>
+				<p>
+					And a TabContainer:
+				</p>
+				<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"height:200px; width:300px", textDir:"rtl"' data-dojo-textdir="rtl">
+					<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1 textDir=rtl" ' >
+						<textarea id="rtlSimpleTexarea" data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props='name:"rtlSimpleTexarea", rows:"4", cols:"15"
+							'>&#1500;&#1493;&#1512;&#1501; &#1488;&#1497;&#1508;&#1505;&#1493;&#1501;.
+						</textarea>
+					</div>
+					<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2 textDir=inherited"' data-dojo-textdir="auto">
+						<textarea id="ltrTexarea" data-dojo-type="dijit/form/Textarea" data-dojo-props='name:"ltrTexarea", rows:"4", cols:"14"
+							'>&#1502;&#1489;&#1495;&#1503;.
+						</textarea>
+						<textarea id="trTexarea" data-dojo-type="dijit/form/Textarea" data-dojo-props='name:"trTexarea", rows:"4", cols:"14"
+							'>Test.
+						</textarea>
+					</div>
+				</div>
+				<p>
+					Text after the widgets.
+				</p>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/Inher-Simple.html b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/Inher-Simple.html
new file mode 100644
index 0000000000000000000000000000000000000000..1c23213fc39893d27dae6518ed4b8581cde6cf8b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/Inher-Simple.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>DOH simple inheritance textDir Tests</title>
+
+		<style type="text/css">
+			@import "../../../../dijit/themes/tundra/tundra.css";
+			@import "../../../../dojo/resources/dojo.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+
+		<script type="text/javascript">
+			dojo.require("dojo.parser");
+			dojo.require("doh.runner");
+			dojo.require("dijit.form.TextBox");
+			dojo.require("dijit.form.ComboBox");
+
+			dojo.ready(function(){
+
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+
+				doh.register("dijit.tests._BidiSupport.inheritance.Inher-Simple", [
+
+					function test_ltrTextBoxInheritFromDiv(){
+						doh.is("ltr", dijit.byId("ltrTextBox").focusNode.dir,"ltrTextBox");
+					},
+					function test_rtlTextBoxInheritBody(){
+						doh.is("rtl", dijit.byId("rtlTextBox").focusNode.dir, "rtlTextBox");
+					},
+					function test_ltrComboBoxInheritTable(){
+						doh.is("ltr", dijit.byId("fruitLtr").focusNode.dir, "fruitLtr");
+					},
+					function test_rtlComboBoxInheritTable(){
+						doh.is("rtl", dijit.byId("fruitRtl").focusNode.dir, "fruitRtl");
+					},
+					function test_autoComboBoxInheritTableLtr(){
+						dijit.byId("autoTextBox").set("value","Hello!!");
+						doh.is("ltr", dijit.byId("autoTextBox").focusNode.dir, "autoTextBox: Hello!!");
+					},
+					function test_autoComboBoxInheritTableRtl(){
+						dijit.byId("autoTextBox").set("value","\u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+						doh.is("rtl", dijit.byId("autoTextBox").focusNode.dir, "autoTextBox: \u05e9\u05dc\u05d5\u05dd\u0021\u0021");
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+	<body class="tundra" data-dojo-textdir="rtl">
+		<table data-dojo-textdir="auto">
+			<tr>
+				<td>
+					<div data-dojo-textdir="ltr">
+						<label for="ltrTextBox" >
+							<b>I'm a LTR TexBox </b>
+						</label>
+						<input data-dojo-type="dijit/form/TextBox" id="ltrTextBox" data-dojo-props='name:"ltrTextBox", value:"", type:"text"'/>
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<label for="autoTextBox" >
+						<b>I'm a Auto TexBox </b>
+					</label>
+					<input data-dojo-type="dijit/form/TextBox" id="autoTextBox" data-dojo-props='name:"autoTextBox", value:"",type:"text"'/>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<select id="fruitLtr" data-dojo-type="dijit/form/ComboBox" data-dojo-props='name:"fruitLtr"'>
+						<option >Apples!</option>
+						<option >Oranges!</option>
+						<option selected>Pears!</option>
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<select id="fruitRtl" data-dojo-type="dijit/form/ComboBox" data-dojo-props='name:"fruitRtr"'>
+						<option >&#1514;&#1508;&#1493;&#1495;&#1497;&#1501;.</option>
+						<option >&#1488;&#1490;&#1505;&#1497;&#1501;.</option>
+						<option selected>&#1488;&#1508;&#1512;&#1505;&#1511;&#1497;&#1501;.</option>
+					</select>
+				</td>
+			</tr>
+		</table>
+
+		<label for="rtlTextBox" >
+			<b>I'm a RTL TexBox </b>
+		</label>
+		<input data-dojo-type="dijit/form/TextBox" id="rtlTextBox" data-dojo-props='name:"rtlTextBox", value:"", type:"text"'/>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/module.js b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..2897ecf5a2685a4a58d935dd673637614e089f0e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/module.js
@@ -0,0 +1,9 @@
+define(["doh/main", "require"], function(doh, require){
+
+	doh.register("_BidiSupport.inheritance.Inher-Simple", require.toUrl("./Inher-Simple.html"), 999999);
+
+	doh.register("_BidiSupport.inheritance.Inher-MarkupContainers", require.toUrl("./Inher-MarkupContainers.html"), 999999);
+
+	doh.register("_BidiSupport.inheritance.Inher-ComplexMarkupContainers", require.toUrl("./Inher-ComplexMarkupContainers.html"), 999999);
+
+});
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/runTests.html b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..fb7125e2ab99a12f3a876457e4717112bb28d056
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/inheritance/runTests.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>Inheritance Unit Test Runner</title>
+		<meta http-equiv="REFRESH" content="0;url=../../../../util/doh/runner.html?testModule=dijit.tests._BidiSupport.inheritance.module">
+	</head>
+	<body>
+		Redirecting to D.O.H runner.
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/layout/AccordionContainer.html b/src/main/resources/static/dijit/tests/_BidiSupport/layout/AccordionContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..9a09d4ea15ebe5d3b29f47c1bf1f300524ff03ca
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/layout/AccordionContainer.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Accordion Widget Demo</title>
+
+	<!-- only needed for test files: -->
+	<style type="text/css">
+		@import "../../../themes/claro/document.css";
+		@import "../../css/dijitTests.css";
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+
+	<script type="text/javascript" src="../../../../dojo/dojo.js"
+		data-dojo-config="async: true, isDebug: true, has: { 'dojo-bidi': true }"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom",
+			"dojo/parser",
+			"dojo/query",
+			"dijit/registry",
+			"dijit/layout/AccordionContainer",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dojo/domReady!"
+		], function(doh, dom, parser, query, registry, ContentPane){
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			doh.register("tests._BidiSupport.layout.Accordion.Bidi", [
+				{
+					name: "Accordion Bidi",
+					runTest: function(){
+						query("span.dijitAccordionText").forEach(function(node, index, arr){
+							if(registry.getEnclosingWidget(node).textDir !== 'auto') {
+								doh.is(node.dir, registry.getEnclosingWidget(node).textDir, "tab button direction should coincide with widget's 'textDir'");
+							}
+						});
+					}
+				}
+			]);
+
+			doh.register("log", function(){
+				dom.byId('failures').innerHTML = doh._failureCount;
+				dom.byId('errors').innerHTML = doh._errorCount;
+			});
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro" style="padding: 50px;">
+
+	<h1 class="testTitle">Bidi Accordion Container Test</h1>
+
+	<div id="markupAccordion" data-dojo-type="dijit/layout/AccordionContainer" data-dojo-props='textDir:"rtl", style:"width: 300px; height: 200px; overflow: hidden"'>
+		<div id="Pane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:true,textDir:"ltr",
+			title:"Explicit LTR!", iconClass:"dijitEditorIcon dijitEditorIconSave", tooltip:"Explicit LTR!" '>
+				<p>Explicit LTR text direction of content pane</p>
+		</div>
+
+		<div id="borderContainerPane" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='title:"Inherited RTL!", tooltip:"Inherited RTL!",iconClass:"dijitEditorIcon dijitEditorIconPaste"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:50%", splitter:true'>
+			Inherited RTL title text direction of accordion button.
+			</div>
+		</div>
+
+		<div id="embeddedLayoutPane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='textDir:"auto", title:"�Explicit AUTO!", tooltip:"�Explicit AUTO!",iconClass:"dijitEditorIcon dijitEditorIconCut"'>
+			<p>Explicit 'auto' text direction of content pane</p>
+		</div>
+	</div>
+	<br>Errors:&nbsp;<span id="errors">?</span>
+	<br>Failures:&nbsp;<span id="failures">?</span>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/layout/StackContainer.html b/src/main/resources/static/dijit/tests/_BidiSupport/layout/StackContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..c8dbc5572eb8b9ba2c443934ee30f20b73f5627c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/layout/StackContainer.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>StackContainer Demo</title>
+
+	<style>
+		@import "../../../themes/claro/document.css";
+		@import "../../css/dijitTests.css";
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"
+		data-dojo-config="async: true, has: { 'dojo-bidi': true }"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom",
+			"dojo/parser",
+			"dojo/query",
+			"dijit/registry",
+			"dijit/layout/StackController",
+			"dijit/layout/ContentPane",
+			"dojo/domReady!"
+		], function(doh, dom, parser, query, registry){
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			doh.register("tests._BidiSupport.layout.StackContainer.Bidi", [
+				{
+					name: "StackContainer Bidi",
+					runTest: function(){
+						query("span.dijitButtonText").forEach(function(node, index, arr){
+							if(registry.getEnclosingWidget(node).textDir !== 'auto') {
+								doh.is(node.dir, registry.getEnclosingWidget(node).textDir, "tab button direction should coinside with widget's 'textDir'");
+							}
+						});
+					}
+				}
+			]);
+
+			doh.register("log", function(){
+				dom.byId('failures').innerHTML = doh._failureCount;
+				dom.byId('errors').innerHTML = doh._errorCount;
+			});
+
+			doh.run();
+		});
+	</script>
+</head>
+
+<body class="claro">
+	<h1 class="testTitle">Bidi RTL stack container</h1>
+	<span data-dojo-type="dijit/layout/StackController" data-dojo-props='containerId:"stackContainer"'></span>
+	<div id="stackContainer" data-dojo-type="dijit/layout/StackContainer"
+		data-dojo-props='textDir:"rtl", style:"width: 90%; border: 1px solid #9b9b9b; height: 6em; margin: 0.5em 0 0.5em 0; padding: 0.5em;"'>
+		<p id="page1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='textDir:"ltr",title:"Explicit LTR!"'>Explicit LTR text direction of content pane</p>
+		<p id="page2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Inherited RTL!"'>Inherited RTL title text direction of stack button</p>
+		<p id="page3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='textDir:"auto",title:"�Explicit AUTO!"'>Explicit 'auto' text direction of content pane</p>
+	</div>
+	<br>Errors:&nbsp;<span id="errors">?</span>
+	<br>Failures:&nbsp;<span id="failures">?</span>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/layout/TabContainer.html b/src/main/resources/static/dijit/tests/_BidiSupport/layout/TabContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..a4e4821e4a5b416c5114148d85ec80e1bec9f014
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/layout/TabContainer.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TabContainer BIDI DOH Test</title>
+
+	<style>
+		@import "../../../themes/claro/document.css";
+		@import "../../css/dijitTests.css";
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"
+		data-dojo-config="async: true,isDebug: true, has: { 'dojo-bidi': true }"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom",
+			"dojo/parser",
+			"dojo/query",
+			"dijit/registry",
+			"dijit/layout/TabContainer",
+			"dijit/layout/ContentPane",
+			"dojo/domReady!"
+		], function(doh, dom, parser, query, registry, TabContainer, ContentPane){
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			doh.register("tests._BidiSupport.layout.TabContainer.Bidi", [
+				{
+					name: 'changing Tabs',
+					runTest: function(){
+						var tc = registry.byId("tc1");
+						var cp = new ContentPane({
+							id: "newTab1",
+							title: "Added Panel,RTL textDir !",
+							content: "Added content pane with RTL textDir",
+							textDir: "rtl"
+						});
+						tc.addChild(cp);
+
+						var t1 = registry.byId('t1');
+						t1.set('title', 'LTR panel,changed title!');
+
+						var tc1 = registry.byId("tc1");
+						children = tc1.getChildren();
+						children[1].set({
+							title: "Panel with no direction,changed title!"
+						});
+
+						doh.is('ltr', query("#tc1_tablist_t1")[0].dir, "Pane have explicit LTR text direction");
+						doh.is('rtl', query("#tc1_tablist_t2")[0].dir, "Pane inherits RTL text direction from container");
+						doh.is('ltr', query("#tc1_tablist_t3")[0].dir, "Pane have explicit LTR text direction");
+						doh.is('rtl', query("#tc1_tablist_t4")[0].dir, "Pane inherits RTL text direction from container");
+						doh.is('rtl', query("#tc1_tablist_newTab1")[0].dir, "Added pane have explicit 'Auto' text direction");
+						doh.is('rtl', query("#tc3_tablist_three")[0].dir, "Pane have explicit RTL text direction");
+						doh.is('rtl', query("#tc3_tablist_four")[0].dir, "Pane have explicit RTL text direction");
+					}
+				}
+			]);
+
+			doh.register("testingMenu", {
+				name: "Test menu",
+				runTest: function(){
+					var menuBtn = registry.byId("tc1_tablist_menuBtn");
+					menuBtn.toggleDropDown();
+					var menu = registry.byId("tc1_menu");
+					doh.is('ltr', menu.getChildren()[0].textDirNode.dir, "Menu item should have LTR text direction");
+					doh.is('rtl', menu.getChildren()[1].textDirNode.dir, "Menu item should have RTL text direction 1");
+					doh.is('ltr', menu.getChildren()[2].textDirNode.dir, "Menu item should have LTR text direction 2");
+					doh.is('rtl', menu.getChildren()[3].textDirNode.dir, "Menu item should have RTL text direction 3");
+
+					menuBtn.closeDropDown();
+				}
+			});
+
+			doh.register("log", function(){
+				dom.byId('failures').innerHTML = doh._failureCount;
+				dom.byId('errors').innerHTML = doh._errorCount;
+			});
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro">
+
+	<h1 class="testTitle">Bidi TabContainer tests</h1>
+	<h2 class="testTitle">TabContainer with RTL text direction and changed tabs</h2>
+	<div id="tc1" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='textDir: "rtl", style:"width: 550px; height: 60px;" '>
+		<div id="t1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='textDir: "ltr", title:"tab1 @", selected:true'>
+			Title of this LTR pane has been changed
+		</div>
+		<div id="t2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab2 @", closable:true'>
+			Title of this pane with no text direction specified (inherited) has been changed
+		</div>
+		<div id="t3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='textDir: "ltr", title:"Explicit LTR!", closable:true'>
+			Explicit LTR text direction of content pane
+		</div>
+		<div id="t4" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Inherited RTL!", closable:true'>
+			Inherited RTL text direction of content pane tab
+		</div>
+	</div>
+	<br />
+	<h2 class="testTitle">TabContainer with RTL text direction</h2>
+	<div id="tc3" data-dojo-type="dijit/layout/TabContainer" textDir="rtl" data-dojo-id="tc3" style="width: 300px; height:100px;">
+		<div data-dojo-type="dijit/layout/ContentPane" title="Explicit LTR!" textDir="ltr" data-dojo-id="one" id="one">Explicit LTR text direction of content pane</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="Inherited RTL!" data-dojo-id="two" id="two">Inherited RTL text direction of content pane tab</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="�Explicit AUTO!" data-dojo-id="three" id="three">Explicit 'auto' text direction of content pane</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="Explicit RTL!" textDir="rtl" data-dojo-id="four" id="four">Explicit RTL text direction of content pane</div>
+	</div>
+		<br>Errors:&nbsp;<span id="errors">?</span>
+		<br>Failures:&nbsp;<span id="failures">?</span>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/layout/module.js b/src/main/resources/static/dijit/tests/_BidiSupport/layout/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..3a13aff9dec13596d463e89d353a5a00f80b1302
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/layout/module.js
@@ -0,0 +1,5 @@
+define(["doh/main", "require"], function(doh, require){
+	doh.register("_BidiSupport.layout.TabContainer", require.toUrl("./TabContainer.html"), 999999);
+	doh.register("_BidiSupport.layout.StackContainer", require.toUrl("./StackContainer.html"), 999999);
+	doh.register("_BidiSupport.layout.AccordionContainer", require.toUrl("./AccordionContainer.html"), 999999);
+});
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/layout/runTests.html b/src/main/resources/static/dijit/tests/_BidiSupport/layout/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..7195415d968006c669326ec29f2c3f520331b69f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/layout/runTests.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>Bidi Layout Unit Test Runner</title>
+		<meta http-equiv="REFRESH" content="0;url=../../../../util/doh/runner.html?testModule=dijit.tests._BidiSupport.layout.module"></head>
+	<body>
+		Redirecting to D.O.H runner.
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/misc/Dialog.html b/src/main/resources/static/dijit/tests/_BidiSupport/misc/Dialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..20e874302cda282af54580dbce2d212909504a60
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/misc/Dialog.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dialog Widget Automated (non-robot) Tests</title>
+
+	<style type="text/css">
+		@import "../../../themes/claro/document.css";
+		@import "../../css/dijitTests.css";
+	</style>
+
+	<!-- required: a default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="async: true, has: { 'dojo-bidi': true }"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/query",
+			"dijit/Dialog",
+			"dojo/domReady!"
+		], function(doh, query, Dialog){
+			toggleTextDir = function(){
+				dlg.set("textDir", (dlg.get("textDir") !== "rtl") ? "rtl" : "ltr");
+			};
+			doh.register("tests._BidiSupport.form.DialogBidi", [
+				{
+					name: "Bidi Dialog test",
+					runTest: function(){
+						var d = new doh.Deferred();
+						dlg = new Dialog({
+							textDir: "rtl",
+							title: "Title!",
+							content: "<input id='dlg1_inputA'><br>" +
+									"<input id='dlg1_inputB'><br>" +
+									"<input id='dlg1_inputC'><br>" +
+									"<input type='button' value='Toggle title textDir' onclick='toggleTextDir()'>"
+						});
+						dlg.show().then(d.getTestCallback(function(){
+							doh.is(dlg.get("textDir"), query(".dijitDialogTitle")[0].dir, "Dialog title node should have 'dir' attribute equal to dialog's 'textDir' property");
+						}));
+						return d;
+					}
+				}
+			]);
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro">
+<h1 class="testTitle">Bidi Dialog Test</h1>
+</body>
+</html>
+
+
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/misc/MenuItem.html b/src/main/resources/static/dijit/tests/_BidiSupport/misc/MenuItem.html
new file mode 100644
index 0000000000000000000000000000000000000000..01b79d6a5bc0c34583dd6957303ee8cf13483efc
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/misc/MenuItem.html
@@ -0,0 +1,311 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Test Bidi support for Menu Item</title>
+
+	<style type="text/css">
+		@import "../../../../dijit/themes/claro/document.css";
+		@import "../../../../dijit/tests/css/dijitTests.css";
+
+		body { padding: 0; }
+
+		/* styling for left-hand-side navigation menu to become a column equal to length of page */
+		#formattingTable {
+			border: 0;
+			border-spacing: 0;
+		}
+		#contentContainer { padding: 2em; }
+
+		#navMenu {
+			/* make the sidebar menu blend in with the whole sidebar */
+			border: none;
+		}
+	</style>
+
+	<!-- required: a default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true, has: { 'dojo-bidi': true }"></script>
+
+	<script type="text/javascript">
+		dojo.require("dijit.Menu");
+		dojo.require("dijit.MenuItem");
+		dojo.require("dijit.PopupMenuItem");
+		dojo.require("dijit.CheckedMenuItem");
+		dojo.require("dijit.MenuSeparator");
+
+		dojo.require("dijit.MenuBar");
+		dojo.require("dijit.MenuBarItem");
+		dojo.require("dijit.PopupMenuBarItem");
+
+		dojo.require("dijit.ColorPalette");
+		dojo.require("dijit.form.TextBox");
+		dojo.require("doh.runner");
+
+		dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+	</script>
+
+	<script type="text/javascript">
+		function createMenu(){
+			// create a menu programmatically
+			function fClick(){console.log("clicked!")}
+
+			pMenu = new dijit.Menu({targetNodeIds:["prog_menu"], id:"progMenu"});
+			pMenu.addChild(new dijit.MenuItem({label:"Programmatic Context Menu", disabled:true}));
+			pMenu.addChild(new dijit.MenuSeparator());
+			pMenu.addChild(new dijit.MenuItem({label:"\u05e9\u05dc\u05d5\u05dd\u0021\u0021 rtl", onClick:fClick, accelKey:"Shift+S", textDir:"rtl", id:"progItemRtl"}));
+			pMenu.addChild(new dijit.MenuItem({label:"Another menu item...", onClick:fClick, accelKey:"Ctrl+A",  textDir:"ltr", id:"progItemLtr"}));
+			pMenu.addChild(new dijit.MenuItem({label:"With an icon", iconClass:"dijitEditorIcon dijitEditorIconCut", onClick:fClick}));
+			var mItem = new dijit.MenuItem({label:"dojo.event clicking!! auto", accelKey: "Alt+D", textDir:"auto", id:"progItemAuto1"});
+			dojo.connect(mItem, "onClick", function(){console.log("click! handler created via dojo.connect()")});
+			pMenu.addChild(mItem);
+			mItem = new dijit.CheckedMenuItem({label:"\u05e9\u05dc\u05d5\u05dd\u0021\u0021 auto", textDir:"auto", id:"progItemAuto2"});
+			pMenu.addChild(mItem);
+
+			var pSubMenu = new dijit.Menu({parentMenu:pMenu, id:"progSubMenu"});
+			pSubMenu.addChild(new dijit.MenuItem({label:"Submenu item", onClick:fClick}));
+			pSubMenu.addChild(new dijit.MenuItem({label:"Submenu item", onClick:fClick}));
+
+			var pSubSubMenu = new dijit.Menu({parentMenu:pSubMenu, id:"progSubSubMenu"});
+			pSubSubMenu.addChild(new dijit.MenuItem({label:"SubSubmenu item", onClick:fClick}));
+			pSubSubMenu.addChild(new dijit.MenuItem({label:"SubSubmenu item", onClick:fClick}));
+			pSubMenu.addChild(new dijit.PopupMenuItem({label:"SubSubmenu rtl...", popup:pSubSubMenu, textDir:"rtl"}));
+
+			pMenu.addChild(new dijit.PopupMenuItem({label:"Submenu", popup:pSubMenu}));
+
+			pMenu.startup();
+
+				updateButtons(true);
+			dojo.byId("prog_menu").innerHTML="This div has a programmatic context menu on it that's different to the page menu.";
+
+			dojo.byId("createButton").disabled = true;
+			dojo.byId("destroyButton").disabled = false;
+		}
+
+		function destroyMenu(){
+			pMenu.destroyRecursive();
+			updateButtons(false);
+		}
+
+		function updateButtons(created){
+			dojo.byId("prog_menu").innerHTML=created?"This div has a programmatic context menu on it that's different to the page menu.":"No programmatic menu on this div, should get page level menu.";
+			dojo.byId("createButton").disabled = created;
+			dojo.byId("destroyButton").disabled = !created;
+		}
+		dojo.ready(function(){
+			// need to explicitly update our buttons states, otherwise the
+			// browser will remember the last states of them before reloading
+			// (so a programmatic menu is created, reload, and "the create
+			// programmatic menu" button is still in disabled state)
+			updateButtons(false);
+
+			doh.register("dijit.tests._BidiSupport.widget.MenuItem", [
+				function test_LTR_TextDir(){
+					doh.is(dijit.byId("open").get("textDir"), "ltr");
+					doh.is(dijit.byId("open").textDirNode.dir, "ltr");
+					doh.is(dijit.byId("navMenuComedy").get("textDir"), "ltr");
+					doh.is(dijit.byId("navMenuComedy").textDirNode.dir, "ltr");
+				},
+
+				function test_LTR_TextDir_RTL_dir(){
+					doh.is(dijit.byId("menu2").get("textDir"), "ltr");
+					doh.is(dijit.byId("menu2").textDirNode.dir, "ltr");
+				},
+
+				function test_RTL_TextDir_LTR_dir(){
+					doh.is(dijit.byId("menu1").get("textDir"), "rtl");
+					doh.is(dijit.byId("menu1").textDirNode.dir, "rtl");
+				},
+
+				function test_RTL_TextDir(){
+					doh.is(dijit.byId("new").get("textDir"), "rtl");
+					doh.is(dijit.byId("new").textDirNode.dir, "rtl");
+					doh.is(dijit.byId("navMenuDrama").get("textDir"), "rtl");
+					doh.is(dijit.byId("navMenuDrama").textDirNode.dir, "rtl");
+				},
+
+				function test_AUTO_TextDir(){
+					doh.is(dijit.byId("save").get("textDir"), "auto");
+					doh.is(dijit.byId("save").textDirNode.dir, "ltr");
+					doh.is(dijit.byId("saveas").get("textDir"), "auto");
+					doh.is(dijit.byId("saveas").textDirNode.dir, "rtl");
+				},
+
+				function test_PopupMenuBarItem_TextDirLTR(){
+					doh.is(dijit.byId("file").get("textDir"), "ltr");
+					doh.is(dijit.byId("file").textDirNode.dir, "ltr");
+				},
+
+				function test_PopupMenuBarItem_TextDirRTL(){
+					doh.is(dijit.byId("view").get("textDir"), "rtl");
+					doh.is(dijit.byId("view").textDirNode.dir, "rtl");
+				},
+
+				function test_PopupMenuBarItem_TextDirAUTO(){
+					doh.is(dijit.byId("empty").get("textDir"), "auto");
+					doh.is(dijit.byId("empty").textDirNode.dir, "ltr");
+				},
+
+				function test_PopupMenuItem_TextDirRTL(){
+					doh.is(dijit.byId("popupMenuItem").get("textDir"), "rtl");
+					doh.is(dijit.byId("popupMenuItem").textDirNode.dir, "rtl");
+				},
+
+				function test_PopupMenuItem_TextDirAUTO(){
+					doh.is(dijit.byId("navMenuDisabledItem").get("textDir"), "auto");
+					doh.is(dijit.byId("navMenuDisabledItem").textDirNode.dir, "rtl");
+				},
+
+				function test_programmat_menuitem(){
+					createMenu();
+					doh.is(dijit.byId("progItemLtr").get("textDir"), "ltr");
+					doh.is(dijit.byId("progItemLtr").textDirNode.dir, "ltr");
+					doh.is(dijit.byId("progItemRtl").get("textDir"), "rtl");
+					doh.is(dijit.byId("progItemRtl").textDirNode.dir, "rtl");
+					doh.is(dijit.byId("progItemAuto1").get("textDir"), "auto");
+					doh.is(dijit.byId("progItemAuto1").textDirNode.dir, "ltr");
+					doh.is(dijit.byId("progItemAuto2").get("textDir"), "auto");
+					doh.is(dijit.byId("progItemAuto2").textDirNode.dir, "rtl");
+					destroyMenu();
+				},
+
+				function test_changeLabel_forAUTO(){
+					var item = dijit.byId("saveas");
+					doh.is(item.get("textDir"), "auto");
+					doh.is(item.textDirNode.dir, "rtl");
+					item.set("label", "");
+					doh.is(item.textDirNode.dir, "ltr");
+					item.set("label", "new label '\u05e9\u05d9\u05de\u05d5\u05e9\u0020\u05d1\u05ea\u05d2\u05d9\u05d5\u05ea\u002e'");
+					doh.is(item.textDirNode.dir, "ltr");
+					item.set("label", "'\u05e9\u05d9\u05de\u05d5\u05e9\u0020\u05d1\u05ea\u05d2\u05d9\u05d5\u05ea\u002e'");
+					doh.is(item.textDirNode.dir, "rtl");
+				}
+			]);
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro">
+
+	<div id="windowContextMenu" data-dojo-type="dijit/Menu" data-dojo-props='contextMenuForWindow:true, style:"display: none;"'>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Hello world"); }'> &#1506;&#1512;&#1498; &#1495;&#1491;&#1513; for context Menu</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='disabled:true, onClick:function(){ alert("this should NOT appear"); }'>Disabled Item</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+			onClick:function(){ console.log("not actually cutting anything, just a test!") }, accelKey:"Ctrl+X"' textDir="rtl" >Cut RTL...</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+			onClick:function(){ console.log("not actually copying anything, just a test!") }, accelKey:"Ctrl+C"' textDir="ltr" >Copy LTR...</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+			onClick:function(){ console.log("not actually pasting anything, just a test!") }, accelKey:"Ctrl+V"' textDir="auto" >&#1495;&#1491;&#1513; AUTO...</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+
+
+	</div>
+
+
+	<table id="formattingTable">
+		<tr>
+			<td style="width:0;">
+				<!-- This is here for tabIndex testing.
+					Use textarea since Chrome 1.0 likes it better for TABing and
+					because it has innerText property and because it doesn't mess
+					with the URL when clicked -->
+				<textarea id="link" tabIndex="0" readOnly class="dijitReset" style="font-family:monospace;font-size:12px;width:84px;text-decoration:underline;overflow:hidden;background-color:transparent;" rows=1>random link</textarea>
+			</td>
+			<td id="menuBarContainer" style="width:100%;">
+				<div id="menubar" data-dojo-type="dijit/MenuBar">
+					<div id="file" data-dojo-type="dijit/PopupMenuBarItem" textDir="ltr">
+						<span>File...</span>
+						<div id="fileMenu" data-dojo-type="dijit/Menu" >
+							<div id="new" data-dojo-type="dijit/MenuItem" textDir="rtl"  label="File RTL ..."></div>
+							<div id="open" data-dojo-type="dijit/MenuItem" textDir="ltr">Open LTR ...</div>
+							<div id="separator" data-dojo-type="dijit/MenuSeparator" ></div>
+							<div id="save" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIconSave"'  textDir="auto">START AUTO &#1495;&#1491;&#1513;!...</div>
+							<div id="saveas" data-dojo-type="dijit/MenuItem" textDir="auto" >&#1495;&#1491;&#1513; AUTO END...</div>
+						</div>
+					</div>
+					<div id="view" data-dojo-type="dijit/PopupMenuBarItem" textDir="rtl" >
+						<span>&#1495;&#1491;&#1513;...</span>
+						<div id="viewMenu" data-dojo-type="dijit/Menu" >
+							<div data-dojo-type="dijit/MenuItem">Normal w/o textDir....</div>
+							<div id="popupMenuItem" data-dojo-type="dijit/PopupMenuItem" textDir="rtl">
+								<span>Submenu test RTL &#1495;&#1491;&#1513;...</span>
+								<div id="zoomMenu" data-dojo-type="dijit/Menu" >
+									<div id="menu1" data-dojo-type="dijit/MenuItem" textDir="rtl" dir="ltr">&#1495;&#1491;&#1513; new RTL menu...</div>
+									<div id="menu2" data-dojo-type="dijit/MenuItem" textDir="ltr" dir="rtl">&#1495;&#1491;&#1513; new LTR menu...</div>
+									<div data-dojo-type="dijit/MenuItem" textDir="auto">&#1495;&#1491;&#1513; new Auto menu...</div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div id="empty" data-dojo-type="dijit/PopupMenuBarItem" textDir="auto">
+						<span>Empty auto &#1495;&#1491;&#1513;... </span>
+						<div data-dojo-type="dijit/Menu">
+						</div>
+					</div>
+					<div data-dojo-type="dijit/PopupMenuBarItem" data-dojo-props='disabled:true' textDir="rtl">
+						<span>&#1495;&#1491;&#1513; Disabled RTL !!!</span>
+						<div data-dojo-type="dijit/Menu">
+							<div data-dojo-type="dijit/MenuItem">You should not see this</div>
+						</div>
+					</div>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td id="navMenuContainer" class="dijitMenu" style="vertical-align:top; width:0;">
+
+				<h3 style="margin-bottom: 2em;">Navigation menu:</h3>
+				<div id="navMenu" data-dojo-type="dijit/Menu" >
+					<div id="navMenuDrama" data-dojo-type="dijit/MenuItem" textDir="rtl" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+						onClick:function(){ console.log("drama!"); }'>Drama RTL ...</div>
+					<div id="navMenuComedy"data-dojo-type="dijit/MenuItem" textDir="ltr" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+						onClick:function(){ console.log("comedy!") }'>Comedy LTR ...</div>
+
+					<div id="navMenuDisabledItem" data-dojo-type="dijit/PopupMenuItem" textDir="auto" data-dojo-props='disabled:true '>
+						<span>&#1495;&#1491;&#1513; new disabled submenu</span>
+						<div id="navMenuSub3" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+							<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!") }' textDir="auto">START AUTO &#1495;&#1491;&#1513;!...</div>
+							<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!") }'>Submenu 2!</div>
+						</div>
+					</div>
+					<div data-dojo-type="dijit/PopupMenuItem">
+						<span>Different popup</span>
+						<div data-dojo-type="dijit/ColorPalette"></div>
+					</div>
+					<div data-dojo-type="dijit/MenuSeparator"></div>
+					<div data-dojo-type="dijit/CheckedMenuItem" textDir="rtl" data-dojo-props='checked:true, onChange:function(val){ console.log("Now set to " + val); }'>&#1495;&#1491;&#1513; checked RTL ...</div>
+					<div id="checked2" data-dojo-type="dijit/CheckedMenuItem" >Not Checked</div>
+					<div data-dojo-type="dijit/CheckedMenuItem" data-dojo-props='checked:true, disabled:true'>Checked Disabled</div>
+				</div>
+			</td>
+
+			<td style="padding: 1em" id="contentContainer">
+
+				<h1 class="testTitle">Test Bidi support for Menu Item</h1>
+
+				<p>This page contains:</p>
+				<ul>
+					<li>"Navigation bar" Menu widget on left, a.k.a vertical MenuBar
+					<li>MenuBar on top
+					<li>page level context menu (right-click anywhere on page)
+					<li>form widget context menu (right-click on textbox widget)</li>
+					<li>Example of programatically created menu
+					<li>Note: while some accelerator (shortcut) keys are displayed in the context menu, they are not actually hooked up to the corresponding actions (if any), they need to be setup explicitly by the user
+				</ul>
+
+				<div id="prog_menu" style="clear: both; border:1px solid blue; padding:10px; margin:20px 0;">
+					Click button below to create special menu on this div.
+				</div>
+				<button id="createButton" onclick="createMenu();">create programmatic menu</button>
+				<button id="destroyButton" onclick="destroyMenu();" disabled>destroy programmatic menu</button>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/misc/TitlePane.html b/src/main/resources/static/dijit/tests/_BidiSupport/misc/TitlePane.html
new file mode 100644
index 0000000000000000000000000000000000000000..31c37fdb3dbe6dc01711b66eec11f03938f19c3c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/misc/TitlePane.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TitlePane Test</title>
+
+	<style type="text/css">
+		@import "../../../themes/claro/document.css";
+		@import "../../css/dijitTests.css";
+	</style>
+
+	<link id="themeStyles" rel="stylesheet" href="../../../themes/claro/claro.css"/>
+	<script type="text/javascript" src="../../../../dojo/dojo.js"
+		data-dojo-config="async: true, has: { 'dojo-bidi': true }"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom",
+			"dojo/parser",
+			"dojo/query",
+			"dijit/registry",
+			"dijit/TitlePane",
+			"dojo/domReady!"
+		], function(doh, dom, parser, query, registry){
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			doh.register("tests._BidiSupport.misc.TitlePane.Bidi", [
+				{
+					name: "TitlePane Bidi",
+					runTest: function(){
+						registry.byId("pane_2").set('textDir', "rtl");
+						doh.is("rtl", registry.byId("pane_1").titleNode.dir, "title node had direction correspondent to 'textDir'");
+						doh.is("rtl", registry.byId("pane_2").titleNode.dir, "title node had direction correspondent to 'textDir'");
+					}
+				}
+			]);
+
+			doh.register("log", function(){
+				dom.byId('failures').innerHTML = doh._failureCount;
+				dom.byId('errors').innerHTML = doh._errorCount;
+			});
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro">
+	<h1 class="testTitle"><b>Bidi TitlePane Test</b></h1>
+	<h1>Title pane with tooltip, textDir == 'auto'</h1>
+	<div id="pane_1" data-dojo-id="pane1" data-dojo-type="dijit/TitlePane" data-dojo-props='textDir:"auto", title:"\u05e9\u05dc\u05d5\u05dd Title Pane!",
+		tooltip:"\u05e9\u05dc\u05d5\u05dd I\"m the tooltip for Title Pane\"s title bar!",
+		style:"width: 500px;" '>
+		Arabic, Hebrew, Urdu, and Farsi (Persian) are written from right to left,
+		while numbers and segments of Latin (or Cyrillic or Greek) text are embedded in
+		this text from left to right. The dual directionality aspects of such
+		bidirectional (bidi) text are posing challenges to the way this text is processed and presented in computer applications.
+
+	</div>
+	<h1>Title pane, textDir == 'rtl'</h1>
+	<div id="pane_2" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane!", textDir:"ltr", tooltip:"Title Pane!", style:"width: 500px;"'>
+		The Unicode Bidirectional Algorithm, which is commonly used for preparation of Bidi text for display,
+		is not capable to reliably identify the natural base text direction for a given text.
+		Only a human reader can unfailingly recognize the natural base text direction for a given text.
+		Support for enforcing the base text direction is provided out of the box by most platforms / technologies,
+		but very often the default settings do not guarantee proper display of English and Arabic/Hebrew text in the
+		same application.	See for reference:	http://w3-03.ibm.com/globalization/page/publish/4353
+	</div>
+	<br>Errors:&nbsp;<span id="errors">?</span>
+	<br>Failures:&nbsp;<span id="failures">?</span>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/misc/Tooltip.html b/src/main/resources/static/dijit/tests/_BidiSupport/misc/Tooltip.html
new file mode 100644
index 0000000000000000000000000000000000000000..dd16a0982b78e672ee653ba69e60cc8b613b5e46
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/misc/Tooltip.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dojo Tooltip Widget Test with Bidi support</title>
+
+	<style type="text/css">
+		@import "../../../../dijit/themes/tundra/tundra.css";
+		@import "../../../../dojo/resources/dojo.css";
+
+		td { padding: 20px; }
+	</style>
+
+
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+
+	<script type="text/javascript">
+		dojo.require("dojo.parser");
+		dojo.require("doh.runner");
+
+		dojo.require("dijit.form.ValidationTextBox");
+		dojo.require("dijit.Tooltip");
+
+		dojo.ready(function(){
+			function checkContextualDir(text){
+				var fdc = /[A-Za-z\u05d0-\u065f\u066a-\u06ef\u06fa-\u07ff\ufb1d-\ufdff\ufe70-\ufefc]/.exec(text);
+				// if found return the direction that defined by the character, else return widgets dir as defult.
+				return fdc ? ( fdc[0] <= 'z' ? "ltr" : "rtl" ) : "ltr";
+			}
+			doh.register("tooltip text direction", [
+				{
+					name: "tooltip LTR text direction for LTR widget",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var tt = dijit.byId("id1_tooltip");
+						tt.open(dojo.byId("id1"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("ltr",tt.textDir, "textDir of : " + tt.id);
+							doh.is("ltr",dijit._masterTT.containerNode.dir, "direction of : " + tt.id);
+							tt.close();
+						}), 200);
+						return d;
+					}
+				},
+				{
+					name: "tooltip RTL text direction for LTR widget",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id2_tooltip");
+						tt.open(dojo.byId("id2"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("rtl",tt.textDir, "textDir of : " + tt.id);
+							doh.is("rtl",dijit._masterTT.containerNode.dir, "direction of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+
+					}
+				},
+				{
+					name: "tooltip AUTO text direction for LTR widget",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id3_tooltip");
+						tt.open(dojo.byId("id3"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("auto",tt.textDir, "textDir of : " + tt.id);
+							doh.is("rtl",dijit._masterTT.containerNode.dir, "direction of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				}
+			]);
+			doh.register("tooltip RTL text direction for tooltip with HTML inline elements", [
+				{
+					name: "tooltip RTL text direction for LTR widget",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id7_tooltip");
+						tt.open(dojo.byId("id7"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("rtl",tt.textDir, "textDir of : " + tt.id);
+							doh.is("rtl",dijit._masterTT.containerNode.dir, "direction of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				},
+				{
+					name: "tooltip LTR text direction for RTL widget",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id4_tooltip");
+						tt.open(dojo.byId("id4"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("ltr",tt.textDir, "textDir of : " + tt.id);
+							doh.is("ltr",dijit._masterTT.containerNode.dir, "direction of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				},
+				{
+					name: "tooltip text alignment for tooltip with dir 'rtl'",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id4_tooltip");
+						tt.open(dojo.byId("id4"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("right",dijit._masterTT.containerNode.align, "alignment of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				},
+				{
+					name: "tooltip RTL text direction for RTL widget",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id5_tooltip");
+						tt.open(dojo.byId("id5"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("rtl",tt.textDir, "textDir of : " + tt.id);
+							doh.is("rtl",dijit._masterTT.containerNode.dir, "direction of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				},
+				{
+					name: "tooltip AUTO text direction for RTL widget",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id6_tooltip");
+						tt.open(dojo.byId("id6"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("auto",tt.textDir, "textDir of : " + tt.id);
+							doh.is("rtl",dijit._masterTT.containerNode.dir, "direction of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("tooltip RTL text direction for tooltip with HTML inline elements", [
+				{
+					name: "tooltip RTL text direction for LTR widget",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id7_tooltip");
+						tt.open(dojo.byId("id7"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("rtl",tt.textDir, "textDir of : " + tt.id);
+							doh.is("rtl",dijit._masterTT.containerNode.dir, "direction of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("tooltip with children nodes", [
+				{
+					name: "tooltip AUTO text direction, check text direction for children",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id8_tooltip");
+						tt.open(dojo.byId("id8"));
+						setTimeout(d.getTestCallback(function(){
+							dojo.forEach(dijit._masterTT.containerNode.children, function(child){
+								var dir = checkContextualDir(dojo.isIE? child.outerText : child.textContent);
+								doh.is(dir, child.dir, "direction of : " + tt.id);
+							}, this);
+							doh.is("auto",tt.textDir, "textDir of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				},
+				{
+					name: "Check text direction for tooltip with AUTO text direction and RTL dir attribute",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id10_tooltip");
+						tt.open(dojo.byId("id10"));
+						setTimeout(d.getTestCallback(function(){
+							dojo.forEach(dijit._masterTT.containerNode.children, function(child){
+								var dir = checkContextualDir(dojo.isIE? child.outerText : child.textContent);
+								doh.is(dir, child.dir, "direction of nodes : " + tt.id);
+							}, this);
+							doh.is("auto",tt.textDir, "textDir of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				},
+				{
+					name: "Check alignment for tooltip with RTL dir attribute",
+					runTest: function(){
+					var d = new doh.Deferred();
+						var tt = dijit.byId("id10_tooltip");
+						tt.open(dojo.byId("id10"));
+						setTimeout(d.getTestCallback(function(){
+							doh.is("right",dijit._masterTT.containerNode.align, "alignment of : " + tt.id);
+							tt.close();
+						}), 400);
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body class="tundra">
+
+	<h1 class="testTitle">Tooltip test</h1>
+
+	<p>Mouse-over or focus the items below to test tooltips.</p>
+
+		<input type="text" id="id1" name="test1" data-dojo-type="dijit/form/ValidationTextBox" value="#1 tooltip ltr"/><br>
+		<input type="text" id="id2" name="test2" data-dojo-type="dijit/form/ValidationTextBox" value="#2 tooltip rtl"/><br>
+		<input type="text" id="id3" name="test3" data-dojo-type="dijit/form/ValidationTextBox" value="#3 tooltip auto"/><br><br />
+
+		<input type="text" id="id7" name="test7" data-dojo-type="dijit/form/ValidationTextBox" value="tooltip inline HTML elements"/><br><br />
+		<input type="text" id="id8" name="test8" data-dojo-type="dijit/form/ValidationTextBox" value="tooltip auto with children nodes"/><br>
+
+		<div dir="rtl">
+		<input type="text" id="id4" name="test4" data-dojo-type="dijit/form/ValidationTextBox" value="#4 tooltip ltr"/><br>
+		<input type="text" id="id5" name="test5" data-dojo-type="dijit/form/ValidationTextBox" value="#5 tooltip rtl"/><br>
+		<input type="text" id="id6" name="test5" data-dojo-type="dijit/form/ValidationTextBox" value="#6 tooltip auto"/><br><br />
+		</div>
+		<input type="text" id="id10" name="test10" data-dojo-type="dijit/form/ValidationTextBox" value="tooltip auto with children nodes" dir="rtl"/><br>
+
+	<br>
+
+
+
+	<span id="id1_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id1"], textDir: "ltr"'>&#1495;&#1491;&#1513;! tooltip #1 !!!</span>
+	<span id="id2_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id2"], textDir: "rtl"'>&#1495;&#1491;&#1513;! tooltip #2!!!</span>
+	<span id="id3_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id3"], textDir: "auto"'>&#1495;&#1491;&#1513;! tooltip  #3...</span>
+	<span id="id4_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id4"], textDir: "ltr", dir: "rtl"'>&#1495;&#1491;&#1513;!   tooltip #4 !!!</span>
+	<span id="id5_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id5"], textDir: "rtl"'>&#1495;&#1491;&#1513;! tooltip #5!!!</span>
+	<span id="id6_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id6"], textDir: "auto"'>&#1495;&#1491;&#1513;! tooltip  #6...</span>
+
+
+
+	<span id="id7_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id7"], textDir:"rtl"'>
+	<i>
+		&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!
+	</i>
+	textDir :
+	<b>
+		RTL...
+	</b></span>
+
+	<span id="id8_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id8"], textDir: "auto"'>
+		<b>
+			Tooltip "auto" with block elements
+		</b>
+		<div>
+			DIV element
+			<p> &#1506;&#1512;&#1498; &#1495;&#1491;&#1513; p element! </p>
+		</div>
+		<b>
+			&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!
+		</b>
+		<div>
+			&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!
+		</div>
+		<p>long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;text ..</p>
+	</span>
+
+	<span id="id10_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id10"], textDir: "auto", dir: "rtl"'>
+		<b>
+			Tooltip "auto" with block elements
+		</b>
+		<div>
+			DIV element
+			<p> &#1506;&#1512;&#1498; &#1495;&#1491;&#1513; p element! </p>
+		</div>
+		<b>
+			&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!
+		</b>
+		<div>
+			&#1506;&#1512;&#1498; &#1495;&#1491;&#1513;!
+		</div>
+		<p>long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;text ..</p>
+	</span>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/misc/TooltipDialog.html b/src/main/resources/static/dijit/tests/_BidiSupport/misc/TooltipDialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..892b0ddf3bd04f7dc423e41552927dda29418948
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/misc/TooltipDialog.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TooltipDialog Widget Automated (non-robot) Tests</title>
+
+	<style type="text/css">
+		@import "../../../themes/claro/document.css";
+		@import "../../css/dijitTests.css";
+	</style>
+
+	<!-- required: a default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="async: true, has: { 'dojo-bidi': true }"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dijit/registry",
+			"dijit/TooltipDialog",
+			"dijit/popup",
+			"dojo/domReady!"
+		], function(doh, registry, TooltipDialog, popup){
+
+			// Setup intentional global
+			toggleTextDir = function(){
+				var td = registry.byId("td");
+				td.set("textDir", (td.get("textDir") !== "rtl") ? "rtl" : "ltr");
+			};
+
+			doh.register("tests._BidiSupport.misc.TooltipDialog", [
+				{
+					name: "Bidi TooltipDialog test",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var td = new TooltipDialog({
+							id: "td",
+							textDir: "rtl",
+							title: "Title!",
+							content:
+								"<input id='dlg1_inputA'><br>" +
+								"<input id='dlg1_inputB'><br>" +
+								"<input id='dlg1_inputC'><br>" +
+								"<input type='button' value='Toggle title textDir' onclick='toggleTextDir();'>"
+						});
+						popup.open({
+							popup: td,
+							x: 10,
+							y: 50
+						});
+						doh.is(String.fromCharCode(8235), td.containerNode.title.charAt(0), "Dialog title tooltip should have direction correspondent to dialog's 'textDir'");
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro">
+	<h1 class="testTitle">Bidi TooltipDialog Test</h1>
+</body>
+</html>
+
+
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/misc/module.js b/src/main/resources/static/dijit/tests/_BidiSupport/misc/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..3574208ebad06e36b91682dafd2228b70f8c3da3
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/misc/module.js
@@ -0,0 +1,9 @@
+define(["doh/main", "require"], function(doh, require){
+
+	doh.register("_BidiSupport.misc.Tooltip.html", require.toUrl("./Tooltip.html"), 999999);
+	doh.register("_BidiSupport.misc.Dialog.html", require.toUrl("./Dialog.html"), 999999);
+	doh.register("_BidiSupport.misc.TooltipDialog.html", require.toUrl("./TooltipDialog.html"), 999999);
+	doh.register("_BidiSupport.misc.MenuItem.html", require.toUrl("./MenuItem.html"), 999999);
+	doh.register("_BidiSupport.layout.TitlePane", require.toUrl("./TitlePane.html"), 999999);
+
+});
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/misc/runTests.html b/src/main/resources/static/dijit/tests/_BidiSupport/misc/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..546619175a8ffd01496180cab9dffcce2f62b7b8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/misc/runTests.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>textDirTests Unit Test Runner</title>
+		<meta http-equiv="REFRESH" content="0;url=../../../../util/doh/runner.html?testModule=dijit.tests._BidiSupport.misc.module">
+	</head>
+	<body>
+		Redirecting to D.O.H runner.
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/module.js b/src/main/resources/static/dijit/tests/_BidiSupport/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..d12d34263c0c3d84439c6d60f12fb547a355b853
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/module.js
@@ -0,0 +1,9 @@
+define([
+	"./layout/module",
+	"./misc/module",
+	"./form/module",
+	"./BidiSupportModule/module",
+	"./inheritance/module",
+	"./dynamicallyChangeTextDir/module",
+	"./tree/module"
+], 1);
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/runTests.html b/src/main/resources/static/dijit/tests/_BidiSupport/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..e31d9e5ad876532946a4cdb755df05ac729000cf
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/runTests.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>textDirTests Unit Test Runner</title>
+		<meta http-equiv="REFRESH" content="0;url=../../../util/doh/runner.html?testModule=dijit.tests._BidiSupport.module">
+	</head>
+	<body>
+			Redirecting to D.O.H runner.
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/tree/ProgrammaticTree.html b/src/main/resources/static/dijit/tests/_BidiSupport/tree/ProgrammaticTree.html
new file mode 100644
index 0000000000000000000000000000000000000000..6967c66e45bb1d627f1830df2ef88a9121405829
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/tree/ProgrammaticTree.html
@@ -0,0 +1,258 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html dir="ltr">
+    <head>
+        <style type="text/css">
+            body, html { font-family:helvetica,arial,sans-serif; font-size:90%; }
+        </style>
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true, has: { 'dojo-bidi': true }">
+		</script>
+		<link id="themeStyles" rel="stylesheet" href="../../../../dijit/themes/claro/claro.css"/>
+        <script type="text/javascript">
+            dojo.require("doh.runner");
+			dojo.require("dojo.data.ItemFileWriteStore");
+            dojo.require("dijit.Tree");
+
+            dojo.ready(function() {
+                var store = new dojo.data.ItemFileWriteStore({
+                    url: "../../../../dijit/tests/_BidiSupport/_data/countriesHeb.json"
+                });
+                var treeModel = new dijit.tree.ForestStoreModel({
+                   store: store,
+                    query: {
+                        "type": "continent"
+                    },
+                    rootId: "root",
+                    rootLabel: "Continents!",
+                    childrenAttrs: ["children"]
+                });
+                new dijit.Tree({
+ 					textDir: "ltr",
+                    model: treeModel
+                },
+                "treeLtr");
+				new dijit.Tree({
+ 					textDir: "rtl",
+                    model: treeModel
+                },
+                "treeRtl");
+                new dijit.Tree({
+ 					textDir: "auto",
+                    model: treeModel
+                },
+                "treeAuto");
+				var treeRtl, treeLtr, treeAuto, buttonLtr, buttonRtl, buttonAuto, buttonRenameCountry;
+				function testNodeAuto(node,textDir){
+					doh.is(node.tree._checkContextual(node.label), node.labelNode.dir, "direction of " + node.tree.id +" : rootNode");
+					if(!node.item.children){
+						return;
+					}
+					dojo.forEach(node.getChildren(), function(childNode){
+						//doh.is(textDir, childNode.labelNode.dir, "direction of " + childNode.tree.id + " element: " + i);
+						testNodeAuto(childNode,textDir);
+					});
+				}
+				function testNode(node,textDir){
+					doh.is(textDir, node.labelNode.dir, "direction of " + node.tree.id +" : rootNode");
+					if(!node.item.children){
+						return;
+					}
+					dojo.forEach(node.getChildren(), function(childNode){
+						//doh.is(textDir, childNode.labelNode.dir, "direction of " + childNode.tree.id + " element: " + i);
+						testNode(childNode,textDir);
+					});
+				}
+				function expandedNodesTextDirTest(tree, textDir){
+					textDir == "auto" ? testNodeAuto(tree.rootNode, textDir) : testNode(tree.rootNode, textDir);
+				}
+				function renameContinent(){
+					store.fetch({
+						query:{
+							type: "continent"
+						},
+						onComplete: rename,
+						queryOptions:{
+							deep: true
+						}
+					});
+				}
+				function renameCountry(){
+					store.fetch ({
+						query:{
+							type: "country"
+						},
+						onComplete: rename,
+						queryOptions:{
+							deep: true
+						}
+					});
+				}
+				function rename(items, request){
+					if(items){
+						var i;
+						for(i = 0; i < items.length; i++){
+							var item = items[i];
+							var newName = '\u05D0' + '_' + store.getValue(item, 'name');
+							store.setValue(item, 'name', newName);
+						}
+					}
+				}
+				buttonRenameCountry = dojo.byId("buttonRenameCountry");
+				dojo.connect(buttonRenameCountry, "onclick", renameCountry);
+				doh.register("initial", [
+					{
+						name: "initial dirs",
+						setUp: function(){
+							treeRtl = dijit.byId("treeRtl");
+							treeLtr = dijit.byId("treeLtr");
+							treeAuto = dijit.byId("treeAuto");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("rtl", treeRtl.rootNode.labelNode.dir, "direction of treeRtl: rootNode");
+								doh.is("ltr", treeLtr.rootNode.labelNode.dir, "direction of treeLtr: rootNode");
+								doh.is("ltr", treeAuto.rootNode.labelNode.dir, "direction of treeAuto: rootNode");
+								var rtlChildren = treeRtl.rootNode.getChildren(), ltrChildren = treeLtr.rootNode.getChildren(),
+									autoChildren = treeAuto.rootNode.getChildren();
+								for(var i = 0 ; i < rtlChildren.length ; i++){
+									doh.is("rtl", rtlChildren[i].labelNode.dir, "direction of treeRtl element: " + i);
+									doh.is("ltr", ltrChildren[i].labelNode.dir, "direction of treeLtr element: " + i);
+									doh.is(treeAuto._checkContextual(autoChildren[i].label), autoChildren[i].labelNode.dir, "direction of treeAuto element: " + autoChildren[i].label);
+								}
+							}), 100);
+							return d;
+						}
+					},
+					{
+						name: "expanded RTL",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							treeRtl.expandAll().then(d.getTestCallback(function(){
+								expandedNodesTextDirTest(treeRtl, "rtl");
+							}));
+							return d;
+						}
+					},
+					{
+						name: "expanded LTR",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							treeLtr.expandAll().then(d.getTestCallback(function(){
+								expandedNodesTextDirTest(treeLtr, "ltr");
+							}));
+							return d;
+						}
+					},
+					{
+						name: "expanded AUTO",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							treeAuto.expandAll().then(d.getTestCallback(function(){
+								expandedNodesTextDirTest(treeAuto, "auto");
+							}));
+							return d;
+						}
+					}
+				]);
+				doh.register("Dynamic change textDir", [
+					{
+						name: 'check "set("textDir", textDir)" function',
+						setUp: function(){
+							treeRtl = dijit.byId("treeRtl");
+							treeLtr = dijit.byId("treeLtr");
+							treeAuto = dijit.byId("treeAuto");
+							buttonLtr = dojo.byId("buttonLtr");
+							buttonRtl = dojo.byId("buttonRtl");
+							buttonAuto = dojo.byId("buttonAuto");
+						},
+						runTest: function(){
+							dijit.byId("treeRtl").set("textDir", "ltr");
+							expandedNodesTextDirTest(treeRtl, "ltr");
+							expandedNodesTextDirTest(treeAuto, "auto");
+						}
+					},
+					{
+						name: 'set using the buttons: LTR',
+						runTest: function(){
+							buttonLtr.click();
+							expandedNodesTextDirTest(treeRtl, "ltr");
+							expandedNodesTextDirTest(treeLtr, "ltr");
+							expandedNodesTextDirTest(treeAuto, "ltr");
+						}
+					},
+					{
+						name: 'set using the buttons: RTL',
+						runTest: function(){
+							buttonRtl.click();
+							expandedNodesTextDirTest(treeRtl, "rtl");
+							expandedNodesTextDirTest(treeLtr, "rtl");
+							expandedNodesTextDirTest(treeAuto, "rtl");
+						}
+					},
+					{
+						name: 'set using the buttons: AUTO',
+						runTest: function(){
+							buttonAuto.click();
+							expandedNodesTextDirTest(treeRtl, "auto");
+							expandedNodesTextDirTest(treeLtr, "auto");
+							expandedNodesTextDirTest(treeAuto, "auto");
+						}
+					}
+				]);
+				doh.register("Change Node label", [
+					{
+						name: 'check "_setLabelAttr" function',
+						runTest: function() {
+							renameContinent();
+							expandedNodesTextDirTest(treeAuto, "auto");
+						}
+					}
+				]);
+				doh.run();
+            });
+        </script>
+    </head>
+    <body class="claro">
+		<table>
+			<tr><td>
+					<label for="treeLtr" >
+						<b>  I'm a LTR Tree   </b>
+					</label>
+					<div id="treeLtr"></div>
+				</td>
+				<td>
+					<label for="treeRtl" >
+						<b>  I'm a RTL Tree   </b>
+					</label>
+					<div id="treeRtl"></div>
+				</td>
+				<td>
+					<label for="treeAuto" >
+						<b>  I'm a Contextual Tree   </b>
+					</label>
+					<div id="treeAuto"></div>
+				</td>
+			</tr>
+		</table>
+		<input id="buttonRtl" type="button" value="RTL"
+			onclick="dijit.byId('treeLtr').set('textDir','rtl');
+				dijit.byId('treeRtl').set('textDir','rtl');
+				dijit.byId('treeAuto').set('textDir','rtl');"
+		>
+		<input id="buttonLtr" type="button" value="LTR"
+			onclick="dijit.byId('treeLtr').set('textDir','ltr');
+				dijit.byId('treeRtl').set('textDir','ltr');
+				dijit.byId('treeAuto').set('textDir','ltr');"
+		>
+		<input id="buttonAuto" type="button" value="AUTO"
+			onclick="dijit.byId('treeLtr').set('textDir','auto');
+				dijit.byId('treeRtl').set('textDir','auto');
+				dijit.byId('treeAuto').set('textDir','auto');"
+		>
+		<input id="buttonRenameCountry" type="button" value="Rename Country">
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/tree/module.js b/src/main/resources/static/dijit/tests/_BidiSupport/tree/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..4375fe46e2278efd9dbae04ff8b48adbad7a6483
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/tree/module.js
@@ -0,0 +1,5 @@
+define(["doh/main", "require"], function(doh, require){
+
+	doh.register("_BidiSupport.tree.ProgrammaticTree.html", require.toUrl("./ProgrammaticTree.html"), 999999);
+
+});
diff --git a/src/main/resources/static/dijit/tests/_BidiSupport/tree/runTests.html b/src/main/resources/static/dijit/tests/_BidiSupport/tree/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..4013e3ebc8ade78c4c3683bd535d57aa3ca66920
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_BidiSupport/tree/runTests.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>Dijit Unit Test Runner</title>
+		<meta http-equiv="REFRESH" content="0;url=../../../../util/doh/runner.html?testModule=dijit.tests._BidiSupport.tree.module"></head>
+	<body>
+		Redirecting to D.O.H runner.
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Container.html b/src/main/resources/static/dijit/tests/_Container.html
new file mode 100644
index 0000000000000000000000000000000000000000..9ac1d3a585fdfa6e9e4ced49c15a1d5de2d68b70
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Container.html
@@ -0,0 +1,189 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Container</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/declare", "dojo/dom", "dojo/parser",
+			"dijit/a11y", "dijit/focus", "dijit/registry", "dijit/_WidgetBase", "dijit/_Container", "dijit/_Contained",
+			"dijit/tests/helpers", "dojo/domReady!"
+		], function(doh, declare, dom, parser, a11y, focus, registry, _WidgetBase, _Container, _Contained, helpers){
+
+			declare("TestContainer",
+					[_WidgetBase, _Container], { }
+			);
+
+			declare("TestContained",
+					[_WidgetBase, _Contained], {}
+			);
+
+			doh.register("parse", function(){
+				parser.parse();
+			});
+
+			doh.register("basic tests", [
+				{
+					name: "getChildren",
+					runTest: function(t){
+						var c = registry.byId("container");
+						var children = c.getChildren();
+						t.is(4, children.length);
+						t.is("zero", children[0].id);
+						t.is("one", children[1].id);
+						t.is("two", children[2].id);
+						t.is("three", children[3].id);
+					}
+				},
+				{
+					name: "_getSiblingOfChild",
+					runTest: function(t){
+						var c = registry.byId("container");
+						var children = c.getChildren();
+						t.is("one", c._getSiblingOfChild(children[0], 1).id);
+						t.is("two", c._getSiblingOfChild(children[1], 1).id);
+						t.is("three", c._getSiblingOfChild(children[2], 1).id);
+						t.is(null, c._getSiblingOfChild(children[3], 1));
+						t.is(null, c._getSiblingOfChild(children[0], -1));
+						t.is("zero", c._getSiblingOfChild(children[1], -1).id);
+						t.is("one", c._getSiblingOfChild(children[2], -1).id);
+						t.is("two", c._getSiblingOfChild(children[3], -1).id);
+					}
+				},
+				{
+					name: "getIndexOfChild",
+					runTest: function(t){
+						var c = registry.byId("container");
+						t.is(0, c.getIndexOfChild(registry.byId("zero")));
+						t.is(1, c.getIndexOfChild(registry.byId("one")));
+						t.is(2, c.getIndexOfChild(registry.byId("two")));
+						t.is(3, c.getIndexOfChild(registry.byId("three")));
+						t.is(-1, c.getIndexOfChild(registry.byId("outside")));
+						t.is(-1, c.getIndexOfChild(registry.byId("outsideCont")));
+					}
+				},
+				{
+					name: "getIndexInParent",
+					runTest: function(t){
+						t.is(0, registry.byId("zero").getIndexInParent());
+						t.is(1, registry.byId("one").getIndexInParent());
+						t.is(2, registry.byId("two").getIndexInParent());
+						t.is(-1, registry.byId("outsideCont").getIndexInParent());
+					}
+				},
+				{
+					name: "removeChild",
+					runTest: function(t){
+						var c = registry.byId("container");
+						var children = c.getChildren();
+						t.is(4, children.length);
+						c.removeChild(registry.byId("zero"));
+						c.removeChild(1); // should remove "two" - because zero is already removed
+						children = c.getChildren();
+						t.is(2, children.length);
+						t.is("one", children[0].id);
+						t.is("three", children[1].id);
+					}
+				},
+				{
+					name: "addChild",
+					runTest: function(t){
+						var c = registry.byId("container");
+
+						// Add child at beginning
+						c.addChild(registry.byId("zero"), 0);
+						children = c.getChildren();
+						t.is(3, children.length);
+						t.is("zero", children[0].id, "after addChild(zero), zero");
+						t.is("one", children[1].id, "after addChild(zero), one");
+						t.is("three", children[2].id, "after addChild(zero), three");
+
+						// Add child in middle
+						c.addChild(registry.byId("two"), 2);
+						children = c.getChildren();
+						t.is(4, children.length);
+						t.is("zero", children[0].id, "after addChild(two), zero");
+						t.is("one", children[1].id, "after addChild(two), one");
+						t.is("two", children[2].id, "after addChild(two), two");
+						t.is("three", children[3].id, "after addChild(two), three");
+
+						// Add child at end
+						c.addChild(new TestContained({id: "four"}));
+						children = c.getChildren();
+						t.is(5, children.length);
+						t.is("zero", children[0].id, "after addChild(four), zero");
+						t.is("one", children[1].id, "after addChild(four), one");
+						t.is("two", children[2].id, "after addChild(four), two");
+						t.is("three", children[3].id, "after addChild(four), three");
+						t.is("four", children[4].id, "after addChild(four), four");
+
+						// Add child at end with explicit position specified
+						c.addChild(new TestContained({id: "five"}), 5);
+						children = c.getChildren();
+						t.is(6, children.length);
+						t.is("zero", children[0].id, "after addChild(five), zero");
+						t.is("one", children[1].id, "after addChild(five), one");
+						t.is("two", children[2].id, "after addChild(five), two");
+						t.is("three", children[3].id, "after addChild(five), three");
+						t.is("four", children[4].id, "after addChild(five), four");
+						t.is("five", children[5].id, "after addChild(five), five");
+					}
+				}
+			]);
+
+			// Test for StackContainer etc. where each child is wrapped inside a <div>
+			doh.register("wrapped children", [
+				{
+					name: "getChildren",
+					runTest: function(t){
+						var c = registry.byId("wrappedContainer");
+						var children = c.getChildren();
+						t.is(3, children.length);
+						t.is("wrappedOne", children[0].id);
+						t.is("wrappedTwo", children[1].id);
+						t.is("wrappedThree", children[2].id);
+					}
+				},
+				{
+					name: "getPreviousSibling / getNextSibling",
+					runTest: function(t){
+						var c = registry.byId("wrappedTwo");
+						t.is("wrappedOne", c.getPreviousSibling().id);
+						t.is("wrappedThree", c.getNextSibling().id);
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body>
+
+<label for="input">before:</label><input id="input"/>
+<div id="container" data-dojo-type="TestContainer">
+	<!-- comment just to make sure that numbering isn't thrown off -->
+	<div id="zero" data-dojo-type="TestContained"></div>
+	<div id="one" data-dojo-type="TestContained"></div>
+	<div id="two" data-dojo-type="TestContained"></div>
+	<div id="three" data-dojo-type="dijit/_WidgetBase"></div>
+</div>
+<div id="outside" data-dojo-type="dijit/_WidgetBase"></div>
+<div id="outsideCont" data-dojo-type="TestContained"></div>
+
+
+<div id="wrappedContainer" data-dojo-type="TestContainer">
+	<div id="wrappedOne" data-dojo-type="TestContained"></div>
+	<div id="wrappedTwo" data-dojo-type="TestContained"></div>
+	<div id="wrappedThree" data-dojo-type="TestContained"></div>
+</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_HasDropDown.html b/src/main/resources/static/dijit/tests/_HasDropDown.html
new file mode 100644
index 0000000000000000000000000000000000000000..788614eca248a97615256f83560ff820e3781ab3
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_HasDropDown.html
@@ -0,0 +1,286 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>_HasDropDown unit test</title>
+
+<script type="text/javascript" src="boilerplate.js"></script>
+
+<script type="text/javascript">
+require([
+	"doh/runner",
+	"dojo/_base/declare", "dojo/dom-geometry", "dojo/has", "dojo/keys", "dojo/on", "dojo/_base/window",
+	"dijit/_HasDropDown", "dijit/_WidgetBase", "dijit/_TemplatedMixin",
+	"dijit/tests/helpers", "dojo/domReady!"
+], function(doh, declare, domGeom, has, keys, on, win,
+			_HasDropDown, _WidgetBase, _TemplatedMixin, helpers){
+
+
+	var SimplePopup = declare([_WidgetBase, _TemplatedMixin], {
+		// summary:
+		//		A trivial popup widget
+
+		templateString: "<div></div>",
+
+		label: "i'm a popup",
+		_setLabelAttr: { node: "domNode", type: "innerText" }
+	});
+
+	var SimpleDropDownButton = declare([_WidgetBase, _TemplatedMixin, _HasDropDown], {
+		// summary:
+		//		A button that shows a popup.
+
+		templateString: "<button></button>",
+
+		label: "show dropdown",
+		_setLabelAttr: { node: "domNode", type: "innerText" },
+
+		popupLabel: "i'm a popup",
+		_setPopupLabel: "dropDown",
+
+		orient: ["below"],
+
+		postCreate: function(){
+			this.inherited(arguments);
+			this.dropDown = new SimplePopup({
+				id: this.id + "_popup"
+			});
+		}
+	});
+
+	var NonFocusableDropDownButton = declare([_WidgetBase, _TemplatedMixin, _HasDropDown], {
+		// summary:
+		//		A non-focusable "button" that shows a popup.   Should work for mouse, although not for keyboard.
+
+		label: "show popup (non-focusable)",
+		orient: ["below"],
+
+		templateString: "<span>${label}</span>",
+
+		postCreate: function(){
+			this.inherited(arguments);
+			this.dropDown = new SimplePopup({
+				id: this.id + "_popup",
+				label: "popup from non-focusable"
+			});
+		}
+	});
+
+	// Synthetic events.   Could alternately use robot.
+	function key(node, key){
+		on.emit(node, "keydown", {
+			keyCode: key,
+			bubbles: true
+		});
+		on.emit(node, "keyup", {
+			keyCode: key,
+			bubbles: true
+		});
+	}
+	function click(node){
+		on.emit(node, has("pointer-events") ? "pointerdown" : has("MSPointer") ? "MSPointerDown" : "mousedown", {
+			button: 0,	// left button (except on IE quirks mode, when it's 1)
+			bubbles: true
+		});
+		on.emit(node, has("pointer-events") ? "pointerup" : has("MSPointer") ? "MSPointerUp" : "mouseup", {
+			button: 0,	// left button (except on IE quirks mode, when it's 1)
+			bubbles: true
+		});
+		on.emit(node, "click", {
+			bubbles: true
+		});
+	}
+
+	doh.register("basic", [
+		function setup(){
+			dd = new SimpleDropDownButton({
+				id: "dd",
+				label: "show dropdown - ltr"
+			}).placeAt(win.body());
+			popup = dd.dropDown;
+			doh.t(!!popup, "popup exists");
+		},
+		function open(){
+			var d = new doh.Deferred();
+			click(dd.domNode);
+			setTimeout(d.getTestCallback(function(){
+				doh.t(helpers.isVisible(popup), "popup visible");
+				var anchorPos = domGeom.position(dd.domNode),
+					dropDownPos = domGeom.position(popup.domNode);
+				doh.t(Math.abs(anchorPos.x - dropDownPos.x) < 1, "drop down and anchor left aligned");
+				doh.t(Math.abs(anchorPos.w - dropDownPos.w) < 1, "drop down same width as anchor");
+			}), 10);
+			return d;
+		},
+		function close(){
+			dd.closeDropDown();
+			doh.t(helpers.isHidden(popup), "popup hidden");
+		},
+		function openBySpace(){
+			var d = new doh.Deferred();
+			key(dd.domNode, keys.SPACE);
+			setTimeout(d.getTestCallback(function(){
+				doh.t(!!popup, "popup exists");
+				doh.t(helpers.isVisible(popup), "popup visible again");
+			}), 10);
+			return d;
+		},
+		function close2(){
+			dd.closeDropDown();
+			doh.t(helpers.isHidden(popup), "popup hidden again");
+		}
+		// TODO: open by down arrow
+	]);
+
+	doh.register("rtl", [
+		function setup(){
+			dd = new SimpleDropDownButton({
+				id: "rdd",
+				dir: "rtl",
+				label: "show dropdown - rtl"
+			}).placeAt(win.body());
+			popup = dd.dropDown;
+			doh.t(!!popup, "popup exists");
+		},
+		function open(){
+			var d = new doh.Deferred();
+			click(dd.domNode);
+			setTimeout(d.getTestCallback(function(){
+				doh.t(helpers.isVisible(popup), "popup visible");
+				var anchorPos = domGeom.position(dd.domNode),
+					dropDownPos = domGeom.position(popup.domNode);
+				doh.t(Math.abs(anchorPos.x - dropDownPos.x) < 1, "drop down and anchor left aligned");
+				doh.t(Math.abs(anchorPos.w - dropDownPos.w) < 1, "drop down same width as anchor");
+			}), 10);
+			return d;
+		}
+	]);
+
+	doh.register("non focusable", [
+		function setup(){
+			ndd = new NonFocusableDropDownButton({id: "ndd"}).placeAt(win.body());
+			popup = ndd.dropDown;
+			doh.t(!!popup, "popup exists");
+		},
+		function open(){
+			var d = new doh.Deferred();
+			click(ndd.domNode);
+			setTimeout(d.getTestCallback(function(){
+				doh.t(helpers.isVisible(popup), "popup visible");
+			}), 10);
+			return d;
+		},
+		function close(){
+			ndd.closeDropDown();
+		}
+	]);
+
+	doh.register("alignment", [
+		function left(){
+			var d = new doh.Deferred();
+			var ltr = new SimpleDropDownButton({
+				id: "ltr",
+				label: "show non-auto-width dropdown - ltr",
+				autoWidth: false
+			}).placeAt(win.body());
+			click(ltr.domNode);
+			setTimeout(d.getTestCallback(function(){
+				var anchorPos = domGeom.position(ltr.domNode),
+					dropDownPos = domGeom.position(ltr.dropDown.domNode);
+				doh.t(Math.abs(anchorPos.x - dropDownPos.x) < 1, "drop down and anchor left aligned");
+				doh.t(anchorPos.w > dropDownPos.w, "anchor wider than drop down");
+			}), 10);
+			return d;
+		},
+		function right(){
+			var d = new doh.Deferred();
+			var rtl = new SimpleDropDownButton({
+				id: "rtl",
+				dir: "rtl",
+				label: "show non-auto-width dropdown - rtl",
+				autoWidth: false
+			}).placeAt(win.body());
+			click(rtl.domNode);
+			setTimeout(d.getTestCallback(function(){
+				var anchorPos = domGeom.position(rtl.domNode),
+					dropDownPos = domGeom.position(rtl.dropDown.domNode);
+				doh.t(Math.abs((anchorPos.x + anchorPos.w) - (dropDownPos.x + dropDownPos.w)) < 1,
+						"drop down and anchor right aligned");
+				doh.t(anchorPos.w > dropDownPos.w, "anchor wider than drop down");
+			}), 10);
+			return d;
+		}
+	]);
+
+	doh.register("autoWidth", [
+		function setup(){
+			dd = new SimpleDropDownButton({
+				id: "autowidth",
+				label: "auto width",
+				popupLabel: "x"		// start with narrow popup to test it gets expanded
+			}).placeAt(win.body());
+			popup = dd.dropDown;
+			doh.t(!!popup, "popup exists");
+		},
+		function open(){
+			var d = new doh.Deferred();
+			click(dd.domNode);
+			setTimeout(d.getTestCallback(function(){
+				doh.t(helpers.isVisible(popup), "popup visible");
+				var anchorPos = domGeom.position(dd.domNode),
+						dropDownPos = domGeom.position(popup.domNode);
+				doh.t(Math.abs(anchorPos.w - dropDownPos.w) < 1, "drop down same width as anchor");
+			}), 10);
+			return d;
+		},
+		function close(){
+			dd.closeDropDown();
+			doh.t(helpers.isHidden(popup), "popup hidden");
+		},
+		function open2(){
+			var d = new doh.Deferred();
+			dd.dropDown.set("label", "this is a very wide dropdown, wider than the button")
+			click(dd.domNode);
+			setTimeout(d.getTestCallback(function(){
+				doh.t(helpers.isVisible(popup), "popup visible");
+				var anchorPos = domGeom.position(dd.domNode),
+						dropDownPos = domGeom.position(popup.domNode);
+				doh.t(dropDownPos.w > anchorPos.w + 1,
+					"drop down wider than anchor, " + dropDownPos.w + ", " + anchorPos.w);
+			}), 10);
+			return d;
+		},
+		function close2(){
+			dd.closeDropDown();
+			doh.t(helpers.isHidden(popup), "popup hidden");
+		}
+	]);
+
+	doh.register("destroy", [
+		function setup(){
+			dd = new SimpleDropDownButton({id: "dd2"}).placeAt(win.body());
+			popup = dd.dropDown;
+			doh.t(!!popup, "popup exists");
+		},
+		function open(){
+			var d = new doh.Deferred();
+			click(dd.domNode);
+			setTimeout(d.getTestCallback(function(){
+				doh.t(helpers.isVisible(popup), "popup visible");
+				doh.is(1, require("dijit/popup")._stack.length, "in popup manager stack");
+			}), 10);
+			return d;
+		},
+		function destroy(){
+			dd.destroy();
+			doh.is(0, require("dijit/popup")._stack.length, "popup was closed");
+		}
+	]);
+
+	doh.run();
+});
+</script>
+</head>
+<body>
+<h1>_HasDropDown Unit Test</h1>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_KeyNavContainer.html b/src/main/resources/static/dijit/tests/_KeyNavContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..884989ac33b283a08666c204c3897399b331afae
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_KeyNavContainer.html
@@ -0,0 +1,227 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>_KeyNavContainer</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/declare", "dojo/dom", "dojo/keys", "dojo/on", "dojo/parser",
+			"dijit/a11y", "dijit/focus", "dijit/registry",
+			"dijit/_WidgetBase", "dijit/_KeyNavContainer",
+			"dijit/tests/helpers", "dojo/domReady!"
+		], function(doh, declare, dom, keys, on, parser, a11y, focus, registry, _WidgetBase, _KeyNavContainer, helpers){
+
+			declare("TestContainer", [_WidgetBase, _KeyNavContainer], {
+				postCreate: function(){
+					this.inherited(arguments);
+					this.connectKeyNavHandlers([keys.LEFT_ARROW, keys.UP_ARROW], [keys.RIGHT_ARROW, keys.DOWN_ARROW]);
+				}
+			});
+
+			declare("TestContained", _WidgetBase, {
+				// _KeyNavContainer requires children to have focus()
+				focus: function(){
+					this.domNode.focus();
+				}
+			});
+
+			declare("TestNotFocusedChildContainer", [_WidgetBase, _KeyNavContainer], {
+				// Some container may override focus and have 'focusedChild==null'
+				// dijit/form/Select is a sample
+				focus: function(){
+					this.domNode.focus();
+				}
+			});
+
+			doh.register("parse", function(){
+				parser.parse();
+			});
+
+
+			/*
+			 * Most of _KeyNavContainer is tested indirectly via Menu, Toolbar, etc. test suites, but
+			 * starting to build up some basic tests here.
+			 */
+
+			doh.register("basic", [
+				{
+					name: "initial",
+					runTest: function(){
+						var c = registry.byId("container");
+
+						// initially container has tabIndex of 0
+						doh.is(0, c.domNode.getAttribute("tabIndex"), "container tabIndex=0");
+
+						// and all the contents have tabIndex of -1, or no tab index
+						doh.f(a11y.isTabNavigable("zero"), "child not tab navigable");
+					}
+				},
+				{
+					name: "tab in",
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						var c = registry.byId("container");
+
+						// focusing container (simulated tabbing into container) should move focus to first child
+						c.focus();
+
+						setTimeout(d.getTestCallback(function(){
+							doh.is("zero", focus.curNode.id, "focus moved to first child");
+							doh.t(a11y.isTabNavigable("zero"), "child is tab navigable");
+							doh.isNot(0, c.domNode.getAttribute("tabIndex"), "container tabIndex removed or set to -1");
+						}), 0);
+
+						return d;
+					}
+				},
+				{
+					name: "next",
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						var c = registry.byId("container");
+
+						on.emit(c.domNode, "keydown", {keyCode: keys.DOWN_ARROW, bubbles: true, cancelable: true});
+
+						setTimeout(d.getTestCallback(function(){
+							doh.is("one", focus.curNode.id, "focus moved to second child");
+							doh.f(a11y.isTabNavigable("zero"), "zero not tab navigable");
+							doh.t(a11y.isTabNavigable("one"), "one tab navigable");
+						}), 0);
+
+						return d;
+					}
+				},
+				{
+					name: "previous",
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						var c = registry.byId("container");
+
+						on.emit(c.domNode, "keydown", {keyCode: keys.LEFT_ARROW, bubbles: true, cancelable: true});
+
+						setTimeout(d.getTestCallback(function(){
+							doh.is("zero", focus.curNode.id, "focus moved to first child");
+							doh.f(a11y.isTabNavigable("one"), "one not tab navigable");
+							doh.t(a11y.isTabNavigable("zero"), "zero tab navigable");
+						}), 0);
+
+						return d;
+					}
+				},
+				{
+					name: "tab out",
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						var c = registry.byId("container");
+
+						dom.byId("input").focus();
+
+						// tab index on container restored
+						setTimeout(d.getTestCallback(function(){
+							doh.f(a11y.isTabNavigable("zero"), "child not tab navigable");
+							doh.is(0, c.domNode.getAttribute("tabIndex"), "container tabIndex restored");
+						}), 0);
+
+						return d;
+					}
+				},
+				{
+					name: "mouse in",
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						var c = registry.byId("container");
+
+						dom.byId("zero").focus();
+
+						// focusing first child directly (simulated mouse click) should remove tabIndex on container
+						setTimeout(d.getTestCallback(function(){
+							doh.isNot(0, c.domNode.getAttribute("tabIndex"), "container tabIndex removed or set to -1");
+							doh.t(a11y.isTabNavigable("zero"), "child tab navigable");
+						}), 0);
+
+						return d;
+					}
+				},
+				{
+					name: "search (& match) in container with not focused child",
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						var c = registry.byId("notFocusedChildContainer");
+						c.focus();
+
+						doh.is("notFocusedChildContainer", focus.curNode.id, "container is focused");
+
+						// searach with no match
+						on.emit(c.domNode, "keypress", {charCode: 115 /* "s" */, bubbles: true, cancelable: true});
+
+						setTimeout(d.getTestCallback(function(){
+							doh.is("single", focus.curNode.id, "focus changed to child 'single'");
+						}), 0);
+
+						return d;
+					}
+				},
+				{
+					name: "search (& no match) in container with not focused child",
+					setUp: function() {
+						var d = this.d = new doh.Deferred();
+						window.onerror = function(msg){
+							d.reject(new Error(msg));
+						};
+					},
+					runTest: function(t){
+						var d = this.d;
+
+						var c = registry.byId("notFocusedChildContainer");
+						c.focus();
+
+						doh.is("notFocusedChildContainer", focus.curNode.id, "container is focused");
+
+						// searach with no match
+						on.emit(c.domNode, "keypress", {charCode: 97 /* "a" */, bubbles: true, cancelable: true});
+
+						setTimeout(d.getTestCallback(function(){
+							doh.is("notFocusedChildContainer", focus.curNode.id, "focus not changed");
+						}), 0);
+
+						return d;
+					},
+					tearDown: function(){
+						window.onerror = null;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body>
+
+	<label for="input">before:</label><input id="input"/>
+	<div id="container" data-dojo-type="TestContainer">
+		<!-- comment just to make sure that numbering isn't thrown off -->
+		<div id="zero" data-dojo-type="TestContained">zero</div>
+		<div id="one" data-dojo-type="TestContained">one</div>
+		<div id="two" data-dojo-type="TestContained">two</div>
+		<div id="three" data-dojo-type="TestContained">three</div>
+	</div>
+
+	<div id="notFocusedChildContainer" data-dojo-type="TestNotFocusedChildContainer">
+		<div id="single" data-dojo-type="TestContained">single</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Templated-widgetsInTemplate1.x.html b/src/main/resources/static/dijit/tests/_Templated-widgetsInTemplate1.x.html
new file mode 100644
index 0000000000000000000000000000000000000000..3ac17706510fe418bbb30db1b0955da9c023acac
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Templated-widgetsInTemplate1.x.html
@@ -0,0 +1,469 @@
+<html>
+	<head>
+		<title>testing widgetsInTemplate support</title>
+		<style type="text/css">
+			@import "../themes/claro/document.css";
+			@import "../themes/claro/claro.css";
+		</style>
+		<script type="text/javascript" src="../../dojo/dojo.js"
+			djConfig="isDebug: true"></script>
+		<script type="text/javascript">
+			dojo.require("doh.runner");
+
+			dojo.require("dojo.parser");
+
+			dojo.require("dijit._Widget");
+			dojo.require("dijit._Templated");
+			dojo.require("dijit.form.Button");
+			dojo.require("dijit.form.CheckBox");
+			dojo.require("dijit.ProgressBar");
+			dojo.require("dijit.layout.ContentPane");
+			dojo.require("dijit.layout.TabContainer");
+			dojo.require("dijit._Container");
+			dojo.require("dijit._Contained");
+			dojo.require("dijit.layout._LayoutWidget");
+
+			dojo.ready(function(){
+				var testW;
+
+				dojo.declare('Test1Widget', [dijit._Widget, dijit._Templated], {
+					templateString: dojo.byId('Test1Template').textContent || dojo.byId('Test1Template').innerText,
+					onClick: function(e){
+						if(e.target){
+							alert('onClick widgetId='+e.target.id);
+						}else{
+							if(e._counter == undefined){
+								e._counter = 1;
+							}else{
+								e._counter++;
+							}
+						}
+					}
+				});
+
+				dojo.declare('Test2Widget', [dijit._Widget, dijit._Templated], {
+					templateString: dojo.byId('Test2Template').textContent || dojo.byId('Test2Template').innerText
+				});
+
+				dojo.declare('Test4Widget', [dijit._Widget, dijit._Templated], {
+					templateString: dojo.byId('Test4Template').textContent || dojo.byId('Test4Template').innerText
+				});
+		
+				function validateTest4Widget(t, testW){
+					var selectedTab = dojo.query(".dijitTabChecked", testW.domNode)[0];
+					var selectedPane = dojo.query(".dijitVisible > .dijitTabPane", testW.domNode)[0];
+					var tabBox = selectedTab ? dojo.contentBox(selectedTab) : null;
+					var paneBox = selectedPane ? dojo.contentBox(selectedPane) : null;
+					t.t(tabBox && tabBox.w > 0 && tabBox.h > 0, "tabBox && tabBox.w > 0 && tabBox.h > 0");
+					t.t(paneBox && paneBox.w > 0 && paneBox.h > 0, "paneBox && paneBox.w > 0 && paneBox.h");
+					// Check that everything got started
+					t.t(testW._started, "testW._started");
+					t.t(testW.tabCont._started, "tabCont._started");
+					t.t(testW.tab1._started, "tab1._started");
+					t.t(testW.tab2._started, "tab2._started");
+				}
+
+				dojo.declare('TestLayoutWidget', dijit.layout._LayoutWidget, {
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+				dojo.declare('TestCtnrWidget', [dijit._Widget, dijit._Container], {
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+				dojo.declare('TestCtndWidget', [dijit._Widget, dijit._Contained], {
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+				dojo.declare('TestNonCtnrWidget', [dijit._Widget, dijit._Templated], {
+					templateString: "<div dojoAttachPoint=containerNode></div>",
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+				dojo.declare('TestStubWidget', dijit._Widget, {
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+		
+				dojo.declare('Test5Widget', [dijit._Widget, dijit._Templated], {
+					templateString: dojo.byId('Test5Template').textContent || dojo.byId('Test5Template').innerText,
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+		
+				function getTestWidgets(testW){
+					return [
+						testW,
+						testW.layout,
+						testW.layChild1,
+						testW.layChild2,
+						testW.container,
+						testW.contained1,
+						testW.contained2,
+						testW.nonContainer,
+						testW.nonContained1,
+						testW.nonContained2,
+						testW.threeLevel,
+						testW.secondLevel,
+						testW.bottomLevel,
+						testW.anotherThree,
+						testW.anotherSecond,
+						testW.anotherBottom,
+						testW.stub1
+					];
+				}
+		
+				function validateTest5Widget(t, testW){
+					// Check that everything got started, but not double-started
+					dojo.forEach(getTestWidgets(testW), function(w){
+						t.t(w._started, "w._started: " + w);
+						t.is(undefined, w._doubleStarted, "w._doubleStarted: " + w);
+					});
+				}
+		
+				function validateTest5WidgetDestroy(t, testW){
+					var savedWidgets = getTestWidgets(testW);
+					testW.destroy();
+					dojo.forEach(savedWidgets, function(w, idx){
+						t.t(w._destroyed, "w._destroyed: " + w);
+						t.is(undefined, w._doubleDestroyed, "w._doubleDestroyed: " + w);
+					});
+				}
+
+				dojo.declare("Missing", [dijit._Widget, dijit._Templated], {
+					templateString: '<div>' +
+										'<div dojoType="dijit.layout.ContentPane">' +
+											'<div dojoType="dijit.form.Button" id="missingButtonId" ' +
+											'dojoAttachPoint="missingButton">Missing...</div>' +
+										'</div>' +
+									'</div>'
+				});
+	
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+
+				doh.register("_Templated-widgetsInTemplate1.x",
+					[
+						{
+							name: "dojoAttachPoint",
+							runTest: function(t){
+								var testW = dijit.byId("test1Widget");
+								t.t(testW.normalNode, "normalNode");
+								t.f(isNaN(testW.normalNode.nodeType), "normalNode.nodeType");
+								t.t(testW.buttonWidget instanceof dijit.form.Button, "buttonWidget is Button");
+								t.t(testW.checkboxWidget instanceof dijit.form.CheckBox, "checkboxWidget is CheckBox");
+								t.t(testW.progressBarWidget instanceof dijit.ProgressBar, "progressBarWidget is ProgressBar");
+								testW = dijit.byId("test2Widget");
+								t.t(testW.containerNode, "containerNode");
+								t.f(isNaN(testW.containerNode.nodeType), "containerNode nodeType");
+								t.is(undefined,testW.buttonWidget, "buttonWidget undefined");
+								t.t(testW.checkboxWidget instanceof dijit.form.CheckBox, "checkboxWidget is still CheckBox");
+							}
+						},
+						{
+							name: "dojoAttachEvent",
+							runTest: function(t){
+								var testW = dijit.byId("test1Widget");
+								testW.buttonWidget._counter=0;
+								testW.buttonWidget.onClick(testW.buttonWidget);
+								testW.checkboxWidget._counter=0;
+								testW.checkboxWidget.onClick(testW.checkboxWidget);
+								testW.progressBarWidget._counter=0;
+								testW.progressBarWidget.onChange(testW.progressBarWidget);
+								t.is(1,testW.buttonWidget._counter, "buttonWidget._counter");
+								t.is(1,testW.checkboxWidget._counter, "checkboxWidget._counter");
+								t.is(1,testW.progressBarWidget._counter, "progressBarWidget._counter");
+							}
+						},
+						{
+							// Test that getDescendants ()
+							// finds direct descendants but skips widgetsInTemplates
+							// and also nested widgets (if direct==true)
+							name: "destruction",
+							runTest: function(t){
+								var testW = dijit.byId("test3Widget");
+
+
+/*** performance tests
+								var start = new Date();
+								for(var i=0; i<1000; i++)
+									testW.getChildren();
+								console.log("*** time for getChildren(): " + (new Date()-start));
+								var start = new Date();
+								for(var i=0; i<1000; i++)
+									testW.getDescendants();
+								console.log("*** time for getDescendants(false): " + (new Date()-start));
+***/
+								var chil = testW.getChildren();
+								t.is(5, chil.length, "number of direct descendants");
+								t.is(chil[0].id, "3.1");
+								t.is(chil[1].id, "3.2");
+								t.is(chil[2].id, "3.3");
+								t.is(chil[3].id, "3.4");
+								t.is(chil[4].id, "3.5");
+
+								var desc = testW.getDescendants();
+								t.is(7, desc.length, "number of descendants (including nested ones)");
+								t.is(desc[0].id, "3.1");
+								t.is(desc[1].id, "3.2");
+								t.is(desc[2].id, "3.3");
+								t.is(desc[3].id, "3.nested");
+								t.is(desc[4].id, "3.nested2");
+								t.is(desc[5].id, "3.4");
+								t.is(desc[6].id, "3.5");
+							}
+						},
+						{
+							// Check that declarative widget with layout widgets in template is correctly created and rendered
+							name: "declarative widget with layout widgets",
+							runTest: function(t){
+								validateTest4Widget(t, dijit.byId("test4Widget"));
+							}
+						},
+						{
+							// Check that programmatic widget with layout widgets in template is correctly created and rendered
+							name: "programmatic widget with layout widgets",
+							runTest: function(t){
+								test4WidgetProgrammatic = new Test4Widget({}).placeAt("test4Widget", "after");
+								test4WidgetProgrammatic.startup();
+								validateTest4Widget(t, test4WidgetProgrammatic);
+							}
+						},
+						{
+							// Compare programmatic and declaratively created widget with layout widgets in template
+							name: "programmatic vs declarative with layout widgets",
+							runTest: function(t){
+								// Focus unrelated element, so that we don't have different classes on our two widgets
+								dojo.byId("plainInput").focus();
+								var declW = dijit.byId("test4Widget");
+								var progW = test4WidgetProgrammatic;
+
+								// Check that generated HTML in DOM is same
+								var declNeutralHtml = declW.domNode.innerHTML.replace(/_\d+/g, "");
+								var progNeutralHtml = progW.domNode.innerHTML.replace(/_\d+/g, "");
+								t.is(declNeutralHtml, progNeutralHtml, "progNeutralHtml");
+
+								// Check that dimensions are same
+								var declBox = dojo.contentBox(declW.domNode);
+								var progBox = dojo.contentBox(progW.domNode);
+								t.is(declBox.h, progBox.h, "progBox.h");
+								t.is(declBox.w, progBox.w, "progBox.w");
+							}
+						},
+						{
+							// Check that declarative widget with other widgets in template is correctly started
+							name: "declarative widget with many child widgets",
+							runTest: function(t){
+								validateTest5Widget(t, dijit.byId("test5Widget"));
+							}
+						},
+						{
+							// Check that programmatic widget with other widgets in template is correctly started
+							name: "programmatic widget with many child widgets",
+							runTest: function(t){
+								test5WidgetProgrammatic = new Test5Widget().placeAt("test5Widget", "after");
+								test5WidgetProgrammatic.startup();
+								validateTest5Widget(t, test5WidgetProgrammatic);
+							}
+						},
+						{
+							// Check that destroying our declarative widget works correctly
+							name: "declarative widget destruction",
+							runTest: function(t){
+								validateTest5WidgetDestroy(t, dijit.byId("test5Widget"));
+							}
+						},
+						{
+							// Check that destroying our programmatic widget works correctly
+							name: "programmatic widget destruction",
+							runTest: function(t){
+								validateTest5WidgetDestroy(t, test5WidgetProgrammatic);
+							}
+						},
+						{
+							// Test that dojoAttachPoint inside of a ContentPane (inside of a template) works
+							name: "ContentPane",
+							runTest: function(){
+								var testW = dijit.byId("missing");
+								doh.t(testW, "widget was created");
+								doh.t(testW.missingButton, "dojoAttachPoint created");
+								doh.is("dijit.form.Button", testW.missingButton.declaredClass, "and it's to a widget");
+								doh.t(dijit.byId("missingButtonId"), "nested widget also registered by id");
+							}
+						}
+					]
+				);
+				doh.run();
+			});
+		</script>
+	</head>
+	<body class="claro">
+		<h1>testing widgetsInTemplate support</h1>
+		<xmp id="Test1Template" style="display:none;">
+			<div>
+				<div dojoAttachPoint="normalNode" >normal node</div>
+				<button dojoAttachPoint="buttonWidget" dojoAttachEvent="onClick:onClick" dojoType="dijit.form.Button">button #1</button>
+				<div dojoAttachPoint="checkboxWidget" dojoAttachEvent="onClick:onClick" dojoType="dijit.form.CheckBox"></div> checkbox #1
+				<div dojoAttachPoint="progressBarWidget" dojoAttachEvent="onChange:onClick" style="width:400px"
+					maximum="200" progress="20" dojoType="dijit.ProgressBar"></div>
+			</div>
+		</xmp>
+	<div dojoType="Test1Widget" id="test1Widget" ></div>
+
+	<!-- TODO: this is a strange test; the containerNode shouldn't have any contents as they will be overwritten -->
+	<xmp id="Test2Template" style="display:none;">
+		<div>
+			<div dojoAttachPoint="containerNode" >
+				<div dojoAttachPoint="checkboxWidget" dojoType="dijit.form.CheckBox"></div>
+				checkbox #2
+			</div>
+		</div>
+	</xmp>
+	<div dojoType="Test2Widget" id="test2Widget" ><button dojoAttachPoint="buttonWidget" dojoType="dijit.form.Button">button #2</button></div>
+
+
+	<xmp id="Test3Template" style="display:none;">
+		<div>
+			<div dojoAttachPoint="checkboxWidget" dojoType="dijit.form.CheckBox"></div> checkbox #3
+			<div dojoAttachPoint="containerNode" ></div>
+		</div>
+	</xmp>
+		<script>
+			dojo.declare('Test3Widget', [dijit._Widget, dijit._Templated], {
+				templateString: dojo.byId('Test3Template').textContent || dojo.byId('Test3Template').innerText
+			});
+		</script>
+	<div dojoType="Test3Widget" id="test3Widget" >
+		<span>hello world</span>
+		<b style="border: 1px solid blue;">this is my
+			<button dojoType="dijit.form.Button" id="3.1">first button</button>
+		</b>
+		<button dojoType="dijit.form.Button" id="3.2">another button</button>
+		<i>and some more</i>
+		<div style="border: 1px solid red;">
+			<div dojoType="dijit.layout.ContentPane" style="border: 1px solid gray;" id="3.3">
+				<button dojoType="dijit.form.Button" id="3.nested">a nested button</button>
+				<button dojoType="dijit.form.Button" id="3.nested2">another nested button</button>
+			</div>
+			<button dojoType="dijit.form.Button" id="3.4">yet another button</button>
+			<button dojoType="dijit.form.Button" id="3.5">yet yet another button</button>
+		</div>
+	</div>
+
+	<!-- Test templated widget containing layout widgets in template -->
+	<xmp id="Test4Template" style="display:none;">
+		<div>
+			<div dojoType="dijit.layout.TabContainer" dojoAttachPoint="tabCont" style="height: 5em;">
+				<div dojoType="dijit.layout.ContentPane" dojoAttachPoint="tab1" title="Tab 1">
+					pane 1
+				</div>
+				<div dojoType="dijit.layout.ContentPane" dojoAttachPoint="tab2" title="Tab 2">
+					pane 2
+				</div>
+			</div>
+		</div>
+	</xmp>
+	<div dojoType="Test4Widget" id="test4Widget" ></div>
+
+	<!-- Test templated widget containing container and nested widgets in template -->
+	<xmp id="Test5Template" style="display:none;">
+		<div>
+			<div dojoType="TestLayoutWidget" dojoAttachPoint="layout">
+				<div dojoType="TestCtndWidget" dojoAttachPoint="layChild1"></div>
+				<div dojoType="TestCtndWidget" dojoAttachPoint="layChild2"></div>
+			</div>
+			<div dojoType="TestCtnrWidget" dojoAttachPoint="container">
+				<div dojoType="TestCtndWidget" dojoAttachPoint="contained1"></div>
+				<div dojoType="TestCtndWidget" dojoAttachPoint="contained2"></div>
+			</div>
+			<div dojoType="TestStubWidget" dojoAttachPoint="stub1"></div>
+			<div dojoType="TestNonCtnrWidget" dojoAttachPoint="nonContainer">
+				<div dojoType="TestStubWidget" dojoAttachPoint="nonContained1"></div>
+				<div dojoType="TestStubWidget" dojoAttachPoint="nonContained2"></div>
+			</div>
+			<div dojoType="TestCtnrWidget" dojoAttachPoint="threeLevel">
+				<div dojoType="TestNonCtnrWidget" dojoAttachPoint="secondLevel">
+					<div dojoType="TestStubWidget" dojoAttachPoint="bottomLevel"></div>
+				</div>
+			</div>
+			<div dojoType="TestNonCtnrWidget" dojoAttachPoint="anotherThree">
+				<div dojoType="TestCtnrWidget" dojoAttachPoint="anotherSecond">
+					<div dojoType="TestCtndWidget" dojoAttachPoint="anotherBottom"></div>
+				</div>
+			</div>
+		</div>
+	</xmp>
+	<div dojoType="Test5Widget" id="test5Widget" ></div>
+
+	<div dojoType="Missing" id="missing"></div>
+	<input id="plainInput"/>
+	</body>
+</html>
+
diff --git a/src/main/resources/static/dijit/tests/_TemplatedMixin.html b/src/main/resources/static/dijit/tests/_TemplatedMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..51d3150e0b85c8c8ed92f4acfa2135cf54d4e2af
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_TemplatedMixin.html
@@ -0,0 +1,238 @@
+<!DOCTYPE html>
+<html>
+	<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_TemplatedMixin tests</title>
+	<script type="text/javascript" src="boilerplate.js"></script>
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array", "dojo/_base/declare", "dojo/dom", "dojo/query",
+			"dijit/_WidgetBase", "dijit/_TemplatedMixin", "dijit/layout/LayoutContainer",
+			"dojo/domReady!"
+		], function(doh, array, declare, dom, query, _WidgetBase, _TemplatedMixin){
+
+			function getOuterHTML(/*DomNode*/ node){
+				var wrapper = document.createElement("div");
+				wrapper.appendChild(node);
+				return wrapper.innerHTML.toLowerCase();		// IE prints <BUTTON> rather than <button>; normalize it.
+			}
+
+			// Template with no variables (should be cached as a DOM tree)
+			declare("SimpleTemplate", [_WidgetBase, _TemplatedMixin], {
+				id: "",
+				_setIdAttr: null, // override _WidgetBase to not copy id to domNode
+
+				templateString: "<button type='button'><span>hello &lt; world</span></button>"
+			});
+
+			// Template with variables
+			declare("VariableTemplate", [_WidgetBase, _TemplatedMixin], {
+				id: "test2",
+				_setIdAttr: null, // override _WidgetBase to not copy id to domNode
+
+				num: 5,
+				bool: false,
+				text: "hello <i>&quot;'\" world",
+
+				templateString: "<button><span num=\"${num}\" value=\"${bool}\">${text}</span></button>"
+			});
+
+			// Template with ! variables (for literal substitution)
+			declare("ExclamationVariableTemplate", [_WidgetBase, _TemplatedMixin], {
+				markup: "<span>hello world</span>",
+
+				templateString: "<div>${!markup}</div>"
+			});
+
+			// Template that starts with special node (has to be constructed inside a <tbody>)
+			declare("TableRowTemplate", [_WidgetBase, _TemplatedMixin], {
+				id: "test3",
+				_setIdAttr: null, // override _WidgetBase to not copy id to domNode
+				text: "bar",
+
+				templateString: "<tr><td>${text}</td></tr>"
+			});
+
+			// Illegal substitution variable name
+			declare("IllegalSubstitution", [_WidgetBase, _TemplatedMixin], {
+				templateString: "<tr><td>${fake}</td></tr>"
+			});
+
+			// data-dojo-attach-point
+			declare("AttachPoint", [_WidgetBase, _TemplatedMixin], {
+				templateString: "<div style='border: 1px solid red'>" +
+						"<button data-dojo-attach-point='buttonNode,focusNode'>hi</button>" +
+						'<span><input data-dojo-attach-point="inputNode" value="input"/></span>' +
+						"<span data-dojo-attach-point='containerNode'></span>" +
+						"</div>"
+			});
+
+			// data-dojo-attach-event
+			declare("AttachEvent", [_WidgetBase, _TemplatedMixin], {
+				click: function(){
+					this.clickCalled = true;
+				},
+				onfocus: function(){
+					this.focusCalled = true;
+				},
+				focus2: function(){
+					this.focus2Called = true;
+				},
+				templateString: "<table style='border: 1px solid blue'><tr>" +
+						"<td><button type='button' data-dojo-attach-point='left' data-dojo-attach-event='onclick: click, onfocus'>left</button></td>" +
+						"<td><button type='button' data-dojo-attach-point='right' data-dojo-attach-event='onclick: click, onfocus: focus2'>right</button></td>" +
+						"</tr></table>"
+			});
+
+			var testW;
+
+			doh.register("_TemplatedMixin", [
+				function simple(t){
+					var widget = new SimpleTemplate({id: "test1"});
+					var wrapper = dom.byId("simpleWrapper");
+					wrapper.appendChild(widget.domNode);
+
+					// Different browsers have different orders for type=button and widgetid=... so simplify
+					// by just removing the type=button.
+					t.is('<button widgetid=\"test1\"><span>hello &lt; world</span></button>', wrapper.innerHTML.toLowerCase().replace(/ type="?button"?/, ""));
+				},
+
+				function variables(t){
+					var widget = new VariableTemplate();
+					var span = widget.domNode.getElementsByTagName("span")[0];
+					var text = (span.innerText || span.textContent).replace("&#x27", "'");
+					t.is("5", span.getAttribute("num"), "num attr");
+					t.is("false", span.getAttribute("value"), "value attr");
+					t.is("hello <i>&quot;'\" world", text, "span textContent");
+				},
+				function variables2(t){
+					var widget = new VariableTemplate({id: "myid", num: -5, bool: true, text: ""});
+					var span = widget.domNode.getElementsByTagName("span")[0];
+					var text = span.innerHTML;
+					t.is("-5", span.getAttribute("num"));
+					t.is("true", span.getAttribute("value"));
+					t.is("", text);
+				},
+				function variablesWithExclamation(t){
+					var widget = new ExclamationVariableTemplate();
+
+					// ExclamationVariableTemplate should create markup like
+					//		<div><span>hello world</span></div>
+					// The <span> comes from the ${!markup} variable.
+					var span = query("> *", widget.domNode);
+					t.is(1, span.length, "dom node has one child");
+					t.is("SPAN", span[0].nodeName.toUpperCase(), "which is a span");
+					t.is("hello world", span[0].innerHTML, "and the text is set correctly too");
+				},
+
+				function table(t){
+					var widget = new TableRowTemplate({text: "hello"});
+					var wrapper = dom.byId("trWrapper");
+					wrapper.appendChild(widget.domNode);
+					var actual = wrapper.innerHTML.toLowerCase().replace(/\r/g, "").replace(/\n/g, "");
+					t.is('<tr widgetid="test3"><td>hello</td></tr>', actual);
+				},
+				function illegal(t){
+					var hadException = false;
+					try{
+						var widget = new IllegalSubstitution();
+					}catch(e){
+						console.log(e);
+						hadException = true;
+					}
+					t.t(hadException);
+				},
+				function attachPoint(t){
+					var widget = new AttachPoint();
+					var wrapper = dom.byId("attachPointWrapper");
+					wrapper.appendChild(widget.domNode);
+					t.is(widget.containerNode.tagName.toLowerCase(), "span");
+					t.is(widget.buttonNode.tagName.toLowerCase(), "button");
+					t.is(widget.focusNode.tagName.toLowerCase(), "button");
+					t.is(widget.inputNode.tagName.toLowerCase(), "input");
+				},
+				function attachEvent(t){
+					var deferred = new doh.Deferred();
+					var widget = new AttachEvent();
+					var wrapper = dom.byId("attachEventWrapper");
+					wrapper.appendChild(widget.domNode);
+					widget.left.focus();
+					widget.right.focus();
+					setTimeout(deferred.getTestCallback(function(){
+						t.t(widget.focusCalled, "left focused");
+						t.t(widget.focus2Called, "right focused");
+					}), 50);
+					return deferred;
+				},
+
+				// Test IE problem having "length" as data-dojo-attach-point name
+				function length(){
+					var MyWidget = declare([_WidgetBase, _TemplatedMixin], {
+						name: "",
+						templateString: "<div>" +
+								"<input data-dojo-attach-point='focusNode' name='${name}'>" +
+								"<span data-dojo-attach-point='spanNode'>" +
+								"</div>"
+					});
+					var widget = new MyWidget({name: "length"});
+					doh.isNot(undefined, widget.focusNode, "focusNode");
+					doh.isNot(undefined, widget.spanNode, "spanNode");
+				}
+			]);
+
+			// This is more of a test of _WidgetBase, but putting here for convenience
+			// since it tests the case when srcNodeRef is swapped for a widget's template
+			doh.register("srcNodeRef", [
+				function replaceMe(){
+					var prev = dom.byId("replaceMe").previousSibling;
+
+					// This should swap out the <span id="replaceMe"> w/the widget
+					var widget = new SimpleTemplate({}, "replaceMe");
+
+					// Make sure the swap occurred
+					doh.is(widget.domNode, prev.nextSibling, "swapped");
+					doh.is(null, dom.byId("replaceMe"), "original node removed");
+
+					// For garbage collection widget.srcNodeRef should also be cleared
+					doh.is(null, widget.srcNodeRef, "srcNodeRef cleared");
+				}
+			]);
+
+			doh.register("_rendered", [
+				function preRendered(){
+					// Testing for when a widget's template is expanded on the server, so _rendered:true is passed
+					// as a parameter to the widget constructor.
+					var MyWidget = declare([_WidgetBase, _TemplatedMixin], {
+						declaredClass: "MyWidget",
+						templateString: "<input>"	// shouldn't be used, just listing a template for testing purposes
+					});
+					var widget = new MyWidget({
+						_rendered: true	// flag to not do template insertion
+					}, dom.byId("prerendered"));
+					doh.t(widget.heading, "heading attach point setup");
+					doh.is("h2", widget.heading.tagName.toLowerCase());
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+	</head>
+	<body>
+	<h1>_TemplatedMixin test</h1>
+
+	<div id="simpleWrapper"></div>
+	<table>
+		<tbody id="trWrapper"></tbody>
+	</table>
+	<div id="attachPointWrapper"></div>
+	<div id="attachEventWrapper"></div>
+	<span id="replaceMe"></span>
+
+	<!-- test for _rendered=true flag -->
+	<div id="prerendered">
+		<h2 data-dojo-attach-point="heading">hi</h2>
+	</div>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_TimePicker.html b/src/main/resources/static/dijit/tests/_TimePicker.html
new file mode 100644
index 0000000000000000000000000000000000000000..bf06daf97b0d8ced572d21b94bb83e1b7da3c033
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_TimePicker.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_TimePicker DOH Test</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/declare",
+			"dijit/_TimePicker",
+			"dojo/domReady!"
+		], function(doh, declare, _TimePicker){
+
+			doh.register("tests", [
+				function extended_range(){
+					var t1 = _TimePicker({}, "t1");
+					t1.set('value', new Date("December 11, 2011 00:09:30"));
+					doh.is(96, t1.timeMenu.children.length, 'num entries 1');
+				},
+				function constraints17250(){
+					var tp = new (declare(_TimePicker, {
+						isDisabledDate: function () {
+							return this.inherited(arguments);
+						}
+					}))();
+
+					tp.set('constraints', {
+						constructor: null,
+						clickableIncrement: 'T01:00:00',
+						set: function () {
+							throw new Error('Wrong set called');
+						}
+					});
+
+					tp.set('value', new Date());
+					doh.is(24, tp.timeMenu.children.length, 'Increment constraints should be copied but other non-constraint properties should not');
+				},
+				function min_max(){
+					var tp = _TimePicker({
+						pickerMin: "T09:00:00",
+						clickableIncrement: "T01:00:00",
+						pickerMax: "T17:00:00"
+					});
+					doh.is(9, tp.timeMenu.children.length, 'num entries');
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body>
+	<h1 class="testTitle">dijit._TimePicker automated tests (non-robot)</h1>
+	
+	<label for="t1">t1:</label>
+	<div id="t1" style="height: 200px; width: 150px; overflow: auto;"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Widget-attr.html b/src/main/resources/static/dijit/tests/_Widget-attr.html
new file mode 100644
index 0000000000000000000000000000000000000000..f09f4f205a37e2b3c6c96904255c7611f1cb4187
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Widget-attr.html
@@ -0,0 +1,331 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>widget attribute unit test (in constructor and get()/set())</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/_base/declare",
+			"dojo/dom", "dojo/dom-attr", "dojo/dom-class", "dojo/dom-style", "dojo/sniff",
+			"dijit/_WidgetBase", "dijit/_Widget",
+			"dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin",
+			"dojo/domReady!"
+		], function(doh, declare, dom, domAttr, domClass, domStyle, has,
+					_WidgetBase, _Widget, _TemplatedMixin, _WidgetsInTemplateMixin){
+
+			doh.register("attributes", [
+				// Test attributes mapped to DOMNodes
+				function domMapping(){
+					var IndividualMaps = declare([_WidgetBase, _TemplatedMixin], {
+						// Mapping foo to this.domNode.foo
+						foo:"",
+						_setFooAttr: "",
+		
+						// Mapping bar to this.buttonNode.bar
+						bar: "",
+						_setBarAttr: "buttonNode",
+		
+						// Mapping plainText to this.plainTextNode.innerHTML
+						plainText: "",
+						_setPlainTextAttr: {node: "plainTextNode", type: "innerText"},
+
+						teeny: false,
+						_setTeenyAttr: {node: "teenyNode", type: "toggleClass"},
+
+						templateString: "<div class='class1' style='border: 1px solid red; width: 456px'>" +
+											"<button data-dojo-attach-point='buttonNode,focusNode'>hi</button>" +
+											'<span><input data-dojo-attach-point="inputNode" value="input"></span>' +
+											"<span data-dojo-attach-point='containerNode'></span>" +
+											"<span data-dojo-attach-point='plainTextNode'>original plain text</span>" +
+											"<span data-dojo-attach-point='teenyNode'>teeny text</span>" +
+										"</div>"
+					});
+
+					var widget = new IndividualMaps({
+						foo:"value1",
+						bar:"value2",
+						"class":"class2",
+						style:"height: 123px",
+						plainText: "hello world <>&;",
+						teeny: true,
+						"name-with-dashes": "name with dashes"
+					}).placeAt(dom.byId("wrapper"));
+
+					// test attributes specified to constructor were copied over to DOM
+					doh.is("value1", widget.domNode.getAttribute("foo"), "widget.domNode.getAttribute('foo')");
+					doh.is("value2", widget.buttonNode.getAttribute("bar"), "widget.domNode.getAttribute('bar')");
+					doh.t(domClass.contains(widget.domNode, "class1"), "class1");
+					doh.t(domClass.contains(widget.domNode, "class2"), "class2");
+					doh.is("123px", widget.domNode.style.height, "height");
+					doh.is("456px", widget.domNode.style.width, "width");
+					doh.is("hello world &lt;&gt;&amp;;", widget.plainTextNode.innerHTML, "innerHTML");
+					doh.t(domClass.contains(widget.teenyNode, "teeny"), "teeny");
+				},
+
+				// Test attributes mapped to subwidgets
+				function subwidgetMapping(){
+					declare("MySubWidget", [_WidgetBase], {
+						_setFooAttr: function(val){
+							this.foo = val;
+							this.gotValue = true;	// set flag for testing purposes
+						}
+					});
+					var IndividualMaps = declare(
+							[_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+
+						// Mapping foo to this.subwidget.foo
+						foo:"",
+						_setFooAttr: "subwidget",
+
+						templateString:
+							"<div class='class1' style='border: 1px solid red; width: 456px'>" +
+								"<button data-dojo-type='MySubWidget' data-dojo-attach-point='subwidget'>hi</button>" +
+							"</div>"
+					});
+
+					var widget = new IndividualMaps({
+						foo: "value1"
+					}).placeAt(dom.byId("wrapper"));
+
+					// test attribute specified to constructor was copied over to subwidget
+					doh.is("value1", widget.subwidget.get("foo"), "widget.subwidget.get('foo')");
+					doh.t(widget.subwidget.gotValue, "gotValue");
+				},
+
+				// Test that certain attributes are automatically applied to focusNode or domNode.
+				// These are attributes that aren't mentioned at all in _WidgetBase.
+				function autoDomMapping(){
+					// Mapping to this.domNode
+					var w = new _WidgetBase({
+						title: "dom title",
+						"aria-labelledby": "foo",
+						role: "button"
+					});
+					doh.is("dom title", domAttr.get(w.domNode, "title"), "domNode title");
+					doh.is("foo", w.domNode.getAttribute("aria-labelledby", "domNode labelledby"));
+					doh.is("button", domAttr.get(w.domNode, "role"), "domNode role");
+
+					// Mapping to this.focusNode
+					var fw = new (declare([_WidgetBase, _TemplatedMixin], {
+						templateString: "<div><input data-dojo-attach-point='focusNode'/></div>"
+					}))({
+						title: "my title",
+						"aria-labelledby": "foo"
+					});
+					doh.is("my title", domAttr.get(fw.focusNode, "title"), "focusNode title");
+					doh.is("foo", fw.focusNode.getAttribute("aria-labelledby"), "focusNode labelledby");
+
+					// Mapping attributes with dashes and mixed case
+					var mc = new (declare([_WidgetBase, _TemplatedMixin], {
+						templateString: "<form></form>"
+					}))({
+						"accept-charset": "utf8",
+						"novalidate": "true"	// parser delivers as lowercase even though it's noValidate in JS obj
+					});
+					doh.is("utf8", mc.domNode.getAttribute("accept-charset"), "accept-charset");
+					if(has("ff") >= 4 || has("ie") >= 10 || has("webkit")){
+						// only works for HTML5 compliant browsers where novalidate is understood
+						// (also, hasAttribute() is not available on IE6/7)
+						doh.t(mc.domNode.hasAttribute("novalidate"), "noValidate");
+					}
+				},
+
+				// Test that creating a widget with type defined doesn't causes exceptions on IE6-8.
+				// This is really trying to test that markup like <input dojoType=WidgetBase type=text> works.
+				// (Todo: remove for 2.0)
+				function typeException(){
+					var node = document.createElement("input");
+					document.body.appendChild(node);
+					new _WidgetBase({
+						type: "text"
+					}, node);
+				},
+
+				// Test custom setters/getter methods
+				function customSetters(){
+					var CustomSetters = declare([_WidgetBase], {
+						foo: 0,
+						_setFooAttr: function(val){ this._set("foo", val + 5); },
+						_getFooAttr: function(val){ return this._get("foo") - 10; }
+					});
+
+					var widget = new CustomSetters({
+						foo: 100
+					});
+
+					doh.is(105, widget._get("foo"), "custom setter called at initialize time");
+					doh.is(95, widget.get("foo"), "custom getter called");
+
+					widget.set("foo", 50);
+					doh.is(55, widget._get("foo"), "custom setter called dynamically");
+					doh.is(45, widget.get("foo"), "custom getter still called");
+				},
+
+				// Test setters for attribute names with dashes
+				function settersForNamesWithDashes(){
+					var MyWidget = declare([_WidgetBase, _TemplatedMixin], {
+						"name-with-dashes": "",
+						_setNameWithDashesAttr: {node: "dashNode", type: "innerHTML"},
+
+						templateString: "<div>" +
+											"<span data-dojo-attach-point='dashNode'></span>" +
+										"</div>"
+					});
+
+					var widget = new MyWidget({
+						"name-with-dashes": "name with dashes"
+					}).placeAt(dom.byId("wrapper"));
+
+					doh.is("name with dashes", widget.get("name-with-dashes"), "get()");
+					doh.is("name with dashes", widget.dashNode.innerHTML, "innerHTML");
+
+					widget.set("name-with-dashes", "hello");
+					doh.is("hello", widget.dashNode.innerHTML);
+				},
+
+				// Test deprecated attr() method (remove for 2.0)
+				function attr(){
+					var MyWidget = new declare([_Widget, _TemplatedMixin], {
+						templateString: "<div><span data-dojo-attach-point=nameNode></span></div>",
+						_setNameAttr:  {node: "nameNode", type: "innerHTML"}
+					});
+
+					var b = new MyWidget();
+
+					// simple setting
+					b.attr("name", "thinger");
+					doh.is("thinger", b.attr("name"), "b.attr('name')");
+					doh.is("thinger", b.nameNode.innerHTML, "innerHTML");
+
+					// hash setting
+					b.attr({
+						name: "bang",
+						foo: "zap"
+					});
+					doh.is("bang", b.attr("name"), "hash set of bang");
+					doh.is("zap", b.attr("foo"), "hash set of zap");
+				},
+				
+				// Test deprecated attributeMap (remove for 2.0)
+				function attributeMap(){
+					var AttrMap = declare([_WidgetBase, _TemplatedMixin], {
+						attributeMap: {foo: "", bar: "buttonNode", plainText: {node: "plainTextNode", type: "innerText"}, teeny: {node: "teenyNode", type: "toggleClass"}},
+						templateString: "<div class='class1' style='border: 1px solid red; width: 456px'>" +
+											"<button data-dojo-attach-point='buttonNode,focusNode'>hi</button>" +
+											'<span><input data-dojo-attach-point="inputNode" value="input"></span>' +
+											"<span data-dojo-attach-point='containerNode'></span>" +
+											"<span data-dojo-attach-point='plainTextNode'>original plain text</span>" +
+											"<span data-dojo-attach-point='teenyNode'>teeny text</span>" +
+										"</div>"
+					});
+
+					var widget = new AttrMap({
+						foo:"value1",
+						bar:"value2",
+						"class":"class2",
+						style:"height: 123px",
+						plainText: "hello world <>&;",
+						teeny: true
+					}).placeAt(dom.byId("wrapper"));
+
+					// test that attributes specified to constructor were copied over to the DOM
+					doh.is("value1", widget.domNode.getAttribute("foo"), "widget.domNode.getAttribute('foo')");
+					doh.is("value2", widget.buttonNode.getAttribute("bar"), "widget.domNode.getAttribute('bar')");
+					doh.t(domClass.contains(widget.domNode, "class1"), "class1");
+					doh.t(domClass.contains(widget.domNode, "class2"), "class2");
+					doh.is("123px", widget.domNode.style.height, "height");
+					doh.is("456px", widget.domNode.style.width, "width");
+					doh.is("hello world &lt;&gt;&amp;;", widget.plainTextNode.innerHTML, "innerHTML");
+					doh.t(domClass.contains(widget.teenyNode, "teeny"), "teeny");
+				},
+
+				// Test that attributes set in the ctor when side effects setter exist
+				// are correctly applied
+				function ctorDependentAttributes(){
+					var TestWidget = declare(_WidgetBase, {
+						single: null,
+						multiple: [],
+						_setSingleAttr: function(value){
+							this._set("multiple", value != null ? [value] : null);
+							this._set("single", value);
+						},
+						_setMultipleAttr: function(value){
+							this._set("single", value ? (value.length > 0 ? value[0] : null) : null);
+							this._set("multiple", value);
+						}
+					});
+
+					var w1 = new TestWidget({
+							single : 5
+					});
+					var w2 = new TestWidget({
+							multiple: [5]
+					});
+					doh.is(5, w1.get("single"), "w1.single");
+					doh.is([5], w1.get("multiple"), "w1.multiple");
+					doh.is(5, w2.get("single"), "w2.single");
+					doh.is([5], w2.get("multiple"), "w2.multiple");
+				},
+
+				function moreCorrelatedProperties(){
+					var Widget = declare([_WidgetBase], {
+						foo: 10,
+						_setFooAttr: function(val){
+							this._set("foo", val);
+							this._set("bar", val + 1);
+						},
+
+						bar: 11,
+						_setBarAttr: function(val){
+							this._set("bar", val);
+							this._set("foo", val - 1);
+						}
+					});
+
+					var w1 = new Widget({foo: 30});
+					doh.is(30, w1.get("foo"), "w1.foo");
+					doh.is(31, w1.get("bar"), "w1.bar");
+
+					var w2 = new Widget({bar: 30});
+					doh.is(30, w2.get("bar"), "w2.bar");
+					doh.is(29, w2.get("foo"), "w2.foo");
+
+					var w3 = new Widget({});
+					doh.is(10, w3.get("foo"), "w3.foo");
+					doh.is(11, w3.get("bar"), "w3.bar");
+				},
+
+				function widgetWatch() {
+					var widget = new _WidgetBase({}),
+						expected = [ 'a', NaN ],
+						actual = [];
+
+					widget.watch('foo', function (key, oldValue, value) {
+						actual.push(value);
+					});
+
+					widget.set('foo', 'a');
+					widget.set('foo', 'a');
+					widget.set('foo', NaN);
+					widget.set('foo', NaN);
+
+					doh.is(expected, actual);
+
+					widget.destroyRecursive();
+				}
+			]);	// doh.register()
+
+			doh.run();
+
+		});	// require()
+
+	</script>
+</head>
+<body>
+	<h1>Dijit widget.get()/set() Unit Test</h1>
+	<div id="wrapper"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Widget-connect-performance.html b/src/main/resources/static/dijit/tests/_Widget-connect-performance.html
new file mode 100644
index 0000000000000000000000000000000000000000..4d6425a8688e98b4ba70ec01b4944321faa36f36
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Widget-connect-performance.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Test Dijit Internal Event: "ondijitclick"</title>
+
+	<script type="text/javascript" src="../../dojo/dojo.js" data-dojo-config="isDebug: true"></script>
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit._Widget");
+		dojo.require("dojo.parser");
+
+		dojo.ready(function(){
+			dojo.declare("MyWidget", dijit._Widget, {
+				_eventHandler: function(){}
+			});
+
+			doh.register("parse", function(){
+				dojo.parser.parse();
+			});
+
+			var connects = [];
+			doh.register("_widgetConnect",
+				[
+					{
+						name: "_Widget.connect x 100",
+						runTest: function(t){
+							var w = dijit.byId("widget1");
+							var n = dojo.byId("externalNode");
+							var sLen = w._connects.length;
+							for(var i = 0; i < 100; i++){
+								connects.push(w.connect(n, "onblur", "_eventHandler"));
+							}
+							t.is(100, w._connects.length - sLen);
+						}
+					},
+					{
+						name: "_Widget.connect - ondijitclick x 100",
+						runTest: function(t){
+							var w = dijit.byId("widget1");
+							var n = dojo.byId("externalNode");
+							var sLen = w._connects.length;
+							for(var i = 0; i < 100; i++){
+								connects.push(w.connect(n, "ondijitclick", "_eventHandler"));
+							}
+							t.is(100, w._connects.length - sLen);
+						}
+					},
+					{
+						name: "_Widget.disconnect x 200",
+						runTest: function(t){
+							var w = dijit.byId("widget1");
+							var n = dojo.byId("externalNode");
+							var sLen = w._connects.length;
+							for(var i = 0; i < 200; i++){
+								w.disconnect(connects[i]);
+							}
+							connects = [];
+							t.is(200, sLen - w._connects.length);
+						}
+					}
+				]
+			);
+			doh.run();
+		});
+
+	</script>
+</head>
+<body class="claro">
+	<div id="externalNode"></div>
+	<div id="widget1" data-dojo-type="MyWidget"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Widget-deferredConnect.html b/src/main/resources/static/dijit/tests/_Widget-deferredConnect.html
new file mode 100644
index 0000000000000000000000000000000000000000..fcc726c0d24e6363d7ca71a6f74a89e8c1e0df12
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Widget-deferredConnect.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_Widget deferred connection test</title>
+	<style type="text/css">
+		@import "../themes/claro/document.css";
+		@import "../themes/claro/claro.css";
+		@import "css/dijitTests.css";
+	</style>
+
+	<script type="text/javascript" src="../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+	<script>
+		dojo.require("dojo.parser");
+		dojo.require("dijit.form.Button");
+
+		overrodeMouseMoved = false;
+		bothOverrodeMouseMoved = false;
+		connectedMouseMoved = false;
+		bothConnectedMouseMoved = false;
+
+		function bothHandler(){
+			if(!bothOverrodeMouseMoved){
+				console.log("'both' button: overrode handler called");
+			}
+			bothOverrodeMouseMoved = true;
+		}
+
+		dojo.ready(function(){
+			dojo.connect(dijit.byId("connect"), "onMouseMove", function(){
+				if(!connectedMouseMoved){
+					console.log("'connect' button: mouse moved");
+				}
+				connectedMouseMoved = true;
+			});
+
+			dojo.connect(dijit.byId("both"), "onMouseMove", function(){
+				if(!bothConnectedMouseMoved){
+					console.log("'both' button: connected handler");
+				}
+				bothConnectedMouseMoved = true;
+			});
+		});
+
+	</script>
+</head>
+<body class="claro">
+	<h1>Test deferred connections</h1>
+	<p>
+		OnMouseMove is a deferred connection, _Widget only call dojo.connect()
+		(data-dojo-attach-event) to connect the onmousemove event on the focusNode to
+		the widget method if needed.
+	</p>
+	<p>
+		Mousing over the three buttons below should call the user-defined mouse-move
+		handlers.  The "both" button has two handlers, and they should both be called.
+	</p>
+
+	<!--
+		"overrode" button specifies an onmousemove handler on initialization.
+	-->
+	<button id="overrode" data-dojo-type="dijit/form/Button"
+		data-dojo-props='onMouseMove:function(){ if(!overrodeMouseMoved){ console.log("\"overrode\" button: mouse moved"); } overrodeMouseMoved = true; }'>
+		overrode
+	</button>
+
+	<!--
+		"connect" button essentially is doing a dojo.connect("connect", "onMouseMove", myFunc).
+		This should trigger an additional dojo.connect() call from Button.focusNode.onmousemove
+		to the Button.onMouseMove empty function.
+	-->
+	<button id="connect" data-dojo-type="dijit/form/Button">
+		connected
+	</button>
+
+	<button id="both" data-dojo-type="dijit/form/Button" data-dojo-props='onMouseMove:bothHandler'>
+		both
+	</button>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Widget-lifecycle.html b/src/main/resources/static/dijit/tests/_Widget-lifecycle.html
new file mode 100644
index 0000000000000000000000000000000000000000..369e37c3cbcd17d271697397230d1795b4eda859
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Widget-lifecycle.html
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+
+	<title>_WidgetBase lifecycle unit test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/declare", "dojo/dom",
+			"dijit/registry", "dijit/_WidgetBase",
+			"dojo/domReady!"
+		], function(doh, declare, dom, registry, _WidgetBase){
+
+			var obj = {
+				foo: function(){
+					// summary: empty function that we connect to
+				}
+			};
+
+			// Number of times foo was called while TestWidget existed
+			var calls = 0;
+
+			declare("TestWidget", _WidgetBase, {
+				postMixInProperties: function(){
+					// make sure we can call set for parameters that don't touch the DOM
+					this.set("foo", "bar");
+				},
+				postCreate: function(){
+					// Rather odd call to this.connect() For testing the connections are dropped on destroy()
+					this.connect(obj, "foo", function(){
+						calls++;
+					});
+				}
+			});
+
+			var w;
+
+			doh.register("create and destroy", [
+				{
+					name: "create",
+					runTest: function(t){
+						w = new TestWidget({id: "w1"}, "w1");
+
+						doh.t(registry.byId("w1"), "widget in registry");
+
+						// since there's no template, the widget just points to the srcNodeRef
+						doh.is(w.domNode, dom.byId("w1"), "srcNodeRef read in");
+
+						// test the connection
+						doh.is(0, calls, "foo() not called yet");
+						obj.foo();
+						doh.is(1, calls, "foo() called");
+					}
+				},
+				{
+					name: "destroy",
+					runTest: function(t){
+						w.destroy();
+
+						doh.f(registry.byId("w1"), "widget no longer in registry");
+
+						// test the connection was destroyed
+						calls = 0;
+						obj.foo();
+						doh.is(0, calls, "connection was deleted");
+
+						// test the DOM node was removed
+						doh.f(dom.byId("w1"), "DOM Node removed");
+					}
+				},
+				{
+					name: "destroy(true)  (preserving DOM node)",
+					runTest: function(t){
+						w = new TestWidget({id: "w2"}, "w2");
+
+						doh.t(registry.byId("w2"), "widget in registry");
+						w.destroy(true);
+
+						doh.f(registry.byId("w2"), "widget no longer in registry");
+
+						// test the DOM node *wasn't* removed
+						doh.t(dom.byId("w2"), "DOM Node left");
+					}
+				},
+				{
+					name: "create with undefined id",
+					runTest: function(t){
+						// If id is "specified" as undefined, generate a new one
+						w = new TestWidget({id: undefined});
+
+						doh.isNot(undefined, w.id)
+					}
+				},
+				{
+					name: "create where id specified in prototype",
+					runTest: function(t){
+						declare("TestWidgetWithId", _WidgetBase, {
+							id: "id-in-prototype"
+						});
+
+						// Creating without an id should use the id in the prototype
+						w = new TestWidgetWithId();
+						w.placeAt(document.body);
+						doh.t(registry.byId("id-in-prototype"), "widget in registry");
+						doh.is(w.domNode, dom.byId("id-in-prototype"), "id on domnode");
+						w.destroy();
+
+						// Then try overriding id
+						w = new TestWidgetWithId({id: "override"});
+						w.placeAt(document.body);
+						doh.t(registry.byId("override"), "widget in registry");
+						doh.is(w.domNode, dom.byId("override"), "id on domnode");
+						w.destroy();
+					}
+				},
+
+			]);
+
+			doh.register("setter calls on creation", function(){
+				// Make sure setters are called even for anonymous classes (#12122),
+				// and even when there's no value explicitly specified in the parameters
+				var fooSetterCalled,
+					MyWidget = declare(_WidgetBase, {
+						foo: 345,
+						_setFooAttr: function(val){
+							fooSetterCalled = val;
+							this._set("foo", val);
+						}
+					});
+
+				new MyWidget();
+
+				doh.is(345, fooSetterCalled, "fooSetterCalled");
+			});
+
+			doh.register("tweaking params in postMixInProperties", function(){
+				// Tests that property changes in postMixInProperties() are not lost (#16080)
+				var Test = declare(_WidgetBase, { foo: "bar", postMixInProperties: function(){ this.foo = "baz"; } });
+				var t = new Test({ foo: "blah" });
+				doh.is("baz", t.foo);
+			});
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body>
+	<div id="w1"></div>
+	<div id="w2"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Widget-on.html b/src/main/resources/static/dijit/tests/_Widget-on.html
new file mode 100644
index 0000000000000000000000000000000000000000..cd859a131a89b2928553654e41f1b586afc411cf
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Widget-on.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>_WidgetBase on() test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script>
+		require([
+			"doh/runner",
+			"dojo/_base/declare", "dojo/has", "dojo/_base/lang", "dojo/on", "dojo/parser", "dojo/touch",
+			"dijit/registry", "dijit/_WidgetBase", "dojo/domReady!"
+		], function(doh, declare, has, lang, on, parser, touch, registry, _WidgetBase){
+
+			var mousedOver, clicked;
+
+			doh.register("on", [
+				function setup(){
+					declare("MyWidget", _WidgetBase, {
+						postCreate: function(){
+							on(this.domNode, "click", lang.hitch(this, "onFooBar"));
+						},
+						onFooBar: function(){
+							// This is called whenever the widget is clicked
+						},
+						foobar: function(){
+							// A widget.on("foobar") should go to onFooBar() (above), not here
+						}
+					});
+
+					parser.parse();
+				},
+
+				function connect(){
+					// This should work despite the fact that the function onMouseOver has
+					// multiple capital letters
+					registry.byId("myWidget").on("mouseover", function(){
+						mousedOver = true;
+						console.log("mouseover event");
+					});
+
+					// Likewise, this should work despite the fact that the function onFooBar has
+					// multiple capital letters
+					registry.byId("myWidget").on("foobar", function(){
+						clicked = true;
+						console.log("click event");
+					});
+				},
+
+				function test(){
+					var myWidget = registry.byId("myWidget");
+
+					// Test that _WidgetBase.on() catches click event
+					doh.f(clicked, "clicked");
+					on.emit(myWidget.domNode, "click", {
+						bubbles: true,
+						cancelable: true,
+						which: 1
+					});
+					doh.t(clicked, "clicked");
+
+					// Test that _WidgetBase.on() catches mouseover event
+					doh.f(mousedOver, "mousedOver");
+					on.emit(myWidget.domNode, "mouseover", {
+						bubbles: true,
+						cancelable: true,
+						which: 1
+					});
+					doh.t(mousedOver, "mousedOver");
+				},
+
+				function synthetic(){
+					// Test that on() works for synthetic events
+
+					var myWidget = registry.byId("myWidget"),
+						touched;
+
+					myWidget.on(dojo.touch.press, function(){
+						touched = true;
+					});
+
+					var eventType = has("pointer-events") ? "pointerdown" : has("MSPointer") ?
+									"MSPointerDown" : has("touch-events") ? "touchstart" : "mousedown",
+						target = myWidget.domNode;
+
+					if(document.createEvent && target.dispatchEvent){
+						// This branch needed or the test fails on iOS in dojo/on,
+						// because changedTouches[0] isn't defined.
+
+						var touch = {
+							identifier: (new Date()).getTime(),
+							target: target,
+							screenX: 0,
+							screenY: 0,
+							clientX: 0,
+							clientY: 0,
+							pageX: 0,
+							pageY: 0
+						};
+
+						var mouseEvent = document.createEvent("MouseEvent");
+						mouseEvent.initMouseEvent(
+							eventType,
+							true,
+							true,
+							target.ownerDocument.defaultView,
+							0,
+							0,
+							0,
+							0,
+							0,
+							false,
+							false,
+							false,
+							false,
+							0,
+							document.body	// relatedTarget, for mouseout events
+						);
+
+						if(/touch/.test(eventType)){
+							mouseEvent['touches'] = [touch];
+							mouseEvent['targetTouches'] = [touch];
+							mouseEvent['changedTouches'] = [touch];
+						}
+
+						target.dispatchEvent(mouseEvent);
+					}else{
+						on.emit(myWidget.domNode, eventType, {
+							bubbles: true,
+							cancelable: true,
+							which: 1
+						});
+					}
+
+					doh.t(touched, "touched");
+				},
+
+				function syntheticNoCallbackArgs(){
+					var evt = null;
+					var MyWidget = declare(_WidgetBase, {
+						show: function(){
+							return this.emit('show');
+						},
+						onshow: function(e){
+							evt = e;
+						}
+					});
+					new MyWidget({}).show();
+					doh.isNot(null, evt, "onshow was called with event object");
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body>
+	<div id="myWidget" data-dojo-type="MyWidget">
+		mouseover and click events to console
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Widget-ondijitclick.html b/src/main/resources/static/dijit/tests/_Widget-ondijitclick.html
new file mode 100644
index 0000000000000000000000000000000000000000..b777ef816fd0d52d940c2ed8fe956957a919104e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Widget-ondijitclick.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Test Dijit Internal Event: "ondijitclick"</title>
+
+	<style>
+		div {
+			border: 1px solid blue;
+			margin: 1em;
+		}
+	</style>
+
+	<script type="text/javascript" src="../../dojo/dojo.js" data-dojo-config="isDebug: true"></script>
+	<script type="text/javascript">
+		dojo.require("dijit._WidgetBase");
+		dojo.require("dijit._OnDijitClickMixin");
+		dojo.require("dojo.parser");
+
+		dojo.ready(function(){
+			dojo.declare("WidgetWithOndijitclick", [dijit._WidgetBase, dijit._OnDijitClickMixin], {
+				clickCount: 0,
+				onClick: function(){
+				},
+				_onClick: function(evt){
+					this.clickCount++;
+					this.onClick(evt);
+				},
+				postCreate: function(){
+					this.connect(this.domNode, "ondijitclick", "_onClick");
+				}
+			});
+
+			dojo.parser.parse();
+		});
+	</script>
+</head>
+<body class="claro">
+	<h1>_Widget.ondijitclick test</h1>
+	<p>
+		This tests dijit's infrastructure for catching SPACE and ENTER key clicks on nodes
+		that aren't &lt;button&gt; or &lt;a&gt;, and therefore don't normally respond to keyboard
+		"click events".
+	</p>
+	<p>
+		Clicking the first widget moves focus to the plain button,
+		but that button itself shouldn't get a click event.   (There are some subtleties about
+		whether catch clicks on key-down or key-up so this tests to make sure we are doing
+		the right one.)
+	</p>
+	<div id="first" tabIndex="0" data-dojo-type="WidgetWithOndijitclick" data-dojo-props='
+			onClick:function(){ dojo.byId("plainbutton").focus(); }'>
+		click me using space or enter, to focus button below
+	</div>
+	<button id="plainbutton" onclick="console.log('plain button clicked'); window.clicked = true;" type="button" >plain button</button>
+
+	<div id="second" tabIndex="0" data-dojo-type="WidgetWithOndijitclick" data-dojo-props='
+			onClick:function(){ dojo.byId("textarea").focus(); }'>
+		click me using space or enter, to focus textarea below
+	</div>
+	<textarea id="textarea">hello world</textarea>
+
+	<br>
+	<button id="plainbutton2" style="margin-top: 2em;" type="button"
+			onClick="dojo.byId('third').focus();">
+		click me using space or enter, to focus ondijitclick widget below
+	</button>
+	<div id="third" tabIndex="0" data-dojo-type="WidgetWithOndijitclick" data-dojo-props='style:"margin-top: 0px;",
+			onFocus:function(){ console.log("onfocus on third"); window.onDijitClickFocus = true; },
+			onClick:function(){ console.log("onclick on third"); window.spuriousOnDijitClick = true; }'>
+		clicking the button above shouldn't cause my ondijitclick handler to fire
+	</div>
+	<br>
+	<div id="fourth" tabIndex="0" data-dojo-type="WidgetWithOndijitclick" data-dojo-props='style:"margin-top: 0px;",
+			onClick:function(){ alert("make sure can close this alert via keyboard"); }'>
+		Manual Test: Click me using space or enter to launch a JavaScript alert() from element using ondijitclick
+	</div>
+	<br>
+	Clicking this button should produce exactly one click event to console:
+	<button id="widgetbutton" tabIndex="0" data-dojo-type="WidgetWithOndijitclick">
+		button w/ondijitclick
+	</button>
+
+	<div id="outer">
+		Test for bubble of click
+		<div id="inner">
+			<span data-dojo-type="WidgetWithOndijitclick" id="bubbleTestWidget" tabindex="0">click me</span>
+			<span data-dojo-type="WidgetWithOndijitclick" id="bubbleTestWidget2" tabindex="0">click me too</span>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Widget-placeAt.html b/src/main/resources/static/dijit/tests/_Widget-placeAt.html
new file mode 100644
index 0000000000000000000000000000000000000000..92b354ef83ed3df47eb93ba2f72148e73c465bf1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Widget-placeAt.html
@@ -0,0 +1,248 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>_Widget.placeAt tests</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/aspect", "dojo/_base/declare", "dojo/dom",
+			"dijit/_WidgetBase", "dijit/form/Button",
+			"dijit/layout/ContentPane", "dijit/layout/TabContainer", "dijit/layout/BorderContainer",
+			"dojo/domReady!"
+		], function(doh, aspect, declare, dom, _WidgetBase, Button, ContentPane, TabContainer, BorderContainer){
+
+			var SimpleWidget = declare(_WidgetBase, {
+				buildRendering: function(){
+					this.domNode = document.createElement("div");
+					this.containerNode = document.createElement("div");
+					this.domNode.appendChild(this.containerNode);
+				}
+			});
+
+			function getFragment() {
+				var frag = document.createDocumentFragment();
+				frag.appendChild(document.createElement('div'));
+				frag.appendChild(document.createElement('div'));
+				frag.appendChild(document.createElement('div'));
+				return frag;
+			}
+
+			doh.register("placeAt document fragment", [
+				function placeAsLastNode(){
+					var frag = getFragment();
+					simple = (new SimpleWidget({id: "simple"})).placeAt(frag);
+					doh.assertEqual(simple.domNode, frag.lastChild);
+					simple.destroy();
+				},
+
+				function placeAsFirstNode(){
+					var frag = getFragment();
+					simple = (new SimpleWidget({id: "simple"})).placeAt(frag, "first");
+					doh.assertEqual(simple.domNode, frag.firstChild);
+					simple.destroy();
+				},
+
+				function placeAsOnlyNode() {
+					var frag = getFragment();
+					simple = (new SimpleWidget({id: "simple"})).placeAt(frag, "only");
+					doh.assertEqual(frag.childNodes.length, 1);
+					doh.assertEqual(simple.domNode, frag.firstChild);
+					simple.destroy();
+				},
+
+				function placeAtPosition() {
+					var frag = getFragment();
+					simple = (new SimpleWidget({id: "simple"})).placeAt(frag, 2);
+					doh.assertEqual(simple.domNode, frag.childNodes[2]);
+					simple.destroy();
+				}
+			]);
+
+			var simple, pane1, pane2, pane3, pane4, pane5;
+			doh.register("parent without addChild", [
+				function placeAsDOMNodeChild(){
+					// create a SimpleWidget
+					simple = (new SimpleWidget({id: "simple"})).placeAt("container");
+					doh.is(dom.byId("container"), simple.domNode.parentNode, "simple is child of container");
+				},
+
+				function placeAsWidgetChild(){
+					// add the child to the SimpleWidget now
+					pane1 = (new ContentPane({ title: "pane1" })).placeAt(simple);
+					doh.is(pane1, simple.getChildren()[0], "pane1 is child of SimpleWidget");
+					doh.is(simple.containerNode, pane1.domNode.parentNode, "pane1 added to simple.containerNode not simple.domNode")
+				},
+
+				function placeAsWidgetChildOrdered(){
+					// add this child (created second) as the new first child
+					pane2 = (new ContentPane({ title: "pane2" })).placeAt("simple", 0);
+					doh.is(simple.containerNode, pane2.domNode.parentNode, "pane2 added to simple.containerNode not simple.domNode")
+					doh.is(pane2, simple.getChildren()[0], "pane2 is new first child of SimpleWidget");
+					doh.is(pane1, simple.getChildren()[1], "pane1 is now second child of SimpleWidget");
+				},
+
+				function placeBeforeDomNode(){
+					var button = (new Button({})).placeAt(dom.byId("container"), "before");
+					doh.is(dom.byId("container"), button.domNode.nextSibling, "button is before tab container");
+				},
+
+				function placeBeforeDomNodeId(){
+					var button = (new Button({})).placeAt("container", "before");
+					doh.is(dom.byId("container"), button.domNode.nextSibling, "button is before tab container");
+				},
+
+				function placeFirstWidget(){
+					simple.startup();
+					pane4 = (new ContentPane({ title: "pane4" })).placeAt("simple", "first");
+					doh.is(simple.containerNode, pane4.domNode.parentNode, "pane4 added to simple.containerNode not simple.domNode")
+					doh.is(pane4, simple.getChildren()[0], "pane4 is new first child of SimpleWidget");
+					doh.t(pane4._started, "pane4 was automatically started because simple was already started")
+				},
+				function placeLastWidget(){
+					pane5 = (new ContentPane({ title: "pane5" })).placeAt(simple.containerNode, "last");
+					doh.is(pane5, simple.getChildren()[simple.getChildren().length-1], "pane5 is new last child of SimpleWidget");
+					doh.t(pane5._started, "pane5 was automatically started because simple was already started")
+				}
+			]);
+
+			var tc;
+			doh.register("TabContainer parent", [
+				function placeAsDOMNodeChild(){
+					// create a TabContainer
+					tc = (new TabContainer({
+						id: "tc",
+						style: "height:200px; width:200px"
+					}, "tabContainerThinger")).placeAt("container");
+
+					doh.is(dom.byId("container"), tc.domNode.parentNode, "TabContainer is child of container");
+				},
+
+				function placeAsWidgetChild(){
+					// add the child to the TabContainer now:
+					pane1 = (new ContentPane({ title: "pane1" })).placeAt(tc);
+
+					doh.is(pane1, tc.getChildren()[0], "pane1 is child of TabContainer");
+				},
+
+				function placeAsWidgetChildOrdered(){
+					// add this child (created second) as the first tab:
+					pane2 = (new ContentPane({ title: "pane2" })).placeAt(tc, 0);
+
+					doh.is(pane2, tc.getChildren()[0], "pane2 is new first child of TabContainer");
+					doh.is(pane1, tc.getChildren()[1], "pane1 is now second child of TabContainer");
+				},
+
+				function placeAsWidgetIdChild(){
+					// add the child to the TabContainer now:
+					pane3 = (new ContentPane({ title: "pane1" })).placeAt("tc");
+
+					doh.is(pane3, tc.getChildren()[2], "pane3 is child of TabContainer");
+				},
+
+				function startup(){
+					// just starting the TabContainer so we can do some more tests
+					tc.startup();
+					tc.selectChild(pane2);
+				},
+
+				function placeAsFirst(){
+					pane2.set("content","button should appear BEFORE this text");
+
+					// create a button, and add it to pane2 before the above text
+					var button = (new Button({
+						label:"alert",
+						onClick: function(){
+							alert('woot');
+						}
+					})).placeAt(pane2.containerNode, "first");
+
+					doh.is(button.domNode, pane2.containerNode.firstChild, "button is first child");
+					doh.is(3, button.domNode.nextSibling.nodeType, "button went before other content");
+				},
+
+				function placeBefore(){
+					// And a button, this time we'll place it before the TabContainer's dom.
+					// placeAt(refWidget, "before"/"after"/"replace") isn't supported in general,
+					// especially not when the grandparent has addChild()/removeChild() methods, but testing
+					// here for regressions in what does work
+					var otherButton = new Button({
+						label:"destroy TabContainer",
+						onClick:function(){
+							tc.destroyRecursive();
+						}
+					});
+					otherButton.placeAt("tc", "before");
+
+					// make sure it went before tc.domNode, not before tc.containerNode
+					doh.is(tc.domNode, otherButton.domNode.nextSibling, "otherButton is before tab container");
+
+					// since it doesn't have a widget parent it should have been started
+					doh.f(otherButton._started, "button wasn't started");
+				}
+			]);
+
+			doh.register("startup tests", [
+				function startup(){
+					var bc = new BorderContainer({
+						id: "bc",
+						style: "width:600px; height:400px"
+					});
+					bc.placeAt(document.body);
+					doh.is(document.body, bc.domNode.parentNode, "BorderContainer parentNode == document.body");
+
+					// add a center pane before BC startup
+					var centerStarted;
+					var center = new ContentPane({
+						region: "center",
+						content: "<p>center</p>"
+					});
+					aspect.after(center, "startup", function(){ centerStarted = true; }, true);
+					center.placeAt(bc);
+					doh.f(centerStarted, "center not started");	// shouldn't be started since BC itself isn't started
+					doh.is(bc, center.getParent(), "center ContentPane parent == BorderContainer");
+
+					// start BorderContainer
+					bc.startup();
+					doh.t(centerStarted, "center started");	// should be started along with BC
+
+					// add a left pane after startup
+					var leftStarted;
+					var left = new ContentPane({
+						region: "left",
+						content: "<p>wowzers</p>",
+						style: "width:100px"
+					});
+					aspect.after(left, "startup", function(){ leftStarted = true; }, true);
+					left.placeAt("bc");
+					doh.is(bc, left.getParent(), "left ContentPane parent == BorderContainer");
+					doh.t(leftStarted, "left ContentPane automatically started since BorderContainer was already started");
+
+					// add a top pane, and add content
+					var topStarted;
+					var top = new ContentPane({
+						region: "top",
+						style: "height:100px"
+					});
+					aspect.after(top, "startup", function(){ topStarted = true; }, true);
+					top.placeAt(bc).set("content","<div>some HTML text</div>");
+					doh.is(bc, top.getParent(), "top ContentPane parent == BorderContainer");
+					doh.t(topStarted, "top ContentPane automatically started since BorderContainer was already started");
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body>
+	<h1 class="testTitle">_Widget.placeAt tests</h1>
+
+	<div id="container">
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_Widget-subscribe.html b/src/main/resources/static/dijit/tests/_Widget-subscribe.html
new file mode 100644
index 0000000000000000000000000000000000000000..78d9aa36bbe2ff60a871ddf7d6dba07248f12ac0
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_Widget-subscribe.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Test Dijit Subscribe</title>
+
+	<script type="text/javascript" src="../../dojo/dojo.js" data-dojo-config="isDebug: true"></script>
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit._Widget");
+		dojo.require("dojo.parser");
+
+		dojo.ready(function(){
+			var numCallsInternal = 0;
+			var numCallsExternal = 0;
+			var externalString = "";
+			var internalSubscribe = null;
+	
+			dojo.declare("MyWidget", dijit._Widget, {
+				_subscribeHandlerInternal: function(){ numCallsInternal++; }
+			});
+
+			doh.register("parse", function(){
+				dojo.parser.parse();
+			});
+
+			doh.register("_widgetSubscribe",
+				[
+					{
+						name: "_Widget.subscribe - set up subscriptions",
+						runTest: function(t){
+							var w = dijit.byId("widget1");
+							internalSubscribe = w.subscribe("/custom/event",
+													"_subscribeHandlerInternal");
+							w.subscribe("/custom/event", function(){
+								if(this == w){
+									numCallsExternal++;
+								}
+							});
+							w.subscribe("/custom/setString", function(str){
+								if(this == w){
+									externalString = str;
+								}
+							});
+							doh.is(0, numCallsInternal);
+							doh.is(0, numCallsExternal);
+							doh.is("", externalString);
+							doh.isNot(null, internalSubscribe);
+						}
+					},
+					{
+						name: "_Widget.subscribe - publish events",
+						runTest: function(t){
+							var w = dijit.byId("widget1");
+							dojo.publish("/custom/event", []);
+							doh.is(1, numCallsInternal);
+							doh.is(1, numCallsExternal);
+							dojo.publish("/custom/setString", ["myString"]);
+							doh.is("myString", externalString);
+							dojo.publish("/custom/setString", ["anotherString"]);
+							doh.is("anotherString", externalString);
+						}
+					},
+					{
+						name: "_Widget.unsubscribe",
+						runTest: function(t){
+							var w = dijit.byId("widget1");
+							dojo.publish("/custom/event", []);
+							doh.is(2, numCallsInternal, "numCallsInternal");
+							doh.is(2, numCallsExternal, "numCallsExternal");
+							w.unsubscribe(internalSubscribe);
+							dojo.publish("/custom/event", []);
+							doh.is(2, numCallsInternal, "numCallsInternal again");
+							doh.is(3, numCallsExternal, "numCallsExternal again");
+						}
+					},
+					{
+						name: "_Widget.destroy",
+						runTest: function(t){
+							var w = dijit.byId("widget1");
+							w.destroy();
+							dojo.publish("/custom/event", []);
+							doh.is(2, numCallsInternal, "numCallsInternal");
+							doh.is(3, numCallsExternal, "numCallsExternal");
+							dojo.publish("/custom/setString", ["myString"]);
+							doh.is("anotherString", externalString, "externalString");
+						}
+					}
+				]
+			);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body class="claro">
+	<div id="widget1" data-dojo-type="MyWidget"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_WidgetsInTemplateMixin.html b/src/main/resources/static/dijit/tests/_WidgetsInTemplateMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..fdf2ee2538eaf1db99e24c5f99557e9f0ec01e45
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_WidgetsInTemplateMixin.html
@@ -0,0 +1,617 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+		<title>WidgetsInTemplateMixin.js</title>
+
+		<style type="text/css">
+			/* Make our tests stand out as easily identifiable content */
+			.testcontainer {
+				border: 10px yellow;
+				border-style: dashed;
+				padding: 1em;
+				margin: 1em;
+			}
+			.testcontainer > p {
+				padding: 0 1em;
+				font-weight: bold;
+			}
+		</style>
+
+		<script type="text/javascript" src="boilerplate.js"></script>
+		<script type="text/javascript">
+			require([
+				"doh", "dojo/_base/array", "dojo/_base/declare", "dojo/_base/window", "dojo/dom", "dojo/dom-geometry",
+				"dojo/html", "dojo/on", "dojo/query", "dojo/parser",
+				"dijit/registry", "dijit/_WidgetBase", "dijit/_Widget",
+				"dijit/_AttachMixin", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin",
+				"dijit/form/Button", "dijit/form/CheckBox", "dijit/form/TextBox",
+				"dijit/ProgressBar", "dijit/_Container", "dijit/_Contained",
+				"dijit/layout/ContentPane", "dijit/layout/_LayoutWidget", "dijit/layout/LayoutContainer",
+				"dijit/tests/resources/TestContextRequireWidget",
+				"dojo/domReady!"
+			], function(doh, array, declare, win, dom, domGeom, html, on, query, parser,
+					registry, _WidgetBase, _Widget, _AttachMixin, _TemplatedMixin, _WidgetsInTemplateMixin,
+					Button, CheckBox, TextBox, ProgressBar, _Container, _Contained, _LayoutWidget, LayoutContainer){
+
+				declare('Test1Widget', [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+					templateString: dom.byId('Test1Template').value,
+					onClick: function(e){
+						if(e.target){
+							alert('onClick widgetId='+e.target.id);
+						}else{
+							if(e._counter == undefined){
+								e._counter = 1;
+							}else{
+								e._counter++;
+							}
+						}
+					}
+				});
+
+				declare('Test3Widget', [_Widget, _TemplatedMixin, _WidgetsInTemplateMixin], {
+					templateString: dom.byId('Test3Template').value
+				});
+
+				declare('TestLayoutWidget', _LayoutWidget, {
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+
+				declare('TestCtnrWidget', [_WidgetBase, _Container], {
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+
+				declare('TestCtndWidget', [_WidgetBase, _Contained], {
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+
+				declare('TestNonCtnrWidget', [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+					templateString: "<div data-dojo-attach-point=containerNode></div>",
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+
+				declare('TestStubWidget', _WidgetBase, {
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+	
+				declare('Test5Widget',
+					[_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin],
+				{
+					templateString: dom.byId('Test5Template').value,
+					startup: function(){
+						if(this._started){
+							this._doubleStarted = true;
+						}
+						this.inherited(arguments);
+					},
+					destroy: function(){
+						if(this._destroyed){
+							this._doubleDestroyed = true;
+						}
+						this.inherited(arguments);
+						this._destroyed = true;
+					}
+				});
+
+				declare('Test6Widget', [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+					templateString: dom.byId('Test6Template').value,
+					clickCount: 0,
+					handleClick: function(){
+						this.clickCount++;
+					}
+				});
+
+				declare("Missing", [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+					templateString: '<div>' +
+										'<div data-dojo-type="dijit/layout/ContentPane">' +
+											'<div data-dojo-type="dijit/form/Button" data-dojo-props="id: \'missingButtonId\'" ' +
+											'data-dojo-attach-point="missingButton">Missing...</div>' +
+										'</div>' +
+									'</div>'
+				});
+
+				function getTest5WidgetsInTemplate(testW){
+					// summary:
+					//		Returns all the widgets in the template for a Test5Widget
+					return [
+						testW,
+						testW.layout,
+						testW.layChild1,
+						testW.layChild2,
+						testW.container,
+						testW.contained1,
+						testW.contained2,
+						testW.nonContainer,
+						testW.nonContained1,
+						testW.nonContained2,
+						testW.threeLevel,
+						testW.secondLevel,
+						testW.bottomLevel,
+						testW.anotherThree,
+						testW.anotherSecond,
+						testW.anotherBottom,
+						testW.stub1
+					];
+				}
+		
+				function validateTest5Widget(/*Test5Widget*/ testW, /*Boolean*/ started){
+					// Check that testW widget, and all the widgets in it's template, got started, but not double-started
+					array.forEach(getTest5WidgetsInTemplate(testW), function(w){
+						if(started){
+							doh.t(w._started, w + " should be started");
+						}else{
+							doh.f(w._started, w + " should not be started");
+						}
+						doh.is(undefined, w._doubleStarted, "w._doubleStarted: " + w);
+					});
+				}
+		
+				function validateTest5WidgetDestroy(t, testW){
+					var savedWidgets = getTest5WidgetsInTemplate(testW);
+					testW.destroy();
+					array.forEach(savedWidgets, function(w, idx){
+						doh.t(w._destroyed, "w._destroyed: " + w);
+						doh.is(undefined, w._doubleDestroyed, "w._doubleDestroyed: " + w);
+					});
+				}
+
+				doh.register("_AttachMixin-widgetInTemplate", [
+					function createAttachWidgetsCombo() {
+						/*** TEST _AttachMixin combined with _WidgetsInTemplateMixin ***/
+						var AttachWidgetsCombo = declare([ _WidgetBase, _AttachMixin, _WidgetsInTemplateMixin ], {
+
+							postCreate: function() {
+								html.set(this.heading, "Amazing things will happen if you click this button!!!");
+							},
+							_buttonClicked: function(e) {
+								html.set(this.heading, "Well that was boring. " +
+										"My attach point button thinks it is a " + (this.mybutton.isInstanceOf(Button) ? 'dijit/form/Button':'Gruffalo'));
+							}
+						});
+
+						var myawc = new AttachWidgetsCombo({}, dom.byId('attachMeThree'));
+
+						doh.t(myawc.heading, "heading");
+						doh.t(myawc.mybutton, "mybutton");
+						doh.is("Amazing things will happen if you click this button!!!", myawc.heading.innerHTML, "Initial value");
+
+						// Simulate clicking the button.   Don't use click() because it's not supported on a <span>
+						// in Android < 4.4.
+						on.emit(myawc.mybutton.focusNode, "click", {
+							bubbles: true,
+							cancelable: true
+						});
+
+						doh.is("Well that was boring. My attach point button thinks it is a dijit/form/Button", myawc.heading.innerHTML, "Post-op value");
+					},
+
+					function containerNode(){
+						// Test that widgets inside of containerNode aren't parsed by _WidgetsInTemplateMixin
+
+						declare("OuterWidget", [ _WidgetBase, _AttachMixin, _WidgetsInTemplateMixin ], {
+							// Prevent the main parser call from hitting my supporting widgets.
+							// But this also stops the parser from hitting anything inside my containerNode, so I need
+							// to do a recursive parse() like ContentPane does (or just extend ContentPane)
+							stopParser: true,
+
+							postCreate: function(){
+								doh.is(0, this.getChildren().length, "contained widget not created yet");
+								parser.parse(this.containerNode);
+							}
+						});
+						declare("SupportingWidget", _WidgetBase);
+						declare("ContainedWidget", _WidgetBase);
+						parser.parse(dom.byId("containerNode"));
+
+						doh.t("outerWidget" in window, "outer widget created");
+						doh.t(outerWidget.supportingWidget, "supporting widget instantiated");
+						doh.f(outerWidget.containedWidget, "contained widget not instantiated by _WidgetsInTemplateMixin parse call");
+
+						doh.is(1, outerWidget.getChildren().length, "contained widget created too");
+					}
+				]);
+
+				doh.register("_Templated-widgetsInTemplate", [
+					function parse(){
+						parser.parse("templateTests");
+					},
+					{
+						name: "data-dojo-attach-point",
+						runTest: function(t){
+							var testW = registry.byId("test1Widget");
+							doh.t(testW, "test1Widget was instantiated");
+							doh.t(testW.normalNode, "normalNode");
+							doh.f(isNaN(testW.normalNode.nodeType), "normalNode.nodeType");
+							doh.t(testW.buttonWidget instanceof Button, "buttonWidget is Button");
+							doh.t(testW.checkboxWidget instanceof CheckBox, "checkboxWidget is CheckBox");
+							doh.t(testW.progressBarWidget instanceof ProgressBar, "progressBarWidget is ProgressBar");
+						}
+					},
+					{
+						name: "data-dojo-attach-event",
+						runTest: function(t){
+							var testW = registry.byId("test1Widget");
+							testW.buttonWidget._counter=0;
+							testW.buttonWidget.onClick(testW.buttonWidget);
+							testW.checkboxWidget._counter=0;
+							testW.checkboxWidget.onClick(testW.checkboxWidget);
+							testW.progressBarWidget._counter=0;
+							testW.progressBarWidget.onChange(testW.progressBarWidget);
+							doh.is(1,testW.buttonWidget._counter, "buttonWidget._counter");
+							doh.is(1,testW.checkboxWidget._counter, "checkboxWidget._counter");
+							doh.is(1,testW.progressBarWidget._counter, "progressBarWidget._counter");
+						}
+					},
+					{
+						name: "data-dojo-attach-event strange name",
+						runTest: function(t){
+							// This is for testing data-dojo-attach-event to attach to a method in the widget,
+							// rather than using _WidgetBase.on(...).   Remove for 2.0.
+							var SubWidget = declare("SubWidget", _WidgetBase, {
+								f: function(){
+									// just for attaching to
+								}
+							});
+							var MainWidget = declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+								templateString:
+									'<div>' +
+										'<div data-dojo-type="SubWidget" data-dojo-attach-point="sw" ' +
+											' data-dojo-attach-event="f: g">' +
+									'</div>',
+								g: function(){
+									this.gWasCalled = true;
+								}
+							});
+							var mw = new MainWidget();
+							doh.t(mw.sw, "attach-point exists");
+							mw.sw.f();
+							doh.t(mw.gWasCalled, "attach-event worked");
+						}
+					},
+					{
+						// Test that getDescendants ()
+						// finds direct descendants but skips widgetsInTemplates
+						// and also nested widgets (if direct==true)
+						name: "getChildren",
+						runTest: function(t){
+							var testW = registry.byId("test3Widget");
+
+/*** performance tests
+							var start = new Date();
+							for(var i=0; i<1000; i++)
+								testW.getChildren();
+							console.log("*** time for getChildren(): " + (new Date()-start));
+							var start = new Date();
+							for(var i=0; i<1000; i++)
+								testW.getDescendants();
+							console.log("*** time for getDescendants(false): " + (new Date()-start));
+***/
+							var chil = testW.getChildren();
+							doh.is(5, chil.length, "number of direct descendants");
+							doh.is(chil[0].id, "3.1");
+							doh.is(chil[1].id, "3.2");
+							doh.is(chil[2].id, "3.3");
+							doh.is(chil[3].id, "3.4");
+							doh.is(chil[4].id, "3.5");
+
+							// remove this test for 2.0
+							var desc = testW.getDescendants();
+							doh.is(7, desc.length, "number of descendants (including nested ones)");
+							doh.is(desc[0].id, "3.1");
+							doh.is(desc[1].id, "3.2");
+							doh.is(desc[2].id, "3.3");
+							doh.is(desc[3].id, "3.nested");
+							doh.is(desc[4].id, "3.nested2");
+							doh.is(desc[5].id, "3.4");
+							doh.is(desc[6].id, "3.5");
+						}
+					},
+					{
+						// Check that declarative widget with other widgets in template is correctly started
+						name: "declarative widget with many child widgets",
+						runTest: function(t){
+							validateTest5Widget(registry.byId("test5Widget"), true);
+						}
+					},
+					{
+						// Check that programmatic widget with other widgets in template is correctly started
+						name: "programmatic widget with many child widgets",
+						runTest: function(t){
+							// Create widget.  Widgets in template should not be started yet.
+							test5WidgetProgrammatic = new Test5Widget();
+							validateTest5Widget(test5WidgetProgrammatic, false);
+
+							// Place widget in DOM and startup.  Widgets in template should now be started.
+							test5WidgetProgrammatic.placeAt("test5Widget", "after");
+							test5WidgetProgrammatic.startup();
+							validateTest5Widget(test5WidgetProgrammatic, true);
+						}
+					},
+					{
+						// Check that destroying our declarative widget works correctly
+						name: "declarative widget destruction",
+						runTest: function(t){
+							validateTest5WidgetDestroy(t, registry.byId("test5Widget"));
+						}
+					},
+					{
+						// Check that destroying our programmatic widget works correctly
+						name: "programmatic widget destruction",
+						runTest: function(t){
+							validateTest5WidgetDestroy(t, test5WidgetProgrammatic);
+						}
+					},
+					{
+						// Test that data-dojo-attach-point inside of a ContentPane (inside of a template) works
+						name: "ContentPane",
+						runTest: function(){
+							var testW = registry.byId("missing");
+							doh.t(testW, "widget was created");
+							doh.t(testW.missingButton, "data-dojo-attach-point created");
+							doh.is("dijit.form.Button", testW.missingButton.declaredClass, "and it's to a widget");
+							doh.t(registry.byId("missingButtonId"), "nested widget also registered by id");
+						}
+					},
+					{
+						// Test that data-dojo-attach-event bindings work with widgets in template, when
+						// binding to dijit/_Widget methods
+						name: "_Widget Deferred Connect methods",
+						runTest: function(){
+							var test6Widget = registry.byId("test6Widget");
+							doh.t(test6Widget.clickCount === 0, "click count was initially zero");
+							// Issue a 'click' event directly on the interior input of the TextBox
+							test6Widget.textbox.textbox.click();
+							doh.t(test6Widget.clickCount === 1, "click count incremented properly");
+						}
+					},
+
+					function widgetsInTemplateLifecycle(t){
+
+						var result = [], expected = [1, 1, 0, 2, 2, 3];
+
+						// widgetsInTemplateLifecycle
+						declare("SubThing", _WidgetBase, {
+							postCreate: function(){
+								this.inherited(arguments);
+								result.push(1);
+							},
+							startup: function(){
+								this.inherited(arguments);
+								result.push(2);
+							}
+						});
+
+						declare("ParentThing", [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+							templateString: "<div>" +
+									"<span data-dojo-type='SubThing'>a</span>" +
+									"<div data-dojo-type='dijit/layout/LayoutContainer'>" +
+									"<span data-dojo-type='SubThing' data-dojo-props='region: \"center\"'>b</span>" +
+									"</div>" +
+									"</div>",
+							postCreate: function(){
+								// children postcreate (x2) called before this postCreate
+								this.inherited(arguments);
+								result.push(0);
+							},
+							startup: function(){
+								// then children startup (x2) then our startup
+								// (we can call inherited after push(), and change the order)
+								this.inherited(arguments);
+								result.push(3);
+							}
+						});
+
+						new ParentThing().startup();
+
+						t.is(expected.length, result.length);
+						array.forEach(expected, function(r){
+							t.is(r, result.shift());
+						});
+
+					}
+				]);
+
+				// Test that "this" referenced from data-dojo-props can refer to the hosting widget
+				doh.register("data-dojo-props this", function(){
+					var host = declare([dijit._WidgetBase, dijit._TemplatedMixin, dijit._WidgetsInTemplateMixin], {
+						obj: {hello: "world"},
+						templateString:
+							"<div>" +
+								"<div data-dojo-type='dijit/_WidgetBase' data-dojo-props='hostObj: this.obj'" +
+								" data-dojo-attach-point='subWidget'></div>" +
+							"</div>"
+					});
+
+					var hostWidget = new host(),
+						subWidget = hostWidget && hostWidget.subWidget;
+					doh.isNot(undefined, hostWidget, "created host widget");
+					doh.isNot(undefined, subWidget, "created sub widget");
+					doh.isNot(undefined, subWidget.hostObj, "sub widget got hostObj defined");
+					doh.is("world", subWidget.hostObj.hello, "object is correct")
+				});
+
+				// Test that a context require can be passed to the parser
+				doh.register("context require", function(){
+					var cw = registry.byId("testContextWidget");
+					doh.is(typeof cw.fooNode, "object", "button created");
+					doh.is(cw.fooNode.fooNode.innerHTML, "TestWidget", "sub widget contains right properties");
+				});
+
+				doh.run();
+			});
+		</script>
+	</head>
+	<body>
+		<h1>WidgetsInTemplateMixin</h1>
+
+		<!-- Tests for _WidgetsInTemplateMixin combined with _AttachMixin -->
+		<div class="testcontainer">
+			<p>This test shows that a _AttachMixin dijit with _WidgetsInTemplate properly attaches widgets from the template.<br>
+			<div id="attachMeThree">
+				<h2 data-dojo-attach-point='heading'></h2>
+				<button data-dojo-type='dijit/form/Button'
+						data-dojo-attach-point='mybutton'
+						data-dojo-attach-event='click: _buttonClicked'>A button</button>
+			</div>
+		</div>
+
+		<!-- Test that widgets inside containerNode aren't parsed by _WidgetsInTemplateMixin-->
+		<div id="containerNode" class="testcontainer">
+			<p>This tests that nodes inside of data-dojo-attach-point="containerNode" are ignored<br>
+			<div data-dojo-id="outerWidget" data-dojo-type="OuterWidget">
+				<h2 data-dojo-attach-point="heading">heading</h2>
+				<div data-dojo-type="SupportingWidget" data-dojo-attach-point="supportingWidget">supporting widget</div>
+				<div data-dojo-attach-point="containerNode">
+					<span data-dojo-type="ContainedWidget" data-dojo-attach-point="containedWidget">contained widget</span>
+				</div>
+			</div>
+		</div>
+
+		<!-- Tests for _WidgetsInTemplateMixin combined with _TemplatedMixin -->
+		<div id="templateTests">
+			<textarea id="Test1Template" style="display:none;">
+				<div>
+					<div data-dojo-attach-point="normalNode">normal node</div>
+					<button data-dojo-attach-point="buttonWidget" data-dojo-attach-event="click:onClick" data-dojo-type="dijit/form/Button">button #1</button>
+					<div data-dojo-attach-point="checkboxWidget" data-dojo-attach-event="click:onClick" data-dojo-type="dijit/form/CheckBox"></div> checkbox #1
+					<div data-dojo-attach-point="progressBarWidget" data-dojo-attach-event="change:onClick"
+						 data-dojo-type="dijit/ProgressBar" data-dojo-props='value: 20, maximum: 200, style: "width:400px;"'></div>
+				</div>
+			</textarea>
+
+			<div data-dojo-type="Test1Widget" data-dojo-props="id: 'test1Widget'"></div>
+
+
+			<textarea id="Test3Template" style="display:none;">
+				<div>
+					<div data-dojo-attach-point="checkboxWidget" data-dojo-type="dijit/form/CheckBox"></div> checkbox #3
+					<div data-dojo-attach-point="containerNode"></div>
+				</div>
+			</textarea>
+
+			<div data-dojo-type="Test3Widget" data-dojo-props="id: 'test3Widget'">
+				<span>hello world</span>
+				<b style="border: 1px solid blue;">this is my
+					<button data-dojo-type="dijit/form/Button" data-dojo-props="id: '3.1'">first button</button>
+				</b>
+				<button data-dojo-type="dijit/form/Button" data-dojo-props="id: '3.2'">another button</button>
+				<i>and some more</i>
+				<div style="border: 1px solid red;">
+					<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="style: {border: '1px solid gray'}, id: '3.3'">
+						<button data-dojo-type="dijit/form/Button" data-dojo-props="id: '3.nested'">a nested button</button>
+						<button data-dojo-type="dijit/form/Button" data-dojo-props="id: '3.nested2'">another nested button</button>
+					</div>
+					<button data-dojo-type="dijit/form/Button" data-dojo-props="id: '3.4'">yet another button</button>
+					<button data-dojo-type="dijit/form/Button" data-dojo-props="id: '3.5'">yet yet another button</button>
+				</div>
+			</div>
+
+			<!-- Test templated widget containing container and nested widgets in template -->
+			<textarea id="Test5Template" style="display:none;">
+				<div>
+					<div data-dojo-type="TestLayoutWidget" data-dojo-attach-point="layout">
+						<div data-dojo-type="TestCtndWidget" data-dojo-attach-point="layChild1"></div>
+						<div data-dojo-type="TestCtndWidget" data-dojo-attach-point="layChild2"></div>
+					</div>
+					<div data-dojo-type="TestCtnrWidget" data-dojo-attach-point="container">
+						<div data-dojo-type="TestCtndWidget" data-dojo-attach-point="contained1"></div>
+						<div data-dojo-type="TestCtndWidget" data-dojo-attach-point="contained2"></div>
+					</div>
+					<div data-dojo-type="TestStubWidget" data-dojo-attach-point="stub1"></div>
+					<div data-dojo-type="TestNonCtnrWidget" data-dojo-attach-point="nonContainer">
+						<div data-dojo-type="TestStubWidget" data-dojo-attach-point="nonContained1"></div>
+						<div data-dojo-type="TestStubWidget" data-dojo-attach-point="nonContained2"></div>
+					</div>
+					<div data-dojo-type="TestCtnrWidget" data-dojo-attach-point="threeLevel">
+						<div data-dojo-type="TestNonCtnrWidget" data-dojo-attach-point="secondLevel">
+							<div data-dojo-type="TestStubWidget" data-dojo-attach-point="bottomLevel"></div>
+						</div>
+					</div>
+					<div data-dojo-type="TestNonCtnrWidget" data-dojo-attach-point="anotherThree">
+						<div data-dojo-type="TestCtnrWidget" data-dojo-attach-point="anotherSecond">
+							<div data-dojo-type="TestCtndWidget" data-dojo-attach-point="anotherBottom"></div>
+						</div>
+					</div>
+				</div>
+			</textarea>
+
+			<div data-dojo-type="Test5Widget" data-dojo-props="id: 'test5Widget'"></div>
+
+			<div data-dojo-type="Missing" data-dojo-props="id: 'missing'"></div>
+
+			<!-- Test templated widget containing relative MIDs for data-dojo-type -->
+			<div data-dojo-type="dijit/tests/resources/TestContextRequireWidget" data-dojo-props="id: 'testContextWidget'"></div>
+
+			<!-- Test templated widget for back-compat with inherited onClick etc events when using widgets in template -->
+			<textarea id="Test6Template" style="display:none;">
+				<div>
+					<div data-dojo-type="dijit/form/TextBox" data-dojo-attach-point="textbox" data-dojo-attach-event="onClick: handleClick"></div>
+				</div>
+			</textarea>
+
+			<div data-dojo-type="Test6Widget" data-dojo-props="id: 'test6Widget'"></div>
+
+		</div>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/manager.html b/src/main/resources/static/dijit/tests/_base/manager.html
new file mode 100644
index 0000000000000000000000000000000000000000..7eb3bea89c485cd9ef70012b7a9b05f5cc0295b1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/manager.html
@@ -0,0 +1,269 @@
+<!DOCTYPE html>
+
+<!--
+	Remove in 2.0.   Replaced by dijit/tests/registry.html
+-->
+
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dijit manager unit test</title>
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../css/dijitTests.css";
+	</style>
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true"></script>
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dojo.parser");
+		dojo.require("dijit.dijit");
+
+		dojo.ready(function(){
+			dojo.declare("foo", dijit._Widget, {
+				name: "",
+				attr1: 0,
+				attr2: 0
+			});
+	
+			dojo.declare("bar", dijit._Widget, {
+				name: "",
+				attr1: 0,
+				attr2: 0
+			});
+	
+			dojo.declare("Baz", dijit._Widget, {
+				name: "",
+				attr1: 1,
+				attr2: 1
+			});
+
+			doh.register("parse", function(){
+				dojo.parser.parse();
+			});
+
+			doh.register("dijit._base.manager",
+				[
+					function forEachTest(t){
+						var names=[];
+						dijit.registry.forEach(function(widget){ names.push(widget.name); });
+						t.is(names.join(" "), "bob is your uncle");
+					},
+					function filterTest(t){
+						var names=[];
+						dijit.registry.
+							filter(function(widget){ return widget.attr1==10; }).
+							forEach(function(widget){ names.push(widget.name); });
+						t.is(names.join(" "), "bob uncle");
+					},
+					function filterScope(t){
+						// testing filter with a forced 'this' in the cb function
+						var names = [],
+							obj = {
+								check: function(widget, val){
+									// same as previous unit test
+									return widget.attr1 == val;
+								}
+							};
+						dijit.registry
+							.filter(function(w){ return this.check(w, 10); }, obj)
+							.forEach(function(w){ names.push(w.name) })
+						;
+						t.is(names.join(" "), "bob uncle");
+					},
+					function byId(t){
+						t.is(dijit.byId("three").name, "your");
+						t.f(dijit.byId("nonexistent"));
+					},
+					function byClass(t){
+						var names=[];
+						dijit.registry.
+							byClass("bar").
+							forEach(function(widget){ names.push(widget.name); });
+						t.is(names.join(" "), "your uncle");
+					},
+					function lengthTest(t){
+						// test existing length
+						t.is(dijit.registry.byClass("bar").length, 2);
+						// test adding:
+						var n = new Baz();
+						t.is(dijit.registry.byClass("Baz").length, 1);
+						// test destroying:
+						n.destroy();
+						t.is(dijit.registry.byClass("Baz").length, 0);
+					},
+					function nullLengthTest(t){
+						var ws = new dijit.WidgetSet();
+						var count = 0;
+
+						var b = [new Baz(), new Baz()];
+						ws.add(b[0]);
+						ws.add(b[1]);
+
+						t.is(2, ws.length);
+
+						ws.remove(b[0].id);
+						t.is(1, ws.length);
+
+						ws.remove(b[1].id);
+						t.is(0, ws.length);
+
+						// ensure we don't ever go below 0
+						ws.remove("invalidId");
+						t.is(0, ws.length);
+
+						dojo.forEach(b, function(w){ w.destroy() });
+
+					},
+					function forEachScope(t){
+						var obj = {
+							getIt: function(widget){
+								return widget.id;
+							}
+						};
+
+						dijit.registry.forEach(function(w){
+							t.is(w.id, this.getIt(w));
+						}, obj);
+					},
+					function forEachReturn(t){
+						// also tests WidgetSet.map
+						var ws = dijit.registry.forEach(function(){}).map(function(w){
+							return w.declaredClass.toUpperCase();
+						});
+						t.t(dojo.isArray(ws));
+						t.is(ws.length, dijit.registry.length);
+					},
+					function forEachInc(t){
+						var x = 0;
+						dijit.registry.forEach(function(w, i){
+							t.is(i, x++);
+						});
+					},
+					function toArrayTest(t){
+						var ws = dijit.registry.byClass("bar");
+						var wa = ws.toArray();
+
+						t.t(dojo.isArray(wa));
+						t.is(ws.length, wa.length);
+
+						var wda = dojo.map(wa, function(w){
+							return w.domNode;
+						});
+
+						t.is(wda.length, ws.length);
+						var wdas = wda.slice(-1);
+
+						t.is(1, wdas.length);
+
+						var w = dijit.byNode(wdas[0]);
+						t.is(w.declaredClass, "bar");
+					},
+					function mapTest(t){
+						var ids = dijit.registry.map(function(w){
+							return w.id;
+						});
+						t.is(ids.length, dijit.registry.length);
+						dijit.registry.forEach(function(id){
+							t.t(dijit.byId(id));
+						});
+					},
+					function everyTest(t){
+
+						var a = new Baz();
+						var b = new Baz();
+
+						var hasid = dijit.registry.every(function(w){
+							return w.id;
+						});
+
+						t.t(hasid);
+
+						var hasattr1 = dijit.registry.every(function(w){
+							return w.attr1 > 0;
+						});
+
+						t.t(hasattr1);
+
+						var x = 0;
+						var once = dijit.registry.every(function(w){
+							x++;
+							return false;
+						});
+						t.is(1, x);
+						t.f(once);
+
+						a.destroy();
+						b.destroy();
+
+					},
+					function someTest(t){
+
+						var a = new Baz();
+						var b = new Baz();
+
+						var x = 0;
+						var hasid = dijit.registry.some(function(w){
+							x++;
+							return w.id;
+						});
+
+						t.is(1, x);
+						t.t(hasid);
+
+						var n = 0;
+						var hasattr1 = dijit.registry.some(function(w){
+							n++;
+							return false;
+						});
+						t.is(n, dijit.registry.length);
+						t.f(hasattr1);
+
+						var l = 0;
+						var once = dijit.registry.some(function(w){
+							l++;
+							return true;
+						});
+						t.is(1, l);
+						t.t(once);
+
+						a.destroy();
+						b.destroy();
+
+					},
+					function deleteTest(t){
+						var names=[];
+						dijit.byId("two").destroy();
+						dijit.byId("four").destroy();
+						dijit.registry.forEach(function(widget){ names.push(widget.name); });
+						t.is(names.join(" "), "bob your");
+					},
+					function getEnclosingWidgetTest(t){
+						t.is(dijit.getEnclosingWidget(dojo.byId("not-a-widget")), null);
+						t.is(dijit.getEnclosingWidget(dojo.byId("three")).name, "your");
+						t.is(dijit.getEnclosingWidget(dojo.byId("three.one")).name, "your");
+						t.is(dijit.getEnclosingWidget(dojo.byId("three.one.one")).name, "your");
+					}
+				]
+			);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body>
+	<h1>Dijit Manager Unit Test</h1>
+	<div id="one" data-dojo-type="foo" data-dojo-props='name:"bob", attr1:10, attr2:10'></div>
+	<div id="two" data-dojo-type="foo" data-dojo-props='name:"is", attr1:5, attr2:10'></div>
+	<div id="three" data-dojo-type="bar" data-dojo-props='name:"your", attr1:5, attr2:5'>
+		<div id="three.one">
+			<div id="three.one.one"></div>
+		</div>
+	</div>
+	<div id="four" data-dojo-type="bar" data-dojo-props='name:"uncle", attr1:10, attr2:5'></div>
+	<div id="not-a-widget"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/module.js b/src/main/resources/static/dijit/tests/_base/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..4d58871af2235d2106fb0467ed68686e5082e098
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/module.js
@@ -0,0 +1,15 @@
+define(["doh/main", "require", "dojo/sniff"], function(doh, require, has){
+
+	var test_robot = has("trident") || has("ff") || has("chrome") < 45;
+
+	doh.register("_base.manager", require.toUrl("./manager.html"), 999999);
+	doh.register("_base.wai", require.toUrl("./wai.html"), 999999);
+	doh.register("_base.place", require.toUrl("./place.html"), 999999);
+	doh.register("_base.popup", require.toUrl("./popup.html"), 999999);
+	if(test_robot){
+		doh.register("_base.robot.CrossWindow", require.toUrl("./robot/CrossWindow.html"), 999999);
+		doh.register("_base.robot.FocusManager", require.toUrl("./robot/FocusManager.html"), 999999);
+		doh.register("_base.robot.focus_mouse", require.toUrl("./robot/focus_mouse.html"), 999999);
+	}
+
+});
diff --git a/src/main/resources/static/dijit/tests/_base/multiversion.html b/src/main/resources/static/dijit/tests/_base/multiversion.html
new file mode 100644
index 0000000000000000000000000000000000000000..ca5d7a94d6b40bdd4aa8717c3ccb829b82146bf4
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/multiversion.html
@@ -0,0 +1,86 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+	<!--
+		Tests that generated widget id's are unique according to scopeMap.
+		The created widgets should get the non-conflicting generated names 
+			- dijit1_dijit_layout_ContentPane_0
+			- dijit2_dijit_layout_ContentPane_0
+
+		Before running this tests, Dojo XD must be built via:
+			$ cd util/buildscripts
+			$ ./build.sh action=release loader=xdomain profile=standard optimize=comments
+	-->
+	<title>Multi-version test</title>
+	<script type="text/javascript">
+		djConfig = {
+			baseUrl:'../../../release/dojo/dojo/',
+			scopeMap:[
+				['dojo','dojo1'],
+				['dijit','dijit1'],
+				['dojox','dojox1']
+			],
+			afterOnLoad: true
+		};
+	</script>
+	<script type="text/javascript" src="../../../release/dojo/dojo/dojo.xd.js"></script>
+	<script type="text/javascript">
+		dojo1.require("dijit.layout.ContentPane");
+		var cp1, cp2;
+		dojo1.ready(function(){
+			cp1 = new dijit1.layout.ContentPane({ content: 'one' });
+			cp1.placeAt(dojo1.body());
+			cp1.startup();
+
+			var sc = dojo1.doc.createElement('script');
+			sc.type = 'text/javascript';
+			djConfig = {
+				baseUrl:'../../../release/dojo/dojo/',
+				scopeMap:[
+					['dojo','dojo2'],
+					['dijit','dijit2'],
+					['dojox','dojox2']
+				],
+				afterOnLoad: true
+			};
+			sc.src = '../../../release/dojo/dojo/dojo.xd.js';
+			function onScriptLoad(){
+				dojo2.require("dijit.layout.ContentPane");
+				dojo2.ready(function(){
+					cp2 = new dijit2.layout.ContentPane({ content: 'two' });
+					cp2.placeAt(dojo2.body());
+					cp2.startup();
+
+					var widgets1 = dijit1.findWidgets(dojo1.body());
+					var widgets2 = dijit2.findWidgets(dojo2.body());
+
+					dojo1.query('[widgetId='+cp1.id+']').forEach(function(n){
+						var w = dijit1.byNode(n);
+						if(w.domNode === n){
+							console.log(w + ' matches');
+						}else{
+							console.log(w + ' doesn\'t match');
+						}
+					});
+					dojo2.query('[widgetId='+cp2.id+']').forEach(function(n){
+						var w = dijit2.byNode(n);
+						if(w.domNode === n){
+							console.log(w + ' matches');
+						}else{
+							console.log(w + ' doesn\'t match');
+						}
+					});
+				});
+			}
+			if(typeof sc['addEventListener'] != 'undefined'){
+				sc.addEventListener('load', onScriptLoad, false);
+			}else{
+				sc.attachEvent('onreadystatechange', onScriptLoad);
+			}
+			dojo1.doc.getElementsByTagName('head')[0].appendChild(sc);
+		});
+	</script>
+</head>
+<body>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/place.html b/src/main/resources/static/dijit/tests/_base/place.html
new file mode 100644
index 0000000000000000000000000000000000000000..a8933019aefa43e5ca87540df04b3d3da14e8e8c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/place.html
@@ -0,0 +1,283 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+
+<!--
+    Test case for dijit/_base/place.
+    Remove in 2.0 in favor of dijit/tests/place.html
+-->
+
+<html>
+<head>
+	<title>dijit/_base/place unit test</title>
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../css/dijitTests.css";
+
+		html {
+			overflow: hidden; /* ie6 needs this */
+		}
+		body {
+			height: 100%;
+			padding: 0;
+			margin: 0;
+			border: 0;
+		}
+
+		.aroundNode {
+			position: absolute;
+			width: 20px;
+			height: 20px;
+			background: yellow;
+		}
+
+		#popup {
+			position: absolute;
+			width: 75px;
+			background: blue;
+			color: white;
+		}
+	</style>
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: false"></script>
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dojo.window");
+		dojo.require("dijit.dijit");
+
+
+		dojo.ready(function(){
+
+			// The around nodes
+			var aroundTop = dojo.byId("aroundTop"),
+				aroundBottom = dojo.byId("aroundBottom"),
+				aroundLeft = dojo.byId("aroundLeft"),
+				aroundRight = dojo.byId("aroundRight");
+
+			// The popup (aka dropdown)
+			var popup = dojo.byId("popup");
+
+			doh.register("dijit/_base/place",
+				[
+					function placeOnScreenTL(t){
+						// Place popup at (10,7)... dijit.placeOnScreen() should choose the top-left corner, because
+						// any of the other corner would make the popup go partially off the screen
+						var ret = dijit.placeOnScreen(popup, {x: 10, y:7}, ["TR", "BR", "BL", "TL"]);
+
+						doh.is("TL", ret.corner, "top left corner chosen");
+						doh.is("10px", popup.style.left, "x coord");
+						doh.is("7px", popup.style.top, "y coord");
+						doh.is(75, ret.w, "it's 75px wide");
+					},
+					function placeOnScreenTR(t){
+						// Place popup at top right... dijit.placeOnScreen() should choose the top-right corner, because
+						// any of the other corner would make the popup go partially off the screen
+						var viewport = dojo.window.getBox(),
+							ret = dijit.placeOnScreen(popup, {x: viewport.w-10, y:7}, ["TL", "BR", "TR", "BL"]),
+							popupCoords = dojo.position(popup);
+
+						doh.is("TR", ret.corner, "top left corner chosen");
+						doh.is(viewport.w-10, popupCoords.x + popupCoords.w, "x coord");
+						doh.is("7px", popup.style.top, "y coord");
+						doh.is(75, ret.w, "it's 75px wide");
+					},
+					function placeOnScreenAroundNodeT(t){
+						// Dropdown from "aroundTop" node. Should pick the second choice, since the first
+						// goes offscreen.
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundTop, {
+							"TL": "BL",	// aroundTop's top-left corner with the popup's bottom-left corner (fails)
+							"BL": "TL",	// aroundTop's bottom-left corner with the popup's top-left corner (works)
+							"BR": "TR"	// aroundTop's bottom-right corner with the popup's top-right corner (works)
+						});
+
+						doh.is("BL", ret.aroundCorner, "around corner");
+						doh.is("TL", ret.corner, "popup's corner");
+						doh.is("20px", popup.style.top, "underneath around node");
+						doh.is(Math.round(dojo.position(aroundTop).x), Math.round(popup.style.left.replace("px", "")),
+								"left sides aligned");
+					},
+					function placeOnScreenAroundNodeTooltip(t){
+						// Same as above test except that shape of drop down changes depending on where it's positioned.
+						// Simulates tooltip placement (tooltip shape changes b/c of the arrow).
+						// Should pick the third choice this time
+
+						function layoutNode(node, aroundCorner, nodeCorner){
+							node.style.width = (nodeCorner == "TL" ? "5000px" : "75px");
+						}
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundTop, {
+							"TL": "BL",	// aroundTop's top-left corner with the popup's bottom-left corner (fails)
+							"BL": "TL",	// aroundTop's bottom-left corner with the popup's top-left corner (works)
+							"BR": "TR"	// aroundTop's bottom-right corner with the popup's top-right corner (works)
+						}, layoutNode);
+
+						doh.is("BR", ret.aroundCorner, "around corner");
+						doh.is("TR", ret.corner, "popup's corner");
+						doh.is("20px", popup.style.top, "underneath around node");
+						doh.is(Math.round(dojo.position(aroundTop).x + dojo.position(aroundTop).w),
+							Math.round(dojo.position(popup).x + dojo.position(popup).w),
+							"right sides aligned");
+					},
+					function placeOnScreenAroundNodeB(t){
+						// Dropdown from "aroundBottom" node. Should go above aroundNode so that
+						// popup doesn't go offscreen
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundBottom, {
+							"BL": "TL",	// aroundBottom's bottom-left corner with the popup's top-left corner (fails)
+							"TL": "BL",	// aroundBottom's top-left corner with the popup's bottom-left corner (works)
+							"BR": "TR"	// aroundBottom's bottom-right corner with the popup's top-right corner (fails)
+						});
+
+						doh.is("TL", ret.aroundCorner, "around corner");
+						doh.is("BL", ret.corner, "popup's corner");
+						doh.is(Math.round(dojo.position(aroundBottom).y),
+								Math.round(dojo.position(popup).y + dojo.position(popup).h), "above around node");
+					},
+					function placeOnScreenAroundNodeBM(t){
+						// bottom middle popup from "aroundBottom" node
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundBottom, {
+							"TR": "TL",	// aroundBottom's top-right corner with the popup's top-left corner (fails)
+							"TM": "BM",	// aroundBottom's top-middle with the popup's bottom-middle (works)
+							"BM": "TM",	// aroundBottom's bottom-middle with the popup's top-middle (fails)
+							"TL": "TR"	// aroundBottom's top-left corner with the popup's top-right corner (fails)
+						});
+
+						doh.is("TM", ret.aroundCorner, "around middle");
+						doh.is("BM", ret.corner, "popup's middle");
+						var popupPos = dojo.position(popup);
+						var aroundPos = dojo.position(aroundBottom);
+						doh.is(Math.round(aroundPos.y), Math.round(popupPos.y + popupPos.h), "above around node");
+						doh.t(aroundPos.x > popupPos.x, "starts before around node");
+						doh.t(aroundPos.x < (popupPos.x + popupPos.w), "ends after around node");
+					},
+					function placeOnScreenAroundNodeTM(t){
+						// top middle popup from "aroundTop" node
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundTop, {
+							"BL": "BR",	// aroundTop's bottom-left corner with the popup's bottom-right corner (fails)
+							"TM": "BM",	// aroundTop's top-middle with the popup's bottom-middle (fails)
+							"BM": "TM",	// aroundTop's bottom-middle with the popup's top-middle (works)
+							"BR": "BL"	// aroundTop's bottom-right corner with the popup's bottom-left corner (fails)
+						});
+
+						doh.is("BM", ret.aroundCorner, "around middle");
+						doh.is("TM", ret.corner, "popup's middle");
+						var popupPos = dojo.position(popup);
+						var aroundPos = dojo.position(aroundTop);
+						doh.is(Math.round(aroundPos.y + aroundPos.h), Math.round(popupPos.y), "below around node");
+						doh.t(aroundPos.x > popupPos.x, "starts before around node");
+						doh.t(aroundPos.x < (popupPos.x + popupPos.w), "ends after around node");
+					},
+					function placeOnScreenAroundNodeML(t){
+						// middle left popup from "aroundLeft" node
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundLeft, {
+							"BR": "TR",	// aroundLeft's bottom-right corner with the popup's top-right corner (fails)
+							"MR": "ML",	// aroundLeft's middle-right with the popup's middle-left (works)
+							"ML": "MR",	// aroundLeft's middle-left with the popup's middle-right (fails)
+							"TR": "BR"	// aroundLeft's top-right corner with the popup's bottom-right corner (fails)
+						});
+
+						doh.is("MR", ret.aroundCorner, "around middle");
+						doh.is("ML", ret.corner, "popup's middle");
+						var popupPos = dojo.position(popup);
+						var aroundPos = dojo.position(aroundLeft);
+						doh.is(aroundPos.x + aroundPos.w, popupPos.x, "after around node");
+						doh.t(aroundPos.y > popupPos.y, "starts before around node");
+						doh.t(aroundPos.y < (popupPos.y + popupPos.h), "ends after around node");
+					},
+					function placeOnScreenAroundNodeMR(t){
+						// middle left popup from "aroundRight" node
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundRight, {
+							"BL": "TL",	// aroundRight's bottom-left corner with the popup's top-left corner (fails)
+							"MR": "ML",	// aroundRight's middle-right with the popup's middle-left (fails)
+							"ML": "MR",	// aroundRight's middle-left with the popup's middle-right (works)
+							"TL": "BL"	// aroundRight's top-left corner with the popup's bottom-left corner (fails)
+						});
+
+						doh.is("ML", ret.aroundCorner, "around middle");
+						doh.is("MR", ret.corner, "popup's middle");
+						var popupPos = dojo.position(popup);
+						var aroundPos = dojo.position(aroundRight);
+						doh.is(Math.round(popupPos.x + popupPos.w), Math.round(aroundPos.x), "before around node");
+						doh.t(aroundPos.y > popupPos.y, "starts before around node");
+						doh.t(aroundPos.y < (popupPos.y + popupPos.h), "ends after around node");
+					},
+					function placeOnScreenAroundNodeMLB(t){
+						// bottom middle popup from "aroundLeft" node
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundLeft, {
+							"BR": "TR",	// aroundLeft's bottom-right corner with the popup's top-right corner (fails)
+							"BM": "TM",	// aroundLeft's bottom-middle with the popup's top-middle (works, sort of)
+							"TR": "BR"	// aroundLeft's top-right corner with the popup's bottom-right corner (fails)
+						});
+
+						doh.is("BM", ret.aroundCorner, "around middle");
+						doh.is("TM", ret.corner, "popup's middle");
+						var popupPos = dojo.position(popup);
+						var aroundPos = dojo.position(aroundLeft);
+						doh.is(Math.round(aroundPos.y + aroundPos.h), Math.round(popupPos.y), "below around node");
+						doh.is(aroundPos.x, popupPos.x, "left aligned with around node");
+					},
+					function placeOnScreenAroundNodeMRT(t){
+						// top middle popup from "aroundRight" node
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundRight, {
+							"BL": "TL",	// aroundRight's bottom-left corner with the popup's top-left corner (fails)
+							"TM": "BM",	// aroundRight's top-middle with the popup's bottom-middle (works)
+							"TL": "BL"	// aroundRight's top-left corner with the popup's bottom-left corner (fails)
+						});
+
+						doh.is("TM", ret.aroundCorner, "around middle");
+						doh.is("BM", ret.corner, "popup's middle");
+						var popupPos = dojo.position(popup);
+						var aroundPos = dojo.position(aroundRight);
+						doh.is(Math.round(popupPos.x + popupPos.w),
+								Math.round(aroundPos.x + aroundPos.w + 1/*right:1px*/), "right aligned with around node");
+						doh.is(Math.round(popupPos.y + popupPos.h), Math.round(aroundPos.y), "above around node");
+					},
+					function placeOnScreenAroundNodeTML(t){
+						// middle left popup from "aroundTop" node
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundTop, {
+							"BL": "BR",	// aroundTop's bottom-left corner with the popup's bottom-right corner (fails)
+							"ML": "MR",	// aroundTop's middle-left with the popup's middle-right (works)
+							"BR": "BL"	// aroundTop's bottom-right corner with the popup's bottom-left corner (fails)
+						});
+
+						doh.is("ML", ret.aroundCorner, "around middle");
+						doh.is("MR", ret.corner, "popup's middle");
+						var popupPos = dojo.position(popup);
+						var aroundPos = dojo.position(aroundTop);
+						doh.is(Math.round(aroundPos.x), Math.round(popupPos.x + popupPos.w), "before around node");
+						doh.is(aroundPos.y, popupPos.y, "top aligned with around node");
+					},
+					function placeOnScreenAroundNodeBMR(t){
+						// middle right popup from "aroundBottom" node
+						var ret = dijit.placeOnScreenAroundNode(popup, aroundBottom, {
+							"TL": "TR",	// aroundBottom's top-left corner with the popup's top-right corner (fails)
+							"MR": "ML",	// aroundBottom's middle-right with the popup's middle-left (works)
+							"TR": "TL"	// aroundBottom's top-right corner with the popup's top-left corner (fails)
+						});
+
+						doh.is("MR", ret.aroundCorner, "around middle");
+						doh.is("ML", ret.corner, "popup's middle");
+						var popupPos = dojo.position(popup);
+						var aroundPos = dojo.position(aroundBottom);
+						doh.is(Math.round(aroundPos.x + aroundPos.w), Math.round(popupPos.x), "after around node");
+						doh.is(Math.round(aroundPos.y + aroundPos.h + 5/*bottom:5px*/),
+								Math.round(popupPos.y + popupPos.h), "bottom aligned with around node");
+					}
+				]
+			);
+			doh.run();
+		});
+
+	</script>
+</head>
+<body>
+	<h1>Dijit/_base/place Unit Test</h1>
+	<div id="aroundTop" class="aroundNode" style="top: 0; left: 50%;">T</div>
+	<div id="aroundLeft" class="aroundNode" style="bottom: 30%; left: 0;">L</div>
+	<div id="aroundRight" class="aroundNode" style="bottom: 30%; right: 1px;">R</div>
+	<div id="aroundBottom" class="aroundNode" style="bottom: 5px; left: 50%;">B</div>
+
+	<div id="popup">
+		I'm a drop down, wider and taller than the around nodes I'm placed next to.
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/popup.html b/src/main/resources/static/dijit/tests/_base/popup.html
new file mode 100644
index 0000000000000000000000000000000000000000..13a61e39872f92d9442dd4a9b3a74fc9876f73f8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/popup.html
@@ -0,0 +1,472 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+
+<!--
+	Tests the old dijit/_base/popup API.
+	Remove in 2.0.   Replaced by dijit/tests/popup.html.
+-->
+
+<html>
+<head>
+	<title>Dijit.popup and BackgroundIFrame unit test</title>
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+		@import "../css/dijitTests.css";
+
+		body {
+			height: 100%;
+			padding: 0;
+			margin: 0;
+		}
+
+		div {
+			background: white;
+			border: solid 1px gray;
+		}
+
+		/* the menu type test widgets */
+		.choice div {
+			width: 200px;
+			cursor: pointer;
+		}
+		.choice div:hover {
+			background: #ccc;
+		}
+	</style>
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: false"></script>
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit._base.popup");
+		dojo.require("dijit._Widget");
+		dojo.require("dijit._TemplatedMixin");
+		dojo.require("dijit.tests.helpers");	// functions to help test
+
+		function log(str){
+			console.log(str);
+		}
+
+		dojo.ready(function(){
+
+			dojo.declare("SimpleDropDownButton", [dijit._Widget, dijit._TemplatedMixin], {
+				// summary:
+				//		A button that shows a popup.
+				//		Supply popup as parameter when instantiating this widget.
+
+				label: "show popup",
+				orient: {'BL': 'TL', 'BR': 'TR'},
+
+				templateString: "<button data-dojo-attach-event='onclick: openPopup'>${label}</button>",
+
+				openPopup: function(){
+					var self = this;
+
+					dijit.popup.open({
+						popup: this.popup,
+						parent: this,
+						around: this.domNode,
+						orient: this.orient,
+						onCancel: function(){
+							log(self.id + ": cancel of child");
+						},
+						onExecute: function(){
+							log(self.id + ": execute of child");
+							dijit.popup.close(self.popup);
+							self.open = false;
+						}
+					});
+
+					this.open = true;
+				},
+
+				closePopup: function(){
+					if(this.open){
+						log(this.id + ": close popup due to blur");
+						dijit.popup.close(this.popup);
+						this.open = false;
+					}
+				},
+
+				_onBlur: function(){
+					// summary:
+					//		This is called from focus manager and when we get the signal we
+					//		need to close the drop down
+					this.closePopup();
+				}
+			});
+
+			dojo.declare("SimplePopup",  [dijit._Widget, dijit._TemplatedMixin], {
+				// summary:
+				//		A trivial popup widget
+
+				templateString: "<span>i'm a popup</span>"
+			});
+
+			dojo.declare("SimpleChoiceWidget",  [dijit._Widget, dijit._TemplatedMixin], {
+				// summary:
+				//		A list of values; select a value by pressing an entry in the list.
+
+				choice1: "1",
+				choice2: "2",
+				choice3: "3",
+
+				templateString:
+					"<div class='choice'>" +
+						"<div data-dojo-attach-event='onclick: onClick'>${choice1}</div>" +
+						"<div data-dojo-attach-event='onclick: onClick'>${choice2}</div>" +
+						"<div data-dojo-attach-event='onclick: onClick'>${choice3}</div>" +
+					"</div>",
+
+				onClick: function(e){
+					this.onChange(e.target.innerHTML);
+				},
+
+				onChange: function(val){
+					// summary:
+					//		When this widget is used as a popup, dijit.popup monitors calls
+					//		to onChange and then closes the popup
+					log(this.id + ": selected " + val);
+				}
+			});
+
+			// Create a button that displays a simple drop down
+			choiceDropDown = new SimpleChoiceWidget();
+			(choiceDropDownButton = new SimpleDropDownButton({
+				id: "choiceDropDownButton",
+				label: "show choice drop down",
+				popup: choiceDropDown
+			})).placeAt(dojo.byId("widgets"));
+
+			dojo.declare("DialogWithPopupWidget",  [dijit._Widget, dijit._TemplatedMixin], {
+				// summary:
+				//		This is a dialog that contains a button that spawns a drop down.
+				//		Supply popup as an argument to this widget.
+
+				title: "I'm a dialog",
+				label: "click me",
+
+				templateString:
+					"<div style='width: 300px'>" +
+						"<div>${title}</div>" +
+						"<input><br>" +
+						"<button data-dojo-attach-point='button'>${label}</button><br>" +
+						"<button data-dojo-attach-event='onclick: onExecute'>OK</button>" +
+					"</div>",
+
+				postCreate: function(){
+					// Convert the plain button into a SimpleDropDownButton widget.
+					// Having it be a widget is important because that's how the popup
+					// code knows where a stack of nested popups (typically menus) ends.
+					// (In this case closing a stack of menus shouldn't close the dialog.)
+
+					new SimpleDropDownButton({
+						id: this.id + "PopupButton",
+						label: this.label,
+						popup: this.popup,
+						orient: {'BR': 'BL', 'TR': 'tL'}	// so popup doesn't cover OK button
+					}, this.button);
+				},
+
+				onExecute: function(){
+					// summary:
+					//		Called when OK button is pressed.
+					//		If this is used as a popup this signals to the parent that
+					//		Dialog can be closed.
+					console.log(this.id + ": executed");
+				}
+			});
+
+			// Create a button that displays a dialog that displays a choice widget
+			dialogDropDownButton = new SimpleDropDownButton({
+				id: "showSimpleDialogButton",
+				label: "show dialog",
+				popup: new DialogWithPopupWidget({
+					id: "simpleDialog",
+					label: 'show simple choice drop down',
+					popup: new SimpleChoiceWidget({
+						id: "choiceFromDialog"
+					})
+				})
+			}).placeAt(dojo.byId("widgets"));
+
+			dojo.declare("NestedPopupOpener",  [dijit._Widget, dijit._TemplatedMixin], {
+				// summary:
+				//		Clicking a value in this list will open a nested popup.
+				//		Specify popup1 and popup2 as parameters to this widget.
+
+				templateString:
+					"<div class='choice'>" +
+						"<div data-dojo-attach-event='onclick: onClick'>popup1</div>" +
+						"<div data-dojo-attach-event='onclick: onClick'>popup2</div>" +
+					"</div>",
+
+				onClick: function(e){
+					var id = this.id,
+						popup = this[e.target.innerHTML];
+					log(id + ": opening popup " + popup.id);
+					this.openPopup(popup);
+				},
+
+				openPopup: function(popup){
+					dijit.popup.open({
+						popup: popup,
+						parent: this,
+						around: this.domNode,
+						orient: {'TR': 'TL', 'TL': 'TR'},
+						onCancel: function(){
+							log(id + ": cancel of child " + popup.id);
+						},
+						onExecute: function(){
+							log(id + ": execute of child " + popup.id);
+							dijit.popup.close(popup);
+						}
+					})
+				},
+
+				closePopup: function(popup){
+					dijit.popup.close(popup);
+				}
+			});
+
+			// Create a button that displays a nested drop down.
+			nestedOpener = new NestedPopupOpener({
+				id: 'nestedPopupOpener',
+				popup1: (nestedChoice1 = new SimpleChoiceWidget({
+					id: "nestedChoice1"
+				})),
+				popup2: (nestedChoice2 = new SimpleChoiceWidget({
+					id: "nestedChoice2",
+					choice1: "4",
+					choice2: "5",
+					choice3: "6"
+				}))
+			});
+			nestedDropDownButton = new SimpleDropDownButton({
+				id: "showNestedMenuButton",
+				label: "show nested drop down",
+				popup: nestedOpener
+			}).placeAt(dojo.byId("widgets"));
+
+			// Create a button that displays a dialog that displays a nested drop down
+			dialogNestedChoice1 = new SimpleChoiceWidget({
+				id: "dialogNestedChoice1"
+			});
+			dialogNestedChoice2 = new SimpleChoiceWidget({
+				id: "dialogNestedChoice2",
+				choice1: "4",
+				choice2: "5",
+				choice3: "6"
+			});
+			dialogNestedPopupOpener = new NestedPopupOpener({
+				id: "nestedPopupOpenerFromDialog",
+				popup1: dialogNestedChoice1,
+				popup2: dialogNestedChoice2
+			});
+			dialogWithNestedPopup = new DialogWithPopupWidget({
+				id: "buttonInComplexDialog",
+				label: 'show nested menu',
+				popup: dialogNestedPopupOpener
+			});
+			dialogDropDownButton = new SimpleDropDownButton({
+				id: "showComplexDialogButton",
+				label: "show dialog w/nested menu",
+				popup: dialogWithNestedPopup
+			}).placeAt(dojo.byId("widgets"));
+
+			// For testing, create an unattached widget and unattached DOMNode
+			new SimplePopup({id: "spw"}).placeAt(dojo.body());
+			dojo.place("<span id='sdn'>simple dom node</span>", dojo.body());
+
+			doh.register("API", [
+					function repeatMoveOffScreen(){
+						// Previously, calling moveOffScreen twice would cause an exception
+						dijit.popup.moveOffScreen(dijit.byId("spw"));
+						dijit.popup.moveOffScreen(dijit.byId("spw"));
+
+						// Deprecated API where moveOffScreen() takes a DOMNode
+						dijit.popup.moveOffScreen(dojo.byId("sdn"));
+						dijit.popup.moveOffScreen(dojo.byId("sdn"));
+					}
+			]);
+
+			doh.register("simple open and close", [
+				function initialConditions(t){
+					// If the popup code has cached any iframes, make sure they are hidden
+					dojo.query("iframe").forEach(function(node){
+						console.log("found iframe", node);
+						doh.is("none", node.style.display, "background iframe is hidden");
+					});
+				},
+
+				// Create popup on the edge of another widget
+				function openAround(){
+					var d = new doh.Deferred();
+
+					var around = dojo.global.choiceDropDownButton,
+						popup = dojo.global.choiceDropDown;
+
+					around.openPopup();
+
+					setTimeout(d.getTestCallback(function(){
+						doh.t(isVisible(popup.domNode), "popup is visible");
+
+						if(dojo.isIE <= 6){
+							// Test the BackgroundIFrame
+							var iframes = dojo.query("iframe");
+							doh.is(1, iframes.length, "one background iframe on IE6");
+
+							var popupCoords = dojo.position(popup.domNode),
+								iframeCoords = dojo.position(iframes[0]);
+							doh.is(popupCoords.x, iframeCoords.x, "x is same: " + popupCoords.x);
+							doh.is(popupCoords.y, iframeCoords.y, "y is same: " + popupCoords.y);
+							doh.is(popupCoords.w, iframeCoords.w, "w is same: " + popupCoords.w);
+							doh.is(popupCoords.h, iframeCoords.h, "h is same: " + popupCoords.h);
+							doh.is("", iframes[0].style.display, "not display:none");
+						}
+						// TODO: test stack
+					}), 500);
+
+					return d;
+				},
+
+				function closeAround(){
+					// Close the popup
+					var around = dojo.global.choiceDropDownButton,
+						popup = dojo.global.choiceDropDown;
+
+					around.closePopup();
+
+					// Make sure the popup is hidden
+					doh.is("none", popup.domNode.parentNode.style.display, "popup is hidden");
+				}
+			]);
+
+			doh.register("nested open and close", [
+				// Open first level
+				function openAround(){
+					var d = new doh.Deferred();
+
+					var around = dojo.global.nestedDropDownButton,
+						popup = dojo.global.nestedOpener,
+						nestedPopup = dojo.global.nestedChoice1;
+
+					around.openPopup();
+
+					setTimeout(d.getTestCallback(function(){
+						doh.t(isVisible(popup.domNode), "popup is visible");
+
+						if(dojo.isIE <= 6){
+							// Test the BackgroundIFrame
+							var iframes = dojo.query("iframe", popup.domNode.parentNode);
+							doh.is(1, iframes.length, "one background iframe on IE6");
+
+							var popupCoords = dojo.position(popup.domNode),
+								iframeCoords = dojo.position(iframes[0]);
+							doh.is(popupCoords.x, iframeCoords.x, "x is same: " + popupCoords.x);
+							doh.is(popupCoords.y, iframeCoords.y, "y is same: " + popupCoords.y);
+							doh.is(popupCoords.w, iframeCoords.w, "w is same: " + popupCoords.w);
+							doh.is(popupCoords.h, iframeCoords.h, "h is same: " + popupCoords.h);
+							doh.is("", iframes[0].style.display, "not display:none");
+						}
+						// TODO: test stack
+					}), 500);
+
+					return d;
+				},
+
+				function openNested(){
+					var d = new doh.Deferred();
+
+					var around = dojo.global.nestedDropDownButton,
+						popup = dojo.global.nestedOpener,
+						nestedPopup = dojo.global.nestedChoice1;
+
+					popup.openPopup(nestedPopup);
+
+					setTimeout(d.getTestCallback(function(){
+						doh.t(isVisible(nestedPopup.domNode), "nested popup is visible");
+
+						if(dojo.isIE <= 6){
+							// Test the BackgroundIFrame
+							var iframes = dojo.query("iframe", popup.domNode.parentNode);
+							doh.is(1, iframes.length, "one background iframe for popup");
+
+							iframes = dojo.query("iframe", nestedPopup.domNode.parentNode);
+							doh.is(1, iframes.length, "another background iframe for nested popup");
+
+							var popupCoords = dojo.position(nestedPopup.domNode),
+								iframeCoords = dojo.position(iframes[0]);
+							doh.is(popupCoords.x, iframeCoords.x, "x is same: " + popupCoords.x);
+							doh.is(popupCoords.y, iframeCoords.y, "y is same: " + popupCoords.y);
+							doh.is(popupCoords.w, iframeCoords.w, "w is same: " + popupCoords.w);
+							doh.is(popupCoords.h, iframeCoords.h, "h is same: " + popupCoords.h);
+							doh.is("", iframes[0].style.display, "not display:none");
+						}
+						// TODO: test stack
+					}), 500);
+
+					return d;
+				},
+
+				function closeAround(){
+					// Close the layer of popups
+					var around = dojo.global.nestedDropDownButton,
+						popup = dojo.global.nestedOpener,
+						nestedPopup = dojo.global.nestedChoice1;
+
+					around.closePopup();
+
+					// Make sure the popups are both hidden
+					// (in a future release this might change to display:none etc but currently it's visibility:hidden)
+					doh.is("none", popup.domNode.parentNode.style.display, "popup is hidden");
+					doh.is("none", nestedPopup.domNode.parentNode.style.display, "nested popup is hidden");
+				}
+			]);
+
+			// Make sure there are no hidden tab stops when popups are closed.
+			// This test doesn't work on safari (due to safari bugs) although there aren't any hidden tab stops.
+			doh.register("no hidden tab stops", function hiddenTabStops(){
+				var tabbable = tabOrder();
+				doh.is("inputAtStart", tabbable[0].id, "first tabbable node");
+				doh.is("inputAtEnd", tabbable[tabbable.length - 1].id, "last tabbable node");
+			});
+
+			// TODO: test x/y placement
+
+			// Test that onCancel goes back one level.
+			// Call nestedChoice2.onCancel() and that should trigger nestedChoice2 to close
+			// but nestedOpener stays open.
+			// (TODO)
+
+			// Test that onChange/onExecute goes back to top of popup chain.
+			// Call dialogNestedChoice2.onChange() and that should trigger dialogNestedChoice2
+			// and dialogNestedPopupOpener to close, but not dialogWithNestedPopup.
+			// (TODO)
+
+			// ---------------------
+			// a11y tests
+
+			// Test that ESC key closes one level of a popup chain.
+			// Focus nestedChoice2 and type ESC, and that should trigger nestedChoice2 to close
+			// but nestedOpener stays open.
+			// (TODO)
+
+			// Test that TAB key cancels back to top of popup chain.
+			// Focus nestedChoice2 and type TAB, and that should trigger dialogNestedChoice2
+			// and dialogNestedPopupOpener to close, but not dialogWithNestedPopup.
+			// (TODO)
+
+			doh.run();
+		});
+	</script>
+</head>
+<body>
+	<h1>dijit.popup and BackgroundIFrame Unit Test</h1>
+	<input id="inputAtStart">
+	<span id="widgets"></span>
+	<input id="inputAtEnd">
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/robot/CrossWindow.html b/src/main/resources/static/dijit/tests/_base/robot/CrossWindow.html
new file mode 100644
index 0000000000000000000000000000000000000000..a3b58fd0119c6eb397cfd681a9c75418530f0a05
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/robot/CrossWindow.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot CrossWindow Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_CrossWindow.html');
+
+				doh.register("CrossWindow", [
+					{
+						name: "Create widget on main window",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var widget = dijit.byId("simple_0");
+								doh.t(widget, "The first widget was not created");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "Pop up new window",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("popupLink", 100, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var widget = dijit.byId("simple3");
+								doh.t(widget, "The 3rd widget was not created");
+								doh.is("mainpage", widget.domNode.ownerDocument.body.id);
+								doh.is("Templated in IE Popup Test", widget.domNode.ownerDocument.title);
+
+								widget = dijit.byId("simple2");
+								doh.t(widget, "The 2nd widget was not created");
+								doh.is("popup", widget.domNode.ownerDocument.body.id);
+								doh.is("IE Cross Window", widget.domNode.ownerDocument.title);
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/robot/FocusManager.html b/src/main/resources/static/dijit/tests/_base/robot/FocusManager.html
new file mode 100644
index 0000000000000000000000000000000000000000..7745e14c39c46fc7da73d849230ba6e765901ce5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/robot/FocusManager.html
@@ -0,0 +1,168 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+
+<!-- Remove in 2.0, replaced by dijit/tests/focus.html -->
+
+<html>
+	<head>
+		<title>Dijit focus manager DOH Robot test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_FocusManager.html');
+
+				doh.register("Dijit focus manager low level tests", [
+					{
+						name: "set timer to save focus and selection",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(function(){
+								dojo.byId("delay_save").focus();
+							}, 500);
+							doh.robot.keyPress(dojo.keys.ENTER, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// This is just here to tell DOH that test is finished
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "focus textarea and select some text",
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dojo.byId("textarea").focus();
+
+							// Position caret at " there!"
+							if(dojo.isMac){
+								doh.robot.keyPress(dojo.keys.LEFT_ARROW, 20, {meta: true});
+							}else{
+								doh.robot.keyPress(dojo.keys.HOME, 20, {});
+							}
+							for(var i=0; i<5; i++){
+								doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 20, {});
+							}
+
+							// select " there"
+							for(i=0; i<6; i++){
+								doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 20, {shift: true});
+							}
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// Wait for selection and focus to be copied
+							}), 3000);
+
+							return d;
+						}
+					},
+					{
+						name: "restore focus and selection",
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus somewhere else
+							doh.robot.sequence(function(){
+								dojo.byId("input1").focus();
+							}, 500);
+
+							// Press restore button
+							doh.robot.sequence(function(){
+								dojo.byId("restore").focus();
+							}, 500);
+
+							doh.robot.keyPress(dojo.keys.SPACE, 500);
+
+							//Move cursor to unselect the text
+							for(i=0; i<2; i++){
+								doh.robot.keyPress(dojo.keys.LEFT_ARROW, 20, {shift: false});
+							}
+
+							// Press restore button again, should restore previous selection.
+							doh.robot.sequence(function(){
+								dojo.byId("restore").focus();
+							}, 500);
+
+							doh.robot.keyPress(dojo.keys.SPACE, 500);
+
+							// Focus should have been moved back to textarea, and
+							// " there" should be selected through the focus restorel
+							// by deleting the selection
+							doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// Check that focus was returned to the textarea
+								doh.t(dojo.global.dijit.focus.curNode, "curFocus defined");
+								doh.is("textarea", dojo.global.dijit.focus.curNode.id, "focused on textarea");
+
+								// And that " there" was selected then deleted
+								doh.is("hello!", dojo.byId("textarea").value);
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "Test select text, clear, and restore",
+						timeout: 8000,
+						runTest: function(){
+							if(!dojo.isIE){ // IE only supports selecting form elements and the whole body from a plain non-Editor page, see the MSDN article on createTextRange
+							var d = new doh.Deferred();
+
+							//Select the text in the p tag.
+							var p = dojo.byId("selectableText");
+							dijit._editor.selection.selectElementChildren(p);
+							var value = dijit._editor.selection.getSelectedText();
+							value = dojo.trim(value);
+							try{
+								doh.assertEqual(
+									"This paragraph contains text to select for testing purposes.",
+								value, "Original Text Selection");
+
+								//Get the current focus, which saves the selections too.
+								var curFocus = dijit.getFocus();
+
+								//Clear current selection.
+								dijit._editor.selection.collapse(true);
+
+								//Check it's cleared.
+								value = dijit._editor.selection.getSelectedText();
+								doh.assertEqual("",value);
+
+								//Restore it and check again.
+								dijit.focus(curFocus);
+								value = dijit._editor.selection.getSelectedText();
+								doh.assertEqual(
+									"This paragraph contains text to select for testing purposes.",
+								value, "Restored Text Selection");
+
+								//Clear the selection, we're complete.
+								dijit._editor.selection.collapse(true);
+								d.callback(true);
+							}catch(e){
+								d.errback(e);
+							}
+							return d;
+							}
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/robot/focus_mouse.html b/src/main/resources/static/dijit/tests/_base/robot/focus_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..658dbe815df03faab77d7fc26cf7e8a2a3161c4c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/robot/focus_mouse.html
@@ -0,0 +1,216 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+
+<!-- Remove in 2.0, replaced by dijit/tests/focus.html -->
+
+<html>
+	<head>
+		<title>Dijit focus manager DOH Robot test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_focusWidget.html?animate=false');
+
+				// These are objects used to track calls to _onFocus and _onBlur in various widgets
+				function resetEvents(){
+					focusEvents = {};
+					blurEvents = {};
+					focusedState = {};
+					focusedWatchLog = {};
+				}
+				resetEvents();
+
+				doh.register("Dijit focus manager tests", [
+
+					function setUp(){
+						dojo.forEach(["form", "fieldset1", "fieldset2", "select", "spinner"], function(id){
+							var w = dijit.byId(id);
+
+							// old API is to connect to onFocus/onBlur (remove in 2.0)
+							dojo.connect(w, "onFocus", function(){
+								focusEvents[id] = true;
+							});
+							dojo.connect(w, "onBlur", function(){
+								blurEvents[id] = true;
+							});
+
+							// new API is to watch "focused" attribute
+							w.watch("focused", function(name, oldValue, newValue){
+								// keep track of current state
+								focusedState[name] = newValue;
+
+								// keep log of every watch notification
+								var nvs = newValue ? "focused" : "blurred";
+								focusedWatchLog[w.id] = !focusedWatchLog[w.id] ? nvs : focusedWatchLog[w.id] + ", " + nvs;
+							});
+						});
+					},
+
+					{
+						name: "focus simple input",
+						timeout: 4000,
+						setUp: function(){
+							resetEvents();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus the simple input
+							//dojo.byId("first").focus();
+							doh.robot.mouseMoveAt("first");
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// Make sure that focus manager caught the focus event
+								doh.is(dojo.byId("first"), dojo.global.dijit.focus.curNode);
+
+								// And that the dijit.form.Form widget is marked as
+								// being "in focus"
+								doh.t(focusEvents["form"], "form focused");
+								
+								// And that it got one watch event
+								doh.is("focused", focusedWatchLog["form"], "watch callback");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "focus combobox",
+						timeout: 4000,
+						setUp: function(){
+							resetEvents();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							handle = dojo.connect(dijit.byId("select").focusNode, "onfocus", d.getTestCallback(function(){
+								// Focus goes to an <input> node deep inside of select.domNode,
+								// but that <input> node has the id of the widget
+								doh.is(dojo.byId("select"), dojo.global.dijit.focus.curNode);
+
+								// The focus stack should show the ComboBox plus all parent widgets
+								var stack = dojo.global.dijit._activeStack;
+								doh.is("form, fieldset1, select", stack.join(", "), "combobox stack");
+
+								// _onFocus()/_onBlur was called appropriately
+								doh.f(focusEvents["form"], "form was already focused, no duplicate event");
+								doh.f(blurEvents["form"], "form wasn't blurred");
+								doh.t(focusEvents["fieldset1"], "fieldset1 focused");
+								doh.t(focusEvents["select"], "select focused");
+								
+								doh.f(focusedWatchLog["form"], "form watch callback (no new notification)");
+								doh.is("focused", focusedWatchLog["fieldset1"], "fieldset watch callback");
+								doh.is("focused", focusedWatchLog["select"], "select watch callback");
+							}));
+							dijit.byId("select").focus();
+
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handle);
+						}
+					},
+
+					// clicking spinner buttons should activate the spinner, even
+					// though there's no actual DOM focus event
+					{
+						name: "spinner",
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var upArrow = dojo.query(".dijitSpinner .dijitUpArrowButton")[0];
+							doh.t(upArrow, "found the up arrow");
+
+							doh.robot.mouseMoveAt(upArrow, 500);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// The focus stack should show the Spinner plus all parent widgets
+								var stack = dojo.global.dijit._activeStack;
+								doh.is("form, fieldset2, spinner", stack.join(", "), "spinner stack");
+
+								// check watch callbacks
+								doh.f(focusedWatchLog["form"], "grandparent of spinner stayed focused, so no new watch event (watch)");
+								doh.is("focused", focusedWatchLog["fieldset2"], "parent of spinner (watch)");
+								doh.is("focused", focusedWatchLog["spinner"], "spinner (watch)");
+							}), 1000);
+
+							return d;
+						}
+					}/*,
+					// FIXME: this test is invalid because focus is not designed to change on mouse click to the first item in the menu
+					{
+						name: "combo button menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var button = dijit.byId('button').focusNode;
+							doh.t(button, "found drop down button");
+
+							doh.robot.mouseMoveAt(button);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// Focus goes to an first item in the drop down menu
+								doh.is(dojo.byId("mi1").id, dojo.global.dijit.focus.curNode.id);
+
+								// The focus stack should show the ComboBox plus all parent widgets
+								var stack = dojo.global.dijit._activeStack;
+								console.log("menu stack is ", stack);
+								doh.is("form, fieldset2, button, menu, mi1", stack.join(", "), "menuitem stack");
+							}), 500);
+
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handle);
+						}
+					}*/
+
+/*
+					// Commented out because
+					// in order to allow dijit.popup's getTopPopup() to work,a sub menu's popupParent
+					// points to the parent Menu, bypassing the parent MenuItem... thus the
+					// MenuItem is not in the chain of active widgets
+					{
+						name: "nested menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("popupMenuItem");
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// Focus goes to an first item in the sub menu
+								doh.is(dojo.byId("smi1"), dojo.global.dijit.focus.curNode);
+
+								// The focus stack should show the two submenus and then upwards
+								// to the ComboButton, and the rest
+								var stack = dojo.global.dijit._activeStack;
+								console.log("menu stack is ", stack);
+								doh.is("form, fieldset2, button, menu, mi1, submenu, smi1", stack.join(", "),
+								 	"submenuitem stack");
+							}), 1000);
+
+							return d;
+						}
+					}
+*/
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/runTests.html b/src/main/resources/static/dijit/tests/_base/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..953fa058f90afd0e98a9cdbfc7a10980a05227cb
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/runTests.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+	<title>Dijit _base Unit Test Runner</title>
+	<meta http-equiv="REFRESH" content="0;url=../../../util/doh/runner.html?testModule=dijit.tests._base.module"></HEAD>
+	<BODY>
+		Redirecting to D.O.H runner.
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/_base/test_CrossWindow.html b/src/main/resources/static/dijit/tests/_base/test_CrossWindow.html
new file mode 100644
index 0000000000000000000000000000000000000000..caf9c314c9ef85071c56046bc1ac3ac73243101d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/test_CrossWindow.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+	<head>
+		<title>Templated in IE Popup Test</title>
+		<style>
+			body{
+			font-family:Arial, Helvetica, sans-serif;
+			font-size:12px;
+			}
+		</style>
+		<script type="text/javascript"
+			src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug:true, popup:false, parseOnLoad:false">
+		</script>
+		<script type="text/javascript">
+
+			dojo.require("dijit._Widget");
+			dojo.require("dijit._TemplatedMixin");
+			dojo.require("dojo.parser");
+
+			var w;
+			var popup;
+			var widgetClass;
+			var popwin;
+			var globalDocument;
+			var mainwin = window;
+
+			onPopClose = function(){
+				console.log("setting context back to main window...");
+				dojo.setContext(dojo.global, globalDocument);
+				if(dijit.byId('simple3')){
+					dijit.byId('simple3').destroy();
+				}
+				console.log("Now building the widget in the main window...");
+				var div = dojo.doc.createElement("div");
+				dojo.byId("main").appendChild(div);
+				new widgetClass({id:"simple3"}, div);
+				console.log("There should now be two widgets at the top of the page.");
+			};
+
+			onPopLoad = function(){
+				globalDocument = dojo.doc;
+				dojo.setContext(dojo.global, popwin.document);
+
+				if(dijit.byId('simple2')){
+					dijit.byId('simple2').destroy();
+				}
+				console.log("rendering one widget in popup...");
+
+				var div = dojo.doc.createElement("div");
+				dojo.byId("main").appendChild(div);
+				new widgetClass({id:"simple2"}, div);
+
+				console.log("The widget should have appeared in the popup window.");
+
+				onPopClose();
+			};
+
+			openPopup = function(){
+				popup = window.open('', "mywin", "width=240,height=180");
+				var doc = popup.document;
+
+				var newbcolor = '#FFFFFF';
+				var newfcolor = '$FF0000';
+				var word = "";
+				var HTMLstring = '<HTML><HEAD><TITLE>IE Cross Window</TITLE></HEAD>\n' +
+						'<BODY id="popup" bgColor="' + newbcolor + '">\n' +
+						'<div><div id="main"></div></div>\n' +
+						'</BODY></HTML>';
+
+				doc.write(HTMLstring);
+				doc.close();
+				popup.console = window.console;
+
+
+				// The onload event for IE is written into the above body tag.
+				// This is the onload for Firefox
+				if(dojo.isMoz){
+					popup.onload = onPopLoad;
+				}else{
+					setTimeout(function(){
+						onPopLoad();
+					}, 200);
+				}
+
+				return popup;
+			};
+
+			speedTest = function(){
+				console.log("Speed Test");
+
+				var start = new Date();
+				var amt = 1000;
+
+				var div = dojo.doc.createElement("div");
+				dojo.byId("main").appendChild(div);
+
+				for(var i = 0; i < amt; i++){
+					new widgetClass({id:"simple_" + i}, div);
+				}
+				console.log("Time to render ", amt, " widgets:", (new Date() - start));
+			};
+
+			dojo.ready(function(){
+				widgetClass = dojo.declare(
+					"Simple",
+					[dijit._Widget, dijit._TemplatedMixin], {
+						templateString: '<div> Widget created: ${id} </div>'
+					}
+				);
+
+				speedTest();
+			});
+		</script>
+	</head>
+	<body id="mainpage">
+		<h2>Test for cross window widget building</h2>
+		<p>
+			This test will create a widget in the main window, then in a popup, then another in the main window.
+			Tests issues on IE, namely making sure that nodes are created in the right document, see
+			<a href="http://trac.dojotoolkit.org/ticket/6791">#6791</a>.
+		</p>
+		<p>
+			You must allow popups before running this test.
+			Check console for results.
+		</p>
+		<div id="main"></div>
+		<iframe name="mywin" src="about:blank"></iframe>
+		
+		<a id="popupLink" href="nowhere.html" onclick="popwin = openPopup();return false;">run popup test</a>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/test_FocusManager.html b/src/main/resources/static/dijit/tests/_base/test_FocusManager.html
new file mode 100644
index 0000000000000000000000000000000000000000..8c827aeae211c91f568077af0c60db1066bd9332
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/test_FocusManager.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+
+<!-- Remove in 2.0, replaced by dijit/tests/focus.html -->
+
+<html>
+<head>
+	<title>dijit.focus Test</title>
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/claro/claro.css";
+		@import "../css/dijitTests.css";
+	</style>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true"></script>
+	<script type="text/javascript">
+		dojo.require("dijit.focus");		// dijit.focus()
+		dojo.require("dijit._base.focus");	// dijit.getFocus()
+		dojo.require("dijit._editor.selection");	// accessed by robot test
+		var savedFocus, fakeWidget;
+		dojo.ready(function(){
+			fakeWidget = { domNode: dojo.byId("save") };
+			dojo.subscribe("focusNode", function(node){ console.log("focused on " + (node?(node.id||node.tagName):"nothing"));});
+		});
+		function save(){
+			savedFocus = dijit.getFocus(fakeWidget);
+			console.debug("saved focus: ", savedFocus);
+
+		}
+		function restore(){
+			dijit.focus(savedFocus);
+			console.log("restored focus to: ", savedFocus);
+		}
+	</script>
+</head>
+<body style="background-color: #fff; color: black; padding: 0; margin: 0" class="claro">
+
+	<h3>Focus/Selection Save/Restore Test</h3>
+	<p>This is for testing whether focus and selection can be saved and restored by the focus manager.</p>
+	<p>
+		If you press the "Save focus" button, it should save the focus, but not the selection.
+		This is because merely pressing that button makes the focused textarea/input lose focus,
+		which also loses the selection.  (We fudge things by saving the previously focused element rather
+		than the currently focused one.)
+	</p>
+	<p>
+		If you press the "Save focus/selection state after 3 seconds" button, and then focus an input/textarea
+		and select some text, it should (after three seconds) save both the focused element and the selection.
+	</p>
+	<p id="selectableText" style="color: darkred">This paragraph contains text to select for testing purposes.</p>
+	<form style="border: 2px solid blue;">
+		<input id=input1 value=tom autocomplete=off><br>
+		<input id=input2 value=jones autocomplete=off><br>
+		<textarea id=textarea autocomplete=off>hello there!</textarea><br>
+		<button id=button>push me</button>
+	</form>
+
+	<button id="save" onclick="save();">Save focus</button>
+	<button id="delay_save" onclick="console.log('set timer for func'); setTimeout(save, 3000);">Save focus/selection state after 3 seconds</button>
+	<button id="restore" onclick="restore();">Restore focus/selection state</button>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/test_focusWidget.html b/src/main/resources/static/dijit/tests/_base/test_focusWidget.html
new file mode 100644
index 0000000000000000000000000000000000000000..d4cf75666182488cdd4b607455c82a7fbfade957
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/test_focusWidget.html
@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+
+<!-- Remove in 2.0, replaced by dijit/tests/focus.html -->
+
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>dijit.focus Test</title>
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/claro/claro.css";
+		@import "../css/dijitTests.css";
+	</style>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+	<script type="text/javascript">
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+
+		dojo.require("dijit.form.DateTextBox");
+		dojo.require("dijit.form.ComboBox");
+		dojo.require("dijit.form.NumberSpinner");
+		dojo.require("dijit.form.ComboButton");
+
+		dojo.require("dijit.Menu");
+		dojo.require("dijit.MenuItem");
+		dojo.require("dijit.PopupMenuItem");
+
+		dojo.require("dijit.layout.ContentPane");
+
+		dojo.require("dijit._base.focus");
+
+		// This code does animation to change border color and width to show
+		// active vs. non-active widgets.
+		var queue=[];
+		var animation;
+		function animateBorderColor(widget, color, startWidth, endWidth){
+			if(animation){
+				queue.push(arguments);
+				return;
+			}
+			var s = widget.domNode.style;
+			s.borderStyle="solid";
+			s.outlineStyle="solid";
+			animation = dojo.animateProperty({
+				node: widget.domNode,
+				duration: 50,
+				properties: {
+					// depending on browser and node type, sometimes border or outline is ineffective.
+					// doing both seems to work in all cases though (for at least one of them)
+					borderColor: { end: color },
+					borderWidth: { start: startWidth, end: endWidth },
+					outlineColor: { end: color },
+					outlineWidth: { start: startWidth, end: endWidth }
+				},
+				onEnd: function(){
+					animation=null;
+					if(queue.length){
+						animateBorderColor.apply(null, queue.shift());
+					}
+				}
+			});
+			animation.play();
+		}
+
+		// This flag controls animation and can be disabled by the test harness in robot/focus_mouse.html
+		animate = !window.location.search.match("animate=false");
+
+		dojo.ready(function(){
+			dojo.subscribe("widgetFocus", function(widget){
+				console.log("focused on widget " + (widget?widget:"nothing"));
+				if(animate){
+					animateBorderColor(widget, "#ff0000", 1, 3);
+				}
+			});
+			dojo.subscribe("widgetBlur", function(widget){
+				console.log("blurred widget " + (widget?widget:"nothing"));
+				if(animate){
+					animateBorderColor(widget, "#0000ff", 3, 1);
+				}
+			});
+			dojo.subscribe("focusNode", function(node){ console.log("focused on node " + (node?(node.id||node.tagName):"nothing"));});
+
+			// Focus notification also comes through watch() on each widget
+			dijit.registry.forEach(function(widget){
+				widget.watch("focused", function(name, oldValue, newValue){
+					console.log(this.id + "." + name + ": " + oldValue + " ---> " + newValue);
+				});
+			}, this);
+		});
+	</script>
+	<style>
+		div, fieldset, form, input {
+			padding: 3px;
+			margin: 3px;
+			border: 1px solid blue;
+		}
+	</style>
+</head>
+<body style="background-color: #fff; color: black; padding: 0; margin: 0" class="claro">
+
+	<h3>Widget Focus Test</h3>
+	<p>
+		This is for testing code to detect onBlur and onFocus on a widget level.<br>
+		Focused widgets' borders will turn red.<br>
+		Also, check the console log for focus and blur events on widgets.
+	</p>
+
+	<label>a form ContentPane widget:</label><br>
+	<form id="form" data-dojo-type="dijit/layout/ContentPane" >
+		<label for="first">simple input: </label><input id="first"/><br>
+
+		<label>a fieldset ContentPane widget:</label><br>
+		<fieldset id=fieldset1 data-dojo-type="dijit/layout/ContentPane">
+			<label for="select">a ComboBox widget:</label>
+			<select id=select data-dojo-type="dijit/form/ComboBox">
+				<option>this</option>
+				<option>is</option>
+				<option>a</option>
+				<option>list</option>
+			</select>
+			<label for="plain">a plain input:</label>
+			<input id=plain value=plain/>
+		</fieldset>
+		<br>
+		<label>another fieldset ContentPane:</label><br>
+		<fieldset id=fieldset2 data-dojo-type="dijit/layout/ContentPane">
+			<label for="date">a DateTextBox widget:</label>
+			<input id=date data-dojo-type="dijit/form/DateTextBox"/><br>
+
+			<label for="textarea">a plain textarea:</label><br>
+			<textarea id=textarea>hello there!</textarea><br>
+
+			<label for="spinner">a Spinner widget:</label>
+			<input id=spinner data-dojo-type="dijit/form/NumberSpinner" data-dojo-props='value:100'/><br>
+
+			<label>a Combobutton widget:</label>
+			<div id=button data-dojo-type="dijit/form/ComboButton" data-dojo-props='tabIndex:"0"'>
+				<span>push me</span>
+				<div id=menu data-dojo-type="dijit/Menu">
+					<div id=mi1 data-dojo-type="dijit/MenuItem">menu item 1</div>
+					<div id=mi2 data-dojo-type="dijit/MenuItem">menu item 2</div>
+					<div id=popupMenuItem data-dojo-type="dijit/PopupMenuItem">
+						<span>submenu</span>
+						<div id=submenu data-dojo-type="dijit/Menu">
+							<div id=smi1 data-dojo-type="dijit/MenuItem">submenu item 1</div>
+							<div id=smi2 data-dojo-type="dijit/MenuItem">submenu item 2</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</fieldset>
+	</form>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_base/wai.html b/src/main/resources/static/dijit/tests/_base/wai.html
new file mode 100644
index 0000000000000000000000000000000000000000..0389b391175347365be98cc9e2b3ce32c6539da1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_base/wai.html
@@ -0,0 +1,113 @@
+<html>
+<head>
+	<title>Dijit wai unit test</title>
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true"></script>
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit.dijit");
+
+		dojo.ready(function(){
+			doh.register("dijit.tests._base.wai",
+				[
+					function getWaiRoleOnElementWithNoRole(){
+						var elem = dojo.byId("no-role-or-states");
+						doh.assertFalse(dijit.hasWaiRole(elem));
+						doh.assertEqual("", dijit.getWaiRole(elem));
+					},
+
+					function getEmptyWairoleRole(){
+						var elem = dojo.byId("empty-wairole");
+						doh.assertFalse(dijit.hasWaiRole(elem));
+						doh.assertEqual("", dijit.getWaiRole(elem));
+					},
+
+					function getWairoleRole(){
+						var elem = dojo.byId("wairole");
+						doh.assertTrue(dijit.hasWaiRole(elem));
+						doh.assertEqual("menuitem", dijit.getWaiRole(elem));
+					},
+
+					function getUnprefixedRole(){
+						var elem = dojo.byId("unprefixed-role");
+						doh.assertTrue(dijit.hasWaiRole(elem));
+						doh.assertEqual("menuitem", dijit.getWaiRole(elem));
+					},
+
+					function setWaiRole(){
+						var div = document.createElement("div");
+						dijit.setWaiRole(div, "menuitem");
+						doh.assertEqual("menuitem", div.getAttribute("role"));
+					},
+
+					function setWaiRoleToExistingXHTML(){
+						/* replacing XHTML role w/wai role */
+						var elem=dojo.byId("navigation-role");
+						dijit.setWaiRole(elem, "treeitem");
+						doh.assertEqual("treeitem", elem.getAttribute("role"));
+					},
+
+					function setWaiRoleToExistingWaiRole(){
+						/* replacing wai role w/another wai role */
+						var div= document.createElement("div");
+						dijit.setWaiRole(div, "menuitem");
+						doh.assertTrue(dijit.hasWaiRole(div, "menuitem"));
+						dijit.setWaiRole(div, "treeitem");
+						doh.assertEqual("treeitem", div.getAttribute("role"));
+					},
+
+					function removeAllWaiRole(){
+						var div = document.createElement("div");
+						dijit.setWaiRole(div, "menuitem");
+						doh.assertTrue(dijit.hasWaiRole(div, "menuitem"));
+						dijit.removeWaiRole(div);
+						if(div.hasAttribute){
+							doh.assertFalse(div.hasAttribute("role"));
+						}else{
+							doh.assertTrue(div.getAttribute("role") == null
+								|| div.getAttribute("role") == "");
+						}
+					},
+
+					function getWaiStateOnElementWithNoState(){
+						var elem = dojo.byId("no-role-or-states");
+						doh.assertFalse(dijit.hasWaiState(elem, "checked"));
+						doh.assertEqual("", dijit.getWaiState(elem, "checked"));
+					},
+
+					function getWaiState(){
+						var elem = dojo.byId("checked");
+						doh.assertTrue(dijit.hasWaiState(elem, "checked"));
+						doh.assertEqual("true",
+							dijit.getWaiState(elem, "checked"));
+					},
+
+					function setWaiState(){
+						var div = document.createElement("div");
+						dijit.setWaiState(div, "checked", "true");
+						doh.assertEqual("true",
+							div.getAttribute("aria-checked"));
+					},
+
+					function removeWaiState(){
+						var div = document.createElement("div");
+						dijit.setWaiState(div, "checked", "true");
+						dijit.removeWaiState(div, "checked");
+						doh.assertEqual("", dijit.getWaiState(div, "checked"));
+					}
+				]
+			);
+			doh.run();
+		});
+	</script>
+</head>
+<body>
+	<div id="no-role-or-states"></div>
+	<div id="empty-wairole" role="wairole:"></div>
+	<div id="wairole" role="wairole:menuitem"></div>
+	<div id="unprefixed-role" role="menuitem"></div>
+	<div id="navigation-role" role="contentinfo"></div>
+	<div id="single-role" role="contentinfo"></div>
+	<div id="checked" aria-checked="true"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/_data/SlowStore.js b/src/main/resources/static/dijit/tests/_data/SlowStore.js
new file mode 100644
index 0000000000000000000000000000000000000000..966b63b5acbc0e5c4acd25d540ec0416fd13af1c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_data/SlowStore.js
@@ -0,0 +1,89 @@
+define(["dojo/_base/declare", "dojo/data/ItemFileReadStore"], function(declare, ItemFileReadStore){
+
+	return declare("dijit.tests._data.SlowStore", ItemFileReadStore, {
+		// summary:
+		//		This wrapper decorates an ItemFileReadStore by delaying queries issued according to the
+		//		length of the query:
+		//
+		//		- empty query: 2000ms,
+		//		- 1 or 2 characters: 1000ms,
+		//		- 3 characters: 500ms,
+		//		- 4 or more characters: 100ms.
+
+		constructor: function(){
+			this.log = [];
+		},
+
+		fetch: function(/* Object */ keywordArgs){
+			// Get the query phrase (store into first), and the # of chars it has
+			var count = 0;
+			var first;
+			if("query" in keywordArgs){
+				var query = keywordArgs.query;
+				for(var attr in query){
+					first = query[attr];
+					break;
+				}
+				count = first.toString().length;
+			}
+
+			var delay = 100;
+			switch(count || 0){
+				case 0:
+					delay = 2000;
+					break;
+				case 1:
+				case 2:
+					delay = 1000;
+					break;
+				case 3:
+					delay = 500;
+					break;
+				case 4:
+					delay = 100;
+					break;
+			}
+
+			this.log.push({
+				type: "start",
+				date: new Date(),
+				query: query,
+				count: count,
+				delay: delay
+			});
+			console.log("START query on " + (first || "{}") + " (" + count + " chars), delay = " + delay);
+
+			var that = this,
+				thatArgs = arguments;
+			var handle = setTimeout(function(){
+				that.log.push({
+					type: "end",
+					date: new Date(),
+					query: query,
+					count: count,
+					delay: delay
+				});
+				console.log("END query on " + (first || "{}") + " (" + count + " chars), delay = " + delay);
+				ItemFileReadStore.prototype.fetch.apply(that, thatArgs);
+			}, delay);
+
+			// This abort() method cancels a request before it has even been sent to ItemFileReadStore.
+			// (Since ItemFileReadStore has already loaded the data (as per code in the test file),
+			// it operates synchronously; there is never a case to send the cancel request to that object)
+			keywordArgs.abort = function(){
+				clearTimeout(handle);
+				that.log.push({
+					type: "cancel",
+					date: new Date(),
+					query: query,
+					count: count,
+					delay: delay
+				});
+				console.log("CANCEL query on " + (first || "{}") + " (" + count + " chars), delay = " + delay);
+			};
+
+			return keywordArgs;
+		}
+	});
+
+});
diff --git a/src/main/resources/static/dijit/tests/_data/categories.json b/src/main/resources/static/dijit/tests/_data/categories.json
new file mode 100644
index 0000000000000000000000000000000000000000..0bf996c8c6ab24a913432f375d4729567bef87b5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_data/categories.json
@@ -0,0 +1,12 @@
+{
+	"identifier": "id",
+	"label": "name",
+	"items": [
+		{ "id": "0", "name":"Foods", "numberOfItems":1, "children":[ {"_reference": "1"},  {"_reference": "2"},  {"_reference": "3"} ] },
+			{ "id": "1", "name":"Fruits", "numberOfItems":1, "children":[ {"_reference": "4"} ] },
+				{ "id": "4","name":"Citrus", "numberOfItems":1, "items":[ {"_reference": "5"} ] },
+					{ "id": "5", "name":"Orange"},
+		{ "id": "2", "name":"Vegetables", "numberOfItems":0},
+		{ "id": "3", "name":"Cereals", "numberOfItems":0}
+	]
+}
diff --git a/src/main/resources/static/dijit/tests/_data/categoriesNested.json b/src/main/resources/static/dijit/tests/_data/categoriesNested.json
new file mode 100644
index 0000000000000000000000000000000000000000..c264344eceb1183132b15c1ebf3f138d9b664fa1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_data/categoriesNested.json
@@ -0,0 +1,13 @@
+{
+	"identifier": "id",
+	"label": "name",
+	"items": [
+		{ "id": "0", "name":"Fruits", "numberOfItems":1, "children":[
+			{ "id": "1","name":"Citrus", "numberOfItems":1, "items":[
+				{ "id": "4", "name":"Orange"}
+			]}
+		]},
+		{ "id": "2", "name":"Vegetables", "numberOfItems":0},
+		{ "id": "3", "name":"Cereals", "numberOfItems":0}
+	]
+}
diff --git a/src/main/resources/static/dijit/tests/_data/countries.json b/src/main/resources/static/dijit/tests/_data/countries.json
new file mode 100644
index 0000000000000000000000000000000000000000..8b39decbcf78b79792d6bd5f1a55b6da3d3dea90
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_data/countries.json
@@ -0,0 +1,46 @@
+{
+	"identifier": "id",
+	"label": "name",
+	"items": [
+	        { "id": "AF", "name":"Africa", "type":"continent", "population":"900 million", "area": "30,221,532 sq km",
+	        		"timezone": "-1 UTC to +4 UTC",
+	        		"children":[{"_reference":"EG"}, {"_reference":"KE"}, {"_reference":"SD"}] },
+	        	{ "id": "EG", "name":"Egypt", "type":"country" },
+	        	{ "id": "KE", "name":"Kenya", "type":"country",
+	        			"children":[{"_reference":"Nairobi"}, {"_reference":"Mombasa"}] },
+	        		{ "id": "Nairobi", "name":"Nairobi", "type":"city" },
+	        		{ "id": "Mombasa", "name":"Mombasa", "type":"city" },
+	        	{ "id": "SD", "name":"Sudan", "type":"country",
+	        			"children":{"_reference":"Khartoum"} },
+	        		{ "id": "Khartoum", "name":"Khartoum", "type":"city" },
+	        	{ "id": "AS", "name":"Asia", "type":"continent",
+	        			"children":[{"_reference":"CN"}, {"_reference":"IN"}, {"_reference":"RU"}, {"_reference":"MN"}] },
+	        		{ "id": "CN", "name":"China", "type":"country" },
+	        		{ "id": "IN", "name":"India", "type":"country" },
+	        		{ "id": "RU", "name":"Russia", "type":"country" },
+	        		{ "id": "MN", "name":"Mongolia", "type":"country" },
+	        	{ "id": "OC", "name":"Oceania", "type":"continent", "population":"21 million",
+	        			"children":{"_reference":"AU"}},
+	        	{ "id": "AU", "name":"Australia", "type":"country", "population":"21 million"},
+	        	{ "id": "EU", "name":"Europe", "type":"continent",
+	        			"children":[{"_reference":"DE"}, {"_reference":"FR"}, {"_reference":"ES"}, {"_reference":"IT"}] },
+	        	{ "id": "DE", "name":"Germany", "type":"country" },
+	        	{ "id": "FR", "name":"France", "type":"country" },
+	        	{ "id": "ES", "name":"Spain", "type":"country" },
+	        	{ "id": "IT", "name":"Italy", "type":"country" },
+	        { "id": "NA", "name":"North America", "type":"continent",
+	        		"children":[{"_reference":"MX"}, {"_reference":"CA"}, {"_reference":"US"}] },
+	        	{ "id": "MX", "name":"Mexico", "type":"country",  "population":"108 million", "area":"1,972,550 sq km",
+	        			"children":[{"_reference":"Mexico City"}, {"_reference":"Guadalajara"}] },
+	        		{ "id": "Mexico City", "name":"Mexico City", "type":"city", "population":"19 million", "timezone":"-6 UTC"},
+	        		{ "id": "Guadalajara", "name":"Guadalajara", "type":"city", "population":"4 million", "timezone":"-6 UTC" },
+	        	{ "id": "CA", "name":"Canada", "type":"country",  "population":"33 million", "area":"9,984,670 sq km",
+	        			"children":[{"_reference":"Ottawa"}, {"_reference":"Toronto"}] },
+	        		{ "id": "Ottawa", "name":"Ottawa", "type":"city", "population":"0.9 million", "timezone":"-5 UTC"},
+	        		{ "id": "Toronto", "name":"Toronto", "type":"city", "population":"2.5 million", "timezone":"-5 UTC" },
+	        	{ "id": "US", "name":"United States of America", "type":"country" },
+	        { "id": "SA", "name":"South America", "type":"continent",
+	        		"children":[{"_reference":"BR"}, {"_reference":"AR"}] },
+	        	{ "id": "BR", "name":"Brazil", "type":"country", "population":"186 million" },
+	        	{ "id": "AR", "name":"Argentina", "type":"country", "population":"40 million" }
+]}
diff --git a/src/main/resources/static/dijit/tests/_data/dijits.json b/src/main/resources/static/dijit/tests/_data/dijits.json
new file mode 100644
index 0000000000000000000000000000000000000000..160581b5d0b1f7285b7ba71e5be2941302008b9e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_data/dijits.json
@@ -0,0 +1 @@
+{"timestamp":1193692111,"items":[{"namespace":"dijit","className":"dijit.ColorPalette","summary":"Grid showing various colors, so the user can pick a certain color","description":null,"examples":null},{"namespace":"dijit","className":"dijit.Declaration","summary":"The Declaration widget allows a user to declare new widget\nclasses directly from a snippet of markup.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.DialogUnderlay","summary":"the thing that grays out the screen behind the dialog\n\nTemplate has two divs; outer div is used for fade-in\/fade-out, and also to hold background iframe.\nInner div has opacity specified in CSS file.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.Dialog","summary":"Pops up a modal dialog window, blocking access to the screen\nand also graying out the screen Dialog is extended from\nContentPane so it supports all the same parameters (href, etc.)","description":null,"examples":null},{"namespace":"dijit","className":"dijit.TooltipDialog","summary":"Pops up a dialog that appears like a Tooltip","description":null,"examples":null},{"namespace":"dijit","className":"dijit.Editor","summary":"A rich-text Editing widget","description":null,"examples":null},{"namespace":"dijit","className":"dijit.InlineEditBox","summary":"Behavior for an existing node (<p>, <div>, <span>, etc.) so that\nwhen you click it, an editor shows up in place of the original\ntext.  Optionally, Save and Cancel button are displayed below the edit widget.\nWhen Save is clicked, the text is pulled from the edit\nwidget and redisplayed and the edit widget is again hidden.\nBy default a plain Textarea widget is used as the editor (or for\ninline values a TextBox), but you can specify an editor such as\ndijit.Editor (for editing HTML) or a Slider (for adjusting a number).\nAn edit widget must support the following API to be used:\nString getDisplayedValue() OR String getValue()\nvoid setDisplayedValue(String) OR void setValue(String)\nvoid focus()","description":null,"examples":null},{"namespace":"dijit","className":"dijit._InlineEditor","summary":"internal widget used by InlineEditBox, displayed when in editing mode\nto display the editor and maybe save\/cancel buttons.  Calling code should\nconnect to save\/cancel methods to detect when editing is finished\n\nHas mainly the same parameters as InlineEditBox, plus these values:\n\nstyle: Object\nSet of CSS attributes of display node, to replicate in editor\n\nvalue: String\nValue as an HTML string or plain text string, depending on renderAsHTML flag","description":null,"examples":null},{"namespace":"dijit","className":"dijit.Menu","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.MenuItem","summary":"A line item in a Menu2\n\nMake 3 columns\nicon, label, and expand arrow (BiDi-dependent) indicating sub-menu","description":null,"examples":null},{"namespace":"dijit","className":"dijit.PopupMenuItem","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.MenuSeparator","summary":"A line between two menu items","description":null,"examples":null},{"namespace":"dijit","className":"dijit.ProgressBar","summary":"a progress widget\n\nusage:\n<div dojoType=\"ProgressBar\"","description":null,"examples":null},{"namespace":"dijit","className":"dijit.TitlePane","summary":"A pane with a title on top, that can be opened or collapsed.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.Toolbar","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.ToolbarSeparator","summary":"A line between two menu items","description":null,"examples":null},{"namespace":"dijit","className":"dijit._MasterTooltip","summary":"Internal widget that holds the actual tooltip markup,\nwhich occurs once per page.\nCalled by Tooltip widgets which are just containers to hold\nthe markup","description":null,"examples":null},{"namespace":"dijit","className":"dijit.Tooltip","summary":"Pops up a tooltip (a help message) when you hover over a node.","description":null,"examples":null},{"namespace":"dijit","className":"dijit._TreeNode","summary":"Single node within a tree","description":null,"examples":null},{"namespace":"dijit","className":"dijit.Tree","summary":"This widget displays hierarchical data from a store.  A query is specified\nto get the \"top level children\" from a data store, and then those items are\nqueried for their children and so on (but lazily, as the user clicks the expand node).\n\nThus in the default mode of operation this widget is technically a forest, not a tree,\nin that there can be multiple \"top level children\".  However, if you specify label,\nthen a special top level node (not corresponding to any item in the datastore) is\ncreated, to father all the top level children.","description":null,"examples":null},{"namespace":"dijit","className":"dijit._Calendar","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit._Contained","summary":"Mixin for widgets that are children of a container widget","description":null,"examples":null},{"namespace":"dijit","className":"dijit._Container","summary":"Mixin for widgets that contain a list of children like SplitContainer","description":null,"examples":null},{"namespace":"dijit","className":"dijit._KeyNavContainer","summary":"A _Container with keyboard navigation of its children.\nTo use this mixin, call connectKeyNavHandlers() in\npostCreate() and call connectKeyNavChildren() in startup().","description":null,"examples":null},{"namespace":"dijit","className":"dijit._Templated","summary":"mixin for widgets that are instantiated from a template","description":null,"examples":null},{"namespace":"dijit","className":"dijit._TimePicker","summary":"A graphical time picker that TimeTextBox pops up\nIt is functionally modeled after the Java applet at http:\/\/java.arcadevillage.com\/applets\/timepica.htm\nSee ticket #599","description":null,"examples":null},{"namespace":"dijit","className":"dijit._Widget","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.WidgetSet","summary":"A set of widgets indexed by id","description":null,"examples":null},{"namespace":"dijit","className":"dijit.BackgroundIframe","summary":"For IE z-index schenanigans. id attribute is required.","description":"new dijit.BackgroundIframe(node)\nMakes a background iframe as a child of node, that fills\narea (and position) of node","examples":null},{"namespace":"dijit","className":"dijit._editor.RichText","summary":"dijit._editor.RichText is the core of the WYSIWYG editor in dojo, which\nprovides the basic editing features. It also encapsulates the differences\nof different js engines for various browsers","description":null,"examples":null},{"namespace":"dijit","className":"dijit._editor._Plugin","summary":"only allow updates every two tenths of a second","description":null,"examples":null},{"namespace":"dijit","className":"dijit._editor.plugins.AlwaysShowToolbar","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit._editor.plugins.EnterKeyHandling","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit._editor.plugins.FontChoice","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit._editor.plugins.DualStateDropDownButton","summary":"a DropDownButton but button can be displayed in two states (checked or unchecked)","description":null,"examples":null},{"namespace":"dijit","className":"dijit._editor.plugins.UrlTextBox","summary":"the URL input box we use in our dialog\n\nregular expression for URLs, generated from dojo.regexp.url()","description":null,"examples":null},{"namespace":"dijit","className":"dijit._editor.plugins.LinkDialog","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit._editor.plugins.TextColor","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.range.W3CRange","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.demos.chat.Room","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.Button","summary":"Basically the same thing as a normal HTML button, but with special styling.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.DropDownButton","summary":"push the button and a menu shows up","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.ComboButton","summary":"left side is normal button, right side displays menu","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.ToggleButton","summary":"A button that can be in two states (checked or not).\nCan be base class for things like tabs or checkbox or radio buttons","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.CheckBox","summary":"Same as an HTML checkbox, but with fancy styling.","description":"Value of \"type\" attribute for <input>","examples":null},{"namespace":"dijit","className":"dijit.form.RadioButton","summary":"Same as an HTML radio, but with fancy styling.","description":"This shared object keeps track of all widgets, grouped by name","examples":null},{"namespace":"dijit","className":"dijit.form.ComboBoxMixin","summary":"Auto-completing text box, and base class for FilteringSelect widget.\n\nThe drop down box's values are populated from an class called\na data provider, which returns a list of values based on the characters\nthat the user has typed into the input box.\n\nSome of the options to the ComboBox are actually arguments to the data\nprovider.\n\nYou can assume that all the form widgets (and thus anything that mixes\nin ComboBoxMixin) will inherit from _FormWidget and thus the \"this\"\nreference will also \"be a\" _FormWidget.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form._ComboBoxMenu","summary":"these functions are called in showResultList","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.ComboBox","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.CurrencyTextBox","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.DateTextBox","summary":"A validating, serializable, range-bound date text box.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.FilteringSelect","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form._FormMixin","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.Form","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.InlineEditBox","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.NumberSpinner","summary":"Number Spinner","description":"This widget is the same as NumberTextBox but with up\/down arrows added","examples":null},{"namespace":"dijit","className":"dijit.form.NumberTextBoxMixin","summary":"A mixin for all number textboxes","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.NumberTextBox","summary":"A validating, serializable, range-bound text box.\nconstraints object: min, max, places","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.HorizontalSlider","summary":"A form widget that allows one to select a value with a horizontally draggable image","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.VerticalSlider","summary":"A form widget that allows one to select a value with a vertically draggable image","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form._SliderMover","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.HorizontalRule","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.VerticalRule","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.HorizontalRuleLabels","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.VerticalRuleLabels","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.TextBox","summary":"A generic textbox field.\nServes as a base class to derive more specialized functionality in subclasses.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.Textarea","summary":"event handlers, you can over-ride these in your own subclasses","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.TimeTextBox","summary":"NaN\nNaN","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.ValidationTextBox","summary":"default values for new subclass properties","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.MappedTextBox","summary":"A subclass of ValidationTextBox.\nProvides a hidden input field and a serialize method to override","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form.RangeBoundTextBox","summary":"A subclass of MappedTextBox.\nTests for a value out-of-range","description":null,"examples":null},{"namespace":"dijit","className":"dijit.form._FormWidget","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.form._Spinner","summary":"Mixin for validation widgets with a spinner","description":"This class basically (conceptually) extends dijit.form.ValidationTextBox.\nIt modifies the template to have up\/down arrows, and provides related handling code.","examples":null},{"namespace":"dijit","className":"dijit.layout.AccordionContainer","summary":"Holds a set of panes where every pane's title is visible, but only one pane's content is visible at a time,\nand switching between panes is visualized by sliding the other panes up\/down.\nusage:\n<div dojoType=\"dijit.layout.AccordionContainer\">\n<div dojoType=\"dijit.layout.AccordionPane\" title=\"pane 1\">\n<div dojoType=\"dijit.layout.ContentPane\">...<\/div>\n<\/div>\n<div dojoType=\"dijit.layout.AccordionPane\" title=\"pane 2\">\n<p>This is some text<\/p>\n...\n<\/div>","description":null,"examples":null},{"namespace":"dijit","className":"dijit.layout.AccordionPane","summary":"AccordionPane is a ContentPane with a title that may contain another widget.\nNested layout widgets, such as SplitContainer, are not supported at this time.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.layout.ContentPane","summary":"A widget that acts as a Container for other widgets, and includes a ajax interface","description":"A widget that can be used as a standalone widget\nor as a baseclass for other widgets\nHandles replacement of document fragment using either external uri or javascript\ngenerated markup or DOM content, instantiating widgets within that content.\nDon't confuse it with an iframe, it only needs\/wants document fragments.\nIt's useful as a child of LayoutContainer, SplitContainer, or TabContainer.\nBut note that those classes can contain any widget as a child.\nexample:\nSome quick samples:\nTo change the innerHTML use .setContent('<b>new content<\/b>')\n\nOr you can send it a NodeList, .setContent(dojo.query('div [class=selected]', userSelection))\nplease note that the nodes in NodeList will copied, not moved\n\nTo do a ajax update use .setHref('url')","examples":null},{"namespace":"dijit","className":"dijit.layout.LayoutContainer","summary":"Provides Delphi-style panel layout semantics.\n\ndetails\nA LayoutContainer is a box with a specified size (like style=\"width: 500px; height: 500px;\"),\nthat contains children widgets marked with \"layoutAlign\" of \"left\", \"right\", \"bottom\", \"top\", and \"client\".\nIt takes it's children marked as left\/top\/bottom\/right, and lays them out along the edges of the box,\nand then it takes the child marked \"client\" and puts it into the remaining space in the middle.\n\nLeft\/right positioning is similar to CSS's \"float: left\" and \"float: right\",\nand top\/bottom positioning would be similar to \"float: top\" and \"float: bottom\", if there were such\nCSS.\n\nNote that there can only be one client element, but there can be multiple left, right, top,\nor bottom elements.\n\nusage\n<style>\nhtml, body{ height: 100%; width: 100%; }\n<\/style>\n<div dojoType=\"dijit.layout.LayoutContainer\" style=\"width: 100%; height: 100%\">\n<div dojoType=\"dijit.layout.ContentPane\" layoutAlign=\"top\">header text<\/div>\n<div dojoType=\"dijit.layout.ContentPane\" layoutAlign=\"left\" style=\"width: 200px;\">table of contents<\/div>\n<div dojoType=\"dijit.layout.ContentPane\" layoutAlign=\"client\">client area<\/div>\n<\/div>\n\nLays out each child in the natural order the children occur in.\nBasically each child is laid out into the \"remaining space\", where \"remaining space\" is initially\nthe content area of this widget, but is reduced to a smaller rectangle each time a child is added.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.layout.LinkPane","summary":"A ContentPane that loads data remotely","description":"LinkPane is just a ContentPane that loads data remotely (via the href attribute),\nand has markup similar to an anchor.  The anchor's body (the words between <a> and <\/a>)\nbecome the title of the widget (used for TabContainer, AccordionContainer, etc.)\nexample:\n<a href=\"foo.html\">my title<\/a>\n\nI'm using a template because the user may specify the input as\n<a href=\"foo.html\">title<\/a>, in which case we need to get rid of the\n<a> because we don't want a link.","examples":null},{"namespace":"dijit","className":"dijit.layout.SplitContainer","summary":"A Container widget with sizing handles in-between each child","description":"Contains multiple children widgets, all of which are displayed side by side\n(either horizontally or vertically); there's a bar between each of the children,\nand you can adjust the relative size of each child by dragging the bars.\n\nYou must specify a size (width and height) for the SplitContainer.","examples":null},{"namespace":"dijit","className":"dijit.layout.StackContainer","summary":null,"description":null,"examples":null},{"namespace":"dijit","className":"dijit.layout.StackController","summary":"Set of buttons to select a page in a page list.\nMonitors the specified StackContainer, and whenever a page is\nadded, deleted, or selected, updates itself accordingly.","description":null,"examples":null},{"namespace":"dijit","className":"dijit.layout._StackButton","summary":"StackContainer buttons are not in the tab order by default","description":null,"examples":null},{"namespace":"dijit","className":"dijit.layout.TabContainer","summary":"A Container with Title Tabs, each one pointing at a pane in the container.","description":"A TabContainer is a container that has multiple panes, but shows only\none pane at a time.  There are a set of tabs corresponding to each pane,\nwhere each tab has the title (aka title) of the pane, and optionally a close button.\n\nPublishes topics <widgetId>-addChild, <widgetId>-removeChild, and <widgetId>-selectChild\n(where <widgetId> is the id of the TabContainer itself.","examples":null},{"namespace":"dijit","className":"dijit.layout.TabController","summary":"Set of tabs (the things with titles and a close button, that you click to show a tab panel).","description":"Lets the user select the currently shown pane in a TabContainer or StackContainer.\nTabController also monitors the TabContainer, and whenever a pane is\nadded or deleted updates itself accordingly.","examples":null},{"namespace":"dijit","className":"dijit.layout._TabButton","summary":"A tab (the thing you click to select a pane).","description":"Contains the title of the pane, and optionally a close-button to destroy the pane.\nThis is an internal widget and should not be instantiated directly.","examples":null},{"namespace":"dijit","className":"dijit.layout._LayoutWidget","summary":"Mixin for widgets that contain a list of children like SplitContainer.\nWidgets which mixin this code must define layout() to lay out the children","description":null,"examples":null}],"identifier":"className","label":"className"}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/_data/geography.js b/src/main/resources/static/dijit/tests/_data/geography.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3eff4e19dd9267c8915a85ce523153d99ebd885
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_data/geography.js
@@ -0,0 +1,37 @@
+// Array of countries and cities, with children having references to their parents rather than vice-versa.
+// Used with dijit/tree/ObjectStoreModel.
+
+define([
+	{ id: "earth", name:"The earth", type:"planet", population: "6 billion"},
+	{ id: "AF", name:"Africa", type:"continent", population:"900 million", area: "30,221,532 sq km",
+		timezone: "-1 UTC to +4 UTC", parent: "earth"},
+	{ id: "EG", name:"Egypt", type:"country", parent: "AF" },
+	{ id: "KE", name:"Kenya", type:"country", parent: "AF" },
+	{ id: "Nairobi", name:"Nairobi", type:"city", parent: "KE" },
+	{ id: "Mombasa", name:"Mombasa", type:"city", parent: "KE" },
+	{ id: "SD", name:"Sudan", type:"country", parent: "AF" },
+	{ id: "Khartoum", name:"Khartoum", type:"city", parent: "SD" },
+	{ id: "AS", name:"Asia", type:"continent", parent: "earth" },
+	{ id: "CN", name:"China", type:"country", parent: "AS" },
+	{ id: "IN", name:"India", type:"country", parent: "AS" },
+	{ id: "RU", name:"Russia", type:"country", parent: "AS" },
+	{ id: "MN", name:"Mongolia", type:"country", parent: "AS" },
+	{ id: "OC", name:"Oceania", type:"continent", population:"21 million", parent: "earth"},
+	{ id: "AU", name:"Australia", type:"country", population:"21 million", parent: "OC"},
+	{ id: "EU", name:"Europe", type:"continent", parent: "earth" },
+	{ id: "DE", name:"Germany", type:"country", parent: "EU" },
+	{ id: "FR", name:"France", type:"country", parent: "EU" },
+	{ id: "ES", name:"Spain", type:"country", parent: "EU" },
+	{ id: "IT", name:"Italy", type:"country", parent: "EU" },
+	{ id: "NA", name:"North America", type:"continent", parent: "earth" },
+	{ id: "MX", name:"Mexico", type:"country",  population:"108 million", area:"1,972,550 sq km", parent: "NA" },
+	{ id: "Mexico City", name:"Mexico City", type:"city", population:"19 million", timezone:"-6 UTC", parent: "MX"},
+	{ id: "Guadalajara", name:"Guadalajara", type:"city", population:"4 million", timezone:"-6 UTC", parent: "MX" },
+	{ id: "CA", name:"Canada", type:"country",  population:"33 million", area:"9,984,670 sq km", parent: "NA" },
+	{ id: "Ottawa", name:"Ottawa", type:"city", population:"0.9 million", timezone:"-5 UTC", parent: "CA"},
+	{ id: "Toronto", name:"Toronto", type:"city", population:"2.5 million", timezone:"-5 UTC", parent: "CA" },
+	{ id: "US", name:"United States of America", type:"country", parent: "NA" },
+	{ id: "SA", name:"South America", type:"continent", parent: "earth" },
+	{ id: "BR", name:"Brazil", type:"country", population:"186 million", parent: "SA" },
+	{ id: "AR", name:"Argentina", type:"country", population:"40 million", parent: "SA" }
+]);
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/_data/states.json b/src/main/resources/static/dijit/tests/_data/states.json
new file mode 100644
index 0000000000000000000000000000000000000000..b2bc4081a911ac306d89730e920a0bf821f749f5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_data/states.json
@@ -0,0 +1,67 @@
+{
+  "identifier":"abbreviation",
+  "label": "name",
+  "items": [
+	{"name":"Alabama", "label":"<img width='97px' height='127px' src='images/Alabama.jpg'/>Alabama","abbreviation":"AL"},
+	{"name":"Alaska", "label":"Alaska","abbreviation":"AK"},
+	{"name":"American Samoa", "label":"American Samoa","abbreviation":"AS"},
+	{"name":"Arizona", "label":"Arizona","abbreviation":"AZ"},
+	{"name":"Arkansas", "label":"Arkansas","abbreviation":"AR"},
+	{"name":"Armed Forces Europe", "label":"Armed Forces Europe","abbreviation":"AE"},
+	{"name":"Armed Forces Pacific", "label":"Armed Forces Pacific","abbreviation":"AP"},
+	{"name":"Armed Forces the Americas", "label":"Armed Forces the Americas","abbreviation":"AA"},
+	{"name":"California", "label":"California","abbreviation":"CA"},
+	{"name":"Colorado", "label":"Colorado","abbreviation":"CO"},
+	{"name":"Connecticut", "label":"Connecticut","abbreviation":"CT"},
+	{"name":"Delaware", "label":"Delaware","abbreviation":"DE"},
+	{"name":"District of Columbia", "label":"District of Columbia","abbreviation":"DC"},
+	{"name":"Federated States of Micronesia", "label":"Federated States of Micronesia","abbreviation":"FM"},
+	{"name":"Florida", "label":"Florida","abbreviation":"FL"},
+	{"name":"Georgia", "label":"Georgia","abbreviation":"GA"},
+	{"name":"Guam", "label":"Guam","abbreviation":"GU"},
+	{"name":"Hawaii", "label":"Hawaii","abbreviation":"HI"},
+	{"name":"Idaho", "label":"Idaho","abbreviation":"ID"},
+	{"name":"Illinois", "label":"Illinois","abbreviation":"IL"},
+	{"name":"Indiana", "label":"Indiana","abbreviation":"IN"},
+	{"name":"Iowa", "label":"Iowa","abbreviation":"IA"},
+	{"name":"Kansas", "label":"Kansas","abbreviation":"KS"},
+	{"name":"Kentucky", "label":"Kentucky","abbreviation":"KY"},
+	{"name":"Louisiana", "label":"Louisiana","abbreviation":"LA"},
+	{"name":"Maine", "label":"Maine","abbreviation":"ME"},
+	{"name":"Marshall Islands", "label":"Marshall Islands","abbreviation":"MH"},
+	{"name":"Maryland", "label":"Maryland","abbreviation":"MD"},
+	{"name":"Massachusetts", "label":"Massachusetts","abbreviation":"MA"},
+	{"name":"Michigan", "label":"Michigan","abbreviation":"MI"},
+	{"name":"Minnesota", "label":"Minnesota","abbreviation":"MN"},
+	{"name":"Mississippi", "label":"Mississippi","abbreviation":"MS"},
+	{"name":"Missouri", "label":"Missouri","abbreviation":"MO"},
+	{"name":"Montana", "label":"Montana","abbreviation":"MT"},
+	{"name":"Nebraska", "label":"Nebraska","abbreviation":"NE"},
+	{"name":"Nevada", "label":"Nevada","abbreviation":"NV"},
+	{"name":"New Hampshire", "label":"New Hampshire","abbreviation":"NH"},
+	{"name":"New Jersey", "label":"New Jersey","abbreviation":"NJ"},
+	{"name":"New Mexico", "label":"New Mexico","abbreviation":"NM"},
+	{"name":"New York", "label":"New York","abbreviation":"NY"},
+	{"name":"North Carolina", "label":"North Carolina","abbreviation":"NC"},
+	{"name":"North Dakota", "label":"North Dakota","abbreviation":"ND"},
+	{"name":"Northern Mariana Islands", "label":"Northern Mariana Islands","abbreviation":"MP"},
+	{"name":"Ohio", "label":"Ohio","abbreviation":"OH"},
+	{"name":"Oklahoma", "label":"Oklahoma","abbreviation":"OK"},
+	{"name":"Oregon", "label":"Oregon","abbreviation":"OR"},
+	{"name":"Pennsylvania", "label":"Pennsylvania","abbreviation":"PA"},
+	{"name":"Puerto Rico", "label":"Puerto Rico","abbreviation":"PR"},
+	{"name":"Rhode Island", "label":"Rhode Island","abbreviation":"RI"},
+	{"name":"South Carolina", "label":"South Carolina","abbreviation":"SC"},
+	{"name":"South Dakota", "label":"South Dakota","abbreviation":"SD"},
+	{"name":"Tennessee", "label":"Tennessee","abbreviation":"TN"},
+	{"name":"Texas", "label":"Texas","abbreviation":"TX"},
+	{"name":"Utah", "label":"Utah","abbreviation":"UT"},
+	{"name":"Vermont", "label":"Vermont","abbreviation":"VT"},
+	{"name": "Virgin Islands, U.S.","label":"Virgin Islands, U.S.","abbreviation":"VI"},
+	{"name":"Virginia", "label":"Virginia","abbreviation":"VA"},
+	{"name":"Washington", "label":"Washington","abbreviation":"WA"},
+	{"name":"West Virginia", "label":"West Virginia","abbreviation":"WV"},
+	{"name":"Wisconsin", "label":"Wisconsin","abbreviation":"WI"},
+	{"name":"Wyoming", "label":"Wyoming","abbreviation":"WY"}
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/_loadTest.js b/src/main/resources/static/dijit/tests/_loadTest.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ef26d68d60fd427b19cda56f5cb8b5f44065f2d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_loadTest.js
@@ -0,0 +1,103 @@
+(function(){
+var file;
+var head = document.documentElement.firstChild;
+while(head && head.tagName != "HEAD"){
+	head = head.nextSibling;
+}
+var script = head.lastChild;
+while(script){
+	if(script.tagName == "SCRIPT"){
+		if((script.getAttribute('src')||'').search('_loadTest') >= 0 && (!script.readyState || script.readyState == "interactive")){
+			file = script.getAttribute('file');
+			break;
+		}
+	}
+	script = script.previousSibling;
+}
+if(!file && window.location.href.search(/[?&]file[=]/i) > 0){
+	file = window.location.href.replace(/.*[?&]file=(([^&?]*)).*/i, "$2");
+}
+var readFile = function(file){
+	var xhr = null;
+	try{
+		xhr = new XMLHttpRequest();
+	}catch(e0){
+		try{
+			xhr = new ActiveXObject('Msxml2.XMLHTTP');
+		}catch(e1){
+			try{
+				xhr = new ActiveXObject('Microsoft.XMLHTTP');
+			}catch(e2){
+				try{
+					xhr = new ActiveXObject('Msxml2.XMLHTTP.4.0');
+				}catch(e3){
+				}
+			}
+		}
+	}
+	try{
+		xhr.open("GET", file, false);
+		xhr.send(null);
+	}catch(e){
+		return null
+	} // file not found
+	return xhr.responseText;
+};
+var text = readFile(file) || (file + " not found");
+var baseHref = file.replace(/^(.*\/)?[^\/]+$/, "$1");
+if(baseHref){
+	baseHref = window.location.href.replace(/[?].*/, "").replace(/[^\/]*$/, "")+baseHref;
+	text = text.replace(/(<HEAD\b([^>]|\s)*>)/i, "$1" + "<BASE href='" + baseHref + "'><\/BASE>");
+}
+// strip DOCTYPE and HTML tag
+text = text.replace(/^(.|\s)*?<html\b(([^>]|\s)*)>((.|\s)*)/i,
+	function(s,a1,htmlAttrs,a3,content){
+		// add attributes from target file's HTML tag - may not be necessary but we'll do it anyway for completeness
+		htmlAttrs = htmlAttrs.replace(/((\w+)\s*=\s*(['"]?)(.*?)(\3)?(\s+|$))/g,
+			function(s, all, attr, quote, val){
+				document.documentElement.setAttribute(attr, val);
+				return "";
+			});
+		return content.replace(/<\/html\b([^>]|\s)*>(.|\s)*?$/i, "");
+	});
+if(/MSIE/.test(navigator.userAgent)){ // need to load scripts serially
+	document._oldgetElementsByTagName_ = document.getElementsByTagName;
+	document.getElementsByTagName = function(tag){
+		// take over getElementsByTagName so I can take over script.getAttribute('src')
+		if(/^script$/i.test(tag)){
+			var scripts = document.scripts;
+			for(var i=0; i <scripts.length; i++){
+				(function(script){
+					if(!('_oldGetAttribute' in script)){
+						var src = script.getAttribute('_oldsrc');
+						if(src){
+							script._oldGetAttribute = script.getAttribute;
+							script.getAttribute = function(attr){ return /^src$/i.test(attr) ? src : script._oldGetAttribute(attr); };
+						}
+					}
+				}).call(this, scripts[i]);
+			}
+			return scripts;
+		}
+		return document._oldgetElementsByTagName_(tag);
+	};
+	document._oldwrite_ = document.write;
+	document.write = function(text){
+		text = text.replace(/<[!][-][-](.|\s){5,}?[-][-]>/g, "<!--?-->" // shorten long comments that may contain script tags
+			).replace(/(<script\s[^>]*)\bsrc\s*=\s*([^>]*>)/ig,
+		function(s,pre,post){
+			if(s.search(/\sdefer\b/i) > 0){ return s; }
+			//if(s.search(/\bxpopup.js\b/i) > 0){ return pre+">"; } // firewall popup blocker:  uncomment if you get out of stack space message
+			var file = post.substr(0, post.search(/\s|>/)).replace(/['"]/g, "");
+			var scriptText = readFile(baseHref+file);
+			if(!scriptText){
+				scriptText = readFile(file);
+				if(!scriptText){ return s; }
+			}
+			return pre + "  _oldsrc=" + post + "eval(unescape('"+escape(scriptText)+"'))";
+		});
+		document._oldwrite_(text);
+	};
+}
+document.write(text);
+})();
diff --git a/src/main/resources/static/dijit/tests/_testCommon.js b/src/main/resources/static/dijit/tests/_testCommon.js
new file mode 100644
index 0000000000000000000000000000000000000000..20fa930c1426fdbe03ed10884adacc4a4579196f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_testCommon.js
@@ -0,0 +1,127 @@
+// module:
+//		dijit/tests/_testCommon.js
+// description:
+//		Deprecated, remove in 2.0.   New test files should use boilerplate.html rather than this file,
+//		and non-test files shouldn't be using either.
+
+require([
+	"require",
+	"dojo/_base/array",
+	"dojo/_base/config",
+	"dojo/dom",
+	"dojo/dom-attr",
+	"dojo/dom-class",
+	"dojo/dom-construct",
+	"dojo/_base/kernel",
+	"dojo/_base/lang",
+	"dojo/query",
+	"dojo/ready",
+	"dojo/_base/window"
+], function(require, array, config, dom, domAttr, domClass, domConstruct, kernel, lang, query, ready, win){
+
+	var dir = "",
+		theme = false,
+		themeModule = "dijit",
+		testMode = null,
+		defTheme = "claro",
+		vars={};
+
+	if(window.location.href.indexOf("?") > -1){
+		var str = window.location.href.substr(window.location.href.indexOf("?")+1).split(/#/);
+		var ary  = str[0].split(/&/);
+		for(var i=0; i<ary.length; i++){
+			var split = ary[i].split("="),
+				key = split[0],
+				value = (split[1]||'').replace(/[^\w]/g, "");	// replace() to prevent XSS attack
+			switch(key){
+				case "locale":
+					// locale string | null
+					kernel.locale = config.locale = locale = value;
+					break;
+				case "dir":
+					// rtl | null
+					document.getElementsByTagName("html")[0].dir = value;
+					dir = value;
+					break;
+				case "theme":
+					// tundra | soria | nihilo | claro | null
+					theme = value;
+					break;
+				case "a11y":
+					if(value){ testMode = "dj_a11y"; }
+					break;
+				case "themeModule":
+					// moduleName | null
+					if(value){ themeModule = value; }
+			}
+			vars[key] = value;
+		}
+	}
+	kernel._getVar = function(k, def){	// TODO: not sure what this is
+		return vars[k] || def;
+	};
+
+	// BIDI
+	if(dir == "rtl"){
+		ready(0, function(){
+			// pretend all the labels are in an RTL language, because
+			// that affects how they lay out relative to inline form widgets
+			query("label").attr("dir", "rtl");
+		});
+	}
+
+	// a11y
+	if(testMode){
+		ready(0, function(){
+			var b = win.body();
+			if(testMode){
+				domClass.add(b, testMode);
+			}
+		});
+	}
+
+	// If URL specifies a non-claro theme then pull in those theme CSS files and modify
+	// <body> to point to that new theme instead of claro.
+	//
+	// Also defer parsing and any dojo.ready() calls that the test file makes
+	// until the CSS has finished loading.
+	if(theme){
+		// Wait until JS modules have finished loading so this doesn't confuse
+		// AMD loader.
+		ready(1, function(){
+			// Reset <body> to point to the specified theme
+			var b = win.body();
+			domClass.replace(b, theme, defTheme);
+
+			// Remove claro CSS
+			query('link[href$="claro.css"]').orphan();
+			query('link[href$="claro/document.css"]').orphan();
+
+			// Load theme CSS.
+			// Eventually would like to use [something like]
+			// https://github.com/unscriptable/curl/blob/master/src/curl/plugin/css.js
+			// to load the CSS and then know exactly when it finishes loading.
+			var modules = [
+				require.toUrl(themeModule+"/themes/"+theme+"/"+theme+".css"),
+				require.toUrl(themeModule+"/themes/"+theme+"/"+theme+"_rtl.css"),
+				require.toUrl("dojo/resources/dojo.css")
+			];
+			var head = query("head")[0];
+			array.forEach(modules, function(css){
+				if(document.createStyleSheet){
+					// For IE
+					document.createStyleSheet(css);
+				}else{
+					// For other browsers
+					domConstruct.place('<link rel="stylesheet" type="text/css" href="'+css+'"/>',
+						head);
+				}
+			});
+		});
+		ready(2, function(){
+			// Delay parsing and other dojo.ready() callbacks (except ones in this file)
+			// until the injected <link>'s above have finished loading.
+			require(["dijit/tests/delay!320"]);
+		});
+	}
+});
diff --git a/src/main/resources/static/dijit/tests/_testMatrix.php b/src/main/resources/static/dijit/tests/_testMatrix.php
new file mode 100644
index 0000000000000000000000000000000000000000..27654fd76e19b339f695ae7b8037d00579da429e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/_testMatrix.php
@@ -0,0 +1,75 @@
+<?php // IF you don't have PHP5 installed, you can't use this index! ?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>Dojo Toolkit - Every Dijit Test + Theme</title>
+
+	<style type="text/css">
+		@import "../themes/claro/document.css";
+		@import "css/dijitTests.css";
+	</style>
+
+</head>
+<body>
+
+	<h1 class="testTitle">Dijit Test Matrix Table</h1>
+
+	<table id="testMatrix">
+		<thead>
+			<tr class="top"><th rowspan="2">Test</th><th colspan="4">Tundra</th><th colspan="4">Nihilo</th><th colspan="4">Soria</th></tr>
+			<tr class="tests"><th>Normal</th><th>a11y</th><th>rtl</th><th>a11y + rtl<th>Normal</th><th>a11y</th><th>rtl</th><th>a11y + rtl<th>Normal</th><th>a11y</th><th>rtl</th><th>a11y + rtl</tr>
+		</thead>
+		<tbody><?php
+
+			printLinks(".", "Base Dijit Tests");
+			printLinks("./form", "Dijit Form Widget Tests");
+			printLinks("./layout", "Dijit Layout Widget Tests");
+			printLinks("./tree","Dijit Tree Tests");
+
+		?>
+		</tbody>
+	</table>
+
+</body>
+</html>
+<?php
+
+function printLinks($path, $group){
+	$handle = opendir($path);
+	$i = 0;
+	print "<tr class='spacer'><td colspan='13'>".$group."</td></tr>";
+	while(false !== ($file = readdir($handle))){
+		if(preg_match("/(test_|demo_)(.*)\.html/", $file, $matches)){
+			$base = $matches[0];
+			$link = $path."/".$matches[0];
+			print
+			"<tr class='testRow ". (++$i % 2 ==0 ? "alt" : "")   ."'>" .
+
+				"<td class='label'>" . $base . "</td>" .
+
+			    // standard / tundra:
+				"<td><a href='".$link."'>run</a></td>" .
+				"<td><a href='".$link."?a11y=true'>run</a></td>" .
+				"<td><a href='".$link."?dir=rtl'>run</a></td>" .
+				"<td><a href='".$link."?dir=rtl&amp;a11y=true'>run</a></td>" .
+
+				// nihilo
+				"<td><a href='".$link."?theme=nihilo'>run</a></td>" .
+				"<td><a href='".$link."?theme=nihilo&amp;a11y=true'>run</a></td>" .
+				"<td><a href='".$link."?theme=nihilo&amp;dir=rtl'>run</a></td>" .
+				"<td><a href='".$link."?theme=nihilo&amp;dir=rtl&amp;a11y=true'>run</a></td>" .
+
+				// soria
+				"<td><a href='".$link."?theme=soria'>run</a></td>" .
+				"<td><a href='".$link."?theme=soria&amp;a11y=true'>run</a></td>" .
+				"<td><a href='".$link."?theme=soria&amp;dir=rtl'>run</a></td>" .
+				"<td><a href='".$link."?theme=soria&amp;dir=rtl&amp;a11y=true'>run</a></td>" .
+
+			 "</tr>";
+		}
+	}
+}
+
+
+?>
diff --git a/src/main/resources/static/dijit/tests/a11y.html b/src/main/resources/static/dijit/tests/a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..57fc0b4830fad826ce2f040adcfccf1ba83c9d56
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/a11y.html
@@ -0,0 +1,303 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>dijit/a11y unit test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/dom", "dojo/parser",
+			"dijit/a11y", "dijit/registry", "dojo/domReady!", "dijit/Editor"
+		], function(doh, dom, parser, a11y, registry){
+
+			doh.register("dijit/a11y", [
+				function parse(){
+					parser.parse();
+				},
+
+				function isTabNavigable(t){
+					var d = new doh.Deferred();
+					doh.t(a11y.isTabNavigable(dom.byId("a-with-href")), "a-with-href");
+					doh.f(a11y.isTabNavigable(dom.byId("a-without-href")), "a-without-href");
+					doh.t(a11y.isTabNavigable(dom.byId("area")), "area");
+					doh.t(a11y.isTabNavigable(dom.byId("button")), "button");
+					doh.t(a11y.isTabNavigable(dom.byId("input")), "input");
+					doh.t(a11y.isTabNavigable(dom.byId("object")), "object");
+					doh.t(a11y.isTabNavigable(dom.byId("select")), "select");
+					doh.t(a11y.isTabNavigable(dom.byId("textarea")), "textarea");
+					doh.f(a11y.isTabNavigable(dom.byId("empty")), "empty");
+					doh.t(a11y.isTabNavigable(dom.byId("zero-tabindex-div")), "zero-tabindex-div");
+					doh.f(a11y.isTabNavigable(dom.byId("no-tabindex-div")), "no-tabindex-div");
+					doh.f(a11y.isTabNavigable(dom.byId("iframe")), "iframe");
+
+					registry.byId("editor").onLoadDeferred.then(d.getTestCallback(function(){
+						doh.t(a11y.isTabNavigable(dom.byId("editor_iframe")), "editor_iframe");
+					}));
+
+					return d;
+				},
+				function findTabNullOnEmpty(t){
+					doh.is(null, a11y.getFirstInTabbingOrder("empty"));
+					doh.is(null, a11y.getLastInTabbingOrder("empty"));
+				},
+				function findTabElements(t){
+					doh.is(null, a11y.getFirstInTabbingOrder("div-container"));
+					doh.is(null, a11y.getFirstInTabbingOrder("a-without-href-container"));
+					doh.is("a-with-href", a11y.getFirstInTabbingOrder("a-with-href-container").id);
+
+					// in WebKit area elements are not in the tab order
+					// and their display style property is "none";
+					// therefore it is expected that this test will fail
+					if(!dojo.isWebKit){
+						doh.is("area", a11y.getFirstInTabbingOrder("area-map").id);
+					}
+
+					doh.is("button", a11y.getFirstInTabbingOrder("button-container").id);
+					doh.is("input", a11y.getFirstInTabbingOrder("input-container").id);
+					doh.is("object", a11y.getFirstInTabbingOrder("object-container").id);
+					doh.is("select", a11y.getFirstInTabbingOrder("select-container").id);
+					doh.is("textarea", a11y.getFirstInTabbingOrder("textarea-container").id);
+					doh.is(null, a11y.getLastInTabbingOrder("div-container"));
+					doh.is(null, a11y.getLastInTabbingOrder("a-without-href-container"));
+					doh.is("a-with-href", a11y.getLastInTabbingOrder("a-with-href-container").id);
+
+					// in WebKit area elements are not in the tab order
+					// and their display style property is "none";
+					// therefore it is expected that this test will fail
+					if(!dojo.isWebKit){
+						doh.is("area", a11y.getLastInTabbingOrder("area-map").id);
+					}
+
+					doh.is("button", a11y.getLastInTabbingOrder("button-container").id);
+					doh.is("input", a11y.getLastInTabbingOrder("input-container").id);
+					doh.is("object", a11y.getLastInTabbingOrder("object-container").id);
+					doh.is("select", a11y.getLastInTabbingOrder("select-container").id);
+					doh.is("textarea", a11y.getLastInTabbingOrder("textarea-container").id);
+				},
+				function findTabOnElementRatherThanString(t){
+					doh.is("a-with-href", a11y.getFirstInTabbingOrder(dom.byId("a-with-href-container")).id);
+					doh.is("a-with-href", a11y.getLastInTabbingOrder(dom.byId("a-with-href-container")).id);
+				},
+				function findTabSkipDisabled(t){
+					doh.is("not-disabled-input", a11y.getFirstInTabbingOrder("skip-disabled").id);
+					doh.is("not-disabled-input", a11y.getLastInTabbingOrder("skip-disabled").id);
+				},
+				function findTabZeroTabindex(t){
+					doh.is("zero-tabindex-div", a11y.getFirstInTabbingOrder("zero-tabindex-div-container").id);
+					doh.is("zero-tabindex-input", a11y.getFirstInTabbingOrder("zero-tabindex-input-container").id);
+					doh.is("zero-tabindex-div", a11y.getLastInTabbingOrder("zero-tabindex-div-container").id);
+					doh.is("zero-tabindex-input", a11y.getLastInTabbingOrder("zero-tabindex-input-container").id);
+				},
+				function findTabPositiveTabindex(t){
+					doh.is("positive-tabindex-input1a", a11y.getFirstInTabbingOrder("positive-tabindex-mixed-with-no-tabindex").id);
+					doh.is("positive-tabindex-input3a", a11y.getFirstInTabbingOrder("positive-tabindex").id);
+					doh.is("no-tabindex-input2", a11y.getLastInTabbingOrder("positive-tabindex-mixed-with-no-tabindex").id);
+					doh.is("positive-tabindex-input4b", a11y.getLastInTabbingOrder("positive-tabindex").id);
+				},
+				function findTabSkipMinusOneTabindex(t){
+					doh.is("not-minus-one-input", a11y.getFirstInTabbingOrder("skip-minus-one").id);
+					doh.is("not-minus-one-input", a11y.getLastInTabbingOrder("skip-minus-one").id);
+				},
+				function findTabDescend(t){
+					doh.is("child-input1", a11y.getFirstInTabbingOrder("descend").id);
+					doh.is("child-input2", a11y.getLastInTabbingOrder("descend").id);
+				},
+				function findTabOuterInner(t){
+					doh.is("outer1", a11y.getFirstInTabbingOrder("outer-inner-container").id);
+					doh.is("inner2", a11y.getLastInTabbingOrder("outer-inner-container").id);
+				},
+				function skipNotShown(t){
+					doh.is(null, a11y.getFirstInTabbingOrder("hidden-element-container"));
+					doh.is(null, a11y.getFirstInTabbingOrder("hidden-container-tabindex-zero"));
+					doh.is(null, a11y.getFirstInTabbingOrder("hidden-container-no-tabindex"));
+					doh.is(null, a11y.getFirstInTabbingOrder("container-with-hidden-containers"));
+
+					doh.is(null, a11y.getFirstInTabbingOrder("display-none-element-container"));
+					doh.is(null, a11y.getFirstInTabbingOrder("display-none-container-tabindex-zero"));
+					doh.is(null, a11y.getFirstInTabbingOrder("display-none-container-no-tabindex"));
+					doh.is(null, a11y.getFirstInTabbingOrder("container-with-display-none-containers"));
+				},
+				function multiDigitTabIndex(){
+					doh.is("one", a11y.getFirstInTabbingOrder("multiDigitTabIndex").name, "first");
+					doh.is("eleven", a11y.getLastInTabbingOrder("multiDigitTabIndex").name, "last");
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body>
+	<h1>Dijit TabIndex Related Functions Unit Test</h1>
+
+	<div id="empty"></div>
+
+	<div id="div-container">
+		<div id="div"></div>
+	</div>
+	<div id="a-without-href-container">
+		<a id="a-without-href"></a>
+	</div>
+	<div id="a-with-href-container">
+		<a id="a-with-href" href="#a-without-href"></a>
+	</div>
+
+	<div><img src="images/flatScreen.gif" alt="picture of a flat-screen monitor" usemap="#area-map"/></div>
+	<map id="area-map" name="area-map">
+		<area id="area" href="#" alt="example area" shape="rect" coords="0,0,8,8"/>
+	</map>
+
+	<div id="button-container">
+		<button id="button"></button>
+	</div>
+	<div id="input-container">
+		<input id="input"/>
+	</div>
+	<div id="object-container">
+		<object id="object" type="text/javascript"></object>
+	</div>
+	<div id="select-container">
+		<select id="select"></select>
+	</div>
+	<div id="textarea-container">
+		<textarea id="textarea"></textarea>
+	</div>
+
+	<div id="skip-disabled">
+		<input id="disabled-input1" disabled="disabled"/>
+		<input id="not-disabled-input"/>
+		<input id="disabled-input2" disabled="disabled"/>
+	</div>
+
+	<div id="zero-tabindex-div-container">
+		<div id="zero-tabindex-div" tabindex="0"></div>
+	</div>
+
+	<div id="no-tabindex-div-container">
+		<div id="no-tabindex-div"></div>
+	</div>
+
+	<div id="zero-tabindex-input-container">
+		<input id="zero-tabindex-input" tabindex="0"/>
+	</div>
+
+	<div id="iframe-container">
+		<div id="iframe"></div>
+	</div>
+
+	<div id="editor-container">
+		<div id="editor" data-dojo-type="dijit/Editor"></div>
+	</div>
+
+	<div id="positive-tabindex-mixed-with-no-tabindex">
+		<input id="no-tabindex-input1"/>
+		<input id="no-tabindex-input2"/>
+		<input id="positive-tabindex-input1a" tabindex="1"/>
+		<input id="positive-tabindex-input1b" tabindex="1"/>
+		<input id="positive-tabindex-input2a" tabindex="2"/>
+		<input id="positive-tabindex-input2b" tabindex="2"/>
+	</div>
+
+	<div id="positive-tabindex">
+		<input id="positive-tabindex-input3a" tabindex="3"/>
+		<input id="positive-tabindex-input3b" tabindex="3"/>
+		<input id="positive-tabindex-input4a" tabindex="4"/>
+		<input id="positive-tabindex-input4b" tabindex="4"/>
+	</div>
+
+	<div id="skip-minus-one">
+		<input id="minus-one-input1" tabindex="-1"/>
+		<input id="not-minus-one-input"/>
+		<input id="minus-one-input2" tabindex="-1"/>
+	</div>
+
+	<div id="descend">
+		<input disabled="disabled"/>
+		<div>
+			<input disabled="disabled"/>
+			<div>
+				<input disabled="disabled"/>
+			</div>
+		</div>
+		<div>
+			<input disabled="disabled"/>
+			<div>
+				<input disabled="disabled"/>
+			</div>
+			<div>
+				<input id="child-input1"/>
+			</div>
+			<div>
+				<input id="child-input2"/>
+			</div>
+		</div>
+		<div>
+			<div>
+				<input disabled="disabled"/>
+			</div>
+			<input disabled="disabled"/>
+		</div>
+		<input disabled="disabled"/>
+	</div>
+
+	<div id="outer-inner-container">
+		<div id="outer1" tabindex="0">
+			<div id="inner1" tabindex="0"></div>
+		</div>
+		<div id="outer2" tabindex="0">
+			<div id="inner2" tabindex="0"></div>
+		</div>
+	</div>
+
+	<div id="hidden-element-container">
+		<div id="hidden-element" tabindex="0" style="visibility: hidden;">
+		</div>
+	</div>
+
+	<div id="container-with-hidden-containers">
+		<div id="hidden-container-tabindex-zero" tabindex="0" style="visibility: hidden;">
+			<div id="inside-hidden-container-tabindex-zero" tabindex="0">
+			</div>
+		</div>
+
+		<div id="hidden-container-no-tabindex" style="visibility: hidden;">
+			<div id="inside-hidden-container-no-tabindex" tabindex="0">
+			</div>
+		</div>
+	</div>
+
+	<div id="display-none-element-container">
+		<div id="display-none-element" tabindex="0" style="display: none;">
+		</div>
+	</div>
+
+	<div id="container-with-display-none-containers">
+		<div id="display-none-container-tabindex-zero" tabindex="0" style="display: none;">
+			<div id="inside-display-none-container-tabindex-zero" tabindex="0">
+			</div>
+		</div>
+
+		<div id="display-none-container-no-tabindex" style="display: none;">
+			<div id="inside-display-none-container-no-tabindex" tabindex="0">
+			</div>
+		</div>
+	</div>
+
+	<div id="multiDigitTabIndex">
+		<input name="one" tabindex=1>
+		<input name="two" tabindex=2>
+		<input name="three" tabindex=3>
+		<input name="four" tabindex=4>
+		<input name="five" tabindex=5>
+		<input name="six" tabindex=6>
+		<input name="seven" tabindex=7>
+		<input name="eight" tabindex=8>
+		<input name="nine" tabindex=9>
+		<input name="ten" tabindex=10>
+		<input name="eleven" tabindex=11>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/boilerplate.js b/src/main/resources/static/dijit/tests/boilerplate.js
new file mode 100644
index 0000000000000000000000000000000000000000..3d22bd1475e48f575ed8b76e56cfb90051e80bfd
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/boilerplate.js
@@ -0,0 +1,138 @@
+// module:
+//		dijit/tests/boilerplate
+// description:
+//		A <script src="boilerplate.js"> on your test page will:
+//
+//		- load claro or a specified theme
+//		- load the loader (i.e. define the require() method)
+//
+//		By URL flags you can specify the theme,
+//		and optionally enable RTL (right to left) mode, and/or dj_a11y (high-
+//		contrast/image off emulation) ... probably not a genuine test for a11y.
+//
+//		You should NOT be using this in a production environment.  Include
+//		your css and set your classes manually:
+//
+//		<style type="text/css">
+//			@import "dijit/themes/claro/document.css";
+//		</style>
+//		<link id="themeStyles" rel="stylesheet" href="dijit/themes/claro/claro.css"/>
+//		<script type="text/javascript" src="dojo/dojo.js"></script>
+//		...
+//		<body class="claro">
+
+var dir = "",
+	theme = "claro",
+	testMode = null;
+
+dojoConfig = {
+	async: true,
+	isDebug: true,
+	locale: "en-us"
+};
+
+// Parse the URL, get parameters
+if(window.location.href.indexOf("?") > -1){
+	var str = window.location.href.substr(window.location.href.indexOf("?")+1).split(/#/);
+	var ary  = str[0].split(/&/);
+	for(var i = 0; i < ary.length; i++){
+		var split = ary[i].split("="),
+			key = split[0],
+			value = (split[1]||'').replace(/[^\w]/g, "");	// replace() to prevent XSS attack
+		switch(key){
+			case "locale":
+				// locale string | null
+				dojoConfig.locale = value;
+				break;
+			case "dir":
+				// rtl | null
+				dir = value;
+				break;
+			case "theme":
+				// tundra | soria | nihilo | claro | null
+				theme = /null|none/.test(value) ? null : value;
+				break;
+			case "a11y":
+				if(value){ testMode = "dj_a11y"; }
+				break;
+		}
+	}
+}
+
+// Find the <script src="boilerplate.js"> tag, to get test directory and data-dojo-config argument
+var scripts = document.getElementsByTagName("script"), script, testDir;
+for(i = 0; script = scripts[i]; i++){
+	var src = script.getAttribute("src"),
+		match = src && src.match(/(.*|^)boilerplate\.js/i);
+	if(match){
+		// Sniff location of dijit/tests directory relative to this test file.   testDir will be an empty string if it's
+		// the same directory, or a string including a slash, ex: "../", if the test is in a subdirectory.
+		testDir = match[1];
+
+		// Sniff configuration on attribute in script element.
+		// Allows syntax like <script src="boilerplate.js data-dojo-config="parseOnLoad: true">, where the settings
+		// specified override the default settings.
+		var attr = script.getAttribute("data-dojo-config");
+		if(attr){
+			var overrides = eval("({ " + attr + " })");
+			for(var key in overrides){
+				dojoConfig[key] = overrides[key];
+			}
+		}
+		break;
+	}
+}
+
+// Output the boilerplate text to load the theme CSS
+if(theme){
+	var themeDir = testDir + "../themes/" + theme + "/";
+	document.write([
+		'<style type="text/css">',
+			theme == "claro" ? '@import "' + themeDir + 'document.css";' : "",
+			'@import "' + testDir + 'css/dijitTests.css";',
+		'</style>',
+		'<link id="themeStyles" rel="stylesheet" href="' + themeDir + theme + '.css"/>'
+	].join("\n"));
+}
+
+// Output the boilerplate text to load the loader, and to do some initial manipulation when the page finishes loading
+// For 2.0 this should be changed to require the loader (ex: requirejs) directly, rather than dojo.js.
+document.write('<script type="text/javascript" src="' + testDir + '../../dojo/dojo.js"></script>');
+
+// On IE9 the following inlined script will run before dojo has finished loading, leading to an error because require()
+// isn't defined yet.  Workaround it by putting the code in a separate file.
+//document.write('<script type="text/javascript">require(["dojo/domReady!"], boilerplateOnLoad);</script>');
+document.write('<script type="text/javascript" src="' + testDir + 'boilerplateOnload.js"></script>');
+
+function boilerplateOnLoad(){
+	// This function is the first registered domReady() callback, allowing us to setup
+	// theme stuff etc. before the widgets start instantiating.
+
+	// theme (claro, tundra, etc.)
+	if(theme){
+		// Set <body> to point to the specified theme
+		document.body.className = theme;
+	}
+
+	// a11y (flag for faux high-contrast testing)
+	if(testMode){
+		document.body.className += " " + testMode;
+	}
+
+	// BIDI
+	if(dir == "rtl"){
+		// set dir=rtl on <html> node
+		document.body.parentNode.setAttribute("dir", "rtl");
+
+		require(["dojo/query!css2", "dojo/NodeList-dom"], function(query){
+			// pretend all the labels are in an RTL language, because
+			// that affects how they lay out relative to inline form widgets
+			query("label").attr("dir", "rtl");
+		});
+	}
+
+	// parseOnLoad: true requires that the parser itself be loaded.
+	if(dojoConfig.parseOnLoad){
+		require(["dojo/parser"]);
+	}
+}
diff --git a/src/main/resources/static/dijit/tests/boilerplateOnload.js b/src/main/resources/static/dijit/tests/boilerplateOnload.js
new file mode 100644
index 0000000000000000000000000000000000000000..e12fbf285ca81aa6054f293c05ba9eeba493a4c7
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/boilerplateOnload.js
@@ -0,0 +1,3 @@
+// Part of boilerplate.js but need to put it in a separate file for IE9, so it doesn't run until dojo has finished
+// loading and require is defined
+require(["dojo/domReady!"], boilerplateOnLoad);
diff --git a/src/main/resources/static/dijit/tests/css/dijitTests.css b/src/main/resources/static/dijit/tests/css/dijitTests.css
new file mode 100644
index 0000000000000000000000000000000000000000..df16d1e800c88f9360feff4348efee87a5566692
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/css/dijitTests.css
@@ -0,0 +1,116 @@
+/* Test file styles for Dijit widgets */
+
+body {
+	background: #fff url("../images/testsBodyBg.gif") repeat-x top left;
+	padding: 20px;
+}
+
+h1.testTitle {
+	font-size: 2em;
+	margin: 0 0 1em 0;
+}
+
+/* Icons used in the tests */
+
+.plusIcon, .plusBlockIcon {
+	background-image: url(../images/plus.gif);
+	background-repeat: no-repeat;
+	background-position: center center;
+	width: 18px;
+	height: 18px;
+}
+.plusBlockIcon {
+	display: block !important;
+}
+.noteIcon {
+	background-image: url(../images/note.gif);
+	background-repeat: no-repeat;
+	background-position: center center;
+	width: 18px;
+	height: 18px;
+}
+.flatScreenIcon {
+	background-image: url(../images/flatScreen.gif);
+	background-repeat: no-repeat;
+	width: 32px;
+	height: 32px;
+}
+.dijitTestNodeDialog {
+	position:absolute;
+	top:5px;
+	right:5px;
+	display:block;
+	width:200px;
+	visibility:hidden;
+	background-color:#fff !important;
+	color:#000 !important;
+	border:1px solid #000;
+	padding:5px;
+}
+.dijitTestNodeDialog table {
+	background-color:#fff !important;
+}
+.dijitTestNodeDialog td {
+	padding:3px;
+}
+.dijitTestNodeShowing {
+	visibility:visible;
+}
+
+body .customFolderOpenedIcon, body .customFolderClosedIcon {
+	background-image: url('../images/folderIcons.png'); /* mail icons sprite image */
+	background-repeat: no-repeat;
+	width: 18px;
+	height: 18px;
+    background-position: -44px;
+}
+
+.dj_ie6 .customFolderOpenedIcon, .dj_ie6 .customFolderClosedIcon {
+	background-image: url('../images/folderIcons.gif');
+}
+
+.customFolderClosedIcon {
+    background-position: -154px;
+}
+
+#testMatrix {
+	width:100%;
+	text-align:center;
+}
+#testMatrix tr > td {
+	text-align:left;
+}
+#testMatrix tr.top {
+	background:blue;
+	color:#fff;
+}
+#testMatrix tr.top th {
+	padding:6px;
+}
+#testMatrix tr.tests {
+	background:#666;
+	padding:3px;
+	padding-left:6px;
+	padding-right:6px;
+	color:#fff;
+}
+#testMatrix tr.tests th {
+	text-align:center;
+}
+#testMatrix tr.spacer {
+	background:#dedede;
+	color:#666;
+}
+#testMatrix tr.spacer td {
+	padding:6px;
+}
+#testMatrix tr.testRow td {
+	text-align:center;
+}
+#testMatrix tr.testRow td.label {
+	text-align:left;
+	padding-left:15px;
+}
+#testMatrix tr.alt {
+	background:#ededed;
+}
diff --git a/src/main/resources/static/dijit/tests/delay.js b/src/main/resources/static/dijit/tests/delay.js
new file mode 100644
index 0000000000000000000000000000000000000000..820a7c7c91e00f3b154c3dbe42dc15fccf54b1d7
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/delay.js
@@ -0,0 +1,22 @@
+// module:
+//		dijit/tests/delay.js
+// summary:
+//		AMD plugin that waits a specified number of ms before "loading".
+//		Used to delay execution of callbacks registered by dojo.ready().
+//		(Used by _testCommon.html)
+//
+//		Usage: ready(1, function(){ require(["dijit/tests/delay!300"]); });
+
+// TODO: remove for 2.0, it's only used by _testCommon.js which will also be removed.
+
+define({
+	load: function(delay, req, loaded){
+		setTimeout(function(){
+			loaded(1);
+		}, delay);
+	},
+	dynamic: 1,
+	normalize: function(id){
+		return id;
+	}
+});
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/editor/BackForwardState.html b/src/main/resources/static/dijit/tests/editor/BackForwardState.html
new file mode 100644
index 0000000000000000000000000000000000000000..46f406894e46fa2290ae277e461816d6392d8694
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/BackForwardState.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Back/Forward Button Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Editor",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+
+<body class="claro" role="main">
+	<h1>Editor back/forward button value restore tests</h1>
+	<p>
+		Try typing something into the editors below, and then click the page refrsh link or the back then forward buttons.
+		The editor should not lose the value.
+	</p>
+	<p>Notes:</p>
+	<ol>
+		<li>Editor must have a "name" attribute for this to work (not sure why)
+		<li>If in XD mode must set dojo.config.allowXdRichTextSave or manually create the hidden
+			&lt;textarea&gt; node used to preserve the data.
+	</ol>
+	<p><a href="BackForwardStateHelper.html" id="away">Navigate to another page</a></p>
+
+	<div id="editor0" data-dojo-type="dijit/Editor" aria-label="editor0" data-dojo-props='name:"editor0", height:"100", plugins:[]'>editor0 original contents</div>
+	<div id="editor1" data-dojo-type="dijit/Editor" aria-label="editor1" data-dojo-props='name:"editor1", height:"100", plugins:[]'>editor1 original contents</div>
+	<textarea id="dijit._editor.RichText.value" style="display:none;position:absolute;top:-100px;left:-100px;height:3px;width:3px;overflow:hidden;"></textarea>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/BackForwardStateHelper.html b/src/main/resources/static/dijit/tests/editor/BackForwardStateHelper.html
new file mode 100644
index 0000000000000000000000000000000000000000..ac1a046bc727294d86e5af7a5df8ef8affb9cece
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/BackForwardStateHelper.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head><title>Back/forward test helper page</title></head>
+<body role="main">
+<h1>Back/forward test helper page</h1>
+<p>
+	You've navigated to this page from <a href="BackForwardState.html">backForward.html</a>.
+	Press the "Go back" link below to return, or your browser's back button,
+	and check that the editors' values were restored to the test data you entered.
+</p>
+<p>
+	Note that pressing the link above will not work, since the browser doesn't consider it
+	as "returning" to the previous page.
+</p>
+<a href="javascript:history.go(-1)" id="back">Go Back</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/editor/Editor.html b/src/main/resources/static/dijit/tests/editor/Editor.html
new file mode 100644
index 0000000000000000000000000000000000000000..f758d7b2b93be44b7c4a7d18ced1d0004b959161
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/Editor.html
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>Editor Test</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-2"/>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom",
+			"dojo/dom-construct",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/tests/helpers",
+			"dijit/Editor",
+			"dojo/domReady!"
+		], function(doh, dom, domConstruct, parser, registry, helpers, Editor){
+
+			doh.register("setup", [
+				{
+					name: "parse",
+					timeout: 5000,
+					runTest: function(){
+						parser.parse();
+
+						// In some browsers, the editor will not yet be loaded.  Test that no error occurs
+						// when retrieving the value.
+						doh.is("initial content", editor.get("value"));
+					}
+				},
+				{
+					name: "wait for editors to load",
+					timeout: 5000,
+					runTest: helpers.waitForLoad
+				}
+			]);
+
+			doh.register("miscellaneous", [
+				{
+					name: "set value on unfocused editor",
+					runTest: function(){
+						editor.set("value", "hello");
+						editor.focus();
+						doh.is("hello", editor.editNode.textContent || editor.editNode.innerText);
+						doh.is("hello", editor.get("value"));
+					}
+				},
+				{
+					name: "get value of unloaded editor",
+					runTest: function(){
+						var tmpEditor = new Editor({ value: "test editor value"});
+						doh.is("test editor value", tmpEditor.get("value"));
+						doh.is("test editor value", tmpEditor.value);
+						doh.f(tmpEditor.isLoaded);
+						tmpEditor.startup();
+						doh.is("test editor value", tmpEditor.get("value"));
+						doh.is("test editor value", tmpEditor.value);
+						doh.f(tmpEditor.isLoaded);
+					}
+				}
+			]);
+
+			doh.register("reparent", [
+				{
+					name: "update editor's value",
+					runTest: function(){
+						var d = new doh.Deferred();
+						editor.set("value", "updated content");
+						setTimeout(function(){
+							d.callback();
+						}, 500);
+						return d;
+					}
+				},
+				{
+					name: "reparent",
+					runTest: function(){
+						var d = new doh.Deferred();
+						domConstruct.place(dom.byId("editorWrapper"), "anchorDiv", "before");
+
+						// Reparenting the editor causing another onLoad event on the iframe.
+						// Wait for that to complete and then check that editor's value wasn't corrupted.
+						setTimeout(d.getTestCallback(function(){
+							doh.is("updated content", editor.get("value"), "get('value')");
+
+							var realContent = editor.iframe.contentDocument.body.textContent ||
+								editor.iframe.contentDocument.body.innerText;
+							doh.is("updated content", realContent, "real content")
+						}), 500);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("destroy", [
+				{
+					name: "destroy the editor",
+					runTest: function(){
+						// just making sure this doesn't throw an exception
+						editor.destroy();
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<div id="anchorDiv">This is the anchor div.</div>
+	<div id="editorWrapper">
+		<div data-dojo-id="editor" data-dojo-type="dijit/Editor"
+			 data-dojo-props='"aria-label":"editor", name:"field"'>initial content</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/Editor_IE8Compat.html b/src/main/resources/static/dijit/tests/editor/Editor_IE8Compat.html
new file mode 100644
index 0000000000000000000000000000000000000000..9e9c1eb24597eb693f0ba29b41b8efbee2d5bc54
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/Editor_IE8Compat.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=8">
+		<title>Demo: Basic Editor</title>
+		<link rel="stylesheet" href="../../themes/claro/claro.css" />
+		<script src="../../../dojo/dojo.js"
+				data-dojo-config="async: true, parseOnLoad: true"></script>
+		<script>
+			// Include the class
+			require(["dojo/has", "dijit/Editor", "dojo/parser", "dojo/domReady!"], function(has){
+				console.log("has(ie) == " + has("ie"));
+			});
+		</script>
+	</head>
+	<body class="claro" role="main">
+		<h1>Test of Editor on IE9 in IE8 Compatibility mode</h1>
+		<div data-dojo-type="dijit.Editor" aria-label="editor1" id="editor1"></div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/editor/Editor_stylesheet.html b/src/main/resources/static/dijit/tests/editor/Editor_stylesheet.html
new file mode 100644
index 0000000000000000000000000000000000000000..866e956dea17a44c71312d02876daa5b8db48ba0
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/Editor_stylesheet.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>Editor StyleSheet Test</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/parser",
+			"dojo/query",
+			"dijit/registry",
+			"dijit/Editor",
+			"dojo/NodeList-dom",	// style()
+			"dojo/domReady!"
+		], function(doh, parser, query, registry){
+
+			var editor;
+
+			doh.register("setup", [
+				function parse(){
+					parser.parse();
+					editor = registry.byId("editor");
+				},
+				{
+					name: "wait for load",
+					timeout: 5000,
+					runTest: function(){
+						// Editor.onLoadDeferred doesn't seem good enough, editor.window is still unset
+						// after it fires
+						var d = new doh.Deferred();
+						console.log("initially, editor.window is", editor.window);
+						editor.onLoadDeferred.then(function(){
+							var handle = setInterval(function(){
+								if(editor.window){
+									clearInterval(handle);
+									d.callback(true);
+								}
+							}, 50);
+						});
+						return d;
+					}
+				}
+			]);
+
+			doh.register("stylesheets", [
+				{
+					name: "add sheet",
+					runTest: function(){
+						editor.addStyleSheet('test_editor.css');
+
+						// Wait for stylesheet to take effect and then check if <h1> has border.
+						// Not checking background color because it could be "red" or #FF0000 or rgb(...
+						var d = new doh.Deferred();
+						setTimeout(d.getTestCallback(function(){
+							var h1styles = query("h1", editor.window.document).style("borderTopStyle");
+							doh.is(1, h1styles.length, "found h1");
+							doh.is("solid", h1styles[0], "h1 border");
+						}), 250);
+						return d;
+					}
+				},
+				{
+					name: "remove sheet",
+					runTest: function(){
+						editor.removeStyleSheet('test_editor.css');
+
+						var h1styles = query("h1", editor.window.document).style("borderTopWidth");
+
+						// Wait for stylesheet removal to take effect and then check if <h1> has border.
+						// Not checking background color because it could be "red" or #FF0000 or rgb(...
+						// Not checking border-width because on IE it's 4px, but border-style is none
+						// (which means that there's really no border).
+						var d = new doh.Deferred();
+						setTimeout(d.getTestCallback(function(){
+							var h1styles = query("h1", editor.window.document).style("borderTopStyle");
+							doh.is(1, h1styles.length, "found h1");
+							doh.is("none", h1styles[0], "h1 border style");
+						}), 250);
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+<script type="dojo/require">
+	registry: "dijit/registry"
+</script>
+<p>Turning on the stylesheet should make header red</p>
+<div id="editor" data-dojo-type="dijit/Editor" aria-label="editor" data-dojo-props='name:"field"'>
+	<h1>Adding stylesheet should make my background red</h1>
+	<h2>I shouldn't change</h2>
+</div>
+<button id="addStyleSheet" onclick="registry.byId('editor').addStyleSheet('test_editor.css');">add stylesheet</button>
+<button id="removeStyleSheet" onclick="registry.byId('editor').removeStyleSheet('test_editor.css');">remove stylesheet</button>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/EnterKeyHandling.html b/src/main/resources/static/dijit/tests/editor/EnterKeyHandling.html
new file mode 100644
index 0000000000000000000000000000000000000000..ef05299ca742fbe4d6970d21eb8931452ff15f4a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/EnterKeyHandling.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/_editor/RichText",
+			"dijit/Editor",
+			"dijit/_editor/plugins/ViewSource",
+			"dojo/domReady!"
+		], function(parser, RichText){
+			// Make editor indent work for paragraphs in addition to lists
+			var oldQCE = RichText.prototype.queryCommandEnabled;
+			RichText.prototype.queryCommandEnabled = function(command){
+				return command == 'indent' || command == 'outdent' || oldQCE.call(this, command);
+			};
+
+			parser.parse();
+		});
+	</script>
+</head>
+
+<body class="claro" role="main">
+	<h1>Test file for Editor EnterKeyHandling plugin</h1>
+
+	<h2>blockNodeforEnter='BR'</h2>
+	<div id="br" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor_br", plugins:[{name:"dijit/_editor/plugins/EnterKeyHandling", blockNodeForEnter:"BR"}, "viewsource"]
+		'><p>para 1<br>line 2</p>
+		<p>para 2<br>line 2</p>
+ 	</div>
+
+ 	<h2>blockNodeforEnter='DIV'</h2>
+	<div id="div" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor_div", plugins:[{name:"dijit/_editor/plugins/EnterKeyHandling", blockNodeForEnter:"DIV"}, "viewsource"]
+		'><p>para 1<br>line 2</p>
+		<p>para 2<br>line 2</p>
+ 	</div>
+
+ 	<h2>blockNodeforEnter='DIV' split test</h2>
+	<div id="div2" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor_div2", plugins:[{name:"dijit/_editor/plugins/EnterKeyHandling", blockNodeForEnter:"DIV"}, "viewsource"]'>
+		<div>&nbsp;</div>
+		<div id="lineOne">this is a line of text.  It <b id="boldLine0">IS</b> intended to be split up by pressing enter.</div>
+		<div>&nbsp;</div>
+ 	</div>
+
+ 	<h2>blockNodeforEnter='DIV' split test style clone</h2>
+	<div id="div3" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor_div3", plugins:[{name:"dijit/_editor/plugins/EnterKeyHandling", blockNodeForEnter:"DIV"}, "viewsource"]'>
+		<div>&nbsp;</div>
+		<div id="lineOne">this is a line of text.  It <b id="boldLine1" style="font-size: 4em">IS</b> intended to be split up by pressing enter.</div>
+		<div>&nbsp;</div>
+ 	</div>
+
+ 	<h2>blockNodeforEnter='DIV' split test font clone</h2>
+	<div id="div4" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor_div4", plugins:[{name:"dijit/_editor/plugins/EnterKeyHandling", blockNodeForEnter:"DIV"}, "viewsource"]'>
+		<div>&nbsp;</div>
+		<div id="lineOne">this is a line of text.  It <font id="fontLine1" size="5">IS</font> intended to be split up by pressing enter.</div>
+		<div>&nbsp;</div>
+ 	</div>
+
+ 	<h2>blockNodeforEnter='P'</h2>
+	<div id="p" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor_p", plugins:[{name:"dijit/_editor/plugins/EnterKeyHandling", blockNodeForEnter:"P"}, "viewsource"]
+		'><p>para 1<br>line 2</p>
+		<p>para 2<br>line 2</p>
+ 	</div>
+ 	
+	<h2>blockNodeforEnter='P' split test</h2>
+	<div id="p2" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor_p2", plugins:[{name:"dijit/_editor/plugins/EnterKeyHandling", blockNodeForEnter:"P"}, "viewsource"]'>
+		<p>&nbsp;</p>
+		<p id="lineOne">this is a line of text.  It <b id="boldLine2">IS</b> intended to be split up by pressing enter.</p>
+		<p>&nbsp;</p>
+ 	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/customIcon.gif b/src/main/resources/static/dijit/tests/editor/customIcon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5fd50d28927012ea9f10629af16851cf5e623eeb
Binary files /dev/null and b/src/main/resources/static/dijit/tests/editor/customIcon.gif differ
diff --git a/src/main/resources/static/dijit/tests/editor/html.html b/src/main/resources/static/dijit/tests/editor/html.html
new file mode 100644
index 0000000000000000000000000000000000000000..36d9e495ec24596cc09ff396ca15ef462b910882
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/html.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>html utility tests</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require(["doh/runner", "dojo/dom", "dojo/_base/lang", "dojo/sniff", "dijit/_editor/html", "dojo/domReady!"],
+				function(doh, dom, lang, has, htmlAPI){
+
+			doh.register("getNodeHtml", [
+				function general(){
+					var html = htmlAPI.getNodeHtml(dom.byId("general"));
+					html = html.replace(/\s+/g, " ").replace(/>\s*</g, "><").replace(/10%;"/, '10%"');
+					doh.is('<div id="general"><img alt="" base="foo" style="width: 10%; height: 10%" /><span><i>hello<b>world</b></i></span></div>', html);
+				},
+				function tagClose(){
+					var html = htmlAPI.getNodeHtml(dom.byId("tagclosure"));
+					html = html.replace(/\s+/g, " ").replace(/>\s*</g, "><");
+					doh.is('<div id="tagclosure"><span><span></span><br /><hr /></span></div>', html);
+				},
+				function djrealurl(){
+					var html = htmlAPI.getNodeHtml(dom.byId("djrealurl"));
+					html = html.replace(/\s+/g, " ").replace(/>\s*</g, "><");
+					doh.is('<div id="djrealurl"><a href="real">hi</a><img alt="" src="real" /></div>', html);
+				}
+			]);
+
+			doh.register("getChildrenHtml", [
+				function general(){
+					var html = htmlAPI.getChildrenHtml(dom.byId("general"));
+					html = lang.trim(html.replace(/\s+/g, " ").replace(/>\s*</g, "><").replace(/10%;"/, '10%"'));
+					doh.is('<img alt="" base="foo" style="width: 10%; height: 10%" /><span><i>hello<b>world</b></i></span>', html);
+				},
+				function tagClose(){
+					var html = htmlAPI.getChildrenHtml(dom.byId("tagclosure"));
+					html = lang.trim(html.replace(/\s+/g, " ").replace(/>\s*</g, "><"));
+					doh.is('<span><span></span><br /><hr /></span>', html);
+				},
+				function djrealurl(){
+					var html = htmlAPI.getChildrenHtml(dom.byId("djrealurl"));
+					html = lang.trim(html.replace(/\s+/g, " ").replace(/>\s*</g, "><"));
+					doh.is('<a href="real">hi</a><img alt="" src="real" />', html);
+				},
+				function specialchars(){
+					var html = htmlAPI.getChildrenHtml(dom.byId("specialchars"));
+					html = lang.trim(html.replace(/\s+/g, " ").replace(/>\s*</g, "><"));
+					doh.is('hello&amp;goodbye<span>3&gt;2</span>', html);
+				},
+				function image(){
+					var html = htmlAPI.getChildrenHtml(dom.byId("image"));
+					html = lang.trim(html.replace(/\s+/g, " ").replace(/>\s*</g, "><"));
+					doh.is('<img alt="alt text" height="88" id="bibli_WR4479" src="http://acme.com/logo.png" title="test" width="150" />', html)
+				}
+			]);
+
+			// This is testing a bug with IE and malformed HTML.   Since the HTML is malformed different
+			// browsers get different results (but still results that can't be considered errors).   The
+			// only browsers that get error results are IE.   Thus limiting the test to IE6-8.
+			if(has("ie") < 9){
+				doh.register("IE6-8", [
+					function graph(){
+						var html = htmlAPI.getChildrenHtml(dom.byId("graph"));
+						html = lang.trim(html.replace(/\s+/g, " ").replace(/>\s*</g, "><")).toUpperCase();
+						doh.is('<FONT SIZE="2"><P>123<FONT SIZE="6">456</FONT><FONT SIZE="2">789</FONT></P></FONT>', html);
+					}
+				]);
+			}
+
+			doh.register("escapeXML", [
+				function regular(){
+					var escaped = htmlAPI.escapeXml("hello<b>\"&'</b>goodbye");
+					doh.is("hello&lt;b&gt;&quot;&amp;&#39;&lt;/b&gt;goodbye", escaped);
+				},
+				function noSingleQuote(){
+					var escaped = htmlAPI.escapeXml("hello<b>\"&'</b>goodbye", true);
+					doh.is("hello&lt;b&gt;&quot;&amp;'&lt;/b&gt;goodbye", escaped);
+				}
+			]);
+			doh.run();
+		});
+	</script>
+</head>
+<body role="main">
+
+<!--
+this tests that tag case is normalized, and that attributes are sorted
+(the style vs. base attributes for the <img>
+-->
+<div id="general">
+	<imG alt="" style="width: 10%; height: 10%" base="foo">
+	<SPAN><i>hello<b>world</b></i></SPAN>
+</div>
+
+<!--
+testing tag closure: br, hr, etc close with /> but others like <span> close with </span>
+-->
+<div id="tagclosure">
+<span><span></span><br><hr></span>
+</div>
+
+<!--
+src and href attributes get converted to _djrealurl, which is dropped
+-->
+<div id="djrealurl">
+<a href="javascript:1" _djrealurl="real">hi</a>
+<img alt="" src="javascript:1" _djrealurl="real">
+</div>
+
+<div id="specialchars">
+	hello&amp;goodbye<span>3&gt;2</span>
+</div>
+</body>
+
+<!--
+image tag (was problem on IE9, see #15032)
+-->
+<div id="image">
+	<img alt="alt text"  width="150" height="88" id="bibli_WR4479" src="http://acme.com/logo.png" title="test" />
+</div>
+
+<!--
+Graph test, for bug where IE has nodes with multiple parents, see #8363
+-->
+<div id="graph">
+<FONT size=2><P>123</FONT><FONT size=6>456</FONT><FONT size=2>789</P></FONT>
+</div>
+
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/module.js b/src/main/resources/static/dijit/tests/editor/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..e9c7452cbbf7e7a20a93f965d3c61e18ce615bbb
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/module.js
@@ -0,0 +1,48 @@
+define(["doh/main", "require", "dojo/sniff"], function(doh, require, has){
+
+	var test_robot = has("trident") || has("ff") || has("chrome") < 45;
+
+	// inline doh tests
+	doh.register("editor.Editor", require.toUrl("./Editor.html"), 999999);
+	doh.register("editor.nls_8859-2", require.toUrl("./nls_8859-2.html"), 999999);
+	doh.register("editor.nls_sjis", require.toUrl("./nls_sjis.html"), 999999);
+	doh.register("editor.nls_utf8", require.toUrl("./nls_utf8.html"), 999999);
+	doh.register("editor.Editor_stylesheet", require.toUrl("./Editor_stylesheet.html"), 999999);
+	doh.register("editor.html", require.toUrl("./html.html"), 999999);
+
+	// Base editor functionality
+	if(test_robot){
+		doh.register("editor.robot.Editor_mouse", require.toUrl("./robot/Editor_mouse.html"), 999999);
+		doh.register("editor.robot.Editor_a11y", require.toUrl("./robot/Editor_a11y.html"), 999999);
+		doh.register("editor.robot.Misc", require.toUrl("./robot/Editor_misc.html"), 999999);
+		doh.register("editor.robot.Bidi", require.toUrl("./robot/Editor_bidi.html"), 999999);
+	}
+
+	// Plugins
+	if(test_robot){
+		doh.register("editor.robot.CustomPlugin", require.toUrl("./robot/CustomPlugin.html"), 999999);
+		doh.register("editor.robot.EnterKeyHandling", require.toUrl("./robot/EnterKeyHandling.html"), 999999);
+		doh.register("editor.robot.FullScreen", require.toUrl("./robot/Editor_FullScreen.html"), 999999);
+		doh.register("editor.robot.ViewSource", require.toUrl("./robot/Editor_ViewSource.html"), 999999);
+		doh.register("editor.robot.NewPage", require.toUrl("./robot/Editor_NewPage.html"), 999999);
+		doh.register("editor.robot.LinkDialog", require.toUrl("./robot/Editor_LinkDialog.html"), 999999);
+		doh.register("editor.robot.FontChoice", require.toUrl("./robot/Editor_FontChoice.html"), 999999);
+		doh.register("editor.robot.ToggleDir", require.toUrl("./robot/ToggleDir.html"), 999999);
+		doh.register("editor.robot.TabIndent", require.toUrl("./robot/TabIndent.html"), 999999);
+	}
+
+	if(test_robot && !has("webkit")){
+		// The back button on webkit is URL for the browser itself, restarting the entire test suite,
+		// rather than just for the iframe holding the test file (BackForwardState.html and BackForwardStateHelper.html)
+		doh.register("editor.robot.BackForwardState", require.toUrl("./robot/BackForwardState.html"), 999999);
+	}
+
+	// Special test for IE9 in IE8 compat mode (#14900)
+	if(test_robot && has("ie") == 9){
+		doh.register("editor.robot.Editor_IE8Compat", require.toUrl("./robot/Editor_IE8Compat.html"), 999999);
+	}
+
+});
+
+
+
diff --git a/src/main/resources/static/dijit/tests/editor/nls_8859-2.html b/src/main/resources/static/dijit/tests/editor/nls_8859-2.html
new file mode 100644
index 0000000000000000000000000000000000000000..9ebc3b8a06717979663b14c95fb1fc625cdf5a84
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/nls_8859-2.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>Editor Test</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-2"/>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+		
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/Editor",
+			"dojo/domReady!"
+		], function(doh, parser, registry){
+		
+			doh.register("parse", function(){
+				parser.parse();
+			});
+
+
+			doh.register("test value", [
+				{
+					name: "test value",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						
+						setTimeout(d.getTestCallback(function(){
+							var value = registry.byId('editor').get('value');
+							doh.is("ê󱶳¿¼æñÊÓ£¡¦£¯¬ÆÑ", value );
+							
+							registry.byId('editor').set('value', '\u65e5\u672c\u8a9e');
+							value = registry.byId('editor').get('value');
+							doh.is("\u65e5\u672c\u8a9e", value );
+
+							registry.byId('editor').set('value', 'ê󱶳¿¼æñÊÓ£¡¦£¯¬ÆÑ');
+						}), 2000);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+<script type="dojo/require">
+	registry: "dijit/registry"
+</script>
+<form method="post">
+<p>
+Plain text: ê󱶳¿¼æñÊÓ£¡¦£¯¬ÆÑ
+</p>
+
+<p>
+Same text should show up in the Editor:
+</p>
+<div id="editor" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor", name:"field"'>ê󱶳¿¼æñÊÓ£¡¦£¯¬ÆÑ</div>
+<input type="submit" value="Save" />
+<button type=button onclick="console.log(registry.byId('editor').get('value'))">getValue</button>
+<button type=button onclick="registry.byId('editor').set('value', '\u65e5\u672c\u8a9e')">set value to &#x65e5;&#x672c;&#x8a9e;</button>
+
+</form>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/nls_sjis.html b/src/main/resources/static/dijit/tests/editor/nls_sjis.html
new file mode 100644
index 0000000000000000000000000000000000000000..e8a93022839a62993ac4f4bba396932f0cf1aeb0
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/nls_sjis.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html lang="jp">
+<head>
+	<title>Editor Test</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=Shift-JIS"/>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+		
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/Editor",
+			"dojo/domReady!"
+		], function(doh, parser, registry){
+
+			doh.register("parse", function(){
+				parser.parse();
+			});
+
+
+			doh.register("test value", [
+				{
+					name: "test value",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						
+						setTimeout(d.getTestCallback(function(){
+							var value = registry.byId('editor').get('value');
+							doh.is("“ú–{Œê", value );
+							
+							registry.byId('editor').set('value', '‚±‚ñ‚É‚¿‚Í');
+							value = registry.byId('editor').get('value');
+							doh.is("‚±‚ñ‚É‚¿‚Í", value );
+
+							registry.byId('editor').set('value', '“ú–{Œê');
+						}), 2000);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+<script type="dojo/require">
+	registry: "dijit/registry"
+</script>
+<form method="get">
+<p>
+Plain text: “ú–{Œê
+</p>
+
+<p>
+Same text should show up in the Editor:
+</p>
+<div id="editor" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor", name:"field"'>“ú–{Œê</div>
+<input type="submit" value="Save" />
+<button type=button onclick="console.log(registry.byId('editor').get('value'))">getValue</button>
+<button type=button onclick="registry.byId('editor').set('value', '‚±‚ñ‚É‚¿‚Í')">set value to ‚±‚ñ‚É‚¿‚Í</button>
+
+</form>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/nls_utf8.html b/src/main/resources/static/dijit/tests/editor/nls_utf8.html
new file mode 100644
index 0000000000000000000000000000000000000000..ca69d5f497594a33895189babcc16558f57e0f43
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/nls_utf8.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<title>Editor Test</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/Editor",
+			"dojo/domReady!"
+		], function(doh, parser, registry){
+			 
+			doh.register("parse", function(){
+				parser.parse();
+			});
+
+			doh.register("test value", [
+				{
+					name: "test value",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						
+						setTimeout(d.getTestCallback(function(){
+							var value = registry.byId('editor').get('value');
+							doh.is("日本語", value );
+							
+							registry.byId('editor').set('value', '�ん���');
+							value = registry.byId('editor').get('value');
+							doh.is("�ん���", value );
+							
+							registry.byId('editor').set('value', '日本語');
+						}), 2000);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+<script type="dojo/require">
+	registry: "dijit/registry"
+</script>
+<form method="get">
+<p>
+Plain text: 日本語
+</p>
+
+<p>
+Same text should show up in the Editor:
+</p>
+<div id="editor" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor",name:"field"'>日本語</div>
+<input type="submit" value="Save" />
+<button type=button onclick="console.log(registry.byId('editor').get('value'))">getValue</button>
+<button type=button onclick="registry.byId('editor').set('value', '�ん���')">set value to �ん���</button>
+
+</form>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/BackForwardState.html b/src/main/resources/static/dijit/tests/editor/robot/BackForwardState.html
new file mode 100644
index 0000000000000000000000000000000000000000..686ba6574b0bf77a598a6afc0e10cf99df28a7ff
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/BackForwardState.html
@@ -0,0 +1,127 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor/Back Button Restore Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/dom", "dojo/keys", "dojo/query", "dojo/robotx", "dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, dom, keys, query, robot, helpers){
+
+				// This page tests that the editor's value won't be lost if the user
+				// accidentally navigates to a different page, and then returns to the
+				// page w/the editor by pressing the back button.
+
+				robot.initRobot('../BackForwardState.html');
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("back button restore", [
+					{
+						name: "set editor value",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var editor0 = registry.byId("editor0"),
+								editor1 = registry.byId("editor1");
+
+							doh.is("editor0 original contents", editor0.get('value'));
+							doh.is("editor1 original contents", editor1.get('value'));
+
+							editor0.set('value', 'hello');
+							editor1.set('value', 'goodbye');
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("hello", editor0.get('value'));
+								doh.is("goodbye", editor1.get('value'));
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "navigate away",
+						timeout: 10000,
+						runTest: function(){
+							return robot.waitForPageToLoad(function(){
+								// On most browsers just focusing causes navigation.  On safari
+								// need to click...
+								var away = dom.byId("away", robot.doc);
+								dom.byId("away", robot.doc).focus();
+								robot.keyPress(keys.ENTER, 500);
+							});
+						}
+					},
+					{
+						name: "confirm navigation to new page worked",
+						runTest: function(){
+							// Confirm that we successfully navigated away
+							doh.is("Back/forward test helper page", (query("h1", robot.doc)[0]||{}).innerHTML);
+						}
+					},
+					{
+						name: "go back to original page",
+						timeout: 10000,
+						runTest: function(){
+							return robot.waitForPageToLoad(function(){
+								// On most browsers just focusing causes navigation.  On safari
+								// need to click...
+								var back = dom.byId("back", robot.doc);
+								back.focus();
+								robot.keyPress(keys.ENTER, 500);
+							});
+						}
+					},
+					{
+						name: "wait for editors to load again",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVarsAgain(){
+						registry = robot.window.require("dijit/registry");
+					},
+					{
+						name: "check that editor values restored",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(d.getTestCallback(function(){
+								var editor0 = registry.byId("editor0"),
+									editor1 = registry.byId("editor1");
+
+								doh.t(editor0, "editor0 found");
+								doh.is("hello", editor0.get('value'));
+
+								doh.t(editor1, "editor1 found");
+								doh.is("goodbye", editor1.get('value'));
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/editor/robot/CustomPlugin.html b/src/main/resources/static/dijit/tests/editor/robot/CustomPlugin.html
new file mode 100644
index 0000000000000000000000000000000000000000..8cd9ede76f8f6c48ce4dc6be47aab5abc3e40d46
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/CustomPlugin.html
@@ -0,0 +1,101 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot CustomPlugin Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner",
+				"dojo/_base/array", "dojo/query", "dojo/robotx", "dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, array, query, robot, helpers){
+
+				// TODO: convert this to non-robot test, clicking button using button.click()
+
+				robot.initRobot('../test_CustomPlugin.html');
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				var myPlugin;
+
+				doh.register("isVisible", [
+					function initialConditions(){
+						var pluginIcon = query(".customIcon", robot.doc)[0];
+						doh.t(helpers.isVisible(pluginIcon), "isVisible(pluginIcon)");
+					}
+				]);
+
+					
+				doh.register("testCustomPlugin", [
+					{
+						name: "toggleOn",
+						setUp: function(){
+							var editor = registry.byId("editor1");
+							array.forEach(editor._plugins, function(plugin){
+								if(plugin.name === "MyPlugin"){
+									myPlugin = plugin;
+								}
+							});
+						},
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							myPlugin.button.focus();
+							robot.mouseMoveAt(myPlugin.button.domNode, 500);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								var foundClass = false;
+								doh.t(myPlugin.button.get("checked"), "Verifying button was checked.");
+								var sourceArea = myPlugin.sourceArea;
+								doh.t(helpers.isVisible(sourceArea), "isVisible(sourceArea)");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "toggleOff",
+						setUp: function(){
+							var editor = registry.byId("editor1");
+							array.forEach(editor._plugins, function(plugin){
+								if(plugin.name === "MyPlugin"){
+									myPlugin = plugin;
+								}
+							});
+						},
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							myPlugin.button.focus();
+							robot.mouseMoveAt(myPlugin.button.domNode, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(myPlugin.button.get("checked"), "Verifying button was unchecked.");
+								var sourceArea = myPlugin.sourceArea;
+								doh.f(helpers.isVisible(sourceArea), "isVisible(sourceArea)");
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_FontChoice.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_FontChoice.html
new file mode 100644
index 0000000000000000000000000000000000000000..9405616e2415769c397e82323b76ae2f1f8aa1d1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_FontChoice.html
@@ -0,0 +1,538 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor FontChoice Plugin Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/dom", "dojo/sniff", "dojo/window", "dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, array, dom, has, winUtils, helpers){
+
+				robot.initRobot('../test_FontChoice.html');
+
+				var editor;		// points to one of the editors (editor0, editor1, etc.)
+				var fcPlugin;	// formatBlock, fontSize, or fontName plugin
+				var value;		// HTML value of editor
+
+				function getPlugin(/*String*/ command){
+					var editor = registry.byId("editor0");
+					var edPlugins = editor._plugins, i;
+					for(i = 0; i < edPlugins.length; i++){
+						var p = edPlugins[i];
+						if(p.declaredClass === "dijit._editor.plugins.FontChoice" && p.command == command){
+							return p;
+						}
+					}
+					throw new Error("didn't find plugin " + command);
+				}
+
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				// Verify that the formatBlock, fontSize, and fontName
+				// plugins correctly display the format / font-size / font-name of the selected text.
+
+				doh.register("FontChoice: verify current format/font-size/font-name",
+					array.map(
+						[
+							{id: "para0", format: "p"},
+							{id: "pre0", format: "pre"},
+							{id: "h10", format: "h1"},
+							{id: "h20", format: "h2"},
+							{id: "h30", format: "h3"},
+							{id: "sizedText1", size: "1"},
+							{id: "sizedText4", size: "4"},
+							{id: "sizedText7", size: "7"},
+							{id: "comicText", name: "Comic Sans MS"}
+						],
+						function(params){
+							return {
+								name: [
+										"Verify",
+										params.format ? "format " + params.format.toUpperCase() : "",
+										params.size ? "font size " + params.size : "",
+										params.name ? "font name " + params.name : "",
+										"Identified"
+									].join(" ").replace(/ +/g, " "),
+								timeout: 20000,
+								setUp: function(){
+									editor = registry.byId("editor0");
+									value = editor.get("value");
+								},
+								runTest: function(){
+									var d = new doh.Deferred();
+		
+									// Focus on the editor window
+									winUtils.scrollIntoView(editor.domNode);
+									editor.focus();
+									robot.mouseMoveAt(editor.iframe, 1000);
+									robot.mouseClick({left:true}, 1000);
+	
+									robot.sequence(d.getTestErrback(function(){
+										// Find node w/specified id
+										var node = dom.byId(params.id, editor.document);
+										doh.is(params.id, node && node.id, "found " + params.id);
+
+										// Select the text, collapse to the start of it
+										editor.selection.selectElementChildren(node);
+										editor.selection.collapse(true);
+									}),1000);
+					                robot.sequence(d.getTestErrback(function(){
+										// Make sure states update.
+										editor.onDisplayChanged();
+									}), 1000);
+									robot.sequence(d.getTestCallback(function(){
+										if(params.format){
+											doh.is(params.format, getPlugin("formatBlock").button.get("value"), "format " + params.format + " identified.");
+										}
+										if(params.size){
+											doh.is(params.size, getPlugin("fontSize").button.get("value"), "font size " + params.size + " identified.");
+										}
+										if(params.name){
+											doh.is(params.name, getPlugin("fontName").button.get("value"), "font name" + params.name + " identified.");
+										}
+									}), 2000);
+
+									return d;
+								},
+								tearDown: function(){
+									if(editor){editor.set("value", value);}
+								}
+							};	// end of return { ...
+						}	// end of function()
+					)	// end of array.map()
+				);	// end of doh.register()
+
+				// Test changing format/font-size/font-name (ex: changing an <h1> to an <h2>)
+				doh.register("FontChoice: change format/font-size/font",
+					array.map(
+						[
+							{id: "text", type: "formatBlock", from: "p", to: "pre"},
+							{id: "text", type: "formatBlock", from: "pre", to: "h1"},
+							{id: "text", type: "formatBlock", from: "h1", to: "h2"},
+							{id: "text", type: "formatBlock", from: "h2", to: "h3"},
+							{id: "sizedText7", type: "fontSize", from: "7", to: "3"},
+							{id: "comicText", type: "fontName", from: "Comic Sans MS", to: "Times New Roman"}
+						],
+						function(params){
+							return {
+								name: "formatBlock: Verify can change " + params.type + " " +
+									params.from.toUpperCase() + " to " + params.to.toUpperCase(),
+								timeout: 20000,
+								setUp: function(){
+									fcPlugin = getPlugin(params.type);
+									value = editor.get("value");
+								},
+								runTest: function(){
+									var d = new doh.Deferred();
+
+									// Focus on the editor window
+									winUtils.scrollIntoView(editor.domNode);
+									editor.focus();
+									robot.mouseMoveAt(editor.iframe, 1000);
+									robot.mouseClick({left:true}, 1000);
+	
+									robot.sequence(d.getTestErrback(function(){
+										// Find node
+										var p = dom.byId(params.id, editor.document);
+										doh.is(params.id, p && p.id, "found node");
+	
+										// Select the text, collapse to the start of it
+										editor.selection.selectElementChildren(p);
+										// Disable collapse.  Webkit changed behavior so it now requires
+										// a selection.
+										if(!has("webkit")){ editor.selection.collapse(true) }
+
+										// Set the format / font-size / font-name plugin to the new value
+										// TODO: use mouse/keyboard to set the value
+										fcPlugin.button.set("value", params.to);
+									}),1000);
+					                robot.sequence(d.getTestErrback(function(){
+										// Make sure states update.
+										editor.onDisplayChanged();
+									}), 1000);
+									robot.sequence(d.getTestCallback(function(){
+										doh.is(params.to, fcPlugin.button.get("value"), "verify converted");
+
+										// TODO: check that it actually changed the format / font-size / font-name (in the editor contents)
+									}), 2000);
+
+									return d;
+								},
+								tearDown: function(){
+									if(editor){editor.set("value", value);}
+								}
+							};	// end of return { ...
+						}	// end of function()
+					)	// end of array.map()
+				);	// end of doh.register()
+
+				doh.register("formatBlock: multiple changes",
+					{
+						name: "formatBlock: Verify changing multiple nodes to h3",
+						timeout: 20000,
+						setUp: function(){
+							editor = registry.byId("editor0");
+							fcPlugin = getPlugin("formatBlock");
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor.domNode);
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000);
+							robot.mouseClick({left:true}, 1000);
+
+							// Verify the formatBlock plugin was found
+							doh.t(fcPlugin !== null, "formatBlock was found");
+
+							robot.sequence(d.getTestErrback(function(){
+								var p = dom.byId("text", editor.document);
+								doh.is("text", p && p.id, "found text");
+
+								// Select the text, collapse to the start of it
+								editor.selection.selectElementChildren(p);
+								editor.selection.collapse(true);
+
+								// Set the format / font-size / font-name plugin to the new value
+								// TODO: use mouse/keyboard to set the value
+								fcPlugin.button.set("value", "h3");
+							}),1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Make sure states update.
+								editor.onDisplayChanged();
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("h3", fcPlugin.button.get("value"), "Verify first P converted to H3.");
+								// TODO: check that it actually changed the format (in the editor contents)
+							}), 2000);
+
+							// Move to the next block and try to change it to h3 too.
+							robot.sequence(d.getTestErrback(function(){
+								var p = dom.byId("text1", editor.document);
+								doh.is("text1", p && p.id, "found text1");
+
+								// Select the text, collapse to the start of it
+								editor.selection.selectElementChildren(p);
+								editor.selection.collapse(true);
+
+								// Set the format / font-size / font-name plugin to the new value
+								// TODO: use mouse/keyboard to set the value
+								fcPlugin.button.set("value", "h3");
+							}),1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Make sure states update.
+								editor.onDisplayChanged();
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// state should have updated, so, now set value.
+								// TODO: use mouse/keyboard to set the value
+								fcPlugin.button.set("value", "h3");
+							}),1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Make sure states update.
+								editor.onDisplayChanged();
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("h3", fcPlugin.button.get("value"), "Verify second P converted to H3.");
+								// TODO: check that it actually changed the format (in the editor contents)
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					}
+				);
+
+				doh.register("FontChoice: Format Removal Tests", [
+					{
+						name: "formatBlock: Verify single level format is removed (inside format block).",
+						timeout: 20000,
+						setUp: function(){
+							editor = registry.byId("editor0");
+							fcPlugin = getPlugin("formatBlock");
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor.domNode);
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000);
+							robot.mouseClick({left:true}, 1000);
+
+							// Verify the formatBlock plugin was found
+							doh.t(fcPlugin !== null, "formatBlock was found");
+
+							robot.sequence(d.getTestErrback(function(){
+								var p = dom.byId("text", editor.document);
+								doh.is("text", p && p.id, "found text");
+
+								// Select the text, collapse to the start of it
+								editor.selection.selectElementChildren(p);
+								editor.selection.collapse(true);
+							}),1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Make sure states update.
+								editor.onDisplayChanged();
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								fcPlugin.button.set("value", "noFormat");
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Make sure states update.
+								// If change occurred, then the value should 
+								// still be noFormat.
+								editor.onDisplayChanged();
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+                                doh.is("noFormat", fcPlugin.button.get("value"), 
+									"Validating current cursor point format is noFormat");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "formatBlock: Verify multiple format removal via selection",
+						timeout: 20000,
+						setUp: function(){
+							editor = registry.byId("editor0");
+							fcPlugin = getPlugin("formatBlock");
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor.domNode);
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000);
+							robot.mouseClick({left:true}, 1000);
+
+							// Verify the formatBlock plugin was found
+							doh.isNot(null, fcPlugin, "formatBlock was found");
+
+							robot.sequence(d.getTestErrback(function(){
+								var p = dom.byId("text", editor.document);
+								doh.is("text", p && p.id, "found text");
+
+								// Select the text, collapse to the start of it
+								editor.selection.selectElementChildren(p);
+								editor.selection.collapse(true);
+							}),1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Make sure states update.
+								editor.onDisplayChanged();
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Select the children of the block and try to flatten the formatting.
+								var selection = dom.byId("selectionContainer", editor.document);
+								winUtils.scrollIntoView(selection);
+								editor.selection.selectElementChildren(selection);
+								fcPlugin.button.set("value", "noFormat");
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check that the elements are all gone.
+								var selection = dom.byId("selectionContainer", editor.document);
+								doh.t(selection.childNodes.length > 0,
+										"Checking that there are still child nodes, actual was " + selection.childNodes.length);
+
+								var i;
+								var nodes = selection.childNodes;
+								for(i = 0; i < nodes.length; i++){
+									var n = nodes[i];
+									if(n.nodeType == 1){
+										var tag = n.nodeName ? n.nodeName.toLowerCase() : "";
+										doh.isNot("p", tag, "selection node #" + i + " of " + nodes.length);
+										doh.isNot("h3", tag, "selection node #" + i + " of " + nodes.length);
+										doh.isNot("pre", tag, "selection node #" + i + " of " + nodes.length);
+									}
+								}
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					}
+				]);
+
+				doh.register("FontChoice: miscellaneous tests", [
+					{
+						name: "FontChoice: Plain Text labels",
+						timeout: 20000,
+						setUp: function(){
+							editor = registry.byId("editor1");
+							fcPlugin = [];
+							var edPlugins = editor._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.FontChoice"){
+									fcPlugin.push(p);
+								}
+							}
+							value = editor.get("value");
+						},
+						runTest: function(){
+							// summary:
+							//		This test goes through all the registered FontChoice plugins
+							//		and verifies that they're all using plain text labels in the dropdown.
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor.domNode);
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000);
+							robot.mouseClick({left:true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								for(var i = 0; i < fcPlugin.length; i++){
+									var p = fcPlugin[i];
+									var store = p.button.select.store;
+									var items = store.query();
+									for(var j = 0; j < items.length; j++){
+										var item = items[j];
+										doh.f(item.name.indexOf("<") === 0, "failed on: " + item.name);
+									}
+								}
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "FontChoice: Validate usage of generic names",
+						timeout: 20000,
+						setUp: function(){
+							editor = registry.byId("generic");
+							fcPlugin = null;
+							var edPlugins = editor._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.FontChoice" && p.command === "fontName" && p.generic){
+									fcPlugin = p;
+								}
+							}
+							value = editor.get("value");
+						},
+						runTest: function(){
+							// summary:
+							//		This test goes through the font choice plugin registered as generic font names and validates
+							//		the font names in the values are the generic map.
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor.domNode);
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000);
+							robot.mouseClick({left:true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								var map = {
+									"sans-serif": false,
+									"serif": false,
+									"cursive": false,
+									"monospace": false,
+									"fantasy": false
+								};
+								var store = fcPlugin.button.select.store;
+								var items = store.query();
+								for(var j = 0; j < items.length; j++){
+									var item = items[j];
+									map[item.value] = true;
+								}
+								for(j in map){
+									doh.t(map[j], j);
+								}
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "FontChoice: Validate custom font names",
+						timeout: 20000,
+						setUp: function(){
+							editor = registry.byId("custom");
+							fcPlugin = null;
+							var edPlugins = editor._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.FontChoice" && p.command === "fontName" && p.custom){
+									fcPlugin = p;
+								}
+							}
+							value = editor.get("value");
+						},
+						runTest: function(){
+							// summary:
+							//		This test goes through the font choice plugin registered as custom font names and validates
+							//		the font names in the values are the provided names.
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor.domNode);
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000);
+							robot.mouseClick({left:true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								var map = {
+									"Verdana": false,
+									"Myriad": false,
+									"Garamond": false
+								};
+								var store = fcPlugin.button.select.store;
+								var items = store.query();
+								for(var j = 0; j < items.length; j++){
+									var item = items[j];
+									map[item.value] = true;
+								}
+								for(j in map){
+									doh.t(map[j], j);
+								}
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_FullScreen.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_FullScreen.html
new file mode 100644
index 0000000000000000000000000000000000000000..4e2c88c1da5d48e546981777502688e0bbda6e03
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_FullScreen.html
@@ -0,0 +1,645 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor FullScreen Plugin Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom-geometry", "dojo/dom-style", "dojo/keys", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, domGeom, domStyle, keys, winUtils, helpers){
+	
+				robot.initRobot('../test_FullScreen.html');
+
+				function getPlugin(/*Editor*/ editor){
+					// summary:
+					//		Return full screen plugin for specified editor
+					var edPlugins = editor._plugins, i;
+					for(i = 0; i < edPlugins.length; i++){
+						var p = edPlugins[i], fsPlugin;
+						if(p.declaredClass === "dijit._editor.plugins.FullScreen"){
+							p.button.set("checked", false);
+							return p;				
+						}
+					}
+					throw new Error("didn't find plugin");
+				}
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("General", [
+					function setUp(){
+						editor = registry.byId("editor0");
+						fsPlugin = getPlugin(editor);
+					},
+					{
+						name: "Keyboard: Go to Fullscreen (CTRL-SHIFT-F11)",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							robot.keyPress(keys.F11, 500, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.t(fsPlugin.isFullscreen, "isFullScreen");
+								var vp = winUtils.getBox();
+								var edPos = domGeom.position(editor.domNode);
+								doh.is("absolute", domStyle.get(editor.domNode, "position"));
+								doh.is("0", domStyle.get(editor.domNode, "top"), "Top position check");
+								doh.is("0", domStyle.get(editor.domNode, "left"), "Left position check");
+
+								//There may be a difference of a pixel or two, so check that the editor is real close
+								//to the viewport size.
+								doh.t(edPos.h >= vp.h && edPos.h < (vp.h + 5),
+									"Height check, ed = " + edPos.h + ", vp = " + vp.h);
+								doh.t(Math.ceil(edPos.w) >= vp.w && Math.floor(edPos.w) < (vp.w + 5),
+									"Width check, ed = " + edPos.w + ", vp = " + vp.w);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+						}
+					},
+					{
+						name: "Keyboard: Go to fullscreen and back",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							robot.keyPress(keys.F11, 500, {ctrl:true,shift:true});
+							robot.keyPress(keys.F11, 1000, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.f(fsPlugin.isFullscreen, "isFullScreen");
+								var edPos = domGeom.position(editor.domNode);
+								doh.isNot("absolute", domStyle.get(editor.domNode, "position"));
+
+								//There may be a difference of a pixel or two depending on how the browser sizes
+								//so check that the editor is real close to the expected size defined in the test doc.
+								doh.t(edPos.h >= 400 && (edPos.h < 405), "Restored height check.");
+								doh.t(edPos.w >= 800 && (edPos.w < 805), "Restored width check.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+						}
+					},
+					{
+						name: "Mouse Click: Go to Fullscreen",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							robot.mouseMoveAt(fsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 750);
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.t(fsPlugin.isFullscreen, "isFullScreen");
+								var vp = winUtils.getBox();
+								var edPos = domGeom.position(editor.domNode);
+								doh.is("absolute", domStyle.get(editor.domNode, "position"));
+								doh.is("0", domStyle.get(editor.domNode, "top"), "Top position check");
+								doh.is("0", domStyle.get(editor.domNode, "left"), "Left position check");
+
+								//There may be a difference of a pixel or two, so check that the editor is real close
+								//to the viewport size.
+								doh.t(edPos.h >= vp.h && edPos.h < (vp.h + 5), "Height check");
+								doh.t(Math.ceil(edPos.w) >= vp.w && Math.floor(edPos.w) < (vp.w + 5),
+												"Width check, ed = " + edPos.w + ", vp = " + vp.w);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+						}
+					},
+					{
+						name: "Mouse Click: Go to fullscreen and back",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							//Click it, then click it again!
+							robot.mouseMoveAt(fsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 750);
+							robot.mouseMoveAt(fsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 750);
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.f(fsPlugin.isFullscreen, "isFullScreen");
+								var edPos = domGeom.position(editor.domNode);
+								doh.isNot("absolute", domStyle.get(editor.domNode, "position"));
+
+								//There may be a difference of a pixel or two depending on how the browser sizes
+								//so check that the editor is real close to the expected size defined in the test doc.
+								doh.t(edPos.h >= 400 && (edPos.h < 405), "Restored height check.");
+								doh.t(edPos.w >= 800 && (edPos.w < 805), "Restored width check.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+						}
+					}
+				]);
+
+				doh.register("BorderContainer", [
+					function setUp(){
+						editor = registry.byId("editor1");
+						fsPlugin = getPlugin(editor);
+						container = registry.byId("bc");
+					},
+
+					{
+						name: "BorderContainer:  Go Fullscreen, Reduce BorderContainer, Exit FullScreen, Validate Resize",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							var origEditorSize = domGeom.getMarginBox(editor.domNode);
+							var origContainerSize = domGeom.getMarginBox(container.domNode);
+							os = {w: origContainerSize.w, h: origContainerSize.h};
+
+							robot.sequence(d.getTestErrback(function(){
+								// Engage FullScreen Mode
+								fsPlugin.button.set("checked", true);
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Resize the container
+								container.resize({w: 400, h: 400});
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Disengage FullScreen Mode
+								fsPlugin.button.set("checked", false);
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								// Now validate the editor resized when it returned since
+								// the Container was resized.
+								var curEditorSize = domGeom.getMarginBox(editor.domNode);
+								var curContainerSize = domGeom.getMarginBox(container.domNode);
+								var containerWdiff = origContainerSize.w - curContainerSize.w;
+								var containerHdiff = origContainerSize.h - curContainerSize.h;
+								var eWdiff = origEditorSize.w - curEditorSize.w;
+								var eHdiff = origEditorSize.h - curEditorSize.h;
+
+								doh.t(origEditorSize.w > curEditorSize.w, "Validating new width is less that the original size");
+								doh.t(origEditorSize.h > curEditorSize.h, "Validating new height is less that the original size");
+								doh.t((eWdiff < (containerWdiff + 5)) && (eWdiff > (containerWdiff - 5)), "Doing a rough check that the editor width resized roughly to the Container difference, eWdiff = " + eWdiff + ", containerWdiff = " + containerWdiff);
+								doh.t((eHdiff < (containerHdiff + 5)) && (eHdiff > (containerHdiff - 5)), "Doing a rough check that the editor height resized roughly to the Container difference, eHdiff = " + eHdiff + ", containerHdiff = " + containerHdiff);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+							 if(container && os){container.resize(os);}
+						}
+					},
+					{
+						name: "BorderContainer:  Go Fullscreen, Increase BorderContainer, Exit FullScreen, Validate Resize",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							var origEditorSize = domGeom.getMarginBox(editor.domNode);
+							var origContainerSize = domGeom.getMarginBox(container.domNode);
+							os = {w: origContainerSize.w, h: origContainerSize.h};
+
+							robot.sequence(d.getTestErrback(function(){
+								// Engage FullScreen Mode
+								fsPlugin.button.set("checked", true);
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Resize the container
+								container.resize({w: 800, h: 800});
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Disengage FullScreen Mode
+								fsPlugin.button.set("checked", false);
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								// Now validate the editor resized when it returned since
+								// the Container was resized.
+								var curEditorSize = domGeom.getMarginBox(editor.domNode);
+								var curContainerSize = domGeom.getMarginBox(container.domNode);
+								var containerWdiff = -(origContainerSize.w - curContainerSize.w);
+								var containerHdiff = -(origContainerSize.h - curContainerSize.h);
+								var eWdiff = -(origEditorSize.w - curEditorSize.w);
+								var eHdiff = -(origEditorSize.h - curEditorSize.h);
+
+								doh.t(origEditorSize.w < curEditorSize.w, "Validating new width is less that the original size");
+								doh.t(origEditorSize.h < curEditorSize.h, "Validating new height is less that the original size");
+								doh.t((eWdiff < (containerWdiff + 5)) && (eWdiff > (containerWdiff - 5)), "Doing a rough check that the editor width resized roughly to the Container difference, eWdiff = " + eWdiff + ", containerWdiff = " + containerWdiff);
+								doh.t((eHdiff < (containerHdiff + 5)) && (eHdiff > (containerHdiff - 5)), "Doing a rough check that the editor height resized roughly to the Container difference, eHdiff = " + eHdiff + ", containerHdiff = " + containerHdiff);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+							 if(container && os){container.resize(os);}
+						}
+					}
+				]);
+
+				doh.register("TabContainer", [
+					function setUp(){
+						editor = registry.byId("editor2");
+						fsPlugin = getPlugin(editor);
+						container = registry.byId("tc");
+					},
+
+					{
+						name: "TabContainer:  Go Fullscreen, Reduce TabContainer, Exit FullScreen, Validate Resize",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							var origEditorSize = domGeom.getMarginBox(editor.domNode);
+							var origContainerSize = domGeom.getMarginBox(container.domNode);
+							os = {w: origContainerSize.w, h: origContainerSize.h};
+
+							robot.sequence(d.getTestErrback(function(){
+								// Engage FullScreen Mode
+								fsPlugin.button.set("checked", true);
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Resize the container
+								container.resize({w: 400, h: 400});
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Disengage FullScreen Mode
+								fsPlugin.button.set("checked", false);
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								// Now validate the editor resized when it returned since
+								// the Container was resized.
+								var curEditorSize = domGeom.getMarginBox(editor.domNode);
+								var curContainerSize = domGeom.getMarginBox(container.domNode);
+								var containerWdiff = origContainerSize.w - curContainerSize.w;
+								var containerHdiff = origContainerSize.h - curContainerSize.h;
+								var eWdiff = origEditorSize.w - curEditorSize.w;
+								var eHdiff = origEditorSize.h - curEditorSize.h;
+
+								doh.t(origEditorSize.w > curEditorSize.w, "Validating new width is less that the original size");
+								doh.t(origEditorSize.h > curEditorSize.h, "Validating new height is less that the original size");
+								doh.t((eWdiff < (containerWdiff + 5)) && (eWdiff > (containerWdiff - 5)), "Doing a rough check that the editor width resized roughly to the Container difference, eWdiff = " + eWdiff + ", containerWdiff = " + containerWdiff);
+								doh.t((eHdiff < (containerHdiff + 5)) && (eHdiff > (containerHdiff - 5)), "Doing a rough check that the editor height resized roughly to the Container difference, eHdiff = " + eHdiff + ", containerHdiff = " + containerHdiff);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+							 if(container && os){container.resize(os);}
+						}
+					},
+					{
+						name: "TabContainer:  Go Fullscreen, Increase TabContainer, Exit FullScreen, Validate Resize",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							var origEditorSize = domGeom.getMarginBox(editor.domNode);
+							var origContainerSize = domGeom.getMarginBox(container.domNode);
+							os = {w: origContainerSize.w, h: origContainerSize.h};
+
+							robot.sequence(d.getTestErrback(function(){
+								// Engage FullScreen Mode
+								fsPlugin.button.set("checked", true);
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Resize the container
+								container.resize({w: 800, h: 800});
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Disengage FullScreen Mode
+								fsPlugin.button.set("checked", false);
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								// Now validate the editor resized when it returned since
+								// the Container was resized.
+								var curEditorSize = domGeom.getMarginBox(editor.domNode);
+								var curContainerSize = domGeom.getMarginBox(container.domNode);
+								var containerWdiff = -(origContainerSize.w - curContainerSize.w);
+								var containerHdiff = -(origContainerSize.h - curContainerSize.h);
+								var eWdiff = -(origEditorSize.w - curEditorSize.w);
+								var eHdiff = -(origEditorSize.h - curEditorSize.h);
+
+								doh.t(origEditorSize.w < curEditorSize.w, "Validating new width is less that the original size");
+								doh.t(origEditorSize.h < curEditorSize.h, "Validating new height is less that the original size");
+								doh.t((eWdiff < (containerWdiff + 5)) && (eWdiff > (containerWdiff - 5)), "Doing a rough check that the editor width resized roughly to the Container difference, eWdiff = " + eWdiff + ", containerWdiff = " + containerWdiff);
+								doh.t((eHdiff < (containerHdiff + 5)) && (eHdiff > (containerHdiff - 5)), "Doing a rough check that the editor height resized roughly to the Container difference, eHdiff = " + eHdiff + ", containerHdiff = " + containerHdiff);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+							 if(container && os){container.resize(os);}
+						}
+					}
+				]);
+
+				doh.register("AccordionContainer", [
+					function setUp(){
+						editor = registry.byId("editor3");
+						fsPlugin = getPlugin(editor);
+						container = registry.byId("ac");
+					},
+
+					{
+						name: "AccordionContainer:  Go Fullscreen, Reduce AccordionContainer, Exit FullScreen, Validate Resize",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							var origEditorSize = domGeom.getMarginBox(editor.domNode);
+							var origContainerSize = domGeom.getMarginBox(container.domNode);
+							os = {w: origContainerSize.w, h: origContainerSize.h};
+
+							robot.sequence(d.getTestErrback(function(){
+								// Engage FullScreen Mode
+								fsPlugin.button.set("checked", true);
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Resize the container
+								container.resize({w: 400, h: 400});
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Disengage FullScreen Mode
+								fsPlugin.button.set("checked", false);
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								// Now validate the editor resized when it returned since
+								// the Container was resized.
+								var curEditorSize = domGeom.getMarginBox(editor.domNode);
+								var curContainerSize = domGeom.getMarginBox(container.domNode);
+								var containerWdiff = origContainerSize.w - curContainerSize.w;
+								var containerHdiff = origContainerSize.h - curContainerSize.h;
+								var eWdiff = origEditorSize.w - curEditorSize.w;
+								var eHdiff = origEditorSize.h - curEditorSize.h;
+
+								doh.t(origEditorSize.w > curEditorSize.w, "Validating new width is less that the original size");
+								doh.t(origEditorSize.h > curEditorSize.h, "Validating new height is less that the original size");
+								doh.t((eWdiff < (containerWdiff + 5)) && (eWdiff > (containerWdiff - 5)), "Doing a rough check that the editor width resized roughly to the Container difference, eWdiff = " + eWdiff + ", containerWdiff = " + containerWdiff);
+								doh.t((eHdiff < (containerHdiff + 5)) && (eHdiff > (containerHdiff - 5)), "Doing a rough check that the editor height resized roughly to the Container difference, eHdiff = " + eHdiff + ", containerHdiff = " + containerHdiff);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+							 if(container && os){container.resize(os);}
+						}
+					},
+					{
+						name: "AccordionContainer:  Go Fullscreen, Increase AccordionContainer, Exit FullScreen, Validate Resize",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							var origEditorSize = domGeom.getMarginBox(editor.domNode);
+							var origContainerSize = domGeom.getMarginBox(container.domNode);
+							os = {w: origContainerSize.w, h: origContainerSize.h};
+
+							robot.sequence(d.getTestErrback(function(){
+								// Engage FullScreen Mode
+								fsPlugin.button.set("checked", true);
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Resize the container
+								container.resize({w: 800, h: 800});
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Disengage FullScreen Mode
+								fsPlugin.button.set("checked", false);
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								// Now validate the editor resized when it returned since
+								// the Container was resized.
+								var curEditorSize = domGeom.getMarginBox(editor.domNode);
+								var curContainerSize = domGeom.getMarginBox(container.domNode);
+								var containerWdiff = -(origContainerSize.w - curContainerSize.w);
+								var containerHdiff = -(origContainerSize.h - curContainerSize.h);
+								var eWdiff = -(origEditorSize.w - curEditorSize.w);
+								var eHdiff = -(origEditorSize.h - curEditorSize.h);
+
+								doh.t(origEditorSize.w < curEditorSize.w, "Validating new width is less that the original size");
+								doh.t(origEditorSize.h < curEditorSize.h, "Validating new height is less that the original size");
+								doh.t((eWdiff < (containerWdiff + 5)) && (eWdiff > (containerWdiff - 5)), "Doing a rough check that the editor width resized roughly to the Container difference, eWdiff = " + eWdiff + ", containerWdiff = " + containerWdiff);
+								doh.t((eHdiff < (containerHdiff + 5)) && (eHdiff > (containerHdiff - 5)), "Doing a rough check that the editor height resized roughly to the Container difference, eHdiff = " + eHdiff + ", containerHdiff = " + containerHdiff);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+							 if(container && os){container.resize(os);}
+						}
+					}
+				]);
+
+				doh.register("StackContainer", [
+					function setUp(){
+						editor = registry.byId("editor4");
+						fsPlugin = getPlugin(editor);
+						container = registry.byId("sc");
+					},
+
+					{
+						name: "StackContainer:  Go Fullscreen, Reduce StackContainer, Exit FullScreen, Validate Resize",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							var origEditorSize = domGeom.getMarginBox(editor.domNode);
+							var origContainerSize = domGeom.getMarginBox(container.domNode);
+							os = {w: origContainerSize.w, h: origContainerSize.h};
+
+							robot.sequence(d.getTestErrback(function(){
+								// Engage FullScreen Mode
+								fsPlugin.button.set("checked", true);
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Resize the container
+								container.resize({w: 400, h: 400});
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Disengage FullScreen Mode
+								fsPlugin.button.set("checked", false);
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								// Now validate the editor resized when it returned since
+								// the Container was resized.
+								var curEditorSize = domGeom.getMarginBox(editor.domNode);
+								var curContainerSize = domGeom.getMarginBox(container.domNode);
+								var containerWdiff = origContainerSize.w - curContainerSize.w;
+								var containerHdiff = origContainerSize.h - curContainerSize.h;
+								var eWdiff = origEditorSize.w - curEditorSize.w;
+								var eHdiff = origEditorSize.h - curEditorSize.h;
+
+								doh.t(origEditorSize.w > curEditorSize.w, "Validating new width is less that the original size");
+								doh.t(origEditorSize.h > curEditorSize.h, "Validating new height is less that the original size");
+								doh.t((eWdiff < (containerWdiff + 5)) && (eWdiff > (containerWdiff - 5)), "Doing a rough check that the editor width resized roughly to the Container difference, eWdiff = " + eWdiff + ", containerWdiff = " + containerWdiff);
+								doh.t((eHdiff < (containerHdiff + 5)) && (eHdiff > (containerHdiff - 5)), "Doing a rough check that the editor height resized roughly to the Container difference, eHdiff = " + eHdiff + ", containerHdiff = " + containerHdiff);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+							 if(container && os){container.resize(os);}
+						}
+					},
+					{
+						name: "StackContainer:  Go Fullscreen, Increase StackContainer, Exit FullScreen, Validate Resize",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Focus on the editor window
+							robot.sequence(d.getTestErrback(function(){
+								winUtils.scrollIntoView(editor.domNode);
+								editor.focus();
+							}), 500);
+
+							var origEditorSize = domGeom.getMarginBox(editor.domNode);
+							var origContainerSize = domGeom.getMarginBox(container.domNode);
+							os = {w: origContainerSize.w, h: origContainerSize.h};
+
+							robot.sequence(d.getTestErrback(function(){
+								// Engage FullScreen Mode
+								fsPlugin.button.set("checked", true);
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Resize the container
+								container.resize({w: 800, h: 800});
+							}), 1000);
+							robot.sequence(d.getTestErrback(function(){
+								// Disengage FullScreen Mode
+								fsPlugin.button.set("checked", false);
+							}), 1000);
+							robot.sequence(d.getTestCallback(function(){
+								// Now validate the editor resized when it returned since
+								// the Container was resized.
+								var curEditorSize = domGeom.getMarginBox(editor.domNode);
+								var curContainerSize = domGeom.getMarginBox(container.domNode);
+								var containerWdiff = -(origContainerSize.w - curContainerSize.w);
+								var containerHdiff = -(origContainerSize.h - curContainerSize.h);
+								var eWdiff = -(origEditorSize.w - curEditorSize.w);
+								var eHdiff = -(origEditorSize.h - curEditorSize.h);
+
+								doh.t(origEditorSize.w < curEditorSize.w, "Validating new width is less that the original size");
+								doh.t(origEditorSize.h < curEditorSize.h, "Validating new height is less that the original size");
+								doh.t((eWdiff < (containerWdiff + 5)) && (eWdiff > (containerWdiff - 5)), "Doing a rough check that the editor width resized roughly to the Container difference, eWdiff = " + eWdiff + ", containerWdiff = " + containerWdiff);
+								doh.t((eHdiff < (containerHdiff + 5)) && (eHdiff > (containerHdiff - 5)), "Doing a rough check that the editor height resized roughly to the Container difference, eHdiff = " + eHdiff + ", containerHdiff = " + containerHdiff);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 fsPlugin.button.set("checked", false);
+							 if(container && os){container.resize(os);}
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_IE8Compat.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_IE8Compat.html
new file mode 100644
index 0000000000000000000000000000000000000000..de20fc0935ee1b68776fc0b5410cc7cd4f386c8e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_IE8Compat.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor IE9 in IE8 Compat Mode Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx", "dojo/keys", "dojo/window", "dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, keys, winUtils, helpers){
+
+				robot.initRobot('../Editor_IE8Compat.html');
+
+				var editor1;
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+						editor1 = registry.byId("editor1");
+					}
+				]);
+
+				doh.register("general", [
+					{
+						name: "general",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							winUtils.scrollIntoView(editor1.domNode);
+
+							// Set contents of editor1
+							robot.sequence(d.getTestErrback(function(){
+								editor1.focus();
+							}), 500);
+							robot.typeKeys("hello", 500, 750);
+							robot.keyPress(keys.ENTER, 500);
+							robot.typeKeys("world", 500, 1650);
+
+							robot.sequence(d.getTestCallback(function(){
+								var val = editor1.get('value').replace(/[\s\xA0]+/g, "").toLowerCase();
+								doh.is("hello<br/>world", val);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+
+
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_LinkDialog.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_LinkDialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..06b95bd1c587a2501173be6237f84e916055ccf5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_LinkDialog.html
@@ -0,0 +1,903 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor LinkDialog Plugin Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, helpers){
+
+				robot.initRobot('../test_LinkDialog.html');
+
+				var editor;
+				var ldPlugin;
+				var value;
+				var node;
+
+				var registry, focus;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+						focus = robot.window.require("dijit/focus");
+					}
+				]);
+
+				doh.register("LinkDialog_tests", [
+					function setUp(){
+						editor = registry.byId("editor");
+						ldPlugin = null;
+						var edPlugins = editor._plugins, i;
+						for(i = 0; i < edPlugins.length; i++){
+							var p = edPlugins[i];
+							if(p.declaredClass === "dijit._editor.plugins.LinkDialog"){
+								ldPlugin = p;
+								break;
+							}
+						}
+						doh.t(ldPlugin != null, "found link dialog.");
+					},
+
+					{
+						name: "Anchor Tag: Create a new link",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							var url, desc;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								url.set("value", "http://example.com/");
+								desc.set("value", "This is my example link.");
+							}),2000);
+
+							robot.mouseMoveAt(function(){return registry.byId(ldPlugin._uniqueId + "_setButton").domNode;}, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.t(new RegExp("href=(\"|\')http://example.com/(\"|\')").test(newVal), "Verifying URL has been inserted.");
+								doh.f(new RegExp("<li><a").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.), newVal =" + newVal);
+								doh.t(new RegExp("target=(\"|\')_self(\"|\')").test(newVal), "Verifying target has been inserted.");
+								doh.t(new RegExp(">This is my example link.<").test(newVal), "Verifying description has been inserted.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Create a new link with alternate target",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, target, desc;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+								url.set("value", "http://example.com/");
+								desc.set("value", "This is my example link.");
+								target.set("value", "_blank");
+							}),2000);
+							robot.mouseMoveAt(function(){return registry.byId(ldPlugin._uniqueId + "_setButton").domNode;}, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.f(new RegExp("<li><a").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.)");
+								doh.t(new RegExp("href=(\"|\')http://example.com/(\"|\')").test(newVal), "Verifying URL has been inserted.");
+								doh.t(new RegExp("target=(\"|\')_blank(\"|\')").test(newVal), "Verifying target has been inserted.");
+								doh.t(new RegExp(">This is my example link.<").test(newVal), "Verifying description has been inserted.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Test auto insertion of http:// for urls.",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, desc, target;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+								url.set("value", "example.com/");
+								desc.set("value", "This is my example link.");
+								target.set("value", "_blank");
+							}),2000);
+							robot.mouseMoveAt(function(){return registry.byId(ldPlugin._uniqueId + "_setButton").domNode;}, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.f(new RegExp("<li><a").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.)");
+								doh.t(new RegExp("href=(\"|\')http://example.com/(\"|\')").test(newVal), "Verifying URL has been inserted.");
+								doh.t(new RegExp("target=(\"|\')_blank(\"|\')").test(newVal), "Verifying target has been inserted.");
+								doh.t(new RegExp(">This is my example link.<").test(newVal), "Verifying description has been inserted.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Test insertion 'relative' urls (./)",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, desc, target;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+								url.set("value", "./myDirectory/myfile.html");
+								desc.set("value", "This is my example relative link.");
+								target.set("value", "_blank");
+							}),2000);
+							robot.mouseMoveAt(function(){return registry.byId(ldPlugin._uniqueId + "_setButton").domNode;}, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.f(new RegExp("<li><a").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.)");
+								doh.t(new RegExp("href=(\"|\')\./myDirectory/myfile.html(\"|\')").test(newVal), "Verifying URL has been inserted.");
+								doh.t(new RegExp("target=(\"|\')_blank(\"|\')").test(newVal), "Verifying target has been inserted.");
+								doh.t(new RegExp(">This is my example relative link.<").test(newVal), "Verifying description has been inserted.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Test insertion 'relative' url (../)",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, desc, target;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+								url.set("value", "../myDirectory/myfile.html");
+								desc.set("value", "This is my example relative link.");
+								target.set("value", "_blank");
+							}),2000);
+							robot.mouseMoveAt(function(){return registry.byId(ldPlugin._uniqueId + "_setButton").domNode;}, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.f(new RegExp("<li><a").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.)");
+								doh.t(new RegExp("href=(\"|\')\.\./myDirectory/myfile.html(\"|\')").test(newVal), "Verifying URL has been inserted.");
+								doh.t(new RegExp("target=(\"|\')_blank(\"|\')").test(newVal), "Verifying target has been inserted.");
+								doh.t(new RegExp(">This is my example relative link.<").test(newVal), "Verifying description has been inserted.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Update existing anchor tag",
+						timeout: 20000,
+						setUp: function(){
+							node = dom.byId("exampleLink", editor.document);
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								// Okay, select the text of the hyperlink so we can then perform an edit on it.
+								editor.selection.selectElement(node);
+							}),500);
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							var url, desc, target, oldUrl, oldDesc;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+
+								oldUrl = url.get("value");
+								doh.is("http://www.example.com/example.html", oldUrl, "old url");
+								oldDesc = desc.get("value");
+								doh.is("This is an example link in the page.", oldDesc, "old desc");
+
+								url.set("value", oldUrl + "_2");
+								desc.set("value", oldDesc + "_2");
+								target.set("value", "_blank");
+							}), 2000);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_setButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.t(new RegExp("href=(\"|\')"+ oldUrl + "_2" + "(\"|\')").test(newVal), "Verifying URL has been inserted.");
+								doh.f(new RegExp("href=(\"|\')"+ oldUrl + "(\"|\')").test(newVal), "Verifying old URL is gone.");
+								doh.f(new RegExp("<li><a").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.)");
+								doh.t(new RegExp("target=(\"|\')_blank(\"|\')").test(newVal), "Verifying target has been inserted.");
+								doh.f(new RegExp("target=(\"|\')_self(\"|\')").test(newVal), "Verifying old target is removed.");
+								doh.t(new RegExp(">" + oldDesc + "_2<").test(newVal), "Verifying description has been inserted.");
+								doh.f(new RegExp(">" + oldDesc + "<").test(newVal), "Verifying old desc is gone.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Blank description invalid.",
+						timeout: 20000,
+						setUp: function(){
+							node = dom.byId("exampleLink", editor.document);
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								// Okay, select the text of the hyperlink so we can then perform an edit on it.
+								editor.selection.selectElement(node);
+							}),500);
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							var url, desc, target, oldDesc;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+								oldDesc = desc.get("value");
+								desc.set("value", "");
+								target.set("value", "_blank");
+							}), 2000);
+							robot.sequence(d.getTestErrback(function(){
+								// Verify setting the content is disabled.
+								var setButton = registry.byId(ldPlugin._uniqueId + "_setButton");
+								doh.t(setButton.get("disabled"));
+							}), 500);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_cancelButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.is(value, newVal, "Verify the contents have not changed.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Test invalid url.",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, desc, target;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+								url.set("value", "http://this is not/valid/bad.html");
+								desc.set("value", "This is my example relative link.");
+								target.set("value", "_blank");
+								url.validate();
+							}),2000);
+							robot.sequence(d.getTestErrback(function(){
+								var setButton = registry.byId(ldPlugin._uniqueId + "_setButton");
+								doh.t(setButton.get("disabled"), "set button disabled");
+							}), 500);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_cancelButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt(editor.iframe, 500, 0, 0, 0);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.is(value, newVal, "Verify the contents have not changed.");
+								doh.f(url.isValid(), "url.isValid");
+							}), 2000);
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Test mailto url.",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, desc, target;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+								url.set("value", "mailto:johndoe@example.com");
+								desc.set("value", "Send a message to John.");
+								target.set("value", "_blank");
+								url.isValid();
+							}),2000);
+							robot.sequence(d.getTestErrback(function(){
+								var setButton = registry.byId(ldPlugin._uniqueId + "_setButton");
+								doh.t(!setButton.get("disabled"));
+							}), 500);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_setButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt(editor.iframe, 500, 0, 0, 0);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.t((newVal.indexOf("mailto:johndoe@example.com") > -1), "Verify the contents have the mailto url present, newVal=" + newVal);
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Test mailto url prepend.",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, desc, target;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+								url.set("value", "johndoe@example.com");
+								desc.set("value", "Send a message to John.");
+								target.set("value", "_blank");
+								url.isValid();
+							}),2000);
+							robot.sequence(d.getTestErrback(function(){
+								var setButton = registry.byId(ldPlugin._uniqueId + "_setButton");
+								doh.t(!setButton.get("disabled"));
+							}), 500);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_setButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt(editor.iframe, 500, 0, 0, 0);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.t((newVal.indexOf("mailto:johndoe@example.com") > -1), "Verify the contents have the mailto url present, newVal=" + newVal);
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Test invalid mailto url.",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, desc, target;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								target = registry.byId(ldPlugin._uniqueId + "_targetSelect");
+								url.set("value", "mailto:john doe@example.com");
+								desc.set("value", "Send a message to John.");
+								target.set("value", "_blank");
+								url.isValid();
+							}),2000);
+							robot.sequence(d.getTestErrback(function(){
+								var setButton = registry.byId(ldPlugin._uniqueId + "_setButton");
+								doh.t(setButton.get("disabled"));
+							}), 500);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_cancelButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt(editor.iframe, 500, 0, 0, 0);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								var newVal = editor.get("value");
+								doh.t(newVal === value, "Verify the contents have not changed.");
+								doh.f(url.isValid());
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Anchor Tag: Double-Click opens TooltipDialog.",
+						timeout: 20000,
+						setUp: function(){
+							node = dom.byId("exampleLink", editor.document);
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(ldPlugin && ldPlugin.dropDown && ldPlugin.dropDown.domNode, "found TooltipDialog");
+								doh.t(helpers.isHidden(ldPlugin.dropDown.domNode),  "tooltip dialog is hidden");
+							}));
+
+							// Double click
+							robot.mouseMoveAt(node, 500, 1);
+							robot.mouseClick({left:true}, 100);
+							robot.mouseClick({left:true}, 100);
+
+							var f;
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible(ldPlugin.dropDown.domNode),  "tooltip dialog is visible");
+								f = focus.curNode;
+								doh.isNot(null, f, "is focus");
+								var w = registry.getEnclosingWidget(f);
+								doh.isNot(null, w, "focused on widget");
+								var val = w.get("value");
+								doh.t(new RegExp("http://www.example.com/example.html").test(val), "Verifying the contents contained link url");
+							}), 2000);
+
+							// Clicking the <input> shouldn't close TooltipDialog (#14395)
+							robot.mouseMoveAt(function(){ return f; }, 500, 1);
+							robot.mouseClick({left:true}, 100);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible(ldPlugin.dropDown.domNode),  "tooltip dialog still visible");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							ldPlugin.dropDown.onCancel();
+							if(editor){editor.set("value", value);}
+						}
+					}
+				]);
+
+				doh.register("ImgDialog_tests", [
+					function setUp(){
+						editor = registry.byId("editor");
+						ldPlugin = null;
+						var edPlugins = editor._plugins, i;
+						for(i = 0; i < edPlugins.length; i++){
+							var p = edPlugins[i];
+							if(p.declaredClass === "dijit._editor.plugins.ImgLinkDialog"){
+								ldPlugin = p;
+								break;
+							}
+						}
+						doh.t(ldPlugin != null, "found image dialog.");
+						value = editor.get("value");
+					},
+
+					{
+						name: "Image Tag: Create a new image",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, desc;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								url.set("value", "./sample2.jpg");
+								desc.set("value", "This is my example image 2.");
+							}),2000);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_setButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.f(new RegExp("<li><img").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.): " + newVal);
+								doh.t(new RegExp("src=(\"|\').*/sample2.jpg(\"|\')").test(newVal), "Verifying URL has been inserted: " + newVal);
+								doh.t(new RegExp("alt=(\"|\')This is my example image 2.(\"|\')").test(newVal), "Verifying alt description has been inserted: " + newVal);
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Image Tag: Verify http:// is prepended",
+						timeout: 20000,
+						setUp: function(){
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+
+							var url, desc;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								url.set("value", "example.com/example.jpg");
+								desc.set("value", "This is my example image.");
+							}),2000);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_setButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.f(new RegExp("<li><img").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.)");
+								doh.t(new RegExp("src=(\"|\')http://example.com/example.jpg(\"|\')").test(newVal), "Verifying URL has been inserted.");
+								doh.t(new RegExp("alt=(\"|\')This is my example image.(\"|\')").test(newVal), "Verifying alt description has been inserted.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Image Tag: Update existing image tag",
+						timeout: 20000,
+						setUp: function(){
+							node = dom.byId("exampleImage", editor.document);
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){editor.selection.selectElement(node);}), 500);
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							var url, desc, oldDesc;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								doh.t(new RegExp(".*/sample.jpg").test(url.get("value")), "original URL");
+								oldDesc = desc.get("value");
+								doh.is("Sample Image", oldDesc, "original alt-text");
+								url.set("value", "./sample2.jpg");
+								desc.set("value", oldDesc + "_2");
+							}), 2000);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_setButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.f(new RegExp("<li><img").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.)");
+								doh.t(new RegExp("src=(\"|\')"+ ".*/sample2.jpg" + "(\"|\')").test(newVal), "Verifying URL has been inserted.");
+								doh.f(new RegExp("src=(\"|\')"+ ".*/sample.jpg" + "(\"|\')").test(newVal), "Verifying old URL is gone.");
+								doh.t(new RegExp("alt=(\"|\")" + oldDesc + "_2" + "(\"|\')").test(newVal), "Verifying description has been inserted.");
+								doh.f(new RegExp("alt=(\"|\")" + oldDesc + "(\"|\')").test(newVal), "Verifying old desc is gone.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Image Tag: Blank description valid.",
+						timeout: 20000,
+						setUp: function(){
+							node = dom.byId("exampleImage", editor.document);
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){editor.selection.selectElement(node);}), 500);
+							robot.mouseMoveAt(ldPlugin.button.domNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							var url, desc, oldDesc;
+							robot.sequence(d.getTestErrback(function(){
+								url = registry.byId(ldPlugin._uniqueId + "_urlInput");
+								desc = registry.byId(ldPlugin._uniqueId + "_textInput");
+								oldDesc = desc.get("value");
+								url.set("value", "./sample2.jpg");
+								desc.set("value", "");
+							}), 2000);
+							robot.sequence(d.getTestErrback(function(){
+								// Verify setting the content is disabled.
+								var setButton = registry.byId(ldPlugin._uniqueId + "_setButton");
+								doh.f(setButton.get("disabled"));
+							}), 500);
+							robot.mouseMoveAt(function(){ return registry.byId(ldPlugin._uniqueId + "_setButton").domNode; }, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								doh.f(new RegExp("<li><img").test(newVal), "Verifying insert did not occur in the top li (IE test for selection restore.), newVal=" + newVal);
+								doh.t(new RegExp("src=(\"|\')"+ ".*/sample2.jpg" + "(\"|\')").test(newVal), "Verifying URL has been inserted.");
+								doh.f(new RegExp("src=(\"|\')"+ ".*/sample.jpg" + "(\"|\')").test(newVal), "Verifying old URL is gone.");
+								doh.t(new RegExp("alt=(\"|\")(\"|\')").test(newVal), "Verifying description has been cleared.");
+								doh.f(new RegExp("alt=(\"|\")" + oldDesc + "(\"|\')").test(newVal), "Verifying old desc is gone.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Image Tag: Single click selects image.",
+						timeout: 20000,
+						setUp: function(){
+							node = dom.byId("exampleImage", editor.document);
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.mouseMoveAt(node, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								var selectedElement = editor.selection.getSelectedElement(null);
+								doh.t(selectedElement != null);
+								var tag = selectedElement.tagName? selectedElement.tagName.toLowerCase() : "";
+								doh.is("img", tag);
+								doh.is("exampleImage", selectedElement.getAttribute("id"));
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor){editor.set("value", value);}
+						}
+					},
+					{
+						name: "Image Tag: Double-Click opens TooltipDialog.",
+						timeout: 20000,
+						setUp: function(){
+							node = dom.byId("exampleImage", editor.document);
+							value = editor.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							editor.focus();
+							robot.mouseMoveAt(editor.iframe, 1000, 1);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(ldPlugin && ldPlugin.dropDown && ldPlugin.dropDown.domNode, "found TooltipDialog");
+								doh.t(helpers.isHidden(ldPlugin.dropDown.domNode),  "tooltip dialog is hidden");
+							}));
+
+							// Double click
+							robot.mouseMoveAt(node, 500, 1);
+							robot.mouseClick({left:true}, 100);
+							robot.mouseClick({left:true}, 100);
+
+							var f;
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible(ldPlugin.dropDown.domNode),  "tooltip dialog is visible");
+
+								f = focus.curNode;
+								doh.t(f, "got focus");
+
+								var w = registry.getEnclosingWidget(f);
+								doh.t(w, "found enclosing widget");
+
+								var val = w.get("value");
+								doh.t(new RegExp(".*/sample.jpg").test(val), "Verifying the contents contained image name");
+							}), 2000);
+
+							// Clicking the <input> shouldn't close TooltipDialog (#14395)
+							robot.mouseMoveAt(function(){ return f; }, 500, 1);
+							robot.mouseClick({left:true}, 100);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible(ldPlugin.dropDown.domNode),  "tooltip dialog still visible");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							ldPlugin.dropDown.onCancel();
+							if(editor){editor.set("value", value);}
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_NewPage.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_NewPage.html
new file mode 100644
index 0000000000000000000000000000000000000000..2c795800f45e22ebc80ff902760a0cf94435a962
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_NewPage.html
@@ -0,0 +1,116 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor NewPage Plugin Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/lang", "dojo/window", "dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, lang, winUtils, helpers){
+
+				robot.initRobot('../test_NewPage.html');
+
+				function getPlugin(/*Editor*/ editor){
+					// summary:
+					//		Return new page plugin for specified editor
+					var edPlugins = editor._plugins, i;
+					for(i = 0; i < edPlugins.length; i++){
+						var p = edPlugins[i], fsPlugin;
+						if(p.declaredClass === "dijit._editor.plugins.NewPage"){
+							p.button.set("checked", false);
+							return p;				
+						}
+					}
+					throw new Error("didn't find plugin");
+				}
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("NewPage_tests", [
+					{
+						name: "Mouse: Click new page clears editor",
+						timeout: 20000,
+						setUp: function(){
+							editor = registry.byId("editor0");
+							npPlugin = getPlugin(editor);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor.domNode);
+							editor.focus();
+
+							value = editor.get("value");
+							robot.mouseMoveAt(npPlugin.button.domNode, 500);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.is("", editor.get("value"), "editor.get('value')");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							editor.set("value", value);
+
+						}
+					},
+					{
+						name: "Mouse: Click new page sets editor with default content.",
+						timeout: 20000,
+						setUp: function(){
+							editor = registry.byId("editor1");
+							npPlugin = getPlugin(editor);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor.domNode);
+							editor.focus();
+
+							value = editor.get("value");
+							robot.mouseMoveAt(npPlugin.button.domNode, 500);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								var newVal = editor.get("value");
+								doh.isNot(value, newVal, "Verify the contents have changed.");
+								newVal = lang.trim(newVal);
+								doh.is("<p>This page intentionally left blank</p>", newVal, "Validate the contents are the defined default content");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							editor.set("value", value);
+
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_ViewSource.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_ViewSource.html
new file mode 100644
index 0000000000000000000000000000000000000000..99adc1884ca2fed0597db8b7697649db3d9a1228
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_ViewSource.html
@@ -0,0 +1,842 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor View Source Plugin Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom-attr", "dojo/dom-style", "dojo/keys", "dojo/sniff", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, domAttr, domStyle, keys, has, winUtils, helpers){
+
+				robot.initRobot('../test_ViewSource.html');
+
+				var editor0, editor1, editor2, editor3;
+				var fsPlugin;
+				var vsPlugin;
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("ViewSource_Tests", [
+					{
+						name: "Keyboard: Go to view source (CTRL-SHIFT-F12)",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for VS plugin.");
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								editor0.focus();
+							}), 500);
+
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.t(vsPlugin._sourceShown, "Verifying the plugin believes the source is shown.");
+								doh.is("hidden", domStyle.get(editor0.iframe, "visibility"), "Verifying iframe is invisible");
+								doh.is("block", domStyle.get(vsPlugin.sourceArea, "display"), "Verifying source view node is visible");
+								doh.is(vsPlugin.sourceArea.nextSibling, editor0.iframe, "Verifying source view node's next sibling is the hidden iframe node.");
+							}), 3000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "Keyboard: Go to source mode and back",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking that the view source plugin was found.");
+							if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(d.getTestErrback(function(){
+								editor0.focus();
+							}), 1000);
+
+							robot.keyPress(keys.F12, 500, {ctrl:true,shift:true});
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.f(vsPlugin._sourceShown, "Verifying the plugin states the source is not shown.");
+								doh.is("visible", domStyle.get(editor0.iframe, "visibility"), "Verifying iframe is visible");
+								doh.is("none", domStyle.get(vsPlugin.sourceArea, "display"), "Verifying source view node is invisible");
+								doh.is(vsPlugin.sourceArea.nextSibling, editor0.iframe, "Verifying source view node's next sibling is the hidden iframe node.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						}
+					},
+					{
+						name: "Mouse Click: Go to View Source",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking that the view source plugin was found.");
+							if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(d.getTestErrback(function(){
+								editor0.focus();
+							}), 1000);
+
+							robot.mouseMoveAt(vsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 750);
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.t(vsPlugin._sourceShown, "Verifying the plugin believes the source is shown.");
+								doh.is("hidden", domStyle.get(editor0.iframe, "visibility"), "Verifying iframe is invisible");
+								doh.is("block", domStyle.get(vsPlugin.sourceArea, "display"), "Verifying source view node is visible");
+								doh.is(vsPlugin.sourceArea.nextSibling, editor0.iframe, "Verifying source view node's next sibling is the hidden iframe node.");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "Mouse Click: Go to View Source, then mouseclick twice (open/close sourceview)",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+									break;
+								}
+							}
+							doh.t(vsPlugin != null);
+							if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(d.getTestErrback(function(){
+								editor0.focus();
+							}), 500);
+
+							robot.mouseMoveAt(vsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 750);
+							robot.mouseMoveAt(vsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 750);
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.t(!vsPlugin._sourceShown, "Verifying the plugin believes the source is not shown.");
+								doh.is("visible", domStyle.get(editor0.iframe, "visibility"), "Verifying iframe is visible");
+								doh.is("none", domStyle.get(vsPlugin.sourceArea, "display"), "Verifying source view node is invisible");
+								doh.is(vsPlugin.sourceArea.nextSibling, editor0.iframe, "Verifying source view node's next sibling is the hidden iframe node.");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "Combination Test:  FullScreen + ViewSource (Verify view source works in fullscreen mode)",
+						timeout: 20000,
+						setUp: function(){
+							editor1 = registry.byId("editor1");
+							var edPlugins = editor1._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.FullScreen"){
+									fsPlugin = p;
+								}
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin && fsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for viewSource plugin.");
+							doh.t(fsPlugin != null, "Checking for fullScreen plugin.");
+							if(fsPlugin){fsPlugin.button.set("checked", false);}
+							if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(d.getTestErrback(function(){
+								editor1.focus();
+							}), 1000);
+
+							robot.mouseMoveAt(fsPlugin.button.domNode, 1000);
+							robot.mouseClick({left: true}, 500);
+							robot.mouseMoveAt(vsPlugin.button.domNode, 1000);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.t(fsPlugin.isFullscreen, "Verifying the plugin believes the editor is in full screen mode.");
+								doh.t(vsPlugin._sourceShown, "Verifying the plugin believes the source is shown.");
+								doh.is("hidden", domStyle.get(editor1.iframe, "visibility"), "Verifying iframe is invisible");
+								doh.is("block", domStyle.get(vsPlugin.sourceArea, "display"), "Verifying source view node is visible");
+								doh.is(vsPlugin.sourceArea.nextSibling, editor1.iframe, "Verifying source view node's next sibling is the hidden iframe node.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(fsPlugin){fsPlugin.button.set("checked", false);}
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "Combination Test:  FullScreen + ViewSource (toggle on and off)",
+						timeout: 20000,
+						setUp: function(){
+							editor1 = registry.byId("editor1");
+							var edPlugins = editor1._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.FullScreen"){
+									fsPlugin = p;
+								}
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin && fsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for viewSource plugin.");
+							doh.t(fsPlugin != null, "Checking for fullScreen plugin.");
+							if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							if(fsPlugin){fsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor1.domNode);
+								editor1.focus();
+							}), 1000);
+
+							//Toggle fs on, the source on.
+							robot.mouseMoveAt(fsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 750);
+							robot.mouseMoveAt(vsPlugin.button.domNode, 1000);
+							robot.mouseClick({left: true}, 1000);
+							robot.mouseMoveAt(vsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 1000);
+							robot.mouseMoveAt(fsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.t(!fsPlugin.isFullscreen, "Verifying the plugin believes the editor is not in full screen mode.");
+								doh.t(!vsPlugin._sourceShown, "Verifying the plugin believes the source is not shown.");
+								doh.is("visible", domStyle.get(editor1.iframe, "visibility"), "Verifying iframe is visible");
+								doh.is("none", domStyle.get(vsPlugin.sourceArea, "display"), "Verifying source view node is invisible");
+								doh.is(vsPlugin.sourceArea.nextSibling, editor1.iframe, "Verifying source view node's next sibling is the hidden iframe node.");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 if(fsPlugin){fsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "XSS: Verify simple script tags get stripped.",
+						timeout: 30000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for VS plugin.");
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var oldValue = editor0.get("value");
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor0.domNode);
+								editor0.focus();
+							}), 500);
+
+							var simpleScript0 = '<scr' + 'ipt type="text/javascript">var foo = "Hack!"</scr' + 'ipt>';
+							var simpleScript1 = '<scr' + 'ipt type="text/javascript" src="http://example.com/hack.js"></scr' + 'ipt>';
+
+							//Type in some script stuff.
+
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+							robot.sequence(d.getTestErrback(function(){
+								vsPlugin.sourceArea.value = "\n\n" +
+										simpleScript0 +
+										"\n\n" +
+										simpleScript1 +
+										"\n" +
+										vsPlugin.sourceArea.value;
+							}), 1000);
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								var val = editor0.get("value");
+								doh.is(-1, val.indexOf("Hack!"), "Validating inline script tag was stripped");
+								doh.is(-1, val.indexOf("hack.js"), "Validating import script tag was stripped");
+								editor0.set("value", oldValue);
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "XSS: Verify complex/odd script tags get stripped.",
+						timeout: 30000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for VS plugin.");
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var oldValue = editor0.get("value");
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor0.domNode);
+								editor0.focus();
+							}), 500);
+
+							var complexScript = '< scr' + 'IPt type="text/javascript"            \n>\n   var foo = "Hack!"  \n</SCr' + 'ipt  >';
+							robot.keyPress(keys.F12, 500, {ctrl:true,shift:true});
+							robot.sequence(d.getTestErrback(function(){
+								vsPlugin.sourceArea.value = "\n\n" +
+										complexScript +
+										"\n\n" +
+										vsPlugin.sourceArea.value;
+							}), 1000);
+							robot.keyPress(keys.F12, 500, {ctrl:true,shift:true});
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								var val = editor0.get("value");
+								doh.is(-1, val.indexOf("< scrIPt "), "Validating script tag was stripped");
+								editor0.set("value", oldValue);
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "XSS: Verify single line comment blocks are stripped.",
+						timeout: 30000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for VS plugin.");
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							var oldValue = editor0.get("value");
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor0.domNode);
+								editor0.focus();
+							}), 500);
+
+							var simpleComment = '<!--  Hello, this is a comment! -->';
+
+							//Type in some script stuff.
+							robot.keyPress(keys.F12, 500, {ctrl:true,shift:true});
+							robot.sequence(d.getTestErrback(function(){
+								vsPlugin.sourceArea.value = "\n\n" +
+										simpleComment +
+										"\n\n" +
+										vsPlugin.sourceArea.value;
+							}), 1000);
+							robot.keyPress(keys.F12, 500, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								var val = editor0.get("value");
+								doh.is(-1, val.indexOf("Hello, this is a comment!"), "Validating comment block was stripped");
+								editor0.set("value", oldValue);
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "XSS: Verify multi line comment blocks are stripped.",
+						timeout: 30000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for VS plugin.");
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var oldValue = editor0.get("value");
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor0.domNode);
+								editor0.focus();
+							}), 500);
+
+							//Type in some script stuff.
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+							robot.sequence(d.getTestErrback(function(){
+								vsPlugin.sourceArea.value = "\n\n" +
+										"<!--\n" +
+										"Hello, this is a comment!\n" +
+										"-->\n" +
+										"\n\n" +
+										vsPlugin.sourceArea.value;
+							}), 1000);
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								var val = editor0.get("value");
+								doh.is(-1, val.indexOf("Hello, this is a comment!"), "Validating multiline comment block was stripped");
+								editor0.set("value", oldValue);
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						//This is probably paranoia, but I think there's a chance iframes
+						//can be used to pull in hack scripts, so check that we can strip those too.
+						name: "XSS: Verify iframe tags are stripped.",
+						timeout: 30000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for VS plugin.");
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							 var d = new doh.Deferred();
+
+								var oldValue = editor0.get("value");
+
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor0.domNode);
+								editor0.focus();
+							}), 500);
+
+							var simpleIFrame = '<iframe src="http://example.com/hack.html" width=0 height=0 style="display: none;"></iframe>';
+
+							//Type in some script stuff.
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+							robot.sequence(d.getTestErrback(function(){
+								vsPlugin.sourceArea.value = "\n\n" +
+									simpleIFrame +
+									"\n\n" +
+									vsPlugin.sourceArea.value;
+							}), 1000);
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								var val = editor0.get("value");
+								doh.is(-1, val.indexOf("<iframe"), "Validating iframe tag was stripped stripped");
+								editor0.set("value", oldValue);
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "XSS Disabled: Verify script, comment, and iframes are not stripped.",
+						timeout: 30000,
+						setUp: function(){
+							editor3 = registry.byId("editor3");
+							var edPlugins = editor3._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for VS plugin.");
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							var oldValue = editor3.get("value");
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor3.domNode);
+								editor3.focus();
+							}), 500);
+
+							var simpleScript0 = '<scr' + 'ipt type="text/javascript">var foo = "Hack!"</scr' + 'ipt>';
+							var simpleScript1 = '<scr' + 'ipt type="text/javascript" src="http://example.com/hack.js"></scr' + 'ipt>';
+							var simpleiFrame = '<iframe src="http://example.com/hack.html" width=0 height=0 style="display: none;"></iframe>';
+							var simpleComment = '<!--  Hello, this is a comment! -->';
+
+							//Type in some script stuff.
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestErrback(function(){
+								vsPlugin.sourceArea.value = "\n\n" +
+										"<div>\n" +
+										simpleScript0 +
+										"\n\n" +
+										simpleScript1 +
+										"\n" +
+										"</div>" +
+										"\n\n" +
+										simpleiFrame +
+										"\n\n" +
+										simpleComment +
+										"\n\n" +
+										vsPlugin.sourceArea.value;
+							}), 1000);
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								var val = editor3.get("value");
+								// IE strips scripts anyway, need to look more at this sometime.
+								// It's not the plugin doing it.
+								doh.t((0 <= val.indexOf("Hack!")) || has("ie"), "Validating inline script tag was left");
+								doh.t((0 <= val.indexOf("hack.js") || has("ie")), "Validating import script tag was left");
+								doh.t(0 <= val.indexOf("<iframe"), "Validating iframe tag was left");
+								doh.t(0 <= val.indexOf("Hello, this is a comment!"), "Validating comment was left");
+								editor3.set("value", oldValue);
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "ReadOnly:  Verify View Source can be put in ReadOnly mode.",
+						timeout: 30000,
+						setUp: function(){
+							editor2 = registry.byId("editor2");
+							var edPlugins = editor2._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							 var d = new doh.Deferred();
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor2.domNode);
+								editor2.focus();
+							}), 500);
+
+							robot.mouseMoveAt(vsPlugin.button.domNode, 500);
+							robot.mouseClick({left: true}, 750);
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.is(true, domAttr.has(vsPlugin.sourceArea, "readOnly"), "Verify the source area is read only.");
+							}), 2000);
+
+							return d;
+						},
+						tearDown: function(){
+							 if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							 fsPlugin = null;
+							 vsPlugin = null;
+						}
+					},
+					{
+						name: "ViewSource:  GetValue",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							value = editor0.get("value");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for VS plugin.");
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor0.domNode);
+								editor0.focus();
+							}), 500);
+
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.t(vsPlugin._sourceShown, "Verifying the plugin believes the source is shown.");
+								doh.is("hidden", domStyle.get(editor0.iframe, "visibility"), "Verifying iframe is invisible");
+								doh.is("block", domStyle.get(vsPlugin.sourceArea, "display"), "Verifying source view node is visible");
+								doh.is(vsPlugin.sourceArea.nextSibling, editor0.iframe, "Verifying source view node's next sibling is the hidden iframe node.");
+								vsPlugin.sourceArea.value = "FOO";
+								doh.is("FOO", editor0.get("value"), "Verifying the source area returns foo when getValue is called.");
+							}), 3000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							editor0.set("value", value); 
+							fsPlugin = null;
+							vsPlugin = null;
+						}
+					},
+					{
+						name: "ViewSource:  SetValue",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							value = editor0.get("value");
+							var edPlugins = editor0._plugins, i;
+							for(i = 0; i < edPlugins.length; i++){
+								var p = edPlugins[i];
+								if(p.declaredClass === "dijit._editor.plugins.ViewSource"){
+									vsPlugin = p;
+								}
+								if(vsPlugin){
+									break;
+								}
+							}
+							doh.t(vsPlugin != null, "Checking for VS plugin.");
+							if(vsPlugin){ vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Timing gets wonky here, so we need to do this on a timeout
+							//so the browser has time  to shift focus.
+							robot.sequence(d.getTestErrback(function(){
+								//Focus on the editor window
+								winUtils.scrollIntoView(editor0.domNode);
+								editor0.focus();
+							}), 500);
+
+							robot.keyPress(keys.F12, 1000, {ctrl:true,shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								//Now check the state!
+								doh.t(vsPlugin._sourceShown, "Verifying the plugin believes the source is shown.");
+								doh.is("hidden", domStyle.get(editor0.iframe, "visibility"), "Verifying iframe is invisible");
+								doh.is("block", domStyle.get(vsPlugin.sourceArea, "display"), "Verifying source view node is visible");
+								doh.is(vsPlugin.sourceArea.nextSibling, editor0.iframe, "Verifying source view node's next sibling is the hidden iframe node.");
+								editor0.set("value", "FOO");
+								doh.is("FOO", editor0.get("value"), "Verifying the source area returns FOO when getValue is called.");
+							}), 3000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(vsPlugin){vsPlugin.button.focus(); vsPlugin.button.set("checked", false);}
+							editor0.set("value", value); 
+							fsPlugin = null;
+							vsPlugin = null;
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_a11y.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..38d36fb3a93ace9069fe3685ef572f9cfa667ee8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_a11y.html
@@ -0,0 +1,397 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor A11Y Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/dom", "dojo/keys", "dojo/_base/lang", "dojo/sniff", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, array, dom, keys, lang, has, winUtils, helpers){
+
+				function normalize(str){
+					// try to do some normalization to make all browsers look
+					// the same.   Would be nice if we didn't need this, the normalization should
+					// probably happen as pre and post filters on the editor
+					return str.
+							replace(' />', '/>').
+							replace('<br/>', '').		// FF.  Because of EnterKeyHandling plugin?
+							replace(/^<p>/, '').replace(/<\/p>$/, '').		// Safari.  Because of EnterKeyHandling plugin?
+							replace(new RegExp(String.fromCharCode(160), "g"), " ");	// Safari: nbsp (char code 160) to normal space (char code 32)
+				}
+
+				robot.initRobot('../test_Editor.html');
+
+				// For some reason the meta key (meta-a for selection, meta-b for bold, etc) doesn't work
+				// on mac/safari... use ctrl- instead, just like on windows. (#9553)
+				var metaKey = {ctrl: true};
+
+				var editor0,
+					editor1, editor1oldValue, editor1newValue, editor1onChange = "no onchange event yet";
+
+				var registry, focus;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+						focus = robot.window.require("dijit/focus");
+						editor0 = registry.byId("editor0");
+						editor1 = registry.byId("editor1");
+						editor1.watch("value", function(attr, oldVal, newVal){
+							editor1oldValue = normalize(oldVal);
+							editor1newValue = normalize(newVal);
+						});
+						editor1.onChange = function(newValue){
+							editor1onChange = normalize(newValue);
+						};
+					}
+				]);
+
+				doh.register("keyboard shortcuts", [
+					{
+						name: "bold/italic",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							winUtils.scrollIntoView(editor1.domNode);
+
+							// Set contents of editor1
+							robot.sequence(d.getTestErrback(function(){
+								editor1.focus();
+							}), 500);
+							robot.keyPress("a", 500, metaKey);	// select all
+							robot.typeKeys("hello ", 500, 750);		// and erase (by typing something new)
+							robot.keyPress("b", 500, metaKey);	// start bold
+							robot.typeKeys("bold", 500, 600);
+							robot.keyPress("b", 500, metaKey);	// stop bold
+							robot.typeKeys(" and ", 500, 750);
+							robot.keyPress("i", 500, metaKey);	// start italic
+							robot.typeKeys("exciting", 500, 1200);
+							robot.keyPress("i", 500, metaKey);	// stop italic
+							robot.typeKeys(" new world.", 500, 1650);
+
+							robot.sequence(d.getTestCallback(function(){
+								var val = normalize(editor1.get('value'));
+								doh.is("hello <b>bold</b> and <i>exciting</i> new world.", val);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				// Check that toolbar buttons are depressed/not depressed (etc.) based on
+				// where caret is in document
+				doh.register("toolbar state", [
+					{
+						name: "setup",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							winUtils.scrollIntoView(editor1.domNode);
+
+							// strange things happen if you alter an editor's value while it is focused,
+							// so temporarily move to the toolbar while setting content
+							robot.keyPress(keys.TAB, 500, {shift: true});	// go to toolbar
+							robot.sequence(d.getTestErrback(function(){
+								editor1.set("value", "toolbar <b>state</b> <i>test</i>.");
+
+								// set() should fire watch() callbacks but not call onChange()
+								doh.is("toolbar <b>state</b> <i>test</i>.", editor1newValue, "value set successfully");
+								doh.is("no onchange event yet", editor1onChange, "onChange not called");
+							}), 500);
+							robot.keyPress(keys.TAB, 500);	// goes to content
+							robot.keyPress(keys.HOME, 500, {});	// go to start of content
+							robot.sequence(d.getTestCallback(function(){
+								// just to signal that we are done
+							}));
+
+							return d;
+						}
+					},
+					{
+						name: "no buttons depressed",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(d.getTestCallback(function(){
+								var toolbar = editor1.toolbar;
+								doh.t(toolbar, "found toolbar");
+
+								var boldButton = toolbar.getChildren()[7];
+								doh.t(boldButton, "found bold button");
+								doh.f(boldButton.get("checked"), "bold button not depressed");
+
+								var italicButton = toolbar.getChildren()[8];
+								doh.t(italicButton, "found italic button");
+								doh.f(italicButton.get("checked"), "italic button not depressed");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "bold button depressed",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							robot.sequence(d.getTestErrback(function(){
+								editor1.placeCursorAtStart();
+							}), 500);
+							for(var i = 0; i < 9; i++){
+								// Move to second letter of second word.
+								robot.keyPress(keys.RIGHT_ARROW, 500);
+							}
+							robot.sequence(d.getTestCallback(function(){
+								var toolbar = editor1.toolbar;
+								doh.t(toolbar, "found toolbar");
+
+								var boldButton = toolbar.getChildren()[7];
+								doh.t(boldButton, "found bold button");
+								doh.t(boldButton.get("checked"), "bold button depressed");
+
+								var italicButton = toolbar.getChildren()[8];
+								doh.t(italicButton, "found italic button");
+								doh.f(italicButton.get("checked"), "italic button not depressed");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "italic button depressed",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(d.getTestErrback(function(){
+								editor1.placeCursorAtStart();
+							}), 500);
+							for(var i = 0; i < 15; i++){
+								// Move to second letter of third word.
+								robot.keyPress(keys.RIGHT_ARROW, 500);
+							}
+							robot.sequence(d.getTestCallback(function(){
+								var toolbar = editor1.toolbar;
+								doh.t(toolbar, "found toolbar");
+
+								var boldButton = toolbar.getChildren()[7];
+								doh.t(boldButton, "found bold button");
+								doh.f(boldButton.get("checked"), "bold button not depressed");
+
+								var italicButton = toolbar.getChildren()[8];
+								doh.t(italicButton, "found italic button");
+								doh.t(italicButton.get("checked"), "italic button depressed");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("toolbar navigation", [
+					{
+						name: "bold",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							winUtils.scrollIntoView(editor1.domNode);
+
+							// Write "hello" in editor and also make sure there's something in the system
+							// clipboard, so that the paste button in the toolbar is guaranteed to be enabled.
+							// (otherwise the two RIGHT_ARROW commands below will overshoot the bold button
+							// and end up on the italic button)
+							robot.sequence(d.getTestErrback(function(){
+								editor1.focus();
+							}), 500);
+							robot.keyPress("a", 1000, metaKey);	// select all
+							robot.keyPress("c", 500, has("mac") ? {meta: true} : {ctrl: true});	// copy into clipboard
+							robot.typeKeys("hello ", 500, 900);		// and erase (by typing something new)
+
+							// Go to toolbar and turn on bold.
+							// We only have to right-arrow twice because it skips the vertical divider bars
+							// and also skips cut and copy (they are disabled b/c nothing is selected)
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.keyPress(keys.RIGHT_ARROW, 1000);
+							robot.keyPress(keys.RIGHT_ARROW, 500);
+							robot.keyPress(keys.SPACE, 500);
+
+							// Focus and caret should be back after "hello ", type "world" in bold
+							robot.typeKeys("world", 1000, 750);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Get the value and try to do some normalization to make all browsers look
+								// the same.   Would be nice if we didn't need this, the normalization should
+								// probably happen as pre and post filters on the editor
+								var val = normalize(editor1.get('value'));
+								doh.is("hello <b>world</b>", val);
+							}), 1500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("tabbing", [
+					{
+						name: "into editor1 toolbar",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							winUtils.scrollIntoView(editor1.domNode);
+
+							// Focus on link before editor
+							robot.sequence(d.getTestErrback(function(){
+								dom.byId("focusBefore", robot.doc).focus();
+							}), 500);
+
+							// Go to toolbar of editor1
+							robot.keyPress(keys.TAB, 500);
+
+							// We should get focus on one of the toolbar buttons, although which one depends
+							// on whether the editor's contents have been modified (undo button enabled), and
+							// whether there is something in the browser's paste buffer, etc.)
+							robot.sequence(d.getTestCallback(function(){
+								var curFocus = registry.getEnclosingWidget(focus.curNode);
+								doh.isNot(-1, array.indexOf(editor1.toolbar.getChildren(), curFocus), "focused on button of editor1 toolbar");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "into editor1",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Go to content of editor1
+							robot.keyPress(keys.TAB, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("editor1_iframe", focus.curNode.id, "focused on editor content");
+							}), 500);
+
+							robot.keyPress("a", 500, metaKey);	// select all
+							robot.typeKeys("tabbing test", 500, 1800);		// and replace with "tabbing test"
+
+							robot.sequence(d.getTestCallback(function(){
+								// just here to make deferred fire
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "out of editor1",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Go to link after editor1
+							robot.keyPress(keys.TAB, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("focusAfter", focus.curNode.id, "focused after editor1");
+								
+								doh.is("tabbing test", editor1newValue, "watch()");
+								doh.is("tabbing test", editor1onChange, "onChange");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "shift-tab back into editor1",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Go to content of editor1
+							robot.keyPress(keys.TAB, 500, {shift: true});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("editor1_iframe", focus.curNode.id, "focused on editor content");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "shift-tab back to toolbar",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.TAB, 500, {shift: true});
+
+							robot.sequence(d.getTestCallback(function(){
+								var curFocus = registry.getEnclosingWidget(focus.curNode);
+								doh.isNot(-1, array.indexOf(editor1.toolbar.getChildren(), curFocus), "focused on button of editor1 toolbar");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "shift-tab to before editor",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.TAB, 500, {shift: true});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("focusBefore", focus.curNode.id, "focused before editor1");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("clear then focus", {
+					name: "#10268",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						dom.byId("focusBefore", robot.doc).focus();
+						winUtils.scrollIntoView(editor1.domNode);
+						editor1.set("value", "");
+						editor1.focus();
+
+						robot.typeKeys("hello ", 500, 750);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("hello", lang.trim(editor1.get("value")), "get('value')");
+						}), 500);
+
+						return d;
+					}
+				});
+
+				doh.run();
+			});
+
+
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_bidi.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_bidi.html
new file mode 100644
index 0000000000000000000000000000000000000000..54827dd0330b7be2b8e979541e946adf45d6c413
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_bidi.html
@@ -0,0 +1,155 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor GUI orientation and default text direction tests</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx", "dojo/dom-style", "dojo/keys",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, domStyle, keys, helpers){
+
+				robot.initRobot('../test_bidiEditor.html');
+				var registry;
+				var editor1;
+				
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},						
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("GUI orientation and default text direction tests", [
+					{
+						name: "Inherited LTR; Undefined",
+						timeout: 10000,
+						setUp: function(){
+							editor1 = registry.byId("ed1");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("ltr", domStyle.get(editor1.domNode,"direction"));
+								doh.is("ltr", domStyle.get(editor1.editNode,"direction"));
+							}), 3000);
+							editor1.focus();
+							robot.typeKeys("GUI orientation is inherited as left-to-right.",50,500);
+							robot.keyPress(keys.ENTER, 100);
+							robot.typeKeys("Text direction isn't defined explicitly.",50,500);							
+							return d;
+						}
+					},
+					{
+						name: "Inherited RTL; Undefined",
+						timeout: 10000,
+						setUp: function(){
+							editor1 = registry.byId("ed2");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("rtl", domStyle.get(editor1.domNode,"direction"));
+								doh.is("rtl", domStyle.get(editor1.editNode,"direction"));
+							}), 3000);
+							editor1.focus();
+							robot.typeKeys("GUI orientation is inherited as right-to-left.",50,500);
+							robot.keyPress(keys.ENTER, 100);
+							robot.typeKeys("Text direction isn't defined explicitly.",50,500);							
+							return d;
+						}
+					},
+
+					{
+						name: "dir=LTR; textDir=RTL",
+						timeout: 10000,
+						setUp: function(){
+							editor1 = registry.byId("ed3");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("ltr", domStyle.get(editor1.domNode,"direction"));
+								doh.is("rtl", domStyle.get(editor1.editNode,"direction"));
+							}), 2000);
+							editor1.focus();
+							robot.typeKeys("GUI orientation is set as left-to-right.",50,500);
+							robot.keyPress(keys.ENTER, 100);
+							robot.typeKeys("Text direction is set as right-to-left.",50,500);							
+							return d;
+						}
+					},
+					{
+						name: "dir=RTL; textDir=LTR",
+						timeout: 10000,
+						setUp: function(){
+							editor1 = registry.byId("ed4");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("rtl", domStyle.get(editor1.domNode,"direction"));
+								doh.is("ltr", domStyle.get(editor1.editNode,"direction"));
+							}), 2000);
+							editor1.focus();
+							robot.typeKeys("GUI orientation is set as right-to-left.",50,500);
+							robot.keyPress(keys.ENTER, 100);
+							robot.typeKeys("Text direction is set as left-to-right.",50,500);							
+							return d;
+						}
+					},
+					{
+						name: "Dir: LTR; TextDir: RTL (programmatic creation)",
+						timeout: 10000,
+						setUp: function(){
+							editor1 = registry.byId("prog1");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("ltr", domStyle.get(editor1.domNode,"direction"));
+								doh.is("rtl", domStyle.get(editor1.editNode,"direction"));
+							}), 2000);							
+							editor1.focus();
+							robot.typeKeys("Editor is created with left-to-right direction,",50,500);
+							robot.keyPress(keys.ENTER, 100);
+							robot.typeKeys("its text direction is set to right-to-left.",50,500);
+							return d;
+						}
+					},
+					{
+						name: "Dir: RTL; TextDir: LTR (programmatic creation)",
+						timeout: 10000,
+						setUp: function(){
+							editor1 = registry.byId("prog2");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("rtl", domStyle.get(editor1.domNode,"direction"));
+								doh.is("ltr", domStyle.get(editor1.editNode,"direction"));
+							}), 2000);							
+							editor1.focus();
+							robot.typeKeys("Editor is created with right-to-left direction,",50,500);
+							robot.keyPress(keys.ENTER, 100);
+							robot.typeKeys("its text direction is set to left-to-right.",50,500);							
+							return d;
+						}
+					} 
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_misc.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_misc.html
new file mode 100644
index 0000000000000000000000000000000000000000..b822472384d7d101590b8dd23defb4079f1c1c6a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_misc.html
@@ -0,0 +1,379 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor Miscellaneous Tests</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/dom", "dojo/dom-style", "dojo/keys", "dojo/sniff", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, array, dom, domStyle, keys, has, winUtils, helpers){
+
+				robot.initRobot('../test_Editor.html');
+				var editor0;
+				var height;
+				var value;
+				var editor1;
+				var editor1OriginalBackgroundColor;
+
+				function getPlugin(/*Editor*/ editor, /*String*/ command){
+					return array.filter(editor._plugins, function(p){
+						return p.command == command;
+					})[0];
+				}
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("Miscellaneous_tests", [
+					{
+						name: "addStylesheet",
+						timeout: 3000,
+						setUp: function(){
+							editor1 = registry.byId("editor1");
+							editor1.setValue("<h1>header one</h1>");
+							var editorTextNode = editor1.editNode.firstChild;
+							editor1OriginalBackgroundColor = domStyle.getComputedStyle(editorTextNode).backgroundColor;
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							winUtils.scrollIntoView(editor1.domNode);
+							editor1.addStyleSheet('test_editor.css');
+
+							setTimeout(d.getTestCallback(function(){
+								var editorTextNode = editor1.editNode.firstChild;
+								var backgroundColor = domStyle.getComputedStyle(editorTextNode).backgroundColor;
+								var borderStyle = domStyle.getComputedStyle(editorTextNode).borderBottomStyle;
+								var borderWidth = domStyle.getComputedStyle(editorTextNode).borderBottomWidth;
+								doh.is("header one", editorTextNode.innerHTML);
+								doh.t(backgroundColor==="rgb(255, 0, 0)" || backgroundColor==="red" || backgroundColor==="#ff0000", "backgroundColor " + backgroundColor);
+								doh.is("solid", borderStyle);
+								doh.is("1px", borderWidth);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "removeStylesheet",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+								editor1.removeStyleSheet('test_editor.css');
+
+							setTimeout(d.getTestCallback(function(){
+								var editorNodeText = editor1.editNode.firstChild;
+								var backgroundColor = domStyle.getComputedStyle(editorNodeText).backgroundColor;
+								doh.is("header one", editorNodeText.innerHTML);
+								doh.is(editor1OriginalBackgroundColor, backgroundColor, "backgroundColor");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "auto expand",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("thud");
+							height = dojo.style(editor0.domNode, "height");
+							value = editor0.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor0.domNode);
+							robot.mouseMoveAt(editor0.iframe, 500, null, 10, 10);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.ENTER, 500);
+							robot.keyPress(keys.ENTER, 500);
+							robot.keyPress(keys.ENTER, 500);
+							robot.keyPress(keys.ENTER, 500);
+							robot.keyPress(keys.ENTER, 500);
+							robot.keyPress(keys.ENTER, 500);
+							robot.keyPress(keys.ENTER, 500);
+							robot.keyPress(keys.ENTER, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var newHeight = dojo.style(editor0.domNode, "height");
+								doh.t(height < newHeight, "height decreased from " + height + " to " + newHeight);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor0){editor0.set("value", value);}
+						}
+					},
+					{
+						name: "font-size style migrated to editor body",
+						runTest: function(){
+							editor0 = registry.byId("fontSizedEditor");
+							var bStyle = editor0.document.body.style["fontSize"];
+							doh.t(bStyle != null, "bStyle set");
+							doh.is("30pt", bStyle.toLowerCase());
+						}
+					},
+					{
+						name: "prefilters do process initial content",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("filteredEditor");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor0.domNode);
+							robot.mouseMoveAt(editor0.iframe, 500, null, 10, 10);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var val = editor0.get("value");
+								doh.t(val.indexOf("DOJO") >= 0, "dojo in val " + val);
+								doh.t(val.indexOf("notdojo") < 0, "notdojo not in val " + val);
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "placeCursorAtStart (br tag) moves input before br, not inside",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("brEditor");
+							value = editor0.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor0.domNode);
+							robot.mouseMoveAt(editor0.iframe, 500, null, 10, 10);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestErrback(function(){
+								editor0.placeCursorAtStart();
+							}), 500);
+							robot.typeKeys("abc", 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var content = editor0.get("value").replace(/[\s]/g, "");
+								doh.t(content.indexOf("abc<br") >= 0, "looked for 'abc<br', found: " + content);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor0){editor0.set("value", value);}
+						}
+					},
+					{
+						name: "custom editor content (programmatic creation)",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("programmatic3");
+							value = editor0.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor0.domNode);
+							robot.mouseMoveAt(editor0.iframe, 500, null, 10, 10);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								var content = editor0.get("value");
+								doh.t(content.indexOf("Custom Initial Content.") >= 0);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor0){editor0.set("value", value);}
+						}
+					},
+					{
+						name: "custom filters passed in constructor are not lost",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("programmatic4");
+							value = editor0.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor0.domNode);
+							robot.mouseMoveAt(editor0.iframe, 500, null, 10, 10);
+							robot.mouseClick({left:true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								doh.t(editor0.contentPreFilters.length > 1);
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor0){editor0.set("value", value);}
+						}
+					},
+					{
+						name: "replaceValue",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("programmatic4");
+							value = editor0.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor0.domNode);
+							dojo.style(editor0.domNode, "display", "none");
+							editor0.replaceValue("New Value");
+							dojo.style(editor0.domNode, "display", "none");
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								dojo.style(editor0.domNode, "display", "");
+								winUtils.scrollIntoView(editor0.domNode);
+								var newValue = editor0.get("value");
+								editor0.undo();
+								var curValue = editor0.get("value");
+								doh.t(newValue.indexOf(value) < 0, "content changed with no trace of old content");
+								doh.t(curValue != newValue, "undo undid the change");
+								doh.t(curValue == value, "original value was restored");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor0){editor0.set("value", value);}
+						}
+					},
+					{
+						name: "page up/down",
+						timeout: 6000,
+						setUp: function(){
+							editor0 = registry.byId("editor0");
+							value = editor0.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor0.domNode);
+							robot.sequence(d.getTestErrback(function(){
+								editor0.focus();
+							}), 500);
+							
+							robot.keyPress(keys.PAGE_UP, 500);
+							robot.typeKeys("abc", 500);
+							robot.keyPress(keys.PAGE_DOWN, 500);
+							robot.typeKeys("def", 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								var value = editor0.get("value");
+								if(!has("webkit")){	// commented out due to #14193
+									doh.t(value.indexOf("abcdef") == 0, "editor value = " + value);
+								}
+							}), 500);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor0){editor0.set("value", value);}
+						}
+					},
+					{
+						name: "emptyAltTag",
+						timeout: 20000,
+						setUp: function(){
+							editor0 = registry.byId("programmatic4");
+							value = editor0.get("value");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							// Focus on the editor window
+							winUtils.scrollIntoView(editor0.domNode);
+							editor0.set("value", "<img alt=\"''\" src=\"http://blogsearch.google.com/blogsearch/intl/en_ALL/images/blogs_logo.gif\">");
+							robot.sequence(d.getTestCallback(function(){
+								// Now check the state!
+								winUtils.scrollIntoView(editor0.domNode);
+								var newValue = editor0.get("value");
+								var test = "alt=\"''\"";
+								doh.t(newValue.indexOf(test) > 0, "content includes empty string alt");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(editor0){editor0.set("value", value);}
+						}
+					},
+					{
+						name: "caret pos #1",
+						timeout: 20000,
+						setUp: function(){
+							editor1 = registry.byId("editor1");
+
+							// Scroll editor into view, set content to list except for middle item isn't part of list
+							winUtils.scrollIntoView(editor1.domNode);
+							editor1.set("value", "<ul><li>one</li><li>two</li></ul><p id='three'>three</p><ul><li>four</li><li>five</li></ul>");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Select middle item ("three")
+							robot.mouseMoveAt(dom.byId("three", editor1.document), 500);
+							robot.mouseClick({left:true}, 500);
+
+							// Press indent button, so that "three" becomes part of list
+							robot.mouseMoveAt(function(){
+								return getPlugin(editor1, "indent").button.domNode;
+							}, 500);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								var value = editor1.get("value").toLowerCase();
+								value = value.replace(/blockquote[^>]*>/, "blockquote>").replace(/ id="three"/, "");
+
+								// Ideally three would become part of the list, but it becomes a separate block quote.
+								// Maybe it would be part of the list w/dojox/Editor/plugins/NormalizeIndentOutdent.
+								doh.is(
+									"<ul><li>one</li><li>two</li></ul>" +
+										"<blockquote><p>three</p></blockquote>" +
+										"<ul><li>four</li><li>five</li></ul>",
+									value, "element 'three' indented")
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/Editor_mouse.html b/src/main/resources/static/dijit/tests/editor/robot/Editor_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..f2792a6385fe6d2a949b8ee67603c4f37a39ed0c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/Editor_mouse.html
@@ -0,0 +1,170 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Editor Mouse Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js" data-dojo-config="async: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner",  "dojo/robotx",
+				"dojo/dom-class", "dojo/keys", "dojo/query", "dojo/sniff",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, domClass, keys, query, has, helpers){
+
+				function normalize(str){
+					// try to do some normalization to make all browsers look
+					// the same.   Would be nice if we didn't need this, the normalization should
+					// probably happen as pre and post filters on the editor
+					return str.
+						replace(/\s*\/>/g, "/>").
+						replace(/<br\/>$/, '').		// FF.  Because of EnterKeyHandling plugin?
+						replace(/^<p>/, '').replace(/<\/p>$/, '').		// Safari.  Because of EnterKeyHandling plugin?
+						replace(new RegExp(String.fromCharCode(160), "g"), " ");	// Safari: nbsp (char code 160) to normal space (char code 32)
+				}
+
+				robot.initRobot('../test_Editor.html');
+
+				// For some reason the meta key (meta-a for selection, meta-b for bold, etc) isn't working
+				// on mac... use ctrl- instead, just like on windows. (#9553)
+				var metaKey = {ctrl: true};
+
+				var editor0, editor1;
+
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+						editor0 = registry.byId("editor0");
+						doh.t(!!editor0, "editor0");
+						editor1 = registry.byId("editor1");
+						doh.t(!!editor1, "editor1");
+					}
+				]);
+
+				doh.register("toolbar buttons", [
+					{
+						name: "bold/italic",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var toolbar = editor1.toolbar,
+								boldButton = toolbar.getChildren()[7],
+								italicButton = toolbar.getChildren()[8];
+
+							// Focus the editor
+							robot.mouseMoveAt(editor1.editNode, 500, 1);
+							robot.mouseClick({left: true}, 500);
+
+							// select all and erase, by typing something new
+							robot.keyPress("a", 500, metaKey);
+							robot.typeKeys("hello ", 1000, 1000);
+
+							// turn on bold
+							robot.mouseMoveAt(boldButton.domNode, 500, 1);
+							robot.mouseClick({left: true}, 500);
+
+							robot.typeKeys("world", 1000, 1000);
+
+							// turn off bold
+							robot.mouseMoveAt(boldButton.domNode, 500, 1);
+							robot.mouseClick({left: true}, 500);
+
+							robot.typeKeys(". ", 1000, 400);
+
+							// turn on italic
+							robot.mouseMoveAt(italicButton.domNode, 500, 1);
+							robot.mouseClick({left: true}, 500);
+
+							robot.typeKeys("how are you", 1000, 2000);
+
+							// turn off italic
+							robot.mouseMoveAt(italicButton.domNode, 500, 1);
+							robot.mouseClick({left: true}, 500);
+
+							robot.typeKeys("?", 1000, 200);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Get the value and try to do some normalization to make all browsers look
+								// the same.   Would be nice if we didn't need this, the normalization should
+								// probably happen as pre and post filters on the editor
+								var val = normalize(editor1.get("value"));
+								doh.is("hello <b>world</b>. <i>how are you</i>?", val);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "delete bold tag",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Find the bolded "world" word in the editor
+							var bold = query('b', editor1.editNode);
+							if(!bold.length){
+								bold = query('strong', editor1.editNode)
+							}
+
+							// Double-click "world" to select it
+							robot.mouseMoveAt(bold[0], 500, 1, 5, 5);
+							robot.mouseClick({left: true}, 500);
+							robot.mouseClick({left: true}, 50);
+
+							// Delete "world" and the space before it
+							robot.keyPress(keys.DELETE, 500);
+							if(!has("safari") && !(has("chrome") && has("mac"))){
+								// they delete the space too?
+								robot.keyPress(keys.BACKSPACE, 500);
+							}
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("hello. <i>how are you</i>?", normalize(editor1.get("value")));
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("selection", [
+					{
+						name: "mouseup but no click event",
+						timeout: 10000,
+						runTest: function(){
+							var cutButton = editor1.toolbar.getChildren()[3].domNode;
+							doh.t(domClass.contains(cutButton, "dijitButtonDisabled"), "Cut should be disabled " + cutButton.className);
+
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt(editor1.editNode, 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(editor1.editNode, 500, 500, -10, 0); // move off of editNode
+							robot.mouseRelease({left: true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(domClass.contains(cutButton, "dijitButtonDisabled"), "Cut should not be disabled " + cutButton.className);
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+
+
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/EnterKeyHandling.html b/src/main/resources/static/dijit/tests/editor/robot/EnterKeyHandling.html
new file mode 100644
index 0000000000000000000000000000000000000000..d2d9cb86fc7c418ac381e9866b6ca19f669806c6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/EnterKeyHandling.html
@@ -0,0 +1,549 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Editor/EnterKeyHandling Plugin Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/keys", "dojo/_base/lang", "dojo/sniff", "dojo/window",
+				"dijit/_editor/range", "dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, keys, lang, has, winUtils, range, helpers){
+
+				function dom2string(root){
+					// summary:
+					//		Simple dump of the HTML inside an editor, skipping
+					//		attributes altogether.   Similar to `dijit._editor.getNodeHtml`
+					//		(maybe want to switch to using that).
+					var out = [];
+	
+					function recurse(children){
+						var i=0, node = children[i++];
+						while(node){
+							switch(node.nodeType){
+							case 1:	// normal node
+								if(node.childNodes.length){
+									out.push("<" + node.tagName.toLowerCase() + ">");
+									recurse(node.childNodes);
+									out.push("</" + node.tagName.toLowerCase() + ">");
+								}else{
+									out.push("<" + node.tagName.toLowerCase() + "/>");
+								}
+								break;
+							case 3:	// text
+								var text = lang.trim(node.textContent || node.data).
+											replace('\u00a0', "&nbsp;");
+								if(text){
+									out.push(text);
+								}
+								break;
+							}
+							node = children[i++];
+						}
+					}
+	
+					recurse(root.childNodes);
+					return out.join("");
+				}
+
+				robot.initRobot('../EnterKeyHandling.html');
+
+				var metaKey = has("mac")? {meta: true} : {ctrl: true};
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				// Tests for BR mode
+				doh.register("blockNodeForEnter=BR", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: function(){
+						    return helpers.waitForLoad
+						}
+					},
+					{
+						name: "type in some text",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var br = registry.byId("br");
+							br.set("value", "");
+							br.focus();
+							
+							robot.mouseMoveAt(br.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.BACKSPACE, 500, {});
+							
+							// tab to the MenuBar... then focus should automatically shift to "File" menu,
+							for(var i=0; i<4; i++){
+								robot.typeKeys("ab345", 500);
+								robot.keyPress(keys.ENTER, 500, {});
+							}
+
+							robot.sequence(d.getTestCallback(function(){
+								// get('value') should call the post-filter which recombines the separate <p> nodes into bigger
+								// paragraphs.
+								var value = br.get('value');
+								value = value.replace(/&nbsp;/g, "");
+								value = value.replace(/ /g, "");
+								value = value.replace(/\xA0/g, "");
+								doh.is('ab345<br/>ab345<br/>ab345<br/>ab345',
+										value,
+										"get('value')");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "copy and paste",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var br = registry.byId("br");
+							br.set("value", "");
+							br.focus();
+							
+							robot.mouseMoveAt(br.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.BACKSPACE, 500, {});
+								
+							robot.typeKeys("testingCopyAndPaste", 500);
+							robot.keyPress("a", 500, metaKey);	// select all
+							robot.keyPress("c", 500, metaKey);	// copy
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress(keys.ENTER, 500, {shift: false});
+							robot.sequence(d.getTestCallback(function(){
+								// get('value') should call the post-filter which recombines the separate <p> nodes into bigger
+								// paragraphs.
+								var value = br.get('value');
+								value = value.replace(/ /g, "");
+								value = value.replace(/\xA0/g, "");
+								if(has("webkit") && !has("mac")){
+									// Work around webkit bug:
+									// http://code.google.com/p/chromium/issues/detail?id=106551
+									// Should hopefully be fixed in Chrome 19.
+									value = value.replace(/\n/g, "");
+									value = value.replace(/\r\f/g, "");
+								}
+
+								doh.is('testingCopyAndPastetestingCopyAndPastetestingCopyAndPaste',
+										value,
+										"get('value')");
+							}), 1000);
+							return d;
+						}
+					},					
+					{
+						name: "copy and paste split",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var br = registry.byId("br");
+							br.set("value", "");
+							br.focus();
+							
+							robot.mouseMoveAt(br.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.BACKSPACE, 500, {});
+								
+							robot.typeKeys("testingCopyAndPaste", 500);
+							robot.keyPress("a", 500, metaKey);	// select all
+							robot.keyPress("c", 500, metaKey);	// copy
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								// get('value') should call the post-filter which recombines the separate <p> nodes into bigger
+								// paragraphs.
+								var value = br.get('value');
+								value = value.replace(/ /g, "");
+								if(has("webkit") && !has("mac")){
+									// Work around webkit bug:
+									// http://code.google.com/p/chromium/issues/detail?id=106551
+									// Should hopefully be fixed in Chrome 19.
+									value = value.replace(/\n/g, "");
+									value = value.replace(/\r\f/g, "");
+								}
+								
+
+								// Safari may end with a trailing/extra br, so we need to remove it.
+								if(/aste<br\/>$/.test(value)){
+									value = value.substring(0, value.length - 5);
+								}
+								doh.is('testingCopyAndPastetestingCopyAndPastetestingCopyAndP<br/>aste',
+										value,
+										"get('value')");
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+				
+				doh.register("Split tests", [
+					{
+						name: "Test div line split",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							// The initial input was a div with a line of text with a bold tag in the middle.
+							// we want to focus on the bold and enter there, splitting it.
+							var editor = registry.byId("div2");
+							winUtils.scrollIntoView(editor.iframe);
+							var node = dom.byId("boldLine0", editor.document);
+
+							robot.mouseMoveAt(editor.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								editor.selection.selectElementChildren(node);
+							}), 500);
+							
+							// Keyboard kill the selection and shift position between I and S.
+							if(!has("moz") || has("mac")){ robot.keyPress(keys.RIGHT_ARROW, 100, {}); }
+							robot.keyPress(keys.LEFT_ARROW, 100, {});
+							robot.keyPress(keys.ENTER, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Do tests here.
+								var val = editor.get("value");
+								// Check that it split the is into two and that the bold and div were properly split.
+								doh.t(val.indexOf("It <b id=\"boldLine0\">I</b></div>") > 0, "start");
+								doh.t(val.indexOf("<div><b>S</b>") > 0, "end");
+							}), 500);
+
+							return d;
+						}
+
+					},
+					{
+						name: "Test div line split style clone",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							// The initial input was a div with a line of text with a bold tag in the middle.
+							// we want to focus on the bold and enter there, splitting it.
+							var editor = registry.byId("div3");
+							winUtils.scrollIntoView(editor.iframe);
+							var node = dom.byId("boldLine1", editor.document);
+							
+							robot.mouseMoveAt(editor.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								editor.selection.selectElementChildren(node);
+							}), 500);
+							
+							// Keyboard kill the selection and shift position between I and S.
+							if(!has("moz") || has("mac")){ robot.keyPress(keys.RIGHT_ARROW, 100, {}); }
+							robot.keyPress(keys.LEFT_ARROW, 100, {});
+							robot.keyPress(keys.ENTER, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Do tests here.
+								var val = editor.get("value");
+								// Check that it split the is into two and that the bold and div were properly split.
+								val = val.toLowerCase();
+								doh.t(/it <b\s+id="boldline1"\s+style\s*=\s*"\s*font-size:\s*4em;?\s*">i<\/b><\/div>/.test(val), "start");
+								doh.t(/<div><b\s+style\s*=\s*"\s*font-size:\s*4em;?\s*">s<\/b>/.test(val), "end");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "Test div line split font clone",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							// The initial input was a div with a line of text with a font tag in the middle.
+							// we want to focus on the font and enter there, splitting it.
+							var editor = registry.byId("div4");
+							winUtils.scrollIntoView(editor.iframe);
+							var node = dom.byId("fontLine1", editor.document);
+							
+							robot.mouseMoveAt(editor.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								editor.selection.selectElementChildren(node);
+							}), 500);
+							
+							// Keyboard kill the selection and shift position between I and S.
+							if(!has("moz") || has("mac")){ robot.keyPress(keys.RIGHT_ARROW, 100, {}); }
+							robot.keyPress(keys.LEFT_ARROW, 100, {});
+							robot.keyPress(keys.ENTER, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Do tests here.
+								var val = editor.get("value");
+								// Check that it split the is into two and that the bold and div were properly split.
+								val = val.toLowerCase();
+								doh.t(/it <font\s+id="fontline1"\s+size\s*=\s*"\s*5?\s*">i<\/font><\/div>/.test(val),"font not set on first line");
+								doh.t(/<div><font\s+size\s*=\s*"\s*5?\s*">s<\/font>/.test(val),"font not set on split line");
+							}), 500);
+
+							return d;
+						}
+					},					
+					{
+						name: "copy and paste DIV",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var editor = registry.byId("div3");
+							winUtils.scrollIntoView(editor.iframe);
+							editor.set("value", "");
+							editor.focus();
+							
+							robot.mouseMoveAt(editor.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.BACKSPACE, 500, {});
+								
+							robot.typeKeys("testingCopyAndPaste", 500);
+							robot.keyPress("a", 500, metaKey);	// select all
+							robot.keyPress("c", 500, metaKey);	// copy
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								var value = editor.get('value');
+								value = value.replace(/\xA0/g, "");
+								if(has("webkit") && !has("mac")){
+									// Work around webkit bug:
+									// http://code.google.com/p/chromium/issues/detail?id=106551
+									// Should hopefully be fixed in Chrome 19.
+									value = value.replace(/\n/g, "");
+									value = value.replace(/\r\f/g, "");
+								}
+								doh.is('<div>testingCopyAndPastetestingCopyAndPastetestingCopyAndPaste</div>',
+										value,
+										"get('value')");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "copy and paste DIV split",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var editor = registry.byId("div3");
+							winUtils.scrollIntoView(editor.iframe);
+							editor.set("value", "");
+							editor.focus();
+							
+							robot.mouseMoveAt(editor.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.BACKSPACE, 500, {});
+								
+							robot.typeKeys("testingCopyAndPaste", 500);
+							robot.keyPress("a", 500, metaKey);	// select all
+							robot.keyPress("c", 500, metaKey);	// copy
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								// get('value') should call the post-filter which recombines the separate <p> nodes into bigger
+								// paragraphs.
+								var value = editor.get('value');
+								value = value.replace(/\xA0/g, "");
+								if(has("webkit") && !has("mac")){
+									// Work around webkit bug:
+									// http://code.google.com/p/chromium/issues/detail?id=106551
+									// Should hopefully be fixed in Chrome 19.
+									value = value.replace(/\n/g, "");
+									value = value.replace(/\r\f/g, "");
+								}
+								
+
+								doh.is('<div>testingCopyAndPastetestingCopyAndPastetestingCopyAndP</div><div>aste</div>',
+									value,
+									"get('value')");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "Test p line split",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							// The initial input was a div with a line of text with a bold tag in the middle.
+							// we want to focus on the bold and enter there, splitting it.
+							var editor = registry.byId("p2");
+							winUtils.scrollIntoView(editor.iframe);
+							var node = dom.byId("boldLine2", editor.document);
+							
+							robot.mouseMoveAt(editor.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								editor.selection.selectElementChildren(node);
+							}), 500);
+							
+							// Keyboard kill the selection and shift position between I and S.
+							if(!has("moz") || has("mac")){ robot.keyPress(keys.RIGHT_ARROW, 100, {}); }
+							robot.keyPress(keys.LEFT_ARROW, 100, {});
+							robot.keyPress(keys.ENTER, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Do tests here.
+								var val = editor.get("value");
+								// Check that it split the is into two and that the bold and div were properly split.
+								doh.t(val.indexOf("It <b id=\"boldLine2\">I</b></p>") > 0, "start");
+								doh.t(val.indexOf("<p><b>S</b>") > 0, "end");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "shift enter to replace all content in p",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var editor = registry.byId("p2");
+							editor.set('value','<p>ab</p>');
+							var selection = range.getSelection(editor.window);
+							selection.removeAllRanges();
+							var r = range.create(editor.window);
+							r.setStart(editor.editNode.firstChild, 0);
+							r.setEnd(editor.editNode.firstChild, 1);
+							selection.addRange(r);
+							robot.keyPress(keys.ENTER, 500, {shift: true});
+							robot.sequence(d.getTestCallback(function(){
+								var val = editor.get("value");
+								doh.is(val, '<p><br /></p>');
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "copy and paste P",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var editor = registry.byId("p2");
+							winUtils.scrollIntoView(editor.iframe);
+							editor.set("value", "");
+							editor.focus();
+							
+							robot.mouseMoveAt(editor.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.BACKSPACE, 500, {});
+								
+							robot.typeKeys("testingCopyAndPaste", 500);
+							robot.keyPress("a", 500, metaKey);	// select all
+							robot.keyPress("c", 500, metaKey);	// copy
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								var value = editor.get('value');
+								value = value.replace(/\xA0/g, "");
+								if(has("webkit") && !has("mac")){
+									// Work around webkit bug:
+									// http://code.google.com/p/chromium/issues/detail?id=106551
+									// Should hopefully be fixed in Chrome 19.
+									value = value.replace(/\n/g, "");
+									value = value.replace(/\r\f/g, "");
+								}
+								
+								doh.is('<p>testingCopyAndPastetestingCopyAndPastetestingCopyAndPaste</p>',
+									value,
+									"get('value')");
+							}), 1000);
+							return d;
+						}
+					},					
+					{
+						name: "copy and paste P split",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var editor = registry.byId("p2");
+							winUtils.scrollIntoView(editor.iframe);
+							editor.set("value", "");
+							editor.focus();
+							
+							robot.mouseMoveAt(editor.iframe, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.BACKSPACE, 500, {});
+								
+							robot.typeKeys("testingCopyAndPaste", 500);
+							robot.keyPress("a", 500, metaKey);	// select all
+							robot.keyPress("c", 500, metaKey);	// copy
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress("v", 500, metaKey);	// paste
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								// get('value') should call the post-filter which recombines the separate <p> nodes into bigger
+								// paragraphs.
+								var value = editor.get('value');
+								value = value.replace(/\xA0/g, "");
+								if(has("webkit") && !has("mac")){
+									// Work around webkit bug:
+									// http://code.google.com/p/chromium/issues/detail?id=106551
+									// Should hopefully be fixed in Chrome 19.
+									value = value.replace(/\n/g, "");
+									value = value.replace(/\r\f/g, "");
+								}
+								
+								doh.is('<p>testingCopyAndPastetestingCopyAndPastetestingCopyAndP</p><p>aste</p>',
+										value,
+										"get('value')");
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/TabIndent.html b/src/main/resources/static/dijit/tests/editor/robot/TabIndent.html
new file mode 100644
index 0000000000000000000000000000000000000000..74a4e7836cd8459d8c45b26513e4938cfb83d1b0
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/TabIndent.html
@@ -0,0 +1,152 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot TabIndent Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/keys", "dojo/query", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, keys, query, winUtils, helpers){
+
+				robot.initRobot('../test_TabIndent.html');
+					
+				var metaKey = {ctrl: true};
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("testTabIndent", [
+					{
+						name: "toggleOn",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							var editor = registry.byId("tiTest");
+							
+							robot.sequence(d.getTestErrback(function(){
+								editor.setValue("<ol><li>a list item.</li><li>a list item2.</li></ol>");
+							}),500);
+							
+							robot.mouseMoveAt(query(".dijitEditorIconTabIndent", robot.doc)[0], 1000);
+							robot.mouseClick({left: true}, 500);
+							robot.mouseMoveAt(function(){ return editor.editNode }, 500);
+							robot.mouseClick({left: true}, 500);
+							robot.keyPress(keys.DOWN_ARROW, 500); //make sure the last thing in the list is selected
+							robot.keyPress(keys.TAB, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("<ol><li>a list item.</li><ol><li>a list item2.</li></ol></ol>", editor.getValue());
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "shiftTab",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var editor = registry.byId("tiTest");
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							
+							robot.sequence(d.getTestCallback(function(){
+								var editorValue = editor.getValue();
+								var valid = editorValue === "<ol><li>a list item.</li><li>a list item2.<br /></li></ol>"; //chrome
+								valid = valid || editorValue === "<ol><li>a list item.</li><li>a list item2.<br/></li></ol>"; //safari
+								valid = valid || editorValue === "<ol><li>a list item.</li><li>a list item2.</li></ol>"; //everone else
+								doh.t(valid);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "toggleOff",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							var editor = registry.byId("tiTest");
+							var origValue;
+							robot.sequence(d.getTestErrback(function(){ origValue = editor.getValue(); }), 1000);
+							robot.mouseMoveAt(query(".dijitEditorIconTabIndent", robot.doc)[0], 1000);
+							robot.mouseClick({left: true}, 500);
+							robot.mouseMoveAt(editor.editNode, 500);
+							robot.mouseClick({left: true}, 500);
+							robot.keyPress(keys.TAB, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								//verify the editor lost focus and therefore the value did not change
+								doh.is(origValue, editor.getValue());
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "toggleOn_ctrlM",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							var editor = registry.byId("tiTest");
+
+							robot.mouseMoveAt(function(){ return editor.editNode }, 500);
+							robot.mouseClick({left: true}, 500);
+							robot.keyPress("m", 500, {ctrl: true});
+							robot.mouseMoveAt(function(){ return editor.editNode }, 500);
+							robot.mouseClick({left: true}, 500);
+							robot.keyPress(keys.DOWN_ARROW, 500); //make sure the last thing in the list is selected
+							robot.keyPress(keys.TAB, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("<ol><li>a list item.</li><ol><li>a list item2.</li></ol></ol>", editor.getValue());
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "toggleOff_ctrlM",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							var editor = registry.byId("tiTest");
+							var origValue;
+							robot.sequence(d.getTestErrback(function(){ origValue = editor.getValue(); }), 1000);
+							robot.mouseMoveAt(function(){ return editor.editNode }, 500);
+							robot.mouseClick({left: true}, 500);
+							robot.keyPress("m", 500, {ctrl: true});
+							robot.mouseMoveAt(function(){ return editor.editNode }, 500);
+							robot.mouseClick({left: true}, 500);
+							robot.keyPress(keys.TAB, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								//verify the editor lost focus and therefore the value did not change
+								doh.is(origValue, editor.getValue());
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/robot/ToggleDir.html b/src/main/resources/static/dijit/tests/editor/robot/ToggleDir.html
new file mode 100644
index 0000000000000000000000000000000000000000..b9f7ba0d50501f20b1d6c47c2706904b9ed65428
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/robot/ToggleDir.html
@@ -0,0 +1,85 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot ToggleDir Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/query", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, array, query, winUtils, helpers){
+
+				robot.initRobot('../test_ToggleDir.html');
+					
+				var metaKey = {ctrl: true};
+
+				var registry;
+				doh.register("setup", [
+					{
+						name: "wait for editors to load",
+						timeout: 5000,
+						runTest: helpers.waitForLoad
+					},
+					function setVars(){
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				array.forEach(["ltr", "rtl"], function(dir){
+					doh.register("testToggleDir " + dir, [
+						{
+							name: "toggleDir_toggleOn",
+							timeout: 6000,
+							runTest: function(){
+								var d = new doh.Deferred();
+								var editor = registry.byId(dir + "_ed");
+
+								robot.mouseMoveAt(query(".dijitEditorIconToggleDir", editor.domNode)[0], 1000);
+								robot.mouseClick({left: true}, 500);
+
+								robot.sequence(d.getTestCallback(function(){
+									var editDoc = editor.editorObject.contentWindow.document.documentElement;
+									editDoc = editDoc.getElementsByTagName("body")[0].firstChild;
+									doh.is(dir == "ltr" ? "rtl" : "ltr", editDoc.dir);
+								}), 500);
+
+								return d;
+							}
+						},
+						{
+							name: "toggleDir_toggleOff",
+							timeout: 6000,
+							runTest: function(){
+								var d = new doh.Deferred();
+								var editor = registry.byId(dir + "_ed");
+
+								robot.mouseMoveAt(query(".dijitEditorIconToggleDir", editor.domNode)[0], 1000);
+								robot.mouseClick({left: true}, 500);
+
+								robot.mouseMoveAt(dir + "_ed", 1000);
+								robot.mouseClick({left: true}, 500);
+
+								robot.sequence(d.getTestCallback(function(){
+									var editDoc = editor.editorObject.contentWindow.document.documentElement;
+									editDoc = editDoc.getElementsByTagName("body")[0].firstChild;
+									doh.is(dir, editDoc.dir);
+								}), 1000);
+								return d;
+							}
+						}
+					]);
+				});
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/runTests.html b/src/main/resources/static/dijit/tests/editor/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..7f2a5c45761ed2b655652b4d0c285f042ff3daef
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/runTests.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+	<title>Dijit Unit Test Runner</title>
+	<meta http-equiv="REFRESH" content="0;url=../../../util/doh/runner.html?testModule=dijit/tests/editor/module"></HEAD>
+	<BODY>
+		Redirecting to D.O.H runner.
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/editor/sample.jpg b/src/main/resources/static/dijit/tests/editor/sample.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..53422b3673112fcf2ca5363ffcd08368afaf84a1
Binary files /dev/null and b/src/main/resources/static/dijit/tests/editor/sample.jpg differ
diff --git a/src/main/resources/static/dijit/tests/editor/sample2.jpg b/src/main/resources/static/dijit/tests/editor/sample2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2767c0ae90b6a3ae1be909ecb40cced2008f7d49
Binary files /dev/null and b/src/main/resources/static/dijit/tests/editor/sample2.jpg differ
diff --git a/src/main/resources/static/dijit/tests/editor/test_CustomPlugin.html b/src/main/resources/static/dijit/tests/editor/test_CustomPlugin.html
new file mode 100644
index 0000000000000000000000000000000000000000..288c8d99be366742ba828636997e22c1ba8f6297
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_CustomPlugin.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Custom Plugin Test/Tutorial</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<style>
+		.customIconHtmlToggle {
+			background-image: url('customIcon.gif'); /* custom editor icons sprite image */
+			background-repeat: no-repeat;
+			width: 18px;
+			height: 18px;
+			text-align: center;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"dojo/_base/declare",
+			"dojo/dom-construct",
+			"dojo/dom-geometry",
+			"dojo/dom-style",
+			"dojo/_base/lang",
+			"dojo/parser",
+			"dojo/sniff",
+			"dijit/registry",
+			"dijit/Editor",
+			"dijit/_editor/_Plugin",
+			"dijit/form/ToggleButton",
+			"dojo/domReady!"
+		], function(declare, domConstruct, domGeom, domStyle, lang, parser, has, registry, Editor, _Plugin, ToggleButton){
+
+			var MyPlugin = declare("MyPlugin", _Plugin, {
+				buttonClass: ToggleButton,
+				useDefaultCommand: false,
+				name: "MyPlugin",
+
+				_initButton: function(){
+					this.command = "htmlToggle";
+					this.editor.commands[this.command] = "View HTML source"; // note: should be localized
+					this.iconClassPrefix = "customIcon";
+					this.inherited(arguments);
+					delete this.command; // kludge so setEditor doesn't make the button invisible
+					this.button.on("click", lang.hitch(this, "_toggleSource"));
+				},
+
+				destroy: function(f){
+					this.inherited(arguments);
+					if(this.sourceArea){ domConstruct.destroy(this.sourceArea); }
+				},
+
+				_toggleSource: function(){
+					this.source = !this.source;
+					if(!this.sourceArea){
+						this.sourceArea = document.createElement('textarea');
+						this.sourceArea.style.position = 'absolute';
+						this.sourceArea.setAttribute("aria-label", "sourceArea");
+						domConstruct.place(this.sourceArea, this.editor.domNode, "last");
+					}
+					if(this.source){
+						this.sourceArea.style.display = "";
+						this.sourceArea.value = this.editor.getValue();
+						domStyle.set(this.sourceArea, "borderWidth",
+								domStyle.get(this.editor.editingArea, "borderStyle") == "none" ? "0" :
+										domStyle.get(this.editor.editingArea, "borderWidth"));
+						domGeom.setMarginBox(this.sourceArea, domGeom.getMarginBox(this.editor.editingArea));
+						if(has("ie")){
+							//work around IE oddity with offsetParent mismatch
+							var p = domGeom.position(this.editor.editingArea);
+							domStyle.set(this.sourceArea, { left: p.x, top: p.y });
+						}
+					}else{
+						this.editor.setValue(this.sourceArea.value);
+						this.sourceArea.style.top = "-999px";
+						this.sourceArea.style.display = "none";
+					}
+
+					this.button.set('label', this.source ? "View WYSIWYG" : this.editor.commands["htmlToggle"]); // note: should be localized
+				}
+			});
+	
+			/* the following code registers my plugin */
+			_Plugin.registry["MyPlugin"] = function(args){
+				return new MyPlugin({});
+			};
+			
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<div id="editor1" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editorExtraPlugin",extraPlugins:["MyPlugin"], height: 150'><p>
+	This editor should have my custom plugin
+	</p></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_Editor.html b/src/main/resources/static/dijit/tests/editor/test_Editor.html
new file mode 100644
index 0000000000000000000000000000000000000000..97db8c7b71626e5908f648be6489780326594f36
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_Editor.html
@@ -0,0 +1,215 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+
+	<script type="text/javascript">
+		require([
+			"dojo/_base/declare",
+			"dojo/parser",	// scan page for widgets and instantiate them
+			"dijit/Editor",
+			"dijit/_editor/_Plugin",
+			"dijit/_editor/plugins/AlwaysShowToolbar",
+			"dijit/_editor/plugins/FontChoice",  // 'fontName','fontSize','formatBlock'
+			"dijit/_editor/plugins/TextColor",
+			"dijit/_editor/plugins/LinkDialog",
+			"dojo/NodeList-dom",	// orphan()
+			"dojo/domReady!"
+		], function(declare, parser, Editor, _Plugin){
+
+			// Dummy simple plugin for testing that filters registered this way work
+			// properly with content setting on load.
+			declare("TestFilter", _Plugin, {
+				setEditor: function(editor){
+					this.editor = editor;
+					this.editor.contentPreFilters.push(function(val){
+						if(val){
+							val = val.replace("notdojo", "DOJO");
+						}
+						return val;
+					});
+				}
+			});
+
+			parser.parse();
+
+			var progEditor = new Editor({
+				value: "Custom Initial Content.",
+				"aria-label": "progEditor"
+			}, "programmatic3");
+			progEditor.startup();
+
+			var progEditor2 = new Editor({
+				contentPreFilters: [function(txt){ return txt; }],
+				"aria-label": "progEditor2"
+			}, "programmatic4");
+			progEditor2.startup();
+		});
+
+	</script>
+</head>
+
+<body class="claro" role="main">
+	<script type="dojo/require">
+		dom: "dojo/dom",
+		lang: "dojo/_base/lang",
+		query: "dojo/query",
+		registry: "dijit/registry",
+		Editor: "dijit/Editor"
+	</script>
+	<div data-dojo-type="dijit/Editor" data-dojo-props="plugins:[], focusOnLoad:true, height:'1.5em', style:'border:0px;','aria-label':'automated'" id="automated"
+	>Automated Test - all check boxes should be checked<script type='dojo/method' data-dojo-event='onFocus'>
+			if(!document.getElementById('onFocusFired').checked){
+				document.getElementById('onFocusFired').checked=true;
+				document.getElementById('initialValueOK').checked = (registry.byId('automated').getValue() == 'Automated Test - all check boxes should be checked');
+				registry.byId('automated').document.execCommand('selectall', false, false);
+				document.getElementById('onChangeOKnow').checked=true;
+				registry.byId('automated').document.execCommand('underline', false, false);
+				setTimeout(lang.hitch(registry.byId('editor0'),"focus",0));
+			}
+		</script
+		><script type='dojo/method' data-dojo-event='onBlur'>
+			if(!document.getElementById('onBlurFired').checked){
+				document.getElementById('onBlurFired').checked=true;
+				registry.byId('automated').set('disabled', true);
+				setTimeout(function(){ try {
+					registry.byId('automated').document.execCommand('bold', false, false);
+					document.getElementById('disabledOK').checked = (registry.byId('automated').document.queryCommandState('bold') == false);
+				}catch(e){ document.getElementById('disabledOK').checked = true; }}, 0);
+			}
+		</script
+		><script type='dojo/method' data-dojo-event='onChange'>
+			if(document.getElementById('onChangeOKnow').checked && !document.getElementById('onChangeFired').checked){
+				document.getElementById('onChangeFired').checked=true;
+			}
+		</script
+	></div>
+	<label for="onFocusFired">Focus:</label><input type="checkbox" id="onFocusFired" disabled />
+	<label for="initialValueOK">Value:</label><input type="checkbox" id="initialValueOK" disabled />
+	<input type="checkbox" id="onChangeOKnow" disabled style="display:none;"/>
+	<label for="onChangeFired">Change:</label><input type="checkbox" id="onChangeFired" disabled />
+	<label for="onBlurFired">Blur:</label><input type="checkbox" id="onBlurFired" disabled />
+	<label for="disabledOK">Disabled:</label><input type="checkbox" id="disabledOK" disabled />
+	<br>
+	<br>
+
+	<h1 class="testTitle">Editor + Plugins Test</h1>
+
+	<h2>No plugins, initially empty</h2>
+	<div data-dojo-type="dijit/Editor" data-dojo-props="plugins:[], height:'100', 'aria-label':'applied with aria'" id="editor0"></div>
+
+	<h2><label id="label_editor1">Created from div</label></h2>
+	<label for="focusBefore">lbl:</label><input id="focusBefore" value="input before editor1"/>
+	<div data-dojo-type="dijit/Editor" aria-labelledby="label_editor1" data-dojo-props="onChange:function(v){console.log('editor1 onChange handler: ' + v)}, disableSpellCheck:true" id="editor1"
+	><p>This instance is created from a div directly with default toolbar and plugins</p>
+	The following HTML should appear as source: &lt;INPUT TYPE="IMAGE" SRC="javascript:alert('no scripting attacks')"&gt;
+	</div>
+	<label for="focusAfter">lbl:</label><input id="focusAfter" value="input after editor1"/>
+	<button onClick="registry.byId('editor1').destroy()">destroy</button>
+	<button onClick="registry.byId('editor1').set('disableSpellCheck', !registry.byId('editor1').get('disableSpellCheck'))">toggle spell check</button>
+	<button onclick="console.log(registry.byId('editor1').get('value'))">getValue</button>
+	<hr/>
+
+	<h2>Created from div, auto-expanding</h2>
+	<h3><label id="label_thud">label for editor:</label></h3>
+	<div data-dojo-type="dijit/Editor"
+		data-dojo-props="onChange:function(v){console.log('thud onChange handler: ' + v)}, extraPlugins:['dijit/_editor/plugins/AlwaysShowToolbar'], styleSheets:'../../themes/claro/document.css', minHeight:'75px', height:''"
+		id="thud" aria-labelledby="label_thud">
+		Extra text
+		<p>
+			This editor is created from a div with AlwaysShowToolbar plugin (do not forget to set height="").
+		</p>
+		<p>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+			semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+			porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+			Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+			Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+			risus.
+		</p>
+		The following HTML should appear as source: &lt;INPUT TYPE="IMAGE" SRC="javascript:alert('no scripting attacks')"&gt;
+	</div>
+	<h3>..after</h3>
+	<hr/>
+
+	<h2>Optional toolbar buttons</h2>
+	<h3><label id="label_blah">blah entry</label></h3>
+	<div data-dojo-type="dijit/Editor"
+		data-dojo-props="plugins:['bold','italic','|','createLink','foreColor','hiliteColor',{name:'dijit/_editor/plugins/FontChoice', command:'fontName', generic:true},'fontSize','formatBlock','insertImage','insertHorizontalRule'], styleSheets:'../../themes/claro/document.css'"
+		id="blah" aria-labelledby="label_blah">
+		This instance includes optional toolbar buttons which pull in additional ui (dijit) code.
+		Note the require() arguments to pull in the associated editor plugins to make
+		this work.
+		<br>
+		<span style="font-family: serif">This is serif.</span>
+		<br>
+		<span style="font-family: sans-serif">This is sans-serif.</span>
+		<br>
+		<span style="font-family: monospace">This is monospace.</span>
+		<br>
+		<span style="font-family: cursive">This is cursive.</span>
+		<br>
+		<span style="font-family: fantasy">This is fantasy.</span>
+		<br>
+	</div>
+	<h3>..after</h3>
+	<button onclick="alert(registry.byId('blah').get('value'));">getValue</button>
+	<hr/>
+
+	<h2>Plugins specified</h2>
+	<h3><label id="label_blah2">Another blah entry</label></h3>
+	<div data-dojo-type="dijit/Editor" aria-labelledby="label_blah2"
+		data-dojo-props="plugins:['bold','italic','|',{name:'dijit/_editor/plugins/FontChoice', command:'fontName', custom:['Verdana','Myriad','Garamond','Apple Chancery','Hiragino Mincho Pro']}, {name:'dijit/_editor/plugins/FontChoice', command:'fontSize', custom:[3,4,5]}, {name:'dijit/_editor/plugins/EnterKeyHandling', blockNodeForEnter:'DIV'}], styleSheets:'../../themes/claro/document.css'"
+		id="blah2">
+		This instance demos how to:
+		<ol>
+			<li>specify which plugins to load (see the plugins property): this instance loads FontChoice plugin, among others;</li>
+			<li>specify options for a plugin (see the last item in the plugins array)</li>
+		</ol>
+	</div>
+	<h3>..after</h3>
+	<hr/>
+
+	<h2>Font sizing via style</h2> 
+	<div data-dojo-type="dijit/Editor" data-dojo-props="style:'text-align:left; font-size:30pt'" aria-label="fontSizedEditor" id="fontSizedEditor">
+		Hello World! 
+	</div> 
+
+	<h2>Checking pre-filter application</h2> 
+	<div data-dojo-type="dijit/Editor" data-dojo-props="extraPlugins:[{name: 'TestFilter'}]" aria-label="filteredEditor" id="filteredEditor">
+		notdojo 
+	</div> 
+
+	<h2>Checking editor starting with br</h2> 
+	<div data-dojo-type="dijit/Editor" id="brEditor" aria-label="brEditor">
+		<br>
+		some stuff
+		<br>
+		some other stuff. 
+	</div> 
+
+	<h2>Programmatic creation</h2>
+	<div id="programmatic">This div will become an editor.</div>
+	<button
+		id="create"
+		onclick="new Editor({}, dom.byId('programmatic')); query('#create').orphan();">
+	create static editor
+	</button>
+	<div id="programmatic2">This div will become an auto-expanding editor.</div>
+	<button
+		id="create2"
+		onclick="new Editor({height: '', extraPlugins: ['dijit/_editor/plugins/AlwaysShowToolbar']}, dom.byId('programmatic2')); query('#create2').orphan();">
+	create expanding editor
+	</button>
+
+	<br><br>    
+	<div id="programmatic3">This div will become a programmatic editor in addOnLoad with creation-defined default content.</div>
+	<br><br>
+	<div id="programmatic4">This div will become a programmatic editor in addOnLoad with creation-defined and custom filters.</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_FontChoice.html b/src/main/resources/static/dijit/tests/editor/test_FontChoice.html
new file mode 100644
index 0000000000000000000000000000000000000000..3f5b671e9e328a5e8f868d0ac80806bff2a3c438
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_FontChoice.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test: FontChoice Plugin</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Editor",
+			"dijit/_editor/plugins/FontChoice",
+			"dijit/_editor/plugins/ViewSource",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<br>
+	<br>
+	<div>Content before the editor.</div>
+	<br>
+	<br>
+	<p>Editor with default drop down lists:</p>
+	<div id="editor0" data-dojo-type="dijit/Editor"
+		data-dojo-props='"aria-label":"editor0", extraPlugins:["fontName", "fontSize", "formatBlock", "viewSource"], height: "400px", style:"background-color: white; width: 100%;"'>
+		<h1>Font Choice Plugin details</h1>
+		<ol>
+			<li>The Fontchoice plugin provides three dropdown menus for manipulating font information, such as
+				font name, font size, and the format of the block containing the text (such as P, PRE, H1, and so on)</li>
+			<li>It auto-updates itself based on the caret and selection position in the document.</li>
+		</ol>
+
+		<h2>Things to test:</h2>
+		<ol>
+			<li>Verify clicking in a P tag shows Paragraph in the dropdown.</li>
+			<li>Verify clicking in a a font-sized tag that the size dropdown indicates the current size (via a name).</li>
+			<li>Verify clicking in a a font-nameed tag that the name dropdown indicates the current font name.</li>
+			<li>Verify that you can set/manipulate all the above via the menu.</li>
+		</ol>
+		<br>
+		<p id="para0">
+			This is a pararaph.
+		</p>
+		<br>
+		<pre id="pre0">
+			This is preformatted text.
+		</pre>
+		<br>
+		<h1 id="h10">
+			This is a heading.
+		</h1>
+		<h2 id="h20">
+			This is a sub-heading.
+		</h2>
+		<h3 id="h30">
+			This is a sub-sub-heading.
+		</h3>
+        <br>
+		<p id="text">This is some text in a 'p' for styling.</p>
+		<p id="text1">This is some more text in a 'p' for styling.</p>
+		<br>
+		<font id="sizedText1" size="1">This is some small text.</font>
+		<br>
+		<font id="sizedText4" size="4">This is some mediumish text.</font>
+		<br>
+		<font id="sizedText7" size="7">This is some xx-large text.</font>
+		<br>
+		<font face="'Comic Sans MS'" id="comicText">This is some text in 'Comic Sans MS'</font>.
+		<br>
+		<br>
+		<br>
+		<h1 style="background-color: lightgray">Selection format removal test</h1>
+		<div id="selectionContainer">
+			<h3>
+				Some H3 formatted content.
+			</h3>
+			<pre>
+				Some PRE formatted content.
+			</pre>
+			<p>
+				Some P formatted content.
+			</p>
+		</div>
+
+	</div>
+	<br>
+	<br>
+	<div>Content after the editor.</div>
+	<br>
+	<br>
+	<div>Content before the editor.</div>
+	<br>
+	<br>
+	<p>Editor w/ plain text dropdown values:</p>
+	<div id="editor1" data-dojo-type="dijit/Editor"
+		data-dojo-props='"aria-label":"editor1", extraPlugins:[{name: "fontName", plainText: true}, {name: "fontSize", plainText: true}, {name: "formatBlock", plainText: true}, "viewSource"], style:"background-color: white; width: 100%;", height: "400px"'>
+		<h1>Font Choice Plugin details</h1>
+		<ol>
+			<li>This instance of the FontChoice plugin just turns off formatted content in the dropdowns.  Everything should be the same font and size.</li>
+		</ol>
+
+		<h2>Things to test:</h2>
+		<ol>
+			<li>Verify that each of the dropdowns have values that are all the same size and font.</li>
+		</ol>
+	</div>
+	<br>
+	<br>
+	<div>Content after the editor.</div>
+	<br>
+	<br>
+	<p>Editor w/ generic (web font names) font selector, traditional font name selector, font size selector, and format block selector:</p>
+	<div id="generic" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"generic", height:"10em",
+		plugins:["bold", "italic", "underline", {name: "dijit/_editor/plugins/FontChoice", command: "fontName", generic: true}, "fontName", "fontSize", "formatBlock"]'>hello world</div>
+	<br>
+	<br>
+	<div>Content after the editor.</div>
+	<br>
+	<br>
+	<div>Content before the editor.</div>
+	<br>
+	<br>
+	<p>Editor w/ custom font drop down list:</p>
+	<div id="custom" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"custom", height:"10em",
+		plugins:["bold", "italic", "underline", {name: "dijit/_editor/plugins/FontChoice", command: "fontName", custom:["Verdana","Myriad","Garamond"]}]'>
+			This editor should let you set the fonts to
+			<span style="font-family:Verdana;">Verdana</span>, <span style="font-family:Myriad;">Myriad</span>, and <span style="font-family:Garamond;">Garamond</span>.
+	</div>
+	<br>
+	<br>
+	<div>Content after the editor.</div>
+	<br>
+	<br>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_FullScreen.html b/src/main/resources/static/dijit/tests/editor/test_FullScreen.html
new file mode 100644
index 0000000000000000000000000000000000000000..0c1a40006fc82f938e0c3abe6e204f36791b99ec
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_FullScreen.html
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test: FullScreen Plugin</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Editor",
+			"dijit/_editor/plugins/FullScreen",
+			"dijit/_editor/plugins/ViewSource",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/AccordionContainer",
+			"dijit/layout/StackContainer",
+			"dijit/layout/TabContainer",
+			"dijit/layout/ContentPane",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<br>
+	<br>
+	<div>Content before the editor.</div>
+	<br>
+	<br>
+	<div id="editor0" data-dojo-type="dijit/Editor"
+		data-dojo-props='"aria-label":"editor0", extraPlugins:["fullscreen"], style:"background-color: white; width: 800px; height: 400px;" '>
+		<h1>Full Screen Plugin details</h1>
+		<ol>
+			<li>The Fullscreen plugin provides an extra button on the toolbar to allow switching the
+				editor into 'full screen' mode, meaning the editor takes over the viewport of the
+				browser.   This plugin is particularly useful when editing large documents.</li>
+			<li>The mode can also be toggled by entering the key command: CTRL-SHIFT-F11
+				in the editor pane.</li>
+			<li>When it toggled to full screen, it makes
+				the editor text pane opaque white so that the contents behind it are not visible.</li>
+			<li>When in full screen mode, the plugin attempts to capture the TAB key and allow navigation only between
+				the editor toolbar and the editing area, as when in full screen mode, the rest of the page is hidden
+				behind the editor.</li>
+		</ol>
+
+		<h2>Things to test:</h2>
+		<ol>
+			<li>Verify that clicking the full screen icon highlights the button appropriately and toggles the full screen mode on.</li>
+			<li>Verify that clicking the full screen icon again dehighlites the button and toggles the full screen mode off.</li>
+			<li>Click in the editing pane and verify that CTRL-SHIFT-F11 toggles the full screen mode on and off.</li>
+			<li>Verify while in full screen mode that TAB seems to behave appropriately.  Please note that FireFox and Internet
+				Explorer work the best here.  There are still a few tab control issues in Safari and Chrome.</li>
+		</ol>
+	</div>
+	<br>
+	<br>
+	<div>Content after the editor.</div>
+	<br>
+	<h1>BorderContainer with center region containing editor.</h1>
+	<div id="bc" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='style:"width: 600px; height: 500px;"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width: 50px;"'>left</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", style:"height: 50px;"'>top</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"right", style:"width: 50px;"'>right</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", style:"height: 50px;"'>bottom</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+			<div id="editor1" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor1", extraPlugins:["fullscreen","viewsource"], height:"100%"'>
+				<h1>Full Screen Plugin details</h1>
+				<ol>
+					<li>The Fullscreen plugin provides an extra button on the toolbar to allow switching the
+						editor into 'full screen' mode, meaning the editor takes over the viewport of the
+						browser.   This plugin is particularly useful when editing large documents.</li>
+					<li>The mode can also be toggled by entering the key command: CTRL-SHIFT-F11
+						in the editor pane.</li>
+					<li>When it toggled to full screen, it makes
+						the editor text pane opaque white so that the contents behind it are not visible.</li>
+					<li>When in full screen mode, the plugin attempts to capture the TAB key and allow navigation only between
+						the editor toolbar and the editing area, as when in full screen mode, the rest of the page is hidden
+						behind the editor.</li>
+				</ol>
+		
+				<h2>Things to test:</h2>
+				<ol>
+					<li>Verify that clicking the full screen icon highlights the button appropriately and toggles the full screen mode on.</li>
+					<li>Verify that clicking the full screen icon again dehighlites the button and toggles the full screen mode off.</li>
+					<li>Click in the editing pane and verify that CTRL-SHIFT-F11 toggles the full screen mode on and off.</li>
+					<li>Verify while in full screen mode that TAB seems to behave appropriately.  Please note that FireFox and Internet
+						Explorer work the best here.  There are still a few tab control issues in Safari and Chrome.</li>
+				</ol>
+			</div>
+		</div>
+	</div>
+	<br>
+	<h1>TabContainer with tab containing editor.</h1>
+	<div id="tc" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 600px; height: 500px; border-style: solid; border-width: 1px; padding: 0px; margin: 0px;"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Editor Tab"'>
+			<div id="editor2" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor2", extraPlugins:["fullscreen","viewsource"], height:"100%"'>
+				<h1>Full Screen Plugin details</h1>
+				<ol>
+					<li>The Fullscreen plugin provides an extra button on the toolbar to allow switching the
+						editor into 'full screen' mode, meaning the editor takes over the viewport of the
+						browser.   This plugin is particularly useful when editing large documents.</li>
+					<li>The mode can also be toggled by entering the key command: CTRL-SHIFT-F11
+						in the editor pane.</li>
+					<li>When it toggled to full screen, it makes
+						the editor text pane opaque white so that the contents behind it are not visible.</li>
+					<li>When in full screen mode, the plugin attempts to capture the TAB key and allow navigation only between
+						the editor toolbar and the editing area, as when in full screen mode, the rest of the page is hidden
+						behind the editor.</li>
+				</ol>
+		
+				<h2>Things to test:</h2>
+				<ol>
+					<li>Verify that clicking the full screen icon highlights the button appropriately and toggles the full screen mode on.</li>
+					<li>Verify that clicking the full screen icon again dehighlites the button and toggles the full screen mode off.</li>
+					<li>Click in the editing pane and verify that CTRL-SHIFT-F11 toggles the full screen mode on and off.</li>
+					<li>Verify while in full screen mode that TAB seems to behave appropriately.  Please note that FireFox and Internet
+						Explorer work the best here.  There are still a few tab control issues in Safari and Chrome.</li>
+				</ol>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Blank Tab 1"'>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Blank Tab 2"'>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Blank Tab 3"'>
+		</div>
+	</div>
+	<br>
+	<h1>AccordionContainer with pane containing editor.</h1>
+	<div id="ac" data-dojo-type="dijit/layout/AccordionContainer" data-dojo-props='style:"width: 600px; height: 500px; border-style: solid; border-width: 1px; padding: 0px; margin: 0px;"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Editor Pane"'>
+			<div id="editor3" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor3", extraPlugins:["fullscreen","viewsource"], height:"100%"'>
+				<h1>Full Screen Plugin details</h1>
+				<ol>
+					<li>The Fullscreen plugin provides an extra button on the toolbar to allow switching the
+						editor into 'full screen' mode, meaning the editor takes over the viewport of the
+						browser.   This plugin is particularly useful when editing large documents.</li>
+					<li>The mode can also be toggled by entering the key command: CTRL-SHIFT-F11
+						in the editor pane.</li>
+					<li>When it toggled to full screen, it makes
+						the editor text pane opaque white so that the contents behind it are not visible.</li>
+					<li>When in full screen mode, the plugin attempts to capture the TAB key and allow navigation only between
+						the editor toolbar and the editing area, as when in full screen mode, the rest of the page is hidden
+						behind the editor.</li>
+				</ol>
+		
+				<h2>Things to test:</h2>
+				<ol>
+					<li>Verify that clicking the full screen icon highlights the button appropriately and toggles the full screen mode on.</li>
+					<li>Verify that clicking the full screen icon again dehighlites the button and toggles the full screen mode off.</li>
+					<li>Click in the editing pane and verify that CTRL-SHIFT-F11 toggles the full screen mode on and off.</li>
+					<li>Verify while in full screen mode that TAB seems to behave appropriately.  Please note that FireFox and Internet
+						Explorer work the best here.  There are still a few tab control issues in Safari and Chrome.</li>
+				</ol>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Blank Pane 1"'>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Blank Pane 2"'>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Blank Pane 3"'>
+		</div>
+	</div>
+	<br>
+	<h1>StackContainer with pane containing editor.</h1>
+	<div id="sc" data-dojo-type="dijit/layout/StackContainer" data-dojo-props='style:"width: 600px; height: 500px; border-style: solid; border-width: 1px; padding: 0px; margin: 0px;"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Editor Pane"'>
+			<div id="editor4" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor4", extraPlugins:["fullscreen","viewsource"], height:"100%"'>
+				<h1>Full Screen Plugin details</h1>
+				<ol>
+					<li>The Fullscreen plugin provides an extra button on the toolbar to allow switching the
+						editor into 'full screen' mode, meaning the editor takes over the viewport of the
+						browser.   This plugin is particularly useful when editing large documents.</li>
+					<li>The mode can also be toggled by entering the key command: CTRL-SHIFT-F11
+						in the editor pane.</li>
+					<li>When it toggled to full screen, it makes
+						the editor text pane opaque white so that the contents behind it are not visible.</li>
+					<li>When in full screen mode, the plugin attempts to capture the TAB key and allow navigation only between
+						the editor toolbar and the editing area, as when in full screen mode, the rest of the page is hidden
+						behind the editor.</li>
+				</ol>
+		
+				<h2>Things to test:</h2>
+				<ol>
+					<li>Verify that clicking the full screen icon highlights the button appropriately and toggles the full screen mode on.</li>
+					<li>Verify that clicking the full screen icon again dehighlites the button and toggles the full screen mode off.</li>
+					<li>Click in the editing pane and verify that CTRL-SHIFT-F11 toggles the full screen mode on and off.</li>
+					<li>Verify while in full screen mode that TAB seems to behave appropriately.  Please note that FireFox and Internet
+						Explorer work the best here.  There are still a few tab control issues in Safari and Chrome.</li>
+				</ol>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Blank Pane 1"'>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Blank Pane 2"'>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Blank Pane 3"'>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_LinkDialog.html b/src/main/resources/static/dijit/tests/editor/test_LinkDialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..1681b6e9cfed069f0ce5842f11369ab937c626a2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_LinkDialog.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test: LinkDialog Plugin</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Editor",
+			"dijit/_editor/plugins/LinkDialog",
+			"dijit/_editor/plugins/ViewSource",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<div style="border: 1px dotted black;">
+		<div id="editor" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor",extraPlugins:["createLink", "insertImage", "viewSource"]'>
+			<ol>
+				<li>The LinkDialog plugin is an 'example' style plugin that shows how to insert basic web links as well as
+				image tags.  This plugin is intended to guide users in writing their own, more complex, link and image handlers
+				while still providing useful function.</li>
+			</ol>
+			<br>
+			<div><a href="http://www.example.com/example.html" target="_top" id="exampleLink">This is an example link in the page.</a></div>
+			<br>
+			<br>
+			<div><img src="./sample.jpg" alt="Sample Image" id="exampleImage" /></div>
+			<br>
+			<br>
+		</div>
+	</div>
+
+	<p>RTL Editor:</p>
+	<div style="border: 1px dotted black;">
+		<div id="reditor" data-dojo-type="dijit/Editor" dir="rtl" data-dojo-props='"aria-label":"reditor",extraPlugins:["createLink", "insertImage"]'>
+			<ol>
+				<li>The LinkDialog plugin is an 'example' style plugin that shows how to insert basic web links as well as
+				image tags.  This plugin is intended to guide users in writing their own, more complex, link and image handlers
+				while still providing useful function.</li>
+			</ol>
+			<br>
+			<div><a href="http://www.example.com/example.html" target="_top" id="rexampleLink">This is an example link in the page.</a></div>
+			<br>
+			<br>
+			<div><img src="./sample.jpg" alt="Sample Image" id="rexampleImage" /></div>
+			<br>
+			<br>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_NewPage.html b/src/main/resources/static/dijit/tests/editor/test_NewPage.html
new file mode 100644
index 0000000000000000000000000000000000000000..e14e8302bc7de95f86726ae345862fe577d566a8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_NewPage.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test: New Page Plugin</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Editor",
+			"dijit/_editor/plugins/NewPage",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<br>
+	<br>
+	<div>Content before the editor.</div>
+	<br>
+	<br>
+	<div id="editor0" data-dojo-type="dijit/Editor"
+		data-dojo-props='"aria-label":"editor0",extraPlugins:["newpage"], style:"background-color: white; width: 800px;", height:"400px" '>
+		<h1>New Page Plugin details</h1>
+		<ol>
+			<li>The new page plugin is a small plugin that adds the capability of making a 'new page'.  In other words
+			replacing all the content of the editor with some default text.  This also usually kills any undo that had been saved.</li>
+		</ol>
+
+		<h2>Things to test:</h2>
+		<ol>
+			<li>Verify that clicking the new page button clears the editor contents.</li>
+		</ol>
+	</div>
+	<br>
+	<br>
+	<div id="editor1" data-dojo-type="dijit/Editor"
+		data-dojo-props='"aria-label":"editor1",extraPlugins:[{name: "newpage", content: "&lt;p&gt;This page intentionally left blank&lt;/p&gt;"}], style:"background-color: white; width: 800px;", height:"400px" '>
+		<h1>New Page Plugin details</h1>
+		<ol>
+			<li>The new page plugin is a small plugin that adds the capability of making a 'new page'.  In other words
+			replacing all the content of the editor with some default text.  This also usually kills any undo that had been saved.</li>
+		</ol>
+
+		<h2>Things to test:</h2>
+		<ol>
+			<li>Verify that clicking the new page button sets the content to: &lt;p&gt;This page intentionally left blank&lt;/p&gt;</li>
+		</ol>
+	</div>
+	<br>
+	<br>
+	<div>Content after the editor.</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_Print.html b/src/main/resources/static/dijit/tests/editor/test_Print.html
new file mode 100644
index 0000000000000000000000000000000000000000..bb3de842fe9ac5ee342d353dc3c49d1a39217d52
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_Print.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test: Print  Plugin</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Editor",
+			"dijit/_editor/plugins/Print",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<br>
+	<br>
+	<div>Content before the editor.</div>
+	<br>
+	<br>
+	<div id="editor0" data-dojo-type="dijit/Editor"
+		data-dojo-props='"aria-label":"editor0",extraPlugins:["print"], style:"background-color: white; width: 800px;", height: "400px"'>
+		<h1>Print Plugin details</h1>
+		<ol>
+			<li>The print plugin is a small plugin that adds the capability of printing the document in the editor</li>
+			<li>If the underlying browser doesn't support print, then the button will be disabled by default</li>
+		</ol>
+
+		<h2>Things to test (manually, because of the print dialog, the function test cannot be automated):</h2>
+		<ol>
+			<li>Verify that clicking the print button opns the browser print dialog and the document will print.</li>
+			<li>Verify that the printed document is only the document in the editor, not the whole page.</li>
+		</ol>
+	</div>
+	<br>
+	<br>
+	<div>Content after the editor.</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_TabIndent.html b/src/main/resources/static/dijit/tests/editor/test_TabIndent.html
new file mode 100644
index 0000000000000000000000000000000000000000..f750d209ea20b07cb9c221faf2d287cf6b62fdea
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_TabIndent.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor TabIndent Plugin Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Editor",
+			"dijit/_editor/plugins/TabIndent",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<p>Paragraph with focusable <span tabindex="0" style="color:blue">item </span>before editor. </p>
+	<label>Test TabIndent Plugin</label>
+	<div style="border: 1px dotted black;">
+	
+		<div id="tiTest" data-dojo-type="dijit/Editor"
+			data-dojo-props='"aria-label":"tiTest",extraPlugins:["tabIndent"]'>
+			<div>
+				<ol>
+				<li>the tabIndent plugin allows the use of the tab and shift-tab keys to
+indent list items.</li>
+				<li>another list element</li>
+				<li>and another</li>
+				<li>still one more</li>
+				</ol>
+			</div>
+			<p>
+				Ctrl-M also turns tab indent on/off.
+				(The buttons should change checked status when the user types
+				Ctrl-M, to indicate whether tab and shift-tab is enabled.)
+			</p>
+		</div>
+	</div>
+	<p>Paragraph with focusable <span tabindex="0" style="color:blue">item </span>after editor. </p>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_ToggleDir.html b/src/main/resources/static/dijit/tests/editor/test_ToggleDir.html
new file mode 100644
index 0000000000000000000000000000000000000000..9113b109b10ebc37889e3abf525077ab7a730f39
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_ToggleDir.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test: ToggleDir Plugin</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Editor",
+			"dijit/_editor/plugins/ToggleDir",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h3 id="ltr_label">LTR Editor</h3>
+	<div id="ltr_ed" data-dojo-type="dijit/Editor"  aria-labelledby="ltr_label"
+		 data-dojo-props='extraPlugins:["dijit/_editor/plugins/ToggleDir"], height: 100'>
+		<ol><li>the toggleDir plugin provides an extra button to switch text direction (BiDi). Useful when right-to-left
+				languages are used with left-to-right languages.</li></ol>
+	</div>
+
+	<h3 id="rtl_label">RTL Editor</h3>
+	<div id="rtl_ed" data-dojo-type="dijit/Editor" aria-labelledby="rtl_label" dir="rtl"
+		 data-dojo-props='extraPlugins:["dijit/_editor/plugins/ToggleDir"], height: 100'>
+		<ol><li>the toggleDir plugin provides an extra button to switch text direction (BiDi). Useful when right-to-left
+			languages are used with left-to-right languages.</li></ol>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_ViewSource.html b/src/main/resources/static/dijit/tests/editor/test_ViewSource.html
new file mode 100644
index 0000000000000000000000000000000000000000..f952898f9ea3f337cbc9fa038c07cec8bb1006eb
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_ViewSource.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test: ViewSource Plugin</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Editor",
+			"dijit/_editor/plugins/ViewSource",
+			"dijit/_editor/plugins/FullScreen",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<br>
+	<br>
+	<div>Content before the editors.</div>
+	<br>
+	<br>
+	<div>
+		<div id="editor0" data-dojo-type="dijit/Editor"
+			data-dojo-props='"aria-label":"editor0",extraPlugins:["viewSource"], style:"background-color: white; width: 800px;", height:"400px" '>
+			<h1>ViewSource Plugin details</h1>
+			<ol>
+				<li>The ViewSource plugin provides an extra button on the toolbar to allow switching the
+					editor from WSYIWYG editing to into HTML source mode editing in the browser.
+					This plugin is particularly useful when needing to tweak generated HTML source.</li>
+				<li>The mode can also be toggled by entering the key command: CTRL-SHIFT-F12
+					in the editor pane.</li>
+				<li>When it toggled it makes the edit area either a textarea if editing is enabled, or a readonly TEXTAREA node
+					if it is not editable.</li>
+				<li>The plugin is aware of the FullScreen plugin, and when present will make sure that FullScreen knows which
+					node to make 'full'.</li>
+				<li>The View Source adds in basic comment and script tag stripping by default (to help avoid XSS) attacks in code.
+					These can be disabled, but it is not recommended.</li>
+				<li>While in view source mode, all other menu bar plugins are disabled.</li>
+			</ol>
+
+			<h2>Things to test:</h2>
+			<ol>
+				<li>Verify that clicking the View Source icon highlights the button appropriately and toggles the view source mode on.</li>
+				<li>Verify that clicking the View Source icon again dehighlites the button and toggles the view source mode off.</li>
+				<li>Click in the editing pane and verify that CTRL-SHIFT-F12 toggles the view source mode on and off.</li>
+	   			<li>Verify that when in View Source mode and comment and script tag stripping is enabled, that both inputs are removed when
+					toggled off.</li>
+			</ol>
+		</div>
+	</div>
+	<br>
+	<br>
+	<div>
+		<div id="editor1" data-dojo-type="dijit/Editor"
+			data-dojo-props='"aria-label":"editor1",extraPlugins:["fullScreen","viewSource"], style:"background-color: white; width: 800px;", height:"300px" '>
+			<h1>ViewSource Plugin with FullScreen Plugin details</h1>
+			<ol>
+				<li>The ViewSource plugin is FullScreen aware.  It will  should work appropriately when in full screen mode.</li>
+			</ol>
+
+			<h2>Things to test:</h2>
+			<ol>
+				<li>Verify that while in Full Screen mode clicking the View Source icon highlights the button appropriately and toggles the
+					view source mode on and scales appropriately.</li>
+			</ol>
+		</div>
+	</div>
+	<br>
+	<br>
+	<div>
+		<div id="editor2" data-dojo-type="dijit/Editor"
+			data-dojo-props='"aria-label":"editor2",extraPlugins:["fullScreen",{name: "viewSource", readOnly: true}], style:"background-color: white; width: 800px;", height:"300px" '>
+			<h1>ViewSource Plugin with readOnly enabled details</h1>
+			<ol>
+				<li>The ViewSource plugin supports a readonly mode.  This should display the content but not allow any edits..</li>
+			</ol>
+
+			<h2>Things to test:</h2>
+			<ol>
+				<li>Verify that while in View Source mode, the source cannot be edited.</li>
+			</ol>
+		</div>
+	</div>
+	<br>
+	<br>
+	<div>
+		<div id="editor3" data-dojo-type="dijit/Editor"
+			data-dojo-props='"aria-label":"editor3",extraPlugins:["fullScreen",{name: "viewSource", stripScripts: false, stripComments: false, stripIFrames: false}],
+			style:"background-color: white; width: 800px;", height:"300px" '>
+			<h1>ViewSource Plugin with script* disabled</h1>
+			<ol>
+				<li>The ViewSource plugin supports disabling the script stripping, comment stripping, etc.  This can be dangerous, but sometimes it is desirable.</li>
+			</ol>
+
+			<h2>Things to test:</h2>
+			<ol>
+				<li>Verify that typed in script tags, comments, and iframes are left in the content when view switched.</li>
+			</ol>
+		</div>
+	</div>
+	<br>
+	<br>
+	<div>Content after the editors.</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_bidiEditor.html b/src/main/resources/static/dijit/tests/editor/test_bidiEditor.html
new file mode 100644
index 0000000000000000000000000000000000000000..83597614c580218e39ac2628146d3ebb37b66888
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_bidiEditor.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Editor Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"
+		data-dojo-config="parseOnLoad: false, has: {'dojo-bidi': true}">
+	</script>
+
+
+	<script type="text/javascript">
+		require([
+			"dojo/_base/declare",
+			"dojo/parser",	// scan page for widgets and instantiate them
+			"dijit/Editor",
+			"dojo/domReady!"
+		], function(declare, parser, Editor){
+
+			parser.parse();
+
+			var editor1 = new Editor({
+				dir: 'ltr',
+				textDir: 'rtl',
+				height: '75px',
+				value: ''
+			}, "prog1");
+			editor1.startup();
+			
+			var editor2 = new Editor({
+				dir: 'rtl',
+				textDir: 'ltr',
+				height: '75px',				
+				value: ''				
+			}, "prog2");
+			editor2.startup();
+		});
+
+	</script>
+</head>
+
+<body class="claro" role="main">
+	<h1 class="testTitle">Editor GUI orientation and default text direction Test</h1>
+	<h2 class="testTitle" style="text-align: center;">Created from div.</h2>
+	<table width='100%'>
+	<tr><td width='49%' dir='ltr'>
+		<div data-dojo-type="dijit/Editor"
+			data-dojo-props="styleSheets:'../../themes/claro/document.css', height:'70px'"
+			id="ed1">
+		</div>
+	</td>
+	<td width='2%'></td>
+	<td dir='rtl'>	
+		<div data-dojo-type="dijit/Editor"
+			data-dojo-props="styleSheets:'../../themes/claro/document.css', height:'70px'"
+			id="ed2">
+		</div>
+	</td></tr>
+	<tr><td width='49%'>
+		<div data-dojo-type="dijit/Editor"
+			data-dojo-props="styleSheets:'../../themes/claro/document.css', height:'70px', dir: 'ltr', textDir: 'rtl'"
+			id="ed3">
+		</div>
+	</td>
+	<td width='2%'></td>
+	<td>	
+		<div data-dojo-type="dijit/Editor"
+			data-dojo-props="styleSheets:'../../themes/claro/document.css', height:'70px', dir: 'rtl', textDir: 'ltr'"
+			id="ed4">
+		</div>
+	</td></tr>
+	</table>
+	
+	<h2 class="testTitle" style="text-align: center;">Programmatic creation.</h2>
+	<table width='100%'>
+	<tr><td width='49%'>
+		<div id="prog1">This div will become a programmatic editor in addOnLoad.</div>
+	</td>
+	<td width='2%'></td>
+	<td>
+		<div id="prog2">This div will become a programmatic editor in addOnLoad.</div>
+	</td></tr>
+	</table>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/editor/test_editor.css b/src/main/resources/static/dijit/tests/editor/test_editor.css
new file mode 100644
index 0000000000000000000000000000000000000000..6b4d4ece8fe57a0f596857636e21eed41a0de383
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_editor.css
@@ -0,0 +1,4 @@
+h1 {
+	border: 1px solid black;
+	background-color:red;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/editor/test_performance.html b/src/main/resources/static/dijit/tests/editor/test_performance.html
new file mode 100644
index 0000000000000000000000000000000000000000..ed8562503f26f959b8ea90765f38671f60806b54
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/editor/test_performance.html
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+	<title>test_performance</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/_base/declare",
+			"dojo/_base/lang",
+			"dojo/parser",
+			"dijit/Editor",
+			"dijit/_editor/_Plugin",
+			"dijit/form/Button",
+			"dojo/domReady!"
+		], function(declare, lang, parser, Editor, _Plugin, Button){
+
+			var TestPluginGet = declare("TestPluginGet", _Plugin, {
+				// summary:
+				//		Get the value of the editor
+
+				showAlert: false,
+				logResults: false,
+
+				_initButton: function(){
+					this.button = new Button({
+						label: "get",
+						showLabel: true,
+						onClick: lang.hitch(this, "_get"),
+						title: "Dojo"
+					});
+				},
+
+				setEditor: function(editor){
+					this.editor = editor;
+					this._initButton();
+				},
+
+				_get: function(){
+					var getDate1 = new Date();
+					var html = this.editor.get("value");
+					var getDate2 = new Date();
+
+					var timeTakenGet = (getDate2.getTime() - getDate1.getTime()) / 1000;
+
+					if(this.showAlert){
+						alert("Get (" + timeTakenGet + " secs)\n"
+								+ "Steps: " + this.editor._steps.length);
+					}
+					if(this.logResults){
+						console.log("Get (" + timeTakenGet + " secs)");
+						console.log("Steps: " + this.editor._steps.length);
+					}
+				}
+
+			});
+			_Plugin.registry["testpluginget"] = function(args){
+				return new TestPluginGet(args);
+			};
+
+			var TestPluginSet = declare("TestPluginSet", _Plugin, {
+				// summary:
+				//		Set editor value
+
+				showAlert: false,
+
+				logResults: false,
+
+				htmlValue: "Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> Aliquam at arcu sit amet enim tincidunt mattis.<br/> Pellentesque tincidunt interdum ipsum.<br/> condimentum congue libero <br/> a.<br/> Vivamus arcu metus.<br/> pharetra sed iaculis a.<br/> ullamcorper <br/> tortor.<br/> Praesent volutpat.<br/> erat in <br/> fringilla.<br/> dolor mi malesuada ligula.<br/> non adipiscing mi sem vel neque.<br/> Nam odio nibh.<br/> ultrices nec fringilla non.<br/> tempus vel ligula.<br/> Suspendisse elementum eleifend volutpat.<br/> Aenean a aliquam est.<br/> Nulla facilisi.<br/> Praesent elit turpis.<br/> vestibulum vel laoreet sit amet.<br/> eleifend vel nisl.<br/> Suspendisse potenti.<br/> Curabitur luctus pellentesque sem quis consequat.<br/> Integer lacus turpis.<br/> pulvinar vitae gravida et.<br/> viverra vel ipsum.<br/> <br/> In ac elit <br/> lorem pellentesque tristique.<br/> Sed vehicula consectetur turpis.<br/> Duis pharetra mattis ante.<br/> quis hendrerit diam bibendum a.<br/> Praesent interdum felis sed enim suscipit vel adipiscing augue accumsan.<br/> Duis ullamcorper mattis eleifend.<br/> Pellentesque molestie justo nec ante porta elementum.<br/> Suspendisse vehicula.<br/> est sodales gravida facilisis.<br/> nisi elit aliquam mauris.<br/> ac varius eros odio sed ipsum.<br/> Nulla faucibus mauris et magna tincidunt lacinia congue leo euismod.<br/> Vestibulum dapibus.<br/> ante in posuere imperdiet.<br/> erat augue tincidunt dolor.<br/> sed condimentum neque nisl ac orci.<br/> <br/> Quisque ullamcorper faucibus libero auctor molestie.<br/> Sed at orci nisl.<br/> Aenean scelerisque velit iaculis justo fringilla accumsan.<br/> Nullam vulputate nisi at nulla vehicula vel sollicitudin libero volutpat.<br/> Nulla facilisi.<br/> Cras odio nisi.<br/> mollis vel tristique sed.<br/> iaculis iaculis neque.<br/> Cras eu commodo neque.<br/> Etiam iaculis eros et ipsum fermentum gravida.<br/> Sed rhoncus lectus tellus.<br/> Praesent scelerisque orci eu nulla feugiat laoreet.<br/> Sed scelerisque tempor lacus.<br/> ac bibendum diam ullamcorper nec.<br/> Nunc quam ipsum.<br/> commodo vitae scelerisque quis.<br/> aliquam at neque.<br/> Morbi tristique.<br/> dolor vitae sollicitudin mattis.<br/> libero nisl vulputate eros.<br/> vel mattis risus ligula at nulla.<br/> Quisque in urna arcu.<br/> Suspendisse nisi justo.<br/> elementum ac semper in.<br/> dapibus ut erat.<br/> Phasellus blandit molestie scelerisque.<br/> <br/> Nulla non enim in velit cursus posuere dignissim id diam.<br/> Morbi posuere eros non felis molestie auctor.<br/> In et magna quis orci egestas placerat.<br/> Proin consectetur.<br/> quam <br/> laoreet posuere.<br/> lorem lectus dignissim lectus.<br/> sit amet vulputate purus lorem <br/> felis.<br/> Sed tristique dolor nec mi mattis eleifend.<br/> Suspendisse eros tellus.<br/> hendrerit nec dictum ullamcorper.<br/> vehicula nec mi.<br/> Sed tempor gravida tortor et aliquam.<br/> Ut vel neque turpis.<br/> quis molestie ante.<br/> In pharetra ultrices tellus.<br/> vel cursus tellus semper a.<br/> Nam imperdiet mauris at lacus facilisis a tempus erat facilisis.<br/> Sed id neque est.<br/> vitae commodo felis.<br/> Maecenas congue ante ut nulla eleifend vel pellentesque nibh tempus.<br/> Morbi laoreet venenatis lectus id vestibulum.<br/> Nam vel blandit dolor.<br/> Pellentesque et dui sed est sollicitudin accumsan non ac libero.<br/> Curabitur et egestas sapien.<br/> <br/> Maecenas nec lectus in lectus auctor bibendum id et ipsum.<br/> Fusce tortor tellus.<br/> eleifend vitae aliquam quis.<br/> blandit lobortis tellus.<br/> Suspendisse potenti.<br/> Vivamus vel nulla sit amet urna volutpat fermentum quis ultricies justo.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed venenatis nibh at tortor dignissim ac porttitor sem fermentum.<br/> Etiam euismod felis a odio volutpat aliquam.<br/> Nunc neque nisl.<br/> pellentesque vel auctor et.<br/> luctus at lacus.<br/> <br/> Curabitur ipsum urna.<br/> sodales suscipit vehicula ac.<br/> bibendum et mauris.<br/> Sed non odio nunc.<br/> in pulvinar velit.<br/> Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> Nullam faucibus.<br/> augue ac volutpat faucibus.<br/> sapien arcu auctor nulla.<br/> non condimentum massa metus nec nisi.<br/> Maecenas malesuada.<br/> risus nec euismod tincidunt.<br/> augue lacus iaculis metus.<br/> <br/> ultrices ligula massa tempus mauris.<br/> Fusce quis suscipit nunc.<br/> Vestibulum diam dolor.<br/> placerat <br/> mattis ut.<br/> sollicitudin vitae lorem.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Proin tincidunt mattis accumsan.<br/> Ut viverra rhoncus leo et fermentum.<br/> Mauris ac justo felis.<br/> nec tincidunt nibh.<br/> Vivamus euismod dolor sit amet magna elementum dignissim.<br/> Vivamus nisi nisi.<br/> malesuada in auctor in.<br/> auctor nec tellus.<br/> Curabitur vestibulum euismod orci.<br/> non vulputate enim eleifend ac.<br/> Cras sit amet tempus dui.<br/> <br/> Nunc non tristique lectus.<br/> Morbi viverra gravida lacus.<br/> sed placerat nibh scelerisque et.<br/> Aliquam dui justo.<br/> varius sed pellentesque lobortis.<br/> euismod sed sapien.<br/> Morbi faucibus commodo hendrerit.<br/> Maecenas id vulputate erat.<br/> Donec sed sapien <br/> nisi venenatis gravida sed eu dui.<br/> Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> Aenean vestibulum odio a urna sollicitudin malesuada.<br/> <br/> Duis sodales mollis lectus.<br/> id elementum diam pulvinar nec.<br/> Donec sit amet enim in velit eleifend pretium.<br/> Nam eleifend dui <br/> diam faucibus vel facilisis eros eleifend.<br/> Nam ac ante tortor.<br/> sagittis ultricies sem.<br/> Praesent iaculis consequat odio interdum lacinia.<br/> Sed a volutpat dolor.<br/> Nullam fermentum nisl at ante dictum lacinia.<br/> Cras eu mi sem.<br/> <br/> Fusce tristique congue nulla nec viverra.<br/> Mauris dignissim ipsum non sem pharetra ultricies.<br/> Etiam non felis felis.<br/> non fermentum velit.<br/> Nulla convallis sapien viverra velit tempus id pellentesque neque sagittis.<br/> Suspendisse arcu neque.<br/> congue ut suscipit scelerisque.<br/> pulvinar non justo.<br/> Sed posuere eros ut tortor accumsan dictum.<br/> Vestibulum <br/> lectus at felis volutpat suscipit sit amet sed leo.<br/> Curabitur odio lectus.<br/> porttitor eu malesuada vel.<br/> consectetur eu velit.<br/> Morbi ut tortor ut turpis mattis tempor a ut odio.<br/> Donec ut velit et dolor dapibus tincidunt.<br/> Aenean lobortis neque laoreet dui adipiscing id vehicula metus malesuada.<br/> <br/> Etiam sed quam augue.<br/> sit amet congue libero.<br/> Cras auctor facilisis tortor.<br/> sed porttitor orci tempor et.<br/> Fusce eu bibendum tortor.<br/> Nulla et nunc est.<br/> Sed justo felis.<br/> semper mollis mollis ac.<br/> ultrices nec enim.<br/> Duis laoreet.<br/> erat quis blandit semper.<br/> diam risus egestas justo.<br/> sed vestibulum dui sem a massa.<br/> Praesent id suscipit purus.<br/> <br/> Maecenas eleifend.<br/> erat <br/> convallis mattis.<br/> massa odio sagittis diam.<br/> <br/> tristique tortor velit at quam.<br/> Donec nec elit ut velit faucibus dapibus et dignissim erat.<br/> Nullam dui lacus.<br/> fermentum a sagittis sit amet.<br/> tristique et ipsum.<br/> Vestibulum semper.<br/> risus sed lacinia condimentum.<br/> nisi magna accumsan nulla.<br/> a mattis lorem libero non mauris.<br/> Maecenas elit nisi.<br/> aliquam et varius et.<br/> auctor vel tellus.<br/> Praesent dapibus.<br/> eros ut commodo pretium.<br/> velit orci feugiat mauris.<br/> vel tristique massa tellus ac nunc.<br/> In hac habitasse platea dictumst.<br/> Etiam a justo at odio congue interdum vitae sit amet nulla.<br/> Etiam tellus odio.<br/> suscipit vitae elementum in.<br/> consequat <br/> magna.<br/> Quisque in velit arcu.<br/> Nam in nibh nec sem porttitor condimentum.<br/> Vivamus tincidunt venenatis hendrerit.<br/> <br/> Duis at eros ac erat ultrices aliquet.<br/> Proin <br/> lorem risus.<br/> eu volutpat velit.<br/> Fusce sollicitudin.<br/> sapien vitae vehicula egestas.<br/> justo nibh varius eros.<br/> non malesuada massa orci nec libero.<br/> Class aptent taciti sociosqu ad litora torquent per conubia nostra.<br/> per inceptos himenaeos.<br/> Duis <br/> molestie elit.<br/> sed vehicula ligula elementum sit amet.<br/> Cras molestie.<br/> mi quis ultricies vehicula.<br/> ipsum elit iaculis libero.<br/> quis facilisis purus velit non velit.<br/> Praesent est lorem.<br/> rhoncus vitae pharetra a.<br/> imperdiet non tellus.<br/> Morbi et pharetra tortor.<br/> Vestibulum <br/> malesuada sapien.<br/> Pellentesque porta metus vitae quam hendrerit ornare.<br/> Mauris facilisis ultrices placerat.<br/> Phasellus iaculis est et ligula blandit at lobortis libero pharetra.<br/> Ut sollicitudin tempor aliquam.<br/> Donec dapibus faucibus leo.<br/> vel fermentum turpis ullamcorper eu.<br/> <br/> Nam ante quam.<br/> consectetur ut pretium vel.<br/> faucibus non sem.<br/> Nulla feugiat arcu mollis odio pretium pharetra.<br/> In placerat tincidunt scelerisque.<br/> Proin at enim nisl.<br/> Integer id turpis sit amet sapien interdum volutpat eu et arcu.<br/> Vivamus quis magna metus.<br/> Praesent facilisis mi libero.<br/> <br/> dapibus mi.<br/> <br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In hac habitasse platea dictumst.<br/> Nunc lacinia velit quis orci adipiscing at sodales risus hendrerit.<br/> Donec adipiscing laoreet mauris.<br/> in mattis sapien blandit mollis.<br/> Sed pretium arcu in lorem auctor vehicula.<br/> In hac habitasse platea dictumst.<br/> Praesent volutpat nulla in felis volutpat in elementum neque adipiscing.<br/> Quisque tempor odio ut leo tempor in hendrerit risus euismod.<br/> Cras vestibulum quam sit amet ante porttitor non luctus quam laoreet.<br/> Nam <br/> luctus lacus.<br/> <br/> Mauris vehicula nunc leo.<br/> <br/> euismod purus.<br/> Nullam leo dui.<br/> vestibulum vitae ullamcorper quis.<br/> suscipit ac urna.<br/> Sed interdum orci id sapien iaculis egestas.<br/> Quisque porta elementum libero.<br/> vel vulputate ipsum aliquam eu.<br/> Morbi ac dolor eu quam dignissim tincidunt.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas euismod suscipit vulputate.<br/> Proin aliquet consequat felis sed consequat.<br/> Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> Donec vel vehicula velit.<br/> Nam vitae nunc sed nibh molestie volutpat at at ipsum.<br/> Nullam volutpat consequat metus sit amet rhoncus.<br/> Curabitur pharetra est non ligula fringilla scelerisque.<br/> Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> <br/> Ut <br/> lorem vitae nunc dignissim vestibulum.<br/> Cras massa magna.<br/> dapibus sed vulputate eu.<br/> placerat eu felis.<br/> Donec eros dolor.<br/> lobortis non consequat <br/>.<br/> semper in odio.<br/> Fusce semper <br/> imperdiet.<br/> Etiam pellentesque commodo justo.<br/> blandit sagittis leo lacinia vitae.<br/> Donec id neque leo.<br/> Sed ultricies faucibus nisl suscipit ullamcorper.<br/> Nam elementum accumsan pretium.<br/> Ut sit amet diam libero.<br/> Vestibulum placerat est et felis <br/> lobortis.<br/> <br/> Ut quis est risus.<br/> sed tempor nisl.<br/> Curabitur orci orci.<br/> fermentum a accumsan in.<br/> congue suscipit ligula.<br/> Nulla eleifend mattis nunc.<br/> vel ornare dui porta in.<br/> Class aptent taciti sociosqu ad litora torquent per conubia nostra.<br/> per inceptos himenaeos.<br/> Mauris ornare ipsum <br/> odio gravida aliquet.<br/> Suspendisse sed elit non neque pharetra malesuada.<br/> Sed consequat felis ac nisl accumsan aliquet.<br/> Duis aliquam lorem id risus vehicula ac aliquam purus vulputate.<br/> Donec malesuada.<br/> lectus a aliquet vestibulum.<br/> eros massa dapibus ante.<br/> id dapibus eros neque tempor justo.<br/> Nulla suscipit porttitor magna.<br/> vitae malesuada enim bibendum non.<br/> Nulla vestibulum turpis eu tortor cursus ac dictum enim adipiscing.<br/> Curabitur id elit laoreet sem ornare auctor et <br/> tortor.<br/> Donec sit amet quam quis est pretium <br/> vitae vitae purus.<br/> Aenean risus purus.<br/> sollicitudin sed dignissim vitae.<br/> adipiscing quis diam.<br/> Quisque nec nisl <br/> tortor viverra dignissim a at turpis.<br/> Etiam suscipit faucibus mauris id varius.<br/> <br/> Maecenas sit amet posuere libero.<br/> Mauris in est a odio euismod bibendum sed in elit.<br/> Aenean vel metus vel turpis pretium gravida.<br/> Integer lectus erat.<br/> scelerisque nec ultricies non.<br/> pellentesque eu nisi.<br/> Proin pulvinar bibendum scelerisque.<br/> Vivamus a lectus ligula.<br/> vel <br/> purus.<br/> Proin adipiscing.<br/> metus id pharetra ultrices.<br/> magna dolor <br/> erat.<br/> nec scelerisque mauris purus sit amet risus.<br/> Fusce auctor ipsum id felis porttitor tristique.<br/> Curabitur tempor nibh id purus ultricies ut aliquet metus placerat.<br/> Mauris dapibus <br/> augue <br/> molestie.<br/> Curabitur euismod tristique felis non dictum.<br/> In placerat convallis luctus.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Vivamus malesuada blandit nisi.<br/> a placerat purus iaculis ut.<br/> Suspendisse nec nunc sem.<br/> <br/> Etiam a mi dui.<br/> Integer ullamcorper feugiat nunc sed cursus.<br/> Mauris erat orci.<br/> <br/> et facilisis at.<br/> porttitor id leo.<br/> Pellentesque interdum.<br/> ligula quis ullamcorper semper.<br/> nibh turpis egestas quam.<br/> <br/> pharetra velit tortor sed ligula.<br/> Suspendisse <br/> ante eu nibh ultrices facilisis <br/> vitae ipsum.<br/> Mauris nec sapien quis felis dictum imperdiet.<br/> Quisque eu elit lacus.<br/> Proin non augue eu mi tincidunt gravida.<br/> Proin eu sem vitae arcu ornare hendrerit.<br/> <br/> Sed tempus lectus eu enim laoreet id dictum felis euismod.<br/> Aenean scelerisque nisi non leo bibendum euismod.<br/> Proin libero purus.<br/> porttitor vel vestibulum id.<br/> iaculis ac metus.<br/> Sed dictum feugiat convallis.<br/> Vivamus mattis sollicitudin velit vel consectetur.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Sed imperdiet ornare felis vel posuere.<br/> <br/> Proin ut risus ornare velit adipiscing bibendum at sit amet turpis.<br/> Sed volutpat iaculis lobortis.<br/> Phasellus non nulla libero.<br/> <br/> laoreet sapien.<br/> Donec massa dolor.<br/> scelerisque placerat consequat ut.<br/> dapibus eu nunc.<br/> Mauris mattis gravida tempor.<br/> Sed vitae nisl diam.<br/> <br/> posuere quam.<br/> Suspendisse condimentum lacus quis ipsum congue sed iaculis diam feugiat.<br/> Nullam sit amet metus eros.<br/> a luctus nunc.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Curabitur et felis lorem.<br/> Ut egestas.<br/> metus et egestas aliquam.<br/> tellus ligula suscipit metus.<br/> vitae auctor velit ante vitae lectus.<br/> Phasellus ligula quam.<br/> lacinia vitae auctor sit amet.<br/> porttitor at est.<br/> Donec vitae arcu <br/> tortor auctor aliquet at in diam.<br/> Fusce at odio at sapien tincidunt sollicitudin in sed eros.<br/> Curabitur tincidunt.<br/> eros ac consequat viverra.<br/> diam neque commodo elit.<br/> nec ullamcorper odio est ac dui.<br/> Praesent fermentum nibh vitae risus vehicula tincidunt.<br/> <br/> Nunc massa eros.<br/> cursus vel posuere at.<br/> fermentum in mauris.<br/> Aenean sollicitudin condimentum ligula.<br/> vitae ultricies erat condimentum eu.<br/> In lacus nisi.<br/> congue euismod posuere quis.<br/> blandit <br/> orci.<br/> Nulla facilisi.<br/> Proin commodo nisi id ipsum hendrerit malesuada.<br/> Quisque <br/> mauris ut neque dignissim interdum.<br/> Nam at nunc lacus.<br/> id sollicitudin diam.<br/> Donec at dolor semper sapien ultrices dictum.<br/> Phasellus interdum scelerisque est.<br/> vel malesuada turpis hendrerit sed.<br/> Integer rhoncus volutpat eleifend.<br/> <br/> Nulla sollicitudin odio ut nisl ultricies quis dapibus tellus tincidunt.<br/> Etiam quis sem lectus.<br/> Proin urna magna.<br/> tincidunt a semper ac.<br/> hendrerit ac mi.<br/> Integer non est quis lorem condimentum ultrices.<br/> Proin et quam elit.<br/> ut semper massa.<br/> Nullam a lorem odio.<br/> nec condimentum arcu.<br/> Sed nec risus mauris.<br/> In est lectus.<br/> <br/> non aliquam sit amet.<br/> scelerisque vel nulla.<br/> Aliquam feugiat aliquet risus <br/> vulputate.<br/> Vestibulum vitae adipiscing lectus.<br/> Donec condimentum posuere dui.<br/> et vehicula odio luctus in.<br/> Vivamus porttitor pulvinar tristique.<br/> Fusce ultrices vestibulum dui.<br/> ac porttitor quam pellentesque sit amet.<br/> Sed <br/> odio ac justo porta bibendum in et mauris.<br/> Donec turpis lorem.<br/> pretium non pharetra et.<br/> dictum at tellus.<br/> <br/> Vestibulum id risus ante.<br/> sit amet pulvinar odio.<br/> Sed volutpat mi turpis.<br/> semper pellentesque mi.<br/> Donec facilisis metus vel libero ornare malesuada.<br/> Donec lectus dui.<br/> feugiat non consectetur sit amet.<br/> lobortis sit amet ante.<br/> Vivamus at neque non ipsum sodales sodales.<br/> Ut iaculis fermentum orci.<br/> Ut et imperdiet justo.<br/> Proin consectetur.<br/> quam vitae egestas molestie.<br/> sem mauris malesuada nunc.<br/> <br/> vehicula nibh est vel enim.<br/> Nullam quis nisi a dolor suscipit varius quis id turpis.<br/> Integer consequat porta metus.<br/> vel molestie felis fringilla <br/>.<br/> Suspendisse semper.<br/> velit sed egestas consequat.<br/> urna dui ullamcorper ligula.<br/> quis posuere tellus massa nec nibh.<br/> Nullam ut dui felis.<br/> Cras tristique feugiat pretium.<br/> Cras vulputate.<br/> risus ut vehicula placerat.<br/> enim risus volutpat odio.<br/> quis eleifend lectus ante vel turpis.<br/> Etiam <br/> nibh dictum tellus ultricies facilisis.<br/> Vestibulum nisi sapien.<br/> tincidunt in hendrerit ut.<br/> molestie <br/> massa.<br/> <br/> Praesent euismod.<br/> metus sodales dictum hendrerit.<br/> metus lacus vulputate dui.<br/> et vestibulum lacus nibh at est.<br/> Sed fringilla condimentum risus.<br/> tempus adipiscing odio mattis feugiat.<br/> Sed dolor justo.<br/> malesuada eu commodo a.<br/> luctus at nunc.<br/> Phasellus fringilla.<br/> est vitae ullamcorper luctus.<br/> tellus nisl interdum arcu.<br/> ut ultrices libero velit a purus.<br/> Ut nibh dolor.<br/> vulputate vitae porttitor <br/>.<br/> ultrices in massa.<br/> Sed vel tortor eu velit mattis scelerisque.<br/> In odio dui.<br/> iaculis sit amet sollicitudin a.<br/> sodales nec nisl.<br/> Donec faucibus.<br/> elit et cursus imperdiet.<br/> sem ligula malesuada leo.<br/> bibendum tempus enim felis nec eros.<br/> Donec tellus lectus.<br/> blandit at gravida id.<br/> fermentum in ante.<br/> Cras at libero neque.<br/> Nullam consequat placerat eros.<br/> <br/> mollis urna porta vitae.<br/> Nunc vel sagittis sapien.<br/> Integer egestas.<br/> arcu quis consectetur posuere.<br/> tortor erat imperdiet urna.<br/> quis vulputate leo nibh quis nibh.<br/> Integer iaculis congue erat.<br/> vitae cursus elit ultrices convallis.<br/> Aenean fringilla neque laoreet tortor porttitor iaculis.<br/> Proin tincidunt.<br/> lacus vel feugiat eleifend.<br/> sapien justo commodo purus.<br/> id tincidunt risus nulla in tortor.<br/> <br/> Nulla consequat tortor a metus varius vel tincidunt diam fermentum.<br/> Ut at libero sapien.<br/> <br/> mattis arcu.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nulla ipsum ante.<br/> <br/> lacinia vestibulum vitae.<br/> bibendum nec nulla.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce sit amet felis <br/> erat hendrerit tempus.<br/> Pellentesque at nibh ultrices nisi mattis accumsan eu eu sapien.<br/> Integer quis justo purus.<br/> non mollis purus.<br/> Donec vitae nisl dui.<br/> Phasellus ultricies vehicula tellus in venenatis.<br/> Donec sit amet convallis justo.<br/> Ut enim arcu.<br/> luctus sit amet condimentum sit amet.<br/> imperdiet sit amet purus.<br/> Pellentesque luctus leo vel dolor convallis ullamcorper.<br/> <br/> Suspendisse placerat blandit nunc.<br/> vitae pharetra lacus vestibulum et.<br/> Nunc laoreet metus ac ante egestas a tempor purus vehicula.<br/> Vivamus malesuada imperdiet risus vel ultrices.<br/> Duis vel lacinia nisl.<br/> Nulla placerat.<br/> magna sed malesuada lobortis.<br/> dui orci <br/> elit.<br/> nec imperdiet odio mauris sit amet metus.<br/> Proin ipsum nisi.<br/> consequat in mattis <br/>.<br/> luctus malesuada elit.<br/> Maecenas faucibus bibendum erat.<br/> nec vulputate nibh hendrerit et.<br/> Morbi consequat auctor laoreet.<br/> Mauris sed massa vitae nunc bibendum facilisis a <br/> nisi.<br/> Curabitur sollicitudin.<br/> diam a sagittis tempus.<br/> tellus risus ullamcorper dolor.<br/> non suscipit orci lectus at purus.<br/> Ut vulputate lobortis arcu.<br/> sit amet <br/> sapien mattis sed.<br/> Donec sit amet magna mi.<br/> Proin <br/> augue in orci <br/> euismod.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi ullamcorper fringilla tellus.<br/> et tristique odio semper sit amet.<br/> Vivamus ut orci lacus.<br/> <br/> Pellentesque euismod dui id felis auctor feugiat iaculis at massa.<br/> Aenean <br/> laoreet est.<br/> et ultricies turpis fringilla non.<br/> Nam facilisis leo sit amet quam aliquam aliquet.<br/> Pellentesque condimentum nibh ac quam bibendum cursus.<br/> Aliquam suscipit vehicula leo.<br/> et elementum urna porta <br/>.<br/> Etiam eu magna risus.<br/> non ultricies libero.<br/> Integer rhoncus purus ac lorem ullamcorper dictum.<br/> Suspendisse potenti.<br/> Morbi id ante id quam mollis semper.<br/> Etiam ut consectetur justo.<br/> Nunc in ligula vel arcu tincidunt iaculis et in nunc.<br/> Cum sociis natoque penatibus et magnis dis parturient montes.<br/> nascetur ridiculus mus.<br/> Fusce orci nibh.<br/> placerat at lacinia eu.<br/> lacinia sit amet neque.<br/> Vivamus dapibus velit vel turpis sodales pharetra.<br/> <br/> Pellentesque vestibulum.<br/> turpis at pretium sagittis.<br/> massa diam pretium orci.<br/> a pharetra lorem lorem nec tortor.<br/> Aenean suscipit consequat nulla et vehicula.<br/> Pellentesque non dapibus nulla.<br/> Morbi in semper metus.<br/> In arcu erat.<br/> pretium vitae dictum eu.<br/> vehicula non nibh.<br/> Phasellus vehicula tristique magna <br/> sollicitudin.<br/> Nam non sem orci.<br/> id vulputate nisi.<br/> Phasellus eu metus accumsan diam tempus dignissim ac lacinia odio.<br/> Curabitur sodales.<br/> elit ut sollicitudin faucibus.<br/> nunc ipsum aliquet lacus.<br/> eu ultrices augue enim pulvinar dui.<br/> Aliquam erat volutpat.<br/> Donec ultricies eleifend enim ac ultricies.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Suspendisse vitae tortor leo.<br/> a <br/> massa.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Quisque vel nisl luctus neque auctor venenatis <br/> ac mi.<br/> <br/> In interdum molestie purus.<br/> bibendum sollicitudin sem iaculis vel.<br/> Aliquam tellus tortor.<br/> sollicitudin ut cursus non.<br/> semper vel urna.<br/> Praesent suscipit odio vitae neque convallis at rhoncus elit tempor.<br/> Class aptent taciti sociosqu ad litora torquent per conubia nostra.<br/> per inceptos himenaeos.<br/> Integer <br/> sapien ut velit euismod blandit non ac lectus.<br/> Nulla blandit magna non dolor mollis cursus.<br/> Praesent nibh ligula.<br/> adipiscing id sodales sed.<br/> consequat nec nisi.<br/> Proin nisl mi.<br/> tincidunt vitae ultricies at.<br/> consequat at dui.<br/> Ut tincidunt.<br/> mauris at dapibus sagittis.<br/> enim nulla convallis nibh.<br/> id pellentesque diam justo ut libero.<br/> Praesent erat tellus.<br/> laoreet nec imperdiet at.<br/> eleifend non nisi.<br/> Etiam vel nulla diam.<br/> sit amet adipiscing lorem.<br/> Nullam aliquet dui suscipit elit dictum ut porta nibh ullamcorper.<br/> <br/> Integer at erat vitae est posuere vehicula vel faucibus mi.<br/> Maecenas odio metus.<br/> euismod a commodo eu.<br/> egestas vitae quam.<br/> Quisque ac commodo leo.<br/> Maecenas ut diam turpis.<br/> et auctor arcu.<br/> Curabitur <br/> augue id purus mollis semper.<br/> Proin id libero et tortor luctus scelerisque.<br/> Aliquam pellentesque.<br/> tellus vitae vulputate placerat.<br/> lorem quam feugiat sem.<br/> non sodales justo lacus sed nisi.<br/> <br/> Phasellus quis tellus turpis.<br/> id tincidunt nunc.<br/> Aenean tristique tristique libero.<br/> id elementum nunc <br/> quis.<br/> Pellentesque mollis auctor massa.<br/> ut lobortis purus mollis mollis.<br/> Phasellus ullamcorper magna nec libero posuere vel feugiat orci dictum.<br/> Duis lacinia aliquet laoreet.<br/> Etiam justo tellus.<br/> lobortis a feugiat at.<br/> consequat ut urna.<br/> Fusce rhoncus.<br/> nibh et malesuada aliquam.<br/> nisl orci vehicula dui.<br/> vitae tincidunt lorem risus a sem.<br/> Integer nec enim sapien.<br/> Fusce sodales nisl non lacus molestie at tempus tortor fringilla.<br/> Maecenas elementum ornare sem.<br/> eu cursus risus eleifend vel.<br/> Ut laoreet consequat risus at facilisis.<br/> <br/> Nunc facilisis urna lobortis ante eleifend vestibulum.<br/> Pellentesque blandit.<br/> ante at malesuada congue.<br/> augue enim adipiscing dui.<br/> in malesuada nibh neque <br/> arcu.<br/> Nunc velit nibh.<br/> pharetra id accumsan vel.<br/> dignissim in sem.<br/> Duis scelerisque tincidunt urna non consequat.<br/> Nullam eu quam nec diam interdum dapibus.<br/> Donec at eros eu elit varius tempor.<br/> Donec vel nunc ac diam luctus hendrerit eu nec nibh.<br/> Nam quis ultrices ante.<br/> Fusce placerat libero et lectus dapibus sit amet porta enim auctor.<br/> Sed molestie nulla tincidunt nisi scelerisque interdum.<br/> Aliquam tristique hendrerit est.<br/> in faucibus eros consectetur et.<br/> Vestibulum pulvinar elit eu tortor dapibus pharetra.<br/> Etiam sit amet tortor dui.<br/> Aenean vitae nulla ac mi dictum aliquam.<br/> Aenean nec ante <br/> leo fringilla porttitor.<br/> <br/> Donec ac tincidunt purus.<br/> Integer volutpat pharetra turpis in aliquet.<br/> Nam semper convallis enim ac gravida.<br/> Donec pretium nulla sit amet est blandit vel venenatis neque blandit.<br/> Vivamus nec arcu vel odio vehicula fermentum at vitae enim.<br/> Integer libero augue.<br/> hendrerit non iaculis nec.<br/> facilisis ac felis.<br/> Nunc turpis sapien.<br/> pellentesque a lobortis id.<br/> fermentum nec felis.<br/> Quisque velit magna.<br/> convallis in hendrerit non.<br/> rhoncus <br/> nisl.<br/> Aenean convallis arcu a magna aliquam et ultricies augue lacinia.<br/> Sed aliquam accumsan eros.<br/> <br/> pharetra mauris placerat ut.<br/> Phasellus diam metus.<br/> <br/> id blandit <br/>.<br/> malesuada et nunc.<br/> Etiam non nibh ut massa adipiscing elementum sed vitae velit.<br/> Sed in dui diam.<br/> non consequat est.<br/> <br/> Pellentesque eu dolor elit.<br/> vitae facilisis odio.<br/> Curabitur <br/> tortor nisl.<br/> nec adipiscing est.<br/> Fusce lacinia.<br/> lectus ac tempor pulvinar.<br/> nisi lorem placerat odio.<br/> quis ultrices velit neque vitae erat.<br/> Cras sed turpis nisl.<br/> non pretium massa.<br/> Vestibulum porta pharetra consectetur.<br/> Maecenas viverra ultricies velit vitae varius.<br/> Donec bibendum semper massa.<br/> vitae dictum erat gravida ut.<br/> Maecenas at metus neque.<br/> nec tristique lorem.<br/> Suspendisse nulla ligula.<br/> molestie in laoreet ut.<br/> consequat nec tortor.<br/> Cras <br/> metus at nisl mattis adipiscing.<br/> Donec laoreet pellentesque massa.<br/> id mollis risus facilisis nec.<br/> <br/> Proin tellus lacus.<br/> semper non tincidunt vitae.<br/> vestibulum nec eros.<br/> Vivamus dictum volutpat tristique.<br/> Proin ut nunc sit amet lorem convallis tempor.<br/> Mauris metus erat.<br/> tempus nec hendrerit condimentum.<br/> <br/> vel augue.<br/> Donec venenatis iaculis nunc.<br/> volutpat auctor libero placerat id.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Praesent sodales purus id est accumsan tincidunt.<br/> Mauris in molestie tellus.<br/> Pellentesque a ultricies nulla.<br/> Curabitur suscipit leo congue tortor fermentum elementum.<br/> Suspendisse <br/> nibh orci.<br/> sed facilisis libero.<br/> Donec sit amet lobortis magna.<br/> Cum sociis natoque penatibus et magnis dis parturient montes.<br/> nascetur ridiculus mus.<br/> In imperdiet malesuada cursus.<br/> Donec non orci felis.<br/> Phasellus vitae augue sit amet nulla tempus semper.<br/> <br/> Suspendisse potenti.<br/> Duis nunc est.<br/> sollicitudin <br/> congue ut.<br/> lacinia et lorem.<br/> Duis sagittis tempus tempus.<br/> Sed arcu lectus.<br/> lacinia non <br/> at.<br/> molestie nec diam.<br/> Donec tristique consectetur eleifend.<br/> Donec condimentum gravida massa.<br/> at venenatis velit tincidunt id.<br/> Phasellus placerat vulputate tempus.<br/> Proin fermentum sagittis mollis.<br/> Sed iaculis elit id metus tincidunt sed fringilla eros hendrerit.<br/> Nam at turpis quis felis pretium eleifend lobortis eu risus.<br/> Nam <br/> ligula enim.<br/> Vestibulum ut convallis massa.<br/> <br/> Maecenas accumsan lorem vel leo cursus auctor.<br/> Nulla vulputate.<br/> neque vitae tincidunt facilisis.<br/> risus diam interdum nunc.<br/> eu commodo nunc mauris et lacus.<br/> Pellentesque a velit nisl.<br/> Maecenas pulvinar diam <br/> lorem dictum sit amet sollicitudin massa mattis.<br/> Nunc vel justo ut enim interdum elementum lobortis ut dolor.<br/> Suspendisse non ligula nec est consectetur semper.<br/> Aliquam non eleifend urna.<br/> Nunc leo lorem.<br/> sodales non malesuada a.<br/> convallis quis lectus.<br/> Sed non ligula et elit ultricies pretium a in quam.<br/> Proin <br/> mattis leo sit amet posuere.<br/> Sed sed justo libero.<br/> Donec interdum.<br/> metus sit amet imperdiet imperdiet.<br/> purus leo dictum dui.<br/> id consequat enim magna <br/> ipsum.<br/> <br/> Duis aliquet nisl in odio dapibus aliquet.<br/> Donec molestie commodo volutpat.<br/> Nulla molestie neque non arcu dignissim tincidunt.<br/> Donec ligula mauris.<br/> faucibus ut dictum non.<br/> iaculis <br/> eros.<br/> Cras pulvinar.<br/> tortor vel euismod elementum.<br/> libero elit semper diam.<br/> at semper libero urna at massa.<br/> Ut malesuada.<br/> nibh eu sodales dictum.<br/> turpis leo dictum enim.<br/> ultricies laoreet arcu neque in erat.<br/> Phasellus ultricies eleifend velit id sollicitudin.<br/> Nulla mattis aliquet diam non hendrerit.<br/> Nunc laoreet sem eu lorem gravida ultricies.<br/> Vestibulum vel mauris dui.<br/> at congue nisi.<br/> Vivamus nec nulla nulla.<br/> a dapibus lacus.<br/> Morbi ut fringilla erat.<br/> Aliquam metus risus.<br/> lacinia at <br/> sit amet.<br/> accumsan at augue.<br/> <br/> Cras justo augue.<br/> egestas vel egestas at.<br/> sagittis eu leo.<br/> Cras ut lorem turpis.<br/> Nulla dolor magna.<br/> volutpat aliquet semper vitae.<br/> fermentum in nibh.<br/> Mauris faucibus faucibus sagittis.<br/> Sed nunc felis.<br/> pellentesque non faucibus vitae.<br/> fringilla vel erat.<br/> Ut ut enim tortor.<br/> in laoreet turpis.<br/> Vivamus <br/> massa felis.<br/> sed pharetra tellus.<br/> Duis congue porttitor ligula.<br/> at blandit felis semper id.<br/> <br/> Integer rhoncus est vel erat placerat convallis lacinia nisl varius.<br/> Morbi condimentum arcu et lorem porttitor at dignissim ipsum adipiscing.<br/> Vestibulum porttitor euismod nibh.<br/> quis pretium risus porttitor vitae.<br/> Nulla vestibulum ante eu purus pretium varius.<br/> Phasellus fringilla est vel nunc dapibus cursus.<br/> Pellentesque a ligula vitae dui feugiat rhoncus.<br/> Cras faucibus magna et eros aliquam eu eleifend mauris fringilla.<br/> Morbi nec imperdiet turpis.<br/> <br/> Sed luctus hendrerit malesuada.<br/> Integer iaculis mi <br/> velit venenatis tincidunt.<br/> Ut <br/> elit non erat aliquam vestibulum.<br/> Nulla facilisi.<br/> Nulla convallis risus at ante sollicitudin faucibus.<br/> Praesent sapien elit.<br/> varius quis fermentum nec.<br/> scelerisque quis libero.<br/> In ut ante mauris.<br/> non tempor nunc.<br/> Nulla facilisi.<br/> Aliquam sit amet mi nisi.<br/> sodales pretium massa.<br/> Duis ultrices lobortis nisl.<br/> in feugiat purus bibendum ac.<br/> Donec urna purus.<br/> convallis vel fermentum at.<br/> tincidunt et enim.<br/> Sed pretium malesuada ornare.<br/> Maecenas cursus pretium turpis vel cursus.<br/> <br/> Cras metus erat.<br/> consectetur eu ultricies in.<br/> ornare ut nisi.<br/> Aenean velit ipsum.<br/> vestibulum ut condimentum et.<br/> aliquet ut lectus.<br/> Integer et odio in libero consequat aliquam.<br/> Donec fermentum enim mauris.<br/> Sed iaculis convallis nibh at pellentesque.<br/> Curabitur placerat ligula sit amet nisi vestibulum aliquam.<br/> Suspendisse <br/> dolor ligula.<br/> Fusce vel arcu arcu.<br/> ut ornare lectus.<br/> Class aptent taciti sociosqu ad litora torquent per conubia nostra.<br/> per inceptos himenaeos.<br/> Ut non eros sed lectus molestie cursus.<br/> Nam <br/> arcu augue.<br/> vulputate suscipit purus.<br/> Praesent sed metus id est pulvinar egestas.<br/> Maecenas accumsan magna eu risus tristique <br/> sollicitudin est lobortis.<br/> Morbi gravida dictum purus.<br/> et consequat ipsum consectetur ornare.<br/> <br/> Donec bibendum.<br/> arcu non euismod semper.<br/> nibh ipsum dictum erat.<br/> vitae hendrerit nibh nisi a turpis.<br/> Vestibulum placerat lobortis quam.<br/> et blandit ligula euismod sit amet.<br/> Maecenas quis quam erat.<br/> non tincidunt odio.<br/> Praesent <br/> urna non turpis blandit fringilla faucibus a sem.<br/> Proin quis mauris libero.<br/> lobortis fringilla ante.<br/> Sed <br/> convallis nibh ac pellentesque.<br/> Praesent non sem quis dolor ornare scelerisque.<br/> Sed metus mauris.<br/> tincidunt nec congue in.<br/> convallis quis lectus.<br/> Integer mi elit.<br/> porttitor sit amet tristique sit amet.<br/> bibendum ultrices erat.<br/> Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> Vestibulum id dui justo.<br/> Nunc placerat.<br/> ipsum at porta congue.<br/> nisi metus luctus nunc.<br/> ut volutpat nulla ligula sed elit.<br/> <br/> Nullam gravida nulla ac orci aliquam faucibus.<br/> Donec quis eros eu arcu luctus sodales vitae et ante.<br/> Fusce vel laoreet ante.<br/> Ut volutpat faucibus tortor.<br/> vel laoreet nisi sodales a.<br/> Aliquam imperdiet urna et lacus luctus sollicitudin.<br/> Proin ante nisi.<br/> laoreet vitae accumsan a.<br/> venenatis fringilla quam.<br/> Donec lorem odio.<br/> sodales vel ultrices a.<br/> commodo quis erat.<br/> Vestibulum non sapien velit.<br/> sit amet hendrerit lacus.<br/> Donec ut tincidunt lectus.<br/> Sed dictum nibh pulvinar nisi facilisis in ultrices nunc ornare.<br/> In ut dictum diam.<br/> Maecenas porttitor eros ac est tempor accumsan.<br/> Vestibulum velit mauris.<br/> blandit ac ultricies sit amet.<br/> fermentum sed velit.<br/> Etiam dolor ligula.<br/> gravida a varius id.<br/> porta sed lacus.<br/> Suspendisse potenti.<br/> Donec <br/> bibendum leo.<br/> <br/> Vestibulum elementum.<br/> mauris in placerat iaculis.<br/> dolor eros rhoncus augue.<br/> id dictum ante odio eu massa.<br/> In ultricies nibh a felis volutpat at facilisis risus scelerisque.<br/> Nunc aliquam arcu id sapien egestas vel mollis orci faucibus.<br/> Sed dignissim.<br/> metus sit amet egestas tristique.<br/> augue libero mollis enim.<br/> ut elementum diam leo non dolor.<br/> Nam id justo non leo ornare ut sit amet nibh.<br/> Vivamus a mauris.<br/> ac elit.<br/> Donec velit neque.<br/> aliquet a ultrices in.<br/> tempus id neque.<br/> Etiam et sem vitae ante eu vitae ligula.<br/> Donec quis pulvinar lorem.<br/> Integer euismod.<br/> leo a condimentum commodo.<br/> felis sem <br/> urna.<br/> ut feugiat leo turpis <br/> nisl.<br/> Maecenas blandit sagittis neque.<br/> et pharetra nisl molestie vitae.<br/> Ut posuere libero vel tellus rhoncus ut convallis turpis placerat.<br/> Mauris nec purus eu lacus laoreet mollis.<br/> Cras tristique lorem vitae nulla consectetur pretium.<br/> Nunc vel mi enim.<br/> ut hendrerit arcu.<br/> <br/> Proin dui lacus.<br/> mollis ac eleifend id.<br/> ultricies vitae elit.<br/> Aliquam imperdiet porta posuere.<br/> Aliquam pulvinar commodo nunc.<br/> ut commodo lacus pulvinar ac.<br/> Duis gravida odio in mi venenatis adipiscing.<br/> Nulla vitae nisi ac elit sodales placerat.<br/> Proin at turpis diam.<br/> Duis nec mi vehicula sapien consequat convallis.<br/> Mauris eu volutpat nunc.<br/> <br/> Donec mollis vulputate suscipit.<br/> Aenean egestas urna non metus rhoncus euismod.<br/> Mauris imperdiet convallis convallis.<br/> Sed tristique ligula ac mauris convallis ultricies.<br/> Fusce mi felis.<br/> ultrices ut pretium ut.<br/> sollicitudin non tortor.<br/> Praesent quis purus in massa cursus ornare.<br/> Nulla sagittis purus eu risus ultrices consectetur.<br/> <br/> Vivamus non quam orci.<br/> in molestie odio.<br/> Mauris ac tellus ac eros luctus commodo.<br/> Morbi quis sapien eleifend nibh tristique volutpat ut in nulla.<br/> Fusce <br/> dolor et nibh mollis consectetur vel eu arcu.<br/> Donec feugiat eros a quam mattis varius.<br/> Maecenas risus libero.<br/> mattis a adipiscing et.<br/> viverra sed elit.<br/> Fusce id leo non massa dapibus cursus.<br/> Ut porttitor.<br/> metus non accumsan consequat.<br/> tortor orci eleifend dolor.<br/> id vestibulum enim mauris convallis diam.<br/> Quisque dui lectus.<br/> tempor vel ultricies id.<br/> sagittis ultrices nibh.<br/> Quisque facilisis dui sed sem mattis elementum.<br/> Sed <br/> congue eros.<br/> Sed accumsan imperdiet enim at venenatis.<br/> Duis ut facilisis eros.<br/> <br/> Aliquam nec metus sit amet est mollis semper.<br/> Cum sociis natoque penatibus et magnis dis parturient montes.<br/> nascetur ridiculus mus.<br/> Pellentesque laoreet.<br/> massa sed facilisis dignissim.<br/> dolor leo tempor lacus.<br/> eu commodo dolor ante ut orci.<br/> Cras mollis malesuada nulla.<br/> <br/> commodo nisl tristique et.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nunc condimentum egestas eleifend.<br/> Sed fringilla.<br/> justo molestie pellentesque auctor.<br/> magna mauris tincidunt lectus.<br/> non auctor purus sem sit amet felis.<br/> Aenean lectus lacus.<br/> viverra scelerisque vestibulum eu.<br/> mattis nec dui.<br/> Nunc ac malesuada elit.<br/> <br/> Nulla aliquet aliquam mattis.<br/> Integer eleifend nibh quis nisi vulputate iaculis.<br/> Suspendisse fermentum dapibus sem.<br/> Vestibulum sed diam augue.<br/> Cras mollis.<br/> ipsum quis porta malesuada.<br/> libero enim gravida dolor.<br/> vel eleifend velit massa at metus.<br/> Suspendisse eu nibh mi.<br/> Vivamus aliquam odio a lacus volutpat venenatis.<br/> Vestibulum nec est a erat auctor feugiat.<br/> Quisque nulla nisl.<br/> luctus sed pellentesque vitae.<br/> volutpat at tortor.<br/> Donec auctor.<br/> dui sed porttitor egestas.<br/> felis dolor pretium magna.<br/> gravida volutpat tellus leo at quam.<br/> Nam orci neque.<br/> aliquam nec tincidunt a.<br/> condimentum id neque.<br/> Duis eu nulla ligula.<br/> Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> Proin et magna neque.<br/> in hendrerit libero.<br/> Proin dapibus tortor non sem facilisis condimentum.<br/> <br/> Nulla facilisi.<br/> Nam sagittis.<br/> lectus consectetur blandit blandit.<br/> sem turpis sollicitudin purus.<br/> non vulputate arcu ligula <br/> nulla.<br/> Curabitur tristique.<br/> orci quis aliquam fermentum.<br/> tellus felis pulvinar tellus.<br/> nec imperdiet libero neque ac elit.<br/> Fusce imperdiet nunc sit amet orci tempor dictum ut vitae ligula.<br/> Donec et velit nibh.<br/> In imperdiet facilisis nibh nec vestibulum.<br/> Maecenas ut sodales turpis.<br/> Praesent condimentum eros orci.<br/> <br/> auctor elit.<br/> Class aptent taciti sociosqu ad litora torquent per conubia nostra.<br/> per inceptos himenaeos.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Vestibulum commodo enim a risus molestie vestibulum.<br/> Curabitur eu <br/> purus.<br/> Suspendisse potenti.<br/> Vivamus dolor metus.<br/> adipiscing quis pulvinar vel.<br/> venenatis non erat.<br/> Vestibulum eu turpis ipsum.<br/> <br/> Donec <br/> tempor sem non ullamcorper.<br/> Cras nibh enim.<br/> interdum <br/> tempor eu.<br/> lacinia quis lorem.<br/> Cras elit nibh.<br/> tincidunt eu fringilla id.<br/> scelerisque <br/> felis.<br/> Cras pretium diam vel turpis sollicitudin vestibulum.<br/> Nunc commodo facilisis tempor.<br/> Nunc tincidunt ornare magna vitae vestibulum.<br/> In tincidunt sem non dui vestibulum nec luctus justo sagittis.<br/> Integer viverra nunc sit amet est lobortis tempor.<br/> Sed sed risus turpis.<br/> Ut volutpat viverra consectetur.<br/> Etiam lorem sem.<br/> laoreet et molestie quis.<br/> posuere nec enim.<br/> Pellentesque semper tincidunt dolor sed pretium.<br/> Donec elementum ornare sapien.<br/> sit amet feugiat nisl gravida dignissim.<br/> Maecenas vel magna magna.<br/> sagittis euismod velit.<br/> Etiam fringilla.<br/> erat nec ornare iaculis.<br/> massa turpis pharetra eros.<br/> sed iaculis leo dolor vel arcu.<br/> Aliquam id leo lorem.<br/> nec tempus arcu.<br/> <br/> Pellentesque pulvinar.<br/> sapien vitae euismod luctus.<br/> dolor ante placerat quam.<br/> in viverra mi mi non tortor.<br/> Nullam sit amet justo libero.<br/> In et arcu orci.<br/> sed tempor lacus.<br/> Cras at magna erat.<br/> Sed in ligula purus.<br/> nec suscipit orci.<br/> Vivamus a nisi leo.<br/> Ut venenatis.<br/> velit in ullamcorper fermentum.<br/> metus lacus rhoncus ante.<br/> a semper sapien ipsum quis urna.<br/> <br/> Cras cursus rhoncus erat.<br/> nec fermentum lacus ultrices nec.<br/> Pellentesque pellentesque dui sit amet nulla viverra pharetra.<br/> Pellentesque at magna in lorem auctor adipiscing.<br/> Donec suscipit semper risus in tincidunt.<br/> Fusce ornare commodo feugiat.<br/> Pellentesque lectus enim.<br/> hendrerit at condimentum a.<br/> venenatis in tortor.<br/> Vestibulum volutpat tortor in ipsum consectetur eu volutpat libero suscipit.<br/> Donec vel nibh nisl.<br/> ac suscipit mi.<br/> Pellentesque interdum quam ut enim aliquam tempor consectetur arcu convallis.<br/> In scelerisque suscipit enim id vestibulum.<br/> Vestibulum sollicitudin lorem quis sem condimentum non cursus magna consequat.<br/> Sed <br/> mollis ligula vel posuere.<br/> Praesent vitae mi vel nunc fermentum dictum.<br/> <br/> Mauris vehicula ultricies tortor.<br/> ut hendrerit nulla condimentum id.<br/> Praesent quis nisl ipsum.<br/> Donec nec nulla a purus porta sodales ac id lacus.<br/> Mauris pulvinar urna et lorem ultricies sit amet fermentum ipsum suscipit.<br/> Curabitur tincidunt auctor est.<br/> et ullamcorper neque commodo vel.<br/> Integer ultricies.<br/> sapien vel vestibulum convallis.<br/> tortor arcu ultrices ipsum.<br/> ut aliquet sem odio id lacus.<br/> Nulla sem dolor.<br/> luctus bibendum vestibulum ac.<br/> condimentum ac magna.<br/> Nulla nec elit mauris.<br/> Pellentesque lobortis dui in enim faucibus quis dignissim mauris tristique.<br/> <br/> Donec at quam odio.<br/> Aliquam posuere feugiat lorem.<br/> quis aliquet purus fermentum a.<br/> Sed bibendum est ut lorem condimentum varius.<br/> Phasellus magna tortor.<br/> tristique sit amet rhoncus vitae.<br/> congue at metus.<br/> In volutpat metus non nulla egestas scelerisque.<br/> Vivamus nulla purus.<br/> rhoncus <br/> ornare in.<br/> aliquet at metus.<br/> Aliquam adipiscing ultricies libero.<br/> sit amet mattis diam auctor at.<br/> Donec sed tellus sed nisl iaculis mollis.<br/> Nulla sit amet leo a nisl vehicula vestibulum.<br/> In hac habitasse platea dictumst.<br/> Curabitur commodo.<br/> justo pretium adipiscing pretium.<br/> est sem vulputate libero.<br/> eu consequat nibh quam vel tellus.<br/> <br/> Donec ornare massa et leo rhoncus facilisis.<br/> Fusce ullamcorper sagittis laoreet.<br/> Praesent sollicitudin.<br/> nisl sit amet porttitor commodo.<br/> ligula enim faucibus diam.<br/> vel interdum odio tortor ut eros.<br/> In fringilla tincidunt cursus.<br/> Pellentesque ut massa nibh.<br/> id suscipit ante.<br/> Curabitur non massa at mi condimentum gravida <br/> vitae nisl.<br/> Nulla facilisi.<br/> Sed tincidunt arcu <br/> orci tempus congue.<br/> In fringilla dignissim bibendum.<br/> Sed mi magna.<br/> fringilla sed dignissim ac.<br/> porttitor et mauris.<br/> Vivamus porta purus in nulla imperdiet <br/> ultrices nisl auctor.<br/> Praesent placerat dictum nisl ac accumsan.<br/> Morbi gravida blandit orci et euismod.<br/> <br/> Suspendisse potenti.<br/> In vehicula leo a tellus rhoncus varius.<br/> Curabitur adipiscing tincidunt purus.<br/> vel imperdiet purus dapibus quis.<br/> Duis augue turpis.<br/> sagittis <br/> elementum malesuada.<br/> consequat vitae risus.<br/> Integer eu erat nibh.<br/> ut varius ligula.<br/> Nunc pharetra tristique dui.<br/> posuere viverra orci aliquam <br/>.<br/> Phasellus posuere.<br/> tortor <br/> rhoncus malesuada.<br/> dolor massa egestas sapien.<br/> sit amet dignissim nunc nisl <br/> felis.<br/> Donec fringilla faucibus risus nec hendrerit.<br/> <br/> Vestibulum a turpis nec turpis <br/> auctor.<br/> Suspendisse massa urna.<br/> mollis eu laoreet et.<br/> pulvinar id eros.<br/> Integer vitae diam nec tellus dignissim interdum.<br/> Vivamus nibh nisi.<br/> venenatis sit amet congue <br/>.<br/> porta eu mauris.<br/> Nam <br/> mattis enim vel pharetra.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Aliquam luctus laoreet elit.<br/> at rhoncus ante luctus euismod.<br/> Fusce tristique.<br/> lectus ac sodales aliquam.<br/> massa tellus volutpat augue.<br/> ut dictum massa est non elit.<br/> Sed nec posuere lacus.<br/> Maecenas nec tortor nisl.<br/> Vestibulum neque sapien.<br/> accumsan vel malesuada quis.<br/> ultricies sed dolor.<br/> Proin nec velit dui.<br/> at bibendum tellus.<br/> Praesent scelerisque.<br/> justo in aliquet tempus.<br/> felis lorem pellentesque nunc.<br/> et consectetur eros urna ac dui.<br/> <br/> Proin et lectus velit.<br/> et bibendum ante.<br/> Pellentesque sagittis neque nec erat bibendum fermentum.<br/> In fermentum adipiscing risus et sagittis.<br/> Praesent ut ultrices magna.<br/> Nunc non nisl massa.<br/> nec volutpat massa.<br/> Sed diam magna.<br/> molestie nec euismod et.<br/> lobortis vitae tortor.<br/> Vivamus tristique adipiscing sapien vitae consequat.<br/> Maecenas magna sapien.<br/> dignissim ut consectetur non.<br/> pharetra quis leo.<br/> In aliquam mi <br/> risus fringilla vehicula.<br/> Fusce nisl turpis.<br/> viverra feugiat tempus quis.<br/> semper sed est.<br/> Cras orci libero.<br/> sagittis ornare gravida eu.<br/> vestibulum vehicula tellus.<br/> Pellentesque et dui enim.<br/> ac volutpat nisi.<br/> Duis <br/> faucibus lectus.<br/> accumsan imperdiet mauris pellentesque ut.<br/> Morbi nec pharetra tellus.<br/> Vestibulum luctus faucibus scelerisque.<br/> In felis enim.<br/> tincidunt nec tincidunt feugiat.<br/> sodales quis erat.<br/> <br/> Phasellus pellentesque posuere orci.<br/> ac porta quam porttitor vel.<br/> Cras condimentum rhoncus lorem non tincidunt.<br/> In cursus congue lorem.<br/> ut venenatis orci tempor sed.<br/> Fusce ac varius purus.<br/> Nullam quis lectus quis quam porttitor cursus.<br/> Nunc in sem nibh.<br/> sit amet suscipit velit.<br/> Cum sociis natoque penatibus et magnis dis parturient montes.<br/> nascetur ridiculus mus.<br/> Aenean sagittis.<br/> arcu eu blandit accumsan.<br/> purus mauris molestie nibh.<br/> vitae placerat metus turpis sit amet nunc.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec ac pretium metus.<br/> <br/> Quisque ac congue est.<br/> Pellentesque quis sapien vel diam sagittis condimentum tincidunt et lorem.<br/> Proin sed quam eros.<br/> Pellentesque congue eros dapibus diam faucibus tempor.<br/> Vestibulum et faucibus diam.<br/> Nullam nisi lorem.<br/> elementum id gravida a.<br/> blandit ac ante.<br/> Sed <br/> turpis est.<br/> Vestibulum quis diam non dolor dictum consectetur in quis urna.<br/> Cras vel mi sit amet purus interdum faucibus.<br/> Ut nisi quam.<br/> tempor quis luctus blandit.<br/> euismod ac elit.<br/> Nunc et lacus est.<br/> vitae suscipit mauris.<br/> Phasellus congue consequat iaculis.<br/> <br/> Pellentesque dictum dignissim nisl.<br/> quis hendrerit neque tempus nec.<br/> Integer dui risus.<br/> varius eu fringilla id.<br/> sollicitudin sit amet justo.<br/> Sed suscipit feugiat tellus et placerat.<br/> Nam quis rhoncus lorem.<br/> Phasellus magna quam.<br/> tristique vel vehicula nec.<br/> tincidunt ut felis.<br/> Mauris molestie accumsan gravida.<br/> Sed vitae neque odio.<br/> Suspendisse pellentesque scelerisque felis <br/> vulputate.<br/> Ut vel tellus nisi.<br/> Quisque diam magna.<br/> varius vitae egestas in.<br/> elementum in orci.<br/> Integer venenatis bibendum luctus.<br/> Donec feugiat nunc id lectus feugiat ac bibendum neque lacinia.<br/> Fusce arcu tortor.<br/> eleifend et pulvinar ut.<br/> lacinia ut velit.<br/> Fusce quis semper eros.<br/> <br/> Quisque placerat nibh eros.<br/> Nam rhoncus suscipit neque vitae pulvinar.<br/> In adipiscing consectetur leo <br/> volutpat.<br/> Aenean scelerisque risus ut elit elementum a venenatis augue bibendum.<br/> Nullam sit amet feugiat enim.<br/> Nam at arcu ac lacus auctor hendrerit quis non magna.<br/> Praesent iaculis mi sollicitudin leo lobortis varius.<br/> Curabitur lobortis imperdiet lacus non hendrerit.<br/> Vestibulum vel ligula dui.<br/> ut viverra augue.<br/> Vestibulum in nisl non lorem auctor cursus sed euismod nunc.<br/> <br/> Nunc elementum mauris non arcu feugiat ut volutpat nisl bibendum.<br/> Ut vel nunc mauris.<br/> viverra vestibulum tellus.<br/> Etiam quam nibh.<br/> sollicitudin id elementum euismod.<br/> lobortis non diam.<br/> Phasellus varius.<br/> nulla nec laoreet commodo.<br/> diam eros pharetra orci.<br/> feugiat tempor augue risus ac nisl.<br/> Integer eu tortor odio.<br/> vitae tincidunt lectus.<br/> Aliquam erat volutpat.<br/> Suspendisse potenti.<br/> Curabitur convallis pulvinar massa.<br/> Aliquam quam ipsum.<br/> tincidunt sed bibendum id.<br/> auctor ultrices elit.<br/> Morbi et blandit dolor.<br/> Curabitur quam quam.<br/> condimentum non cursus in.<br/> gravida <br/> sapien.<br/> Maecenas ut eros enim.<br/> vel luctus felis.<br/> Pellentesque neque turpis.<br/> blandit sed malesuada et.<br/> porttitor <br/> erat.<br/> Nullam eu pharetra erat.<br/> <br/> Suspendisse auctor sem sed eros suscipit et sollicitudin est fermentum.<br/> Donec sit amet erat sed diam consectetur tempus et <br/> mi.<br/> In ligula mi.<br/> aliquam a egestas et.<br/> cursus congue augue.<br/> Vivamus ac ante massa.<br/> et vulputate lorem.<br/> Proin accumsan placerat justo eu bibendum.<br/> Nunc nec lorem vitae ipsum luctus tincidunt ut sed erat.<br/> Quisque laoreet gravida hendrerit.<br/> Aliquam erat volutpat.<br/> Duis ut arcu eros.<br/> Cras faucibus enim id arcu pellentesque interdum.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Curabitur dolor leo.<br/> pretium quis viverra in.<br/> mollis at nisi.<br/> Morbi tristique nisl vel velit auctor non porttitor nibh molestie.<br/> Nam sed sodales lorem.<br/> Donec dignissim.<br/> lectus fermentum sagittis dignissim.<br/> eros est hendrerit dui.<br/> sed molestie mi eros sit amet orci.<br/> <br/> Curabitur sit amet nibh arcu.<br/> Nam consectetur vulputate enim tincidunt vestibulum.<br/> Nunc non odio a enim blandit convallis et et est.<br/> Sed varius neque vitae enim interdum tempor.<br/> Donec ante purus.<br/> <br/> id dapibus sit amet.<br/> <br/> id tortor.<br/> Cras hendrerit.<br/> metus sit amet consectetur auctor.<br/> lectus ante porttitor leo.<br/> sed tempor libero arcu ac nunc.<br/> Suspendisse sapien orci.<br/> consectetur a adipiscing ac.<br/> posuere nec magna.<br/> <br/> Duis sodales sagittis ornare.<br/> Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> Sed at dolor lorem.<br/> laoreet imperdiet dui.<br/> Curabitur in cursus dui.<br/> Donec dictum orci nec ipsum auctor sit amet pulvinar ipsum venenatis.<br/> Donec pellentesque odio ac arcu pellentesque iaculis.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Ut mattis luctus quam.<br/> et imperdiet risus viverra id.<br/> Cras pellentesque euismod enim ac lobortis.<br/> Suspendisse potenti.<br/> Integer ullamcorper diam tellus.<br/> Proin pulvinar sapien sed eros varius fringilla.<br/> <br/> Aliquam commodo.<br/> lectus et ornare dignissim.<br/> massa mauris adipiscing nibh.<br/> egestas aliquam libero mi a urna.<br/> Suspendisse <br/> sapien eu elit lacinia congue.<br/> Nulla at est eros.<br/> In a massa et dolor mollis ullamcorper.<br/> Pellentesque in ligula lectus.<br/> imperdiet lacinia augue.<br/> Nullam pulvinar tortor a enim posuere at blandit est commodo.<br/> Curabitur tristique sagittis erat.<br/> sed rhoncus turpis porta eu.<br/> Aenean volutpat mauris sed velit euismod gravida.<br/> Nunc faucibus orci lacinia massa pretium pretium.<br/> <br/> Cras vehicula auctor sapien.<br/> a suscipit eros molestie non.<br/> Quisque odio nulla.<br/> malesuada et malesuada <br/>.<br/> facilisis ac quam.<br/> Pellentesque nulla tellus.<br/> ultrices ac consequat ut.<br/> eleifend sed turpis.<br/> Nam nec orci elit.<br/> vel tempor diam.<br/> Aenean rhoncus eleifend mauris.<br/> sed ornare justo fringilla a.<br/> Quisque non libero libero.<br/> Praesent sollicitudin placerat quam ac tempor.<br/> Curabitur pulvinar fringilla diam.<br/> id porttitor risus congue convallis.<br/> Pellentesque vestibulum turpis ut justo varius fringilla.<br/> Ut <br/> urna quis mauris lobortis hendrerit vel vitae sapien.<br/> Mauris quis ullamcorper est.<br/> Proin eleifend placerat consequat.<br/> Maecenas et arcu at nisl volutpat egestas.<br/> <br/> Sed fringilla metus quis ipsum tristique quis venenatis tellus sagittis.<br/> Duis ultrices.<br/> dolor et condimentum fermentum.<br/> leo turpis tempus enim.<br/> sit amet tempor risus magna vel nibh.<br/> Praesent volutpat.<br/> risus non blandit <br/>.<br/> mi ante sagittis justo.<br/> at aliquet quam ipsum vel nulla.<br/> Nulla est lacus.<br/> feugiat sed hendrerit non.<br/> hendrerit a augue.<br/> Pellentesque ultrices elementum lectus molestie dictum.<br/> Vivamus sagittis erat eu turpis viverra eu <br/> odio interdum.<br/> Aenean lacinia quam ac dui faucibus a iaculis est porta.<br/> Sed leo arcu.<br/> suscipit non faucibus id.<br/> sollicitudin sit amet est.<br/> Nulla id laoreet ligula.<br/> Maecenas hendrerit nunc <br/> neque egestas quis pretium leo consectetur.<br/> Suspendisse mi mi.<br/> scelerisque et aliquam quis.<br/> porttitor id lorem.<br/> Nam tempus pellentesque ornare.<br/> <br/> Donec est turpis.<br/> cursus euismod vehicula elementum.<br/> iaculis nec dui.<br/> Donec blandit tincidunt euismod.<br/> Aenean dapibus.<br/> magna id mattis faucibus.<br/> lectus justo ultricies lectus.<br/> in feugiat tortor dui sed tellus.<br/> Duis in massa vitae purus gravida auctor <br/> a nibh.<br/> Proin elementum tristique luctus.<br/> Integer laoreet iaculis magna a luctus.<br/> Nunc consequat lacinia magna.<br/> at mollis quam blandit ac.<br/> Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> Sed <br/> neque et quam vehicula blandit non a erat.<br/> Ut id magna a lorem ornare luctus in <br/> lorem.<br/> Aliquam erat volutpat.<br/> Etiam mollis nisl id massa sodales vel eleifend nisi feugiat.<br/> <br/> Morbi a felis eros.<br/> a posuere ligula.<br/> Phasellus <br/> porttitor tincidunt.<br/> Sed euismod.<br/> ante ac varius dapibus.<br/> ante eros aliquet massa.<br/> varius euismod nisi neque non velit.<br/> Mauris iaculis.<br/> justo id gravida fringilla.<br/> erat lectus vestibulum urna.<br/> et mattis nibh diam ut quam.<br/> Nulla ac lorem in orci ultricies luctus et vel mauris.<br/> Pellentesque adipiscing.<br/> diam dapibus elementum faucibus.<br/> lectus ipsum pharetra elit.<br/> <br/> malesuada odio urna ut elit.<br/> Suspendisse suscipit pulvinar porttitor.<br/> Phasellus justo massa.<br/> tempus eu viverra ac.<br/> suscipit et nibh.<br/> Ut sed ligula vitae turpis tempus tristique <br/> ac velit.<br/> Aliquam nunc libero.<br/> molestie rhoncus auctor nec.<br/> tincidunt a risus.<br/> In sit amet enim sed sapien volutpat rhoncus.<br/> <br/> Suspendisse ac velit nisl.<br/> Phasellus ornare feugiat adipiscing.<br/> Cum sociis natoque penatibus et magnis dis parturient montes.<br/> nascetur ridiculus mus.<br/> Morbi iaculis enim <br/> mauris venenatis sit amet feugiat sem dapibus.<br/> Aenean gravida luctus sem.<br/> <br/> facilisis tortor egestas ut.<br/> In mattis mauris sed nunc gravida non mollis magna tempor.<br/> Maecenas mauris nibh.<br/> semper <br/> vehicula id.<br/> ultrices in libero.<br/> Donec tincidunt.<br/> sem sit amet varius dictum.<br/> leo justo accumsan justo.<br/> id porttitor neque sem nec erat.<br/> Quisque sit amet magna tincidunt sapien varius pretium.<br/> Vestibulum arcu magna.<br/> porta ac sodales ac.<br/> sodales porttitor nibh.<br/> Mauris orci nibh.<br/> semper volutpat eleifend imperdiet.<br/> imperdiet in purus.<br/> Maecenas bibendum massa ut arcu scelerisque bibendum vulputate nibh lacinia.<br/> <br/> Aenean ultrices ullamcorper dignissim.<br/> Curabitur tortor eros.<br/> imperdiet sit amet imperdiet vitae.<br/> rhoncus et elit.<br/> Ut vulputate neque arcu.<br/> ut tincidunt sem.<br/> Aliquam leo lacus.<br/> <br/> at volutpat quis.<br/> lobortis sed ante.<br/> Fusce mi orci.<br/> dapibus <br/> venenatis nec.<br/> pretium adipiscing leo.<br/> Donec ultricies egestas lacus non laoreet.<br/> Suspendisse potenti.<br/> Praesent ultrices.<br/> lorem in volutpat luctus.<br/> massa justo mollis elit.<br/> et scelerisque eros sem quis felis.<br/> Suspendisse luctus.<br/> mi non consequat tempus.<br/> arcu felis gravida mi.<br/> et ullamcorper nibh turpis ut neque.<br/> Sed a risus nec augue tristique condimentum vel ut justo.<br/> Nam luctus pharetra turpis ultricies pellentesque.<br/> Pellentesque ultricies dui quis nisl aliquet dapibus.<br/> <br/> Ut fringilla mi eros.<br/> non pretium nibh.<br/> Maecenas pretium tempus massa quis tempor.<br/> Integer faucibus mollis turpis.<br/> eu congue eros ornare ac.<br/> Sed consequat justo quis leo ultricies ut interdum tortor porta.<br/> Etiam ac leo turpis.<br/> accumsan rhoncus lorem.<br/> Mauris convallis arcu non lorem sodales tristique.<br/> Aenean non eros ipsum.<br/> Etiam neque turpis.<br/> mattis a consequat ac.<br/> convallis at lectus.<br/> Fusce pretium varius metus quis sollicitudin.<br/> Nam gravida enim ac lectus molestie eu dignissim metus imperdiet.<br/> In sit amet dui libero.<br/> <br/> Mauris semper dui viverra tortor molestie ornare.<br/> Pellentesque nec sapien mi.<br/> Sed et molestie orci.<br/> Morbi purus diam.<br/> pulvinar id cursus vel.<br/> dictum ac mi.<br/> Nulla scelerisque laoreet neque.<br/> et vestibulum erat ornare ut.<br/> Maecenas ut orci sem.<br/> vitae molestie magna.<br/> Curabitur feugiat consequat lacus.<br/> vel volutpat nibh bibendum non.<br/> <br/> Mauris erat odio.<br/> pretium et mattis at.<br/> pretium quis nulla.<br/> Quisque venenatis faucibus venenatis.<br/> Aenean mauris ante.<br/> pulvinar pellentesque mollis sit amet.<br/> gravida a augue.<br/> Nam <br/> dolor nibh.<br/> et elementum ipsum.<br/> Nullam gravida velit id arcu elementum vestibulum.<br/> Aliquam quam ligula.<br/> viverra vitae porttitor ut.<br/> tristique in elit.<br/> Morbi vitae nunc nunc.<br/> Nulla ornare consectetur nisl sit amet imperdiet.<br/> Fusce porttitor vehicula enim.<br/> a fermentum augue pellentesque in.<br/> Ut vehicula blandit diam <br/> sodales.<br/> Quisque <br/> consectetur risus.<br/> Duis dignissim.<br/> libero non venenatis pharetra.<br/> enim quam ullamcorper nibh.<br/> vestibulum dapibus felis massa imperdiet enim.<br/> <br/> Ut tincidunt faucibus elit.<br/> a condimentum lorem vestibulum ut.<br/> Morbi adipiscing posuere nibh id congue.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Maecenas imperdiet ipsum sit amet nulla ultrices aliquam.<br/> Nullam ac condimentum mi.<br/> Praesent sollicitudin auctor odio.<br/> quis interdum tortor ullamcorper nec.<br/> Ut elementum aliquet vulputate.<br/> Cras ut iaculis dui.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Sed quis mollis est.<br/> Proin tincidunt metus interdum mi aliquet ornare.<br/> Duis volutpat elit interdum quam pharetra condimentum.<br/> <br/> Integer vestibulum enim a nulla lacinia tincidunt.<br/> Donec lacinia placerat erat ac tempor.<br/> Cras volutpat tempus iaculis.<br/> Curabitur lectus purus.<br/> rhoncus <br/> accumsan sit amet.<br/> tempor suscipit dolor.<br/> Duis vitae fringilla lorem.<br/> Donec risus dui.<br/> venenatis at commodo sed.<br/> tempus vitae enim.<br/> Pellentesque turpis metus.<br/> luctus quis rhoncus quis.<br/> auctor et est.<br/> Proin gravida suscipit sodales.<br/> Etiam aliquam egestas porttitor.<br/> Vestibulum lorem lectus.<br/> dapibus quis blandit rhoncus.<br/> hendrerit at tortor.<br/> <br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Morbi neque odio.<br/> lacinia et scelerisque at.<br/> suscipit et ante.<br/> Etiam arcu orci.<br/> dapibus sit amet aliquet rhoncus.<br/> tincidunt ac justo.<br/> Nunc nunc erat.<br/> dignissim in bibendum fermentum.<br/> consectetur vitae tellus.<br/> Aenean bibendum tellus eu purus convallis vel fringilla nisl aliquam.<br/> Curabitur purus magna.<br/> egestas <br/> accumsan at.<br/> feugiat nec sapien.<br/> Nullam consequat.<br/> mi et malesuada facilisis.<br/> tellus diam porttitor tortor.<br/> vitae pharetra purus eros vitae felis.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Duis euismod mollis massa.<br/> vitae suscipit ligula ullamcorper nec.<br/> Morbi tincidunt.<br/> ante <br/> suscipit posuere.<br/> nulla ligula lobortis purus.<br/> vel tincidunt purus nisl quis libero.<br/> Ut sed pellentesque risus.<br/> Curabitur vestibulum dolor molestie tellus ullamcorper hendrerit.<br/> Pellentesque consectetur.<br/> mi ultricies tincidunt bibendum.<br/> nulla urna condimentum elit.<br/> id interdum purus arcu ut urna.<br/> <br/> Suspendisse sed sodales elit.<br/> Duis nisi dui.<br/> viverra id fringilla vitae.<br/> convallis ut odio.<br/> Praesent molestie rhoncus nisl.<br/> non facilisis lacus pulvinar dignissim.<br/> Cras arcu eros.<br/> porta vitae porttitor in.<br/> euismod a felis.<br/> Praesent at lacus vitae dolor consequat lobortis.<br/> Nulla facilisi.<br/> Morbi porttitor felis vel sem convallis ultricies.<br/> Praesent lorem tortor.<br/> laoreet vel venenatis nec.<br/> aliquet non enim.<br/> Nunc fringilla lectus eu odio auctor gravida.<br/> Donec id urna risus.<br/> et sagittis sapien.<br/> Duis pharetra.<br/> magna non imperdiet vehicula.<br/> neque massa scelerisque nulla.<br/> id scelerisque magna elit in mi.<br/> Proin elementum metus vel nulla pharetra <br/> sagittis justo vulputate.<br/> Aenean vel erat id libero volutpat scelerisque.<br/> Donec ante massa.<br/> sollicitudin a tincidunt dignissim.<br/> faucibus et mi.<br/> Vestibulum <br/> hendrerit malesuada.<br/> Nulla facilisi.<br/> <br/> Praesent tincidunt lacinia nisl.<br/> ut lacinia felis ullamcorper in.<br/> Phasellus tristique.<br/> purus a posuere malesuada.<br/> purus purus placerat metus.<br/> <br/> euismod libero tellus a elit.<br/> Mauris <br/> massa quam.<br/> venenatis elementum nisi.<br/> Integer rhoncus quam et orci commodo <br/> pretium nisl sodales.<br/> Vivamus mi ipsum.<br/> elementum elementum venenatis dapibus.<br/> commodo vitae ligula.<br/> Morbi tincidunt mattis mauris ultrices posuere.<br/> Quisque at libero non arcu tristique vestibulum eu eu nisl.<br/> Donec eleifend iaculis tortor non ullamcorper.<br/> <br/> Duis tempor velit sit amet tellus porta et auctor eros luctus.<br/> Mauris molestie neque libero.<br/> Aenean quis volutpat nulla.<br/> Morbi lobortis congue commodo.<br/> In vel tellus sit amet ipsum elementum placerat.<br/> Fusce varius.<br/> ipsum non placerat eleifend.<br/> tellus nulla ultricies magna.<br/> ultrices imperdiet orci lectus sit amet enim.<br/> Morbi rhoncus sodales felis.<br/> Phasellus et tortor purus.<br/> Sed dignissim pulvinar egestas.<br/> Sed congue ligula sed ante suscipit auctor.<br/> Duis faucibus adipiscing metus.<br/> Phasellus sollicitudin.<br/> elit in rhoncus tincidunt.<br/> mi velit viverra nunc.<br/> quis consequat arcu quam quis orci.<br/> Etiam eu purus erat.<br/> ut aliquet lectus.<br/> <br/> Phasellus a ligula nibh.<br/> id luctus eros.<br/> Aliquam ornare risus <br/> mauris bibendum varius.<br/> Aenean vel lacus <br/> leo auctor fermentum.<br/> Phasellus fringilla ultricies lacus.<br/> sagittis tincidunt justo iaculis sit amet.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Vestibulum nec diam lectus.<br/> a tristique nibh.<br/> Mauris nec condimentum elit.<br/> <br/> Sed et ligula risus.<br/> Aenean commodo iaculis est sed cursus.<br/> Quisque rhoncus dignissim orci.<br/> vel mollis quam sodales vel.<br/> Donec vel leo tortor.<br/> at mattis velit.<br/> Aliquam vitae massa nunc.<br/> In ultrices euismod nulla.<br/> ornare auctor ligula varius ut.<br/> Proin ullamcorper placerat sem.<br/> ac suscipit velit bibendum in.<br/> <br/> Nunc porttitor bibendum magna ut viverra.<br/> Sed volutpat interdum libero.<br/> id elementum arcu egestas non.<br/> Suspendisse facilisis feugiat turpis.<br/> <br/> vehicula sem sodales lacinia.<br/> Etiam sit amet est nulla.<br/> nec vestibulum diam.<br/> Pellentesque pretium convallis magna varius blandit.<br/> Vestibulum vehicula sapien <br/> eros feugiat ut lobortis est suscipit.<br/> Cras non dui tortor.<br/> Aenean euismod.<br/> sapien sit amet imperdiet porttitor.<br/> justo urna sodales mauris.<br/> vel elementum dolor erat et mauris.<br/> Mauris consectetur.<br/> sem a rhoncus <br/>.<br/> ante ipsum malesuada sem.<br/> vel volutpat nulla lacus in arcu.<br/> Sed sagittis lacinia ipsum vitae placerat.<br/> Aenean in orci in urna pretium ultricies.<br/> Cras lacus felis.<br/> tempor id <br/> ac.<br/> consequat at turpis.<br/> Mauris malesuada blandit eleifend.<br/> <br/> Sed sed ornare erat.<br/> Suspendisse sagittis ullamcorper dui vitae accumsan.<br/> Aliquam accumsan tellus et eros consequat commodo tempor risus faucibus.<br/> Nulla iaculis.<br/> ligula eu vulputate sagittis.<br/> sem ipsum egestas erat.<br/> ac consectetur erat ipsum vitae justo.<br/> Suspendisse ut quam ac sem faucibus commodo sed non enim.<br/> Praesent justo nunc.<br/> convallis sed aliquam pellentesque.<br/> aliquet non mi.<br/> Ut posuere aliquet magna.<br/> vitae consequat tellus imperdiet quis.<br/> Praesent vitae nisl dui.<br/> nec condimentum dui.<br/> Nam ac mattis mi.<br/> Vestibulum ut ipsum enim.<br/> eu sodales velit.<br/> Suspendisse blandit tortor non turpis sagittis vehicula.<br/> <br/> Donec ut dictum felis.<br/> Cum sociis natoque penatibus et magnis dis parturient montes.<br/> nascetur ridiculus mus.<br/> Nullam et enim quis nulla tempor ultricies non <br/> nibh.<br/> Praesent a diam non sem aliquam vestibulum.<br/> Suspendisse sit amet accumsan neque.<br/> Maecenas est est.<br/> blandit id iaculis vitae.<br/> elementum nec diam.<br/> Morbi mattis magna <br/> nunc sagittis vehicula.<br/> Vivamus consectetur suscipit nisl sit amet porttitor.<br/> Integer vitae tortor felis.<br/> Vivamus dapibus eros a erat aliquam non ultricies neque sollicitudin.<br/> Donec posuere orci at justo luctus dictum scelerisque diam dictum.<br/> Nullam tincidunt tempus augue.<br/> non malesuada eros egestas in.<br/> Nullam tortor eros.<br/> feugiat in suscipit ut.<br/> vehicula sit amet elit.<br/> Aenean iaculis felis porttitor mauris lobortis quis ultricies sem posuere.<br/> Vestibulum quis scelerisque nulla.<br/> <br/> Nam mattis erat quis nisl posuere a pharetra lectus venenatis.<br/> Quisque nisl lorem.<br/> tempor eu luctus quis.<br/> congue sed est.<br/> Nunc <br/> blandit egestas.<br/> Donec pulvinar ullamcorper dui porta imperdiet.<br/> Etiam augue leo.<br/> egestas eu ornare in.<br/> placerat ac metus.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras dui turpis.<br/> vehicula nec vestibulum pellentesque.<br/> tempus a nisi.<br/> Pellentesque a libero tortor.<br/> Vivamus mi eros.<br/> aliquet ac placerat vitae.<br/> egestas tincidunt tortor.<br/> Nulla vitae pretium tortor.<br/> Fusce volutpat ultricies viverra.<br/> Donec neque erat.<br/> adipiscing <br/> <br/> mattis.<br/> fermentum <br/> augue.<br/> Vestibulum a lectus purus.<br/> id iaculis enim.<br/> Sed dignissim sodales ante sit amet iaculis.<br/> Proin vel magna velit.<br/> a vestibulum purus.<br/> <br/> Aenean in magna accumsan turpis dignissim luctus blandit at ligula.<br/> Cras euismod ipsum gravida nibh venenatis vitae molestie quam faucibus.<br/> Vestibulum scelerisque nunc <br/> velit molestie nec vulputate nunc laoreet.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Nullam et pulvinar leo.<br/> Phasellus ut tempor urna.<br/> Sed iaculis convallis tincidunt.<br/> Cras ut interdum purus.<br/> Phasellus ullamcorper suscipit viverra.<br/> Nam faucibus posuere velit.<br/> a adipiscing diam porttitor ullamcorper.<br/> Nunc sed lorem ante.<br/> Nunc eleifend feugiat pharetra.<br/> Suspendisse risus libero.<br/> dictum vel posuere vitae.<br/> molestie nec nibh.<br/> Nam vulputate condimentum scelerisque.<br/> <br/> Ut volutpat urna in felis accumsan tincidunt et vitae eros.<br/> Proin egestas est nec erat tristique vestibulum.<br/> Suspendisse ac nibh ut turpis elementum congue.<br/> Curabitur sit amet risus sit amet sem pretium egestas.<br/> Ut accumsan auctor purus id fermentum.<br/> Nulla tempus.<br/> diam at semper aliquam.<br/> nibh nisl vestibulum massa.<br/> non ornare neque augue in nisi.<br/> Quisque sollicitudin auctor rhoncus.<br/> Proin tellus mi.<br/> ultricies ut elementum a.<br/> venenatis et massa.<br/> Donec varius nulla vitae dui luctus eu tristique orci dapibus.<br/> Aliquam malesuada sem eu elit posuere tempor.<br/> Mauris et facilisis sapien.<br/> <br/> Praesent turpis libero.<br/> consectetur ut varius et.<br/> vulputate vel nunc.<br/> Morbi tristique rhoncus metus.<br/> vitae varius tortor viverra at.<br/> Proin placerat condimentum ornare.<br/> Nullam id purus felis.<br/> et luctus felis.<br/> Donec at est enim.<br/> sit amet aliquam arcu.<br/> Aenean ultrices elit vel enim auctor ornare in vel arcu.<br/> Vestibulum quis lacus vitae dui pulvinar tempus.<br/> Nulla tempor sem bibendum metus hendrerit semper.<br/> Nunc vel ante nunc.<br/> Maecenas lobortis.<br/> felis a facilisis luctus.<br/> urna eros eleifend eros.<br/> at euismod nisi quam ac leo.<br/> Quisque adipiscing risus vitae tortor lobortis scelerisque a at sem.<br/> In vel tellus non nunc venenatis ornare eu sed risus.<br/> Aenean quis mi ante.<br/> Phasellus sagittis venenatis scelerisque.<br/> <br/> Vivamus ultrices commodo dolor.<br/> vitae tincidunt urna hendrerit vel.<br/> Vivamus laoreet facilisis libero.<br/> ut auctor libero vulputate accumsan.<br/> Suspendisse laoreet volutpat interdum.<br/> Vivamus ante quam.<br/> gravida ut venenatis ut.<br/> consequat in ligula.<br/> Phasellus varius faucibus diam ac dignissim.<br/> Nunc quis sapien leo.<br/> Sed lobortis dapibus ultrices.<br/> In non aliquet sapien.<br/> Nam ultricies gravida bibendum.<br/> Nullam facilisis nisi at nunc dapibus at viverra ligula ultricies.<br/> Aliquam velit velit.<br/> faucibus imperdiet egestas ac.<br/> interdum et turpis.<br/> Proin tellus lacus.<br/> sodales ut aliquam vel.<br/> posuere sed dolor.<br/> Etiam ac dui diam.<br/> et vulputate purus.<br/> In eros nulla.<br/> lobortis in condimentum a.<br/> condimentum mattis massa.<br/> <br/> Cras vitae odio tellus.<br/> sollicitudin <br/> augue.<br/> Pellentesque eu blandit purus.<br/> Sed semper faucibus nulla <br/> euismod.<br/> Sed quis odio leo.<br/> Aenean nisl sapien.<br/> mattis id feugiat eu.<br/> pharetra vitae sem.<br/> In fermentum neque nec augue luctus mattis.<br/> Nam placerat dapibus lacinia.<br/> Etiam fermentum lobortis enim non venenatis.<br/> <br/> Proin id turpis nulla.<br/> Sed <br/> eros sit amet tellus bibendum ultricies. Vulputate vehicula eu sit amet lectus risus.<br/> Vivamus nec ligula est.<br/> Integer sit amet lorem <br/> magna commodo ornare non quis mi. Et dapibus purus.<br/> Quisque in mauris lectus.<br/> Nullam magna neque.<br/> bibendum quis facilisis a.<br/> elementum at sem.<br/> <br/> Nunc feugiat risus eu sapien aliquet tincidunt.<br/> Aenean tristique gravida velit a gravida.<br/> Aenean est quam.<br/> sagittis vitae ornare sit amet.<br/> placerat nec urna.<br/> Proin cursus.<br/> lorem in egestas vehicula.<br/> magna risus ornare augue.<br/> vitae tristique massa tellus eu dolor.<br/> Etiam dictum congue dapibus.<br/> Nulla ut rhoncus sapien.<br/> Aenean vitae nulla non arcu adipiscing consectetur non id magna.<br/> Aliquam auctor aliquet justo.<br/> sed hendrerit turpis commodo non.<br/> Cum sociis natoque penatibus et magnis dis parturient montes.<br/> nascetur ridiculus mus.<br/> Nunc urna arcu.<br/> ultrices commodo placerat ut.<br/> dapibus vitae lectus.<br/> Fusce posuere nisi at ligula pellentesque malesuada.<br/> Maecenas quis turpis malesuada augue dignissim porta a <br/> massa.<br/> Donec <br/> metus orci.<br/> Vestibulum consectetur nunc in libero euismod faucibus.<br/> <br/> In vel metus nulla.<br/> nec tempus justo.<br/> Aenean ac est neque.<br/> Donec <br/> ligula quis ipsum placerat cursus <br/> id mauris.<br/> Suspendisse elit leo.<br/> ultrices ut pulvinar ac.<br/> porttitor ac urna.<br/> Ut sed laoreet orci.<br/> Class aptent taciti sociosqu ad litora torquent per conubia nostra.<br/> per inceptos himenaeos.<br/> Nam ipsum magna.<br/> mattis ac facilisis at.<br/> pharetra eu nisl.<br/> <br/> Duis ut ante vel nunc lacinia fermentum.<br/> Nunc pretium enim a sapien sagittis <br/>.<br/> Integer egestas eros a metus cursus ac condimentum nibh laoreet.<br/> Suspendisse lacinia enim vel arcu scelerisque viverra.<br/> Maecenas eros quam.<br/> venenatis cursus faucibus vitae.<br/> elementum id arcu.<br/> Aliquam erat volutpat.<br/> Nunc in quam sed neque dapibus malesuada.<br/> Phasellus elementum massa in sem tempus sed pharetra ante tincidunt.<br/> Nam vel bibendum magna.<br/> Curabitur sagittis porta arcu.<br/> non posuere mi vehicula ut.<br/> Pellentesque rhoncus mauris <br/> est rhoncus auctor.<br/> Cras aliquam orci quis diam <br/> vulputate vehicula velit auctor.<br/> <br/> Donec venenatis nibh non urna dignissim eleifend.<br/> Morbi at sapien neque.<br/> et blandit diam.<br/> Proin sem tellus.<br/> sollicitudin <br/> vehicula imperdiet.<br/> viverra <br/> ligula.<br/> Aliquam elementum pulvinar aliquet.<br/> Nulla facilisi.<br/> Morbi a laoreet arcu.<br/> Suspendisse potenti.<br/> Cras sed est ipsum.<br/> Mauris ut vulputate mi.<br/> Fusce imperdiet.<br/> lorem eu scelerisque dignissim.<br/> ligula tortor mollis lacus.<br/> in rhoncus dolor mauris sit amet elit.<br/> Morbi quis nibh sed nisl tempus vulputate sit amet vel lorem.<br/> <br/> Donec <br/>.<br/> turpis laoreet venenatis aliquet.<br/> lectus orci tincidunt massa.<br/> sagittis euismod leo nibh in leo.<br/> Ut sed libero lectus.<br/> Nam tincidunt sodales massa.<br/> Proin congue tellus id dolor condimentum auctor.<br/> Vivamus ullamcorper ligula non nulla vestibulum in consequat nisi placerat.<br/> Aliquam nec erat vitae diam rhoncus placerat.<br/> Sed risus ipsum.<br/> eleifend nec bibendum id.<br/> placerat vel orci.<br/> Sed sagittis lorem a justo auctor lobortis.<br/> Aliquam congue lobortis pellentesque.<br/> Phasellus nec arcu velit.<br/> <br/> imperdiet tellus.<br/> Quisque sodales adipiscing <br/>.<br/> Duis vitae massa urna.<br/> Sed auctor nulla metus.<br/> at pellentesque leo.<br/> In lacus tortor.<br/> ultrices sagittis sollicitudin ut.<br/> tempor at leo.<br/> <br/> Integer lorem elit.<br/> aliquam in gravida ac.<br/> sagittis at diam.<br/> Aenean tincidunt tincidunt elit.<br/> a euismod nulla iaculis ut.<br/> Pellentesque vitae diam magna.<br/> Etiam vitae tortor augue.<br/> Proin <br/> purus lacus.<br/> Nulla facilisi.<br/> Vivamus vehicula.<br/> libero quis pharetra dignissim.<br/> ipsum tortor eleifend justo.<br/> quis dignissim purus purus id ante.<br/> Quisque mollis neque vitae eros iaculis non euismod ante mattis.<br/> Fusce id nibh quis ante feugiat vehicula ac sed neque.<br/> Nam nec consectetur sapien.<br/> <br/> Etiam eleifend.<br/> augue sed eleifend consequat.<br/> libero nunc faucibus neque.<br/> nec interdum nisi nisl vitae risus.<br/> Praesent id diam at dolor bibendum luctus eu sit amet nunc.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Nunc pellentesque sem at ligula lacinia bibendum elementum purus lobortis.<br/> Nulla sagittis.<br/> tellus ut fermentum placerat.<br/> augue turpis suscipit mi.<br/> quis porttitor lectus orci nec magna.<br/> Nunc facilisis dui nec lacus dignissim sodales.<br/> Curabitur pretium egestas ante id congue.<br/> Vestibulum euismod pharetra vestibulum.<br/> Phasellus leo nisi.<br/> tincidunt quis tempus sit amet.<br/> accumsan id justo.<br/> Suspendisse arcu odio.<br/> semper quis mattis tempus.<br/> sollicitudin a erat.<br/> Sed sed enim leo.<br/> ut consectetur tellus.<br/> <br/> Vestibulum nec urna tortor.<br/> eu elementum dolor.<br/> Sed facilisis scelerisque euismod.<br/> Vivamus mollis tempor nunc id accumsan.<br/> Aenean risus leo.<br/> mattis at tincidunt vitae.<br/> sagittis egestas purus.<br/> Phasellus varius.<br/> metus nec cursus faucibus.<br/> nunc nibh aliquet nulla.<br/> ac ultricies felis arcu malesuada nisi.<br/> Mauris erat lacus.<br/> varius a semper a.<br/> aliquam <br/> est.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus faucibus tincidunt arcu.<br/> quis fringilla dui aliquam <br/>.<br/> Curabitur auctor diam id diam tempus condimentum.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; <br/> Nunc eu tortor erat.<br/> In turpis quam.<br/> lobortis at <br/> vitae.<br/> placerat ac nisl.<br/> Cras vitae viverra urna.<br/> Suspendisse a dolor quis erat sollicitudin varius et at nunc.<br/> Vestibulum sodales leo at arcu euismod posuere.<br/> Vivamus <br/> mi non metus blandit tempor.<br/> Sed congue leo facilisis dui tempor auctor.<br/> Aliquam erat volutpat.<br/> Etiam in orci dolor.<br/> sit amet mattis nisi.<br/> Fusce dignissim iaculis neque in commodo.<br/> Aliquam erat volutpat.<br/> Proin blandit faucibus nibh eu malesuada.<br/> Cras dictum nibh id velit lacinia facilisis.<br/> <br/> Mauris mi quam.<br/> rhoncus sed mollis ac.<br/> vehicula in lacus.<br/> Vivamus pretium dignissim tempus.<br/> Duis vel risus ut lectus vulputate malesuada.<br/> Proin urna ante.<br/> dictum <br/> elementum et.<br/> interdum ac lectus.<br/> Praesent <br/> tortor ac risus tincidunt eu suscipit massa faucibus.<br/> Sed leo mauris.<br/> vulputate vitae fermentum quis.<br/> auctor at ligula.<br/> Vestibulum ac eros eu dui ullamcorper elementum.<br/> Donec facilisis sagittis metus.<br/> sed posuere enim bibendum nec.<br/> Sed enim tortor.<br/> interdum nec imperdiet id.<br/> posuere vitae dolor.<br/> Etiam feugiat.<br/> lorem id bibendum facilisis.<br/> tortor augue laoreet arcu.<br/> non molestie ipsum ipsum a tellus.<br/> Nam metus eros.<br/> feugiat at ornare id.<br/> blandit at urna.<br/> Nullam fringilla erat non felis tristique congue.<br/> Morbi sodales risus et lacus vehicula sed porta odio varius.<br/> Proin dapibus.<br/> enim <br/> tempus imperdiet.<br/> magna risus tempor lacus.<br/> id congue dolor turpis placerat metus.<br/> Phasellus sodales aliquet viverra.<br/> Pellentesque enim eros.<br/> accumsan ut tincidunt nec.<br/> faucibus ut augue.<br/> <br/> Fusce et eros est.<br/> a auctor tortor.<br/> Phasellus porta aliquam mollis.<br/> Mauris eu nibh ac urna pretium ornare ac non dui.<br/> Donec ut ullamcorper nibh.<br/> Etiam at eleifend turpis.<br/> Duis fermentum.<br/> turpis non suscipit viverra.<br/> lectus erat gravida nulla.<br/> a pharetra turpis lorem vel mi.<br/> Nulla facilisi.<br/> Cras pretium imperdiet tincidunt.<br/> In pellentesque quam non est cursus lacinia.<br/> Vivamus gravida neque at ligula mollis condimentum.<br/> Integer quis libero magna.<br/> Donec a nunc purus.<br/> sit amet laoreet neque.<br/> Quisque at elit nisi.<br/> in gravida lectus.<br/> Aenean ac libero lacus.<br/> nec facilisis nisi.<br/> In nec egestas est.<br/> Praesent rhoncus eleifend faucibus.<br/> <br/> Donec gravida.<br/> diam at tincidunt consectetur.<br/> odio risus eleifend sem.<br/> sed ornare velit odio a leo.<br/> Etiam justo metus.<br/> malesuada at posuere eu.<br/> dignissim commodo orci.<br/> Nullam vehicula est sit amet turpis interdum dignissim.<br/> Nunc fringilla magna nec turpis gravida <br/>.<br/> Pellentesque congue bibendum dui non lobortis.<br/> Donec odio enim.<br/> elementum at imperdiet non.<br/> tristique id eros.<br/> Maecenas ut leo vitae gravida.<br/> <br/> In nec erat neque.<br/> sed tempor nisi.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Mauris scelerisque neque a tortor mollis ac tincidunt turpis euismod.<br/> Nam pharetra quam vitae tortor sollicitudin vitae scelerisque sapien tincidunt.<br/> Cras cursus iaculis urna quis feugiat.<br/> Etiam pharetra fringilla metus.<br/> ac vehicula nisl pharetra id.<br/> Nam convallis volutpat adipiscing.<br/> In hac habitasse platea dictumst.<br/> Nullam placerat tellus tincidunt nibh vestibulum vulputate.<br/> <br/> Nunc a sapien erat.<br/> sit amet tempus risus.<br/> Lorem ipsum dolor sit amet.<br/> consectetur adipiscing elit.<br/> Etiam tincidunt massa id risus elementum nec venenatis urna varius.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Duis sed risus turpis.<br/> Sed vel pretium sem.<br/> Quisque tortor lacus.<br/> <br/> <br/> convallis id.<br/> rhoncus sit amet ligula.<br/> Sed sit amet.<br/> <br/>Fusce porttitor vehicula enim.<br/> a fermentum augue pellentesque in.<br/> Ut vehicula blandit diam <br/> sodales.<br/> Quisque <br/> consectetur risus.<br/> Duis dignissim.<br/> libero non venenatis pharetra.<br/> enim quam ullamcorper nibh.<br/> vestibulum dapibus felis massa imperdiet enim.<br/> <br/> Ut tincidunt faucibus elit.<br/> a condimentum lorem vestibulum ut.<br/> Morbi adipiscing posuere nibh id congue.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Maecenas imperdiet ipsum sit amet nulla ultrices aliquam.<br/> Nullam ac condimentum mi.<br/> Praesent sollicitudin auctor odio.<br/> quis interdum tortor ullamcorper nec.<br/> Ut elementum aliquet vulputate.<br/> Cras ut iaculis dui.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Sed quis mollis est.<br/> Proin tincidunt metus interdum mi aliquet ornare.<br/> Duis volutpat elit interdum quam pharetra condimentum.<br/> <br/> Integer vestibulum enim a nulla lacinia tincidunt.<br/> Donec lacinia placerat erat ac tempor.<br/> Cras volutpat tempus iaculis.<br/> Curabitur lectus purus.<br/> rhoncus <br/> accumsan sit amet.<br/> tempor suscipit dolor.<br/> Duis vitae fringilla lorem.<br/> Donec risus dui.<br/> venenatis at commodo sed.<br/> tempus vitae enim.<br/> Pellentesque turpis metus.<br/> luctus quis rhoncus quis.<br/> auctor et est.<br/> Proin gravida suscipit sodales.<br/> Etiam aliquam egestas porttitor.<br/> Vestibulum lorem lectus.<br/> dapibus quis blandit rhoncus.<br/> hendrerit at tortor.<br/> <br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Morbi neque odio.<br/> lacinia et scelerisque at.<br/> suscipit et ante.<br/> Etiam arcu orci.<br/> dapibus sit amet aliquet rhoncus.<br/> tincidunt ac justo.<br/> Nunc nunc erat.<br/> dignissim in bibendum fermentum.<br/> consectetur vitae tellus.<br/> Aenean bibendum tellus eu purus convallis vel fringilla nisl aliquam.<br/> Curabitur purus magna.<br/> egestas <br/> accumsan at.<br/> feugiat nec sapien.<br/> Nullam consequat.<br/> mi et malesuada facilisis.<br/> tellus diam porttitor tortor.<br/> vitae pharetra purus eros vitae felis.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Duis euismod mollis massa.<br/> vitae suscipit ligula ullamcorper nec.<br/> Morbi tincidunt.<br/> ante <br/> suscipit posuere.<br/> nulla ligula lobortis purus.<br/> vel tincidunt purus nisl quis libero.<br/> Ut sed pellentesque risus.<br/> Curabitur vestibulum dolor molestie tellus ullamcorper hendrerit.<br/> Pellentesque consectetur.<br/> mi ultricies tincidunt bibendum.<br/> nulla urna condimentum elit.<br/> id interdum purus arcu ut urna.<br/> <br/> Suspendisse sed sodales elit.<br/> Duis nisi dui.<br/> viverra id fringilla vitae.<br/> convallis ut odio.<br/> Praesent molestie rhoncus nisl.<br/> non facilisis lacus pulvinar dignissim.<br/> Cras arcu eros.<br/> porta vitae porttitor in.<br/> euismod a felis.<br/> Praesent at lacus vitae dolor consequat lobortis.<br/> Nulla facilisi.<br/> Morbi porttitor felis vel sem convallis ultricies.<br/> Praesent lorem tortor.<br/> laoreet vel venenatis nec.<br/> aliquet non enim.<br/> Nunc fringilla lectus eu odio auctor gravida.<br/> Donec id urna risus.<br/> et sagittis sapien.<br/> Duis pharetra.<br/> magna non imperdiet vehicula.<br/> neque massa scelerisque nulla.<br/> id scelerisque magna elit in mi.<br/> Proin elementum metus vel nulla pharetra <br/> sagittis justo vulputate.<br/> Aenean vel erat id libero volutpat scelerisque.<br/> Donec ante massa.<br/> sollicitudin a tincidunt dignissim.<br/> faucibus et mi.<br/> Vestibulum <br/> hendrerit malesuada.<br/> Nulla facilisi.<br/> <br/> Praesent tincidunt lacinia nisl.<br/> ut lacinia felis ullamcorper in.<br/> Phasellus tristique.<br/> purus a posuere malesuada.<br/> purus purus placerat metus.<br/> <br/> euismod libero tellus a elit.<br/> Mauris <br/> massa quam.<br/> venenatis elementum nisi.<br/> Integer rhoncus quam et orci commodo <br/> pretium nisl sodales.<br/> Vivamus mi ipsum.<br/> elementum elementum venenatis dapibus.<br/> commodo vitae ligula.<br/> Morbi tincidunt mattis mauris ultrices posuere.<br/> Quisque at libero non arcu tristique vestibulum eu eu nisl.<br/> Donec eleifend iaculis tortor non ullamcorper.<br/> <br/> Duis tempor velit sit amet tellus porta et auctor eros luctus.<br/> Mauris molestie neque libero.<br/> Aenean quis volutpat nulla.<br/> Morbi lobortis congue commodo.<br/> In vel tellus sit amet ipsum elementum placerat.<br/> Fusce varius.<br/> ipsum non placerat eleifend.<br/> tellus nulla ultricies magna.<br/> ultrices imperdiet orci lectus sit amet enim.<br/> Morbi rhoncus sodales felis.<br/> Phasellus et tortor purus.<br/> Sed dignissim pulvinar egestas.<br/> Sed congue ligula sed ante suscipit auctor.<br/> Duis faucibus adipiscing metus.<br/> Phasellus sollicitudin.<br/> elit in rhoncus tincidunt.<br/> mi velit viverra nunc.<br/> quis consequat arcu quam quis orci.<br/> Etiam eu purus erat.<br/> ut aliquet lectus.<br/> <br/> Phasellus a ligula nibh.<br/> id luctus eros.<br/> Aliquam ornare risus <br/> mauris bibendum varius.<br/> Aenean vel lacus <br/> leo auctor fermentum.<br/> Phasellus fringilla ultricies lacus.<br/> sagittis tincidunt justo iaculis sit amet.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Vestibulum nec diam lectus.<br/> a tristique nibh.<br/> Mauris nec condimentum elit.<br/> <br/> Sed et ligula risus.<br/> Aenean commodo iaculis est sed cursus.<br/> Quisque rhoncus dignissim orci.<br/> vel mollis quam sodales vel.<br/> Donec vel leo tortor.<br/> at mattis velit.<br/> Aliquam vitae massa nunc.<br/> In ultrices euismod nulla.<br/> ornare auctor ligula varius ut.<br/> Proin ullamcorper placerat sem.<br/> ac suscipit velit bibendum in.<br/> <br/> Nunc porttitor bibendum magna ut viverra.<br/> Sed volutpat interdum libero.<br/> id elementum arcu egestas non.<br/> Suspendisse facilisis feugiat turpis.<br/> <br/> vehicula sem sodales lacinia.<br/> Etiam sit amet est nulla.<br/> nec vestibulum diam.<br/> Pellentesque pretium convallis magna varius blandit.<br/> Vestibulum vehicula sapien <br/> eros feugiat ut lobortis est suscipit.<br/> Cras non dui tortor.<br/> Aenean euismod.<br/> sapien sit amet imperdiet porttitor.<br/> justo urna sodales mauris.<br/> vel elementum dolor erat et mauris.<br/> Mauris consectetur.<br/> sem a rhoncus <br/>.<br/> ante ipsum malesuada sem.<br/> vel volutpat nulla lacus in arcu.<br/> Sed sagittis lacinia ipsum vitae placerat.<br/> Aenean in orci in urna pretium ultricies.<br/> Cras lacus felis.<br/> tempor id <br/> ac.<br/> consequat at turpis.<br/> Mauris malesuada blandit eleifend.<br/> <br/> Sed sed ornare erat.<br/> Suspendisse sagittis ullamcorper dui vitae accumsan.<br/> Aliquam accumsan tellus et eros consequat commodo tempor risus faucibus.<br/> Nulla iaculis.<br/> ligula eu vulputate sagittis.<br/> sem ipsum egestas erat.<br/> ac consectetur erat ipsum vitae justo.<br/> Suspendisse ut quam ac sem faucibus commodo sed non enim.<br/> Praesent justo nunc.<br/> convallis sed aliquam pellentesque.<br/> aliquet non mi.<br/> Ut posuere aliquet magna.<br/> vitae consequat tellus imperdiet quis.<br/> Praesent vitae nisl dui.<br/> nec condimentum dui.<br/> Nam ac mattis mi.<br/> Vestibulum ut ipsum enim.<br/> eu sodales velit.<br/> Suspendisse blandit tortor non turpis sagittis vehicula.<br/> <br/> Donec ut dictum felis.<br/> Cum sociis natoque penatibus et magnis dis parturient montes.<br/> nascetur ridiculus mus.<br/> Nullam et enim quis nulla tempor ultricies non <br/> nibh.<br/> Praesent a diam non sem aliquam vestibulum.<br/> Suspendisse sit amet accumsan neque.<br/> Maecenas est est.<br/> blandit id iaculis vitae.<br/> elementum nec diam.<br/> Morbi mattis magna <br/> nunc sagittis vehicula.<br/> Vivamus consectetur suscipit nisl sit amet porttitor.<br/> Integer vitae tortor felis.<br/> Vivamus dapibus eros a erat aliquam non ultricies neque sollicitudin.<br/> Donec posuere orci at justo luctus dictum scelerisque diam dictum.<br/> Nullam tincidunt tempus augue.<br/> non malesuada eros egestas in.<br/> Nullam tortor eros.<br/> feugiat in suscipit ut.<br/> vehicula sit amet elit.<br/> Aenean iaculis felis porttitor mauris lobortis quis ultricies sem posuere.<br/> Vestibulum quis scelerisque nulla.<br/> <br/> Nam mattis erat quis nisl posuere a pharetra lectus venenatis.<br/> Quisque nisl lorem.<br/> tempor eu luctus quis.<br/> congue sed est.<br/> Nunc <br/> blandit egestas.<br/> Donec pulvinar ullamcorper dui porta imperdiet.<br/> Etiam augue leo.<br/> egestas eu ornare in.<br/> placerat ac metus.<br/> Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras dui turpis.<br/> vehicula nec vestibulum pellentesque.<br/> tempus a nisi.<br/> Pellentesque a libero tortor.<br/> Vivamus mi eros.<br/> aliquet ac placerat vitae.<br/> egestas tincidunt tortor.<br/> Nulla vitae pretium tortor.<br/> Fusce volutpat ultricies viverra.<br/> Donec neque erat.<br/> adipiscing <br/> <br/> mattis.<br/> fermentum <br/> augue.<br/> Vestibulum a lectus purus.<br/> id iaculis enim.<br/> Sed dignissim sodales ante sit amet iaculis.<br/> Proin vel magna velit.<br/> a vestibulum purus.<br/> <br/> Aenean in magna accumsan turpis dignissim luctus blandit at ligula.<br/> Cras euismod ipsum gravida nibh venenatis vitae molestie quam faucibus.<br/> Vestibulum scelerisque nunc <br/> velit molestie nec vulputate nunc laoreet.<br/> Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<br/> Nullam et pulvinar leo.<br/> Phasellus ut tempor urna.<br/> Sed iaculis convallis tincidunt.<br/> Cras ut interdum purus.<br/> Phasellus ullamcorper suscipit viverra.<br/> Nam faucibus posuere velit.<br/> a adipiscing diam porttitor ullamcorper.<br/> Nunc sed lorem ante.<br/> Nunc eleifend feugiat pharetra.<br/> Suspendisse risus libero.<br/> dictum vel posuere vitae.<br/> molestie nec nibh.<br/> Nam vulputate condimentum scelerisque.<br/> <br/> Ut volutpat urna in felis accumsan tincidunt et vitae eros.<br/> Proin egestas est nec erat tristique vestibulum.<br/> Suspendisse ac nibh ut turpis elementum congue.<br/> Curabitur sit amet risus sit amet sem pretium egestas.<br/> Ut accumsan auctor purus id fermentum.<br/> Nulla tempus.<br/> diam at semper aliquam.<br/> nibh nisl vestibulum massa.<br/> non ornare neque augue in nisi.<br/> Quisque auctor rhoncus.<br/> Proin mi.<br/> ultricies ut elementum a.<br/> venenatis et massa.<br/> Donec varius nulla vitae dui luctus eu tristique orci dapibus.<br/> Aliquam malesuada sem eu elit posuere tempor.<br/> Mauris et facilisis sapien.<br/> <br/> Praesent turpis libero.<br/> consectetur ut varius et.<br/> vulputate vel nunc.<br/> Morbi rhoncus metus.<br/> vitae tortor viverra at.<br/> Proin placerat condimentum ornare.<br/> Nullam id purus felis.<br/> et luctus felis.<br/> Donec at est enim.<br/> sit amet aliquam arcu.<br/> Aenean elit vel enim ornare in vel arcu.<br/> Vestibulum quis lacus vitae dui pulvinar tempus.<br/> Nulla tempor sem bibendum metus hendrerit semper.<br/> Nunc vel ante nunc.<br/> Maecenas lobortis.<br/> felis a facilisis luctus.<br/> urna eros eleifend eros.<br/> at euismod nisi quam ac leo.<br/> Quisque adipiscing risus vitae tortor lobortis scelerisque a at sem.<br/> In vel tellus non nunc venenatis ornare eu sed risus.<br/> Aenean quis mi ante.<br/> Phasellus sagittis venenatis scelerisque.<br/> <br/> Vivamus ultrices commodo dolor.<br/> vitae tincidunt urna hendrerit vel.<br/> Vivamus laoreet facilisis libero.<br/> ut auctor libero vulputate accumsan.<br/> Suspendisse laoreet volutpat interdum.<br/> Vivamus ante quam.<br/> gravida ut venenatis ut.<br/> consequat in ligula.<br/> Phasellus varius faucibus diam ac dignissim.<br/> Nunc quis sapien leo.<br/> Sed lobortis dapibus ultrices.<br/> In non aliquet sapien.<br/> Nam ultricies gravida bibendum.<br/> Nullam facilisis nisi at nunc dapibus at viverra ligula ultricies.<br/> Aliquam velit velit.<br/> faucibus imperdiet egestas ac.<br/> interdum et turpis.<br/> Proin tellus lacus.<br/> sodales ut aliquam vel.<br/> posuere sed dolor.<br/> Etiam ac dui diam.<br/> et vulputate purus.<br/> In eros nulla.<br/> lobortis in condimentum a.<br/> condimentum mattis massa.<br/> <br/> Cras vitae odio tellus.<br/> sollicitudin <br/> augue.<br/> Pellentesque eu blandit purus.<br/> Sed semper faucibus nulla <br/> euismod.<br/> Sed quis odio leo.<br/> Aenean nisl sapien.<br/> mattis id feugiat eu.<br/> pharetra vitae sem.<br/> In fermentum neque nec augue luctus mattis.<br/> Nam placerat dapibus lacinia.<br/> Etiam fermentum lobortis enim non venenatis.<br/> <br/> Proin id turpis nulla.<br/> Sed <br/> eros sit amet tellus bibendum ultricies.<br/> Maecenas ac elit tincidunt libero tempus cursus.<br/> Pellentesque at arcu nec ligula vulputate vehicula eu <br/> nulla.<br/> Suspendisse sit amet lectus risus.<br/> Vivamus nec ligula est.<br/> Integer sit amet lorem <br/> magna commodo ornare non quis mi.<br/> Proin <br/> dui nibh.<br/> et dapibus purus.<br/> Quisque in mauris lectus.<br/> Nullam magna neque.<br/> bibendum quis facilisis a.<br/> elementum at sem.<br/> <br/> Nunc feugiat risus eu sapien aliquet tincidunt.<br/> Aenean tristique gravida velit a gravida.<br/> Aenean est quam.<br/> sagittis vitae ornare sit amet.<br/> placerat nec urna.<br/> Proin cursus.<br/> lorem in egestas vehicula.<br/> magna risus ornare augue.<br/> vitae tristique massa tellus eu dolor.<br/> Etiam dictum congue dapibus.<br/> Nulla ut rhoncus sapien.<br/> Aenean vitae nulla non arcu adipiscing consectetur non id magna.<br/> Aliquam auctor aliquet justo.<br/> sed hendrerit turpis commodo non.<br/> Cum sociis natoque penatibus et magnis dis parturient montes.<br/> nascetur ridiculus mus.<br/> Nunc urna arcu.<br/> ultrices commodo placerat ut.<br/> dapibus vitae lectus.<br/> Fusce posuere nisi at ligula pellentesque malesuada.<br/> Maecenas quis turpis malesuada augue dignissim porta a <br/> massa.<br/> Donec <br/> metus orci.<br/> Vestibulum consectetur nunc in libero euismod faucibus.<br/> <br/> In vel metus nulla.<br/> nec tempus justo.<br/> Aenean ac est neque.<br/> Donec <br/> ligula quis ipsum placerat cursus <br/> id mauris.<br/> Suspendisse elit leo.<br/> ultrices ut pulvinar ac.<br/> porttitor ac urna.<br/> Ut sed laoreet orci.<br/> Class aptent taciti sociosqu ad litora torquent per conubia nostra.<br/> per inceptos himenaeos.<br/> Nam ipsum magna.<br/> mattis ac facilisis at.<br/> pharetra eu nisl.<br/> <br/> Duis ut ante vel nunc lacinia fermentum.<br/> Nunc pretium enim a sapien sagittis <br/>.<br/> Integer egestas eros a metus cursus ac condimentum nibh laoreet.<br/> Suspendisse lacinia enim vel arcu scelerisque viverra.<br/> Maecenas eros quam.<br/> venenatis cursus faucibus vitae.<br/> elementum id arcu.<br/> Aliquam erat volutpat.<br/> Nunc in quam sed neque dapibus malesuada.<br/> Phasellus elementum massa in sem tempus sed pharetra ante tincidunt.<br/> Nam vel bibendum magna.<br/> Curabitur sagittis porta arcu.<br/> non posuere mi vehicula ut.<br/> Pellentesque rhoncus mauris <br/> est rhoncus auctor.<br/> Cras aliquam orci quis diam <br/> vulputate vehicula velit auctor.<br/> <br/> Donec venenatis nibh non urna dignissim eleifend.<br/> Morbi at sapien neque.<br/> et blandit diam.<br/> Proin sem tellus.<br/> sollicitudin <br/> vehicula imperdiet.<br/> viverra <br/> ligula.<br/> Aliquam elementum pulvinar aliquet.<br/> Nulla facilisi.<br/> Morbi a laoreet arcu.<br/> Suspendisse potenti.<br/> Cras sed est ipsum.<br/> Mauris ut vulputate mi.<br/> Fusce imperdiet.<br/> lorem eu scelerisque dignissim.<br/> ligula tortor mollis lacus.<br/> in rhoncus dolor mauris sit amet elit.<br/> Morbi quis nibh sed nisl tempus vulputate sit amet vel lorem.<br/> <br/> Donec <br/>.<br/> turpis laoreet venenatis aliquet.<br/> lectus orci tincidunt massa.<br/> sagittis euismod leo nibh in leo.<br/> Ut sed libero lectus.<br/> Nam tincidunt sodales massa.<br/> Proin congue tellus id dolor condimentum auctor.<br/> Vivamus ullamcorper ligula non nulla vestibulum in consequat nisi placerat.<br/> Aliquam nec erat vitae diam rhoncus placerat.<br/> Sed risus ipsum.<br/> eleifend nec bibendum id.<br/> placerat vel orci.<br/> Sed sagittis lorem a justo auctor lobortis.<br/> Aliquam congue lobortis pellentesque.<br/> Phasellus nec arcu velit.<br/> <br/> imperdiet tellus.<br/> Quisque adipiscing <br/>.<br/> Duis vitae massa urna.<br/>",
+
+				_initButton: function(){
+					this.button = new Button({
+						label: "set",
+						showLabel: true,
+						onClick: lang.hitch(this, "_set"),
+						title: "Dojo"
+					});
+				},
+
+				setEditor: function(editor){
+					this.editor = editor;
+					this._initButton();
+				},
+
+				_set: function(){
+					var setDate1 = new Date();
+					this.editor.set("value", this.htmlValue);
+					var setDate2 = new Date();
+
+					var timeTakenSet = (setDate2.getTime() - setDate1.getTime()) / 1000;
+
+					if(this.showAlert){
+						alert("Set(" + timeTakenSet + " secs)\n"
+								+ "Steps: " + this.editor._steps.length
+						);
+					}
+					if(this.logResults){
+						console.log("Set(" + timeTakenSet + " secs)");
+						console.log("Steps: " + this.editor._steps.length);
+					}
+				}
+
+			});
+			_Plugin.registry["testpluginset"] = function(args){
+				return new TestPluginSet(args);
+			};
+
+			var TestPluginInsert = declare("TestPluginInsert", _Plugin, {
+				// summary:
+				//		Execute the inserthtml command at the current caret position
+
+				showAlert: false,
+
+				logResults: false,
+
+				_initButton: function(){
+					this.button = new Button({
+						label: "inserthtml",
+						showLabel: true,
+						onClick: lang.hitch(this, "_insert"),
+						title: "Dojo"
+					});
+				},
+
+				setEditor: function(editor){
+					this.editor = editor;
+					this._initButton();
+				},
+
+				_insert: function(){
+					var insertDate1 = new Date();
+					this.editor.execCommand("inserthtml", "<span class=\"cursorSpan\">Insert</span>");
+					var insertDate2 = new Date();
+
+					var timeTakenInsert = (insertDate2.getTime() - insertDate1.getTime()) / 1000;
+
+					if(this.showAlert){
+						alert("insertHTML(" + timeTakenInsert + " secs)\n"
+								+ "Steps: " + this.editor._steps.length);
+					}
+					if(this.logResults){
+						console.log("insertHTML(" + timeTakenInsert + " secs)");
+						console.log("Steps: " + this.editor._steps.length);
+					}
+				}
+			});
+			_Plugin.registry["testplugininsert"] = function(args){
+				return new TestPluginInsert(args);
+			};
+
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1>Dojo Editor PerformanceTest</h1>
+	<!-- plugins="[]"  -->
+	<div dojoType="dijit/Editor" aria-label="editor1" id="editor1"
+		 customUndo="false"
+		 extraPlugins="[
+		  {name: 'testpluginset', showAlert: true},
+		  {name: 'testpluginget', showAlert: true},
+		  {name: 'testplugininsert', showAlert: true}
+		]">
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/focus-framedojo-child.html b/src/main/resources/static/dijit/tests/focus-framedojo-child.html
new file mode 100644
index 0000000000000000000000000000000000000000..11081fed3da1aa3d384ff02b06433794c3b8741a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/focus-framedojo-child.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Focus Issue Child</title>
+	<script>
+	// open the parent, if user tries to open the child directly
+	if (parent == window)
+		location.href = './focus-framedojo.html';
+	</script>
+	<script type="text/javascript" src="../../dojo/dojo.js"
+		data-dojo-config="isDebug:true"></script>
+	<script type="text/javascript">
+		dojo.require("dijit.focus");
+		dojo.require("doh.runner");
+
+		// set objects in parent
+		for (var v in {'dijit':true, 'dojo':true, 'dojox':true})
+			parent[v] = window[v];
+
+		// This will execute before the dojo.ready() code in dijit.focus() executes
+		dojo.setContext(parent, parent.document);
+
+		dojo.ready(function(){
+			doh.register("focus", function focus(){
+				var d = new doh.Deferred();
+				doh.is("input", dojo.byId("input").id, "found input");
+
+				dijit.focus.watch("curNode", function(attr, oldVal, newVal){
+					console.log("focused on ", newVal);
+					if(!newVal){
+						return;	// IE gives spurious event
+					}
+					d.getTestCallback(function(){
+						doh.is("input", newVal.id, "notified that focused on input");
+					})();
+				});
+
+				dojo.byId("input").focus();
+
+				return d;
+			});
+
+			doh.run();
+		});
+	</script>
+</head>
+<body bgcolor="#e0e0e0">
+	this frame is for loading script only
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/focus-framedojo.html b/src/main/resources/static/dijit/tests/focus-framedojo.html
new file mode 100644
index 0000000000000000000000000000000000000000..6e46cb9da4de8a31bd6d308889b7545b9601bccb
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/focus-framedojo.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Focus Issue</title>
+	<style type="text/css">
+		@import "../themes/claro/claro.css";
+	</style>
+</head>
+<body class="claro">
+	<p>
+		Test case for focus code when dojo is loaded into an iframe.
+		Not supported officially but checking in test case anyway.
+	</p>
+
+	<p>Automated test will focus this input, causing a console message:</p>
+	<input id="input">
+
+	<p>Dojo is loaded into this iframe:</p>
+	<iframe style="width:100%;height:2em;" src="./focus-framedojo-child.html"></iframe>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/focus.html b/src/main/resources/static/dijit/tests/focus.html
new file mode 100644
index 0000000000000000000000000000000000000000..e3da7e0fd30d99ba32aa72855c5d3d9d1feda065
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/focus.html
@@ -0,0 +1,439 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>dijit/focus automated test</title>
+
+		<script src="boilerplate.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/_base/array", "dojo/dom", "dojo/on", "dojo/parser", "dojo/query",
+				"dijit/focus", "dijit/registry", "dijit/tests/helpers",
+				"dojo/domReady!",
+				"dijit/form/DateTextBox", "dijit/form/ComboBox", "dijit/form/NumberSpinner","dijit/form/ComboButton",
+				"dijit/Menu", "dijit/MenuItem", "dijit/PopupMenuItem", "dijit/layout/ContentPane", "dijit/Editor"
+			], function(doh, array, dom, on, parser, query, focus, registry, helpers){
+
+				doh.register("setup", [
+					function parse(){
+						parser.parse();
+						return helpers.waitForLoad();
+					},
+					function listeners(){
+						array.forEach(["form", "fieldset1", "fieldset2", "select", "editor", "spinner"], function(id){
+							var w = registry.byId(id);
+
+							// old API is to connect to onFocus/onBlur (remove in 2.0)
+							w.on("focus", function(){
+								focusEvents[id] = true;
+							});
+							w.on("blur", function(){
+								blurEvents[id] = true;
+							});
+
+							// new API is to watch "focused" attribute
+							w.watch("focused", function(name, oldValue, newValue){
+								// keep track of current state
+								focusedState[name] = newValue;
+
+								// keep log of every watch notification
+								var nvs = newValue ? "focused" : "blurred";
+								focusedWatchLog[w.id] = !focusedWatchLog[w.id] ? nvs : focusedWatchLog[w.id] + ", " + nvs;
+							});
+						});
+
+						// And there's also a curNode attribute that you can watch
+						focus.watch("curNode", function(name, oldValue, newValue){
+							curNodeWatchLog.push(newValue ? newValue.id || newValue.tagName : "null")
+						});
+					}
+				]);
+
+				function resetEvents(){
+					// These are objects used to track calls to _onFocus and _onBlur in various widgets
+					focusEvents = {};
+					blurEvents = {};
+					focusedState = {};
+					focusedWatchLog = {};
+
+					// This tracks watch("curNode")
+					curNodeWatchLog = [];
+				}
+				resetEvents();
+
+				function click(node){
+					on.emit(node, "mousedown", {
+						bubbles: true,
+						cancelable: true,
+						which: 1
+					});
+					on.emit(node, "mouseup", {
+						bubbles: true,
+						cancelable: true,
+						which: 1
+					});
+					on.emit(node, "click", {
+						bubbles: true,
+						cancelable: true,
+						which: 1
+					});
+				}
+				doh.register("basic", [
+					{
+						name: "focus simple input",
+						timeout: 4000,
+						setUp: function(){
+							resetEvents();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus the simple input
+							dom.byId("first").focus();
+
+							setTimeout(d.getTestCallback(function(){
+								// Make sure that focus manager caught the focus event
+								doh.is(dom.byId("first"), focus.curNode);
+								doh.is("first", curNodeWatchLog.join(", "), "curNodeWatchLog");
+
+								// And that the dijit.form.Form widget is marked as
+								// being "in focus"
+								doh.t(focusEvents["form"], "form focused");
+								
+								// And that it got one watch event
+								doh.is("focused", focusedWatchLog["form"], "watch callback");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "focus another simple input",
+						timeout: 4000,
+						setUp: function(){
+							resetEvents();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus the simple input
+							dom.byId("second").focus();
+
+							setTimeout(d.getTestCallback(function(){
+								// Make sure that focus manager caught the focus event
+								doh.is(dom.byId("second"), focus.curNode);
+								doh.is("second", curNodeWatchLog.join(", "), "curNodeWatchLog");
+
+								// Since the dijit.form.Form widget didn't leave the focus chain it
+								// shouldn't have any more events (since the resetEvents() call in setUp() above)
+								doh.f("form" in focusEvents, "form no new focus event");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "focus combobox",
+						timeout: 4000,
+						setUp: function(){
+							resetEvents();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var watchedActiveStack, activeStackWatchNotifications = 0;
+							focus.watch("activeStack", function(attr, oldVal, newVal){
+								watchedActiveStack = newVal;
+								activeStackWatchNotifications++;
+							});
+
+							// This onFocus() function from helpers.js would be useful here, except it
+							// defeats the purpose of the test by using dijit/focus.
+							on.once(registry.byId("select").focusNode, "focus", function(){
+								setTimeout(d.getTestCallback(function(){
+									// Focus goes to an <input> node deep inside of select.domNode,
+									// but that <input> node has the id of the widget
+									doh.is(dom.byId("select"), focus.curNode);
+
+									// The focus stack should show the ComboBox plus all parent widgets
+									var stack = focus.activeStack;
+									doh.is("form, fieldset1, select", stack.join(", "), "active stack");
+
+									// Also check that we got (exactly) one watch notification about active stack
+									doh.is(1, activeStackWatchNotifications, "one watch() on activeStack");
+									doh.is("form, fieldset1, select", watchedActiveStack.join(", "), "watched active stack");
+
+									// _onFocus()/_onBlur was called appropriately
+									doh.f(focusEvents["form"], "form was already focused, no duplicate event");
+									doh.f(blurEvents["form"], "form wasn't blurred");
+									doh.t(focusEvents["fieldset1"], "fieldset1 focused");
+									doh.t(focusEvents["select"], "select focused");
+
+									doh.f(focusedWatchLog["form"], "form watch callback (no new notification)");
+									doh.is("focused", focusedWatchLog["fieldset1"], "fieldset watch callback");
+									doh.is("focused", focusedWatchLog["select"], "select watch callback");
+								}), 100);
+							});
+							registry.byId("select").focus();
+
+							return d;
+						}
+					},
+					{
+						name: "focus combobox again",
+						timeout: 4000,
+						setUp: function(){
+							resetEvents();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var again;
+							focus.watch("activeStack", function(){
+								again = true;
+							});
+
+							registry.byId("select").focus();
+
+							on.emit(registry.byId("select").focusNode, "mousedown", {bubbles: true});
+							on.emit(registry.byId("select").focusNode, "mouseup", {bubbles: true});
+
+							setTimeout(d.getTestCallback(function(){
+								doh.f(again, "duplicate notification about activeStack");
+							}), 100);
+
+							return d;
+						}
+					},
+					{
+						name: "focus editor",
+						timeout: 4000,
+						setUp: function(){
+							resetEvents();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							registry.byId("editor").focus();
+
+							setTimeout(d.getTestCallback(function(){
+								// The focus stack should show the Editor plus all parent widgets
+								var stack = focus.activeStack;
+								doh.is("form, editor", stack.join(", "), "active stack");
+
+								// _onFocus()/_onBlur was called appropriately
+								doh.f(focusEvents["form"], "form was already focused, no duplicate event");
+								doh.f(blurEvents["form"], "form wasn't blurred");
+								doh.t(blurEvents["fieldset1"], "fieldset no longer focused");
+								doh.t(focusEvents["editor"], "editor focused");
+
+								doh.f(focusedWatchLog["form"], "form watch callback (no new notification)");
+								doh.is("blurred", focusedWatchLog["fieldset1"], "fieldset watch callback, no longer focused");
+								doh.is("blurred", focusedWatchLog["select"], "select watch callback, no longer focused");
+								doh.is("focused", focusedWatchLog["editor"], "editor watch callback");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					// clicking spinner buttons should activate the spinner, even
+					// though there's no actual DOM focus event
+					{
+						name: "spinner",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var upArrow = query(".dijitSpinner .dijitUpArrowButton")[0];
+							doh.t(upArrow, "found the up arrow");
+
+							click(upArrow);
+
+							setTimeout(d.getTestCallback(function(){
+								// The focus stack should show the Spinner plus all parent widgets
+								var stack = focus.activeStack;
+								doh.is("form, fieldset2, spinner", stack.join(", "), "active stack");
+
+								// check watch callbacks
+								doh.f(focusedWatchLog["form"], "grandparent of spinner stayed focused, so no new watch event (watch)");
+								doh.is("focused", focusedWatchLog["fieldset2"], "parent of spinner (watch)");
+								doh.is("focused", focusedWatchLog["spinner"], "spinner (watch)");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					// Clicking a tabIndex=-1 node should set focus.curNode even though it's not tab navigable
+					{
+						name: "tabIndex=-1",
+						timeout: 4000,
+						setUp: function(){
+							resetEvents();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var minusOne = query("#minusOne")[0];
+							doh.t(minusOne, "found tabIndex=-1 button");
+
+							minusOne.focus();
+
+							setTimeout(d.getTestCallback(function(){
+								doh.is("minusOne", focus.curNode.id);
+							}), 500);
+
+							return d;
+						}
+					},
+
+					// Clicking a disabled button should not set focus.curNode
+					{
+						name: "disabled button",
+						timeout: 4000,
+						setUp: function(){
+							resetEvents();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var disabledButton = query("#disabledButton")[0];
+							doh.t(disabledButton, "found disabled button");
+
+							try{
+								disabledButton.focus();
+							}catch(e){
+								/* IE throws exception trying to focus disabled button */
+							}
+
+							setTimeout(d.getTestCallback(function(){
+								doh.is("minusOne", focus.curNode.id, "focus.curNode still old value");
+							}), 500);
+
+							return d;
+						}
+					}
+					/*,
+					// FIXME: this test is invalid because focus is not designed to change on mouse click to the first item in the menu
+					{
+						name: "combo button menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var button = registry.byId('button').focusNode;
+							doh.t(button, "found drop down button");
+
+							doh.robot.mouseMoveAt(button);
+							doh.robot.mouseClick({left: true}, 500);
+
+							setTimeout(d.getTestCallback(function(){
+								// Focus goes to an first item in the drop down menu
+								doh.is(dom.byId("mi1").id, focus.curNode.id);
+
+								// The focus stack should show the ComboBox plus all parent widgets
+								var stack = focus.activeStack;
+								console.log("menu stack is ", stack);
+								doh.is("form, fieldset2, button, menu, mil", stack.join(", "), "active stack");
+							}), 500);
+
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handle);
+						}
+					}*/
+
+/*
+					// Commented out because
+					// in order to allow dijit.popup's getTopPopup() to work,a sub menu's popupParent
+					// points to the parent Menu, bypassing the parent MenuItem... thus the
+					// MenuItem is not in the chain of active widgets
+					{
+						name: "nested menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("popupMenuItem");
+
+							setTimeout(d.getTestCallback(function(){
+								// Focus goes to an first item in the sub menu
+								doh.is(dom.byId("smi1"), focus.curNode);
+
+								// The focus stack should show the two submenus and then upwards
+								// to the ComboButton, and the rest
+								var stack = focus.activeStack;
+								console.log("menu stack is ", stack);
+								doh.is("form, fieldset2, button, menu, mil, submenu, smil", stack.join(", "), "active stack");
+							}), 1000);
+
+							return d;
+						}
+					}
+*/
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+	<body style="background-color: #fff; color: black; padding: 0; margin: 0">
+	
+		<h3>Dijit/focus Automated Test</h3>
+
+		<label>a form ContentPane widget:</label><br>
+		<form id="form" data-dojo-type="dijit/layout/ContentPane" >
+			<label for="first">simple input: </label><input id="first"/><br>
+			<label for="second">another simple input: </label><input id="second"/><br>
+
+			<label>a fieldset ContentPane widget:</label><br>
+			<fieldset id=fieldset1 data-dojo-type="dijit/layout/ContentPane">
+				<label for="select">a ComboBox widget:</label>
+				<select id=select data-dojo-type="dijit/form/ComboBox">
+					<option>this</option>
+					<option>is</option>
+					<option>a</option>
+					<option>list</option>
+				</select>
+				<label for="plain">a plain input:</label>
+				<input id=plain value=plain/>
+			</fieldset>
+			<div id=editor data-dojo-type="dijit/Editor" >
+				Hello world, this is an <i>editor</i>
+			</div>
+			<br>
+			<label>another fieldset ContentPane:</label><br>
+			<fieldset id=fieldset2 data-dojo-type="dijit/layout/ContentPane">
+				<label for="date">a DateTextBox widget:</label>
+				<input id=date data-dojo-type="dijit/form/DateTextBox"/><br>
+	
+				<label for="textarea">a plain textarea:</label><br>
+				<textarea id=textarea>hello there!</textarea><br>
+	
+				<label for="spinner">a Spinner widget:</label>
+				<input id=spinner data-dojo-type="dijit/form/NumberSpinner" data-dojo-props='value:100'/><br>
+	
+				<label>a Combobutton widget:</label>
+				<div id=button data-dojo-type="dijit/form/ComboButton" data-dojo-props='tabIndex:"0"'>
+					<span>push me</span>
+					<div id=menu data-dojo-type="dijit/Menu">
+						<div id=mi1 data-dojo-type="dijit/MenuItem">menu item 1</div>
+						<div id=mi2 data-dojo-type="dijit/MenuItem">menu item 2</div>
+						<div id=popupMenuItem data-dojo-type="dijit/PopupMenuItem">
+							<span>submenu</span>
+							<div id=submenu data-dojo-type="dijit/Menu">
+								<div id=smi1 data-dojo-type="dijit/MenuItem">submenu item 1</div>
+								<div id=smi2 data-dojo-type="dijit/MenuItem">submenu item 2</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</fieldset>
+			<button tabIndex="-1" id="minusOne" type="button">non tab-navigable button</button>
+			<button id="disabledButton" type="button" disabled>disabled button</button>
+		</form>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/AutoCompleterMixin.html b/src/main/resources/static/dijit/tests/form/AutoCompleterMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..0c1e10ffc0c3031ee3c14aba2cab7a866892faab
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/AutoCompleterMixin.html
@@ -0,0 +1,299 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_AutoCompleterMixin tests</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+		@import "../../themes/claro/claro.css";
+		@import "../../../dojox/mobile/themes/iphone/TextBox.css";
+		@import "../../../dojox/mobile/themes/iphone/ComboBox.css";
+
+		#table {
+			margin: 0;
+			padding: 2px;
+		}
+		#table .layout {
+			padding: 2px;
+			font-size: 100%;
+			margin: 0;
+		}
+	</style>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.DataList");
+		dojo.require("dijit.form.ComboBox");
+		dojo.require("dojox.mobile.ComboBox");
+		dojo.require("dojo.on");
+
+		dojo.ready(function(){
+
+			doh.register("attributes", [
+				{
+					name: "dijit",
+					runTest: function(){
+						var d = new doh.Deferred(),
+							dijit_attributes = dijit.byId('dijit_attributes');
+						doh.is("", dijit_attributes.textbox.value, "dijit original value");
+						doh.is("", dijit_attributes.get('value'), "dijit original get('value')");
+						doh.is(Infinity, dijit_attributes.get('pageSize'), "dijit original get('pageSize')");
+						dijit_attributes.set('pageSize', 9);
+						dijit_attributes.set('value', "test");
+						doh.is("test", dijit_attributes.textbox.value, "dijit value");
+						doh.is("test", dijit_attributes.get('value'), "dijit get('value')");
+						doh.is(9, dijit_attributes.get('pageSize'), "dijit get('pageSize')");
+						dijit_attributes.set('item', {});
+						dijit_attributes.textbox.value = '';
+						
+						dojo.on(dijit_attributes.textbox, 'input', function(){
+							setTimeout(d.getTestCallback(function() {
+								doh.is(null, dijit_attributes.get('item'), 'clears item when textbox emptied');
+							}), 10);
+						});
+						dojo.on.emit(dijit_attributes.textbox,'input', {});
+
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					runTest: function(){
+						var mobile_attributes = dijit.byId('mobile_attributes');
+						doh.is("", mobile_attributes.textbox.value, "mobile original value");
+						doh.is("", mobile_attributes.get('value'), "mobile original get('value')");
+						doh.is(Infinity, mobile_attributes.get('pageSize'), "mobile original get('pageSize')");
+						mobile_attributes.set('pageSize', 9);
+						mobile_attributes.set('value', "test");
+						doh.is("test", mobile_attributes.textbox.value, "mobile value");
+						doh.is("test", mobile_attributes.get('value'), "mobile get('value')");
+						doh.is(9, mobile_attributes.get('pageSize'), "mobile get('pageSize')");
+					}
+	 			}
+			]);
+
+			doh.register("events", [
+				{
+					name: "dijit",
+					timeout: 5000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							dijit_events = dijit.byId('dijit_events'),
+							nop = function(){ return false; };
+
+						function onFocus(){
+							dijit_events.set('onFocus', nop);
+							dijit_events.set('displayedValue', "Focus");
+							dijit_events.set('onChange', onChange);
+							dijit_events.set('onBlur', onBlur);
+							dijit.byId('mobile_events').focus();
+						}
+						function onBlur(){
+							dijit_events.set('onBlur', nop);
+							dijit_events.set('displayedValue', dijit_events.get('displayedValue')+"Blur");
+						}
+						function onChange(){
+							dijit_events.set('onChange', nop);
+							dijit_events.set('displayedValue', dijit_events.get('displayedValue')+"Change");
+							dijit_events.focus();
+							d.getTestCallback(function(){
+								doh.is("FocusBlurChange", dijit_events.textbox.value);
+							})();
+						}
+						doh.is(nop.toString(), dijit_events.get('onFocus').toString(), "get('onFocus')");
+						doh.is(nop.toString(), dijit_events.get('onBlur').toString(), "get('onBlur')");
+						doh.is(nop.toString(), dijit_events.get('onChange').toString(), "get('onChange')");
+						dijit_events.set('onFocus', onFocus);
+						setTimeout(dojo.hitch(dijit_events, "focus"), 0);
+
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 5000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							mobile_events = dijit.byId('mobile_events'),
+							focusHandle, blurhandle,
+							nop = function(){ return false; };
+
+						function onFocus(){
+							mobile_events.disconnect(focusHandle);
+							mobile_events.set('displayedValue', "Focus");
+							mobile_events.set('onChange', onChange);
+							blurhandle = mobile_events.connect(mobile_events.textbox, 'onblur', onBlur);
+							dijit.byId('dijit_events').focus();
+						}
+						function onBlur(){
+							mobile_events.disconnect(blurhandle);
+							mobile_events.set('displayedValue', mobile_events.get('displayedValue')+"Blur");
+						}
+						function onChange(){
+							mobile_events.set('onChange', nop);
+							mobile_events.set('displayedValue', mobile_events.get('displayedValue')+"Change");
+							mobile_events.focus();
+							d.getTestCallback(function(){
+								doh.is("FocusBlurChange", mobile_events.textbox.value);
+							})();
+						}
+						doh.is(nop.toString(), mobile_events.get('onChange').toString(), "get('onChange')");
+						focusHandle = mobile_events.connect(mobile_events.textbox, 'onfocus', onFocus);
+						setTimeout(dojo.hitch(mobile_events, "focus"), 0);
+
+						return d;
+					}
+	 			}
+			]);
+
+			doh.register("programmatic", [
+				{
+					name: "dijit",
+					timeout: 5000,
+					runTest: function(){
+						new dijit.form.ComboBox({id:"dijit_programmatic", list:"states", "aria-label":"dijit_programmatic",value:"Alabama"}).placeAt("dijit_programmatic_container", "first");
+						var dijit_programmatic = dijit.byId('dijit_programmatic');
+						var focushandle = dijit_programmatic.connect(dijit_programmatic, '_onFocus',
+							function(){
+								d.getTestCallback(function(){
+									dijit_programmatic.disconnect(focushandle);
+									var pos = dojo.position(dijit_programmatic.domNode, true);
+									doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'dijit position');
+									doh.is("Alabama", dijit_programmatic.textbox.value, 'dijit textbox value');
+									doh.is("Alabama", dijit_programmatic.get('value'), 'dijit widget value');
+								})();
+							}
+						);
+						var d = new doh.Deferred();
+						setTimeout(dojo.hitch(dijit_programmatic, "focus"), 0);
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 5000,
+					runTest: function(){
+						new dojox.mobile.ComboBox({id:"mobile_programmatic", list:"states", "aria-label":"mobile_programmatic", value:"Alabama"}).placeAt("mobile_programmatic_container", "first");
+						var mobile_programmatic = dijit.byId('mobile_programmatic');
+						var focushandle = mobile_programmatic.connect(mobile_programmatic.textbox, 'onfocus',
+							function(){
+								d.getTestCallback(function(){
+									mobile_programmatic.disconnect(focushandle);
+									var pos = dojo.position(mobile_programmatic.domNode, true);
+									doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'mobile position');
+									doh.is("Alabama", mobile_programmatic.textbox.value, 'mobile textbox value');
+									doh.is("Alabama", mobile_programmatic.get('value'), 'mobile widget value');
+								})();
+							}
+						);
+						var d = new doh.Deferred();
+						setTimeout(dojo.hitch(mobile_programmatic, "focus"), 0);
+						return d;
+					}
+	 			}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">_AutoCompleterMixin (dijit and mobile) non-robot tests</h1>
+	<datalist id="states">
+	<select data-dojo-type="dijit/form/DataList" data-dojo-props='id:"states"' >
+		<option value="AL">Alabama</option>
+		<option value="AK">Alaska</option>
+		<option value="AS">American Samoa</option>
+		<option value="AZ">Arizona</option>
+		<option value="AR">Arkansas</option>
+		<option value="AE">Armed Forces Europe</option>
+		<option value="AP">Armed Forces Pacific</option>
+		<option value="AA">Armed Forces the Americas</option>
+		<option value="CA">California</option>
+		<option value="CO">Colorado</option>
+		<option value="CT">Connecticut</option>
+		<option value="DE">Delaware</option>
+		<option value="DC">District of Columbia</option>
+		<option value="FM">Federated States of Micronesia</option>
+		<option value="FL">Florida</option>
+		<option value="GA">Georgia</option>
+		<option value="GU">Guam</option>
+		<option value="HI">Hawaii</option>
+		<option value="ID">Idaho</option>
+		<option value="IL">Illinois</option>
+		<option value="IN">Indiana</option>
+		<option value="IA">Iowa</option>
+		<option value="KS">Kansas</option>
+		<option value="KY">Kentucky</option>
+		<option value="LA">Louisiana</option>
+		<option value="ME">Maine</option>
+		<option value="MH">Marshall Islands</option>
+		<option value="MD">Maryland</option>
+		<option value="MA">Massachusetts</option>
+		<option value="MI">Michigan</option>
+		<option value="MN">Minnesota</option>
+		<option value="MS">Mississippi</option>
+		<option value="MO">Missouri</option>
+		<option value="MT">Montana</option>
+		<option value="NE">Nebraska</option>
+		<option value="NV">Nevada</option>
+		<option value="NH">New Hampshire</option>
+		<option value="NJ">New Jersey</option>
+		<option value="NM">New Mexico</option>
+		<option value="NY">New York</option>
+		<option value="NC">North Carolina</option>
+		<option value="ND">North Dakota</option>
+		<option value="MP">Northern Mariana Islands</option>
+		<option value="OH">Ohio</option>
+		<option value="OK">Oklahoma</option>
+		<option value="OR">Oregon</option>
+		<option value="PA">Pennsylvania</option>
+		<option value="PR">Puerto Rico</option>
+		<option value="RI">Rhode Island</option>
+		<option value="SC">South Carolina</option>
+		<option value="SD">South Dakota</option>
+		<option value="TN">Tennessee</option>
+		<option value="TX">Texas</option>
+		<option value="UT">Utah</option>
+		<option value="VT">Vermont</option>
+		<option value="VI">Virgin Islands, U.S.</option>
+		<option value="VA">Virginia</option>
+		<option value="WA">Washington</option>
+		<option value="WV">West Virginia</option>
+		<option value="WI">Wisconsin</option>
+		<option value="WY">Wyoming</option>
+	</select>
+	</datalist>
+	<table id="table">
+		<tr>
+			<th class="layout">&nbsp;</th>
+			<th class="layout">dijit</th>
+			<th class="layout">mobile</th>
+		</tr>
+		<tr>
+			<td class="layout">attributes</td>
+			<td class="layout"><input id="dijit_attributes" aria-label="dijit_attributes" data-dojo-type="dijit/form/ComboBox" data-dojo-props='value:"", list:"states"'/></td>
+			<td class="layout"><input id="mobile_attributes" aria-label="mobile_attributes" data-dojo-type="dojox.mobile.ComboBox" data-dojo-props='value:"", list:"states"'></td>
+		</tr>
+		<tr>
+			<td class="layout">Events</td>
+			<td class="layout"><input id="dijit_events" aria-label="dijit_events" data-dojo-type="dijit/form/ComboBox" data-dojo-props='value:"", list:"states", onFocus:function(){ return false; }, onBlur:function(){ return false; }, onChange:function(){ return false; }'/></td>
+			<td class="layout"><input id="mobile_events" aria-label="mobile_events" data-dojo-type="dojox.mobile.ComboBox" data-dojo-props='value:"", list:"states", onChange:function(){ return false; }'></td>
+		</tr>
+		<tr>
+			<td class="layout">Programmatic</td>
+			<td class="layout" id="dijit_programmatic_container"></td>
+			<td class="layout" id="mobile_programmatic_container"></td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/Button.html b/src/main/resources/static/dijit/tests/form/Button.html
new file mode 100644
index 0000000000000000000000000000000000000000..ea2b08b2bd78421d9e3c433152bd65c3769edfa6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/Button.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Button non-robot tests</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+	</style>
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config=" async: true, isDebug: true"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/declare",
+			"dojo/dom",
+			"dijit/_WidgetBase",
+			"dijit/_TemplatedMixin",
+			"dijit/_WidgetsInTemplateMixin",
+			"dijit/form/Button",
+			"dojo/domReady!"
+		],function(doh, declare, dom, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, Button){
+			doh.register("title", function(){
+				// This button has a title specified explicitly.  It should not be overridden.
+				var b1 = new Button({
+					label: "my label",
+					title: "my title",
+					showLabel: false
+				});
+				b1.placeAt(document.body);
+				doh.is("my title", b1.titleNode.title);
+
+				// This button's title should be set from its label.
+				var b2 = new Button({
+					label: "my label",
+					showLabel: false
+				});
+				b2.placeAt(document.body);
+				doh.is("my label", b2.titleNode.title);
+			});
+
+			doh.register("buttons in templates", function(){
+				var Test1Widget = declare('Test1Widget', [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+					templateString:
+						'<div>\
+							<div data-dojo-type="dijit/form/Button">\
+								<div>\
+								<h3 data-dojo-attach-point="titleNode"></h3>\
+								<span>Something else</span>\
+								</div>\
+								<span>Something else</span>\
+							</div>\
+						</div>'
+				});
+
+				var myWidget = new Test1Widget();
+				doh.t(dom.isDescendant(myWidget.titleNode, myWidget.domNode), "titleNode inside domNode");
+			});
+
+			// ARIA tests.  See also Button_a11y.html.
+			doh.register("aria", function(){
+				var b1 = new Button({
+					label: "disabled",
+					disabled: true
+				});
+				b1.placeAt(document.body);
+				doh.is("true", b1.focusNode.getAttribute("aria-disabled"), "aria-disabled");
+				doh.f(b1.focusNode.disabled, "disabled not set since it's a <span>")
+			});
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">Button non-robot tests</h1>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/ButtonMixin.html b/src/main/resources/static/dijit/tests/form/ButtonMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..92b3f547a7ab4e9033e72968e40a183deff4ba25
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/ButtonMixin.html
@@ -0,0 +1,256 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_ButtonMixin tests</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+
+		#table {
+			margin: 0;
+			padding: 2px;
+		}
+		#table, .dijit, BUTTON {
+			font-family: monospace;
+			font-size: 12pt;
+		}
+		#table .layout {
+			padding: 2px;
+			font-size: 100%;
+			margin: 0;
+		}
+	</style>
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.Dialog");
+		dojo.require("dijit.form.Button");
+		dojo.require("dojox.mobile.Button");
+
+		dojo.ready(function(){
+
+			doh.register("attributes", [
+				{
+					name: "dijit",
+					runTest: function(){
+						var dijit_attributes = dijit.byId('dijit_attributes');
+						doh.is("original", dijit_attributes.get('label'), "dijit original get('label')");
+						dijit_attributes.set('label', "label");
+						doh.is("label", dijit_attributes.get('label'), "dijit get('label')");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass), "dijit baseClass");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, "mblRedButton"), "dijit original class");
+						dijit_attributes.set('class', "mblBlueButton");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, "mblBlueButton"), "dijit new class");
+					}
+	 			},
+				{
+					name: "mobile",
+					runTest: function(){
+						var mobile_attributes = dijit.byId('mobile_attributes');
+						doh.is("original", mobile_attributes.get('label'), "mobile original get('label')");
+						mobile_attributes.set('label', "label");
+						doh.is("label", mobile_attributes.get('label'), "mobile get('label')");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass), "mobile baseClass");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, "mblRedButton"), "mobile original class");
+						mobile_attributes.set('class', "mblBlueButton");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, "mblBlueButton"), "mobile new class");
+					}
+	 			}
+			]);
+
+			doh.register("programmatic", [
+				{
+					name: "dijit",
+					timeout: 2000,
+					runTest: function(){
+						new dijit.form.Button({id:"dijit_programmatic", type:"button", label:"No srcNodeRef"}).placeAt("dijit_programmatic_container", "first");
+						var dijit_programmatic = dijit.byId('dijit_programmatic');
+						var pos = dojo.position(dijit_programmatic.domNode, true);
+						doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'dijit position');
+						doh.is("No srcNodeRef", dijit_programmatic.get('label'), 'dijit widget label');
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 2000,
+					runTest: function(){
+						new dojox.mobile.Button({id:"mobile_programmatic", type:"button", label:"No srcNodeRef"}).placeAt("mobile_programmatic_container", "first");
+						var mobile_programmatic = dijit.byId('mobile_programmatic');
+						var pos = dojo.position(mobile_programmatic.domNode, true);
+						doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'mobile position');
+						doh.is("No srcNodeRef", mobile_programmatic.get('label'), 'mobile widget label');
+					}
+	 			}
+			]);
+
+			var runTests = function(t,i){
+				var	d = new doh.Deferred(),
+					form = document.getElementById('myform'),
+					clicks = document.getElementById('clicks'),
+					submits = document.getElementById('submits'),
+					bubbles = document.getElementById('bubbles');
+				form.reset();
+				document.getElementById('native'+i).click();
+				setTimeout(function(){
+					var nativeClicks = clicks.value;
+					var nativeSubmits = submits.value;
+					var nativeBubbles = bubbles.value;
+					form.reset();
+					document.getElementById('widget'+i).click();
+					setTimeout(function(){
+						var widgetClicks = clicks.value;
+						var widgetSubmits = submits.value;
+						var widgetBubbles = bubbles.value;
+						form.reset();
+						document.getElementById('mobile'+i).click();
+						setTimeout(function(){
+							var mobileClicks = clicks.value;
+							var mobileSubmits = submits.value;
+							var mobileBubbles = bubbles.value;
+							form.reset();
+							document.getElementById('dialogButton'+i).click();
+							setTimeout(d.getTestCallback(function(){
+								var dialogClicks = clicks.value;
+								var dialogSubmits = submits.value;
+								var dialogBubbles = bubbles.value;
+								t.is(nativeClicks, widgetClicks, "widget clicks");
+								t.is(nativeSubmits, widgetSubmits, "widget submits");
+								t.is(nativeBubbles, widgetBubbles, "widget bubbles");
+								t.isNot("000", widgetClicks+""+widgetSubmits+""+widgetBubbles, "not all 0");
+								t.is(nativeClicks, mobileClicks, "mobile clicks");
+								t.is(nativeSubmits, mobileSubmits, "mobile submits");
+								t.is(nativeBubbles, mobileBubbles, "mobile bubbles");
+								t.is(nativeClicks, dialogClicks, "dialog clicks");
+								t.is(nativeSubmits, dialogSubmits, "dialog submits");
+								t.is(nativeBubbles, dialogBubbles, "dialog bubbles");
+							}), 0);
+						}, 0);
+					}, 0);
+				}, 0);
+				return d;
+			};
+
+			doh.register("click behavior", [
+				{
+					name: "return true",
+					timeout: 1000,
+					runTest: function(t){
+						runTests(t,1);
+					}
+				},
+				{
+					name: "return false",
+					timeout: 1000,
+					runTest: function(t){
+						runTests(t,2);
+					}
+				},
+				{
+					name: "stopProgation + return true",
+					timeout: 1000,
+					runTest: function(t){
+						runTests(t,3);
+					}
+				},
+				{
+					name: "stopProgation + return false",
+					timeout: 1000,
+					runTest: function(t){
+						runTests(t,4);
+					}
+				},
+				{
+					name: "preventDefault + return true",
+					timeout: 1000,
+					runTest: function(t){
+						runTests(t,5);
+					}
+				},
+				{
+					name: "preventDefault + return false",
+					timeout: 1000,
+					runTest: function(t){
+						runTests(t,6);
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">_ButtonMixin (dijit and mobile) non-robot tests</h1>
+
+	<table id="table">
+		<tr>
+			<th class="layout">&nbsp;</th>
+			<th class="layout">dijit</th>
+			<th class="layout">mobile</th>
+		</tr>
+		<tr>
+			<td class="layout">attributes</td>
+			<td class="layout"><input id="dijit_attributes" data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", label:"original", "class":"mblRedButton"'/></td>
+			<td class="layout"><button type="button" class="mblRedButton" id="mobile_attributes" dojoType="dojox.mobile.Button" label="original"/></td>
+		</tr>
+		<tr>
+			<td class="layout">Programmatic</td>
+			<td class="layout" id="dijit_programmatic_container"></td>
+			<td class="layout" id="mobile_programmatic_container"></td>
+		</tr>
+	</table>
+	<form id="myform" method="get" onsubmit="document.getElementById('submits').value++;return false" onclick="document.getElementById('bubbles').value++;return true;" style="border:1px solid black;margin:10px 0;">
+		<legend>Compare native and widget click event behavior:</legend>
+		<label for="submits">Submits</label><input id="submits" size="4" disabled value="0">
+		<label for="bubbles">Bubbles</label><input id="bubbles" size="4" disabled value="0">
+		<label for="clicks">Clicks</label><input id="clicks" size="4" disabled value="0">
+		<input type="reset" id="formContainerReset">
+		<br>
+		<button id="native1" type="submit" onclick="document.getElementById('clicks').value++;return true;">native return true</button>
+		<button id="widget1" type="submit" onclick="document.getElementById('clicks').value++;return true;" data-dojo-type="dijit/form/Button">widget return true</button>
+		<button id="mobile1" type="submit" onclick="document.getElementById('clicks').value++;return true;" data-dojo-type="dojox/mobile/Button">mobile return true</button>
+		<button id="dialog1" type="button" onclick="arguments[0].stopPropagation();arguments[0].preventDefault();document.getElementById('dialogButton1').click();return false;" data-dojo-type="dijit/form/Button">dialog return true</button>
+		<br>
+		<button id="native2" type="submit" onclick="document.getElementById('clicks').value++;return false;">native return false</button>
+		<button id="widget2" type="submit" onclick="document.getElementById('clicks').value++;return false;" data-dojo-type="dijit/form/Button">widget return false</button>
+		<button id="mobile2" type="submit" onclick="document.getElementById('clicks').value++;return false;" data-dojo-type="dojox/mobile/Button">mobile return false</button>
+		<button id="dialog2" type="button" onclick="arguments[0].stopPropagation();arguments[0].preventDefault();document.getElementById('dialogButton2').click();return false;" data-dojo-type="dijit/form/Button">dialog return false</button>
+		<br>
+		<button id="native3" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].stopPropagation();return true;">native stopPropagation + return true</button>
+		<button id="widget3" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].stopPropagation();return true;" data-dojo-type="dijit/form/Button">widget stopPropagation + return true</button>
+		<button id="mobile3" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].stopPropagation();return true;" data-dojo-type="dojox/mobile/Button">mobile stopPropagation + return true</button>
+		<button id="dialog3" type="button" onclick="arguments[0].stopPropagation();arguments[0].preventDefault();document.getElementById('dialogButton3').click();return false;" data-dojo-type="dijit/form/Button">dialog stopPropagation + return true</button>
+		<br>
+		<button id="native4" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].stopPropagation();return false;">native stopPropagation + return false</button>
+		<button id="widget4" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].stopPropagation();return false;" data-dojo-type="dijit/form/Button">widget stopPropagation + return false</button>
+		<button id="mobile4" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].stopPropagation();return false;" data-dojo-type="dojox/mobile/Button">mobile stopPropagation + return false</button>
+		<button id="dialog4" type="button" onclick="arguments[0].stopPropagation();arguments[0].preventDefault();document.getElementById('dialogButton4').click();return false;" data-dojo-type="dijit/form/Button">dialog stopPropagation + return false</button>
+		<br>
+		<button id="native5" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].preventDefault();return true;">native preventDefault + return true</button>
+		<button id="widget5" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].preventDefault();return true;" data-dojo-type="dijit/form/Button">widget preventDefault + return true</button>
+		<button id="mobile5" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].preventDefault();return true;" data-dojo-type="dojox/mobile/Button">mobile preventDefault + return true</button>
+		<button id="dialog5" type="button" onclick="arguments[0].stopPropagation();arguments[0].preventDefault();document.getElementById('dialogButton5').click();return false;" data-dojo-type="dijit/form/Button">dialog preventDefault + return true</button>
+		<br>
+		<button id="native6" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].preventDefault();return false;">native preventDefault + return false</button>
+		<button id="widget6" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].preventDefault();return false;" data-dojo-type="dijit/form/Button">widget preventDefault + return false</button>
+		<button id="mobile6" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].preventDefault();return false;" data-dojo-type="dojox/mobile/Button">mobile preventDefault + return false</button>
+		<button id="dialog6" type="button" onclick="arguments[0].stopPropagation();arguments[0].preventDefault();document.getElementById('dialogButton6').click();return false;" data-dojo-type="dijit/form/Button">dialog preventDefault + return false</button>
+	</form> 
+	<div data-dojo-type="dijit/Dialog" onExecute="document.getElementById('submits').value++;return false" onclick="document.getElementById('bubbles').value++;return true;">
+		<button id="dialogButton1" type="submit" onclick="document.getElementById('clicks').value++;return true;" data-dojo-type="dijit/form/Button"></button>
+		<button id="dialogButton2" type="submit" onclick="document.getElementById('clicks').value++;return false;" data-dojo-type="dijit/form/Button"></button>
+		<button id="dialogButton3" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].stopPropagation();return true;" data-dojo-type="dijit/form/Button"></button>
+		<button id="dialogButton4" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].stopPropagation();return false;" data-dojo-type="dijit/form/Button"></button>
+		<button id="dialogButton5" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].preventDefault();return true;" data-dojo-type="dijit/form/Button"></button>
+		<button id="dialogButton6" type="submit" onclick="document.getElementById('clicks').value++;arguments[0].preventDefault();return false;" data-dojo-type="dijit/form/Button"></button>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/CheckBox.html b/src/main/resources/static/dijit/tests/form/CheckBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..824dae2247617b6acaa2edb3880b10222ed49726
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/CheckBox.html
@@ -0,0 +1,273 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>Checkbox unit Test</title>
+
+		<script type="text/javascript" src="../boilerplate.js"></script>
+
+		<script type="text/javascript">
+			function defaultSubmitHandler(values){
+				console.debug('actual submitted values: ' + json.stringify(values));
+			}
+			submittedValues = defaultSubmitHandler;
+
+			require([
+				"doh/runner",
+				"dojo/dom", "dojo/json", "dojo/parser", "dojo/query",
+				"dijit/registry", "dijit/form/CheckBox", "dijit/form/Form", "dojo/domReady!"
+			], function(doh, dom, json, parser, query, registry, CheckBox){
+
+				// These are the values assigned to the widgets in the page's HTML
+				var originalGet = {
+					cb1: [],
+					cb2: ["on"],
+					cb4: ["on"],
+					cb5: [],
+					cb6: ["on"],
+					cb7: []
+				};
+	
+				var originalSubmit = {
+					cb2: "on",
+					cb4: "on",
+					cb6: "on"
+				};
+	
+				// attempt to change these values
+				var change = {
+					cb1: ["foo"],
+					cb2: [],
+					cb3: ["on"],
+					cb4: [],
+					cb5: ["on"],
+					cb6: ["foo"]
+				};
+	
+				// changed values
+				var changedGet = {
+					cb1: ["foo"],
+					cb2: [],
+					cb4: [],
+					cb5: ["on"],
+					cb6: [],
+					cb7: []
+				};
+	
+				var changedSubmit = {
+					cb1: "foo",
+					cb5: "on"
+				};
+		
+				doh.register("setup", [
+					function parse(){
+						parser.parse();
+					},
+					function programmatic(){
+						new CheckBox({id: "cb6", name: "cb6", checked: true }, "cb6");
+					}
+				]);
+
+				// should be able to query for all of the inputs, including hidden ones
+				doh.register("query input by checked state", [
+					{
+						name: "query checked",
+						runTest: function(){
+							var queried = query("input[checked]", dom.byId('myForm'));
+							doh.is(3, queried.length, "num checked widgets");
+						}
+					}
+				]);
+
+				doh.register("query input by name", [
+					{
+						name: "query name",
+						runTest: function(){
+							var queried = query("input[name]", dom.byId('myForm'));
+							doh.is(7, queried.length, "input[name]");
+						}
+					}
+				]);
+
+				var formWidget = registry.byId("myForm");
+
+				var submitForm = function(name, testValues){
+					return {
+						name: name,
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							submittedValues = function(formValues){
+								d.getTestCallback(function(){
+									for(var i in originalGet){ doh.is(testValues[i], formValues[i], i); }
+								})();
+							};
+							formWidget.submit();
+							return d;
+						},
+						tearDown: function(){
+							submittedValues = defaultSubmitHandler;
+						}
+					};
+				};
+
+				doh.register("CheckBox values", [
+					function getValues(){
+						doh.is( json.stringify(originalGet), json.stringify(registry.byId("myForm").get('value')) );
+					},
+					function resetWithoutStateChange(){
+						var dfd = new doh.Deferred();
+						var passed = true;
+						var handle = cb1.on("change", function () { passed = false; });
+						cb1.reset();
+						setTimeout(dfd.getTestCallback(function() {
+							handle.remove();
+							doh.t(passed, "Change event should not fire when checkbox state is not changed from its initial value");
+						}), 50);
+						return dfd;
+					},
+					{
+						timeout: 6000,
+						name: "setValues",
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							setTimeout(d.getTestErrback(function(){
+								submitForm("original submit", originalSubmit);
+								setTimeout(d.getTestErrback(function(){
+									registry.byId("myForm").set('value', change);
+									setTimeout(d.getTestCallback(function(){
+										doh.is(json.stringify(changedGet), json.stringify(registry.byId("myForm").get('value')) );
+									}), 1000);
+								}), 500);
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						timeout: 6000,
+						name: "resetValues",
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							setTimeout(d.getTestErrback(function(){
+								submitForm("changed submit", changedSubmit);
+								setTimeout(d.getTestErrback(function(){
+									registry.byId("myForm").reset();
+									setTimeout(d.getTestCallback(function(){
+										doh.is( json.stringify(originalGet), json.stringify(registry.byId("myForm").get('value')), "reset to original values" );
+									}), 1000);
+								}), 500);
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "reset blank value",
+						runTest: function(){
+							doh.f(registry.byId('cb4').params.value, "blank parameter");
+							doh.is("on", registry.byId('cb4').value, "value initially on");
+							registry.byId('cb4').reset();
+							doh.is("on", registry.byId('cb4').value, "on after reset");
+						}
+					}
+				]);
+
+				doh.register("CheckBox onChange", [
+					function fireOnChange(){
+						var d = new doh.Deferred();
+						var cb = registry.byId('cb2');
+						var changed;
+						cb.on("change", function(){ changed = true; });
+						cb.set('checked', !cb.get('checked'));
+						setTimeout(d.getTestCallback(function(){
+							doh.t(changed, "got onchange");
+						}), 50);
+						return d;
+					},
+
+					function skipOnChange(){
+						var d = new doh.Deferred();
+						var cb = registry.byId('cb2');
+						var changed;
+						cb.on("change", function(){ changed = true; });
+						cb.set('checked', !cb.get('checked'), false);
+						setTimeout(d.getTestCallback(function(){
+							doh.f(changed, "no onchange");
+						}), 50);
+						return d;
+					}
+				]);
+
+				doh.register("CheckBox watch", [
+					function w(){
+						var cb = registry.byId('cb2');
+						cb.set("checked", true);
+
+						var oldWatch, newWatch;
+						cb.watch("checked", function(name, o, n){
+							oldWatch = o;
+							newWatch = n;
+						});
+
+						cb.set("checked", false);
+						doh.t(oldWatch, "old value was checked");
+						doh.f(newWatch, "new value is unchecked");
+
+						cb.set("checked", true);
+						doh.f(oldWatch, "old value was unchecked");
+						doh.t(newWatch, "new value is checked");
+					}
+				]);
+
+				// ARIA tests.  See also CheckBox_a11y.html.
+				doh.register("aria", function(){
+					var c1 = new CheckBox({
+						disabled: true
+					});
+					c1.placeAt(document.body);
+					doh.t(c1.focusNode.disabled, "disabled set")
+					doh.f(c1.focusNode.hasAttribute("aria-disabled"),
+						"aria-disabled not set, that would be redundant");
+				});
+
+				doh.run();
+			});
+		</script>
+	</head>
+	<body role="main">
+
+		<h1 class="testTitle">Dijit CheckBox Test</h1>
+		<p>
+			Here are some checkboxes.  Try clicking, and hovering, tabbing, and using the space bar to select:
+		</p>
+		<!--    to test form submission, you'll need to create an action handler similar to
+			http://www.utexas.edu/teamweb/cgi-bin/generic.cgi -->
+		<form id="myForm" data-dojo-type="dijit/form/Form" data-dojo-props='action:"../formAction.html", method:"", target:"formSubmitIframe"'>
+			<input id="cb1" data-dojo-id="cb1" data-dojo-type="dijit/form/CheckBox" name="cb1" value="foo"/>
+			<label for="cb1">cb1: normal checkbox, with value=foo</label>
+			<br>
+			<input id="cb2" data-dojo-type="dijit/form/CheckBox" name="cb2" checked/>
+			<label for="cb2">cb2: normal checkbox, with default value, initially turned on.</label>
+			<br>
+			<input id="cb3" data-dojo-type="dijit/form/CheckBox" name="cb3" disabled/>
+			<label for="cb3">cb3: disabled checkbox</label>
+			<br>
+			<input id="cb4" data-dojo-type="dijit/form/CheckBox" name="cb4" readOnly checked value=""/><!-- blank value => "on" -->
+			<label for="cb4">cb4: readOnly checkbox, turned on</label>
+			<br>
+			<input id="cb5" data-dojo-type="dijit/form/CheckBox" name="cb5" value=""/>
+			<label for="cb5">cb5: normal checkbox, with specified value=""</label>
+			<br>
+			<input id="cb6"/>
+			<label for="cb6">cb6: instantiated from script</label>
+			<br>
+			<input id="cb7" data-dojo-type="dijit/form/CheckBox" name="cb7"/>
+			<label for="cb7">cb7: normal checkbox.</label>
+			<br>
+		</form>
+		<iframe name="formSubmitIframe" src="about:blank" onload="if(this.values)submittedValues(this.values)" style="display:none;"></iframe>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/CheckBoxMixin.html b/src/main/resources/static/dijit/tests/form/CheckBoxMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..c26a73792c70aa313e79f7836fdd6d7315165ae6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/CheckBoxMixin.html
@@ -0,0 +1,323 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_CheckBoxMixin tests</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+
+		#table {
+			margin: 0;
+			padding: 2px;
+		}
+		#table, .dijit, BUTTON {
+			font-family: monospace;
+			font-size: 12pt;
+		}
+		#table .layout {
+			padding: 2px;
+			font-size: 100%;
+			margin: 0;
+		}
+		INPUT#mobile_attributes {
+			-webkit-appearance: radio;
+			width:32px;
+			height:32px;
+			border-radius: 0;
+		}
+		INPUT#mobile_events:not(:checked){
+			background-color:rgba(255,0,0,1);
+			border-radius: 32px;
+		}
+		INPUT#mobile_events {
+			width:32px;
+			height:32px;
+			background-color:rgba(0,0,255,1);
+			border-radius: 32px;
+		}
+		INPUT#mobile_programmatic {
+			width:32px;
+			height:32px;
+			background-color:rgba(0,0,0,0);
+			border:0 none rgba(0,0,0,0);
+			border-radius: 0;
+		}
+		INPUT#mobile_programmatic:not(:checked){
+			opacity:0;
+		}
+		.dijitCheckBox {
+			vertical-align: baseline !important;
+		}
+	</style>
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dojo.query");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.CheckBox");
+		dojo.require("dojox.mobile.CheckBox");
+		var on = dojo.require("dojo.on");
+
+		dojo.ready(function(){
+
+			doh.register("attributes", [
+				{
+					name: "dijit",
+					runTest: function(){
+						var dijit_attributes = dijit.byId('dijit_attributes');
+						doh.is("something", dijit_attributes.focusNode.value, 'dijit HTML element original value');
+						doh.t(dijit_attributes.get('checked'), "dijit original get('checked')");
+						doh.t(!!dijit_attributes.focusNode.checked, 'dijit HTML element originally checked');
+						doh.t(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass+"Checked"), "dijit baseClass checked");
+						dijit_attributes.set('value', "something else");
+						dijit_attributes.set('checked', false);
+						doh.f(dijit_attributes.get('checked'), "dijit get('checked')");
+						doh.t(!dijit_attributes.focusNode.checked, 'dijit HTML element unchecked');
+						doh.f(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass+"Checked"), "dijit baseClass not checked");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass), "dijit baseClass");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, "mblRedButton"), "dijit original class");
+						doh.is("something else", dijit_attributes.focusNode.value, 'dijit HTML element value');
+					}
+	 			},
+				{
+					name: "mobile",
+					runTest: function(){
+						var mobile_attributes = dijit.byId('mobile_attributes');
+						doh.is("something", mobile_attributes.focusNode.value, 'mobile HTML element original value');
+						doh.t(mobile_attributes.get('checked'), "mobile original get('checked')");
+						doh.t(!!mobile_attributes.focusNode.checked, 'mobile HTML element originally checked');
+						doh.t(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass+"Checked"), "mobile baseClass checked");
+						mobile_attributes.set('checked', false);
+						mobile_attributes.set('value', "something else");
+						doh.f(mobile_attributes.get('checked'), "mobile get('checked')");
+						doh.t(!mobile_attributes.focusNode.checked, 'mobile HTML element unchecked');
+						doh.f(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass+"Checked"), "mobile baseClass not checked");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass), "mobile baseClass");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, "mblRedButton"), "mobile original class");
+						doh.is("something else", mobile_attributes.focusNode.value, 'mobile HTML element value');
+					}
+	 			}
+			]);
+
+			doh.register("events", [
+				{
+					name: "dijit",
+					timeout: 5000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							dijit_events = dijit.byId('dijit_events'),
+							calledOnClick = false,
+							nop = function(){ return false; };
+
+						function onChange(v){
+							dijit_events.set('onChange', nop);
+							d.callback(true);
+						}
+						dijit_events.set('onChange', onChange);
+						dijit_events.focusNode.click();
+
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 5000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							mobile_events = dijit.byId('mobile_events'),
+							nop = function(){ return false; };
+
+						function onChange(){
+							mobile_events.set('onChange', nop);
+							d.callback(true);
+						}
+						mobile_events.set("onChange", onChange);
+						mobile_events.focusNode.click();
+
+						return d;
+					}
+	 			}
+			]);
+
+			doh.register("programmatic", [
+				{
+					name: "dijit",
+					timeout: 5000,
+					runTest: function(){
+						new dijit.form.CheckBox({id:"dijit_programmatic", checked:true,"aria-label":"check3dijit"}).placeAt("dijit_programmatic_container", "first");
+						var dijit_programmatic = dijit.byId('dijit_programmatic');
+						var pos = dojo.position(dijit_programmatic.domNode, true);
+						doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'dijit position');
+						doh.t(dijit_programmatic.get('checked'), 'dijit widget checked');
+						doh.t(!!dijit_programmatic.focusNode.checked, 'dijit HTML element checked');
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 5000,
+					runTest: function(){
+						new dojox.mobile.CheckBox({id:"mobile_programmatic", checked:true,"aria-label":"check3mobile"}).placeAt("mobile_programmatic_container", "first");
+						var mobile_programmatic = dijit.byId('mobile_programmatic');
+						if(dojo.isIE < 8){ // older IE ignores setting checked after creation but before appending to the DOM
+							dojo.attr(mobile_programmatic.focusNode, "checked", mobile_programmatic.checked);
+						}
+						var pos = dojo.position(mobile_programmatic.domNode, true);
+						doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'mobile position');
+						doh.t(!!mobile_programmatic.focusNode.checked, 'mobile HTML element checked');
+						doh.t(mobile_programmatic.get('checked'), 'mobile widget checked');
+					}
+	 			}
+			]);
+
+			var form = dojo.byId('onClickTests');
+			form.reset(); // so reload works
+
+			// click all the checkboxes, but not too fast
+			doh.register("click all checkboxes",  dojo.query("INPUT[type=checkbox]", form).map(function(inputNode){
+				return {
+					timeout: 5000,
+					name: "click " + inputNode.id,
+					runTest: function(){
+						var d = new doh.Deferred();
+						on.once(form, "click", function(){
+							setTimeout(function(){ d.callback(true); }, 1);
+						});
+						setTimeout(function(){ inputNode.click(); }, 1);
+						return d;
+					}
+				};
+			}));
+
+			// check widgets
+			var widgets = dijit.findWidgets(form);
+			doh.register("onclick widgets", dojo.map(widgets, function(widget){
+				return {
+					name: widget.id,
+					runTest: function () {
+						var id = widget.id,
+								testId = "t" + id.substr(1),
+								native = dojo.byId(testId);
+						var widgetVal = widget.checked;
+						var expectedVal = !!native.checked;
+						var widgetNodeVal = !!dojo.byId(id).checked;
+						doh.is(expectedVal, widgetVal, 'widget value');
+						doh.is(expectedVal, widgetNodeVal, 'hidden node');
+					}
+				};
+			}));
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">_CheckBoxMixin (dijit and mobile) non-robot tests</h1>
+
+	<table id="table">
+		<tr>
+			<th class="layout">&nbsp;</th>
+			<th class="layout">dijit</th>
+			<th class="layout">mobile</th>
+		</tr>
+		<tr>
+			<td class="layout">attributes</td>
+			<td class="layout"><input id="dijit_attributes"  aria-label="check1dijit" data-dojo-type="dijit/form/CheckBox" data-dojo-props='checked: true, "class":"mblRedButton", value:"something"'/></td>
+			<td class="layout"><input type="checkbox" aria-label="check1mobile" value="something" class="mblRedButton" checked id="mobile_attributes" dojoType="dojox/mobile/CheckBox"/></td>
+		</tr>
+		<tr>
+		<tr>
+			<td class="layout">Events</td>
+			<td class="layout"><input id="dijit_events" aria-label="check2dijit" data-dojo-type="dijit/form/CheckBox" data-dojo-props='onClick:function(){ return true; }' /></td>
+			<td class="layout"><input type="checkbox" aria-label="check2mobile" id="mobile_events" data-dojo-type="dojox/mobile/CheckBox" data-dojo-props='onClick:function(){ return true; }' /></td>
+		</tr>
+		<tr>
+			<td class="layout">Programmatic</td>
+			<td class="layout" id="dijit_programmatic_container"></td>
+			<td class="layout" id="mobile_programmatic_container"></td>
+		</tr>
+	</table>
+	<form method="get" id="onClickTests" style="font-family:monospace;font-size:16px;">
+		before click: checked=true, onclick handler: return false, after click:
+			<input aria-label="t1" id="t1" type="checkbox" checked onclick="return false;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w1" id="w1" type="checkbox" checked onclick="return false;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m1" id="m1" type="checkbox" checked onclick="return false;"><br>
+		before click: checked=true, onclick handler: return true,  after click:
+			<input aria-label="t2" id="t2" type="checkbox" checked onclick="return true;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w2" id="w2" type="checkbox" checked onclick="return true;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m2" id="m2" type="checkbox" checked onclick="return true;"><br>
+		before click: checked=false, onclick handler: return false, after click:
+			<input aria-label="t5" id="t5" type="checkbox" onclick="return false;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w5" id="w5" type="checkbox" onclick="return false;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m5" id="m5" type="checkbox" onclick="return false;"><br>
+		before click: checked=false, onclick handler: return true,  after click:
+			<input aria-label="t6" id="t6" type="checkbox" onclick="return true;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w6" id="w6" type="checkbox" onclick="return true;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m6" id="m6" type="checkbox" onclick="return true;"><br>
+		before click: checked=true, onclick handler: no return, after click:
+			<input aria-label="t11" id="t11" type="checkbox" checked onclick="return;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w11" id="w11" type="checkbox" checked onclick="return;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m11" id="m11" type="checkbox" checked onclick="return;"><br>
+		before click: checked=false, onclick handler: no return, after click:
+			<input aria-label="t15" id="t15" type="checkbox" onclick="return;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w15" id="w15" type="checkbox" onclick="return;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m15" id="m15" type="checkbox" onclick="return;"><br>
+		before click: checked=true, onclick handler: checked=false and return false, after click:
+			<input id="t101" aria-label="t101" type="checkbox" checked onclick="this.checked=false;return false;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w101" id="w101" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',false);return false;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m101" id="m101" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',false);return false;"><br>
+		before click: checked=true, onclick handler: checked=false and return true,  after click:
+			<input aria-label="t102" id="t102" type="checkbox" checked onclick="this.checked=false;return true;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w102" id="w102" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',false);return true;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m102" id="m102" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',false);return true;"><br>
+		before click: checked=true, onclick handler: checked=true  and return false, after click:
+			<input aria-label="t103" id="t103" type="checkbox" checked onclick="this.checked=true;return false;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w103" id="w103" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',true);return false;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m103" id="m103" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',true);return false;"><br>
+		before click: checked=true, onclick handler: checked=true  and return true, after click:
+			<input aria-label="t104" id="t104" type="checkbox" checked onclick="this.checked=true;return true;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w104" id="w104" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',true);return true;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m104" id="m104" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',true);return true;"><br>
+		before click: checked=false, onclick handler: checked=false and return false, after click:
+			<input aria-label="t105" id="t105" type="checkbox" onclick="this.checked=false;return false;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w105" id="w105" type="checkbox" onclick="dijit.byId(this.id).set('checked',false);return false;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m105" id="m105" type="checkbox" onclick="dijit.byId(this.id).set('checked',false);return false;"><br>
+		before click: checked=false, onclick handler: checked=false and return true,  after click:
+			<input aria-label="t106" id="t106" type="checkbox" onclick="this.checked=false;return true;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w106" id="w106" type="checkbox" onclick="dijit.byId(this.id).set('checked',false);return true;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m106" id="m106" type="checkbox" onclick="dijit.byId(this.id).set('checked',false);return true;"><br>
+		before click: checked=false, onclick handler: checked=true  and return false, after click:
+			<input aria-label="t107" id="t107" type="checkbox" onclick="this.checked=true;return false;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w107" id="w107" type="checkbox" onclick="dijit.byId(this.id).set('checked',true);return false;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m107" id="m107" type="checkbox" onclick="dijit.byId(this.id).set('checked',true);return false;"><br>
+		before click: checked=false, onclick handler: checked=true  and return true,  after click:
+			<input aria-label="t108" id="t108" type="checkbox" onclick="this.checked=true;return true;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w108" id="w108" type="checkbox" onclick="dijit.byId(this.id).set('checked',true);return true;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m108" id="m108" type="checkbox" onclick="dijit.byId(this.id).set('checked',true);return true;"><br>
+		before click: checked=true, onclick handler: checked=false and no return, after click:
+			<input aria-label="t111" id="t111" type="checkbox" checked onclick="this.checked=false;return;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w111" id="w111" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',false);return;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m111" id="m111" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',false);return;"><br>
+		before click: checked=true, onclick handler: checked=true  and no return, after click:
+			<input aria-label="t113" id="t113" type="checkbox" checked onclick="this.checked=true;return;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w113" id="w113" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',true);return;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m113" id="m113" type="checkbox" checked onclick="dijit.byId(this.id).set('checked',true);return;"><br>
+		before click: checked=false, onclick handler: checked=false and no return, after click:
+			<input aria-label="t115" id="t115" type="checkbox" onclick="this.checked=false;return;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w115" id="w115" type="checkbox" onclick="dijit.byId(this.id).set('checked',false);return;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m115" id="m115" type="checkbox" onclick="dijit.byId(this.id).set('checked',false);return;"><br>
+		before click: checked=false, onclick handler: checked=true  and no return, after click:
+			<input aria-label="t117" id="t117" type="checkbox" onclick="this.checked=true;return;">
+			<input data-dojo-type="dijit/form/CheckBox" aria-label="w117" id="w117" type="checkbox" onclick="dijit.byId(this.id).set('checked',true);return;">
+			<input data-dojo-type="dojox/mobile/CheckBox" aria-label="m117" id="m117" type="checkbox" onclick="dijit.byId(this.id).set('checked',true);return;"><br>
+	</form>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/ExpandingTextAreaMixin.html b/src/main/resources/static/dijit/tests/form/ExpandingTextAreaMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..0499368e25fbdefe6f7b49af800536ff384b3f07
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/ExpandingTextAreaMixin.html
@@ -0,0 +1,286 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_ExpandingTextAreaMixin tests</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+
+		#table {
+			margin: 0;
+			padding: 2px;
+		}
+		#table, TEXTAREA {
+			font-family: monospace;
+			font-size: 12pt;
+		}
+		#table .layout {
+			padding: 2px;
+			font-size: 100%;
+			margin: 0;
+		}
+	</style>
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.Textarea");
+		dojo.require("dojox.mobile.ExpandingTextArea");
+
+		dojo.ready(function(){
+
+			var maxLengthNativeSupport = "maxLength" in document.createElement("textarea");
+
+			doh.register("attributes", [
+				{
+					name: "dijit",
+					runTest: function(){
+						var dijit_attributes = dijit.byId('dijit_attributes');
+						doh.is("", dijit_attributes.textbox.value, "dijit original value");
+						doh.is("", dijit_attributes.get('value'), "dijit original get('value')");
+						if(maxLengthNativeSupport){
+							doh.is("20", dijit_attributes.textbox.getAttribute("maxlength"), "dijit original maxLength");
+						}
+						doh.is("20", dijit_attributes.get('maxLength'), "dijit original get('maxLength')");
+						dijit_attributes.set('maxLength', "9");
+						doh.is("", dijit_attributes.textbox.value, "dijit value");
+						doh.is("", dijit_attributes.get('value'), "dijit get('value')");
+						if(maxLengthNativeSupport){
+							doh.is("9", dijit_attributes.textbox.getAttribute("maxlength"), "dijit maxLength");
+						}
+						doh.is("9", dijit_attributes.get('maxLength'), "dijit get('maxLength')");
+						// cols
+						doh.is("20", dijit_attributes.textbox.getAttribute("cols"), "dijit original cols");
+						doh.is("20", dijit_attributes.get('cols'), "dijit original get('cols')");
+						dijit_attributes.set('cols', "19");
+						doh.is("19", dijit_attributes.textbox.getAttribute("cols"), "dijit cols");
+						doh.is("19", dijit_attributes.get('cols'), "dijit get('cols')");
+					}
+	 			},
+				{
+					name: "mobile",
+					runTest: function(){
+						var mobile_attributes = dijit.byId('mobile_attributes');
+						doh.is("", mobile_attributes.textbox.value, "mobile original value");
+						doh.is("", mobile_attributes.get('value'), "mobile original get('value')");
+						if(maxLengthNativeSupport){
+							doh.is("20", mobile_attributes.textbox.getAttribute("maxlength"), "mobile original maxLength");
+						}
+						doh.is("20", mobile_attributes.get('maxLength'), "mobile original get('maxLength')");
+						mobile_attributes.set('maxLength', "9");
+						doh.is("", mobile_attributes.textbox.value, "mobile value");
+						doh.is("", mobile_attributes.get('value'), "mobile get('value')");
+						if(maxLengthNativeSupport){
+							doh.is("9", mobile_attributes.textbox.getAttribute("maxlength"), "mobile maxLength");
+						}
+						doh.is("9", mobile_attributes.get('maxLength'), "mobile get('maxLength')");
+						// cols
+						doh.is("20", mobile_attributes.textbox.getAttribute("cols"), "mobile original cols");
+						doh.is("20", mobile_attributes.get('cols'), "mobile original get('cols')");
+						mobile_attributes.set('cols', "19");
+						doh.is("19", mobile_attributes.textbox.getAttribute("cols"), "mobile cols");
+						doh.is("19", mobile_attributes.get('cols'), "mobile get('cols')");
+					}
+	 			}
+			]);
+
+			doh.register("events", [
+				{
+					name: "dijit",
+					timeout: 5000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							dijit_events = dijit.byId('dijit_events'),
+							nop = function(){ return false; };
+
+						function onFocus(){
+							dijit_events.set('onFocus', nop);
+							dijit_events.set("value", "Focus");
+							dijit_events.set('onBlur', onBlur);
+							dijit.byId('mobile_events').focus();
+						}
+						function onBlur(){
+							dijit_events.set('onChange', onChange);
+							dijit_events.set('onBlur', nop);
+							dijit_events.set("value", "Blur");
+						}
+						function onChange(){
+							dijit_events.set('onChange', nop);
+							dijit_events.set("value", "Change");
+							dijit_events.focus();
+							d.callback(true);
+						}
+						doh.is(nop.toString(), dijit_events.get('onFocus').toString(), "get('onFocus')");
+						doh.is(nop.toString(), dijit_events.get('onBlur').toString(), "get('onBlur')");
+						doh.is(nop.toString(), dijit_events.get('onChange').toString(), "get('onChange')");
+						dijit_events.set('onFocus', onFocus);
+						setTimeout(dojo.hitch(dijit_events, "focus"), 0);
+
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 10000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							mobile_events = dijit.byId('mobile_events'),
+							focusHandle, blurhandle,
+							nop = function(){ return false; };
+
+						function onFocus(){
+							mobile_events.disconnect(focusHandle);
+							mobile_events.set("value", "Focus");
+							blurhandle = mobile_events.connect(mobile_events, '_onBlur', onBlur);
+							dijit.byId('dijit_events').focus();
+						}
+						function onBlur(){
+							mobile_events.set('onChange', onChange);
+							mobile_events.disconnect(blurhandle);
+							mobile_events.set("value", "Blur");
+						}
+						function onChange(){
+							mobile_events.set('onChange', nop);
+							mobile_events.set("value", "Change");
+							mobile_events.focus();
+							d.callback(true);
+						}
+						doh.is(nop.toString(), mobile_events.get('onChange').toString(), "get('onChange')");
+						mobile_events.textbox.value = "changing";
+						focusHandle = mobile_events.connect(mobile_events, '_onFocus', onFocus);
+						setTimeout(dojo.hitch(mobile_events, "focus"), 0);
+
+						return d;
+					}
+	 			}
+			]);
+
+			doh.register("programmatic", [
+				{
+					name: "dijit",
+					timeout: 5000,
+					runTest: function(){
+						new dijit.form.Textarea({id:"dijit_programmatic", value:"No srcNodeRef", "aria-label":"dijit_programmatic"}).placeAt("dijit_programmatic_container", "first");
+						var dijit_programmatic = dijit.byId('dijit_programmatic');
+						dijit_programmatic.resize();
+						var focushandle = dijit_programmatic.connect(dijit_programmatic, '_onFocus',
+							function(){
+								d.getTestCallback(function(){
+									dijit_programmatic.disconnect(focushandle);
+									var pos = dojo.position(dijit_programmatic.domNode, true);
+									doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'dijit position');
+									doh.is("No srcNodeRef", dijit_programmatic.textbox.value, 'dijit textbox value');
+									doh.is("No srcNodeRef", dijit_programmatic.get('value'), 'dijit widget value');
+								})();
+							}
+						);
+						var d = new doh.Deferred();
+						setTimeout(dojo.hitch(dijit_programmatic, "focus"), 0);
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 5000,
+					runTest: function(){
+						new dojox.mobile.ExpandingTextArea({id:"mobile_programmatic", value:"No srcNodeRef","aria-label":"mobile_programmatic"}).placeAt("mobile_programmatic_container", "first");
+						var mobile_programmatic = dijit.byId('mobile_programmatic');
+						mobile_programmatic.resize();
+						var focushandle = mobile_programmatic.connect(mobile_programmatic, '_onFocus',
+							function(){
+								d.getTestCallback(function(){
+									mobile_programmatic.disconnect(focushandle);
+									var pos = dojo.position(mobile_programmatic.domNode, true);
+									doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'mobile position');
+									doh.is("No srcNodeRef", mobile_programmatic.textbox.value, 'mobile textbox value');
+									doh.is("No srcNodeRef", mobile_programmatic.get('value'), 'mobile widget value');
+								})();
+							}
+						);
+						var d = new doh.Deferred();
+						setTimeout(dojo.hitch(mobile_programmatic, "focus"), 0);
+						return d;
+					}
+	 			}
+			]);
+
+			doh.register("sizes", [
+				{
+					name: "dijit",
+					runTest: function(){
+						var dijit_size = dijit.byId('dijit_size');
+						var originalH = dijit_size.domNode.offsetHeight;
+						var originalVal = dijit_size.value;
+						dijit_size.set('value', originalVal + "\n");
+						var newH = dijit_size.domNode.offsetHeight;
+						doh.t(newH > originalH, "expand: " + newH + ' ' + originalH);
+						dijit_size.set('value', originalVal);
+						newH = dijit_size.domNode.offsetHeight;
+						doh.is(newH, originalH, "shrink: " + newH + ' ' + originalH);
+					}
+	 			},
+				{
+					name: "mobile",
+					runTest: function(){
+						var mobile_size = dijit.byId('mobile_size');
+						var originalH = mobile_size.domNode.offsetHeight;
+						var originalVal = mobile_size.value;
+						mobile_size.set('value', originalVal + "\n");
+						var newH = mobile_size.domNode.offsetHeight;
+						doh.t(newH > originalH, "expand: " + newH + ' ' + originalH);
+						mobile_size.set('value', originalVal);
+						newH = mobile_size.domNode.offsetHeight;
+					}
+	 			}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">_ExpandingTextAreaMixin (dijit and mobile) non-robot tests</h1>
+	<table id="table">
+		<tr>
+			<th class="layout">&nbsp;</th>
+			<th class="layout">dijit</th>
+			<th class="layout">mobile</th>
+		</tr>
+		<tr>
+			<td class="layout">attributes</td>
+			<td class="layout"><input id="dijit_attributes" aria-label="dijit_attr" data-dojo-type="dijit/form/Textarea" data-dojo-props='value:"", placeHolder:"original", maxLength:"20", cols:20'/></td>
+			<td class="layout"><textarea id="mobile_attributes" aria-label="mobilet_attr" data-dojo-type="dojox.mobile.ExpandingTextArea" data-dojo-props='cols:20, placeHolder:"original", maxLength:20'></textarea></td>
+		</tr>
+		<tr>
+			<td class="layout">Events</td>
+			<td class="layout"><input id="dijit_events" aria-label="dijit_events"data-dojo-type="dijit/form/Textarea" data-dojo-props='value:"", onFocus:function(){ return false; }, onBlur:function(){ return false; }, onChange:function(){ return false; }'/></td>
+			<td class="layout"><textarea id="mobile_events" aria-label="mobile_events" data-dojo-type="dojox.mobile.ExpandingTextArea" data-dojo-props='onChange:function(){ return false; }'></textarea></td>
+		</tr>
+		<tr>
+			<td class="layout">Programmatic</td>
+			<td class="layout" id="dijit_programmatic_container"></td>
+			<td class="layout" id="mobile_programmatic_container"></td>
+		</tr>
+		<tr>
+			<td class="layout">Size</td>
+			<td class="layout"><textarea id="dijit_size" aria-label="dijit_size" data-dojo-type="dijit/form/Textarea" data-dojo-props=''
+>line 1
+line 2
+line 3</textarea></td>
+			<td class="layout"><textarea id="mobile_size" aria-label="mobile_size" data-dojo-type="dojox.mobile.ExpandingTextArea" data-dojo-props=''
+>line 1
+line 2
+line 3</textarea></td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/Form.html b/src/main/resources/static/dijit/tests/form/Form.html
new file mode 100644
index 0000000000000000000000000000000000000000..db331f60d5fafe3704ce4f93330fcf03611e5352
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/Form.html
@@ -0,0 +1,921 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Form unit test</title>
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../css/dijitTests.css";
+		TD { border:2px outset; padding:2px; }
+		TH { border:2px solid; font-weight: bold; padding:1px; }
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true"></script>
+
+	<!-- only needed for alternate theme testing: -->
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dojo.date");
+		dojo.require("dojo.parser");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.focus");
+		dojo.require("dijit.form.Form");
+		dojo.require("dijit.layout.ContentPane");
+		dojo.require("dijit.form.ComboBox");
+		dojo.require("dijit.form.CheckBox");
+		dojo.require("dijit.form.RadioButton");
+		dojo.require("dijit.form.DateTextBox");
+		dojo.require("dijit.form.Button");
+		dojo.require("dijit.form.MultiSelect");
+		dojo.require("dijit.form.Select");
+		dojo.require("dijit.form.Textarea");
+		dojo.require("dijit.form.SimpleTextarea");
+		dojo.require("dijit.Editor");
+
+		var obj;
+		function getValues(){
+			obj = dijit.byId('myForm').get('value');
+			console.log("Object is: " + dojo.toJson(obj, true));
+		}
+
+		function setValues(){
+			if(!obj){
+		 		obj = {testF: 'testi'};
+			}
+			console.log("Object is: " + dojo.toJson(obj, true));
+			dijit.byId('myForm').set('value', obj);
+		}
+
+		function validate(){
+			console.log(dijit.byId('myForm').validate());
+		}
+
+		function defaultSubmitHandler(values){
+			console.log('actual submitted values: ' + dojo.toJson(values));
+		}
+		submittedValues = defaultSubmitHandler;
+		// make dojo.toJson() print dates correctly (this feels a bit dirty)
+		Date.prototype.json = function(){ return dojo.date.stamp.toISOString(this, {selector: 'date'});};
+
+		var d = dojo.date.stamp.fromISOString;
+
+		// These are the values assigned to the widgets in the page's HTML
+		var original =	{
+							foo: {bar: {baz: {quux: d("2007-12-30")} } },
+							available: {from: d("2005-01-02"), to: d("2006-01-02")},
+							plop: {combo: "one"},
+							cb: ["2", "3"],
+							r: "2",
+							ms1: ["VA", "WA"],
+							s1: "VA",
+							h1: "hidden",
+							t1: "line 1\nline 2",
+							st1: "simple line 1\nsimple line 2",
+							richtext: "<h1>original</h1><p>This is the default content</p>",
+							filename: "",
+							requiredWidget: "",
+							readOnlyWidget: "Should be returned",
+							duplicate: ["first", "second", "third"]
+						};
+
+		// we change the form to these values
+		var changed =	{
+							foo: {bar: {baz: {quux: d("2005-01-01")} } },
+							available: {from: d("2005-11-02"), to: d("2006-11-02")},
+							plop: {combo: "three"},
+							cb: ["4"],
+							r: "1",
+							ms1: ["FL", "CA"],
+							s1: "FL",
+							h1: "still hidden",
+							t1: "new line 1\nnew line 2",
+							st1: "new simple line 1\nnew simple line 2",
+							richtext: "<h1>changed</h1><p>This is the changed content set by set('value', ...')</p>",
+							filename: "",
+							requiredWidget: "abc",
+							readOnlyWidget: "Should be returned",
+							duplicate: ["1", "2", "3"]
+						};
+		var partialChange = {
+							foo: {bar: {baz: {quux: d("2006-01-01")} } },
+							available: {from: d("2006-11-02"), to: d("2007-11-02")},
+							plop: {combo: "two"},
+							cb: ["2"]
+		};
+
+		dojo.ready(function(){
+
+			doh.register("parse", function(){
+				dojo.parser.parse();
+
+				formWidget = dijit.byId("myForm");
+			});
+
+			// should be able to query for all of the inputs, including hidden ones
+			doh.register("query input by checked state", [
+				{
+					name: "all",
+					runTest: function(){
+						var queried=dojo.query("input[checked]");
+						doh.t(queried.length>0,"dojo.query could not find checked widgets.");
+						doh.is(3,queried.length,"expected: 3 checked widgets, got: "+queried.length);
+						doh.is(dojo.byId('cb_2'),queried[0],"Expected 2nd checkbox.");
+						doh.is(dojo.byId('cb_3'),queried[1],"Expected 3rd checkbox.");
+						doh.is(dojo.byId('r_2'),queried[2],"Expected 2nd radio button.");
+					}
+				}
+			]);
+
+			doh.register("query input by name",
+				dojo.map(
+					[
+						"foo.bar.baz.quux","available.from","available.to", // DateTextBox
+						"plop.combo", // ComboBox
+						"cb", // CheckBox
+						"r", // RadioButton
+						//"ms1", // MultiSelect
+						"h1", // plain hidden input
+						//"t1", "st1", // TextArea
+						//"richtext", // Editor
+						"filename", // TextBox set to file input
+						"disabledWidget" // disabled TextBox
+					],
+					function(name){
+						return {
+							name: name,
+							widgetName: name,
+							runTest: function(){
+								var queried = dojo.query("input[name="+this.widgetName+"]");
+								doh.t(queried.length > 0, "dojo.query could not find form widget: '"+this.widgetName+"'");
+							}
+						};
+					}
+				)
+			);
+
+			var resetready=false;
+			var testSubmittedValues = function(deferred, testValues, formValues){
+				deferred.getTestCallback(function(){
+					doh.is(testValues.foo.bar.baz.quux.json(), formValues['foo.bar.baz.quux']);
+					doh.is(testValues.available.from.json(), formValues['available.from']);
+					doh.is(testValues.available.to.json(), formValues['available.to']);
+					doh.is(testValues.plop.combo, formValues['plop.combo']);
+					doh.is(testValues.cb, formValues.cb);
+					doh.is(testValues.r, formValues.r);
+					doh.is(testValues.ms1, formValues.ms1);
+					doh.is(testValues.s1, formValues.s1);
+					doh.is(testValues.h1, formValues.h1);
+					doh.is(testValues.t1, formValues.t1);
+					doh.is(testValues.st1, formValues.st1);
+					doh.is(testValues.filename, formValues.filename || '');
+					doh.is(testValues.readOnlyWidget, formValues.readOnlyWidget);
+				})();
+			};
+			doh.register("general tests",
+				[
+					{
+						name: "setUp",
+						timeout: 5000,
+						runTest: function(){
+							var d=new doh.Deferred();
+
+							var defer=function(){
+								if(dijit.byId('t1')._resetValue!==undefined &&
+									!dijit.byId('editor').disabled){
+									doh.t(true);
+									d.callback(true);
+								}else{
+									setTimeout(defer,100);
+								}
+							};
+							setTimeout(defer,1000);
+							return d;
+						}
+					},
+					function getValues(){
+						var values = formWidget.get('value');
+
+						// FF3 sticks in some tabs and newlines that mess up the equality check
+						// Need better way to compare two HTML trees but for now do this.
+						values.richtext = values.richtext.replace(/[\n\t]/, "", "g");
+
+						doh.is( dojo.toJson(original), dojo.toJson(values) );
+					},
+					{
+						name:"testSubmit",
+						timeout: 10000,
+						runTest:function(){
+							var d=new doh.Deferred();
+							submittedValues = function(values){
+								testSubmittedValues(d, original, values);
+							};
+							setTimeout(function(){ formWidget.containerNode.submit(); }, 1000);
+							return d;
+						},
+						tearDown: function(){
+							submittedValues = defaultSubmitHandler;
+						}
+					},
+					function setValues(){
+						formWidget.set('value', changed);
+						doh.is( dojo.toJson(changed), dojo.toJson(formWidget.get('value')) );
+
+						formWidget.set('value', partialChange);
+						doh.is( dojo.toJson(dojo.mixin(changed,partialChange)), dojo.toJson(formWidget.get('value')) );
+					},
+					function nameAttributeSurvived(){  // ticket:4753
+						var radios = dojo.query("INPUT[type=radio]", "radio-cells").forEach(
+							function(r){
+								doh.is( r.name, "r" );
+							});
+					},
+					{
+					        name:"postSubmit",
+					        timeout:5000,
+					        runTest:function(){
+							var d=new doh.Deferred();
+							submittedValues = function(values){
+								testSubmittedValues(d, dojo.mixin(changed,partialChange), values);
+							};
+							setTimeout(function(){ formWidget.containerNode.submit(); }, 1000);
+							return d;
+						},
+						tearDown: function(){
+							submittedValues = defaultSubmitHandler;
+						}
+					},
+					function resetTest(){
+						formWidget._onResetReturn = false;
+						formWidget.reset();
+						doh.isNot( dojo.toJson(original), dojo.toJson(formWidget.get('value')), "onReset false");
+						formWidget._onResetReturn = true;
+						formWidget.reset();
+						delete formWidget._onResetReturn;
+						doh.is( dojo.toJson(original), dojo.toJson(formWidget.get('value')), "onReset true" );
+					}
+				]
+			);
+
+			doh.register("watch('value')", [
+				// Set() calls fire onChange() on a timer, so set calls from above may have unfired onChange events.
+				// Avoid spurious watch() notifications by waiting for lingering onChange() events to fire.
+				function coolDown(){
+					var d = new doh.Deferred();
+					setTimeout(function(){ d.callback(true); }, 100);
+					return d;
+				},
+
+				// Setup watch("value", ...)
+				function setUp(){
+					// Setup globals to reflect return from watch("value"), ...
+					calls = 0;
+					oldVal = null;
+					newVal = null;
+
+					handle = formWidget.watch("value", function(name, oldV, newV){
+						calls++;
+						oldVal = oldV;
+						newVal = newV;
+					});
+				},
+
+				// Change the DateTextBox values through Form.set("value", ...)
+				// and see if Form.watch("value", ...) does the right thing					
+				function formSet(){
+					var d = new doh.Deferred();
+					calls = 0;
+					formWidget.set("value", {
+						foo: {bar: {baz: {quux: "1967-10-20"} } },
+						available: {from: "1967-11-09"}
+					});
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "exactly one watch(value) call");
+						doh.is('2007-12-30', dojo.date.stamp.toISOString(oldVal.foo.bar.baz.quux, {selector: 'date'}), "old value");
+						doh.is('1967-10-20', dojo.date.stamp.toISOString(newVal.foo.bar.baz.quux, {selector: 'date'}), "new value");
+						doh.is('1967-11-09', dojo.date.stamp.toISOString(newVal.available.from, {selector: 'date'}), "new value2");
+					}), 500);
+					
+					return d;
+				},
+
+				// Change the DateTextBox value directly
+				// and see if Form.watch("value", ...) does the right thing					
+				function directSet(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					dijit.byId("dtb1").set("value", "1981-10-12");
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "exactly one watch(value) call");
+						doh.is('1967-10-20', dojo.date.stamp.toISOString(oldVal.foo.bar.baz.quux, {selector: 'date'}), "old value");
+						doh.is('1981-10-12', dojo.date.stamp.toISOString(newVal.foo.bar.baz.quux, {selector: 'date'}), "new value");
+					}), 500);
+					
+					return d;
+				},
+
+				// Change the CheckBox values through Form.set("value", ...)
+				// and see if Form.watch("value", ...) does the right thing					
+				function checkboxSet(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					formWidget.set("value", {cb: ["1", "4"]});
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "exactly one watch(value) call");
+
+						doh.is(2, oldVal.cb.length, "number of checkboxes previously checked");
+						doh.is(2, oldVal.cb[0], "old checkboxes, first checked");
+						doh.is(3, oldVal.cb[1], "old checkboxes, second checked");
+
+						doh.is(2, newVal.cb.length, "number of checkboxes currently checked");
+						doh.is(1, newVal.cb[0], "new checkboxes, first checked");
+						doh.is(4, newVal.cb[1], "new checkboxes, second checked");
+					}), 500);
+					
+					return d;
+				},
+
+				// Uncheck a CheckBox directly
+				// and see if Form.watch("value", ...) does the right thing					
+				function directCheckBoxUncheck(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					dijit.byId("cb_1").set("checked", false);
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "exactly one watch(value) call");
+
+						doh.is(2, oldVal.cb.length, "number of checkboxes previously checked");
+						doh.is(1, oldVal.cb[0], "old checkboxes, first checked");
+						doh.is(4, oldVal.cb[1], "old checkboxes, second checked");
+
+						doh.is(1, newVal.cb.length, "number of checkboxes currently checked");
+						doh.is(4, newVal.cb[0], "new checkboxes, first checked");
+					}), 500);
+					
+					return d;
+				},
+
+				// Check a CheckBox directly
+				// and see if Form.watch("value", ...) does the right thing					
+				function directCheckBoxCheck(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					dijit.byId("cb_2").set("checked", true);
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "exactly one watch(value) call");
+
+						doh.is(1, oldVal.cb.length, "number of checkboxes previously checked");
+						doh.is(4, oldVal.cb[0], "old checkboxes, first checked");
+
+						// the new array should be [2,4] not [4,2] because the order the checkboxes
+						// were checked shouldn't matter; the value needs to be canonical
+						doh.is(2, newVal.cb.length, "number of checkboxes currently checked");
+						doh.is(2, newVal.cb[0], "new checkboxes, first checked");
+						doh.is(4, newVal.cb[1], "new checkboxes, second checked");
+					}), 500);
+					
+					return d;
+				},
+
+				// Change the selected RadioButton through Form.set("value", ...)
+				// and see if Form.watch("value", ...) does the right thing					
+				function radioSet(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					formWidget.set("value", {r: "3"});
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "exactly one watch(value) call");
+						doh.is(2, oldVal.r, "old selected radio button");
+						doh.is(3, newVal.r, "new selected radio button");
+					}), 500);
+
+					return d;
+				},
+
+				// Change the selected RadioButton directly
+				// and see if Form.watch("value", ...) does the right thing					
+				function radioDirectSet(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					dijit.byId("r_1").set("checked", true);
+
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "exactly one watch(value) call");
+						doh.is(3, oldVal.r, "old selected radio button");
+						doh.is(1, newVal.r, "new selected radio button");
+					}), 500);
+					
+					return d;
+				},
+
+				// Disabling a widget should remove it from the value
+				function disableWidget(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					dijit.byId("dtb1").set("disabled", true);
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "one watch(value) call");
+						doh.t(dojo.getObject("foo.bar.baz.quux", false, oldVal) !== undefined, "attribute used to exist");
+						doh.t(dojo.getObject("foo.bar.baz.quux", false, newVal) === undefined, "attribute no longer exists");
+					}), 500);
+					
+					return d;
+				},
+
+				// Enabling a widget should add it back to the value
+				function enableWidget(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					dijit.byId("dtb1").set("disabled", false);
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "one watch(value) call");
+						doh.t(dojo.getObject("foo.bar.baz.quux", false, oldVal) === undefined, "attribute didn't used to exist");
+						doh.t(dojo.getObject("foo.bar.baz.quux", false, newVal) !== undefined, "attribute now exists");
+					}), 500);
+					
+					return d;
+				},
+
+				function tearDown(){
+					handle.unwatch();
+				}
+			]);
+
+			doh.register("watch('state')", [
+				// fill in something in required field so that form is valid
+				function makeValid(){
+					doh.f(formWidget.isValid(), "form isn't valid (due to required but empty)");
+					dijit.byId("rw").set("value", "abc");
+					doh.t(formWidget.isValid(), "form is now valid");
+				},
+
+				// Setup watch("state", ...)
+				function setUp(){
+					// Setup globals to reflect return from watch("value"), ...
+					calls = 0;
+					oldVal = null;
+					newVal = null;
+
+					handle = formWidget.watch("state", function(name, oldV, newV){
+						calls++;
+						oldVal = oldV;
+						newVal = newV;
+					});
+
+					validState = true;
+					dojo.connect(formWidget, "onValidStateChange", function(val){
+						validState = val;
+					});
+				},
+
+				// Start typing a value into the DateTextBox while it's focused.
+				// The incomplete value should trigger a change of the Form to Incomplete state even though
+				// user is still focused
+				function partialInput(){
+					var d = new doh.Deferred();
+
+					// Simulate the typing and validation checking since this isn't a robot test
+					dojo.byId("dtb1").focus();
+					dojo.byId("dtb1").value = "12/";
+					dijit.byId("dtb1").validate(true);
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "one watch(state) calls");
+						doh.is("", oldVal, "old state");
+						doh.is("Incomplete", newVal, "new state");
+					}), 50);
+					
+					return d;
+				},
+
+				// Finishing the input will change state back to ""
+				function finishInput(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+
+					// Simulate the typing and validation checking since this isn't a robot test
+					dojo.byId("dtb1").value = "12/31/2012";
+					dijit.byId("dtb1").validate(true);
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "another watch(state) calls");
+						doh.is("Incomplete", oldVal, "old state");
+						doh.is("", newVal, "new state");
+					}), 50);
+					
+					return d;
+				},
+
+				// An error value should trigger the Form.state change, even before blur		
+				function errorInput(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+
+					// Simulate the typing and validation checking since this isn't a robot test
+					dojo.byId("dtb1").value = "12/a";
+					dijit.byId("dtb1").validate(true);
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "another watch(state) call");
+						doh.is("", oldVal, "old state");
+						doh.is("Error", newVal, "new state");
+						doh.f(validState, "onValidStateChange(false) called")
+					}), 50);
+					
+					return d;
+				},
+
+				// Disabling the widget in error state should make the form valid
+				function disableErrorWidget(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					dijit.byId("dtb1").set("disabled", true);
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "one watch(state) call");
+						doh.is("Error", oldVal, "old state");
+						doh.is("", newVal, "new state");
+						doh.t(formWidget.isValid(), "isValid");
+					}), 50);
+					
+					return d;
+				},
+
+				// Enabling the widget in error state should make the form invalid again
+				function enableErrorWidget(){
+					var d = new doh.Deferred();
+
+					calls = 0;
+					dijit.byId("dtb1").set("disabled", false);
+					
+					setTimeout(d.getTestCallback(function(){
+						doh.is(1, calls, "one watch(state) call");
+						doh.is("", oldVal, "old state");
+						doh.is("Error", newVal, "new state");
+						doh.f(formWidget.isValid(), "isValid");
+					}), 50);
+					
+					return d;
+				},
+
+				function tearDown(){
+					handle.unwatch();
+				}
+			]);
+
+			doh.register("validate()", function validate(){
+				formWidget.set("value", original);
+
+				// make the second and third DateTextBoxes invalid
+				dojo.byId("dtb2").value = "12/a";
+				dijit.byId("dtb2").validate(true);
+				dojo.byId("dtb3").value = "12/a";
+				dijit.byId("dtb3").validate(true);
+
+				// Since the required but empty ValidationTextBox has never been focused,
+				// it's not yet marked in an error state
+				doh.f(dojo.hasClass(dojo.byId("widget_rw"), "dijitValidationTextBoxError"), "required but empty not yet marked as error");
+
+				// validate() should focus the first DateTextBox and highlight
+				// the two invalid DateTextBoxes and the required but empty ValidationTextBox.
+				formWidget.validate();
+				
+				doh.t(dojo.hasClass(dojo.byId("widget_rw"), "dijitValidationTextBoxError"), "required but empty marked as error");
+
+				// Check that focus went to invalid field.  But on IE9+ focus change is asynchronous so use a timer.
+				var d = new doh.Deferred();
+				setTimeout(d.getTestCallback(function(){
+					doh.is("dtb2", dijit.focus.curNode.id, "focused on first invalid DateTextBox");
+				}), 0);
+				return d;
+			});
+
+			if(dojo.isFF >= 4 || dojo.isIE >= 10 || dojo.isWebKit){
+				// only works for HTML5 compliant browsers where novalidate is understood
+				// (also, hasAttribute() is not available on IE6/7)
+				doh.register("novalidate", function noValidate(){
+					// Making sure the parser picks up the flag and _WidgetBase copies it to this.domNode
+					doh.t(dijit.byId("noValidateForm").domNode.hasAttribute("novalidate"), "novalidate");
+				});
+			}
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1>Form Widget Unit Test</h1>
+	<p>
+		The form widget takes data in a form and serializes/deserializes it, so
+		it can be submitted as a JSON string of nested objects.
+	</p>
+	<div style="color:red">Currently only widgets are supported, not raw elements.</div>
+	<!--    to test form submission, you'll need to create an action handler similar to
+			http://www.utexas.edu/teamweb/cgi-bin/generic.cgi
+		http://www.tipjar.com/cgi-bin/test -->
+	<form id="myForm" data-dojo-type="dijit/form/Form" data-dojo-props='encType:"multipart/form-data", action:"../formAction.html", method:"", target:"formSubmitIframe"'>
+		<script type="dojo/method" data-dojo-event="onReset">
+			return ("_onResetReturn" in this)? this._onResetReturn : confirm('Press OK to reset widget values');
+		</script>
+		<script type="dojo/method" data-dojo-event="onSubmit">
+			console.debug('Attempting to submit form w/values:\n',
+				dojo.toJson(this.get('value'),true)
+			);
+			if(this.validate()){
+				return confirm('Form is valid, press OK to submit');
+			}else{
+				alert('Form contains invalid data.  Please correct first');
+				return false;
+			}
+			return true;
+		</script>
+		<p>Just HTML text</p>
+		<table style="border: 1px solid #9f9f9f;">
+			<thead>
+				<tr>
+					<th>Description</th>
+					<th>Name</th>
+					<th>Form node/widget</th>
+				</tr>
+			</thead>
+			<tbody>
+				<!--
+				<tr><td>text</td><td>testF</td><td><input type="text" name="testF" value="bar1" /></td></tr>
+				<tr><td>password</td><td>passwordF</td><td><input type="password" name="passwordF" value="bar4" /></td></tr>
+				<tr><td>hidden</td><td>hiddenF</td><td><input type="hidden" name="hiddenF" value="bar4" /></td></tr>
+				<tr><td>select</td><td>plop.noncombo</td><td>
+				<div class="group">
+					<select name="plop.noncombo">
+					 <option value="1">one</option>
+					 <option value="2">two</option>
+					 <option value="3">three</option>
+					</select>
+				</div>
+
+				</td></tr>
+				-->
+
+				<tr>
+					<td>DateTextBox inside contentpane</td>
+					<td><label for="dtb1">foo.bar.baz.quux</label></td>
+					<td>
+						<div data-dojo-type="dijit/layout/ContentPane">
+						<input data-dojo-type="dijit/form/DateTextBox" data-dojo-props='id:"dtb1", name:"foo.bar.baz.quux", value:"2007-12-30" '/>
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<td>DateTextBox 2</td>
+					<td><label for="dtb2">available.from</label></td>
+					<td>
+						<input data-dojo-type="dijit/form/DateTextBox" data-dojo-props='id:"dtb2", name:"available.from", value:"2005-01-02" '/>
+					</td>
+				</tr>
+				<tr>
+					<td>DateTextBox 3</td>
+					<td><label for="dtb3">available.to</label></td>
+					<td>
+						<input data-dojo-type="dijit/form/DateTextBox" data-dojo-props='id:"dtb3", name:"available.to", value:"2006-01-02" '/>
+					</td>
+				</tr>
+				<tr>
+					<td>ComboBox</td>
+					<td><label for="plopcombo">plop.combo</label></td>
+					<td>
+						<select data-dojo-type="dijit/form/ComboBox" id="plopcombo" data-dojo-props='name:"plop.combo" '>
+							<option value="one">one</option>
+							<option value="two">two</option>
+							<option value="three">three</option>
+						</select>
+					</td>
+				</tr>
+
+				<!--
+				<tr>
+					<td>textarea</td>
+					<td>myTextArea</td>
+					<td>
+						<textarea name="myTextArea">
+							text text text """ \\\/
+						</textarea>
+					</td>
+				</tr>
+				-->
+
+				<!--
+				<tr>
+					<td>CheckBox</td>
+					<td>cb1</td>
+					<td>
+						<input type="checkbox" name="cb1" value="1" /> 1
+						<input type="checkbox" name="cb1" value="2" checked="checked" /> 2
+						<input type="checkbox" name="cb1" value="3" checked="checked" /> 3
+						<input type="checkbox" name="cb1" value="4" /> 4
+					</td>
+				</tr>
+				-->
+
+				<tr>
+					<td>CheckBox widget</td>
+					<td>cb</td>
+					<td>
+						<input data-dojo-type="dijit/form/CheckBox" id="cb_1" name="cb" value="1"/> <label for="cb_1">1</label>
+						<input data-dojo-type="dijit/form/CheckBox" id="cb_2" name="cb" value="2" checked/> <label for="cb_2">2</label>
+						<input data-dojo-type="dijit/form/CheckBox" id="cb_3" name="cb" value="3" checked/> <label for="cb_3">3</label>
+						<input data-dojo-type="dijit/form/CheckBox" id="cb_4" name="cb" value="4"/> <label for="cb_4">4</label>
+					</td>
+				</tr>
+
+				<!--
+				<tr>
+					<td>radio</td>
+					<td>r1</td>
+					<td>
+						<input type="radio" name="r1" value="1" /> 1
+						<input type="radio" name="r1" value="2" /> 2
+						<input type="radio" name="r1" value="3" /> 3
+						<input type="radio" name="r1" value="4" /> 4
+					</td>
+				</tr>
+				-->
+
+				<tr>
+				<td>Radio widget</td><td>r</td>
+				<td id="radio-cells">
+					<input data-dojo-type="dijit/form/RadioButton" id="r_1" name="r" value="1"/> <label for="r_1">1</label>
+					<input data-dojo-type="dijit/form/RadioButton" id="r_2" name="r" value="2" checked/> <label for="r_2">2</label>
+					<input data-dojo-type="dijit/form/RadioButton" id="r_3" name="r" value="3"/> <label for="r_3">3</label>
+					<input data-dojo-type="dijit/form/RadioButton" id="r_4" name="r" value="4"/> <label for="r_4">4</label>
+				<input type="button" onclick="dojo.query('INPUT[type=radio]','radio-cells').forEach(function(n){dijit.getEnclosingWidget(n).set('checked',false);});return true;" value="Unset all radio buttons"/>
+				</td>
+				</tr>
+
+				<tr>
+					<td>Multi-select</td><td>ms1</td>
+					<td>
+						<select id="ms1" multiple data-dojo-type="dijit/form/MultiSelect"
+							data-dojo-props='name:"ms1", "aria-label":"ms1",
+							style:{height:"100px", width:"175px", border:"5px solid #ededed"}'>
+
+							<option value="TN">Tennessee</option>
+							<option value="VA" selected>Virginia</option>
+							<option value="WA" selected>Washington</option>
+							<option value="FL">Florida</option>
+							<option value="CA">California</option>
+
+						</select>
+					</td>
+				</tr>
+
+				<tr>
+					<td>Select</td><td>s1</td>
+					<td>
+						<select id="s1" data-dojo-type="dijit/form/Select"
+							data-dojo-props='name:"s1", style:{width:"175px"}, "aria-label":"s1"'>
+							<option value="TN">Tennessee</option>
+							<option value="VA" selected="selected">Virginia</option>
+							<option value="WA">Washington</option>
+							<option value="FL">Florida</option>
+							<option value="CA">California</option>
+
+						</select>
+					</td>
+				</tr>
+
+				<tr>
+					<td>Hidden input</td>
+					<td>h1</td>
+					<td>
+						<input id="h1" data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"h1", type:"hidden", value:"hidden", "aria-label":"h1" '/>
+					</td>
+				</tr>
+
+				<tr>
+					<td>Auto-sizing textarea</td>
+					<td>t1</td>
+					<td>
+						<textarea id="t1" data-dojo-type="dijit/form/Textarea" data-dojo-props='name:"t1", "aria-label":"t1" '>line 1
+line 2</textarea>
+					</td>
+				</tr>
+
+				<tr>
+					<td>Fixed size textarea</td>
+					<td>st1</td>
+					<td>
+						<textarea id="st1" data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props='name:"st1", rows:"5", cols:"50", "aria-label":"st1" '>
+simple line 1
+simple line 2</textarea>
+					</td>
+				</tr>
+
+				<tr>
+					<td>Editor widget</td>
+					<td>richtext</td>
+					<td>
+						<textarea id="editor" name="richtext" data-dojo-type="dijit/Editor" data-dojo-props='"aria-label":"editor", plugins:["bold", "italic"]'><h1>original</h1><p>This is the default content</p></textarea>
+					</td>
+				</tr>
+
+				<tr>
+					<td>File upload</td>
+					<td>filename</td>
+					<td>
+						<input data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"filename", type:"file", "aria-label":"filename" '/>
+					</td>
+				</tr>
+				<tr>
+					<td>Required Widget</td>
+					<td>requiredWidget</td>
+					<td>
+						<input data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='id: "rw", name:"requiredWidget", required:true, value:"", "aria-label":"rw" '/>
+					</td>
+				</tr>
+				<tr>
+					<td>Disabled Widget</td>
+					<td>disabledWidget</td>
+					<td>
+						<input data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"disabledWidget", disabled:true, value:"Should not be returned", "aria-label":"disabled" '/>
+					</td>
+				</tr>
+				<tr>
+					<td>Disabled Required Widget</td>
+					<td>disabledRequiredWidget</td>
+					<td>
+						<input data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='id: "drw", name:"disabledRequiredWidget", disabled:true, required:true, value:"", "aria-label":"disabledRequired" '/>
+					</td>
+				</tr>
+				<tr>
+					<td>Read-only Widget</td>
+					<td>readOnlyWidget</td>
+					<td>
+						<input data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"readOnlyWidget", readOnly:true, value:"Should be returned", "aria-label":"readonly" '/>
+					</td>
+				</tr>
+				<tr>
+					<td>Duplicate named TextBox 1</td>
+					<td>duplicate</td>
+					<td>
+						<input data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"duplicate", value:"first", "aria-label":"duplicate" '/>
+					</td>
+				</tr>
+				<tr>
+					<td>Duplicate named TextBox 2</td>
+					<td>duplicate</td>
+					<td>
+						<input data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"duplicate", value:"second", "aria-label":"duplicate2" '/>
+					</td>
+				</tr>
+				<tr>
+					<td>Duplicate named TextBox 3</td>
+					<td>duplicate</td>
+					<td>
+						<input data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"duplicate", value:"third", "aria-label":"duplicate3" '/>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ getValues(); }'>Get Values from form!</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ setValues(); }'>Set Values to form!</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ validate(); }'>Validate form!</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"submit", value:"Submit"'>Submit</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"reset"'>HTML Reset</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", onClick:function(){ dijit.byId("myForm").reset() }'>reset()</button>
+	</form>
+<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"button",
+onClick:function(){ dijit.byId("myForm").submit() }'>Submit programmatically</button>
+
+<iframe name="formSubmitIframe" src="about:blank" onload="if(this.values)submittedValues(this.values)" style="display:none;"></iframe>
+
+	<form id="noValidateForm" data-dojo-type="dijit/form/Form" novalidate></form>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/RadioButtonMixin.html b/src/main/resources/static/dijit/tests/form/RadioButtonMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..4d792a13dee2a4eeb5f1a506d5620e5deb88f31c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/RadioButtonMixin.html
@@ -0,0 +1,187 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_RadioButtonMixin tests</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+
+		#table {
+			margin: 0;
+			padding: 2px;
+		}
+		#table, .dijit, BUTTON {
+			font-family: monospace;
+			font-size: 12pt;
+		}
+		#table .layout {
+			padding: 2px;
+			font-size: 100%;
+			margin: 0;
+		}
+	</style>
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.RadioButton");
+		dojo.require("dojox.mobile.RadioButton");
+
+		dojo.ready(function(){
+
+			doh.register("attributes", [
+				{
+					name: "dijit",
+					runTest: function(){
+						var dijit_attributes = dijit.byId('dijit_attributes');
+						doh.is("something", dijit_attributes.focusNode.value, 'dijit HTML element original value');
+						doh.t(dijit_attributes.get('checked'), "dijit original get('checked')");
+						doh.t(!!dijit_attributes.focusNode.checked, 'dijit HTML element originally checked');
+						doh.t(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass+"Checked"), "dijit baseClass checked");
+						dijit_attributes.set('value', "something else");
+						dijit.byId('dijit_attributes2').set('checked', true);
+						doh.f(dijit_attributes.get('checked'), "dijit get('checked')");
+						doh.t(!dijit_attributes.focusNode.checked, 'dijit HTML element unchecked');
+						doh.f(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass+"Checked"), "dijit baseClass not checked");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass), "dijit baseClass");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, "mblRedButton"), "dijit original class");
+						doh.is("something else", dijit_attributes.focusNode.value, 'dijit HTML element value');
+					}
+	 			},
+				{
+					name: "mobile",
+					runTest: function(){
+						var mobile_attributes = dijit.byId('mobile_attributes');
+						doh.is("something", mobile_attributes.focusNode.value, 'mobile HTML element original value');
+						doh.t(mobile_attributes.get('checked'), "mobile original get('checked')");
+						doh.t(!!mobile_attributes.focusNode.checked, 'mobile HTML element originally checked');
+						doh.t(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass+"Checked"), "mobile baseClass checked");
+						dijit.byId('mobile_attributes2').set('checked', true);
+						mobile_attributes.set('value', "something else");
+						doh.f(mobile_attributes.get('checked'), "mobile get('checked')");
+						doh.t(!mobile_attributes.focusNode.checked, 'mobile HTML element unchecked');
+						doh.f(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass+"Checked"), "mobile baseClass not checked");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass), "mobile baseClass");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, "mblRedButton"), "mobile original class");
+						doh.is("something else", mobile_attributes.focusNode.value, 'mobile HTML element value');
+					}
+	 			}
+			]);
+
+			doh.register("events", [
+				{
+					name: "dijit",
+					timeout: 5000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							dijit_events = dijit.byId('dijit_events'),
+							calledOnClick = false,
+							nop = function(){ return false; };
+
+						function onChange(v){
+							dijit_events.set('onChange', nop);
+							d.callback(true);
+						}
+						dijit_events.set('onChange', onChange);
+						dijit_events._onClick({ preventDefault: nop });
+
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 5000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							mobile_events = dijit.byId('mobile_events'),
+							nop = function(){ return false; };
+
+						function onChange(){
+							mobile_events.set('onChange', nop);
+							d.callback(true);
+						}
+						mobile_events.set("onChange", onChange);
+						setTimeout(function(){ mobile_events.focusNode.click({ preventDefault: nop }); }, 0);
+
+						return d;
+					}
+	 			}
+			]);
+
+			doh.register("programmatic", [
+				{
+					name: "dijit",
+					timeout: 5000,
+					runTest: function(){
+						new dijit.form.RadioButton({name:"dijit_programmatic", id:"dijit_programmatic", checked:true, "aria-label":"dijit_programmatic"}).placeAt("dijit_programmatic_container", "first");
+						var dijit_programmatic = dijit.byId('dijit_programmatic');
+						var pos = dojo.position(dijit_programmatic.domNode, true);
+						doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'dijit position');
+						doh.t(dijit_programmatic.get('checked'), 'dijit widget checked');
+						doh.t(!!dijit_programmatic.focusNode.checked, 'dijit HTML element checked');
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 5000,
+					runTest: function(){
+						new dojox.mobile.RadioButton({name:"mobile_programmatic", id:"mobile_programmatic", checked:true, "aria-label":"mobile_programmatic"}).placeAt("mobile_programmatic_container", "first");
+						var mobile_programmatic = dijit.byId('mobile_programmatic');
+						if(dojo.isIE < 8){ // older IE ignores setting checked after creation but before appending to the DOM
+							dojo.attr(mobile_programmatic.focusNode, "checked", mobile_programmatic.checked);
+						}
+						var pos = dojo.position(mobile_programmatic.domNode, true);
+						doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'mobile position');
+						doh.t(!!mobile_programmatic.focusNode.checked, 'mobile HTML element checked');
+						doh.t(mobile_programmatic.get('checked'), 'mobile widget checked');
+					}
+	 			}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">_RadioButtonMixin (dijit and mobile) non-robot tests</h1>
+
+	<table id="table">
+		<tr>
+			<th class="layout">&nbsp;</th>
+			<th class="layout" colspan=2>dijit</th>
+			<th class="layout" colspan=2>mobile</th>
+		</tr>
+		<tr>
+			<td class="layout">attributes</td>
+			<td class="layout"><input name="dijit_attributes" id="dijit_attributes" data-dojo-type="dijit/form/RadioButton" data-dojo-props='checked: true, "class":"mblRedButton", value:"something", name:"dijit_attributes", "aria-label":"dijit_attributes" '/></td>
+			<td class="layout"><input name="dijit_attributes" aria-label="dijit_attributes2" id="dijit_attributes2" type="radio" value="other" dojoType="dijit.form.RadioButton">
+			<td class="layout"><input name="mobile_attributes" aria-label="mobile_attributes" type="radio" value="something" class="mblRedButton" checked id="mobile_attributes" dojoType="dojox.mobile.RadioButton"/></td>
+			<td class="layout"><input name="mobile_attributes" aria-label="mobile_attributes2" id="mobile_attributes2" type="radio" value="other" dojoType="dojox.mobile.RadioButton">
+		</tr>
+		<tr>
+		<tr>
+			<td class="layout">Events</td>
+			<td class="layout"><input name="dijit_events" id="dijit_events" data-dojo-type="dijit/form/RadioButton" data-dojo-props='onClick:function(){ return true; }, name:"dijit_events", "aria-label":"dijit_events"' /></td>
+			<td class="layout"><input name="dijit_events" aria-label="dijit_events2" type="radio" value="other" dojoType="dijit.form.RadioButton">
+			<td class="layout"><input name="mobile_events" aria-label="mobile_events" type="radio" id="mobile_events" data-dojo-type="dojox.mobile.RadioButton" data-dojo-props='onClick:function(){ return true; }' /></td>
+			<td class="layout"><input name="mobile_events" aria-label="mobile_events2" type="radio" value="other" dojoType="dojox.mobile.RadioButton">
+		</tr>
+		<tr>
+			<td class="layout">Programmatic</td>
+			<td class="layout" id="dijit_programmatic_container"></td>
+			<td class="layout"><input name="dijit_programmatic" type="radio" aria-label="dijit_programmatic" value="other" dojoType="dijit.form.RadioButton">
+			<td class="layout" id="mobile_programmatic_container"></td>
+			<td class="layout"><input name="mobile_programmatic" type="radio" aria-label="mobile_programmatic" value="other" dojoType="dojox.mobile.RadioButton">
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/RadioButtonTiming.html b/src/main/resources/static/dijit/tests/form/RadioButtonTiming.html
new file mode 100755
index 0000000000000000000000000000000000000000..9e27ec6d00d62ed3a9dfe6c3cda83f4272a81295
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/RadioButtonTiming.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Dijit RadioButton checked state test</title>
+		<link rel="stylesheet" href="../../themes/claro/claro.css">
+	</head>
+
+	<body class="claro">
+		<fieldset>
+			<legend>Native input[type=radio] Test</legend>
+			<p>Click the radio buttons and view the console output.</p>
+			<label>
+				<input type="radio" name="domButton" id="dom1">Native radio 1
+			</label>
+			<br>
+			<label>
+				<input type="radio" name="domButton" id="dom2">Native radio 2
+			</label>
+			<br>
+			<label>
+				<input type="radio" name="domButton" id="dom3">Native radio 3
+			</label>
+		</fieldset>
+		<br>
+		<fieldset>
+			<legend>Dijit/form/RadioButton Test</legend>
+			<p>Click the radio buttons and view the console output.</p>
+			<label>
+				<input type="radio" name="dijitButton" id="dijit1" data-dojo-type="dijit/form/RadioButton"> Dijit RadioButton 1
+			</label>
+			<br>
+			<label>
+				<input type="radio" name="dijitButton" id="dijit2" data-dojo-type="dijit/form/RadioButton"> Dijit RadioButton 2
+			</label>
+			<br>
+			<label>
+				<input type="radio" name="dijitButton" id="dijit3" data-dojo-type="dijit/form/RadioButton"> Dijit RadioButton 3
+			</label>
+			<p><b>Expectation:</b> only a single radio button can be checked at a time</p>
+			<p><b>Result:</b> two radio buttons are simultaneously checked</p>
+		</fieldset>
+
+		<p>
+			When the click handler is called, the "checked" property should be set true, but if
+			the event handler calls preventDefault(), then after a delay, the "checked" property will revert to false.
+		</p>
+		<label for="preventDefault">Call evt.preventDefault() on click:</label>
+		<input type="checkbox" id="preventDefault">
+
+		<script src="../../../dojo/dojo.js" data-dojo-config="async: true"></script>
+
+		<script>
+		require([
+			"doh/runner",
+			"dojo/dom",
+			"dojo/on",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/form/RadioButton"
+		],function(doh, dom, on, parser, registry, RadioButton){
+			parser.parse();
+
+			var dijit1 = registry.byId("dijit1");
+			var dijit2 = registry.byId("dijit2");
+			var dijit3 = registry.byId("dijit3");
+
+			if(/mode=test/i.test(window.location.href)){
+				var listeners = [];
+				doh.register("timing", [
+					{
+						name: "timing",
+						runTest: function(){
+							var d = new doh.Deferred();
+							listeners.push(dijit1.on("click", d.getTestErrback(function(){
+								doh.t(dijit1.checked, "dijit1.checked true");
+								listeners.push(dijit2.on("click", d.getTestCallback(function(){
+									doh.f(dijit1.checked, "dijit1.checked false");
+									doh.t(dijit2.checked, "dijit2.checked true");
+								})));
+								dijit2.focusNode.click();
+							})));
+							dijit1.focusNode.click();
+							return d;
+						},
+						tearDown: function(){
+							while(listeners[0]){
+								listeners.pop().remove();
+							}
+						}
+					},
+					{
+						name: "preventDefault",
+						runTest: function(){
+							var d = new doh.Deferred();
+							listeners.push(dijit3.on("click", d.getTestErrback(function(){
+								doh.f(dijit1.checked, "dijit1.checked false");
+								doh.f(dijit2.checked, "dijit2.checked false");
+								doh.t(dijit3.checked, "dijit3.checked true");
+								listeners.push(dijit2.on("click", d.getTestErrback(function(evt){
+									doh.f(dijit3.checked, "dijit3.checked false");
+									doh.t(dijit2.checked, "dijit2.checked true");
+
+									// this preventDefault() call should revert dijit2.checked to false
+									evt.preventDefault();
+
+									setTimeout(d.getTestCallback(function(){
+										doh.f(dijit2.checked, "dijit2.checked reverted to false");
+										doh.t(dijit3.checked, "dijit3.checked reverted to true");
+									}), 10);
+								})));
+								dijit2.focusNode.click();
+							})));
+							dijit3.focusNode.click();
+							return d;
+						},
+						tearDown: function(){
+							while(listeners[0]){
+								listeners.pop().remove();
+							}
+						}
+					}
+				]);
+				doh.run();
+			}else{
+				// Non (automated) test mode, setup listeners for manual testing.
+				var dom1 = dom.byId("dom1");
+				var dom2 = dom.byId("dom2");
+				var dom3 = dom.byId("dom3");
+				var preventDefault = dom.byId("preventDefault");
+
+				on(document.body, "input[name=domButton]:click", function(evt) {
+					console.group("Native radiobutton click");
+					console.log("dom1.checked = " + dom1.checked);
+					console.log("dom2.checked = " + dom2.checked);
+					console.log("dom3.checked = " + dom3.checked);
+					console.groupEnd();
+					if(preventDefault.checked){
+						evt.preventDefault();
+						setTimeout(function(){
+							console.group("After preventDefault() native radiobutton checked state:");
+							console.log("dom1.checked = " + dom1.checked);
+							console.log("dom2.checked = " + dom2.checked);
+							console.log("dom3.checked = " + dom3.checked);
+							console.groupEnd();
+						});
+					}
+				});
+
+				function logDijitState (evt) {
+					console.group("Dijit RadioButton click");
+					console.log("dijit1.checked = " + dijit1.checked);
+					console.log("dijit2.checked = " + dijit2.checked);
+					console.log("dijit3.checked = " + dijit3.checked);
+					console.groupEnd();
+					if(preventDefault.checked){
+						evt.preventDefault();
+						setTimeout(function(){
+							console.group("After preventDefault(), Dijit RadioButton checked state:");
+							console.log("dijit1.checked = " + dijit1.checked);
+							console.log("dijit2.checked = " + dijit2.checked);
+							console.log("dijit3.checked = " + dijit3.checked);
+							console.groupEnd();
+						});
+					}
+				}
+
+				on(dijit1, "click", logDijitState);
+				on(dijit2, "click", logDijitState);
+				on(dijit3, "click", logDijitState);
+			}
+		});
+		</script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/form/Slider.html b/src/main/resources/static/dijit/tests/form/Slider.html
new file mode 100644
index 0000000000000000000000000000000000000000..abf80fe64146e840ecd38ae4914cfea19389d3b9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/Slider.html
@@ -0,0 +1,153 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Dojo Slider Widget Test (non-robot)</title>
+
+		<script type="text/javascript" src="../boilerplate.js"></script>
+
+		<script type="text/javascript">
+			var registry, dom;
+			require([
+				"doh/runner",
+				"dojo/dom",
+				"dojo/dom-construct",
+				"dojo/parser",
+				"dojo/query",
+				"dijit/registry",
+				"dijit/form/HorizontalSlider",
+				"dijit/form/VerticalSlider",
+				"dijit/form/HorizontalRule",
+				"dijit/form/VerticalRule",
+				"dijit/form/HorizontalRuleLabels",
+				"dijit/form/VerticalRuleLabels",
+				"dojo/domReady!"
+			], function(doh, dom, domConstruct, parser, query, registry,
+				HorizontalSlider, VerticalSlider, HorizontalRule,
+				VerticalRule, HorizontalRuleLabels, VerticalRuleLabels) {
+
+				var slider1, slider2;
+
+				doh.register("create", {
+
+					one: function () {
+						// Create a slider w/out a root node.  Note: tests #13815.
+						slider1 = new HorizontalSlider({
+							value: 10,
+							showButtons: false,
+							minimum: 0,
+							maximum: 50,
+							discreteValues: 51
+						});
+
+						var hrLabels1 = new HorizontalRuleLabels({
+							container: "topDecoration",
+							style: "height: 12px",
+							minimum: 0,
+							maximum: 0.5,
+							count: 6
+						});
+						slider1.addChild(hrLabels1);
+
+						var hrRule1 = new HorizontalRule({
+							container: "topDecoration",
+							style: "height: 5px",
+							count: 11
+						});
+						slider1.addChild(hrRule1);
+
+						slider1.placeAt(document.body);
+
+						doh.is(10, slider1.get("value"), "value");
+					},
+
+					two: function () {
+						// Create a second slider.
+						slider2 = new HorizontalSlider({
+							value: 0,
+							showButtons: false,
+							minimum: 0,
+							maximum: 90,
+							discreteValues: 91
+						});
+
+						var hrLabels3 = new HorizontalRuleLabels({
+							container: "topDecoration",
+							style: "height: 12px",
+							minimum: 0,
+							maximum: 0.9,
+							count: 10
+						});
+						slider2.addChild(hrLabels3);
+
+						var hrRule3 = new HorizontalRule({
+							container: "topDecoration",
+							style: "height: 5px",
+							count: 21
+						});
+						slider2.addChild(hrRule3);
+
+						slider2.placeAt(document.body);
+
+						// Should get ten labels, not five (#18113)
+						doh.is(10, query(".dijitRuleLabelContainer", slider2.domNode).length, "# of labels");
+					}
+				});
+
+				// aria role and properties tests.
+				doh.register("aria", function() {
+					doh.is("slider", slider1.focusNode.getAttribute("role"), "aria role (slider)");
+					doh.is(slider1.minimum, slider1.focusNode.getAttribute("aria-valuemin"), "aria-valuemin");
+					doh.is(slider1.maximum, slider1.focusNode.getAttribute("aria-valuemax"), "aria-valuemax");
+					doh.is(slider1.get('value'), slider1.focusNode.getAttribute("aria-valuenow"), "initial aria-valuenow");
+					var half = (slider1.maximum + slider1.minimum) >> 1;
+					slider1.set('value', half, true);
+					doh.is(half, slider1.focusNode.getAttribute("aria-valuenow"), "half aria-valuenow");
+				});
+
+				doh.register("API", [
+					function increment() {
+						var v = slider1.get('value');
+						slider1._bumpValue(1, true);
+						var v2 = slider1.get('value');
+						doh.t(v2 > v, "increment");
+						slider1.maximum = v2;
+						slider1._bumpValue(1, true);
+						var v3 = slider1.get('value');
+						doh.is(v2, v3, "no increment");
+					},
+					function decrement() {
+						var v = slider1.get('value');
+						slider1._bumpValue(-1, true);
+						var v2 = slider1.get('value');
+						doh.t(v2 < v, "decrement");
+						slider1.minimum = v2;
+						slider1._bumpValue(-1, true);
+						var v3 = slider1.get('value');
+						doh.is(v2, v3, "no decrement");
+					},
+					function locked() {
+						var v = slider1.get('value');
+						slider1.maximum = slider1.minimum;
+						slider1._bumpValue(-1, true);
+						var v2 = slider1.get('value');
+						doh.is(v, v2, "no decrement");
+						slider1._bumpValue(1, true);
+						var v2 = slider1.get('value');
+						doh.is(v, v2, "no increment");
+						this.slideDuration = 0;
+						slider1.set('value', v, true);
+						slider1.progressBar.style.width = "0%";
+						slider1.remainingBar.style.width = "100%";
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+
+	<body role="main">
+		<h1 class="testTitle">Slider Non-Robot Test</h1>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/TextBoxMixin.html b/src/main/resources/static/dijit/tests/form/TextBoxMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..3b2e5a4e7aaa119ff6e434437238084aaf54b3e5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/TextBoxMixin.html
@@ -0,0 +1,264 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_TextBoxMixin tests</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+
+		#table {
+			margin: 0;
+			padding: 2px;
+		}
+		#table, INPUT {
+			font-family: monospace;
+			font-size: 12pt;
+		}
+		#table .layout {
+			padding: 2px;
+			font-size: 100%;
+			margin: 0;
+		}
+	</style>
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.TextBox");
+		dojo.require("dojox.mobile.TextBox");
+
+		dojo.ready(function(){
+
+			doh.register("DOM attributes", [
+				{
+					name: "dijit",
+					runTest: function(){
+						var dijit_DOMattr = dijit.byId('dijit_DOMattr');
+						doh.is("original", dijit_DOMattr.get('placeHolder'), "dijit original get('placeHolder')");
+						dijit_DOMattr.set('placeHolder', "place holder");
+						doh.is("", dijit_DOMattr.textbox.value, "dijit original value");
+						doh.is("", dijit_DOMattr.get('value'), "dijit original get('value')");
+						doh.is("place holder", dijit_DOMattr.get('placeHolder'), "dijit get('placeHolder')");
+						doh.is("20", dijit_DOMattr.textbox.getAttribute("maxlength"), "dijit original maxLength");
+						doh.is("20", dijit_DOMattr.get('maxLength'), "dijit original get('maxLength')");
+						dijit_DOMattr.set('maxLength', "9");
+						doh.is("", dijit_DOMattr.textbox.value, "dijit value");
+						doh.is("", dijit_DOMattr.get('value'), "dijit get('value')");
+						doh.is("9", dijit_DOMattr.textbox.getAttribute("maxlength"), "dijit maxLength");
+						doh.is("9", dijit_DOMattr.get('maxLength'), "dijit get('maxLength')");
+					}
+	 			},
+				{
+					name: "mobile",
+					runTest: function(){
+						var mobile_DOMattr = dijit.byId('mobile_DOMattr');
+						doh.is("original", mobile_DOMattr.textbox.getAttribute("placeholder"), "mobile original placeholder");
+						doh.is("original", mobile_DOMattr.get('placeHolder'), "mobile original get('placeHolder')");
+						mobile_DOMattr.set('placeHolder', "place holder");
+						doh.is("", mobile_DOMattr.textbox.value, "mobile original value");
+						doh.is("", mobile_DOMattr.get('value'), "mobile original get('value')");
+						doh.is("place holder", mobile_DOMattr.textbox.getAttribute("placeholder"), "mobile placeholder");
+						doh.is("place holder", mobile_DOMattr.get('placeHolder'), "mobile get('placeHolder')");
+						doh.is("20", mobile_DOMattr.textbox.getAttribute("maxlength"), "mobile original maxLength");
+						doh.is("20", mobile_DOMattr.get('maxLength'), "mobile original get('maxLength')");
+						mobile_DOMattr.set('maxLength', "9");
+						doh.is("", mobile_DOMattr.textbox.value, "mobile value");
+						doh.is("", mobile_DOMattr.get('value'), "mobile get('value')");
+						doh.is("9", mobile_DOMattr.textbox.getAttribute("maxlength"), "mobile maxLength");
+						doh.is("9", mobile_DOMattr.get('maxLength'), "mobile get('maxLength')");
+					}
+	 			}
+			]);
+
+			doh.register("widget attributes", [
+				{
+					name: "dijit",
+					runTest: function(){
+						var dijit_WidgetAttr = dijit.byId('dijit_WidgetAttr');
+						doh.is(false, dijit_WidgetAttr.get('propercase'), "dijit original get('propercase')");
+						dijit_WidgetAttr.set('propercase', true);
+						doh.is(true, dijit_WidgetAttr.get('propercase'), "dijit get('propercase')");
+						dijit_WidgetAttr.set('displayedValue', "proper cased");
+						dijit_WidgetAttr._onBlur();
+						doh.is("Proper Cased", dijit_WidgetAttr.textbox.value, "dijit value");
+						doh.is("Proper Cased", dijit_WidgetAttr.get('value'), "dijit get('value')");
+					}
+	 			},
+				{
+					name: "mobile",
+					runTest: function(){
+						var mobile_WidgetAttr = dijit.byId('mobile_WidgetAttr');
+						doh.is(false, mobile_WidgetAttr.get('propercase'), "mobile original get('propercase')");
+						mobile_WidgetAttr.set('propercase', true);
+						doh.is(true, mobile_WidgetAttr.get('propercase'), "get('propercase')");
+						mobile_WidgetAttr.set('displayedValue', "proper cased");
+						mobile_WidgetAttr._onBlur();
+						doh.is("Proper Cased", mobile_WidgetAttr.textbox.value, "mobile value");
+						doh.is("Proper Cased", mobile_WidgetAttr.get('value'), "mobile get('value')");
+					}
+	 			}
+			]);
+
+			doh.register("events", [
+				{
+					name: "dijit",
+					timeout: 2000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							dijit_events = dijit.byId('dijit_events'),
+							nop = function(){ return false; };
+
+						function onFocus(){
+							dijit_events.set('onFocus', nop);
+							dijit_events.textbox.value = "Focus";
+							dijit_events.set('onBlur', onBlur);
+							dijit.byId('mobile_events').focus();
+						}
+						function onBlur(){
+							dijit_events.set('onChange', onChange);
+							dijit_events.set('onBlur', nop);
+							dijit_events.textbox.value = "Blur";
+						}
+						function onChange(){
+							dijit_events.set('onChange', nop);
+							dijit_events.textbox.value = "Change";
+							dijit_events.focus();
+							d.callback(true);
+						}
+						doh.is(nop.toString(), dijit_events.get('onFocus').toString(), "get('onFocus')");
+						doh.is(nop.toString(), dijit_events.get('onBlur').toString(), "get('onBlur')");
+						doh.is(nop.toString(), dijit_events.get('onChange').toString(), "get('onChange')");
+						dijit_events.set('onFocus', onFocus);
+						setTimeout(dojo.hitch(dijit_events, "focus"), 0);
+
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 2000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							mobile_events = dijit.byId('mobile_events'),
+							focusHandle, blurhandle,
+							nop = function(){ return false; };
+
+						function onFocus(){
+							mobile_events.disconnect(focusHandle);
+							mobile_events.textbox.value = "Focus";
+							blurhandle = mobile_events.connect(mobile_events, '_onBlur', onBlur);
+							dijit.byId('dijit_events').focus();
+						}
+						function onBlur(){
+							mobile_events.set('onChange', onChange);
+							mobile_events.disconnect(blurhandle);
+							mobile_events.textbox.value = "Blur";
+						}
+						function onChange(){
+							mobile_events.set('onChange', nop);
+							mobile_events.textbox.value = "Change";
+							mobile_events.focus();
+							d.callback(true);
+						}
+						doh.is(nop.toString(), mobile_events.get('onChange').toString(), "get('onChange')");
+						mobile_events.textbox.value = "changing";
+						focusHandle = mobile_events.connect(mobile_events, '_onFocus', onFocus);
+						setTimeout(dojo.hitch(mobile_events, "focus"), 0);
+
+						return d;
+					}
+	 			}
+			]);
+
+			doh.register("programmatic", [
+				{
+					name: "dijit",
+					timeout: 2000,
+					runTest: function(){
+						new dijit.form.TextBox({id:"dijit_programmatic", selectOnClick:true, value:"No srcNodeRef", "aria-label":"dijit_programmatic"}).placeAt("dijit_programmatic_container", "first");
+						var dijit_programmatic = dijit.byId('dijit_programmatic');
+						var focushandle = dijit_programmatic.connect(dijit_programmatic, '_onFocus',
+							function(){
+								d.getTestCallback(function(){
+									dijit_programmatic.disconnect(focushandle);
+									var pos = dojo.position(dijit_programmatic.domNode, true);
+									doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'dijit position');
+									doh.is("No srcNodeRef", dijit_programmatic.textbox.value, 'dijit textbox value');
+									doh.is("No srcNodeRef", dijit_programmatic.get('value'), 'dijit widget value');
+								})();
+							}
+						);
+						var d = new doh.Deferred();
+						setTimeout(dojo.hitch(dijit_programmatic, "focus"), 0);
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 2000,
+					runTest: function(){
+						new dojox.mobile.TextBox({id:"mobile_programmatic", selectOnClick:true, value:"No srcNodeRef","aria-label":"mobile_programmatic"}).placeAt("mobile_programmatic_container", "first");
+						var mobile_programmatic = dijit.byId('mobile_programmatic');
+						var focushandle = mobile_programmatic.connect(mobile_programmatic, '_onFocus',
+							function(){
+								d.getTestCallback(function(){
+									mobile_programmatic.disconnect(focushandle);
+									var pos = dojo.position(mobile_programmatic.domNode, true);
+									doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'mobile position');
+									doh.is("No srcNodeRef", mobile_programmatic.textbox.value, 'mobile textbox value');
+									doh.is("No srcNodeRef", mobile_programmatic.get('value'), 'mobile widget value');
+								})();
+							}
+						);
+						var d = new doh.Deferred();
+						setTimeout(dojo.hitch(mobile_programmatic, "focus"), 0);
+						return d;
+					}
+	 			}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">_TextBoxMixin (dijit and mobile) non-robot tests</h1>
+
+	<table id="table">
+		<tr>
+			<th class="layout">&nbsp;</th>
+			<th class="layout">dijit</th>
+			<th class="layout">mobile</th>
+		</tr>
+		<tr>
+			<td class="layout">DOM attr</td>
+			<td class="layout"><input id="dijit_DOMattr" data-dojo-type="dijit/form/TextBox" data-dojo-props='"aria-label":"dijit_DOMattr",type:"text", value:"", placeHolder:"original", maxLength:20'/></td>
+			<td class="layout"><input id="mobile_DOMattr" data-dojo-type="dojox.mobile.TextBox" data-dojo-props='"aria-label":"mobile_DOMattr",type:"text", value:"", placeHolder:"original", maxLength:20'/></td>
+		</tr>
+		<tr>
+			<td class="layout">Widget attr</td>
+			<td class="layout"><input id="dijit_WidgetAttr" data-dojo-type="dijit/form/TextBox" data-dojo-props='"aria-label":"dijit_WidgetAttr", type:"text", value:"", propercase:false'/></td>
+			<td class="layout"><input id="mobile_WidgetAttr" data-dojo-type="dojox.mobile.TextBox" data-dojo-props='"aria-label":"mobile_WidgetAttr", type:"text", value:"", propercase:false'/></td>
+		</tr>
+		<tr>
+			<td class="layout">Events</td>
+			<td class="layout"><input id="dijit_events" data-dojo-type="dijit/form/TextBox" data-dojo-props='"aria-label":"dijit_events", type:"text", value:"", onFocus:function(){ return false; }, onBlur:function(){ return false; }, onChange:function(){ return false; }'/></td>
+			<td class="layout"><input id="mobile_events" data-dojo-type="dojox.mobile.TextBox" data-dojo-props='"aria-label":"mobile_events", type:"text", value:"", onChange:function(){ return false; }'/></td>
+		</tr>
+		<tr>
+			<td class="layout">Programmatic</td>
+			<td class="layout" id="dijit_programmatic_container"></td>
+			<td class="layout" id="mobile_programmatic_container"></td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/TextBox_sizes.html b/src/main/resources/static/dijit/tests/form/TextBox_sizes.html
new file mode 100644
index 0000000000000000000000000000000000000000..09995112b2aaa582fd30ae827226570b35f08710
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/TextBox_sizes.html
@@ -0,0 +1,621 @@
+<!DOCTYPE html>
+<html dir="ltr" lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>dijit.form.TextBox size tests</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+		@import "../../themes/dijit_rtl.css";
+		@import "../../themes/tundra/Common.css";
+		@import "../../themes/tundra/form/Button.css";
+		@import "../../themes/tundra/form/Common.css";
+		@import "../../themes/tundra/form/Select.css";
+		@import "../../themes/claro/Common.css";
+		@import "../../themes/claro/form/Button.css";
+		@import "../../themes/claro/form/Button_rtl.css";
+		@import "../../themes/claro/form/Common.css";
+		@import "../../themes/claro/form/Common_rtl.css";
+		@import "../../themes/claro/form/NumberSpinner.css";
+		@import "../../themes/claro/form/Select.css";
+		@import "../../themes/soria/Common.css";
+		@import "../../themes/soria/form/Button.css";
+		@import "../../themes/soria/form/Button_rtl.css";
+		@import "../../themes/soria/form/Common.css";
+		@import "../../themes/soria/form/Select.css";
+		@import "../../themes/nihilo/Common.css";
+		@import "../../themes/nihilo/form/Button.css";
+		@import "../../themes/nihilo/form/Button_rtl.css";
+		@import "../../themes/nihilo/form/Common.css";
+		@import "../../themes/nihilo/form/Select.css";
+
+		.dijitTextBox,
+		.dijitSelect {
+			box-sizing: border-box !important;
+			-moz-box-sizing: border-box !important;
+			width: 330px !important;
+		}
+		.dj_ie6 .dijitSelect,
+		.dj_ie7 .dijitSelect {
+			width: 332px !important; /* lack of box-sizing support */
+		}
+		.dj_iequirks .dijitSelect {
+			width: 330px !important; /* lack of box-sizing support */
+		}
+		#table > TBODY > TR > TD {
+			background-color: pink;
+			font-size: 100%;
+			padding: 0;
+			margin: 0;
+		}
+		TABLE#table, #table > TBODY > TR > TD, .dijit {
+			margin: 0 !important;
+		}
+		#table .dijit {
+			vertical-align: bottom;
+		}
+		.dj_ie9 table.dijitSelect {
+			border-width: thin !important; /* needed for IE9 strict bug since 1px table border only measures 0.8px */
+		}
+		.dj_iequirks.dj_ie9 table.dijitSelect {
+			border-width: 1px !important; /* needed for IE9 quirks due to strict rule above */
+		}
+		.padded .dijitInputField {
+			padding: 10px !important;
+		}
+		.unPadded .dijitInputField {
+			padding: 0 !important;
+		}
+		#table {
+			padding: 0;
+			border:1px solid black;
+			background-color: pink;
+		}
+		#table .layout {
+			padding: 1px;
+			border: 1px solid black;
+		}
+		.dj_a11y, /* a11y emulation rules */
+		.dj_a11y * {
+			background: white none !important;
+			border-color: black !important;
+			color: black !important;
+		}
+	</style>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.TextBox");
+		dojo.require("dijit.form.NumberTextBox");
+		dojo.require("dijit.form.ComboBox");
+		dojo.require("dijit.form.FilteringSelect");
+		dojo.require("dijit.form.NumberSpinner");
+		dojo.require("dijit.form.Select");
+		dojo.require("dijit.form.Button");
+
+		dojo.ready(function(){
+
+			var padding = "padded";
+			var theme = "claro";
+			var direction = "ltr";
+			var fontSize = "12pt";
+			var fontFamily = "monospace";
+
+			dijit.byId("theme").isRealA11y = dojo.hasClass(dojo.body(), "dj_a11y");
+
+			var str = window.location.href.substr(window.location.href.indexOf("?")+1).split(/#/);
+			var ary  = str[0].split(/&/);
+			if(window.location.href.indexOf("?") > -1){
+				for(var i=0; i<ary.length; i++){
+					var split = ary[i].split("="),
+						key = split[0],
+						value = split[1].replace(/[^\w]/g, "");	// replace() to prevent XSS attack
+					switch(key){
+						case "locale":
+							// locale string | null
+							dojo.locale = dojo.config.locale = locale = value;
+							break;
+						case "dir":
+						case "direction":
+							// rtl | ltr
+							direction = value;
+							break;
+						case "theme":
+							// tundra | soria | nihilo | claro | a11y
+							theme = value;
+							break;
+						case "a11y": // included for backward compat
+							theme = "a11y";
+							break;
+						case "size":
+						case "fontsize":
+						case "fontSize":
+							// size string (e.g 12px)
+							fontSize = value;
+							break;
+						case "family":
+						case "fontfamily":
+						case "fontFamily":
+							// family string (e.g monospace)
+							fontFamily = value;
+							break;
+						case "padding":
+							// padded | unPadded | default
+							padding = value;
+							break;
+					}
+				}
+			}
+
+			dijit.byId('padding').set('value', padding, true);
+			dijit.byId('theme').set('value', theme, true);
+			dijit.byId('direction').set('value', direction, true);
+			dijit.byId('fontSize').set('value', fontSize, true);
+			dijit.byId('fontFamily').set('value', fontFamily, true);
+
+			var	textbox = dijit.byId("textbox"),
+				validation = dijit.byId("validation"),
+				combobox = dijit.byId("combobox"),
+				select = dijit.byId("select"),
+				spinner = dijit.byId("spinner");
+
+			var compareToTextBox = function(attr){
+				try{
+				var
+					attrMap = {
+						x: 'offsetLeft',
+						h: 'offsetHeight',
+						w: 'offsetWidth'
+					},
+					textboxNode = textbox.domNode,
+					validationNode = validation.domNode,
+					comboboxNode = combobox.domNode,
+					selectNode = select.domNode,
+					spinnerNode = spinner.domNode,
+					textboxPos = dojo.position(textboxNode),
+					validationPos = dojo.position(validationNode),
+					comboboxPos = dojo.position(comboboxNode),
+					selectPos = dojo.position(selectNode),
+					spinnerPos = dojo.position(spinnerNode),
+					attrMapAttr = attrMap[attr];
+					// IE9 sometimes reports getBoundingClientRect.bottom incorrectly for TD so also check offset*
+				doh.t(Math.round(textboxPos[attr]) == Math.round(validationPos[attr])
+					|| (attrMapAttr && textboxNode[attrMapAttr] > 0 && textboxNode[attrMapAttr] == validationNode[attrMapAttr]),
+					"validationPos " + attr + " " + textboxPos[attr] + " vs " + validationPos[attr]);
+				doh.t(Math.round(textboxPos[attr]) == Math.round(comboboxPos[attr])
+					|| (attrMapAttr && textboxNode[attrMapAttr] > 0 && textboxNode[attrMapAttr] == comboboxNode[attrMapAttr]),
+					"comboboxPos " + attr + " " + textboxPos[attr] + " vs " + comboboxPos[attr]);
+				doh.t(Math.round(textboxPos[attr]) == Math.round(selectPos[attr])
+					|| (attrMapAttr && textboxNode[attrMapAttr] > 0 && textboxNode[attrMapAttr] == selectNode[attrMapAttr])
+					|| (dojo.isIE <= 7 && (Math.round(textboxPos[attr]) - Math.round(selectPos[attr]) == 2)), // box-sizing issue
+					"selectPos " + attr + " " + textboxPos[attr] + " vs " + selectPos[attr]);
+				doh.t(Math.round(textboxPos[attr]) == Math.round(spinnerPos[attr])
+					|| (attrMapAttr && textboxNode[attrMapAttr] > 0 && textboxNode[attrMapAttr] == spinnerNode[attrMapAttr]),
+					"spinnerPos " + attr + " " + textboxPos[attr] + " vs " + spinnerPos[attr]);
+				}catch(e){
+					throw e; // prevent consoles from including entire function text in output
+				}
+			};
+
+			var runTest = [
+				{
+						name: "x",
+						runTest: function(){ compareToTextBox("x"); }
+				},
+				{
+						name: "h",
+						runTest: function(){ compareToTextBox("h"); }
+				},
+				{
+						name: "w",
+						runTest: function(){ compareToTextBox("w"); }
+				}
+			];
+
+			var createErrors = function(){
+				textbox._hasBeenBlurred = true;
+				textbox.set('value', "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz");
+				validation._hasBeenBlurred = true;
+				validation.set('displayedValue', "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz");
+				combobox._hasBeenBlurred = true;
+				combobox.set('displayedValue', "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz");
+				spinner._hasBeenBlurred = true;
+				spinner.set('displayedValue', "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz");
+				select._hasBeenBlurred = true;
+				select.set('value', "");
+			};
+
+			doh.register("create normal boxes", {
+				name: "setup",
+				timeout: 9000,
+				runTest: function(){
+					var d = new doh.Deferred();
+					/* create errors, then insert good values to exercise the widget rendering */
+					createErrors();
+					validation.set('value', 23);
+					spinner.set('value', 32);
+					combobox.onChange = function(v){ if(v == "KY"){ d.callback(true); combobox.onChange = function(){}; }};
+					combobox.set('value', "KY");
+					select.set('value', "noError");
+					return d;
+				}
+ 			});
+
+			doh.register("check normal sizes", runTest);
+
+			dojo.forEach([textbox, validation, combobox, select, spinner], function(widget){
+				var widgetName = widget.baseClass.replace(/^.* /, "");
+				doh.register("valid internal offsets", [
+					{
+						name: "textbox: " + widgetName,
+						timeout: 1000,
+						runTest: function(){
+							var	paddedBoxPos = dojo.position(widget.containerNode || widget.focusNode.parentNode),
+								inputPos = dojo.position(dojo.query('.dijitSelectLabel', widget.domNode)[0] || widget.focusNode),
+								paddingLeft = Math.abs(inputPos.x - paddedBoxPos.x),
+								paddingRight = Math.abs(inputPos.w - paddedBoxPos.w) - paddingLeft,
+								paddingTop = Math.abs(inputPos.y - paddedBoxPos.y),
+								paddingBottom = Math.abs(inputPos.h - paddedBoxPos.h) - paddingTop,
+								pad = undefined;
+							if(dojo.hasClass(testtable, "padded")){
+								pad = 10;
+							}else if(dojo.hasClass(testtable, "unPadded")){
+								pad = 0;
+							}else{
+								return;
+							}
+							doh.t(Math.abs(paddingLeft-pad) <= 1, "left padding("+paddingLeft+") should be "+pad);
+							doh.t(Math.abs(paddingRight-pad) <= 1, "right padding("+paddingRight+") should be "+pad);
+							doh.t(Math.abs(paddingTop-pad) <= 1, "top padding("+paddingTop+") should be "+pad);
+							doh.t(Math.abs(paddingBottom-pad) <= 1, "bottom padding("+paddingBottom+") should be "+pad);
+						}
+					},
+					{
+						name: "padded box: " + widgetName,
+						timeout: 1000,
+						runTest: function(){
+							var	domNodePos = dojo.position(widget.domNode),
+								contentNode = (widget.containerNode || widget.focusNode).parentNode,
+								paddedBoxPos = dojo.position(contentNode),
+								//paddedBoxPos = dojo.position(widget.containerNode || widget.focusNode.parentNode),
+								// getBorderExtents bug neccesitates use of currentStyle
+								borderV = ((widget.domNode.currentStyle && widget.domNode.currentStyle.borderTopWidth) 
+									? (parseInt(widget.domNode.currentStyle.borderTopWidth) + parseInt(widget.domNode.currentStyle.borderBottomWidth)) 
+									: dojo.getBorderExtents(widget.domNode).h)
+									|| (widget.domNode.offsetHeight - widget.domNode.firstChild.offsetHeight),
+								borderH = ((widget.domNode.currentStyle && widget.domNode.currentStyle.borderLeftWidth) 
+									? (parseInt(widget.domNode.currentStyle.borderLeftWidth) + parseInt(widget.domNode.currentStyle.borderRightWidth)) 
+									: dojo.getBorderExtents(widget.domNode).h)
+									|| (widget.domNode.offsetWidth - widget.domNode.firstChild.offsetWidth);
+							if(!borderV || !borderH){ // border is inside domNode
+								var be = dojo.getBorderExtents(contentNode);
+								paddedBoxPos.x += be.l;
+								paddedBoxPos.y += be.t;
+								paddedBoxPos.w -= be.w;
+								paddedBoxPos.h -= be.h;
+								borderV = be.h;
+								borderH = be.w;
+							}
+							var	clientHeight = widget.domNode.offsetHeight - borderV,
+								clientWidth = widget.domNode.offsetWidth - borderH,
+								offset = Math.min(Math.abs(domNodePos.x + (borderH >> 1) - paddedBoxPos.x), Math.abs(domNodePos.x + domNodePos.w - (borderH >> 1) - paddedBoxPos.x - paddedBoxPos.w));
+							doh.t(Math.abs(clientHeight-paddedBoxPos.h) <= 1, "padded textbox height: " + clientHeight + " vs " + paddedBoxPos.h);
+							doh.t(offset <= 1, "padded textbox horizontally just left or right (" + offset + ") of domNode: domNode x/w/b = " + domNodePos.x+"/"+domNodePos.w+"/"+borderH + ", pad box x/w = " + paddedBoxPos.x+"/"+paddedBoxPos.w);
+						}
+					},
+					{
+						name: "button: " + widgetName,
+						timeout: 1000,
+						runTest: function(){
+							var buttonNode = dojo.query(".dijitArrowButton", widget.domNode)[0];
+							if(!buttonNode){ return; }
+							var paddedBoxNode = (widget.containerNode || widget.focusNode).parentNode;
+							while(buttonNode.parentNode != paddedBoxNode.parentNode){
+								buttonNode = buttonNode.parentNode;
+							}
+							var	paddedBoxPos = dojo.position(paddedBoxNode),
+								buttonPos = dojo.position(buttonNode),
+								offset = Math.min(Math.abs(paddedBoxPos.x + paddedBoxPos.w - buttonPos.x), Math.abs(buttonPos.x + buttonPos.w - paddedBoxPos.x));
+							// IE 6 & quirks float bug(s) causes a known 3px margin between input field & validation icon 
+							// Fix could be .dj_ie .dijitInputField { float:right; }
+							// But this breaks even more the tests, dojo.position() bug?
+							if(dojo.isIE < 7 || dojo.isQuirks)
+								doh.t(offset <= 4, "button node horizontally just left or right (" + offset + ") of padded input node: input x/w = " + paddedBoxPos.x+"/"+paddedBoxPos.w + ", button x/w = " + buttonPos.x+"/"+buttonPos.w);
+							else
+								doh.t(offset <= 1, "button node horizontally just left or right (" + offset + ") of padded input node: input x/w = " + paddedBoxPos.x+"/"+paddedBoxPos.w + ", button x/w = " + buttonPos.x+"/"+buttonPos.w);
+						}
+					}
+				]);
+			});
+
+			doh.register("create errors", {
+				name: "setup",
+				timeout: 9000,
+				runTest: function(){
+					var d = new doh.Deferred();
+					createErrors();
+					textbox.onChange = function(v){ d.callback(true); textbox.onChange = function(){}; };
+					textbox.set('value', textbox.get('value')+' ');
+					return d;
+				}
+			});
+
+			doh.register("check error sizes", runTest);
+
+			doh.register("check button sizes", [
+				{
+					name: "ComboBox",
+					timeout: 1000,
+					runTest: function(){
+						var	inputPos = dojo.position(combobox.focusNode.parentNode),
+							arrowPos = dojo.position(combobox._buttonNode);
+						doh.t(Math.abs(inputPos.h-arrowPos.h) <= 1, "ComboBox button height (" + arrowPos.h + ") is same as input height (" + inputPos.h + ")");
+					}
+				},
+				{
+					name: "Spinner",
+					timeout: 1000,
+					runTest: function(){
+						// use offsetHeight since the buttons could be truncated by overflow:hidden
+						var	inputHeight = spinner.focusNode.parentNode.offsetHeight,
+							downArrowHeight = spinner.downArrowNode.offsetHeight,
+							upArrowHeight = spinner.upArrowNode.offsetHeight;
+						doh.t((inputHeight-downArrowHeight-upArrowHeight) <= 1, "Spinner button heights (" + upArrowHeight + "," + downArrowHeight + ") are equal to the input height (" + inputHeight + ")");
+						doh.t(Math.abs(upArrowHeight - downArrowHeight) <= 1, "Spinner UP button height (" + upArrowHeight + ") is equal to the DOWN button height (" + downArrowHeight + ")");
+					}
+				}
+  			]);
+
+			dojo.forEach([validation, combobox, spinner], function(widget){
+				var widgetName = widget.baseClass.replace(/^.* /, "");
+				doh.register("error internal offsets", [
+					{
+						name: "textbox: " + widgetName,
+						timeout: 1000,
+						runTest: function(){
+							var	paddedBoxPos = dojo.position(widget.focusNode.parentNode),
+								inputPos = dojo.position(widget.focusNode),
+								paddingLeft = Math.abs(inputPos.x - paddedBoxPos.x),
+								paddingRight = Math.abs(inputPos.w - paddedBoxPos.w) - paddingLeft,
+								paddingTop = Math.abs(inputPos.y - paddedBoxPos.y),
+								paddingBottom = Math.abs(inputPos.h - paddedBoxPos.h) - paddingTop,
+								pad = undefined;
+							if(dojo.hasClass(testtable, "padded")){
+								pad = 10;
+							}else if(dojo.hasClass(testtable, "unPadded")){
+								pad = 0;
+							}else{
+								return;
+							}
+							doh.t(Math.abs(paddingLeft-pad) <= 1, "left padding("+paddingLeft+") should be "+pad);
+							doh.t(Math.abs(paddingRight-pad) <= 1, "right padding("+paddingRight+") should be "+pad);
+							doh.t(Math.abs(paddingTop-pad) <= 1, "top padding("+paddingTop+") should be "+pad);
+							doh.t(Math.abs(paddingBottom-pad) <= 1, "bottom padding("+paddingBottom+") should be "+pad);
+						}
+					},
+					{
+						name: "padded box: " + widgetName,
+						timeout: 1000,
+						runTest: function(){
+							var	domNodePos = dojo.position(widget.domNode),
+								paddedBoxPos = dojo.position(widget.focusNode.parentNode),
+								clientHeight = widget.domNode.clientHeight,
+								clientWidth = widget.domNode.clientWidth,
+								border = (domNodePos.w - clientWidth) >> 1, // average border width
+								offset = Math.min(Math.abs(domNodePos.x + border - paddedBoxPos.x), Math.abs(domNodePos.x + domNodePos.w - border - paddedBoxPos.x - paddedBoxPos.w));
+							doh.t(Math.abs(clientHeight-paddedBoxPos.h) <= 1, "padded textbox height: " + clientHeight + " vs " + paddedBoxPos.h);
+							doh.t(offset <= 1, "padded textbox horizontally just left or right (" + offset + ") of domNode: domNode x/w/b = " + domNodePos.x+"/"+domNodePos.w+"/"+border + ", pad box x/w = " + paddedBoxPos.x+"/"+paddedBoxPos.w);
+						}
+					},
+					{
+						name: "validation node: " + widgetName,
+						timeout: 1000,
+						runTest: function(){
+							if(widget.state != "Error"){ return; }
+							var	validationNode = dojo.query(".dijitValidationContainer", widget.domNode)[0],
+								validationPos = dojo.position(validationNode),
+								paddedBoxPos = dojo.position(widget.focusNode.parentNode),
+								offset = Math.min(Math.abs(paddedBoxPos.x + paddedBoxPos.w - validationPos.x), Math.abs(validationPos.x + validationPos.w - paddedBoxPos.x));
+
+							// IE 6 & quirks float bug(s) causes a known 3px margin between input field & validation icon 
+							// Fix could be .dj_ie .dijitInputField { float:right; }
+							// But this breaks even more the tests, dojo.position() bug?
+							if(dojo.isIE < 7 || dojo.isQuirks)
+								doh.t(offset <= 4, "padded textbox horizontally just left or right (" + offset + ") of validation node: valiation node x/w = " + validationPos.x+"/"+validationPos.w + ", pad box x/w = " + paddedBoxPos.x+"/"+paddedBoxPos.w);
+							else
+								doh.t(offset <= 1, "padded textbox horizontally just left or right (" + offset + ") of validation node: valiation node x/w = " + validationPos.x+"/"+validationPos.w + ", pad box x/w = " + paddedBoxPos.x+"/"+paddedBoxPos.w);
+						}
+					},
+					{
+						name: "button: " + widgetName,
+						timeout: 1000,
+						runTest: function(){
+							if(widget.state != "Error" || widgetName == "dijitValidationTextBox" ||
+								widgetName == "dijitNumberTextBox" || widgetName == "dijitCurrencyTextBox"){ return; }
+							var	validationNode = dojo.query(".dijitValidationContainer", widget.domNode)[0],
+								buttonNode = dojo.query(".dijitValidationContainer", widget.domNode)[0].previousSibling,
+								validationPos = dojo.position(validationNode),
+								buttonPos = dojo.position(buttonNode),
+								offset = Math.min(Math.abs(validationPos.x + validationPos.w - buttonPos.x), Math.abs(buttonPos.x + buttonPos.w - validationPos.x));
+							doh.t(offset <= 1, "button node horizontally just left or right (" + offset + ") of validation node: valiation node x/w = " + validationPos.x+"/"+validationPos.w + ", button x/w = " + buttonPos.x+"/"+buttonPos.w);
+						}
+					}
+				]);
+			});
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">dijit.form.TextBox size tests</h1>
+
+	<table class="padded" id="table" style="font-family:monospace;font-size:12pt;" role="presentation">
+		<tr>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+		</tr>
+		<tr>
+			<td class="layout">TextBox</td>
+			<td class="layout"><input id="textbox" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text", value:"text", "aria-label":"textbox"'/></td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+		</tr>
+		<tr>
+			<td class="layout">NumberTextBox</td>
+			<td class="layout"><input id="validation" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='type:"text", value:54, required:true, "aria-label":"NumberTextBox"'/></td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+		</tr>
+		<tr>
+			<td class="layout">FilteringSelect</td>
+			<td class="layout"><select id="combobox" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props='required:true, "aria-label":"FilteringSelect"'>
+				<option value="KY">Kentucky</option>
+			</select></td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+		</tr>
+		<tr>
+			<td class="layout">Select</td>
+			<td class="layout">
+			<!-- width:0px prevents IE from resizing the table columns inappropriately -->
+			<select id="select" data-dojo-type="dijit/form/Select" style="width:0px;" data-dojo-props='required:true, "aria-label":"Select"'>
+				<option data-dojo-value="">Invalid</option>
+				<option data-dojo-value="noError">Some Label</option>
+			</select></td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+		</tr>
+		<tr>
+			<td class="layout">NumberSpinner</td>
+			<td class="layout"><div id="spinner" data-dojo-type="dijit/form/NumberSpinner" data-dojo-props='type:"text", value:45, required:true, "aria-label":"numberSpinner"'></div></td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+		</tr>
+		<tr>
+			<td class="layout">INPUT type=file</td>
+			<td class="layout"><input id="file" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"file", "aria-label":"textboxFile" '/></td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+		</tr>
+		<tr>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+			<td style="font-size:1px;overflow:hidden;">&nbsp;</td>
+		</tr>
+	</table><br>
+	<script type="text/javascript">
+		testtable = dojo.byId('table');
+
+		function fontFamilyOnChange(fontFamily){
+			testtable.style.fontFamily = fontFamily;
+			if(dojo.isIE){
+				dojo.query('[widgetId]', document.body).forEach(function(node){
+					node.style.fontFamily = fontFamily;
+					dojo.query('*', node).forEach(function(node){
+						node.style.fontFamily = fontFamily;
+					});
+				});
+			}
+		}
+
+		function directionOnChange(direction){
+			dojo.query('[widgetId]', testtable).forEach(function(node){
+				if(dojo.isIE == 7){ // IE layout bugs
+					dojo.query('INPUT', node).forEach(function(node){
+						node.className = node.className;
+					});
+				}
+				node.style.direction = direction;
+				node.parentNode.style.direction = direction;
+				dojo.forEach(node.className.split(' '), function(cls){
+					if(cls.indexOf('Rtl') > 0){
+						dojo.removeClass(node, cls);
+					}
+				});
+				if(direction == "rtl"){
+					dojo.forEach(node.className.split(' '), function(cls){
+						if(cls.indexOf('Box') > 0){
+							cls = cls.substr(0, cls.indexOf('Box')+3) + "Rtl" + cls.substr(cls.indexOf('Box')+3);
+						}else{
+							cls = cls + "Rtl";
+						}
+						dojo.addClass(node, cls);
+					});
+				}
+			});
+		}
+
+		function themeOnChange(theme){
+			if(theme == "a11y"){
+				theme="dj_a11y";
+			}
+			dojo.body().className = theme + ((this.isRealA11y && theme != "dj_a11y") ? " dj_a11y" : "");
+		}
+
+
+		function sizeOnChange(size){
+			testtable.style.fontSize = size;
+			dojo.query('[widgetId]', testtable).forEach(function(node){
+				if(dojo.isIE == 7){ // IE layout bugs
+					dojo.query('INPUT', node).forEach(function(node){
+						node.className = node.className;
+					});
+				}
+			});
+		}
+
+		function paddingOnChange(padding){
+			testtable.className = padding;
+			dojo.query('[widgetId]', testtable).forEach(function(node){
+				if(dojo.isIE == 7){ // IE layout bugs
+					dojo.query('INPUT', node).forEach(function(node){
+						node.className = node.className;
+					});
+				}
+			});
+		}
+	</script>
+	<table style="background-color:cyan;" border="1" role="presentation">
+	<tr><td class="layout" style="text-align:right;">Font family:
+	<select id="fontFamily" data-dojo-type="dijit/form/ComboBox" data-dojo-props='style:{fontSize:"14pt"}, value:"", onChange:fontFamilyOnChange, "aria-label":"fontFamily"'>
+		<option selected>monospace</option>
+		<option>Helvetica</option>
+		<option>Times</option>
+		<option>Verdana</option>
+	</select></td></tr>
+	<tr><td class="layout" style="text-align:right;">Font size:
+	<select id="fontSize" data-dojo-type="dijit/form/ComboBox" data-dojo-props='style:{fontSize:"14pt"}, value:"", onChange:sizeOnChange, "aria-label":"fontSize"'>
+		<option>small</option>
+		<option selected>12pt</option>
+		<option>xx-large</option>
+		<option>8pt</option>
+		<option>21px</option>
+		<option>1cm</option>
+		<option>1em</option>
+		<option>200%</option>
+	</select></td></tr>
+	<tr><td class="layout" style="text-align:right;">Padding:
+	<select id="padding" data-dojo-type="dijit/form/Select" data-dojo-props='style:{width:"0px", fontSize:"14pt"}, value:"padded", onChange:paddingOnChange, "aria-label":"padding"'>
+		<option value="default">default</option>
+		<option value="padded">padded</option>
+		<option value="unPadded">unPadded</option>
+	</select></td></tr>
+	<tr><td class="layout" style="text-align:right;">Direction:
+	<span id="direction" data-dojo-type="dijit/form/Select" data-dojo-props='style:{width:"0px", fontSize:"14pt"}, value:"ltr", onChange:directionOnChange, "aria-label":"direction"'>
+		<span data-dojo-value="ltr">left-to-right</span>
+		<span data-dojo-value="rtl">right-to-left</span>
+	</span></td></tr>
+	<tr><td class="layout" style="text-align:right;">Theme:
+	<select id="theme" data-dojo-type="dijit/form/Select" data-dojo-props='style:{width:"0px", fontSize:"14pt"}, value:"claro", onChange:themeOnChange, "aria-label":"theme"'>
+		<option data-dojo-value="tundra">tundra</option>
+		<option data-dojo-value="soria">soria</option>
+		<option data-dojo-value="nihilo">nihilo</option>
+		<option data-dojo-value="claro">claro</option>
+		<option data-dojo-value="a11y">a11y</option>
+	</select></td></tr>
+	</table>
+	<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ doh.run(); }'>Run tests</button>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/TextBox_sizes.js b/src/main/resources/static/dijit/tests/form/TextBox_sizes.js
new file mode 100644
index 0000000000000000000000000000000000000000..e877764c05181a609fb0b914912b6512fd578a65
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/TextBox_sizes.js
@@ -0,0 +1,107 @@
+dojo.provide("dijit.tests.form.TextBox_sizes");
+
+var userArgs = window.location.search.replace(/[\?&](dojoUrl|testUrl|testModule)=[^&]*/g,"").replace(/^&/,"?");
+
+
+try{
+
+doh.registerUrl('t.monospace.small.padded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=padded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.padded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=padded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.padded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=padded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.padded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=padded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.padded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=padded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.padded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=padded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.unPadded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=unPadded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.unPadded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=unPadded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.unPadded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=unPadded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.unPadded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=unPadded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.unPadded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=unPadded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.small.unPadded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=unPadded&fontSize=small&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.padded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=padded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.padded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=padded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.padded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=padded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.padded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=padded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.padded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=padded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.padded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=padded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.unPadded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=unPadded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.unPadded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=unPadded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.unPadded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=unPadded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.unPadded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=unPadded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.unPadded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=unPadded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.large.unPadded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=unPadded&fontSize=large&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.padded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=padded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.padded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=padded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.padded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=padded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.padded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=padded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.padded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=padded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.padded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=padded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.unPadded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=unPadded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.unPadded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=unPadded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.unPadded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=unPadded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.unPadded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=unPadded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.unPadded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=unPadded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.1em.unPadded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=unPadded&fontSize=1em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.padded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=padded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.padded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=padded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.padded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=padded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.padded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=padded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.padded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=padded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.padded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=padded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.unPadded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=unPadded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.unPadded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=unPadded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.unPadded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=unPadded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.unPadded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=unPadded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.unPadded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=unPadded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.monospace.2em.unPadded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=unPadded&fontSize=2em&fontFamily=monospace'), 999999);
+doh.registerUrl('t.Times.small.padded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=padded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.padded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=padded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.padded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=padded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.padded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=padded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.padded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=padded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.padded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=padded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.unPadded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=unPadded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.unPadded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=unPadded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.unPadded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=unPadded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.unPadded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=unPadded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.unPadded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=unPadded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.small.unPadded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=unPadded&fontSize=small&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.padded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=padded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.padded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=padded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.padded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=padded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.padded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=padded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.padded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=padded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.padded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=padded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.unPadded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=unPadded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.unPadded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=unPadded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.unPadded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=unPadded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.unPadded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=unPadded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.unPadded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=unPadded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.large.unPadded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=unPadded&fontSize=large&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.padded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=padded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.padded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=padded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.padded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=padded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.padded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=padded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.padded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=padded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.padded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=padded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.unPadded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=unPadded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.unPadded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=unPadded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.unPadded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=unPadded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.unPadded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=unPadded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.unPadded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=unPadded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.1em.unPadded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=unPadded&fontSize=1em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.padded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=padded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.padded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=padded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.padded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=padded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.padded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=padded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.padded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=padded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.padded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=padded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.unPadded.ltr.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=ltr&padding=unPadded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.unPadded.ltr.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=ltr&padding=unPadded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.unPadded.ltr.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=ltr&padding=unPadded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.unPadded.rtl.claro',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=claro&dir=rtl&padding=unPadded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.unPadded.rtl.tundra',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=tundra&dir=rtl&padding=unPadded&fontSize=2em&fontFamily=Times'), 999999);
+doh.registerUrl('t.Times.2em.unPadded.rtl.a11y',dojo.moduleUrl('dijit', 'tests/form/TextBox_sizes.html?theme=a11y&dir=rtl&padding=unPadded&fontSize=2em&fontFamily=Times'), 999999);
+
+}catch(e){
+	doh.debug(e);
+}
diff --git a/src/main/resources/static/dijit/tests/form/TextBox_types.html b/src/main/resources/static/dijit/tests/form/TextBox_types.html
new file mode 100644
index 0000000000000000000000000000000000000000..b3548c6a80093b12342d23817ad0170fd16116ec
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/TextBox_types.html
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>TextBox type Tests</title>
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../css/dijitTests.css";
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+
+	<!-- only needed for alternate theme testing: -->
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dojo.parser");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.TextBox");
+		dojo.require("dijit.form.CurrencyTextBox");
+		dojo.require("dijit.form.DateTextBox");
+		dojo.require("dijit.form.TimeTextBox");
+		dojo.require("dijit.form.NumberTextBox");
+		dojo.require("dijit.form.RangeBoundTextBox");
+
+		dojo.ready(function(){
+
+			doh.register("types", [
+				{
+					name: "HTML4",
+					runTest: function(){
+						doh.is(dojo.byId('hn').type, dijit.byId('dr').focusNode.type, "dr");
+						doh.is(dojo.byId('hp').type, dijit.byId('dp').focusNode.type, "dp");
+						doh.is("text", dijit.byId('dn').focusNode.type, "dn");
+						doh.is("text", dijit.byId('dc').focusNode.type, "dc");
+						doh.is("text", dijit.byId('dd').focusNode.type, "dd");
+						doh.is("text", dijit.byId('dt').focusNode.type, "dt");
+					}
+				},
+				{
+					name: "HTML5",
+					runTest: function(){
+						doh.is(dojo.byId('hn').type, dijit.byId('wr').focusNode.type, "wr");
+						doh.is(dojo.byId('hp').type, dijit.byId('wp').focusNode.type, "wp");
+						doh.is("text", dijit.byId('wn').focusNode.type, "wn");
+						doh.is("text", dijit.byId('wc').focusNode.type, "wc");
+						doh.is("text", dijit.byId('wd').focusNode.type, "wd");
+						doh.is("text", dijit.byId('wt').focusNode.type, "wt");
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1>TextBox type Tests</h1>
+	<input id="hn" aria-label="hn" type="number" value="1234" /><br>
+	<input id="hd" aria-label="hd" type="date" value="2011-05-19" /><br>
+	<input id="ht" aria-label="ht" type="time" value="10:11:00" /><br>
+	<input id="hp" aria-label="hp" type="password" value="password" /><br>
+<br>
+	<input aria-label="dr" id="dr" type="number" dojoType="dijit.form.RangeBoundTextBox" value="1234" /><br>
+	<input aria-label="dp" id="dp" type="password" dojoType="dijit.form.TextBox" value="password" /><br>
+	<input aria-label="dn" id="dn" type="number" dojoType="dijit.form.NumberTextBox" value="1234" /><br>
+	<input aria-label="dc" id="dc" type="number" dojoType="dijit.form.CurrencyTextBox" value="1234.00" /><br>
+	<input aria-label="dd" id="dd" type="date" dojoType="dijit.form.DateTextBox" value="2011-05-19" /><br>
+	<input aria-label="dt" id="dt" type="time" dojoType="dijit.form.TimeTextBox" value="T10:11:00" /><br>
+<br>
+	<input id="wr" data-dojo-type="dijit/form/RangeBoundTextBox" data-dojo-props='value:1234, type:"number", "aria-label":"wr" ' /><br>
+	<input id="wp" data-dojo-type="dijit/form/TextBox" data-dojo-props='value:"password", type:"password", "aria-label":"wp" ' /><br>
+	<input id="wn" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='value:1234, type:"number", "aria-label":"wn" ' /><br>
+	<input id="wc" data-dojo-type="dijit/form/CurrencyTextBox" data-dojo-props='value:1234, type:"number", "aria-label":"wc" ' /><br>
+	<input id="wd" data-dojo-type="dijit/form/DateTextBox" data-dojo-props='value:new Date(2011,04,19,0,0,0,0), type:"date", "aria-label":"wd" ' /><br>
+	<input id="wt" data-dojo-type="dijit/form/TimeTextBox" data-dojo-props='value:new Date(0,0,0,10,11,0,0), type:"time", "aria-label":"wt" ' /><br>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/ToggleButtonMixin.html b/src/main/resources/static/dijit/tests/form/ToggleButtonMixin.html
new file mode 100644
index 0000000000000000000000000000000000000000..e36d8a7707ff63ab5466a610be9b2b381c31c3f6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/ToggleButtonMixin.html
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>_ToggleButtonMixin tests</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../../themes/dijit.css";
+
+		#table {
+			margin: 0;
+			padding: 2px;
+		}
+		#table, .dijit, BUTTON {
+			font-family: monospace;
+			font-size: 12pt;
+		}
+		#table .layout {
+			padding: 2px;
+			font-size: 100%;
+			margin: 0;
+		}
+		.mblRedButtonChecked {
+			border-style: inset;
+		}
+	</style>
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad: true, isDebug: true"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.ToggleButton");
+		dojo.require("dojox.mobile.ToggleButton");
+
+		dojo.ready(function(){
+
+			doh.register("attributes", [
+				{
+					name: "dijit",
+					runTest: function(){
+						var dijit_attributes = dijit.byId('dijit_attributes');
+						doh.t(dijit_attributes.get('checked'), "dijit original get('checked')");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass+"Checked"), "dijit baseClass checked");
+						dijit_attributes.set('checked', false);
+						doh.f(dijit_attributes.get('checked'), "dijit get('checked')");
+						doh.f(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass+"Checked"), "dijit baseClass not checked");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, dijit_attributes.baseClass), "dijit baseClass");
+						doh.t(dojo.hasClass(dijit_attributes.domNode, "mblRedButton"), "dijit original class");
+					}
+	 			},
+				{
+					name: "mobile",
+					runTest: function(){
+						var mobile_attributes = dijit.byId('mobile_attributes');
+						doh.t(mobile_attributes.get('checked'), "mobile original get('checked')");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass+"Checked"), "mobile baseClass checked");
+						mobile_attributes.set('checked', false);
+						doh.f(mobile_attributes.get('checked'), "mobile get('checked')");
+						doh.f(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass+"Checked"), "mobile baseClass not checked");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, mobile_attributes.baseClass), "mobile baseClass");
+						doh.t(dojo.hasClass(mobile_attributes.domNode, "mblRedButton"), "mobile original class");
+					}
+	 			}
+			]);
+
+			doh.register("events", [
+				{
+					name: "dijit",
+					timeout: 2000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							dijit_events = dijit.byId('dijit_events'),
+							calledOnClick = false,
+							nop = function(){ return false; };
+
+						function onChange(v){
+							dijit_events.set('onChange', nop);
+							d.callback(true);
+						}
+						dijit_events.set('onChange', onChange);
+						dijit_events._onClick({
+							preventDefault: nop,
+							stopPropagation: nop
+						});
+
+						return d;
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 2000,
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							mobile_events = dijit.byId('mobile_events'),
+							nop = function(){ return false; };
+
+						function onChange(){
+							mobile_events.set('onChange', nop);
+							d.callback(true);
+						}
+						mobile_events.set("onChange", onChange);
+						setTimeout(function(){
+							mobile_events.focusNode.click({
+								preventDefault: nop,
+								stopPropagation: nop
+							});
+						}, 0);
+
+						return d;
+					}
+	 			}
+			]);
+
+			doh.register("programmatic", [
+				{
+					name: "dijit",
+					timeout: 2000,
+					runTest: function(){
+						new dijit.form.ToggleButton({id:"dijit_programmatic", type:"button", checked:true, label:"No srcNodeRef", "aria-label":"dijit_programmatic"}).placeAt("dijit_programmatic_container", "first");
+						var dijit_programmatic = dijit.byId('dijit_programmatic');
+						var pos = dojo.position(dijit_programmatic.domNode, true);
+						doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'dijit position');
+						doh.t(dijit_programmatic.get('checked'), 'dijit widget checked');
+					}
+	 			},
+				{
+					name: "mobile",
+					timeout: 2000,
+					runTest: function(){
+						new dojox.mobile.ToggleButton({id:"mobile_programmatic", type:"button", checked:true, label:"No srcNodeRef", "aria-label":"mobile_programmatic"}).placeAt("mobile_programmatic_container", "first");
+						var mobile_programmatic = dijit.byId('mobile_programmatic');
+						var pos = dojo.position(mobile_programmatic.domNode, true);
+						doh.t(pos.w > 0 && pos.h > 0 && pos.x > 0 && pos.y > 0, 'mobile position');
+						doh.t(mobile_programmatic.get('checked'), 'mobile widget checked');
+					}
+	 			}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">_ToggleButtonMixin (dijit and mobile) non-robot tests</h1>
+
+	<table id="table">
+		<tr>
+			<th class="layout">&nbsp;</th>
+			<th class="layout">dijit</th>
+			<th class="layout">mobile</th>
+		</tr>
+		<tr>
+			<td class="layout">attributes</td>
+			<td class="layout"><input id="dijit_attributes" data-dojo-type="dijit/form/ToggleButton" data-dojo-props='type:"button", checked: true, label:"original", "class":"mblRedButton"'/></td>
+			<td class="layout"><button type="button" class="mblRedButton" checked id="mobile_attributes" dojoType="dojox.mobile.ToggleButton" label="original"/></td>
+		</tr>
+		<tr>
+		<tr>
+			<td class="layout">Events</td>
+			<td class="layout"><button id="dijit_events" data-dojo-type="dijit/form/ToggleButton" data-dojo-props='type:"button", onClick:function(){ return true; }'>innerHTML</button></td>
+			<td class="layout"><button type="button" id="mobile_events" data-dojo-type="dojox.mobile.ToggleButton" data-dojo-props='type:"button", onClick:function(){ return true; }'>innerHTML</button></td>
+		</tr>
+		<tr>
+			<td class="layout">Programmatic</td>
+			<td class="layout" id="dijit_programmatic_container"></td>
+			<td class="layout" id="mobile_programmatic_container"></td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/_autoComplete.html b/src/main/resources/static/dijit/tests/form/_autoComplete.html
new file mode 100644
index 0000000000000000000000000000000000000000..456146a55ff15ba3ca91bc396574535a60b752ba
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/_autoComplete.html
@@ -0,0 +1,944 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>dijit.form.ComboBox Unit Test</title>
+
+	<style>
+		@import "../../themes/claro/document.css";
+		@import "../../../util/doh/robot/robot.css";
+		@import "../css/dijitTests.css";
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: false"></script>
+
+	<!-- only needed for alternate theme testing: -->
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		var isUnitTest = false;
+		var testWidget = "dijit.form.ComboBox";
+		var qstr = window.location.search.substr(1);
+		if(qstr.length){
+		        var qparts = qstr.split("&");
+		        for(var x=0; x<qparts.length; x++){
+		                var tp = qparts[x].split("=");
+		                if(tp[0] == "testWidget"){
+		                        testWidget = tp[1];
+					document.title = testWidget + " Unit Test";
+		                }else if(tp[0] == "mode"){
+					isUnitTest = tp[1] == "test";
+				}
+		        }
+		}
+		var isComboBox = testWidget == "dijit.form.ComboBox";
+		dojo.require("dojo.store.Memory");
+		dojo.require("dojo._base.Deferred");
+		dojo.require("dojo.data.ItemFileReadStore");
+		dojo.require("dijit.tests._data.SlowStore");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require(testWidget);
+		dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+		dojo.require("doh.runner");
+
+		function setVal2(val){
+			dojo.byId('value2').value=val;
+			var w = dijit.byId('datatest');
+			var item = w.item;
+			console.debug("Value changed to ["+val+"] in second box (#1652): datastore item label = " + (item?w.store.getLabel(item):'no item'));
+		}
+		function setVal3(val){
+			dojo.byId('value3').value=val;
+		}
+		function setVal4(val){
+			dojo.byId('value4').value=val;
+		}
+		var combo;
+		function myLabelFunc(item, store){
+			var label=store.getValue(item, 'name');
+			// DEMO: uncomment to chop off a character
+			//label=label.substr(0, label.length-1);
+			// DEMO: uncomment to set to lower case
+			label = label.toLowerCase();
+			return label;
+		}
+
+		// Test Custom Store
+		dojo.declare("StateSelect", isComboBox ? dijit.form.ComboBox : dijit.form.FilteringSelect , {
+			placeHolder: "Select a State",
+			searchAttr: "name",
+			label: "State:",
+			name: "state",
+			style: "width: 160px",
+			store: new dojo.data.ItemFileReadStore({ url: dojo.moduleUrl("dijit.tests._data", "states.json") }),
+			value: ''
+		});
+
+		function init(){
+			var combo;
+
+			var testClass = dojo.getObject(testWidget);
+			// substitute testWidget for each data-dojo-type=$testWidget
+			dojo.query('[data-dojo-type="$testWidget"]').forEach(function(node){
+				node.setAttribute('data-dojo-type', testWidget);
+			});
+			dojo.parser.parse(dojo.body());
+			store = new dojo.data.ItemFileReadStore({url: dojo.moduleUrl("dijit.tests._data", "states.json")});
+			combo = new testClass({
+				name:"prog",
+				title: "title attribute used for label",
+				autoComplete:false,
+				store: store,
+				searchAttr:"name"
+			}, dojo.byId("progCombo"));
+			store2 = new dojo.data.ItemFileReadStore({url: dojo.moduleUrl("dijit.tests._data", "countries.json")});
+			combo = new testClass({
+				name:"prog2",
+				autoComplete:false,
+				store:store2,
+				query:{type:'country'},
+				searchAttr:"name"
+			}, dojo.byId("progCombo2"));
+
+			new testClass({
+				name:"prog3",
+				autoComplete:false,
+				store:store2,
+				query:{type:'country'},
+				searchAttr:"name",
+				fetchProperties: {sort:[{attribute: 'name', descending: true}]}
+			}, dojo.byId("progCombo3"));
+
+			// change Memory store to have an asynchronous total
+			var oldMemoryQuery = dojo.store.Memory.prototype.query;
+			dojo.store.Memory.extend({
+				query: function(){
+					var results = oldMemoryQuery.apply(this, arguments);
+					var total = results.total;
+					results.total = new dojo.Deferred();
+					setTimeout(function(){
+						results.total.resolve(total);
+					}, 100);
+					return results;
+				}
+			});
+
+			if(!isUnitTest){ return; }
+
+			doh.register("label", [
+				{
+					name: "user-specified id",
+					runTest: function(){
+						combo = dijit.byId("setvaluetest");
+						var labelId = combo.domNode.getAttribute('aria-labelledby');
+						doh.is("setvaluetest_mylabel", labelId, "labelledby");
+						doh.is(labelId, dojo.byId(labelId).id, "label id");
+					}
+				},
+				{
+					name: "generated id",
+					runTest: function(){
+						combo = dijit.byId("datatest");
+						var labelId = combo.domNode.getAttribute('aria-labelledby');
+						doh.is("datatest_label", labelId, "labelledby");
+						doh.is(labelId, dojo.byId(labelId).id, "label id");
+					}
+				},
+				{
+					name: "aria roles and attributes",
+					timeout: 5000,
+					runTest:function(){
+						var d = new doh.Deferred();
+						combo = dijit.byId("setvaluetest");
+						// ComboBox and FilteringSelect have the same roles and attributes
+						doh.is("combobox", combo._popupStateNode.getAttribute("role"), "combo _popupStateNode role");
+						doh.t(combo._popupStateNode.getAttribute("aria-haspopup"), "aria-haspopup on combo");
+						doh.is("setvaluetest_mylabel", combo._popupStateNode.getAttribute("aria-labelledby"), "aria-labelledby");
+						doh.f(combo._popupStateNode.getAttribute("aria-expanded"), "initially missing aria-expanded");
+						doh.f(combo._popupStateNode.getAttribute("aria-owns"), "initally missing aria-owns");					
+
+						// Type is "text" by default but app should be able to override it.
+						// Except it doesn't work on IE9 and below; the type is always text.
+						if(!(dojo.isIE <= 9)){
+							doh.is("text", combo.focusNode.type, "default type");
+							doh.is("url", dijit.byId("url").focusNode.type, "override type");
+						}
+
+						var handler = dojo.connect(combo, "openDropDown", function(){
+							dojo.disconnect(handler);
+							setTimeout(d.getTestCallback(function(){
+								doh.t(combo._popupStateNode.getAttribute("aria-expanded"), "now aria-expanded should be true");
+								doh.is("setvaluetest_popup", combo._popupStateNode.getAttribute("aria-owns"), "should aria-own the popup");
+							
+								doh.is("listbox", combo.dropDown.domNode.getAttribute("role"), "dropDown.domNode should have a role");
+								doh.is("setvaluetest", combo.dropDown.domNode.getAttribute("aria-labelledby"), "aria-labelledby should point back to button");
+								doh.is("region", dojo.byId("widget_setvaluetest_dropdown").getAttribute("role"), "popup wrapper should have role=region since it gets appended to the end of the body");
+								doh.is("setvaluetest_popup", dojo.byId("widget_setvaluetest_dropdown").getAttribute("aria-label"), "popup wrapper should have aria-label since role=region");
+							}), 500);
+						});
+
+						combo.loadDropDown();
+						return d;
+					},
+					tearDown:function(){
+						combo.closeDropDown();
+					}
+				}
+			]);
+
+			doh.register("placeHolder", [
+				{
+					timeout: 2000,
+					name: "focus enpty",
+					combo: "placeholdertest",
+					setUp: function(){
+						dojo.byId('native').focus(); // blur combo so onfocus fires
+						combo = dijit.byId(this.combo);
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+						doh.is("", combo.get("value"), "value");
+						doh.is("", combo.get('displayedValue'), "displayedValue");
+						doh.is("Select a New England State", combo._phspan.innerHTML, "_phspan.innerHTML");
+						doh.isNot("none", combo._phspan.style.display, "_phspan.style.display 1");
+
+						var handler = dojo.connect(combo.textbox, "onfocus", function(){
+							dojo.disconnect(handler);
+							setTimeout(d.getTestCallback(function(){
+								doh.isNot("none", combo._phspan.style.display, "_phspan.style.display 2");
+							}), 0);
+						});
+						combo.focus();
+						return d;
+					}
+				},
+				{
+					timeout: 5000,
+					name: "blur empty",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var handler = dojo.connect(dojo.byId('native'), "onfocus", function(){
+							dojo.disconnect(handler);
+							setTimeout(d.getTestCallback(function(){
+								doh.is("", combo.get("value"), "value");
+								doh.is("", combo.get('displayedValue'), "displayedValue");
+								doh.isNot("none", combo._phspan.style.display, "_phspan.style.display");
+							}), 0);
+						});
+						dojo.byId('native').focus(); // blur combo
+						return d;
+					}
+				},
+				{
+					timeout: 5000,
+					name: "focus non enpty",
+					combo: "placeholdertest",
+					setUp: function(){
+						dojo.byId('native').focus(); // blur combo so onfocus fires
+						combo = dijit.byId(this.combo);
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+						var value = isComboBox? 'Connecticut' : 'ct';
+						combo.set("value", value);
+						doh.is(value, combo.get("value"), "value");
+						doh.is("none", combo._phspan.style.display, "_phspan.style.display 1");
+
+						var handler = dojo.connect(combo.textbox, "onfocus", function(){
+							dojo.disconnect(handler);
+							setTimeout(d.getTestCallback(function(){
+								doh.is("none", combo._phspan.style.display, "_phspan.style.display 2");
+							}), 0);
+						});
+						combo.focus();
+						return d;
+					}
+				},
+				{
+					timeout: 5000,
+					name: "blur non empty",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var value = isComboBox? 'Connecticut' : 'ct';
+						var handler = dojo.connect(dojo.byId('native'), "onfocus", function(){
+							dojo.disconnect(handler);
+							setTimeout(d.getTestCallback(function(){
+								doh.is(value, combo.get("value"), "value");
+								doh.is("none", combo._phspan.style.display, "_phspan.style.display");
+								doh.is('Connecticut', combo.textbox.value, "textbox.value");
+							}), 0);
+						});
+						dojo.byId('native').focus(); // blur combo
+						return d;
+					}
+				},
+				{
+					timeout: 5000,
+					name: "re-empty",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var handler = dojo.connect(combo, "onChange", function(){
+							dojo.disconnect(handler);
+							setTimeout(d.getTestCallback(function(){
+								doh.is("", combo.get("value"), "value");
+								doh.is("", combo.get("displayedValue"), "displayedValue");
+								doh.isNot("none", combo._phspan.style.display, "_phspan.style.display");
+							}), 0);
+						});
+						combo.set("value", '');
+						return d;
+					}
+				}
+			]);
+
+			if(!isComboBox) {
+
+				var fsStore;
+				
+				doh.register("FilteringSelect data", [
+					function setupMemoryStore() {
+						fsStore = new dojo.store.Memory({
+							data: [{
+								id: 1,
+								name: "one",
+								value: "one"
+							},	{
+								id: 2,
+								name: "two",
+								value: "two"
+							}, {
+								id: 3,
+								name: "three",
+								value: "three"
+							}]
+						});
+					},{
+						timeout: 5000,
+						name: "set store after construction",
+						runTest: function() {
+							var fs = new dijit.form.FilteringSelect({});
+							fs.set('store', fsStore);
+							doh.is(fs.get('store'), fsStore);
+							fs.destroy();
+						}
+					},{
+						timeout: 5000,
+						name: "set store and place after construction",
+						runTest: function() {
+							var fs = new dijit.form.FilteringSelect({});
+							var ele = document.getElementById("filteringSelect");
+							fs.set('store', fsStore);
+							fs.placeAt(ele);
+							doh.is(fs.domNode, ele.firstChild);
+							fs.destroy();
+						}
+					}, {
+						timeout: 5000,
+						name: "set store and value after construction",
+						runTest: function() {
+							var fs = new dijit.form.FilteringSelect({});
+							var ele = document.getElementById("filteringSelect");
+							fs.set('store', fsStore);
+							fs.placeAt(ele);
+							fs.set('value', 2);
+							doh.is(fs.get("displayedValue"), fsStore.get(2).name);
+							fs.destroy();
+						}
+					}
+				]);
+			}
+
+			doh.register("asynchronous data store", [
+				{
+					timeout:5000,
+					name:"total",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("slow");
+						var handler = dojo.connect(combo, "onSearch", function(results, query, options){
+							dojo.disconnect(handler);
+							d.getTestCallback(function(){
+								doh.is(30, options.start, "start");
+								doh.is(4, results.length, "count");
+								doh.is(61, results.total, "total");
+							})();
+						});
+						combo._set('fetchProperties', { start:30, count:4 });
+						combo._startSearch("");
+						return d;
+					},
+					tearDown:function(){
+						dijit.byId("slow").closeDropDown();
+					}
+				}
+			]);
+
+			doh.run();
+		}
+		dojo.ready(init);
+
+		function toggleDisabled(button, widget){
+			widget = dijit.byId(widget);
+			button = dojo.byId(button);
+			widget.set('disabled',!widget.disabled);
+			button.innerHTML= widget.disabled ? "Enable" : "Disable";
+		}
+
+		function getValue(){
+			var f = document.getElementById("form1");
+			var s = "";
+			for(var i = 0; i < f.elements.length; i++){
+				var elem = f.elements[i];
+				if(elem.nodeName.toLowerCase() == "button" || elem.type=="submit" || elem.type=="button")  { continue; }
+				s += elem.name + ": " + elem.value + "\n";
+			}
+			return s;
+		}
+
+		// formSubmitted flag is for benefit of DOH test harneess
+		formSubmitted = false;
+		function onFormSubmit(){
+			formSubmitted = true;
+			console.log(getValue());
+			return false;
+		}
+	</script>
+</head>
+
+<body class="claro" role="main">
+
+	<h1 class="testTitle" id="title"></h1>
+	<script>dojo.byId('title').appendChild(document.createTextNode(testWidget+" Unit Test"))</script>
+	<form id="form1" action="#" method="GET" onsubmit="return onFormSubmit();">
+		
+		<!--
+			Need a submit button like this (rather than onsubmit handler on <form>) to get
+			IE to submit when the ENTER key is pressed.
+			
+			And (at least on IE8) when ComboBox_a11y.html is run via runTests.html,
+			it only seems to work if the button is at the top of the form, not at the bottom.
+		-->
+		<button type="reset">reset</button>
+		<button type="submit">fake submit</button><br/>
+		<hr>
+
+		<p>Option tags, autoComplete=false, selectOnClick=true, default value of California, pageSize=30, custom labelFunc method</p>
+		<label id="setvaluetest_mylabel" for="setvaluetest">US State test 1 (200% Courier font):</label>
+		<script type="text/javascript">
+			function setValueTestOnChange(newValue){
+				if(this.lastlabelFuncMsg){
+					this.lastlabelFuncMsg = '';
+				}
+				dojo.byId('oc1').value = newValue;
+				var itemLabel;
+				if(this.item === null){
+					itemLabel = "null";
+					if(testWidget != "dijit.form.ComboBox" && this.isValid() && this.textbox.value != ''){
+						console.error(this.id + ' has a null item, onChange value = ' + newValue + ', widget value = ' + this.value + ', displayed Value = ' + this.textbox.value);
+						this.itemError = true;
+					}
+				}else if(typeof this.item === "undefined"){
+					itemLabel = "undefined";
+					console.error(this.id + ' has an undefined item, onChange value = ' + newValue + ', widget value = ' + this.value + ', displayed Value = ' + this.textbox.value);
+					this.itemError = true;
+				}else{
+					itemLabel = this.item[this.searchAttr].toString();
+				}
+				dojo.byId('i1').value = itemLabel;
+			}
+			function setValueTestLabelFunc(item, store){
+				var label = item[this.searchAttr];
+				var value = item.value;
+				if(!this.labelFuncCount){ this.labelFuncCount = 0; }
+				if(!this.labelFuncCounts){ this.labelFuncCounts = []; }
+				if(!this.labelFuncCounts[value]){ this.labelFuncCounts[value] = 0; }
+				this.labelFuncCount++;
+				this.labelFuncCounts[value]++;
+				this.lastlabelFuncMsg = 'my labelfunc ' + label + ' (' + value + '), count = ' + this.labelFuncCounts[value];
+				return label + ' (' + value + ')';
+			}
+		</script>
+		<select id="setvaluetest" data-dojo-type="$testWidget"
+				data-dojo-props='name:"state1",
+				style:{width:"50%", fontSize:"200%", fontFamily:"Courier"},
+				autoComplete:false,
+				selectOnClick:true,
+				onBlur:function(){ dojo.byId("b1").value=dijit.byId("setvaluetest").value },
+				onClick:function(){ console.log("onclick"); },
+				pageSize:30,
+				labelFunc:setValueTestLabelFunc,
+				onChange:setValueTestOnChange
+		'>
+			<option value="AL">Alabama</option>
+			<option value="AK">Alaska</option>
+			<option value="AS">American Samoa</option>
+			<option value="AZ">Arizona</option>
+			<option value="AR">Arkansas</option>
+			<option value="AE">Armed Forces Europe</option>
+			<option value="AP">Armed Forces Pacific</option>
+			<option value="AA">Armed Forces the Americas</option>
+			<option value="CA" selected>California</option>
+			<option value="CO">Colorado</option>
+			<option value="CT">Connecticut</option>
+			<option value="DE">Delaware</option>
+			<option value="DC">District of Columbia</option>
+			<option value="FM">Federated States of Micronesia</option>
+			<option value="FL">Florida</option>
+			<option value="GA">Georgia</option>
+			<option value="GU">Guam</option>
+			<option value="HI">Hawaii</option>
+			<option value="ID">Idaho</option>
+			<option value="IL">Illinois</option>
+			<option value="IN">Indiana</option>
+			<option value="IA">Iowa</option>
+			<option value="KS">Kansas</option>
+			<option value="KY">Kentucky</option>
+			<option value="LA">Louisiana</option>
+			<option value="ME">Maine</option>
+			<option value="MH">Marshall Islands</option>
+			<option value="MD">Maryland</option>
+			<option value="MA">Massachusetts</option>
+			<option value="MI">Michigan</option>
+			<option value="MN">Minnesota</option>
+			<option value="MS">Mississippi</option>
+			<option value="MO">Missouri</option>
+			<option value="MT">Montana</option>
+			<option value="NE">Nebraska</option>
+			<option value="NV">Nevada</option>
+			<option value="NH">New Hampshire</option>
+			<option value="NJ">New Jersey</option>
+			<option value="NM">New Mexico</option>
+			<option value="NY">New York</option>
+			<option value="NC">North Carolina</option>
+			<option value="ND">North Dakota</option>
+			<option value="MP">Northern Mariana Islands</option>
+			<option value="OH">Ohio</option>
+			<option value="OK">Oklahoma</option>
+			<option value="OR">Oregon</option>
+			<option value="PA">Pennsylvania</option>
+			<option value="PR">Puerto Rico</option>
+			<option value="RI">Rhode Island</option>
+			<option value="SC">South Carolina</option>
+			<option value="SD">South Dakota</option>
+			<option value="TN">Tennessee</option>
+			<option value="TX">Texas</option>
+			<option value="UT">Utah</option>
+			<option value="VT">Vermont</option>
+			<option value="VI">Virgin Islands, U.S.</option>
+			<option value="VA">Virginia</option>
+			<option value="WA">Washington</option>
+			<option value="WV">West Virginia</option>
+			<option value="WI">Wisconsin</option>
+			<option value="WY">Wyoming</option>
+		</select>
+		<br><label for="oc1">onChange:</label><input id="oc1" disabled value="not fired yet!" autocomplete="off"/>
+		<br><label for="v1">value:</label><input id="v1" disabled value="not fired yet!" autocomplete="off"/>
+		<br><label for="b1">blur:</label><input id="b1" disabled value="not fired yet!" autocomplete="off"/>
+		<br><label for="i1">this.item:</label><input id="i1" disabled value="no onChange yet!" autocomplete="off"/>
+		<input type="button" id="sv1_1" value="Set displayed value to Kentucky" onClick="dijit.byId('setvaluetest').set('displayedValue', 'Kentucky')"/>
+	        <input type="button" id="sv1_2" value="Set displayed value to Canada" onClick="dijit.byId('setvaluetest').set('displayedValue', 'Canada')"/>
+	        <input type="button" id="sv1_3" value="Set value to null" onClick="dijit.byId('setvaluetest').set('value', null)"/>
+	        <input type="button" id="sv1_4" value="Get value" onClick="dojo.byId('v1').value=dijit.byId('setvaluetest').get('value')"/>
+
+		<hr>
+
+		<div data-dojo-id="stateStore" data-dojo-type="dojo/data/ItemFileReadStore" data-dojo-props='url:"../_data/states.json"'></div>
+		<div data-dojo-id="slowStateStore" data-dojo-type="dijit/tests/_data/SlowStore" data-dojo-props='url:"../_data/states.json"'></div>
+
+		<div data-dojo-id="dijitStore" data-dojo-type="dojo/data/ItemFileReadStore" data-dojo-props='url:"../_data/dijits.json"'></div>
+
+		<p>Data store, autoComplete=true:</p>
+		<label for="datatest">US State test 2 (8pt font):</label>
+		<input id="datatest" data-dojo-type="$testWidget"
+				data-dojo-props='value: (testWidget == "dijit.form.ComboBox") ? "California" : "CA",
+				store:stateStore,
+				searchAttr:"name",
+				style:{width:"200px", fontSize:"8pt"},
+				name:"state2",
+				onChange:setVal2
+				'/>
+		<br><label for="value2">onChange:</label><input id="value2" disabled value="not fired yet!" autocomplete="off"/>
+		<hr>
+		<p>Artificially slowed-down data store, autoComplete=true:</p>
+		<label for="slow">US State test slow:</label>
+		<input id="slow" data-dojo-type="$testWidget"
+				data-dojo-props='value: (testWidget == "dijit.form.ComboBox") ? "California" : "CA",
+				store:slowStateStore,
+				searchAttr:"name",
+				name:"stateSlow",
+				onChange:function(val){ dojo.byId("ocSlow").value = val; }
+				'/>
+		<br><label for="ocSlow">onChange:</label><input id="ocSlow" disabled value="not fired yet!" autocomplete="off"/>
+		<button id="slowDestroy" type="button" onclick="dijit.byId('slow').destroy();return false">Destroy widget to test in-flight query cancel</button>
+		<hr>
+
+		<label for="datatestDijit">Dijit List test #1 (150% font):</label>
+		<input id="datatestDijit" data-dojo-type="$testWidget"
+				data-dojo-props='value:"dijit.Editor",
+				store:dijitStore,
+				searchAttr:"className",
+				style:{width:"200px",fontSize:"150%"},
+				name:"dijitList1"
+				'/>
+		<span>Hey look, this one is kind of useful.</span>
+		<hr>
+
+		<p>Initially disabled, url, autoComplete=false:</p>
+		<label for="combo3">US State test 3:</label>
+	 	<input id="combo3" data-dojo-type="$testWidget"
+	 			data-dojo-props='value:(testWidget == "dijit.form.ComboBox") ? "California" : "CA",
+				store:stateStore,
+				searchAttr:"name",
+				style:{width:"300px"},
+				name:"state3",
+				autoComplete:false,
+				onChange:setVal3,
+				disabled:true
+		'/>
+		<br><label for="value3">onChange:</label><input id="value3" disabled value="not fired yet!" autocomplete="off"/>
+		<div>
+			<button id="combo3_disable" type="button" onclick='toggleDisabled("combo3_disable", "combo3"); return false;' tabIndex="-1">Enable</button>
+		</div>
+		<hr>
+		<p>Data store, autoComplete=false required=true and highlightMatch="none"</p>
+		<label for="combobox4">US State test 4:</label>
+		<input id="combobox4" data-dojo-type="$testWidget"
+				data-dojo-props='value:"",
+				store:stateStore,
+				searchAttr:"name",
+				style:{width:"300px"},
+				name:"state4",
+				onChange:setVal4,
+				autoComplete:false,
+				required:true,
+				highlightMatch:"none"
+		'/>
+		<br><label for="value4">onChange:</label><input id="value4" disabled value="not fired yet!" autocomplete="off"/>
+		<hr>
+		<p>test that title used as label is preserved on input</p>
+		<select id="preservetitletest" data-dojo-type="$testWidget"
+				data-dojo-props='name:"titletest",
+				style:{width:"50%", fontFamily:"Courier"},
+				autoComplete:false,
+				selectOnClick:true,
+				pageSize:5,
+				title:"New England States"
+		'>
+			<option value="ct">Connecticut</option>
+			<option value="me">Maine</option>
+			<option value="ma">Massachusetts</option>
+			<option value="nh">New Hampshire</option>
+			<option value="vt">Vermont</option>
+		</select>
+		<hr>
+		<p>No arrow, data store which searches and highlights matches anywhere in the string</p>
+		<label for="arrowless">Arrowless:</label>
+	 	<input id="arrowless" data-dojo-type="$testWidget"
+				data-dojo-props='value: (testWidget == "dijit.form.ComboBox") ? "California" : "CA",
+				store:stateStore,
+				searchAttr:"name",
+				queryExpr:"*${0}*",
+				name:"state5",
+				autoComplete:false,
+				hasDownArrow:false,
+				highlightMatch:"all"
+		'/>
+		<hr>
+		<p>Created programmatically</p>
+		<label for="progCombo">progCombo:</label>
+		<input id="progCombo"/>
+		<hr>
+		<p>Created programmatically with an initial query.  (Limits list to items with type = country.)</p>
+		<label for="progCombo2">progCombo2</label>
+		<input id="progCombo2"/>
+		<hr>
+		<p>Created programmatically with an ItemFileReadStore and a descending sort.  (Limits list to items with type = country.)</p>
+		<label for="progCombo3">progCombo3:</label>
+		<input id="progCombo3"/>
+		<hr>
+		<p>With option tags, autoComplete=true, pageSize=30, and a descending sort.</p>
+		<label for="descending">descending:</label>
+		<select id="descending" data-dojo-type="$testWidget"
+				data-dojo-props='name:"descending",
+				style:{width:"50%",fontSize:"200%",fontFamily:"Courier"},
+				autoComplete:true,
+				pageSize:30,
+				fetchProperties:{sort:[{attribute: "name", descending: true}]}
+		'>
+			<option value="AL">Alabama</option>
+			<option value="AK">Alaska</option>
+			<option value="AS">American Samoa</option>
+			<option value="AZ">Arizona</option>
+			<option value="AR">Arkansas</option>
+			<option value="AE">Armed Forces Europe</option>
+			<option value="AP">Armed Forces Pacific</option>
+			<option value="AA">Armed Forces the Americas</option>
+			<option value="CA" selected>California</option>
+			<option value="CO">Colorado</option>
+			<option value="CT">Connecticut</option>
+			<option value="DE">Delaware</option>
+			<option value="DC">District of Columbia</option>
+			<option value="FM">Federated States of Micronesia</option>
+			<option value="FL">Florida</option>
+			<option value="GA">Georgia</option>
+			<option value="GU">Guam</option>
+			<option value="HI">Hawaii</option>
+			<option value="ID">Idaho</option>
+			<option value="IL">Illinois</option>
+			<option value="IN">Indiana</option>
+			<option value="IA">Iowa</option>
+			<option value="KS">Kansas</option>
+			<option value="KY">Kentucky</option>
+			<option value="LA">Louisiana</option>
+			<option value="ME">Maine</option>
+			<option value="MH">Marshall Islands</option>
+			<option value="MD">Maryland</option>
+			<option value="MA">Massachusetts</option>
+			<option value="MI">Michigan</option>
+			<option value="MN">Minnesota</option>
+			<option value="MS">Mississippi</option>
+			<option value="MO">Missouri</option>
+			<option value="MT">Montana</option>
+			<option value="NE">Nebraska</option>
+			<option value="NV">Nevada</option>
+			<option value="NH">New Hampshire</option>
+			<option value="NJ">New Jersey</option>
+			<option value="NM">New Mexico</option>
+			<option value="NY">New York</option>
+			<option value="NC">North Carolina</option>
+			<option value="ND">North Dakota</option>
+			<option value="MP">Northern Mariana Islands</option>
+			<option value="OH">Ohio</option>
+			<option value="OK">Oklahoma</option>
+			<option value="OR">Oregon</option>
+			<option value="PA">Pennsylvania</option>
+			<option value="PR">Puerto Rico</option>
+			<option value="RI">Rhode Island</option>
+			<option value="SC">South Carolina</option>
+			<option value="SD">South Dakota</option>
+			<option value="TN">Tennessee</option>
+			<option value="TX">Texas</option>
+			<option value="UT">Utah</option>
+			<option value="VT">Vermont</option>
+			<option value="VI">Virgin Islands, U.S.</option>
+			<option value="VA">Virginia</option>
+			<option value="WA">Washington</option>
+			<option value="WV">West Virginia</option>
+			<option value="WI">Wisconsin</option>
+			<option value="WY">Wyoming</option>
+		</select>
+		<hr>
+		<p>Special characters</p>
+		<p>The drop down list should be:</p>
+		<ul>
+		   <li>sticks &amp; stones</li>
+		   <li>rags --&gt; riches to</li>
+		   <li>more\less</li>
+		   <li>3 * 5</li>
+		</ul>
+		<label for="specialchars">Special chars:</label>
+		<select id="specialchars" data-dojo-type="$testWidget"
+			data-dojo-props='name:"specialchars"
+			'>
+			<option value="sticks" selected>sticks &amp; stones</option>
+			<option value="rags">rags --&gt; riches to</option>
+			<option value="more">more\less</option>
+			<option value="times">3 * 5</option>
+		</select>
+		<hr>
+		<p>Japanese</p>
+		<p>Try typing &#x6771;&#x533A; (East), &#x897F;&#x533A; (West), &#x5317;&#x533A; (North), &#x5357;&#x533A; (South) and a few choices will pop up.<br>
+		Using the Microsoft IME for Japanese (Hiragana), &#x6771; can be inputed by typing higashi followed by SPACE.
+		</p>
+		<label for="japanese">Japanese list:</label>
+		<select id="japanese" data-dojo-type="$testWidget" data-dojo-props='name:"japanese", style:{width:"300px"}, autoComplete:true, required:true, value:""'>
+			<option value="nanboku">&#x5357;&#x5317; (Nanboku)</option>
+			<option value="touzai">&#x6771;&#x897F; (Touzai)</option>
+			<option value="toukyou">&#x6771;&#x4EAC; (Tokyo)</option>
+			<option value="higashiku">&#x6771;&#x533A; (East)</option>
+			<option value="nishiku">&#x897F;&#x533A; (West)</option>
+			<option value="minamiku">&#x5357;&#x533A; (South)</option>
+			<option value="kitaku">&#x5317;&#x533A; (North)</option>
+		</select>
+		<hr>
+		<p>Custom labelFunc (labels in lowercase), autoComplete=true, prompt message when field is blank:</p>
+		<label for="labelFunc">custom label function</label>
+		<input id="labelFunc" data-dojo-type="$testWidget"
+				data-dojo-props='value: (testWidget == "dijit.form.ComboBox") ? "Oregon" : "OR",
+				labelFunc:myLabelFunc,
+				store:stateStore,
+				name:"labelFunc",
+				autoComplete:true,
+				labelAttr:"label",
+				labelType:"html",
+				promptMessage:"Please enter a state",
+				invalidMessage:"Invalid state name."
+		'/>
+		<input type="button" onclick="dijit.byId('labelFunc').set('readOnly',false);" value="Remove readOnly"/>
+		<input type="button" onclick="dijit.byId('labelFunc').set('readOnly',true);" value="Set readOnly"/>
+		<input type="button" onclick="dijit.byId('labelFunc').set('disabled',false);" value="Remove disabled"/>
+		<input type="button" onclick="dijit.byId('labelFunc').set('disabled',true);" value="Set disabled"/>
+		<hr>
+
+		<p>Rich text label</p>
+		<label for="richtexttest">Rich text labels in drop down:</label>
+		<select id="richtexttest" data-dojo-type="$testWidget"
+				data-dojo-props='name:"richtexttest",
+				autoComplete:false,
+				selectOnClick:true,
+				value:"h1",
+				labelType:"html",
+				labelFunc:function(item){ var txt = item.value; return "<"+txt+">"+txt+"</"+txt+">"; }
+		'>
+			<option value="h1">h1</option>
+			<option value="h2">h2</option>
+			<option value="p">p</option>
+			<option value="pre">pre</option>
+		</select>
+		<hr>
+
+		<input type="button" value="Create one in a window" onclick="var win=window.open(window.location);"/>
+
+	</form>
+	
+	<hr>
+	<p><label for="placeholdertest">test placeholder</label></p>
+	<select id="placeholdertest" data-dojo-type="$testWidget"
+			data-dojo-props='name:"placetest",
+			style:{width:"50%",fontFamily:"Courier"},
+			autoComplete:false,
+			selectOnClick:true,
+			pageSize:5,
+			placeHolder:"Select a New England State",
+			value:""
+	'>
+		<option value="ct">Connecticut</option>
+		<option value="me">Maine</option>
+		<option value="ma">Massachusetts</option>
+		<option value="nh">New Hampshire</option>
+		<option value="vt">Vermont</option>
+	</select>
+	<p id="nativeLabel">
+	This is some text below the boxes. It shouldn't get pushed out of the way when search results get returned.
+	A native select tag to test IE bleed through problem:
+	</p>
+
+	<select id="native" aria-labelledby="nativeLabel">
+	  <option>test for</option>
+	  <option>IE bleed through</option>
+	  <option>problem</option>
+	</select>
+	
+	<label for="combo_01">Destroy test:</label><div id="destroyDiv"
+		><select id="combo_01" data-dojo-type="$testWidget" 
+				data-dojo-props='name:"state", 
+				disabled:true,
+				style:{width:"300px"},
+				autoComplete:false'>
+			<option value="AL">Alabama</option>
+			<option value="AK">Alaska</option>
+			<option value="AS">American Samoa</option>
+			<option value="AZ">Arizona</option>
+			<option value="AR">Arkansas</option>
+			<option value="AE">Armed Forces Europe</option>
+			<option value="AP">Armed Forces Pacific</option>
+		</select
+	></div>
+
+	<br>
+	<fieldset style="position:relative;border:1px solid black;display:inline;">
+		<legend>Highlight test</legend>
+		<div style="border:0;margin:1.5em;">
+			<span style='white-space:nowrap;'>
+			<label for="ignoreCase">ignoreCase:</label><select id="ignoreCase" onchange="dijit.byId('highlight').set('ignoreCase', this.value=='true')">
+				<option value="true" selected>true</option>
+				<option value="false">false</option>
+			</select>
+			<label for="highlightMatch">highlightMatch:</label>
+			<select id="highlightMatch" onchange="dijit.byId('highlight').set('highlightMatch', this.value)">
+				<option value="first" selected>first</option>
+				<option value="all">all</option>
+				<option value="none">none</option>
+			</select>
+			<label for="queryExpr">queryExpr:</label>
+			<select id="queryExpr" onchange="dijit.byId('highlight').set('queryExpr', this.value)">
+				<option value="${0}*" selected>${0}*</option>
+				<option value="*${0}*">*${0}*</option>
+				<option value="*${0}">*${0}</option>
+			</select>
+			</span>
+			<br>
+			<span style='white-space:nowrap;'>
+			<label for="highlight">Highlight test:</label>
+			<select id="highlight" data-dojo-type="$testWidget"
+					data-dojo-props='ignoreCase:true,
+					highlightMatch:"first",
+					autoComplete:false,
+					required:false,
+					labelType:"text",
+					onBlur:function(){ this.set("value",null) },
+					value:""'>
+				<option value="AA">AA</option>
+				<option value="Aa">Aa</option>
+				<option value="aA">aA</option>
+				<option value="aa">aa</option>
+			</select>
+			</span>
+		</div>
+	</fieldset>
+
+	<div id="debugbox"></div>
+
+	<p><label for="subclass">User-defined subclass of ComboBox/FilteringSelect:</label></p>
+	<input id="subclass" data-dojo-type="StateSelect"/>
+
+	<div id="filteringSelect"></div>
+
+	<hr>
+	<p>autoComplete=true</p>
+	<select id="autocompleteon" data-dojo-type="$testWidget"
+			data-dojo-props='name:"autocompleteon",
+			style:{width:"50%", fontFamily:"Courier"},
+			autoComplete:true,
+			selectOnClick:true,
+			pageSize:5,
+			title:"New England States"
+	'>
+		<option value="ct">Connecticut</option>
+		<option value="me">Maine</option>
+		<option value="ma">Massachusetts</option>
+		<option value="nh">New Hampshire</option>
+		<option value="vt">Vermont</option>
+	</select>
+
+	<hr>
+	<p>autoComplete=false</p>
+	<select id="autocompleteoff" data-dojo-type="$testWidget"
+			data-dojo-props='name:"autocompleteon",
+			style:{width:"50%", fontFamily:"Courier"},
+			autoComplete:false,
+			selectOnClick:true,
+			pageSize:5,
+			title:"New England States"
+	'>
+		<option value="ct">Connecticut</option>
+		<option value="me">Maine</option>
+		<option value="ma">Massachusetts</option>
+		<option value="nh">New Hampshire</option>
+		<option value="vt">Vermont</option>
+	</select>
+
+	<hr>
+	<p>type=url</p>
+	<select id="url" data-dojo-type="$testWidget" type="url">
+		<option value="toolkit">http://dojotoolkit.org/</option>
+		<option value="foundation">http://dojofoundation.org/</option>
+	</select>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/images/Alabama.jpg b/src/main/resources/static/dijit/tests/form/images/Alabama.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f2018e664ea57288aa4f667ae884378478e80dff
Binary files /dev/null and b/src/main/resources/static/dijit/tests/form/images/Alabama.jpg differ
diff --git a/src/main/resources/static/dijit/tests/form/mobile.html b/src/main/resources/static/dijit/tests/form/mobile.html
new file mode 100644
index 0000000000000000000000000000000000000000..6e80879fc6ad2b8b0cbeef15321b75824363c871
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/mobile.html
@@ -0,0 +1,220 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes" >
+		<title>Form widgets mobile test page</title>
+
+		<link href="../../icons/commonIcons.css" rel="stylesheet">
+
+		<script type="text/javascript" src="../boilerplate.js"></script>
+
+		<script language="JavaScript" type="text/javascript">
+			require([
+				"dojo/parser",
+
+				"dijit/form/Button",
+				"dijit/form/DropDownButton",
+				"dijit/form/ComboButton",
+				"dijit/form/ToggleButton",
+				"dijit/DropDownMenu",
+				"dijit/MenuItem",
+
+				"dijit/form/CheckBox",
+				"dijit/form/RadioButton",
+
+				"dijit/form/ValidationTextBox",
+				"dijit/form/DateTextBox",
+				"dijit/form/TimeTextBox",
+				"dijit/form/NumberSpinner",
+
+				"dijit/form/FilteringSelect",
+				"dijit/form/Select",
+				"dijit/form/MultiSelect",
+
+				"dijit/form/HorizontalSlider",
+				"dijit/form/HorizontalRule",
+				"dijit/form/HorizontalRuleLabels",
+				"dojo/domReady!"
+			], function(parser){
+				parser.parse();
+			});
+		</script>
+	</head>
+	<body>
+		<h1>Buttons</h1>
+		<button data-dojo-type="dijit/form/Button" id="T1465" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon", value:"Create"'>
+			Button
+		</button>
+		<button id="SubmitDropDown" data-dojo-type="dijit/form/DropDownButton" name="DropDown" type="submit" value="DropDown Submit"
+				data-dojo-props="label: 'DropDown Submit'">
+			DropDownButton
+			<span data-dojo-type="dijit/DropDownMenu">
+				<span id="SubmitDropDownMenuItem" data-dojo-type="dijit/MenuItem">DropDown MenuItem</span>
+			</span>
+		</button>
+		<button id="comboCreate" title="creative title" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options", onClick:function(){ console.log("clicked combo save") },
+				iconClass:"plusIcon"'>
+			<span>ComboButton</span>
+			<span id="createMenu" data-dojo-type="dijit/DropDownMenu">
+				<span data-dojo-type="dijit/MenuItem"  data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+					onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Create blank</span>
+				<span data-dojo-type="dijit/MenuItem"
+					data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Create from template</span>
+			</span>
+		</button>
+		<button id="toggle2" data-dojo-type="dijit/form/ToggleButton"
+			data-dojo-props='onChange:function(val){ console.log("toggled button checked="+val); }, iconClass:"dijitRadioIcon"'>
+			Toggle me
+		</button>
+
+		<h1>CheckBox, RadioButton</h1>
+		<fieldset>
+			<legend>check boxes</legend>
+			<label for="cb1">cb1:</label>
+			<input id="cb1" data-dojo-id="cb1" data-dojo-type="dijit/form/CheckBox"
+				   name="cb" value="foo" onClick="console.log('clicked cb1');">
+			<label for="cb2">cb2</label>
+			<input id="cb2" data-dojo-id="cb2" data-dojo-type="dijit/form/CheckBox"
+				   name="cb" value="bar" onClick="console.log('clicked rb2');">
+		</fieldset>
+		<fieldset>
+			<legend>radio buttons</legend>
+			<label for="rb1">rb1</label>
+			<input id="rb1" data-dojo-id="rb1" data-dojo-type="dijit/form/RadioButton"
+				   name="rb" value="foo" onClick="console.log('clicked rb1');">
+			<label for="rb2">rb2</label>
+			<input id="rb2" data-dojo-id="rb2" data-dojo-type="dijit/form/RadioButton"
+				   name="rb" value="foo" onClick="console.log('clicked rb2');">
+		</fieldset>
+
+		<h1>TextBoxes</h1>
+		<label for="vtb">ValidationTextBox:</label>
+		<input id="vtb" data-dojo-type="dijit/form/ValidationTextBox" placeHolder="hint text">
+		<label for="q03">NumberSpinner:</label>
+		<input id="q03" data-dojo-type="dijit/form/NumberSpinner"
+			name="age" class="small"
+			data-dojo-props='
+			promptMessage:"(optional) Enter an age between 0 and 120",
+			maxLength:"3",
+			constraints:{places:0,min:0,max:120},
+			onChange:function(val){ console.log(val); },
+			tooltipPosition:["above", "below"]
+		'>
+		<label for="date">Date:</label>
+		<input id="date" data-dojo-type="dijit/form/DateTextBox"
+			name="date" value="2008-12-31" onChange="console.log(arguments[0]);"
+		>
+		<label for="time">Time:</label>
+		<input id="time" data-dojo-type="dijit/form/TimeTextBox"
+			   name="time" value="T17:45:00" onChange="console.log(arguments[0]);"
+		>
+
+		<h1>Selects</h1>
+		<label for="s">Select:</label>
+		<select id="s" data-dojo-type="dijit/form/Select">
+			<option value="TN">Tennessee</option>
+			<option value="VA" selected="selected">Virginia</option>
+			<option value="WA">Washington</option>
+			<option value="FL">Florida</option>
+			<option value="CA">California</option>
+		</select>
+
+		<label for="fs">FilteringSelect:</label>
+		<select id="fs" aria-label="fs" data-dojo-type="dijit/form/FilteringSelect">
+			<option value="AL">Alabama</option>
+			<option value="AK">Alaska</option>
+			<option value="AS">American Samoa</option>
+			<option value="AZ">Arizona</option>
+			<option value="AR">Arkansas</option>
+			<option value="AE">Armed Forces Europe</option>
+			<option value="AP">Armed Forces Pacific</option>
+			<option value="AA">Armed Forces the Americas</option>
+			<option value="CA" selected>California</option>
+			<option value="CO">Colorado</option>
+			<option value="CT">Connecticut</option>
+			<option value="DE">Delaware</option>
+			<option value="DC">District of Columbia</option>
+			<option value="FM">Federated States of Micronesia</option>
+			<option value="FL">Florida</option>
+			<option value="GA">Georgia</option>
+			<option value="GU">Guam</option>
+			<option value="HI">Hawaii</option>
+			<option value="ID">Idaho</option>
+			<option value="IL">Illinois</option>
+			<option value="IN">Indiana</option>
+			<option value="IA">Iowa</option>
+			<option value="KS">Kansas</option>
+			<option value="KY">Kentucky</option>
+			<option value="LA">Louisiana</option>
+			<option value="ME">Maine</option>
+			<option value="MH">Marshall Islands</option>
+			<option value="MD">Maryland</option>
+			<option value="MA">Massachusetts</option>
+			<option value="MI">Michigan</option>
+			<option value="MN">Minnesota</option>
+			<option value="MS">Mississippi</option>
+			<option value="MO">Missouri</option>
+			<option value="MT">Montana</option>
+			<option value="NE">Nebraska</option>
+			<option value="NV">Nevada</option>
+			<option value="NH">New Hampshire</option>
+			<option value="NJ">New Jersey</option>
+			<option value="NM">New Mexico</option>
+			<option value="NY">New York</option>
+			<option value="NC">North Carolina</option>
+			<option value="ND">North Dakota</option>
+			<option value="MP">Northern Mariana Islands</option>
+			<option value="OH">Ohio</option>
+			<option value="OK">Oklahoma</option>
+			<option value="OR">Oregon</option>
+			<option value="PA">Pennsylvania</option>
+			<option value="PR">Puerto Rico</option>
+			<option value="RI">Rhode Island</option>
+			<option value="SC">South Carolina</option>
+			<option value="SD">South Dakota</option>
+			<option value="TN">Tennessee</option>
+			<option value="TX">Texas</option>
+			<option value="UT">Utah</option>
+			<option value="VT">Vermont</option>
+			<option value="VI">Virgin Islands, U.S.</option>
+			<option value="VA">Virginia</option>
+			<option value="WA">Washington</option>
+			<option value="WV">West Virginia</option>
+			<option value="WI">Wisconsin</option>
+			<option value="WY">Wyoming</option>
+		</select>
+
+		<label for="ms">ms:</label>
+		<select id="ms" multiple data-dojo-type="dijit/form/MultiSelect"
+				name="ms" style="height:100px; width:175px;">
+			<option value="TN" selected>Tennessee</option>
+			<option value="VA">Virginia</option>
+			<option value="WA">Washington</option>
+			<option value="FL">Florida</option>
+			<option value="CA">California</option>
+		</select>
+
+		<h1>HorizontalSlider</h1>
+		<div id="slider1" data-dojo-type="dijit/form/HorizontalSlider" data-dojo-props='name:"horizontal1",
+			value:10,
+			maximum:100,
+			minimum:0,
+			pageIncrement:100,
+			showButtons:true,
+			intermediateChanges:true,
+			slideDuration:500,
+			style:{width:"100%", height:"20px"}
+			'>
+				<ol data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='container:"topDecoration", style:{height:"1.2em",fontSize:"75%"}, count:6, numericMargin:1'></ol>
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"topDecoration", count:6, style:{height:"5px"}'></div>
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"bottomDecoration", count:5, style:{height:"5px"}'></div>
+				<ol data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='container:"bottomDecoration", style:{height:"1em",fontSize:"75%"}'>
+					<li>lowest</li>
+					<li>normal</li>
+					<li>highest</li>
+				</ol>
+		</div>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/module.js b/src/main/resources/static/dijit/tests/form/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..7dda3cf2eed041fa30bd0de945c87c10db27da7e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/module.js
@@ -0,0 +1,106 @@
+define(["doh/main", "require", "dojo/sniff"], function(doh, require, has){
+
+	var test_robot = has("trident") || has("ff") || has("chrome") < 45;
+
+	doh.register("form.ButtonMixin", require.toUrl("./ButtonMixin.html"), 999999);
+	doh.register("form.Button", require.toUrl("./Button.html"), 999999);
+	doh.register("form.ToggleButtonMixin", require.toUrl("./ToggleButtonMixin.html"), 999999);
+	if(test_robot){
+		doh.register("form.robot.Button_mouse", require.toUrl("./robot/Button_mouse.html"), 999999);
+		doh.register("form.robot.Button_a11y", require.toUrl("./robot/Button_a11y.html"), 999999);
+	}
+
+	doh.register("form.CheckBoxMixin", require.toUrl("./CheckBoxMixin.html"), 999999);
+	doh.register("form.CheckBox", require.toUrl("./CheckBox.html"), 999999);
+	doh.register("form.RadioButtonMixin", require.toUrl("./RadioButtonMixin.html"), 999999);
+	doh.register("form.RadioButtonTiming", require.toUrl("./RadioButtonTiming.html?mode=test"), 999999);
+	if(test_robot){
+		doh.register("form.robot.CheckBox_mouse", require.toUrl("./robot/CheckBox_mouse.html"), 999999);
+		doh.register("form.robot.CheckBox_a11y", require.toUrl("./robot/CheckBox_a11y.html"), 999999);
+	}
+
+	doh.register("form.test_validate", require.toUrl("./test_validate.html?mode=test"), 999999);
+	if(test_robot){
+		doh.register("form.robot.ValidationTextBox", require.toUrl("./robot/ValidationTextBox.html"), 999999);
+		doh.register("form.robot.TextBox_onInput", require.toUrl("./robot/TextBox_onInput.html"), 999999);
+	}
+
+	doh.register("form.DateTextBox", require.toUrl("./test_DateTextBox.html?mode=test"), 999999);
+	if(test_robot){
+		doh.register("form.robot.DateTextBox", require.toUrl("./robot/DateTextBox.html"), 999999);
+		doh.register("form.robot.TimeTextBox", require.toUrl("./robot/TimeTextBox.html"), 999999);
+	}
+
+	doh.register("form.Form", require.toUrl("./Form.html"), 999999);
+	if(test_robot){
+		doh.register("form.robot.FormState", require.toUrl("./robot/Form_state.html"), 999999);
+		doh.register("form.robot.Form_onsubmit", require.toUrl("./robot/Form_onsubmit.html"), 999999);
+	}
+
+	doh.register("form.Select", require.toUrl("./test_Select.html?mode=test"), 999999);
+	if(test_robot){
+		doh.register("form.robot.Select", require.toUrl("./robot/Select.html"), 999999);
+	}
+
+	doh.register("form.AutoCompleterMixin", require.toUrl("./AutoCompleterMixin.html"), 999999);
+	doh.register("form.ComboBox", require.toUrl("./_autoComplete.html?testWidget=dijit.form.ComboBox&mode=test"), 999999);
+	if(test_robot){
+		doh.register("form.robot.ComboBox_mouse", require.toUrl("./robot/_autoComplete_mouse.html?testWidget=dijit.form.ComboBox"), 999999);
+		doh.register("form.robot.ComboBox_a11y", require.toUrl("./robot/_autoComplete_a11y.html?testWidget=dijit.form.ComboBox"), 999999);
+	}
+	doh.register("form.FilteringSelect", require.toUrl("./_autoComplete.html?testWidget=dijit.form.FilteringSelect&mode=test"), 999999);
+	if(test_robot){
+		doh.register("form.robot.FilteringSelect_mouse", require.toUrl("./robot/_autoComplete_mouse.html?testWidget=dijit.form.FilteringSelect"), 999999);
+		doh.register("form.robot.FilteringSelect_a11y", require.toUrl("./robot/_autoComplete_a11y.html?testWidget=dijit.form.FilteringSelect"), 999999);
+	}
+
+	doh.register("form.MultiSelect", require.toUrl("./test_MultiSelect.html?mode=test"), 999999);
+	if(test_robot){
+		doh.register("form.robot.MultiSelect", require.toUrl("./robot/MultiSelect.html"), 999999);
+	}
+
+	if(test_robot){
+		doh.register("form.robot.SimpleTextarea", require.toUrl("./robot/SimpleTextarea.html"), 999999);
+	}
+
+	doh.register("form.Slider", require.toUrl("./Slider.html"), 999999);
+	if(test_robot){
+		doh.register("form.robot.Slider_mouse", require.toUrl("./robot/Slider_mouse.html"), 999999);
+		doh.register("form.robot.Slider_a11y", require.toUrl("./robot/Slider_a11y.html"), 999999);
+	}
+
+	if(test_robot){
+		doh.register("form.robot.Spinner_mouse", require.toUrl("./robot/Spinner_mouse.html"), 999999);
+		doh.register("form.robot.Spinner_a11y", require.toUrl("./robot/Spinner_a11y.html"), 999999);
+	}
+
+	doh.register("form.ExpandingTextAreaMixin", require.toUrl("./ExpandingTextAreaMixin.html"), 999999);
+	if(test_robot){
+		doh.register("form.robot.Textarea", require.toUrl("./robot/Textarea.html"), 999999);
+	}
+
+	if(test_robot){
+		doh.register("form.robot.validationMessages", require.toUrl("./robot/validationMessages.html"), 999999);
+	}
+
+	doh.register("form.verticalAlign", require.toUrl("./test_verticalAlign.html"), 999999);
+
+	doh.register("form.TextBox_types", require.toUrl("./TextBox_types.html"), 999999);
+
+	doh.register("form.TextBox_sizes.tundra.ltr", require.toUrl("./TextBox_sizes.html?theme=tundra&dir=ltr"), 999999);
+	doh.register("form.TextBox_sizes.tundra.rtl", require.toUrl("./TextBox_sizes.html?theme=tundra&dir=rtl"), 999999);
+	doh.register("form.TextBox_sizes.tundra.quirks", require.toUrl("../quirks.html?file=form/TextBox_sizes.html&theme=tundra&dir=ltr"), 999999);
+	doh.register("form.TextBox_sizes.claro.ltr", require.toUrl("./TextBox_sizes.html?theme=claro&dir=ltr"), 999999);
+	doh.register("form.TextBox_sizes.claro.rtl", require.toUrl("./TextBox_sizes.html?theme=claro&dir=rtl"), 999999);
+	doh.register("form.TextBox_sizes.claro.quirks", require.toUrl("../quirks.html?file=form/TextBox_sizes.html&theme=claro&dir=ltr"), 999999);
+	doh.register("form.TextBox_sizes.soria.ltr", require.toUrl("./TextBox_sizes.html?theme=soria&dir=ltr"), 999999);
+	doh.register("form.TextBox_sizes.soria.rtl", require.toUrl("./TextBox_sizes.html?theme=soria&dir=rtl"), 999999);
+	doh.register("form.TextBox_sizes.soria.quirks", require.toUrl("../quirks.html?file=form/TextBox_sizes.html&theme=soria&dir=rtl"), 999999);
+	doh.register("form.TextBox_sizes.nihilo.ltr", require.toUrl("./TextBox_sizes.html?theme=nihilo&dir=ltr"), 999999);
+	doh.register("form.TextBox_sizes.nihilo.rtl", require.toUrl("./TextBox_sizes.html?theme=nihilo&dir=rtl"), 999999);
+	doh.register("form.TextBox_sizes.nihilo.quirks", require.toUrl("../quirks.html?file=form/TextBox_sizes.html&theme=nihilo&dir=rtl"), 999999);
+	doh.register("form.TextBox_sizes.a11y.ltr", require.toUrl("./TextBox_sizes.html?a11y=1&dir=ltr"), 999999);
+	doh.register("form.TextBox_sizes.a11y.rtl", require.toUrl("./TextBox_sizes.html?a11y=1&dir=rtl"), 999999);
+	doh.register("form.TextBox_sizes.a11y.quirks", require.toUrl("../quirks.html?file=form/TextBox_sizes.html&a11y=1&dir=ltr"), 999999);
+
+});
diff --git a/src/main/resources/static/dijit/tests/form/robot/Button_a11y.html b/src/main/resources/static/dijit/tests/form/robot/Button_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..4cf67a080454e2994864521450aa9f557e6b5872
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Button_a11y.html
@@ -0,0 +1,610 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Button Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dojo.on");
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_Button.html');
+
+				var submitCount = 0, resetCount = 0;
+
+				doh.register("setup", function(){
+					doh.robot.sequence(function(){
+						dojo.connect(dijit.byId("testForm"), "onSubmit", function(){
+							submitCount++;
+						});
+						dojo.connect(dijit.byId("testForm"), "onReset", function(){
+							resetCount++;
+						})
+					});
+				});
+
+				doh.register("dijit.form.Button", [
+					{
+						name: "label",
+						timeout: 1000,
+						runTest: function(){
+							var label = dijit.byId("T1465").containerNode.innerHTML;
+							doh.is('Create', dojo.trim(label), "source.innerHTML label " + label);
+							var label2 = dijit.byId("T1466").containerNode.innerHTML;
+							doh.is('View', label2, "subclass label " + label2);
+						}
+					},
+					{
+						name: "enabled",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dojo.byId("input").focus();
+
+							var clicks = 0;
+							dijit.byId("T1465").set("onClick", function(){ clicks++; });
+
+
+							// tab into button to get focus
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {});
+
+							// and activate	with space / enter
+							doh.robot.keyPress(dojo.keys.SPACE, 1000, {});
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is(2, clicks, "both space and enter click the button");
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "disabled no focus",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.is("T1465", dijit.getEnclosingWidget(dojo.global.dijit.focus.curNode).id, "focus starting on 1465");
+
+							dijit.byId("T1466").set("disabled", true);
+
+							// tab over disabled "View" button to "Create" combo-button
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								console.log("current focus is ", dojo.global.dijit.focus.curNode);
+								doh.is("comboCreate", dijit.getEnclosingWidget(dojo.global.dijit.focus.curNode).id, "focus jumped to combo create (left part of button)");
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("dijit.form.DropDownButton", [
+					function initialState(){
+						doh.f(dojo.hasClass(dijit.byId("edit").domNode, "dijitDropDownButtonOpened"),
+								"no dijitDropDownButtonOpened class");
+					},
+					{
+						name: "down arrow opens menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dijit.byId("edit").focus();
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dojo.hasClass(dijit.byId("edit").domNode, "dijitDropDownButtonOpened"),
+										"dijitDropDownButtonOpened class");
+								doh.t(isVisible("editMenu"), "edit menu is visible: " + dijit.byId("editMenu").domNode.style.cssText);
+								doh.is("cut", dojo.global.dijit.focus.curNode.id, "focus is on menu");
+							}), 500);
+							return d;
+						}
+					},
+
+					{
+						name: "esc closes menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.ESCAPE, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("editMenu"), "edit menu is hidden: " + dijit.byId("editMenu").domNode.style.cssText);
+								doh.is("edit", dojo.global.dijit.focus.curNode.id, "focus is back on button");
+								doh.f(dojo.hasClass(dijit.byId("edit").domNode, "dijitDropDownButtonOpened"),
+										"no dijitDropDownButtonOpened class");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "space opens menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dijit.byId("edit").focus();
+							doh.robot.keyPress(dojo.keys.SPACE, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible("editMenu"), "edit menu is visible: " + dijit.byId("editMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "space executes menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.SPACE, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("editMenu"), "edit menu is hidden: " + dijit.byId("editMenu").domNode.style.cssText);
+								doh.is("edit", dojo.global.dijit.focus.curNode.id, "focus is back on button");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "enter opens menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dijit.byId("edit").focus();
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible("editMenu"), "edit menu is visible: " + dijit.byId("editMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "tab key closes popup, goes back to button",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("editMenu"), "edit menu is hidden: " + dijit.byId("editMenu").domNode.style.cssText);
+								doh.is("edit", dojo.global.dijit.focus.curNode.id, "focus is back on button");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "enter opens menu again",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dijit.byId("edit").focus();
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible("editMenu"), "edit menu is visible: " + dijit.byId("editMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "enter closes menu (#4772)",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("editMenu"), "edit menu is hidden: " + dijit.byId("editMenu").domNode.style.cssText);
+								doh.is("edit", dojo.global.dijit.focus.curNode.id, "focus is back on button");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "aria role and attributes",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+							button = dijit.byId("dropdown_default");	//testing dropDownButton
+								
+							doh.is("button", button._popupStateNode.getAttribute("role"), "button._popupStateNode role");
+							doh.t(button._popupStateNode.getAttribute("aria-haspopup"), "button._popupStateNode aria-haspopup");
+							doh.is("dropdown_default_label", button._popupStateNode.getAttribute("aria-labelledby"), "aria-labelledby");
+							doh.f(button._popupStateNode.getAttribute("aria-expanded"), "dont expect initial aria-expanded");
+							doh.f(button._popupStateNode.getAttribute("aria-owns"), "initally missing aria-owns");
+							
+							// open the drop down, check that button now has aria-owns to the dropDown
+							button.focus();
+							doh.robot.keyPress(dojo.keys.ENTER, 1000, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(button._popupStateNode.getAttribute("aria-expanded"), "now aria-expanded should be true");
+								doh.is("dijit_ColorPalette_0", button._popupStateNode.getAttribute("aria-owns"), "should aria-own the Dlg");
+								// Check roles and attributes on the popped out ColorPalette					
+								var popup = dijit.byId("dijit_ColorPalette_0");
+								doh.is("grid", popup.domNode.getAttribute("role"), "popup domNode role");
+								doh.is("dropdown_default", popup.domNode.getAttribute("aria-labelledby"), "aria-labelledby of popup should point to the button");
+							}), 500);
+							
+							return d;
+						},
+						tearDown: function(){
+						    dijit.byId("combo_default").focus();
+						}
+					}
+				]);
+
+				doh.register("dijit.form.ComboButton", [
+					{
+						name: "aria role and attributes",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+							button = dijit.byId("combo_default");
+															
+							doh.is("button", button._popupStateNode.getAttribute("role"), "button._popupStateNode role");
+							doh.t(button._popupStateNode.getAttribute("aria-haspopup"), "button._popupStateNode aria-haspopup");
+							doh.f(button._popupStateNode.getAttribute("aria-expanded"), "dont expect initial aria-expanded");
+							doh.f(button._popupStateNode.getAttribute("aria-owns"), "initally missing aria-owns");
+
+							button.focus();		//calling focus() on a ComboButton focuses the dropDownArrow node
+							doh.robot.keyPress(dojo.keys.ENTER, 2000, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(button._popupStateNode.getAttribute("aria-expanded"), "post click aria-expanded");
+								doh.is("dijit_Menu_0", button._popupStateNode.getAttribute("aria-owns"), "should aria-own the Menu");
+								var popup = dijit.byId("dijit_Menu_0");
+								doh.is("menu", popup.domNode.getAttribute("role"), "popup domNode role");		
+								doh.is("combo_default", popup.domNode.getAttribute("aria-labelledby"), "aria-labelledby of popup should point to the button");
+							}), 500);
+							
+							return d;
+						},
+						tearDown: function(){
+							dijit.byId("combo_default").focus();
+						}
+					},
+					{
+						name: "tab to button",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dijit.byId("color").focus();
+
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {});
+
+							var leftPart = dojo.query(".dijitButtonContents", dojo.byId("save"))[0];
+							doh.t(leftPart, "found left part of button");
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is(leftPart, dojo.global.dijit.focus.curNode, "focused on left part");
+								doh.f(dojo.hasClass(dijit.byId("save").domNode, "dijitComboButtonOpened"),
+										"no dijitComboButtonOpened class");
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "click button",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var clicked = false;
+							dijit.byId("save").set("onClick", function(){ clicked = true; });
+
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(clicked, "button was clicked");
+								doh.f(dojo.hasClass(dijit.byId("save").domNode, "dijitComboButtonOpened"),
+										"no dijitComboButtonOpened class");
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "tab to drop down arrow",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var rightPart = dojo.query(".dijitDownArrowButton", dojo.byId("save"))[0];
+							doh.t(rightPart, "found right part of button");
+
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is(rightPart, dojo.global.dijit.focus.curNode, "focused on right part of combo");
+								doh.f(dojo.hasClass(dijit.byId("save").domNode, "dijitComboButtonOpened"),
+										"no dijitComboButtonOpened class");
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "down arrow opens menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var rightPart = dojo.query(".dijitDownArrowButton", dojo.byId("save"))[0];
+							doh.t(rightPart, "found right part of button");
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible("saveMenu"), "save menu is visible: " + dijit.byId("saveMenu").domNode.style.cssText);
+								doh.t(dojo.hasClass(dijit.byId("save").domNode, "dijitComboButtonOpened"),
+										"dijitComboButtonOpened class");
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "esc closes menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var rightPart = dojo.query(".dijitDownArrowButton", dojo.byId("save"))[0];
+							doh.t(rightPart, "found right part of button");
+
+							doh.robot.keyPress(dojo.keys.ESCAPE, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("saveMenu"), "save menu was closed: " + dijit.byId("saveMenu").domNode.style.cssText);
+								doh.is(rightPart, dojo.global.dijit.focus.curNode, "refocused on right part of combo");
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "enter key opens menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible("saveMenu"), "save menu is visible: " + dijit.byId("saveMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "tab closes menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var rightPart = dojo.query(".dijitDownArrowButton", dojo.byId("save"))[0];
+							doh.t(rightPart, "found right part of button");
+
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("saveMenu"), "save menu was closed: " + dijit.byId("saveMenu").domNode.style.cssText);
+								doh.is(rightPart, dojo.global.dijit.focus.curNode, "refocused on right part of combo");
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "tab closes menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus element before "save" ComboButton
+							dijit.byId("color").focus();
+							// And disable the ComboButton
+							dijit.byId("save").set("disabled", true);
+
+							// Tab should skip over the ComboButton entirely
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var focusedWidget = dijit.getEnclosingWidget(dojo.global.dijit.focus.curNode);
+								doh.isNot("save", focusedWidget && focusedWidget.id, "didn't focus on combo");
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("dijit.form.ToggleButton", [
+					{
+						name: "uncheck",
+						timeout: 4000,
+						runTest: function(){
+							var toggle1 = dijit.byId("toggle1");
+							var checked = toggle1.get("checked");
+							doh.t(checked, "toggle1 initially checked");
+							doh.is("true", dojo.byId('toggle1').getAttribute("aria-pressed"), "aria-pressed 1");
+
+							var d = new doh.Deferred();
+
+							var watchOld, watchNew;
+							toggle1.set("onChange", function(v){ checked = v; });
+							toggle1.watch("checked", function(name, o, n){
+								watchOld = o;
+								watchNew = n;
+							});
+
+							toggle1.focus();
+							doh.robot.typeKeys(' ', 1000, 250);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(checked, "toggle1 unchecked");
+								doh.is("false", dojo.byId('toggle1').getAttribute("aria-pressed"), "aria-pressed 2");
+								doh.t(watchOld, "watch: previous == checked");
+								doh.f(watchNew, "watch: new == unchecked");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "check",
+						timeout: 4000,
+						runTest: function(){
+							var toggle1 = dijit.byId("toggle1");
+							var checked = toggle1.get("checked");
+							doh.f(checked, "toggle1 unchecked");
+							doh.is("false", dojo.byId('toggle1').getAttribute("aria-pressed"), "aria-pressed 1");
+
+							var d = new doh.Deferred();
+
+							var watchOld, watchNew;
+							toggle1.set("onChange", function(v){ checked = v; });
+							toggle1.watch("checked", function(name, o, n){
+								watchOld = o;
+								watchNew = n;
+							});
+
+							doh.robot.typeKeys(' ', 500, 250);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(checked, "toggle1 checked");
+								doh.is("true", dojo.byId('toggle1').getAttribute("aria-pressed"), "aria-pressed 2");
+								doh.f(watchOld, "watch: previous == unchecked");
+								doh.t(watchNew, "watch: new == checked");
+							}), 1000);
+							return d;
+						}
+					}
+
+				]);
+
+				dojo.forEach(["SPACE", "ENTER"], function(key){
+					doh.register("Invoke Submit and Reset Buttons by " + key, [
+					{
+						name: "click Submit",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							submitCount = 0;
+							dijit.byId("bSubmit").focus();
+							doh.robot.keyPress(dojo.keys[key], 1000, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is(1, submitCount, (key + ": # of times submit invoked " + submitCount));
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "click Reset",
+						timeout: 7000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							resetCount = 0;
+							dijit.byId("testName").value = "";
+
+							dijit.byId("testName").focus();
+							doh.robot.typeKeys("test", 1000, 2000);
+
+							doh.robot.sequence(function(){
+								dijit.byId("bReset").focus();
+							}, 500);
+							doh.robot.keyPress(dojo.keys[key], 1000, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is(1, resetCount, (key + ": reset should be invoked 1 time. actual count = " + resetCount));
+								doh.is("",dijit.byId("testName").value, "Name field has been reset");
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+				});
+
+				doh.register("Submit via ENTER key on input", {
+					name: "enter on input",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						submitCount = 0;
+						dijit.byId("testName").focus();
+						doh.robot.keyPress(dojo.keys.ENTER, 1000, {});
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is(1, submitCount, "submitted via enter key on input");
+						}), 500);
+
+						return d;
+					}
+				});
+
+				doh.register("bubbling", [
+					{
+						name: "bubbling",
+						timeout: 5000,
+						runTest: function(){
+
+							var d = new doh.Deferred(),
+								wrapper = dojo.byId("bubbleContainer"),
+								buttonNode = dojo.byId("bubble2");
+
+							// Listen for click events on the outer DOMNode.
+							var clicks = 0;
+							dojo.on(wrapper, "click", function(){
+								clicks++;
+							});
+
+							// Keyboard-click the widget button
+							doh.robot.sequence(function(){
+								buttonNode.focus();
+							}, 500);
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							// Check that one click event bubbled
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is(1, clicks, "one click event bubbled");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/Button_mouse.html b/src/main/resources/static/dijit/tests/form/robot/Button_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..643410f78c7e8c10222fa8730b27bdb203f3f0f0
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Button_mouse.html
@@ -0,0 +1,799 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Button Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dojo.on");
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_Button.html');
+
+				doh.register("dijit.form.Button", [
+					{
+						name: "enabled",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var clicked = false;
+							dijit.byId("T1466").set("onClick", function(){ clicked = true; });
+
+							doh.robot.mouseMoveAt("T1466", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(clicked, "click event was fired");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "disabled",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var clicked = false;
+							dijit.byId("disabled").set("onClick", function(){ clicked = true; });
+
+							doh.robot.mouseMoveAt("disabled", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								if(!dojo.isWebKit){		// webkit bug, see #11064
+									doh.f(dojo.isDescendant(dojo.global.dijit.focus.curNode, dijit.byId("disabled").domNode), "not focused on button")
+								}
+								doh.f(clicked, "click event wasn't fired");
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("dijit.form.DropDownButton", [
+					{
+						name: "click button",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("edit", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible("editMenu"), "edit menu is visible: " + dijit.byId("editMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "click blank part of screen",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveTo({x: 10, y: 10}, 0, 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("editMenu"), "edit menu was closed: " + dijit.byId("editMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "click button again",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("edit", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible("editMenu"), "edit menu is visible: " + dijit.byId("editMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "click menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("copy", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("editMenu"), "edit menu was closed: " + dijit.byId("editMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("dijit.form.ComboButton", [
+					{
+						name: "click button",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var leftPart = dojo.query(".dijitButtonContents", dojo.byId("save"))[0];
+							doh.t(leftPart, "found left part of button");
+
+							var clicked = false;
+							dijit.byId("save").set("onClick", function(){ clicked = true; });
+
+							doh.robot.mouseMoveAt(leftPart, 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(clicked, "click event was fired");
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "click drop down button",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var rightPart = dojo.query(".dijitDownArrowButton", dojo.byId("save"))[0];
+							doh.t(rightPart, "found right part of button");
+
+							doh.robot.mouseMoveAt(rightPart, 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible("saveMenu"), "save menu is visible: " + dijit.byId("saveMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "click blank part of screen",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveTo({x: 10, y: 10}, 0, 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("saveMenu"), "save menu was closed: " + dijit.byId("saveMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "click drop down button again",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var rightPart = dojo.query(".dijitDownArrowButton", dojo.byId("save"))[0];
+							doh.t(rightPart, "found right part of button");
+
+							doh.robot.mouseMoveAt(rightPart, 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible("saveMenu"), "save menu is visible: " + dijit.byId("saveMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "click menu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("saveAs", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden("saveMenu"), "save menu was closed: " + dijit.byId("saveMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "disabled click button",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var leftPart = dojo.query(".dijitButtonContents", dojo.byId("save"))[0];
+							doh.t(leftPart, "found left part of button");
+
+							var clicked = false;
+							dijit.byId("save").set("onClick", function(){ clicked = true; });
+
+							dijit.byId("save").set("disabled", true);
+
+							doh.robot.mouseMoveAt(leftPart, 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								if(!dojo.isWebKit){ // webkit bug, see #11064
+									doh.f(dojo.isDescendant(dojo.global.dijit.focus.curNode, dijit.byId("save").domNode), "not focused on button")
+								}
+								doh.f(clicked, "click event wasn't fired");
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "disabled click drop down button",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var rightPart = dojo.query(".dijitDownArrowButton", dojo.byId("save"))[0];
+							doh.t(rightPart, "found right part of button");
+
+							doh.robot.mouseMoveAt(rightPart, 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								if(!dojo.isWebKit){		// webkit bug, see #11064
+									doh.f(dojo.isDescendant(dojo.global.dijit.focus.curNode, dijit.byId("save").domNode), "not focused on button")
+								}
+								doh.t(isHidden("saveMenu"), "save menu is still hidden: " + dijit.byId("saveMenu").domNode.style.cssText);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "tabIndex",
+						timeout: 1000,
+						runTest: function(){
+							var btn = dijit.byId("save"),
+								focusNode = btn.focusNode,
+								titleNode = btn.titleNode;
+
+							btn.set("disabled", true);
+							doh.t(btn.get("disabled"), "save button is disabled");
+							doh.f(dojo.hasAttr(focusNode, "tabIndex") && dojo.attr(focusNode, "tabIndex") >= 0, "disabled focusNode tabIndex");
+							doh.f(dojo.hasAttr(titleNode, "tabIndex") && dojo.attr(titleNode, "tabIndex") >= 0, "disabled titleNode tabIndex");
+
+							btn.set("disabled", false);
+							doh.f(btn.get("disabled"), "save button is enabled");
+							doh.is(0, dojo.attr(focusNode, "tabIndex"), "enabled focusNode tabIndex");
+							doh.is(0, dojo.attr(titleNode, "tabIndex"), "enabled titleNode tabIndex");
+						}
+					}
+				]);
+
+				doh.register("dijit.form.ToggleButton", [
+					{
+						name: "initially checked",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var checked = dijit.byId("toggle1").get("checked");
+							dijit.byId("toggle1").set("onChange", function(v){ checked = v; });
+							doh.t(checked, "toggle1 initially checked");
+
+							doh.robot.mouseMoveAt("toggle1", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(checked, "toggle1 unchecked");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "initially unchecked",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var checked = dijit.byId("toggle2").get("checked");
+							dijit.byId("toggle2").set("onChange", function(v){ checked = v; });
+							doh.f(checked, "toggle2 initially unchecked");
+
+							doh.robot.mouseMoveAt("toggle2", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(checked, "toggle2 checked");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "disabled",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dijit.byId("toggle1").set("disabled", true);
+
+							var changed = false;
+							dijit.byId("toggle1").set("onChange", function(v){ changed = true; });
+
+							doh.robot.mouseMoveAt("toggle1", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								if(!dojo.isWebKit){		// webkit bug, see #11064
+									doh.f(dojo.isDescendant(dojo.global.dijit.focus.curNode, dijit.byId("toggle1").domNode), "not focused on button")
+								}
+								doh.f(changed, "value didn't change");
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("get/set", [
+					{
+						name: "change label",
+						runTest: function(){
+							dijit.byId("edit").set("label", "hi!");
+							doh.is("hi!", dijit.byId("edit").containerNode.innerHTML);
+						}
+					},
+
+					{
+						name: "icon",
+						runTest: function(){
+							// initial condition: no icon
+							doh.f(dojo.hasClass(dijit.byId("T1466").iconNode, "plusIcon"), "doesn't have plusIcon class");
+							doh.is("none", dojo.style(dijit.byId("T1466").iconNode, "display"), "initially hidden");
+
+							// no icon --> icon
+							dijit.byId("T1466").set("iconClass", "plusIcon");
+							doh.t(dojo.hasClass(dijit.byId("T1466").iconNode, "plusIcon"), "plusIcon class added");
+							doh.isNot("none", dojo.style(dijit.byId("T1466").iconNode, "display"), "became visible");
+
+							// switching icon
+							dijit.byId("T1466").set("iconClass", "noteIcon");
+							doh.f(dojo.hasClass(dijit.byId("T1466").iconNode, "plusIcon"), "plusIcon cleared");
+							doh.t(dojo.hasClass(dijit.byId("T1466").iconNode, "noteIcon"), "noteIcon added");
+
+							// initial conditions for buttons with icon
+							doh.t(dojo.hasClass(dijit.byId("dropDownNoLabel").iconNode, "noteIcon"),
+									"dropDownNoLabel: noteIcon set");
+							doh.t(dojo.hasClass(dijit.byId("comboNoLabel").iconNode, "plusBlockIcon"),
+									"comboNoLabel: plusBlockIcon set");
+							doh.t(isVisible(dijit.byId("comboNoLabel").iconNode),
+									"comboNoLabel: initially visible");
+						}
+					},
+
+					{
+						name: "disable",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dijit.byId("save").set("disabled", true);
+
+							// click left side of button
+							var leftPart = dojo.query(".dijitButtonContents", dojo.byId("save"))[0];
+							doh.t(leftPart, "found left part of button");
+							var clicked = false;
+							dijit.byId("save").set("onClick", function(){ clicked = true; });
+							doh.robot.mouseMoveAt(leftPart, 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							// click right side of button
+							var rightPart = dojo.query(".dijitDownArrowButton", dojo.byId("save"))[0];
+							doh.t(rightPart, "found right part of button");
+							doh.robot.mouseMoveAt(rightPart, 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(clicked, "click event was not fired");
+								doh.f(isVisible("saveMenu"), "save menu is hidden: " + dijit.byId("saveMenu").domNode.style.cssText);
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				var nameBox, valueBox;
+				function setUp(){
+					nameBox = dojo.byId("buttonName");
+					valueBox = dojo.byId("buttonValue");
+					dojo.window.scrollIntoView(valueBox);
+					nameBox.value = 'INIT';
+					valueBox.value = 'INIT';
+				}
+				doh.register("submit", [
+					{
+						name: "plain",
+						timeout: 5000,
+						setUp: setUp,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt('SubmitPlain', 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("Plain", nameBox.value, "Plain name");
+								doh.is("Plain Submit", valueBox.value, "Plain value");
+							}), 1500);
+
+							return d;
+						}
+					},
+					{
+						name: "combo left",
+						timeout: 5000,
+						setUp: setUp,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt('SubmitCombo', 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("Combo", nameBox.value, "Combo name");
+								doh.is("Combo Submit", valueBox.value, "Combo value");
+							}), 1500);
+
+							return d;
+						}
+					},
+					{
+						name: "combo right",
+						timeout: 5000,
+						setUp: setUp,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var downArrowNode = dojo.query(".dijitDownArrowButton", dojo.byId("SubmitCombo"))[0];
+
+							doh.robot.mouseMoveAt(downArrowNode, 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("INIT", nameBox.value, "Combo Down Arrow name");
+								doh.is("INIT", valueBox.value, "Combo Down Arrow value");
+							}), 1500);
+
+							return d;
+						}
+					},
+					{
+						name: "combo menu",
+						timeout: 5000,
+						setUp: setUp,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("SubmitComboMenuItem", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("", nameBox.value, "Combo Arrow name");
+								doh.is("", valueBox.value, "Combo Arrow value");
+							}), 1500);
+
+							return d;
+						}
+					},
+					{
+						name: "drop down",
+						timeout: 5000,
+						setUp: setUp,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt('SubmitDropDown', 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("DropDown", nameBox.value, "DropDown name");
+								doh.is("DropDown Submit", valueBox.value, "DropDown value");
+							}), 1500);
+
+							return d;
+						}
+					},
+					{
+						name: "drop down menu",
+						timeout: 5000,
+						setUp: setUp,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("SubmitDropDownMenuItem", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("", nameBox.value, "DropDown Arrow name");
+								doh.is("", valueBox.value, "DropDown Arrow value");
+							}), 1500);
+
+							return d;
+						}
+					},
+					{
+						name: "disabled",
+						timeout: 5000,
+						setUp: setUp,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt('SubmitDisabled', 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("INIT", nameBox.value, "Disabled name");
+								doh.is("INIT", valueBox.value, "Disabled value");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("onClick", [
+					{
+						name: "reset: none",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '1';
+							doh.robot.mouseMoveAt('reset1', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("RESET", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "reset native: none",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '1';
+							doh.robot.mouseMoveAt('reset1N', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("RESET", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "reset: return false",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '2';
+							doh.robot.mouseMoveAt('reset2', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("2", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "reset native: return false",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '2';
+							doh.robot.mouseMoveAt('reset2N', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("2", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "reset: return true",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '3';
+							doh.robot.mouseMoveAt('reset3', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("RESET", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "reset native: return true",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '3';
+							doh.robot.mouseMoveAt('reset3N', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("RESET", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "reset: return",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '4';
+							doh.robot.mouseMoveAt('reset4', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("RESET", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "reset native: return",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '4';
+							doh.robot.mouseMoveAt('reset4N', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("RESET", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "reset: empty",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '5';
+							doh.robot.mouseMoveAt('reset5', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("RESET", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "reset native: empty",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var valueBox = dojo.byId("onClickName");
+							valueBox.value = '5';
+							doh.robot.mouseMoveAt('reset5N', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("RESET", dojo.byId('onClickName').value);
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("resize", [
+					{
+						name: "ComboButton",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var combo = dijit.byId('combo_default');
+							var origSize = combo.domNode.scrollWidth;
+
+							doh.robot.mouseMoveAt('changeLabels', 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.isNot(origSize, combo.domNode.scrollWidth, "ComboButton size");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("bubbling", [
+					{
+						name: "bubbling",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								wrapper = dojo.byId("bubbleContainer");
+
+							// Listen for click events on the outer DOMNode.
+							var clicks = 0;
+							dojo.on(wrapper, "click", function(){
+								clicks++;
+							});
+
+							doh.robot.mouseMoveAt("bubble2", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							// Check that one click event bubbled
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is(1, clicks, "one click event bubbled");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/CheckBox_a11y.html b/src/main/resources/static/dijit/tests/form/robot/CheckBox_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..3d0ecdca6f153edc94f74d9c803579278ad64045
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/CheckBox_a11y.html
@@ -0,0 +1,403 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Checkbox a11y Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_CheckBox.html');
+
+				doh.register("Checkbox a11y",[
+					{
+						timeout:5000,
+						name:"uncheck cb0 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+
+							dijit.byId("cb1").focus();
+							doh.robot.keyPress(dojo.keys.TAB, 500, {
+								shift: true
+							});
+							doh.robot.keyPress(dojo.keys.SPACE, 1000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dojo.byId('cb0').checked, "cb0 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:5000,
+						name:"check cb1 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.TAB, 500);
+							doh.robot.keyPress(dojo.keys.SPACE, 1000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('cb1').checked, "cb1 was not checked");
+								doh.is("true", dojo.byId('cb1').getAttribute("aria-checked"), "aria-checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:7000,
+						name:"uncheck cb2 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.TAB, 500);
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+							doh.robot.keyPress(dojo.keys.SPACE, 1000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('cb2').checked, "cb2 was checked");
+								doh.is("false", dojo.byId('cb2').getAttribute("aria-checked"), "aria-checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:7000,
+						name:"cb4 readonly a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.TAB, 500);
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+							doh.robot.keyPress(dojo.keys.SPACE, 1000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('cb4').checked, "cb4 was not checked");
+								doh.is("true", dojo.byId('cb4').getAttribute("aria-checked"), "aria-checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:9000,
+						name:"cb6 uncheck a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.TAB, 500);
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+							doh.robot.keyPress(dojo.keys.SPACE, 1000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('cb6').checked, "cb6 was checked");
+								doh.is("false", dojo.byId('cb6').getAttribute("aria-checked"), "aria-checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"cb6 check a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.SPACE, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('cb6').checked, "cb6 was not checked");
+								doh.is("true", dojo.byId('cb6').getAttribute("aria-checked"), "aria-checked");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Radio button a11y",[
+					{
+						name: "reset blank value",
+						runTest: function(){
+							doh.is("", dijit.byId('g1rb3').params.value, "blank parameter");
+							doh.is("", dijit.byId('g1rb3').value, "initially blank");
+							dijit.byId('g1rb3').reset();
+							doh.is("", dijit.byId('g1rb3').value, "blank after reset");
+						}
+					},
+					{
+						timeout: 5000,
+						name: "initial tab order",
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dojo.byId("enableWeatherButton").focus();
+							doh.robot.keyPress(dojo.keys.TAB, 500, {
+								shift: true
+							});
+							doh.robot.keyPress(dojo.keys.TAB, 500, {
+								shift: true
+							});
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							doh.robot.keyPress(dojo.keys.SPACE, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('g1rb2').checked, "talk should have been checked");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						timeout:6000,
+						name:"weather enabled a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							dijit.byId("g1rb2").focus();
+							dijit.byId("g1rb3").set("disabled",false);
+							doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 1000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('g1rb1').checked, "news was checked");
+								doh.f(dijit.byId('g1rb2').checked, "talk was checked");
+								doh.t(dijit.byId('g1rb3').checked, "weather was not checked");
+								doh.is("false", dojo.byId('g1rb1').getAttribute("aria-checked")||"false", "aria-checked 1");
+								doh.is("false", dojo.byId('g1rb2').getAttribute("aria-checked")||"false", "aria-checked 2");
+								doh.is("true", dojo.byId('g1rb3').getAttribute("aria-checked"), "aria-checked 3");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout: 5000,
+						name: "changed tab order",
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dojo.byId("enableWeatherButton").focus();
+							doh.robot.keyPress(dojo.keys.TAB, 500, {
+								shift: true
+							});
+							doh.robot.keyPress(dojo.keys.TAB, 500, {
+								shift: true
+							});
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							doh.robot.keyPress(dojo.keys.LEFT_ARROW, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('g1rb2').checked, "talk should have been checked");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						timeout:6000,
+						name:"change value to country a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							dijit.byId("g2rb1").focus();
+							doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 1000);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500);
+							doh.robot.keyPress(dojo.keys.SPACE, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('g2rb3').checked, "country was not checked");
+								doh.f(dijit.byId('g2rb2').checked, "oldies was checked");
+								doh.f(dijit.byId('g2rb1').checked, "top 40 was checked");
+								doh.is("false", dojo.byId('g2rb1').getAttribute("aria-checked")||"false", "aria-checked 1");
+								doh.is("false", dojo.byId('g2rb2').getAttribute("aria-checked")||"false", "aria-checked 2");
+								doh.is("true", dojo.byId('g2rb3').getAttribute("aria-checked"), "aria-checked 3");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:4000,
+						name:"change value to top 40 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 500);
+							doh.robot.keyPress(dojo.keys.LEFT_ARROW, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('g2rb3').checked, "country was checked");
+								doh.f(dijit.byId('g2rb2').checked, "oldies was checked");
+								doh.t(dijit.byId('g2rb1').checked, "top 40 was not checked");
+								doh.is("true", dojo.byId('g2rb1').getAttribute("aria-checked"), "aria-checked 1");
+								doh.is("false", dojo.byId('g2rb2').getAttribute("aria-checked")||"false", "aria-checked 2");
+								doh.is("false", dojo.byId('g2rb3').getAttribute("aria-checked")||"false", "aria-checked 3");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:11000,
+						name:"enable b1 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.keyPress(dojo.keys.TAB, 500);
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+							doh.robot.keyPress(dojo.keys.SPACE, 1000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('b1').checked, "b1 was not checked");
+								doh.f(dijit.byId('b2').checked, "b2 was checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.f(dijit.byId('c2').checked, "c2 was checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable b2 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.f(dijit.byId('c2').checked, "c2 was checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:5000,
+						name:"enable c1 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.keyPress(dojo.keys.TAB, 500);
+							doh.robot.keyPress(dojo.keys.SPACE, 1000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.t(dijit.byId('c1').checked, "c1 was not checked");
+								doh.f(dijit.byId('c2').checked, "c2 was checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable c2 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.t(dijit.byId('c2').checked, "c2 was not checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:6000,
+						name:"enable d2 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.keyPress(dojo.keys.TAB, 500);
+							doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 1000);
+							doh.robot.keyPress(dojo.keys.SPACE, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.t(dijit.byId('c2').checked, "c2 was not checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.t(dijit.byId('d2').checked, "d2 was not checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable d1 a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.t(dijit.byId('c2').checked, "c2 was not checked");
+								doh.t(dijit.byId('d1').checked, "d1 was not checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:5000,
+						name:"enable coffee a11y",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.keyPress(dojo.keys.TAB, 500);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('g4rb1').checked, "tea was checked");
+								doh.t(dijit.byId('g4rb2').checked, "coffee was not checked");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/CheckBox_mouse.html b/src/main/resources/static/dijit/tests/form/robot/CheckBox_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..d7cea1c6aff0aa2f0f6053adc3b03acedc6e22a5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/CheckBox_mouse.html
@@ -0,0 +1,422 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Checkbox mouse Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			// These are the values assigned to the widgets in the page's HTML
+			var originalGet = {
+				cb1: [],
+				cb2: ["on"],
+				cb4: ["on"],
+				cb5: [],
+				cb6: ["on"],
+				cb7: [],
+				'g[1]': "on",
+				g2: null
+			};
+
+			var originalSubmit = {
+				cb2: "on",
+				cb4: "on",
+				cb6: "on",
+				'g[1]': "on"
+			};
+
+			// attempt to change these values
+			var change = {
+				cb1: ["foo"],
+				cb2: [],
+				cb3: ["on"],
+				cb4: [],
+				cb5: ["on"],
+				cb6: ["foo"],
+				'g[1]': "", // weather
+				g2: "country"
+			};
+
+			// changed values
+			var changedGet = {
+				cb1: ["foo"],
+				cb2: [],
+				cb4: [],
+				cb5: ["on"],
+				cb6: [],
+				cb7: [],
+				'g[1]': null,
+				g2: "country"
+			};
+
+			var changedSubmit = {
+				cb1: "foo",
+				cb5: "on",
+				g2: "country"
+			};
+		
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_CheckBox.html');
+
+
+				var submitForm = function(name, testValues){
+					return {
+						name: name,
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var formWidget = dijit.byId("myForm");
+							submittedValues = function(formValues){
+								d.getTestCallback(function(){
+									for(var i in originalGet){ doh.is(testValues[i], formValues[i], i); }
+								})();
+							};
+							formWidget.submit();
+							return d;
+						},
+						tearDown: function(){
+							submittedValues = defaultSubmitHandler;
+						}
+					};
+				};
+
+				doh.register("CheckBox values", [
+					{
+						timeout:3000,
+						name:"readOnly",
+						runTest:function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(function(){ submitForm("reset submit", originalSubmit); }, 500); 
+							doh.robot.mouseMoveAt("cb4", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is( dojo.toJson(originalGet), dojo.global.dojo.toJson(dijit.byId("myForm").get('value')), "still have original values" );
+								submitForm("resubmit", originalSubmit);
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Radio button onChange",[
+					function checkInitialValues(){
+						doh.f(dijit.byId('g1rb1').checked, "news was checked");
+						doh.t(dijit.byId('g1rb2').checked, "talk was not checked");
+						doh.f(dijit.byId('g1rb3').checked, "weather was checked");
+						doh.f(dijit.byId('g2rb1').checked, "top 40 was checked");
+						doh.f(dijit.byId('g2rb2').checked, "oldies was checked");
+						doh.f(dijit.byId('g2rb3').checked, "country was checked");
+						doh.f(dojo.byId('g3rb1').checked, "rock was checked");
+						doh.f(dojo.byId('g3rb2').checked, "jazz was checked");
+						doh.t(dojo.byId('g3rb3').checked, "classical was not checked");
+						doh.t(dijit.byId('g4rb1').checked, "tea was not checked");
+						doh.f(dijit.byId('g4rb2').checked, "coffee was checked");
+					},
+					{
+						timeout:3000,
+						name:"change value to news",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("g1rb1", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('g1rb1').checked, "news was not checked");
+								doh.f(dijit.byId('g1rb2').checked, "talk was checked");
+								doh.f(dijit.byId('g1rb3').checked, "weather was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"weather disabled",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("g1rb3", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('g1rb1').checked, "news was not checked");
+								doh.f(dijit.byId('g1rb2').checked, "talk was checked");
+								doh.f(dijit.byId('g1rb3').checked, "weather was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:4000,
+						name:"weather enabled",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("enableWeatherButton", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.mouseMoveAt("g1rb3", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('g1rb1').checked, "news was checked");
+								doh.f(dijit.byId('g1rb2').checked, "talk was checked");
+								doh.t(dijit.byId('g1rb3').checked, "weather was not checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"change value to county",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("g2rb3", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('g2rb3').checked, "country was not checked");
+								doh.f(dijit.byId('g2rb2').checked, "oldies was checked");
+								doh.f(dijit.byId('g2rb1').checked, "top 40 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"change value to top 40",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("g2rb1", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('g2rb3').checked, "country was checked");
+								doh.f(dijit.byId('g2rb2').checked, "oldies was checked");
+								doh.t(dijit.byId('g2rb1').checked, "top 40 was not checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"change value to oldies",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("g2rb2", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('g2rb3').checked, "country was checked");
+								doh.t(dijit.byId('g2rb2').checked, "oldies was not checked");
+								doh.f(dijit.byId('g2rb1').checked, "top 40 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"change value to rock",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("g3rb1", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dojo.byId('g3rb1').checked, "rock was not checked");
+								doh.f(dojo.byId('g3rb2').checked, "jazz was checked");
+								doh.f(dojo.byId('g3rb3').checked, "classical was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"disabled jazz",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("g3rb2", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dojo.byId('g3rb1').checked, "rock was not checked");
+								doh.f(dojo.byId('g3rb2').checked, "jazz was checked");
+								doh.f(dojo.byId('g3rb3').checked, "classical was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable b1",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("b1", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId('b1').checked, "b1 was not checked");
+								doh.f(dijit.byId('b2').checked, "b2 was checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.f(dijit.byId('c2').checked, "c2 was checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable b2",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("b2", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.f(dijit.byId('c2').checked, "c2 was checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable c1",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("c1", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.t(dijit.byId('c1').checked, "c1 was not checked");
+								doh.f(dijit.byId('c2').checked, "c2 was checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable c2",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("c2", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.t(dijit.byId('c2').checked, "c2 was not checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable d2",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("d2", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.t(dijit.byId('c2').checked, "c2 was not checked");
+								doh.f(dijit.byId('d1').checked, "d1 was checked");
+								doh.t(dijit.byId('d2').checked, "d2 was not checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable d1",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("d1", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('b1').checked, "b1 was checked");
+								doh.t(dijit.byId('b2').checked, "b2 was not checked");
+								doh.f(dijit.byId('c1').checked, "c1 was checked");
+								doh.t(dijit.byId('c2').checked, "c2 was not checked");
+								doh.t(dijit.byId('d1').checked, "d1 was not checked");
+								doh.f(dijit.byId('d2').checked, "d2 was checked");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						timeout:3000,
+						name:"enable coffee",
+						runTest:function(){
+							var d = new doh.Deferred();
+ 
+							doh.robot.mouseMoveAt("g4rb2", 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId('g4rb1').checked, "tea was checked");
+								doh.t(dijit.byId('g4rb2').checked, "coffee was not checked");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/ComboBox_a11y.html b/src/main/resources/static/dijit/tests/form/robot/ComboBox_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..8c04f69d2d5a1bc722abc49ae8192383f93d5009
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/ComboBox_a11y.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+	<HEAD>
+		<TITLE>ComboBox General/Keyboard Robot Test</TITLE>
+	</HEAD>
+	<BODY>
+		Loading ComboBox a11y robot test.
+		<SCRIPT>
+			window.location.replace("_autoComplete_a11y.html?testWidget=dijit.form.ComboBox"+window.location.search.replace(/^\?/,"&"));
+		</SCRIPT>
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/form/robot/ComboBox_mouse.html b/src/main/resources/static/dijit/tests/form/robot/ComboBox_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..7bb349cb197590dd58236103d7779661f96e0cfd
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/ComboBox_mouse.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+	<HEAD>
+		<TITLE>ComboBox Mouse Robot Test</TITLE>
+	</HEAD>
+	<BODY>
+		Loading ComboBox mouse robot test.
+		<SCRIPT>
+			window.location.replace("_autoComplete_mouse.html?testWidget=dijit.form.ComboBox"+window.location.search.replace(/^\?/,"&"));
+		</SCRIPT>
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/form/robot/DateTextBox.html b/src/main/resources/static/dijit/tests/form/robot/DateTextBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..574cf9cb63200589697cb49f43fdfe9ed7197fd9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/DateTextBox.html
@@ -0,0 +1,1165 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>doh.robot DateTextBox Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dojo.date");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_DateTextBox.html');
+
+				// refs to DateTextBox widgets
+				var american, german, localLong, pattern, handler;
+
+				// log of calls to onChange handler, and watch(value)
+				var changes = [], watches = [];
+
+				// ctrl-page-down / page-up will go forward/barck a year, except on chrome where
+				// it switches browser tabs.   use alt instead
+				var yearModifierKey = dojo.isChrome ? {alt: true} : {ctrl: true};
+
+				doh.register("setup",
+					function setUp(){
+						// refs to DateTextBox widgets
+				    		american = dijit.byId('american');
+				    		german = dijit.byId('german');
+						localLong = dijit.byId('localLong');
+				    		pattern = dijit.byId('pattern');
+
+						// setup onChange handler to monitor onChange calls on american textbox
+						dojo.connect(american, 'onChange', function(val){
+							console.log('onchange w/value: ', val);
+							changes.push(val);
+						});
+						
+						american.watch("value", function(attr, oldV, newV){
+							watches.push(newV);
+						});
+				    }
+				);
+
+				doh.register("keyboard: direct input", {
+					name: "direct input",
+					timeout: 6000,
+					setUp: function(){
+						// clear the field
+						changes = [];
+						watches = [];
+						american.focus();
+					},
+					runTest: function(){
+						var	d = new doh.Deferred(),
+							r1 = true,
+							r2 = true,
+							r3 = true,
+							r4 = true,
+							r5 = true,
+							r6 = false,
+							r7 = false,
+							r8 = true;
+
+						handler = dojo.connect(american, 'onChange', d.getTestCallback(function(){
+							doh.f(r1, "1 out of range");
+							doh.f(r2, "1/ out of range");
+							doh.f(r3, "1/3 out of range");
+							doh.f(r4, "1/3/ out of range");
+							doh.f(r5, "1/3/2 out of range");
+							doh.t(r6, "1/3/20 in range");
+							doh.t(r7, "1/3/200 in range");
+							doh.f(r8, "1/3/2005 out of range");
+							var value = american.get('value');
+							doh.is(0, dojo.date.compare(new Date(2005, 0, 3), value), 'actual value is ' + value);
+							doh.is(1, changes.length, 'one onchange event');	// #9018
+							doh.is(2, watches.length, 'one watch(value) event from the onblur');
+							doh.is(0, dojo.date.compare(new Date(2005, 0, 3), changes[0]),
+									'value reported by onchange: ' + changes[0] +
+									', should be ' + new Date(2005, 0, 3));
+							doh.is(0, dojo.date.compare(new Date(2005, 0, 3), watches[1]),
+									'value reported by watch(value): ' + watches[1] +
+									', should be ' + new Date(2005, 0, 3));
+						}));
+
+						american.set('value', null, false);
+
+						doh.robot.typeKeys('1', 1000, 200);
+						doh.robot.sequence(function(){
+							r1 = american._isDefinitelyOutOfRange();
+						}, 100);
+						doh.robot.typeKeys('/', 100, 200);
+						doh.robot.sequence(function(){
+							r2 = american._isDefinitelyOutOfRange();
+						}, 100);
+						doh.robot.typeKeys('3', 100, 200);
+						doh.robot.sequence(function(){
+							r3 = american._isDefinitelyOutOfRange();
+						}, 100);
+						doh.robot.typeKeys('/', 100, 200);
+						doh.robot.sequence(function(){
+							r4 = american._isDefinitelyOutOfRange();
+						}, 100);
+						doh.robot.typeKeys('2', 100, 200);
+						doh.robot.sequence(function(){
+							r5 = american._isDefinitelyOutOfRange();
+						}, 100);
+						doh.robot.typeKeys('0', 100, 200);
+						doh.robot.sequence(function(){
+							r6 = american._isDefinitelyOutOfRange();
+						}, 100);
+						doh.robot.typeKeys('0', 100, 200);
+						doh.robot.sequence(function(){
+							r7 = american._isDefinitelyOutOfRange();
+						}, 100);
+						doh.robot.typeKeys('5', 100, 200);
+						doh.robot.sequence(function(){
+							r8 = american._isDefinitelyOutOfRange();
+						}, 100);
+
+						doh.robot.keyPress(dojo.keys.TAB, 500, {}); // focus german
+
+						return d;
+					},
+					tearDown: function(){
+						dojo.disconnect(handler);
+					}
+				});
+
+				doh.register("keyboard: drop down", [
+					{
+						name: "initial popup display",
+						timeout: 6000,
+						setUp: function(){
+							// set to may 10
+							changes = [];
+							american.set('displayedValue', "", false);
+							watches = [];	// put after set() so we can ignore the watch() published by set()
+							american.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred(),
+								calendar;
+
+							handler = dojo.connect(american, 'openDropDown', function(){
+								dojo.disconnect(handler);
+								calendar = dijit.byId("american_popup");
+								handler = dojo.connect(calendar, 'focus', function(){
+									// Use setTimeout() because focus on IE9+ is asynchronous.
+									setTimeout(d.getTestCallback(function(){
+										// calendar exists and is shown
+										doh.t(calendar && isVisible(calendar), "calendar is visible");
+
+										// calendar is on the right month
+										doh.is("May", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "calendar starts on month selected in input box");
+
+										// and the right year
+										var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", calendar.domNode);
+										doh.is(1, selectedYearButtons.length, "current year is shown");
+										doh.is("2005", innerText(selectedYearButtons[0]), "current year is 2005");
+
+										// and the currently selected date is right too
+										var selectedDays = dojo.query(".dijitCalendarSelectedDate", calendar.domNode);
+										doh.is(1, selectedDays.length, "one day selected");
+										doh.is("10", innerText(selectedDays[0]), "correct day is selected");
+
+										// focus moved to the calendar
+										doh.is(10, innerText(dojo.global.dijit.focus.curNode), "focus on selected calendar cell");
+
+										doh.is(0, changes.length, "no onchange events yet");
+										doh.is(0, watches.length, "no watch(value) events yet");
+									}), 0);
+								});
+							});
+
+							doh.robot.typeKeys("5/10/2005", 1000, 1800);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 700, {});
+
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handler);
+						}
+					},
+
+					{
+						name: "forward two days",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// selected day not changed (because no ENTER/SPACE)
+								var selectedDays = dojo.query(".dijitCalendarSelectedDate", calendar.domNode);
+								doh.is(1, selectedDays.length, "one day selected");
+								doh.is(10, innerText(selectedDays[0]), "correct day is selected");
+
+								// focus still on the calendar, moved forward 2 days
+								doh.is(12, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "back a day",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.LEFT_ARROW, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// focus still on the calendar, moved back 1 day
+								doh.is(11, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "forward four weeks",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 750, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 750, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 750, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 750, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// should have advanced to next month
+								doh.is("June", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "month changed");
+
+								// and focused day changed
+								doh.is(8, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "back three weeks",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 750, {});
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 750, {});
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 750, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// should have scrolled back to previous month
+								doh.is("May", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "month changed");
+
+								// focused day still the same
+								doh.is(18, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "forward two months",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.PAGE_DOWN, 750, {});
+							doh.robot.keyPress(dojo.keys.PAGE_DOWN, 750, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// focused day still the same
+								doh.is(18, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								// month changed
+								doh.is("July", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "month changed");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "back a month",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.PAGE_UP, 750, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// focused day still the same
+								doh.is(18, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								// month changed
+								doh.is("June", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "month changed");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "forward two years",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.PAGE_DOWN, 750, yearModifierKey);
+							doh.robot.keyPress(dojo.keys.PAGE_DOWN, 750, yearModifierKey);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// focused day still the same (focused even though disabled)
+								doh.is(18, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								// same month
+								doh.is("June", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "same month");
+
+								// year changed
+								var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", calendar.domNode);
+								doh.is(1, selectedYearButtons.length, "current year is shown");
+								doh.is("2007", innerText(selectedYearButtons[0]), "year changed");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "back a year",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.PAGE_UP, 750, yearModifierKey);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// focused day still the same
+								doh.is(18, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								// same month
+								doh.is("June", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "same month");
+
+								// year changed
+								var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", calendar.domNode);
+								doh.is(1, selectedYearButtons.length, "current year is shown");
+								doh.is("2006", innerText(selectedYearButtons[0]), "year changed");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "first day of month",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.HOME, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// focused on first day of month
+								doh.is(1, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "last day of month",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.robot.keyPress(dojo.keys.END, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// focused on last day of month
+								doh.is(30, innerText(dojo.global.dijit.focus.curNode), "focus");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "select a date",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// select
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is('6/30/2006', american.get('displayedValue'), 'displayed value of american');
+
+								var expectedVal = new Date(2006, 5, 30);	// 6/30/2006
+								doh.is(0, dojo.date.compare(expectedVal, american.get('value')), 'wire value of american: ' + american.get('value'));
+
+								doh.is(1, changes.length, "onchange event fired");
+								doh.is(1, watches.length, "watch(value) event fired");
+								doh.is(0, dojo.date.compare(expectedVal, changes[0]), 'onchange of american: ' + changes[0]);
+								doh.is(0, dojo.date.compare(expectedVal, watches[0]), 'watch(value) of american: ' + watches[0]);
+
+								// focus moved back to <input>
+								doh.is("american", dojo.global.dijit.focus.curNode.id, "focus on <input>")
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "tab away",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							handler = dojo.connect(american, '_onFocus', d.getTestCallback(function(){
+								doh.is(1, changes.length, "no new onchange events");	// #9018
+								doh.is(1, watches.length, "no new watch(value) events yet");
+							}));
+
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							doh.robot.keyPress(dojo.keys.TAB, 500, {shift:true});
+
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handler);
+						}
+					}
+				]);
+
+// TODO: add key-repeat tests
+
+				doh.register("mouse: drop down", [
+					{
+						name: "initial popup display",
+						timeout: 6000,
+						setUp: function(){
+							// clear the field
+							changes = [];
+							american.set('displayedValue', "", false);
+							watches = [];	// do it here to ignore watch() notification for above set() call
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							handler = dojo.connect(american, 'openDropDown', d.getTestCallback(function(){
+								var calendar = dijit.byId("american_popup");
+
+								// drop down automatically opened on click
+								doh.t(calendar && isVisible(calendar), "calendar is visible");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}));
+
+							doh.robot.mouseMoveAt(american._buttonNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handler);
+						}
+					},
+					
+					{
+						name: "close and reopen",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							handler = dojo.connect(american, 'closeDropDown', function(){
+								dojo.disconnect(handler);
+
+								handler = dojo.connect(american, 'openDropDown', d.getTestCallback(function(){
+									var calendar = dijit.byId("american_popup");
+	
+									// calendar exists and is shown
+									doh.t(calendar && isVisible(calendar), "calendar is visible");
+	
+									// calendar is on the right month
+									doh.is("May", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "calendar starts on month selected in input box");
+	
+									// and the right year
+									var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", calendar.domNode);
+									doh.is(1, selectedYearButtons.length, "current year is shown");
+									doh.is("2005", innerText(selectedYearButtons[0]), "current year is 2005");
+	
+									// and the currently selected date is right too
+									var selectedDays = dojo.query(".dijitCalendarSelectedDate", calendar.domNode);
+									doh.is(1, selectedDays.length, "one day selected");
+									doh.is("10", innerText(selectedDays[0]), "correct day is selected");
+	
+									doh.is(0, changes.length, "no onchange events yet");
+									doh.is(0, watches.length, "no watch(value) events yet");
+								}));
+	
+								// type a value
+								doh.robot.typeKeys("5/10/2005", 500, 1800);
+								// And open dropdown again (manually)
+								doh.robot.mouseMoveAt(american._buttonNode, 500, 1);
+								doh.robot.mouseClick({left:true}, 500);
+							});
+
+							// Close drop down
+							doh.robot.keyPress(dojo.keys.ESCAPE, 500, {});
+							
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handler);
+						}
+					},
+
+					{
+						name: "advance a month",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup"),
+								nextMonthButtons = dojo.query(".dijitCalendarIncrease", calendar.domNode);
+
+							doh.is(1, nextMonthButtons.length, "found next month button");
+
+							doh.robot.mouseMoveAt(nextMonthButtons[0], 100, 1); // delay to allow previous keyUp to occur
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar && isVisible(calendar), "calendar is visible");
+
+								// calendar moved to the next month
+								doh.is("June", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "moved from may to june");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "advance a month with the menu dropdown",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.is(1, dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode).length, "found month label");
+							doh.t(calendar.monthWidget.dropDown, "month dropdown exists");
+							doh.f(isVisible(calendar.monthWidget.dropDown), "month dropdown is not visible");
+
+							doh.robot.mouseMoveAt(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0], 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							
+							doh.robot.mouseMoveAt(function(){
+								return dojo.query("[month=6]", calendar.monthWidget.dropDown.domNode)[0];
+							}, 1000, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar && isVisible(calendar), "calendar is visible");
+
+								// calendar moved to the next month
+								doh.is("July", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "moved from june to july");
+								var rows = dojo.query("TR.dijitCalendarWeekTemplate", calendar.domNode),
+									firstRowDays = dojo.query("TD", rows[0]);
+								doh.is(7, firstRowDays.length, "7 days in first row");
+								doh.t(dojo.hasClass(firstRowDays[0], "dijitCalendarPreviousMonth"), "previous month class applied");
+								doh.is("26", innerText(firstRowDays[0]), "first day is june 26");
+								doh.is("1", innerText(firstRowDays[5]), "sixth day is june 1");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "advance a year",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var calendar = dijit.byId("american_popup"),
+								nextYearButtons = dojo.query(".dijitCalendarNextYear", calendar.domNode);
+
+							doh.is(1, nextYearButtons.length, "found next year button");
+
+							doh.robot.mouseMoveAt(nextYearButtons[0], 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar && isVisible(calendar), "calendar is visible");
+
+								// calendar moved to the next year
+								var yearNodes = dojo.query(".dijitCalendarSelectedYear", calendar.domNode);
+								doh.is(1, yearNodes.length, "found year node");
+								doh.is("2006", innerText(yearNodes[0]), "moved from 2005 to 2006");
+
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "check disabled dates",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Move forward another year, to see disabled days (this date text box is valid only to 2006)
+							var calendar = dijit.byId("american_popup"),
+								nextYearButtons = dojo.query(".dijitCalendarNextYear", calendar.domNode);
+
+							doh.is(1, nextYearButtons.length, "found next year button");
+
+							doh.robot.mouseMoveAt(nextYearButtons[0], 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								dojo.query(".dijitCalendarDateTemplate", calendar.domNode).forEach(function(node){
+									doh.t(dojo.hasClass(node, 'dijitCalendarDisabledDate'), 'every day in 2007 is disabled');
+								});
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "check enabled dates",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Move back a year, dates should be enabled again
+							var calendar = dijit.byId("american_popup"),
+								previousYearButtons = dojo.query(".dijitCalendarPreviousYear", calendar.domNode);
+
+							doh.is(1, previousYearButtons.length, "found previous year button");
+
+							doh.robot.mouseMoveAt(previousYearButtons[0], 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								dojo.query(".dijitCalendarDateTemplate", calendar.domNode).forEach(function(node){
+									doh.f(dojo.hasClass(node, 'dijitCalendarDisabledDate'), "every day in 2006 is enabled");
+								});
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "check calendar display",
+						timeout: 6000,
+						runTest: function(){
+							var calendar = dijit.byId("american_popup"),
+								rows = dojo.query("TR.dijitCalendarWeekTemplate", calendar.domNode);
+
+							doh.is(6, rows.length, "six weeks shown");
+							var firstRowDays = dojo.query("TD", rows[0]);
+							doh.is(7, firstRowDays.length, "7 days in first row");
+							doh.t(dojo.hasClass(firstRowDays[0], "dijitCalendarPreviousMonth"), "previous month class applied");
+							doh.is("25", innerText(firstRowDays[0]), "first day is june 25");
+							doh.is("1", innerText(firstRowDays[6]), "seventh day is july 1");
+
+							var lastRowDays = dojo.query("TD", rows[5]);
+							doh.t(dojo.hasClass(lastRowDays[3], 'dijitCalendarNextMonth'), "last row is for next month");
+							doh.is(0, changes.length, "no onchange events yet");
+							doh.is(0, watches.length, "no watch(value) events yet");
+						}
+					},
+
+					{
+						name: "hover a date",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var calendar = dijit.byId("american_popup"),
+								rows = dojo.query("TR.dijitCalendarWeekTemplate", calendar.domNode),
+								thirdRowDays = dojo.query("TD", rows[2]),
+								day = thirdRowDays[6];
+
+							// hover June 15
+							doh.is("15", innerText(day), "found july 15");
+							doh.robot.mouseMoveAt(day, 0, 1);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dojo.hasClass(day, 'dijitCalendarHoveredDate'), "hovered date has hover class");
+								doh.is(0, changes.length, "no onchange events yet");
+								doh.is(0, watches.length, "no watch(value) events yet");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "select a date",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// select June 15
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is('7/15/2006', american.get('displayedValue'), 'displayed value of american');
+
+								var expectedVal = new Date(2006, 6, 15);	// 7/15/2006
+								doh.is(0, dojo.date.compare(expectedVal, american.get('value')), 'wire value of american: ' + american.get('value'));
+
+								doh.is(1, changes.length, "onchange event fired");
+								doh.is(1, watches.length, "watch(value) event fired");
+								doh.is(0, dojo.date.compare(expectedVal, changes[0]), 'onchange of american: ' + changes[0]);
+								doh.is(0, dojo.date.compare(expectedVal, watches[0]), 'watch(value) of american: ' + watches[0]);
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "tab away",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is(1, changes.length, "no new onchange events");	// #9018
+								doh.is(1, watches.length, "no new watch(value) events");
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				// Tests that drop down displays correct year/month, and that correct cell is focused,
+				// based on this.value and this.dropDownDefaultValue
+				doh.register("focused popup value", [
+					{
+						name: "today",
+						timeout: 6000,
+						setUp: function(){
+							german.closeDropDown(true);	// close drop down and focus widget
+							german.set('value', null);
+							german.set("dropDownDefaultValue", null);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var today = new Date();
+	
+								var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", german.dropDown.domNode);
+								doh.is(today.getFullYear(), innerText(selectedYearButtons[0]), "current year is selected");
+	
+								var selectedDates = dojo.query(".dijitCalendarSelectedDate", german.dropDown.domNode);
+								doh.is(0, selectedDates.length, "no selected date");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "dropDownDefaultValue",
+						timeout: 6000,
+						setUp: function(){
+							german.closeDropDown(true);
+							german.set('value', null);
+							german.set("dropDownDefaultValue", new Date(2000,11,21));
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", german.dropDown.domNode);
+								doh.is("2000", innerText(selectedYearButtons[0]), "specified default year is selected");
+	
+								var selectedDates = dojo.query(".dijitCalendarSelectedDate", german.dropDown.domNode);
+								doh.is(0, selectedDates.length, "no selected date");
+	
+								doh.is("21", innerText(dojo.global.dijit.focus.curNode), "but focused on the 21st");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					// Testing that value overrides dropDownDefaultValue
+					{
+						name: "textbox value",
+						timeout: 6000,
+						setUp: function(){
+							german.closeDropDown(true);
+							german.set("dropDownDefaultValue", new Date(2000,11,21));
+							german.set('value', new Date(2004,10,25));
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", german.dropDown.domNode);
+								doh.is("2004", innerText(selectedYearButtons[0]), "textbox year is selected");
+	
+								var selectedDates = dojo.query(".dijitCalendarSelectedDate", german.dropDown.domNode);
+								doh.is(1, selectedDates.length, "one selected date");
+								doh.is("25", innerText(selectedDates[0]), "25th is selected");
+	
+								doh.is("25", innerText(dojo.global.dijit.focus.curNode), "and also focused on the 25th");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "close",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							handler = dojo.connect(german, 'closeDropDown', d.getTestCallback(function(){}));
+							// Close the drop down so it doesn't interfere with the next test by covering up the
+							// <input> that we want to focus.
+							doh.robot.keyPress(dojo.keys.ESCAPE, 500, {});
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handler);
+						}
+					}
+				]);
+
+				// Testing that canceling an edit doesn't select anything
+				doh.register("cancel edit", {
+					name: "no value",
+					timeout: 6000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var wasBlank = !pattern.get("value");
+
+						handler = dojo.connect(pattern, 'openDropDown', function(){
+							dojo.disconnect(handler);
+							var calendar = dijit.byId("pattern_popup");
+							var wasVisible = calendar && isVisible(calendar);
+
+							handler = dojo.connect(pattern, 'closeDropDown', d.getTestCallback(function(){
+								doh.t(wasBlank, "initially blank");
+								doh.t(wasVisible, "calendar was visible");
+								var calendar = dijit.byId("pattern_popup");
+								doh.f(calendar && isVisible(calendar), "calendar popup destroyed or hidden");
+								doh.t(!pattern.get("value"), "no value set into DateTextBox")
+							}));
+
+							// close the drop down
+							doh.robot.mouseMoveAt("pattern", 0, 1, pattern.domNode.offsetWidth + 20, pattern.domNode.offsetHeight/2);
+							doh.robot.mouseClick({left:true}, 500);			
+						});
+
+						// open the drop down
+						doh.robot.mouseMoveAt(pattern._buttonNode, 100, 1); // delay to allow previous keyUp to occur
+						doh.robot.mouseClick({left:true}, 500);
+
+						return d;
+					},
+					tearDown: function(){
+						dojo.disconnect(handler);
+					}
+				});
+
+				doh.register("month drop down edge case", [
+					{
+						name: "initial popup display",
+						timeout: 6000,
+						setUp: function(){
+							american.set('value', new Date(2006, 11, 31), false);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							handler = dojo.connect(american, 'openDropDown', d.getTestCallback(function(){
+								var calendar = dijit.byId("american_popup");
+
+								// calendar exists and is shown
+								doh.t(calendar && isVisible(calendar), "calendar is visible");
+
+								// calendar is on the right month
+								doh.is("December", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "calendar starts on month selected in input box");
+
+								// and the right year
+								var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", calendar.domNode);
+								doh.is(1, selectedYearButtons.length, "current year is shown");
+								doh.is("2006", innerText(selectedYearButtons[0]), "current year");
+
+								// and the currently focused date is the 31'st
+								doh.is("31", innerText(dojo.query(".dijitCalendarSelectedDate", calendar.domNode)[0]), "correct day is selected");
+							}));
+
+							doh.robot.mouseMoveAt(american._buttonNode, 100, 1); // delay to allow previous mouseUp to occur
+							doh.robot.mouseClick({left:true}, 500);
+
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handler);
+						}
+					},
+
+					// Switching to February to test that movement works even though there is no Feb 31st.
+					{
+						name: "switch to february",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.is(1, dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode).length, "found month label");
+							doh.t(calendar.monthWidget.dropDown, "month dropdown exists");
+							doh.f(isVisible(calendar.monthWidget.dropDown), "month dropdown is not visible");
+
+							doh.robot.mouseMoveAt(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0], 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.mouseMoveAt(function(){
+								return dojo.query("[month=1]", calendar.monthWidget.dropDown.domNode)[0];
+							}, 1000, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// calendar moved to feb 2006
+								doh.is("February", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "moved from December to February");
+								var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", calendar.domNode);
+								doh.is(1, selectedYearButtons.length, "current year is shown");
+								doh.is("2006", innerText(selectedYearButtons[0]), "current year");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					// Switching to December to make sure that drop down isn't cut off
+					{
+						name: "switch back to december",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var calendar = dijit.byId("american_popup");
+
+							doh.is(1, dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode).length, "found month label");
+							doh.t(calendar.monthWidget.dropDown, "month dropdown exists");
+							doh.f(isVisible(calendar.monthWidget.dropDown), "month dropdown is not visible");
+
+							doh.robot.mouseMoveAt(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0], 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.mouseMoveAt(function(){
+								return dojo.query("[month=11]", calendar.monthWidget.dropDown.domNode)[0];
+							}, 1000, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								// calendar still exists and is shown
+								doh.t(calendar, "calendar popup exists");
+								doh.t(isVisible(calendar), "calendar is visible");
+
+								// calendar moved to dec 2006
+								doh.is("December", innerText(dojo.query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]), "moved from june to july");
+								var selectedYearButtons = dojo.query(".dijitCalendarSelectedYear", calendar.domNode);
+								doh.is(1, selectedYearButtons.length, "current year is shown");
+								doh.is("2006", innerText(selectedYearButtons[0]), "current year");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "cancel",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							handler = dojo.connect(american, 'closeDropDown', d.getTestCallback(function(){
+								var calendar = dijit.byId("american_popup");
+								doh.f(calendar && isVisible(calendar), "calendar isn't visible");
+							}));
+							doh.robot.keyPress(dojo.keys.ESCAPE, 500, {});
+
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handler);
+						}
+					}
+				]);
+
+				doh.register("clicking input", [
+					{
+						name: "click on input",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							handler = dojo.connect(localLong.focusNode, 'onfocus', function(){
+								dojo.disconnect(handler);
+								var calendar = dijit.byId("localLong_popup");
+								var wasVisible = calendar && isVisible(calendar);
+								handler = dojo.connect(localLong, 'openDropDown', d.getTestCallback(function(){
+									doh.f(wasVisible, "calendar isn't visible");
+									calendar = dijit.byId("localLong_popup");
+									doh.t(calendar && isVisible(calendar), "calendar is visible");
+								}));
+								doh.robot.mouseMoveAt(localLong._buttonNode, 0, 1);
+								doh.robot.mouseClick({left:true}, 500);
+							});
+
+							doh.robot.mouseMoveAt(localLong.focusNode, 100, 1); // delay to allow previous keyUp to occur
+							doh.robot.mouseClick({left:true}, 500);
+
+							return d;
+						},
+						tearDown: function(){
+							dojo.disconnect(handler);
+							localLong.closeDropDown();
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/FilteringSelect_a11y.html b/src/main/resources/static/dijit/tests/form/robot/FilteringSelect_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..0c135ae88027e40c6666bcd5ca8cfd7b453adf12
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/FilteringSelect_a11y.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+	<HEAD>
+		<TITLE>FilteringSelect General/Keyboard Robot Test</TITLE>
+	</HEAD>
+	<BODY>
+		Loading FilteringSelect a11y robot test.
+		<SCRIPT>
+			window.location.replace("_autoComplete_a11y.html?testWidget=dijit.form.FilteringSelect"+window.location.search.replace(/^\?/,"&"));
+		</SCRIPT>
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/form/robot/FilteringSelect_mouse.html b/src/main/resources/static/dijit/tests/form/robot/FilteringSelect_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..725b817df194ae0a4db8473f0376bc44436c35c7
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/FilteringSelect_mouse.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+	<HEAD>
+		<TITLE>FilteringSelect Mouse Robot Test</TITLE>
+	</HEAD>
+	<BODY>
+		Loading FilteringSelect mouse robot test.
+		<SCRIPT>
+			window.location.replace("_autoComplete_mouse.html?testWidget=dijit.form.FilteringSelect"+window.location.search.replace(/^\?/,"&"));
+		</SCRIPT>
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/form/robot/Form_onsubmit.html b/src/main/resources/static/dijit/tests/form/robot/Form_onsubmit.html
new file mode 100644
index 0000000000000000000000000000000000000000..f398ade7052dfae5c1b8c6dcaa6403ced01595e1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Form_onsubmit.html
@@ -0,0 +1,214 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Form_onsubmit Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_Form_onsubmit.html');
+
+				var textbox;
+				var handler;
+				doh.register("onsubmit", [
+					{
+						name: "submit1",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							textbox = dijit.byId("textbox");
+							//reset the submit textbox
+							textbox.set('value', "", false);
+							handler = textbox.connect(textbox, 'onChange', function(){
+								d.errback('onChange should not have fired');
+							});
+							
+							doh.robot.mouseMoveAt("submit1", 1000, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("", textbox.get('value'));
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							textbox.disconnect(handler);
+						}
+					},
+					{
+						name: "submit2",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//reset the submit textbox
+							textbox.set('value', "", false);
+							handler = textbox.connect(textbox, 'onChange', function(){
+								d.errback('onChange should not have fired');
+							});
+														
+							doh.robot.mouseMoveAt("submit2", 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("", textbox.get('value'));
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							textbox.disconnect(handler);
+						}
+					},
+					{
+						name: "submit3",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//reset the submit textbox
+							textbox.set('value', "", false);
+
+							handler = textbox.connect(textbox, 'onChange',
+								d.getTestCallback(function(){
+									doh.is("one", textbox.get('value'));
+								})
+							);
+							doh.robot.mouseMoveAt("submit3", 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							return d;
+						},
+						tearDown: function(){
+							textbox.disconnect(handler);
+						}
+					},
+					{
+						name: "submit4",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//reset the submit textbox
+							textbox.set('value', "", false);
+							
+							handler = textbox.connect(textbox, 'onChange',
+								d.getTestCallback(function(){
+									doh.is("one", textbox.get('value'));
+								})
+							);
+							doh.robot.mouseMoveAt("submit4", 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							
+							return d;
+						},
+						tearDown: function(){
+							textbox.disconnect(handler);
+						}
+					},
+					{
+						name: "testReset1",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							doh.robot.mouseMoveAt("combo1", 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.mouseMoveAt("reset1", 500, 0);
+							doh.robot.mouseClick({left:true}, 500);
+							
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("two", dijit.byId("combo1").value);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "testReset2",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("combo2", 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.mouseMoveAt("reset2", 500, 0);
+							doh.robot.mouseClick({left:true}, 500);
+							
+							
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("three", dijit.byId("combo2").value);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "testReset3",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							doh.robot.mouseMoveAt("combo3", 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.mouseMoveAt("reset3", 500, 0);
+							doh.robot.mouseClick({left:true}, 500);
+							
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("one", dijit.byId("combo3").value);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "testReset4",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("combo4", 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.mouseMoveAt("reset4", 500, 0);
+							doh.robot.mouseClick({left:true}, 500);
+							
+							
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("one", dijit.byId("combo4").value);
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/Form_state.html b/src/main/resources/static/dijit/tests/form/robot/Form_state.html
new file mode 100644
index 0000000000000000000000000000000000000000..c325c9fc1df17908db4142e9730370518cdc0bf8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Form_state.html
@@ -0,0 +1,184 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Form Valid/Invalid State Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			// Some of these tests are duplicated in Form.html, maybe the Form.html watch(state) and validate()
+			// tests groups should be moved here.
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_Form_state.html');
+
+				doh.register("FormValidationState", [
+					{
+						name: "formLoadInvalid",
+						runTest: function(){
+							doh.t(dijit.byId("submitButton").get("disabled"));
+						}
+					},
+					{
+						name: "initialFormInvalid",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(function(){ dojo.byId("notes").focus(); });
+							doh.robot.typeKeys("my notes", 1, 1200);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId("submitButton").get("disabled"));
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "initialFormInvalid2",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(function(){ dojo.byId("name").focus(); });
+							doh.robot.typeKeys("my name", 1, 1000);
+
+							doh.robot.sequence(function(){
+								dojo.byId("birth").focus();
+								dijit.byId('birth').set('value', null);
+							}, 500); 
+							doh.robot.typeKeys("1/1/2010", 1, 1200);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId("submitButton").get("disabled"));
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "initialFormValid",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dojo.byId("reset").focus();
+							dojo.byId("reset").click();
+
+							setTimeout(d.getTestCallback(function(){
+								doh.f(dijit.byId("submitButton").get("disabled"));
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "initialFormValid2",
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(function(){
+								dojo.byId("birth").focus();
+								dijit.byId('birth').set('value', null); 
+							});
+							doh.robot.typeKeys("1/1/2010", 1, 1200);
+
+							doh.robot.sequence(function(){
+								dojo.byId("disable").focus();
+								dojo.byId("disable").click();
+							}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId("submitButton").get("disabled"));
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "initialFormInvalid3",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dojo.byId("enable").focus();
+							dojo.byId("enable").click();
+
+							setTimeout(d.getTestCallback(function(){
+								doh.t(dijit.byId("submitButton").get("disabled"));
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "moreFieldsInvalid",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dojo.byId("reset").focus();
+							dojo.byId("reset").click();
+
+							dojo.byId("addMoreFields").focus();
+							dijit.byId("addMoreFields").onClick();
+
+							setTimeout(d.getTestCallback(function(){
+								doh.t(dijit.byId("submitButton").get("disabled"));
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "moreFieldsValid",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(function(){ dojo.byId("lastName").focus(); });
+							doh.robot.typeKeys("my last name", 1, 1800);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(dijit.byId("submitButton").get("disabled"));
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "moreFieldsInvalid2",
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(function(){
+								dojo.byId("color").focus();
+								dijit.byId('color').set('value', null); 
+							});
+							doh.robot.keyPress(dojo.keys.TAB, 1, {});
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(dijit.byId("submitButton").get("disabled"));
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/MultiSelect.html b/src/main/resources/static/dijit/tests/form/robot/MultiSelect.html
new file mode 100644
index 0000000000000000000000000000000000000000..89d375dfcba768883e217eaea0cf63262964f949
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/MultiSelect.html
@@ -0,0 +1,251 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot MultiSelect Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			function testInverted(allOptions, selected, newSelected){
+				doh.is(allOptions.length, selected.length+newSelected.length); //newSelected + the no longer selected list size should be the same as the length of the whole list
+				dojo.forEach(allOptions, function(option){ //verify the selections were inverted
+					var found;
+					if(option.selected){
+						//it must be in the newSelectedList
+						found=false;
+						dojo.forEach(newSelected, function(ns){
+							if(option.value===ns){
+								found=true;
+							}
+						});
+						doh.t(found);
+					}else{
+						//it better be in the original selected list
+						found=false;
+						dojo.forEach(selected, function(s){
+							if(option.value===s){
+								found=true;
+							}
+						});
+						doh.t(found);
+					}
+				});
+			}
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_MultiSelect.html');
+
+				doh.register("dijit.form.MultiSelect", [
+					{
+						name: "tabInSelect",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var changed = false;
+							dijit.byId("select").set("onChange", function(e){changed = true; });
+
+							dojo.global.scrollTo(0,0);
+							doh.robot.mouseMove(30,30);
+							doh.robot.mouseClick({left:true}, 1000); //tabbing in doesn't work in FF unless we first click on the page first
+
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {}); //Arrowing down will select the element for IE, FF, Safari, & chrome
+							doh.robot.keyPress(dojo.keys.SPACE, 1000, {}); //Space is needed to select the element in opera
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(changed);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "switchRight",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(function(){ 
+								dijit.byId('select').set('value', ['16']);
+							}, 500);
+
+							doh.robot.mouseMoveAt("right", 1000);
+							doh.robot.mouseClick({left:true}, 500);
+
+							var selectedValue2 = "";
+							doh.robot.sequence(function(){ selectedValue2 = dijit.byId('select2').get('value');}, 1000); 
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("16", dijit.byId('select2').value.toString());
+								doh.is("16", selectedValue2[0]);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "switchLeft",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.sequence(function(){ 
+								dijit.byId('select2').set('value', ['3','7','19','47']);
+							}, 500);
+
+							doh.robot.mouseMoveAt("left", 1000);
+							doh.robot.mouseClick({left:true}, 500);
+
+							var selectedValue = "";
+							doh.robot.sequence(function(){ selectedValue = dijit.byId('select').get('value');}, 1000); 
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("3", selectedValue[0]);
+								doh.is("7", selectedValue[1]);
+								doh.is("19", selectedValue[2]);
+								doh.is("47", selectedValue[3]);
+								doh.is("3 7 19 47", dijit.byId('select').value.join(' '));
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "invertSelected",
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//select a block in the first list
+							doh.robot.sequence(function(){ 
+								dijit.byId('select').set('value', ['18','14','12','10']);
+							}, 500);
+
+							//get the selected list
+							var allOptions = "";
+							var selected = "";
+							var newSelected = "";
+							doh.robot.sequence(function(){ 
+								selected = dijit.byId('select').get('value'); 
+								allOptions = dijit.byId('select').domNode.options;
+							}, 1000); 
+
+							doh.robot.mouseMoveAt("i1", 1000);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(function(){ 
+								newSelected = dijit.byId('select').get('value'); 
+							}, 1000); 
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								testInverted(allOptions, selected, newSelected);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "invertSelected2",
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//select random options
+							doh.robot.sequence(function(){ 
+								dijit.byId('select').set('value', ['2','8','14','20','22','32']);
+							}, 500);
+
+							//get the selected list
+							var allOptions = "";
+							var selected = "";
+							var newSelected = "";
+							doh.robot.sequence(function(){ 
+								selected = dijit.byId('select').get('value'); 
+								allOptions = dijit.byId('select').domNode.options;
+							}, 1000); 
+
+							doh.robot.mouseMoveAt("i1", 1000);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(function(){ 
+								newSelected = dijit.byId('select').get('value'); 
+							}, 1000); 
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								testInverted(allOptions, selected, newSelected);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "invertSelected3",
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Select the first thing in the list and then invert it
+							//select random options
+							doh.robot.sequence(function(){ 
+								dijit.byId('select3').set('value', ['TN']);
+							}, 500);
+
+							//get the selected list
+							var allOptions = "";
+							var selected = "";
+							var newSelected = "";
+							doh.robot.sequence(function(){ 
+								selected = dijit.byId('select3').get('value'); 
+								allOptions = dijit.byId('select3').domNode.options;
+							}, 1000); 
+
+							doh.robot.mouseMoveAt("i3", 1000);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(function(){ 
+								newSelected = dijit.byId('select3').get('value'); 
+							}, 1000); 
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								testInverted(allOptions, selected, newSelected);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "setValue",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//Select only one thing in the list to make sure we don't start with the values that we are going to select
+							doh.robot.sequence(function(){ 
+								dijit.byId('select3').set('value', ['CA']);
+							}, 500);
+
+							doh.robot.mouseMoveAt("s1", 1000);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var selected = dijit.byId('select3').get('value');
+								doh.is(2, selected.length);
+								doh.is(selected[0], 'VA');
+								doh.is(selected[1], 'WA');
+								doh.is("VA WA", dijit.byId('select3').value.join(' '));
+							}), 1000);
+							return d;
+						}
+					}
+
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/Select.html b/src/main/resources/static/dijit/tests/form/robot/Select.html
new file mode 100644
index 0000000000000000000000000000000000000000..fcbe453e662e9b7ec9fe5778a05ad50e9f1cdad4
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Select.html
@@ -0,0 +1,912 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>doh.robot Select Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dojo.date");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_Select.html');
+
+				// refs to parts of s1 Select
+				var s1, s1menu, Tenessee, Virginia, Washington,	// s1 select
+					s2, s2menu, s8a, s8a_menu, s8b, s8b_menu, s3, s3_menu;				// long list selects
+
+				// log of calls to onChange handler
+				var changes = [];
+
+				var focus;		// dijit/focus
+
+				doh.register("setup",
+					function setUp(){
+						s1 = dijit.byId('s1');
+						s1_menu = dijit.byId('s1_menu');
+						doh.t(s1, "s1 select exists");
+						doh.t(s1_menu, "s1 menu exists");
+						
+						s2 = dijit.byId('s2');
+						s2_menu = dijit.byId('s2_menu');
+						s8a = dijit.byId('s8a');
+						s8a_menu = dijit.byId('s8a_menu');
+						s8b = dijit.byId('s8b');
+						s8b_menu = dijit.byId('s8b_menu');
+						s3 = dijit.byId('s3');
+						s3_menu = dijit.byId('s3_menu');
+						s13 = dijit.byId('s13');
+						s13_menu = dijit.byId('s13_menu');
+						s14 = dijit.byId('s14');
+						s14_menu = dijit.byId('s14_menu');
+
+						form = dijit.byId('form');
+
+						// preload menus since first load can take a while
+						var doNothing = function(){};
+						s1.loadDropDown(doNothing);
+						dijit.byId('s5').loadDropDown(doNothing);
+						dijit.byId('s6').loadDropDown(doNothing);
+						s8a.loadDropDown(doNothing);
+						s8b.loadDropDown(doNothing);
+
+						// modules in test page
+						focus = dojo.global.require("dijit/focus");
+				    }
+				);
+
+				doh.register("mouse", [
+					{
+						name: "two clicks to select",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// click to open drop down
+							doh.robot.mouseMoveAt(s1.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.t(isVisible(s1_menu), "drop down menu displayed after click");
+								doh.is("true", s1.domNode.getAttribute('aria-expanded'), 'aria-expanded');
+								doh.is("listbox", s1_menu.domNode.getAttribute('role'), 'menu role');
+								doh.is(5, dojo.query("tr", s1_menu.domNode).length, "5 options in menu");
+
+								var selectedOptions = dojo.query(".dijitSelectSelectedOption .dijitMenuItemLabel", s1_menu.domNode);
+								doh.is(1, selectedOptions.length, "one selected option");
+								doh.is("Virginia", innerText(selectedOptions[0]), "Virginia highlighted");
+
+								Washington = dojo.query("tr", s1_menu.domNode)[2];
+								doh.t(Washington, "Washington is another menu choice");
+							}), 1000);
+
+							// select an option in the drop down
+							doh.robot.mouseMoveAt(function(){
+								// function wrapper because Washington isn't defined until about sequence() runs
+								return Washington;
+							}, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.t(isHidden(s1_menu), "clicking choice hides menu");
+								doh.is("false", s1.domNode.getAttribute('aria-expanded'), 'aria-expanded');
+
+								doh.is("Washington", innerText(s1.containerNode), "select shows selected option");
+								doh.is("WA", s1.get("value"), "get(value) after selecting Washington");
+							}), 1000);
+
+							// click to open drop down again
+							doh.robot.mouseMoveAt(s1.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.t(isVisible(s1_menu), "drop down menu displayed after third click");
+
+								var selectedOptions = dojo.query(".dijitSelectSelectedOption .dijitMenuItemLabel", s1_menu.domNode);
+								doh.is(1, selectedOptions.length, "one selected option");
+								doh.is("Washington", innerText(selectedOptions[0]), "Washington highlighted");
+							}), 1000);
+
+							// clicking away should close the drop down
+							doh.robot.mouseMove(10, 10, 500);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden(s1_menu), "clicking away hides menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "mouse down, slide, mouse up",
+						timeout: 15000,
+						setUp: function(){
+							s1.set("value", "VA");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// mouse-down to open drop down
+							doh.robot.mouseMoveAt(s1.domNode, 0, 1);
+							doh.robot.mousePress({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.t(isVisible(s1_menu), "drop down menu displayed after mouse down");
+								doh.is(5, dojo.query("tr", s1_menu.domNode).length, "5 options in menu");
+
+								var selectedOptions = dojo.query(".dijitSelectSelectedOption .dijitMenuItemLabel", s1_menu.domNode);
+								doh.is(1, selectedOptions.length, "one selected option");
+								doh.is("Virginia", innerText(selectedOptions[0]), "Virginia highlighted");
+
+								Washington = dojo.query("tr", s1_menu.domNode)[2];
+								doh.t(Washington, "Washington is another menu choice");
+							}), 1000);
+
+							// select an option in the drop down
+							doh.robot.mouseMoveAt(function(){
+								// function wrapper because Washington isn't defined until above sequence() runs
+								return Washington;
+							}, 0, 1);
+							doh.robot.mouseRelease({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.t(isHidden(s1_menu), "clicking choice hides menu");
+
+								doh.is("Washington", innerText(s1.containerNode), "select shows selected option");
+								doh.is("WA", s1.get("value"), "get(value) after selecting Washington");
+							}), 1000);
+
+							// mouse down to open drop down again
+							doh.robot.mouseMoveAt(s1.domNode, 0, 1);
+							doh.robot.mousePress({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.t(isVisible(s1_menu), "drop down menu displayed after second mouse down");
+
+								var selectedOptions = dojo.query(".dijitSelectSelectedOption .dijitMenuItemLabel", s1_menu.domNode);
+								doh.is(1, selectedOptions.length, "one selected option");
+								doh.is("Washington", innerText(selectedOptions[0]), "Washington highlighted");
+							}), 1000);
+
+							// mouse up away from node should leave drop down open
+							doh.robot.mouseMove(10, 10, 500);
+							doh.robot.mouseRelease({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.t(isVisible(s1_menu), "mouse up away from menu leaves menu open");
+							}), 500);
+
+							// then another mouse click should close it
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden(s1_menu), "clicking on blank screen hides menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "maxHeight",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// open drop down
+							doh.robot.mouseMoveAt(s8a.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.t(isVisible(s8a_menu.domNode), "drop down menu displayed after mouse down");
+
+								var pos = dojo.position(s8a_menu.domNode.parentNode);	// scrollbar on wrapper
+								doh.t(pos.h >= 200, "height at least 200: " + pos.h);
+								doh.t(pos.h < 220, "height including borders not much more than 200: " + pos.h);
+							}), 1000);
+
+							// close drop down
+							doh.robot.mouseMove(10, 10, 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden(s8a_menu), "clicking on blank screen hides menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					// Not sure if this is good or not, but sometimes menu can overlap
+					// the select itself.  In this case, mouse up should leave the menu open
+					{
+						name: "menu overlaps select",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								overlapping = false;
+
+							// open drop down
+							doh.robot.mouseMoveAt(s8b.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.t(isVisible(s8b_menu.domNode), "drop down menu displayed after mouse click");
+
+								var select = dojo.position(s8b.domNode),
+									menu = dojo.position(s8b_menu.domNode);
+								doh.t(menu.h >= 220, "menu has big height: " + menu.h);
+
+								// Sometimes the menu overlaps and (at least on chrome/win) sometimes it doesn't.
+								// Not sure why the behavior changes but not treating it as a bug.
+								overlapping = menu.y < select.y && menu.y+menu.h > select.y+select.h;
+							}), 1000);
+
+							// clicking again should select the option from the menu
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								if(overlapping){
+									doh.t(isHidden(s8b_menu), "clicking again selects something from menu");
+								}
+							}), 1000);
+
+							return d;
+						}
+					}
+
+				]);
+
+				doh.register("keyboard", [
+					{
+						name: "tabIndex",
+						timeout: 10000,
+						setUp: function(){
+							dojo.byId("htmlSelect2").focus();
+							dijit.byId("s2").set("disabled", true);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// tab to s1
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("s1", dojo.global.dijit.focus.curNode.id)
+
+								// Make sure _KeyNavMixin superclass didn't set tabIndex to -1.
+								doh.is("0", dijit.byId("s1").domNode.tabIndex, "tabIndex")
+							}), 1000);
+
+							// tab to button after s1
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("s1button", dojo.global.dijit.focus.curNode.id)
+							}), 1000);
+
+							// tab again should skip disabled s2, and go to s3
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("s3", dojo.global.dijit.focus.curNode.id)
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							dijit.byId("s2").set("disabled", false);
+						}
+					},
+					{
+						name: "selecting",
+						timeout: 9000,
+						setUp: function(){
+							dojo.byId("htmlSelect2").focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							var nextFocused, previousSelectionFocused, wasVisible, stillVisible, widgetFocused;
+
+							// tab to s1
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {});
+							doh.robot.sequence(function(){
+								widgetFocused = dojo.global.dijit.focus.curNode.id == "s1";
+							}, 1000);
+
+							// down arrow to open drop down and focus first item
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.sequence(function(){
+								wasVisible = isVisible(s1_menu);
+								previousSelectionFocused = dojo.query("tr", s1_menu.domNode)[2] == dojo.global.dijit.focus.curNode;
+							}, 1000);
+
+							// down arrow to next menu choice
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.sequence(function(){
+								stillVisible = isVisible(s1_menu);
+								nextFocused = dojo.query("tr", s1_menu.domNode)[3] == dojo.global.dijit.focus.curNode;
+							}, 500);
+
+							// ENTER to select option
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(widgetFocused, "widget focus");
+								doh.t(wasVisible, "drop down menu displayed after down arrow");
+								doh.t(previousSelectionFocused, "focused on previously selected item")
+								doh.t(stillVisible, "drop down menu still displayed");
+								doh.t(nextFocused, "focused on next menu item")
+								doh.t(isHidden(s1_menu), "drop down menu closes after ENTER key");
+								doh.is("FL", s1.get("value"));
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							dijit.byId("s1").set("value", "VA");
+						}
+					},
+					{
+						name: "ESC to close menu",
+						timeout: 9000,
+						setUp: function(){
+							dojo.byId("htmlSelect2").focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							var nextFocused, wasVisible, widgetFocused;
+
+							// tab to s1
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {});
+							doh.robot.sequence(function(){
+								widgetFocused = dojo.global.dijit.focus.curNode.id == "s1";
+							}, 1000);
+
+							// down arrow to open drop down and focus first item
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.sequence(function(){
+								wasVisible = isVisible(s1_menu);
+							}, 1000);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.sequence(function(){
+								nextFocused = dojo.query("tr", s1_menu.domNode)[2] == dojo.global.dijit.focus.curNode;
+							}, 500);
+
+							// ESC to close menu
+							doh.robot.keyPress(dojo.keys.ESCAPE, 500, {});
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(widgetFocused, "widget focus");
+								doh.t(wasVisible, "drop down menu displayed after down arrow");
+								doh.t(nextFocused, "focused next menu item")
+								doh.t(isHidden(s1_menu), "drop down menu closes after ENTER key");
+								doh.is("VA", s1.get("value"), "value unchanged");
+							}), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							dijit.byId("s1").set("value", "VA");
+						}
+					},
+					{
+						name: "single letter search after failed multiple letter search, no dropdown",
+						timeout: 9000,
+						setUp: function(){
+							s2.set("value", "CA");
+							s2.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// c search fails to find CA due to multi-character searching
+							doh.robot.typeKeys("aaaaaaac", 1000, 1200);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("AZ", s2.get("value"), "hidden value");
+								doh.f(isVisible(s2_menu), "no menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "multiple letter search after failed multiple letter search, no dropdown",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// ala suffix fails to find either alabama or alaska due to multi-character searching
+							doh.robot.typeKeys("aaaaaaaaala", 1000, 1400);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("AR", s2.get("value"), "hidden value");
+								doh.f(isVisible(s2_menu), "no menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "multiple letter searching from current, no dropdown",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// search for Alabama
+							doh.robot.typeKeys("al", 1000, 1600); // al search finds alabama
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("AL", s2.get("value"), "hidden value");
+								doh.f(isVisible(s2_menu), "no menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "multiple letter searching find next, no dropdown",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.typeKeys("alas", 1000, 1600); // s search finds alaska
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("AK", s2.get("value"), "hidden value");
+								doh.f(isVisible(s2_menu), "no menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "single letter searching, no dropdown",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// c search finds CA
+							doh.robot.typeKeys("c", 500, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("CA", s2.get("value"), "hidden value");
+								doh.f(isVisible(s2_menu), "no menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "multi letter searching with SPACE, no dropdown",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// c search fails to find CA due to multi-character searching
+							doh.robot.typeKeys("new m", 500, 1200);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("NM", s2.get("value"), "hidden value");
+								doh.f(isVisible(s2_menu), "no menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "single letter searching from dropdown",
+						timeout: 9000,
+						setUp: function(){
+							s2.set("value", "CA");
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// down arrow to open drop down and search with several a's
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.typeKeys("aaaaaaac", 1000, 1200); // c search fails to find CA due to multi-character searching
+
+							// SPACE to close menu
+							doh.robot.keyPress(dojo.keys.SPACE, 1100, {}); // long delay so that multi-letter searching is deactivated
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("AZ", s2.get("value"), "hidden value");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "multiple letter searching no match from dropdown",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// ENTER to open drop down and search with several a's
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.typeKeys("aaaaaaaaala", 1000, 1400); // ala suffix fails to find either alabama or alaska
+
+							// ENTER to close menu
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("AR", s2.get("value"), "hidden value");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "multiple letter searching from current from dropdown",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var wasVisible;
+
+							// SPACE to open drop down and search with several a's
+							doh.robot.keyPress(dojo.keys.SPACE, 500, {});
+							doh.robot.typeKeys("al", 1000, 1600); // al search finds alabama
+							doh.robot.sequence(function(){
+								wasVisible = isVisible(s2_menu);
+							}, 1000);
+
+							// SPACE to close menu
+							doh.robot.keyPress(dojo.keys.SPACE, 1100, {}); // long delay so that multi-letter searching is deactivated
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(wasVisible, "no auto selection");
+								doh.is("AL", s2.get("value"), "hidden value");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "multiple letter searching find next from dropdown",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var wasVisible;
+
+							// down arrow to open drop down and search with several a's
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.typeKeys("alas", 1000, 1600); // s search finds alaska
+							doh.robot.sequence(function(){
+								wasVisible = isVisible(s2_menu);
+							}, 1000);
+
+							// ENTER to close menu
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(wasVisible, "no auto selection");
+								doh.is("AK", s2.get("value"), "hidden value");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "toolbar",
+						timeout: 10000,
+						setUp: function(){
+							dojo.byId("beforeToolbar").focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// tab into toolbar, then arrow to select
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 500, {});
+
+							// select Alabama
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							// go to right toggle button and click it
+							doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.SPACE, 500, {});
+
+							// go to left toggle button and click it
+							doh.robot.keyPress(dojo.keys.LEFT_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.LEFT_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.SPACE, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("AL", dijit.byId("toolbarSelect").get("value"), "select value");
+								doh.t(dijit.byId("toggle1").get("checked"), "first toggle button");
+								doh.t(dijit.byId("toggle2").get("checked"), "second toggle button");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("display", [
+					{
+						name: "empty drop down",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Open widget w/no choices
+							var s6 = dijit.byId("s6");
+							doh.robot.mouseMoveAt(s6.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								var menu = dijit.byId("s6_menu"),
+									trs = dojo.query("tr", menu.domNode);
+								doh.is(1, trs.length, "one entry in menu");
+								doh.is("", innerText(dojo.query(".dijitMenuItemLabel", trs[0])), "blank");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					// Currently (for better or worse) the select's width changes based on which option
+					// is selected.   Make sure that the drop down is wide enough to show all entries,
+					// even when a narrow entry is selected.
+					{
+						name: "width",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var s5 = dijit.byId("s5"),
+								s5_menu = dijit.byId("s5_menu"),
+								menuSize;
+
+							// originally s5 is narrow
+							var s5origSize = dojo.position(s5.domNode);
+
+							// Open drop down menu and make sure it's wider than the select
+							// (to display "no move" and "no copy" choices)
+							doh.robot.mouseMoveAt(s5.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								menuSize = dojo.position(s5_menu.domNode);
+								doh.t(menuSize.w > s5origSize.w, "menu (" + menuSize.w + ") wider than select (" + s5origSize.w + ")");
+							}), 1000);
+
+							// Select last entry in the drop down.   Should make the select wider.
+							doh.robot.mouseMoveAt(function(){
+								return dojo.query("tr", s5_menu.domNode)[4];
+							}, 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								var s5newSize = dojo.position(s5.domNode);
+								doh.t(s5newSize.w > s5origSize.w, "select changed width from " + s5origSize.w + " to " + s5newSize.w);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("required", [
+					function initial_value(){
+						doh.t(!s3.get('value'), "initial blank value");
+						doh.t(!s3.options[0].value, "blank option");
+						doh.t(s3.get('required'), "required");
+						doh.f(s3.isValid(), "should not be valid");
+					},
+					{
+						name: "select blank option",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Open drop down menu
+							doh.robot.mouseMoveAt(s3.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							// Select blank option
+							doh.robot.mouseMoveAt(function(){
+								return dojo.query("tr", s3_menu.domNode)[0];
+							}, 1000, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden(s3_menu), "drop down menu closes after selection");
+								doh.t(!s3.get('value'), "blank value");
+								doh.t(!s3.options[0].value, "blank option");
+								doh.f(s3.isValid(), "should not be valid");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "select option w/ blank present",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Open drop down menu
+							doh.robot.mouseMoveAt(s3.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							// Select 4th option
+							doh.robot.mouseMoveAt(function(){
+								return dojo.query("tr", s3_menu.domNode)[4];
+							}, 1000, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden(s3_menu), "drop down menu closes after selection");
+								doh.is("AZ", s3.get('value'), "Arizona");
+								doh.f(!s3.options[0].value, "no blank option");
+								doh.t(s3.isValid(), "should be valid");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "select option w/o blank present",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Open drop down menu
+							doh.robot.mouseMoveAt(s3.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							// Select 4th option
+							doh.robot.mouseMoveAt(function(){
+								return dojo.query("tr", s3_menu.domNode)[4];
+							}, 1000, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden(s3_menu), "drop down menu closes after selection");
+								doh.is("AR", s3.get('value'), "Arkansas");
+								doh.t(s3.isValid(), "should be valid");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("form submit", [
+					{
+						name: "first validate",
+						timeout: 5000,
+						runTest: function(){
+							// First validate() should focus s13 and display a tooltip.
+							// (s13 is also required, but has a value from previous tests)
+							var d = new doh.Deferred();
+
+							 var handle = dijit.focus.watch("curNode", d.getTestErrback(function(name, oval, nval){
+								if(!nval){ return; }	// ignore spurious event on IE
+								console.log("focused on", nval && (nval.id || nval.innerHTML));
+								doh.is("s13", nval.id, "focused on first required select");
+								handle.unwatch();
+								setTimeout(d.getTestCallback(function(){
+									// Tooltip should appear with error message
+									masterTT = dojo.global.dijit._masterTT;
+									doh.t(masterTT && isVisible(masterTT.domNode), "visible");
+									doh.is("s13", masterTT.aroundNode.id, "tooltip for s13");
+									doh.is("This value is required.", dojo.trim(innerText(masterTT.domNode)));
+								}), 750);
+							}));
+
+							// Validate the form programatically
+							dijit.byId("form").validate();
+
+							return d;
+						}
+					},
+					{
+						name: "select non-blank option for s13",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Open drop down menu
+							doh.robot.mouseMoveAt(s13.domNode, 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							// Select 4th option
+							doh.robot.mouseMoveAt(function(){
+								return dojo.query("tr", s13_menu.domNode)[4];
+							}, 1000, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden(s13_menu), "drop down menu closes after selection");
+								doh.is("AZ", s13.get('value'), "Arizona");
+								doh.t(s13.isValid(), "should be valid");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "revalidate",
+						timeout: 5000,
+						runTest: function(){
+							// Second validate() should focus s14 and display a tooltip
+							var d = new doh.Deferred();
+
+							var handle = dijit.focus.watch("curNode", d.getTestErrback(function(name, oval, nval){
+								if(!nval){ return; }	// ignore spurious event on IE
+								if(nval.id == "submit"){ return; }	// ignore focus onto submit button
+								doh.is("s14", nval.id, "focused on second required select");
+								handle.unwatch();
+								setTimeout(d.getTestCallback(function(){
+									// Tooltip should appear with error message
+									masterTT = dojo.global.dijit._masterTT;
+									doh.t(masterTT && isVisible(masterTT.domNode), "visible");
+									doh.is("s14", masterTT.aroundNode.id, "tooltip for s14");
+									doh.is("This value is required.", dojo.trim(innerText(masterTT.domNode)));
+								}), 750);
+							}));
+
+							// Press button to submit the form
+							doh.robot.mouseMoveAt("submit", 0, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("validation in dialog", [
+					{
+						name: "show and validate dialog",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Show dialog
+							doh.robot.mouseMoveAt("dlg1OpenBtn", 0, 1);
+							doh.robot.mouseClick({left: true}, 500);
+
+							// Clicking validate button should show "required but empty" tooltip on the Select
+							doh.robot.mouseMoveAt("dlg1ValidateBtn", 0, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("dlg1Select", focus.curNode && focus.curNode.id, "focused on select");
+								var masterTT = dijit.Tooltip._masterTT;
+								doh.t(masterTT && isVisible(masterTT.domNode), "tooltip shown");
+							}), 750);
+							return d;
+						}
+					},
+					{
+						name: "hide dialog",
+						timeout: 5000,
+						runTest: function(){
+							// Hiding the dialog should make the validation tooltip disappear
+							var d = new doh.Deferred();
+
+							doh.is("dlg1Select", focus.curNode && focus.curNode.id, "focused on select");
+
+							// Close dialog via ESCAPE key because on FF, robot when run from runTests.html has
+							// problems positioning mouse over the close icon.  It strangely positions a few
+							// hundred pixels above the close icon, perhaps due to the iframes and scrolling.
+							doh.robot.keyPress(dojo.keys.ESCAPE, 500, {});
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isHidden(dojo.byId("dlg1")), "dialog hidden");
+								var masterTT = dijit.Tooltip._masterTT;
+								doh.t(isHidden(masterTT.domNode), "tooltip hidden");
+							}), 750);
+							return d;
+						}
+					},
+					{
+						name: "show again",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Show dialog again.   Presumably focus is already on the open button, so can
+							// keyboard trigger it.
+							doh.robot.keyPress(dojo.keys.SPACE, 500, {});
+
+							// Opening the dialog focuses the select, which is invalid since it's got no value.
+							// Since this is the second time it's being focused, it should popup the tooltip
+							// immediately.
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(isVisible(dojo.byId("dlg1")), "dialog shown again");
+								doh.is("dlg1Select", focus.curNode.id, "focused on select");
+								var masterTT = dijit.Tooltip._masterTT;
+								doh.t(masterTT && isVisible(masterTT.domNode), "tooltip shown");
+							}), 750);
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/SimpleTextarea.html b/src/main/resources/static/dijit/tests/form/robot/SimpleTextarea.html
new file mode 100644
index 0000000000000000000000000000000000000000..53f504a8fb1e050da4825d85d3c8cae23b35df2b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/SimpleTextarea.html
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot SimpleTextArea Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_SimpleTextarea.html');
+
+				doh.register("dijit.form.SimpleTextarea", [
+					{
+						name: "tab",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							dojo.global.scrollTo(0,0);
+							doh.robot.mouseMove(10,10);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {});
+							doh.robot.sequence(function(){ dijit.byId('ta1').set('value', null) }, 1000); 
+							doh.robot.typeKeys("hi", 500, 500);
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("hi", dojo.byId('oc1').value);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "onchange",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var changed = false;
+							dijit.byId("ta1").set("onChange", function(e){console.log(e); changed = true; });
+
+							doh.robot.mouseMoveAt("ta1", 500);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.typeKeys("hello", 500, 1000);
+							
+							//blur to trigger onChange
+							doh.robot.mouseMoveAt("ta2", 500); 
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(changed, "onchange event was not fired");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "maxlength",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var changed = false;
+							dijit.byId("ta1").set("maxLength", "5");
+
+							doh.robot.mouseMoveAt("ta1", 500);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.typeKeys("mississippi", 500, 2000);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("missi", dojo.byId('ta1').value);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "testReset",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("resetButton", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("shichashaw, textarea text baw.", dojo.trim(dojo.byId('ta1').value));
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "testGetValue",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("getValueButton", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is(dojo.byId('gv1').value, dojo.byId('ta1').value);
+							}), 1000);
+							return d;
+						}
+					}
+					,
+					{
+						name: "testNull",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.mouseMoveAt("setNullButton", 500);
+							doh.robot.mouseClick({left:true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("", dojo.byId('ta1').value);
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/Slider_a11y.html b/src/main/resources/static/dijit/tests/form/robot/Slider_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..dd16d67e42fb13790c09a537a685802f73b54005
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Slider_a11y.html
@@ -0,0 +1,351 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>doh.robot Slider Test</title>
+
+	<style>
+		@import "../../../../util/doh/robot/robot.css";
+	</style>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dijit.robotx");
+
+		// These are all the sliders
+		var accessibleSliders = ['slider1','slider2','slider3'];
+		var accessibleSliderInit_min = [0.2,10,2,1200];
+		var accessibleSliderInit_max = [99.8,90,2,2800];
+		var sliderIds = ["slider1", "slider2", "slider3", "sliderH2"];
+		var sliderNames = ["horizontal1","vertical1","horizontal2","horizontalH2"];
+		var onChange = {slider1: 'slider1input', slider2: 'slider2input'};
+
+		function a11yBoundaryTest(slider, initValue, finalValue){
+			// summary:
+			//		Sets slider to initValue, which should be either one below the
+			//		max, or one above the min.
+			//
+			//		Use the arrow key once to get to the final value, and
+			//		then use the arrow key again (value shouldn't change second time)
+
+			var d = new doh.Deferred();
+			var key = initValue < finalValue ? dojo.keys.RIGHT_ARROW : dojo.keys.LEFT_ARROW;
+
+			// Set slider to initial value, one value away from the min or max
+			slider.set('value', initValue, false);
+
+			// Focus the slider
+			slider.focus();
+
+			// First key press moves to either min or max
+			doh.robot.keyPress(key, 500);
+			doh.robot.sequence(d.getTestErrback(function(){
+				doh.is(Number(finalValue).toFixed(1), Number(slider.get('value')).toFixed(1),
+						"value after first " + (key == dojo.keys.RIGHT_ARROW ? "right arrow" : "left arrow"));
+				if(onChange[slider.id]){
+					doh.is(Number(finalValue).toFixed(1), Number(parseFloat(dojo.byId(onChange[slider.id]).value)).toFixed(1),
+						"onchange after first " + (key == dojo.keys.RIGHT_ARROW ? "right arrow" : "left arrow"));
+				}
+
+				// Second key press should have no effect, but confirm it
+				doh.robot.keyPress(key, 500);
+				doh.robot.sequence(d.getTestCallback(function(){
+					doh.is(Number(finalValue).toFixed(1), Number(slider.get('value')).toFixed(1),
+						"value after second " + (key == dojo.keys.RIGHT_ARROW ? "right arrow" : "left arrow"));
+					if(onChange[slider.id]){
+						doh.is(Number(finalValue).toFixed(1), Number(parseFloat(dojo.byId(onChange[slider.id]).value)).toFixed(1),
+						"onchange after second " + (key == dojo.keys.RIGHT_ARROW ? "right arrow" : "left arrow"));
+					}
+				}), 500);
+			}), 500);
+			return d;
+		}
+
+		// machinery for testing keyboard manipulation of sliders
+		var eaVals = [];	// array holding expected values and actual values after arrow etc. keypresses
+		var strokeIndex = 0;
+		var noteChanges;
+
+		function keyStrokeSetup(inSliderId){
+			// summary:
+			//		Populates eaVals[] with expected slider values after each keystroke (in this test),
+			//		and sets up listener to record actual value into same eaVals[] array.
+
+			var slider = registry.byId(inSliderId);
+			eaVals = populateExpected(slider);
+			strokeIndex = 0;
+			noteChanges = dojo.global.dojo.connect(slider, "onChange", function(){
+				eaVals[strokeIndex++].actual = slider.get('value');
+			});
+		}
+
+		function populateExpected(/*Slider Widget*/inSlider){
+			// summary:
+			//		Returns array of expected slider values after each keystroke (in this test)
+
+			var initVal = inSlider.get('value');
+			var eVals = [];
+
+			// The values expected by pressing HOME, right arrow five times,
+			// PgUp twice, PgDn, up arrow twice, down arrow once,
+			// left arrow once, and END.
+			inSlider.set('value', inSlider.minimum, false);
+			eVals.push({stroke: "HOME", expected: inSlider.get('value')});
+			for(var i = 0; i < 5; i++){
+				inSlider._bumpValue(1, false);
+				eVals.push({stroke: "RIGHT", expected: inSlider.get('value')});
+			}
+			for(i = 0; i < 2; i++){
+				inSlider._bumpValue(inSlider.pageIncrement, false);
+				eVals.push({stroke: "PgUp", expected: inSlider.get('value')});
+			}
+			inSlider._bumpValue(-inSlider.pageIncrement, false);
+			eVals.push({stroke: "PgDn", expected: inSlider.get('value')});
+			for(i = 0; i < 2; i++){
+				inSlider._bumpValue(1, false);
+				eVals.push({stroke: "UP", expected: inSlider.get('value')});
+			}
+			inSlider._bumpValue(-1, false);
+			eVals.push({stroke: "DOWN", expected: inSlider.get('value')});
+			inSlider._bumpValue(-1, false);
+			eVals.push({stroke: "LEFT", expected: inSlider.get('value')});
+			inSlider.set('value', inSlider.maximum, false);
+			eVals.push({stroke: "END", expected: inSlider.get('value')});
+
+			// reset <inSlider> back to its initial value, and return
+			inSlider.set('value', initVal, false);
+			return eVals;
+		}
+
+		function a11yTabFocusTest(inSliderId){
+			var d = new doh.Deferred();
+			var slider = registry.byId(inSliderId);
+			var focusCount = 0;
+			var blurCount = 0;
+			var gotFocus = function(){
+				focusCount++;
+			};
+			var lostFocus = function(){
+				blurCount++;
+			};
+			var focusFunc = dojo.global.dojo.connect(slider.focusNode, "onfocus", gotFocus);
+			var blurFunc = dojo.global.dojo.connect(slider.focusNode, "onblur", lostFocus);
+
+			// insure a known focus starting point -- the slider to test.
+			slider.focus();
+
+			// Shift-tab away, tab to, tab away, shift-tab back.
+			doh.robot.keyPress(dojo.keys.TAB, 1000, {
+				shift: true
+			});
+			doh.robot.keyPress(dojo.keys.TAB, 500);
+			doh.robot.keyPress(dojo.keys.TAB, 500);
+			doh.robot.keyPress(dojo.keys.TAB, 500, {
+				shift: true
+			});
+			var checkGotFocus = function(){
+				doh.assertEqual(3, focusCount, slider.id + ": # of times focussed");
+				doh.assertEqual(2, blurCount, slider.id + ": # of times lost focus");
+				dojo.disconnect(focusFunc);
+				dojo.disconnect(blurFunc);
+			};
+			doh.robot.sequence(d.getTestCallback(checkGotFocus), 1000, 500);
+			return d;
+		}
+
+		function a11yKeystrokeTest(inSliderId){
+			var d = new doh.Deferred();
+			var slider = registry.byId(inSliderId);
+			var initVal = slider.get('value');
+			// get focus on slider thumb before pressing keys.
+			slider.focus();
+			doh.robot.sequence(function(){
+				strokeIndex = 0;
+			}, 1000); // insure onChange events have stopped
+			doh.robot.keyPress(dojo.keys.HOME, 200);
+			doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 1000);
+			doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 200);
+			doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 200);
+			doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 200);
+			doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 200);
+			doh.robot.keyPress(dojo.keys.PAGE_UP, 200);
+			doh.robot.keyPress(dojo.keys.PAGE_UP, 500);
+			doh.robot.keyPress(dojo.keys.PAGE_DOWN, 500);
+			doh.robot.keyPress(dojo.keys.UP_ARROW, 500);
+			doh.robot.keyPress(dojo.keys.UP_ARROW, 200);
+			doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+			doh.robot.keyPress(dojo.keys.LEFT_ARROW, 200);
+			doh.robot.keyPress(dojo.keys.END, 200);
+			doh.robot.sequence(d.getTestCallback(function(){
+				dojo.disconnect(noteChanges);
+				slider.set('value', initVal, false);
+				for(var i = 0; i < eaVals.length; i++){
+					doh.assertEqual(eaVals[i].expected, eaVals[i].actual, eaVals[i].stroke + " (" + slider.id + ")");
+				}
+			}), 1000, 500);
+			return d;
+		}
+
+		dojo.ready(function(){
+			doh.robot.initRobot('../test_Slider.html');
+
+			doh.register(function setup(){
+				// get pointer to registry in the iframe
+				registry = doh.robot.window.require("dijit/registry");
+				dfocus = doh.robot.window.require("dijit/focus");
+			});
+
+			// TODO: move to Slider.html
+			// This tests that Slider is structured so that dojo.query can find the hidden input.
+			doh.register("dojo.query() by name",
+				function slider1(){
+					var slider = registry.byId("slider1"),
+						queried = dojo.query("input[name=horizontal1]"),
+						bar = slider.valueNode.parentNode,
+						barWidth = bar.offsetWidth;
+					accessibleSliderInit_min[0] = 100 / (barWidth-1); // discover slider smallest non min value
+					accessibleSliderInit_max[0] = 100 - accessibleSliderInit_min[0]; // discover slider largest non max value
+					doh.is(1, queried.length, "Expected 1 slider with name horizontal1");
+					doh.is(slider.valueNode, queried[0], "Slider's valueNode did not match the one found by dojo.query.");
+				}
+			);
+
+			// This tests that pressing the arrow keys has no effect on a disabled slider
+			// TODO: this doesn't make sense, should just be testing that slider can't get
+			// focus.  (And if it doesn't have focus then testing keystrokes is meaningless)
+			doh.register("disabledTest",{
+				name: accessibleSliders[0]+'_a11y_min',
+				slider: accessibleSliders[0],
+				timeout: 30000,
+				runTest: function(){
+					this.slider = registry.byId(this.slider);
+					this.slider.set('disabled', true);
+					var value = accessibleSliderInit_min[0];
+					return a11yBoundaryTest(this.slider, value, value);
+				}
+			});
+
+			// This tests to make sure that the error keys don't go beyond the min or max values
+			doh.register("a11yBoundaryTest - min", {
+				name: accessibleSliders[0]+'_a11y_min',
+				slider: accessibleSliders[0],
+				timeout: 30000,
+				runTest: function(){
+					this.slider = registry.byId(this.slider);
+					this.slider.set('disabled', false);
+					return a11yBoundaryTest(this.slider, accessibleSliderInit_min[0], this.slider.minimum);
+				}
+			});
+			doh.register("a11yBoundaryTest",{
+				name: accessibleSliders[0]+'_a11y_max',
+				slider: accessibleSliders[0],
+				timeout: 30000,
+				runTest: function(){
+					this.slider = registry.byId(this.slider);
+					return a11yBoundaryTest(this.slider, accessibleSliderInit_max[0], this.slider.maximum);
+				}
+			});
+
+			// keyboard a11y tests (robot) -- tab focus
+			doh.register("a11yTabFocus",
+			[
+				{
+					name: "slider2TabFocus",
+					timeout: 9000,
+					runTest: function(){
+						return a11yTabFocusTest("slider2");
+					}
+				},
+				{
+					name: "slider3TabFocus",
+					timeout: 9000,
+					runTest: function(){
+						return a11yTabFocusTest("slider3");
+					}
+				}
+			]);
+
+			// keyboard a11y tests (robot) -- manipulate slider via keystrokes
+			doh.register("a11yKeystrokes", [
+				{
+					name: "slider1Keystrokes",
+					timeout: 9000,
+					setUp: function(){
+						keyStrokeSetup("slider1");
+					},
+					runTest: function(){
+						return a11yKeystrokeTest("slider1");
+					}
+				},
+				{
+					name: "slider2Keystrokes",
+					timeout: 9000,
+					setUp: function(){
+						keyStrokeSetup("slider2");
+					},
+					runTest: function(){
+						return a11yKeystrokeTest("slider2");
+					}
+				},
+				{
+					name: "disabledTabStop",
+					timeout: 9000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// focus element after slider 2, and disable slider 2
+						doh.robot.window.document.getElementById("slider2input").focus();
+						registry.byId("slider2").set("disabled", true);
+
+						// jump to element before slider 2 (hopefully)
+						doh.robot.keyPress(dojo.keys.TAB, 1000, {
+							shift: true
+						});
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("disableButton", dfocus.curNode.id, "disabled tab stop should be skipped");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					// Check for rounding errors on a fractional slider.
+					name: "fractional value",
+					timeout: 9000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						var slider = registry.byId("fractionalSlider");
+						slider.focus();
+						doh.is("0.28", slider.focusNode.getAttribute("aria-valuenow"), "aria-valuenow #0");
+
+						doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 500);
+						doh.robot.sequence(d.getTestErrback(function(){
+							doh.is("0.3", slider.focusNode.getAttribute("aria-valuenow"), "aria-valuenow #1");
+							doh.is("0.3", slider.get("value"), "get('value') #1");
+							doh.is("0.3", dojo.byId("fractionalSliderInput").value, "value reported in input #1");
+						}), 500);
+
+						doh.robot.keyPress(dojo.keys.LEFT_ARROW, 500);
+						doh.robot.sequence(d.getTestErrback(function(){
+							doh.is("0.28", slider.focusNode.getAttribute("aria-valuenow"), "aria-valuenow #2");
+						}), 500);
+
+						doh.robot.keyPress(dojo.keys.LEFT_ARROW, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("0.26", slider.focusNode.getAttribute("aria-valuenow"), "aria-valuenow #3");
+							doh.is("0.26", slider.get("value"), "get('value') #3");
+							doh.is("0.26", dojo.byId("fractionalSliderInput").value, "value reported in input #3");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/Slider_mouse.html b/src/main/resources/static/dijit/tests/form/robot/Slider_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..485aef26b3193de442126987ece750184f3cfcde
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Slider_mouse.html
@@ -0,0 +1,357 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>doh.robot Slider Test</title>
+
+	<style>
+		@import "../../../../util/doh/robot/robot.css";
+	</style>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dojo.window");
+		dojo.require("dijit.robotx");
+
+		var arrowSliders = ['slider1','slider2'];
+		var arrowSliderInit_min = [0.2,10,1200];
+		var arrowSliderInit_max = [99.8,90,2800];
+		var sliderIds = ["slider1", "slider2", "slider3", "sliderH2"];
+
+		var onChange = {slider1: 'slider1input', slider2: 'slider2input'};
+
+		function boundaryTest(slider, initValue, finalValue){
+			// summary:
+			//		Sets slider to initValue, which should be either one below the
+			//		max, or one above the min.
+			//
+			//		Click the arrow button once to get to the final value, and
+			//		then click the arrow button again (value shouldn't change second time)
+			var d = new doh.Deferred();
+			slider.set('value', initValue);
+			var button = slider._descending ?
+				(initValue<finalValue?slider.decrementButton: slider.incrementButton) :
+				(initValue<finalValue?slider.incrementButton: slider.decrementButton);
+			doh.robot.sequence(function(){
+				dojo.window.scrollIntoView(slider.domNode);
+			},500);
+			doh.robot.mouseMoveAt(button, 500);
+			doh.robot.mouseClick({left: true}, 500);
+			doh.robot.sequence(d.getTestErrback(function(){
+				doh.is(Number(finalValue).toFixed(2), Number(slider.get('value')).toFixed(2));
+				if(onChange[slider.id]){
+					doh.is(Number(finalValue).toFixed(1), Number(parseFloat(dojo.byId(onChange[slider.id]).value)).toFixed(1));
+				}
+				doh.robot.mouseMoveAt(button, 500);
+				doh.robot.mouseClick({left: true}, 500);
+				doh.robot.sequence(d.getTestCallback(function(){
+					doh.is(Number(finalValue).toFixed(2), Number(slider.get('value')).toFixed(2));
+					if(onChange[slider.id]){
+						doh.is(Number(finalValue).toFixed(1), Number(parseFloat(dojo.byId(onChange[slider.id]).value)).toFixed(1));
+					}
+				}), 500);
+			}), 500);
+			return d;
+		}
+
+		function buttonHeldTest(slider, initValue, finalValue){
+			var d = new doh.Deferred();
+			slider.set('value', initValue);
+			var button = slider._descending?(initValue<finalValue?slider.decrementButton: slider.incrementButton): (initValue<finalValue?slider.incrementButton: slider.decrementButton);
+			doh.robot.sequence(function(){
+				dojo.window.scrollIntoView(slider.domNode);
+			},500);
+			doh.robot.mouseMoveAt(button, 500);
+			doh.robot.mousePress({left: true}, 500);
+			doh.robot.mouseRelease({left: true}, 5000);
+			doh.robot.sequence(d.getTestCallback(function(){
+				doh.is(finalValue, new Number(slider.get('value')).toFixed(1));
+				if(onChange[slider.id]){
+					doh.is(finalValue, parseFloat(dojo.byId(onChange[slider.id]).value));
+				}
+			}), 500);
+			return d;
+		}
+
+		function mouseWheelTest(slider, initValue, finalValue){
+			if(slider.discreteValues != Infinity){
+				var d = new doh.Deferred();
+				slider.set('value', initValue);
+				var direction = (finalValue-initValue)/Math.abs(finalValue-initValue);
+				var delta = Math.ceil((slider.discreteValues-1)*Math.abs(doh.robot.mouseWheelSize)/doh.robot.mouseWheelSize);
+				doh.robot.sequence(function(){
+					dojo.window.scrollIntoView(slider.domNode);
+				},500);
+				doh.robot.mouseMoveAt(slider.focusNode, 500);
+				doh.robot.mouseClick({left: true}, 500);
+				doh.robot.mouseWheel(delta*direction, 500, Math.abs(delta)*200);
+				doh.robot.sequence(d.getTestCallback(function(){
+					doh.is(finalValue, new Number(slider.get('value')).toFixed(1));
+					if(onChange[slider.id]){
+						doh.is(finalValue, parseFloat(dojo.byId(onChange[slider.id]).value));
+					}
+				}), 500);
+				return d;
+			}
+		}
+
+		dojo.ready(function(){
+			doh.robot.initRobot('../test_Slider.html');
+
+			doh.register(function setup(){
+				// get pointer to registry in the iframe
+				registry = doh.robot.window.require("dijit/registry");
+			});
+
+			// Test initial values
+			doh.register("initial values", function initialValues(){
+				var slider = registry.byId(arrowSliders[0]),
+					bar = slider.valueNode.parentNode,
+					barWidth = bar.offsetWidth;
+				arrowSliderInit_min[0] = 100 / (barWidth-1); // discover slider smallest non min value
+				arrowSliderInit_max[0] = 100 - arrowSliderInit_min[0]; // discover slider largest non max value
+				doh.is(10, registry.byId("slider1").get("value"), "horizontal1");
+				doh.is(10, registry.byId("slider2").get("value"), "vertical1");
+				doh.is(2, registry.byId("slider3").get("value"), "horizontal2");
+				doh.is(10, registry.byId("sliderH2").get("value"), "sliderH2");
+			});
+
+			doh.register("set('value', ...)", [
+				function valid(){
+					var slider = registry.byId(arrowSliders[0]);
+					slider.set('value', 50);
+					var d = new doh.Deferred();
+					doh.robot.sequence(d.getTestCallback(function(){
+						doh.is(50, parseFloat(dojo.byId(onChange[slider.id]).value));
+					}), 500);
+					return d;
+				},
+				function setToNull(){
+					// No idea why setting to null makes it go to 0 but apparently that's expected behavior
+					var slider = registry.byId(arrowSliders[0]);
+					slider.set('value', null);
+					var d = new doh.Deferred();
+					doh.robot.sequence(d.getTestCallback(function(){
+						doh.is(0, parseFloat(dojo.byId(onChange[slider.id]).value));
+					}), 500);
+					return d;
+				}
+			]);
+
+			// Test that disabled sliders don't respond to mouse clicks (or at least,
+			// the left/right arrow buttons don't)
+			doh.register("disabledTest", [
+				{
+					name: arrowSliders[0]+'_setUp',
+					slider: arrowSliders[0],
+					timeout: 30000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						doh.robot.mouseMoveAt('disableButton',500);
+						doh.robot.mouseClick({left: true}, 500);
+						if(dojo.isMac){
+							// Workaround mac/FF bug where first click doesn't register
+							doh.robot.mouseClick({
+								left: true
+							}, 500);
+						}
+						doh.robot.sequence(function(){ d.callback(true); },500);
+						return d;
+					}
+				},
+				{
+					name: arrowSliders[0]+'_min',
+					slider: arrowSliders[0],
+					timeout: 30000,
+					runTest: function(){
+						this.slider = registry.byId(this.slider);
+						var value = arrowSliderInit_min[0];
+						return boundaryTest(this.slider, value, value);
+					}
+				},
+				{
+					name: arrowSliders[0]+'_tearDown',
+					slider: arrowSliders[0],
+					timeout: 30000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						doh.robot.mouseMoveAt('enableButton',500);
+						doh.robot.mouseClick({left: true}, 500);
+						doh.robot.sequence(function(){ d.callback(true); },500);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("buttonBoundaryTest", [
+				{
+					name: arrowSliders[0]+'_min',
+					slider: arrowSliders[0],
+					timeout: 30000,
+					runTest: function(){
+						this.slider = registry.byId(this.slider);
+						return boundaryTest(this.slider, arrowSliderInit_min[0], this.slider.minimum);
+					}
+				},
+				{
+					name: arrowSliders[0]+'_max',
+					slider: arrowSliders[0],
+					timeout: 30000,
+					runTest: function(){
+						this.slider = registry.byId(this.slider);
+						return boundaryTest(this.slider, arrowSliderInit_max[0], this.slider.maximum);
+					}
+				}
+			]);
+
+			doh.register("buttonHeldTest", [
+				{
+					name: arrowSliders[1]+'_minToMax',
+					slider: arrowSliders[1],
+					timeout: 30000,
+					runTest: function(){
+						this.slider = registry.byId(this.slider);
+						return buttonHeldTest(this.slider, this.slider.minimum, this.slider.maximum);
+					}
+				},
+				{
+					name: arrowSliders[1]+'_maxToMin',
+					slider: arrowSliders[1],
+					timeout: 30000,
+					runTest: function(){
+						this.slider = registry.byId(this.slider);
+						return buttonHeldTest(this.slider, this.slider.maximum, this.slider.minimum);
+					}
+				}
+			]);
+
+			doh.register("mouseWheelTest", [
+				{
+					name: arrowSliders[1]+'_minToMax',
+					slider: arrowSliders[1],
+					timeout: 30000,
+					runTest: function(){
+						this.slider = registry.byId(this.slider);
+						return mouseWheelTest(this.slider, this.slider.minimum, this.slider.maximum);
+					}
+				},
+				{
+					name: arrowSliders[1]+'_maxToMin',
+					slider: arrowSliders[1],
+					timeout: 30000,
+					runTest: function(){
+						this.slider = registry.byId(this.slider);
+						return mouseWheelTest(this.slider, this.slider.maximum, this.slider.minimum);
+					}
+				}
+			]);
+
+			doh.register("general tests", [
+				{
+					name: "slider1",
+					timeout: 5000, // this is the animated slider so there is a 500ms delay
+					runTest: function(){
+						var d = new doh.Deferred();
+						var slider = registry.byId("slider1");
+						slider.set('value', 10);
+						dojo.window.scrollIntoView(slider.domNode);
+						doh.robot.mouseMoveAt(slider.focusNode, 1, 0);
+						doh.robot.mousePress({left: true}, 500);
+						// drag to 20% marker
+						var marker = dojo.query("div[style*='20%']", dojo.byId('dijit_form_HorizontalRule_0'))[0];
+						doh.robot.mouseMoveAt(marker, 500, 0);
+						doh.robot.mouseRelease({left: true}, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+							var value = slider.get('value');
+							doh.t(value >= 19 && value <= 21, "Expected 20-ish, got "+value);
+						}), 1000);
+						return d;
+					}
+				},
+
+				{
+					name: "slider2",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						var slider = registry.byId("slider2");
+						slider.set('value', 10);
+						dojo.window.scrollIntoView(slider.domNode);
+						doh.robot.mouseMoveAt(slider.focusNode, 1, 0);
+						doh.robot.mousePress({left: true}, 500);
+						// drag to 20% marker (Slider is in descending order so it's 100-20=80%)
+						var marker = dojo.query("div[style*='80%']", dojo.byId('dijit_form_VerticalRule_1'))[0];
+						doh.robot.mouseMoveAt(marker, 500, 0);
+						doh.robot.mouseRelease({left: true}, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+							var value = slider.get('value');
+							doh.is(20, value);
+						}), 1000);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("drag tests", [
+				{
+					name: "horizontal",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						var slider = registry.byId("slider1");
+						slider.set('value', 50);
+						dojo.window.scrollIntoView(slider.domNode);
+						doh.robot.mouseMoveAt(slider.focusNode, 1, 0);
+						doh.robot.mousePress({left: true}, 500);
+						doh.robot.mouseMoveAt(slider.incrementButton, 1000, 0);
+						doh.robot.mouseRelease({left: true}, 500);
+						doh.robot.mouseMoveAt(slider.decrementButton, 1000, 0);
+						doh.robot.sequence(d.getTestCallback(function(){
+							var value = slider.get('value');
+							doh.is(value, 100, "Expected max value of 100, got "+value);
+						}), 1000);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("fractional slider test", {
+				// Check for rounding errors on a fractional slider.
+				name: "fractional value",
+				timeout: 9000,
+				runTest: function(){
+					var d = new doh.Deferred();
+					var slider = registry.byId("fractionalSlider");
+					doh.is("0.28", slider.focusNode.getAttribute("aria-valuenow"), "aria-valuenow #0");
+
+					doh.robot.mouseMoveAt(slider.incrementButton, 1000, 0);
+					doh.robot.mouseClick({left: true}, 500);
+					doh.robot.sequence(d.getTestErrback(function(){
+						doh.is("0.3", slider.focusNode.getAttribute("aria-valuenow"), "aria-valuenow #1");
+						doh.is("0.3", slider.get("value"), "get('value') #1");
+						doh.is("0.3", dojo.byId("fractionalSliderInput").value, "value reported in input #1");
+					}), 500);
+
+					doh.robot.mouseMoveAt(slider.decrementButton, 1000, 0);
+					doh.robot.mouseClick({left: true}, 500);
+					doh.robot.sequence(d.getTestErrback(function(){
+						doh.is("0.28", slider.focusNode.getAttribute("aria-valuenow"), "aria-valuenow #2");
+					}), 500);
+
+					doh.robot.mouseClick({left: true}, 500);
+					doh.robot.sequence(d.getTestCallback(function(){
+						doh.is("0.26", slider.focusNode.getAttribute("aria-valuenow"), "aria-valuenow #3");
+						doh.is("0.26", slider.get("value"), "get('value') #3");
+						doh.is("0.26", dojo.byId("fractionalSliderInput").value, "value reported in input #3");
+					}), 500);
+					return d;
+				}
+			});
+
+			doh.run();
+		});
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/Spinner_a11y.html b/src/main/resources/static/dijit/tests/form/robot/Spinner_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..cdd495e0613ae01b91e995f621a7e31feb66986b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Spinner_a11y.html
@@ -0,0 +1,701 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Spinner Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+
+			dojo.ready(function(){
+				var spin1;
+				var spin2;
+				var spin3;
+				var spinnerIds = ["integerspinner1", "integerspinner2", "integertextbox3", "realspinner1"];
+				doh.robot.initRobot('../test_Spinner.html');
+
+				// focus handlers for noticing tab/shift+tab navigation
+				var focusCountZ = 0;
+				var blurCountZ = 0;
+				var countFocus = function(){
+					focusCountZ++;
+				};
+				var countBlur = function(){
+					blurCountZ++;
+				};
+				var focusConnect;
+				var blurConnect;
+				var tabFocusSetup = function(inSpinnerId){
+					var spinner = dijit.byId(inSpinnerId);
+					dijit.byId('integerspinner1').focus();
+					focusCountZ = 0;
+					blurCountZ = 0;
+					focusConnect = spinner.connect(spinner.focusNode, "onfocus", countFocus);
+					blurConnect = spinner.connect(spinner.focusNode, "onblur", countBlur);
+				};
+
+				// Setup to test manipulation of spinner via keystrokes.
+				var results;	// array holding both expected value and actual value after each keypress
+				var strokeIndex = 0;
+				var noteConnect;
+				function keyStrokeSetup(inSpinnerId){
+					// summary:
+					//		Populates results[] with expected values after each keypress.
+					//		Also sets up listener to every keyboard event (arrow key etc) on a spinner and
+					//		records to record the actual spinner values into results[].
+					var spinner = dijit.byId(inSpinnerId);
+					results = populateExpected(spinner);
+					strokeIndex = 0;
+					noteConnect = spinner.connect(spinner.focusNode, "onkeydown", function(){
+						setTimeout(function(){
+							results[strokeIndex].actual = spinner.get('value');
+							strokeIndex++;
+						}, 5);
+					});
+				}
+
+				// Use spinner api to calculate values for a set of keystrokes.
+				// Returns array of expected values.
+				var populateExpected = function(/*Spinner Widget*/inSpinner){
+					var initVal = inSpinner.get('value');
+					var eVals = [];
+					var newVal;
+					var i;
+
+					// The values expected by pressing HOME, right arrow five times,
+					// PgUp twice, PgDn, up arrow twice, down arrow once,
+					// left arrow once, and END.
+					if(inSpinner.constraints.min){
+						inSpinner.set('value', inSpinner.constraints.min);
+					}
+					newVal = inSpinner.get('value');
+					eVals.push({stroke: "HOME", expected: newVal});
+					// UP 5 times
+					for(i = 0; i < 5; i++){
+						newVal = inSpinner.adjust(newVal, inSpinner.smallDelta);
+						inSpinner.set('value', newVal);
+						newVal = inSpinner.get('value');
+						eVals.push({stroke: "UP", expected: newVal});
+					}
+					// PgUp twice
+					for(i = 0; i < 2; i++){
+						newVal = inSpinner.adjust(newVal, inSpinner.largeDelta);
+						inSpinner.set('value', newVal);
+						newVal = inSpinner.get('value');
+						eVals.push({stroke: "PgUp", expected: newVal});
+					}
+					// PgDn once.
+					newVal = inSpinner.adjust(newVal, -inSpinner.largeDelta);
+					inSpinner.set('value', newVal);
+					newVal = inSpinner.get('value');
+					eVals.push({stroke: "PgDn", expected: newVal});
+					// DOWN
+					newVal = inSpinner.adjust(newVal, -inSpinner.smallDelta);
+					inSpinner.set('value', newVal);
+					newVal = inSpinner.get('value');
+					eVals.push({stroke: "DOWN", expected: newVal});
+					// END
+					if(inSpinner.constraints.max){
+						inSpinner.set('value', inSpinner.constraints.max);
+					}
+					newVal = inSpinner.get('value');
+					eVals.push({stroke: "END", expected: newVal});
+
+					// reset <inSpinner> back to its initial value, and return
+					inSpinner.set('value', initVal);
+					return eVals;
+				};
+
+				// execute some test as soon as the widget gets focus
+				var focusThenRun = function(widget, fcn){
+					if(!widget.focused){
+						var handler = widget.connect(widget, '_onFocus', function(){
+							widget.disconnect(handler);
+							setTimeout(fcn, 1);
+						});
+						widget.focus();
+					}else{
+						fcn();
+					}
+				};
+
+				// common robot TAB-focus test function.
+				var a11yTabFocus = function(inSpinnerId){
+					var d = new doh.Deferred();
+					var spinner = dijit.byId(inSpinnerId);
+					focusThenRun(spinner, function(){
+						var handler = spinner.connect(spinner, '_onBlur', function(){
+							spinner.disconnect(handler);
+							setTimeout(function(){
+								handler = spinner.connect(spinner, '_onFocus', function(){
+									spinner.disconnect(handler);
+									setTimeout(function(){
+										handler = spinner.connect(spinner, '_onBlur', function(){
+											spinner.disconnect(handler);
+											setTimeout(function(){
+												handler = spinner.connect(spinner, '_onFocus', function(){
+													spinner.disconnect(handler);
+													setTimeout(d.getTestCallback(function(){
+														spinner.disconnect(focusConnect);
+														spinner.disconnect(blurConnect);
+														doh.is(3, focusCountZ, "# of times focused (" + spinner.id + ")");
+														doh.is(2, blurCountZ, "# of times lost focus (" + spinner.id + ")");
+													}), 1);
+												});
+												doh.robot.keyPress(dojo.keys.TAB, 1, {shift:true}); // refocus
+											}, 1);
+										});
+										doh.robot.keyPress(dojo.keys.TAB, 1); // reblur
+									}, 1);
+								});
+								doh.robot.keyPress(dojo.keys.TAB, 1); // refocus
+							}, 1);
+						});
+						doh.robot.keyPress(dojo.keys.TAB, 1, {shift:true}); // blur
+					});
+					return d;
+				};
+
+				// common robot keystroke test function.
+				var a11yKeystrokeTest = function(inSpinnerId){
+					var d = new doh.Deferred();
+					var spinner = dijit.byId(inSpinnerId);
+					var initVal = spinner.get('value');
+
+					focusThenRun(spinner, function(){
+						doh.robot.keyPress(dojo.keys.HOME, 1);
+						doh.robot.keyPress(dojo.keys.UP_ARROW, 200);
+						doh.robot.keyPress(dojo.keys.UP_ARROW, 200);
+						doh.robot.keyPress(dojo.keys.UP_ARROW, 200);
+						doh.robot.keyPress(dojo.keys.UP_ARROW, 200);
+						doh.robot.keyPress(dojo.keys.UP_ARROW, 200);
+						doh.robot.keyPress(dojo.keys.PAGE_UP, 200);
+						doh.robot.keyPress(dojo.keys.PAGE_UP, 200);
+						doh.robot.keyPress(dojo.keys.PAGE_DOWN, 200);
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 200);
+						doh.robot.keyPress(dojo.keys.END, 200);
+						var testPresses = function(){
+							spinner.disconnect(noteConnect);
+							spinner.set('value', initVal);
+							for(var i = 0; i < results.length; i++){
+								var aResult = results[i];
+								if(!(isNaN(aResult.expected) && isNaN(aResult.actual))){
+									doh.is(aResult.expected, aResult.actual, aResult.stroke);
+								}
+							}
+						};
+						doh.robot.sequence(d.getTestCallback(testPresses), 1000, 1000);
+					});
+					return d;
+				};
+
+				doh.register("setUp",{
+					name: "setUp",
+					timeout: 5000,
+					setUp:function(){
+						spin1 = dijit.byId('integerspinner1');
+						spin2 = dijit.byId('integerspinner2');
+						spin3 = dijit.byId('realspinner1');
+						spin4 = dijit.byId('spinnerMinOnly');
+						safeClick = dojo.byId('form1');
+					},
+					runTest: function(){
+						// assert onChange not fired
+						doh.is("not fired yet!", dojo.byId('oc1').value, "onChange should not have fired");
+
+						// make sure initial values are what we expect
+						doh.is(1, spin1.smallDelta);
+						doh.is(900, spin1.get('value'), "integerspinner1");
+						doh.is(1000, spin2.get('value'), "integerspinner2");
+						doh.is(1.0, spin3.get('value'), "realspinner1");
+						doh.is(1.0, spin4.get('value'), "spinnerMinOnly");
+					}
+				});
+
+				doh.register("dojo.query() input by name",
+					dojo.map(spinnerIds, function(id){
+						return {
+							name: id,
+							spinner: id,
+							spinnerName: id,
+							runTest:function(){
+								this.spinner = dijit.byId(this.spinner);
+								var queried=dojo.query("input[name="+this.spinnerName+"]");
+								doh.is(1, queried.length,"Expected 1 spinner with name "+this.spinnerName+", found "+queried.length);
+								doh.is(this.spinner.valueNode, queried[0],"Spinner's valueNode did not match the one found by dojo.query.");
+							}
+						};
+					})
+				);
+
+				doh.register("a11y", [
+					{
+						name: "spinner2_typematic",
+						timeout: 9000,
+						runTest: function(){
+							// test typematic
+							var d=new doh.Deferred();
+							spin2.set('value', 900);
+							focusThenRun(spin2, function(){
+								doh.robot.keyDown(dojo.keys.DOWN_ARROW, 1);
+								doh.robot.keyUp(dojo.keys.DOWN_ARROW, 5000);
+								doh.robot.sequence(d.getTestCallback(function(){
+									var v = spin2.get('value');
+									doh.t(v <= 800, 'Error in typematic test. Expected <=800, got '+v);
+								}), 1000);
+							});
+							return d;
+						}
+					},
+
+					{
+						name: "spinner2_max",
+						timeout: 5000,
+						runTest: function(){
+							// test max with arrow key
+							var d=new doh.Deferred();
+							spin2.set('value', 1549);
+							focusThenRun(spin2, function(){
+								// press once: should move up
+								doh.robot.keyPress(dojo.keys.UP_ARROW, 1);
+								doh.robot.sequence(d.getTestErrback(function(){
+									doh.is(1550, spin2.get('value'), "value 1: " + spin2.get('value'));
+									doh.is("1550", spin2.focusNode.value, "displayed value 1: " + spin2.focusNode.value);
+									doh.t(spin2.isValid(), "invalid 1");
+									// press again: shouldn't move
+									doh.robot.keyPress(dojo.keys.UP_ARROW, 500);
+									doh.robot.sequence(d.getTestCallback(function(){
+										doh.is(1550, spin2.get('value'), "value 2: " + spin2.get('value'));
+										doh.is("1550", spin2.focusNode.value, "displayed value 2: " + spin2.focusNode.value);
+										doh.t(spin2.isValid(), "invalid 2");
+									}), 500);
+								}), 500);
+							});
+							return d;
+						}
+					},
+
+					{
+						name: "spinner2_min",
+						timeout: 5000,
+						runTest: function(){
+							// test min with arrow key
+							var d=new doh.Deferred();
+							spin2.set('value', 10);
+							focusThenRun(spin2, function(){
+								// press once: should move up
+								doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1);
+								doh.robot.sequence(d.getTestErrback(function(){
+									doh.is(9, spin2.get('value'), "value 1: " + spin2.get('value'));
+									doh.is("9", spin2.focusNode.value, "displayed value 1: " + spin2.focusNode.value);
+									doh.t(spin2.isValid(), "invalid 1");
+									// press again: shouldn't move
+									doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500);
+									doh.robot.sequence(d.getTestCallback(function(){
+										doh.is(9, spin2.get('value'), "value 2: " + spin2.get('value'));
+										doh.is("9", spin2.focusNode.value, "displayed value 2: " + spin2.focusNode.value);
+										doh.t(spin2.isValid(), "invalid 2");
+									}), 500);
+								}), 500);
+							});
+							return d;
+						}
+					},
+
+					{
+						name: "spinner2_invalid",
+						timeout: 3000,
+						runTest: function(){
+							// assert invalid works
+							var d=new doh.Deferred();
+							spin2.set("value", NaN);
+							focusThenRun(spin2, function(){
+								doh.robot.typeKeys("0.5", 1, 600);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.f(spin2.isValid(), "valid");
+								}), 500);
+							});
+							return d;
+						}
+					}
+				]);
+
+				// Test ARIA role.  Since role attribute is set in template,
+				// checking one should be sufficient.
+				doh.register("a11yAriaRole",
+					function spinnerRole(){
+						var spinner = dijit.byId("integerspinner1");
+						doh.isNot(spinner, null, "can't find 'integerspinner1'");
+						doh.is(dojo.attr(spinner.focusNode, "role"), "spinbutton", spinner.id + ": aria role (spinbutton)");
+					}
+				);
+
+				// Check ARIA min/max values.
+				// - both min and max.
+				// - min, no max.
+				// - max, no min.
+				// - neither.
+				doh.register("a11yMinMaxValues",
+					[
+						function minAndMax(){
+							var spinner = dijit.byId("integerspinner2");
+							doh.isNot(spinner, null, "can't find 'integerspinner2'");
+							doh.is(spinner.focusNode.getAttribute("aria-valuemin"), spinner.constraints.min, spinner.id + ": aria-valuemin");
+							doh.is(spinner.focusNode.getAttribute("aria-valuemax"), spinner.constraints.max, spinner.id + ": aria-valuemax");
+						},
+						function minOnly(){
+							var spinner = dijit.byId("spinnerMinOnly");
+							doh.isNot(spinner, null, "can't find 'spinnerMinOnly'");
+							doh.is(spinner.focusNode.getAttribute("aria-valuemin"), spinner.constraints.min, spinner.id + ": aria-valuemin");
+							if(spinner.constraints.max){
+								doh.is(spinner.focusNode.getAttribute("aria-valuemax"), spinner.constraints.max, spinner.id + ": aria-valuemax");
+							}else{
+								if(spinner.focusNode.hasAttribute){		// not available on IE6/7
+									doh.f(spinner.focusNode.hasAttribute("aria-valuemax"), spinner.id + ": aria-valuemax");
+								}
+							}
+						},
+						function maxOnly(){
+							var spinner = dijit.byId("integertextbox3");
+							doh.isNot(spinner, null, "can't find 'integertextbox3'");
+							doh.is(spinner.focusNode.getAttribute("aria-valuemax"), spinner.constraints.max, spinner.id + ": aria-valuemax");
+							if(spinner.constraints.min){
+								doh.is(spinner.focusNode.getAttribute("aria-valuemin"), spinner.constraints.min, spinner.id + ": aria-valuemin");
+							}else{
+								if(spinner.focusNode.hasAttribute){		// not available on IE6/7
+									doh.f(spinner.focusNode.hasAttribute("aria-valuemin"), spinner.id + ": aria-valuemin");
+								}
+							}
+						},
+						function neitherMinNorMax(){
+							var spinner = dijit.byId("integertextbox3");
+							doh.isNot(spinner, null, "can't find 'integertextbox3'");
+							if(spinner.constraints.min){
+								doh.is(spinner.focusNode.getAttribute("aria-valuemin"), spinner.constraints.min, spinner.id + ": aria-valuemin");
+							}else{
+								if(spinner.focusNode.hasAttribute){		// not available on IE6/7
+									doh.f(spinner.focusNode.hasAttribute("aria-valuemin"), spinner.id + ": aria-valuemin");
+								}
+							}
+							if(spinner.constraints.max){
+								doh.is(spinner.focusNode.getAttribute("aria-valuemax"), spinner.constraints.max, spinner.id + ": aria-valuemax");
+							}else{
+								if(spinner.focusNode.hasAttribute){		// not available on IE6/7
+									doh.f(spinner.focusNode.hasAttribute("aria-valuemax"), spinner.id + ": aria-valuemax");
+								}
+							}
+						}
+					]
+				);
+
+				// Loop to test each spinner for aria-valuenow
+				// TODO:
+				//		Is testing one spinner sufficient?
+				//
+				// test aria valuemin, valuemax, valuenow.
+				doh.register("a11yValueNow",
+					dojo.map(spinnerIds, function(id){
+						return {
+							name: id+"_value",
+							spinnerId: id,
+							runTest:function(){
+								var spinner = dijit.byId(this.spinnerId);
+								spinner.set('value', 100);
+								var ariaVal = spinner.focusNode.getAttribute("aria-valuenow");
+								doh.is(100, ariaVal, spinner.id + ": aria-valuenow");
+							}
+						};
+					})
+				);
+
+
+					// test "null" aria-valuenow
+/* Remove null aria-valuenow test until #7866 is resolved
+					doh.register("a11yNullValuenow", {
+						name:spinnerIds[i]+"_nullValueNow",
+						spinnerId:spinnerIds[i],
+						runTest:function(){
+							var spinner = dijit.byId(this.spinnerId);
+							var initVal = spinner.get('value');
+							spinner.set('value', null);
+							var spinnerVal = spinner.get('value');
+							var nowVal = spinner.focusNode.getAttribute("aria-valuenow");
+							var invalid = spinner.focusNode.getAttribute("aria-invalid");
+							spinner.set('value', initVal);
+							doh.t(invalid, spinner.id + ": aria-invalid");
+							if(!(isNaN(spinnerVal) && isNaN(nowVal))){
+								doh.is(spinnerVal, nowVal, spinner.id + ": null aria-valuenow");
+							}
+						}
+					});
+*/
+
+				// a11y tab focus tests (robot)
+				doh.register("a11yTabFocus",
+				[
+					// don't test integerspinner1 since shift-tab from there goes to address bar and the robot doesn't like that at all
+					{
+						name:"integertextbox3TabFocus",
+						timeout:3000,
+						setUp:function(){
+							tabFocusSetup("integertextbox3");
+						},
+						runTest:function(){
+							return a11yTabFocus("integertextbox3");
+						}
+					},
+					{ // test integerspinner2 second since the previous test group already had it focused
+						name:"integerspinner2TabFocus",
+						timeout:3000,
+						setUp:function(){
+							tabFocusSetup("integerspinner2");
+						},
+						runTest:function(){
+							return a11yTabFocus("integerspinner2");
+						}
+					},
+					{
+						name:"realspinner1TabFocus",
+						timeout:3000,
+						setUp:function(){
+							tabFocusSetup("realspinner1");
+						},
+						runTest:function(){
+							return a11yTabFocus("realspinner1");
+						}
+					}
+				]);
+
+				// a11y keystroke tests
+				doh.register("a11yKeystrokes",
+				[
+					{
+						name:"integerspinner1Keystrokes",
+						timeout:9000,
+						setUp:function(){
+							keyStrokeSetup("integerspinner1");
+						},
+						runTest:function(){
+							return a11yKeystrokeTest("integerspinner1");
+						}
+					},
+					{
+						name:"integerspinner2Keystrokes",
+						timeout:9000,
+						setUp:function(){
+							keyStrokeSetup("integerspinner2");
+						},
+						runTest:function(){
+							return a11yKeystrokeTest("integerspinner2");
+						}
+					},
+					{
+						name:"integertextbox3Keystrokes",
+						timeout:9000,
+						setUp:function(){
+							keyStrokeSetup("integertextbox3");
+						},
+						runTest:function(){
+							return a11yKeystrokeTest("integertextbox3");
+						}
+					},
+					{
+						name:"realspinner1Keystrokes",
+						timeout:9000,
+						setUp:function(){
+							keyStrokeSetup("realspinner1");
+						},
+						runTest:function(){
+							return a11yKeystrokeTest("realspinner1");
+						}
+					}
+				]);
+
+				// exponential value keystroke tests
+				doh.register("exponential",
+				[
+					{
+						name: "spinnerMinOnly large exp",
+						timeout: 5000,
+						runTest: function(){
+							var d=new doh.Deferred();
+							spin4.set("value", NaN);
+							focusThenRun(spin4, function(){
+								var handler = spin4.connect(spin4, '_onBlur',
+									function(){
+										spin4.disconnect(handler);
+										setTimeout(d.getTestCallback(function(){
+											doh.f(spin4.isValid(false), "large exponential is invalid");
+											doh.f(spin4.isInRange(false), "large exponential is out of range");
+											doh.is(spin4.getErrorMessage(true), spin4.rangeMessage, "large exponential showing out of range message");
+											doh.is("5e+98", spin4.get('displayedValue'), "large exponential reformatted to standard form");
+										}), 150);
+									});
+								doh.robot.typeKeys("0.5e99", 1, 1200);
+								doh.robot.keyPress(dojo.keys.TAB, 500, {shift:true});
+							});
+							return d;
+						}
+					},
+					{
+						name: "spinnerMinOnly adjust small exp",
+						timeout: 5000,
+						runTest: function(){
+							var d=new doh.Deferred();
+							spin4.set("value", NaN);
+							focusThenRun(spin4, function(){
+								var handler = spin4.connect(spin4, '_onBlur',
+									function(){
+										spin4.disconnect(handler);
+										setTimeout(d.getTestCallback(function(){
+											doh.t(spin4.isValid(false), "small exponential is valid");
+											doh.t(spin4.isInRange(false), "small exponential is in range");
+											doh.is(500000000.1, spin4.get('value'), "small exponential converted to whole number");
+											doh.is("500,000,000.1", spin4.get('displayedValue'), "small exponential converted to whole number with formatting");
+										}), 150);
+									});
+								doh.robot.typeKeys("0.5e9", 1, 1000);
+								doh.robot.keyPress(dojo.keys.UP_ARROW, 500);
+								doh.robot.keyPress(dojo.keys.TAB, 500, {shift:true});
+							});
+							return d;
+						}
+					},
+					{
+						name: "spinnerMinOnly adjust max exp",
+						timeout: 9000,
+						runTest: function(){
+							var d=new doh.Deferred();
+							spin4.set("value", NaN);
+							focusThenRun(spin4, function(){
+								var handler = spin4.connect(spin4, '_onBlur',
+									function(){
+										spin4.disconnect(handler);
+										setTimeout(d.getTestCallback(function(){
+											doh.t(spin4.isValid(false), "large exponential converted to max is valid");
+											doh.t(spin4.isInRange(false), "max value is in range");
+											doh.is(89999999999999.9, spin4.get('value'), "max value (-.1)");
+											doh.is("89,999,999,999,999.9", spin4.get('displayedValue'), "max value (-.1) with formatting");
+										}), 150);
+									});
+								doh.robot.typeKeys("0.5e99", 1, 1200);
+								doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500); // convert to max
+								doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500);
+								doh.robot.keyPress(dojo.keys.TAB, 500, {shift:true});
+							});
+							return d;
+						}
+					}
+				]);
+
+				// invalid editing keystroke tests
+				doh.register("invalid editing",
+				[
+					{
+						name: "HOME key, out of range",
+						timeout: 5000,
+						runTest: function(){
+							var d=new doh.Deferred();
+							spin4.set("value", NaN);
+							focusThenRun(spin4, function(){
+								doh.robot.typeKeys("0.5e99", 1, 1200);
+								doh.robot.keyPress(dojo.keys.HOME, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.t(spin4.isValid(true), "HOME changed large exponential to valid min, value is instead: "+spin4.focusNode.value);
+									doh.t(spin4.isInRange(true), "HOME changed large exponential to in range");
+									doh.is(-10.9, spin4.get('value'), "HOME changed large exponential to min value");
+									doh.is("-10.9", spin4.get('displayedValue'), "HOME changed large exponential to min display");
+								}), 500);
+							});
+							return d;
+						}
+					},
+					{
+						name: "HOME key, invalid",
+						timeout: 9000,
+						runTest: function(){
+							var d=new doh.Deferred();
+							spin4.set("value", NaN);
+							focusThenRun(spin4, function(){
+								doh.robot.typeKeys(".5e9a", 1, 1000);
+								doh.robot.keyPress(dojo.keys.HOME, 500);
+								if(dojo.isMac){
+									doh.robot.keyPress(dojo.keys.LEFT_ARROW, 500, {meta:true});
+								}
+								doh.robot.typeKeys("1", 500, 200);
+								doh.robot.keyPress(dojo.keys.END, 500);
+								if(dojo.isMac){
+									doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 500, {meta:true});
+								}
+								doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.t(spin4.isValid(true), "edited exponential is now valid");
+									doh.is(1.5e+9, spin4.get('value'), "edited exponential");
+								}), 500);
+							});
+							return d;
+						}
+					},
+					{
+						name: "out-of-range formatting",
+						timeout: 5000,
+						runTest: function(){
+							var d=new doh.Deferred();
+							spin3.set("value", NaN);
+							focusThenRun(spin3, function(){
+								var handler = spin3.connect(spin3, '_onBlur',
+									function(){
+										spin3.disconnect(handler);
+										setTimeout(d.getTestCallback(function(){
+											doh.f(spin3.isValid(), "out-of-range is invalid");
+											doh.is('156.0', spin3.get('displayedValue'), "fraction not removed from out-of-range");
+											doh.is(156, spin3.get('value'), "out-of-range number returns number");
+										}), 150);
+									});
+								doh.robot.typeKeys("156.0", 1, 1000);
+								doh.robot.keyPress(dojo.keys.TAB, 500);
+							});
+							return d;
+						}
+					}
+				]);
+
+				doh.register("rounding",
+				[
+					{
+						name: "simple",
+						timeout: 5000,
+						runTest: function(){
+							var d=new doh.Deferred();
+							var spinner = dijit.byId("integertextbox3");
+							spinner.set('value', '');
+							focusThenRun(spinner, function(){
+								var handler = spinner.connect(spinner, '_onBlur',
+									function(){
+										spinner.disconnect(handler);
+										setTimeout(d.getTestCallback(function(){
+											doh.t(spinner.isValid(false), "no error when rounding");
+											doh.is(1.234, spinner.get('value'), "value is rounded");
+											doh.is("1.234", spinner.get('displayedValue'), "rounded value correctly displayed");
+										}), 150);
+									});
+								doh.robot.typeKeys("1.2339", 1, 1200);
+								doh.robot.keyPress(dojo.keys.TAB, 500);
+							});
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/Spinner_mouse.html b/src/main/resources/static/dijit/tests/form/robot/Spinner_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..fd44c9d7db9aa34afe97ebcf025639f5d9fe9f81
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Spinner_mouse.html
@@ -0,0 +1,387 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Spinner Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+
+			dojo.ready(function(){
+				var spin1;
+				var spin2;
+				var spin3;
+				var delta=1; // redefine with doh.robot.mouseWheelSize when it is available
+				doh.robot.initRobot('../test_Spinner.html');
+
+				doh.register("setUp",{
+					name: "setUp",
+					timeout: 15000,
+					setUp:function(){
+						spin1=dijit.byId('integerspinner1');
+						spin2=dijit.byId('integerspinner2');
+						spin3=dijit.byId('realspinner1');
+					},
+					runTest: function(){
+						// assert onChange not fired
+						doh.is("not fired yet!", dojo.byId('oc1').value);
+
+						// make sure initial values are what we expect
+						doh.is(1, spin1.smallDelta);
+						doh.is(900, spin1.get('value'), "integerspinner1");
+						doh.is(1000, spin2.get('value'), "integerspinner2");
+						doh.is(1.0, spin3.get('value'), "realspinner1");
+					}
+				});
+
+				doh.register("setvaluetest", [
+					{
+						name: "valid",
+						runTest:function(){
+							spin1.set('value', 400);
+							doh.is(400, spin1.focusNode.value);
+							doh.is(true, spin1.isValid());
+
+						}
+					},
+
+					{
+						name: "null_notrequired",
+						runTest:function(){
+							spin1.set('value', null);
+							spin1.set('required',false);
+							doh.is('', spin1.focusNode.value);
+							doh.is(true, spin1.isValid());
+							doh.is(true, isNaN(spin1.get('value')));
+						},
+						tearDown:function(){
+							spin1.set('required',true);
+							spin1.set('value', 900);
+						}
+					},
+
+					{
+						name: "null_required",
+						runTest:function(){
+							spin1.set('value', null);
+							doh.is('', spin1.focusNode.value);
+							doh.is(false, spin1.isValid());
+							doh.is(true, isNaN(spin1.get('value')));
+						}
+					},
+
+					{
+						name: "spinner1_invalid",
+						timeout: 15000,
+						runTest: function(){
+							// assert invalid works
+							var d=new doh.Deferred();
+							doh.robot.mouseMoveAt(spin1.focusNode, 1, 0);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(function(){
+								spin1.set("value", NaN);
+							}, 500);
+							doh.robot.typeKeys("0.5", 500, 600);
+							doh.robot.sequence(function(){
+								try{
+								// test before user clicks away
+								doh.f(spin1.isValid(), "spin1 is marked as error");
+								doh.robot.keyPress(dojo.keys.TAB, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									// also test after user clicks away
+									doh.f(spin1.isValid(), "spin1 is marked as error");
+								}), 500);
+								}catch(e){d.callback(e);}
+							}, 500);
+							return d;
+						},
+						tearDown:function(){
+							spin1.set('value', 1);
+						}
+					},
+
+					{
+						name: "spinner3_invalid",
+						timeout: 15000,
+						runTest: function(){
+							// assert invalid works
+							var d=new doh.Deferred();
+							doh.robot.mouseMoveAt(spin3.focusNode, 1, 0);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.sequence(function(){
+								spin3.set("value", NaN);
+							}, 500);
+							doh.robot.typeKeys("0.a", 500, 600); // vs 0.5 in spinner1_invalid, spin3 would accept that
+							doh.robot.sequence(function(){
+								try{
+								// test before user clicks away
+								doh.f(spin3.isValid(), "spin3 is marked as error");
+								doh.robot.keyPress(dojo.keys.TAB, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									// also test after user clicks away
+									doh.f(spin3.isValid(), "spin3 is marked as error");
+								}), 500);
+								}catch(e){d.callback(e);}
+							}, 500);
+							return d;
+						},
+						tearDown:function(){
+							spin3.set('value', 1);
+						}
+					}
+				]);
+
+				doh.register("arrowButton", [
+					{
+						name: "spinner1_typematic",
+						timeout: 20000,
+						setUp:function(){
+							spin1.set('value', 900);
+						},
+						runTest: function(){
+							// test typematic
+							var d=new doh.Deferred();
+							doh.robot.mouseMoveAt(spin1.focusNode, 1, 0); // scroll both buttons into view
+							doh.robot.mouseMoveAt(spin1.downArrowNode, 1, 0);
+							doh.robot.mousePress({left:true,  middle:false,  right:false}, 1000);
+							doh.robot.mouseRelease({left:true,  middle:false,  right:false}, 5000); // going too fast overwhelms the CPU and starves the robot thread
+							doh.robot.mousePress({left:true,  middle:false,  right:false}, 500);
+							doh.robot.mouseRelease({left:true,  middle:false,  right:false}, 5000);
+							doh.robot.sequence(d.getTestCallback(function(){
+								var v = spin1.get('value');
+								// also test after user clicks away
+								doh.t(v <= 875, "Error in typematic test. Expected <= 875, got " + v);
+							}), 500);
+							return d;
+						}
+					},
+
+					{
+						name: "spinner1_max",
+						timeout: 15000,
+						setUp:function(){
+							spin1.set('value', 1549);
+						},
+						runTest: function(){
+							// test max with arrow button
+							var d=new doh.Deferred();
+							// press once: should move up
+							doh.robot.mouseMoveAt(spin1.focusNode, 1, 0); // scroll both buttons into view
+							doh.robot.mouseMoveAt(spin1.upArrowNode, 1, 0);
+							doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+							doh.robot.mouseMoveAt('sv1_4', 1, 0);
+							doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is(1550, spin1.get('value'));
+								doh.is("1,550", spin1.focusNode.value);
+								doh.is("1550", dojo.byId('oc1').value);
+								doh.is(true, spin1.isValid());
+								// press again: shouldn't move
+								doh.robot.mouseMoveAt(spin1.upArrowNode, 1, 0);
+								doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+								doh.robot.mouseMoveAt('sv1_4', 1, 0);
+								doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is(1550, spin1.get('value'));
+									doh.is("1,550", spin1.focusNode.value);
+									doh.is("1550", dojo.byId('oc1').value);
+									doh.is(true, spin1.isValid());
+								}), 500);
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "spinner1_min",
+						timeout: 15000,
+						setUp:function(){
+							spin1.set('value', 1);
+						},
+						runTest: function(){
+							// test min with arrow button
+							var d=new doh.Deferred();
+							// press once: should move up
+							doh.robot.mouseMoveAt(spin1.focusNode, 1, 0); // scroll both buttons into view
+							doh.robot.mouseMoveAt(spin1.downArrowNode, 1, 0);
+							doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+							doh.robot.mouseMoveAt('sv1_4', 1, 0);
+							doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is(0, spin1.get('value'));
+								doh.is("0", spin1.focusNode.value);
+								doh.is("0", dojo.byId('oc1').value);
+								doh.is(true, spin1.isValid());
+								// press again: can move since no min
+								doh.robot.mouseMoveAt(spin1.downArrowNode, 1, 0);
+								doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+								doh.robot.mouseMoveAt('sv1_4', 1, 0);
+								doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is(-1, spin1.get('value'));
+									doh.is("-1", spin1.focusNode.value);
+									doh.is("-1", dojo.byId('oc1').value);
+									doh.is(true, spin1.isValid());
+								}), 500);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("mouseWheel", [
+					{
+						name:"spinner1",
+						timeout:5500,
+						setUp:function(){
+							spin1.set('value', 900);
+						},
+						runTest:function(){
+							// get the mouse's delta
+							// note that Spinner spins backwards!
+							delta=-doh.robot.mouseWheelSize;
+							var d=new doh.Deferred();
+							doh.robot.mouseMoveAt(spin1.domNode, 1, 0);
+							doh.robot.mouseClick({left:true}, 500);
+							// wheel up 10 times
+							// this should increase the value by 10
+							// takes 100ms/click
+							doh.robot.mouseWheel(-10, 1000, 1000);
+							doh.robot.sequence(d.getTestCallback(function(){
+								var v=spin1.get('value');
+								doh.is(v, (900+10*delta), "spinner 1: wrong value, expected "+(900+10*delta)+", got "+v);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name:"spinner2",
+						timeout:5500,
+						setUp:function(){
+							spin2.set('value', 1000);
+						},
+						runTest:function(){
+							// test custom delta with mouse wheel
+							// it should increment 10 per mouse wheel
+							var d=new doh.Deferred();
+							doh.robot.mouseMoveAt(spin2.domNode, 1, 0);
+							doh.robot.mouseClick({left:true}, 500);
+							// wheel down 9 times
+							// this should decrease the value by 90
+							// takes 100ms/click
+							doh.robot.mouseWheel(9, 1000, 900);
+							doh.robot.sequence(d.getTestCallback(function(){
+								var v = spin2.get('value');
+								doh.is(v, (1000-90*delta), "spinner 2: wrong value, expected "+(1000-90*delta)+", got "+v);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name:"spinner3",
+						timeout:5500,
+						setUp:function(){
+							spin3.set('value', 1.0);
+						},
+						runTest:function(){
+							// test real number spinner with mouse wheel
+							// it should increment 0.1 per mouse wheel
+							var d=new doh.Deferred();
+							doh.robot.mouseMoveAt(spin3.domNode, 1, 0);
+							doh.robot.mouseClick({left:true}, 500);
+							// wheel up 10
+							// this should increase the value by 1.0
+							// takes 100ms/click
+							doh.robot.mouseWheel(-10, 1000, 1000);
+							doh.robot.sequence(d.getTestCallback(function(){
+								var v = spin3.get('value');
+								doh.is(v, (1.0+delta), "spinner 3: wrong value, expected "+(1.0+delta)+", got "+v);
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "spinner3_max",
+						timeout: 15000,
+						setUp:function(){
+							spin3.set('value', 155-0.1*delta);
+						},
+						runTest: function(){
+							// test max with arrow key
+							var d=new doh.Deferred();
+							// press once: should move up
+							doh.robot.mouseMoveAt(spin3.focusNode, 1, 0);
+							doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+							// wheel up 1; this will increase the value by delta
+							doh.robot.mouseWheel(-1, 500, 1);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is(155.0, spin3.get('value'));
+								doh.is("155.0", spin3.focusNode.value);
+								doh.is(true, spin3.isValid());
+								// press again: shouldn't move
+								doh.robot.mouseMoveAt(spin3.focusNode, 1, 0);
+								doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+								// wheel up 1; this will increase the value by delta
+								doh.robot.mouseWheel(-1, 500, 1);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is(155.0, spin3.get('value'));
+									doh.is("155.0", spin3.focusNode.value);
+									doh.is(true, spin3.isValid());
+								}), 500);
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "spinner3_min",
+						timeout: 15000,
+						setUp:function(){
+							spin3.set('value', -10.9+0.1*delta);
+						},
+						runTest: function(){
+							// test min with arrow key
+							var d=new doh.Deferred();
+							// press once: should move up
+							doh.robot.mouseMoveAt(spin3.focusNode, 1, 0);
+							doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500);
+							doh.robot.mouseWheel(1, 500, 1);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is(-10.9, spin3.get('value'));
+								doh.is("-10.9", spin3.focusNode.value);
+								doh.is(true, spin3.isValid());
+								// press again: shouldn't move
+								doh.robot.mouseMoveAt(spin3.focusNode, 1, 0);
+								doh.robot.mouseClick({left:true,  middle:false,  right:false}, 500);
+								doh.robot.mouseWheel(1, 500, 1);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is(-10.9, spin3.get('value'));
+									doh.is("-10.9", spin3.focusNode.value);
+									doh.is(true, spin3.isValid());
+								}), 500);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/TextBox_onInput.html b/src/main/resources/static/dijit/tests/form/robot/TextBox_onInput.html
new file mode 100644
index 0000000000000000000000000000000000000000..2a5103f0bacefaea3c0afa3cc317f5cc17a24a38
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/TextBox_onInput.html
@@ -0,0 +1,178 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>robot TextBox onInput and _processInput Test</title>
+
+	<style>
+		@import "../../../../util/doh/robot/robot.css";
+	</style>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx",
+			"dojo/aspect", "dojo/json", "dojo/keys", "dojo/on",
+			"dojo/domReady!"
+		], function(doh, robot, aspect, json, keys, on){
+			robot.initRobot('../test_validate.html');
+
+			var widget, registry;
+
+			function nop(){}
+
+			doh.register("onInput", [
+				function setup(){
+					// get pointers to singletons loaded on test page
+					registry = robot.window.require("dijit/registry");
+					widget = registry.byId('q01');
+				},
+				{
+					name: "focus",
+					timeout: 2000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						var handler = on.once(widget.focusNode, "focus", function(){
+							setTimeout(function(){
+								d.resolve();
+							}, 0);
+						});
+						setTimeout(function(){
+							widget.focus();
+						}, 1); // return d before calling focus
+						return d;
+					}
+				},
+				{
+					name: "space",
+					timeout: 2000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						widget.onInput = d.getTestErrback(function(e){
+							var expEvt = expected.shift() || {type: null, charOrCode: null};
+							if(expEvt.type != e.type || expEvt.charOrCode !== e.charOrCode || expEvt.ctrlKey != e.ctrlKey || expEvt.shiftKey != e.shiftKey || expEvt.altKey != e.altKey){
+								widget.onInput = nop;
+								d.getTestCallback(function(){
+									doh.is(expEvt.type, e.type);
+									doh.is(expEvt.charOrCode, e.charOrCode);
+									doh.is(expEvt.ctrlKey, e.ctrlKey);
+									doh.is(expEvt.shiftKey, e.shiftKey);
+									doh.is(expEvt.altKey, e.altKey);
+								})(); // fail asap
+							}else if(expected.length == 0){
+								setTimeout(d.getTestCallback(function(){
+									widget.onInput = nop;
+								}), 100); // wait to see if an extra onInput event arrives
+							}
+						});
+						var expected = [
+							{ type: "keypress", charOrCode: ' ', ctrlKey: false, shiftKey: false, altKey: false }
+						];
+						robot.keyPress(keys.SPACE, 100, {});
+
+						return d;
+					}
+				},
+				{
+					name: "test all",
+					timeout: 9000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						widget.onInput = d.getTestErrback(function(e){
+							var expEvt = expected.shift() || { type: null, charOrCode: null, ctrlKey: false, shiftKey: false, altKey: false };
+							if(expEvt.charOrCode == ' '/*the end sentinel*/ || (expEvt.type != e.type || expEvt.charOrCode !== e.charOrCode || expEvt.ctrlKey != e.ctrlKey || (expEvt.shiftKey != null && expEvt.shiftKey != e.shiftKey) || expEvt.altKey != e.altKey)){
+								widget.onInput = nop;
+								d.getTestCallback(function(){
+									var hint = "Expected: " +
+											json.stringify({ type: expEvt.type, charOrCode: expEvt.charOrCode, ctrlKey: expEvt.ctrlKey, shiftKey: expEvt.shiftKey, altKey: expEvt.altKey }) +
+											", Actual " +
+											json.stringify({ type: e.type, charOrCode: e.charOrCode, ctrlKey: e.ctrlKey, shiftKey: e.shiftKey, altKey: e.altKey });
+									doh.is(expEvt.type, e.type, hint);
+									doh.is(expEvt.charOrCode, e.charOrCode, hint);
+									doh.is(expEvt.ctrlKey, e.ctrlKey, hint);
+									doh.is(expEvt.altKey, e.altKey, hint);
+									doh.t(expEvt.shiftKey == null || expEvt.shiftKey == e.shiftKey, hint);
+								})();
+							}
+						});
+						var expected = [
+							{ type: "keypress", charOrCode: 'a', ctrlKey: false, shiftKey: false, altKey: false },
+							{ type: "keypress", charOrCode: 'Z', ctrlKey: false, shiftKey: true, altKey: false },
+							{ type: "keypress", charOrCode: '0', ctrlKey: false, shiftKey: null, altKey: false },
+							{ type: "keypress", charOrCode: '_', ctrlKey: false, shiftKey: null, altKey: false },
+							{ type: "keypress", charOrCode: '-', ctrlKey: false, shiftKey: null, altKey: false },
+							{ type: "keypress", charOrCode: '+', ctrlKey: false, shiftKey: null, altKey: false },
+							{ type: "keypress", charOrCode: '=', ctrlKey: false, shiftKey: null, altKey: false },
+							{ type: "keypress", charOrCode: '/', ctrlKey: false, shiftKey: null, altKey: false },
+							{ type: "keypress", charOrCode: '*', ctrlKey: false, shiftKey: null, altKey: false },
+							{ type: "keypress", charOrCode: '.', ctrlKey: false, shiftKey: null, altKey: false },
+							{ type: "keypress", charOrCode: 'Q', ctrlKey: false, shiftKey: true, altKey: false },
+							{ type: "keydown", charOrCode: 'C', ctrlKey: true, shiftKey: false, altKey: false },
+							{ type: "keydown", charOrCode: keys.RIGHT_ARROW, ctrlKey: false, shiftKey: false, altKey: false },
+							{ type: "keydown", charOrCode: keys.ENTER, ctrlKey: true, shiftKey: false, altKey: true },
+							{ type: "keydown", charOrCode: keys.TAB, ctrlKey: false, shiftKey: false, altKey: false },
+							{ type: "keypress", charOrCode: ' ', ctrlKey: false, shiftKey: false, altKey: false }
+						];
+						robot.typeKeys('aZ0_-+=/*.', 100, 2000);
+						robot.keyPress('q', 200, { shift: true });
+						robot.keyPress('c', 200, { ctrl: true });
+						robot.keyPress(keys.RIGHT_ARROW, 200, {});
+						robot.keyPress(keys.ENTER, 200, { ctrl: true, shift: false, alt: true });
+						robot.keyPress(keys.TAB, 200, {});
+						robot.keyPress(keys.TAB, 500, { shift: true });
+						robot.keyPress(keys.SPACE, 500, {});
+
+						return d;
+					}
+				},
+				{
+					name: "advanced",
+					timeout: 2000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// note: using robot.sequence() to give time for final SPACE key in above test to process
+						robot.sequence(d.getTestErrback(function(){
+							widget.set("value", "");
+							widget.focus();
+
+							// Test that when onInput is overridden and returns false, the character is canceled.
+							// "a" should be ignored and only "b" will appear in the <input> and to
+							// trigger the call to _processInput()
+							widget.onInput = function(evt1){
+								if(evt1.charOrCode == "a"){
+									return false;
+								}
+							};
+
+							// Test that _processInput(evt) is called with the event object after the character has
+							// appeared in the <input>
+							var handle = aspect.after(widget, "_processInput", d.getTestCallback(function(res, args){
+								var evt2 = args[0];
+								handle.remove();
+								doh.is("b", evt2.charOrCode, "charOrCode");
+								doh.is("b", widget.focusNode.value, "widget.focusNode.value");
+							}));
+
+						}), 100);
+
+						robot.keyPress("a", 100, {});
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("", widget.focusNode.value, "widget.focusNode.value");
+						}), 100);
+
+						robot.keyPress("b", 100, {});
+
+						return d;
+					}
+				}
+			]);
+			doh.run();
+		});
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/Textarea.html b/src/main/resources/static/dijit/tests/form/robot/Textarea.html
new file mode 100644
index 0000000000000000000000000000000000000000..cb1df84688b63d3ebb737630247db4c8d7a0106e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/Textarea.html
@@ -0,0 +1,326 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>robot Textarea Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom-geometry", "dojo/keys", "dojo/sniff",
+				"dojo/domReady!"
+			], function(doh, robot, domGeom, keys, has){
+				robot.initRobot('../test_Textarea.html');
+
+				// execute some test as soon as the widget gets focus
+				function focusThenRun(widget, fcn){
+					if(!widget.focused){
+						var handle = widget.on('focus', function(){
+							handle.remove();
+							setTimeout(fcn, 1);
+						});
+						widget.focus();
+					}else{
+						fcn();
+					}
+				}
+
+				doh.register("init", function init(){
+					registry = robot.window.require("dijit/registry");
+
+					// Wait for Textarea widgets to size themselves... it's done on a setTimeout(func, 0)
+					var d = new doh.Deferred();
+					setTimeout(function(){
+						d.callback(true);
+					}, 100);
+					return d;
+				});
+
+				doh.register("height tests", [
+					{
+						name: "initial height",
+						runTest: function(){
+							var blank = domGeom.getMarginBox("blank").h,
+							large = domGeom.getMarginBox("largeTextArea").h;
+							doh.t(blank > 8, "blank: " + blank);
+							doh.t(large > blank, "blank: " + blank + ", large: " + large);
+						}
+					},
+					{
+						name: "expansion/contraction by newline",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								w = registry.byId("blank"),
+								height1 = domGeom.getMarginBox(w.domNode).h,
+								height2, height3;
+
+							focusThenRun(w, function(){
+								// Test expand on newline
+								robot.typeKeys('Row of text.', 1, 2000);
+								robot.keyPress(keys.ENTER, 100, {});
+								robot.keyPress(keys.ENTER, 100, {});
+								robot.sequence(d.getTestErrback(function(){
+									height2 = domGeom.getMarginBox(w.domNode).h;
+								}), 1000);
+
+								// Test shrink on delete of newline
+								robot.keyPress(keys.BACKSPACE, 200, {});
+								robot.sequence(d.getTestCallback(function(){
+									height3 = domGeom.getMarginBox(w.domNode).h;
+									doh.t(height2 > height1, "height ("+height2+") should have increased from " + height1);
+									doh.t(height3 < height2, "height ("+height3+") should have decreased from " + height2);
+								}), 1000);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "expansion/contraction by word wrap",
+						timeout: 50000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								w = registry.byId("blank"),
+								height1 = domGeom.getMarginBox(w.domNode).h,
+								height2,
+								height3,
+								handler,
+								pos,
+								i = 0,
+								text = 'The quick brown fox jumped over the lazy dog.',
+								typing = true;
+
+							w.set('intermediateChanges', true);
+							// Test expand by wordwrap
+							text = text+text+text+text;
+							// onChange handler enables very fast typing and deleting, but not too fast
+							handler = w.on('change', function(nv){
+								if(typing){
+									pos = nv.indexOf(text);
+									if(pos <= 0){
+										robot.typeKeys(text.substr(i++,1), 1, 0);
+										return;
+									} // still typing
+									height2 = domGeom.getMarginBox(w.domNode).h;
+									typing = false;
+									// Test shrink on delete (backspace) of text
+									robot.keyPress(keys.BACKSPACE, 0, {});
+								}else{
+									if(nv.length > pos){
+										robot.keyPress(keys.BACKSPACE, 0, {});
+										return; // still deleting
+									}
+									handler.remove();
+									robot.sequence(d.getTestCallback(function(){
+										doh.t(height2 > height1, "height ("+height2+") should have increased from " + height1);
+										height3 = domGeom.getMarginBox(w.domNode).h;
+										doh.t(height3 < height2, "height ("+height3+") should have decreased from " + height2);
+									}), 1);
+								}
+							});
+							robot.typeKeys(text.substr(i++,1), 1, 0);
+
+							return d;
+						}
+					},
+					{
+						name: "expansion/contraction by cut/paste",
+						timeout: 9000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								modifier = has("mac") ? {meta: true} : {ctrl: true},
+								w = registry.byId("blank"),
+								height1, height2, height3;
+
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(function(){
+								height1 = domGeom.getMarginBox(w.domNode).h;
+								w.domNode.select();
+							}, 500);
+							// Cut text, height should decrease
+							robot.keyPress("x", 500, modifier);
+							robot.sequence(function(){
+								height2 = domGeom.getMarginBox(w.domNode).h;
+								doh.t(height2 < height1, "height2 (" + height2 + ") < height1 (" + height1 + ")");
+							}, 500);
+
+							// Paste text, height should increase
+							robot.keyPress("v", 500, modifier);
+							robot.keyPress("v", 500, modifier);
+							robot.sequence(d.getTestCallback(function(){
+								height3 = domGeom.getMarginBox(w.domNode).h;
+								doh.t(height3 > height2, "height3 (" + height3 + ") > height2 (" + height2 + ")");
+							}), 500);
+
+							return d;
+						}
+					}
+
+				]);
+
+				doh.register("maxLength",
+					{
+						name: "maxLength",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								ta = registry.byId("simple"),
+								value1, value2, value3;
+
+							focusThenRun(ta, function(){
+								// Limit is 50, and there's text there already, so not all of
+								// these characters will fit; some should be rejected.
+								robot.typeKeys('0123456789', 1, 2000);
+								robot.sequence(function(){
+									value1 = ta.get("value");
+								}, 500);
+
+								// Erase a character
+								robot.keyPress(keys.BACKSPACE, 500, {});
+								robot.sequence(function(){
+									value2 = ta.get("value");
+								}, 500);
+
+								// And try to type a new character, there should be room now,
+								// but just for one character
+								robot.typeKeys('AB', 500, 400);
+								robot.sequence(d.getTestCallback(function(){
+									value3 = ta.get("value");
+									doh.is(50, value1.length, "should have stopped at 50, value is " + value1);
+									doh.is(49, value2.length, "erased a char, value is " + value2);
+									doh.is(50, value3.length, "tried to type 2 chars but only 1 should fit, value is " + value3);
+								}), 500);
+							});
+
+							return d;
+						}
+					});
+				doh.register("min/max height", [
+					{
+						name: "initial height",
+						timeout: 1000,
+						runTest: function(){
+							var w = registry.byId("programmatic");
+							var h = w.domNode.offsetHeight;
+							doh.t(h > 64, "initial 3 line height " + h);
+						}
+					},
+					{
+						name: "#13166",
+						timeout: 5000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								w = registry.byId("programmatic");
+
+							focusThenRun(w, function(){
+								var h = w.domNode.offsetHeight;
+								robot.keyPress(keys.SPACE, 500, {});
+								robot.sequence(d.getTestCallback(function(){
+									doh.is(0, w.domNode.scrollTop, "no scroll");
+									doh.is(h, w.domNode.offsetHeight, "height should not change");
+								}), 500);
+							});
+
+							return d;
+						}
+					},
+					{
+						name: "less than max-height",
+						timeout: 5000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								w = registry.byId("programmatic");
+
+							var h = w.domNode.offsetHeight;
+							w.set('value', '');
+							doh.t(h > w.domNode.offsetHeight, "min-height is smaller than 3 lines: " + w.domNode.offsetHeight);
+							doh.t(40 < w.domNode.offsetHeight, "min-height is at least 1 line: " + w.domNode.offsetHeight);
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(0, w.domNode.scrollTop, "no scroll");
+								doh.t(h < w.domNode.offsetHeight, "height grew " + w.domNode.offsetHeight);
+								if(has("ie") <= 7){
+									doh.t(w.domNode.parentNode.parentNode.clientHeight >= w.domNode.parentNode.parentNode.scrollHeight, "non-scrolled parent");
+								}
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "more than max-height",
+						timeout: 5000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								w = registry.byId("programmatic");
+
+							var h = w.domNode.offsetHeight;
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								if(has("ie") <= 6){
+									doh.is(0, w.domNode.scrollTop, "no scroll");
+									doh.t(w.domNode.parentNode.parentNode.clientHeight < w.domNode.parentNode.parentNode.scrollHeight, "scrolled parent");
+								}else{
+									doh.isNot(0, w.domNode.scrollTop, "scroll");
+								}
+								doh.t(h < w.domNode.offsetHeight, "height grew " + w.domNode.offsetHeight);
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "delete until less than max-height",
+						timeout: 5000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								w = registry.byId("programmatic");
+
+							var h = w.domNode.offsetHeight;
+							robot.keyPress(keys.BACKSPACE, 500, {});
+							robot.keyPress(keys.BACKSPACE, 500, {});
+							robot.keyPress(keys.BACKSPACE, 500, {});
+							robot.keyPress(keys.BACKSPACE, 500, {});
+							robot.keyPress(keys.BACKSPACE, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(0, w.domNode.scrollTop, "no scroll");
+								if(has("ie") <= 7){
+									doh.t(w.domNode.parentNode.parentNode.clientHeight >= w.domNode.parentNode.parentNode.scrollHeight, "non-scrolled parent");
+								}
+								doh.t(h > w.domNode.offsetHeight, "height shrank " + w.domNode.offsetHeight);
+							}), 500);
+
+							return d;
+						}
+					}
+
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/TimeTextBox.html b/src/main/resources/static/dijit/tests/form/robot/TimeTextBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..c327a5c589a349c131260658500fe088b60b385d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/TimeTextBox.html
@@ -0,0 +1,511 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>doh.robot TimeTextBox Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dojo.date.stamp");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_TimeTextBox.html');
+
+				var w;
+				doh.register("keyboard", [
+					{
+						name: "select",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							w = dijit.byId('q1');
+							dojo.global.formValue = null;
+
+							// focus field... drop down shouldn't open yet
+							w.focus();
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(!popup || isHidden(popup), "popup hidden");
+							}), 500);
+
+							// open drop down
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(popup && isVisible(popup), "popup visible");
+							}), 500);
+
+							// advance from 5:45PM to 6PM
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(popup && isVisible(popup), "popup still visible");
+
+								// for screenreader (and to be like ComboBox), navigated value should be in <input>
+								var val = dojo.date.stamp.toISOString(w.get('value'), {selector: "time"});
+								doh.is("T18:00:00", val, "6PM was selected");
+
+								doh.is(null, dojo.global.formValue, "no form submit");
+							}), 500);
+
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(!popup || isHidden(popup), "popup hidden again");
+
+								var val = dojo.date.stamp.toISOString(w.get('value'), {selector: "time"});
+								doh.is("T18:00:00", val, "6PM was selected");
+
+								doh.is(null, dojo.global.formValue, "no form submit");
+							}), 500);
+
+							// ENTER key while drop down is closed should submit the form
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.isNot(null, dojo.global.formValue, "form was submitted");
+							}), 500);
+
+							return d;
+						},
+						tearDown: function(){
+							// Even if test failed, make sure drop down is closed so it doesn't interfere w/next test
+							w.closeDropDown();
+						}
+					},
+					{
+						name: "select original value",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							w = dijit.byId('q1');
+							dojo.global.formValue = null;
+
+							// focus field... drop down shouldn't open yet
+							w.focus();
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(!popup || isHidden(popup), "popup hidden");
+							}), 500);
+
+							// open drop down
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(popup && isVisible(popup), "popup visible");
+							}), 500);
+
+							// select the initial value
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(!popup || isHidden(popup), "popup hidden again");
+
+								var val = dojo.date.stamp.toISOString(w.get('value'), {selector: "time"});
+								doh.is("T18:00:00", val, "6PM was selected (again)");
+
+								doh.is(null, dojo.global.formValue, "no form submit");
+							}), 500);
+
+							// ENTER key while drop down is closed should submit the form
+							doh.robot.keyPress(dojo.keys.ENTER, 500, {});
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.isNot(null, dojo.global.formValue, "form was submitted");
+							}), 500);
+
+							return d;
+						},
+						tearDown: function(){
+							// Even if test failed, make sure drop down is closed so it doesn't interfere w/next test
+							w.closeDropDown();
+						}
+					},
+					{
+						name: "cancel",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							w = dijit.byId('q1');
+							dojo.global.formValue = null;
+
+							// focus field... drop down shouldn't open yet
+							w.focus();
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(!popup || isHidden(popup), "popup hidden");
+							}), 500);
+
+							// open drop down
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+							doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 100, {}); // needed to prevent FF8 bug: reset on ESC
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(popup && isVisible(popup), "popup visible");
+							}), 500);
+
+							// close drop down
+							doh.robot.keyPress(dojo.keys.ESCAPE, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var popup = dijit.byId('q1_popup');
+								doh.t(!popup || isHidden(popup), "popup hidden again");
+
+								var val = dojo.date.stamp.toISOString(w.get('value'), {selector: "time"});
+								doh.is("T18:00:00", val, "same value as before");
+							}), 500);
+							return d;
+						},
+						tearDown: function(){
+							// Even if test failed, make sure drop down is closed so it doesn't interfere w/next test
+							w.closeDropDown();
+						}
+					},
+					{
+						name: "partial input",
+						timeout: 10000,
+						setUp: function(){
+							// clear the field
+							w = dijit.byId('q2');
+							w.set('value', null, false);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// focus field... drop down shouldn't open yet
+							w.focus();
+							doh.robot.sequence(d.getTestErrback(function(){
+								var popup = dijit.byId('q2_popup');
+								doh.t(!popup || isHidden(popup), "popup hidden");
+							}), 1000);
+
+							// do partial input
+							doh.robot.typeKeys('12', 500, 400);
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								// partial input shouldn't be flagged as an error, because probably
+								// the user just hasn't finished typing yet
+								doh.f(w.isValid(), 'fully invalid');
+								doh.t(w._isValidSubset(), 'partially valid');
+								doh.isNot("Error", w.state, 'no error shown');
+
+								// typing caused drop down to open
+								var popup = dijit.byId('q2_popup');
+								doh.t(popup && isVisible(popup), "popup visible");
+
+								// drop down list should be filtered to times starting with 12:,
+								// and they should appear in chronological order
+								var children = dojo.query(".dijitTimePickerItem", popup.domNode);
+								doh.is(8, children.length, "# of items in drop down");
+								doh.is("12:00 AM", innerText(children[0]));
+								doh.is("12:15 AM", innerText(children[1]));
+								doh.is("12:30 AM", innerText(children[2]));
+								doh.is("12:45 AM", innerText(children[3]));
+								doh.is("12:00 PM", innerText(children[4]));
+								doh.is("12:15 PM", innerText(children[5]));
+								doh.is("12:30 PM", innerText(children[6]));
+								doh.is("12:45 PM", innerText(children[7]));
+							}), 1000);
+
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500, {});
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								// dropdown list should still be filtered
+								var popup = dijit.byId('q2_popup');
+								var children = dojo.query(".dijitTimePickerItem", popup.domNode);
+								doh.is(8, children.length, "# of items in drop down after down arrow keys");
+
+								// for screenreader (and to be like ComboBox), navigated value should be in <input>
+								var val = dojo.date.stamp.toISOString(w.get('value'), {selector: "time"});
+								doh.is("T00:15:00", val, "12:15 was selected");
+
+								// Setup handler to fire when TAB keypress below fires
+								onFocus(d.getTestCallback(function(){
+									var popup = dijit.byId('q2_popup');
+									doh.t(!popup || isHidden(popup), "popup hidden again");
+
+									doh.is("q3", dojo.global.dijit.focus.curNode.id, "tab moved to next input widget");
+								}));
+							}), 1000);
+
+							// tab away to close drop down
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+
+							return d;
+						},
+						tearDown: function(){
+							// Even if test failed, make sure drop down is closed so it doesn't interfere w/next test
+							w.closeDropDown();
+						}
+					},
+					{
+						name: "invalid input",
+						timeout: 10000,
+						setUp: function(){
+							// clear the field
+							w = dijit.byId('q2');
+							w.set('value', null, false);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// focus field... drop down shouldn't open yet
+							w.focus();
+
+							// do partial input
+							doh.robot.typeKeys('12a', 500, 600);
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								// partial input shouldn't be flagged as an error, because probably
+								// the user just hasn't finished typing yet
+								doh.f(w.isValid(), 'fully invalid');
+								doh.f(w._isValidSubset(), 'subset invalid');
+								doh.is("Error", w.state, 'error shown');
+
+								// typing caused drop down to open
+								var popup = dijit.byId('q2_popup');
+								doh.t(popup && isVisible(popup), "popup visible");
+
+								// illegal pattern, so all entries are in the drop down
+								var children = dojo.query(".dijitTimePickerItem", popup.domNode);
+								doh.is(96, children.length, "# of items in drop down");
+							}), 1000);
+
+							// tab away to close drop down
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(w._opened, "drop down closed");
+							}), 500);
+
+							return d;
+						},
+						tearDown: function(){
+							// Even if test failed, make sure drop down is closed so it doesn't interfere w/next test
+							w.closeDropDown();
+						}
+					},
+					{
+						name: "corrected invalid input",
+						timeout: 10000,
+						setUp: function(){
+							// clear the field
+							w = dijit.byId('q2');
+							w.set('value', null, false);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// focus field... drop down shouldn't open yet
+							w.focus();
+
+							// do partial input
+							doh.robot.typeKeys('12a', 500, 600);
+							doh.robot.keyPress(dojo.keys.BACKSPACE, 500, {});
+
+							doh.robot.sequence(d.getTestErrback(function(){
+								// partial input shouldn't be flagged as an error, because probably
+								// the user just hasn't finished typing yet
+								doh.f(w.isValid(), 'fully invalid');
+								doh.t(w._isValidSubset(), 'subset valid');
+								doh.is("Error", w.state, 'error shown');
+
+								// typing caused drop down to open
+								var popup = dijit.byId('q2_popup');
+								doh.t(popup && isVisible(popup), "popup visible");
+
+								// drop down list should be filtered to times starting with 12:,
+								// and they should appear in chronological order
+								var children = dojo.query(".dijitTimePickerItem", popup.domNode);
+								doh.is(8, children.length, "# of items in drop down");
+							}), 1000);
+
+							// tab away to close drop down
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(w._opened, "drop down closed");
+							}), 500);
+
+							return d;
+						},
+						tearDown: function(){
+							// Even if test failed, make sure drop down is closed so it doesn't interfere w/next test
+							w.closeDropDown();
+							console.log("closed drop down for " + w.id)
+						}
+					}
+				]);
+
+				var handler, q5;
+				doh.register("mouse", [
+					{
+						name: "select",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								popup,
+								toClick;
+							w = dijit.byId('q1');
+
+							handler = w.connect(w, 'openDropDown', d.getTestErrback(function(){
+								console.log("drop down opened");
+								w.disconnect(handler);
+								popup = dijit.byId('q1_popup');
+								var wasVisible = popup && isVisible(popup);
+								toClick = dojo.query(".dijitTimePickerItemInner:contains(6:45)", popup.domNode);
+
+								handler = w.connect(w, 'closeDropDown', d.getTestCallback(function(){
+									console.log("drop down closed");
+									doh.t(wasVisible, "popup visible");
+									doh.is(2, toClick.length, "found 6:45am and 6:45pm in drop down");
+									popup = dijit.byId('q1_popup');
+									doh.t(!popup || isHidden(popup), "popup hidden");
+									var val = dojo.date.stamp.toISOString(w.get('value'), {selector: "time"});
+									doh.is("T18:45:00", val, "should be 6:45PM");
+								}));
+
+								// click 6:45pm, thus selecting it and closing drop down
+								doh.robot.mouseMoveAt(function(){return toClick[1]; }, 500, 1);
+								doh.robot.mouseClick({left:true}, 500);
+							}));
+
+							// click down arrow, opening drop down
+							doh.robot.mouseMoveAt(w._buttonNode, 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+
+							return d;
+						},
+						tearDown: function(){
+							w.disconnect(handler);
+							w.closeDropDown();
+						}
+					}
+				]);
+
+				var q20;
+				doh.register("disabled", [
+					{
+						name: "disable",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							q20 = dijit.byId('q20');
+
+							q20.set('disabled',true);
+							// click down arrow, but disabled so won't open drop down
+							doh.robot.mouseMoveAt(q20._buttonNode, 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.typeKeys('1', 500, 200);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var popup = dijit.byId('q20_popup');
+								doh.t(!popup || isHidden(popup), "popup hidden");
+								var val = dojo.date.stamp.toISOString(q20.get('value'), {selector: "time"});
+								doh.is("T17:45:00", val, "should be 5:45PM");
+							}), 1000);
+							return d;
+						},
+						tearDown: function(){
+							q20.set('disabled',false);
+							q20.closeDropDown();
+						}
+					},
+					{
+						name: "readOnly",
+						timeout: 6000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							q20 = dijit.byId('q20');
+
+							q20.set('readOnly',true);
+							// click down arrow, but readonly so won't open drop down
+							doh.robot.mouseMoveAt(q20._buttonNode, 500, 1);
+							doh.robot.mouseClick({left:true}, 500);
+							doh.robot.typeKeys('1', 500, 200);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								var popup = dijit.byId('q20_popup');
+								doh.t(!popup || isHidden(popup), "popup hidden");
+								var val = dojo.date.stamp.toISOString(q20.get('value'), {selector: "time"});
+								doh.is("T17:45:00", val, "should be 5:45PM");
+							}), 1000);
+							return d;
+						},
+						tearDown: function(){
+							q20.set('readOnly',false);
+							q20.closeDropDown();
+						}
+					}
+				]);
+
+				var q21;
+				doh.register("Regression tests for 18201", [
+					{
+						name: "set Date value",
+						timeout: 1000,
+						runTest: function(){
+							var q21 = dijit.byId("q21"),
+								testDate = new Date();
+
+							q21.set('value', testDate);
+							var value = q21.get('value');
+							doh.assertTrue(value != null, "Unable to set Date value");
+						}
+					},
+					{
+						name: "compare Date value",
+						timeout: 1000,
+						runTest: function(){
+							var q21 = dijit.byId("q21"),
+								testDate = new Date();
+
+							q21.set('value', testDate);
+							var widgetDate = q21.get('value');
+							doh.assertEqual(0, q21.compare(testDate, widgetDate), "Invalid date comparison")
+						}
+					}
+				]);
+
+				doh.register("limited drop down range", {
+					name: "9 to 5",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						w = dijit.byId('q22');
+
+						// open drop down
+						w.focus();
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000, {});
+						doh.robot.sequence(d.getTestCallback(function(){
+							var popup = dijit.byId('q22_popup');
+							doh.t(isVisible(popup), "popup visible");
+							doh.is(9, popup.containerNode.children.length, "# of entries in drop down")
+						}), 500);
+
+						return d;
+					},
+					tearDown: function(){
+						// Even if test failed, make sure drop down is closed so it doesn't interfere w/next test
+						w.closeDropDown();
+					}
+				});
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/ValidationTextBox.html b/src/main/resources/static/dijit/tests/form/robot/ValidationTextBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..818202f75792ad9aa9a22f751cedfe4a7874f939
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/ValidationTextBox.html
@@ -0,0 +1,1585 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>doh.robot Validation Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dojo.on");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_validate.html');
+
+				doh.register("intermediatechanges", {
+					name: "valid",
+					textbox: "q01",
+					timeout: 9000,
+					setUp: function(){
+						this.textbox = dijit.byId(this.textbox);
+						this.textbox.set('value', '');
+						this.textbox.focusNode.focus();
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+						var onChange = dojo.byId('oc1');
+						var keyPressOnTextBox;
+						this.textbox.on("keypress", function(){
+							keypressOnTextbox = true;
+						});
+
+						var keypressOnParent;
+						dojo.on(this.textbox.domNode.parentNode, "keypress", function(){
+							keypressOnParent = true;
+						});
+
+						doh.robot.typeKeys('Testing', 1000, 1400);
+
+						doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+							// test that value changed while typing since intermediateChanges = true
+							doh.is('Testing', this.textbox.focusNode.value, "focusNode value");
+							doh.is('Testing', this.textbox.get('value'), "attr value");
+							doh.is('Testing', onChange.value, "onChange.value");
+
+							// Test that keypress event visible on TextBox but doesn't bubble to TextBox's parent.
+							// This is necessary when a TextBox is inside a Toolbar, which interprets keystrokes
+							// as keyboard search (to the Toolbar's children)
+							doh.t(keypressOnTextbox, "keypressOnTextbox");
+							doh.f(keypressOnParent, "keypressOnParent");
+						})), 1000);
+						return d;
+					}
+				});
+
+				doh.register("allcaps", {
+					name: "valid",
+					textbox: "q02",
+					timeout: 9000,
+					setUp: function(){
+						this.textbox = dijit.byId(this.textbox);
+						this.textbox.set('value', '');
+						this.textbox.focusNode.focus();
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+						doh.robot.typeKeys('Testing', 1000, 1400);
+						doh.robot.sequence(function(){
+							dojo.byId("q01").focus();
+						}, 500);
+						doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+							doh.is('TESTING', this.textbox.focusNode.value, "focusNode.value");
+							doh.is('TESTING', this.textbox.get('value'), "get('value')");
+						})), 1000);
+						return d;
+					}
+				});
+
+				doh.register("aria-invalid", [
+					{
+						name: "initial state",
+						textbox: "fav",
+						timeout: 9000,
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+						},
+						runTest: function(){
+							// Even though it's required, it shouldn't initially be marked invalid
+							doh.is('false', this.textbox.focusNode.getAttribute("aria-invalid"), "aria-invalid");
+						}
+					},
+					{
+						name: "after blur",
+						textbox: "fav",
+						timeout: 9000,
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.keyPress(dojo.keys.TAB, 100, {});
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('true', this.textbox.focusNode.getAttribute("aria-invalid"), "aria-invalid");
+							})), 1000);
+							return d;
+						}
+					},
+					{
+						name: "type invalid value",
+						textbox: "fav",
+						timeout: 9000,
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('abc', 1000, 600);
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('true', this.textbox.focusNode.getAttribute("aria-invalid"), "aria-invalid");
+							})), 1000);
+							return d;
+						}
+					},
+					{
+						name: "type valid value",
+						textbox: "fav",
+						timeout: 9000,
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('abc', 1000, 600);
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('true', this.textbox.focusNode.getAttribute("aria-invalid"), "aria-invalid");
+							})), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("maxlength", [
+					{
+						name: "3chars",
+						textbox: "fav",
+						timeout: 9000,
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('100', 1000, 600);
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								// test that value changed while typing since intermediateChanges = true
+								doh.is('100', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(100, this.textbox.get('value'), "get('value')");
+							})), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "4chars",
+						textbox: "fav",
+						timeout: 9000,
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('1001', 1000, 800);
+							doh.robot.sequence(d.getTestErrback(dojo.hitch(this, function(){
+								// test that value changed while typing since intermediateChanges = true
+								doh.is('100', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(100, this.textbox.get('value'), "get('value')");
+								doh.robot.typeKeys('1', 500, 200);
+								doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+									doh.is('100', this.textbox.focusNode.value, "focusNode.value");
+									doh.is(100, this.textbox.get('value'), "get('value')");
+								})), 500);
+							})), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("errorStyle", [
+					{
+						name: "beforeFocus",
+						textbox: "q04",
+						runTest: function(){
+							this.textbox = dijit.byId(this.textbox);
+							doh.is('Incomplete', this.textbox.get('state'));
+							doh.is(false, this.textbox.isValid(), "isValid()");
+						}
+					},
+
+					{
+						name: "focus",
+						textbox: "q04",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.focusNode.focus();
+							doh.robot.sequence(dojo.hitch(this, function(){
+								dojo.byId("q01").focus();
+							}), 1000);	// time for promptMessage to appear on q04 (IE6 takes a while due to iframe)
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('Error', this.textbox.get('state'));
+								doh.is(false, this.textbox.isValid(), "isValid()");
+							})), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "valid",
+						textbox: "q04",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.focusNode.focus();
+							doh.robot.sequence(d.getTestErrback(dojo.hitch(this, function(){
+								doh.is('Error', this.textbox.get('state'));
+								doh.is(false, this.textbox.isValid(), "isValid()");
+								doh.robot.typeKeys('a', 500, 200);
+								doh.robot.sequence(d.getTestErrback(dojo.hitch(this, function(){
+									doh.is('a', this.textbox.get('value'), "get('value')");
+									doh.is('', this.textbox.get('state'), "state 1");
+									doh.is(true, this.textbox.isValid(), "isValid() 1");
+									dojo.byId("q01").focus();
+									doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+										doh.is('', this.textbox.get('state'), "state 2");
+										doh.is(true, this.textbox.isValid(), "isValid() 2");
+									})), 1000);
+								})), 500);
+							})), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("commaformat", [
+					{
+						name: "beforeFocus",
+						textbox: "q05",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', 3000);
+						},
+						runTest: function(){
+							this.textbox = dijit.byId(this.textbox);
+							doh.is('3,000', this.textbox.focusNode.value, "focusNode.value");
+							doh.is('3000', this.textbox.get('value'), "get('value')");
+							doh.is(true, this.textbox.isValid(), "isValid()");
+						}
+					},
+
+					{
+						name: "focus",
+						timeout: 9000,
+						textbox: "q05",
+						runTest: function(){
+							var d = new doh.Deferred();
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.focusNode.focus();
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								// comma should disappear on click, value shouldn't change
+								doh.is('3,000', this.textbox.focusNode.value, "focusNode.value");
+								doh.is('3000', this.textbox.get('value'), "get('value')");
+								doh.is(true, this.textbox.isValid(), "isValid()");
+							})), 500);
+							return d;
+						}
+					},
+
+					{
+						name: "type_valid_nocomma",
+						timeout: 9000,
+						textbox: "q05",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							var onChange = dojo.byId('oc5');
+							doh.robot.typeKeys('3000', 1000, 800);
+							doh.robot.sequence(d.getTestErrback(dojo.hitch(this, function(){
+								doh.is('3000', this.textbox.focusNode.value, "focusNode.value");
+								doh.is('3000', this.textbox.get('value'), "get('value')");
+								doh.is(true, this.textbox.isValid(), "isValid()");
+								doh.is('NaN', onChange.value);
+								dojo.byId("q01").focus();
+								doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+									doh.is('3,000', this.textbox.focusNode.value, "focusNode.value");
+									doh.is('3000', this.textbox.get('value'), "get('value')");
+									doh.is(true, this.textbox.isValid(), "isValid()");
+									doh.is('3000', onChange.value);
+								})), 1000);
+							})), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "type_valid_comma",
+						timeout: 9000,
+						textbox: "q05",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							var onChange = dojo.byId('oc5');
+							doh.robot.typeKeys('3,000', 1000, 1000);
+							doh.robot.sequence(d.getTestErrback(dojo.hitch(this, function(){
+								doh.is('3,000', this.textbox.focusNode.value, "focusNode.value");
+								doh.is('3000', this.textbox.get('value'), "get('value')");
+								doh.is(true, this.textbox.isValid(), "isValid()");
+								doh.is('NaN', onChange.value);
+								dojo.byId("q01").focus();
+								doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+									doh.is('3,000', this.textbox.focusNode.value, "focusNode.value");
+									doh.is('3000', this.textbox.get('value'), "get('value')");
+									doh.is(true, this.textbox.isValid(), "isValid()");
+									doh.is('3000', onChange.value);
+								})), 1000);
+							})), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "type_invalid_comma",
+						timeout: 9000,
+						textbox: "q05",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							var onChange = dojo.byId('oc5');
+							doh.robot.typeKeys('300,0', 1000, 1000);
+							doh.robot.sequence(d.getTestErrback(dojo.hitch(this, function(){
+								doh.is('300,0', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(undefined, this.textbox.get('value'), "get('value')");
+								doh.is(false, this.textbox.isValid(), "isValid()");
+								doh.is('NaN', onChange.value);
+								dojo.byId("q01").focus();
+								doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+									doh.is('300,0', this.textbox.focusNode.value, "focusNode.value");
+									doh.is(undefined, this.textbox.get('value'), "get('value')");
+									doh.is(false, this.textbox.isValid(), "isValid()");
+									doh.is('undefined', onChange.value);
+								})), 1000);
+							})), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("currencyFormat", [
+					{
+						name: "beforeFocus",
+						textbox: "q08",
+						runTest: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set("value", 54775.53);
+							doh.is('$54,775.53', this.textbox.focusNode.value, "focusNode.value");
+							doh.is('54775.53', this.textbox.get('value'), "get('value')");
+							doh.is(true, this.textbox.isValid(), "isValid()");
+						}
+					},
+
+					{
+						name: "focus",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								// comma should disappear on click, value shouldn't change
+								doh.is('54775.53', this.textbox.focusNode.value, "focusNode.value");
+								doh.is('54775.53', this.textbox.get('value'), "get('value')");
+								doh.is(true, this.textbox.isValid(), "isValid()");
+							})), 500);
+							return d;
+						}
+					},
+
+					{
+						name: "type_valid_number",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							var onChange = dojo.byId('oc8');
+							doh.robot.typeKeys('10000.01', 1000, 1600);
+							doh.robot.sequence(d.getTestErrback(dojo.hitch(this, function(){
+								doh.is('10000.01', this.textbox.focusNode.value, "focusNode.value");
+								doh.is('10000.01', this.textbox.get('value'), "get('value')");
+								doh.is(true, this.textbox.isValid(), "isValid()");
+								doh.is('NaN', onChange.value);
+								dojo.byId("q01").focus();
+								doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+									doh.is('$10,000.01', this.textbox.focusNode.value, "focusNode.value");
+									doh.is('10000.01', this.textbox.get('value'), "get('value')");
+									doh.is(true, this.textbox.isValid(), "isValid()");
+									doh.is('10000.01', onChange.value);
+								})), 1000);
+							})), 1000);
+							return d;
+						}
+					},
+					{
+						name: "type_valid_dollarsign",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							var textbox = this.textbox;
+							var onChange = dojo.byId('oc8');
+							doh.robot.typeKeys('$20000.01', 1000, 1800);
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is('$20000.01', textbox.focusNode.value, "focusNode.value");
+								doh.is(20000.01, textbox.get('value'), "get('value')");
+								doh.is(true, textbox.isValid(), "isValid()");
+								doh.is('NaN', onChange.value);
+								var handler = textbox.connect(textbox, 'onChange',
+									function(){
+										textbox.disconnect(handler);
+										setTimeout(d.getTestCallback(function(){
+											doh.is('$20,000.01', textbox.focusNode.value, "blurred focusNode.value");
+											doh.is(20000.01, textbox.get('value'), "blurred get('value')");
+											doh.is(true, textbox.isValid(), "blurred isValid()");
+											doh.is('20000.01', onChange.value);
+										}), 1);
+									});
+								dojo.byId("q01").focus();
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "missing required decimal",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('123', 1000, 600);
+							doh.robot.sequence(d.getTestErrback(dojo.hitch(this, function(){
+								doh.is('123', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(123, this.textbox.get('value'), "get('value')");
+								doh.f(this.textbox.isValid(), "!isValid()");
+							})), 1000);
+							var textbox = this.textbox;
+							var handler = textbox.connect(textbox, '_onBlur',
+								function(){
+									textbox.disconnect(handler);
+									setTimeout(d.getTestCallback(function(){
+										doh.is('$123.00', textbox.focusNode.value, "focusNode.value");
+										doh.is(123, textbox.get('value'), "get('value')");
+										doh.t(textbox.isValid(), "isValid()");
+									}), 150);
+								});
+							doh.robot.keyPress(dojo.keys.TAB, 1500, {});
+							return d;
+						}
+					},
+					{
+						name: "too few decimal digits",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('123.0', 1000, 1000);
+							doh.robot.sequence(d.getTestErrback(dojo.hitch(this, function(){
+								doh.is('123.0', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(123, this.textbox.get('value'), "get('value')");
+								doh.f(this.textbox.isValid(), "!isValid()");
+							})), 1000);
+							var textbox = this.textbox;
+							var handler = textbox.connect(textbox, '_onBlur',
+								function(){
+									textbox.disconnect(handler);
+									setTimeout(d.getTestCallback(function(){
+										doh.is('$123.00', textbox.focusNode.value, "focusNode.value");
+										doh.is(123, textbox.get('value'), "get('value')");
+										doh.t(textbox.isValid(), "isValid()");
+									}), 150);
+								});
+							doh.robot.keyPress(dojo.keys.TAB, 1500, {});
+							return d;
+						}
+					},
+					{
+						name: "too many decimal digits",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('123.000', 1000, 1400);
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('123.000', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(undefined, this.textbox.get('value'), "get('value')");
+								doh.f(this.textbox.isValid(), "!isValid()");
+							})), 1500);
+							return d;
+						}
+					},
+					{
+						name: "negative decimal",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('-123.00', 1000, 1400);
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('-123.00', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(-123, this.textbox.get('value'), "get('value')");
+								doh.t(this.textbox.isValid(), "isValid()");
+							})), 1500);
+							return d;
+						}
+					},
+					{
+						name: "negative currency",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('($123.00)', 1000, 1600);
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('($123.00)', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(-123, this.textbox.get('value'), "get('value')");
+								doh.t(this.textbox.isValid(), "isValid()");
+							})), 2000);
+							return d;
+						}
+					},
+					{
+						name: "convert negative decimal to negative currency",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('-123.45', 1000, 1400);
+
+							var textbox = this.textbox;
+							var handler = textbox.connect(textbox, '_onBlur',
+								function(){
+									textbox.disconnect(handler);
+									setTimeout(d.getTestCallback(function(){
+										doh.is('($123.45)', textbox.focusNode.value, "focusNode.value");
+										doh.is(-123.45, textbox.get('value'), "get('value')");
+										doh.t(textbox.isValid(), "isValid()");
+									}), 150);
+								});
+							doh.robot.keyPress(dojo.keys.TAB, 100, {});
+							return d;
+						}
+					},
+					{
+						name: "convert negative negative currency to negative decimal",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('($123.45)', 1000, 1800);
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							doh.robot.keyPress(dojo.keys.TAB, 500, {shift:true});
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('-123.45', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(-123.45, this.textbox.get('value'), "get('value')");
+								doh.t(this.textbox.isValid(), "isValid()");
+							})), 1000);
+							return d;
+						}
+					},
+					{
+						name: "exponent not allowed",
+						timeout: 9000,
+						textbox: "q08",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('1.23e0', 1000, 1200);
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							doh.robot.keyPress(dojo.keys.TAB, 500, {shift:true});
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('1.23e0', this.textbox.focusNode.value, "focusNode.value");
+								doh.is(undefined, this.textbox.get('value'), "get('value')");
+								doh.f(this.textbox.isValid(), "!isValid()");
+							})), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("euroformat", {
+					name: "type_1",
+					timeout: 9000,
+					textbox: "q08eur",
+					setUp: function(){
+						this.textbox = dijit.byId(this.textbox);
+						this.textbox.set('value', '');
+						this.textbox.focusNode.focus();
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+						doh.robot.typeKeys('1', 1000, 200);
+						doh.robot.sequence(dojo.hitch(this, function(){
+							dijit.byId('q01').focusNode.focus();
+						}), 500);
+						doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+							doh.is('€1.00', this.textbox.focusNode.value, "focusNode.value");
+							doh.is('1', this.textbox.get('value'), "get('value')");
+							doh.is(true, this.textbox.isValid(), "isValid()");
+						})), 1000);
+						return d;
+					}
+				});
+
+				doh.register("regexp", [
+					{
+						name: "valid",
+						timeout: 9000,
+						textbox: "q22",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('a', 1000, 200);
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('a', this.textbox.focusNode.value, "focusNode.value");
+								doh.is('a', this.textbox.get('value'), "get('value')");
+								doh.is(true, this.textbox.isValid(), "isValid()");
+							})), 500);
+							return d;
+						}
+					},
+
+					{
+						name: "invalid",
+						timeout: 9000,
+						textbox: "q22",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.focusNode.focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+							doh.robot.typeKeys('a ', 1000, 400);
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('a ', this.textbox.focusNode.value, "focusNode.value");
+								doh.is('a ', this.textbox.get('value'), "get('value')");
+								doh.is(false, this.textbox.isValid(), "isValid()");
+							})), 500);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("password", {
+					name: "type",
+					timeout: 9000,
+					textbox: "q23",
+					setUp: function(){
+						this.textbox = dijit.byId(this.textbox);
+						this.textbox.set('value', '');
+						this.textbox.focusNode.focus();
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+						doh.robot.typeKeys('abcdef', 1000, 1200);
+						doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+							doh.is('abcdef', this.textbox.focusNode.value, "focusNode.value");
+							doh.is('abcdef', this.textbox.get('value'), "get('value')");
+						})), 1000);
+						return d;
+					}
+				});
+
+				doh.register("readonly", [
+					{
+						name: "readonly",
+						timeout: 9000,
+						textbox: "q24",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							dojo.byId("mname").focus();
+						},
+						runTest: function(){
+							doh.t(this.textbox.isFocusable(), "readOnly is focusable");
+							var d = new doh.Deferred();
+
+							// Tab into element (readonly *can* be focused, although disabled can't)
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+
+							// typing on a disabled element should have no effect
+							doh.robot.typeKeys('abc', 1000, 600);
+
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is("q24", (dojo.global.dijit.focus.curNode||{}).id, "did focus");
+								doh.is('cannot type here', this.textbox.focusNode.value, "focusNode.value");
+								doh.is('cannot type here', this.textbox.get('value'), "get('value')");
+							})), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "write",
+						timeout: 9000,
+						textbox: "q24",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('value', '');
+							this.textbox.set('readOnly', false);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							//  Click to focus
+							doh.robot.mouseMoveAt(this.textbox.focusNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.typeKeys('abc', 1000, 600);
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is('abc', this.textbox.focusNode.value, "focusNode.value");
+								doh.is('abc', this.textbox.get('value'), "get('value')");
+							})), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("disabled", [
+					{
+						name: "click doesn't focus",
+						timeout: 9000,
+						setUp: function(){
+							this.textbox = dijit.byId("q24");
+							dojo.byId("mname").focus();
+							this.textbox.set('disabled', true);
+						},
+						runTest: function(){
+							doh.f(this.textbox.isFocusable(), "disabled is not focusable");
+							var d = new doh.Deferred();
+
+							//  Clicking shouldn't have any effect since it's disabled
+							doh.robot.mouseMoveAt(this.textbox.focusNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.isNot("q24", (dojo.global.dijit.focus.curNode||{}).id, "didn't focus");
+							})), 500);
+							return d;
+						}
+					},
+
+					{
+						name: "tab jumps over",
+						timeout: 9000,
+
+						setUp: function(){
+							var textbox = dijit.byId("q24");
+							dojo.byId("mname").focus();
+							textbox.set('disabled', true);
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.robot.keyPress(dojo.keys.TAB, 500);
+
+							doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+								doh.is("q26", dojo.global.dijit.focus.curNode.id,
+										"tabbed past input, to the button after it");
+							})), 500);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("selectOnClick", [
+					{
+						name: "1 click does highlight",
+						timeout: 9000,
+						setUp: function(){
+							dijit.byId("q02").focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred(),
+								textbox = dijit.byId("q01");
+
+							textbox.set('value', 'Testing');
+							doh.robot.mouseMoveAt(textbox.focusNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							doh.robot.typeKeys("abc", 1000, 600);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("Abc", textbox.get('value'), "was highlighted");
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "2 clicks doesn't highlight",
+						timeout: 9000,
+						setUp: function(){
+							dijit.byId("q02").focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred(),
+								textbox = dijit.byId("q01");
+
+							textbox.set('value', 'Testing');
+							doh.robot.mouseMoveAt(textbox.focusNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							doh.robot.mouseClick({left: true}, 1000);
+							var oldValue = textbox.get('value');
+							doh.robot.typeKeys("abc", 500, 600);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.isNot(oldValue, textbox.get('value'), "didn't change at all");
+								doh.isNot("Abc", textbox.get('value'), "was highlighted");
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "TAB focus still highlights a selectOnFocus textbox",
+						timeout: 9000,
+						setUp: function(){
+							dijit.byId("q02").focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred(),
+								textbox = dijit.byId("q01");
+
+							textbox.set('value', 'Testing');
+							doh.robot.mouseMoveAt(textbox.focusNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							doh.robot.mouseClick({left: true}, 1000);
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {shift:true});
+							doh.robot.typeKeys("abc", 500, 600);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("Abc", textbox.get('value'), "was not highlighted");
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "click doesn't highlight after TAB focus",
+						timeout: 9000,
+						setUp: function(){
+							dijit.byId("q02").focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred(),
+								textbox = dijit.byId("q01");
+
+							textbox.set('value', 'Testing');
+							doh.robot.mouseMoveAt(textbox.focusNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							doh.robot.mouseClick({left: true}, 1000);
+							doh.robot.keyPress(dojo.keys.TAB, 1000);
+							doh.robot.keyPress(dojo.keys.TAB, 1000, {shift:true});
+							doh.robot.mouseClick({left: true}, 1000);
+							var oldValue = textbox.get('value');
+							doh.robot.typeKeys("abc", 500, 600);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.isNot(oldValue, textbox.get('value'), "didn't change at all");
+								doh.isNot("Abc", textbox.get('value'), "was highlighted");
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "mouse selection still works",
+						timeout: 9000,
+						setUp: function(){
+							dijit.byId("q02").focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred(),
+								textbox = dijit.byId("q01");
+
+							textbox.set('value', 'MMMMMMM');
+							doh.robot.mouseMoveAt(textbox.focusNode, 500, 1, 3, 6);
+							doh.robot.mousePress({left: true}, 500);
+							doh.robot.mouseMoveAt(textbox.focusNode, 500, 500, 10, 6);
+							doh.robot.mouseRelease({left: true}, 500);
+							doh.robot.typeKeys("abc", 500, 600);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("AbcMMMMMM", textbox.get('value'), "could not select text");
+							}), 500);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("set constraints", [
+					{
+						name: "number",
+						timeout: 9000,
+						runTest: function(){
+							var textWidget = dijit.byId("q05");
+							textWidget.set('value', 12345);
+							doh.is("12,345", textWidget.get('displayedValue'), "default value");
+							textWidget.set('constraints', {places:2});
+							doh.is("12,345.00", textWidget.get('displayedValue'), "decimal value");
+						}
+					},
+					{
+						name: "currency",
+						timeout: 9000,
+						runTest: function(){
+							var textWidget = dijit.byId("q08eurde");
+							textWidget.set('value', 12345.25);
+							doh.is("12.345,25\xa0€", textWidget.get('displayedValue'), "EUR value");
+							textWidget.set('constraints', {currency:'USD', locale:'en-us'});
+							doh.is("$12,345.25", textWidget.get('displayedValue'), "USD value");
+						}
+					}
+				]);
+
+				doh.register("placeholder", [
+					{
+						name: "textbox",
+						runTest: function(){
+							var textWidget = dijit.byId("q26");
+							doh.is('', textWidget.get('value'),'initial value is empty');
+							doh.is('placeholder is here', textWidget._phspan.innerHTML, '_phspan.innerHTML');
+							textWidget.set('value','abc');
+							doh.is('abc', textWidget.get('value'));
+							textWidget.set('placeHolder','new placeholder');
+							doh.f(textWidget.focusNode.hasAttribute("placeholder"),
+									"make sure placeholder attribute didn't get set natively on <input> too")
+							doh.is('abc', textWidget.get('value'));
+							textWidget.set('value','');
+							doh.is('new placeholder', textWidget._phspan.innerHTML, '_phspan.innerHTML 1');
+							doh.is('', textWidget.get('value'));
+						}
+					},
+					{
+						name: "focus/blur textbox",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred(), textWidget = dijit.byId("q26");
+							textWidget.set('placeHolder','placeholder is here');
+							textWidget.set('value','');
+							
+							//  Clicking into the input should hide _phspan
+							doh.robot.mouseMoveAt(textWidget.focusNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("", textWidget.get('value'), "get('value')");
+								doh.isNot("none", textWidget._phspan.style.display, "_phspan.style.display");
+								
+								doh.robot.keyPress(dojo.keys.TAB, 500, {shift:true});
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("", textWidget.get('value'), "get('value')");
+									doh.isNot("none", textWidget._phspan.style.display, "_phspan.style.display 1");
+								}), 1000);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "type in textbox",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred(), textWidget = dijit.byId("q26");
+							textWidget.set('placeHolder','placeholder is here');
+							textWidget.set('value','');
+							
+							//  Clicking into the input should hide _phspan
+							doh.robot.mouseMoveAt(textWidget.focusNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							
+							doh.robot.sequence(d.getTestErrback(function(){
+								doh.is("", textWidget.get('value'), "get('value')");
+								doh.isNot("none", textWidget._phspan.style.display, "_phspan.style.display 1");
+								
+								doh.robot.typeKeys('new', 0, 600);
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.is("new", textWidget.get('value'), "get('value')");
+									doh.is("none", textWidget._phspan.style.display, "_phspan.style.display 2");
+								}), 500);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "reset textbox",
+						timeout: 9000,
+						runTest: function(){
+							var textWidget = dijit.byId("q26"), d = new doh.Deferred();
+							textWidget.focus();
+							textWidget.set('placeHolder','placeholder is here');
+							textWidget.set('value','');
+							
+							doh.is("", textWidget.get('value'), "get('value') 1");
+							doh.isNot("none", textWidget._phspan.style.display, "_phspan.style.display");
+							
+							textWidget.set('value','abc');
+							textWidget.reset();
+							
+							doh.is("", textWidget.get('value'), "get('value') 2");
+							doh.isNot("none", textWidget._phspan.style.display, "_phspan.style.display 1");
+							
+							var handler = textWidget.connect(textWidget, '_onBlur',
+								function(){
+									textWidget.disconnect(handler);
+									textWidget.set('value','xyz');
+									textWidget.reset();
+									setTimeout(d.getTestCallback(function(){
+										doh.is("", textWidget.get('value'), "get('value')");
+										doh.isNot("none", textWidget._phspan.style.display, "_phspan.style.display 2");
+									}), 150);
+								});
+							doh.robot.keyPress(dojo.keys.TAB, 500, {});
+							
+							return d;
+						}
+					},
+					{
+						name: "set textbox value",
+						runTest: function(){
+							var textWidget = dijit.byId("q26");
+							textWidget.set('placeHolder','placeholder is here');
+							textWidget.set('value','value');
+							doh.is("none", textWidget._phspan.style.display, "_phspan.style.display");
+						}
+					}
+				]);
+
+				function testOn(evt, widget, deferred, callback, delay){
+					var handler = widget.connect(widget.focusNode, "on"+evt,
+						function(){
+							widget.disconnect(handler);
+							setTimeout(deferred.getTestCallback(callback), delay||250);
+						});
+				}
+
+				// Supplementary test from validationMessages.html, to make sure tooltip doesn't flash
+				// on typing multiple invalid characters
+				doh.register("no flashing on validation", [
+					{
+						name: "first focus, empty value",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							textbox = dijit.byId("q03");
+							textbox.focusNode.scrollIntoView();
+							textbox.set("value", "");
+							textbox.focus();
+							setTimeout(d.getTestCallback(function(){
+								// Tooltip should appear with information message
+								masterTT = dojo.global.dijit._masterTT;
+								doh.t(masterTT && isVisible(masterTT.domNode), "visible");
+								doh.is("(optional) Enter an age between 0 and 120", dojo.trim(innerText(masterTT.domNode)));
+							}), 750);
+							return d;
+						}
+					},
+					{
+						name: "first invalid character",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							testOn('keyup', textbox, d, function(){
+								masterTT = dojo.global.dijit._masterTT;
+								doh.t(masterTT && isVisible(masterTT.domNode), "visible");
+								doh.is("The value entered is not valid.", dojo.trim(innerText(masterTT.domNode)),
+									"message changed from info message to error message");
+							});
+							doh.robot.typeKeys("a", 0, 0);
+							return d;
+						}
+					},
+					{
+						name: "second invalid character",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var tooltipHidden = false;
+							testOn('keyup', textbox, d, function(){
+								masterTT = dojo.global.dijit._masterTT;
+								doh.f(tooltipHidden, "tooltip didn't blink or disappear");
+								doh.is("The value entered is not valid.", dojo.trim(innerText(masterTT.domNode)),
+									"same message");
+							});
+							dojo.connect(dijit, "hideTooltip", function(){ tooltipHidden = true; });
+							doh.robot.typeKeys("a", 0, 0);
+							return d;
+						}
+					},
+					{
+						name: "tab away",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							testOn('blur', textbox, d, function(){
+								masterTT = dojo.global.dijit._masterTT;
+								doh.t(masterTT && isHidden(masterTT.domNode), "hidden");
+							});
+							doh.robot.keyPress(dojo.keys.TAB, 0);
+							return d;
+						}
+					},
+					{
+						name: "tab back",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							testOn('focus', textbox, d, function(){
+								masterTT = dojo.global.dijit._masterTT;
+								doh.t(masterTT && isVisible(masterTT.domNode), "visible again");
+								doh.is("The value entered is not valid.", dojo.trim(innerText(masterTT.domNode)),
+									"same message");
+							});
+							doh.robot.keyPress(dojo.keys.TAB, 0, { shift:true });
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Ensure value formatting doesn't change entered values", [
+					{
+						name: "Ensure leading 0s don't cause a value change on blur",
+						timeout: 1000,
+						setUp: function(){
+							var textWidget = dijit.byId("ticket17955");
+							textWidget.set('maxLength', 8);
+							textWidget.set('constraints', {pattern: "000.#"});
+						},
+						runTest: function(){
+							var textWidget = dijit.byId("ticket17955");
+							textWidget.textbox.focus();
+							textWidget.textbox.value = "02103.5";
+							textWidget.textbox.blur();
+							doh.is(2103.5, textWidget.get("value"), "textbox.get('value')");
+						}
+					},
+					{
+						name: "Ensure extra digits do not cause a value change on blur",
+						timeout: 1000,
+						setUp: function(){
+							var textWidget = dijit.byId("ticket17955");
+							textWidget.set('maxLength', 8);
+							textWidget.set('constraints', {pattern: "000.#"});
+						},
+						runTest: function(){
+							var textWidget = dijit.byId("ticket17955");
+							textWidget.textbox.focus();
+							textWidget.textbox.value = "5123123";
+							textWidget.textbox.blur();
+							doh.is(5123123, textWidget.get("value"), "textbox.get('value')");
+						}
+					},
+					{
+						name: "Verify patterns without a decimal work as expected",
+						timeout: 1000,
+						setUp: function(){
+							var textWidget = dijit.byId("ticket17955");
+							textWidget.set('maxLength', null);
+							textWidget.set('constraints', {pattern: "#"});
+						},
+						runTest: function(){
+							var textWidget = dijit.byId("ticket17955");
+							textWidget.textbox.focus();
+							textWidget.textbox.value = "80000";
+							textWidget.textbox.blur();
+							doh.is(80000, textWidget.get("value"), "textbox.get('value')");
+						}
+					}
+				]);
+
+				doh.register("Leading 0 parsing for NumberTextBox", [
+				{
+					name: "valid with 2 leading zeros",
+					timeout: 2000,
+					setUp: function(){
+						var textbox = dijit.byId("ticket17923");
+							textbox.set('value', '');
+							textbox.set('constraints', dojo.mixin({}, textbox.get('constraints'), {min: 1}));
+							textbox.set('maxLength', 3);
+						// When this is run at the end of the tests in IE 9, the incomplete
+						// state is not properly triggered. Focus and blur to fix.
+						textbox.focusNode.focus();
+						textbox.focusNode.blur();
+					},
+					runTest: function(){
+						var d = new doh.Deferred(),
+							textbox = dijit.byId("ticket17923");
+						textbox.focusNode.scrollIntoView();
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('00', 500, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("Incomplete", textbox.get('state'), "textbox.get('state')");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					name: "invalid with 3 leading zeros",
+					timeout: 2000,
+					setUp: function(){
+						var textbox = dijit.byId("ticket17923");
+						textbox.set('value', '');
+						textbox.set('constraints', dojo.mixin({}, textbox.get('constraints'), {min: 1}));
+						textbox.set('maxLength', 3);
+					},
+					runTest: function(){
+						var d = new doh.Deferred(),
+						textbox = dijit.byId("ticket17923");
+						textbox.focusNode.scrollIntoView();
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('000', 500, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("Error", textbox.get('state'), "textbox.get('state')");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					name: "invalid with 2 leading zeros",
+					timeout: 2000,
+					setUp: function(){
+						var textbox = dijit.byId("ticket17923");
+						textbox.set('value', '');
+						textbox.set('constraints', dojo.mixin({}, textbox.get('constraints'), {min: 100}));
+						textbox.set('maxLength', 4);
+					},
+					runTest: function(){
+						var d = new doh.Deferred(),
+							textbox = dijit.byId("ticket17923");
+						textbox.focusNode.scrollIntoView();
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('00', 500, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("Error", textbox.get('state'), "textbox.get('state')");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					name: "valid with 5 leading zeros",
+					timeout: 2000,
+					setUp: function(){
+						var textbox = dijit.byId("ticket17923");
+						textbox.set('value', '');
+						textbox.set('constraints', dojo.mixin({}, textbox.get('constraints'), {min: 10}));
+						textbox.set('maxLength', 7);
+					},
+					runTest: function(){
+						var d = new doh.Deferred(),
+							textbox = dijit.byId("ticket17923");
+						textbox.focusNode.scrollIntoView();
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('00000', 500, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("Incomplete", textbox.get('state'), "textbox.get('state')");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					name: "invalid with 0.1 leading zeros",
+					timeout: 2000,
+					setUp: function(){
+						var textbox = dijit.byId("ticket17923");
+						textbox.set('value', '');
+						textbox.set('constraints', dojo.mixin({}, textbox.get('constraints'), {min: 10}));
+						textbox.set('maxLength', 7);
+					},
+					runTest: function(){
+						var d = new doh.Deferred(),
+							textbox = dijit.byId("ticket17923");
+						textbox.focusNode.scrollIntoView();
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('0.1', 500, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+						  doh.is("Error", textbox.get('state'), "textbox.get('state')");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					name: "invalid with -9.01",
+					timeout: 2000,
+					setUp: function(){
+						var textbox = dijit.byId("ticket17923");
+						textbox.set('value', '');
+						textbox.set('constraints', dojo.mixin({}, textbox.get('constraints'), {max: -9.02}));
+						textbox.set('maxLength', 7);
+					},
+					runTest: function(){
+						var d = new doh.Deferred(),
+							textbox = dijit.byId("ticket17923");
+						textbox.focusNode.scrollIntoView();
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('-9.01', 500, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+						  doh.is("Error", textbox.get('state'), "textbox.get('state')");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					name: "valid with -9.021",
+					timeout: 2000,
+					setUp: function(){
+						var textbox = dijit.byId("ticket17923");
+						textbox.set('value', '');
+						textbox.set('constraints', dojo.mixin({}, textbox.get('constraints'), {min: -9.03, max: -9.02}));
+						textbox.set('maxLength', 7);
+					},
+					runTest: function(){
+						var d = new doh.Deferred(),
+							textbox = dijit.byId("ticket17923");
+						textbox.focusNode.scrollIntoView();
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('-9.021', 500, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+						  doh.is("", textbox.get('state'), "textbox.get('state')");
+						}),500);
+						return d;
+					}
+				},
+				{
+					name: "checking each keypress for -9.01: 1 of 5",
+					timeout: 500,
+					setUp: function(){
+						var textbox = dijit.byId("ticket17923");
+						textbox.set('value', '');
+						textbox.set('constraints', dojo.mixin({}, textbox.get('constraints'), {min: -9.03, max: -9.02}));
+						textbox.set('maxLength', 7);
+					},
+					runTest: function(){
+						var d = new doh.Deferred(),
+							textbox = dijit.byId("ticket17923");
+						textbox.focusNode.scrollIntoView();
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('-', 50, 100);
+						doh.robot.sequence(d.getTestCallback(function(){
+						  doh.is("Incomplete", textbox.get('state'), "textbox.get('state')");
+						}));
+						return d;
+					}
+				},
+				{
+					name: "checking each keypress for -9.01: 2 of 5",
+					timeout: 500,
+					runTest: function(){
+						var d = new doh.Deferred(),
+						textbox = dijit.byId("ticket17923");
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('9', 50, 100);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("Incomplete", textbox.get('state'), "textbox.get('state')");
+						}));
+						return d;
+					}
+				},
+				{
+					name: "checking each keypress for -9.01: 3 of 5",
+					timeout: 500,
+					runTest: function(){
+						var d = new doh.Deferred(),
+						textbox = dijit.byId("ticket17923");
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('.', 50, 100);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("Incomplete", textbox.get('state'), "textbox.get('state')");
+						}));
+						return d;
+					}
+				},
+				{
+					name: "checking each keypress for -9.01: 4 of 5",
+					timeout: 500,
+					runTest: function(){
+						var d = new doh.Deferred(),
+						textbox = dijit.byId("ticket17923");
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('0', 50, 100);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("Incomplete", textbox.get('state'), "textbox.get('state')");
+						}));
+						return d;
+					}
+				},
+				{
+					name: "checking each keypress for -9.01: 5 of 5",
+					timeout: 500,
+					runTest: function(){
+						var d = new doh.Deferred(),
+						textbox = dijit.byId("ticket17923");
+						textbox.focusNode.focus();
+						doh.robot.typeKeys('1', 50, 100);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("Error", textbox.get('state'), "textbox.get('state')");
+						}));
+						return d;
+					}
+				}]);
+
+				// This should be the last test since it destroys a ValidationTextBox
+				doh.register("tooltip hide on destroy", [
+					{
+						name: "focus",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							textbox = dijit.byId("q03");
+							textbox.focusNode.scrollIntoView();
+							textbox.set("value", "");
+							textbox.focus();
+							setTimeout(d.getTestCallback(function(){
+								// Tooltip should appear with information message
+								masterTT = dojo.global.dijit._masterTT;
+								doh.t(masterTT && isVisible(masterTT.domNode), "visible");
+							}), 750);
+							return d;
+						}
+					},
+					{
+						name: "destroy",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							textbox.destroy();
+							setTimeout(d.getTestCallback(function(){
+								// Tooltip should disappear when ValidationTextBox (or enclosing Dialog) destroyed
+								masterTT = dojo.global.dijit._masterTT;
+								doh.t(masterTT && isHidden(masterTT.domNode), "hidden");
+							}), 300);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Ensure rounding works with locale's whose decimal separator is not a period", [
+					{
+						name: "basic rounding test",
+						runTest: function(){
+							// Expects the textbox to have a constraint of up to 1 decimal place, and the lang of 'de-de',
+							// which uses a comma instead of a period as the decimal separator.
+							var textbox = dijit.byId("ticket18260");
+							textbox.set('value', 12.9);
+							doh.is(12.9, textbox.get('value'), 'textbox.value == 12.9');
+							textbox.set('value', 12.99);
+							doh.is(13.0, textbox.get('value'), 'textbox.value == 13.0');
+						}
+					}
+				]);
+
+				doh.register("Ensure using both forms of the places constraint work as expected", [
+					{
+						name: "Fixed numeric places test, 2",
+						runTest: function(){
+							var textbox = dijit.byId("ticket18367");
+							textbox.set('constraints', {places:2});
+							textbox.set('value', 12.991);
+							doh.is(12.99, textbox.get('value'), 'textbox.value == 12.99');
+						}
+					},
+					{
+						name: "Range places test 0,4",
+						runTest: function(){
+							var textbox = dijit.byId("ticket18367");
+							textbox.set('constraints', {places: "0,4"});
+							textbox.set('value', 12);
+							doh.is(12, textbox.get('value'), 'textbox.value == 12');
+							textbox.set('value', 12.9);
+							doh.is(12.9, textbox.get('value'), 'textbox.value == 12.9');
+							textbox.set('value', 12.99);
+							doh.is(12.99, textbox.get('value'), 'textbox.value == 12.99');
+							textbox.set('value', 12.991);
+							doh.is(12.991, textbox.get('value'), 'textbox.value == 12.991');
+							textbox.set('value', 12.9912);
+							doh.is(12.9912, textbox.get('value'), 'textbox.value == 12.9912');
+							textbox.set('value', 12.99123);
+							doh.is(12.9912, textbox.get('value'), 'textbox.value == 12.9912');
+							textbox.set('value', 12.1);
+							doh.is(12.1, textbox.get('value'), 'textbox.value == 12.1');
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/_autoComplete_a11y.html b/src/main/resources/static/dijit/tests/form/robot/_autoComplete_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..3682dddf8142471017c9fd482ccc30d760b7f00c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/_autoComplete_a11y.html
@@ -0,0 +1,1629 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>doh.robot ComboBox/FilteringSelect General and A11Y Tests</title>
+
+	<style>
+		@import "../../../../util/doh/robot/robot.css";
+	</style>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dijit.robotx");
+		dojo.require("dojo.aspect");
+		dojo.require("dijit.tests.helpers");	// functions to help test
+		dojo.require("dijit.form._TextBoxMixin");	// selectInputText
+
+		// TODO: provide URL toggle for FilteringSelect
+		var testWidget = "dijit.form.ComboBox";
+		var qstr = window.location.search.substr(1);
+		if(qstr.length){
+		        var qparts = qstr.split("&");
+		        for(var x=0; x<qparts.length; x++){
+		                var tp = qparts[x].split("=");
+		                if(tp[0] == "testWidget"){
+		                        testWidget = tp[1];
+		                }
+		        }
+		}
+		isComboBox = testWidget=="dijit.form.ComboBox";
+		dojo.ready(function(){
+
+			doh.robot.initRobot('../_autoComplete.html?testWidget='+testWidget);
+
+			var arrowlessComboBoxes=['arrowless'];
+
+			var robot_typeValue = function(combo, text, value, expectedText){
+				if(value===undefined) value = text;
+				if(expectedText===undefined) expectedText = text;
+				var d = new doh.Deferred();
+
+				// setup watch() on "value" and "displayedValue"
+				var dv, v;					
+				var h1 = combo.watch("displayedValue", function(name, oldVal, newVal){ dv = newVal; });
+				var h2 = combo.watch("value", function(name, oldVal, newVal){ v = newVal; });
+
+				combo.focusNode.focus();
+				combo.itemError = false;
+				doh.robot.sequence(function(){ combo.set("value", null); }, 500);
+				doh.robot.typeKeys(text.replace(/^(.).*$/, "$1"), 500);
+				doh.robot.typeKeys(text.replace(/^./, ""), 1500);
+				doh.robot.keyPress(dojo.keys.ENTER, 1500);
+
+				doh.robot.sequence(d.getTestCallback(function(){
+					// general tests
+					doh.is(value, combo.get("value"), "combo.get(value)");
+					doh.is(expectedText, combo.focusNode.value, "expectedText");
+					doh.f(combo._opened, "not opened");
+					doh.f(combo.itemError, "no itemError");
+					
+					// watch() tests
+					doh.is(expectedText, dv, "watch of displayedValue");
+					doh.is(value, v, "watch of value");
+					h1.unwatch();
+					h2.unwatch();
+				}), 2000);
+				return d;
+			};
+
+			var findMenuItem = function(combo, text){
+				var node = combo.dropDown.domNode.firstChild;
+				while(innerText(node).indexOf(text) < 0 && node.nextSibling){
+					node = node.nextSibling;
+				}
+				return node;
+			};
+
+			// Select a value from the drop down using the keyboard, using "more choices" button to page as necessary
+			var robot_a11ySelectValue = function(combo, text, value, expectedText){
+				if(!value) value = text;
+				if(!expectedText) expectedText = text;
+				var d = new doh.Deferred();
+
+				// setup watch() on "value", "displayedValue", "item"
+				var dv, v, i;					
+				var h1 = combo.watch("displayedValue", function(name, oldVal, newVal){ dv = newVal; });
+				var h2 = combo.watch("value", function(name, oldVal, newVal){ v = newVal; });
+				var h3 = combo.watch("item", function(name, oldVal, newVal){ i = newVal; });
+
+				combo.focusNode.focus();
+				combo.itemError = false;
+				doh.robot.sequence(function(){ combo.set("value", null); }, 1000);
+
+				doh.robot.mouseMoveAt(combo.focusNode, 0); // get cursor out of the way so that wiggling doesn't mess up test
+				doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500);
+				var repeat = function(){
+					var node = findMenuItem(combo, text);
+					var isMoreChoices = node == combo.dropDown.nextButton;
+					var selected = combo.dropDown.getHighlightedOption() || combo.dropDown.domNode.firstChild;
+					while(selected != node){
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 300);
+						selected = selected.nextSibling;
+					}
+					doh.robot.keyPress(dojo.keys.ENTER, 500);
+					if(isMoreChoices){
+						// can go faster since the data will have loaded by now
+						doh.robot.sequence(repeat, 1000);
+					}else{
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is(value, combo.get("value"), "combo.get(value)");
+							doh.is(expectedText, combo.focusNode.value, "expectedText");
+							doh.f(combo._opened, "not opened");
+							doh.f(combo.itemError, "no itemError");
+							
+							// watch() tests
+							doh.is(expectedText, dv, "watch of displayedValue");
+							doh.is(value, v, "watch of value");
+							doh.is(value, isComboBox ? i[combo.searchAttr] : combo.store.getIdentity(i), "watch of item");
+							h1.unwatch();
+							h2.unwatch();
+							h3.unwatch();
+						}), 500);
+					}
+
+				};
+				// first time, wait for the data to come in
+				doh.robot.sequence(repeat, 3000);
+				return d;
+			};
+
+			// Wait for data stores to finish loading before starting tests
+			doh.register("wait for data store load",
+				dojo.map(["store", "store2", "stateStore", "dijitStore"], function(name){
+					return {
+							name: "wait for " + name,
+							timeout: 5000,
+							runTest: function(){
+								var d = new doh.Deferred();
+								dojo.global[name].fetch({
+									onComplete: function(){
+										d.callback(true);
+									},
+									onError: function(e){
+										d.errback(e);
+									}
+								});
+								return d;
+							}
+						};
+				})
+			 );
+
+			// Verify that all of the form values are correct at init
+			doh.register("verify values",
+				{
+					name:"verifyValues",
+					runTest:function(){
+						// Spot check of initial conditions of widgets and DOM nodes
+
+						doh.is("California", dijit.byId("setvaluetest").get("displayedValue"), "state1 displayed value");
+						doh.is(isComboBox ? "California" : "CA", dijit.byId("setvaluetest").get("value"), "state1 value");
+						doh.is("not fired yet!", dojo.byId("oc1").value, "state1 onChange hasn't fired");
+
+						// Test that dojo.query() finds hidden field, see #8660
+						var elems = dojo.doc.getElementsByName("state2");
+						doh.is(1, elems.length, "exactly one node with name=state2");
+						doh.is(isComboBox ? "California" : "CA", elems[0].value, "state2 submit value");
+						var qelems = dojo.query("input[name=state2]");
+						doh.is(1, qelems.length, "dojo.query() returns exactly one node with name=state2");
+						doh.is(isComboBox ? "California" : "CA", qelems[0].value, "state2 dojo.query value");
+
+						doh.is(1, dojo.query("input[name=state3]").length,
+							"Just one input inside of " + testWidget + " w/name specified");
+						if(!isComboBox){
+							// Filtering select should have two inputs, but the displayed one is hidden
+							doh.is(2, dojo.query("input", dijit.byId("combo3").domNode).length-dojo.query("input[readOnly]", dijit.byId("combo3").domNode).length,
+								"Two inputs inside of filteringSelect");
+						}
+
+						doh.is("sticks & stones", dijit.byId("specialchars").get("displayedValue"), "specialchars get('displayValue')");
+						doh.is(isComboBox ? "sticks & stones" : "sticks", dijit.byId("specialchars").get("value"), "specialchars value");
+						doh.is("sticks & stones", dojo.query("input[id=specialchars]")[0].value, "specialchars display value via DOMNode");
+						doh.is(isComboBox ? "sticks & stones" : "sticks", dojo.query("input[name=specialchars]")[0].value, "specialchars submit value via DOMNode");
+					}
+				}
+			);
+
+			var comboIds=['setvaluetest','datatest','combo3','combobox4','arrowless','descending'];
+			for(var i=0; i<comboIds.length; i++){
+				doh.register("query input by name",{
+					name:comboIds[i],
+					combo:comboIds[i],
+					runTest:function(){
+						this.combo = dijit.byId(this.combo);
+						var queried=dojo.query("input[name="+(this.combo.valueNode||this.combo.focusNode).name+"]");
+						doh.is(1,queried.length,"Expected 1 combo with name "+(this.combo.valueNode||this.combo.focusNode).name+", found "+queried.length);
+						doh.is(this.combo.valueNode||this.combo.focusNode,queried[0],"Combo's valueNode did not match the one found by dojo.query.");
+					}
+				});
+			}
+
+			doh.register("set('displayedValue', ...)", [
+				// Set displayedValue to Kentucky.
+				// This should be a valid assignment.
+				{
+					timeout:5000,
+					name:"valid",
+					runTest:function(){
+						var d = new doh.Deferred(),
+							combo = dijit.byId("setvaluetest");
+						
+						var dv, v;	
+						combo.watch("displayedValue", function(name, oldVal, newVal){ dv = newVal; });
+						combo.watch("value", function(name, oldVal, newVal){ v = newVal; });
+
+						combo.set('displayedValue', 'Kentucky');
+						doh.robot.sequence(d.getTestCallback(function(){
+							var oc1=dojo.byId('oc1');
+							doh.is(isComboBox ? "Kentucky" : "KY", combo.get("value"), "get('value')");
+							doh.is(isComboBox ? "Kentucky" : "KY", oc1.value, "onChange");
+							if(!isComboBox){
+								doh.t(combo.isValid(), "isValid()");
+							}
+							doh.is(isComboBox ? "Kentucky" : "KY", v, "watch of value");
+							doh.is("Kentucky", dv, "watch of displayedValue")
+						}), 900);
+						return d;
+					}
+				},
+
+				// Set displayedValue to Canada.
+				// This should be an invalid assignment for FilteringSelect, but ok for ComboBox.
+				{
+					timeout:5000,
+					name:"invalid",
+					runTest:function(){
+						var d = new doh.Deferred(),
+							combo = dijit.byId("setvaluetest");
+						combo.set('displayedValue', 'Canada');
+						doh.robot.sequence(d.getTestCallback(function(){
+							var oc1=dojo.byId('oc1');
+							doh.is(isComboBox ? "Canada" : "", combo.get("value"), "get('value')");
+							doh.is(isComboBox ? "Canada" : "", oc1.value, "onChange");
+							if(!isComboBox){
+								doh.f(combo.isValid(), "isValid()");
+							}
+						}), 900);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("set('value', ...)", [
+				// Set value to null.
+				// This should be an invalid assignment for FilteringSelect, but ok for ComboBox.
+				{
+					timeout:5000,
+					name:"nullvalue",
+					runTest:function(){
+						var d = new doh.Deferred(),
+							combo = dijit.byId("setvaluetest");
+						combo.set("value", null);
+						doh.robot.sequence(d.getTestCallback(function(){
+							var oc1=dojo.byId('oc1');
+							doh.is("", combo.get("value"), "get('value')");
+							doh.is("", oc1.value, "onChange");
+							if(!isComboBox){
+								doh.f(combo.isValid(), "isValid()");
+							}
+						}), 900);
+						return d;
+					}
+				}
+
+				// TODO: test some other set("value") calls
+			]);
+
+			doh.register("back compat", [
+				function fetch_optionTags(){
+					// Make sure that myComboBox.store.fetch() still works even though
+					// ComboBox is using the new dojo.store API
+					var d = new doh.Deferred();
+					doh.t(dijit.byId("setvaluetest").store, "store exists");
+					doh.t(dojo.isFunction(dijit.byId("setvaluetest").store.fetch), "fetch exists");
+					dijit.byId("setvaluetest").store.fetch({
+						onBegin: d.getTestCallback(function(total){
+							doh.is(61, total, "# records");
+						})
+					});
+					return d;
+				},
+				function fetch_externalStore(){
+					// Make sure that myComboBox.store.fetch() still works even though
+					// ComboBox is using the new dojo.store API
+					var d = new doh.Deferred();
+					doh.t(dijit.byId("datatest").store, "store exists");
+					doh.t(dojo.isFunction(dijit.byId("datatest").store.fetch), "fetch exists");
+					dijit.byId("datatest").store.fetch({
+						onBegin: d.getTestCallback(function(total){
+							doh.is(61, total, "# records");
+						})
+					});
+					return d;
+				},
+				{
+					timeout:60000,
+					name:"fetch() called with string",
+					runTest:function(){
+						// Make sure typing into a ComboBox connected to an
+						// old dojo.data store calls store.fetch() with a String argument rather than a Regex
+
+						var d = new doh.Deferred();
+						combo = dijit.byId("datatest");
+
+						doh.t("fetch" in combo.store,
+								"combo.store has fetch() method (i.e. it's the old dojo.data API)");
+
+						combo.focusNode.focus();
+						doh.robot.sequence(function(){ combo.set("value", null); }, 500);
+
+						// Keypress (below) will trigger a call to store.fetch, which will then call this code.
+						doh.robot.sequence(function(){
+							var handle = dojo.aspect.after(combo.store, "fetch", d.getTestErrback(function(args){
+								handle.remove();
+								doh.isNot(null, args && args.query && args.query.name,
+										"args.query.name set");
+								doh.is("string", typeof args.query.name, "typeof searchAttr");
+							}), true);
+						}, 500);
+						doh.robot.keyPress("k", 500);
+
+						// Code below merely to let ComboBox finish any pending requests, so "datatest" ComboBox
+						// doesn't grab focus in the middle of with the "direct input" test below.
+						doh.robot.keyPress(dojo.keys.ENTER, 500);
+						doh.robot.sequence(function(){
+							d.callback(true);
+						}, 500);
+
+						return d;
+					}
+				}
+			]);
+
+			!isComboBox && doh.register("FilteringSelect back-compat", [
+				function setDisplayedValue(){
+					// Make sure that set("displayedValue", ...) on a FilteringSelect connected to an
+					// old dojo.data store calls store.fetch() with a String argument rather than a Regex
+					var combo = dijit.byId("datatest");
+					doh.t("fetch" in combo.store, "combo.store has fetch() method (i.e. it's the old dojo.data API)");
+					var handle = dojo.aspect.after(combo.store, "fetch", function(args){
+						handle.remove();
+						doh.isNot(null, args && args.query && args.query.name, "args.query.name set");
+						doh.is("string", typeof args.query.name, "typeof searchAttr");
+					}, true);
+					combo.set("displayedValue", "Kentucky");
+				}
+			]);
+
+			doh.register("direct input", [
+				// Type a valid value and press Enter
+				{
+					timeout:60000,
+					name:"valid value",
+					combo:"setvaluetest",
+					runTest:function(){
+						return robot_typeValue(dijit.byId(this.combo), "California", isComboBox? undefined : "CA", isComboBox? undefined : "California");
+					}
+				},
+
+				// Type an invalid value and press Enter
+				{
+					timeout:60000,
+					name:"invalid value",
+					combo:"setvaluetest",
+					runTest:function(){
+						return robot_typeValue((this.combo = dijit.byId(this.combo)), "zxcxarax", isComboBox?"zxcxarax":"");
+					}
+				},
+
+				// Check on the invalid value from the previous test
+				{
+					timeout:60000,
+					name:"invalid value 2",
+					combo:"setvaluetest",
+					runTest:function(){
+						this.combo = dijit.byId(this.combo);
+						if(isComboBox){
+							doh.is("zxcxarax", this.combo.get("value"), "Expected value of zxcxarax, got "+this.combo.get("value")+", text is:"+this.combo.focusNode.value);
+							doh.t(this.combo.isValid(), "Bad value not permitted in ComboBox. Value is: "+this.combo.get("value")+", text is:"+this.combo.focusNode.value);
+						}else{
+							doh.is("", this.combo.get("value"), "Expected value of '', got "+this.combo.get("value")+", text is:"+this.combo.focusNode.value);
+							doh.t(!this.combo.isValid(), "Bad value permitted in FilteringSelect. Value is: "+this.combo.get("value")+", text is:"+this.combo.focusNode.value);
+						}
+						doh.t(!this.combo.itemError, "Should not have an itemError");
+					},
+					tearDown:function(){
+						this.combo.set("value", isComboBox?"Alaska":"AK");
+					}
+				}
+			]);
+
+			// Test that enter key submits the form, but only when nothing is selected in the drop down
+			doh.register("enter key", {
+				timeout:60000,
+				name:"submit",
+				runTest:function(){
+					dojo.global.formSubmitted = false;
+					var d = new doh.Deferred();
+					var combo = dijit.byId("setvaluetest");
+					combo.focus();
+
+					// Initial conditions:
+					doh.robot.sequence(d.getTestErrback(function(){
+						var popup = dijit.byId('setvaluetest_popup');
+						doh.t(!popup || isHidden(popup), "popup hidden");
+					}), 500);
+
+					// Down arrow opens the drop down
+					doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500);
+					doh.robot.sequence(d.getTestErrback(function(){
+						var popup = dijit.byId('setvaluetest_popup');
+						doh.t(popup && isVisible(popup), "popup visible");
+					}), 500);
+
+					// Enter key should select value and close drop down but not submit form
+					doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500); // highlight value
+					doh.robot.keyPress(dojo.keys.ENTER, 500);
+					doh.robot.sequence(d.getTestErrback(function(){
+						var popup = dijit.byId('setvaluetest_popup');
+						doh.t(!popup || isHidden(popup), "popup hidden");
+						doh.f(dojo.global.formSubmitted, "form not submitted yet")
+					}), 500);
+
+					// Enter key again should submit form
+					doh.robot.keyPress(dojo.keys.ENTER, 500);
+					doh.robot.sequence(d.getTestCallback(function(){
+						var popup = dijit.byId('setvaluetest_popup');
+						doh.t(!popup || isHidden(popup), "popup hidden");
+						doh.t(dojo.global.formSubmitted, "form submitted")
+					}), 500);
+
+					return d;
+				}
+			});
+
+			doh.register("drop down navigation / keyboard", [
+				// Select a value from the drop down using the keyboard,
+				// use "more choices" button to page as necessary
+				{
+					timeout:60000,
+					name:"setvaluetest_a11y",
+					combo:"setvaluetest",
+					runTest:function(){
+						return robot_a11ySelectValue(dijit.byId(this.combo), "Texas", isComboBox? "Texas" : "TX", "Texas");
+					}
+				}
+			]);
+
+			// Test that drop down choices are filtered to values matching what user has typed
+			doh.register("filtering of drop down", [
+				{
+					timeout:60000,
+					name:"type C",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("setvaluetest");
+						combo.itemError = false;
+
+						combo.focusNode.focus();
+
+						// Filter drop down list to entries starting with "C"
+						doh.robot.sequence(function(){ combo.set("value", null); }, 1000);
+						doh.robot.keyPress("C", 100);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// Check that drop down list has appeared, and contains California, Colorado, Connecticut
+							var list = dojo.byId("setvaluetest_popup");
+							doh.t(list, "drop down exists");
+							doh.t(isVisible(list), "drop down is visible");
+
+							var entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.is(3, entries.length, "three entries in drop down: " + list.innerHTML);
+							doh.is("California (CA)", innerText(entries[0]), "list #1");
+							doh.is("Colorado (CO)", innerText(entries[1]), "list #2");
+							doh.is("Connecticut (CT)", innerText(entries[2]), "list #3");
+
+							// Check that search-string highlighting is working
+							doh.is('<span class=dijitcomboboxhighlightmatch>c</span>onnecticut (ct)', entries[2].innerHTML.toLowerCase().replace(/"/g, ""), //balanced"
+								"highlighting is working");
+							doh.f(combo.itemError, testWidget + " item mismatch");
+						}), 900);
+
+						return d;
+					}
+				},
+				{
+					timeout:60000,
+					name:"type 'o' after 'C'",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("setvaluetest");
+						combo.itemError = false;
+
+						// Filter drop down list to entries starting with "Co"
+						doh.robot.keyPress("o", 100);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// Check that drop down list is still there, and California has disappeared
+							var list = dojo.byId("setvaluetest_popup");
+							doh.t(list, "drop down exists");
+							doh.t(isVisible(list), "drop down is visible");
+
+							var entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.is(2, entries.length, "three entries in drop down: " + list.innerHTML);
+							doh.is("Colorado (CO)", innerText(entries[0]), "list #1");
+							doh.is("Connecticut (CT)", innerText(entries[1]), "list #2");
+							doh.f(combo.itemError, testWidget + " item mismatch");
+						}), 900);
+
+						return d;
+					}
+				},
+				{
+					timeout:60000,
+					name:"type backspace",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("setvaluetest");
+						combo.itemError = false;
+
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 100);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// List should again contain California
+							var list = dojo.byId("setvaluetest_popup");
+							doh.t(list, "drop down exists");
+							doh.t(isVisible(list), "drop down is visible");
+
+							var entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.is(3, entries.length, "three entries in drop down: " + list.innerHTML);
+							doh.is("California (CA)", innerText(entries[0]), "list #1");
+							doh.is("Colorado (CO)", innerText(entries[1]), "list #2");
+							doh.is("Connecticut (CT)", innerText(entries[2]), "list #3");
+							doh.f(combo.itemError, testWidget + " item mismatch");
+						}), 900);
+
+						return d;
+					}
+				}
+
+				// TODO: make separate test group for testing highlighting, and then check
+				//     - matching of anywhere in string (id=arrowless)
+				//     - highlightmatch=none (combobox4)
+			]);
+
+			// Test auto complete
+			doh.register("auto-complete", [
+				{
+					timeout:60000,
+					name:"no auto-complete",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("setvaluetest");
+
+						combo.focusNode.focus();
+						doh.robot.sequence(function(){ combo.set("value", null); }, 1000);
+
+						// Filter drop down list to entries starting with "C"
+						doh.robot.keyPress("C", 100);
+
+						// Then tab away
+						doh.robot.keyPress(dojo.keys.TAB, 500);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// Check that drop down list has disappeared
+							var list = dojo.byId("setvaluetest_popup");
+							doh.t(!list || isHidden(list), "drop down is visible");
+
+							// Since autocomplete=false the contents should just be what the user typed
+							doh.is('C', combo.focusNode.value);
+							if(!isComboBox){
+								doh.f(dijit.byId("setvaluetest").isValid(), "FilteringSelect shouldn't be valid");
+							}
+							doh.f(dijit.byId("setvaluetest").itemError, testWidget + " item mismatch");
+						}), 900);
+
+						return d;
+					}
+				},
+				{
+					timeout:60000,
+					name:"auto-complete writes suggested letters in input box",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("datatest");	// auto-complete = true
+
+						combo.focusNode.focus();
+						doh.robot.sequence(function(){ combo.set("value", null); }, 1000);
+
+						// Filter drop down list to entries starting with "C"
+						doh.robot.keyPress("C", 100);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							var list = dojo.byId("datatest_popup");
+							doh.t(isVisible(list), "drop down is visible");
+
+							doh.is('California', combo.focusNode.value, "'alifornia' automatically appended to user input");
+						}), 900);
+
+						return d;
+					}
+				},
+				{
+					timeout:60000,
+					name:"auto-complete changes suggestion based on more typed letters",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("datatest");
+
+						// Further filter drop down to entries starting with "Co" (Colorado and Connectictut).
+						// Note that this depends on (and tests that) "alifornia" is selected (aka highlighted),
+						// so that the "o" keypress erases it and replaces the input box text with "Co"
+						doh.robot.keyPress("o", 100);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is('Colorado', combo.focusNode.value, "suggestion changed from California to Colorado");
+						}), 900);
+
+						return d;
+					}
+				},
+				{
+					timeout:60000,
+					name:"tab-away auto-selects value",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("datatest");
+
+						// Then tab away
+						doh.robot.keyPress(dojo.keys.TAB, 500);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// Check that drop down list has disappeared
+							var list = dojo.byId("datatest_popup");
+							doh.t(!list || isHidden(list), "drop down is hidden");
+
+							doh.is(isComboBox ? "Colorado" : "CO", combo.get("value"));
+							if(!isComboBox){
+								doh.t(combo.isValid(), "FilteringSelect should be valid");
+							}
+						}), 900);
+
+						return d;
+					}
+				}
+			]);
+
+			// TODO: test ESC key or click on screen background or click on another widget to close drop down
+
+			// TODO: click test for arrowless
+
+			!isComboBox && doh.register("reverse lookup query options", [
+				{
+					timeout: 60000,
+					name: "delaware",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("arrowless");
+
+						combo.set("value", null);
+						combo.focusNode.focus();
+
+						doh.robot.typeKeys("delaware", 500, 100);
+						doh.robot.keyPress(dojo.keys.TAB, 1000);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// Value should have been converted to "Delaware" (in upper case) and marked as valid
+							doh.is("Delaware", combo.focusNode.value);
+							doh.is("", combo.state, "marked as valid");
+						}), 1000);
+
+						return d;
+					}
+				}
+			]);
+
+			// Race condition tests based on slow store:
+			// Test that drop down choices are filtered to values matching what user has typed
+			doh.register("race conditions", [
+				// Test when queries return in different order than issued
+				{
+					timeout:60000,
+					name:"query canceling on new input (#8950)",
+					runTest: function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("slow");
+						combo.set('displayedValue', null, false);
+
+						combo.focusNode.focus();
+						// this test is very timing-sensitive
+						// preload states.json for slow networks
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000);
+						doh.robot.sequence(function(){ dojo.global.slowStateStore.log = []; }, 2000, 100); // clear log of query on * messages
+
+						// Filter drop down list to entries starting with "C"
+						doh.robot.typeKeys("c", 500, 100);
+						doh.robot.typeKeys("o", 300, 100); // 300ms > searchDelay, so C* query has been sent (but not yet returned results) when the o is typed
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// The query "c*" should be canceled when "co*" is started
+							var log = dojo.global.slowStateStore.log;
+							doh.is(4, log.length, "4 events on data store");
+							doh.is("start c*", log[0].type + " " + log[0].query.name);
+							doh.is("cancel c*", log[1].type + " " + log[1].query.name);
+							doh.is("start co*", log[2].type + " " + log[2].query.name);
+							doh.is("end co*", log[3].type + " " + log[3].query.name);
+
+							// Check that drop down list has appeared, and contains only Colorado and Connecticut (not California)
+							var list = dojo.byId("slow_popup");
+							doh.t(list, "drop down exists");
+							doh.t(isVisible(list), "drop down is visible");
+
+							var entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.is(2, entries.length, "two entries in drop down: " + list.innerHTML);
+							doh.is("Colorado", innerText(entries[0]), "list #1");
+							doh.is("Connecticut", innerText(entries[1]), "list #2");
+						}), 1000, 500);
+
+						return d;
+					}
+				},
+
+				// Test that drop down doesn't show up after ENTER keypress, and also that
+				// searchDelay is preventing intermediate queries.
+				{
+					timeout:60000,
+					name:"pressing enter before search returns",
+					setUp: function(){
+						dojo.global.slowStateStore.log = [];
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("slow");
+
+						dojo.global.formSubmitted = false;
+						dijit.form._TextBoxMixin.selectInputText(combo.focusNode);
+
+						// Start to filter drop down list to entries starting with "Co"
+						doh.robot.typeKeys("C", 500, 0);
+						doh.robot.typeKeys("o", 300, 0); // 300ms > searchDelay, so C* query has been sent (but not yet returned results) when the o is typed
+
+						// But then hit ENTER after we've started the query to the data store, but
+						// before the data store returns query results... that should cancel the query.
+						doh.robot.keyPress(dojo.keys.ENTER, 300);	// 300ms > searchDelay
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							var log = dojo.global.slowStateStore.log;
+							var len = log.length;
+							doh.t(len >= 4, "log length " + len);
+							doh.is("start C*", log[0].type + " " + log[0].query.name);
+							doh.is("cancel C*", log[1].type + " " + log[1].query.name);
+							doh.is("start Co*", log[2].type + " " + log[2].query.name);
+							doh.is("cancel Co*", log[3].type + " " + log[3].query.name);
+
+							// also, form SHOULD have submitted because no popup was visible
+							doh.t(dojo.global.formSubmitted, "form submitted");
+
+							var list = dojo.byId("slow_popup");
+							doh.t(!list || isHidden(list), "drop down is *not* visible");
+
+							doh.is("Co", combo.get('displayedValue'), "auto-complete didn't fire");
+						}), 1200, 500);
+
+						return d;
+					}
+				}
+			]);
+
+			// disabled tests+standard tests
+			doh.register("disabled", [
+
+				// Test that correct styling is applied
+				{
+					timeout:1000,
+					name:"disabled styling",
+					combo:"combo3",
+					runTest:function(){
+						this.combo = dijit.byId(this.combo);
+						doh.is(true, this.combo.get('disabled'));
+						doh.is(true, this.combo.focusNode.disabled);
+					}
+				},
+
+				// Test that you can't focus a disabled combobox
+				{
+					timeout: 5000,
+					name:"tab over disabled elements",
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						dojo.byId("datatestDijit").focus();
+
+						doh.robot.sequence(d.getTestErrback(function(){
+							// use sequence because focus on IE9+ is asynchronous
+							doh.is("datatestDijit", dojo.global.dijit.focus.curNode.id, "focused on elem before disabled combo");
+						}), 100);
+
+						// Tab over the disabled ComboBox
+						doh.robot.keyPress(dojo.keys.TAB, 100);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("combobox4", dojo.global.dijit.focus.curNode.id, "focused on 'enable' button after disabled combo");
+						}), 200);
+
+						return d;
+					}
+				}
+			]);
+
+			// now enable it and test that it can be used
+			doh.register("enabled", [
+				{
+					timeout:30000,
+					name:"combo3_enabledStyle",
+					setUp: function(){
+						dijit.byId("combo3").set("disabled", false);
+					},
+					runTest:function(){
+						var combo = dijit.byId("combo3");
+						doh.is(false, combo.get('disabled'));
+						doh.is(false, combo.focusNode.disabled);
+					}
+				}
+			]);
+
+			doh.register("specialchars", [
+				{
+					timeout:10000,
+					name:"specialchars_type",
+					combo:"specialchars",
+					runTest:function(){
+						return robot_typeValue(dijit.byId(this.combo), "sticks & stones", isComboBox? undefined : "sticks");
+					}
+				},
+				{
+					timeout:10000,
+					name:"specialchars_a11y",
+					combo:"specialchars",
+					runTest:function(){
+						return robot_a11ySelectValue(dijit.byId(this.combo), "more\\less", isComboBox? undefined : "more");
+					}
+				},
+				{
+					timeout:10000,
+					name:"specialchars_escape",
+					combo:"specialchars",
+					runTest:function(){
+						var combo = dijit.byId(this.combo);
+						combo.focusNode.focus();
+						doh.robot.sequence(function(){ combo.set("value", null); }, 1000);
+						var d = new doh.Deferred();
+						doh.robot.typeKeys("3 *", 500, 600);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is("3 *", combo.focusNode.value);
+						}), 500);
+						return d;
+					}
+				},
+				{
+					timeout:10000,
+					name:"specialchars_highlight",
+					combo:"specialchars",
+					runTest:function(){
+						var combo = dijit.byId(this.combo);
+						combo.queryExpr = '*${0}*';
+						combo.focusNode.focus();
+						doh.robot.sequence(function(){ combo.set("value", null); }, 500);
+						var d = new doh.Deferred();
+						doh.robot.typeKeys("t", 1, 100);
+						doh.robot.sequence(d.getTestCallback(function(){
+							var item = findMenuItem(combo, 'riches to');
+							doh.t(item, 'item "rags --> riches to" should be visible');
+							doh.is('rags --&gt; riches <>t<>o',item.innerHTML.replace(/<[^>]*>/g,'<>'), '"t" in "to" should be highlighted');
+						}), 1000, 500);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("japanese", [
+				{
+					timeout:60000,
+					name:"japanese_a11y",
+					combo:"japanese",
+					runTest:function(){
+						return robot_a11ySelectValue((this.combo = dijit.byId(this.combo)), "\u6771\u533A (East)", isComboBox? undefined : "higashiku");
+					},
+					tearDown:function(){
+						this.combo.set("value", isComboBox?"\u6771\u533A (East)":"higashiku");
+					}
+				},
+
+				{
+					timeout:20000,
+					name:"japanese_type",
+					runTest:function(){
+						var	d = new doh.Deferred(),
+							s0 = null,
+							s1 = null,
+							s2 = null,
+							s3 = null,
+							s4 = null,
+							s5 = null,
+							combo = dijit.byId("japanese");
+
+						combo.focusNode.focus();
+
+						doh.robot.keyPress(dojo.keys.END, 1000);
+
+						doh.robot.typeKeys("x", 500, 200);
+						doh.robot.sequence(function(){
+							s0 = combo.state;
+						}, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.sequence(function(){
+							s1 = combo.state;
+						}, 500);
+						doh.robot.typeKeys("xx", 500, 400);
+						doh.robot.sequence(function(){
+							s2 = combo.state;
+						}, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.sequence(function(){
+							s3 = combo.state;
+						}, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.sequence(function(){
+							s4 = combo.state;
+						}, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.sequence(function(){
+							s5 = combo.state;
+						}, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500);
+						doh.robot.keyPress(dojo.keys.ENTER, 500);
+						doh.robot.sequence(dojo.hitch(this, function(){
+							if(!isComboBox){
+								doh.is("Error", s0, "s0");
+								doh.is("Incomplete", s1, "s1");
+								doh.is("Error", s2, "s2");
+								doh.is("Error", s3, "s3");
+								doh.is("Incomplete", s4, "s4");
+								doh.is("Incomplete", s5, "s5");
+							}
+							if(combo.get("value") == (isComboBox?"\u6771\u897F (Touzai)":"touzai") && combo.focusNode.value=="\u6771\u897F (Touzai)"){
+								d.callback(true);
+							}else{
+								d.errback(combo.id+" was supposed to have a value of "+(isComboBox?"\u6771\u897F (Touzai)":"touzai")+". Text is "+combo.focusNode.value+", value is "+combo.get("value"));
+							}
+						}), 1000);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("readOnly", [
+				{
+					timeout:5000,
+					name:"cannot type",
+					combo: "labelFunc",
+					runTest:function(){
+						var	d = new doh.Deferred(),
+							combo = dijit.byId(this.combo),
+							initVal = combo.get('value');
+						combo.set('readOnly', true);
+						combo.focus();
+						doh.robot.typeKeys("xz", 1000, 500);
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.t(combo.isValid(), 'isValid');
+							doh.is(initVal, combo.get('value'), 'changed from ' + initVal + ' to ' + combo.get('value'));
+						}), 500, 500);
+						return d;
+					},
+					tearDown:function(){
+						dijit.byId(this.combo).set("readOnly", false);
+					}
+				}
+			]);
+
+			// Labelfunc tests.   See also initial tests on "setvaluetest" ComboBox.
+			doh.register("labelFunc", [
+				{
+					timeout:60000,
+					name:"labelFunc_keyboardSelect",
+					combo:"labelFunc",
+					runTest:function(){
+						return robot_a11ySelectValue((this.combo = dijit.byId(this.combo)), "texas", isComboBox? "Texas" : "TX", "Texas");
+					},
+					tearDown:function(){
+						this.combo.set("value", isComboBox? "Texas" : "TX");
+					}
+				},
+
+				{
+					timeout:60000,
+					name:"labelFunc_type",
+					combo:"labelFunc",
+					runTest:function(){
+						return robot_typeValue((this.combo = dijit.byId(this.combo)), "Alabama", isComboBox ? "Alabama" : "AL", "Alabama");
+					}
+				},
+
+				{
+					timeout:60000,
+					name: "richtext",
+					runTest: function(){
+						var d = new doh.Deferred(),
+							w = dijit.byId("richtexttest");
+
+						// testing that input has right data
+						doh.is("h1", w.focusNode.value, "initial focus value");
+						w.set("value", "h2");
+						doh.is("h2", w.focusNode.value, "set() focus value");
+
+						w.focus();
+
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 100);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							var list = dojo.byId("richtexttest_popup");
+							doh.t(list, "drop down exists");
+							doh.t(isVisible(list), "drop down is visible");
+
+							var entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.is("<h1>h1</h1>", dojo.trim(entries[0].innerHTML).toLowerCase(), "list #1 is rich text");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			// The specifying a sort order and an initial filter to ComboBox
+			doh.register("filter and sort params", [
+				{
+					timeout:60000,
+					name:"sort order",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo3");
+
+						combo.focusNode.focus();
+						doh.robot.sequence(function(){ combo.set("value", null); }, 1000);
+
+						// Show list, should be in reverse order
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 100);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							var list = dojo.byId("progCombo3_popup");
+							doh.t(list, "drop down exists");
+							doh.t(isVisible(list), "drop down is visible");
+
+							var entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.is("United States of America", innerText(entries[0]), "list #1");
+						}), 900);
+
+						return d;
+					}
+				},
+				{
+					timeout:60000,
+					name:"initial filter, descending sort",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo3");
+
+						// Filter drop down list to entries starting with "A"
+						doh.robot.keyPress("A", 100);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// Check that drop down list *doesn't* contain Africa (since it's a continent),
+							// just Argentina and Australia, in descending sort order
+							var list = dojo.byId("progCombo3_popup");
+							doh.t(list, "drop down exists");
+							doh.t(isVisible(list), "drop down is visible");
+
+							var entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.is(2, entries.length, "two countries (but no continents) in drop down: " + list.innerHTML);
+							doh.is("Australia", innerText(entries[0]), "list #1");
+							doh.is("Argentina", innerText(entries[1]), "list #2");
+						}), 900);
+
+						return d;
+					}
+				}
+			]);
+
+			// The specifying a sort order and an initial filter to ComboBox
+			doh.register("blur", [
+				{
+					timeout:60000,
+					name:"tooltip prompt",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("labelFunc");
+
+						combo.set("value", null);
+						combo.focusNode.focus();
+
+						// blur
+						doh.robot.keyPress(dojo.keys.TAB, 1000);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.t(!combo._message, "no tooltip on blur");
+						}), 1000);
+
+						return d;
+					}
+				},
+				{
+					timeout:60000,
+					name:"empty but required",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("combobox4");
+
+						combo.set("value", null);
+						combo.focusNode.focus();
+
+						// blur
+						doh.robot.keyPress(dojo.keys.TAB, 1000);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.t(combo.state == "Error", "required field has error on blur");
+						}), 1000);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.register("wrap", [
+				{
+					timeout:10000,
+					name:"wrap without More choices",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("preservetitletest");
+
+						combo.set('pageSize', 5); // remove More choices
+						combo.focusNode.focus();
+
+						// Show list, should be in reverse order
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000); // wait for focus
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500); // wait for dropdown to open
+						for(var i=1; i < 14; i++){
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 250); // down arrow and wrap twice
+						}
+						for(i=0; i < 4; i++){
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 250); // up arrow and wrap at most once
+						}
+						doh.robot.keyPress(dojo.keys.ENTER, 500); // select current item
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is(isComboBox ? "Vermont" : "vt", combo.get("value"), "wrap get('value')");
+						}), 1000);
+
+						return d;
+					}
+				},
+				{
+					timeout:10000,
+					name:"wrap with More choices",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("preservetitletest");
+
+						combo.set('pageSize', 4); // add More choices
+						combo.focusNode.focus();
+
+						// Show list, should be in reverse order
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000); // wait for focus
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500); // wait for dropdown to open
+						for(var i=1; i < 14; i++){
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 250); // down arrow and wrap twice
+						}
+						for(i=0; i < 5; i++){
+							doh.robot.keyPress(dojo.keys.UP_ARROW, 200); // up arrow and wrap at most once
+						}
+						doh.robot.keyPress(dojo.keys.ENTER, 500); // select current item
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is(isComboBox ? "Massachusetts" : "ma", combo.get("value"), "wrap get('value')");
+						}), 1000);
+
+						return d;
+					}
+				},
+				{
+					timeout:10000,
+					name:"wrap and TAB from Prev choices",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("preservetitletest");
+
+						combo.set('pageSize', 4); // add More choices
+						combo.set("value", isComboBox ? "Maine" : "me", true); // fires onChange
+						combo.set("value", isComboBox ? "Connecticut" : "ct", false); // temporary value
+						combo.focusNode.focus();
+
+						// Show list, should be in reverse order
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1000); // wait for focus
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500); // wait for dropdown to open
+						for(var i=1; i < 5; i++){
+							doh.robot.keyPress(dojo.keys.DOWN_ARROW, 250); // down arrow to More choices
+						}
+						doh.robot.keyPress(dojo.keys.ENTER, 500); // select More choices
+						doh.robot.keyPress(dojo.keys.UP_ARROW, 1000); // up arrow to Previous choices
+						doh.robot.keyPress(dojo.keys.TAB, 500); // select current item
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is(isComboBox ? "Maine" : "me", combo.get("value"), "Previous choice reverts value");
+						}), 1000);
+
+						return d;
+					}
+				}
+			]);
+
+			var pageSize, combo;
+			// Test more choices
+			doh.register("Select More choices", [
+				{
+					timeout:10000,
+					name:"no auto-complete",
+					setUp: function(){
+						combo = dijit.byId("setvaluetest");
+						pageSize = combo.get('pageSize');
+						combo.set('pageSize', 1);
+						combo.set('displayedValue', null, false);
+						combo.focusNode.focus();
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// select more choices and press Enter
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1500); // open dropdown
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500); // select Alabama
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500); // select more choices
+						doh.robot.keyPress(dojo.keys.ENTER, 500);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// Check that drop down list has disappeared
+							var list = dojo.byId("setvaluetest_popup");
+							doh.t(list && isVisible(list), "drop down is visible");
+							doh.is(combo.dropDown.getHighlightedOption(), findMenuItem(combo, "Alaska"), "Alaska is selected");
+
+							doh.t(combo.focused, "widget is focused");
+
+							// Since the user down arrowed thru the choices, the value should be the current selection
+							doh.is('Alaska', combo.focusNode.value);
+							if(!isComboBox){
+								doh.t(combo.isValid(true), "FilteringSelect should be valid");
+							}
+						}), 1000, 500);
+
+						return d;
+					},
+					tearDown: function(){
+						combo.set('pageSize', pageSize);
+						combo.closeDropDown();
+					}
+				},
+				{
+					timeout:10000,
+					name:"auto-complete",
+					setUp: function(){
+						combo = dijit.byId("datatest");
+						pageSize = combo.get('pageSize');
+						combo.set('pageSize', 1);
+						combo.set('displayedValue', null, false);
+						combo.focusNode.focus();
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// select more choices and press Enter
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 1500); // open dropdown
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500); // select Alabama
+						doh.robot.keyPress(dojo.keys.DOWN_ARROW, 500); // select more choices
+						doh.robot.keyPress(dojo.keys.ENTER, 500);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							// Check that drop down list has disappeared
+							var list = dojo.byId("datatest_popup");
+							doh.t(list && isVisible(list), "drop down is visible");
+							doh.is(combo.dropDown.getHighlightedOption(), findMenuItem(combo, "Alaska"), "Alaska is selected");
+
+							doh.t(combo.focused, "widget is focused");
+
+							// Since the user down arrowed thru the choices, the value should be the current selection
+							doh.is('Alaska', combo.focusNode.value);
+							if(!isComboBox){
+								doh.t(combo.isValid(true), "FilteringSelect should be valid");
+							}
+						}), 1000, 500);
+
+						return d;
+					},
+					tearDown: function(){
+						combo.set('pageSize', pageSize);
+						combo.closeDropDown();
+					}
+				}
+			]);
+
+			doh.register("onChange", [
+				{
+					timeout:6000,
+					name:"11062",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo");
+						var status = "not called";
+						var connectHandle = combo.connect(combo, "onChange", function(){
+							status = "called";
+						});
+						combo.focusNode.focus();
+						doh.robot.keyPress(dojo.keys.TAB, 500); // blur
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							combo.disconnect(connectHandle);
+							doh.is("not called", status, "onChange should not have been called");
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					timeout:2000,
+					name:"10988.0",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo");
+						var value = isComboBox ? 'Kentucky' : 'KY';
+						combo._lastValueReported = combo._lastValue = value;
+						var status = "not called";
+						var connectHandle = combo.connect(combo, "onChange", function(v){
+							status = "called with " + v;
+						});
+						combo.set('value', value, true);
+						doh.robot.sequence(d.getTestCallback(function(){
+							combo.disconnect(connectHandle);
+							combo._pendingOnChange = false;
+							doh.is("not called", status, "onChange should not have been called");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					timeout:2000,
+					name:"10988.1",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo");
+						var value1 = isComboBox ? 'Kentucky' : 'KY';
+						var value2 = isComboBox ? 'Texas' : 'TX';
+						combo._lastValueReported = combo._lastValue = value1;
+						var status = "not called";
+						var connectHandle = combo.connect(combo, "onChange", function(v){
+							status = "called with " + v;
+						});
+						combo.set('value', value2, false);
+						doh.robot.sequence(d.getTestCallback(function(){
+							combo.disconnect(connectHandle);
+							combo._pendingOnChange = false;
+							doh.is("not called", status, "onChange should not have been called");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					timeout:2000,
+					name:"10988.2",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo");
+						var value1 = isComboBox ? 'Kentucky' : 'KY';
+						var value2 = isComboBox ? 'Texas' : 'TX';
+						combo._lastValueReported = combo._lastValue = value2;
+						var status = "not called";
+						var connectHandle = combo.connect(combo, "onChange", function(v){
+							status = "called with " + v;
+						});
+						combo.set('value', value1, false);
+						combo.set('value', value2);
+						doh.robot.sequence(d.getTestCallback(function(){
+							combo.disconnect(connectHandle);
+							combo._pendingOnChange = false;
+							doh.is("called with "+value2, status, "onChange should have been called with "+value2);
+						}), 500);
+						return d;
+					}
+				},
+				{
+					timeout:2000,
+					name:"10988.3",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo");
+						var value1 = isComboBox ? 'Kentucky' : 'KY';
+						var value2 = isComboBox ? 'Texas' : 'TX';
+						combo._lastValueReported = combo._lastValue = value2;
+						var status = "not called";
+						var connectHandle = combo.connect(combo, "onChange", function(v){
+							status = "called with " + v;
+						});
+						combo.set('value', value1, false);
+						combo.set('value', value2, false);
+						combo.set('value', value2, true);
+						doh.robot.sequence(d.getTestCallback(function(){
+							combo.disconnect(connectHandle);
+							combo._pendingOnChange = false;
+							doh.is("called with "+value2, status, "onChange should have been called with "+value2);
+						}), 500);
+						return d;
+					}
+				},
+				{
+					timeout:2000,
+					name:"10988.4",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo");
+						var value = isComboBox ? 'Kentucky' : 'KY';
+						combo._lastValueReported = combo._lastValue = value;
+						var status = "not called";
+						var connectHandle = combo.connect(combo, "onChange", function(v){
+							status = "called with " + v;
+						});
+						combo.set('value', value, false);
+						combo.set('value', value, true);
+						doh.robot.sequence(d.getTestCallback(function(){
+							combo.disconnect(connectHandle);
+							combo._pendingOnChange = false;
+							doh.is("not called", status, "onChange should not have been called");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					timeout:2000,
+					name:"10988.5",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo");
+						var value1 = isComboBox ? 'Kentucky' : 'KY';
+						var value2 = isComboBox ? 'Texas' : 'TX';
+						combo._lastValueReported = combo._lastValue = value2;
+						var status = "not called";
+						var connectHandle = combo.connect(combo, "onChange", function(v){
+							status = "called with " + v;
+						});
+						combo.set('value', value1, false);
+						combo.set('value', value2, true);
+						combo.set('value', value1, false);
+						doh.robot.sequence(d.getTestCallback(function(){
+							combo.disconnect(connectHandle);
+							combo._pendingOnChange = false;
+							doh.is("called with "+value2, status, "onChange should have been called with "+value2);
+						}), 500);
+						return d;
+					}
+				},
+				{
+					timeout:2000,
+					name:"10988.6",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo");
+						var value1 = isComboBox ? 'Kentucky' : 'KY';
+						var value2 = isComboBox ? 'Texas' : 'TX';
+						combo._lastValueReported = combo._lastValue = value1;
+						var status = "not called";
+						var connectHandle = combo.connect(combo, "onChange", function(v){
+							status = "called with " + v;
+						});
+						combo.set('value', value2, true);
+						doh.robot.sequence(d.getTestCallback(function(){
+							combo.disconnect(connectHandle);
+							combo._pendingOnChange = false;
+							doh.is("called with "+value2, status, "onChange should have been called with true"+value2);
+						}), 500);
+						return d;
+					}
+				},
+				{
+					timeout:2000,
+					name:"10988.7",
+					runTest:function(){
+						var d = new doh.Deferred();
+						var combo = dijit.byId("progCombo");
+						var value1 = isComboBox ? 'Kentucky' : 'KY';
+						var value2 = isComboBox ? 'Texas' : 'TX';
+						combo._lastValueReported = combo._lastValue = value2;
+						var status = "not called";
+						var connectHandle = combo.connect(combo, "onChange", function(v){
+							status = "called with " + v;
+						});
+						combo.set('value', value1, false);
+						combo.set('value', value1, true);
+						doh.robot.sequence(d.getTestCallback(function(){
+							combo.disconnect(connectHandle);
+							combo._pendingOnChange = false;
+							doh.is("called with "+value1, status, "onChange should have been called with "+value1);
+						}), 500);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("destroy", [
+				{
+					timeout: 1000,
+					name: "destroy",
+					runTest: function(){
+						var d = new doh.Deferred();
+						doh.robot.sequence(d.getTestCallback(function(){
+							dijit.byId("combo_01").destroy();
+							doh.is(undefined, dojo.byId("combo_01"), 'widget was removed');
+							doh.f(dojo.byId('destroyDiv').firstChild, 'container node is empty');
+						}), 0);
+						return d;
+					}
+				}
+			]);
+
+			dojo.forEach(
+				[
+					{ attrs: { ignoreCase:true,  highlightMatch:"first", queryExpr:"${0}*"  }, results: { AA: "<>A<>A", Aa: "<>A<>a", aA: "<>a<>A", aa: "<>a<>a" } },
+					{ attrs: { ignoreCase:false, highlightMatch:"first", queryExpr:"${0}*"  }, results: { aA: "<>a<>A", aa: "<>a<>a" } },
+					{ attrs: { ignoreCase:true,  highlightMatch:"all",   queryExpr:"${0}*"  }, results: { AA: "<>A<>A", Aa: "<>A<>a", aA: "<>a<>A", aa: "<>a<>a" } },
+					{ attrs: { ignoreCase:true,  highlightMatch:"all",   queryExpr:"*${0}*" }, results: { AA: "<>A<><>A<>", Aa: "<>A<><>a<>", aA: "<>a<><>A<>", aa: "<>a<><>a<>" } },
+					{ attrs: { ignoreCase:false, highlightMatch:"all",   queryExpr:"*${0}*" }, results: { Aa: "A<>a<>", aA: "<>a<>A", aa: "<>a<><>a<>" } },
+					{ attrs: { ignoreCase:false, highlightMatch:"none",  queryExpr:"*${0}*" }, results: { Aa: "Aa", aA: "aA", aa: "aa" } },
+					{ attrs: { ignoreCase:true,  highlightMatch:"all",   queryExpr:"*${0}"  }, results: { AA: "A<>A<>", Aa: "A<>a<>", aA: "a<>A<>", aa: "a<>a<>" } },
+					{ attrs: { ignoreCase:false, highlightMatch:"first", queryExpr:"*${0}"  }, results: { Aa: "A<>a<>", aa: "a<>a<>" } }
+				], function(test){
+					doh.register("highlight", [
+						{
+							timeout: 6000,
+							name: dojo.toJson(test.attrs),
+							setUp: function(){
+								combo = dijit.byId("highlight");
+								dojo.mixin(combo, test.attrs);
+								combo.focusNode.focus();
+							},
+							runTest: function(){
+								var d = new doh.Deferred();
+								doh.robot.keyPress(dojo.keys.BACKSPACE, 1000);
+								doh.robot.typeKeys("a", 1, 100);
+								doh.robot.sequence(d.getTestCallback(function(){
+									dojo.forEach(["AA","Aa","aA","aa"], function(idx){
+										var item = findMenuItem(combo, idx);
+										if(idx in test.results){
+											var expected = test.results[idx];
+											var actual = item.innerHTML.replace(/\/?span\s*[^>]*@?/ig, "");
+											doh.is(expected, actual, idx);
+										}else{
+											doh.t(item == combo.dropDown.nextButton, "too many menu items: " + idx);
+										}
+									});
+								}), 1000, 500);
+								return d;
+							},
+							tearDown: function(){
+								combo.closeDropDown();
+							}
+						}
+					]);
+				}
+			);
+
+			doh.register("custom class", [
+				// Select a value from the drop down using the keyboard,
+				// use "more choices" button to page as necessary
+				{
+					timeout: 60000,
+					name:" customstore_a11y",
+					combo: "subclass",
+					runTest: function(){
+						return robot_a11ySelectValue(dijit.byId(this.combo), "Delaware", isComboBox ? "Delaware" : "DE", "Delaware");
+					}
+				}
+			]);
+
+			doh.register("aria-autocomplete (#9089)", [
+				{
+					timeout: 1000,
+					name:"aria-autocomplete with autoComplete enabled",
+					combo: "autocompleteon",
+					runTest: function(){
+						var combo = dijit.byId(this.combo);
+						doh.is("both", combo.focusNode.getAttribute("aria-autocomplete"), "aria-autocomplete on combo is 'both'");
+					}
+				},
+				{
+					timeout: 1000,
+					name:"aria-autocomplete with autoComplete disabled",
+					combo: "autocompleteoff",
+					runTest: function(){
+						var combo = dijit.byId(this.combo);
+						doh.is("list", combo.focusNode.getAttribute("aria-autocomplete"), "aria-autocomplete on combo is 'list'");
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/_autoComplete_mouse.html b/src/main/resources/static/dijit/tests/form/robot/_autoComplete_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..d6d57adb457c625d34f7f990a589036db1b6fc1d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/_autoComplete_mouse.html
@@ -0,0 +1,470 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>doh.robot ComboBox/FilteringSelect Mouse Tests</title>
+
+	<style>
+		@import "../../../../util/doh/robot/robot.css";
+	</style>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dijit.robotx");
+		dojo.require("dojo.window");
+		dojo.require("dijit.tests.helpers");	// functions to help test
+
+		// TODO: provide URL toggle for FilteringSelect
+		var testWidget = "dijit.form.ComboBox";
+		var qstr = window.location.search.substr(1);
+		if(qstr.length){
+		        var qparts = qstr.split("&");
+		        for(var x=0; x<qparts.length; x++){
+		                var tp = qparts[x].split("=");
+		                if(tp[0] == "testWidget"){
+		                        testWidget = tp[1];
+		                }
+		        }
+		}
+		isComboBox = testWidget=="dijit.form.ComboBox";
+		dojo.ready(function(){
+			var pageSize, combo;
+
+			var findMenuItem = function(combo, text){
+				var node = combo.dropDown.domNode.firstChild;
+				while(((node.innerText || node.textContent).indexOf(text) < 0) && node.nextSibling){
+					node = node.nextSibling;
+				}
+				return node;
+			};
+
+			doh.robot.initRobot('../_autoComplete.html?testWidget='+testWidget);
+
+			// Wait for data stores to finish loading before starting tests
+			doh.register("wait for data store load",
+				dojo.map(["store", "store2", "stateStore", "dijitStore"], function(name){
+					return {
+							name: "wait for " + name,
+							timeout: 5000,
+							runTest: function(){
+								var d = new doh.Deferred();
+								dojo.global[name].fetch({
+									onComplete: function(){
+										d.callback(true);
+									},
+									onError: function(e){
+										d.errback(e);
+									}
+								});
+								return d;
+							}
+						};
+				})
+			);
+
+			doh.register("drop down navigation / mouse", [
+				{
+					timeout:6000,
+					name:"open drop down",
+					runTest:function(){
+						var d = new doh.Deferred();
+
+						combo = dijit.byId("setvaluetest");
+
+						// Open drop down
+						doh.robot.mouseMoveAt(combo._buttonNode, 0, 0);
+						doh.robot.mouseClick({left:true}, 500);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							var list = combo.dropDown.domNode,
+								entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.t(isVisible(list), "list is visible");
+							doh.is(31, entries.length, "30 elements plus next button");
+							doh.is("California", combo.focusNode.value, "displayed value hasn't changed");
+						}), 1500, 100);
+
+						return d;
+					}
+				},
+
+				{
+					timeout:9000,
+					name:"next page",
+					runTest:function(){
+						var d = new doh.Deferred();
+
+						combo = dijit.byId("setvaluetest");
+						var list = combo.dropDown.domNode;
+
+						doh.t(isVisible(list), "list is still visible");
+
+						dojo.window.scrollIntoView(combo.dropDown.nextButton);
+						doh.robot.mouseMoveAt(combo.dropDown.nextButton, 1, 0);
+						doh.robot.mouseClick({left:true}, 1000);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							var entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.is("Minnesota (MN)", innerText(entries[1]), "first entry on second page of drop down");
+							doh.is("California", combo.focusNode.value, "displayed value hasn't changed");
+						}), 1500, 1000);
+
+						return d;
+					}
+				},
+
+				{
+					timeout:9000,
+					name:"last page",
+					runTest:function(){
+						var d = new doh.Deferred();
+
+						combo = dijit.byId("setvaluetest");
+						dojo.window.scrollIntoView(combo.dropDown.nextButton);
+						doh.robot.mouseMoveAt(combo.dropDown.nextButton, 1, 0);
+						doh.robot.mouseClick({left:true}, 1000);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							var list = combo.dropDown.domNode,
+								entries = dojo.query(".dijitMenuItem", list).filter(isVisible);
+							doh.is(2, entries.length, "previous choices + wyoming");
+							doh.is("Wyoming (WY)", innerText(entries[1]));
+						}), 1500, 1000);
+
+						return d;
+					}
+				},
+
+				{
+					timeout:9000,
+					name:"previous page",
+					runTest:function(){
+						var d = new doh.Deferred();
+
+						combo = dijit.byId("setvaluetest");
+						dojo.window.scrollIntoView(combo.dropDown.previousButton);
+						doh.robot.mouseMoveAt(combo.dropDown.previousButton, 0, 0);
+						doh.robot.mouseClick({left:true}, 1000);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							var list = combo.dropDown.domNode,
+								entries = dojo.query(".dijitMenuItem", list);
+							doh.is(32, entries.length, "30 states, plus next and previous button");
+							doh.is("Minnesota (MN)", innerText(entries[1]));
+							doh.is("Wisconsin (WI)", innerText(entries[30]));
+							doh.is("California", combo.focusNode.value, "displayed value hasn't changed");
+						}), 1500, 1000);
+
+						return d;
+					}
+				},
+
+				{
+					timeout:6000,
+					name:"select value",
+					runTest:function(){
+						var d = new doh.Deferred();
+
+						combo = dijit.byId("setvaluetest");
+						var nj = findMenuItem(combo, "New Jersey (NJ)");
+						dojo.window.scrollIntoView(nj);
+
+						doh.robot.mouseMoveAt(function(){ return nj }, 500, 0);
+						doh.robot.mouseClick({left:true}, 500);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is(isComboBox ? "New Jersey" : "NJ", dijit.byId("setvaluetest").get("value"),
+								"selected New Jersey from drop down");
+							var count = dijit.byId("setvaluetest").labelFuncCounts['NJ'];
+							doh.is(2, count, "# custom labelFunc calls");
+						}), 1000, 500);
+
+						return d;
+					}
+				},
+
+				{
+					timeout:6000,
+					name:"blur value",
+					runTest:function(){
+						var d = new doh.Deferred();
+
+						combo = dijit.byId("setvaluetest");
+						// focus combo
+						doh.robot.mouseMoveAt(combo.focusNode, 500, 0);
+						doh.robot.mouseClick({left:true}, 500);
+						// blur
+						doh.robot.mouseMoveAt('sv1_4', 500, 0);
+						doh.robot.mouseClick({left:true}, 500);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.is(isComboBox ? "New Jersey" : "NJ", dijit.byId("setvaluetest").get("value"),
+								"New Jersey still set after blur");
+							var count = dijit.byId("setvaluetest").labelFuncCounts['NJ'];
+							doh.is(2, count, "# custom labelFunc calls unchanged after blur");
+						}), 1000, 500);
+
+						return d;
+					}
+				}
+			]);
+
+
+			// For back-compat with 1.0 need to report click events, even clicks on the button
+			// (which by default is stopped in _HasDropDown)
+			// Remove for 2.0.
+			doh.register("onClick", [
+				{
+					timeout: 5000,
+					name: "click on button",
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						combo = dijit.byId("setvaluetest");
+						handle = dojo.global.dojo.connect(combo, "onClick", d.getTestCallback(function(){
+							// If we hit here it's OK, if no click event then fail with timeout
+							console.log("hit onClick callback");
+						}));
+
+						dojo.window.scrollIntoView(combo.domNode);
+
+						doh.robot.mouseMoveAt(combo._buttonNode, 1000, 0);
+						doh.robot.mouseClick({left:true}, 500);
+
+						return d;
+					},
+					tearDown: function(){
+						dojo.disconnect(handle);
+						combo.closeDropDown();
+					}
+				},
+				{
+					timeout: 5000,
+					name: "click on input",
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						combo = dijit.byId("setvaluetest");
+						handle = dojo.global.dojo.connect(combo, "onClick", d.getTestCallback(function(){
+							// If we hit here it's OK, if no click event then fail with timeout
+							console.log("hit onClick callback");
+						}));
+
+						dojo.window.scrollIntoView(combo.domNode);
+
+						doh.robot.mouseMoveAt(combo.focusNode, 1000, 0);
+						doh.robot.mouseClick({left:true}, 500);
+
+						return d;
+					},
+					tearDown: function(){
+						dojo.disconnect(handle);
+						combo.closeDropDown();
+					}
+				}
+			]);
+
+			// Test clicking more choices / previous choices buttons doesn't affect value in <input> area
+			doh.register("auto-complete", [
+				{
+					timeout:10000,
+					name:"open drop down",
+					setUp: function(){
+						combo = dijit.byId("datatest");
+						pageSize = combo.get('pageSize');
+						combo.set('pageSize', 1);
+						combo.set('displayedValue', null, false);
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+						handle = dojo.connect(combo, "openDropDown", function(){
+							setTimeout(d.getTestCallback(function(){
+								var list = combo.dropDown.domNode;
+								doh.t(list && isVisible(list), "drop down is visible");
+	
+								// Clicking "more choices" shouldn't change value in ComboBox
+								doh.is('Alabama', combo.focusNode.value, "focus value");
+								if(!isComboBox){
+									doh.t(combo.isValid(true), "FilteringSelect should be valid");
+								}
+							}), 0);
+						});
+
+						doh.robot.mouseMoveAt(combo.focusNode, 500, 0);
+						doh.robot.mouseClick({left:true}, 500);
+
+						doh.robot.typeKeys("a", 1500); // will open dropdown
+
+						return d;
+					},
+					tearDown: function(){
+						dojo.disconnect(handle);
+					}
+				},
+				{
+					timeout:10000,
+					name:"click more choices",
+					runTest: function(){
+						var d = new doh.Deferred();
+						handle = dojo.connect(combo, "openDropDown", function(){
+							setTimeout(d.getTestCallback(function(){
+								var list = combo.dropDown.domNode;
+								doh.t(list && isVisible(list), "drop down is visible");
+								doh.is(findMenuItem(combo, "Alaska"), combo.dropDown.getHighlightedOption(), "Alaska is highlighted");
+	
+								doh.t(combo.focused, "widget is focused");
+							}), 0);
+						});
+
+						doh.robot.mouseMoveAt(combo.dropDown.nextButton, 1000, 0); // move to More choices
+						doh.robot.mouseClick({left:true}, 1000);	// will display new drop down
+					
+						return d;
+					},
+					tearDown: function(){
+						dojo.disconnect(handle);
+						combo.set('pageSize', pageSize);
+						combo.closeDropDown();
+					}
+				}
+			]);
+
+			// disabled tests+standard tests
+			doh.register("disabled", [
+				{
+					timeout:6000,
+					name: "focus by mouse",
+					runTest:function(){
+						var d = new doh.Deferred();
+						combo = dijit.byId("combo3");
+
+						doh.robot.mouseMoveAt(combo.focusNode, 500, 0);
+						doh.robot.mouseClick({left:true}, 500);
+
+						doh.robot.sequence(d.getTestCallback(function(){
+							if(!dojo.isWebKit){		// webkit bug, see #11064 - TODO: verify this is fixed now
+								doh.isNot(combo, dijit.getEnclosingWidget(dojo.global.dijit.focus.curNode), "click doesn't focus disabled combo");
+							}
+						}), 1000, 500);
+
+						return d;
+					}
+				},
+				{
+					timeout:6000,
+					name:"dropdown button",
+					runTest:function(){
+						var d = new doh.Deferred();
+						combo = dijit.byId("combo3");
+
+						// Press Arrow Button
+						doh.robot.mouseMoveAt(combo._buttonNode, 500, 0);
+						doh.robot.mouseClick({left:true}, 500);
+
+						// Assert that nothing happened
+						doh.robot.sequence(d.getTestCallback(function(){
+							doh.f(combo.dropDown, "User was able to open the menu on a disabled ComboBox!");
+
+							// Testcase for #8923, uncomment when that bug is fixed
+							//doh.isNot(combo, dijit.getEnclosingWidget(dojo.global.dijit.focus.curNode), "button-click doesn't focus disabled combo");
+						}), 1000, 500);
+						return d;
+					}
+				}
+			]);
+
+			doh.register("#9898", [
+				{
+					timeout: 9000,
+					name: "firefox mouse problem",
+					combo: "labelFunc",
+					handle: null,
+					setUp: function(){
+						combo = dijit.byId(this.combo);
+					},
+					runTest: function(){ // very hard to hit due to timing
+						var d = new doh.Deferred();
+						dojo.byId("native").scrollIntoView(false); // force to bottom of screen
+						// jump through hoops to increase the odds of hitting the problem
+						handle = combo.connect(combo, 'loadDropDown', // when drop down is about to be displayed, set up 1 time event handlers
+							function(){
+								var popup = dijit.byId("labelFunc_popup"); // combobox results
+								var old = dojo.global.dojo._setMarginBox; // menu is about to be shrunk to fit the viewport, so stop this
+								dojo.global.dojo._setMarginBox = dojo.hitch(dojo.global,
+									function(){
+										dojo.global.dojo._setMarginBox = old; // restore original _setMarginBox
+									});
+								var old2 = popup._focusOptionNode;
+								popup._focusOptionNode = // LI option is about to be highlighted, so stop that as well
+									function(node){
+										popup._focusOptionNode = old2; // restore original _focusOptionNode
+									};
+								doh.robot.mouseRelease({left:true}, 0); // invoke popup._onMouseUp
+								doh.robot.sequence(d.getTestCallback(function(){
+									doh.t(isVisible(popup.domNode), "list is visible");
+								}), 1000, 500);
+							}
+						);
+						doh.robot.mouseMoveAt(combo._buttonNode, 1000, 0);
+						doh.robot.mousePress({left:true}, 500); // mousedown on the arrow image
+
+						return d;
+					},
+					tearDown: function(){
+						combo.disconnect(handle);
+						combo.closeDropDown();
+					}
+				}
+			]);
+
+			doh.register("#10431", [
+				{
+					timeout: 9000,
+					name: "untouched blank value and required",
+					combo: "japanese",
+					setUp: function(){
+						combo = dijit.byId(this.combo);
+					},
+					runTest: function(){
+						doh.is("", combo.get("value"), "value");
+						doh.is("", combo.get('displayedValue'), "displayedValue");
+						doh.f(combo.isValid(), "isValid");
+						doh.is("Incomplete", combo.state, "state");
+					},
+					tearDown: function(){
+						combo.closeDropDown();
+					}
+				},
+				{
+					timeout: 9000,
+					name: "blurred blank value and required",
+					combo: "japanese",
+					setUp: function(){
+						combo = dijit.byId(this.combo);
+					},
+					runTest: function(){
+						var d = new doh.Deferred();
+						doh.robot.mouseMoveAt(combo.focusNode, 500, 0);
+						doh.robot.mouseClick({left:true}, 500);
+						doh.robot.keyPress(dojo.keys.TAB, 1000);
+
+						doh.robot.sequence(d.getTestCallback(dojo.hitch(this, function(){
+							doh.is("", combo.get("value"), "value");
+							doh.is("", combo.get('displayedValue'), "displayedValue");
+							doh.f(combo.isValid(), "isValid");
+							doh.is("Error", combo.state, "state");
+						})), 1000, 500);
+						return d;
+					},
+					tearDown: function(){
+						combo.closeDropDown();
+					}
+				}
+			]);
+			
+			doh.run();
+		});
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/robot/validationMessages.html b/src/main/resources/static/dijit/tests/form/robot/validationMessages.html
new file mode 100644
index 0000000000000000000000000000000000000000..742ff58b3a8a23d21fac081f5e8f00f394311bcb
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/robot/validationMessages.html
@@ -0,0 +1,711 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Validation Message Test</title>
+
+		<style>
+			@import "../../../themes/claro/document.css";
+			@import "../../css/dijitTests.css";
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+		<link id="themeStyles" rel="stylesheet" href="../../../themes/dijit.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, locale: 'en-us'"></script>
+
+		<script type="text/javascript">
+			dojo.require("dojo.parser");
+
+			dojo.require("dijit.form.NumberTextBox");
+			dojo.require("dijit.Tooltip");
+			dojo.require("dijit.robot");
+
+			dojo.ready(function(){
+
+			// track tooltip currently being displayed (if any)
+			var tooltip;
+			dojo.connect(dijit.Tooltip, "show", function(msg){ tooltip = msg; });
+			dojo.connect(dijit.Tooltip, "hide", function(msg){ tooltip = ""; });
+
+			function testOn(evt, widget, deferred, callback, delay){
+				var handler = widget.connect(widget.focusNode, "on"+evt,
+					function(){
+						widget.disconnect(handler); 
+						setTimeout(deferred.getTestCallback(callback), delay||33);
+					});
+			}
+
+			doh.register("parse", function parse(){
+				dojo.parser.parse();
+			});
+
+			dojo.forEach([false, true], function(rangeBound){
+				dojo.forEach([false, true], function(required){
+					dojo.forEach(["", "p"], function(promptMessage){
+						dojo.forEach(["", "i"], function(invalidMessage){
+							dojo.forEach(["", "m"], function(missingMessage){
+								var name = "t" + (rangeBound?1:0) + (required?1:0) + (promptMessage?1:0) + (invalidMessage?1:0) + (missingMessage?1:0);
+								var textbox;
+
+								doh.register(name, [
+								{
+									name: name + " first focus, empty value",
+									timeout: 5000,
+									setUp:function(){
+										textbox = dijit.byId(name);
+										textbox.focusNode.scrollIntoView();
+									},
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('mouseup', textbox, d, function(){
+											doh.is(!required, textbox.isValid(false), "isValid");
+											doh.is(required ? "Incomplete" : "", textbox.state, "state");
+											doh.is(promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.mouseMoveAt(textbox.focusNode, 0, 1);
+										doh.robot.mouseClick({left: true}, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " first valid character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.is(!rangeBound, textbox.isValid(true), "isValid");
+											doh.is(rangeBound ? "Incomplete" : "", textbox.state, "state");
+											doh.is(rangeBound? promptMessage : "", tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("1", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " second valid character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("2", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " first invalid character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.f(textbox.isValid(true), "isValid");
+											doh.is("Error", textbox.state, "state");
+											doh.is(invalidMessage||promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("a", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete invalid character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " period",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											// number.parse("12.", {fractional:[true,false], pattern:"#.#####"}) is valid
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.typeKeys(".", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " invalid pre-fractional character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.f(textbox.isValid(true), "isValid");
+											doh.is("Error", textbox.state, "state");
+											doh.is(invalidMessage||promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("a", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete invalid pre-fractional character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " valid fractional digit",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("1", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " invalid fractional character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.f(textbox.isValid(true), "isValid");
+											doh.is("Error", textbox.state, "state");
+											doh.is(invalidMessage||promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("a", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete invalid fractional character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete valid fractional digit",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete period",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete right-most valid character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.is(!rangeBound, textbox.isValid(true), "isValid");
+											doh.is(rangeBound ? "Incomplete" : "", textbox.state, "state");
+											doh.is(rangeBound? promptMessage : "", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete remaining valid character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.is(!required, textbox.isValid(false), "isValid");
+											doh.is(required ? "Incomplete" : "", textbox.state, "state");
+											doh.is(promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " tab from empty",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('blur', textbox, d, function(){
+											doh.is(!required, textbox.isValid(false), "isValid");
+											doh.is(required ? "Error" : "", textbox.state, "state");
+											doh.is("", tooltip, "no tooltip");
+											doh.is(required? (missingMessage||invalidMessage||promptMessage) : promptMessage, textbox.message, "message");
+										});
+										doh.robot.keyPress(dojo.keys.TAB, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " tab back to empty",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('focus', textbox, d, function(){
+											doh.is(!required, textbox.isValid(false), "isValid");
+											doh.is(required ? "Error" : "", textbox.state, "state");
+											doh.is(required? (missingMessage||invalidMessage||promptMessage) : promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.TAB, 0, { shift:true });
+										return d;
+									}
+								},
+								{
+									name: name + " first valid character after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.is(!rangeBound, textbox.isValid(false), "isValid");
+											doh.is(rangeBound ? "Incomplete" : "", textbox.state, "state");
+											doh.is(rangeBound? promptMessage : "", tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("1", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " 2nd valid character after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("2", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " out of range after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.is(!rangeBound, textbox.isValid(false), "isValid");
+											doh.is(rangeBound ? "Error" : "", textbox.state, "state");
+											doh.is(rangeBound? textbox.rangeMessage : "", tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("3", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " tab from out of range",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('blur', textbox, d, function(){
+											doh.is(!rangeBound, textbox.isValid(false), "isValid");
+											doh.is(rangeBound ? "Error" : "", textbox.state, "state");
+											doh.is("", tooltip, "no tooltip");
+											doh.is(rangeBound? textbox.rangeMessage : "", textbox.message, "message");
+										});
+										doh.robot.keyPress(dojo.keys.TAB, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " tab back to out of range",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('focus', textbox, d, function(){
+											doh.is(!rangeBound, textbox.isValid(false), "isValid");
+											doh.is(rangeBound ? "Error" : "", textbox.state, "state");
+											doh.is(rangeBound? textbox.rangeMessage : "", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.TAB, 0, { shift:true });
+										return d;
+									}
+								},
+								{
+									name: name + " position input caret to end",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('keyup', textbox, d, function(){
+											doh.is(!rangeBound, textbox.isValid(true), "isValid");
+											doh.is(rangeBound ? "Error" : "", textbox.state, "state");
+											doh.is(rangeBound? textbox.rangeMessage : "", tooltip, "tooltip");
+										});
+										if(dojo.isMac){
+											doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 0, {meta:true});
+											doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 0); // trigger keyup
+										}else{
+											doh.robot.keyPress(dojo.keys.END, 0);
+										}
+										return d;
+									}
+								},
+								{
+									name: name + " delete out of range character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " period after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.typeKeys(".", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " invalid pre-fractional character after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.f(textbox.isValid(true), "isValid");
+											doh.is("Error", textbox.state, "state");
+											doh.is(invalidMessage||promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("a", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete invalid pre-fractional character after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " valid fractional digit after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("1", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " invalid fractional character after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.f(textbox.isValid(true), "isValid");
+											doh.is("Error", textbox.state, "state");
+											doh.is(invalidMessage||promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.typeKeys("a", 0, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete invalid fractional character after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete valid fractional digit after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete period after refocus",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.t(textbox.isValid(true), "isValid");
+											doh.is("", textbox.state, "state");
+											doh.is("", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete last in-range character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.is(rangeBound ? "Incomplete" : "", textbox.state, "state");
+											doh.is(rangeBound? promptMessage : "", tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " delete remaining character",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('input', textbox, d, function(){
+											doh.is(!required, textbox.isValid(true), "isValid");
+											doh.is(required ? "Incomplete" : "", textbox.state, "state");
+											doh.is(promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.BACKSPACE, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " tab from empty 2",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('blur', textbox, d, function(){
+											doh.is(!required, textbox.isValid(false), "isValid");
+											doh.is(required ? "Error" : "", textbox.state, "state");
+											doh.is("", tooltip, "no tooltip");
+											doh.is(required? (missingMessage||invalidMessage||promptMessage) : promptMessage, textbox.message, "message");
+										});
+										doh.robot.keyPress(dojo.keys.TAB, 0);
+										return d;
+									}
+								},
+								{
+									name: name + " tab back to empty 2",
+									timeout: 2000,
+									runTest: function(){
+										var d = new doh.Deferred();
+										testOn('focus', textbox, d, function(){
+											doh.is(!required, textbox.isValid(false), "isValid");
+											doh.is(required ? "Error" : "", textbox.state, "state");
+											doh.is(required? (missingMessage||invalidMessage||promptMessage) : promptMessage, tooltip, "tooltip");
+										});
+										doh.robot.keyPress(dojo.keys.TAB, 0, { shift:true });
+										return d;
+									}
+								}]);
+							});
+						});
+					});
+				});
+			});
+
+			doh.run();
+			});
+		</script>
+	</head>
+	<body>
+		<label for="t00000">not required, no min/max, no prompt message, no invalid message, no missing message</label><br>
+		<input id="t00000" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:false, promptMessage:"", invalidMessage:"", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t00000"/><br>
+
+		<label for="t00001">not required, no min/max, no prompt message, no invalid message, missing message</label><br>
+		<input id="t00001" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:false, promptMessage:"", invalidMessage:"", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t00001"/><br>
+
+		<label for="t00010">not required, no min/max, no prompt message, invalid message, no missing message</label><br>
+		<input id="t00010" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:false, promptMessage:"", invalidMessage:"i", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t00010"/><br>
+
+		<label for="t00011">not required, no min/max, no prompt message, invalid message, missing message</label><br>
+		<input id="t00011" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:false, promptMessage:"", invalidMessage:"i", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t00011"/><br>
+
+		<label for="t00100">not required, no min/max, prompt message, no invalid message, no missing message</label><br>
+		<input id="t00100" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:false, promptMessage:"p", invalidMessage:"", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t00100"/><br>
+
+		<label for="t00101">not required, no min/max, prompt message, no invalid message, missing message</label><br>
+		<input id="t00101" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:false, promptMessage:"p", invalidMessage:"", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t00101"/><br>
+
+		<label for="t00110">not required, no min/max, prompt message, invalid message, no missing message</label><br>
+		<input id="t00110" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:false, promptMessage:"p", invalidMessage:"i", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t00110"/><br>
+
+		<label for="t00111">not required, no min/max, prompt message, invalid message, missing message</label><br>
+		<input id="t00111" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:false, promptMessage:"p", invalidMessage:"i", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t00111"/><br>
+
+		<label for="t01000">required, no min/max, no prompt message, no invalid message, no missing message</label><br>
+		<input id="t01000" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:true, promptMessage:"", invalidMessage:"", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t01000"/><br>
+
+		<label for="t01001">required, no min/max, no prompt message, no invalid message, missing message</label><br>
+		<input id="t01001" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:true, promptMessage:"", invalidMessage:"", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t01001"/><br>
+
+		<label for="t01010">required, no min/max, no prompt message, invalid message, no missing message</label><br>
+		<input id="t01010" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:true, promptMessage:"", invalidMessage:"i", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t01010"/><br>
+
+		<label for="t01011">required, no min/max, no prompt message, invalid message, missing message</label><br>
+		<input id="t01011" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:true, promptMessage:"", invalidMessage:"i", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t01011"/><br>
+
+		<label for="t01100">required, no min/max, prompt message, no invalid message, no missing message</label><br>
+		<input id="t01100" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:true, promptMessage:"p", invalidMessage:"", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t01100"/><br>
+
+		<label for="t01101">required, no min/max, prompt message, no invalid message, missing message</label><br>
+		<input id="t01101" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:true, promptMessage:"p", invalidMessage:"", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t01101"/><br>
+
+		<label for="t01110">required, no min/max, prompt message, invalid message, no missing message</label><br>
+		<input id="t01110" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:true, promptMessage:"p", invalidMessage:"i", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t01110"/><br>
+
+		<label for="t01111">required, no min/max, prompt message, invalid message, missing message</label><br>
+		<input id="t01111" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false] }, required:true, promptMessage:"p", invalidMessage:"i", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t01111"/><br>
+
+		<label for="t10000">not required, min=10, max=100, no prompt message, no invalid message, no missing message</label><br>
+		<input id="t10000" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:false, promptMessage:"", invalidMessage:"", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t10000"/><br>
+
+		<label for="t10001">not required, min=10, max=100, no prompt message, no invalid message, missing message</label><br>
+		<input id="t10001" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:false, promptMessage:"", invalidMessage:"", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t10001"/><br>
+
+		<label for="t10010">not required, min=10, max=100, no prompt message, invalid message, no missing message</label><br>
+		<input id="t10010" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:false, promptMessage:"", invalidMessage:"i", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t10010"/><br>
+
+		<label for="t10011">not required, min=10, max=100, no prompt message, invalid message, missing message</label><br>
+		<input id="t10011" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:false, promptMessage:"", invalidMessage:"i", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t10011"/><br>
+
+		<label for="t10100">not required, min=10, max=100, prompt message, no invalid message, no missing message</label><br>
+		<input id="t10100" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:false, promptMessage:"p", invalidMessage:"", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t10100"/><br>
+
+		<label for="t10101">not required, min=10, max=100, prompt message, no invalid message, missing message</label><br>
+		<input id="t10101" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:false, promptMessage:"p", invalidMessage:"", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t10101"/><br>
+
+		<label for="t10110">not required, min=10, max=100, prompt message, invalid message, no missing message</label><br>
+		<input id="t10110" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:false, promptMessage:"p", invalidMessage:"i", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t10110"/><br>
+
+		<label for="t10111">not required, min=10, max=100, prompt message, invalid message, missing message</label><br>
+		<input id="t10111" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:false, promptMessage:"p", invalidMessage:"i", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t10111"/><br>
+
+		<label for="t11000">required, min=10, max=100, no prompt message, no invalid message, no missing message</label><br>
+		<input id="t11000" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:true, promptMessage:"", invalidMessage:"", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t11000"/><br>
+
+		<label for="t11001">required, min=10, max=100, no prompt message, no invalid message, missing message</label><br>
+		<input id="t11001" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:true, promptMessage:"", invalidMessage:"", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t11001"/><br>
+
+		<label for="t11010">required, min=10, max=100, no prompt message, invalid message, no missing message</label><br>
+		<input id="t11010" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:true, promptMessage:"", invalidMessage:"i", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t11010"/><br>
+
+		<label for="t11011">required, min=10, max=100, no prompt message, invalid message, missing message</label><br>
+		<input id="t11011" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:true, promptMessage:"", invalidMessage:"i", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t11011"/><br>
+
+		<label for="t11100">required, min=10, max=100, prompt message, no invalid message, no missing message</label><br>
+		<input id="t11100" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:true, promptMessage:"p", invalidMessage:"", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t11100"/><br>
+
+		<label for="t11101">required, min=10, max=100, prompt message, no invalid message, missing message</label><br>
+		<input id="t11101" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:true, promptMessage:"p", invalidMessage:"", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t11101"/><br>
+
+		<label for="t11110">required, min=10, max=100, prompt message, invalid message, no missing message</label><br>
+		<input id="t11110" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:true, promptMessage:"p", invalidMessage:"i", missingMessage:"", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t11110"/><br>
+
+		<label for="t11111">required, min=10, max=100, prompt message, invalid message, missing message</label><br>
+		<input id="t11111" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='constraints:{ fractional:[true,false], min:10, max:100 }, required:true, promptMessage:"p", invalidMessage:"i", missingMessage:"m", rangeMessage:"r"'/>
+		<input style="border:0;" size="6" value="t11111"/><br>
+
+	</body>
+</html>
+
diff --git a/src/main/resources/static/dijit/tests/form/runTests.html b/src/main/resources/static/dijit/tests/form/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..71677dd47ae91a3885396bcadb8033c8019029a6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/runTests.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+	<title>Dijit Unit Test Runner</title>
+	<meta http-equiv="REFRESH" content="0;url=../../../util/doh/runner.html?testModule=dijit.tests.form.module"></HEAD>
+	<BODY>
+		Redirecting to D.O.H runner.
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/form/test_Button.html b/src/main/resources/static/dijit/tests/form/test_Button.html
new file mode 100644
index 0000000000000000000000000000000000000000..8a6b1626cacad6f90c5f06e9c3360ee3d0d4fbc8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_Button.html
@@ -0,0 +1,488 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Dojo Button Widget Test</title>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../css/dijitTests.css";
+
+			/* group multiple buttons in a row */
+			.box {
+				display: block;
+				text-align: center;
+			}
+			BUTTON, INPUT,
+			.box .dijit {
+				margin-right: 10px;
+				vertical-align: middle;
+			}
+			.acmeButton .dijitButtonNode {
+				background: rgb(96,96,96) !important;
+				color: white !important;
+				padding: 10px !important;
+				font-size: x-large !important;
+				padding-top: 10px !important;
+				padding-bottom: 10px !important;
+				border: 2px inset rgb(96,96,96);
+			}
+			.acmeButtonHover .dijitButtonNode {
+				background-color: rgb(89,94,111) !important;
+				color: cyan !important;
+			}
+			.acmeButtonFocused .dijitButtonNode {
+				border: yellow inset 2px;
+			}
+			.acmeButtonActive .dijitButtonNode {
+				background-color: white !important;
+				color: black !important;
+				border: 2px solid black !important;
+			}
+		</style>
+
+		<!-- required: the default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+
+		<!-- only needed for alternate theme testing: -->
+		<script type="text/javascript" src="../_testCommon.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.dijit"); // optimize: load dijit layer
+
+			dojo.require("dijit.ColorPalette");
+			dojo.require("dijit.Tooltip");
+
+			dojo.require("dijit.Dialog");
+			dojo.require("dijit.Menu");
+			dojo.require("dijit.MenuItem");
+			dojo.require("dijit.PopupMenuItem");
+			dojo.require("dijit.MenuSeparator");
+
+			dojo.require("dijit.form.Button");
+			dojo.require("dijit.form.DropDownButton");
+			dojo.require("dijit.form.ComboButton");
+			dojo.require("dijit.form.ToggleButton");
+
+			dojo.require("dijit.form.Form");
+			dojo.require("dijit.form.TextBox");
+
+			dojo.require("dojo.parser");
+
+			dojo.ready(99, function(){
+				ViewButton = dojo.declare([dijit.form.Button], {
+					label: "View"
+				});
+			});
+		</script>
+	</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">Dijit Button Test</h1>
+	<h2>Simple, drop down &amp; combo buttons</h2>
+	<p>
+	Buttons can do an action, display a menu, or both:
+	</p>
+	<p class="box">
+		<button id="button" onclick="console.log('clicked native button');">&lt;button&gt;</button>
+		<input id="input" type="button" value="&lt;input type='button'&gt;" onclick="console.log('clicked native input button');"/>
+		<button data-dojo-type="dijit/form/Button" id="T1465" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon", value:"Create"'>
+			Create
+		</button>
+		<span data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["1465"]'>tooltip on button</span>
+		<button data-dojo-type="ViewButton" id="T1466" title="view title" data-dojo-props='onClick:function(){ console.log("clicked simple"); }'>
+		</button>
+		<button id="comboCreate" title="creative title" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options", onClick:function(){ console.log("clicked combo create") },
+				iconClass:"plusIcon"'>
+			<span>Create</span>
+			<span id="createMenu" data-dojo-type="dijit/Menu">
+				<span data-dojo-type="dijit/MenuItem"  data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+					onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Create blank</span>
+				<span data-dojo-type="dijit/MenuItem"
+					data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Create from template</span>
+			</span>
+		</button>
+		<button id="edit" title="edit title" value="Edit" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"noteIcon"'>
+			<span>Edit<b>!</b></span>
+			<span id="editMenu" data-dojo-type="dijit/Menu" >
+				<span id="cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+					onClick:function(){ console.log("not actually cutting anything, just a test!"); }'>Cut</span>
+				<span id="copy" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+					onClick:function(){ console.log("not actually copying anything, just a test!"); }'>Copy</span>
+				<span id="paste" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+					onClick:function(){ console.log("not actually pasting anything, just a test!"); }'>Paste</span>
+				<span data-dojo-type="dijit/MenuSeparator"></span>
+				<span data-dojo-type="dijit/PopupMenuItem">
+					<span>Submenu</span>
+					<span id="submenu2" data-dojo-type="dijit/Menu" >
+						<span data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!"); }'>Submenu Item One</span>
+						<span data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!"); }'>Submenu Item Two</span>
+						<span data-dojo-type="dijit/PopupMenuItem">
+							<span>Deeper Submenu</span>
+							<span id="submenu4" data-dojo-type="dijit/Menu" >
+								<span data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 1!"); }'>Sub-sub-menu Item One</span>
+								<span data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 2!"); }'>Sub-sub-menu Item Two</span>
+							</span>
+						</span>
+					</span>
+				</span>
+			</span>
+		</button>
+		<button id="color" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"noteIcon", value:"color"'>
+			<span>Color</span>
+			<span id="colorPalette" data-dojo-type="dijit/ColorPalette"
+				data-dojo-props='palette:"3x4", onChange:function(val){ console.log(val); }'></span>
+		</button>
+		<button id="save" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options", onClick:function(){ console.log("clicked combo save"); },
+				iconClass:"plusBlockIcon"'>
+			<span>Save</span>
+			<span id="saveMenu" data-dojo-type="dijit/Menu">
+				<span id="saveMenuItem" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+					onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save</span>
+				<span id="saveAs" data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save As</span>
+			</span>
+		</button>
+		<button id="disabled" disabled data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon"'>
+			Disabled
+		</button>
+	</p>
+	<br style="clear:both;"/>
+	<h2>DropDownButtons with different drop down positions</h2>
+	<button id="dropdown_default" value="color" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"noteIcon"'>
+		<span>Default (below)</span>
+		<span data-dojo-type="dijit/ColorPalette"
+			data-dojo-props='palette:"3x4", onChange:function(val){ console.log(val); }'></span>
+	</button>
+	<button id="dropdown_up" value="color" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='dropDownPosition:["above"], iconClass:"noteIcon"'>
+		<span>Above</span>
+		<span data-dojo-type="dijit/ColorPalette"
+			data-dojo-props='palette:"3x4", onChange:function(val){ console.log(val); }'></span>
+	</button>
+	<button id="dropdown_before" value="color" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='dropDownPosition:["before"], iconClass:"noteIcon"'>
+		<span>Before</span>
+		<span data-dojo-type="dijit/ColorPalette"
+			data-dojo-props='palette:"3x4", onChange:function(val){ console.log(val); }'></span>
+	</button>
+	<button id="dropdown_after" value="color" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='dropDownPosition:["after"], iconClass:"noteIcon"'>
+		<span>After</span>
+		<span data-dojo-type="dijit/ColorPalette"
+			data-dojo-props='palette:"3x4", onChange:function(val){ console.log(val); }'></span>
+	</button>
+	<h2>ComboButtons with different drop down positions</h2>
+	<button id="combo_default" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options", onClick:function(){ console.log("clicked combo save") },
+			iconClass:"plusBlockIcon"'>
+		<span>Default (below)</span>
+		<span data-dojo-type="dijit/Menu">
+			<span data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+				onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save</span>
+			<span data-dojo-type="dijit/MenuItem"
+				data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save As</span>
+		</span>
+	</button>
+	<button id="combo_above" data-dojo-type="dijit/form/ComboButton" data-dojo-props='dropDownPosition:["above"], optionsTitle:"save options", onClick:function(){ console.log("clicked combo save"); },
+			iconClass:"plusBlockIcon"'>
+		<span>Up</span>
+		<span data-dojo-type="dijit/Menu">
+			<span data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+				onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save</span>
+			<span data-dojo-type="dijit/MenuItem"
+				data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save As</span>
+		</span>
+	</button>
+	<button id="combo_before" data-dojo-type="dijit/form/ComboButton" data-dojo-props='dropDownPosition:["before"], optionsTitle:"save options", onClick:function(){ console.log("clicked combo save"); },
+			iconClass:"plusBlockIcon"'>
+		<span>Before</span>
+		<span data-dojo-type="dijit/Menu">
+			<span data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+				onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save</span>
+			<span data-dojo-type="dijit/MenuItem"
+				data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save As</span>
+		</span>
+	</button>
+	<button id="combo_after" data-dojo-type="dijit/form/ComboButton" data-dojo-props='dropDownPosition:["after"], optionsTitle:"save options", onClick:function(){ console.log("clicked combo save"); },
+			iconClass:"plusBlockIcon"'>
+		<span>After</span>
+		<span data-dojo-type="dijit/Menu">
+			<span data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+				onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save</span>
+			<span data-dojo-type="dijit/MenuItem"
+				data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save As</span>
+		</span>
+	</button>
+	<h2>Buttons with no text label</h2>
+	<p>Buttons have showLabel=false so text is not displayed.  If no title attribute supplied, Should have label as title attribute displayed on mouse over</p>
+	<div class="box">
+		<button id="buttonNoLabel" title="title attrib rather than label" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ console.log("clicked simple button with no text label"); },
+		iconClass:"plusIcon", showLabel:false'>
+			<span><b>Rich</b><i> Text</i> Test!</span>
+		</button>
+		<div id="dropDownNoLabel" title="color title" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"noteIcon", showLabel:false'>
+			<span>Color</span>
+			<div id="colorPalette2" data-dojo-type="dijit/ColorPalette"
+				data-dojo-props='palette:"3x4", onChange:function(val){ console.log(val); }'>
+			</div>
+		</div>
+		<div id="comboNoLabel" title="save title" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options", onClick:function(){ console.log("clicked combo save"); },
+				iconClass:"plusBlockIcon", showLabel:false'>
+			<span>Save</span>
+			<div id="saveMenu2" data-dojo-type="dijit/Menu">
+				<div data-dojo-type="dijit/MenuItem"  data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+					onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save</div>
+				<div data-dojo-type="dijit/MenuItem"
+					data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!"); }'>Save As</div>
+			</div>
+		</div>
+	</div>
+	<br style="clear:both;"/>
+	<h2>Toggle buttons</h2>
+	<p>The button CSS as well as the icon CSS can change on toggle </p>
+	<div class="box">
+		<button id="toggle1" checked data-dojo-type="dijit/form/ToggleButton" data-dojo-props='
+			onChange:function(val){
+				console.log("toggled button checked="+val);
+				this.set("label", val ? "toggle me off" : "toggle me on");
+			}, iconClass:"dijitCheckBoxIcon"'>
+			Toggle me off
+		</button>
+		<button id="toggle2" data-dojo-type="dijit/form/ToggleButton"
+			data-dojo-props='onChange:function(val){ console.log("toggled button checked="+val); }, iconClass:"dijitRadioIcon"'>
+			Toggle me
+		</button>
+	</div>
+	<br style="clear:both;"/>
+	<h2>Sizing</h2>
+	<p>Short button, tall buttons, big buttons, small buttons...
+	These buttons size to their content (just like &lt;button&gt;).</p>
+	<div class="box">
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ console.log("big"); }, iconClass:"flatScreenIcon"'>
+			<span style="font-size:xx-large">big</span>
+		</button>
+		<button id="smallButton1" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ console.log("small"); }'>
+			<img src="../images/arrowSmall.gif" alt="small" width="15" height="5"/>
+			<span style="font-size:x-small">small</span>
+		</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ console.log("long"); }'>
+			<img src="../images/tube.gif" alt="long" width="150" height="16"/>
+			long
+		</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ console.log("tall"); }'>
+			<img src="../images/tubeTall.gif" alt="tall" height="75" width="35"/><br>
+			<span style="font-size:medium">tall</span>
+		</button>
+		<div style="clear: both;"></div>
+	</div>
+	<br style="clear:both;"/>
+	<h2>Customized buttons</h2>
+	<p>Dojo users can customize styles.  Here's an example:</p>
+	<div class="box">
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='baseClass:"acmeButton", onClick:function(){ console.log("short"); }'>
+			short
+		</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='baseClass:"acmeButton", onClick:function(){ console.log("longer"); }'>
+			bit longer
+		</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='baseClass:"acmeButton", onClick:function(){ console.log("longer yet"); }'>
+			ridiculously long
+		</button>
+		<div style="clear: both;"></div>
+	</div>
+		<h2>Toggling the display test</h2>
+	<p>
+	(Ticket <a href="http://trac.dojotoolkit.org/ticket/403">#403</a>)
+	</p>
+	<div class="box">
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ dojo.byId("hiddenNode").style.display="inline"; }'>
+			Show Hidden Buttons
+		</button>
+	</div>
+	<div class="box" style="display:none;" id="hiddenNode">
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon"'>
+			Create
+		</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ console.log("clicked simple"); }, iconClass:"plusIcon"'>
+			Create
+		</button>
+	</div>
+	<div style="clear: both;"></div>
+	<h2>Programatically changing buttons</h2>
+	<p>clicking the buttons below will change the buttons above</p>
+	<script type="text/javascript">
+		// FIXME: doesn't the manager have a function for filtering by type?
+		function forEachButton(func){
+			dijit.registry.filter(function(widget){ return widget instanceof dijit.form.Button; }).forEach(func);
+		}
+		var disabled = false;
+		function toggleDisabled(){
+			disabled =! disabled;
+			forEachButton(function(widget){ widget.set('disabled',disabled); });
+			dojo.byId("toggle").innerHTML= disabled ? "Enable all" : "Disable all";
+		}
+		var labels=["<img src='../images/note.gif' width='20' height='20'/>All", "<i>work</i>", "and no", "<span style='font-size: 40pt;'>play</span>",
+					 "<span style='color: red'>makes</span>", "Jack", "<span style='font-size: 20pt;'>a</span>", "dull",
+					 "<img src='../images/plus.gif' width='16' height='16'/>boy"];
+		var idx = 0;
+		function changeLabels(){
+			forEachButton(function(widget){
+				widget.set('label', labels[idx++ % labels.length]);
+			});
+		}
+		function getLabels(){
+			forEachButton(function(widget){
+				console.log(widget.get('label'));
+			});
+		}
+	</script>
+	<div>
+		<button id="toggle" onclick='toggleDisabled()'>Disable all</button>
+		<button id="changeLabels" onclick='changeLabels()'>Change labels</button>
+		<button onclick='getLabels()'>Get labels</button>
+		<button onclick='location.reload()'>Revert</button>
+	</div>
+	<h3>Button instantiated via javacript:</h3>
+	<p id="buttonContainer" style="display: none;"></p>
+	<script type="text/javascript">
+		// See if we can make a button in script and attach it to the DOM ourselves.
+		dojo.ready(function(){
+			var widget = new dijit.form.Button({
+				label: "hello!",
+				name: "programmatic"
+			});
+			widget.placeAt("buttonContainer");	// place in page
+
+			var widget2 = new dijit.form.Button({
+				label: "hello!",
+				name: "programmatic"
+			});
+			widget2.set("label", "i'm programmatic too");	// change label (for testing)
+			widget2.placeAt("buttonContainer");	// place in page
+		});
+	</script>
+	<h3>DropDownButton instantiated via javacript:</h3>
+	<div id="dropdownButtonContainer"></div>
+	<script type="text/javascript">
+		// See if we can make a drop down button in script and attach it to the DOM ourselves.
+		function createButton(){
+			var menu = new dijit.Menu({ });
+			menu.domNode.style.display="none";
+			var menuItem1 = new dijit.MenuItem({
+				label: "Save",
+				iconClass:"dijitEditorIcon dijitEditorIconSave",
+				onClick: function(){ alert('save'); }
+			});
+			menu.addChild(menuItem1);
+
+			var menuItem2 = new dijit.MenuItem({
+				label: "Cut",
+				iconClass:"dijitEditorIcon dijitEditorIconCut",
+				onClick: function(){ alert('cut'); }
+			});
+			menu.addChild(menuItem2);
+
+			var params = {
+				label: "hello!",
+				name: "programmatic2",
+				dropDown: menu,
+				id: "progButton"
+			};
+			var widget = new dijit.form.DropDownButton(params);
+			dojo.byId("dropdownButtonContainer").appendChild(widget.domNode);
+			dojo.byId("createButton").disabled = true;
+			dojo.byId("destroyButton").disabled = false;
+		}
+		function destroyButton(){
+			var button = dijit.byId("progButton");
+			button.destroyRecursive();
+			dojo.byId("createButton").disabled = false;
+			dojo.byId("destroyButton").disabled = true;
+		}
+	</script>
+	<button id="createButton" onclick="createButton();">create dropdown button</button>
+	<button id="destroyButton" onclick="destroyButton();">destroy dropdown button</button>
+
+	<h3>Submit and Reset Buttons</h3>
+	<div>Testing that submit and reset buttons work properly.  OnSubmit and OnReset handlers
+		for the form just output to the console.
+	</div>
+	<form id="testForm" encType="multipart/form-data" name="testForm" action="../formAction.html" method="" data-dojo-type="dijit/form/Form">
+		<script type="dojo/method" data-dojo-event="onReset">
+			console.log("testForm onReset invoked");
+		</script>
+		<script type="dojo/method" data-dojo-event="onSubmit">
+			console.log("testForm onSubmit invoked - not really submitting");
+			return false;
+		</script>
+		<label for="testName">Name: </label><input id="testName" data-dojo-type="dijit/form/TextBox" data-dojo-props='name:"testName", value:""'/><br>
+		<button id="bSubmit" data-dojo-type="dijit/form/Button" data-dojo-props='type:"submit" '>Submit</button>&nbsp;&nbsp;
+		<button id="bReset" data-dojo-type="dijit/form/Button" data-dojo-props='type:"reset" '>Reset</button>
+	</form>
+
+	<h3>onClick Tests</h3>
+	<div>Testing that onClick works properly
+	</div>
+	<form>
+		<label for="onClickName">Value: </label><input id="onClickName" name="onClickName" value="RESET"/><br>
+		<button id="reset1" type="reset" data-dojo-type="dijit/form/Button">Reset with no onClick handler should reset</button>
+		<button type="reset" id="reset1N">Native Reset with no onClick handler should reset</button><br>
+		<button id="reset2" type="reset" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ return false }'>Reset with "return false" onClick handler should not reset</button>
+		<button type="reset" id="reset2N" onClick="return false;">Native Reset with "return false" onClick handler should not reset</button><br>
+		<button id="reset3" type="reset" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ return true }'>Reset with "return true" onClick handler should reset</button>
+		<button type="reset" id="reset3N" onClick="return true;">Native Reset with "return true" onClick handler should reset</button><br>
+		<button id="reset4" type="reset" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ return }'>Reset with "return" onClick handler should reset</button>
+		<button type="reset" id="reset4N" onClick="return;">Native Reset with "return" onClick handler should reset</button><br>
+		<button id="reset5" type="reset" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){  }'>Reset with "" onClick handler should reset</button>
+		<button type="reset" id="reset5N" onClick="">Native Reset with "" onClick handler should reset</button><br>
+	</form>
+
+	<h3>Submit/value test</h3>
+	<script>
+		submittedValues = function(values){
+			for(var i in values){
+				document.getElementById('buttonName').value = i;
+				document.getElementById('buttonValue').value = values[i];
+			}
+		};
+	</script>
+	<form id="myForm" data-dojo-type="dijit/form/Form" encType="multipart/form-data" action="../formAction.html" method="" target="formSubmitIframe">
+		<button id="SubmitPlain" data-dojo-type="dijit/form/Button" name="Plain" type="submit" value="Plain Submit">Plain Submit</button>
+		<button id="SubmitCombo" data-dojo-type="dijit/form/ComboButton" name="Combo" type="submit" value="Combo Submit"
+				data-dojo-props="label: 'Combo Submit'">
+			<span data-dojo-type="dijit/Menu">
+				<span id="SubmitComboMenuItem" data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ dijit.byId("myForm").submit(); }'>Combo MenuItem Submit</span>
+			</span>
+		</button>
+		<button id="SubmitDropDown" data-dojo-type="dijit/form/DropDownButton" name="DropDown" type="submit" value="DropDown Submit">
+			DropDown Submit
+			<span data-dojo-type="dijit/Menu">
+				<span id="SubmitDropDownMenuItem" data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ dijit.byId("myForm").submit(); }'>DropDown MenuItem Submit</span>
+			</span>
+		</button>
+		<button id="SubmitDisabled" data-dojo-type="dijit/form/Button" name="Disabled" type="submit" disabled value="Disabled Submit">Disabled Submit</button>
+	</form>
+	<br>
+	<label for="buttonName">Submitted name:</label><input id="buttonName"/><br>
+	<label for="buttonValue">Submitted value:</label><input id="buttonValue"/>
+	<br>
+	<iframe name="formSubmitIframe" src="about:blank" onload="if(this.values) submittedValues(this.values);" style="display:none;"></iframe>
+
+
+	<p>Tests for bubbling:</p>
+	<div id="bubbleContainer" style="border: solid #aaa 3px">
+		<button type="button" data-dojo-type="dijit/form/Button" id="bubble1">1</button>
+		<button type="button" data-dojo-type="dijit/form/Button" id="bubble2">2</button>
+		<button type="button" data-dojo-type="dijit/form/Button" id="bubble3">3</button>
+	</div>
+	<script>
+		require(["dojo/dom", "dojo/on", "dijit/registry"], function(dom, on, registry){
+			on(dom.byId("bubbleContainer"), "click", function(evt){
+				var widget = registry.getEnclosingWidget(evt.target);
+				if(widget){
+					console.log("click on widget " + widget.id);
+				}
+			});
+		});
+	</script>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_CheckBox.html b/src/main/resources/static/dijit/tests/form/test_CheckBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..cc0cc8c351d6cbaef4286489945a42db65c1530a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_CheckBox.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>CheckBox Widget Demo</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../css/dijitTests.css";
+
+		label { margin-right: 0.80em; }
+	</style>
+
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+
+	<!-- only needed for alternate theme testing: -->
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dijit.form.CheckBox");
+		dojo.require("dijit.form.RadioButton");
+		dojo.require("dijit.form.Form");
+
+		function defaultSubmitHandler(values){
+			console.debug('actual submitted values: ' + dojo.toJson(values));
+		}
+		submittedValues = defaultSubmitHandler;
+
+		function reportChecked(checked){
+			dojo.byId("oncheckedoutput").innerHTML = checked;
+		}
+
+		function reportValueChanged(value){
+			dojo.byId("onvaluechangedoutput").innerHTML = value;
+		}
+
+		dojo.ready(function(){
+			var params = {id: "cb6", name: "cb6", checked: true };
+			new dijit.form.CheckBox(params, "cb6");
+			
+			new dijit.form.RadioButton({
+				checked: true,
+				value: "tea",
+				name: "drink"
+			}, "g4rb1");
+			new dijit.form.RadioButton({
+				value: "coffee",
+				name: "drink"
+			}, "g4rb2");
+
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit CheckBox Test</h1>
+	<p>
+	Here are some checkboxes.  Try clicking, and hovering, tabbing, and using the space bar to select:
+	</p>
+	<!--    to test form submission, you'll need to create an action handler similar to
+		http://www.utexas.edu/teamweb/cgi-bin/generic.cgi -->
+	<form id="myForm" data-dojo-type="dijit/form/Form" data-dojo-props='action:"../formAction.html", method:"", target:"formSubmitIframe"'>
+		<input type="checkbox" id="cb0" checked/>
+			<label for="cb0">cb0: Vanilla (non-dojo) checkbox (for comparison purposes)</label>
+		<br>
+		<input id="cb1" data-dojo-id="cb1" data-dojo-type="dijit/form/CheckBox" data-dojo-props='name:"cb1", value:"foo", onClick:function(){ console.log("clicked cb1") }'/>
+			<label for="cb1">cb1: normal checkbox, with value=foo, clicking generates console log messages</label>
+			<button type=button onclick="alert(dijit.byId('cb1').get('value'));">get('value')</button>
+		<br>
+		<input id="cb2" data-dojo-type="dijit/form/CheckBox" data-dojo-props='onChange:reportChecked, name:"cb2", checked:true'/>
+			<label for="cb2">cb2: normal checkbox, with default value, initially turned on.</label>
+			<span>"onChange" handler updates: [<span id="oncheckedoutput"></span>]</span>
+			<button type=button onclick="alert(dijit.byId('cb2').get('value'));">get('value')</button>
+		<br>
+		<input id="cb3" data-dojo-type="dijit/form/CheckBox" data-dojo-props='name:"cb3", disabled:true'/>
+			<label for="cb3">cb3: disabled checkbox</label>
+		<br>
+		<input id="cb4" data-dojo-type="dijit/form/CheckBox" data-dojo-props='name:"cb4", readOnly:true, checked:true, value:"" '/><!-- blank value => "on" -->
+			<label for="cb4">cb4: readOnly checkbox, turned on</label>
+		<br>
+		<input id="cb5" data-dojo-type="dijit/form/CheckBox" data-dojo-props='name:"cb5", value:"", onClick:function(){ console.log("clicked cb5"); }'/>
+			<label for="cb5">cb5: normal checkbox, with specified value="", clicking generates console log messages</label>
+			<button type=button onclick="alert(dijit.byId('cb5').get('value'));">get('value')</button>
+		<br>
+		<input id="cb6"/>
+			<label for="cb6">cb6: instantiated from script</label>
+		<br>
+		<input id="cb7" data-dojo-type="dijit/form/CheckBox" data-dojo-props='onChange:reportValueChanged, name:"cb7" '/>
+			<label for="cb7">cb7: normal checkbox.</label>
+			<input type="button" onclick='dijit.byId("cb7").set("disabled",true);' value="disable" />
+			<input type="button" onclick='dijit.byId("cb7").set("disabled",false);' value="enable" />
+			<input type="button" onclick='dijit.byId("cb7").set("value", "fish");' value='set value to "fish"' />
+			<input type="button" onclick='dijit.byId("cb7").reset();' value='Reset value+checked' />
+			<span>"onChange" handler updates: [<span id="onvaluechangedoutput"></span>]</span>
+		<br>
+	<p>
+	Here are some radio buttons.  Try clicking, and hovering, tabbing, and arrowing
+	</p>
+		<p>
+			<span>Radio group #1:</span>
+			<input id="g1rb1" data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"g[1]", value:"news" '/>
+			<label for="g1rb1">news</label>
+			<input id="g1rb2" data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"g[1]", checked:true'/><!-- no value => "on" -->
+			<label for="g1rb2">talk</label>
+			<input id="g1rb3" data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"g[1]", value:"", disabled:true'/><!-- blank value => "" -->
+			<label for="g1rb3">weather</label>
+			<input type="button" id="enableWeatherButton" onclick='dijit.byId("g1rb3").set("disabled",false);' value="enable weather" />
+			<input type="button" onclick='dijit.byId("g1rb3").set("disabled",true);' value="disable weather" />
+		</p>
+		<p>
+			<span>Radio group #2: (no default value, and has breaks)</span><br>
+			<input id="g2rb1" data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"g2", value:"top40" '/>
+			<label for="g2rb1">top 40</label><br>
+			<input id="g2rb2" data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"g2", value:"oldies" '/>
+			<label for="g2rb2">oldies</label><br>
+			<input id="g2rb3" data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"g2", value:"country" '/>
+			<label for="g2rb3">country</label><br>
+			(Note if using keyboard: tab to navigate, and use arrow or space to select)
+		</p>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"submit", value:"Submit"'>Submit</button>
+		<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"reset"'>HTML Reset</button>
+	</form>
+
+	<p>
+		<span>Radio group #3 (native radio buttons):</span>
+		<input type="radio" name="g3" id="g3rb1" value="rock"/>
+		<label for="g3rb1">rock</label>
+		<input type="radio" name="g3" id="g3rb2" value="jazz" disabled="disabled"/>
+		<label for="g3rb2">jazz</label>
+		<input type="radio" name="g3" id="g3rb3" value="classical" checked="checked"/>
+		<label for="g3rb3">classical</label>
+	</p>
+
+	<div style='border:1px solid gray;'>
+		These 6 radio buttons have the same name but are in separate forms so they can be selected independently.
+		<form>
+			1:
+			<input id='b1' data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"a1", value:"1"'/><label for='b1'>b1</label>
+			<input id='b2' data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"a1", value:"2"'/><label for='b2'>b2</label>
+		</form>
+		<form>
+			2:
+			<input id='c1' data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"a1", value:"1"'/><label for='c1'>c1</label>
+			<input id='c2' data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"a1", value:"2"'/><label for='c2'>c2</label>
+		</form>
+		<div>
+			3:
+			<input id='d1' data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"a1", value:"1"'/><label for='d1'>d1</label>
+			<input id='d2' data-dojo-type="dijit/form/RadioButton" data-dojo-props='name:"a1", value:"2"'/><label for='d2'>d2</label>
+		</div>
+	</div>
+	
+	<div>
+		<span>Programmatic radio buttons:</span>
+		<form id="radioForm">
+			<input type="radio" name="drink" id="g4rb1" checked value="tea"/> <label for="g4rb1">Tea</label> <br />
+			<input type="radio" name="drink" id="g4rb2" checked value="coffee"/> <label for="g4rb2">Coffee</label> <br />
+		</form>
+	</div>
+<iframe name="formSubmitIframe" src="about:blank" onload="if(this.values)submittedValues(this.values)" style="display:none;"></iframe>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_ComboBox.html b/src/main/resources/static/dijit/tests/form/test_ComboBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..a0635cad3c73dba2a45afa062d71bbe0eb2bee2e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_ComboBox.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+	<HEAD>
+		<TITLE>ComboBox Unit Test</TITLE>
+	</HEAD>
+	<BODY>
+		Loading ComboBox unit test.
+		<SCRIPT>
+			window.location.replace("_autoComplete.html?testWidget=dijit.form.ComboBox"+window.location.search.replace(/^\?/,"&"));
+		</SCRIPT>
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/form/test_DateTextBox.html b/src/main/resources/static/dijit/tests/form/test_DateTextBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..c2487486344a4f0eefe63b70fcc9da7394cd51c2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_DateTextBox.html
@@ -0,0 +1,471 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Test DateTextBox Widget</title>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../css/dijitTests.css";
+
+			.testExample {
+				background-color:#fbfbfb;
+				padding:1em;
+				margin-bottom:1em;
+				border:1px solid #bfbfbf;
+			}
+
+			.noticeMessage {
+				color:#093669;
+				font-size:0.95em;
+				margin-left:0.5em;
+			}
+
+			.dojoTitlePaneLabel label {
+				font-weight:bold;
+			}
+		</style>
+
+		<!-- required: the default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="async: true, isDebug: true, parseOnLoad: true, extraLocale: ['de-de', 'en-us']"></script>
+
+		<!-- only needed for alternate theme testing: -->
+		<script type="text/javascript" src="../_testCommon.js"></script>
+
+		<script type="text/javascript">
+			function eventHandler(e){
+				// use this.domNode.getAttribute('widgetId') to show "this" is the widget
+				// mouseleave/enter map to mouseout/over in all browsers except IE
+				console.log(this.domNode.getAttribute('widgetId') + ' ' + e.type);
+			}
+
+			require([
+				"doh/runner",
+				"dojo/date",
+				"dojo/date/locale",
+				"dojo/_base/lang",
+				"dojo/on",
+				"dojo/parser",
+				"dijit/registry",
+				"dijit/form/DateTextBox",
+				"dijit/form/Form",
+				"dijit/tests/helpers",
+				"dojo/domReady!"
+			], function(doh, date, locale, lang, on, parser, registry, DateTextBox){
+				// Add test=true to the URL to run unit tests.
+				var test = /mode=test/i.test(window.location.href);
+
+				parser.parse();
+				
+				// See if we can make a widget in script and attach it to the DOM ourselves.
+				on(registry.byId('pattern'), "onMouseEnter", eventHandler);
+				on(registry.byId('pattern'), "onMouseLeave", eventHandler);
+				on(registry.byId('pattern'), "onKeyDown", eventHandler);
+
+				var props = {
+					name: "date4",
+					value: new Date(2006,10,29),
+					constraints: {min:new Date(2004,0,1),max:new Date(2006,11,31)},
+					lang: "de-de",
+					hasDownArrow: false,
+					onMouseEnter: eventHandler,
+					onMouseLeave: eventHandler,
+					onKeyDown: eventHandler,
+					promptMessage: "dd.mm.yy",
+					rangeMessage: "Enter a date in the year range 2004-2006.",
+					invalidMessage: "Invalid date. Use dd.mm.yy format."
+				};
+				var german = new DateTextBox(props, "german");
+				german.startup();
+				var localLong = registry.byId("localLong");
+				var american = registry.byId("american");
+
+				localLong.parse = function(value,constraints){
+					return this.dateLocaleModule.parse(value, (constraints.formatLength="long") && constraints) ||
+							this.dateLocaleModule.parse(value, (constraints.formatLength="short") && constraints) ||
+							(this._isEmpty(value) ? null : undefined);	 // Date
+				};
+
+				if(test){
+					doh.register("constraints", [
+						{
+							name: "initial state",
+							timeout: 1000,
+							runTest: function(t){
+								var expected = new Date(2005,11,30);
+								var actual = localLong.get('value');
+								t.is(0, date.compare(expected, actual), 'expected ' + expected.toDateString() + ' but got ' + actual.toDateString());
+								t.is("", localLong.get('state'));
+							}
+						},
+						{
+							name: "change value, now invalid",
+							timeout: 1000,
+							runTest: function(t){
+								var expected = new Date(2007,6,15);
+								localLong.set("value", expected);
+								var actual = localLong.get('value');
+								t.is(0, date.compare(expected, actual), 'expected ' + expected.toDateString() + ' but got ' + actual.toDateString());
+								t.is("Error", localLong.get('state'));
+							}
+						},
+						{
+							name: "change max, still invalid",
+							timeout: 1000,
+							runTest: function(t){
+								localLong.set("constraints", lang.mixin(localLong.get('constraints'), { max: new Date(2007,5,30)}));
+								var expected = new Date(2007,6,15);
+								var actual = localLong.get('value');
+								t.is(0, date.compare(expected, actual), 'expected ' + expected.toDateString() + ' but got ' + actual.toDateString());
+								t.is("Error", localLong.get('state'));
+							}
+						},
+						{
+							name: "change max, now valid",
+							timeout: 1000,
+							runTest: function(t){
+								localLong.set("constraints", lang.mixin(localLong.get('constraints'), { max: new Date(2007,11,31)}));
+								var expected = new Date(2007,6,15);
+								var actual = localLong.get('value');
+								t.is(0, date.compare(expected, actual), 'expected ' + expected.toDateString() + ' but got ' + actual.toDateString());
+								t.is("", localLong.get('state'));
+							}
+						},
+						{
+							name: "change max, now invalid",
+							timeout: 1000,
+							runTest: function(t){
+								localLong.set("constraints", lang.mixin(localLong.get('constraints'), { max: new Date(2006,11,30)}));
+								var expected = new Date(2007,6,15);
+								var actual = localLong.get('value');
+								t.is(0, date.compare(expected, actual), 'expected ' + expected.toDateString() + ' but got ' + actual.toDateString());
+								t.is("Error", localLong.get('state'));
+							}
+						},
+						{
+							name: "change value, now valid",
+							timeout: 1000,
+							runTest: function(t){
+								var expected = new Date(2005,11,30);
+								localLong.set("value", expected);
+								var actual = localLong.get('value');
+								t.is(0, date.compare(expected, actual), 'expected ' + expected.toDateString() + ' but got ' + actual.toDateString());
+								t.is("", localLong.get('state'));
+							}
+						}
+					]);
+
+					doh.register("misc",
+							function noYear(){
+								var widget = registry.byId("noyear");
+								doh.t(widget.isValid(false), "isValid");
+								doh.is(2011, widget.get('value').getFullYear(), "programmatic value");
+								doh.is(2011, widget.value.getFullYear(), "JS value");
+							},
+							function noParams(){
+								// Just making sure we don't get an exception when no parameters are specified.
+								new DateTextBox();
+							}
+					);
+
+					doh.register("API", [
+						function initial(){
+							// initial conditions
+							doh.is(0, date.compare(new Date(2005,11,30), american.get('value')), 'wire value of american: ' + american.get('value'));
+							doh.is('12/30/2005', american.get('displayedValue'), 'displayed value of american');
+						},
+
+						function setValue(){
+							american.set('value', new Date(2004,9,20));
+							doh.is(0, date.compare(new Date(2004,9,20), american.get('value')),
+									'wire value of american is: ' + american.get('value') +
+									' but should be: ' + new Date(2004,9,20));
+							doh.is('10/20/2004', american.get('displayedValue'), 'displayed value of american');
+							doh.t(american.isValid(), 'marked as valid');
+						},
+
+						function setDisplayedValue(){
+							american.set('displayedValue', '11/12/2006');
+							doh.is(0, date.compare(new Date(2006, 10, 12), american.get('value')), 'wire value of american');
+							doh.is('11/12/2006', american.get('displayedValue'), 'displayed value of american');
+							doh.t(american.isValid(), 'marked as valid');
+						},
+
+						function setInvalidDisplayedValue(){
+							american.set('displayedValue', 'foo');
+							doh.t(american.get('value') === undefined, 'value is undefined if displayedValue is garbage');
+							doh.f(american.isValid(), 'marked as invalid');
+
+							// setting the value to get('value') should never change anything, so
+							// therefore setting the value to undefined shouldn't affect the displayed value
+							american.set('value', undefined);
+							doh.is(american.get('displayedValue'), 'foo');
+						},
+
+						function setOutOfRange(){
+							// This widget is set to be valid between 2004 and 2006 only
+							american.set('displayedValue', '12/1/2008');
+							doh.f(american.isValid(), 'marked as invalid since out of range');
+							doh.is('12/1/2008', american.get('displayedValue'), 'displayed value of american');
+						},
+
+						function noInitialValue(){
+							var fromDate = registry.byId('fromDate');
+							doh.is('', fromDate.get('displayedValue'), 'initially blank');
+							doh.is(new Date('').toString(), fromDate.value.toString(), 'default value');
+							var d = new doh.Deferred();
+							var today = new Date();
+							fromDate.set('value', today, true);
+							setTimeout(d.getTestCallback(function(){
+								var toDate = registry.byId('toDate');
+								doh.is(today.toDateString(), fromDate.value.toDateString(), 'changed value');
+								doh.is(today.toDateString(), toDate.constraints.min.toDateString(), 'onChange');
+							}), 500);
+							return d;
+						},
+
+						function ariaRolesAndAttributes(){
+							var d = new doh.Deferred(),
+									button = registry.byId("local");
+
+							doh.is("combobox", button._popupStateNode.getAttribute("role"), "button _popupStateNode role");
+							doh.t(button._popupStateNode.getAttribute("aria-haspopup"), "aria-haspopup on button");
+							doh.f(button._popupStateNode.getAttribute("aria-expanded"), "initially missing aria-expanded");
+							doh.f(button._popupStateNode.getAttribute("aria-owns"), "initally missing aria-owns");
+
+							button.openDropDown();
+
+							setTimeout(d.getTestCallback(function(){
+								doh.t(button._popupStateNode.getAttribute("aria-expanded"), "now aria-expanded should be true");
+								doh.is("local_popup", button._popupStateNode.getAttribute("aria-owns"), "should aria-own the Dlg");
+								// Check roles and attributes on the dialog
+								var dlg = registry.byId("local_popup");
+								doh.t(dlg.domNode.hasAttribute("role"), "Dlg.domNode should have a role");
+								doh.is("local_popup_mddb local_popup_year", dlg.domNode.getAttribute("aria-labelledby"), "aria-labelledby should not overwrite existing labelledby for the Calendar");
+
+								button.closeDropDown();
+							}), 500);
+
+							return d;
+						}
+					]);
+
+					doh.register("localization", [
+						function initialGerman(){
+							doh.is(0, date.compare(new Date(2006,10,29), german.get('value')), 'wire value of german: ' + german.get('value'));
+							doh.is('29.11.2006', german.get('displayedValue'), 'displayed value of german');
+						},
+
+						function setValueGerman(){
+							german.set('value', new Date(2004,9,20));
+							doh.is(0, date.compare(new Date(2004,9,20), german.get('value')),
+									'wire value of german is: ' + german.get('value') +
+									' but should be: ' + new Date(2004,9,20));
+							doh.is('20.10.2004', german.get('displayedValue'), 'displayed value of german');
+							doh.t(german.isValid(), 'marked as valid');
+						},
+
+						function setDisplayedValueGerman(){
+							german.set('displayedValue', '12.11.2006');
+							doh.is(0, date.compare(new Date(2006, 10, 12), german.get('value')), 'wire value of german');
+							doh.is('12.11.2006', german.get('displayedValue'), 'displayed value of german');
+							doh.t(german.isValid(), 'marked as valid');
+						},
+						{
+							name: "labels",
+							timeout: 6000,
+							runTest: function(){
+								german.set('value', new Date(2006, 9, 15));	// 10/15/2006
+
+								german.openDropDown();
+								var calendar = registry.byId("german_popup");
+
+								// calendar exists and is shown
+								doh.t(calendar && isVisible(calendar), "calendar is visible");
+
+								// Month label
+								doh.is("Oktober", innerText(query(".dijitCalendarCurrentMonthLabel", calendar.domNode)[0]));
+
+								// Day labels
+								var dayLabels = query(".dijitCalendarDayLabelTemplate", calendar.domNode);
+								doh.is(7, dayLabels.length, "7 day labels");
+								doh.is("M", innerText(dayLabels[0]), "day 0");
+								doh.is("D", innerText(dayLabels[1]), "day 1");
+								doh.is("M", innerText(dayLabels[2]), "day 2");
+								doh.is("D", innerText(dayLabels[3]), "day 3");
+								doh.is("F", innerText(dayLabels[4]), "day 4");
+								doh.is("S", innerText(dayLabels[5]), "day 5");
+								doh.is("S", innerText(dayLabels[6]), "day 6");
+								german.closeDropDown();
+							}
+						}
+					]);
+
+					doh.run();
+				}
+			});
+		</script>
+	</head>
+
+	<body class="claro" role="main">
+
+		<script type="dojo/require">
+			dom: "dojo/dom",
+			query: "dojo/query",
+			registry: "dijit/registry"
+		</script>
+
+		<h1 class="testTitle">Test DateTextBox Widget</h1>
+		<!--	to test form submission, you'll need to create an action handler similar to
+			http://www.utexas.edu/teamweb/cgi-bin/generic.cgi -->
+		<form id="form1" data-dojo-type='dijit/form/Form' data-dojo-props='action:"", name:"example", method:"", onSubmit:function(){ return this.validate() }'>
+			<div class="dojoTitlePaneLabel">
+				<label for="local"> Date (local format) </label>
+				<span class="noticeMessage">DateTextBox class, no attributes</span>
+			</div>
+			<div class="testExample">
+				<input id="local" data-dojo-type="dijit/form/DateTextBox" style="width: 100px"
+					data-dojo-props='name:"noDOMvalue", value:"2008-12-31", type:"text", onMouseEnter:eventHandler,
+					onMouseLeave:eventHandler,
+					onKeyDown:eventHandler,
+					onChange:function(val){ dom.byId("oc1").value = "" + val; }
+				'/>
+				<label for="oc1">onChange:</label><input id="oc1" size="34" disabled value="not fired yet!" autocomplete="off"/>
+				<span style='white-space:nowrap;'>
+				<button type="button" onclick="registry.byId('local').set('value', null);">set('value',null)</button>
+				<button type="button" onclick="dom.byId('gv1').value=''+registry.byId('local').get('value');">get('value')</button>
+				<button type="button" onclick="dom.byId('gv1').value=''+registry.byId('local').value;">.value</button>
+				<label for="gv1">l:</label><input id="gv1" size="34" disabled value="not called yet!" autocomplete="off"/>
+				</span>
+			</div>
+			<div class="dojoTitlePaneLabel">
+				<label for="localLong"> Date (local format - long) </label>
+				<span class="noticeMessage">DateTextBox class,
+					Attributes: required="true", trim="true", constraints={min:'2004-01-01',max:'2006-12-31',formatLength:'long'}. Works for leap years</span>
+			</div>
+			<div class="testExample">
+				<input id="localLong" data-dojo-id="localLong" data-dojo-type="dijit/form/DateTextBox"
+					data-dojo-props='type:"text", name:"date1", value:"2005-12-30",
+					constraints:{min:"2004-01-01",max:"2006-12-31",formatLength:"long"},
+					required:true,
+					trim:true,
+					onChange:function(val){ dom.byId("oc2").value = val; },
+					onMouseEnter:eventHandler,
+					onMouseLeave:eventHandler,
+					onKeyDown:eventHandler,
+					invalidMessage:"Invalid date." '/>
+ 				<label for="oc2">onChange:</label><input id="oc2" size="34" disabled value="not fired yet!" autocomplete="off"/>
+				<input type="button" value="Destroy" onClick="registry.byId('localLong').destroy(); return false;"/>
+				<input type="button" value="set max to 2007-12-31" onClick="registry.byId('localLong').constraints.max = new Date(2007,11,31); registry.byId('localLong').validate(false); return false;"/>
+			</div>
+			<div class="dojoTitlePaneLabel">
+				<label for="american"> Date (American format) </label>
+				<span class="noticeMessage">DateTextBox class,
+					Attributes: lang="en-us", required="true", constraints={min:'2004-01-01',max:'2006-12-31'}. Works for leap years.
+					Prompt message whenever field is blank.
+				</span>
+			</div>
+			<div class="testExample">
+				<input id="american" data-dojo-type="dijit/form/DateTextBox"
+					data-dojo-props='type:"text", name:"date2", value:"2005-12-30",
+					constraints:{min:"2004-01-01",max:"2006-12-31"},
+					lang:"en-us",
+					required:true,
+					onMouseEnter:eventHandler,
+					onMouseLeave:eventHandler,
+					onKeyDown:eventHandler,
+					promptMessage:"mm/dd/yyyy",
+					invalidMessage:"Invalid date. Use mm/dd/yyyy format."'/>
+			</div>
+			<div class="dojoTitlePaneLabel">
+				<label for="german"> Date (German format)</label>
+				<span class="noticeMessage">DateTextBox class,
+					Attributes: lang="de-de", hasDownArrow=false, constraints={min:2004-01-01, max:2006-12-31}. Works for leap years.
+					Prompt message whenever field is blank.
+				</span>
+			</div>
+			<div class="testExample">
+				<input id="german"/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="pattern"> Date, overriding pattern</label>
+				<span class="noticeMessage">Date, overriding pattern with dd-MM-yyyy</span>
+			</div>
+			<div class="testExample">
+				<input id="pattern" data-dojo-type="dijit/form/DateTextBox" data-dojo-props='name:"noDOMvalue", type:"text", constraints:{datePattern:"dd-MM-yyyy", strict:true}'/>
+			</div>
+			<div class="dojoTitlePaneLabel">
+				<strong>Using title attribute for label</strong>
+				<span class="noticeMessage">DateTextBox class,
+					Attributes: lang="en-us", required="true", prompt message, invalid message
+					Prompt message whenever field is blank.
+				</span>
+			</div>
+			<div class="testExample">
+				<div id="american2" data-dojo-type="dijit/form/DateTextBox"
+					data-dojo-props='type:"text", name:"date20", value:"2008-12-30",
+					title:"Date in month, day, year format",
+					lang:"en-us",
+					required:true,
+					promptMessage:"mm/dd/yyyy",
+					invalidMessage:"Invalid date. Use mm/dd/yyyy format."'>
+				</div>
+			</div>
+
+			<script>
+				function displayData(){
+					var f = document.getElementById("form1");
+					var s = "";
+					for(var i = 0; i < f.elements.length; i++){
+						var elem = f.elements[i];
+						if(elem.name == "button")  { continue; }
+						s += elem.name + ": " + elem.value + "\n";
+					}
+					alert(s);
+				}
+			</script>
+
+			<div class="dojoTitlePaneLabel">
+				 Date pairs, from/to (won't submit unless from/to fields filled in correctly):
+			</div>
+			<div class="testExample">
+				<label for="fromDate">From:</label> <input id="fromDate" data-dojo-type="dijit/form/DateTextBox"
+					data-dojo-props='type:"text", name:"fromDate", required:true,
+					onChange:function(){ registry.byId("toDate").constraints.min = this.get("value"); } '/>
+				<label for="toDate">To:</label> <input id="toDate" data-dojo-type="dijit/form/DateTextBox"
+					data-dojo-props='type:"text", name:"toDate", required:true,
+					onChange:function(){ registry.byId("fromDate").constraints.max = this.get("value"); } '/>
+
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="noyear">Pick a day in 3Q 2011</label>
+			</div>
+			<div class="testExample">
+				<input data-dojo-type="dijit/form/DateTextBox" id="noyear" data-dojo-props='
+					name:"noyear",
+					required:"true",
+					constraints:{datePattern:"MMMM dd",
+						min:new Date(2011,9,1),
+						max:new Date(2011,11,31)
+					},
+					parse:function(){
+						var d = this.inherited("parse", arguments);
+						if(d instanceof Date)d.setFullYear(2011);
+						return d;
+					},
+					value:new Date(2011,10,25)'
+				/>
+			</div>
+
+			<button type="button" name="button" onclick="displayData(); return false;">view data</button>
+			<input type="submit" name="submit" />
+			<input type="reset" name="reset" />
+		</form>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_DateTextBox_iframe.html b/src/main/resources/static/dijit/tests/form/test_DateTextBox_iframe.html
new file mode 100644
index 0000000000000000000000000000000000000000..549f88e6abdca8d767f843627bbbdacec2741667
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_DateTextBox_iframe.html
@@ -0,0 +1,6 @@
+<html lang="en">
+<head><title>test_DateTextBox iframe</title></head>
+<body>
+<iframe src="test_DateTextBox.html" title="test_DateTextBox" width="100%" height="100%" onclick="console.log('iframe click')" role="main"></iframe>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_FilteringSelect.html b/src/main/resources/static/dijit/tests/form/test_FilteringSelect.html
new file mode 100644
index 0000000000000000000000000000000000000000..241de29891ea6272d11dea9f5ae40c48b8a04f1a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_FilteringSelect.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+	<HEAD>
+		<TITLE>FilteringSelect Unit Test</TITLE>
+	</HEAD>
+	<BODY>
+		Loading FilteringSelect unit test.
+		<SCRIPT>
+			window.location.replace("_autoComplete.html?testWidget=dijit.form.FilteringSelect"+window.location.search.replace(/^\?/,"&"));
+		</SCRIPT>
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/form/test_Form_onsubmit.html b/src/main/resources/static/dijit/tests/form/test_Form_onsubmit.html
new file mode 100644
index 0000000000000000000000000000000000000000..09c979b0d2501e9d899510b62abef0a589d9e147
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_Form_onsubmit.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Form unit test</title>
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../css/dijitTests.css";
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+
+	<!-- only needed for alternate theme testing: -->
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dojo.date");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.Form");
+		dojo.require("dijit.form.ComboBox");
+		dojo.require("dijit.form.Button");
+		dojo.require("dijit.form.TextBox");
+		
+		function submittedValues(values){
+			console.log('actual submitted values: ' + dojo.toJson(values));
+			dijit.byId("textbox").set('value', dojo.fromJson(dojo.toJson(values)).plopcombo, true);
+		}
+	</script>
+
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Form Widget Submit Test</h1>
+	<p>Tests dojo.stopEvent() etc. calls inside dijit.form.Form onSubmit and onReset callbacks.</p>
+	<form id="myForm1" data-dojo-type="dijit/form/Form" data-dojo-props='encType:"multipart/form-data", action:"../formAction.html", method:"", target:"formSubmitIframe",
+		onSubmit:function(e){ dojo.stopEvent(e); },
+		onReset:function(e){ dojo.stopEvent(e); }'>
+		<h3>This form shouldn't submit, nor reset</h3>
+		<select id="combo1" data-dojo-type="dijit/form/ComboBox" data-dojo-props='name:"plopcombo","aria-label":"plopcombo" '>
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+		</select>
+		<button id="submit1" data-dojo-type=dijit.form.Button data-dojo-props='type:"submit"'>Submit</button>
+		<button id="reset1" data-dojo-type=dijit.form.Button data-dojo-props='type:"reset"'>Reset</button>
+	</form>
+
+	<form id="myForm2" data-dojo-type="dijit/form/Form" data-dojo-props='encType:"multipart/form-data", action:"../formAction.html", method:"", target:"formSubmitIframe",
+		onSubmit:function(){ return false; },
+		onReset:function(){ return false; }'>
+		<h3>This form shouldn't submit, nor reset</h3>
+		<select id="combo2" data-dojo-type="dijit/form/ComboBox" data-dojo-props='name:"plopcombo","aria-label":"plopcombo2" '>
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+		</select>
+		<button id="submit2" data-dojo-type=dijit.form.Button data-dojo-props='type:"submit"'>Submit</button>
+		<button id="reset2" data-dojo-type=dijit.form.Button data-dojo-props='type:"reset"'>Reset</button>
+	</form>
+
+	<form id="myForm3" data-dojo-type="dijit/form/Form" data-dojo-props='encType:"multipart/form-data", action:"../formAction.html", method:"", target:"formSubmitIframe",
+		onSubmit:function(){ return true; },
+		onReset:function(){ return true; }'>
+		<h3>This form <em>should</em> submit and reset</h3>
+		<select id="combo3" data-dojo-type="dijit/form/ComboBox" data-dojo-props='name:"plopcombo","aria-label":"plopcombo3" '>
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+		</select>
+		<button id="submit3" data-dojo-type=dijit.form.Button data-dojo-props='type:"submit"'>Submit</button>
+		<button id="reset3" data-dojo-type=dijit.form.Button data-dojo-props='type:"reset"'>Reset</button>
+	</form>
+
+	<form id="myForm4" data-dojo-type="dijit/form/Form" data-dojo-props='encType:"multipart/form-data", action:"../formAction.html", method:"", target:"formSubmitIframe",
+		onSubmit:function(){ void(0) },
+		onReset:function(){ void(0) }'>
+		<h3>This form <em>should</em> submit and reset</h3>
+		<select id="combo4" data-dojo-type="dijit/form/ComboBox" data-dojo-props='name:"plopcombo","aria-label":"plopcombo4" '>
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+		</select>
+		<button id="submit4" data-dojo-type=dijit.form.Button data-dojo-props='type:"submit"'>Submit</button>
+		<button id="reset4" data-dojo-type=dijit.form.Button data-dojo-props='type:"reset"'>Reset</button>
+	</form>
+	
+	<h3>Submitted value:</h3>
+	<input id="textbox" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text","aria-label":"textbox"'/>
+	
+	<iframe name="formSubmitIframe" src="about:blank" onload="if(this.values)submittedValues(this.values)" style="display:none;"></iframe>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_Form_state.html b/src/main/resources/static/dijit/tests/form/test_Form_state.html
new file mode 100644
index 0000000000000000000000000000000000000000..33146f780a5bc078f586d77cbc52dafc20aadacb
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_Form_state.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>dijit.form.Form Valid/Invalid State Test</title>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../css/dijitTests.css";
+		</style>
+
+		<!-- required: the default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, parseOnLoad: true, extraLocale: ['de-de', 'en-us']"></script>
+
+		<!-- only needed for alternate theme testing: -->
+		<script type="text/javascript" src="../_testCommon.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.form.ValidationTextBox");
+			dojo.require("dijit.form.DateTextBox");
+			dojo.require("dijit.form.Button");
+			dojo.require("dijit.form.FilteringSelect");
+			dojo.require("dijit.form.Form");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+		</script>
+	</head>
+
+	<body class="claro" role="main">
+		<h1 class="testTitle">dijit.form.Form Valid/Invalid State Test</h1>
+		<p>
+			Tests that dijit.form.Form correctly changes state from valid to invalid (as indicated by disabled/enabled submit button)
+			according to child widget state.
+		</p>
+		<form id="form1" data-dojo-type="dijit/form/Form" data-dojo-props='action:"", name:"example", method:""'>
+			<script type="dojo/connect" data-dojo-event="startup">
+				var submitButton = dijit.byId("submitButton");
+				//  set initial state
+				submitButton.set("disabled", !this.isValid());
+				this.connect(this, "onValidStateChange", function(state){
+						submitButton.set("disabled", !state);
+				});
+			</script>
+			<table role="presentation">
+				<tr>
+					<td><label for="name">Name:</label></td>
+					<td><input id="name" data-dojo-type="dijit/form/ValidationTextBox"
+						data-dojo-props='required:true, name:"name" '/></td>
+				</tr>
+				<tr id="newRow" style="display: none;">
+					<td><label for="lastName">Last Name:</label></td>
+					<td><input id="lastName" /></td>
+				</tr>
+				<tr>
+					<td><label for="birth">Birthdate (before 2006-12-31):</label><br><br><br><br></td>
+					<td><div><input id="birth" data-dojo-type="dijit/form/DateTextBox" data-dojo-props='value:"2000-01-01",
+						required:true, name:"birth", constraints:{min:"1900-01-01", max:"2006-12-31"} '/> <br>
+					<button id="disable" onclick="dijit.byId('birth').set('disabled',true);return false;">Disable</button>
+					<button id="enable" onclick="dijit.byId('birth').set('disabled',false);return false;">Enable</button>
+					<button id="reset" onclick="dijit.byId('birth').reset();return false">Reset</button> <br><br>
+					</div></td>
+				</tr>
+				<tr>
+					<td><label for="notes">Notes (optional)</label></td>
+					<td><input id="notes" data-dojo-type="dijit/form/TextBox"
+						data-dojo-props='name:"notes" '/></td>
+				</tr>
+				<tr id="newRow2" style="display: none;">
+					<td><label for="color">Favorite Color</label></td>
+					<td><select id="color">
+						<option value="red">Red</option>
+						<option value="yellow">Yellow</option>
+						<option value="blue">Blue</option>
+					</select></td>
+				</tr>
+			</table>
+			<button id="submitButton" data-dojo-type="dijit/form/Button" >
+				<script type="dojo/method" data-dojo-event="onClick">
+					console.dir(dijit.byId("form1").get('value'));
+				</script>
+				Submit
+			</button>
+			<button id="addMoreFields" data-dojo-type="dijit/form/Button" >
+				<script type="dojo/method" data-dojo-event="onClick">
+					new dijit.form.FilteringSelect({id: "color",
+													name: "color",
+													required: true},
+													dojo.byId("color"));
+					new dijit.form.ValidationTextBox({id: "lastName",
+													name: "lastName",
+													required: true},
+													dojo.byId("lastName"));
+					dojo.byId("newRow").style.display = "";
+					dojo.byId("newRow2").style.display = "";
+					this.set("disabled", true);
+					this.domNode.blur();
+					// Call this, since we added a new widget - so that our
+					// form knows that we have something else to watch.
+					dijit.byId("form1").connectChildren();
+				</script>
+				Add More Fields
+			</button>
+			<button data-dojo-type="dijit/form/Button">
+				<script type="dojo/method" data-dojo-event="onClick">
+					dijit.byId("name").validate();
+				</script>
+				validate
+			</button>
+		</form>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_MultiSelect.html b/src/main/resources/static/dijit/tests/form/test_MultiSelect.html
new file mode 100644
index 0000000000000000000000000000000000000000..b88a27fcaa149bb78757ff341863737237a4943f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_MultiSelect.html
@@ -0,0 +1,200 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Testing MultiSelect form widget | The Dojo Toolkit</title>
+
+	<style type="text/css">
+		#select, #select2 {
+			width:255px;
+			height:300px;
+			overflow:auto;
+		}
+		div#sel1, div#sel2 {
+			float: left;
+		}
+		div#leftRightButtons {
+			float: left;
+			padding: 10em 0.5em 0 0.5em;
+		}
+	</style>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/query",
+			"dojo/dom-form",
+			"dojo/_base/json",
+			"dojo/_base/array",
+			"dojo/_base/lang",
+			"dojo/dom",
+			"dojo/dom-class",
+			"dojo/parser",
+			"dijit/dijit",
+			"dijit/focus",
+			"dijit/registry",
+			"dijit/form/MultiSelect",
+			"dijit/form/Button",
+			"dijit/form/Form",
+			"dijit/tests/helpers",
+			"dojo/domReady!"
+		], function(doh, query, domForm, json, array, lang, dom, domClass, parser,
+					dijit, focus, registry, MultiSelect, Button, Form,  helpers){
+
+			parser.parse();
+
+			// Add mode=test to the URL to run unit tests.
+			var test = /mode=test/i.test(window.location.href);
+
+			// ref a clonable node, then split it between two selects
+			var c = query(".clone")[0];
+			var l = -1;
+			opt = function(){
+				return dom.byId((++l % 2 == 0 ? "select" : "select2" ));
+			};
+			// based on the the 'dijit' object
+			var count=0;
+			var select1Values = "dojo._defaultEasing";
+			for(var i in dijit){
+				var n = opt().appendChild(lang.clone(c));
+				n.value = count++;
+				if(l % 2 == 0){
+					select1Values += "," + i;
+				}
+				n.innerHTML = i;
+			}
+
+			// turn any non-data-dojo-type selects into widgets programatically:
+			query("select").forEach(function(n){
+				if(!dijit.byNode(n)){
+					var foo = new dijit.form.MultiSelect({ name: n.name }, n).startup();
+				}
+			});
+
+			// listen to the "move items" buttons
+			query("button.switch")
+				.on("click",function(e){
+					switch(e.target.id.toString()){
+						case "left" : registry.byId("select").addSelected(registry.byId("select2")); break;
+						case "right" : registry.byId("select2").addSelected(registry.byId("select")); break;
+					}
+			});
+
+			// listen to the invert buttons
+			query("button.invert")
+				.on("click",function(e){
+					switch(e.target.id.toString()){
+						case "i1" : registry.byId("select").invertSelection(); break;
+						case "i2" : registry.byId("select2").invertSelection(); break;
+						case "i3" : registry.byId("select3").invertSelection(); break;
+					}
+			});
+
+			// there is only one debug button
+			query(".debug").on("click",function(e){
+				console.log('select value:',registry.byId("select").get('value') + '/' + registry.byId("select").value);
+				console.log('select2 value:',registry.byId("select2").get('value') + '/' + registry.byId("select2").value);
+				console.log('select3 value:',registry.byId("select3").get('value') + '/' + registry.byId("select3").value);
+			});
+
+			query("#formSubmit").on("click", function(e){
+				// see what the real form says about our widgets:
+				var vals = domForm.toJson("test");
+				console.log(vals);
+			});
+
+			query("#s1").on("click", function(e){
+				registry.byId('select3').set('value', ['VA', 'WA']);
+			});
+
+			if(test){
+				doh.register("API", [
+					function initial(t){
+						var vals = json.fromJson(domForm.toJson("test"));
+						t.is(select1Values, query("option", registry.byId('select').containerNode).map(function(n){ return n.innerHTML; }).join(','));
+						t.is("", registry.byId('select').get('value').join(''), 'easing widget value');
+						t.is("", registry.byId('select2').get('value').join(''), 'second widget value');
+						t.is("TN", registry.byId('select3').get('value').join(''), 'select3 widget value');
+						t.is("", vals.easing, 'easing form value');
+						t.is("", vals.second, 'second form value');
+						t.is("TN", vals.select3, 'select3 form value');
+						t.t(domClass.contains(registry.byId('select2').domNode, "dijitMultiSelect"), 'second base class');
+						t.t(domClass.contains(registry.byId('select3').domNode, "dijitMultiSelect"), 'select3 base class');
+						t.t(domClass.contains(registry.byId('select3').domNode, "addedClass"), 'select3 added class');
+					},
+					{
+						name: "set",
+						timeout: 1000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							registry.byId('select3').set('value', ['TN','FL']);
+							setTimeout(d.getTestCallback(function(){
+								var vals = json.fromJson(domForm.toJson("test"));
+								t.is("TN,FL", registry.byId('select3').get('value').join(','), "select3 widget value");
+								t.is("TN,FL", vals.select3, "select3 form value");
+							}), 500);
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			}
+		});
+	</script>
+</head>
+<body style="padding:20px" role="main">
+
+		<h1 class="testTitle">dijit.form.MultiSelect:</h1>
+		<p>Select one or more items in First or Second list and move them between lists using the buttons provided.</p>
+		<form action="#" method="get" id="test" onsubmit="return false">
+
+			<div>
+				<div id="sel1" role="presentation">
+					<label for="select">First list:</label><br>
+					<select id="select" multiple size="7" name="easing" tabindex="1">
+						<option class="clone" value="dojo._defaultEasing">dojo._defaultEasing</option>
+					</select>
+				</div>
+				<div id="leftRightButtons" role="presentation">
+					<span>
+						<button class="switch" id="left" title="Move Items to First list">&lt;</button>
+						<button class="switch" id="right" title="Move Items to Second list">&gt;</button>
+					</span>
+				</div>
+				<div id="sel2" role="presentation">
+					<label for="select2">Second list:</label><br>
+					<select id="select2" multiple size="7" name="second">
+					</select>
+				</div>
+			</div>
+
+			<br style="clear: both;"/><br>
+
+			<button class='invert' id="i1">invert first list</button>
+			<button class="invert" id="i2">invert second list</button>
+			<button id="formSubmit" type="submit">Submit</button>
+
+
+		<button class="debug">call get('value')</button>
+
+		<h3><label for="select3">markup:</label></h3>
+
+		<select class="addedClass" id="select3" multiple data-dojo-type="dijit/form/MultiSelect"
+			data-dojo-props='name:"select3",style:{height:"200px", width:"175px", border:"5px solid #ededed"}'>
+
+			<option value="TN" selected>Tennessee</option>
+			<option value="VA">Virginia</option>
+			<option value="WA">Washington</option>
+			<option value="FL">Florida</option>
+			<option value="CA">California</option>
+
+		</select>
+		</form>
+		<br><br>
+		<button class='invert' id="i3">invert markup list</button>
+		<button class='set' id="s1">set markup list to [VA, WA]</button>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_Select.html b/src/main/resources/static/dijit/tests/form/test_Select.html
new file mode 100644
index 0000000000000000000000000000000000000000..ae4c8ff247652cb94de72dd4b54dcd428c6e477c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_Select.html
@@ -0,0 +1,1223 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>dijit/form/Select test</title>
+
+		<style>
+			.ark { text-decoration: underline; }
+			form {
+				margin:  10px 0px;
+				border:  solid gray 2px;
+			}
+			.area {
+				border: 1px solid gray;
+				padding: 2px;
+				display: inline;
+				white-space: nowrap;
+			}
+			h3 {
+				margin: 0;
+			}
+			body .customStyled .dijitSelect,
+			body .customStyled .dijitSelect .dijitButtonContents {
+				border-width: 2px;
+				border-color: blue;
+			}
+			body .customStyled .dijitSelect .dijitInputField {
+				padding: 5px;
+				font-family: Arial;
+				font-size: 150%;
+			}
+			.dj_a11y .dijitSelect,
+			.dj_a11y .dijitSelect .dijitButtonContents {
+				border-width: medium !important;
+			}
+			.dj_a11y .dijitSelect,
+			.dj_a11y .customStyled .dijitSelect,
+			.dj_a11y .dijitSelect *,
+			.dj_a11y .customStyled .dijitSelect * {
+				background-color: white !important;
+				background-image: none !important;
+				border-color: black !important;
+				color: black !important;
+			}
+		</style>
+
+		<script type="text/javascript" src="../boilerplate.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner",
+				"dojo/_base/array",
+				"dojo/_base/lang",
+				"dojo/parser",
+				"dojo/data/ItemFileReadStore",	// for testing old API (remove for 2.0)
+				"dojo/data/ItemFileWriteStore",	// for testing old API (remove for 2.0)
+				"dojo/store/Memory",
+				"dojo/store/Observable",
+				"dijit/focus",
+				"dijit/registry",
+				"dijit/form/Select",
+				"dijit/form/Button",
+				"dijit/form/Form",
+				"dijit/Dialog",
+				"dijit/Tooltip",
+				"dijit/tests/helpers",
+
+				// Used by parser
+				"dijit/Toolbar",
+				"dijit/form/ToggleButton",
+
+				"dojo/domReady!"
+			], function(doh, array, lang, parser, ItemFileReadStore, ItemFileWriteStore, Memory, Observable,
+						focus, registry, Select, Button, Form, Dialog, Tooltip, helpers){
+
+				var numOptions = 0;
+				var numChanges = 0;
+				var addNum = 10;
+	
+				// Add test=true to the URL to run unit tests.
+				// Add testPerformance=true to the URL to run performance tests - note SLOW to run
+				var test = /mode=test/i.test(window.location.href),
+					testPerformance = /mode=benchmark/i.test(window.location.href);
+	
+				// dojo/data (legacy) data stores
+				var data = {
+					identifier: "value",
+					label: "label",
+					items: [
+						{value: "AL", label: "Alabama"},
+						{value: "AK", label: "Alaska"},
+						{value: "AZ", label: "Arizona"},
+						{value: "AR", label: "Arkansas"},
+						{value: "CA", label: "California"},
+						{value: "CO", label: "Colorado"},
+						{value: "CT", label: "Connecticut"}
+					]
+				};
+				var data2 = {
+					identifier: "value",
+					label: "label",
+					items: [
+						{value: "DE", label: "Delaware"},
+						{value: "FL", label: "Florida"},
+						{value: "GA", label: "Georgia"},
+						{value: "HI", label: "Hawaii"},
+						{value: "ID", label: "Idaho"},
+						{value: "IL", label: "Illinois"},
+						{value: "IN", label: "Indiana"}
+					]
+				};
+	
+				readStore = new ItemFileReadStore({data: lang.clone(data)});
+				store2 = new ItemFileReadStore({data: lang.clone(data2)});
+				writeStore = new ItemFileWriteStore({data: lang.clone(data)});
+
+				// dojo/store (new API) data stores
+				var vals = [
+					{value: "AL", label: "Alabama"},
+					{value: "AK", label: "Alaska"},
+					{value: "AZ", label: "Arizona"},
+					{value: "AR", label: "Arkansas"},
+					{value: "CA", label: "Calif<a href='javascript:alert()'>ornia</a>"},
+					{value: "CO", label: "Colorado"},
+					{value: "CT", label: "Connecticut"}
+				];
+				var vals2 = [
+					{value: "DE", label: "Delaware"},
+					{value: "FL", label: "Florida"},
+					{value: "GA", label: "Georgia"},
+					{value: "HI", label: "Hawaii"},
+					{value: "ID", label: "Idaho"},
+					{value: "IL", label: "Illinois"},
+					{value: "IN", label: "Indiana"}
+				];
+				memoryStore = new Memory({
+					idProperty: "value",
+					data: lang.clone(vals)
+				});
+				memoryStore2 = new Memory({
+					idProperty: "value",
+					data: lang.clone(vals2)
+				});
+				memoryStore3 = new Observable(new Memory({	// updates will reflect to select
+					idProperty: "value",
+					data: lang.clone(vals)
+				}));
+
+				parser.parse();
+
+				s1.on("change", function(val){
+					console.log("First Select Changed to " + val);
+					numChanges++;
+				});
+
+				var programmatic = new Select({
+					options: [
+						{ label: 'foo', value: 'foo', selected: true },
+						{ label: 'bar', value: 'bar' }
+					],
+					"aria-label":"programmatic"
+				});
+				programmatic.placeAt('testProgramatic');
+
+				var programmaticDisabled = new Select({
+					disabled: true,
+					options: [
+						{ label: 'foo', value: 'foo', selected: true },
+						{ label: 'bar', value: 'bar' }
+					],
+					"aria-label":"programmatic disabled"
+				});
+				programmaticDisabled.placeAt('testProgramatic');
+
+				if(test){
+					doh.register("API", [
+						{
+							name: "test_set",
+							timeout: 5000,
+							runTest: function(t){
+								var d = new doh.Deferred();
+								t.is("VA", form.get("value").s1, "initial value");
+								s1.set("value", s1.getOptions(2)); // set s1 to a valid value via index search
+								t.is("WA", s1.value);
+
+								setTimeout(function(){
+									try{ // allow onChange to fire
+
+										// set s1 to non-existing value, which (currently) makes the Select pick
+										// the first option in the drop down
+										s1.set("value", "UT");
+										t.is("TN", s1.value);
+
+										setTimeout(function(){
+											try{ // allow onChange to fire
+												t.is(2, numChanges);
+
+												// prevent onChange from firing
+												s1.set("value", "FL", false);
+
+												setTimeout(function(){
+													try{ // allow onChange to fire if it's wrong
+														t.is(2, numChanges);
+														d.callback(true);
+													}catch(e){
+														d.errback(e);
+													}
+												}, 0)
+											}catch(e){
+												d.errback(e);
+											}
+										}, 0);
+									}catch(e){
+										d.errback(e);
+									}
+								}, 0);
+								return d;
+							}
+						},
+						{
+							name: "test_set by number",
+							timeout: 5000,
+							runTest: function(t){
+								var d = new doh.Deferred();
+								t.is(100, form.get("value").s5, "initial value");
+								s5.set("value", s5.getOptions(2)); // set s5 to a valid value via index search
+								t.is(102, s5.value);
+
+								setTimeout(function(){
+									try{ // allow onChange to fire
+
+										// set s5 to non-existing value, which (currently) makes the Select pick
+										// the first option in the drop down
+										s5.set("value", 200);
+										t.is(100, s5.value);
+
+										setTimeout(function(){
+											try{ // allow onChange to fire
+												t.is(2, numChanges);
+
+												// prevent onChange from firing
+												s5.set("value", 103, false);
+												t.t(/.*No Move.*/.test(s5.containerNode.innerHTML), s5.containerNode.innerHTML);
+
+												setTimeout(function(){
+													try{ // allow onChange to fire if it's wrong
+														t.is(2, numChanges);
+														d.callback(true);
+													}catch(e){
+														d.errback(e);
+													}
+												}, 0)
+											}catch(e){
+												d.errback(e);
+											}
+										}, 0);
+									}catch(e){
+										d.errback(e);
+									}
+								}, 0);
+								return d;
+							}
+						},
+						{
+							name: 'test_disabled',
+							runTest: function(t){
+								t.is(testDisabled.disabled, true);
+							}
+						},
+						{
+							name: 'test_programmatic',
+							runTest: function(t){
+								t.is(programmatic.options.length, 2);
+								t.is(programmaticDisabled.options.length, 2);
+								t.is(programmaticDisabled.disabled, true);
+							}
+						},
+						function test_setOptions(t){
+							programmatic.set('options', data2.items);
+							programmatic.reset();
+							t.is(7, programmatic.getOptions().length);
+							t.is("DE", programmatic.value);
+						},
+						// Test that destroying a Select destroys the internal Menu and MenuItems too
+						{
+							name: "test_destroy",
+							timeout: 5000,
+							runTest: function(t){
+								var oldCnt = registry.length;
+
+								s1.destroy();
+
+								var newCnt = registry.length;
+								t.t(newCnt < oldCnt + 3, "should have destroyed many widgets, went from " + oldCnt + " to " + newCnt);
+							}
+						},
+						{
+							name: "aria attributes",
+							timeout: 2000,
+							runTest: function(){
+								var d = new doh.Deferred();
+								select = registry.byId("s2");
+
+								doh.is("listbox", select._popupStateNode.getAttribute("role"), "select _popupStateNode role");
+								doh.t(select._popupStateNode.getAttribute("aria-haspopup"), "aria-haspopup on select");
+								doh.f(select._popupStateNode.getAttribute("aria-expanded"), "initially false aria-expanded");
+								doh.f(select._popupStateNode.getAttribute("aria-owns"), "initially missing aria-owns");
+
+								select.openDropDown();
+								setTimeout(d.getTestCallback(function(){
+									doh.t(select._popupStateNode.getAttribute("aria-expanded"), "now aria-expanded should be true");
+									doh.is("s2_menu", select._popupStateNode.getAttribute("aria-owns"), "should aria-own the menu");
+									// Check roles and attributes on the Menu
+									var menu = registry.byId("s2_menu");
+									doh.is("listbox", menu.domNode.getAttribute("role"), "Dlg.domNode should have a role");
+									doh.is("s2", menu.domNode.getAttribute("aria-labelledby"), "aria-labelledby should point back to button");
+								}), 0);
+
+								return d;
+							},
+							tearDown: function(){
+								select.closeDropDown();
+							}
+						}
+					]);
+
+					// Test legacy dojo/data API, remove for 2.0
+					doh.register("dojo/data store", [
+						// Tests that when the currently selected item is changed in the data store,
+						// the change is reflected in the Select widget
+						function test_changeSelected(t){
+							t.is("AL", s11.value);
+							t.t(/<span.*>Alabama<\/span>/i.test(s11.containerNode.innerHTML), "expected Alabama but got " + s11.containerNode.innerHTML);
+							s11.set("value", ["AK"]); // test array
+							t.is("AK", s11.value);
+							t.t(/<span.*>Alaska<\/span>/i.test(s11.containerNode.innerHTML), "expected Alaska but got " + s11.containerNode.innerHTML);
+							var d = new doh.Deferred();
+							writeStore.fetchItemByIdentity({
+								identity: "AK",
+								onItem: d.getTestCallback(function(item){
+									writeStore.setValue(item, "label", "North Pole");
+									t.t(/<span.*>North Pole<\/span>/i.test(s11.containerNode.innerHTML), "expected North Pole but got " + s11.containerNode.innerHTML);
+								})
+							});
+							return d;
+						},
+
+						// Test that a delete of the non-selected item will remove that item from the Select's
+						// list of options.
+						function test_deleteNonSelected(t){
+							t.is(7, s11.getOptions().length);
+							t.is("AK", s11.value);
+							var d = new doh.Deferred();
+							writeStore.fetchItemByIdentity({
+								identity: "AZ",
+								onItem: d.getTestCallback(function(item){
+									writeStore.deleteItem(item);
+									t.is(6, s11.getOptions().length);
+								})
+							});
+							return d;
+						},
+
+						// Test that a delete of the selected item will remove that item from the Select's
+						// list of options, and switch to a new selected item
+						function test_deleteSelected(t){
+							t.is(6, s11.getOptions().length);
+							t.is("AK", s11.value);
+							var d = new doh.Deferred();
+							writeStore.fetchItemByIdentity({
+								identity: "AK",
+								onItem: d.getTestCallback(function(item){
+									writeStore.deleteItem(item);
+									t.is("AL", s11.value);
+									t.is(5, s11.getOptions().length);
+								})
+							});
+							return d;
+						},
+
+						// Test that new items added to the data store appear in the select's options
+						function test_newItem(t){
+							t.is(5, s11.getOptions().length);
+							t.is("AL", s11.value);
+
+							var d = new doh.Deferred();
+							writeStore.newItem({value: "NY", label: "New York"});
+							setTimeout(d.getTestCallback(function(){
+								t.is(6, s11.getOptions().length);
+								s11.set("value", s11.getOptions({ label: "New York" })); // set via label search
+								t.is("NY", s11.value);
+							}), 100);
+
+							return d;
+						},
+
+						// Test that a Select's store can be changed using deprecated API
+						// TODO remove in 2.0
+						function test_deprecatedSetStore(t){
+							t.is("AL", s12_dep.value);
+							s12_dep.setStore(store2, "FL");
+							t.is("FL", s12_dep.value);
+							s12_dep.setStore(readStore, "CA");
+							t.is("CA", s12_dep.value);
+							s12_dep.setStore(store2);
+							t.is("DE", s12_dep.value);
+							t.is(7, s12_dep.getOptions().length);
+						}
+					]);
+
+					doh.register("dojo/store", [
+						// Tests that when the currently selected item is changed in the data store,
+						// the change is reflected in the Select widget
+						function test_changeSelected(t){
+							// destroy second widget that shares same store to make sure Observable handles are cleaned up
+							ds11a.destroy();
+							t.is("AL", ds11.value);
+							t.t(/<span.*>Alabama<\/span>/i.test(ds11.containerNode.innerHTML));
+							ds11.set("value", "AK");
+							t.is("AK", ds11.value);
+							t.t(/<span.*>Alaska<\/span>/i.test(ds11.containerNode.innerHTML));
+
+							var item = memoryStore3.get("AK");
+							item.label = "North Pole";
+							memoryStore3.put(item);
+							t.t(/<span.*>North Pole<\/span>/i.test(ds11.containerNode.innerHTML), "select displayed value updated");
+						},
+
+						// Test that a delete of the non-selected item will remove that item from the Select's
+						// list of options.
+						function test_deleteNonSelected(t){
+							t.is(7, ds11.getOptions().length);
+							t.is("AK", ds11.value);
+
+							memoryStore3.remove("AZ");
+							t.is(6, ds11.getOptions().length);
+						},
+
+						// Test that a delete of the selected item will remove that item from the Select's
+						// list of options, and switch to a new selected item
+						function test_deleteSelected(t){
+							t.is(6, ds11.getOptions().length);
+							t.is("AK", ds11.value);
+
+							memoryStore3.remove("AK");
+							t.is("AL", ds11.value);
+							t.is(5, ds11.getOptions().length);
+						},
+
+						// Test that new items added to the data store appear in the select's options
+						function test_newItem(t){
+							t.is(5, ds11.getOptions().length);
+							t.is("AL", ds11.value);
+
+							memoryStore3.add({value: "NY", label: "New York"});
+
+							// TODO: try w/out the timeout
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								t.is(6, ds11.getOptions().length);
+								ds11.set("value", "NY");
+								t.is("NY", ds11.value);
+							}), 100);
+							return d;
+						},
+
+						// Test that a Select's store can be changed using set API
+						function test_setStore(t){
+							t.is(7, ds12.getOptions().length);
+							t.is("AL", ds12.value);
+							ds12.set("store", memoryStore2);
+							ds12.set("value", "FL")
+							t.is(7, ds12.getOptions().length);
+							t.is("FL", ds12.value);
+							ds12.set("store", memoryStore);
+							ds12.set("value", "CA")
+							t.is(7, ds12.getOptions().length);
+							// ensure that escaping prevented child nodes
+							t.is(ds12.containerNode.firstChild.childNodes.length, 1);
+							t.is("CA", ds12.value);
+							ds12.set("store", memoryStore2);
+							t.is(7, ds12.getOptions().length);
+							t.is("DE", ds12.value);
+						},
+
+						// Test that a Select's store can be changed using deprecated API
+						// TODO remove in 2.0
+						function test_deprecatedSetStore(t){
+							t.is(7, ds12_dep.getOptions().length);
+							t.is("AL", ds12_dep.value);
+							ds12_dep.setStore(memoryStore2, "FL");
+							t.is(7, ds12_dep.getOptions().length);
+							t.is("FL", ds12_dep.value);
+							ds12_dep.setStore(memoryStore, "CA");
+							t.is(7, ds12_dep.getOptions().length);
+							// ensure that escaping prevented child nodes
+							t.is(ds12_dep.containerNode.firstChild.childNodes.length, 1);
+							t.is("CA", ds12_dep.value);
+							ds12_dep.setStore(memoryStore2);
+							t.is(7, ds12_dep.getOptions().length);
+							t.is("DE", ds12_dep.value);
+						},
+
+						function test_setQuery(){
+							ds.set("value", "CT");
+							doh.is("Connecticut", ds.get("displayedValue"));
+							ds.set("query", {value: /^A.*/});
+							doh.is("Alabama", ds.get("displayedValue"));
+						}
+					]);
+
+					doh.register("validation", [
+						function required(){
+							var s3 = registry.byId("s3");
+							doh.is("Incomplete", s3.get("state"), "incomplete because required but no value");
+
+							var stateWatch = "no notification";
+							s3.watch("state", function(name, oval, nval){
+								stateWatch = nval;
+							});
+
+							s3.set("required", false);
+							doh.is("", stateWatch, "watch fired after set requried=true");
+
+							s3.set("required", true);
+							doh.is("Incomplete", stateWatch, "watch fired after set required=false''");
+
+							s3.set("value", "AK");
+							doh.is("", stateWatch, "watch fired after set value=AK''");
+						}
+					]);
+				}
+
+				if(testPerformance){
+					doh.register("performance", [
+						{
+							name: "test_performance_single",
+							testType: "perf",
+							trialDuration: 100,
+							trialIterations: 100,
+							trialDelay: 100,
+							runTest: function(t){
+								var opt = {value: "Test", label: "Test Option"};
+								s6.addOption(opt);
+								s6.removeOption(opt);
+							}
+						},
+						{
+							name: "test_performance_separate",
+							testType: "perf",
+							trialDuration: 100,
+							trialIterations: 100,
+							trialDelay: 100,
+							setUp: function(t){
+								var opts = (t.options = []);
+								for(var i = 0; i < addNum; i++){
+									opts.push({value: i + "", label: "Option " + (i + 1)});
+								}
+							},
+							runTest: function(t){
+								array.forEach(t.options, function(opt){
+									s6.addOption(opt);
+								});
+								array.forEach(t.options, function(opt){
+									s6.removeOption(opt);
+								});
+							},
+							tearDown: function(t){
+								delete t.options;
+							}
+						},
+						{
+							name: "test_performance_batch",
+							testType: "perf",
+							trialDuration: 100,
+							trialIterations: 100,
+							trialDelay: 100,
+							setUp: function(t){
+								var opts = (t.options = []);
+								for(var i = 0; i < addNum; i++){
+									opts.push({value: i + "", label: "Option " + (i + 1)});
+								}
+							},
+							runTest: function(t){
+								s6.addOption(t.options);
+								s6.removeOption(t.options);
+							},
+							tearDown: function(t){
+								delete t.options;
+							}
+						}
+					]);
+				}
+
+				if(test || testPerformance){
+					doh.run();
+				}
+			});
+		</script>
+	</head>
+	<body role="main">
+		<h1 class="testTitle">Test: dijit/form/Select</h1>
+
+		<p>
+			Note: load <a href="test_Select.html?mode=test">test_Select.html?mode=test</a> to run unit tests, or
+			<a href="test_Select.html?mode=benchmark">test_Select.html?mode=benchmark</a> to run performance tests.
+		</p>
+
+		<script type="dojo/require">
+			registry: "dijit/registry"
+		</script>
+
+		<form method="get" id="htmlForm" action="get">
+			<h2>HTML select for comparison</h2>
+			<label for="htmlSelect">Four options:</label>
+			<select id="htmlSelect" title="native title">
+				<option value="one">one</option>
+				<option value="two">two</option>
+				<option value="three">three</option>
+				<option value="four">four</option>
+			</select>
+			<label for="htmlSelect2">Empty:</label>
+			<select id="htmlSelect2">
+			</select>
+		</form>
+		<form id="form" data-dojo-id="form" data-dojo-type="dijit/form/Form" method="get"
+				onSubmit="return this.validate();">
+			<h2>dijit/form/Select form</h2>
+			<h4 class="testSubtitle">Setting Defaults</h4>
+			<span id="ls1">Test One:</span>
+			<select id="s1" data-dojo-id="s1" data-dojo-type="dijit/form/Select" name="s1" aria-labelledby="ls1">
+				<option value="TN">Tennessee</option>
+				<option value="VA" selected="selected">Virginia</option>
+				<option value="WA">Washington</option>
+				<option value="FL">Florida</option>
+				<option value="CA">California</option>
+			</select>
+			<button id="s1button" data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", onClick:function(){ console.log(s1.get("displayedValue")); }'>
+				Get Displayed Value
+			</button>
+			<span id="ls2">Test Two:</span>
+			<select id="s2" data-dojo-id="s2" data-dojo-type="dijit/form/Select" name="s2" aria-labelledby="ls2"
+					value="CA" title="widget title">
+				<option value="AL">Alabama</option>
+				<option value="AK">Alaska</option>
+				<option value="AZ">Arizona</option>
+				<option value="AR">Arkansas</option>
+				<option value="CA">California</option>
+				<option value="NH">New Hampshire</option>
+				<option value="NJ">New Jersey</option>
+				<option value="NM">New Mexico</option>
+				<option value="NY">New York</option>
+			</select>
+			<span id="ls3">Test Three (required):</span>
+			<select id="s3" data-dojo-id="s3" data-dojo-type="dijit/form/Select" name="s3" aria-labelledby="ls3"
+					data-dojo-props='style:{width:"150px"},
+					required:true,
+					onChange: function(){
+						if(!this.options[0].value){
+							this.removeOption(0);
+						}
+					}
+				'>
+				<option>&nbsp;</option>
+				<option value="AL">Alabama</option>
+				<option value="AK">Alaska</option>
+				<option></option>
+				<option value="AZ">Arizona</option>
+				<option value="AR">Arkansas</option>
+				<option></option>
+				<option value="CA">California</option>
+			</select>
+		<hr>
+			<h4 class="testSubtitle">Rich Text (Need to use divs and spans - since browsers hack selects to pieces)</h4>
+			<span id="ls4">Rich text One:</span>
+			<span id="s4" data-dojo-id="s4" data-dojo-type="dijit/form/Select" name="s4" aria-labelledby="ls4" value="AK">
+				<span data-dojo-value="AL"><b>Alabama</b></span>
+				<span data-dojo-value="AK"><span style="color:red;">A</span><span style="color:orange;">l</span><span style="color:yellow;">a</span><span style="color:green;">s</span><span style="color:blue;">k</span><span style="color:purple;">a</span></span>
+				<span data-dojo-value="AZ"><i>Arizona</i></span>
+				<span data-dojo-value="AR"><span class="ark">Arkansas</span></span>
+				<span data-dojo-value="CA"><span style="font-size:25%">C</span><span style="font-size:50%">a</span><span style="font-size:75%">l</span><span style="font-size:90%">i</span><span style="font-size:100%">f</span><span style="font-size:125%">o</span><span style="font-size:133%">r</span><span style="font-size:150%">n</span><span style="font-size:175%">i</span><span style="font-size:200%">a</span></span>
+				<button value="NM" disabled="disabled">New<br>&nbsp;&nbsp;Mexico</button>
+			</span>
+			<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", onClick:function(){ s4.set("disabled", !s4.get("disabled")); }'>
+				Toggle Disabled
+			</button>
+			<span id="ls5">Rich text two:</span>
+			<span id="s5" data-dojo-id="s5" data-dojo-type="dijit/form/Select" name="s5" aria-labelledby="ls5" value="move">
+				<span data-dojo-value=100><img style="vertical-align: middle;margin-top: 1px;margin-bottom:1px;" src="../../../dijit/themes/tundra/images/dndCopy.png" alt="copy" /> Copy</span>
+				<span data-dojo-value=101><img  style="vertical-align: middle;margin-top: 1px;margin-bottom:1px;" src="../../../dijit/themes/tundra/images/dndMove.png" alt="move" /> Move</span>
+				<span data-dojo-value=102><img  style="vertical-align: middle;margin-top: 1px;margin-bottom:1px;" src="../../../dijit/themes/tundra/images/dndNoCopy.png" alt="no copy" /> No Copy</span>
+				<span data-dojo-value=103><img  style="vertical-align: middle;margin-top: 1px;margin-bottom:1px;" src="../../../dijit/themes/tundra/images/dndNoMove.png" alt="no move" /> No Move</span>
+				<span data-dojo-value=104><img  style="vertical-align: middle;margin-top: 1px;margin-bottom:1px;" src="../../../dijit/themes/tundra/images/dndNoMove.png" alt="very long menu" /> Very Long Menu Entry</span>
+			</span>
+		<hr>
+			<h4 class="testSubtitle" id="ls6">Initially Empty</h4>
+			<select id="s6" data-dojo-id="s6" data-dojo-type="dijit/form/Select" name="s6" aria-labelledby="ls6"
+					data-dojo-props='maxHeight:100'>
+			</select>
+			<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", onClick:function(){ numOptions++; s6.addOption({value: numOptions + "", label: "Option " + numOptions}); }'>
+				Add Option
+			</button>
+			<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", onClick:function(){ s6.removeOption(0); }'>
+				Remove Top Option
+			</button>
+			<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", onClick:function(){ s6.set("disabled", !s6.get("disabled")); }'>
+				Toggle Disabled
+			</button>
+			<hr>
+		<h4 class="testSubtitle" id="ls7">Single Item</h4>
+			<select id="s7" data-dojo-id="s7" data-dojo-type="dijit/form/Select" name="s7" aria-labelledby="ls7">
+				<option value="NY">New York</option>
+			</select>
+		<hr>
+		<h4 class="testSubtitle">Long lists</h4>
+			<span id="ls8a">maxHeight=200:</span>
+			<select id="s8a" data-dojo-id="s8a" data-dojo-type="dijit/form/Select" name="s8" aria-labelledby="ls8"
+					data-dojo-props='maxHeight:200'>
+				<option value="AL">Alabama</option>
+				<option value="AK">Alaska</option>
+				<option value="AZ">Arizona</option>
+				<option value="AR">Arkansas</option>
+				<option value="CA">California</option>
+				<option value="CO">Colorado</option>
+				<option value="CT">Connecticut</option>
+				<option value="DE">Delaware</option>
+				<option value="DC">Dist of Columbia</option>
+				<option value="FL">Florida</option>
+				<option value="GA">Georgia</option>
+				<option value="HI">Hawaii</option>
+				<option value="ID">Idaho</option>
+				<option value="IL">Illinois</option>
+				<option value="IN">Indiana</option>
+				<option value="IA">Iowa</option>
+				<option value="KS">Kansas</option>
+				<option value="KY">Kentucky</option>
+				<option value="LA">Louisiana</option>
+				<option value="ME">Maine</option>
+				<option value="MD">Maryland</option>
+				<option value="MA">Massachusetts</option>
+				<option value="MI">Michigan</option>
+				<option value="MN">Minnesota</option>
+				<option value="MS">Mississippi</option>
+				<option value="MO">Missouri</option>
+				<option value="MT">Montana</option>
+				<option value="NE">Nebraska</option>
+				<option value="NV">Nevada</option>
+				<option value="NH">New Hampshire</option>
+				<option value="NJ">New Jersey</option>
+				<option value="NM">New Mexico</option>
+				<option value="NY">New York</option>
+				<option value="NC">North Carolina</option>
+				<option value="ND">North Dakota</option>
+				<option value="OH">Ohio</option>
+				<option value="OK">Oklahoma</option>
+				<option value="OR">Oregon</option>
+				<option value="PA">Pennsylvania</option>
+				<option value="RI">Rhode Island</option>
+				<option value="SC">South Carolina</option>
+				<option value="SD">South Dakota</option>
+				<option value="TN">Tennessee</option>
+				<option value="TX">Texas</option>
+				<option value="UT">Utah</option>
+				<option value="VT">Vermont</option>
+				<option value="VA">Virginia</option>
+				<option value="WA">Washington</option>
+				<option value="WV">West Virginia</option>
+				<option value="WI">Wisconsin</option>
+				<option value="WY">Wyoming</option>
+			</select>
+			<span id="ls8b">no maxHeight:</span>
+			<select id="s8b" data-dojo-id="s8b" data-dojo-type="dijit/form/Select" name="s8b" aria-labelledby="ls8b">
+				<option value="AL">Alabama</option>
+				<option value="AK">Alaska</option>
+				<option value="AZ">Arizona</option>
+				<option value="AR">Arkansas</option>
+				<option value="CA">California</option>
+				<option value="CO">Colorado</option>
+				<option value="CT">Connecticut</option>
+				<option value="DE">Delaware</option>
+				<option value="DC">Dist of Columbia</option>
+				<option value="FL">Florida</option>
+				<option value="GA">Georgia</option>
+				<option value="HI">Hawaii</option>
+				<option value="ID">Idaho</option>
+				<option value="IL">Illinois</option>
+				<option value="IN">Indiana</option>
+				<option value="IA">Iowa</option>
+				<option value="KS">Kansas</option>
+				<option value="KY">Kentucky</option>
+				<option value="LA">Louisiana</option>
+				<option value="ME">Maine</option>
+				<option value="MD">Maryland</option>
+				<option value="MA">Massachusetts</option>
+				<option value="MI">Michigan</option>
+				<option value="MN">Minnesota</option>
+				<option value="MS">Mississippi</option>
+				<option value="MO">Missouri</option>
+				<option value="MT">Montana</option>
+				<option value="NE">Nebraska</option>
+				<option value="NV">Nevada</option>
+				<option value="NH">New Hampshire</option>
+				<option value="NJ">New Jersey</option>
+				<option value="NM">New Mexico</option>
+				<option value="NY">New York</option>
+				<option value="NC">North Carolina</option>
+				<option value="ND">North Dakota</option>
+				<option value="OH">Ohio</option>
+				<option value="OK">Oklahoma</option>
+				<option value="OR">Oregon</option>
+				<option value="PA">Pennsylvania</option>
+				<option value="RI">Rhode Island</option>
+				<option value="SC">South Carolina</option>
+				<option value="SD">South Dakota</option>
+				<option value="TN">Tennessee</option>
+				<option value="TX">Texas</option>
+				<option value="UT">Utah</option>
+				<option value="VT">Vermont</option>
+				<option value="VA">Virginia</option>
+				<option value="WA">Washington</option>
+				<option value="WV">West Virginia</option>
+				<option value="WI">Wisconsin</option>
+				<option value="WY">Wyoming</option>
+			</select>
+
+			<hr>
+			<h4 class="testSubtitle">dojo/data store (legacy API) based</h4>
+			<span id="ls9">Example 1</span>
+			<select id="s9" data-dojo-id="s9" data-dojo-type="dijit/form/Select" name="s9" value="CT"
+				aria-labelledby="ls9" data-dojo-props='store:readStore'>
+			</select>
+			<span id="ls10">Example 2</span>
+			<select id="s10" data-dojo-id="s10" data-dojo-type="dijit/form/Select" name="s10" aria-labelledby="ls10"
+					data-dojo-props='store:readStore'>
+			</select>
+			<span id="ls11">Example 3</span>
+			<select id="s11" data-dojo-id="s11" data-dojo-type="dijit/form/Select" name="s11" aria-labelledby="ls11"
+					data-dojo-props='store:writeStore'>
+			</select>
+			<span id="ls12_dep">Example 4 Legacy</span>
+			<select id="s12_dep" data-dojo-id="s12_dep" data-dojo-type="dijit/form/Select" name="s12_dep"
+				aria-labelledby="ls12_dep" data-dojo-props='store:readStore'>
+			</select>
+
+			<hr>
+			<h4 class="testSubtitle">dojo/store based</h4>
+			<span id="lds9">Example 1</span>
+			<select id="ds9" data-dojo-id="ds" data-dojo-type="dijit/form/Select" name="ds9" aria-labelledby="lds9"
+					value="CT" data-dojo-props='store:memoryStore, labelAttr:"label"'>
+			</select>
+			<span id="lds10">Example 2</span>
+			<select id="ds10" data-dojo-id="ds10" data-dojo-type="dijit/form/Select" name="ds10" aria-labelledby="lds10"
+					data-dojo-props='store:memoryStore, labelAttr:"label"'>
+			</select>
+			<span id="lds11">Example 3 (Observable)</span>
+			<select id="ds11" data-dojo-id="ds11" data-dojo-type="dijit/form/Select" name="ds11" aria-labelledby="lds11"
+					data-dojo-props='store:memoryStore3, labelType: "text", labelAttr:"label"'>
+			</select>
+			<span id="lds11a">Example 3a (Observable, same store as 3)</span>
+			<select id="ds11a" data-dojo-id="ds11a" data-dojo-type="dijit/form/Select" name="ds11a" aria-labelledby="lds11a"
+					data-dojo-props='store:memoryStore3, labelAttr:"label"'>
+			</select>
+			<span id="lds12">Example 4</span>
+			<select id="ds12" data-dojo-id="ds12" data-dojo-type="dijit/form/Select" name="ds12" aria-labelledby="lds12"
+					data-dojo-props='labelType: "text", store:memoryStore, labelAttr:"label"'>
+			</select>
+			<span id="lds12_dep">Example 5 Legacy</span>
+			<select id="ds12_dep" data-dojo-id="ds12_dep" data-dojo-type="dijit/form/Select" name="ds12_dep"
+					aria-labelledby="lds12_dep"
+					data-dojo-props='labelType: "text", store:memoryStore, labelAttr:"label"'>
+			</select>
+
+			<hr>
+			<h4 class="testSubtitle">Inlined with text (all IE modes except for IE8 Standards)</h4>
+			<span id="ltxtPrompt">Text Prompt:</span>
+			<select id="txtPrompt" data-dojo-type="dijit/form/Select" aria-labelledby="ltxtPrompt">
+				<option value="SEL" selected="selected">Select</option>
+				<option value="OTHER">Other</option>
+			</select>
+
+			<hr>
+			<h4 class="testSubtitle">More required but blank selects</h4>
+			<span id="ls13">required s13:</span>
+			<select id="s13" data-dojo-id="s13" data-dojo-type="dijit/form/Select" name="s13" aria-labelledby="ls13"
+					style="width: 150px;" required="true">
+				<option>&nbsp;</option>
+				<option value="AL">Alabama</option>
+				<option value="AK">Alaska</option>
+				<option></option>
+				<option value="AZ">Arizona</option>
+				<option value="AR">Arkansas</option>
+				<option></option>
+				<option value="CA">California</option>
+			</select>
+			<span id="ls14">required s14:</span>
+			<select id="s14" data-dojo-id="s14" data-dojo-type="dijit/form/Select"
+					name="s14" aria-labelledby="ls14" style="width: 150px;" required="true">
+				<option>&nbsp;</option>
+				<option value="AL">Alabama</option>
+				<option value="AK">Alaska</option>
+				<option></option>
+				<option value="AZ">Arizona</option>
+				<option value="AR">Arkansas</option>
+				<option></option>
+				<option value="CA">California</option>
+			</select>
+
+			<hr>
+			<button data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", onClick:function(){ console.dir(form.getValues()); }'>
+				Get Values
+			</button>
+			<button data-dojo-type="dijit/form/Button" data-dojo-props='id:"submit", type:"submit"'>Submit</button>
+		</form>
+
+		<h4 class="testSubtitle">Disabled</h4>
+		<span id="l_testDisabled">Disabled:</span>
+		<select id='testDisabled' data-dojo-id='testDisabled' data-dojo-type="dijit/form/Select"
+				disabled name="testDisabled" aria-labelledby="l_testDisabled">
+			<option value="foo">foo</option>
+			<option value="bar">bar</option>
+		</select>
+		<hr>
+		<h4 class="testSubtitle">Programmatic and other tests</h4>
+		<div id="testProgramatic"></div>
+
+		<!-- testing that tooltip disappears when dialog is closed -->
+		<div dojoType="dijit/Dialog" id="dlg1">
+			<div dojoType="dijit/form/Select" id="dlg1Select"required="true"></div>
+			<div dojoType="dijit/form/Button" id="dlg1ValidateBtn">
+				<script type=dojo/method data-dojo-event="onClick">
+					var dlg1 = registry.byId("dlg1");
+					if(dlg1.validate()){
+						dlg1.hide();
+					}
+				</script>
+				validate and close
+			</div>
+		</div>
+		<button dojoType="dijit/form/Button" id="dlg1OpenBtn"
+				onclick="registry.byId('dlg1').show();">show one select dialog</button>
+
+		<div dojoType="dijit/Dialog" id="dlg2">
+			<div dojoType="dijit/form/Select" id="dlg2Select1"required="true"></div>
+			<div dojoType="dijit/form/Select" id="dlg2Select2"required="true"></div>
+			<div dojoType="dijit/form/Button" id="dlg2ValidateBtn">
+				<script type=dojo/method data-dojo-event="onClick">
+					var dlg2 = registry.byId("dlg2");
+					if(dlg2.validate()){
+						dlg2.hide();
+					}
+				</script>
+				validate and close
+			</div>
+		</div>
+		<button dojoType="dijit/form/Button" id="dlg2OpenBtn"
+				onclick="registry.byId('dlg2').show();">show two select dialog</button>
+		<br>
+		<fieldset class="area">
+			<legend>Rendering tests</legend>
+			<fieldset class="area">
+				<legend>unstyled widget</legend>
+				<fieldset class="area">
+					<legend id="lr1">normal</legend>
+					<select aria-labelledby="lr1" id="r1" data-dojo-type="dijit/form/Select">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="lr2">disabled</legend>
+					<select aria-labelledby="lr2" id="r2" data-dojo-type="dijit/form/Select" disabled>
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="lr3">error</legend>
+					<select id="r3" aria-labelledby="lr3" data-dojo-type="dijit/form/Select" class="dijitError dijitSelectError dijitValidationTextBoxError" data-dojo-props="required:true">
+						<option data-dojo-value=""></option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="lr4">hover</legend>
+					<select id="r4" aria-labelledby="lr4" data-dojo-type="dijit/form/Select" class="dijitHover dijitSelectHover">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="lr5">focused</legend>
+					<select id="r5" aria-labelledby="lr5" data-dojo-type="dijit/form/Select" class="dijitFocused dijitSelectFocused">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="lr6">RTL</legend>
+					<select id="r6" aria-labelledby="lr6" data-dojo-type="dijit/form/Select" dir="rtl">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="lr7">RTL error</legend>
+					<select id="r7" aria-labelledby="lr7" data-dojo-type="dijit/form/Select" class="dijitError dijitSelectError dijitValidationTextBoxError" dir="rtl" data-dojo-props="required:true">
+						<option data-dojo-value=""></option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="lr8">styled option</legend>
+					<span id="r8" aria-labelledby="lr8" data-dojo-type="dijit/form/Select">
+						<span data-dojo-value="1"><span style="font-size:200%;color:pink;">Large</span></span>
+						<span data-dojo-value="2">2</span>
+					</span>
+				</fieldset>
+			</fieldset>
+			<br>
+			<fieldset class="area">
+				<legend>width:60px;font-family:Arial;font-size:150%;border:2px blue;padding:5px;color:red</legend>
+				<fieldset class="area customStyled">
+					<legend id="lcs1">normal</legend>
+					<select id="cs1" aria-labelledby="lcs1" data-dojo-type="dijit/form/Select" style="color:red;width:60px;">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lcs2">disabled</legend>
+					<select id="cs2" aria-labelledby="lcs2" data-dojo-type="dijit/form/Select" style="color:red;width:60px;" disabled>
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lcs3">error</legend>
+					<select id="cs3" aria-labelledby="lcs3" data-dojo-type="dijit/form/Select" class="dijitError dijitSelectError dijitValidationTextBoxError" style="color:red;width:60px;" data-dojo-props="required:true">
+						<option data-dojo-value=""></option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lcs4">hover</legend>
+					<select id="cs4" aria-labelledby="lcs4" data-dojo-type="dijit/form/Select" class="dijitHover dijitSelectHover" style="color:red;width:60px;">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lcs5">focused</legend>
+					<select id="cs5" data-dojo-type="dijit/form/Select" aria-labelledby="lcs5" class="dijitFocused dijitSelectFocused" style="color:red;width:60px;">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lcs6">RTL</legend>
+					<select id="cs6" aria-labelledby="lcs6" data-dojo-type="dijit/form/Select" dir="rtl" style="color:red;width:60px;">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lcs7">RTL error</legend>
+					<select id="cs7" aria-labelledby="lcs7" data-dojo-type="dijit/form/Select" class="dijitError dijitSelectError dijitValidationTextBoxError" style="color:red;width:60px;" dir="rtl" data-dojo-props="required:true">
+						<option data-dojo-value=""></option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lcs8">styled option</legend>
+					<span id="cs8" aria-labelledby="lcs8" data-dojo-type="dijit/form/Select" style="color:red;width:120px;">
+						<span data-dojo-value="1"><span style="font-size:200%;color:pink;">Large</span></span>
+						<span data-dojo-value="2">2</span>
+					</span>
+				</fieldset>
+			</fieldset>
+			<br>
+			<fieldset class="area dj_a11y">
+				<legend>a11y, unstyled</legend>
+				<fieldset class="area">
+					<legend id="la1">normal</legend>
+					<select id="a1" aria-labelledby="la1" data-dojo-type="dijit/form/Select">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="la2">disabled</legend>
+					<select id="a2" aria-labelledby="la2" data-dojo-type="dijit/form/Select" disabled>
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="la3">error</legend>
+					<select id="a3" aria-labelledby="la3" data-dojo-type="dijit/form/Select" class="dijitError dijitSelectError dijitValidationTextBoxError" data-dojo-props="required:true">
+						<option data-dojo-value=""></option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="la4">hover</legend>
+					<select id="a4" aria-labelledby="la4" data-dojo-type="dijit/form/Select" class="dijitHover dijitSelectHover">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="la5">focused</legend>
+					<select id="a5" aria-labelledby="la5" data-dojo-type="dijit/form/Select" class="dijitFocused dijitSelectFocused">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="la6">RTL</legend>
+					<select id="a6" aria-labelledby="la6" data-dojo-type="dijit/form/Select" dir="rtl">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="la7">RTL error</legend>
+					<select id="a7" aria-labelledby="la7" data-dojo-type="dijit/form/Select" class="dijitError dijitSelectError dijitValidationTextBoxError" dir="rtl" data-dojo-props="required:true">
+						<option data-dojo-value=""></option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area">
+					<legend id="la8">styled option</legend>
+					<span id="a8" aria-labelledby="la8" data-dojo-type="dijit/form/Select">
+						<span data-dojo-value="1"><span style="font-size:200%;color:pink;">Large</span></span>
+						<span data-dojo-value="2">2</span>
+					</span>
+				</fieldset>
+			</fieldset>
+			<br>
+			<fieldset class="area dj_a11y">
+				<legend>a11y styled</legend>
+				<fieldset class="area customStyled">
+					<legend id="lacs1">normal</legend>
+					<select id="acs1" aria-labelledby="lacs1" data-dojo-type="dijit/form/Select" style="color:red;width:60px;">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lacs2">disabled</legend>
+					<select id="acs2" aria-labelledby="lacs2" data-dojo-type="dijit/form/Select" style="color:red;width:60px;" disabled>
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lacs3">error</legend>
+					<select id="acs3" aria-labelledby="lacs3" data-dojo-type="dijit/form/Select" class="dijitError dijitSelectError dijitValidationTextBoxError" style="color:red;width:60px;" data-dojo-props="required:true">
+						<option data-dojo-value=""></option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lacs4">hover</legend>
+					<select id="acs4" aria-labelledby="lacs5" data-dojo-type="dijit/form/Select" class="dijitHover dijitSelectHover" style="color:red;width:60px;">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lacs5">focused</legend>
+					<select id="acs5" aria-labelledby="lacs5" data-dojo-type="dijit/form/Select" class="dijitFocused dijitSelectFocused" style="color:red;width:60px;">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lacs6">RTL</legend>
+					<select id="acs6" aria-labelledby="lacs6" data-dojo-type="dijit/form/Select" dir="rtl" style="color:red;width:60px;">
+						<option data-dojo-value="1">1</option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lacs7">RTL error</legend>
+					<select id="acs7" aria-labelledby="lacs7" data-dojo-type="dijit/form/Select" class="dijitError dijitSelectError dijitValidationTextBoxError" style="color:red;width:60px;" dir="rtl" data-dojo-props="required:true">
+						<option data-dojo-value=""></option>
+						<option data-dojo-value="2">2</option>
+					</select>
+				</fieldset>
+				<fieldset class="area customStyled">
+					<legend id="lacs8">styled option</legend>
+					<span id="acs8" aria-labelledby="lacs8" data-dojo-type="dijit/form/Select" style="color:red;width:120px;">
+						<span data-dojo-value="1"><span style="font-size:200%;color:pink;">Large</span></span>
+						<span data-dojo-value="2">2</span>
+					</span>
+				</fieldset>
+			</fieldset>
+		</fieldset>
+
+		<h4 class="testSubtitle">Toolbar</h4>
+		<input id="beforeToolbar">
+		<div data-dojo-type="dijit/Toolbar">
+			<button type="button" data-dojo-type="dijit/form/ToggleButton" id="toggle1">
+				toggle 1
+			</button>
+			<select id="toolbarSelect" data-dojo-id="s14" data-dojo-type="dijit/form/Select"
+					name="s14" style="width: 150px;" required="true">
+				<option>&nbsp;</option>
+				<option value="AL">Alabama</option>
+				<option value="AK">Alaska</option>
+				<option></option>
+				<option value="AZ">Arizona</option>
+				<option value="AR">Arkansas</option>
+				<option></option>
+				<option value="CA">California</option>
+			</select>
+			<button type="button" data-dojo-type="dijit/form/ToggleButton" id="toggle2">
+				toggle 2
+			</button>
+		</div>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_SimpleTextarea.html b/src/main/resources/static/dijit/tests/form/test_SimpleTextarea.html
new file mode 100644
index 0000000000000000000000000000000000000000..919cab2d2e1005c9bfea0fe1b8eeefa2f07c36e8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_SimpleTextarea.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Testing SimpleTextArea | The Dojo Toolkit</title>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../css/dijitTests.css";
+		</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+
+	<!-- only needed for alternate theme testing: -->
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.SimpleTextarea");
+
+		// needed for tests
+		dojo.require("dijit.layout.BorderContainer");
+	</script>
+</head>
+
+<body class="claro" style="padding:20px" role="main">
+
+		<h1 class="testTitle">SimpleTextarea</h1>
+
+		<p>
+			This is a simple text area that doesn't automatically size itself according to it's content.
+			It can be used inside layout containers.
+		</p>
+
+		<h2><label for="ta1">Plain textarea (rows=5, cols=50), selectOnClick=true</label></h2>
+		<textarea id="ta1" data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props='name:"ta1", rows:"5", cols:"50",
+			onFocus:function(){ console.log("user focus handler") },
+			onBlur:function(){ console.log("user blur handler") },
+			onChange:function(val){ dojo.byId("oc1").value = "" + val; },
+			selectOnClick:true
+		'>
+			shichashaw, textarea text baw.
+		</textarea>
+		<label for="oc1">onChange:</label><textarea id="oc1" rows="6" cols="50" disabled >not fired yet!</textarea>
+		<span style='white-space:nowrap;'>
+		<button id="resetButton" onclick="dijit.byId('ta1').reset();">reset</button>
+		<button id="setNullButton" onclick="dijit.byId('ta1').set('value', null);">set value to null</button>
+		<button id="getValueButton" onclick="dojo.byId('gv1').value=''+dijit.byId('ta1').get('value');">get value</button>
+		<textarea id="gv1" rows="6" cols="50" disabled aria-label="hi">no value yet!</textarea>
+		</span>
+
+
+		<h2><label for="ta2">Plain textarea with style="height: 300px; width: 300px" rows="" cols=""</label></h2>
+		<textarea id="ta2" data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props='name:"ta2",
+			style:{height:"300px", width:"300px"}, rows:"", cols:""'>I have a style setting rather than rows/cols setting</textarea>
+
+		<h2>In a BorderContainer</h2>
+
+		<div id="container" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='style:{width:"500px", height:"400px", border:"inset gray 3px"}'>
+			<textarea id="top" data-dojo-type="dijit/form/SimpleTextarea" aria-label="top" data-dojo-props='name:"top", region:"top", splitter:true, style:{height:"100px"}'>
+				This is just some text in the top region.
+			</textarea>
+			<textarea id="left" data-dojo-type="dijit/form/SimpleTextarea" aria-label="left" data-dojo-props='name:"left", region:"left", splitter:true, style:{width:"200px"}'>
+				This is just some text in the left region.
+			</textarea>
+			<textarea id="center" data-dojo-type="dijit/form/SimpleTextarea" aria-label="center" data-dojo-props='name:"center", region:"center"'>
+				This is just some text in the center region.
+			</textarea>
+			<textarea id="right" data-dojo-type="dijit/form/SimpleTextarea" aria-label="right" data-dojo-props='name:"right", region:"right", splitter:true, style:{width:"200px"}'>
+				This is just some text in the right region.
+			</textarea>
+			<textarea id="bottom" data-dojo-type="dijit/form/SimpleTextarea" aria-label="bottom" data-dojo-props='name:"bottom", region:"bottom", splitter:true, style:{height:"100px"}'>
+				This is just some text in the bottom region.
+			</textarea>
+		</div>
+
+		<script>
+			function setAttr(attr, value){
+				dijit.registry.byClass('dijit.form.SimpleTextarea').forEach(function(widget){ widget.set(attr, value);});
+			}
+		</script>
+		<input type="button" onclick="setAttr('readOnly', false);" value="Remove readOnly"/>
+		<input type="button" onclick="setAttr('readOnly', true);" value="Set readOnly"/>
+		<input type="button" onclick="setAttr('disabled', true);" value="Disable"/>
+		<input type="button" onclick="setAttr('disabled', false);" value="Enable"/>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_Slider.html b/src/main/resources/static/dijit/tests/form/test_Slider.html
new file mode 100644
index 0000000000000000000000000000000000000000..9ef8ab302d8bd8b2c2c32d83923117665fd7117c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_Slider.html
@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Dojo Slider Widget Demo</title>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../css/dijitTests.css";
+			@import "../../../util/doh/robot/robot.css";
+			#slider2 .dijitButtonNode {
+				width:12px;
+				height:12px;
+				border: none;
+				font-size:11px;
+				padding:0;
+			}
+		</style>
+
+		<script type="text/javascript" src="../boilerplate.js"></script>
+
+		<script type="text/javascript">
+			var registry, dom;
+			require([
+				"dojo/dom",
+				"dojo/parser",
+				"dijit/registry",
+
+				// used by parser
+				"dijit/form/Button",
+				"dijit/form/HorizontalSlider",
+				"dijit/form/VerticalSlider",
+				"dijit/form/HorizontalRule",
+				"dijit/form/VerticalRule",
+				"dijit/form/HorizontalRuleLabels",
+				"dijit/form/VerticalRuleLabels",
+				"dojo/domReady!"
+			], function(dm, parser, rgstry){
+					// used by event handlers
+					dom = dm;
+					registry = rgstry;
+
+					parser.parse();
+			});
+		</script>
+	</head>
+
+	<body role="main">
+		<h1 class="testTitle">Slider</h1>
+		Also try using the arrow keys, buttons, or clicking on the progress bar to move the slider.
+		<br>
+		<!--    to test form submission, you'll need to create an action handler similar to
+			http://www.utexas.edu/teamweb/cgi-bin/generic.cgi -->
+		<form id="form1" action="" name="example" method="post">
+
+		<h2>Horizontal Slider Example</h2>
+		initial value=10, min=0, max=100, pageIncrement=100, onChange event triggers input box value change immediately<br>
+		<div id="slider1" data-dojo-type="dijit/form/HorizontalSlider" aria-label="slider 1" data-dojo-props='name:"horizontal1",
+			onChange:function(val){ dom.byId("slider1input").value=dojo.number.format(val/100,{places:1,pattern:"#%"}); },
+			value:10,
+			maximum:100,
+			minimum:0,
+			pageIncrement:100,
+			showButtons:true,
+			intermediateChanges:true,
+			slideDuration:500,
+			style:{width:"50%", height:"20px"}
+			'>
+				<ol data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='container:"topDecoration", style:{height:"1.2em",fontSize:"75%"}, count:6, numericMargin:1'></ol>
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"topDecoration", count:6, style:{height:"5px"}'></div>
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"bottomDecoration", count:5, style:{height:"5px"}'></div>
+				<ol data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='container:"bottomDecoration", style:{height:"1em",fontSize:"75%"}'>
+					<li>lowest</li>
+					<li>normal</li>
+					<li>highest</li>
+				</ol>
+		</div>
+
+		<label for="slider1input">Slider1 Value:</label><input readonly id="slider1input" size="4" value="10.0%"/>
+		<br>
+		<button id="disableButton" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("slider1").set("disabled", true);registry.byId("disableButton").set("disabled",true);registry.byId("enableButton").set("disabled",false); }'>Disable previous slider</button>
+		<button id="enableButton" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("slider1").set("disabled",false);registry.byId("disableButton").set("disabled",false);registry.byId("enableButton").set("disabled", true); }, disabled:true'>Enable previous slider</button>
+
+		<h2>Vertical Slider Example</h2>
+		initial value=10, min=0, max=100, onChange event triggers input box value change when you mouse up or tab away<br>
+		<div id="slider2" data-dojo-type="dijit/form/VerticalSlider" data-dojo-props='name:"vertical1",
+			onChange:function(val){ dom.byId("slider2input").value = val; },
+			value:10,
+			maximum:100,
+			minimum:0,
+			discreteValues:11,
+			"aria-label":"slider 2",
+			style:{height:"300px"}
+			'>
+				<ol data-dojo-type="dijit/form/VerticalRuleLabels" data-dojo-props='container:"leftDecoration", style:{width:"2em"}, labelStyle: document.documentElement.dir=="rtl" ? "left:3px;" : "right:3px;"'>
+					<li>0</li>
+					<li>100</li>
+				</ol>
+				<div data-dojo-type="dijit/form/VerticalRule" data-dojo-props='container:"leftDecoration", count:11, style:{width:"5px"}, ruleStyle:"border-color: #888"'></div>
+				<div data-dojo-type="dijit/form/VerticalRule" data-dojo-props='container:"rightDecoration", count:11, style:{width:"5px"}, ruleStyle:"border-color: #888"'></div>
+				<ol data-dojo-type="dijit/form/VerticalRuleLabels" data-dojo-props='container:"rightDecoration", style:{width:"2em"}, count:6, numericMargin:1, maximum:100, constraints:{pattern:"#"}'></ol>
+		</div>
+		<label for="slider2input">Slider2 Value:</label><input readonly id="slider2input" size="3" value="10"/>
+
+		<h2>Fancy HTML labels (no slide animation):</h2>
+		<div id="slider3" data-dojo-type="dijit/form/HorizontalSlider" aria-label="slider 3" data-dojo-props='name:"horizontal2",
+			title:"Fancy HTML Labels",
+			minimum:1,
+			value:2,
+			maximum:3,
+			discreteValues:3,
+			showButtons:false,
+			intermediateChanges:true,
+			slideDuration:0,
+			style:"width:300px; height: 40px;"
+			'>
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"bottomDecoration", count:3, style:{height:"5px"}'></div>
+				<ol data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='container:"bottomDecoration", style:{height:"1em", fontSize:"75%"}'>
+					<li><img width=10 height=10 alt="small" src="../images/note.gif"/><br><span style="font-size: small">small</span></li>
+					<li><img width=15 height=15 alt="medium" src="../images/note.gif"/><br><span style="font-size: medium">medium</span></li>
+					<li><img width=20 height=20 alt="large" src="../images/note.gif"/><br><span style="font-size: large">large</span></li>
+				</ol>
+		</div>
+		<br><br>
+
+		<h2>Standalone ruler example:</h2>
+
+		<div style="width:2in;border-top:1px solid black;">
+			<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='count:17, style:{height:".4em"}'></div>
+			<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='count:9, style:{height:".4em"}'></div>
+			<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='count:5, style:{height:".4em"}'></div>
+			<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='count:3, style:{height:".4em"}'></div>
+			<ol data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='labelStyle:"font-style:monospace;fontSize:.7em;margin:-1em 0px 0px -.35em;"'>
+				<li></li>
+				<li>1</li>
+				<li>2</li>
+			</ol>
+		</div>
+
+		<h2>Horizontal, with buttons, disabled (to show styling):</h2>
+
+		<div id="sliderH2" aria-label="horizontal slider 2" data-dojo-type="dijit/form/HorizontalSlider" data-dojo-props='name:"horizontalH2",
+			onChange:function(val){ dom.byId("slider1input").value = val; },
+			value:10,
+			maximum:100,
+			minimum:0,
+			disabled:true,
+			showButtons:true,
+			intermediateChanges:true,
+			style:{width:"50%", height:"20px"}
+			'>
+				<ol data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='container:"topDecoration", style:{height:"1.2em", fontSize:"75%"}, count:7, constraints:{pattern:"#.00%"}'></ol>
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"topDecoration", count:7, style:"height:5px;"'></div>
+				<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"bottomDecoration", count:5, style:"height:5px;"'></div>
+				<ol data-dojo-type="dijit/form/HorizontalRuleLabels" data-dojo-props='container:"bottomDecoration", style:{height:"1em", fontSize:"75%"}'>
+					<li>lowest</li>
+					<li>normal</li>
+					<li>highest</li>
+				</ol>
+		</div>
+
+
+		<script>
+		// so robot can get to it easily
+		document.displayData=function(){
+			var f = document.getElementById("form1");
+			var s = "";
+			for(var i = 0; i < f.elements.length; i++){
+				var elem = f.elements[i];
+				if(elem.nodeName.toLowerCase() == "button" || elem.type=="submit" || elem.type=="button")  { continue; }
+				s += elem.name + ": " + elem.value + "\n";
+			}
+			return s;
+		}
+		</script>
+
+		<div>
+			<button name="button" onclick="alert(displayData()); return false;">view data</button>
+			<input type="submit" name="submit" />
+		</div>
+
+		</form>
+
+		<h2>Fractional Slider Example</h2>
+		initial value=0.28, min=0, max=2, onChange event triggers input box value change when you mouse up or tab away<br><br>
+		<div id="fractionalSlider" data-dojo-type="dijit/form/HorizontalSlider" data-dojo-props='
+			onChange:function(val){ dom.byId("fractionalSliderInput").value = val; },
+			value:0.28,
+			maximum:2,
+			minimum:0,
+			discreteValues:101,
+			"aria-label":"fractional slider",
+			style:{width:"357px"}
+			'>
+			<div data-dojo-type="dijit/form/HorizontalRule" data-dojo-props='container:"bottomDecoration", count:101, style:{height:"5px"}'></div>
+		</div>
+		<label for="fractionalSliderInput">Fractional Slider Value:</label><input readonly id="fractionalSliderInput" size="10" value="0.28"/>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_Spinner.html b/src/main/resources/static/dijit/tests/form/test_Spinner.html
new file mode 100644
index 0000000000000000000000000000000000000000..e21ed13a26282f88eb431d7d2133455bae9781f9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_Spinner.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Dojo Spinner Widget Test</title>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../css/dijitTests.css";
+			@import "../../../util/doh/robot/robot.css";
+
+			body .bigFont {
+			        font-size: larger; /* help test widget sizing */
+			}
+
+		</style>
+
+		<!-- required: the default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+
+		<!-- only needed for alternate theme testing: -->
+		<script type="text/javascript" src="../_testCommon.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.dijit"); // optimize: load dijit layer
+			dojo.require("dijit.form.NumberSpinner");
+			dojo.require("dojo.parser"); // scan page for widgets
+		</script>
+
+	</head>
+
+	<body class="claro" role="main">
+		<h1 class="testTitle">Dijit Spinner Test</h1>
+			Try typing values, and use the up/down arrow keys and/or the arrow push
+			buttons to spin
+			<br>
+		<form id="form1" action="" name="example" method="post">
+			<h1>number spinner</h1>
+			<br>
+			initial value=900, no delta specified, no min specified, max=1550, onChange captured, big font<br>
+			<label for="integerspinner1">Spinbox #1: </label><br>
+			<input id="integerspinner1" data-dojo-type="dijit/form/NumberSpinner"
+				data-dojo-props='onChange:function(val){ dojo.byId("oc1").value = val; },
+				value:900,
+				"class":"bigFont",
+				constraints:{max:1550,places:0},
+				name:"integerspinner1"
+				'/>
+			<label for="oc1">onChange:</label><input id="oc1" disabled value="not fired yet!" autocomplete="off"/>
+			<input type="button" id="sv1_1" value="Set value to 400" onClick="dijit.byId('integerspinner1').set('value',400)" tabIndex="-1"/>
+			<input type="button" id="sv1_2" value="Set value to null" onClick="dijit.byId('integerspinner1').set('value',null)" tabIndex="-1"/>
+			<input type="button" id="sv1_3" value="Set required to false" onClick="dijit.byId('integerspinner1').set('required',false)" tabIndex="-1"/>
+			<input type="button" id="sv1_4" value="Set required to true" onClick="dijit.byId('integerspinner1').set('required',true)" tabIndex="-1"/>
+			<br>
+			<br>
+			initial value=1000, delta=10, min=9 max=1550<br>
+			<label for="integerspinner2">Spinbox with custom styling (width=50%, 200% Courier font): </label>
+			<input id="integerspinner2" data-dojo-type="dijit/form/NumberSpinner"
+				data-dojo-props='style:{fontSize:"200%", fontFamily:"Courier", border:"1px solid blue", width:"50%"},
+				value:1000,
+				smallDelta:10,
+				largeDelta:100,
+				constraints:{min:9,max:1550,places:0},
+				style:{ textAlign: "right" },
+				name:"integerspinner2"
+				'/>
+			<br>
+			<br>
+			<label for="integertextbox3">Spinner line break test: </label>initial value not specified, delta not specified, min not specified, max not specified, signed not specified, separator not specified<br>
+			[verify no line break just after this text]
+			<input id="integertextbox3" data-dojo-type="dijit/form/NumberSpinner" data-dojo-props='name:"integertextbox3" '/>
+			[verify no line break just before this text]
+			<br>
+			<br>
+			Move the cursor left and right within the input field to see the effect on the spinner.
+			<br>
+			initial value=+1.0, smalldelta=0.1, largedelta=1.0, min=-10.9, max=155, places=1, maxLength=20, exponent=false<br>
+			<label for="realspinner1">Real Number Spinbox #1: </label><br>
+			<input id="realspinner1" data-dojo-type="dijit/form/NumberSpinner"
+				data-dojo-props='value:1.0,
+				smallDelta:0.1,
+				largeDelta:1.0,
+				constraints:{min:-10.9,max:155,places:1,round:true,exponent:false},
+				maxLength:"20",
+				name:"realspinner1"
+				'/>
+			<br>
+
+			<p>
+			<label for="spinnerMinOnly">Spinner with no maximum, 1 decimal place: </label><br>
+			<input id="spinnerMinOnly" data-dojo-type="dijit/form/NumberSpinner"
+				data-dojo-props='value:1.0,
+				smallDelta:0.1,
+				largeDelta:1.0,
+				constraints:{min:-10.9,places:1,round:false},
+				maxLength:"20",
+				name:"spinnerMinOnly"
+				'/>
+			<input type="button" onclick="dijit.byId('spinnerMinOnly').set('readOnly',false);" value="Remove readOnly"/>
+			<input type="button" onclick="dijit.byId('spinnerMinOnly').set('readOnly',true);" value="Set readOnly"/>
+			<input type="button" onclick="dijit.byId('spinnerMinOnly').set('disabled',false);" value="Remove disabled"/>
+			<input type="button" onclick="dijit.byId('spinnerMinOnly').set('disabled',true);" value="Set disabled"/>
+			</p>
+			<p>
+			<script type="text/javascript">
+				// so robot can get to it easily
+				document.displayData=function(){
+					var f = document.getElementById("form1");
+					var s = "";
+					for(var i = 0; i < f.elements.length; i++){
+						var elem = f.elements[i];
+						if(elem.nodeName.toLowerCase() == "button" || elem.type=="submit" || elem.type=="button")  { continue; }
+						s += elem.name + ": " + elem.value + "\n";
+					}
+					return s;
+				}
+			</script>
+
+			<div>
+				<button name="button" onclick="alert(document.displayData()); return false;">view data</button>
+				<input type="submit" name="submit" />
+			</div>
+		</form>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_Textarea.html b/src/main/resources/static/dijit/tests/form/test_Textarea.html
new file mode 100644
index 0000000000000000000000000000000000000000..51b1a9825ba19d56d1d271085c89fd2dd8c3359d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_Textarea.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<!-- IE8 beta 2 incorrectly sets TEXTAREA scrollHeight when using strict DTD -->
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Dojo dijit.form.Textarea Widget Test</title>
+
+		<style type="text/css">
+			br { margin-bottom: 4em; }
+		</style>
+
+		<script type="text/javascript" src="../boilerplate.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"dojo/dom", "dojo/_base/lang", "dojo/parser",
+				"dijit/registry", "dijit/form/Textarea", "dijit/layout/ContentPane", "dijit/layout/TabContainer",
+				"dojo/domReady!"
+			], function(dom, lang, parser, registry, Textarea){
+				parser.parse();
+
+				programmaticTextarea = new Textarea({
+					id: "programmatic",
+					name: "programmaticTextArea",
+					cols: "70",
+					value: "created programatically with\ncustom border, padding,\nmargin",
+					style: {display:"block", border:"5px solid gray", padding:"11px", margin:"7px", fontSize:"14px", minHeight:"49px", maxHeight:"125px"}
+				});
+				setTimeout(function(){ programmaticTextarea.placeAt("programmaticContainer").startup(); }, 500); // make sure sizing can happen later
+
+				displayData = function(){
+					var f = dom.byId("form1");
+					var s = "";
+					for(var i = 0; i < f.elements.length; i++){
+						var elem = f.elements[i];
+						if(elem.name == "button" || !lang.isString(elem.value)){ continue; }
+						s += elem.name + ":[" + elem.value + "]\n";
+					}
+					console.log(s);
+				};
+
+				setAttr = function(attr, value){
+					var widgets = registry.findWidgets(document.body);
+					for(var i = 0 ; i < widgets.length; i++){
+						if(widgets[i].isInstanceOf(Textarea)){
+							widgets[i].set(attr, value);
+						}
+					}
+				}
+			});
+		</script>
+
+	</head>
+	<body role="main">
+
+		<script type="dojo/require">
+			dom: "dojo/dom"
+		</script>
+
+		<h1 class="testTitle">Auto-sizing Textarea Widget Test</h1>
+
+		<!--    to test form submission, you'll need to create an action handler similar to
+		        http://www.utexas.edu/teamweb/cgi-bin/generic.cgi -->
+		<form id="form1" action="" name="example" method="GET">
+			<fieldset class="dijitReset" style="width:800px;">
+			<legend>Various dijit.form.Textarea widgets</legend>
+			<label for="blank">dijit.form.Textarea, initially blank:</label>
+			<textarea id="blank" data-dojo-type="dijit/form/Textarea" data-dojo-props='style:{ fontSize:"24px" }'></textarea>
+			<br>
+
+			<label for="simple">dijit.form.Textarea, inline with maxLength=50:</label>
+			<textarea id="simple" data-dojo-type="dijit/form/Textarea" data-dojo-props='name:"simpleTextArea", maxLength:"50", style:{width:"33%"},
+	         		onChange:function(val){ dom.byId("ocSimple").value = val; },
+	         		onFocus:function(){ console.log("user focus handler"); },
+	         		onBlur:function(){ console.log("user blur handler"); }
+				'>this is a very simple resizable text area</textarea>
+			<label for="ocSimple">onChange:</label><textarea id="ocSimple" readOnly>not fired yet!</textarea>
+			<br>
+
+			<label for="plain">Native HTML textarea, for comparison: </label><textarea name="plainTextArea" id="plain" rows="3">
+				this is a native text area
+				for comparison
+			</textarea>
+			<br>
+
+			<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='persist:true, tabStrip:true, style:{width:"800px", fontSize:"14px", height:"17em"}, "aria-label":"tabContainer"'>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1", "aria-label":"contentpane"'>
+					<label for="programmatic">dijit.form.Textarea in TabContainer, programmatically created with custom styling:</label>
+					<div id="programmaticContainer"></div>
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+					<input type="button" onclick="programmaticTextarea.set('value', 'new value for programmatic textarea\nmore text for testing\nmore\neven more\nvery last line');" value="change value"/>
+				</div>
+			</div>
+			</fieldset>
+			<br>
+
+
+			<label for="largeTextArea">dijit.form.Textarea, initially full:</label>
+<!--	&#8234; and &#8236; are inserted solely for testing purposes to mark the beginning and end of left-to-right text so that 
+	cogniscent browsers don't render garbled punctuation nor exhibit strange home/end key behavior while in right-to-left mode -->
+			<textarea id="largeTextArea" data-dojo-type="dijit/form/Textarea" data-dojo-props='name:"largeTextArea", style:{ width:"90%" }'>
+&#8234;This is a textarea with a LOT of content.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla &#8234;facilisi.&#8236;
+
+&#8234;This is the end.&#8236;</textarea>
+
+			<h2>Set properties for every dijit.form.Textarea</h2>
+			<input type="button" onclick="setAttr('readOnly', false);" value="Remove readOnly"/>
+			<input type="button" onclick="setAttr('readOnly', true);" value="Set readOnly"/>
+			<input type="button" onclick="setAttr('disabled', true);" value="Disable"/>
+			<input type="button" onclick="setAttr('disabled', false);" value="Enable"/>
+
+			<h2>Submit page as form</h2>
+			<div>
+				<button type="button" name="button" onclick="displayData();">view data</button>
+				<input type="submit" name="submit" />
+			</div>
+		</form>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_TimeTextBox.html b/src/main/resources/static/dijit/tests/form/test_TimeTextBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..e73bc4686740f5e5f60573d653ca80823f13c793
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_TimeTextBox.html
@@ -0,0 +1,209 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Test TimeTextBox Widget</title>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../css/dijitTests.css";
+
+			.testExample {
+				background-color:#fbfbfb;
+				padding:1em;
+				margin-bottom:1em;
+				border:1px solid #bfbfbf;
+			}
+
+			.noticeMessage {
+				color:#093669;
+				font-size:0.95em;
+				margin-left:0.5em;
+			}
+
+			.dojoTitlePaneLabel label {
+				font-weight:bold;
+			}
+
+			.dijitDownArrowActive,
+			.dijitUpArrowActive {
+				opacity:0.5 !important; /* just to test effect of clicking the up or down arrows */
+			}
+		</style>
+
+		<!-- required: the default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+
+		<!-- only needed for alternate theme testing: -->
+		<script type="text/javascript" src="../_testCommon.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.form.TimeTextBox");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+
+			formValue = null;
+	
+			function displayData(){
+				var f = document.getElementById("form1");
+				var s = "";
+				for(var i = 0; i < f.elements.length; i++){
+						var elem = f.elements[i];
+						if(elem.name == "button")  { continue; }
+						s += elem.name + ": " + elem.value + "\n";
+				}
+				console.log(s);
+				formValue = s;
+			}
+		</script>
+	</head>
+
+	<body class="claro" role="main">
+		<h1 class="testTitle">Test TimeTextBox Widget</h1>
+		<!--
+			To really test form submission, you'll need to create an action handler similar to
+			http://www.utexas.edu/teamweb/cgi-bin/generic.cgi.   This just logs the form values
+			to the console.
+		 -->
+		<form id="form1" action="" name="example" method="GET" onsubmit="displayData(); return false;">
+
+			<div>
+				<input type="submit" name="submit" value="fake submit"/>
+			</div>
+			<br/>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q1">Time using local conventions with seconds</label>
+				<span class="noticeMessage">TimeTextBox class,
+					Attributes: {formatLength:'medium'}</span>
+			</div>
+			<div class="testExample">
+				<input id="q1" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1", value:"T17:45:00",
+					constraints:{formatLength:"medium"},
+					required:true,
+					onChange:function(val){ dojo.byId("oc1").value = val; },
+					invalidMessage:"Invalid time." '/>
+				<label for="oc1">onChange:</label><input id="oc1" size="34" disabled value="not fired yet!" autocomplete="off"/>
+			</div>
+		
+			<div class="dojoTitlePaneLabel">
+				<label for="q2">Time using local conventions without seconds, required, no invalid message tooltip</label>
+				<span class="noticeMessage">TimeTextBox class,
+					Attributes: {formatLength:'short'}</span>
+			</div>
+			<div class="testExample">
+				<input id="q2" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1a", value:"T17:45:00",
+					constraints:{formatLength:"short"},
+					required:true,
+					invalidMessage:"" '/>
+			</div>
+		
+			<div class="dojoTitlePaneLabel">
+				<label for="q3"> 12 Hour Time </label>
+				<span class="noticeMessage">TimeTextBox class,
+					Attributes: {timePattern:'h:mm:ss a'}</span>
+			</div>
+			<div class="testExample">
+				<input id="q3" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time1b", value:"T17:45:00",
+					constraints:{timePattern:"h:mm:ss a"},
+					required:true,
+					invalidMessage:"Invalid time." '/>
+			</div>
+		
+			<div class="dojoTitlePaneLabel">
+				<label for="q4"> 24 Hour Time</label>
+				<span class="noticeMessage">TimeTextBox class,
+					Attributes: {timePattern:'HH:mm:ss'}</span>
+			</div>
+			<div class="testExample">
+				<input id="q4" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time2", value:"T17:45:00",
+					constraints:{timePattern:"HH:mm:ss"},
+					required:true,
+					invalidMessage:"Invalid time. Use HH:mm:ss where HH is 00 - 23 hours."'/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q6">Initially empty time text box</label>
+				<span class="noticeMessage">TimeTextBox class,
+					Attributes: {formatLength:'medium',min:'T00:00:00',max:'T12:00:00'}</span>
+			</div>
+			<div class="testExample">
+				<input id="q6" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"time6",
+					constraints:{formatLength:"medium",min:"T00:00:00",max:"T12:00:00"},
+					required:true,
+					onChange:function(val){ dojo.byId("oc6").value = val; },
+					invalidMessage:"Invalid time." '/>
+				<label for="oc6">onChange:</label><input id="oc6" size="34" disabled value="not fired yet!" autocomplete="off"/>
+			</div>
+			<div class="dojoTitlePaneLabel">
+				<strong>Using title attribute for label.</strong>
+				<span class="noticeMessage">TimeTextBox class,
+					Attributes: {formatLength:'short'} Time using local conventions without seconds, required, no invalid message tooltip</span>
+			</div>
+			<div class="testExample">
+				<input id="q20" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='type:"text", name:"q20", value:"T17:45:00",
+					title:"title: Time using local conventions",
+					constraints:{formatLength:"short"},
+					required:true,
+					invalidMessage:"" '/>
+			</div>
+			<div class="dojoTitlePaneLabel">
+				<strong>Ticket #18201</strong>
+				<span class="noticeMessage">Ensure that Date values can used with TimeTextBoxes</span>
+			</div>
+			<div class="testExample">
+				<input id="q21"/>
+				<script type="text/javascript">
+				require(["dijit/form/TimeTextBox", "dojo/domReady!"], function(TimeTextBox){
+					new TimeTextBox({name: "q21", value: new Date(),
+						constraints: {
+							timePattern: 'HH:mm a',
+							clickableIncrement: 'T00:15:00',
+							visibleIncrement: 'T00:15:00',
+							visibleRange: 'T01:00:00'
+						}
+					}, "q21").startup();
+			  });
+				</script>
+			</div>
+			<div class="dojoTitlePaneLabel">
+				<label for="q22">TimeTextBox with dropdown from 9AM - 5PM</label>
+				<span class="noticeMessage">TimeTextBox class,
+					Attributes: {formatLength:"medium",
+						pickerMin: "T09:00:00",
+						clickableIncrement: "T01:00:00",
+						pickerMax: "T17:00:00"}</span>
+			</div>
+			<div class="testExample">
+				<input id="q22" data-dojo-type="dijit/form/TimeTextBox"
+					data-dojo-props='
+					type:"text",
+					name:"time22",
+					value:"T9:45:00",
+					constraints:{
+						formatLength:"medium",
+						pickerMin: "T09:00:00",
+						clickableIncrement: "T01:00:00",
+						pickerMax: "T17:00:00"
+					},
+					required:true,
+					onChange:function(val){ dojo.byId("oc22").value = val; },
+					invalidMessage:"Invalid time." '/>
+				<label for="oc22">onChange:</label><input id="oc22" size="34" disabled value="not fired yet!" autocomplete="off"/>
+			</div>
+		</form>
+		<input id="ro" type="button" onclick="dijit.byId('q20').set('readOnly',true);" value="Set readOnly" tabIndex="-1"/>
+		<input id="rw" type="button" onclick="dijit.byId('q20').set('readOnly',false);" value="Clear readOnly" tabIndex="-1"/>
+		<input id="disable" type="button" onclick="dijit.byId('q20').set('disabled',true);" value="Disable" tabIndex="-1"/>
+		<input id="enable" type="button" onclick="dijit.byId('q20').set('disabled',false);" value="Enable" tabIndex="-1"/>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_validStatePerformance.html b/src/main/resources/static/dijit/tests/form/test_validStatePerformance.html
new file mode 100644
index 0000000000000000000000000000000000000000..0aab07b1681703c25aae7490867e0c81dee3287a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_validStatePerformance.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <title>Performance Test of NumberTextBox</title>
+
+    <style type="text/css">
+      @import "../../themes/claro/document.css";
+      @import "../css/dijitTests.css";
+    </style>
+
+    <!-- required: the default dijit theme: -->
+    <link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+    <!-- required: dojo.js -->
+    <script type="text/javascript" src="../../../dojo/dojo.js"
+      data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+
+    <!-- only needed for alternate theme testing: -->
+    <script type="text/javascript" src="../_testCommon.js"></script>
+
+    <script type="text/javascript">
+      dojo.require("dijit.dijit"); // optimize: load dijit layer
+      dojo.require("dijit.form.TextBox");
+      dojo.require("dijit.form.ValidationTextBox");
+      dojo.require("dijit.form.NumberTextBox");
+      dojo.require("dijit.form.Form");
+      dojo.require("dojo.parser");  // scan page for widgets and instantiate them
+    </script>
+
+  </head>
+
+  <body class="claro" role="main">
+    <script>
+      function performancetest(){
+        console.log("Dojo version " + dojo.version);
+        var startTime1 = (new Date()).getTime();
+        dijit.byId("form1").reset();
+        console.log("Time 1: Reset form with NumberTextBox-fields: " + ((new Date()).getTime() - startTime1) + " millis");
+
+        var startTime2 = (new Date()).getTime();
+        dijit.byId("form2").reset();
+        console.log("Time 2: Reset form with ValidationTextBox-fields: " + ((new Date()).getTime() - startTime2) + " millis");
+
+        var startTime3 = (new Date()).getTime();
+		var i, w;
+        for(i = 1; i <= 20; i++){
+			w = dijit.byId("input1_" + i);
+			if(dojo.version.major == 1 && dojo.version.minor == 2){
+			  w.set("value", i);
+			}else{
+			  w.set("value", i);
+			}
+		}
+		console.log("Time 3: Inserting value into NumberTextBox-fields: " + ((new Date()).getTime() - startTime3) + " millis");
+
+        var startTime4 = (new Date()).getTime();
+        for(i = 1; i <= 20; i++){
+			w = dijit.byId("input2_" + i);
+			if(dojo.version.major == 1 && dojo.version.minor == 2){
+			  w.set("value", i);
+			}else{
+			  w.set("value", i);
+			}
+		}
+		console.log("Time 4: Inserting value into ValidationTextBox-fields: " + ((new Date()).getTime() - startTime4) + " millis");
+      }
+    </script>
+      <form id="form1" data-dojo-type="dijit/form/Form" data-dojo-props='action:"", method:""'>
+      <input id="input1_1" aria-label="input1_1" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_2" aria-label="input1_2" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_3" aria-label="input1_3" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_4" aria-label="input1_4" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_5" aria-label="input1_5" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_6" aria-label="input1_6" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_7" aria-label="input1_7" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_8" aria-label="input1_8" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_9" aria-label="input1_9" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_10" aria-label="input1_10" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_11" aria-label="input1_11" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_12" aria-label="input1_12" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_13" aria-label="input1_13" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_14" aria-label="input1_14" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_15" aria-label="input1_15" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_16" aria-label="input1_16" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_17" aria-label="input1_17" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_18" aria-label="input1_18" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_19" aria-label="input1_19" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input1_20" aria-label="input1_20" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      </form>
+      <br/>
+      <form id="form2" data-dojo-type="dijit/form/Form" data-dojo-props='action:"", method:""'>
+      <input id="input2_1" aria-label="input2_1" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_2" aria-label="input2_2" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_3" aria-label="input2_3" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_4" aria-label="input2_4" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_5" aria-label="input2_5" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_6" aria-label="input2_6" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_7" aria-label="input2_7" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_8" aria-label="input2_8" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_9" aria-label="input2_9" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_10" aria-label="input2_10" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_11" aria-label="input2_11" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_12" aria-label="input2_12" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_13" aria-label="input2_13" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_14" aria-label="input2_14" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_15" aria-label="input2_15" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_16" aria-label="input2_16" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_17" aria-label="input2_17" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_18" aria-label="input2_18" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_19" aria-label="input2_19" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      <input id="input2_20" aria-label="input2_20" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props='name:"input1", maxLength:"6", type:"text" '/>
+      </form>
+      <br/>
+      <button name="button" onclick="performancetest()">Run tests</button>
+  </body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_validate.html b/src/main/resources/static/dijit/tests/form/test_validate.html
new file mode 100644
index 0000000000000000000000000000000000000000..20e775e4aa8ddfa0c6266fa6e5bc5f1cda413d1f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_validate.html
@@ -0,0 +1,982 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Test TextBox Validation Widgets</title>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../css/dijitTests.css";
+
+			.testExample {
+				background-color:#fbfbfb;
+				padding:1em;
+				margin-bottom:1em;
+				border:1px solid #bfbfbf;
+			}
+
+			body .small {
+				width: 3em;
+			}
+			body .medium {
+				width: 10em;
+			}
+			body .long {
+				width: 20em;
+			}
+			body .verylong {
+				width: 90%;
+			}
+
+			.noticeMessage {
+				color:#093669;
+				font-size:0.95em;
+				margin-left:0.5em;
+			}
+
+			.dojoTitlePaneLabel label {
+				font-weight:bold;
+			}
+			#widget_q26 .dijitInputField {
+				padding:10px !important;
+			}
+
+			.monospace .dijitTextBox {
+				font-family: monospace;
+			}
+
+			.sans {
+				font-family: sans-serif;
+			}
+		</style>
+
+		<!-- required: the default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../themes/claro/claro.css"/>
+
+		<!--
+			required: dojo.js
+			Note that the locale is hardcoded to english, for benefit of the robot/ValidationTextBox.html test
+			(when running on a non-US computer).
+		 -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, parseOnLoad: true, locale: 'en-us', extraLocale: ['de-de']"></script>
+
+		<!-- only needed for alternate theme testing: -->
+		<script type="text/javascript" src="../_testCommon.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("doh.runner");
+
+			dojo.require("dijit.form.TextBox");
+			dojo.require("dijit.form.ValidationTextBox");
+			dojo.require("dijit.form.NumberTextBox");
+			dojo.require("dijit.form.CurrencyTextBox");
+
+			dojo.require("dijit.Dialog");
+			dojo.require("dijit.form.Button");
+			dojo.require("dijit.tests.helpers");    // functions to help test
+
+			dojo.require("dojo.currency");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+
+			// Add test=true to the URL to run unit tests.
+			var test = /mode=test/i.test(window.location.href);
+
+			function fixNbsp(val){
+				return typeof val == "string" ? val.replace(/\xA0/g, " ") : val;
+			}
+
+			dojo.ready(function(){
+
+				new dijit.form.TextBox({id: 'monospace1', "aria-label":"monospace1", disabled: true, value: 'M|M:monospace?'}, 'monospace1');
+				new dijit.form.TextBox({id: 'monospace2', "aria-label":"monospace2",disabled: true, value: 'M|M:monospace?'}).placeAt('widget_monospace1', 'after');
+
+				new dijit.form.TextBox({id: 'sans1', "aria-label":"sans1", disabled: true, value: 'sans1'}, 'sans1');
+				new dijit.form.TextBox({id: 'sans2', "aria-label":"sans2", disabled: true, value: 'sans2'}).placeAt('widget_sans1', 'after');
+
+				// See if we can make a widget in script and attach it to the DOM ourselves.
+				var props = {
+					name: "elevation",
+					value: 3000,
+					constraints: {min:-20000,max:20000,places:0,allowCruft:true},
+					promptMessage: "Enter a value between -20000 and +20000",
+					required: true,
+					style:{ textAlign: document.documentElement.dir == "rtl" ? "left" : "right" },
+					editOptions:{pattern:'#,##0'},
+					invalidMessage: "Invalid elevation.",
+					onChange: function(val){dojo.byId('oc5').value = val; },
+					"class": "medium"
+				};
+				(new dojo.declare("customNumberTextBox", dijit.form.NumberTextBox, props)({}, "q05")).startup();
+
+				props = {
+					name: "ticket1651",
+					id: "mname",
+					templateString: null, // #11493
+					templatePath: dojo.moduleUrl('dijit.form.templates', 'TextBox.html'),
+					value: null,
+					"aria-labelledby":"l_ticket1651"
+				};
+				(new dijit.form.TextBox(props, "ticket1651")).startup();
+
+				if(!test){ return; }
+
+				// Test initial conditions
+				doh.register("initial conditions", {
+					name: "initial conditions",
+					runTest: function(){
+						var form1 = dojo.byId("form1");
+
+						doh.is("Testing Testing", form1.firstname.value, "firstname");
+						doh.is("not fired yet!", dojo.byId("oc1").value, "firstname onchange");
+
+						doh.is("TESTING TESTING", form1.lastname.value, "lastname");
+
+						doh.is("", form1.age.value, "age");
+						doh.is("not fired yet!", dojo.byId("oc3").value, "age onchange");
+
+						doh.is("", form1.occupation.value, "occupation");
+
+						doh.is("3000", form1.elevation.value, "elevation");
+						doh.is("3,000", dojo.byId("q05").value, "elevation display value");
+						doh.is("not fired yet!", dojo.byId("oc5").value, "elevation onchange");
+						doh.t(!!dijit.byId("q05").constraints.allowCruft, "constructor constraints value");
+
+						doh.is("54775.53", form1.income1.value, "income1");
+						doh.is("$54,775.53", dojo.byId("q08").value, "income1 display value");
+						doh.is("not fired yet!", dojo.byId("oc8").value, "income1 onchange");
+
+						doh.is("54775.53", form1.income2.value, "income2");
+						doh.is("€54,775.53", dojo.byId("q08eur").value, "income2 display value");
+						doh.f(!!dijit.byId("q08eur").constraints.allowCruft, "constructor constraints value not proliferated");
+
+						doh.is("someTestString", form1.phone.value, "phone");
+						doh.is("", form1.password.value, "password");
+						doh.is("", form1.ticket1651.value, "ticket1651");
+						doh.is("cannot type here", form1.readOnly.value, "readonly");
+						doh.is("cannot type here", form1.disabled.value, "disabled");
+					}
+				});
+
+				var watchHandle, onChangeHandle;
+
+				function setTest(testName, textbox, setDict, watchExpected, unchangedExpected, isValid, onChangeExpected){
+					// summary:
+					//		Generate test to call set("value", ...) and check response
+					// textbox: String
+					//		id of TextBox widget
+					// setDict: Dictionary
+					//		Value to pass to textbox.set(), such as {value: "123"} or {displayedValue: "1,234"}.
+					// watchExpected: Dictionary
+					//		Expected changes in state of TextBox, such as
+					//			{value: 1234, displayedValue: "1,234"}
+					//		Checks that watch() returns these values.
+					//		Also checks that textbox is actually displaying displayedValue
+					// unchangedExpected: Dictionary
+					//		Attributes of textbox that shouldn't change/be reported by watch(), and their values
+					//			{value: 1234, displayedValue: "1,234"}
+					//		Checks that watch() returns these values.
+					//		Also checks that textbox is actually displaying displayedValue
+					// isValid: Boolean
+					//		Checks return of textbox.isValid().   TODO: this should be watchable.
+					// onChangeExpected:
+					//		Check that onChange reports this value
+
+
+					return {
+						name: testName,
+						timeout: 1000,
+						runTest: function(){
+
+							textbox = dijit.byId(textbox);
+
+							// expectedState is a combination of the attributes that we expect to change
+							// and the attributes that we expect not to change
+							var expectedState = dojo.delegate(watchExpected, unchangedExpected);
+
+							// save all notifications from watch()
+							var watchActual = {};
+							watchHandle = textbox.watch(function(attr, oldVal, newVal){
+									console.log(textbox.id + ": " + attr + ": " + oldVal + " --> " + newVal);
+									watchActual[attr] = fixNbsp(newVal);
+								});
+
+							// and monitor onChange() calls too
+							var onChangeActual;
+							if(onChangeExpected){
+								onChangeHandle = textbox.on("change", function(newVal){
+									onChangeActual = fixNbsp(newVal);
+								});
+							}
+
+							// do the set
+							textbox.set(setDict);
+
+							doh.is(expectedState.displayedValue, fixNbsp(textbox.focusNode.value), "focusNode.value");
+
+							doh.is(isValid, textbox.isValid(), "isValid()");
+
+							var d = new doh.Deferred();
+
+							setTimeout(d.getTestCallback(function(){
+								// test that onChange() was called correctly
+								if(onChangeExpected){
+									doh.is(onChangeExpected, onChangeActual, "onChange()");
+								}
+
+								// check that watch() callbacks were called
+								for(attr in watchExpected){
+									doh.t(attr in watchActual, "watch(" + attr + ") fired");
+									doh.is(watchExpected[attr], watchActual[attr], "watch(" + attr + ")");
+									doh.is(typeof watchExpected[attr], typeof watchActual[attr], "typeof watch(" + attr + ")")
+								}
+
+								// check that direct get(...) calls are also working, for both the attributes
+								// that were supposed to change and the attributes that weren't supposed to change
+								for(attr in expectedState){
+									doh.is(expectedState[attr], fixNbsp(textbox.get(attr)), "get(" + attr + ")");
+									doh.is(typeof expectedState[attr], typeof textbox.get(attr), "typeof get(" + attr + ")")
+								}
+
+								// check that watch() didn't report attributes as changed when they didn't change
+								for(attr in unchangedExpected){
+									doh.f(attr in watchActual, attr + " shouldn't have been reported as changed by watch " +
+										watchActual[attr]);
+								}
+							}), 50);
+
+							return d;
+						},
+						tearDown: function(){
+							watchHandle.unwatch();
+							watchHandle = null;
+							if(onChangeHandle){
+								onChangeHandle.remove();
+								onChangeHandle = null;
+							}
+						}
+					};
+				}
+
+				doh.register("set('value')", [
+					// test valid and invalid settings of value
+					setTest("valid_max", 'q03', {value: 120}, {value: 120, displayedValue: "120"}, {}, true),
+					setTest("out_of_range_max",'q03', {value: 121}, {value: 121, displayedValue: "121", state: "Error"}, {}, false),
+					setTest("valid_min", 'q03', {value: 0}, {value: 0, displayedValue: "0", state: ""}, {}, true),
+					setTest("out_of_range_min", 'q03', {value: -1}, {value: -1, displayedValue: "-1", state: "Error"}, {}, false),
+					setTest("invalid", 'q03', {value: 'two'}, {value: undefined, displayedValue: 'two'}, {}, false),
+					setTest("null_required", 'q03', {required: true, value: null},
+							{required: true, value: NaN, displayedValue: ''}, {state: "Error"}, false),
+					setTest("null_notrequired", 'q03', {required: false, value: null}, {}, {displayedValue: ''}, true),
+
+					// test formatting of value vs. displayed value
+					setTest("number format", 'q05', {value: 1234}, {value: 1234, displayedValue: "1,234"}, {}, true),
+					setTest("currency format", 'q08', {value: 1234}, {value: 1234, displayedValue: "$1,234.00"}, {}, true)
+				]);
+
+				doh.register("set('displayedValue')", [
+					// test formatting of value vs. displayed value, in reverse
+					setTest("number format", 'q05', {displayedValue: "4,321"}, {value: 4321, displayedValue: "4,321"}, {}, true),
+					setTest("european currency format", 'q08eurde', {displayedValue: "4.321,98"},
+						{value: 4321.98, displayedValue: "4.321,98 €"}, {}, true)
+				]);
+
+				doh.register("font inheritance", [
+					{
+						name: "with srcNodeRef, style on .dijitTextBox",
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("monospace", dojo.style('monospace1', "fontFamily"));
+							}), 0);
+							return d;
+						}
+					},
+					{
+						name: "without srcNodeRef, style on .dijitTextBox",
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("monospace", dojo.style('monospace2', "fontFamily"));
+							}), 0);
+							return d;
+						}
+					},
+					{
+						name: "with srcNodeRef, style inherited",
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("sans-serif", dojo.style('sans1', "fontFamily"));
+							}), 0);
+							return d;
+						}
+					},
+					{
+						name: "without srcNodeRef, style inherited",
+						runTest: function(){
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("sans-serif", dojo.style('sans2', "fontFamily"));
+							}), 0);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("pattern", [
+					{
+						name: "pattern markup",
+						runTest: function(){
+							var w = dijit.byId('q22');
+							w.set('value', 'someTestString');
+							doh.is(true, w.isValid(false));
+							doh.f(!!w.focusNode.getAttribute('pattern'), "native pattern");
+						}
+					},
+					{
+						name: "pattern string",
+						runTest: function(){
+							var w = dijit.byId('q22');
+							w.set('value', 'someTestString');
+							w.set('pattern', "some[a-z]+"); // invalid
+							doh.is(false, w.isValid(false), "invalid");
+							doh.is(false, w._isValidSubset(), "invalid partial");
+							w.set('value', 'some');
+							doh.is(true, w._isValidSubset(), "valid partial");
+							w.set('value', 'someTestString');
+							w.set('pattern', "someT[a-z]+S[a-z]+"); // valid
+							doh.is(true, w.isValid(false), "valid");
+							doh.is(true, w._isValidSubset(), "valid partial 2");
+							doh.f(!!w.focusNode.getAttribute('pattern'), "native pattern");
+						}
+					},
+					{
+						name: "pattern function",
+						runTest: function(){
+							var w = dijit.byId('q22');
+							w.set('value', 'someTestString');
+							w.set('pattern', function(){ return "[a-z]+"; }); // invalid
+							doh.is('Error', w.get('state'));
+							doh.is(false, w.isValid(false), "invalid string");
+							w.set('pattern', function(){ return "[a-zTS]+"; }); // valid
+							doh.is('', w.get('state'));
+							doh.is(true, w.isValid(false), "valid string");
+						}
+					}
+				]);
+
+				doh.register("#11889", [
+					{
+						name: "non-focused places:5",
+						timeout: 2000,
+						textbox: "q05",
+						setUp: function(){
+							this.textbox = dijit.byId(this.textbox);
+							this.textbox.set('constraints', { places: 5 });
+							this.textbox.set('editOptions', { places: "2,4" });
+						},
+						runTest: function(){
+							this.textbox.set('value', 1.625);
+							doh.is(1.625, this.textbox.get('value'), 'numeric value is unchanged');
+							doh.is('1.62500', this.textbox.get('displayedValue'), 'formatted displayed value');
+							doh.t(this.textbox.isValid(false), 'nonfocused is valid');
+						}
+					},
+					{
+						name: "focused places:2,4. blur to places:5",
+						timeout: 2000,
+						textbox: "q05",
+						runTest: function(){
+							var d = new doh.Deferred();
+							var textbox = this.textbox;
+
+							textbox = dijit.byId(this.textbox);
+							textbox.set('constraints', { places: 5 });
+							textbox.set('editOptions', { places: "2,4" });
+							textbox.focus();
+
+							setTimeout(d.getTestErrback(function(){	// allow time for async focus on IE9+
+								textbox.set('value', 1.125);
+
+								doh.is(1.125, textbox.get('value'), 'numeric value is unchanged');
+								doh.is('1.125', textbox.get('displayedValue'), 'formatted displayed value');
+								doh.t(textbox.isValid(true), 'focused is valid');
+
+
+								var handler = textbox.on("blur", function(){
+									handler.remove();
+									setTimeout(d.getTestCallback(function(){
+										doh.is(1.125, textbox.get('value'), 'numeric value is unchanged #2');
+										doh.is('1.12500', textbox.get('displayedValue'), 'formatted displayed value #2');
+										doh.t(textbox.isValid(false), 'nonfocused is valid #2');
+									}), 150);
+								});
+								dojo.byId("q01").focus();
+							}), 0);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("validation in dialog", [
+					{
+						name: "showDialog",
+						timeout: 5000,
+						runTest: function() {
+							// Show dialog, returning Deferred that fires when show dialog is finished.
+							// Before showing, focus the open button, so that Dialog knows where to return focus to.
+
+							var d = new doh.Deferred();
+
+							dijit.byId("dlgOpenBtn").focus();
+
+							// Focus on IE9+ is asynchronous, so wait for it to occur before showing Dialog.   Otherwise,
+							// when Dialog closes it restores focus somewhere strange.
+							setTimeout(function () {
+								dijit.byId("dlg").show().then(function () {
+									d.resolve(true);
+								});
+							}, 0);
+
+							return d;
+						}
+					},
+					function enterInvalidValue(){
+						// Entering invalid value should make validation tooltip appear
+						var d = new doh.Deferred();
+						dijit.byId("dlgNTB").set("value", "invalid");
+						dijit.byId("dlgNTB").focus();
+						setTimeout(d.getTestCallback(function(){
+							masterTT = dojo.global.dijit._masterTT;
+							doh.t(masterTT && isVisible(masterTT.domNode), "tooltip shown");
+						}), 300);
+						return d;
+					},
+					{
+						name: "hideDialog",
+						timeout: 5000,
+						runTest: function () {
+							// Hiding the dialog should make the validation tooltip disappear
+							var d = new doh.Deferred();
+							dijit.byId("dlg").hide().then(function () {
+								setTimeout(d.getTestCallback(function () {
+									doh.t(isHidden(masterTT.domNode), "tooltip hidden");
+								}), 300);
+							});
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+
+	<body class="claro" role="main">
+		<h1 class="testTitle">Dijit Validation Widgets</h1>
+		<!--	to test form submission, you'll need to create an action handler similar to
+			http://www.utexas.edu/teamweb/cgi-bin/generic.cgi -->
+		<form id="form1" action="" name="example" method="GET">
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q01">First Name:  </label>
+				<span class="noticeMessage"> TextBox class, <b>tabIndex=2</b>, Attributes: {trim: true, propercase: true, intermediateChanges: true, style: 'width:700px', selectOnClick: true}, First letter of each word is upper case.</span>
+			</div>
+			<div class="testExample">
+				<input id="q01" data-dojo-type="dijit/form/TextBox"
+					name="firstname" value="testing testing" style="width:700px" tabIndex="2"
+					data-dojo-props='
+					trim:true,
+					selectOnClick:true,
+					onFocus:function(){ console.log("user onfocus handler"); },
+					onBlur:function(){ console.log("user onblur handler"); },
+					onChange:function(v){ dojo.byId("oc1").value=v; },
+					intermediateChanges:true,
+					propercase:true '/>
+				<br><label for="oc1">onChange:</label><input id="oc1" size="34" disabled value="not fired yet!" autocomplete="off"/>
+				<input tabIndex="-1" type="button" onclick="dijit.byId('q01').set('disabled', true);" value="Disable"/>
+				<input tabIndex="-1" type="button" onclick="dijit.byId('q01').set('disabled', false);" value="Enable"/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q02">Last Name:  </label>
+				<span class="noticeMessage"> TextBox class, Attributes: {trim: true, uppercase: true, "class": 'verylong'}, all letters converted to upper case. </span>
+			</div>
+			<div class="testExample">
+				<input id="q02" data-dojo-type="dijit/form/TextBox"
+					name="lastname" value="testing testing" class="verylong"
+					data-dojo-props='trim:true, uppercase:true '/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q03">Age:  </label>
+				<span class="noticeMessage"> NumberTextBox class, <b>tabIndex=1</b>, Attributes: {trim: true}, no initial value specified, tooltipPosition=[above, below].  Displays a prompt message if field is blank.</span>
+			</div>
+			<div class="testExample">
+				<input id="q03" data-dojo-type="dijit/form/NumberTextBox"
+					name="age" tabIndex="1" class="small"
+					data-dojo-props='
+					promptMessage:"(optional) Enter an age between 0 and 120",
+					maxLength:"3",
+					constraints:{places:0,min:0,max:120},
+					onChange:function(val){ dojo.byId("oc3").value=""+val; },
+					tooltipPosition:["above", "below"]
+				'/>
+				<label for="oc3">onChange:</label><input id="oc3" size="14" disabled value="not fired yet!" autocomplete="off"/>
+				<span style='white-space:nowrap;'>
+				<button id="q03_valid" type=button onclick="dijit.byId('q03').set('value', 120);">set value to 120</button>
+				<button id="q03_outofrange" type=button onclick="dijit.byId('q03').set('value', 121);">set value to 121</button>
+				<button id="q03_invalid" type=button onclick="dijit.byId('q03').set('value', 'two');">set value to two</button>
+				<button id="q03_null" type=button onclick="dijit.byId('q03').set('value', null);">set value to null</button>
+				<button type=button onclick="dojo.byId('gv3').value=''+dijit.byId('q03').get('value');">get value</button>
+				<input id="gv3" aria-label="get value 3" size="10" disabled value="" autocomplete="off"/>
+				</span>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="fav">Favorite Number (1-100):  </label>
+				<span class="noticeMessage"> NumberTextBox class, Attributes: required=true, must be integer, no messages provided,  no initial value specified, maxlength=3</span>
+			</div>
+			<div class="testExample">
+				<input id="fav" data-dojo-type="dijit/form/NumberTextBox"
+					name="fav" class="small" required
+					data-dojo-props='maxLength:"3",constraints:{places:0,min:1,max:100},pattern:"\\d+"'/>
+					<button onclick="dijit.byId('fav').set('required', true); return false;">attr(required, true)</button>
+					<button onclick="dijit.byId('fav').set('required', false); return false;">attr(required, false)</button>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q04">Occupation:  </label>
+				<span class="noticeMessage">ValidationTextBox class,
+					Attributes: {lowercase: true, required: true, "class": verylong, style: font-size: 15pt;}. Displays a prompt message if field is blank.</span>
+			</div>
+			<div class="testExample">
+				<input id="q04" data-dojo-type="dijit/form/ValidationTextBox"
+					name="occupation" class="verylong" style="fontSize:15pt" required="true"
+					data-dojo-props='lowercase:true, promptMessage:"Enter an occupation" '/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q05">Elevation:  </label>
+				<span class="noticeMessage">IntegerTextBox class,
+					Attributes: {required: true, min:-20000, max:+20000 }, displays a prompt message if field is blank, thousands separator remains during editing.</span>
+				<span class="noticeMessage">Enter feet above sea level with a sign.</span>
+			</div>
+			<div class="testExample">
+				<input id="q05" class="small"/>
+				<label for="oc5">onChange:</label><input id="oc5" size="10" disabled value="not fired yet!" autocomplete="off"/>
+			</div>
+<!--
+			<div class="dojoTitlePaneLabel">
+				<label for="attach-here">Population:  </label>
+				<span class="noticeMessage">IntegerTextBox class,
+					Attributes: {trim: true, required: true, signed: false, separator: ","}. <br><b> This widget was added in script, not markup. </b> </span>
+			</div>
+			<div class="testExample" >
+				<input id="attach-here" type="text" name="population" class="medium" value="1500000"/>
+			</div>
+
+			<script>
+				// See if we can make a widget in script and attach it to the DOM ourselves.
+				dojo.ready(function(){
+					var props = {
+						name: "population",
+						value: "1,500,000",
+						trim: "true",
+						required: "true",
+						pattern: dojo.regexp.integer,
+						constraints: {signed:false, separator: ","},
+						invalidMessage: "Invalid population.  Enter a number."
+					};
+					var w = new dijit.form.ValidationTextBox(props, "attach-here");
+					});
+			</script>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q06">Real Number:  </label>
+				<span class="noticeMessage">RealNumberTextBox class,
+					Attributes: {trim: true, required: true}. Enter any sort of real number.</span>
+			</div>
+			<div class="testExample">
+				<input id="q06" type="text" name="real1" class="medium" value="+0.1234"
+					data-dojo-type="dijit/form/ValidationTextBox"
+					pattern="dojo.regexp.realNumber"
+					trim="true"
+					required="true"
+					invalidMessage="This is not a valid real number." />
+			</div>
+			<div class="dojoTitlePaneLabel">
+				<label for="q07">Exponential Notation:  </label>
+				<span class="noticeMessage">RealNumberTextBox class,
+					Attributes: {exponent: true}. Enter a real number in exponential notation.</span>
+			</div>
+			<div class="testExample">
+				<input id="q07" type="text" name="real2" class="medium" value="+0.12"
+					data-dojo-type="dijit/form/ValidationTextBox"
+					pattern="dojo.regexp.realNumber"
+					trim="true"
+					required="true"
+					constraints="{exponent:true}"
+					invalidMessage="Number must be in exponential notation. Example +5E-28" />
+			</div>
+			-->
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q08">Annual Income:  </label>
+				<span class="noticeMessage">CurrencyTextBox class,
+					Attributes: {fractional: true}.  Enter whole and cents.  Currency symbol is optional. Cents are MANDATORY.</span>
+			</div>
+
+			<div class="testExample">
+				<input id="q08" data-dojo-type="dijit/form/CurrencyTextBox"
+					name="income1" class="medium" value="54775.53" required
+					data-dojo-props='constraints:{fractional:true},
+						currency:"USD",
+						onChange:function(val){ dojo.byId("oc8").value = val; },
+						invalidMessage:"Invalid amount.  Cents are MANDATORY." '/>USD
+				&nbsp;<label for="oc8">onChange:</label><input id="oc8" size="15" disabled value="not fired yet!" autocomplete="off"/>
+			</div>
+
+			<div class="testExample">
+				<label for="q08eur">euro currency (local format) fractional part is optional:</label>
+				<input id="q08eur" data-dojo-type="dijit/form/CurrencyTextBox"
+					name="income2" class="medium" value="54775.53" required
+					data-dojo-props='currency:"EUR", invalidMessage:"Invalid amount.  Include cents." '/>EUR
+				<button onclick="dijit.byId('q08eur').set('disabled',true); return false;">Disable</button>
+				<button onclick="dijit.byId('q08eur').set('disabled',false); return false;">Enable</button>
+				<button onclick="dijit.byId('q08eur').reset(); return false;">Reset</button>
+			</div>
+
+			<!--
+				It is unusual to override the lang properties on individual
+				widgets.  Usually it should be the user's default or set on
+				a page basis by the server.  This is for testing purposes
+			-->
+			<div class="testExample">
+				euro currency (fixed lang: de-de) programmatically created, fractional part is optional: <input id="q08eurde" class="medium"/>EUR
+			</div>
+
+			<script>
+				// See if we can make a widget in script and attach it
+				// to the DOM ourselves.
+				dojo.ready(function(){
+					var example = dojo.currency.format(54775.53, {locale: 'de-de', currency: "EUR"});
+					var props = {
+						name: "income3",
+						value: 54775.53,
+						lang: 'de-de',
+						required: true,
+						currency: "EUR",
+						invalidMessage: "Invalid amount.  Example: " + example,
+						"aria-label": "income3 de-de"
+					};
+					var w = new dijit.form.CurrencyTextBox(props, "q08eurde");
+				});
+			</script>
+
+			<!--
+			<div class="dojoTitlePaneLabel">
+				<label for="q08a">Annual Income:  </label>
+				<span class="noticeMessage">Old regexp currency textbox,
+							Attributes: {fractional: true}. Enter dollars and cents.</span>
+			</div>
+			<div class="testExample">
+				<input id="q08a" type="text" name="income3" class="medium" value="$54,775.53"
+					data-dojo-type="dijit/form/ValidationTextBox"
+					pattern="dojo.regexp.currency"
+					trim="true"
+					required="true"
+					constraints="{fractional:true}"
+					invalidMessage="Invalid amount.  Include cents. Example: $12,000.00" />
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q09">IPv4 Address:  </label>
+				<span class="noticeMessage">IpAddressTextBox class,
+					Attributes: {allowIPv6: false, allowHybrid: false}. Also Dotted Hex works, 0x18.0x11.0x9b.0x28</span>
+			</div>
+			<div class="testExample">
+				<input id="q09" type="text" name="ipv4" class="medium" value="24.17.155.40"
+					data-dojo-type="dijit/form/ValidationTextBox"
+					pattern="dojo.regexp.ipAddress"
+					trim="true"
+					required="true"
+					constraints="{allowIPv6:false,allowHybrid:false}"
+					invalidMessage="Invalid IPv4 address."/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q10"> IPv6 Address:  </label>
+				<span class="noticeMessage">IpAddressTextBox class,
+					Attributes: {allowDottedDecimal: false, allowDottedHex: false}.
+							Also hybrid works, x:x:x:x:x:x:d.d.d.d</span>
+			</div>
+			<div class="testExample">
+				<input id="q10" type="text" name="ipv6" class="long" value="0000:0000:0000:0000:0000:0000:0000:0000"
+					data-dojo-type="dijit/form/ValidationTextBox"
+					pattern="dojo.regexp.ipAddress"
+					trim="true"
+					uppercase = "true"
+					required="true"
+					constraints="{allowDottedDecimal:false, allowDottedHex:false, allowDottedOctal:false}"
+					invalidMessage="Invalid IPv6 address, please enter eight groups of four hexadecimal digits. x:x:x:x:x:x:x:x"/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q11"> URL:  </label>
+				<span class="noticeMessage">UrlTextBox class,
+					Attributes: {required: true, trim: true, scheme: true}. </span>
+			</div>
+
+			<div class="testExample">
+				<input id="q11" type="text" name="url" class="long" value="http://www.xyz.com/a/b/c?x=2#p3"
+					data-dojo-type="dijit/form/ValidationTextBox"
+					pattern="dojo.regexp.url"
+					trim="true"
+					required="true"
+					constraints="{scheme:true}"
+					invalidMessage="Invalid URL.  Be sure to include the scheme, http://..." />
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q12"> Email Address  </label>
+				<span class="noticeMessage">EmailTextBox class,
+					Attributes: {required: true, trim: true}. </span>
+			</div>
+
+			<div class="testExample">
+				<input id="q12" type="text" name="email" class="long" value="fred&barney@stonehenge.com"
+					data-dojo-type="dijit/form/ValidationTextBox"
+					pattern="dojo.regexp.emailAddress"
+					trim="true"
+					required="true"
+					invalidMessage="Invalid Email Address." />
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q13"> Email Address List </label>
+				<span class="noticeMessage">EmailListTextBox class,
+					Attributes: {required: true, trim: true}. </span>
+			</div>
+
+			<div class="testExample">
+				<input id="q13" type="text" name="email" class="long" value="a@xyz.com; b@xyz.com; c@xyz.com; "
+					data-dojo-type="dijit/form/ValidationTextBox"
+					pattern="dojo.regexp.emailAddressList"
+					trim="true"
+					required="true"
+					invalidMessage="Invalid Email Address List." />
+			</div>
+			-->
+			<div class="dojoTitlePaneLabel">
+				<label for="q22">Regular Expression </label>
+				<span class="noticeMessage">RegexpTextBox class,
+					Attributes: {required: true} </span>
+			</div>
+			<div class="testExample">
+				<input id="q22" data-dojo-type="dijit/form/ValidationTextBox"
+					name="phone" class="medium" value="someTestString" required
+					data-dojo-props='pattern:"[\\w]+", invalidMessage:"Invalid Non-Space Text."'/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q23"> Password </label>
+				<span class="noticeMessage">(just a test that type attribute is obeyed) </span>
+			</div>
+			<div class="testExample">
+				<input id="q23" data-dojo-type="dijit/form/TextBox" type="password" name="password" class="medium"/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label id="l_ticket1651">Trac ticket 1651:  </label>
+				<span class="noticeMessage">value: null should show up as empty</span>
+			</div>
+			<div class="testExample">
+				<input id="ticket1651" class="medium" value="not null"/>
+			</div>
+
+			<div class="dojoTitlePaneLabel">
+				<label for="q24">initially readOnly TextBox</label>
+				<span class="noticeMessage">a test that readOnly and disabled are understood for TextBox</span>
+			</div>
+			<div class="testExample">
+				<input id="q24" data-dojo-type="dijit/form/TextBox"
+					name="readOnly" class="medium" readOnly value="cannot type here" title="hint text"/>
+				<input type="button" id="removereadonly" onclick="dijit.byId('q24').set('readOnly',false);" value="Remove readOnly" tabIndex="-1"/>
+				<input type="button" onclick="dijit.byId('q24').set('readOnly',true);" value="Set readOnly" tabIndex="-1"/>
+				<input type="button" id="removedisabled" onclick="dijit.byId('q24').set('disabled',false);" value="Remove disabled" tabIndex="-1"/>
+				<input type="button" onclick="dijit.byId('q24').set('disabled',true);" value="Set disabled" tabIndex="-1"/>
+			</div>
+			<div class="dojoTitlePaneLabel">
+				<label for="q25">initially disabled ValidationTextBox</label>
+				<span class="noticeMessage">a test that disabled is understood for ValidationTextBox</span>
+			</div>
+			<div class="testExample">
+				<input id="q25" data-dojo-type="dijit/form/ValidationTextBox"
+					name="disabled" class="medium" disabled value="cannot type here"/>
+				<input type="button" onclick="dijit.byId('q25').set('readOnly',false);" value="Remove readOnly" tabIndex="-1"/>
+				<input type="button" onclick="dijit.byId('q25').set('readOnly',true);" value="Set readOnly" tabIndex="-1"/>
+				<input type="button" onclick="dijit.byId('q25').set('disabled',false);" value="Remove disabled" tabIndex="-1"/>
+				<input type="button" onclick="dijit.byId('q25').set('disabled',true);" value="Set disabled" tabIndex="-1"/>
+			</div>
+
+			<script>
+				// so robot can get to it easily
+				document.displayData=function(){
+					var f = document.getElementById("form1");
+					var s = "";
+					for(var i = 0; i < f.elements.length; i++){
+						var elem = f.elements[i];
+						if(elem.nodeName.toLowerCase() == "button" || elem.type=="submit" || elem.type=="button")  { continue; }
+						s += elem.name + ": " + elem.value + "\n";
+					}
+					return s;
+				}
+			</script>
+
+			<div>
+				<button name="button" onclick="alert(document.displayData()); return false;" tabIndex="-1">view data</button>
+				<input type="submit" name="submit"  tabIndex="-1"/>
+			</div>
+
+		</form>
+		<div class="dojoTitlePaneLabel">
+				<label for="q26">TextBox with placeholder</label>
+				<span class="noticeMessage">a test that placeholder works for TextBox.  10px padding added for testing.</span>
+		</div>
+		<div class="testExample">
+			<input id="q26" data-dojo-type="dijit/form/TextBox" placeHolder="placeholder is here" name="placeHolder" value=""/>
+			<button type="button" onclick="dijit.byId('q26').set('placeHolder', 'this is a very long placeholder that will overflow the input');">
+				set long placeholder
+			</button>
+		</div>
+		<h2>Tooltip positioning</h2>
+		<p>
+		These buttons switch the positions searched to try to place the validation error tooltips.
+		Note that setting tooltip positioning to "above" or "below" is dangerous if
+		you have a node with a dropdown, but the drop down might overlap the tooltip.
+		</p>
+		<button onclick="dijit.Tooltip.defaultPosition=['above', 'below'];">above, below</button>
+		<button onclick="dijit.Tooltip.defaultPosition=['after', 'before'];">after, before (default)</button>
+
+		<div class="monospace">
+			<input id="monospace1"/>
+		</div>
+		<div class="sans">
+			<input id="sans1"/>
+		</div>
+
+		<h2>Validation tooltips inside of dialogs:</h2>
+		<div dojoType="dijit.Dialog" id="dlg">
+			<label for="dlgNTB">NumberTextBox:</label>
+			<div dojoType="dijit.form.NumberTextBox" id="dlgNTB"></div>
+		</div>
+		<button dojoType="dijit.form.Button" id="dlgOpenBtn" onclick="dijit.byId('dlg').show();">show dialog</button>
+
+		<div class="dojoTitlePaneLabel">
+			<label id="l_ticket17923">Trac ticket 17923</label>
+			<span class="noticeMessage">Partial numeric input should be validated with respect to the min/max constraints and available space</span>
+		</div>
+
+		<div class="testExample">
+			<input id="ticket17923" class="medium"/>
+			<input type="button" id="ticket17923-maxLength5" value="maxLength: 5" tabIndex="-1"/>
+			<input type="button" id="ticket17923-maxLength3" value="maxLength: 3" tabIndex="-1"/>
+			<input type="button" id="ticket17923-min1:max15" value="min: 12, max: 142" tabIndex="-1"/>
+			<input type="button" id="ticket17923-min-15:max15" value="min: -15, max: -5" tabIndex="-1"/>
+		</div>
+		<script>
+		require(["dijit/form/NumberTextBox", "dojo/dom", "dojo/on", "dojo/_base/lang"], function(NumberTextBox, dom, on, lang){
+
+			var fld = new NumberTextBox({
+					name: "ticket17923",
+					constraints: {pattern: '#000.#', min: 12, max: 142 },
+					maxLength: 5
+			}, "ticket17923");
+
+			on(dom.byId("ticket17923-maxLength5"), 'click', function(){
+					fld.set('maxLength', 5);
+			});
+
+			on(dom.byId("ticket17923-maxLength3"), 'click', function(){
+					fld.set('maxLength', 3);
+			});
+
+			on(dom.byId("ticket17923-min1:max15"), 'click', function(){
+					fld.set('constraints', lang.mixin({}, fld.get('constraints'), {min: 12, max: 142}));
+			});
+
+			on(dom.byId("ticket17923-min-15:max15"), 'click', function(){
+					fld.set('constraints', lang.mixin({}, fld.get('constraints'), {min: -15, max: -5}));
+			});
+
+			fld.startup();
+		});
+		</script>
+
+		<div class="dojoTitlePaneLabel">
+			<label id="l_ticket17955">Trac ticket 17955</label>
+			<span class="noticeMessage">Ensure setting the formattedValue does not alter the entered value on blur</span>
+		</div>
+		<div class="testExample">
+			<input id="ticket17955" class="medium"/>
+		</div>
+		<script>
+		require(["dijit/form/NumberTextBox"], function(NumberTextBox){
+
+			var fld = new NumberTextBox({
+				name: "ticket17955",
+				constraints: {pattern: '000.#', min: 12, max: 142 },
+				placeHolder: "Number Pattern 000.#",
+				maxLength: 5
+			}, "ticket17955");
+			fld.startup();
+		});
+		</script>
+		<div class="dojoTitlePaneLabel">
+			<label id="l_ticket18260">Trac ticket 18260</label>
+			<span class="noticeMessage">Make sure rounding works with different locale's</span>
+		</div>
+
+		<div class="testExample">
+			<input id="ticket18260" class="medium"/>
+		</div>
+		<script>
+		require(["dijit/form/NumberTextBox"], function(NumberTextBox){
+
+			var fld = new NumberTextBox({
+				name: "ticket18260",
+				lang: 'de-de',
+				value: 12.4,
+				constraints: {pattern: '000.#', min: 12, max: 142 },
+				maxLength: 5
+			}, "ticket18260");
+			fld.startup();
+		});
+		</script>
+
+		<div class="dojoTitlePaneLabel">
+			<label id="l_ticket18367">Trac ticket 18367</label>
+			<span class="noticeMessage">Make sure precision ranges work as expected</span>
+		</div>
+		<div class="testExample">
+			<input id="ticket18367" class="medium"/>
+		</div>
+		<script>
+		require(["dijit/form/NumberTextBox"], function(NumberTextBox){
+
+			var fld = new NumberTextBox({
+				name: "ticket18367",
+				value: 8.0153234,
+				constraints: { min: 1, max: 10 , places: "0,5"},
+				maxLength: 5
+			}, "ticket18367");
+			fld.startup();
+		});
+		</script>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/form/test_verticalAlign.html b/src/main/resources/static/dijit/tests/form/test_verticalAlign.html
new file mode 100644
index 0000000000000000000000000000000000000000..d53f9cff2a04da2998569e0300bed20aa11d3529
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/form/test_verticalAlign.html
@@ -0,0 +1,207 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dojo Form Widget Vertical Alignment Test</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../css/dijitTests.css";
+		BUTTON, SELECT, INPUT {
+			vertical-align: middle;
+		}
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+
+	<!-- only needed for alternate theme testing: -->
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("doh.runner");
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.form.Button");
+		dojo.require("dijit.form.DropDownButton");
+		dojo.require("dijit.form.ComboButton");
+		dojo.require("dijit.Menu");
+		dojo.require("dijit.MenuItem");
+		dojo.require("dijit.form.Select");
+		dojo.require("dijit.form.ComboBox");
+		dojo.require("dijit.form.TextBox");
+		dojo.require("dijit.form.NumberTextBox");
+		dojo.require("dojo.parser");
+
+		dojo.ready(function(){
+
+			function test_all(pre){
+				function compare2native(className){
+					var
+						widget = dijit.byId(pre + "_" + className),
+						pos = dojo.position(widget.domNode),
+						mid = pos.y + (pos.h >> 1);
+
+					doh.t(Math.abs(mid - native_mid) <= 1, "native y:h = " + native_pos.y + ":" + native_pos.h + ", " + className + " y:h = " + pos.y + ":" + pos.h);
+				}
+				var
+					nativeNode = dojo.byId(pre+"_native"),
+					native_pos = dojo.position(nativeNode),
+					native_mid = native_pos.y + (native_pos.h >> 1);
+
+				compare2native("Button");
+				compare2native("DropDown");
+				compare2native("ComboButton");
+				compare2native("Select");
+				compare2native("ComboBox");
+				compare2native("TextBox");
+				compare2native("NumberTextBox");
+			}
+					
+			doh.register("check alignment", [
+				{
+					name: "p",
+					runTest: function(){
+						test_all("p");
+					}
+				},
+				{
+					name: "div",
+					runTest: function(){
+						test_all("div");
+					}
+				},
+				{
+					name: "font",
+					runTest: function(){
+						test_all("font");
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">Dojo Form Widget Vertical Alignment Test</h1>
+
+	<p>In a P</p>
+	<p class="box" style='white-space:nowrap;'>
+		<button id="p_native">native</button>
+		<button id="p_Button" data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", iconClass:"plusIcon", value:"Button"'>
+			Button
+		</button>
+		<button id="p_DropDown" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='type:"button", value:"DropDown", label:"DropDown"'>
+			<span data-dojo-type="dijit/Menu" data-dojo-props='style:"display:none;"'>
+				<span data-dojo-type="dijit/MenuItem">DropDown MenuItem</span>
+			</span>
+		</button>
+		<button id="p_ComboButton" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"options", iconClass:"plusIcon", title:"title"'>
+			<span>Create</span>
+			<span data-dojo-type="dijit/Menu">
+				<span data-dojo-type="dijit/MenuItem">One</span>
+				<span data-dojo-type="dijit/MenuItem">Two</span>
+			</span>
+		</button>
+		<label for="p_Select">Select</label>
+		<select id="p_Select" data-dojo-type="dijit/form/Select">
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+			<option value="four">four</option>
+		</select>
+		<label for="p_ComboBox">ComboBox</label>
+		<select id="p_ComboBox" data-dojo-type="dijit/form/ComboBox" data-dojo-props='style:{width:"5em"}'>
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+			<option value="four">four</option>
+		</select>
+		<label for="p_TextBox">TextBox</label>
+		<input id="p_TextBox" data-dojo-type="dijit/form/TextBox" data-dojo-props='value:"Text", style:{width:"5em"}'/>
+		<label for="p_NumberTextBox">NumberTextBox</label>
+		<input id="p_NumberTextBox" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='value:23, style:{width:"3em"}'/>
+	</p>
+
+	<p>In a DIV</p>
+	<div style='white-space:nowrap;'>
+		<button id="div_native">native</button>
+		<button id="div_Button" data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", iconClass:"plusIcon", value:"Create"'>
+			Button
+		</button>
+		<button id="div_DropDown" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='type:"button", value:"DropDown", label:"DropDown"'>
+			<span data-dojo-type="dijit/Menu">
+				<span data-dojo-type="dijit/MenuItem">DropDown MenuItem</span>
+			</span>
+		</button>
+		<button id="div_ComboButton" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"options", iconClass:"plusIcon", title:"title"'>
+			<span>Create</span>
+			<span data-dojo-type="dijit/Menu">
+				<span data-dojo-type="dijit/MenuItem">One</span>
+				<span data-dojo-type="dijit/MenuItem">Two</span>
+			</span>
+		</button>
+		<label for="div_Select">Select</label>
+		<select id="div_Select" data-dojo-type="dijit/form/Select">
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+			<option value="four">four</option>
+		</select>
+		<label for="div_ComboBox">ComboBox</label>
+		<select id="div_ComboBox" data-dojo-type="dijit/form/ComboBox" data-dojo-props='style:{width:"5em"}'>
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+			<option value="four">four</option>
+		</select>
+		<label for="div_TextBox">TextBox</label>
+		<input id="div_TextBox" data-dojo-type="dijit/form/TextBox" data-dojo-props='value:"Text", style:{width:"5em"}'/>
+		<label for="div_NumberTextBox">NumberTextBox</label>
+		<input id="div_NumberTextBox" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='value:23, style:{width:"3em"}'/>
+	</div>
+
+	<p>font-size 200%</p>
+	<div style="font-size: 200%;white-space:nowrap;">
+		<button id="font_native">native</button>
+		<button id="font_Button" data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", iconClass:"plusIcon", value:"Button"'>
+			Button
+		</button>
+		<button id="font_DropDown" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='type:"button", value:"DropDown", label:"DropDown"'>
+			<span data-dojo-type="dijit/Menu">
+				<span data-dojo-type="dijit/MenuItem">DropDown MenuItem</span>
+			</span>
+		</button>
+		<button id="font_ComboButton" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"options", iconClass:"plusIcon", title:"title"'>
+			<span>Create</span>
+			<span data-dojo-type="dijit/Menu">
+				<span data-dojo-type="dijit/MenuItem">One</span>
+				<span data-dojo-type="dijit/MenuItem">Two</span>
+			</span>
+		</button>
+		<label for="font_Select">Select</label>
+		<select id="font_Select" data-dojo-type="dijit/form/Select">
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+			<option value="four">four</option>
+		</select>
+		<label for="font_ComboBox">ComboBox</label>
+		<select id="font_ComboBox" data-dojo-type="dijit/form/ComboBox" data-dojo-props='style:{width:"5em"}'>
+			<option value="one">one</option>
+			<option value="two">two</option>
+			<option value="three">three</option>
+			<option value="four">four</option>
+		</select>
+		<label for="font_TextBox">TextBox</label>
+		<input id="font_TextBox" data-dojo-type="dijit/form/TextBox" data-dojo-props='value:"Text", style:{width:"5em"}'/>
+		<label for="font_NumberTextBox">NumberTextBox</label>
+		<input id="font_NumberTextBox" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props='value:23, style:{width:"3em"}'/>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/formAction.html b/src/main/resources/static/dijit/tests/formAction.html
new file mode 100644
index 0000000000000000000000000000000000000000..6ecc40bb3cd1277e76027baebf0b20bd10ab8ecf
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/formAction.html
@@ -0,0 +1,26 @@
+<html>
+<!-- form submit page that grabs the parameters from the URL and calls javascript with an array -->
+<head>
+<script type='text/javascript'>
+	var values = {};
+	var win = frameElement.ownerDocument.defaultView||frameElement.document.parentWindow;
+        var str = window.location.search.substr(1).replace(/[%]0D/g, "").replace(/[+]/g, " ").split(/&/);
+        for(var i=0; i<str.length; i++){
+                var split = str[i].split(/=/),
+                        key = decodeURIComponent(split[0] || ''),
+                        value = decodeURIComponent(split[1] || '');
+		if(values[key] === undefined){
+			values[key] = value;
+		}else if(values[key] instanceof Array || typeof values[key] == "array"){
+			values[key].push(value);
+		}else{
+			var old = values[key];
+			values[key] = [old, value];
+		}
+        }
+	frameElement.values = values;
+</script>
+</head>
+<body onload="setTimeout(function(){ frameElement.values = null; window.location.href='about:blank' }, 0)">
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/general-module.js b/src/main/resources/static/dijit/tests/general-module.js
new file mode 100644
index 0000000000000000000000000000000000000000..34b077a32148ba5b3c34bef93ec31eece8e713cc
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/general-module.js
@@ -0,0 +1,70 @@
+define(["doh/main", "require", "dojo/sniff"], function(doh, require, has){
+
+	var test_robot = has("trident") || has("ff") || has("chrome") < 45;
+
+	// top level widget tests
+	doh.register("Bidi", require.toUrl("./Bidi.html"), 999999);
+
+	doh.register("Menu", require.toUrl("./Menu.html"), 999999);
+	if(test_robot){
+		doh.register("robot.Menu_mouse", require.toUrl("./robot/Menu_mouse.html"), 999999);
+		doh.register("robot.Menu_a11y", require.toUrl("./robot/Menu_a11y.html"), 999999);
+		doh.register("robot.Menu_iframe", require.toUrl("./robot/Menu_iframe.html"), 999999);
+	}
+
+	doh.register("Dialog", require.toUrl("./Dialog.html"), 999999);
+	if(test_robot){
+		doh.register("robot.Dialog_mouse", require.toUrl("./robot/Dialog_mouse.html"), 999999);
+		doh.register("robot.Dialog_a11y", require.toUrl("./robot/Dialog_a11y.html"), 999999);
+		doh.register("robot.Dialog_focusDestroy", require.toUrl("./robot/Dialog_focusDestroy.html"), 999999);
+	}
+	doh.register("ConfirmDialog", require.toUrl("./ConfirmDialog.html"), 999999);
+	if(test_robot){
+		doh.register("robot.ConfirmDialog_a11y", require.toUrl("./robot/ConfirmDialog_a11y.html"), 999999);
+	}
+
+	doh.register("ProgressBar", require.toUrl("./ProgressBar.html"), 999999);
+
+	if(test_robot){
+		doh.register("robot.Tooltip_a11y", require.toUrl("./robot/Tooltip_a11y.html"), 999999);
+		doh.register("robot.Tooltip_mouse", require.toUrl("./robot/Tooltip_mouse.html"), 999999);
+		doh.register("robot.Tooltip_mouse_quirks", require.toUrl("./robot/Tooltip_mouse_quirks.html"), 999999);
+	}
+	doh.register("Tooltip-placement", require.toUrl("./Tooltip-placement.html"), 999999);
+
+	doh.register("TooltipDialog", require.toUrl("./TooltipDialog.html"), 999999);
+	if(test_robot){
+		doh.register("robot.TooltipDialog_mouse", require.toUrl("./robot/TooltipDialog_mouse.html"), 999999);
+		doh.register("robot.TooltipDialog_a11y", require.toUrl("./robot/TooltipDialog_a11y.html"), 999999);
+		doh.register("robot.ConfirmTooltipDialog_a11y", require.toUrl("./robot/ConfirmTooltipDialog_a11y.html"), 999999);
+	}
+
+	if(test_robot){
+		doh.register("robot.InlineEditBox", require.toUrl("./robot/InlineEditBox.html"), 999999);
+	}
+
+	if(test_robot){
+		doh.register("robot.ColorPalette", require.toUrl("./robot/ColorPalette.html"), 999999);
+	}
+
+	doh.register("CalendarLite", require.toUrl("./CalendarLite.html"), 999999);
+	if(test_robot){
+		doh.register("robot.Calendar_a11y", require.toUrl("./robot/Calendar_a11y.html"), 999999);
+	}
+
+	if(test_robot){
+		doh.register("robot.TitlePane", require.toUrl("./robot/TitlePane.html"), 999999);
+	}
+
+	doh.register("Fieldset", require.toUrl("./Fieldset.html"), 999999);
+	if(test_robot){
+		doh.register("robot.Fieldset", require.toUrl("./robot/Fieldset.html"), 999999);
+	}
+
+	if(test_robot){
+		doh.register("robot.Toolbar", require.toUrl("./robot/Toolbar.html"), 999999);
+	}
+
+	doh.register("_TimePicker", require.toUrl("./_TimePicker.html"), 999999);
+
+});
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/helpers.js b/src/main/resources/static/dijit/tests/helpers.js
new file mode 100644
index 0000000000000000000000000000000000000000..84f9387e0bfdd8c4af8acf89f8375842eaac429c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/helpers.js
@@ -0,0 +1,137 @@
+// Helper methods for automated testing
+
+define([
+	"dojo/_base/array", "dojo/Deferred", "dojo/promise/all",
+	"dojo/dom-attr", "dojo/dom-class", "dojo/dom-geometry", "dojo/dom-style",
+	"dojo/_base/kernel", "dojo/_base/lang", "dojo/on", "dojo/query", "dojo/sniff",
+	"dijit/a11y"	// isTabNavigable, _isElementShown
+], function(array, Deferred, all,
+			domAttr, domClass, domGeometry, domStyle,
+			kernel, lang, on, query, has, a11y){
+
+
+// Globals used by onFocus()
+var curFocusNode, focusListener, focusCallback, focusCallbackDelay;
+
+var exports = {
+
+isVisible: function isVisible(/*dijit/_WidgetBase|DomNode*/ node){
+	// summary:
+	//		Return true if node/widget is visible
+	var p;
+	if(node.domNode){ node = node.domNode; }
+	return (domStyle.get(node, "display") != "none") &&
+		(domStyle.get(node, "visibility") != "hidden") &&
+		(p = domGeometry.position(node, true), p.y + p.h >= 0 && p.x + p.w >= 0 && p.h && p.w);
+},
+
+isHidden: function isHidden(/*dijit/_WidgetBase|DomNode*/ node){
+	// summary:
+	//		Return true if node/widget is hidden
+	var p;
+	if(node.domNode){ node = node.domNode; }
+	return (domStyle.get(node, "display") == "none") ||
+		(domStyle.get(node, "visibility") == "hidden") ||
+		(p = domGeometry.position(node, true), p.y + p.h < 0 || p.x + p.w < 0 || p.h <= 0 || p.w <= 0);
+},
+
+innerText: function innerText(/*DomNode*/ node){
+	// summary:
+	//		Browser portable function to get the innerText of specified DOMNode
+	return lang.trim(node.textContent || node.innerText || "");
+},
+
+tabOrder: function tabOrder(/*DomNode?*/ root){
+	// summary:
+	//		Return all tab-navigable elements under specified node in the order that
+	//		they will be visited (by repeated presses of the tab key)
+
+	var elems = [];
+
+	function walkTree(/*DOMNode*/ parent){
+		query("> *", parent).forEach(function(child){
+			// Skip hidden elements, and also non-HTML elements (those in custom namespaces) in IE,
+			// since show() invokes getAttribute("type"), which crashes on VML nodes in IE.
+			if((has("ie") <= 8 && child.scopeName !== "HTML") || !a11y._isElementShown(child)){
+				return;
+			}
+
+			if(a11y.isTabNavigable(child)){
+				elems.push({
+					elem: child,
+					tabIndex: domClass.contains(child, "tabIndex") ? domAttr.get(child, "tabIndex") : 0,
+					pos: elems.length
+				});
+			}
+			if(child.nodeName.toUpperCase() != 'SELECT'){
+				walkTree(child);
+			}
+		});
+	}
+
+	walkTree(root || dojo.body());
+
+	elems.sort(function(a, b){
+		return a.tabIndex != b.tabIndex ? a.tabIndex - b.tabIndex : a.pos - b.pos;
+	});
+	return array.map(elems, function(elem){ return elem.elem; });
+},
+
+
+onFocus: function onFocus(func, delay){
+	// summary:
+	//		Wait for the next change of focus, and then delay ms (so widget has time to react to focus event),
+	//		then call func(node) with the currently focused node.  Note that if focus changes again during delay,
+	//		newest focused node is passed to func.
+
+	if(!focusListener){
+		focusListener = on(dojo.doc, "focusin", function(evt){
+			// Track most recently focused node; note it may change again before delay completes
+			curFocusNode = evt.target;
+
+			// If a handler was specified to fire after the next focus event (plus delay), set timeout to run it.
+			if(focusCallback){
+				var callback = focusCallback;
+				focusCallback = null;
+				setTimeout(function(){
+					callback(curFocusNode);		// return current focus, may be different than 10ms earlier
+				}, focusCallbackDelay);	// allow time for focus to change again, see #8285
+			}
+		});
+	}
+
+	focusCallback = func;
+	focusCallbackDelay = delay || 10;
+},
+
+waitForLoad: function(){
+	// summary:
+	//		Returns Promise that fires when all widgets have finished initializing
+
+	var d = new Deferred();
+
+	dojo.global.require(["dojo/ready", "dijit/registry"], function(ready, registry){
+		ready(function(){
+			// Deferred fires when all widgets with an onLoadDeferred have fired
+			var widgets = array.filter(registry.toArray(), function(w){ return w.onLoadDeferred; }),
+				deferreds = array.map(widgets, function(w){ return w.onLoadDeferred; });
+			console.log("Waiting for " + widgets.length + " widgets: " +
+				array.map(widgets, function(w){ return w.id; }).join(", "));
+			new all(deferreds).then(function(){
+				console.log("All widgets loaded.");
+				d.resolve(widgets);
+			});
+		});
+	});
+
+	return d.promise;
+}
+
+};
+
+// All the old tests expect these symbols to be global
+lang.mixin(kernel.global, exports);
+
+return exports;
+
+});
diff --git a/src/main/resources/static/dijit/tests/i18n/README b/src/main/resources/static/dijit/tests/i18n/README
new file mode 100644
index 0000000000000000000000000000000000000000..a6516b6456a93366c221b083b899899e31ec4c92
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/README
@@ -0,0 +1,4 @@
+Global Verification Tests (GVT)
+
+In order to run these tests, you will need full locale support in Dojo.  Dojo only ships with a small subset by default.
+See util/buildscripts/cldr for an ant-based build script.
diff --git a/src/main/resources/static/dijit/tests/i18n/calendar.html b/src/main/resources/static/dijit/tests/i18n/calendar.html
new file mode 100644
index 0000000000000000000000000000000000000000..70fece66300fd60918533425688f00b121cbcb06
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/calendar.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Calendar I18N Test</title>
+
+		<!-- required: a default dijit theme: -->
+		<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+		<!-- required: dojo.js.
+			Explicitly include extra locales because this example has multiple locales
+			on the page besides the browser's default.  -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="parseOnLoad: true, isDebug: true, extraLocale: ['en-us', 'ar-sy', 'es-es', 'zh-cn']"></script>
+
+		<!-- not needed, for testing alternate themes -->
+		<script type="text/javascript" src="../_testCommon.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.dijit"); // optimize: load dijit layer
+			dojo.require("dijit.Calendar");
+			dojo.require("dojo.date.locale");
+			dojo.require("dojo.parser"); // scan page for widgets
+
+			function myHandler(id,newValue){
+				console.debug("onChange for id = " + id + ", value: " + newValue);
+			}
+		</script>
+	</head>
+	<body class="claro">
+
+		<h1 class="testTitle">Dijit Calendar I18N Test</h1>
+
+		before
+
+		<input id="calendar1" data-dojo-type="dijit/Calendar" data-dojo-props='onChange:function(val){ myHandler(this.id, val); }, lang:"en-us"'/>
+		<input id="calendar2" data-dojo-type="dijit/Calendar" data-dojo-props='onChange:function(val){ myHandler(this.id, val); }, lang:"es-es"'/>
+		<input id="calendar3" data-dojo-type="dijit/Calendar" data-dojo-props='onChange:function(val){ myHandler(this.id, val); }, lang:"zh-cn"'/>
+		<input id="calendar4" data-dojo-type="dijit/Calendar" data-dojo-props='onChange:function(val){ myHandler(this.id, val); }, lang:"ar-sy"'/>
+
+		after
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/i18n/currency.html b/src/main/resources/static/dijit/tests/i18n/currency.html
new file mode 100644
index 0000000000000000000000000000000000000000..1fd95e7170a5d8fff8a1705af1a34ea214a9e968
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/currency.html
@@ -0,0 +1,210 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Test CurrencyTextBox</title>
+
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, extraLocale: ['zh-cn','fr-fr','ja-jp']"></script>
+		<script type="text/javascript">
+			dojo.require("dijit.dijit"); // optimize: load dijit layer
+			dojo.require("dijit.form.NumberTextBox");
+			dojo.require("dijit.form.CurrencyTextBox");
+			dojo.require("dijit.form.DateTextBox");
+			dojo.require("dijit.form.ValidationTextBox");
+			dojo.require("dojo.date.locale");
+			dojo.require("dojo.date.stamp");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+			dojo.require("doh.runner");
+		</script>
+		<script src="test_i18n.js"></script>
+		<script type="text/javascript">
+			dojo.ready(function(){
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+				doh.register("t", getAllTestCases());
+				doh.run();
+			});
+		</script>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../../themes/claro/claro.css";
+			@import "../css/dijitTests.css";
+
+			.title {
+				background-color:#ddd;
+			}
+
+			.hint {
+				background-color:#eee;
+			}
+
+			.testExample {
+				background-color:#fbfbfb;
+				padding:1em;
+				margin-bottom:1em;
+				border:1px solid #bfbfbf;
+			}
+
+			.dojoTitlePaneLabel label {
+				font-weight:bold;
+			}
+
+			td {white-space:nowrap}
+		</style>
+	</head>
+
+	<body class="claro">
+		<h1 class="testTitle">Dijit TextBox Globalization Test for Currency</h1>
+
+<!--		<h2 class="testTitle">Press the following button to start all test after this page is loaded.</h2>
+ 		<button id="startButton" onclick="startTest()">Start Test</button> -->
+		<p>
+			Before start this test, make sure the <b>dojo/cldr/nls</b> contains the data for "zh-cn", "fr-fr", and "ja-jp"
+			and currencies CNY, EGP, EUR, JPY. If not, convert these CLDR data and put them there.
+		</p>
+
+		<script>
+		(function(){
+			genFormatTestCases("Currency Format", "dijit.form.CurrencyTextBox", [
+
+				{ attrs: {Currency: "CNY", lang: "zh-cn"},
+				  desc: "Locale: <b>zh_CN</b> Currency: <b>CNY</b>",
+				  value: "123456789.46",
+				  expValue: "&#xFFE5;123,456,789.46",
+				  comment: ""
+				},
+				{ attrs: {Currency: "CNY", lang: "zh-cn"},
+				  desc: "Locale: <b>zh_CN</b> Currency: <b>CNY</b>",
+				  value: "-123456789.46",
+				  expValue: "-&#xFFE5;123,456,789.46",
+				  comment: ""
+				},
+
+				{ attrs: {Currency: "EUR", lang: "fr-fr"},
+				  desc: "Locale: <b>fr_FR</b> Currency: <b>EUR</b>",
+				  value: "123456789.46",
+				  expValue: "123&nbsp;456&nbsp;789,46 &euro;",
+				  comment: ""
+				},
+				{ attrs: {Currency: "EUR", lang: "fr-fr"},
+				  desc: "Locale: <b>zh_CN</b> Currency: <b>EUR</b>",
+				  value: "-123456789.46",
+				  expValue: "-123&nbsp;456&nbsp;789,46 &euro;",
+				  comment: ""
+				},
+
+				{ attrs: {Currency: "JPY", lang: "ja-jp"},
+				  desc: "Locale: <b>ja_JP</b> Currency: <b>JPY</b>",
+				  value: "123456789.46",
+				  expValue: "&#xFFE5;123,456,789",
+				  comment: ""
+				},
+				{ attrs: {Currency: "JPY", lang: "ja-jp"},
+				  desc: "Locale: <b>ja_JP</b> Currency: <b>JPY</b>",
+				  value: "-123456789.46",
+				  expValue: "-&#xFFE5;123,456,789",
+				  comment: ""
+				}
+			]);
+
+			genValidateTestCases("Currency Validate", "dijit.form.CurrencyTextBox", [
+
+				{ attrs: {Currency: "CNY", lang: "zh-cn"},
+				  desc: "Locale: <b>zh_CN</b> Currency: <b>CNY</b>",
+				  value: 123456789.46,
+				  expValue: "&#xFFE5;123,456,789.46",
+				  comment: ""
+				},
+				{ attrs: {Currency: "CNY", lang: "zh-cn"},
+				  desc: "Locale: <b>zh_CN</b> Currency: <b>CNY</b>",
+				  value: -123456789.46,
+				  expValue: "-&#xFFE5;123,456,789.46",
+				  comment: ""
+				},
+
+				{ attrs: {Currency: "EUR", lang: "fr-fr"},
+				  desc: "Locale: <b>fr_FR</b> Currency: <b>EUR</b>",
+				  value: 123456789.46,
+				  expValue: "123&nbsp;456&nbsp;789,46 &euro;",
+				  comment: ""
+				},
+				{ attrs: {Currency: "EUR", lang: "fr-fr"},
+				  desc: "Locale: <b>zh_CN</b> Currency: <b>EUR</b>",
+				  value: -123456789.46,
+				  expValue: "-123&nbsp;456&nbsp;789,46 &euro;",
+				  comment: ""
+				},
+
+				{ attrs: {Currency: "JPY", lang: "ja-jp"},
+				  desc: "Locale: <b>ja_JP</b> Currency: <b>JPY</b>",
+				  value: 123456789,
+				  expValue: "&#xFFE5;123,456,789",
+				  comment: ""
+				},
+				{ attrs: {Currency: "JPY", lang: "ja-jp"},
+				  desc: "Locale: <b>ja_JP</b> Currency: <b>JPY</b>",
+				  value: -123456789,
+				  expValue: "-&#xFFE5;123,456,789",
+				  comment: ""
+				}
+			]);
+
+		})();
+
+		</script>
+
+		<h2 class="testTitle">Issues &amp; Comments</h2>
+		<h3 class="testTitle"><a name="cmt_1">Issue #1<sup style="color:blue">Fixed</sup></a></h3>
+		<p>
+			Some browsers like FireFox have a bug on the non-breaking space character (U+00A0, <b>&amp;nbsp;</b> or <b>&amp;#160;</b> or
+			<b>&amp;#xA0;</b> in HTML).
+			They always convert the NBSP character to a normal space (U+0020, <b>&amp;#x20;</b> in HTML) automatically in the following circumstances:
+        </p>
+		<ul>
+			<li>Copy text from the page</li>
+			<li>Use <b>innerHTML</b> to get the content of a certain element</li>
+			<li>Use <b>value</b> to get an <b>INPUT</b> element's value</li>
+		</ul>
+
+		<p>
+			You cannot read a real NBSP character from an <b>INPUT</b> element on these browsers. It causes issues when some formatting data in CLDR
+			contains an NBSP character. For example,
+		</p>
+		<ul>
+			<li>Many locales like French use an NBSP character as a group separator in numbers</li>
+			<li>French and Finnish use NBSP characters in their percentage and currency format patterns respectively</li>
+		</ul>
+
+		<p>
+			So Dojo may generate formatted data with NBSP characters in it but cannot read NBSP charaters from user's input in some browser.
+		</p>
+
+		<h3 class="testTitle"><a name="cmt_2">Issue #2<sup style="color:blue">Fixed: the CLDR data generator should be fixed by adding code to convert U+200F to "\u200F" in nls JS files.</sup></a></h3>
+		<p>
+			Most Bidi currency symbols contain an LTR-MARK (U+200F) character at the very beginning.
+			But Firefox ignores it when it is not in any escaping form. This should be a bug of Firefox.
+			For example, click <a href="javascript:alert('�'.indexOf('\u200F'))"><code>alert('�'.indexOf('\u+200F'))</code></a> (there is a U+200F in the empty-looking string):
+		</p>
+		<ul>
+			<li>In Firefox, shows "-1" -- no U+200F found</li>
+			<li>In IE &amp; Opera, shows "0" -- the U+200F is found</li>
+		</ul>
+		<p>
+			But if the U+200F is in some escaping form, Firefox will work as well as other browsers.
+			Click <a href="javascript:alert('\u200F'.indexOf('\u200F'))"><code>alert('\u200F'.indexOf('\u+200F'))</code></a> to see the same result both in Firefox and IE:
+		</p>
+
+
+		<h3 class="testTitle"><a name="cmt_3">Issue #3<sup style="color:blue">Fixed: added a "localeDigit" to the options</sup></a></h3>
+		<p>
+			Strictly speaking, the data conversion must support non-European number characters in some locales like Arabic and Hindi.
+			For example, ICU formats a number data into Indic number characters by default in the Arabic locale.
+			However, currently Dojo does not support this feature (Dojo uses the default number conversion of the browser).
+		</p>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/i18n/date.html b/src/main/resources/static/dijit/tests/i18n/date.html
new file mode 100644
index 0000000000000000000000000000000000000000..7cf2a39de6b1bfc1a1ce8a29436da70485df2a30
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/date.html
@@ -0,0 +1,155 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Test DateTextBox</title>
+
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, extraLocale: ['zh-cn','fr-fr','ja-jp','ru-ru','en-us','de-de','es-es','it-it','pt-br','ko-kr','zh-tw']"></script>
+		<script type="text/javascript">
+			dojo.require("dijit.dijit"); // optimize: load dijit layer
+			dojo.require("dijit.form.NumberTextBox");
+			dojo.require("dijit.form.CurrencyTextBox");
+			dojo.require("dijit.form.DateTextBox");
+			dojo.require("dijit.form.ValidationTextBox");
+			dojo.require("dojo.date.locale");
+			dojo.require("dojo.date.stamp");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+			dojo.require("doh.runner");
+		</script>
+		<script src="test_i18n.js"></script>
+		<script type="text/javascript">
+			dojo.ready(function(){
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+				doh.register("t", getAllTestCases());
+				doh.run();
+			});
+		</script>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../../themes/claro/claro.css";
+			@import "../css/dijitTests.css";
+
+			.title {
+				background-color:#ddd;
+			}
+
+			.hint {
+				background-color:#eee;
+			}
+
+			.testExample {
+				background-color:#fbfbfb;
+				padding:1em;
+				margin-bottom:1em;
+				border:1px solid #bfbfbf;
+			}
+
+			.dojoTitlePaneLabel label {
+				font-weight:bold;
+			}
+
+			td {white-space:nowrap}
+		</style>
+		<script>
+			function gen4DateFormat(testCases, language, locale, date, short, shortCmt, medium, mediumCmt, long, longCmt, full, fullCmt){
+				testCases.push({
+				  attrs: {constraints: "{formatLength:'short'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Short</b>",
+				  value: date,
+				  expValue: short,
+				  comment: shortCmt
+				});
+				testCases.push({
+				  attrs: {constraints: "{formatLength:'medium'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Medium</b>",
+				  value: date,
+				  expValue: medium,
+				  comment: mediumCmt
+				});
+				testCases.push({
+				  attrs: {constraints: "{formatLength:'long'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Long</b>",
+				  value: date,
+				  expValue: long,
+				  comment: longCmt
+				});
+				testCases.push({
+				  attrs: {constraints: "{formatLength:'full'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Full</b>",
+				  value: date,
+				  expValue: full,
+				  comment: fullCmt
+				});
+			}
+		</script>
+	</head>
+
+	<body class="claro">
+		<h1 class="testTitle">Dijit TextBox Globalization Test for Date</h1>
+
+<!--		<h2 class="testTitle">Press the following button to start all test after this page is loaded.</h2>
+		<button id="startButton" onclick="startTest()">Start Test</button>-->
+		<p>
+			Before start this test, make sure the <b>dojo/cldr/nls</b> contains the data for "zh-cn", "fr-fr", "ja-jp", "ru-ru", "hi-in", "en-us" and "ar-eg". If not, convert these CLDR data and put them there.
+		</p>
+
+		<script>
+		(function(){
+			var testCases = [];
+			gen4DateFormat(testCases, "ru-ru", "ru_RU", "2005-07-31",
+				"31.07.05", "", "31.07.2005", "", "31 июл� 2005 г.", "Failed in Firefox. <a href='currency.html#cmt_1'>See #1 (currency.html).</a>", "31 июл� 2005 г.", "Failed in Firefox. <a href='currency.html#cmt_1'>See #1 (currency.html).</a>");
+			gen4DateFormat(testCases, "zh-cn", "zh_CN", "2005-07-31",
+				"05-7-31", "", "2005-7-31", "", "2005年7月31日", "", "2005年7月31日星期日", "");
+			gen4DateFormat(testCases, "en-us", "en_US", "2005-07-31",
+				"7/31/05", "", "Jul 31, 2005", "", "July 31, 2005", "", "Sunday, July 31, 2005", "");
+			gen4DateFormat(testCases, "fr-fr", "fr_FR", "2005-07-31",
+				"31/07/05", "", "31 juil. 2005", "", "31 juillet 2005", "", "dimanche 31 juillet 2005", "");
+			gen4DateFormat(testCases, "ja-jp", "ja_JP", "2005-07-31",
+				"05/07/31", "", "2005/07/31", "", "2005年7月31日", "", "2005年7月31日日曜日", "");
+			gen4DateFormat(testCases, "de-de", "de_DE", "2005-07-31",
+				"31.07.05", "", "31.07.2005", "", "31. Juli 2005", "", "Sonntag, 31. Juli 2005", "");
+			gen4DateFormat(testCases, "es-es", "es_ES", "2005-07-31",
+				"31/07/05", "", "31/07/2005", "", "31 de julio de 2005", "", "domingo 31 de julio de 2005", "");
+			gen4DateFormat(testCases, "pt-br", "pt-BR", "2005-07-31",
+				"31/07/05", "", "31/07/2005", "", "31 de julho de 2005", "", "domingo, 31 de julho de 2005", "");
+			gen4DateFormat(testCases, "it-it", "it-IT", "2005-07-31",
+				"31/07/05", "", "31/lug/2005", "", "31 luglio 2005", "", "domenica 31 luglio 2005", "");
+			gen4DateFormat(testCases, "ko-kr", "ko-KR", "2005-07-31",
+				"05. 7. 31.", "", "2005. 7. 31.", "", "2005년 7월 31�", "", "2005년 7월 31� �요�", "");
+			gen4DateFormat(testCases, "zh-tw", "zh-TW", "2005-07-31",
+				"2005/7/31", "", "2005/7/31", "", "2005年7月31日", "", "2005年7月31日星期日", "");
+			genFormatTestCases("Date Format", "dijit.form.DateTextBox", testCases);
+
+			testCases = [];
+			gen4DateFormat(testCases, "ru-ru", "ru_RU", new Date(2005, 6, 31),
+				"31.07.05", "", "31.07.2005", "", "31 июл� 2005&nbsp;г.", "Failed in Firefox. <a href='currency.html#cmt_1'>See #1 (currency.html).</a>", "31 июл� 2005&nbsp;г.", "Failed in Firefox. <a href='currency.html#cmt_1'>See #1 (currency.html).</a>");
+			gen4DateFormat(testCases, "zh-cn", "zh_CN", new Date(2005, 6, 31),
+				"05-7-31", "", "2005-7-31", "", "2005年7月31日", "", "2005年7月31日星期日", "");
+			gen4DateFormat(testCases, "en-us", "en_US", new Date(2005, 6, 31),
+				"7/31/05", "", "Jul 31, 2005", "", "July 31, 2005", "", "Sunday, July 31, 2005", "");
+			gen4DateFormat(testCases, "fr-fr", "fr_FR", new Date(2005, 6, 31),
+				"31/07/05", "", "31 juil. 2005", "", "31 juillet 2005", "", "dimanche 31 juillet 2005", "");
+			gen4DateFormat(testCases, "ja-jp", "ja_JP", new Date(2005, 6, 31),
+				"05/07/31", "", "2005/07/31", "", "2005年7月31日", "", "2005年7月31日日曜日", "");
+			gen4DateFormat(testCases, "de-de", "de_DE", new Date(2005, 6, 31),
+				"31.07.05", "", "31.07.2005", "", "31. Juli 2005", "", "Sonntag, 31. Juli 2005", "");
+			gen4DateFormat(testCases, "es-es", "es_ES", new Date(2005, 6, 31),
+				"31/07/05", "", "31/07/2005", "", "31 de julio de 2005", "", "domingo 31 de julio de 2005", "");
+			gen4DateFormat(testCases, "pt-br", "pt-BR", new Date(2005, 6, 31),
+				"31/07/05", "", "31/07/2005", "", "31 de julho de 2005", "", "domingo, 31 de julho de 2005", "");
+			gen4DateFormat(testCases, "it-it", "it-IT", new Date(2005, 6, 31),
+				"31/07/05", "", "31/lug/2005", "", "31 luglio 2005", "", "domenica 31 luglio 2005", "");
+			gen4DateFormat(testCases, "ko-kr", "ko-KR", new Date(2005, 6, 31),
+				"05. 7. 31.", "", "2005. 7. 31.", "", "2005년 7월 31�", "", "2005년 7월 31� �요�", "");
+			gen4DateFormat(testCases, "zh-tw", "zh-TW", new Date(2005, 6, 31),
+				"2005/7/31", "", "2005/7/31", "", "2005年7月31日", "", "2005年7月31日星期日", "");
+			genValidateTestCases("Date Validate", "dijit.form.DateTextBox", testCases);
+		})();
+		</script>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/i18n/digit.html b/src/main/resources/static/dijit/tests/i18n/digit.html
new file mode 100644
index 0000000000000000000000000000000000000000..e10c540fc514ec5b8d91f0f7776314450b2afcde
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/digit.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Test Hindi/Arabic numerals</title>
+
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, extraLocale: ['ar-eg','hi-in']"></script>
+		<script type="text/javascript">
+			dojo.require("dijit.dijit"); // optimize: load dijit layer
+			dojo.require("dijit.form.NumberTextBox");
+			dojo.require("dijit.form.CurrencyTextBox");
+			dojo.require("dijit.form.DateTextBox");
+			dojo.require("dijit.form.ValidationTextBox");
+			dojo.require("dojo.date.locale");
+			dojo.require("dojo.date.stamp");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+			dojo.require("doh.runner");
+		</script>
+		<script src="test_i18n.js"></script>
+		<script type="text/javascript">
+			dojo.ready(function(){
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+				doh.register("t", getAllTestCases());
+				doh.run();
+			});
+		</script>
+
+		<script>
+			function gen4DateFormat(testCases, language, locale, date, shortVal, shortCmt, mediumVal, mediumCmt, longVal, longCmt, fullVal, fullCmt){
+				testCases.push({
+				  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'short', localeDigit: true}" : "{formatLength:'short'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Short</b>",
+				  value: date,
+				  expValue: shortVal,
+				  comment: shortCmt
+				});
+				testCases.push({
+				  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'medium', localeDigit: true}" : "{formatLength:'medium'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Medium</b>",
+				  value: date,
+				  expValue: mediumVal,
+				  comment: mediumCmt
+				});
+				testCases.push({
+				  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'long', localeDigit: true}" : "{formatLength:'long'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Long</b>",
+				  value: date,
+				  expValue: longVal,
+				  comment: longCmt
+				});
+				testCases.push({
+				  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'full', localeDigit: true}" : "{formatLength:'full'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Full</b>",
+				  value: date,
+				  expValue: fullVal,
+				  comment: fullCmt
+				});
+			}
+		</script>
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../../themes/claro/claro.css";
+			@import "../css/dijitTests.css";
+
+			.title {
+				background-color:#ddd;
+			}
+
+			.hint {
+				background-color:#eee;
+			}
+
+			.testExample {
+				background-color:#fbfbfb;
+				padding:1em;
+				margin-bottom:1em;
+				border:1px solid #bfbfbf;
+			}
+
+			.dojoTitlePaneLabel label {
+				font-weight:bold;
+			}
+
+			td {white-space:nowrap}
+		</style>
+	</head>
+
+	<body class="claro">
+		<h1 class="testTitle">Dijit TextBox Globalization Test for Number</h1>
+
+<!--		<h2 class="testTitle">Press the following button to start all test after this page is loaded.</h2>
+		<button id="startButton" onclick="startTest()">Start Test</button>-->
+		<p>
+			Before start this test, make sure the <b>dojo/cldr/nls</b> contains the data for "ar-eg" and "hi-in". If not, convert these CLDR data and put them there.
+		</p>
+
+		<script>
+		(function(){
+
+			genFormatTestCases("Number Format", "dijit.form.NumberTextBox", [
+				{ attrs: {lang: "ar-eg"},
+				  desc: "Locale: ar_EG",
+				  value: "12345.067",
+				  expValue: "12Ù¬345Ù«067",
+				  comment: ""
+				},
+				{ attrs: {lang: "ar-eg"},
+				  desc: "Locale: ar_EG",
+				  value: "-12345.067",
+				  expValue: "12Ù¬345Ù«067-",
+				  comment: ""
+				},
+
+				{ attrs: {lang: "ar-eg", constraints: "{localeDigit: true}"},
+				  desc: "Locale: ar_EG",
+				  value: "12345.067",
+				  expValue: "١٢\u066C٣٤٥\u066B٠٦٧",
+				  comment: "<a href='currency.html#cmt_2'>See #2 (currency.html).</a>"
+				},
+				{ attrs: {lang: "ar-eg", constraints: "{localeDigit: true}"},
+				  desc: "Locale: ar_EG",
+				  value: "-12345.067",
+				  expValue: "١٢\u066C٣٤٥\u066B٠٦٧-",
+				  comment: "<a href='currency.html#cmt_2'>See #2 (currency.html).</a>"
+				},
+
+				{ attrs: {lang: "hi-in", constraints: "{localeDigit: true}"},
+				  desc: "Locale: hi_IN",
+				  value: "123456789.068",
+				  expValue: "१२,३४,५६,७८९.०६८",
+				  comment: "<a href='currency.html#cmt_2'>See #2 (currency.html).</a>"
+				},
+				{ attrs: {lang: "hi-in", constraints: "{localeDigit: true}"},
+				  desc: "Locale: hi_IN",
+				  value: "-123456789.068",
+				  expValue: "-१२,३४,५६,७८९.०६८",
+				  comment: "<a href='currency.html#cmt_2'>See #2 (currency.html).</a>"
+				}
+			]);
+
+			genValidateTestCases("Number Validate", "dijit.form.NumberTextBox", [
+
+				{ attrs: {lang: "ar-eg"},
+				  desc: "Locale: ar_EG",
+				  value: 12345.067,
+				  expValue: "12Ù¬345Ù«067",
+				  comment: ""
+				},
+				{ attrs: {lang: "ar-eg"},
+				  desc: "Locale: ar_EG",
+				  value: -12345.067,
+				  expValue: "12Ù¬345Ù«067-",
+				  comment: ""
+				},
+
+				{ attrs: {lang: "ar-eg", constraints: "{localeDigit: true}"},
+				  desc: "Locale: ar_EG",
+				  value: 12345.067,
+				  expValue: "١٢\u066C٣٤٥\u066B٠٦٧",
+				  comment: "<a href='currency.html#cmt_2'>See #2 (currency.html).</a>"
+				},
+				{ attrs: {lang: "ar-eg", constraints: "{localeDigit: true}"},
+				  desc: "Locale: ar_EG",
+				  value: -12345.067,
+				  expValue: "١٢\u066C٣٤٥\u066B٠٦٧-",
+				  comment: "<a href='currency.html#cmt_2'>See #2 (currency.html).</a>"
+				},
+
+				{ attrs: {lang: "hi-in", constraints: "{localeDigit: true}"},
+				  desc: "Locale: hi_IN",
+				  value: 123456789.068,
+				  expValue: "१२,३४,५६,७८९.०६८",
+				  comment: "<a href='currency.html#cmt_2'>See #2 (currency.html).</a>"
+				},
+				{ attrs: {lang: "hi-in", constraints: "{localeDigit: true}"},
+				  desc: "Locale: hi_IN",
+				  value: -123456789.068,
+				  expValue: "-१२,३४,५६,७८९.०६८",
+				  comment: "<a href='currency.html#cmt_2'>See #2 (currency.html).</a>"
+				}
+			]);
+
+			genFormatTestCases("Currency Format", "dijit.form.CurrencyTextBox", [
+
+				{ attrs: {Currency: "EGP", lang: "ar-eg"},
+				  desc: "Locale: <b>ar_EG</b> Currency: <b>EGP</b>",
+				  value: "123456789.46",
+				  expValue: "&#x062C;.&#x0645;.\u200F 123&#x066C;456&#x066C;789&#x066B;46",
+				  comment: ""
+				},
+				{ attrs: {Currency: "EGP", lang: "ar-eg"},
+				  desc: "Locale: <b>ar_EG</b> Currency: <b>EGP</b>",
+				  value: "-123456789.46",
+				  expValue: "&#x062C;.&#x0645;.\u200F 123&#x066C;456&#x066C;789&#x066B;46-",
+				  comment: ""
+				},
+
+				{ attrs: {Currency: "EGP", lang: "ar-eg", constraints: "{localeDigit: true}"},
+				  desc: "Locale: <b>ar_EG</b> Currency: <b>EGP</b>",
+				  value: "123456789.46",
+				  expValue: "&#x062C;.&#x0645;.\u200F ١٢٣\u066C٤٥٦\u066C٧٨٩\u066B٤٦",
+				  comment: "<a href='#cmt_3'>See #3.</a> Failed in Firefox. <a href='#cmt_2'>See #2.</a>"
+				},
+				{ attrs: {Currency: "EGP", lang: "ar-eg", constraints: "{localeDigit: true}"},
+				  desc: "Locale: <b>ar_EG</b> Currency: <b>EGP</b>",
+				  value: "-123456789.46",
+				  expValue: "&#x062C;.&#x0645;.\u200F ١٢٣\u066C٤٥٦\u066C٧٨٩\u066B٤٦-",
+				  comment: "<a href='#cmt_3'>See #3.</a> Failed in Firefox. <a href='#cmt_2'>See #2.</a>"
+				}
+			]);
+
+			genValidateTestCases("Currency Validate", "dijit.form.CurrencyTextBox", [
+
+				{ attrs: {Currency: "EGP", lang: "ar-eg"},
+				  desc: "Locale: <b>ar_EG</b> Currency: <b>EGP</b>",
+				  value: 123456789.46,
+				  expValue: "&#x062C;.&#x0645;.\u200F 123&#x066C;456&#x066C;789&#x066B;46",
+				  comment: "Failed in Firefox. <a href='#cmt_2'>See #2.</a>"
+				},
+				{ attrs: {Currency: "EGP", lang: "ar-eg"},
+				  desc: "Locale: <b>ar_EG</b> Currency: <b>EGP</b>",
+				  value: -123456789.46,
+				  expValue: "&#x062C;.&#x0645;.\u200F 123&#x066C;456&#x066C;789&#x066B;46-",
+				  comment: "Failed in Firefox. <a href='#cmt_2'>See #2.</a>"
+				},
+
+				{ attrs: {Currency: "EGP", lang: "ar-eg", constraints: "{localeDigit: true}"},
+				  desc: "Locale: <b>ar_EG</b> Currency: <b>EGP</b>",
+				  value: 123456789.46,
+				  expValue: "&#x062C;.&#x0645;.\u200F ١٢٣\u066C٤٥٦\u066C٧٨٩\u066B٤٦",
+				  comment: "<a href='#cmt_3'>See #3.</a> Failed in Firefox. <a href='#cmt_2'>See #2.</a>"
+				},
+				{ attrs: {Currency: "EGP", lang: "ar-eg", constraints: "{localeDigit: true}"},
+				  desc: "Locale: <b>ar_EG</b> Currency: <b>EGP</b>",
+				  value: -123456789.46,
+				  expValue: "&#x062C;.&#x0645;.\u200F ١٢٣\u066C٤٥٦\u066C٧٨٩\u066B٤٦-",
+				  comment: "<a href='#cmt_3'>See #3.</a> Failed in Firefox. <a href='#cmt_2'>See #2.</a>"
+				}
+			]);
+
+			var testCases = [];
+			gen4DateFormat(testCases, "ar-eg", "ar_EG", "2005-07-31",
+				"31/7/2005", "", "31/07/2005", "", "31 &#x064A;&#x0648;&#x0644;&#x064A;&#x0648;&#x2C; 2005", "", "&#x0627;&#x0644;&#x0623;&#x062D;&#x062F;&#x2C; 31 &#x064A;&#x0648;&#x0644;&#x064A;&#x0648;&#x2C; 2005", "");
+			gen4DateFormat(testCases, "hi-in", "hi_IN", "2005-07-31",
+				"२००५-०७-३१", "<a href='currency.html#cmt_3'>See #3 (currency.html).</a>", "२००५ ज�लाई ३१", "<a href='currency.html#cmt_3'>See #3 (currency.html).</a>", "२००५ ज�लाई ३१", "<a href='currency.html#cmt_3'>See #3 (currency.html).</a>", "रविवार, २००५ ज�लाई ३१", "<a href='currency.html#cmt_3'>See #3 (currency.html).</a>");
+			genFormatTestCases("Date Format", "dijit.form.DateTextBox", testCases);
+
+			testCases = [];
+			gen4DateFormat(testCases, "ar-eg", "ar_EG", new Date(2005, 6, 31),
+				"31/7/2005", "", "31/07/2005", "", "31 &#x064A;&#x0648;&#x0644;&#x064A;&#x0648;&#x2C; 2005", "", "&#x0627;&#x0644;&#x0623;&#x062D;&#x062F;&#x2C; 31 &#x064A;&#x0648;&#x0644;&#x064A;&#x0648;&#x2C; 2005", "");
+			gen4DateFormat(testCases, "hi-in", "hi_IN", new Date(2005, 6, 31),
+				"२००५-०७-३१", "<a href='currency.html#cmt_3'>See #3 (currency.html).</a>", "२००५ ज�लाई ३१", "<a href='currency.html#cmt_3'>See #3 (currency.html).</a>", "२००५ ज�लाई ३१", "<a href='currency.html#cmt_3'>See #3 (currency.html).</a>", "रविवार, २००५ ज�लाई ३१", "<a href='currency.html#cmt_3'>See #3 (currency.html).</a>");
+			genValidateTestCases("Date Validate", "dijit.form.DateTextBox", testCases);
+
+		})();
+
+		</script>
+	</body>
+</html>
+
+<!--
+				testCases.push({
+				  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'short', localeDigit: true}" : "{formatLength:'short'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Short</b>",
+				  value: date,
+				  expValue: short,
+				  comment: shortCmt
+				});
+				testCases.push({
+				  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'medium', localeDigit: true}" : "{formatLength:'medium'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Medium</b>",
+				  value: date,
+				  expValue: medium,
+				  comment: mediumCmt
+				});
+				testCases.push({
+				  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'long', localeDigit: true}" : "{formatLength:'long'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Long</b>",
+				  value: date,
+				  expValue: long,
+				  comment: longCmt
+				});
+				testCases.push({
+				  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'full', localeDigit: true}" : "{formatLength:'full'}", lang: language},
+				  desc: "Locale: <b>" + locale + "</b> Format: <b>Full</b>",
+				  value: date,
+				  expValue: full,
+				  comment: fullCmt
+-->
+
diff --git a/src/main/resources/static/dijit/tests/i18n/module.js b/src/main/resources/static/dijit/tests/i18n/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..6971b0b89486fd742c16ee3c55f6a299a1981b0e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/module.js
@@ -0,0 +1,10 @@
+define(["doh/main", "require"], function(doh, require){
+
+	doh.register("i18n.currency", require.toUrl("./currency.html"), 999999);
+	doh.register("i18n.date", require.toUrl("./date.html"), 999999);
+	doh.register("i18n.number", require.toUrl("./number.html"), 999999);
+	doh.register("i18n.textbox", require.toUrl("./textbox.html"), 999999);
+	doh.register("i18n.time", require.toUrl("./time.html"), 999999);
+	doh.register("i18n.digit", require.toUrl("./digit.html"), 999999);
+
+});
diff --git a/src/main/resources/static/dijit/tests/i18n/number.html b/src/main/resources/static/dijit/tests/i18n/number.html
new file mode 100644
index 0000000000000000000000000000000000000000..9a128db950183852a0efe51fad89e475cc938bc5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/number.html
@@ -0,0 +1,136 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Test NumberTextBox</title>
+
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, extraLocale: ['zh-cn','fr-fr']"></script>
+		<script type="text/javascript">
+			dojo.require("dijit.dijit"); // optimize: load dijit layer
+			dojo.require("dijit.form.NumberTextBox");
+			dojo.require("dijit.form.CurrencyTextBox");
+			dojo.require("dijit.form.DateTextBox");
+			dojo.require("dijit.form.ValidationTextBox");
+			dojo.require("dojo.date.locale");
+			dojo.require("dojo.date.stamp");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+			dojo.require("doh.runner");
+		</script>
+		<script src="test_i18n.js"></script>
+		<script type="text/javascript">
+			dojo.ready(function(){
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+				doh.register("t", getAllTestCases());
+				doh.run();
+			});
+		</script>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../../themes/claro/claro.css";
+			@import "../css/dijitTests.css";
+
+			.title {
+				background-color:#ddd;
+			}
+
+			.hint {
+				background-color:#eee;
+			}
+
+			.testExample {
+				background-color:#fbfbfb;
+				padding:1em;
+				margin-bottom:1em;
+				border:1px solid #bfbfbf;
+			}
+
+			.dojoTitlePaneLabel label {
+				font-weight:bold;
+			}
+
+			td {white-space:nowrap}
+		</style>
+	</head>
+
+	<body class="claro">
+		<h1 class="testTitle">Dijit TextBox Globalization Test for Number</h1>
+
+<!--		<h2 class="testTitle">Press the following button to start all test after this page is loaded.</h2>
+		<button id="startButton" onclick="startTest()">Start Test</button>-->
+		<p>
+			Before start this test, make sure the <b>dojo/cldr/nls</b> contains the data for "zh-cn", "fr-fr". If not, convert these CLDR data and put them there.
+		</p>
+
+		<script>
+		(function(){
+
+			genFormatTestCases("Number Format", "dijit.form.NumberTextBox", [
+
+				{ attrs: {lang: "zh-cn"},
+				  desc: "Locale: zh_CN",
+				  value: "12345.067",
+				  expValue: "12,345.067",
+				  comment: ""
+				},
+				{ attrs: {lang: "zh-cn"},
+				  desc: "Locale: zh_CN",
+				  value: "-12345.067",
+				  expValue: "-12,345.067",
+				  comment: ""
+				},
+
+				{ attrs: {lang: "fr-fr"},
+				  desc: "Locale: fr_FR",
+				  value: "12345.067",
+				  expValue: "12&nbsp;345,067",
+				  comment: ""
+				},
+				{ attrs: {lang: "fr-fr"},
+				  desc: "Locale: zh_CN",
+				  value: "-12345.067",
+				  expValue: "-12&nbsp;345,067",
+				  comment: ""
+				}
+			]);
+
+			genValidateTestCases("Number Validate", "dijit.form.NumberTextBox", [
+
+				{ attrs: {lang: "zh-cn"},
+				  desc: "Locale: zh_CN",
+				  value: 12345.067,
+				  expValue: "12,345.067",
+				  comment: ""
+				},
+				{ attrs: {lang: "zh-cn"},
+				  desc: "Locale: zh_CN",
+				  value: -12345.067,
+				  expValue: "-12,345.067",
+				  comment: ""
+				},
+
+				{ attrs: {lang: "fr-fr"},
+				  desc: "Locale: fr_FR",
+				  value: 12345.067,
+				  expValue: "12&nbsp;345,067",
+				  comment: ""
+				},
+				{ attrs: {lang: "fr-fr"},
+				  desc: "Locale: zh_CN",
+				  value: -12345.067,
+				  expValue: "-12&nbsp;345,067",
+				  comment: ""
+				}
+			]);
+
+		})();
+
+		</script>
+	</body>
+</html>
+
+
diff --git a/src/main/resources/static/dijit/tests/i18n/test_i18n.js b/src/main/resources/static/dijit/tests/i18n/test_i18n.js
new file mode 100644
index 0000000000000000000000000000000000000000..07aee3161fda6cd31c7f519f6a3c5230245a92b5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/test_i18n.js
@@ -0,0 +1,186 @@
+var validateValues = [];
+var formatWidgetCount = 0;
+var validateWidgetCount = 0;
+
+function getElementsById(id){
+	var result = [];
+
+	if(!id || typeof(id) != "string"){
+		return result;
+	}
+
+	var ae = document.getElementsByTagName(dojo.byId(id).tagName);
+	for(var i = 0; i < ae.length; i++){
+		if(ae[i].id == id){
+			result.push(ae[i]);
+		}
+	}
+	return result;
+}
+
+function getString(n){
+	return n && n.toString();
+}
+
+function startTest(t){
+	startTestFormat(t);
+	startTestValidate(t);
+}
+
+function getAllTestCases(){
+	var allTestCases = [];
+	for(var i = 0; i < formatWidgetCount; i++){
+		allTestCases.push({
+			name: "format-" + i,
+			runTest: new Function("t", "startTestFormat(" + i + ", t)")
+		});
+	}
+	for(i = 0; i < validateWidgetCount; i++){
+		allTestCases.push({
+			name: "validate-" + i,
+			runTest: new Function("t", "startTestValidate(" + i + ", t)")
+		});
+	}
+	return allTestCases;
+}
+
+function startTestFormat(i, t){
+	var test_node = dojo.doc.getElementById("test_display_" + i);
+	var exp = dojo.doc.getElementById("test_display_expected_" + i).value;
+	var res_node = dojo.doc.getElementById("test_display_result_" + i);
+	res_node.innerHTML = test_node.value;
+	res_node.style.backgroundColor = (test_node.value == exp) ? "#AFA" : "#FAA";
+	res_node.innerHTML += " <a style='font-size:0.8em' href='javascript:alert(\"Expected: " + encodeURIComponent(exp) + "\\n Result: " + encodeURIComponent(test_node.value) + "\")'>Compare (Escaped)</a>";
+	t.is(exp, test_node.value);
+}
+
+function startTestValidate(i, t){
+	var test_node = dojo.doc.getElementById("test_validate_" + i);
+	var inp_node = dojo.doc.getElementById("test_validate_input_" + i);
+	var exp = dojo.doc.getElementById("test_validate_expected_" + i).innerHTML;
+	var res_node = dojo.doc.getElementById("test_validate_result_" + i);
+	var val_node = dojo.doc.getElementById("test_display_value_" + i);
+
+	test_node.value = inp_node.value;
+
+	var widget = widget = dijit.getEnclosingWidget(test_node);
+
+	if(widget){
+		widget.focus();
+
+		var expected = validateValues[i];
+		var result = widget.getValue();
+		if(validateValues[i].processValue){
+			expected = validateValues[i].processValue(expected);
+			result = validateValues[i].processValue(result);
+		}
+		var parseCorrect = getString(expected) == getString(result);
+		val_node.style.backgroundColor = parseCorrect ?  "#AFA" : "#FAA";
+		val_node.innerHTML = getString(result) + (parseCorrect ? "" : "<br>Expected: " + getString(expected));
+
+		res_node.innerHTML = widget.isValid && !widget.isValid() ? "Wrong" : "Correct";
+		res_node.style.backgroundColor = res_node.innerHTML == exp ? "#AFA" : "#FAA";
+
+		t.is(getString(expected), getString(result));
+	}
+}
+
+function genFormatTestCase(desc, dojoType, dojoAttrs, value, expValue, comment){
+	var res = "";
+	res += "<tr>";
+	res += "<td>" + desc + "</td>";
+	res += "<td>";
+	res += "<input id='test_display_" + formatWidgetCount + "' type='text' value='" + value + "' ";
+	res += "dojoType='" + dojoType + "' ";
+	for(var attr in dojoAttrs){
+		res += attr + "=\"" + dojoAttrs[attr] + "\" ";
+	}
+	res += "/>";
+	res += "</td>";
+	res += "<td><input id='test_display_expected_" + formatWidgetCount + "' value='" + expValue + "'></td>";
+	res += "<td id='test_display_result_" + formatWidgetCount + "'></td>";
+	res += "<td style='white-space:normal'>" + comment + "</td>";
+	res += "</tr>";
+	formatWidgetCount++;
+	
+	return res;
+}
+/*
+[
+	{attrs: {currency: "CNY", lang: "zh-cn"}, desc: "", value:"-123456789.46", expValue: "", comment: ""},
+	...
+]
+*/
+function genFormatTestCases(title, dojoType, testCases){
+	var res = "";
+	res += "<h2 class=testTitle>" + title + "</h2>";
+	res += "<table border=1>";
+	res += "<tr>";
+	res += "<td class=title><b>Test Description</b></td>";
+	res += "<td class=title><b>Test</b></td>";
+	res += "<td class=title><b>Expected</b></td>";
+	res += "<td class=title><b>Result</b></td>";
+	res += "<td class=title><b>Comment</b></td>";
+	res += "</tr>";
+
+	for(var i = 0; i < testCases.length; i++){
+		var testCase = testCases[i];
+		res += genFormatTestCase(testCase.desc, dojoType, testCase.attrs, testCase.value, testCase.expValue, testCase.comment);
+	}
+
+	res += "</table>";
+	
+	dojo.place(res, dojo.body());
+}
+
+function genValidateTestCase(desc, dojoType, dojoAttrs, input, value, comment, isWrong){
+	var res = "";
+	res += "<tr>";
+	res += "<td>" + desc + "</td>";
+	res += "<td>";
+	res += "<input id='test_validate_" + validateWidgetCount + "' type='text' ";
+	res += "dojoType='" + dojoType + "' ";
+	for(var attr in dojoAttrs){
+		res += attr + "=\"" + dojoAttrs[attr] + "\" ";
+	}
+	res += "/>";
+	res += "</td>";
+	res += "<td><input id='test_validate_input_" + validateWidgetCount + "' value='" + input + "'></td>";
+	res += "<td id='test_display_value_" + validateWidgetCount + "'></td>";
+	res += "<td id='test_validate_expected_" + validateWidgetCount + "'>" + (isWrong ? "Wrong" : "Correct") + "</td>";
+	res += "<td id='test_validate_result_" + validateWidgetCount + "'></td>";
+	res += "<td style='white-space:normal'>" + comment + "</td>";
+	res += "</tr>";
+	validateValues.push(value);
+	validateWidgetCount++;
+	
+	return res;
+}
+/*
+[
+	{attrs: {currency: "CNY", lang: "zh-cn"}, desc: "", value:false, expValue: "-123456789.46", comment: ""},
+	...
+]
+*/
+function genValidateTestCases(title, dojoType, testCases){
+	var res = "";
+	res += "<h2 class=testTitle>" + title + "</h2>";
+	res += "<table border=1>";
+	res += "<tr>";
+	res += "<td class=title><b>Test Description</b></td>";
+	res += "<td class=title><b>Test</b></td>";
+	res += "<td class=title><b>Input</b></td>";
+	res += "<td class=title><b>Parsed Value</b></td>";
+	res += "<td class=title><b>Expected</b></td>";
+	res += "<td class=title><b>Result</b></td>";
+	res += "<td class=title><b>Comment</b></td>";
+	res += "</tr>";
+
+	for(var i = 0; i < testCases.length; i++){
+		var testCase = testCases[i];
+		res += genValidateTestCase(testCase.desc, dojoType, testCase.attrs, testCase.expValue, testCase.value, testCase.comment, testCase.isWrong);
+	}
+
+	res += "</table>";
+	dojo.place(res, dojo.body());
+}
diff --git a/src/main/resources/static/dijit/tests/i18n/textbox.html b/src/main/resources/static/dijit/tests/i18n/textbox.html
new file mode 100644
index 0000000000000000000000000000000000000000..9e1923774671a588ded41b089adec39bbfb0c461
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/textbox.html
@@ -0,0 +1,173 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Test TextBox</title>
+
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+		<script type="text/javascript">
+			dojo.require("dijit.dijit"); // optimize: load dijit layer
+			dojo.require("dijit.form.NumberTextBox");
+			dojo.require("dijit.form.CurrencyTextBox");
+			dojo.require("dijit.form.DateTextBox");
+			dojo.require("dijit.form.ValidationTextBox");
+			dojo.require("dojo.date.locale");
+			dojo.require("dojo.date.stamp");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+			dojo.require("doh.runner");
+		</script>
+		<script src="test_i18n.js"></script>
+		<script type="text/javascript">
+			dojo.ready(function(){
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+				doh.register("t", getAllTestCases());
+				doh.run();
+			});
+		</script>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../../themes/claro/claro.css";
+			@import "../css/dijitTests.css";
+
+			.title {
+				background-color:#ddd;
+			}
+
+			.hint {
+				background-color:#eee;
+			}
+
+			.testExample {
+				background-color:#fbfbfb;
+				padding:1em;
+				margin-bottom:1em;
+				border:1px solid #bfbfbf;
+			}
+
+			.dojoTitlePaneLabel label {
+				font-weight:bold;
+			}
+
+			td {white-space:nowrap}
+		</style>
+	</head>
+
+	<body class="claro">
+		<h1 class="testTitle">Dijit TextBox Globalization Test</h1>
+
+<!--		<h2 class="testTitle">Press the following button to start all test after this page is loaded.</h2>
+		<button id="startButton" onclick="startTest()">Start Test</button>-->
+
+		<script>
+		(function(){
+			genFormatTestCases("Natural Language Casing Mapping", "dijit.form.TextBox", [
+
+				{ attrs: {uppercase: "true"},
+				  desc: "Upper casing: Basic Latin",
+				  value: "abcdefghijklmnopqrstuvwxyz",
+				  expValue: "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+				  comment: ""
+				},
+
+				{ attrs: {uppercase: "true"},
+				  desc: "Upper casing: Latin with accents",
+				  value: "àáâãäåæçèéêëìíîïðñòóôõö",
+				  expValue: "À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖ",
+				  comment: ""
+				},
+
+				{ attrs: {uppercase: "true"},
+				  desc: "Upper casing: Turkish",
+				  value: "ıi",
+				  expValue: "IÄ°",
+				  comment: "<a href='#cmt_1'>See #1.</a>"
+				},
+
+				{ attrs: {uppercase: "true"},
+				  desc: "Upper casing: Russian",
+				  value: "абвгдежз",
+				  expValue: "�БВГДЕЖЗ",
+				  comment: ""
+				},
+
+				{ attrs: {uppercase: "true"},
+				  desc: "Upper casing: German",
+				  value: "ß",
+				  expValue: "SS",
+				  comment: "<a href='#cmt_1'>See #1.</a>"
+				},
+
+				{ attrs: {lowercase: "true"},
+				  desc: "Lower casing: Turkish",
+				  value: "IÄ°",
+				  expValue: "ıi",
+				  comment: "<a href='#cmt_1'>See #1.</a>"
+				},
+
+				{ attrs: {propercase: "true"},
+				  desc: "Title/Proper casing: Latin",
+				  value: "\u01F1abc",
+				  expValue: "\u01F2abc",
+				  comment: "<a href='#cmt_1'>See #1.</a>"
+				}
+			]);
+
+			genFormatTestCases("White-space Detecting", "dijit.form.TextBox", [
+
+				{ attrs: {trim: "true"},
+				  desc: "Normal space & tab",
+				  value: "   abc\t\t\t",
+				  expValue: "abc",
+				  comment: ""
+				},
+
+				{ attrs: {trim: "true"},
+				  desc: "NO-BREAK SPACE",
+				  value: "\u00A0abc\u00A0",
+				  expValue: "abc",
+				  comment: "Failed in IE. <a href='#cmt_2'>See #2.</a>"
+				},
+
+				{ attrs: {trim: "true"},
+				  desc: "EN QUAD",
+				  value: "\u2000abc\u2000",
+				  expValue: "abc",
+				  comment: "Failed in IE. <a href='#cmt_2'>See #2.</a>"
+				},
+
+				{ attrs: {trim: "true"},
+				  desc: "IDEOGRAPHIC SPACE",
+				  value: "\u3000abc\u3000",
+				  expValue: "abc",
+				  comment: "Failed in IE. <a href='#cmt_2'>See #2.</a>"
+				}
+
+
+			]);
+
+		})();
+		</script>
+
+		<h2 class="testTitle">Issues &amp; Comments </h2>
+		<a name="cmt_1"><h3 class="testTitle">Issue #1 <sup style="color:red">Not fixed. Avoid using this function of TextBox.</sup></h3></a>
+		<p>
+			Strictly speaking, all casing manipulation must use ICU case mapping rules (routine). However, the default JavaScript routines used by Dojo
+			do not support ICU case mapping rules in all browsers.
+		</p>
+
+		<a name="cmt_2"><h3 class="testTitle">Issue #2 <sup style="color:red">Not fixed. Avoid using this function of TextBox.</sup></h3></a>
+		<p>
+			Trimming must get rid of all Unicode characters with the white space property. However, the default JavaScript routines used by Dojo
+			do not support get character properties in some browsers like IE. Other browsers like Firefox might support trimming more white space
+			characters.
+		</p>
+
+	</body>
+</html>
+
+
diff --git a/src/main/resources/static/dijit/tests/i18n/time.html b/src/main/resources/static/dijit/tests/i18n/time.html
new file mode 100644
index 0000000000000000000000000000000000000000..ba9ddda19ec4bc61758c4131f430faf79ec21512
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/i18n/time.html
@@ -0,0 +1,168 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Test TextBox for Time</title>
+
+		<style type="text/css">
+			@import "../../themes/claro/document.css";
+			@import "../../themes/claro/claro.css";
+			@import "../css/dijitTests.css";
+
+			.title {
+				background-color:#ddd;
+			}
+
+			.hint {
+				background-color:#eee;
+			}
+
+			.testExample {
+				background-color:#fbfbfb;
+				padding:1em;
+				margin-bottom:1em;
+				border:1px solid #bfbfbf;
+			}
+
+			.dojoTitlePaneLabel label {
+				font-weight:bold;
+			}
+
+			td {white-space:nowrap}
+		</style>
+
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, extraLocale: ['zh-cn','fr-fr','ja-jp','ar-eg','ru-ru','hi-in','en-us']"></script>
+		<script type="text/javascript" src="test_i18n.js"></script>
+		<script type="text/javascript">
+			dojo.require("dijit.form.ValidationTextBox");
+			dojo.require("dojo.date.locale");
+			dojo.require("dojo.date.stamp");
+			dojo.require("dojo.date");
+			dojo.require("dojo.string");
+			dojo.require("dojo.number");
+			dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+			dojo.require("doh.runner");
+
+			dojo.ready(function(){
+				var tz_s = dojo.date.getTimezoneName(new Date());
+				if(!tz_s){
+					var offset = new Date().getTimezoneOffset();
+					var tz = [
+						(offset <= 0 ? "+" : "-"),
+						dojo.string.pad(Math.floor(Math.abs(offset) / 60), 2),
+						dojo.string.pad(Math.abs(offset) % 60, 2)
+					];
+					tz.splice(0, 0, "GMT");
+					tz.splice(3, 0, ":");
+					tz_s = tz.join("");
+				}
+	
+				function gen4DateFormat(testCases, language, locale, date, shortFmt, shortCmt, mediumFmt, mediumCmt, longFmt, longCmt, full, fullCmt){
+					var tz_l = language.indexOf("hi") == 0 && dojo.number.normalizeDigitChars ?
+						dojo.number.normalizeDigitChars(tz_s, language) : tz_s;
+	
+					shortFmt = shortFmt.replace(/UTC/, tz_l);
+					mediumFmt = mediumFmt.replace(/UTC/, tz_l);
+					longFmt = longFmt.replace(/UTC/g, tz_l);
+					full = full.replace(/UTC/, tz_l);
+	
+					var shortDate = null;
+					testCases.push({
+					  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'short', selector:'time', localeDigit:true}" : "{formatLength:'short', selector:'time'}",
+					  		lang: language},
+					  desc: "Locale: <b>" + locale + "</b> Format: <b>short</b>",
+					  value: typeof(date) == "string" ? date : shortDate = new Date(date.getYear(), date.getMonth(), date.getDay() - 5, date.getHours(), date.getMinutes()),
+					  expValue: shortFmt,
+					  comment: shortCmt
+					});
+					testCases.push({
+					  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'medium', selector:'time', localeDigit:true}" : "{formatLength:'medium', selector:'time'}",
+					  		lang: language},
+					  desc: "Locale: <b>" + locale + "</b> Format: <b>medium</b>",
+					  value: date,
+					  expValue: mediumFmt,
+					  comment: mediumCmt
+					});
+					testCases.push({
+					  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'long', selector:'time', localeDigit:true}" : "{formatLength:'long', selector:'time'}",
+					  		lang: language},
+					  desc: "Locale: <b>" + locale + "</b> Format: <b>long</b>",
+					  value: date,
+					  expValue: longFmt,
+					  comment: longCmt
+					});
+					testCases.push({
+					  attrs: {constraints: language.indexOf("hi") == 0 ? "{formatLength:'full', selector:'time', localeDigit:true}" : "{formatLength:'full', selector:'time'}",
+					  		lang: language},
+					  desc: "Locale: <b>" + locale + "</b> Format: <b>Full</b>",
+					  //value: typeof(date) == "string" || language.indexOf("fr") ? date : shortDate,
+					  value: date,
+					  expValue: full,
+					  comment: fullCmt
+					});
+	
+					date.processValue = function(value){
+						return value ? new Date(1970, 0, 1, value.getHours(), value.getMinutes(), value.getSeconds()) : value;
+					};
+					if(shortDate){
+						shortDate.processValue = date.processValue;
+					}
+				}
+
+				var testCases = [];
+				gen4DateFormat(testCases, "ru-ru", "ru_RU", "1970-01-01T15:25:35",
+					"15:25", "", "15:25:35", "", "15:25:35 UTC", "", "15:25:35 UTC", "");
+				gen4DateFormat(testCases, "zh-cn", "zh_CN", "1970-01-01T15:25:35",
+					"下�3:25", "", "下�03:25:35", "", "下�03时25分35秒", "", "下�03时25分35秒 UTC", "");
+				gen4DateFormat(testCases, "en-us", "en_US", "1970-01-01T15:25:35",
+					"3:25 PM", "", "3:25:35 PM", "", "3:25:35 PM UTC", "", "3:25:35 PM UTC", "");
+				gen4DateFormat(testCases, "fr-fr", "fr_FR", "1970-01-01T15:25:35",
+					"15:25", "", "15:25:35", "", "15:25:35 UTC", "", "15:25:35 UTC", "");
+				gen4DateFormat(testCases, "ja-jp", "ja_JP", "1970-01-01T15:25:35",
+					"15:25", "", "15:25:35", "", "15:25:35:UTC", "", "15時25分35秒UTC", "");
+				gen4DateFormat(testCases, "ar-eg", "ar_EG", "1970-01-01T15:25:35",
+					"3:25 \u0645", "", "3:25:35 \u0645", "", "UTC 3:25:35 \u0645", "", "UTC 3:25:35 \u0645", "");
+				gen4DateFormat(testCases, "hi-in", "hi_IN", "1970-01-01T15:25:35",
+					"१५:२५", "", "१५:२५:३५", "", "१५:२५:३५ UTC", " ", "१५:२५:३५ UTC", " ");
+
+				genFormatTestCases("Time Format", "dijit.form.TimeTextBox", testCases);
+	
+				testCases = [];
+				gen4DateFormat(testCases, "ru-ru", "ru_RU", new Date(1970, 0, 1, 15, 25, 35),
+					"15:25", "", "15:25:35", "", "15:25:35 UTC", "", "15:25:35 UTC", "");
+				gen4DateFormat(testCases, "zh-cn", "zh_CN", new Date(1970, 0, 1, 15, 25, 35),
+					"下�3:25", "", "下�03:25:35", "", "下�03时25分35秒", "", "下�03时25分35秒 UTC", "");
+				gen4DateFormat(testCases, "en-us", "en_US", new Date(1970, 0, 1, 15, 25, 35),
+					"3:25 PM", "", "3:25:35 PM", "", "3:25:35 PM UTC", "", "3:25:35 PM UTC", "");
+				gen4DateFormat(testCases, "fr-fr", "fr_FR", new Date(1970, 0, 1, 15, 25, 35),
+					"15:25", "", "15:25:35", "", "15:25:35 UTC", "", "15:25:35 UTC", "");
+				gen4DateFormat(testCases, "ja-jp", "ja_JP", new Date(1970, 0, 1, 15, 25, 35),
+					"15:25", "", "15:25:35", "", "15:25:35:UTC", "", "15時25分35秒UTC", "");
+				gen4DateFormat(testCases, "ar-eg", "ar_EG", new Date(1970, 0, 1, 15, 25, 35),
+					"3:25 \u0645", "", "3:25:35 \u0645", "", "UTC 3:25:35 \u0645", "", "UTC 3:25:35 \u0645", "");
+				gen4DateFormat(testCases, "hi-in", "hi_IN", new Date(1970, 0, 1, 15, 25, 35),
+					"१५:२५", "", "१५:२५:३५", "", "१५:२५:३५ UTC", " ", "१५:२५:३५ UTC", " ");
+				genValidateTestCases("Time Validate", "dijit.form.TimeTextBox", testCases);
+
+				doh.register("parse", function(){
+					dojo.parser.parse();
+				});
+
+				doh.register("t", getAllTestCases());
+
+				doh.run();
+			});
+		</script>
+	</head>
+
+	<body class="claro">
+		<h1 class="testTitle">Dijit TextBox Globalization Test for Time</h1>
+
+		<p>
+			Before start this test, make sure the <b>dojo/cldr/nls</b> contains the data for "zh-cn", "fr-fr", "ja-jp", "ru-ru", "hi-in", "en-us" and "ar-eg". If not, convert these CLDR data and put them there.
+		</p>
+	</body>
+</html>
+
diff --git a/src/main/resources/static/dijit/tests/images/arrowSmall.gif b/src/main/resources/static/dijit/tests/images/arrowSmall.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8459ffaf8511531852c36cf946ad6b33f94cf2e4
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/arrowSmall.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/copy.gif b/src/main/resources/static/dijit/tests/images/copy.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3fa0366ec9b77722f1c3191fea43fccdb1dd3256
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/copy.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/cut.gif b/src/main/resources/static/dijit/tests/images/cut.gif
new file mode 100644
index 0000000000000000000000000000000000000000..27d2dd6532a0e42ca1878fd3e52549ddbe2b18d8
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/cut.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/flatScreen.gif b/src/main/resources/static/dijit/tests/images/flatScreen.gif
new file mode 100644
index 0000000000000000000000000000000000000000..05edd7251d92fa3979e8f83ae82f32f9b3d8ca35
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/flatScreen.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/folderIcons.gif b/src/main/resources/static/dijit/tests/images/folderIcons.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d0b1760ac7efccdfbfd561d068eaf5264ff22f7d
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/folderIcons.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/folderIcons.png b/src/main/resources/static/dijit/tests/images/folderIcons.png
new file mode 100644
index 0000000000000000000000000000000000000000..f333fbea54399cc5ff044ebd0f486cc1d637cf4c
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/folderIcons.png differ
diff --git a/src/main/resources/static/dijit/tests/images/note.gif b/src/main/resources/static/dijit/tests/images/note.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ae5c62196b2b1823fc9e2bc4ebe6faf40106b522
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/note.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/paste.gif b/src/main/resources/static/dijit/tests/images/paste.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4862a28699cd54e6c94821cc26eaf1506d646b6e
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/paste.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/plus.gif b/src/main/resources/static/dijit/tests/images/plus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0e92383a1bb2d7c55508eb9ea99a80da96dc774d
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/plus.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/testsBodyBg.gif b/src/main/resources/static/dijit/tests/images/testsBodyBg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4e0b4a7d6b16368281dd1278078b9e9904cc21b9
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/testsBodyBg.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/tube.gif b/src/main/resources/static/dijit/tests/images/tube.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b5065132cfacfa8dcf4a581d2b92307915083c90
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/tube.gif differ
diff --git a/src/main/resources/static/dijit/tests/images/tubeTall.gif b/src/main/resources/static/dijit/tests/images/tubeTall.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e4fdb8b2d0fa9ac2041197a94d5b07ca2bd0210d
Binary files /dev/null and b/src/main/resources/static/dijit/tests/images/tubeTall.gif differ
diff --git a/src/main/resources/static/dijit/tests/infrastructure-module.js b/src/main/resources/static/dijit/tests/infrastructure-module.js
new file mode 100644
index 0000000000000000000000000000000000000000..d6e1db08301949aa534c3696b14f141b0a5f0ed3
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/infrastructure-module.js
@@ -0,0 +1,51 @@
+define(["doh/main", "require", "dojo/sniff"], function(doh, require, has){
+
+	var test_robot = has("trident") || has("ff") || has("chrome") < 45;
+
+	// Utility methods (previously in dijit/_base)
+	doh.register("registry", require.toUrl("./registry.html"), 999999);
+	doh.register("focus", require.toUrl("./focus.html"), 999999);
+	doh.register("place", require.toUrl("./place.html"), 999999);
+	doh.register("place-margin", require.toUrl("./place-margin.html"), 999999);
+	doh.register("place-clip", require.toUrl("./place-clip.html"), 999999);
+	doh.register("popup", require.toUrl("./popup.html"), 999999);
+	doh.register("a11y", require.toUrl("./a11y.html"), 999999);
+	if(test_robot){
+		doh.register("robot.typematic", require.toUrl("./robot/typematic.html"), 999999);
+	}
+
+	// _Widget
+	doh.register("_Widget-lifecycle", require.toUrl("./_Widget-lifecycle.html"), 999999);
+	doh.register("_Widget-attr", require.toUrl("./_Widget-attr.html"), 999999);
+	doh.register("_Widget-subscribe", require.toUrl("./_Widget-subscribe.html"), 999999);
+	doh.register("_Widget-placeAt", require.toUrl("./_Widget-placeAt.html"), 999999);
+	doh.register("_Widget-on", require.toUrl("./_Widget-on.html"), 999999);
+	if(test_robot){
+		doh.register("robot._Widget-deferredConnect", require.toUrl("./robot/_Widget-deferredConnect.html"), 999999);
+		doh.register("robot._Widget-ondijitclick_mouse", require.toUrl("./robot/_Widget-ondijitclick_mouse.html"), 999999);
+		doh.register("robot._Widget-ondijitclick_a11y", require.toUrl("./robot/_Widget-ondijitclick_a11y.html"), 999999);
+	}
+
+	// _Templated and other mixins
+	doh.register("_AttachMixin", require.toUrl("./_AttachMixin.html"), 999999);
+	doh.register("_TemplatedMixin", require.toUrl("./_TemplatedMixin.html"), 999999);
+	doh.register("_WidgetsInTemplateMixin", require.toUrl("./_WidgetsInTemplateMixin.html"), 999999);
+	doh.register("_Templated-widgetsInTemplate1.x", require.toUrl("./_Templated-widgetsInTemplate1.x.html"), 999999);
+	doh.register("_Container", require.toUrl("./_Container.html"), 999999);
+	doh.register("_KeyNavContainer", require.toUrl("./_KeyNavContainer.html"), 999999);
+	if(test_robot){
+		doh.register("robot._KeyNavContainer", require.toUrl("./robot/_KeyNavContainer.html"), 999999);
+	}
+	doh.register("_HasDropDown", require.toUrl("./_HasDropDown.html"), 999999);
+
+	doh.register("Declaration", require.toUrl("./test_Declaration.html"), 999999);
+	doh.register("Declaration_1.x", require.toUrl("./test_Declaration_1.x.html"), 999999);
+
+	// Miscellaneous
+	doh.register("NodeList-instantiate", require.toUrl("./NodeList-instantiate.html"), 999999);
+	doh.register("Destroyable", require.toUrl("./Destroyable.html"), 999999);
+	if(test_robot){
+		doh.register("robot.BgIframe", require.toUrl("./robot/BgIframe.html"), 999999);
+	}
+
+});
diff --git a/src/main/resources/static/dijit/tests/layout/AccordionContainer.html b/src/main/resources/static/dijit/tests/layout/AccordionContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..c0d97f01b9c26f37ad98ad67ea9ea23e00d15dd2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/AccordionContainer.html
@@ -0,0 +1,506 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Accordion Widget Automated Test</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array", "dojo/data/ItemFileReadStore", "dojo/dom", "dojo/dom-geometry", "dojo/dom-style",
+			"dojo/parser", "dojo/query",
+			"dijit/registry", "dijit/layout/AccordionContainer", "dijit/layout/ContentPane", "dijit/_WidgetBase",
+			"dijit/Tree", "dijit/tree/ForestStoreModel", "dijit/form/Button", "dojo/domReady!"
+		], function(doh, array, ItemFileReadStore, dom, domGeom, domStyle, parser, query,
+					registry, AccordionContainer, ContentPane, _WidgetBase){
+
+			// Data used by Tree in markup test
+			data = {
+				identifier: 'id',
+				label: 'name',
+				items: [
+					{ id: 'AF', name:'Africa', type:'continent', population:'900 million', area: '30,221,532 sq km',
+							timezone: '-1 UTC to +4 UTC'},
+					{ id: 'AS', name:'Asia', type:'continent' },
+					{ id: 'OC', name:'Oceania', type:'continent', population:'21 million'},
+					{ id: 'AU', name:'Australia', type:'country', population:'21 million'},
+					{ id: 'EU', name:'Europe', type:'continent' },
+					{ id: 'NA', name:'North America', type:'continent' },
+					{ id: 'SA', name:'South America', type:'continent' }
+				]
+			};
+	
+			var accordion;
+
+			doh.register("basic",
+				[
+					{
+						name: "create",
+						runTest: function(t){
+							accordion = new AccordionContainer({style: "width: 400px; height: 400px;"}).placeAt(document.body);
+
+							array.forEach([ "pane 1", "pane 2", "pane 3" ], function(title, i){
+								var content = new ContentPane({id: title, title: title, selected: i==1});
+								content.containerNode.innerHTML = "this is " + title;
+								accordion.addChild(content);
+							});
+							accordion.startup();
+							var titles = query(".dijitAccordionText", accordion.domNode);
+							t.is(3, titles.length, "number of titles");
+							t.is("pane 3", titles[2].innerHTML);
+
+							var children = accordion.getChildren();
+							t.is(3, children.length, "number of children (ie, contentpanes)");
+						}
+					},
+					{
+						name: "initially open pane",
+						runTest: function(t){
+							// Pane 2 is initially open
+							var openPanes = query(".dijitAccordionChildWrapper > *", accordion.containerNode).filter(function(node){
+								return node.parentNode.style.display != "none";
+							});
+							t.is(1, openPanes.length, "exactly one open pane");
+							t.is("pane 2", registry.byNode(openPanes[0]).title, "pane 2 is initially open");
+
+							// And others are closed
+							var closedPanes = query(".dijitAccordionChildWrapper > *", accordion.containerNode).filter(function(node){
+								return node.parentNode.style.display == "none";
+							});
+							t.is(2, closedPanes.length, "n-1 closed panes");
+						}
+					},
+					{
+						name: "addChild at end",
+						runTest: function(t){
+							var pane4 = new ContentPane({title: "pane 4", content: "this is pane 4"});
+							accordion.addChild(pane4);
+
+							var titles = query(".dijitAccordionText", accordion.domNode);
+							t.is(4, titles.length, "number of titles");
+							t.is("pane 4", titles[3].innerHTML);
+
+							var children = accordion.getChildren();
+							t.is(4, children.length, "number of children (ie, contentpanes)");
+							t.is(pane4, children[3], "last child is the newly inserted one");
+						}
+					},
+					{
+						name: "addChild after pane 1",
+						runTest: function(t){
+							pane1half = new ContentPane({id: "pane1half", title: "pane 1.5", content: "this is pane 1.5"});
+							accordion.addChild(pane1half, 1);
+
+							var titles = query(".dijitAccordionText", accordion.domNode);
+							t.is(5, titles.length, "number of titles");
+							t.is("pane 1.5", titles[1].innerHTML);
+
+							var children = accordion.getChildren();
+							t.is(5, children.length, "number of children (ie, contentpanes)");
+							t.is(pane1half, children[1], "second child is the newly inserted one");
+						}
+					},
+					{
+						name: "removeChild(pane 1.5)",
+						runTest: function(t){
+							accordion.removeChild(registry.byId('pane1half'));
+
+							var titles = query(".dijitAccordionText", accordion.domNode);
+							t.is(4, titles.length, "number of titles");
+							t.is("pane 2", titles[1].innerHTML);
+
+							var children = accordion.getChildren();
+							t.is(4, children.length, "number of children (ie, contentpanes)");
+							t.is("pane 2", children[1].title, "second child is again 'pane 2'");
+							
+							// spec is that removing a child shouldn't delete it
+							t.t(registry.byId("pane1half"), "child removed but still exists");
+						}
+					},
+					{
+						name: "initially open pane (checking again)",
+						runTest: function(t){
+							// Pane 2 is initially open
+							var openPanes = query(".dijitAccordionChildWrapper > *", accordion.containerNode).filter(function(node){
+								return node.parentNode.style.display != "none";
+							});
+							t.is(1, openPanes.length, "exactly one open pane");
+							t.is("pane 2", registry.byNode(openPanes[0]).title, "pane 2 is initially open");
+
+							// And others are closed
+							var closedPanes = query(".dijitAccordionChildWrapper > *", accordion.containerNode).filter(function(node){
+								return node.parentNode.style.display == "none";
+							});
+							t.is(3, closedPanes.length, "n-1 closed panes");
+						}
+					},
+					{
+						name: "select new pane",
+						runTest: function(t){
+							// Selecting pane 3 should open it and close pane 1
+
+							// select w/out animation
+							accordion.selectChild(registry.byId('pane 3'));
+
+							// Pane 3 is now open
+							var openPanes = query(".dijitAccordionChildWrapper > *", accordion.containerNode).filter(function(node){
+								return node.parentNode.style.display != "none";
+							});
+							t.is(1, openPanes.length, "exactly one open pane");
+							t.is("pane 3", registry.byNode(openPanes[0]).title, "pane 3 is now open");
+
+							// And others are closed
+							var closedPanes = query(".dijitAccordionChildWrapper > *", accordion.containerNode).filter(function(node){
+								return node.parentNode.style.display == "none";
+							});
+							t.is(3, closedPanes.length, "n-1 closed panes");
+						}
+					},
+					{
+						name: "select new pane with animation",
+						timeout: 3000,
+						setUp: function(t){
+							// Note that this kicks off an animation so it might be a while before the
+							// bottom setTimeout() fires, likely longer than the 300ms specified
+							accordion.selectChild(registry.byId('pane 2'), true);
+						},
+						runTest: function(t){
+							// Selecting pane 2 should open it and close pane 3
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								// Pane 2 is now open
+								var openPanes = query(".dijitAccordionChildWrapper > *", accordion.containerNode).filter(function(node){
+									return node.parentNode.style.display != "none";
+								});
+								t.is(1, openPanes.length, "exactly one open pane");
+								t.is("pane 2", registry.byNode(openPanes[0]).title, "pane 3 is now open");
+
+								// And others are closed
+								var closedPanes = query(".dijitAccordionChildWrapper > *", accordion.containerNode).filter(function(node){
+									return node.parentNode.style.display == "none";
+								});
+								t.is(3, closedPanes.length, "n-1 closed panes");
+							}), 300);
+							return d;
+						}
+					},
+					{
+						name: "destroy recursive",
+						runTest: function(t){
+							accordion.destroyRecursive();
+							t.is(1, registry.toArray().length, "accordion and subwidgets destroyed, pane1half remains");
+						}
+					}
+				]
+			);
+
+			doh.register("child events", function childEvents(t){
+				accordion = new AccordionContainer({style: "width: 400px; height: 400px;"}).placeAt(document.body);
+
+				array.forEach([ "a", "b", "c" ], function(title, i){
+					var content = new ContentPane({id: title, title: title, selected: i==1});
+					content.containerNode.innerHTML = "this is " + title;
+					accordion.addChild(content);
+				});
+				accordion.startup();
+
+				// Change title of a pane, should change corresponding button label			
+				registry.byId("b").set("title", "b changed");
+				var titles = query(".dijitAccordionText", accordion.domNode);
+				t.is(3, titles.length, "number of titles");
+				t.is("b changed", titles[1].innerHTML);
+
+				// Change tooltip of a pane, should change corresponding button tooltip			
+				registry.byId("c").set("tooltip", "c tooltip changed");
+				titles = query(".dijitAccordionText", accordion.domNode);
+				t.is(3, titles.length, "number of titles");
+				t.is("c tooltip changed", titles[2].title);
+			});
+
+			doh.register("zero children",
+				[
+					{
+						name: "create w/no children",
+						runTest: function(t){
+							accordion = new AccordionContainer({style: "width: 400px; height: 400px;"}).placeAt(document.body);
+							accordion.startup();
+							var children = accordion.getChildren();
+							t.is(0, children.length, "no children");
+							accordion.resize();
+							t.t(true, "resize ran w/out exception");
+						}
+					},
+					{
+						name: "add children",
+						runTest: function(t){
+							array.forEach([ "pane 10", "pane 11"], function(title, i){
+								var content = new ContentPane({id: title, title: title});
+								content.containerNode.innerHTML = "this is " + title;
+								accordion.addChild(content);
+							});
+							var children = accordion.getChildren();
+							t.is(2, children.length, "2 children");
+						}
+					},
+					{
+						name: "remove all children",
+						runTest: function(t){
+							var pane10 = registry.byId("pane 10"),
+								pane11 = registry.byId("pane 11");
+
+							t.is(pane10, accordion.selectedChildWidget, "pane 10 initially selected");
+
+							accordion.removeChild(pane10);
+							t.is(pane11, accordion.selectedChildWidget, "after pane 10 removed, pane 11 selected");
+
+							accordion.removeChild(pane11);
+							t.f(accordion.selectedChildWidget, "after pane 11 removed, no pane selected");
+							var children = accordion.getChildren();
+							t.is(0, children.length, "all children removed");
+						}
+					},
+					{
+						name: "add back children",
+						runTest: function(t){
+							array.forEach([ "pane 12", "pane 13"], function(title, i){
+								var content = new ContentPane({id: title, title: title});
+								content.containerNode.innerHTML = "this is " + title;
+								accordion.addChild(content);
+							});
+
+							var children = accordion.getChildren();
+							t.is(2, children.length, "two new children");
+							t.is(registry.byId("pane 12"), accordion.selectedChildWidget, "pane 12 selected");
+						}
+					}
+				]
+			);
+
+			// This section tests that the animation doesn't leave residual height=... settings on the
+			// node that interfere with future operations
+			doh.register("animation",
+				[
+					{
+						name: "create",
+						runTest: function(t){
+							accordion = new AccordionContainer({style: "width: 400px; height: 400px;"}).placeAt(document.body);
+
+							array.forEach([ "pane 1", "pane 2", "pane 3" ], function(title, i){
+								var content = new ContentPane({id: title, title: title, selected: i==1});
+								content.containerNode.innerHTML = "this is " + title;
+								accordion.addChild(content);
+							});
+							accordion.startup();
+
+							// make sure size of selected child is correct						
+							doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h > 300, "child height > 300");
+							doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h < 400, "child height < 400");
+							doh.is(domGeom.getMarginBox(accordion.selectedChildWidget.domNode).h,
+									domGeom.getContentBox(accordion.selectedChildWidget._wrapperWidget.containerNode).h, "child height vs. wrapper height")
+						}
+					},
+					{
+						name: "select new pane with animation",
+						timeout: 3000,
+						setUp: function(t){
+							// Note that this kicks off an animation so it might be a while before the
+							// bottom setTimeout() fires, likely longer than the 300ms specified
+							accordion.selectChild(registry.byId('pane 2'), true);
+						},
+						runTest: function(t){
+							// Selecting pane 2 should open it and close pane 3
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("pane 2", accordion.selectedChildWidget.title);
+
+								// make sure size of selected child is correct						
+								doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h > 300, "child height > 300");
+								doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h < 400, "child height < 400");
+								doh.is(domGeom.getMarginBox(accordion.selectedChildWidget.domNode).h, domGeom.getContentBox(accordion.selectedChildWidget._wrapperWidget.containerNode).h, "child height vs. wrapper height")
+							}), 300);
+							return d;
+						}
+					},
+
+					// Make sure that the animation didn't leave a residual height: 1px that affect
+					// pane #1 when it is reselected w/out an animation
+					{
+						name: "remove pane #2, reselecting pane #1",
+						runTest: function(t){
+							accordion.removeChild(registry.byId("pane 2"));
+
+							doh.is("pane 1", accordion.selectedChildWidget.title);
+
+							// make sure size of selected child is correct						
+							doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h > 300, "child height > 300");
+							doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h < 400, "child height < 400");
+							doh.is(domGeom.getMarginBox(accordion.selectedChildWidget.domNode).h, domGeom.getContentBox(accordion.selectedChildWidget._wrapperWidget.containerNode).h, "child height vs. wrapper height")
+						}
+					},
+					{
+						name: "select pane #3 with animation",
+						timeout: 3000,
+						setUp: function(t){
+							// Note that this kicks off an animation so it might be a while before the
+							// bottom setTimeout() fires, likely longer than the 300ms specified
+							accordion.selectChild(registry.byId('pane 3'), true);
+						},
+						runTest: function(t){
+							// Selecting pane 2 should open it and close pane 3
+							var d = new doh.Deferred();
+							setTimeout(d.getTestCallback(function(){
+								doh.is("pane 3", accordion.selectedChildWidget.title);
+
+								// make sure size of selected child is correct						
+								doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h > 300, "child height > 300");
+								doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h < 400, "child height < 400");
+								doh.is(domGeom.getMarginBox(accordion.selectedChildWidget.domNode).h, domGeom.getContentBox(accordion.selectedChildWidget._wrapperWidget.containerNode).h, "child height vs. wrapper height")
+							}), 300);
+							return d;
+						}
+					},
+
+					// Make sure that the wipe-in animation didn't leave a residual height: 300px type
+					// setting that will interfere with resizing
+					{
+						name: "resize",
+						timeout: 3000,
+						runTest: function(t){
+							accordion.resize({h: 200});
+
+							// make sure size of selected child is correct						
+							doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h > 100, "child height > 150");
+							doh.t(domGeom.position(accordion.selectedChildWidget.domNode).h < 200, "child height < 200");
+							doh.is(domGeom.getMarginBox(accordion.selectedChildWidget.domNode).h, domGeom.getContentBox(accordion.selectedChildWidget._wrapperWidget.containerNode).h, "child height vs. wrapper height")
+						}
+					}
+				]
+			);
+
+			doh.register("destroy", [
+				function setUp(){
+					accPane = new ContentPane({
+						id: "accPane",
+						onContentError: function(msg){
+							throw new Error(msg);
+						}
+					});
+					accPane.placeAt(document.body);
+					html='<div data-dojo-type="dijit/layout/AccordionContainer" id="Accordion" style="height: 300px;">' +
+						 	'<div data-dojo-type="dijit/layout/ContentPane" title="first" id="first">' +
+								'<div data-dojo-type=dijit/form/Button id=myButton>hello world</div></div>' +
+						 	'<div data-dojo-type="dijit/layout/ContentPane" title="second" id="second">second</div>' +
+							'</div>';
+				},
+
+				function destroyUnstarted(){
+					// Since the wrapper ContentPane hasn't been started yet, the Accordion won't be started, and wrapper
+					// (AccordionInnerContainer) widgets won't be created...
+					accPane.set("content", html);
+					doh.t(dom.byId("Accordion"), "accordion created #1");
+					accPane.set("content", html); //setting the content twice will initiate a destroy
+					registry.byId("Accordion").destroy();
+					doh.is(undefined, dom.byId("Accordion"), "accordion destroyed #1");
+				},
+				
+				function destroyStarted(){
+					// Try same tests again when wrapper ContentPane is started
+					accPane.startup();
+
+					accPane.set("content", html);
+					doh.t(dom.byId("Accordion"), "accordion created #2");
+					accPane.set("content", html); //setting the content twice will initiate a destroy
+					registry.byId("Accordion").destroy();
+					doh.is(undefined, dom.byId("Accordion"), "accordion destroyed #2");
+				}
+			]);
+
+			doh.register("markup", [
+				{
+					name: "create",
+					runTest: function(t){
+						parser.parse();
+
+						accordion = registry.byId("markupAccordion");
+
+						var titles = query(".dijitAccordionText", accordion.domNode);
+						t.is(3, titles.length, "number of titles");
+						t.is("Other Lazy Load Pane", titles[2].innerHTML);
+
+						var children = accordion.getChildren();
+						t.is(3, children.length, "number of children (ie, contentpanes)");
+					}
+				},
+				{
+					name: "addChild after pane 1",
+					runTest: function(t){
+						pane1half = new ContentPane({id: "otherPane1half", title: "pane 1.5", content: "this is pane 1.5"});
+						accordion.addChild(pane1half, 1);
+
+						var titles = query(".dijitAccordionText", accordion.domNode);
+						t.is(4, titles.length, "number of titles");
+						t.is("pane 1.5", titles[1].innerHTML);
+
+						var children = accordion.getChildren();
+						t.is(4, children.length, "number of children (ie, contentpanes)");
+						t.is(pane1half, children[1], "second child is the newly inserted one");
+					}
+				}
+			]);
+
+			doh.register("resize", [
+				{
+					name: "no resize() method",
+					runTest: function(t){
+						accordion = new AccordionContainer({style: "width: 400px; height: 400px;"}).placeAt(document.body);
+
+						var child = new _WidgetBase({
+							id: "no resize",
+							title: "No Resize"
+						});
+						accordion.addChild(child);
+						accordion.startup();
+						t.t(domStyle.get(child.domNode, "height") > 300, "child resized");
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" style="padding: 50px;" role="main">
+
+	<h1 class="testTitle">AccordionContainer Automated Tests</h1>
+
+	<h2 class="testTitle">Markup Accordion</h2>
+
+	<div data-dojo-type="dojo/data/ItemFileReadStore" data-dojo-id="continentStore" data="data"></div>
+	<div data-dojo-type="dijit/tree/ForestStoreModel" data-dojo-id="continentModel"
+		store="continentStore" query="{type:'continent'}"
+		rootId="continentRoot" rootLabel="Continents" childrenAttrs="children">
+	</div>
+
+
+	<div id="markupAccordion" data-dojo-type="dijit/layout/AccordionContainer"
+		 data-dojo-props='style:"width: 400px; height: 300px; overflow: hidden"'>
+		<div id="pane1" data-dojo-type="dijit/Tree" model="continentModel" data-dojo-props='selected:true,
+			title:"Tree Pane", iconClass:"dijitEditorIcon dijitEditorIconSave", tooltip:"tooltip for simple pane"'>
+		</div>
+
+		<!-- test lazy loading.   margin style for testing size calculations. -->
+		<div id="lazyLoadPane1" data-dojo-type="dijit/layout/ContentPane"
+			 data-dojo-props='title:"Lazy Load Pane", href:"doc1.html"'></div>
+
+		<!-- test lazy loading.   margin style for testing size calculations. -->
+		<div id="lazyLoadPane2" data-dojo-type="dijit/layout/ContentPane"
+			 data-dojo-props='title:"Other Lazy Load Pane", href:"doc1.html"'></div>
+
+	</div>
+
+	<h2 class="testTitle">Programmatic Accordions</h2>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/BorderContainer.html b/src/main/resources/static/dijit/tests/layout/BorderContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..1e8070f0f276e3f4dcaeedd72fd25a66f9e4a8b2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/BorderContainer.html
@@ -0,0 +1,327 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+<title>BorderContainer DOH Test</title>
+
+<script type="text/javascript" src="../boilerplate.js"></script>
+
+<script type="text/javascript">
+require([
+	"doh/runner",
+	"dojo/dom", "dojo/dom-geometry", "dojo/dom-style", "dojo/json", "dojo/parser", "dojo/query",
+	"dijit/registry", "dijit/tests/helpers",
+	"dijit/tests/layout/robot/borderContainerTestFunctions",
+	"dijit/layout/BorderContainer",
+	"dijit/layout/ContentPane",
+
+	// used by parser
+	"dijit/form/FilteringSelect",
+	"dijit/MenuBar",
+	"dijit/PopupMenuBarItem",
+	"dijit/Menu",
+	"dijit/MenuItem",
+
+	"dojo/domReady!"
+
+], function(doh, dom, geom, style, json, parser, query, registry, helpers, bcTest,
+		BorderContainer, ContentPane){
+
+	var bc, cp1, cp2, cp3;
+
+	doh.register("markup", [
+		function parse(){
+			parser.parse();
+		},
+
+		function initialConditions(){
+			bcTest.checkBCpanes(registry.byId("border1"));
+			bcTest.checkBCpanes(registry.byId("border2"));
+			doh.is("auto", style.get("border1-left", "overflow"), "overflow on ContentPane should be auto");
+			doh.t("layoutPriority" in registry.byId("menu"),
+					"make sure layoutPriority flag added to _WidgetBase is visible in MenuBar");
+		},
+
+		function tabOrder(){
+			// The tab order between panes and splitters should match the visual layout, so that (in LTR mode)
+			// you tab to the left pane before its corresponding splitter, but tab to the right splitter before
+			// its corresponding pane.
+			var children = query("> *", registry.byId("border1").domNode).map(function(node){
+				return node.id;
+			});
+			doh.is("border1-top, border1-top_splitter, border1-left, border1-left_splitter, border1-center, " +
+					"border1-right_splitter, border1-right, border1-bottom_splitter, border1-bottom",
+				children.join(", "));
+		},
+
+		function resize(){
+			// current size of panes
+			var oTop = geom.position(dom.byId("border1-top")),
+					oLeft = geom.position(dom.byId("border1-left")),
+					oCenter = geom.position(dom.byId("border1-center")),
+					oRight = geom.position(dom.byId("border1-right")),
+					oBottom = geom.position(dom.byId("border1-bottom"));
+
+			// make whole BorderContainer 100px bigger (width and height)
+			var mb = geom.getMarginBox("border1");
+			registry.byId("border1").resize({w: mb.w + 100, h: mb.h + 100});
+
+			// new size of panes
+			var nTop = geom.position(dom.byId("border1-top")),
+					nLeft = geom.position(dom.byId("border1-left")),
+					nCenter = geom.position(dom.byId("border1-center")),
+					nRight = geom.position(dom.byId("border1-right")),
+					nBottom = geom.position(dom.byId("border1-bottom"));
+
+			doh.is(oTop.w + 100, nTop.w, "top width + 100");
+			doh.is(oTop.h, nTop.h, "top height unchanged");
+			doh.is(oCenter.w + 100, nCenter.w, "center width + 100");
+			doh.is(oCenter.h + 100, nCenter.h, "center height + 100");
+			doh.is(oBottom.w + 100, nBottom.w, "bottom width + 100");
+			doh.is(oBottom.h, nBottom.h, "bottom height unchanged");
+			doh.is(oLeft.w, nLeft.w, "left width unchanged");
+			doh.is(oLeft.h + 100, nLeft.h, "left height + 100");
+			doh.is(oRight.w, nRight.w, "right width unchanged");
+			doh.is(oRight.h + 100, nRight.h, "right height + 100");
+
+			// size BorderContainer back to original size
+			registry.byId("border1").resize({w: mb.w, h: mb.h});
+
+			var nnTop = geom.position(dom.byId("border1-top")),
+					nnLeft = geom.position(dom.byId("border1-left")),
+					nnCenter = geom.position(dom.byId("border1-center")),
+					nnRight = geom.position(dom.byId("border1-right")),
+					nnBottom = geom.position(dom.byId("border1-bottom"));
+
+			doh.is(json.stringify(oTop), json.stringify(nnTop), "top after second resize");
+			doh.is(json.stringify(oCenter), json.stringify(nnCenter), "center after second resize");
+			doh.is(json.stringify(oBottom), json.stringify(nnBottom), "bottom after second resize");
+			doh.is(json.stringify(oLeft), json.stringify(nnLeft), "left after second resize");
+			doh.is(json.stringify(oRight), json.stringify(nnRight), "right after second resize");
+		},
+
+		function addRemovePanes(){
+			// current size of panes
+			var oLeft = geom.position(dom.byId("border1-left")),
+					oCenter = geom.position(dom.byId("border1-center")),
+					oRight = geom.position(dom.byId("border1-right")),
+					oBottom = geom.position(dom.byId("border1-bottom"));
+
+			// remove top pane... should expand left/center/right
+			registry.byId("border1").removeChild(registry.byId("border1-top"));
+			doh.is("auto", registry.byId("border1-top").domNode.style.top, "border1-topremove, style.top-->auto");
+			doh.is("auto", registry.byId("border1-top").domNode.style.left, "border1-topremove, style.left-->auto");
+			doh.is("static", registry.byId("border1-top").domNode.style.position, "border1-topremove, style.position");
+
+			// new size of panes
+			var nLeft = geom.position(dom.byId("border1-left")),
+					nCenter = geom.position(dom.byId("border1-center")),
+					nRight = geom.position(dom.byId("border1-right")),
+					nBottom = geom.position(dom.byId("border1-bottom"));
+
+			doh.t(nLeft.h > oLeft.h, "left height increased");
+			doh.t(nCenter.h > oCenter.h, "center height increased");
+			doh.t(nRight.h > oRight.h, "left height increased");
+			doh.is(oBottom.h, nBottom.h, "bottom height didn't change");
+
+			// remove left pane... should just expand center pane
+			registry.byId("border1").removeChild(registry.byId("border1-left"));
+
+			// new size of panes
+			var nnCenter = geom.position(dom.byId("border1-center")),
+					nnRight = geom.position(dom.byId("border1-right")),
+					nnBottom = geom.position(dom.byId("border1-bottom"));
+
+			doh.t(nnCenter.w > nCenter.w, "center width increased");
+			doh.is(json.stringify(nRight), json.stringify(nnRight), "right stayed same");
+			doh.is(json.stringify(nBottom), json.stringify(nnBottom), "bottom stayed same");
+
+			// check that all panes sane
+			bcTest.checkBCpanes(registry.byId("border1"));
+
+			// put back left pane as the top pane
+			registry.byId("border1").addChild(registry.byId("border1-left"));
+
+			// check that all panes sane
+			bcTest.checkBCpanes(registry.byId("border1"));
+		}
+	]);
+
+	doh.register("programmatic creation", [
+		function createProgramatically(){
+			originalWidgetCnt = registry.length;
+
+			bc = new BorderContainer({style:'height:400px;width:500px;border:1px solid black'}).
+					placeAt("programmatic", "after");
+
+			cp1 = new ContentPane({region:'top',style:'height:100px;background-color:red',splitter:true, id:"cp1"});
+			cp1.domNode.innerHTML = "top pane";
+			bc.addChild(cp1);
+
+			cp2 = new ContentPane({region:'center',style:'background-color:green', id:'cp2'});
+			cp2.domNode.innerHTML = "center pane";
+			bc.addChild(cp2);
+
+			cp3 = new ContentPane({region:'left', splitter: true, style:'width: 100px;', id:'cp3'});
+			cp3.domNode.innerHTML = "left pane";
+
+			bc.startup();
+
+			bcTest.checkBCpanes(bc);
+		},
+		function addLeftPane(){
+			var nWidgetsBefore = registry.length;
+			bc.addChild(cp3);
+			bcTest.checkBCpanes(bc);
+			doh.t(helpers.isVisible(cp3));
+			doh.is(nWidgetsBefore + 1, registry.length, "splitter widget created");
+		},
+		function removeTopPane(){
+			var nWidgetsBefore = registry.length;
+			bc.removeChild(cp1);
+			bcTest.checkBCpanes(bc);
+			doh.f(helpers.isVisible(cp1));
+			doh.is(nWidgetsBefore - 1, registry.length, "splitter widget destroyed");
+		},
+		function removeLeftPane(){
+			bc.removeChild(cp3);
+			bcTest.checkBCpanes(bc);
+			doh.f(helpers.isVisible(cp3));
+		},
+		function addLeftPane2(){
+			bc.addChild(cp3);
+			bcTest.checkBCpanes(bc);
+			doh.t(helpers.isVisible(cp3));
+		},
+		function addTopPane(){
+			bc.addChild(cp1);
+			bcTest.checkBCpanes(bc);
+			doh.t(helpers.isVisible(cp3));
+		},
+		function destroyAll(){
+			bc.destroyRecursive();
+			doh.is(originalWidgetCnt, registry.length, "BorderContainer and all contained widgets destroyed");
+		}
+	]);
+
+	doh.register("exceptions", [
+		function createProgramatically(){
+			bc = new BorderContainer({style:'height:400px;width:500px;border:1px solid black'}, dom.byId('main'));
+			doh.isNot(null, bc.domNode.parentNode, "has parent");
+
+			cp1 = new ContentPane({region:'top',style:'height:100px;background-color:red',splitter:true, id:"cp1"});
+			cp1.domNode.innerHTML = "top pane";
+			bc.addChild(cp1);
+
+			cp2 = new ContentPane({region:'center',style:'background-color:green', id:'cp2'});
+			cp2.domNode.innerHTML = "center pane";
+			bc.addChild(cp2);
+
+			var exception;
+			try{
+				cp3 = new ContentPane({splitter: true, style:'width: 100px;', id:'cp3'});
+				cp3.domNode.innerHTML = "left pane";
+				bc.addChild(cp3);
+				bc.startup();
+			}catch(e){
+				doh.t(/No region setting for cp3/.test(e.message), "check exception: " + e);
+				exception = true;
+			}
+			doh.t(exception, "exception was fired");
+		}
+	]);
+
+	doh.run();
+});
+
+</script>
+</head>
+<body class="claro" role="main" aria-label="body">
+<p>Headline layout (default), left is constrained - min:150, max:250</p>
+<div id="border1" data-dojo-type="dijit/layout/BorderContainer"
+	 data-dojo-props='style:"width: 1000px; height: 300px; border: 2px solid blue;"'>
+	<div role="banner" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-top", region:"top", style:"background-color: #b39b86; border: 15px black solid; height: 50px;", splitter:true'>
+		top bar (resizable)
+	</div>
+	<div role="navigation" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-left", region:"left", style:"background-color: #acb386; border: 10px green solid; width: 100px;",
+		splitter:true, minSize:150, maxSize:250'>
+		left (resizable b/w 150 &rarr; 250)
+	</div>
+	<div role="main" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-center", region:"center", style:"background-color: #f5ffbf; padding: 30px;"' aria-labelledby="mylabel">
+		<label id="mylabel">main panel</label> with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+		(to check we're copying children around properly).<br />
+		<select aria-label="select" data-dojo-type="dijit/form/FilteringSelect">
+			<option value="1">foo</option>
+			<option value="2">bar</option>
+			<option value="3">baz</option>
+		</select>
+		Here's some text that comes AFTER the combo box.
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-right", region:"right", style:"background-color: #acb386; width: 100px;"'>
+		right (fixed size)
+	</div>
+	<div role="contentinfo" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-bottom", region:"bottom", style:"background-color: #b39b86; height: 50px;", splitter:true'>
+		bottom bar (resizable)
+	</div>
+</div>
+
+<p>Sidebar layout, BiDi sensitive, liveSplitters: false</p>
+<div id="border2" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='design:"sidebar", liveSplitters:false,
+		style:"border: 20px solid black; width: 1000px; height: 300px;"'>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-leading", region:"leading", style:"background-color: #acb386; width: 100px;"'>
+		leading (fixed size)
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-top", region:"top", style:"background-color: #b39b86; height: 80px;"'>
+		top bar (fixed size)
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-center", region:"center", style:"background-color: #f5ffbf; padding: 10px;"'>
+		main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+		(to check we're copying children around properly).<br />
+		<select aria-label="select2" data-dojo-type="dijit/form/FilteringSelect">
+			<option value="1">foo</option>
+			<option value="2">bar</option>
+			<option value="3">baz</option>
+		</select>
+		Here's some text that comes AFTER the combo box.
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-bottom", region:"bottom", style:"background-color: #b39b86; height: 80px;", splitter:true'>
+		bottom bar (resizable)
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-trailing", region:"trailing", style:"background-color: #acb386; width: 100px;", splitter:true'>
+		trailing (resizable)
+	</div>
+</div>
+
+<p id="programmatic">Programatically created, then destroyed</p>
+<div id='main'></div>
+
+<p>BorderContainer with MenuBar</p>
+<div id="menuBorder" data-dojo-type="dijit/layout/BorderContainer"
+	 data-dojo-props='style:"width: 1000px; height: 300px; border: 2px solid blue;"'>
+	<div id="menu" data-dojo-type="dijit/MenuBar" data-dojo-props='region:"top", splitter:true'>
+		<div id="file" data-dojo-type="dijit/PopupMenuBarItem" >
+			<span>File</span>
+			<div id="fileMenu" data-dojo-type="dijit/Menu" >
+				<div id="new" data-dojo-type="dijit/MenuItem" >New</div>
+				<div id="open" data-dojo-type="dijit/MenuItem" >Open</div>
+			</div>
+		</div>
+		<div id="edit" data-dojo-type="dijit/PopupMenuBarItem" >
+			<span>Edit</span>
+			<div id="editMenu" data-dojo-type="dijit/Menu" >
+				<div id="cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+						onClick:function(){ console.log("not actually cutting anything, just a test!"); }, accelKey:"Ctrl+X"'>Cut</div>
+				<div id="copy" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+						onClick:function(){ console.log("not actually copying anything, just a test!") }, accelKey:"Ctrl+C"'>Copy</div>
+				<div id="paste" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+						onClick:function(){ console.log("not actually pasting anything, just a test!") }, accelKey:"Ctrl+V"'>Paste</div>
+			</div>
+		</div>
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region: "center", splitter:true'>
+		content pane under menu
+	</div>
+</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/ContentPane-auto-require.html b/src/main/resources/static/dijit/tests/layout/ContentPane-auto-require.html
new file mode 100644
index 0000000000000000000000000000000000000000..398b97832dd1034ceba9dc1e7129a0b222f59ba0
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/ContentPane-auto-require.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>ContentPane Auto Require Tests</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh",
+			"dojo/_base/declare",
+			"dojo/Deferred",
+			"dojo/dom",
+			"dojo/_base/lang",
+			"dojo/parser",
+			"dijit/registry",
+			"dojo/domReady!"
+		], function(doh, declare, Deferred, dom, lang, parser, registry){
+
+			// instances of AsyncWidget will finish initializing when this Deferred is resolved
+			var finishCreatingAsyncWidgets = new Deferred();
+
+			AsyncWidget = declare(null, {
+				declaredClass: "AsyncWidget",
+				markupFactory: function(params, node){
+					// the markup factory can return a promise, and the parser will wait
+					return finishCreatingAsyncWidgets.then(function(){return new AsyncWidget(params, node); });
+				},
+				constructor: function(args, node){
+					this.params = args;
+					lang.mixin(this, args);
+				},
+				startup: function(){
+					this._started = true;
+				}
+			});
+
+			doh.register("auto require", [
+				{
+					name: "auto-load parse",
+					timeout: 10000,
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						// This will test auto-loading but only if dijit/form/TextBox isn't in the cache
+						parser.parse(dom.byId("simple")).then(d.getTestCallback(function(){
+							t.is(typeof registry.byId("tb1"), "object", "objected created");
+						}));
+
+						return d;
+					}
+				},
+
+				{
+					name: "href",
+					timeout: 10000,
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						// This will test auto-loading but only if dijit/form/Button isn't in the cache
+						registry.byId("parsedPane1").set("href", "doc3.html").then(d.getTestCallback(function(){
+							t.is(typeof registry.byId("button1"), "object", "object created");
+						}));
+
+						return d;
+					}
+				},
+
+				function nested(){
+					var d = new doh.Deferred();
+
+					var parsePromise = parser.parse(dom.byId("nested"));
+
+					// Parser should wait for innerPane Contentpane,
+					// innerPane should wait for nested call to parser.parse(),
+					// and the nested parser.parse() call is waiting for AsyncWidget to initialize.
+					// This is to simulate when the nested parse() call is waiting for auto-load.
+					doh.f(parsePromise.isFulfilled(), "parse not completed yet");
+					doh.f(formWidget._started, "wrapper form widget not started yet");
+
+					finishCreatingAsyncWidgets.resolve(true);
+
+					return parsePromise.then(d.getTestCallback(function(){
+						doh.t(formWidget._started, "wrapper form widget started");
+					}));
+
+					return d;
+				}
+			]);
+				
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">Dijit layout.ContentPane Auto-Require Tests</h1>
+
+	<h2>ContentPane Loading Content that Requires Auto-Require</h2>
+
+	<div id="simple">
+		<div data-dojo-type="dijit/layout/ContentPane" id="parsedPane1">
+			<input type="text" aria-label="tb1" id="tb1" data-dojo-type="dijit/form/TextBox" data-dojo-props="value: 'testValue'" />
+		</div>
+	</div>
+
+	<div id="nested">
+		<div data-dojo-type="dijit/_WidgetBase" data-dojo-id="formWidget">
+			<div data-dojo-type="dijit/layout/ContentPane" id="innerPane">
+				<!-- for simulating an asynchronous nested parse due to waiting for module to load -->
+				<span data-dojo-id="asyncWidget" data-dojo-type="AsyncWidget">hi</span>
+			</div>
+		</div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/ContentPane-remote.html b/src/main/resources/static/dijit/tests/layout/ContentPane-remote.html
new file mode 100644
index 0000000000000000000000000000000000000000..39f659f7571e55eb27bc793bc8350eb860221f56
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/ContentPane-remote.html
@@ -0,0 +1,700 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>ContentPane Remote Loading Test</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array",
+			"dojo/aspect",
+			"dojo/_base/declare",
+			"dojo/dom",
+			"dojo/dom-class",
+			"dojo/_base/lang",
+			"dojo/parser",
+			"dojo/request",
+			"dojo/when",
+			"dijit/registry",
+			"dijit/_WidgetBase",
+			"dijit/_TemplatedMixin",
+			"dijit/Tooltip",
+			"dijit/TooltipDialog",
+			"dijit/form/Button",
+			"dijit/form/DropDownButton",
+			"dijit/layout/ContentPane",
+			"dijit/layout/StackContainer",
+			"dijit/layout/TabContainer",
+			"dijit/layout/AccordionContainer",
+			"dijit/tests/helpers",
+			"dojo/domReady!"
+		], function(doh, array, aspect, declare, dom, domClass, lang, parser, request, when,
+				registry, _WidgetBase, _TemplatedMixin, Tooltip, TooltipDialog, Button, DropDownButton,
+				ContentPane, StackContainer, TabContainer, AccordionContainer, helpers){
+
+			var tabCounter;
+			testClose = function(pane, tab){
+				// remove html from title
+				var title = lang.trim(tab.title.replace(/<\/?[a-z][a-z0-9]*[^>]*>/ig, ""));
+				return confirm("Please confirm that you want tab "+title+" closed");
+			};
+
+
+			createTab = function(){
+				if(!tabCounter){ tabCounter = 3; }
+
+				var title = '<img src="../images/plus.gif" style="background-color:#95B7D3;"/> Tab ' +(++tabCounter);
+				var refreshOnShow = !!(tabCounter % 2);
+
+				var newTab = new ContentPane({
+					id: "ttab" + tabCounter,
+					title: title + (refreshOnShow ? ' <i>refreshOnShow</i>': ''),
+					closable:true,
+					refreshOnShow: refreshOnShow,
+					href: 'getResponse.php?delay=1000&messId='+tabCounter
+						+"&message="+encodeURI("<h1>Programmatically created Tab "+tabCounter+"</h1>")
+				}, document.createElement('div'));
+
+				registry.byId('ttabs').addChild(newTab);
+
+				newTab.startup();
+			};
+
+			// create a do nothing, only for test widget
+			declare("TestWidget",
+				[_WidgetBase, _TemplatedMixin], {
+				templateString: "<span class='dijitTestWidget'></span>"
+			});
+
+
+			doh.register("parse", function parse(){
+				console.log("parse");
+				return parser.parse();
+			});
+
+			var cp, cp1;
+
+			doh.register("ContentPane", [
+				function create(){
+					cp = new ContentPane({}, dom.byId("cp"));
+
+					cp1 = new declare(ContentPane, {
+						preprocessContent: function(content){
+							if(typeof content === "string"){
+								// return a reversed string
+								var reverse = "";
+								for(var i = content.length - 1; i >= 0; i--){
+									reverse += content[i];
+								}
+								return reverse;
+							}else{
+								// wrap the DocumentFragment in a div
+								var frag = document.createDocumentFragment();
+								var div = document.createElement("div");
+								div.appendChild(content);
+								frag.appendChild(div);
+								return frag;
+							}
+						}
+					})({}, dom.byId("cp1"));
+				},
+
+				{
+					name: "setHref_loading",
+					timeout: 10000,
+					setUp: function(t){
+					},
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						cp.set('href', 'getResponse.php?messId=1').then(d.getTestCallback(function(){
+							doh.is(1, _WidgetBase.prototype.getChildren.call(cp).length);
+						}));
+						return d;
+					}
+				},
+				{
+					name: "setHref_then_cancel",
+					timeout: 2800,
+					setUp: function(t){
+						cp.set("content", "");// clear previous
+					},
+					runTest: function(t){
+						var msg = "This should NEVER be seen!";
+						cp.set('href', 'getResponse.php?delay=1000&message='+encodeURI(msg));
+						var d = new t.Deferred();
+						setTimeout(d.getTestCallback(
+							function(){
+								doh.f(cp.domNode.innerHTML == msg);
+							}
+						), 2500);
+
+						cp.cancel();
+
+						return d;
+					}
+				},
+				{
+					// test that setHref cancels a inflight setHref
+					name: "setHref_cancels_previous_setHref",
+					timeout: 10000,
+					setUp: function(t){
+						cp.set("content", "");
+					},
+					runTest: function(t){
+						var d = new t.Deferred();
+
+						var msgCanceled = "This should be canceled";
+						cp.set('href', "getResponse.php?delay=1000&message="+encodeURI(msgCanceled));
+
+						setTimeout(d.getTestErrback(function(){
+							var msg = "This message should win over the previous";
+							cp.set('href', "getResponse.php?message="+encodeURI(msg));
+
+							setTimeout(d.getTestCallback(
+									function(){
+										doh.is(msg, cp.domNode.innerHTML);
+									}
+							), 1600);
+						}), 900);
+
+						return d;
+					}
+				},
+				{
+					name: "setContent_cancels_setHref",
+					timeout: 2800,
+					setUp: function(t){
+						cp.set("content", "");
+					},
+					runTest: function(t){
+						cp.on("unload", function(){
+							console.log("cp unload of: " + cp.get('content'));
+						});
+						cp.on("load", function(){
+							console.log("cp load of: " + cp.get('content'));
+						});
+						var msgCanceled = "This message be canceled";
+						cp.set('href', "getResponse.php?delay=1000&message="+encodeURI(msgCanceled));
+
+						var msg = "This message should win over (ie, cancel) the inflight one";
+						setTimeout(function(){
+							cp.set("content", msg);
+						}, 500);
+
+						var d = new t.Deferred();
+						setTimeout(d.getTestCallback(
+							function(){
+								doh.is(msg, cp.domNode.innerHTML);
+							}
+						), 2500);
+						return d;
+					}
+				},
+				{
+					name: "refresh",
+					timeout: 1900,
+					setUp: function(t){
+						cp.set('href', "getResponse.php?message="+encodeURI('initial load'));
+					},
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						setTimeout(d.getTestErrback(function(){
+							var msg = 'refreshed load';
+							cp.href = "getResponse.php?message="+encodeURI(msg);
+							cp.refresh().then(d.getTestCallback(function(){
+								doh.is(msg, cp.domNode.innerHTML);
+							}));
+						}), 100);
+
+						return d;
+					}
+				},
+				{
+					// Test isLoaded attribute lifecycle and that onLoad/onUnload callbacks
+					// are called at the right times
+					name: "isLoaded",
+
+					timeout: 10000,
+					setUp: function(t){
+						cp.set("content", "");
+					},
+					runTest: function(t){
+						doh.t(cp.isLoaded, "cp initially loaded");
+
+						// Setup handlers to track when onUnload and onLoad are called,
+						// including tracking if they get called repeatedly (they shouldn't)
+						var history = "";
+						var handles = [
+							cp.on("unload", function(){ history += "unloaded"}),
+							cp.on("load", function(){ history += " and reloaded"})
+						];
+
+						cp.set('href', "getResponse.php?delay=300&message=test");
+
+						doh.f(cp.isLoaded, "immediately after href set, cp isLoaded == false");
+						doh.is("unloaded", history);
+
+						var ilObj = {}; // a object to get a reference instead of copy
+
+						// probe after 200ms
+						setTimeout(function(){
+							ilObj.probed = cp.isLoaded;
+						}, 200);
+
+						var d = new t.Deferred();
+						handles.push(aspect.after(cp, "_setContent", d.getTestCallback(function(){
+							doh.f(ilObj.probed, "200ms after href set, cp was not loaded");
+							doh.t(cp.isLoaded, "eventually, cp was loaded");
+							doh.is("unloaded and reloaded", history);
+
+							array.forEach(handles, function(handle){
+								handle.remove();
+							});
+						}), true));
+						return d;
+					}
+				},
+				{
+					// test that we don't load a response if we are hidden
+					name: "wait_with_load_when_domNode_hidden",
+					timeout: 1800,
+					setUp: function(t){
+						cp.domNode.style.display = 'none';
+						cp.set("content", "");
+					},
+					runTest: function(t){
+						cp._msg = "This text should not be loaded until after widget is shown";
+						cp.set('href', "getResponse.php?message="+encodeURI(cp._msg));
+						var d = new t.Deferred();
+						setTimeout(d.getTestCallback(
+							function(){
+								doh.isNot(cp._msg, cp.domNode.innerHTML);
+							}
+						), 1500);
+						return d;
+					},
+					tearDown: function(t){
+						cp.domNode.style.display = "";
+					}
+				},
+				{
+					name: "onDownloadError",
+					timeout: 1800,
+					setUp: function(t){
+						cp.set("content", "");
+					},
+					runTest: function(t){
+						var msg = "Error downloading modified message";
+						orig = cp.onDownloadError;
+
+						cp.onDownloadError = function(){
+							return msg;
+						};
+
+						var d = new doh.Deferred();
+
+						evtHandle = cp.on("downloaderror", d.getTestErrback(function(e){
+							doh.t(e, "onDownloadError got event argument on invokation");
+							setTimeout(d.getTestCallback(function(){
+								doh.is(msg, cp.domNode.innerHTML, "custom errortext set");
+							}), 1);
+						}));
+
+						// test onDownloadError
+						cp.set('href', 'nonexistent');
+
+						return d;
+					},
+					tearDown: function(){
+						evtHandle.remove();
+						cp.onDownloadError = orig;
+					}
+				},
+
+				// Test that setting an href calls onDownloadStart followed by onDownloadEnd,
+				// and also setting of custom download message instead of "Loading..."
+				{
+					name: "onDownloadStart|End",
+					timeout: 5000,
+					setUp:function(t){
+						cp.set("content", "");
+					},
+					runTest:function(t){
+						var d = new doh.Deferred();
+
+						// set custom message
+						origStart = cp.onDownloadStart;
+						var msg = "custom downloadstart message";
+						cp.onDownloadStart = function(){ return msg; };
+
+						startHandle = cp.on("downloadstart", d.getTestErrback(function(){
+							setTimeout(d.getTestErrback(function(){
+								// check that custom message was set
+								doh.is(msg, cp.containerNode.innerHTML, "custom download message was set");
+
+								// and then wait for the download to complete
+								endHandle = cp.on("downloadend", d.getTestCallback(function(){
+									// if this gets called (before the test timeout) then test succeeded
+								}));
+							}), 1);
+						}));
+						cp.set('href', 'getResponse.php?delay=400&messId=3');
+
+						return d;
+					},
+					tearDown: function(){
+						cp.onDownloadStart = origStart;
+						startHandle.remove();
+						endHandle.remove();
+					}
+				},
+
+				// Test that setting an href calls onUnload followed by onLoad
+				{
+					name: "onLoad|onUnload",
+					timeout: 5000,
+					setUp:function(t){
+						cp.set("content", "");
+					},
+					runTest:function(t){
+						var d = new doh.Deferred();
+
+						loadHandle = cp.on("unload", d.getTestErrback(function(){
+							unloadHandle = cp.on("load", d.getTestCallback(function(){
+								// if this gets called (before the test timeout) then test succeeded
+							}));
+						}));
+						cp.set('href', 'getResponse.php?delay=400&messId=2');
+
+						return d;
+					},
+					tearDown: function(){
+						loadHandle.remove();
+						unloadHandle.remove();
+					}
+				},
+
+				// Test that preprocessContent returns as expected when setting
+				// content as a string
+				{
+					name: "preprocessContent.string",
+					timeout: 5000,
+					setUp:function(t){
+						cp1.set("content", "foo");
+					},
+					runTest:function(t){
+						doh.is("oof", cp1.get("content"), "preprocessContent(string)");
+					}
+				},
+
+				{
+					name: "preprocessContent.DocumentFragment",
+					timeout: 5000,
+					setUp:function(t){
+						var docFrag = document.createDocumentFragment();
+						var span = document.createElement("span");
+						docFrag.appendChild(span);
+						cp1.set("content", docFrag);
+					},
+					runTest:function(t){
+						doh.is("<div><span></span></div>", cp1.get("content").toLowerCase(),
+							"preprocessContent(DocumentFragment)");
+					}
+				}
+
+			]);
+
+			function selectChildAndTestLoad(/*String*/ parentId, /*String*/ childId, /*String*/ startOfExpectedContent){
+				// summary:
+				//		Test deferred load of child of StackContainer widget
+
+				var d = new doh.Deferred(),
+					loadingContent,
+					child = registry.byId(childId),
+					contentNode = dom.byId(childId);
+
+				child.ioMethod = function(args){
+					loadingContent = helpers.innerText(contentNode);
+					delete child.ioMethod;
+					return request(args.url, args);
+				};
+
+				when(registry.byId(parentId).selectChild(child), function(){
+					setTimeout(d.getTestCallback(
+						function(){
+							doh.is(child.loadingMessage.replace(/<[^>]*>/g, ""), loadingContent, "loading message");
+							var startOfActualContent = helpers.innerText(contentNode).substring(0, startOfExpectedContent.length);
+							doh.is(startOfExpectedContent, startOfActualContent, "expected content");
+						}
+					), 1); // return from handler, then test
+				});
+
+				return d;
+			}
+
+			var st,		// stack container
+				pane3, pane3UnloadCnt=0, pane3LoadCnt=0,	// second child of stack container (initially hidden)
+				tmp;
+
+			doh.register("ContentPane in StackContainer", [
+				{
+					// TODO: this test should be moved to registerGroup setUp now that #3504 is fixed
+					//		We actually don't need to test anything here, just setUp
+					name: "setUp_StackContainer",
+					setUp:function(t){
+						// create a StackContainer
+						st = dom.byId('stackcontainer');
+						domClass.add(st, 'box');
+						st = new StackContainer({style: {height: "150px"}}, st);
+
+						// the first child (by default) is the one that will
+						// be shown
+						st.addChild(new TestWidget());
+
+						// the second child *won't* be shown until selected
+						pane3 = new ContentPane({
+							id:"sc_pane2",
+							href:'getResponse.php?delay=300&message=Loaded!',
+							preventCache: true,
+							onLoad: function(){ pane3LoadCnt++; },
+							onUnload: function(){ pane3UnloadCnt++; }
+						}, document.createElement('div'));
+						st.addChild(pane3);
+
+						// start the StackContainer; shouldn't cause ContentPane to load.
+						st.startup();
+					},
+					runTest:function(t){
+						doh.t(st);
+						doh.is(2, st.getChildren().length);
+					}
+				},
+				{
+					name: "preload_false_by_default",
+					runTest: function(t){
+						doh.f(pane3.isLoaded);
+						doh.is('', pane3.domNode.innerHTML);
+					}
+				},
+				{
+					name: "unload event not called initially",
+					runTest: function(t){
+						doh.is(0, pane3UnloadCnt);
+					}
+				},
+				{
+					name: "load event fired when pane is shown",
+					timeout: 10000,
+					runTest: function(t){
+						doh.is(0, pane3LoadCnt, "onload hasn't been called yet");
+
+						var d = new doh.Deferred();
+
+						when(st.selectChild(pane3), function(){
+							setTimeout(d.getTestCallback(function(){
+								doh.t(pane3.isLoaded, "pane3.isLoaded");
+								doh.is(1, pane3LoadCnt, "onload was called");
+								doh.is('Loaded!', pane3.domNode.innerHTML);
+								doh.is(0, pane3UnloadCnt,
+									"unload shouldn't have been called b/c no initial contents (#2)");
+							}), 1);
+						});
+
+						doh.is(0, pane3UnloadCnt,
+							"unload shouldn't have been called b/c no initial contents (#1)");
+
+						return d;
+					}
+				},
+				{
+					name: "refreshOnShow parameter works",
+					timeout: 10000,
+					setUp: function(t){
+						tmp = {
+							onUnload: function(){ this._unload_fired = 1; },
+							onLoad: function(){ this._load_fired = 1; }
+						};
+						tmp.unloadHandle = pane3.on("unload", lang.hitch(tmp, 'onUnload'));
+						tmp.loadHandle = pane3.on("load", lang.hitch(tmp, 'onLoad'));
+
+						pane3.refreshOnShow = true;
+					},
+					runTest: function(t){
+						var d = new doh.Deferred();
+
+						// Show pane 3 again and see if events fire
+						st.back();
+						st.forward().then(function(){
+							setTimeout(d.getTestCallback(function(){
+								doh.t(tmp._unload_fired, "unload was fired");
+								doh.t(tmp._load_fired, "load was fired");
+								doh.is('Loaded!', pane3.domNode.innerHTML);
+							}), 1);
+						});
+
+						return d;
+					},
+					tearDown: function(){
+						tmp.unloadHandle.remove();
+						tmp.loadHandle.remove();
+						pane3.refreshOnShow = pane3.constructor.prototype.refreshOnShow;
+					}
+				}
+			]);
+
+			doh.register("ContentPane in TabContainer", [
+				{
+					name: "tab1InitialLoading",
+					timeout: 9000,
+					runTest: function(){ return selectChildAndTestLoad("ttabs", "ttab1", "IT WAS"); }
+				}
+			]);
+
+			doh.register("ContentPane in AccordionContainer", [
+				{
+					name: "pane3InitialLoading",
+					timeout: 9000,
+					runTest: function(){ return selectChildAndTestLoad("ac", "ac_pane3", "There"); }
+				},
+				{
+					name: "cpInitialLoading",
+					timeout: 9000,
+					runTest: function(){ return selectChildAndTestLoad("ac", "ac_pane2", "There"); }
+				},
+				{
+					name: "pane3Refresh",
+					timeout: 5000,
+					runTest: function(t){
+						var d = new doh.Deferred(),
+						wasLoading = false,
+						widget = registry.byId("ac_pane3"),
+						loadhandler = widget.on("downloadStart", function(){
+							loadhandler.remove();
+							wasLoading = true;
+						}),
+						showhandler = widget.on("show", function(){
+							showhandler.remove();
+							setTimeout(d.getTestCallback(
+								function(){
+									doh.f(wasLoading, "should not have reloaded")
+								}
+							), 1000);
+						});
+
+						registry.byId("ac").selectChild("ac_pane3");
+
+						return d;
+					}
+				},
+				{
+					name: "cpRefresh",
+					timeout: 9000,
+					runTest: function(){ return selectChildAndTestLoad("ac", "ac_pane2", "There"); }
+				}
+			]);
+
+			doh.register("TooltipDialog", [
+				// The preload=true TooltipDialog should already be loaded, or at least be loading,
+				// if it isn't already loading then this test will timeout.
+				{
+					name: "preload=true",
+					timeout: 5000,
+					runTest: function(t){
+						var dlg = registry.byId("preloadTooltipDlg");
+						if(!dlg.isLoaded){
+							doh.t(dlg.onLoadDeferred, "onLoadDeferred exists");
+							return dlg.onLoadDeferred;
+						}
+					}
+				},
+
+				// The preload=false TooltipDialog shouldn't load until opened.
+				{
+					name: "preload=false",
+					timeout: 5000,
+					runTest: function(){
+						// Check that it isn't loaded yet
+						var dlg = registry.byId("noPreloadTooltipDlg");
+						doh.f(dlg.isLoaded, "didn't load yet");
+
+						// Open the dialog and then return Deferred waiting for it to load.
+						// If it doesn't load then this test will get a timeout.
+						var btn = registry.byId("noPreloadTooltipDlgBtn");
+						btn.openDropDown();
+						doh.t(dlg.onLoadDeferred, "onLoadDeferred exists");
+						return dlg.onLoadDeferred;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit layout.ContentPane (delayed) remote tests</h1>
+
+	<h2>Plain ContentPane</h2>
+	<div id='cp' class='box'></div>
+
+	<h2>preprocessContent ContentPane</h2>
+	<div id='cp1' class='box'></div>
+
+	<h2>StackContainer</h2>
+	<div id='stackcontainer'></div>
+
+	<h2>TabContainer</h2>
+	<p>These tabs are made up of external content. Loading is delayed to make it easier to see if refreshOnShow and preload = 'false' is working.<br/>
+	The tabs also tests to insert html in the Tab title
+	</p>
+
+	<div id="createTabButton" data-dojo-type='dijit/form/Button' data-dojo-props='onClick:function(){ createTab() }'>Create a Tab</div>
+	<div id="ttabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabPosition:"top", style:"width: 100%; height: 20em;"'>
+		<div id="ttab1" data-dojo-type="dijit/layout/ContentPane"
+			data-dojo-props='href:"getResponse.php?messId=3&amp;delay=1000",
+			closable:true'
+		title="Tab1"></div>
+		<div id="ttab2" data-dojo-type="dijit/layout/ContentPane"
+			data-dojo-props='href:"getResponse.php?messId=4&amp;delay=1000",
+			refreshOnShow:true, title:"Tab 2 ",
+			selected:true,
+			closable:true'
+		title="refreshOnShow"></div>
+		<div id="ttab3" data-dojo-type="dijit/layout/ContentPane"
+			data-dojo-props='href:"getResponse.php?messId=5&amp;delay=1000",
+			onClose:testClose,
+			closable:true
+		' title="Tab 3">
+		</div>
+	</div>
+
+	<h2>AccordionContainer</h2>
+	<div data-dojo-type="dijit/layout/AccordionContainer" data-dojo-props='id:"ac", style:"height:300px; width:400px;"'>
+		<div id="ac_pane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"one", refreshOnShow:false, href:"getResponse.php?messId=4&amp;delay=1000"'></div>
+		<div id="ac_pane2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"two", refreshOnShow:true, href:"getResponse.php?messId=4&amp;delay=4000"'></div>
+		<div id="ac_pane3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"three", refreshOnShow:false, href:"getResponse.php?messId=4&amp;delay=4100"'></div>
+	</div>
+
+	<h2>TooltipDialog</h2>
+	<div data-dojo-type="dijit/layout/ContentPane">
+		<div id="preloadTooltipDlgBtn" data-dojo-type="dijit/form/DropDownButton">
+			<span>Show Preload TooltipDialog</span>
+			<div id="preloadTooltipDlg" data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Enter Login information", preload: true, href: "doc1.html"'>
+			</div>
+		</div>
+	</div>
+
+	<div id="noPreloadTooltipDlgBtn" data-dojo-type="dijit/form/DropDownButton">
+		<span>Show No-Preload TooltipDialog</span>
+		<div id="noPreloadTooltipDlg" data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Enter Login information", preload: false, href: "doc1.html"'>
+		</div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/ContentPane.html b/src/main/resources/static/dijit/tests/layout/ContentPane.html
new file mode 100644
index 0000000000000000000000000000000000000000..0f59a93dedced74e27d39eee8e5fc6f978da17bf
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/ContentPane.html
@@ -0,0 +1,556 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>ContentPane DOH test</title>
+	<style type="text/css">
+		.box {
+			border: 1px solid black;
+			padding: 8px;
+		}
+
+		.dijitTestWidget {
+			border: 1px dashed red;
+			background-color: #C0E209;
+		}
+	</style>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array",
+			"dojo/_base/declare",
+			"dojo/dom",
+			"dojo/data/ItemFileReadStore",
+			"dojo/_base/NodeList",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/_WidgetBase",
+			"dijit/_TemplatedMixin",
+			"dijit/_WidgetsInTemplateMixin",
+			"dijit/_Container",
+			"dijit/Dialog",
+			"dijit/layout/_LayoutWidget",
+			"dijit/layout/ContentPane",
+			"dijit/layout/StackContainer",
+			"dojo/domReady!"
+		], function(doh, array, declare, dom, ItemFileReadStore, NodeList, parser,
+					registry, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _Container, Dialog, _LayoutWidget,
+					ContentPane, StackContainer){
+
+			// create a do nothing, only for test widget
+			declare("TestWidget",
+				[_WidgetBase, _TemplatedMixin], {
+				templateString: "<span class='dijitTestWidget'></span>"
+			});
+
+			doh.register("pane1", [
+				{
+					name: "no_autoparse",
+					runTest: function(t){
+						if(registry.byId("pane1")){
+							throw doh._AssertFailure("Page got autoparsed when it shouldn't");
+						}
+					}
+				}
+			]);
+
+			var pane2, MyWidget;
+
+			doh.registerGroup("pane2", [
+				{
+					name: "clear_content",
+					setUp: function(t){
+						pane2 = new ContentPane({
+							preventCache: true
+						}, dom.byId("pane2"));
+						pane2.set("content", "");// pass undefined on purpose
+					},
+					runTest: function(t){
+						doh.is(0, _WidgetBase.prototype.getChildren.call(pane2).length);
+						doh.is("", pane2.domNode.innerHTML)
+					}
+				},
+				{
+					name: "setContent_String",
+					setUp: function(){
+						pane2.set("content", "");
+					},
+					runTest: function(t){
+						var msg = "<h3>a simple html string</h3>";
+						pane2.set("content", msg);
+						doh.is(msg, pane2.domNode.innerHTML.toLowerCase());
+					}
+				},
+				{
+					name: "setContent_DOMNode",
+					setUp: function(t){
+						var div = document.createElement('div');
+						div.innerHTML = "set('content', [DOMNode] )";
+						div.setAttribute('data-dojo-type', 'TestWidget');
+						pane2.set("content", div);
+					},
+					runTest: function(t){
+						doh.is(1, _WidgetBase.prototype.getChildren.call(pane2).length);
+					},
+					tearDown: function(t){
+						pane2.set("content", ""); // clear content for next test
+					}
+				},
+				{
+					name: "setContent_NodeList",
+					setUp: function(t){
+						var div = document.createElement('div');
+						div.innerHTML = "<div data-dojo-type='TestWidget'>above</div>"
+										+"Testing!<div><p><span><b>Deep nested</b></span></p></div>"
+										+"<div data-dojo-type='TestWidget'>below</div>";
+
+						var list = div.childNodes;
+						pane2.set("content", div.childNodes);
+					},
+					runTest: function(t){
+						doh.is(2, _WidgetBase.prototype.getChildren.call(pane2).length);
+
+						//regular DOM check
+						var children = pane2.domNode.childNodes;
+						doh.is(4, children.length);
+						doh.is("Testing!", children[1].nodeValue);
+						doh.is("div", children[2].nodeName.toLowerCase());
+						doh.is("<p><span><b>deep nested</b></span></p>", children[2].innerHTML.toLowerCase());
+					}
+				},
+				{
+					name: "setContent_dojo_NodeList",
+					setUp: function(t){
+						pane2.set("content", "");
+					},
+					runTest: function(t){
+						var div = document.createElement('div');
+						div.innerHTML = "<div data-dojo-type='TestWidget'>above</div>"
+									+"Testing!<div><p><span><b>Deep nested</b></span></p></div>"
+									+"<div data-dojo-type='TestWidget'>below</div>";
+
+						var list = new NodeList();
+						array.forEach(div.childNodes, function(n){
+							list.push(n.cloneNode(true));
+						});
+
+						pane2.set("content", list);
+						doh.is(4, pane2.domNode.childNodes.length);
+					}
+				},
+				{
+					name: "extractContent",
+					runTest: function(t){
+						var def = pane2.extractContent;
+						doh.f(def);
+
+						// test that it's actually working
+						pane2.extractContent = true;
+						pane2.set("content", '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" '
+							+'"http://www.w3.org/TR/html4/strict.dtd">'
+							+'<html><head><style>body{font-weight:bold;}</style></head>'
+							+'<body>extractContent test</body></html>');
+
+						doh.is("extractContent test", pane2.domNode.innerHTML);
+
+						// reset back to default
+						pane2.extractContent = def;
+					}
+				},
+				{
+					name: "setContent_widget", // for #12348
+					setUp: function(t){
+						// declare a widget whose template contains a non-templated widget
+						MyWidget = declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+							templateString: '<div><div '
+								+ 'data-dojo-type="dijit/layout/StackContainer"></div></div>'
+						});
+					},
+					runTest: function(t){
+						var w = new MyWidget(), dfd = new doh.Deferred();
+						pane2.set("content", w).then(function(){
+								dfd.callback(true);
+							}, function(e){
+								dfd.errback(e);
+						});
+						return dfd;
+					}
+				}
+			]);
+
+			// Tests for doLayout parameter.
+			// When this parameter is true, the single ContentPane child is resized
+			// to match the size of the ContentPane.
+			// See also ContentPaneLayout.html.
+			var pane5;
+			doh.registerGroup("doLayout", [
+				{
+					name: "simple",
+					setUp: function(t){
+						pane5 = new ContentPane({
+							content:"<div data-dojo-type='dijit/layout/StackContainer'></div>"
+						}).placeAt(document.body);
+						pane5.startup();
+					},
+					runTest: function(t){
+						// since there's just a single child it should be marked
+						// for layout/resize along w/the ContentPane
+						doh.t(pane5._singleChild);
+					},
+					tearDown: function(t){
+						pane5.destroyRecursive();
+					}
+				},
+				{
+					name: "doLayout=false",
+					setUp: function(t){
+						pane5 = new ContentPane({
+							content:
+								"<div data-dojo-type='dijit/layout/StackContainer'></div>",
+							doLayout: false
+						}).placeAt(document.body);
+						pane5.startup();
+					},
+					runTest: function(t){
+						// since doLayout=false shouldn't try to resize child
+						doh.f(pane5._singleChild);
+					},
+					tearDown: function(t){
+						pane5.destroyRecursive();
+					}
+				},
+				{
+					name: "mixed content",
+					setUp: function(t){
+						pane5 = new ContentPane({
+							content:
+								"<span>hello world</span>" +
+								"<div data-dojo-type='dijit/layout/StackContainer'></div>"
+						}).placeAt(document.body);
+						pane5.startup();
+					},
+					runTest: function(t){
+						// since there's plain HTML along with the widget, ContentPane shouldn't try to adjust
+						// this size of the widget (since that would cover up the other HTML)
+						doh.f(pane5._singleChild);
+					},
+					tearDown: function(t){
+						pane5.destroyRecursive();
+					}
+				},
+				{
+					name: "two widgets",
+					setUp: function(t){
+						pane5 = new ContentPane({
+							content:
+								"<div data-dojo-type='dijit/layout/StackContainer'></div>" +
+								"<div data-dojo-type='dijit/layout/StackContainer'></div>"
+						}).placeAt(document.body);
+						pane5.startup();
+					},
+					runTest: function(t){
+						// since there are multiple children, neither should be marked
+						// for layout/resize along w/the ContentPane
+						doh.f(pane5._singleChild);
+					},
+					tearDown: function(t){
+						pane5.destroyRecursive();
+					}
+				},
+				{
+					name: "dojo.data",
+					setUp: function(t){
+						pane5 = new ContentPane({
+							content:
+								"<div data-dojo-type='dojo/data/ItemFileReadStore' data-dojo-id='dd'></div>" +
+								"<div data-dojo-type='dijit/layout/StackContainer' id='sc'></div>"
+						}).placeAt(document.body);
+						pane5.startup();
+					},
+					runTest: function(t){
+						// there are two children but one is invisible, so the other should be marked
+						// for layout/resize along w/the ContentPane
+						doh.t(dd, "dd exists");
+						doh.t(registry.byId("sc"), "sc exists");
+						doh.is(registry.byId("sc"), pane5._singleChild, "pane5._singleChild");
+					},
+					tearDown: function(t){
+						pane5.destroyRecursive();
+					}
+				},
+				{
+					name: "non-visual tags ignored",
+					setUp: function(t){
+						pane5 = new ContentPane({
+							content:
+								"<scri" + "pt></scri" + "pt>" +
+								"<link rel='stylesheet' href='../../themes/claro/claro.css'>" +
+								"<style>body { background: red; }</style>" +
+								"<div data-dojo-type='dijit/layout/StackContainer' id='sc'></div>"
+						}).placeAt(document.body);
+						pane5.startup();
+					},
+					runTest: function(t){
+						// <script> etc. tags should be ignored, <div> should be detected as single child
+						doh.t(pane5._singleChild, "script,link,style tags ignored, marked as single child");
+					},
+					tearDown: function(t){
+						pane5.destroyRecursive();
+					}
+				}
+			]);
+
+			declare("TestContained", _LayoutWidget, {
+				startup: function(){
+					this.inherited(arguments);
+					this._started = true;
+				},
+				resize: function(){
+					this.inherited(arguments);
+					this._resized = true;
+				}
+			});
+
+			var container;
+			doh.register("ContentPane as _Container-like widget", [
+				{
+					name: "creation",
+					runTest: function(t){
+						container = new ContentPane();
+						container.placeAt(document.body, "last");
+						container.startup();
+						t.is(0, container.getChildren().length, "number of children before set('content', ...)");
+						container.set('content',
+							'<span>plain non-widget content</span>' +
+							'<div><span>' +
+								'<div id="zero" data-dojo-type="TestContained"></div>' +
+								'<div id="one" data-dojo-type="TestContained"></div>' +
+							'</span></div>' +
+							'<div id="two" data-dojo-type="TestContained"></div>' +
+							'<div id="three" data-dojo-type="dijit/_WidgetBase"></div>'
+						);
+
+						// Since ContentPane is a container it should call startup
+						// on it's children
+						t.t(registry.byId('two')._started, "started");
+
+						// Also, Layout widgets expect resize() to be
+						// called by their parent
+						t.t(registry.byId('two')._resized, "resized");
+					}
+				},
+				{
+					name: "getChildren",
+					runTest: function(t){
+						var children = container.getChildren();
+						t.is(4, children.length, "number of children");
+						t.is("zero", children[0].id);
+						t.is("one", children[1].id);
+						t.is("two", children[2].id);
+						t.is("three", children[3].id);
+					}
+				},
+
+				{
+					name: "deferred resize",
+					runTest: function(t){
+						// This tests that startup isn't called on the child widgets
+						// until the contentpane is made visible
+
+						var hiddenCP = new ContentPane({style: {display: "none"}});
+						hiddenCP.placeAt(document.body, "last");
+						hiddenCP.startup();
+
+						t.is(0, hiddenCP.getChildren().length, "number of children before set('content', ...)");
+						hiddenCP.set('content',
+							'<span>plain non-widget content</span>' +
+							'<div><span>' +
+								'<div id="deferredZero" data-dojo-type="TestContained"></div>' +
+								'<div id="deferredOne" data-dojo-type="TestContained"></div>' +
+							'</span></div>' +
+							'<div id="deferredTwo" data-dojo-type="TestContained"></div>' +
+							'<div id="deferredThree" data-dojo-type="dijit/_WidgetBase"></div>'
+						);
+
+						t.f(registry.byId('deferredTwo')._resized, "not resized yet");
+
+						hiddenCP.set("style", {display: "block"});
+						hiddenCP._onShow();
+
+						t.t(registry.byId('deferredTwo')._resized, "resized");
+					}
+				}
+
+/***
+				,
+				{
+					name: "addChild",
+					runTest: function(t){
+						var afterTwo = new TestContained({id: "twoPointFive"});
+						container.addChild(afterTwo, 3);
+
+						// Make sure child was added and is in order
+						var children = container.getChildren();
+						t.is(5, children.length);
+						t.is("zero", children[0].id);
+						t.is("one", children[1].id);
+						t.is("two", children[2].id);
+						t.is("twoPointFive", children[3].id);
+						t.is("three", children[4].id);
+
+						// Since ContentPane is a container it should call startup
+						// on it's children
+						t.t(afterTwo._started, "started");
+
+						// Also, Layout widgets expect resize() to be
+						// called by their parent
+						t.t(afterTwo._resized, "resized");
+					}
+				},
+				{
+					name: "removeChild",
+					runTest: function(t){
+						var children = container.getChildren();
+						t.is(5, children.length);
+						container.removeChild(registry.byId("zero"));
+						container.removeChild(1); // should remove "two" - because zero is already removed
+						children = container.getChildren();
+						t.is(3, children.length);
+						t.is("one", children[0].id);
+						t.is("three", children[2].id);
+					}
+				}
+****/
+			]);
+
+			// Test that popup widgets in a ContentPane are created and deleted correctly
+			doh.register("popup test", [
+				function create(){
+					parser.parse(dom.byId("popupTest"));
+					doh.t(registry.byId("popupPane"), "popup ContentPane created");
+					doh.t(registry.byId("dialog"), "dialog created");
+					doh.is(document.body, registry.byId("dialog").domNode.parentNode, "dialog child of <body>");
+				},
+				function destroy(){
+					registry.byId("popupPane").destroyRecursive();
+					doh.f(registry.byId("popupPane"), "popup ContentPane destroyed");
+					doh.f(registry.byId("dialog"), "dialog widget destroyed");
+					doh.f(dom.byId("dialog"), "dialog DOMNode gone too");
+				}
+			]);
+
+			// Test that startup() on child widgets and plain JS objects is called at the correct time
+
+			var nwStartupCalls = 0, nwDestroyCalls = 0;
+			declare("NonWidget", null, {
+				// summary:
+				//		Doesn't extend _WidgetBase.  Used to test that startup() is still called.
+				startup: function(){
+					if(!this._started){
+						nwStartupCalls++;
+						this._started = true;
+					}
+				},
+				destroyRecursive: function(){
+					nwDestroyCalls++;
+				}
+			});
+
+			doh.register("startup", [
+				function startupAfter(){
+					var cp1 = new ContentPane({
+						content: "<div id='startup-c1' data-dojo-type='TestContained'></div>"
+					}).placeAt(document.body);
+
+					var child = registry.byId("startup-c1");
+					doh.t(child, "child widget created");
+					doh.f(child._started, "child widget not started yet");
+
+					cp1.startup();
+
+					doh.t(child._started, "starting ContentPane starts child widget");
+				},
+				function startupBefore(){
+					var cp2 = new ContentPane({}).placeAt(document.body);
+					cp2.startup();
+
+					cp2.set("content", "<div id='startup-c2' data-dojo-type='TestContained'></div>");
+					var child = registry.byId("startup-c2");
+					doh.t(child, "child widget created");
+					doh.t(child._started, "child widget started");
+				}
+			]);
+
+			// Tests for when ContentPane contains objects not descended from _WidgetBase,
+			// like dojo.Dnd.Source
+			doh.register("non widget", [
+				function startupAndDestroy(){
+					// even non-widgets inside of ContentPane (like dojo.dnd.Source) should have
+					// startup called on them
+					parser.parse(dom.byId("nonWidgetTest"));
+					doh.is(1, nwStartupCalls, "startup() on non-widgets called on parse");
+
+					nwp.set("content", "<div><div data-dojo-type='NonWidget' data-dojo-id='nw2'></div></div>");
+					doh.is(2, nwStartupCalls, "startup() called on non-widgets via set(content, ...)");
+					doh.is(1, nwDestroyCalls, "resetting the ContentPane content destroyed the old non-widget content");
+
+					// And also check that destroying ContentPane destroys the non-widget
+					nwp.destroyRecursive();
+					doh.is(2, nwDestroyCalls, "destroying ContentPane destroyed NonWidget content");
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body role="main">
+	<h2>dijit/layout/ContentPane DOH test</h2>
+	<h3>Test designed to run on localhost (minimize impact from network latency)</h3>
+
+	<h4>This should NOT be parsed automatically</h4>
+	<div id="pane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box"'>
+		<div data-dojo-type='TestWidget'>If this has a different background and a red border, the page parsed when it shouldn't</div>
+	</div>
+	<br/><h3>Testing ContentPane</h3>
+	<div id='pane2' class='box'>
+		Even though the entire page isn't scanned for widgets,
+		any sub widgets of a ContentPane will be created when a ContentPane is created<br/>
+		<span id="2_zero" data-dojo-type='TestWidget'>This should have a backgroundcolor and a border</span>
+		<div id="2_one" data-dojo-type="dijit/_WidgetBase"></div>
+		<div id="2_two" data-dojo-type="dijit/_WidgetBase"></div>
+		<div id="2_three" data-dojo-type="dijit/_WidgetBase"></div>
+	</div>
+	<br/><br/>
+
+	<!-- for container tests -->
+	<div id="container" data-dojo-type="dijit/layout/ContentPane">
+		<div id="zero" data-dojo-type="TestContained"></div>
+		<div id="one" data-dojo-type="TestContained"></div>
+		<div id="two" data-dojo-type="TestContained"></div>
+		<div id="three" data-dojo-type="dijit/_WidgetBase"></div>
+	</div>
+	<div id="outside" data-dojo-type="dijit/_WidgetBase"></div>
+	<div id="outsideCont" data-dojo-type="TestContained"></div>
+
+	<!-- for testing popup widgets inside of a content pane -->
+	<div id="popupTest">
+		<div id="popupPane" data-dojo-type="dijit/layout/ContentPane">
+			<div id="dialog" data-dojo-type="dijit/Dialog">
+				hello world
+			</div>
+		</div>
+	</div>
+
+	<!-- for testing non-widgets inside of a content pane -->
+	<div id="nonWidgetTest">
+		<div id="nonWidgetPane" data-dojo-type="dijit/layout/ContentPane" data-dojo-id="nwp">
+			<div data-dojo-type="NonWidget" data-dojo-id="nw1"></div>
+		</div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/ContentPaneLayout.html b/src/main/resources/static/dijit/tests/layout/ContentPaneLayout.html
new file mode 100644
index 0000000000000000000000000000000000000000..1ffae8098f1c935bf4e5da2eed2c224c87aa84b1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/ContentPaneLayout.html
@@ -0,0 +1,830 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>ContentPane layout-related DOH test</title>
+	<style type="text/css">
+		.resizableWidget {
+			border: 1px dashed red;
+			background-color: #C0E209;
+		}
+	</style>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array",
+			"dojo/aspect",
+			"dojo/_base/declare",
+			"dojo/dom-geometry",
+			"dojo/store/Memory",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/_WidgetBase",
+			"dijit/_TemplatedMixin",
+			"dijit/Dialog",
+			"dijit/form/ComboBox",
+			"dijit/form/Form",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dijit/layout/_LayoutWidget",
+			"dijit/layout/TabContainer",
+			"dijit/TitlePane",
+			"dojo/domReady!"
+		], function(doh, array, aspect, declare, domGeom, Memory, parser,
+				registry, _WidgetBase, _TemplatedMixin,
+				Dialog, Form, BorderContainer, ContentPane, _LayoutWidget, TabContainer, TitlePane){
+
+			// Keep track of which panes have had a load event, and how
+			// many load events have occurred for those panes
+			var loadEvents = {
+			};
+			myOnLoad = function(){
+				console.log("onload for " + this);
+				loadEvents[this.id] = (loadEvents[this.id] || 0) + 1;
+			};
+
+			// create a do nothing, only for test widget
+			declare("ResizableWidget", [_WidgetBase, _TemplatedMixin], {
+				templateString: "<span class='dijitInline resizableWidget'>resizable widget</span>",
+				_resized: 0,
+				_resizeArgs: null,
+				
+				constructor: function(){
+					this.history = [];
+				},
+
+				startup: function(){
+					this.history.push("started");
+				},
+
+				resize: function(newSize){
+					this.history.push("resized");
+					this._resized++;
+					this._resizeArgs = arguments;
+					if(newSize){
+						domGeom.setMarginBox(this.domNode, newSize);
+					}
+				}
+			});
+
+			// Monitor lifecycle of widgets.  This used to be done by attaching to _WidgetBase.prototype and
+			// _LayoutWidget.prototype, but that leads to race conditions since declare() runs first, and looks
+			// at the original methods, not the advised-methods.
+			var startups = {};
+			var layoutResizes = {};
+			aspect.after(registry, "add", function(widget){
+				// Keep track of the number of startup() calls to every widget.
+				// Since the href's widgets haven't been created yet we monitor startup() calls on the prototype
+				aspect.after(widget, "startup", function(){
+					startups[widget.id] = (startups[widget.id] || 0) + 1;
+				}, true);
+
+				// Keep track of which layout widgets each resize call to each layout widget,
+				// specifically whether each call specified a size or not.
+				// Since the href's widgets haven't been created yet we can't connect to their resize()
+				// methods, but we can monitor resize() on the prototype
+				aspect.after(widget, "resize", function(){
+					// this is the pointer to the widget, and arguments are newsize/curSize args to resize()
+					var ary = layoutResizes[widget.id];
+					if(!ary){
+						ary = layoutResizes[widget.id] = [];
+					}
+					ary.push(arguments);
+				}, true);
+			}, true);
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			// Test that ContentPanes calls startup() on child widgets appropriately
+			// TODO: overlap here (and other places) with ContentPane.html?
+			doh.register("startup events",
+				{
+					name: "startup on href pane's children",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Wait for load events to occur (after fetching URL's)
+						var pane1 = registry.byId("pane1");
+						pane1.onLoadDeferred.then(d.getTestCallback(function(){
+							var children = pane1.getChildren();
+							doh.is(2, children.length, "found combobox and button");
+							doh.is(1, startups[children[0].id], "combobox started once");
+							doh.is(1, startups[children[0].id], "button started once");
+						}));
+
+						// startup of layout widgets is tested below, indirectly, by
+						// monitoring how man times resize is called etc.
+						return d;
+					}
+				}
+			);
+
+			// Test that ContentPanes defer their load until they are shown
+			doh.register("load events", [
+				{
+					name: "initial conditions",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						// Wait for load events to occur (after fetching URL's)
+						registry.byId("pane1").onLoadDeferred.then(d.getTestCallback(function(){
+							array.forEach(["pane2", "innerPane1", "innerPane2", "bcPane1", "bcPane2"], function(pane){
+								doh.f(loadEvents[pane], pane, pane + " shouldn't be loaded");
+							});
+						}));
+						return d;
+					}
+				},
+				{
+					name: "reset href in hidden pane, pane2",
+					timeout: 2000,
+					runTest: function(){
+						// Resetting an href on a hidden pane should have no effect
+						var d = new doh.Deferred();
+
+						registry.byId("pane2").set("href", "doc0.html");
+						setTimeout(d.getTestCallback(function(){
+							doh.f(loadEvents.pane2, "pane2 shouldn't be loaded");
+						}), 750);
+
+						return d;
+					}
+				},
+				{
+					name: "reset href in hidden pane, innerPane1",
+					timeout: 2000,
+					runTest: function(){
+						// Resetting an href on a hidden pane should have no effect
+						var d = new doh.Deferred();
+
+						registry.byId("innerPane1").set("href", "doc1.html");
+						setTimeout(d.getTestCallback(function(){
+							doh.f(loadEvents.innerPane1, "innerPane1 shouldn't be loaded");
+						}), 750);
+
+						return d;
+					}
+				},
+				{
+					name: "reset href in hidden pane, bcPane2",
+					timeout: 2000,
+					runTest: function(){
+						// Resetting an href on a hidden pane should have no effect
+						var d = new doh.Deferred();
+
+						registry.byId("bcPane2").set("href", "doc0.html");
+						setTimeout(d.getTestCallback(function(){
+							doh.f(loadEvents.bcPane2, "bcPane2 shouldn't be loaded");
+						}), 750);
+
+						return d;
+					}
+				},
+				{
+					name: "selecting ContentPane causes it to load",
+					timeout: 10000,
+					runTest: function(){
+						var pane2 = registry.byId("pane2");
+						doh.f(pane2.onLoadDeferred.isResolved(), "pane2 not loaded yet");
+						registry.byId("outerTC").selectChild(pane2);
+						return pane2.onLoadDeferred;
+					}
+				},
+				{
+					name: "selecting a TabContainer causes its selected child to load",
+					timeout: 10000,
+					runTest: function(){
+						var innerPane1 = registry.byId("innerPane1");
+
+						doh.f(innerPane1.onLoadDeferred.isResolved(), "innerPane1 not loaded yet");
+
+						registry.byId("outerTC").selectChild(registry.byId("innerTC"));
+
+						return innerPane1.onLoadDeferred;
+					}
+				},
+				{
+					name: "selecting a BorderContainer causes its children to load",
+					timeout: 10000,
+					runTest: function(){
+						doh.f(registry.byId("bcPane1").onLoadDeferred.isResolved(), "bcPane1 not loaded");
+						doh.f(registry.byId("bcPane2").onLoadDeferred.isResolved(), "bcPane1 not loaded");
+
+						registry.byId("outerTC").selectChild(registry.byId("bc"));
+
+						return registry.byId("bcPane1").onLoadDeferred.then(function(){
+							return registry.byId("bcPane2").onLoadDeferred;
+						});
+					}
+				}
+			]);
+
+			doh.register("resize events", [
+				// Test that when ContentPane w/single resizable child is shown,
+				// the child is sized to match the ContentPane
+				{
+					name: "single child",
+					runTest: function(){
+						var child = registry.byId("singleChildResizable");
+						doh.is(0, child._resized, "hasn't been shown yet so no resize events");
+
+						registry.byId("resizeTC").selectChild(registry.byId("singleChildPane"));
+
+						doh.t(child._resized, "got resize event");	// note: should only be 1 but currently gets 2
+						doh.t(child._resizeArgs && child._resizeArgs.length, "got size specified");
+
+						var size = child._resizeArgs[0];
+						doh.t(size && size.h, "non-0 height specified");
+						doh.t(size && size.w, "non-0 width specified");
+					}
+				},
+				// Test that when ContentPane w/multiple resizable children is shown,
+				// the children aren't sized to match the ContentPane, but we do call
+				// resize on them so they can lay themselves out
+				{
+					name: "multiple children",
+					runTest: function(){
+						var child1 = registry.byId("multipleChildResizable1"),
+							child2 = registry.byId("multipleChildResizable2");
+
+						doh.is(0, child1._resized, "child1 hasn't been shown yet so no resize events");
+						doh.is(0, child2._resized, "child2 hasn't been shown yet so no resize events");
+
+						registry.byId("resizeTC").selectChild(registry.byId("multipleChildPanes"));
+
+						doh.t(child1._resized, "got resize event for child1");
+						doh.is(0, child1._resizeArgs && child1._resizeArgs.length, "no size specified for child1");
+						doh.t(child2._resized, "got resize event for child2");
+						doh.is(0, child2._resizeArgs && child2._resizeArgs.length, "no size specified for child2")
+					}
+				},
+
+				{
+					name: "single resizable widget, plus invisible widget",
+					runTest: function(){
+						var child = registry.byId("fss2_rc");
+						doh.t(child._resized, "got resize event for child");
+						doh.is(1, child._resizeArgs && child._resizeArgs.length, "size specified");
+						doh.is("fss2_rc", registry.byId("fss2")._singleChild.id, "the resizable child memoed")
+					}
+				},
+
+				{
+					name: "multiple resizable widgets in form with size",
+					runTest: function(){
+						var child1 = registry.byId("fsmc1"),
+							child2 = registry.byId("fsmc2");
+
+						doh.t(child1._resized, "got resize event for child1");
+						doh.is(0, child1._resizeArgs && child1._resizeArgs.length, "no size specified for child1");
+						doh.t(child2._resized, "got resize event for child2");
+						doh.is(0, child2._resizeArgs && child2._resizeArgs.length, "no size specified for child2");
+					}
+				},
+				{
+					name: "single resizable widget, single non-resizable (but visible) widget",
+					runTest: function(){
+						var child = registry.byId("fsm2_rc");
+						doh.t(child._resized, "got resize event for child");
+						doh.is(0, child._resizeArgs && child._resizeArgs.length, "no size specified for child");
+					}
+				},
+
+				// Test that resize event works correctly for href w/single layout widget
+				{
+					name: "single resizable href",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						var singleChildHref = registry.byId("singleChildHref");
+
+						registry.byId("resizeTC").selectChild(singleChildHref);
+
+						// Wait for load events to occur (after fetching URL's)
+						singleChildHref.onLoadDeferred.then(d.getTestCallback(function(){
+							// Check top level border container got sized to fit ContentPane
+							var child = registry.byId("singleChildHrefBorderContainer");
+							doh.t(child, "href was loaded and top level BorderContainer was created");
+							doh.t(layoutResizes["singleChildHrefBorderContainer"], "got resize event");
+							doh.t(layoutResizes["singleChildHrefBorderContainer"][0].length, "got size specified");
+
+							var size = layoutResizes["singleChildHrefBorderContainer"][0][0];
+							doh.t(size && size.h, "non-0 height specified");
+							doh.t(size && size.w, "non-0 width specified");
+
+							// Check that resize() events also trickled down to inner TabContainer
+							var child2 = registry.byId("singleChildHrefInnerTabContainer");
+							doh.t(child2, "inner TabContainer was created");
+							doh.t(layoutResizes["singleChildHrefInnerTabContainer"], "got resize event");
+							doh.is(0, layoutResizes["singleChildHrefInnerTabContainer"][0].length, "no size specified")
+						}));
+
+						return d;
+					}
+				},
+
+				// Test that resize event works correctly for href w/multiple layout widgets
+				{
+					name: "multiple resizable href",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						var multipleChildHref = registry.byId("multipleChildHref")
+
+						registry.byId("resizeTC").selectChild(multipleChildHref);
+
+						// Wait for load events to occur (after fetching URL's)
+						multipleChildHref.onLoadDeferred.then(d.getTestCallback(function(){
+							// Check that resize() done on TabContainer
+							var child = registry.byId("multipleChildHrefTabContainer");
+							doh.t(child, "TabContainer was created");
+							doh.t(layoutResizes["multipleChildHrefTabContainer"], "got resize event");
+							doh.is(0, layoutResizes["multipleChildHrefTabContainer"][0].length, "no size specified")
+						}));
+
+						return d;
+					}
+				},
+
+				// Test that resize() is called on resizable children hidden inside of a form widget
+				// where the form widget is inside a layout container
+				{
+					name: "multiple resizable elements hidden in form in TabContainer",
+					runTest: function(){
+						var child1 = registry.byId("resizableInForm1"),
+							child2 = registry.byId("resizableInForm2");
+
+						doh.is(0, child1._resized, "child1 hasn't been shown yet so no resize events");
+						doh.is(1, child1.history.length, "child1 # of history events (before show)");
+						doh.is("started", child1.history[0], "child1 history");
+
+						doh.is(0, child2._resized, "child2 hasn't been shown yet so no resize events");
+						doh.is(1, child1.history.length, "child2 # of history events (before show)");
+						doh.is("started", child2.history[0], "child2 history");
+
+						registry.byId("resizeTC").selectChild(registry.byId("multipleResizableInForm"));
+
+						doh.t(child1._resized, "got resize event for child1");
+						doh.is(0, child1._resizeArgs && child1._resizeArgs.length, "no size specified for child1");
+						doh.t(child2._resized, "got resize event for child2");
+						doh.is(0, child2._resizeArgs && child2._resizeArgs.length, "no size specified for child2")
+					}
+				},
+
+				{
+					name: "single resizable element hidden in form in TabContainer",
+					runTest: function(){
+						var child = registry.byId("resizableInForm0");
+
+						doh.is(0, child._resized, "child hasn't been shown yet so no resize events");
+						doh.is(1, child.history.length, "child # of history events (before show)");
+						doh.is("started", child.history[0], "child history");
+
+						registry.byId("resizeTC").selectChild(registry.byId("singleResizableInForm"));
+
+						doh.t(child._resized, "got resize event for child");
+						doh.is(1, child._resizeArgs && child._resizeArgs.length, "size specified")
+					}
+				},
+
+				// Test that form where parent *isn't* a layout container calls startup() and resize()
+				// on it's child layout widgets
+				{
+					name: "single resizable element in form with size",
+					runTest: function(){
+						var child = registry.byId("fssc");
+						doh.t(child._resized, "got resize event for child");
+						doh.is(1, child._resizeArgs && child._resizeArgs.length, "size specified")
+					}
+				},
+
+				{
+					name: "multiple resizable elements in form with size",
+					runTest: function(){
+						var child1 = registry.byId("fsmc1"),
+							child2 = registry.byId("fsmc2");
+
+						doh.t(child1._resized, "got resize event for child1");
+						doh.is(0, child1._resizeArgs && child1._resizeArgs.length, "no size specified for child1");
+						doh.t(child2._resized, "got resize event for child2");
+						doh.is(0, child2._resizeArgs && child2._resizeArgs.length, "no size specified for child2")
+					}
+				},
+
+				{
+					name: "single resizable elements in form with no size, doLayout=false",
+					runTest: function(){
+						var child = registry.byId("fnsc");
+
+						doh.t(child._resized, "got resize event for child");
+						doh.is(0, child._resizeArgs && child._resizeArgs.length, "no size specified for child")
+					}
+				},
+
+				{
+					name: "multiple resizable elements in form with no size",
+					runTest: function(){
+						var child1 = registry.byId("fnmc1"),
+							child2 = registry.byId("fnmc2");
+
+						doh.t(child1._resized, "got resize event for child1");
+						doh.is(0, child1._resizeArgs && child1._resizeArgs.length, "no size specified for child1");
+						doh.t(child2._resized, "got resize event for child2");
+						doh.is(0, child2._resizeArgs && child2._resizeArgs.length, "no size specified for child2")
+					}
+				}
+			]);
+
+			// Make sure that TitlePane loads it's href at the appropriate time, and also that
+			// it calls resize on it's children at the appropriate time (since that's the contract
+			// for layout widgets, and ContentPane is acting as a layout widget).
+			doh.register("TitlePane", [
+			/***
+			 * test for #8197, uncomment when it's fixed.
+				{
+					name: "initially open, single child",
+					timeout: 2000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var tp = registry.byId("otpHsc");
+
+						// Allow time for href to load
+						setTimeout(d.getTestCallback(function(){
+							// Check that href loaded
+							doh.is(1, loadEvents["otpHsc"], "otpHsc loaded on page load");
+
+							// Check that resize() done on child
+							doh.t(layoutResizes["otpHscBorderContainer"], "got resize event");
+							doh.is(0, layoutResizes["otpHscBorderContainer"][0].length, "no size specified")
+						}), 750);
+
+						return d;
+					}
+				},
+			  */
+				{
+					name: "initially open, href multiple children",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var tp = registry.byId("otpHmc");
+
+						// Allow time for href to load
+						tp.onLoadDeferred.then(d.getTestCallback(function(){
+							// Check that resize() done on children
+							doh.t(layoutResizes["otpHmcBorderContainer"], "got resize event for BC");
+							doh.t(layoutResizes["otpHmcTabContainer"], "got resize event for TC");
+							doh.is(0, layoutResizes["otpHmcBorderContainer"][0].length, "no size specified for BC")
+						}));
+
+						return d;
+					}
+				},
+
+				{
+					name: "initially open, multiple children",
+					runTest: function(){
+						var tp = registry.byId("otpMc");
+
+						// Check that resize() done on children
+						doh.t(registry.byId("otpMc_child1")._resized, "got resize event for child1");
+						doh.t(registry.byId("otpMc_child2")._resized, "got resize event for child2");
+					}
+				},
+
+				{
+					name: "initially closed, href multiple children",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						doh.f(loadEvents["ctpHmc"], "ctpHmc load deferred until open");
+
+						var tp = registry.byId("ctpHmc");
+						tp.set("open", true);
+
+						// Allow time for href to load, pane to expand, and resize to be called on children
+						tp.onLoadDeferred.then(d.getTestCallback(function(){
+							// Check that resize() done on children
+							doh.t(layoutResizes["ctpHmcBorderContainer"], "got resize event for BC");
+							doh.t(layoutResizes["ctpHmcTabContainer"], "got resize event for TC");
+							doh.is(0, layoutResizes["ctpHmcBorderContainer"][0].length, "no size specified for BC")
+						}));
+
+						return d;
+					}
+				},
+
+				{
+					name: "initially closed, multiple children",
+					timeout: 2000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						doh.f(registry.byId("ctpMc_child1")._resized, "resize event for child1 deferred");
+						doh.f(registry.byId("ctpMc_child2")._resized, "resize event for child2 deferred");
+
+						var tp = registry.byId("ctpMc");
+						tp.set("open", true);
+
+						// Allow time for pane to expand, and resize to be called on children
+						setTimeout(d.getTestCallback(function(){
+							// Check that resize() done on children
+							doh.t(registry.byId("ctpMc_child1")._resized, "got resize event for child1");
+							doh.t(registry.byId("ctpMc_child2")._resized, "got resize event for child2");
+						}), 750);
+
+						return d;
+					}
+				}
+			]);
+
+			// Make sure that Dialog loads it's href when shown, and also that
+			// it calls resize on its children when shown (since that's the contract
+			// for layout widgets, and ContentPane is acting as a layout widget).
+			doh.register("Dialog", [
+				{
+					name: "href multiple children",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						doh.f(loadEvents["dlgHmc"], "dlgHmc load deferred until open");
+
+						var dlg = registry.byId("dlgHmc");
+						dlg.show();
+
+						// Allow time for href to load, pane to expand, and resize to be called on children
+						dlg.onLoadDeferred.then(d.getTestCallback(function(){
+							// Check that href loaded
+							doh.is(1, loadEvents["dlgHmc"], "dlgHmc loaded when expanded");
+
+							// Check that resize() done on children
+							doh.t(layoutResizes["dlgHmcBorderContainer"], "got resize event for BC");
+							doh.t(layoutResizes["dlgHmcTabContainer"], "got resize event for TC");
+							doh.is(0, layoutResizes["dlgHmcBorderContainer"][0].length, "no size specified for BC")
+						}));
+
+						return d;
+					},
+					tearDown: function(){
+						// Note: this currently triggers an CancelError to the console;
+						// we are apparently canceling a Deferred that has already been resolved.
+						var dlg = registry.byId("dlgHmc");
+						dlg.hide();
+					}
+				},
+
+				{
+					name: "multiple inlined children",
+					timeout: 2000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						doh.f(registry.byId("dlgMc_child1")._resized, "resize event for child1 deferred");
+						doh.f(registry.byId("dlgMc_child2")._resized, "resize event for child2 deferred");
+
+						var dlg = registry.byId("dlgMc");
+						dlg.show();
+
+						// Allow time for pane to expand, and resize to be called on children
+						setTimeout(d.getTestCallback(function(){
+							// Check that resize() done on children
+							doh.t(registry.byId("dlgMc_child1")._resized, "got resize event for child1");
+							doh.t(registry.byId("dlgMc_child2")._resized, "got resize event for child2");
+						}), 750);
+
+						return d;
+					},
+					tearDown: function(){
+						var dlg = registry.byId("dlgMc");
+						dlg.hide();
+					}
+				}
+			]);
+
+			// Test that resizing a TabContainer doesn't reload href (when refreshOnShow=true), bug #8197
+			doh.register("TabContainer resize/reload tests", [
+				{
+					name: "initial conditions",
+					timeout: 10000,
+					runTest: function(){
+						// Wait for load events to occur (after fetching URL's)
+						return registry.byId("reloadTC_pane1").onLoadDeferred;
+					}
+				},
+				{
+					name: "reload on reshow",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						var reloadTC = registry.byId("reloadTC"),
+							pane1 = registry.byId("reloadTC_pane1"),
+							pane2 = registry.byId("reloadTC_pane2");
+
+						var originalPane1OnLoadDeferred = pane1.onLoadDeferred;
+
+						reloadTC.selectChild(pane2);
+						reloadTC.selectChild(pane1);
+
+						doh.isNot(originalPane1OnLoadDeferred, pane1.onLoadDeferred,
+								"selecting pane1 again created new onLoadDeferred");
+
+						return pane1.onLoadDeferred;
+					}
+				},
+				{
+					name: "no reload on TabContainer resize",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						registry.byId("reloadTC").resize({h: 300, w: 300});
+						setTimeout(d.getTestCallback(function(){
+							doh.is(2, loadEvents.reloadTC_pane1, "pane1 not loaded again");
+						}), 750);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body role="main">
+	<h1>dijit/layout/ContentPane layout related DOH test</h1>
+
+	<p>
+		Tests ContentPane in it's role as a layout widget, including as child of another layout widgets (especially TabContainer).
+	</p>
+
+	<h2>Tests that href gets loaded when ContentPane is first made visible</h2>
+	<div id="outerTC" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 880px; height: 200px;","aria-label":"outerTC"'>
+		<div id="pane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"doc0.html", title:"Initially Selected", onLoad:myOnLoad'>
+			initially selected pane
+		</div>
+		<div id="pane2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"doc1.html", title:"Initially Hidden", onLoad:myOnLoad'>
+			unselected pane
+		</div>
+		<div id="innerTC" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='nested:true, title:"Nested TabContainer"'>
+			<div id="innerPane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"doc0.html", title:"Initially Selected", onLoad:myOnLoad'>
+				initially selected inner pane
+			</div>
+			<div id="innerPane2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"doc1.html", title:"Initially Hidden", onLoad:myOnLoad'>
+				unselected pane
+			</div>
+		</div>
+		<div id="bc" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='title:"BorderContainer"'>
+			<div id="bcPane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"doc0.html", region:"left", style:"width: 200px;", onLoad:myOnLoad'>
+				left pane
+			</div>
+			<div id="bcPane2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"doc1.html", region:"center", onLoad:myOnLoad'>
+				center pane
+
+				<!-- when this ContentPane is shown each of these widgets should get a resize()
+				 	 call w/no size specification -->
+				<div id="bcResizable1" data-dojo-type="ResizableWidget" ></div>
+				<div id="bcResizable2" data-dojo-type="ResizableWidget" ></div>
+			</div>
+		</div>
+	</div>
+
+	<h2>Tests for resizing in a layout container hierarchy</h2>
+	<div id="resizeTC" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 880px; height: 200px;","aria-label":"resizeTC"'>
+		<div id="resizePane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Initially Selected", onLoad:myOnLoad'>
+			initially selected pane
+		</div>
+		<div id="singleChildPane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Single ResizableChild", onLoad:myOnLoad'>
+			<div id="singleChildResizable" data-dojo-type="ResizableWidget" ></div>
+		</div>
+		<div id="multipleChildPanes" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Multiple ResizableChild", onLoad:myOnLoad'>
+			<div id="multipleChildResizable1" data-dojo-type="ResizableWidget" ></div>
+			<div style="border: groove blue medium;">
+				<span>hide the second widget to see if ContentPane can still find it</span>
+				<div id="multipleChildResizable2" data-dojo-type="ResizableWidget" ></div>
+				<span>ending text</span>
+			</div>
+		</div>
+		<div id="multipleResizableInForm" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Multiple resizable in form", onLoad:myOnLoad'>
+			<div data-dojo-type="dijit/form/Form">
+				<div id="resizableInForm1" data-dojo-type="ResizableWidget" ></div>
+				<div id="resizableInForm2" data-dojo-type="ResizableWidget" ></div>
+			</div>
+		</div>
+		<div id="singleResizableInForm" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Single resizable in form", onLoad:myOnLoad'>
+			<div data-dojo-type="dijit/form/Form">
+				<div id="resizableInForm0" data-dojo-type="ResizableWidget" ></div>
+			</div>
+		</div>
+		<div id="singleChildHref" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Href Single Child",
+			href:"borderContainer.php?id=singleChildHref", onLoad:myOnLoad'></div>
+		<div id="multipleChildHref" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Href Multiple Children",
+			href:"multipleLayoutWidgets.php?id=multipleChildHref", onLoad:myOnLoad'></div>
+	</div>
+
+	
+	<h2>Size on Form, single nested layout widget</h2>
+	<form data-dojo-type="dijit/form/Form" style="height:100px; width: 100px; border: medium inset gray; padding: 10px;" id="fss">
+		<div data-dojo-type="ResizableWidget" id="fssc"></div>
+	</form>
+	<form data-dojo-type="dijit/form/Form" style="height:100px; width: 100px; border: medium inset gray; padding: 10px;" id="fss2">
+		<!-- this form has one resizable child, and an invisible child, so the resizable child should be expanded -->
+		<div id="fss2_rc" data-dojo-type="ResizableWidget">resizable</div>
+		<div id="fss2_ic" data-dojo-type="dojo/store/Memory"></div>
+	</form>
+	<h2>Size on Form, multiple nested widgets</h2>
+	<!-- two layout widgets -->
+	<form data-dojo-type="dijit/form/Form" style="height:250px; width: 150px; border: medium inset gray; padding: 10px;" id="fsm">
+		<div data-dojo-type="ResizableWidget" style="width: 100px; height: 100px; border: 1px solid black;" id="fsmc1">
+			child #1 (100x100)
+		</div>
+		<div data-dojo-type="ResizableWidget" style="width: 100px; height: 100px; border: 1px solid black;" id="fsmc2">
+			child #2 (100x100)
+		</div>
+	</form>
+	<form data-dojo-type="dijit/form/Form" style="height:250px; width: 150px; border: medium inset gray; padding: 10px;" id="fsm2">
+		<div id="fsm2_vc" data-dojo-type="dijit/_WidgetBase">visible</div>
+		<div id="fsm2_rc" data-dojo-type="ResizableWidget">resizable</div>
+	</form>
+
+	<h2>No size on Form, single nested layout widgets</h2>
+	<form data-dojo-type="dijit/form/Form" style="border: medium inset gray; padding: 10px;" data-dojo-props="doLayout: false" id="fns">
+		<div data-dojo-type="ResizableWidget" style="height:200px; width: 400px;" id="fnsc">
+		</div>
+	</form>
+
+	<h2>No size on Form, multiple nested layout widget</h2>
+	<form data-dojo-type="dijit/form/Form" style="border: medium inset gray; padding: 10px;" id="fnm">
+		<div data-dojo-type="ResizableWidget" style="width: 100px; height: 100px; border: 1px solid black;" id="fnmc1">
+			child #1 (100x100)
+		</div>
+		<div data-dojo-type="ResizableWidget" style="width: 100px; height: 100px; border: 1px solid black;" id="fnmc2">
+			child #2 (100x100)
+		</div>
+	</form>
+
+	<h2>Tests that ContentPane resize doesn't trigger reload</h2>
+	<div id="reloadTC" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 880px; height: 200px;","aria-label":"outerTC"'>
+		<div id="reloadTC_pane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"doc0.html", title:"Initially Selected", onLoad:myOnLoad, refreshOnShow:true'>
+			initially selected pane
+		</div>
+		<div id="reloadTC_pane2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"doc1.html", title:"Initially Hidden", onLoad:myOnLoad'>
+			unselected pane
+		</div>
+	</div>
+
+	<h2>Test the ContentPane loads href and resizes children (as per it's contract a layout widget)
+			when it's not a child of a layout container itself</h2>
+	<div id="ctpHsc" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Closed TitlePane Href Single Child", open:false,
+		href:"borderContainer.php?id=ctpHsc&amp;sized=true", onLoad:myOnLoad'></div>
+	<br><br>
+
+	<div id="ctpHmc" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Closed TitlePane Href Multiple Children", open:false,
+		href:"multipleLayoutWidgets.php?id=ctpHmc", onLoad:myOnLoad'></div>
+	<br><br>
+
+	<div id="otpHsc" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Opened TitlePane Href Single Child",
+		href:"borderContainer.php?id=otpHsc&amp;sized=true", onLoad:myOnLoad'></div>
+	<br><br>
+
+	<div id="otpHmc" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Opened TitlePane Href Multiple Children",
+		href:"multipleLayoutWidgets.php?id=otpHmc", onLoad:myOnLoad'></div>
+	<br><br>
+
+	<div id="otpMc" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Opened TitlePane Multiple Children"'>
+		<!-- these widgets should get a resize on page load -->
+		<div id="otpMc_child1" data-dojo-type="ResizableWidget" ></div>
+		<div id="otpMc_child2" data-dojo-type="ResizableWidget" ></div>
+	</div>
+	<br><br>
+
+	<div id="ctpMc" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Closed TitlePane Multiple Children", open:false'>
+		<!-- these widgets should get a resize() when the TitlePane is opened -->
+		<div id="ctpMc_child1" data-dojo-type="ResizableWidget" ></div>
+		<div id="ctpMc_child2" data-dojo-type="ResizableWidget" ></div>
+	</div>
+	<br><br>
+
+	<div id="dlgHmc" data-dojo-type="dijit/Dialog" data-dojo-props='title:"Dialog Href Multiple Children",
+		href:"multipleLayoutWidgets.php?id=dlgHmc", onLoad:myOnLoad'></div>
+
+	<div id="dlgMc" data-dojo-type="dijit/Dialog" data-dojo-props='title:"Dialog Multiple Children"'>
+		<!-- these widgets should get a resize() when the Dialog is opened -->
+		<div id="dlgMc_child1" data-dojo-type="ResizableWidget" ></div>
+		<div id="dlgMc_child2" data-dojo-type="ResizableWidget" ></div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/LayoutContainer.html b/src/main/resources/static/dijit/tests/layout/LayoutContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..10e6f5b788ecc2087f11ba55781cfc3c3a7f61af
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/LayoutContainer.html
@@ -0,0 +1,211 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+	<title>dijit/layout/LayoutContainer Test</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array",
+			"dojo/dom-geometry",
+			"dojo/json",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/layout/ContentPane",
+			"dijit/layout/LayoutContainer",
+			"dijit/tests/helpers",
+			"dijit/form/FilteringSelect",
+			"dojo/domReady!"
+		], function(doh, array,domGeom, json, parser,
+					registry, ContentPane, LayoutContainer, helpers){
+
+			function checkInside(/*Widget*/ child, /*Widget*/ parent){
+				// summary:
+				//		Test that child is fully inside of parent
+				var cp = domGeom.position(child.domNode, true),
+					pp = domGeom.position(parent.domNode, true);
+
+				doh.t(
+					cp.y > pp.y && cp.y+cp.h < pp.y+pp.h &&
+					cp.x > pp.x && cp.x+cp.w < pp.x+pp.w,
+					"check " + child.id + "( " + json.stringify(cp) + " ) inside " + parent.id  + "( " +
+							json.stringify(pp) + " )");
+			}
+			function checkAbove(/*Widget*/ above, /*Widget*/ below){
+				// summary:
+				//		Test that "above" widget is above "below" widget
+
+				var ap = domGeom.position(above.domNode, true),
+					bp = domGeom.position(below.domNode, true);
+
+				doh.t(Math.round(ap.y+ap.h) <= Math.round(bp.y),
+					"check " + above.id + "( " + json.stringify(ap) + " ) above " + below.id + "( " +
+							json.stringify(bp) + " )");
+			}
+			function checkLeft(/*Widget*/ left, /*Widget*/ right){
+				// summary:
+				//		Test that "left" widget is to left of "right" widget
+
+				var lp = domGeom.position(left.domNode, true),
+					rp = domGeom.position(right.domNode, true);
+
+				doh.t(lp.x+lp.w <= rp.x,
+					"check " + left.id + "( " + json.stringify(lp) + " ) to left of " + right.id + "( " +
+							json.stringify(rp) + " )");
+			}
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			doh.register("LayoutContainer", [
+				function basic(){
+					var lc = registry.byId("basic");
+					array.forEach(lc.getChildren(), function(child){
+						checkInside(child, lc);
+					});
+
+					var left = registry.byId("leftcp_layout1"),
+						top = registry.byId("topcp_layout1"),
+						right = registry.byId("rightcp_layout1"),
+						center = registry.byId("centercp_layout1"),
+						bottom = registry.byId("bottomcp_layout1");
+
+					// Check positions
+					checkLeft(left, top);
+					checkLeft(left, center);
+					checkLeft(bottom, right);
+					checkAbove(top, center);
+					checkAbove(center, bottom);
+
+					// Check tab order
+					var tabbable = helpers.tabOrder(lc.domNode);
+					doh.is(7, tabbable.length, "each pane plus link and select");
+					doh.is(left.id, tabbable[0].id, "left");
+					doh.is(right.id, tabbable[1].id, "right");
+					doh.is(top.id, tabbable[2].id, "top");
+					doh.is(center.id, tabbable[3].id, "center");
+					doh.is(bottom.id, tabbable[6].id, "bottom");
+				},
+
+				function advanced(){
+					var lc = registry.byId("advanced");
+					array.forEach(lc.getChildren(), function(child){
+						checkInside(child, lc);
+					});
+
+					var left = registry.byId("leftcp_layout2"),
+						top = registry.byId("topcp_layout2"),
+						right = registry.byId("rightcp_layout2"),
+						centerLeft = registry.byId("centerLeftcp_layout2"),
+						center = registry.byId("centercp_layout2"),
+						centerRight = registry.byId("centerRightcp_layout2"),
+						bottom = registry.byId("bottomcp_layout2");
+
+					// Check positions
+					checkLeft(left, top);
+					checkLeft(left, centerLeft);
+					checkLeft(centerLeft, center);
+					checkLeft(center, centerRight);
+					checkAbove(top, center);
+					checkAbove(top, centerRight);
+					checkAbove(centerLeft, bottom);
+
+					// Check tab order
+					var tabbable = helpers.tabOrder(lc.domNode);
+					doh.is(8, tabbable.length, "each pane plus link and select");
+					doh.is(left.id, tabbable[0].id, "left");
+					doh.is(top.id, tabbable[1].id, "top");
+					doh.is(centerLeft.id, tabbable[2].id, "inner left");
+					doh.is(center.id, tabbable[3].id, "center");
+					/* two random widgets inside center pane ... */
+					doh.is(centerRight.id, tabbable[6].id, "inner right");
+					doh.is(bottom.id, tabbable[7].id, "bottom");
+				}
+			]);
+			
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro" role="main">
+	<h2 id="heading" >Dijit layout.LayoutContainer tests</h2>
+
+	<p>Basic layout. Tabindex=&quot;0&quot; added to each pane to test for tab order matching source code order.  Tab order
+	should be:  left, right, top, middle/main, bottom</p>
+
+	<div id="basic" data-dojo-type="dijit/layout/LayoutContainer" data-dojo-props="design: 'sidebar'"
+		style="border: 2px solid black; width: 90%; height: 300px; padding: 10px;"
+	>
+		<div data-dojo-type="dijit/layout/ContentPane" id="leftcp_layout1" region="left" style="background-color: #acb386; width: 100px;" tabindex="0">
+			left
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="rightcp_layout1" region="right" style="background-color: #acb386;"  tabindex="0">
+			right
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="topcp_layout1" region="top" style="background-color: #b39b86; "  tabindex="0">
+			top bar
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="centercp_layout1" region="center" style="background-color: #f5ffbf; padding: 10px;"  tabindex="0">
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+			<select data-dojo-type="dijit/form/FilteringSelect" aria-label="select">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" id="bottomcp_layout1" region="bottom" style="background-color: #b39b86;"  tabindex="0">
+			bottom bar
+		</div>
+
+	</div>
+
+	<p>Advanced layout. Tabindex=&quot;0&quot; added to each pane to test for tab order matching source code order.  Tab order
+	should be:  left, top, inner left, inner middle, inner right, bottom. This is not an ideal tab order. See below to use nested
+	layout containers to achieve a tab order which matches presentation and source code order.</p>
+	<div id="advanced" data-dojo-type="dijit/layout/LayoutContainer"
+		style="border: 2px solid black; width: 90%; height: 300px; padding: 10px;"
+	>
+		<div data-dojo-type="dijit/layout/ContentPane" id="leftcp_layout2" data-dojo-props="region:'left',layoutPriority:1"
+			 style="background-color: #acb386; width: 100px; margin: 5px;" tabindex="0">
+			left
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="topcp_layout2" data-dojo-props="region:'top',layoutPriority:2"
+			 style="background-color: #b39b86;  margin: 5px;" tabindex="0">
+			top bar
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="centerLeftcp_layout2" data-dojo-props="region:'left',layoutPriority:3"
+			 style="background-color: #eeeeee; width: 100px; margin: 5px;" tabindex="0">
+			inner left
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" id="centercp_layout2" data-dojo-props="region:'center'"
+			 style="background-color: #f5ffbf; padding: 10px; margin: 5px;" tabindex="0">
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+
+			(to check we're copying children around properly).<br />
+			<select data-dojo-type="dijit/form/FilteringSelect" aria-label="select">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="centerRightcp_layout2" data-dojo-props="region:'right',layoutPriority:3"
+			 style="background-color: #eeeeee; width: 100px; margin: 5px;" tabindex="0">
+			inner right
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="bottomcp_layout2" data-dojo-props="region:'bottom',layoutPriority:2"
+			 style="background-color: #b39b86; margin: 5px;" tabindex="0">
+
+			bottom bar
+		</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/LayoutContainer_v1.html b/src/main/resources/static/dijit/tests/layout/LayoutContainer_v1.html
new file mode 100644
index 0000000000000000000000000000000000000000..0d006ddbe96be1189a3e78068395e84631109102
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/LayoutContainer_v1.html
@@ -0,0 +1,290 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+	<title>dijit/layout/LayoutContainer Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array",
+			"dojo/dom-geometry",
+			"dojo/json",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/layout/ContentPane",
+			"dijit/layout/LayoutContainer",
+			"dijit/tests/helpers",
+			"dijit/form/FilteringSelect",
+			"dojo/domReady!"
+		], function(doh, array,domGeom, json, parser,
+					registry, ContentPane, LayoutContainer, helpers){
+
+			function checkInside(/*Widget*/ child, /*Widget*/ parent){
+				// summary:
+				//		Test that child is fully inside of parent
+				var cp = domGeom.position(child.domNode, true),
+					pp = domGeom.position(parent.domNode, true);
+
+				doh.t(
+					cp.y > pp.y && cp.y+cp.h < pp.y+pp.h &&
+					cp.x > pp.x && cp.x+cp.w < pp.x+pp.w,
+					child.layoutAlign + " inside " + parent.id + json.stringify(cp) + json.stringify(pp)
+				);
+			}
+			function checkAbove(/*String*/ comment, /*Widget*/ above, /*Widget*/ below){
+				// summary:
+				//		Test that "above" widget is above "below" widget
+
+				var ap = domGeom.position(above.domNode, true),
+					bp = domGeom.position(below.domNode, true);
+
+				doh.t(Math.round(ap.y+ap.h) <= Math.round(bp.y),
+					comment + " " + above.layoutAlign + " above " + below.layoutAlign + json.stringify(ap) + json.stringify(bp)
+				);
+			}
+			function checkLeft(/*String*/ comment, /*Widget*/ left, /*Widget*/ right){
+				// summary:
+				//		Test that "left" widget is to left of "right" widget
+
+				var lp = domGeom.position(left.domNode, true),
+					rp = domGeom.position(right.domNode, true);
+
+				doh.t(lp.x+lp.w <= rp.x,
+					comment + " " + left.layoutAlign + " to left of " + right.layoutAlign + json.stringify(lp) + json.stringify(rp)
+				);
+			}
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			doh.register("LayoutContainer", [
+				function basic(){
+					var lc = registry.byId("basic");
+					array.forEach(lc.getChildren(), function(child){
+						checkInside(child, lc);
+					});
+
+					var left = registry.byId("leftcp_layout1"),
+						top = registry.byId("topcp_layout1"),
+						right = registry.byId("rightcp_layout1"),
+						center = registry.byId("centercp_layout1"),
+						bottom = registry.byId("bottomcp_layout1");
+
+					// Check positions
+					checkLeft("left vs top", left, top);
+					checkLeft("left vs center", left, center);
+					checkLeft("bottom vs right", bottom, right);
+					checkAbove("top vs center", top, center);
+					checkAbove("center vs bottom", center, bottom);
+
+					// Check tab order
+					var tabbable = helpers.tabOrder(lc.domNode);
+					doh.is(7, tabbable.length, "each pane plus link and select");
+					doh.is(left.id, tabbable[0].id, "left");
+					doh.is(right.id, tabbable[1].id, "right");
+					doh.is(top.id, tabbable[2].id, "top");
+					doh.is(center.id, tabbable[3].id, "center");
+					doh.is(bottom.id, tabbable[6].id, "bottom");
+				},
+
+				function advanced(){
+					var lc = registry.byId("advanced");
+					array.forEach(lc.getChildren(), function(child){
+						checkInside(child, lc);
+					});
+
+					var left = registry.byId("leftcp_layout2"),
+						top = registry.byId("topcp_layout2"),
+						right = registry.byId("rightcp_layout2"),
+						centerLeft = registry.byId("centerLeftcp_layout2"),
+						center = registry.byId("centercp_layout2"),
+						centerRight = registry.byId("centerRightcp_layout2"),
+						bottom = registry.byId("bottomcp_layout2");
+
+					// Check positions
+					checkLeft("left vs top", left, top);
+					checkLeft("left vs centerLeft", left, centerLeft);
+					checkLeft("centerLeft vs center", centerLeft, center);
+					checkLeft("center vs centerRight", center, centerRight);
+					checkAbove("top vs center", top, center);
+					checkAbove("top vs inner right", top, centerRight);
+					checkAbove("centerLeft vs bottom", centerLeft, bottom);
+
+					// Check tab order
+					var tabbable = helpers.tabOrder(lc.domNode);
+					doh.is(8, tabbable.length, "each pane plus link and select");
+					doh.is(left.id, tabbable[0].id, "left");
+					doh.is(top.id, tabbable[1].id, "top");
+					doh.is(bottom.id, tabbable[2].id, "bottom");
+					doh.is(centerLeft.id, tabbable[3].id, "center left");
+					doh.is(center.id, tabbable[4].id, "center");
+					doh.is(centerRight.id, tabbable[7].id, "center right");
+				}
+			]);
+			
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro" role="main">
+	<h2 id="heading" >Dijit layout.LayoutContainer Old API tests</h2>
+	<p>
+		Tests for using layoutAlign property rather than region, so design setting (headline or sidebar) has no effect.
+		Remove for 2.0.
+	</p>
+
+	<p>Basic layout. Tabindex=&quot;0&quot; added to each pane to test for tab order matching source code order.  Tab order
+	should be:  left, right, top, middle/main, bottom</p>
+
+	<div id="basic" data-dojo-type="dijit/layout/LayoutContainer"
+		style="border: 2px solid black; width: 90%; height: 300px; padding: 10px;"
+	>
+		<div data-dojo-type="dijit/layout/ContentPane" id="leftcp_layout1" layoutAlign="left" style="background-color: #acb386; width: 100px;" tabindex="0">
+			left
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="rightcp_layout1" layoutAlign="right" style="background-color: #acb386;"  tabindex="0">
+			right
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="topcp_layout1" layoutAlign="top" style="background-color: #b39b86; "  tabindex="0">
+			top bar
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="centercp_layout1" layoutAlign="client" style="background-color: #f5ffbf; padding: 10px;"  tabindex="0">
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+			<select data-dojo-type="dijit/form/FilteringSelect" aria-label="select">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" id="bottomcp_layout1" layoutAlign="bottom" style="background-color: #b39b86;"  tabindex="0">
+			bottom bar
+		</div>
+
+	</div>
+
+	<p>Advanced layout. Tabindex=&quot;0&quot; added to each pane to test for tab order matching source code order.  Tab order
+	should be:  left, top, bottom, inner left, inner middle, inner right. This is not an ideal tab order. See below to use nested
+	layout containers to achieve a tab order which matches presentation and source code order.</p>
+	<div id="advanced" data-dojo-type="dijit/layout/LayoutContainer"
+		style="border: 2px solid black; width: 90%; height: 300px; padding: 10px;"
+	>
+		<div data-dojo-type="dijit/layout/ContentPane" id="leftcp_layout2" layoutAlign="left" style="background-color: #acb386; width: 100px; margin: 5px;" tabindex="0">
+			left
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="topcp_layout2" layoutAlign="top" style="background-color: #b39b86;  margin: 5px;" tabindex="0">
+			top bar
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="bottomcp_layout2" layoutAlign="bottom" style="background-color: #b39b86; margin: 5px;" tabindex="0">
+
+			bottom bar
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="centerLeftcp_layout2" layoutAlign="left" style="background-color: #eeeeee; width: 100px; margin: 5px;" tabindex="0">
+			inner left
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" id="centercp_layout2" layoutAlign="client" style="background-color: #f5ffbf; padding: 10px; margin: 5px;" tabindex="0">
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+
+			(to check we're copying children around properly).<br />
+			<select data-dojo-type="dijit/form/FilteringSelect" aria-label="select">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" id="centerRightcp_layout2" layoutAlign="right" style="background-color: #eeeeee; width: 100px; margin: 5px;" tabindex="0">
+			inner right
+		</div>
+	</div>
+
+	<p>Advanced layout with nested containers.  Tabindex=&quot;0&quot; added to content panes to show tab order. Order should be:
+	left, top, inner left, inner middle, inner right, bottom. This is the preferred tab order for this type of layout.</p>
+	<div data-dojo-type="dijit/layout/LayoutContainer"
+		style="border: 2px solid black; width: 90%; height: 300px; padding: 10px;"
+	>
+		<div data-dojo-type="dijit/layout/ContentPane" id="leftcp_layout3" layoutAlign="left" style="background-color: #acb386; width: 100px; margin: 5px;" tabindex="0">
+			left
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="client" style="margin: 5px;" >
+			<div data-dojo-type="dijit/layout/LayoutContainer"	style="height:90%;border: 2px solid black;padding: 10px;">
+
+				<div data-dojo-type="dijit/layout/ContentPane" id="topcp_layout3" layoutAlign="top" style="background-color: #b39b86;  margin: 5px;" tabindex="0">
+					top bar
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="client" style="margin: 5px;">
+					<div data-dojo-type="dijit/layout/LayoutContainer"	style="height:80%;border: 2px solid black;padding: 10px;">
+						<div data-dojo-type="dijit/layout/ContentPane" id="centerLeftcp_layout3" layoutAlign="left" style="background-color: #eeeeee; width: 100px; margin: 5px;" tabindex="0">
+							inner left
+						</div>
+						<div data-dojo-type="dijit/layout/ContentPane" id="centercp_layout3" layoutAlign="client" style="background-color: #f5ffbf; padding: 10px; margin: 5px;" tabindex="0">
+							main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+							(to check we're copying children around properly).<br />
+							<select data-dojo-type="dijit/form/FilteringSelect" aria-label="select">
+								<option value="1">foo</option>
+								<option value="2">bar</option>
+								<option value="3">baz</option>
+							</select>
+							Here's some text that comes AFTER the combo box.
+						</div>
+						<div data-dojo-type="dijit/layout/ContentPane" id="centerRightcp_layout3" layoutAlign="right" style="background-color: #eeeeee; width: 100px; margin: 5px;" tabindex="0">
+							inner right
+						</div>
+					</div>
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" id="bottomcp_layout3" layoutAlign="bottom" style="background-color: #b39b86; margin: 5px;" tabindex="0"	>
+					bottom bar
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<p>Goofy spiral layout.  Match of source code order to tab order can not be achieved with this type of layout.</p>
+	<div data-dojo-type="dijit/layout/LayoutContainer"
+		style="border: 2px solid black; width: 90%; height: 300px; padding: 10px;"
+	>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="left" style="background-color: #663333; color: white; width: 100px;">
+			outer left
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="top" style="background-color: #333366; color: white; height: 50px;">
+			outer top
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="right" style="background-color: #663333; color: white; width: 100px;">
+			outer right
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="bottom" style="background-color: #333366; color: white; height: 50px;">
+			outer bottom
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="left" style="background-color: #99CC99; width: 100px;">
+			inner left
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="top" style="background-color: #999966; height: 50px;">
+			inner top
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="right" style="background-color: #99CC99; width: 100px;">
+			inner right
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="bottom" style="background-color: #999966; height: 50px;">
+			inner bottom
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" layoutAlign="client" style="padding: 10px;">
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+			<select data-dojo-type="dijit/form/FilteringSelect" aria-label="select">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/StackContainer.html b/src/main/resources/static/dijit/tests/layout/StackContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..8ef0a36d8d14feebacf00a3f71388a971f43461a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/StackContainer.html
@@ -0,0 +1,484 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>StackContainer Demo</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<style>
+		.dijitStackController .dijitToggleButtonChecked button {
+			background-color: white;
+			background-image: none;
+		}
+		div.dijitStackContainer {
+			border: solid 1px black !important;	/* override .dijitStackContainer-child rule for no border */
+			padding: 3px;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/aspect",
+			"dojo/_base/declare",
+			"dojo/dom",
+			"dojo/dom-geometry",
+			"dojo/on",
+			"dojo/parser",
+			"dojo/query",
+			"dojo/topic",
+			"dijit/registry",
+			"dijit/form/Button",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dijit/layout/_LayoutWidget",
+			"dijit/layout/StackContainer",
+			"dijit/layout/StackController",
+			"dijit/layout/TabContainer",
+			"dijit/tests/helpers",
+			"dojo/domReady!"
+		], function(doh, aspect, declare, dom, domGeom, on, parser, query, topic,
+					registry, Button, BorderContainer, ContentPane, _LayoutWidget, StackContainer, StackController, TabContainer,
+					helpers){
+
+
+			// Hash listing which objects have gotten a resize event
+			var resizesHash = {};
+
+			// track resize events
+			aspect.after(_LayoutWidget.prototype, "resize", function(){
+				console.log("resize of widget " + this.id);
+				resizesHash[this.id] = arguments;
+			}, true);
+
+			function click(/*String*/ id){
+				// Click dijit widget w/specified id
+				on.emit(dom.byId(id), "click", {bubbles: true, cancelable: true});
+			}
+
+			function selected(page){
+				console.debug("page selected " + page.id);
+				var widget=registry.byId("myStackContainer");
+				registry.byId("previous").set("disabled", page.isFirstChild);
+				registry.byId("next").set("disabled", page.isLastChild);
+				registry.byId("previous2").set("disabled", page.isFirstChild);
+				registry.byId("next2").set("disabled", page.isLastChild);
+			}
+			topic.subscribe("myStackContainer-selectChild", selected);
+
+			doh.register("programmatic", [
+				function create(){
+					container = new StackContainer({ id: "sc" }, "myStackContainer2");
+					container.addChild(new ContentPane({
+						id: "page1Prog",
+						title: "Page 1",
+						content: "IT WAS the best of times, it was the worst of times, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope, it was the winter of despair, we had everything before us, we had nothing before us, we were all going direct to Heaven, we were all going direct the other way -- in short, the period was so far like the present period, that some of its noisiest authorities insisted on its being received, for good or for evil, in the superlative degree of comparison only"
+					}));
+					container.addChild(new ContentPane({
+						id: "page2Prog",
+						title: "Page 2",
+						content: "There were a king with a large jaw and a queen with a plain face, on the throne of England; there were a king with a large jaw and a queen with a fair face, on the throne of France. In both countries it was clearer than crystal to the lords of the State preserves of loaves and fishes, that things in general were settled for ever."
+					}));
+					container.addChild(page3Prog = new ContentPane({
+						id: "page3Prog",
+						title: "Page 3",
+						content: "It was the year of Our Lord one thousand seven hundred and seventy- five. Spiritual revelations were conceded to England at that favoured period, as at this. Mrs. Southcott had recently attained her five-and- twentieth blessed birthday, of whom a prophetic private in the Life Guards had heralded the sublime appearance by announcing that arrangements were made for the swallowing up of London and Westminster. Even the Cock-lane ghost had been laid only a round dozen of years, after rapping out its messages, as the spirits of this very year last past (supernaturally deficient in originality) rapped out theirs. Mere messages in the earthly order of events had lately come to the English Crown and People, from a congress of British subjects in America:"
+					}));
+					container.addChild(new ContentPane({
+						id: "page4Prog",
+						title: "Page 4",
+						href: "tab1.html"
+					}));
+
+					// make the controller
+					controller = new StackController({id: "holder", containerId: "sc"}, "holder");
+
+					// start 'em up
+					controller.startup();
+					container.startup();
+
+					doh.is(4, container.getChildren().length, "num children");
+
+					// Check aria roles and structure.
+					doh.is(4, query("> *", container.containerNode).length, "wrapper nodes around children");
+					doh.is(4, query("> *[role=tabpanel]", container.containerNode).length, "wrapper nodes have role=tabpanel");
+					doh.is("page1Prog page2Prog page3Prog page4Prog", query("> * > *", container.containerNode).map(function(node){
+						return registry.byNode(node).id;
+					}).join(" "), "children of wrapper divs");
+				},
+				{
+					name: "selectHref",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						registry.byId("sc").selectChild(registry.byId("page4Prog")).then(d.getTestCallback(function(){
+							doh.t(helpers.isVisible(dom.byId("page4Prog")), "page4 visible");
+							doh.t(helpers.isHidden(dom.byId("page1Prog")), "page1 hidden");
+						}));
+						return d;
+					}
+				},
+				function selectPlain(){
+					var d = new doh.Deferred();
+					registry.byId("sc").selectChild(registry.byId("page1Prog")).then(d.getTestCallback(function(){
+						doh.t(helpers.isVisible(dom.byId("page1Prog")), "page1 visible");
+						doh.t(helpers.isHidden(dom.byId("page4Prog")), "page4 hidden");
+					}));
+					return d;
+				},
+				function selectCurrent(){
+					var d = new doh.Deferred();
+					registry.byId("sc").selectChild(registry.byId("page1Prog")).then(d.getTestCallback(function(){
+						doh.t(helpers.isVisible(dom.byId("page1Prog")), "page1 visible");
+						doh.t(helpers.isHidden(dom.byId("page4Prog")), "page4 hidden");
+					}));
+					return d;
+				},
+				function addChild(){
+					// make sure that child gets put in right place, with role=tabpanel wrapper <div> around it
+					var child = new ContentPane({
+						id: "page2.5Prog",
+						title: "Page 2.5",
+						href: "tab1.html"
+					});
+					container.addChild(child, 2);
+
+					doh.is(5, query("> *", container.containerNode).length, "wrapper nodes around children");
+					doh.is(5, query("> *[role=tabpanel]", container.containerNode).length, "wrapper nodes have role=tabpanel");
+					doh.is("page1Prog page2Prog page2.5Prog page3Prog page4Prog", query("> * > *", container.containerNode).map(function(node){
+						return registry.byNode(node).id;
+					}).join(" "), "children of wrapper divs");
+				},
+				function removeChild(){
+					// note the layout containers only support removeChild(widget), not removeChild(number)
+					container.removeChild(page3Prog);
+
+					doh.is(4, query("> *", container.containerNode).length, "wrapper nodes around children");
+					doh.is(4, query("> *[role=tabpanel]", container.containerNode).length, "wrapper nodes have role=tabpanel");
+					doh.is("page1Prog page2Prog page2.5Prog page4Prog", query("> * > *", container.containerNode).map(function(node){
+						return registry.byNode(node).id;
+					}).join(" "), "children of wrapper divs");
+				}
+			]);
+
+			doh.register("parse", [
+				function parse(){
+					return parser.parse();
+				}
+			]);
+
+			doh.register("basic operation", [
+				function forward(){
+					click("next");
+					doh.t(helpers.isHidden(dom.byId("page1")), "page1 hidden");
+					doh.t(helpers.isVisible(dom.byId("page2")), "page2 visible");
+					doh.t(helpers.isHidden(dom.byId("page3")), "page3 hidden");
+				},
+				function previous(){
+					click("previous");
+					doh.t(registry.byId("previous").disabled, "disabled");
+					doh.t(helpers.isVisible(dom.byId("page1")), "page1 visible");
+					doh.t(helpers.isHidden(dom.byId("page2")), "page2 hidden");
+					doh.t(helpers.isHidden(dom.byId("page3")), "page3 hidden");
+				},
+				function clickPage2(){
+					click("myStackController_page2");
+					doh.t(helpers.isHidden(dom.byId("page1")), "page1 hidden");
+					doh.t(helpers.isVisible(dom.byId("page2")), "page2 visible");
+					doh.t(helpers.isHidden(dom.byId("page3")), "page3 hidden");
+				},
+				function clickTwice(){
+					click("myStackController_page1");
+					click("myStackController_page1");
+					var button = registry.byId("myStackController_page1");
+					doh.t(button.checked, "Page 1 button is still checked");
+				}
+			]);
+
+			doh.register("nested layout widgets", [
+				function nestedLayout(){
+					click("nextPR");
+					var bcPos = domGeom.position("bc"),
+						tcPos = domGeom.position("tc");
+
+					doh.t("bc" in resizesHash, "BorderContainer got resize");
+					doh.is(300, Math.round(bcPos.w), "BorderContainer width");
+					doh.is(200, bcPos.h, "BorderContainer height");
+
+					doh.t("tc" in resizesHash, "TabContainer got resize");
+					doh.is(300, Math.round(bcPos.w), "TabContainer width");
+					doh.is(200, bcPos.h, "TabContainer height");
+				}
+			]);
+
+			doh.register("nested stackcontainer w/doLayout=false", [
+				function resizeCalled(){
+					doh.t("stack1" in resizesHash, "stack1 resized");
+					doh.t("stack2" in resizesHash, "stack2 resized");
+					doh.t("stack3" in resizesHash, "stack3 resized");
+					doh.t("stack4" in resizesHash, "stack4 resized");
+					doh.t(helpers.isVisible(dom.byId("stack4")), "stack4 visible");
+				}
+			]);
+
+			doh.register("removeChild", function removeChild(){
+				var container = new StackContainer({ id: "sc2","aria-label":"sc2" });
+				container.addChild(new ContentPane({
+						id: "rpage1Prog",
+						title: "Page 1",
+						content: "IT WAS the best of times, it was the worst of times, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope, it was the winter of despair, we had everything before us, we had nothing before us, we were all going direct to Heaven, we were all going direct the other way -- in short, the period was so far like the present period, that some of its noisiest authorities insisted on its being received, for good or for evil, in the superlative degree of comparison only"
+				}));
+				container.addChild(new ContentPane({
+						id: "rpage2Prog",
+						title: "Page 2",
+						content: "There were a king with a large jaw and a queen with a plain face, on the throne of England; there were a king with a large jaw and a queen with a fair face, on the throne of France. In both countries it was clearer than crystal to the lords of the State preserves of loaves and fishes, that things in general were settled for ever."
+				}));
+				var page3;
+				container.addChild(page3 = new ContentPane({
+						id: "rpage3Prog",
+						title: "Page 3",
+						content: "It was the year of Our Lord one thousand seven hundred and seventy- five. Spiritual revelations were conceded to England at that favoured period, as at this. Mrs. Southcott had recently attained her five-and- twentieth blessed birthday, of whom a prophetic private in the Life Guards had heralded the sublime appearance by announcing that arrangements were made for the swallowing up of London and Westminster. Even the Cock-lane ghost had been laid only a round dozen of years, after rapping out its messages, as the spirits of this very year last past (supernaturally deficient in originality) rapped out theirs. Mere messages in the earthly order of events had lately come to the English Crown and People, from a congress of British subjects in America:"
+				}));
+
+				container.placeAt(document.body);
+				container.startup();
+				container.selectChild(page3);
+
+				var resizes = 0;
+				aspect.after(page3, "resize", function(){
+					resizes++;
+				}, true);
+				container.removeChild(page3);
+				doh.is(0, resizes, "removing selected child doesn't call resize on it");
+				doh.is(2, container.getChildren().length, "2 children");
+			});
+
+			doh.register("childless startup", function childlessStartup(){
+				// make and start the container without children
+				var container = new StackContainer({ id: "nssc", "aria-label":"nssc"},"noChildrenStackContainer");
+				container.startup();
+
+				// monitor _showChild() calls
+				var showChildCalls = {};
+				aspect.after(container, "_showChild", function(child){
+					showChildCalls[child.id] = (showChildCalls[child.id] || 0) + 1;
+				}, true);
+
+				// Create and add child
+				var child1 = new ContentPane({
+					id: "ncsc1",
+					title: "Page 1",
+					content: "IT WAS the best of times, it was the worst of times, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope, it was the winter of despair, we had everything before us, we had nothing before us, we were all going direct to Heaven, we were all going direct the other way -- in short, the period was so far like the present period, that some of its noisiest authorities insisted on its being received, for good or for evil, in the superlative degree of comparison only"
+				});
+				var resizes = 0;
+				aspect.after(child1, "resize", function(){
+					resizes++;
+				}, true);
+				container.addChild(child1);
+				doh.is(1, resizes, "child1 resized when added");
+				doh.is(1, showChildCalls["ncsc1"], "StackContainer._showChild(child1) called when child added");
+
+				// Add another child
+				container.addChild(new ContentPane({
+					id: "ncsc2",
+					title: "Page 2",
+					content: "There were a king with a large jaw and a queen with a plain face, on the throne of England; there were a king with a large jaw and a queen with a fair face, on the throne of France. In both countries it was clearer than crystal to the lords of the State preserves of loaves and fishes, that things in general were settled for ever."
+				}));
+				doh.f("ncsc2" in showChildCalls, "StackContainer._showChild(child2) not called when child added");
+				doh.is(1, showChildCalls["ncsc1"], "StackContainer._showChild(child1) not called when second child added");
+
+				// addChild() unfortunately triggers child1.resize() to be called, in anticipation that the new
+				// child may have caused the tab labels to overflow to 2 lines, thus reducing content size
+				// doh.is(1, resizes, "child1 not resized when child2 added");
+				var resizesBeforeContainerResize = resizes;	// in 1.7 this is 2, in 2.0 will hopefully be 1
+
+				// Resize the StackContainer.
+				container.resize();
+				doh.is(resizesBeforeContainerResize + 1, resizes, "child1 resized once more when StackContainer resized");
+				doh.is(1, showChildCalls["ncsc1"], "StackContainer._showChild(child1) not called when StackContainer resized");
+			});
+
+			doh.register("destroy", function destroy(){
+				// destroyRecursive() on a StackController used to get an exception
+				var oldNumWidgets = require("dijit/registry").length;
+				registry.byId("holder").destroyRecursive();
+				var newNumWidgets = require("dijit/registry").length;
+				doh.is(5, oldNumWidgets - newNumWidgets, newNumWidgets + "-" + oldNumWidgets + " destroyed");
+			});
+
+			doh.register("selectChild before startup", function selectBeforeStartup(){
+				var container = new StackContainer({ id: "sbs","aria-label":"sbs" });
+				container.addChild(new ContentPane({
+					id: "sbs1",
+					title: "Page 1",
+					content: "select before startup page 1"
+				}));
+				container.addChild(new ContentPane({
+					id: "sbs2",
+					title: "Page 2",
+					content: "select before startup page 2"
+				}));
+				var page3;
+				container.addChild(page3 = new ContentPane({
+					id: "sbs3",
+					title: "Page 3",
+					content: "select before startup page 3"
+				}));
+
+				container.selectChild(page3);
+				container.placeAt(document.body);
+				container.startup();
+
+				doh.t(helpers.isHidden(dom.byId("sbs1")), "page1 hidden");
+				doh.t(helpers.isHidden(dom.byId("sbs2")), "page2 hidden");
+				doh.t(helpers.isVisible(dom.byId("sbs3")), "page2 visible");
+			});
+
+			doh.run();
+		});
+
+	</script>
+</head>
+
+<body class="claro" role="main">
+	<script type="dojo/require">
+		registry: "dijit/registry"
+	</script>
+
+	<h1 class="testTitle">A Tale Of Two Cities</h1>
+
+	<button id="previous" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainer").back() }'>&lt;</button>
+	<span data-dojo-type="dijit/layout/StackController" id="myStackController" data-dojo-props='containerId:"myStackContainer"'></span>
+	<button id="next" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainer").forward() }'>&gt;</button>
+
+	<div id="myStackContainer" data-dojo-type="dijit/layout/StackContainer"
+		data-dojo-props='style:"width: 90%; border: 1px solid #9b9b9b; height: 20em; margin: 0.5em 0 0.5em 0; padding: 0.5em;","aria-label":"my stack container"'>
+		<p id="page1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"page 1","aria-label":"page1"'>IT WAS the best of times, it <input aria-label="input" value="was the worst" /> of times, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope, it was the winter of despair, we had everything before us, we had nothing before us, we were all going direct to Heaven, we were all going direct the other way -- in short, the period was so far like the present period, that some of its noisiest authorities insisted on its being received, for good or for evil, in the superlative degree of comparison only</p>
+		<p id="page2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"page 2"'>There were a king with a large jaw and a queen with a plain face, on the throne of England; there were a king with a large jaw and a queen with a fair face, on the throne of <a href="http://www.france.com">France</a>. In both countries it was clearer than crystal to the lords of the State preserves of loaves and fishes, that things in general were settled for ever.</p>
+		<p id="page3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"page 3"'>It was the year of Our Lord one thousand seven hundred and seventy- five. Spiritual revelations were conceded to England at that favoured period, as at this. Mrs. Southcott had recently attained her five-and- twentieth blessed birthday, of whom a prophetic private in the Life Guards had heralded the sublime appearance by announcing that arrangements were made for the swallowing up of London and Westminster. Even the Cock-lane ghost had been laid only a round dozen of years, after rapping out its messages, as the spirits of this very year last past (supernaturally deficient in originality) rapped out theirs. Mere messages in the earthly order of events had lately come to the English Crown and People, from a congress of British subjects in America:</p>
+	</div>
+
+	<button id="previous2" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainer").back() }'>&lt;</button>
+	<span data-dojo-type="dijit/layout/StackController" data-dojo-props='containerId:"myStackContainer"'></span>
+	<button id="next2" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainer").forward() }'>&gt;</button>
+
+
+	<h1 class="testTitle" style="margin-top: 3em;">Embedded layout widgets</h1>
+	<p>This tests having layout widgets embedded in the StackContainer, making sure they render on the hidden pane.</p>
+
+	<button id="previousPR" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainerPR").back() }'>&lt;</button>
+	<span data-dojo-type="dijit/layout/StackController" data-dojo-props='containerId:"myStackContainerPR"'></span>
+	<button id="nextPR" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainerPR").forward() }'>&gt;</button>
+
+	<div id="myStackContainerPR" data-dojo-type="dijit/layout/StackContainer"
+		data-dojo-props='style:"width: 90%; border: 1px solid #9b9b9b; height: 20em; margin: 0.5em 0 0.5em 0; padding: 0.5em;","aria-label":"my stack container PR"'>
+		<div id="page1PR" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"page 1"'>
+			<p>
+				The next pane should have some text, plus two embedded layout widgets, which should
+				appear correctly even though the pane is initially hidden
+			</p>
+		</div>
+		<div id="page2PR" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"page 2", style:"padding: 1em;"'>
+			<p>
+				Here's a BorderContainer:
+			</p>
+			<div id="bc" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='style:"height:200px; width:300px"'>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:100px", splitter:true'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				And a TabContainer:
+			</p>
+			<div id="tc" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"height:200px; width:300px","aria-label":"tc"'>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				That's it!
+			</p>
+		</div>
+	</div>
+	<button id="previous2PR" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainerPR").back() }'>&lt;</button>
+	<span data-dojo-type="dijit/layout/StackController" data-dojo-props='containerId:"myStackContainerPR"'></span>
+	<button id="next2PR" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainerPR").forward() }'>&gt;</button>
+
+	<h1>Nested StackContainers w/doLayout=false</h1>
+	<p>"hello world" inner text should be visible</p>
+    <div id="stack1" aria-label="stack1" data-dojo-type="dijit/layout/StackContainer" doLayout="false">
+        <div id="stack2" aria-label="stack2" data-dojo-type="dijit/layout/StackContainer" doLayout="false">
+            <div id="stack3" aria-label="stack3" data-dojo-type="dijit/layout/StackContainer" doLayout="false">
+                <div id="stack4" aria-label="stack4" data-dojo-type="dijit/layout/StackContainer" doLayout="false">
+                    hello world
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+	<h1>Programmatic test</h1>
+
+	Links: <span id="holder"></span>
+
+	<div id="myStackContainer2" style="width: 90%; border: 1px solid #9b9b9b; height: 20em; margin: 0.5em 0 0.5em 0; padding: 0.5em;">
+	</div>
+
+	<div id="noChildrenStackContainer" style="width: 90%; border: 1px solid #9b9b9b; height: 20em;"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/TabContainer.html b/src/main/resources/static/dijit/tests/layout/TabContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..87cef13a29d953ddd45db20f3011ca71f45c7ba9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/TabContainer.html
@@ -0,0 +1,844 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TabContainer DOH Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array",
+			"dojo/aspect",
+			"dojo/dom",
+			"dojo/dom-class",
+			"dojo/dom-geometry",
+			"dojo/json",
+			"dojo/_base/lang",
+			"dojo/parser",
+			"dojo/query",
+			"dijit/focus",
+			"dijit/registry",
+			"dijit/layout/TabContainer",
+			"dijit/layout/ContentPane",
+			"dijit/tests/helpers",
+			"dojo/domReady!"
+		], function(doh, array, aspect, dom, domClass, domGeom, json, lang, parser, query,
+					focus, registry, TabContainer, ContentPane, helpers){
+
+
+			doh.register("parse", function(){
+				return parser.parse();
+			});
+
+			doh.register("creationAndDestruction", [
+
+				// Test that destroyRecursive removes all supporting widgets, including the list-of-tabs menu
+				// and the close menu.  Also test that the second tab doesn't get selected
+				// for a split second as the TabContainer is being destroyed.
+				{
+					name: 'destroyRecursive',
+					runTest: function(t){
+						var num = registry.length;
+
+						var cp1 = new ContentPane({title: "test pane 1", closable: true}),
+							cp2 = new ContentPane({title: "test pane 2", href: "doc0.html"}),
+							tc = new TabContainer({
+								id:"creationAndDestruction",
+								useMenu:true
+							}).placeAt(document.body);
+
+						var cp2selected = false;
+						cp2.watch("selected", function(){
+							cp2selected = true;
+						});
+
+						tc.addChild(cp1);
+						tc.addChild(cp2);
+						tc.startup();
+
+						tc.destroyRecursive();
+
+						t.is(registry.length, num, "registry length");
+						t.f(cp2selected, "second pane wasn't temporarily selected");
+					}
+				},
+
+				// Test that on destroyDescendants(), the second tab doesn't get selected
+				// for a split second as the TabContainer is being destroyed.
+				{
+					name: 'destroyDescendants',
+					runTest: function(t){
+						var cp1 = new ContentPane({
+								id: "destroyDescendants_pane1",
+								title: "test pane 1",
+								closable: true
+							}),
+							cp2 = new ContentPane({
+								id: "destroyDescendants_pane2",
+								title: "test pane 2",
+								href: "doc0.html"
+							}),
+							tc = new TabContainer({
+								id:"destroyDescendants",
+								useMenu:true
+							}).placeAt(document.body);
+
+						var cp2selected = false;
+						cp2.watch("selected", function(){
+							cp2selected = true;
+						});
+						var downloadStarted = false;
+						cp2.on("downloadstart", function(){
+							downloadStarted = true;
+						});
+
+						tc.addChild(cp1);
+						tc.addChild(cp2);
+						tc.startup();
+
+						tc.destroyDescendants();
+
+						t.f(cp2selected, "second pane wasn't temporarily selected");
+						t.f(downloadStarted, "second pane never started downloading");
+						t.is(undefined, tc._selectedChildWidget, "no selected child widget");
+					}
+				},
+
+				// Check that tab labels for initial tabs are created.
+				{
+					name: 'checkTabLabels',
+					runTest: function(t){
+						var tabLabels = query("#tc1 .tabLabel");
+						t.is(4, tabLabels.length);
+					}
+				}
+			]);
+
+			doh.register("addingTabs", [
+
+				// Test that adding a pane creates new tab button.
+				{
+					name: 'add new tab',
+					runTest: function(t){
+						var tc = registry.byId("tc1");
+						var cp1 = new ContentPane({
+							id: "newTab1",
+							title: "newTab1",
+							content: "newTab1 content"
+						});
+						tc.addChild(cp1);
+
+						var tabLabels = registry.byId("tc1").getChildren();
+
+						t.is(5, tabLabels.length, "there are 5 tabs");
+					}
+				},
+
+				// Test that scroll buttons show up when tab buttons overflow.
+				{
+					name: 'addTabsOverflowMenu',
+					runTest: function(t){
+						var tc = registry.byId("tc1");
+
+						var cp2 = new ContentPane({
+							id: "newTab2",
+							title: "newTab2",
+							content: "newTab2 content"
+						});
+						tc.addChild(cp2);
+
+						var left = dom.byId("tc1_tablist_leftBtn");
+						var right = dom.byId("tc1_tablist_rightBtn");
+						var menu = dom.byId("tc1_tablist_menuBtn");
+
+						t.t(left, "verify left scroll button exists");
+						t.t(right, "verify right scroll button exists");
+						t.t(menu, "verify dropdown menu button exists");
+
+						t.t(helpers.isVisible(left), "left scroll button is displayed");
+						t.t(helpers.isVisible(right), "right scroll button is displayed");
+						t.t(helpers.isVisible(menu), "menu button is displayed");
+					}
+				}
+			]);
+
+			doh.register("selectingTabs", [
+
+				// Check that tab button is scrolled into view when tab is selected,
+				// but that focus isn't changed because it's outside the tab container.
+				// Also, check that left/right scroll buttons are enabled/disabled correctly.
+				{
+					name: 'focus outside',
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						dom.byId("inputBeforeTc1").focus();
+						doh.is("inputBeforeTc1", focus.curNode.id, "initial focus");
+
+						var tc = registry.byId("tc1");
+
+						var cp = registry.byId("newTab2");
+						tc.selectChild(cp);
+
+						setTimeout(d.getTestErrback(function(){
+							doh.is("inputBeforeTc1", focus.curNode.id, "focus after selectChild()");
+
+							var cpLeft = registry.byId("tc1_tablist_leftBtn");
+							var left = domGeom.position(cpLeft.domNode).x + domGeom.position(cpLeft.domNode).w;
+
+							var cpRight = registry.byId("tc1_tablist_rightBtn");
+							var right = domGeom.position(cpRight.domNode).x;
+
+							var tab = registry.byId("tc1_tablist_newTab1");
+							var tabLeft = domGeom.position(tab.domNode).x;
+							var tabRight = domGeom.position(tab.domNode).x + domGeom.position(tab.domNode).w;
+
+							doh.t(tabLeft > left && tabRight < right, "chosen tab visible");
+
+							doh.f(cpLeft.get("disabled"), "left scroll button enabled");
+							doh.t(cpRight.get("disabled"), "right scroll button disabled");
+
+							tc.selectChild("cpTitle");
+
+							setTimeout(d.getTestCallback(function(){
+								doh.t(cpLeft.get("disabled"), "left scroll button disabled");
+								doh.f(cpRight.get("disabled"), "right scroll button enabled");
+								doh.is("inputBeforeTc1", focus.curNode.id);
+							}), 1000);
+						}), 1000);
+
+						return d;
+					}
+				},
+
+				// Test what happens when focus is inside tab1 and you call selectChild() to select tab2.
+				// In this case focus should be put on the tab2's label, so that it isn't in a hidden pane.
+				{
+					name: 'focus inside',
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// ... if previous test was successful, cpTitle tab is selected ...
+
+						dom.byId("inputInsideCpTitle").focus();
+						doh.is("inputInsideCpTitle", focus.curNode.id, "initial focus");
+
+						var tc = registry.byId("tc1");
+
+						// First select a child where the tab label is already visible.
+						// The specified pane should be selected and the associated tab label should be focused.
+						tc.selectChild("t2");
+						doh.is("tc1_tablist_t2", focus.curNode.id, "focus after selectChild(t2)");
+
+						// Next, select a pane that requires scrolling the tab labels.
+						var cp = registry.byId("newTab2");
+						tc.selectChild(cp);
+
+						setTimeout(d.getTestErrback(function(){
+							doh.is("tc1_tablist_newTab2", focus.curNode.id, "focus after selectChild(newTab2)");
+
+							var cpLeft = registry.byId("tc1_tablist_leftBtn");
+							var left = domGeom.position(cpLeft.domNode).x + domGeom.position(cpLeft.domNode).w;
+
+							var cpRight = registry.byId("tc1_tablist_rightBtn");
+							var right = domGeom.position(cpRight.domNode).x;
+
+							var tab = registry.byId("tc1_tablist_newTab1");
+							var tabLeft = domGeom.position(tab.domNode).x;
+							var tabRight = domGeom.position(tab.domNode).x + domGeom.position(tab.domNode).w;
+
+							doh.t(tabLeft > left && tabRight < right, "chosen tab visible");
+
+							doh.f(cpLeft.get("disabled"), "left scroll button enabled");
+							doh.t(cpRight.get("disabled"), "right scroll button disabled");
+
+							tc.selectChild("cpTitle");
+
+							setTimeout(d.getTestCallback(function(){
+								doh.t(cpLeft.get("disabled"), "left scroll button disabled");
+								doh.f(cpRight.get("disabled"), "right scroll button enabled");
+								doh.is("tc1_tablist_cpTitle", focus.curNode.id, "focus after selectChild(cpTitle)");
+							}), 1000);
+						}), 1000);
+
+						return d;
+					}
+				},
+
+				// Test that scroll position is preserved when returning to a tab.
+				{
+					name: 'panel scroll',
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var tc = registry.byId("tc1");
+						var cp = registry.byId("t4");
+						tc.selectChild(cp);
+
+						setTimeout(d.getTestErrback(function(){
+							cp.domNode.scrollTop = 10000;	// scroll to the bottom
+
+							tc.selectChild("t3");	// switch to another tab
+
+							setTimeout(d.getTestErrback(function(){
+								tc.selectChild(cp);	// and then switch back
+
+								setTimeout(d.getTestCallback(function(){
+									doh.t(cp.domNode.scrollTop > 0, "still scrolled");
+								}), 1000);
+							}), 1000);
+						}), 1000);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.register("icons", [
+				{
+					name: "initialIcon",
+					runTest: function(t){
+						var cp = registry.byId("cp4");
+
+						t.is('tab1', innerText(cp.controlButton.containerNode), "tab label");
+						t.is('plusIcon', cp.controlButton.iconClass, "tab icon");
+					}
+				},
+				{
+					name: "changeIcon",
+					runTest: function(t){
+						var cp = registry.byId("cp4");
+
+						cp.set({
+							"title": "note",
+							"iconClass": "noteIcon"
+						});
+
+						t.is('note', innerText(cp.controlButton.containerNode), "the tab's label has changed");
+						t.is('noteIcon', cp.controlButton.iconClass, "new icon is displayed in tab");
+					}
+				},
+				{
+					name: "noTitle",
+					runTest: function(t){
+						var cp = registry.byId("cp7");
+						t.f(cp.controlButton.showLabel, "an icon exists, but there is no text label");
+					}
+				}
+			]);
+
+			doh.register("changeTabName", [
+				{
+					name: 'changeName',
+					runTest: function(t){
+						var cp = registry.byId('cpTitle');
+						cp.set('title', 'newTitle');
+
+						var title = query("#tc1_tablist_cpTitle")[0];
+
+						t.is('newTitle', innerText(title), "the tab's text label has changed");
+					}
+				}
+			]);
+
+			doh.register("deletingTabs", [
+
+				// Check that deleting a pane removes the tab button.
+				{
+					name: 'deleteTab',
+					runTest: function(t){
+						var tc1 = registry.byId("tc1");
+						var cp = registry.byId("cpTitle");
+
+
+						// track resizes to cp, removing it from tc1 shouldn't cause a resize call
+						var cpResizes = 0;
+						aspect.after(cp, "resize", function(){
+							cpResizes++;
+						}, true);
+
+						t.t(domClass.contains(cp.domNode, 'dijitTabPane'), 'children have correct CSS class');
+
+						tc1.removeChild(cp);
+
+						t.f(domClass.contains(cp.domNode, 'dijitTabPane'), 'children have CSS class removed upon removal');
+
+						var childPanes = tc1.getChildren();
+
+						t.is(5, childPanes.length, "verify there are now only 4 tabs instead of 5");
+						t.t(cp.domNode, "verify that the deleted tab's content pane still exists on the page");
+
+						var label = dom.byId("#tc1_tablist_cpTitle");
+						t.f(label, "verify that deleted tab's label does not exist");
+
+						t.is(0, cpResizes, "no resize");
+					}
+				},
+
+				// Check that scroll buttons disappear when no longer needed.
+				{
+					name: 'removedOverflowMenu',
+					runTest: function(t){
+						var tc = registry.byId("tc3");
+
+						var cp = registry.byId('cp10');
+						tc.removeChild(cp);
+						cp = registry.byId('cp9');
+						tc.removeChild(cp);
+						cp = registry.byId('cp8');
+						tc.removeChild(cp);
+						cp = registry.byId('cp7');
+						tc.removeChild(cp);
+
+						var left = registry.byId("tc3_tablist_leftBtn").domNode;
+						var right = registry.byId("tc3_tablist_rightBtn").domNode;
+						var menu = registry.byId("tc3_tablist_menuBtn").domNode;
+
+						t.t(helpers.isHidden(left), "left scroll is hidden");
+						t.t(helpers.isHidden(right), "right scroll is hidden");
+						t.t(helpers.isHidden(menu), "menu is hidden");
+					}
+				}
+			]);
+
+			doh.register("closableTabs", [
+				{
+					name: "closeTab",
+					runTest: function(t){
+						var cp = registry.byId("cp6");
+						var cp2 = registry.byId("cp5");
+
+						t.t(cp.controlButton.closeButton, "close button is displayed");
+						t.f(cp2.controlButton.closeButton, "close button is not displayed");
+					}
+				}
+			]);
+
+			doh.register("menu", {
+				name: "menu",
+				runTest: function(){
+					var tc1 = registry.byId("tc1"),
+						children = tc1.getChildren();
+
+					// add an icon and change the title just for testing that the icon and label appear in the menu
+					children[0].set({
+						title: "new title",
+						iconClass: "noteIcon"
+					});
+
+					var menuBtn = registry.byId("tc1_tablist_menuBtn");
+					menuBtn.toggleDropDown();
+
+					var menu = registry.byId("tc1_menu");
+					doh.t(helpers.isVisible(menu), "menu exists and is visible");
+					doh.is(menu.getChildren().length, children.length, "# of menu children");
+					doh.is("new title", innerText(menu.getChildren()[0].containerNode));
+					doh.is("noteIcon", menu.getChildren()[0].iconClass);
+				},
+				tearDown: function(){
+					var tc1 = registry.byId("tc1"),
+						children = tc1.getChildren();
+
+					children[0].set({
+						title: "old title",
+						iconClass: ""
+					});
+
+					var menuBtn = registry.byId("tc1_tablist_menuBtn");
+					menuBtn.closeDropDown();
+				}
+			});
+
+			doh.register("layoutTests", [
+				{
+					name: "tabPosition",
+					runTest: function(t){
+						// top tabs above content
+						var topTabs = dom.byId("tc1_tablist"),
+							topContent = query(".dijitTabPaneWrapper", "tc1")[0],
+							topTabsPos = domGeom.position(topTabs),
+							topContentPos = domGeom.position(topContent);
+						t.t(topTabsPos.y + topTabsPos.h <= topContentPos.y, "top tabs above content " +
+							json.stringify(topTabsPos) + json.stringify(topContentPos));
+
+						// left tabs to left of content
+						var leftTabs = dom.byId("leftTabs_tablist"),
+							leftContent = query(".dijitTabPaneWrapper", "leftTabs")[0],
+							leftTabsPos = domGeom.position(leftTabs),
+							leftContentPos = domGeom.position(leftContent);
+						t.t(leftTabsPos.x + Math.floor(leftTabsPos.w) <= leftContentPos.x, "left tabs before content " +
+							json.stringify(leftTabsPos) + json.stringify(leftContentPos));
+
+						// right tabs to right of content
+						var rightTabs = dom.byId("rightTabs_tablist"),
+							rightContent = query(".dijitTabPaneWrapper", "rightTabs")[0],
+							rightTabsPos = domGeom.position(rightTabs),
+							rightContentPos = domGeom.position(rightContent);
+						t.t(rightTabsPos.x >= rightContentPos.x + rightContentPos.w, "right tabs after content " +
+							json.stringify(rightTabsPos) + json.stringify(rightContentPos));
+
+						// bottom tabs below content
+						var bottomTabs = dom.byId("bottomTabs_tablist"),
+							bottomContent = query(".dijitTabPaneWrapper", "bottomTabs")[0],
+							bottomTabsPos = domGeom.position(bottomTabs),
+							bottomContentPos = domGeom.position(bottomContent);
+						t.t(bottomTabsPos.y >= bottomContentPos.y + bottomContentPos.h, "bottom tabs below content " +
+							json.stringify(bottomTabsPos) + json.stringify(bottomContentPos));
+					}
+				},
+				{
+					name: "nested",
+					runTest: function(t){
+						var parent = registry.byId("tcNestedParent"),
+							child = registry.byId("tcNestedChild");
+
+						t.f(parent.nested, "parent TabContainer is not nested");
+
+						var children = parent.getChildren();
+						t.is(2, children.length, "parent TabContainer has multiple children");
+
+						t.t(children[1].nested, "second child of parent TabContainer has nested tabs");
+						t.t(domClass.contains("tcNestedChild_tablist", "dijitTabContainerTabListNested"), "nested CSS applied");
+
+						// test that when TabButtons overflow to 2 rows, the content area is reduced
+						parent.selectChild(registry.byId("tcNestedChild"));
+						var content = query(".dijitTabPaneWrapper", "tcNestedChild")[0],
+							height0 = domGeom.position(content).h;
+
+						var newGrandchildren = [];
+						for(var i=0; i<10; i++){
+							var gc = new ContentPane({
+								title: "additional child #" + i,
+								content: "hello world " + i
+							});
+							newGrandchildren.push(gc);
+							child.addChild(gc);
+						}
+						var height1 = domGeom.position(content).h;
+						doh.t(height1 < height0, "content area size reduced ", height1, height0);
+
+						// and that size increases back when children are removed
+						array.forEach(newGrandchildren, lang.hitch(child, "removeChild"));
+						var height2 = domGeom.position(content).h;
+						doh.is(height0, height2, "after deleting extra children height restored to original");
+
+						// Setting the title of nested TabContainer shouldn't make a tooltip over it
+						doh.f(child.domNode.hasAttribute && child.domNode.hasAttribute("title"), "child.hasAttribute(title) before");
+						child.set("title", "Nested new title");
+						doh.f(child.domNode.hasAttribute && child.domNode.hasAttribute("title"), "child.hasAttribute(title) after");
+					}
+				},
+				{
+					name: "doLayoutFalse",
+					runTest: function(t){
+						var tc = registry.byId("tcNoLayout");
+						var cps = tc.getChildren();
+
+						tc.selectChild(cps[0]);
+						var height1 = tc.domNode.offsetHeight;
+						tc.selectChild(cps[1]);
+						var height2 = tc.domNode.offsetHeight;
+						tc.selectChild(cps[2]);
+						var height3 = tc.domNode.offsetHeight;
+
+						t.t(height1 < height2, "height 1 < height 2" + height1 + " < " + height2);
+						t.t(height2 < height3, "height 2 < height 3" + height2 + " < " + height3);
+					}
+				},
+				{
+					name: "doLayoutTrue",
+					runTest: function(t){
+						var tc = registry.byId("tc3");
+						var cps = tc.getChildren();
+
+						tc.selectChild(cps[0]);
+						var height1 = tc.domNode.offsetHeight;
+						tc.selectChild(cps[1]);
+						var height2 = tc.domNode.offsetHeight;
+						tc.selectChild(cps[2]);
+						var height3 = tc.domNode.offsetHeight;
+
+						t.is(height1, height2);
+						t.is(height2, height3);
+						t.t(height1 > 10, "make sure height measurement is giving something reasonable");
+					}
+				}
+
+			]);
+
+			var tabId = 1;
+			function addTab(tc){
+				// summary:
+				//		Add a tab to specified TabContainer.
+				var cp = new ContentPane({
+					title: 'Tab' + tabId,
+					content: "Contents of Tab " + tabId++
+				});
+				tc.addChild(cp);
+			}
+
+			doh.register("empty tab container",[
+				function createEmptyTabContainer(){
+					var emptyTC = new TabContainer({id:"emptyTC", style:'height:200px;width:500px;'});
+					document.body.appendChild(emptyTC.domNode);
+					emptyTC.startup();
+
+					var children = emptyTC.getChildren();
+					doh.is(0, children.length);
+					doh.t(helpers.isVisible(emptyTC));
+
+					var pos = domGeom.position(emptyTC.domNode);
+					var heightDiff = 200 - pos.h;
+					var widthDiff = 500 - pos.w;
+					doh.t(-0.01 < heightDiff && heightDiff < 0.01);
+					doh.t(-0.01 < widthDiff && widthDiff < 0.01);
+				},
+				function addTabToEmptyTabContainer(){
+					var tc = registry.byId("emptyTC");
+					addTab(tc);
+
+					var children = tc.getChildren();
+					doh.is(1, children.length);
+					doh.is("Tab1", children[0].title);
+					doh.is("Contents of Tab 1", tc.selectedChildWidget.domNode.innerHTML);
+
+					doh.t(helpers.isVisible(tc.tablist.containerNode.childNodes[0]));
+				},
+				function add2ndTabToEmptyTabContainer(){
+					var tc = registry.byId("emptyTC");
+					addTab(tc);
+					tc.selectChild(tc.getChildren()[1]);
+
+					var children = tc.getChildren();
+					doh.is(2, children.length);
+					doh.is("Tab2", children[1].title);
+					doh.is("Contents of Tab 2", tc.selectedChildWidget.domNode.innerHTML);
+
+					doh.t(helpers.isVisible(tc.tablist.containerNode.childNodes[1]));
+				},
+				function remove2ndTabToEmptyTabContainer(){
+					var tc = registry.byId("emptyTC");
+					tc.removeChild(tc.getChildren()[1]);
+
+					var children = tc.getChildren();
+					doh.is(1, children.length);
+					doh.is("Tab1", children[0].title);
+					doh.is("Contents of Tab 1", tc.selectedChildWidget.domNode.innerHTML);
+				}
+			]);
+
+			// Further testing for tab label scrolling.  Also tested in "selectingTabs" section.
+			doh.register("tab label scrolling", [
+				function initialScroll(){
+					// Make sure that tab labels are scrolled so that selected tab visible.
+					var tcPos = domGeom.position("scroll"),
+						labelPos = domGeom.position("scroll_tablist_nine");
+					doh.t(tcPos.x < labelPos.x, "tcPos.x (" + tcPos.x + ") < labelPos.x (" + labelPos.x + ")");
+					doh.t(tcPos.x + tcPos.w > labelPos.x + labelPos.w,
+						"tcPos.x (" + tcPos.x + ") + tcPos.w (" + tcPos.w +
+						") < labelPos.x " + labelPos.x + " + labelPos.w + (" + labelPos.w + ")");
+				},
+				function selectATab(){
+					// Make sure that tab labels are scrolled so that selected tab visible
+					var d = new doh.Deferred();
+					var tc = registry.byId("scroll");
+					tc.selectChild(registry.byId("one"));
+					setTimeout(d.getTestCallback(function(){
+						var tcPos = domGeom.position("scroll"),
+							labelPos = domGeom.position("scroll_tablist_one");
+						doh.t(tcPos.x < labelPos.x, "tcPos.x (" + tcPos.x + ") < labelPos.x (" + labelPos.x + ")");
+						doh.t(tcPos.x + tcPos.w > labelPos.x + labelPos.w,
+								"tcPos.x (" + tcPos.x + ") + tcPos.w (" + tcPos.w +
+								") < labelPos.x " + labelPos.x + " + labelPos.w + (" + labelPos.w + ")");
+					}), 500);
+
+					return d;
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit layout.TabContainer DOH tests</h1>
+
+	<input id="inputBeforeTc1" value="for focus testing">
+	<div id="tc1" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 300px; height: 100px;","aria-label":"my super label" '>
+		<div id="cpTitle" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab1", selected:true'>
+			Lorem ipsum and all around...
+			<input id="inputInsideCpTitle" value="for focus testing">
+		</div>
+		<div id="t2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab2"'>
+			Lorem ipsum and all around - second...
+		</div>
+		<div id="t3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab3", closable:true'>
+			Lorem ipsum and all around - third...
+		</div>
+		<div id="t4" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab4", closable:true'>
+			<p>
+				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+				semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+				porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+				Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+				Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+				risus.
+			</p>
+			<p>
+				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+				semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+				porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+				Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+				Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+				risus.
+			</p>
+			<p>
+				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+				semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+				porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+				Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+				Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+				risus.
+			</p>
+			<p>
+				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+				semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+				porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+				Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+				Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+				risus.
+			</p>
+		</div>
+	</div>
+
+	<div id="tc3" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 300px; height: 100px;" '>
+		<div id="cp4" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab1", selected:true, iconClass:"plusIcon"'>
+			Lorem ipsum and all around...
+		</div>
+		<div id="cp5" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab2"'>
+			 Lorem ipsum and all around - last...
+			<br />
+			<br />
+			<br />
+			Hmmm even more expanding tabs......
+		</div>
+		<div id="cp6" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab3", closable:true'>
+			Lorem ipsum and all around - last...
+		</div>
+		<div id="cp7" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"plus", closable:true, iconClass:"plusIcon", showTitle:false'>
+			Lorem ipsum and all around - last...
+		</div>
+		<div id="cp8" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab4", closable:true'>
+			Lorem ipsum and all around - last...
+		</div>
+		<div id="cp9" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab5", closable:true'>
+			Lorem ipsum and all around - last...
+		</div>
+		<div id="cp10" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"tab6", closable:true'>
+			Lorem ipsum and all around - last...
+		</div>
+	</div>
+
+	<div id="tcNestedParent" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 400px; height: 300px;" '>
+		<div id="tcNestedChild" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='title:"Tab 1", nested:true '>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My first inner tab", selected:true'>
+				Lorem ipsum and all around...
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My second inner tab"'>
+				Lorem ipsum and all around - second...
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My last inner tab"'>
+				Lorem ipsum and all around - last...
+			</div>
+		</div>
+		<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='title:"Tab 2", nested:true'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My first inner tab", selected:true'>
+				Lorem ipsum and all around...
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My second inner tab"'>
+				Lorem ipsum and all around - second...
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My last inner tab"'>
+				Lorem ipsum and all around - last...
+			</div>
+		</div>
+	</div>
+
+	<div id="tcNoLayout" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 100%;", doLayout:false'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My first tab", selected:true'>
+			Lorem ipsum and all around...
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My second tab", closable:true'>
+			Lorem ipsum and all around - second...
+			<br />
+			Hmmm expanding tabs......
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My last tab"'>
+			Lorem ipsum and all around - last...
+			<br />
+			<br />
+			<br />
+			Hmmm even more expanding tabs......
+		</div>
+	</div>
+	<br />
+
+	<div id="leftTabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 500px; height: 200px;",  tabPosition:"left-h"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My first tab", selected:true'>
+			Left tabs
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My second tab", closable:true'>
+			Lorem ipsum and all around - second...
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My last tab"'>
+			Lorem ipsum and all around - last...
+		</div>
+	</div>
+	<br />
+
+	<div id="rightTabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 500px; height: 200px;",  tabPosition:"right-h"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My first tab", selected:true'>
+			Right tabs
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My second tab", closable:true'>
+			Lorem ipsum and all around - second...
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My last tab"'>
+			Lorem ipsum and all around - last...
+		</div>
+	</div>
+	<br />
+
+	<div id="bottomTabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 500px; height: 200px;",  tabPosition:"bottom"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My first tab", selected:true'>
+			Bottom tabs
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My second tab", closable:true'>
+			Lorem ipsum and all around - second...
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"My last tab"'>
+			Lorem ipsum and all around - last...
+		</div>
+	</div>
+
+	<div id="scroll" data-dojo-type="dijit/layout/TabContainer" data-dojo-id="scroll" style="width: 300px; height:200px;">
+		<div data-dojo-type="dijit/layout/ContentPane" title="One" data-dojo-id="one" id="one">One</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="Two" data-dojo-id="two" id="two">Two</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="Three" data-dojo-id="three" id="three">Three</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="Four" data-dojo-id="four" id="four">Four</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="Five" data-dojo-id="five" id="five">Five</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="Six" data-dojo-id="six" id="six">Six</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="Seven" data-dojo-id="seven" id="seven">Seven</div>
+		<div data-dojo-type="dijit/layout/ContentPane" title="Eight" data-dojo-id="eight" id="eight">Eight</div>
+		<div data-dojo-type="dijit/layout/ContentPane" selected="true" title="Nine" data-dojo-id="nine" id="nine">Nine</div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/TabContainerTitlePane.html b/src/main/resources/static/dijit/tests/layout/TabContainerTitlePane.html
new file mode 100644
index 0000000000000000000000000000000000000000..f0dcbb3766798afc21eed504fb2825ec36643ca8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/TabContainerTitlePane.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TabContainer Nested TitlePane Test</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/aspect",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/layout/TabContainer",
+			"dijit/layout/ContentPane",
+			"dijit/TitlePane",
+			"dojo/domReady!"
+		], function(doh, aspect, parser,
+					registry, TabContainer, ContentPane, TitlePane, helpers){
+
+
+			var resized = {};
+
+
+			aspect.after(TabContainer.prototype, "resize", function(){
+				resized[this.id] = true;
+			});
+
+			parser.parse();
+
+			// Tests that TabContainer.resize() (for the TabContainers nested in TitlePanes)
+			// is called at the right time.
+			doh.register("resize timing", [
+				{
+					name: "subtabs1",
+					runTest: function(t){
+						// Since tab 1 is selected and TitlePane 1 is open, subtabs1 should have resized on parse
+						doh.t(resized["subtabs1"], "subtabs1");
+						doh.f(resized["subtabs2"], "subtabs2");
+						doh.f(resized["subtabs3"], "subtabs3");
+					}
+				},
+				{
+					name: "subtabs2",
+					runTest: function(t){
+						// Since TitlePane 2 is open, subtabs2 should get a resize when tab2 is selected
+						registry.byId("mainTabContainer").selectChild(registry.byId("tab2"));
+						doh.t(resized["subtabs2"], "subtabs2");
+						doh.f(resized["subtabs3"], "subtabs3");
+					}
+				},
+				{
+					name: "subtabs3",
+					runTest: function(t){
+						// Since TitlePane 3 is closed, subtabs3 shouldn't get a resize until tab3 is selected
+						// and TitlePane is open
+						registry.byId("mainTabContainer").selectChild(registry.byId("tab3"));
+						doh.f(resized["subtabs3"], "subtabs3 not sized yet");
+						registry.byId("tp3").set("open", true);
+						doh.t(resized["subtabs3"], "subtabs3 sized");
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit layout.TabContainer nested TitlePane tests</h1>
+
+	<div id="mainTabContainer" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 100%; height: 150px;"'>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id: "tab1", title:"Tab 1"'>
+			<h1>I am tab 1</h1>
+			<div data-dojo-type="dijit/TitlePane" data-dojo-props='id: "tp1", title:"Title pane 1", style:{width:"300px"}'>
+				<p>This is a title pane, containing another tab container ...</p>
+				<p>
+					Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque iaculis, nulla id semper faucibus, pede tellus nonummy magna, vitae adipiscing orci arcu ut augue. Nunc condimentum, magna a vestibulum convallis, libero purus pulvinar orci, sed vestibulum urna sem ut pede. More Ipsum...
+				</p>
+				<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='id: "subtabs1", style:"width: 100%; height: 150px;"'>
+					<div id="tab1_1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1"'></div>
+					<div id="tab1_2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+				</div>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id: "tab2", title:"Tab 2"'>
+			<h1>I am tab 2</h1>
+			<div data-dojo-type="dijit/TitlePane" data-dojo-props='id: "tp2", title:"Title pane 2", style:{width:"300px"}'>
+				<p>This is a title pane, containing another tab container ...</p>
+				<p>
+					Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque iaculis, nulla id semper faucibus, pede tellus nonummy magna, vitae adipiscing orci arcu ut augue. Nunc condimentum, magna a vestibulum convallis, libero purus pulvinar orci, sed vestibulum urna sem ut pede. More Ipsum...
+				</p>
+				<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='id: "subtabs2", style:"width: 100%; height: 150px;"'>
+					<div id="tab2_1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1"'></div>
+					<div id="tab2_2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+				</div>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id: "tab3", title:"Tab 3"'>
+			<h1>I am tab 3</h1>
+			<div data-dojo-type="dijit/TitlePane" data-dojo-props='id: "tp3", title:"Title pane 3", style:{width:"300px"}, open: false'>
+				<p>This is a title pane, containing another tab container ...</p>
+				<p>
+					Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque iaculis, nulla id semper faucibus, pede tellus nonummy magna, vitae adipiscing orci arcu ut augue. Nunc condimentum, magna a vestibulum convallis, libero purus pulvinar orci, sed vestibulum urna sem ut pede. More Ipsum...
+				</p>
+				<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='id: "subtabs3", style:"width: 100%; height: 150px;"'>
+					<div id="tab3_1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1"'></div>
+					<div id="tab3_2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+				</div>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id: "hrefTab", href:"tab2.html", title:"Href Tab"'></div>
+	</div>
+
+	<h3>Rendering time</h3>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/_lorem.html b/src/main/resources/static/dijit/tests/layout/_lorem.html
new file mode 100644
index 0000000000000000000000000000000000000000..9b9d4c0566953887b66a9a52c3496dc4bf476951
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/_lorem.html
@@ -0,0 +1,3 @@
+<p>
+	lorem ipsum dolor. Check net tab for a new XHR.
+</p>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/layout/borderContainer.php b/src/main/resources/static/dijit/tests/layout/borderContainer.php
new file mode 100644
index 0000000000000000000000000000000000000000..098b5dd219483a3d2e8aed39a0af89e7983ca0c9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/borderContainer.php
@@ -0,0 +1,34 @@
+<?php
+	// This file is loaded by the test files via ContentPane's href attribute.
+
+	// If you call this file like borderContainer.php?id=foo then the id's of the created widgets
+	// will be based on the string "foo"
+	$id = htmlspecialchars(@$_GET['id']);
+
+	// sized=true means that it will add a width/height to the BorderContainer
+?>
+<div data-dojo-type="dijit/layout/BorderContainer"
+	id="<?php echo $id?>BorderContainer"
+	<?php
+		if(@$_GET['sized']){
+			print "style='width: 300px; height: 300px;'";
+		}
+	?>
+>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width: 200px;"'>
+		This file contains a single top-level BorderContainer layout widget.
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", onLoad:myOnLoad'>
+		But it also has some nested layout widgets, and when this file is loaded the TabContainer and
+		BorderContainer below should get resize() called on them
+		<div data-dojo-type="dijit/layout/TabContainer" id="<?php echo $id?>InnerTabContainer"
+			data-dojo-props='style:"width: 300px; height: 300px;","aria-label":"<?php echo $id ?>"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'><?php echo $id?> tab1</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'><?php echo $id?> tab2</div>
+		</div>
+		<div data-dojo-type="dijit/layout/BorderContainer" id="<?php echo $id?>InnerBorderContainer"
+			data-dojo-props='style:"width: 300px; height: 300px;","aria-label":"<?php echo $id ?>"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>inner border container</div>
+		</div>
+	</div>
+</div>
diff --git a/src/main/resources/static/dijit/tests/layout/combotab.html b/src/main/resources/static/dijit/tests/layout/combotab.html
new file mode 100644
index 0000000000000000000000000000000000000000..fe7754d250889805d4662f279948c44588055d71
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/combotab.html
@@ -0,0 +1,9 @@
+<div data-dojo-id="stateStore" data-dojo-type="dojo/data/ItemFileReadStore" data-dojo-props='url:"../_data/states.json"'></div>
+State:
+<span id="editable" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/ComboBox",
+	editorParams:{value: "California", store: stateStore, searchAttr: "name", promptMessage: "Please enter a state"}'>
+	<script type="dojo/on" data-dojo-event="change">
+		// connect to editable onChange event, Note that we don't need to disconnect
+		console.log('User selected:'+this.getValue());
+	</script>
+</span>
diff --git a/src/main/resources/static/dijit/tests/layout/doc0.html b/src/main/resources/static/dijit/tests/layout/doc0.html
new file mode 100644
index 0000000000000000000000000000000000000000..f77bdc702cb13b1f82f70e912cf5d96ad5d19418
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/doc0.html
@@ -0,0 +1,14 @@
+<h1>Document 0</h1>
+This document has <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+(to check we're copying children around properly).<br />
+Plus some widgets and native fields:<br />
+<input value="native input" aria-label="native input" />
+<select data-dojo-type="dijit/form/ComboBox" aria-label="select box doc 0">
+	<option value="1">dijit</option>
+	<option value="2">form</option>
+	<option value="3">ComboBox</option>
+</select>
+<button>native button</button>
+<button data-dojo-type="dijit/form/Button">dijit/form/Button</button><br>
+
+Here's some text that comes AFTER the button.
diff --git a/src/main/resources/static/dijit/tests/layout/doc1.html b/src/main/resources/static/dijit/tests/layout/doc1.html
new file mode 100644
index 0000000000000000000000000000000000000000..2bff8c56dd65e9bdf82572af49add2cd4bbf62b7
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/doc1.html
@@ -0,0 +1,13 @@
+<!-- Used from test_RemotePane.html -->
+
+<h1> Document 1</h1>
+
+<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus risus. Praesent eu lacus et enim laoreet sollicitudin. Quisque mollis mi a lectus. Cras ante. Aliquam tempus justo laoreet justo. Vestibulum egestas feugiat nisi. Nulla ultrices consequat felis. Curabitur dignissim augue vel enim. Fusce tempus tempor mauris. Praesent suscipit pede in nunc. Duis mi neque, malesuada non, volutpat et, nonummy et, ante. Aliquam neque. Nulla rhoncus, turpis eget mattis molestie, magna nulla dictum ligula, quis tempor odio justo vel pede. Donec sit amet tellus. Phasellus sapien. Nulla id massa at nunc condimentum fringilla. Fusce suscipit ipsum et lorem consequat pulvinar. Quisque lacinia sollicitudin tellus.</p>
+
+<p>Nulla massa lectus, porttitor vitae, dignissim vel, iaculis eget, mi. Vestibulum sed lorem. Nullam convallis elit id leo. Aliquam est purus, rutrum at, sodales non, nonummy a, justo. Proin at diam vel nibh dictum rhoncus. Duis nisl. Etiam orci. Integer hendrerit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In ac erat. Sed velit orci, sodales quis, commodo ut, elementum sed, nibh. Cras mattis vulputate nisl. Mauris eu nulla sed orci dignissim laoreet. Morbi commodo, est vitae pharetra ullamcorper, ante nisl ultrices velit, sit amet vulputate turpis elit id lacus. Vestibulum diam. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
+
+<p>Praesent rutrum nunc quis felis. Morbi tempor. Quisque porta magna imperdiet magna. Ut gravida, ipsum eu euismod consectetuer, nisl lectus posuere diam, vel dignissim elit nisi sit amet lorem. Curabitur non nunc. Morbi metus. Nulla facilisi. Sed et ante. Etiam ac lectus. Duis tristique molestie sem. Pellentesque nec quam. Nullam pellentesque ullamcorper sem.</p>
+
+<p>Duis ut massa eget arcu porttitor pharetra. Curabitur malesuada nisi id eros. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Vivamus massa. Donec quis justo ut tortor faucibus suscipit. Vivamus commodo neque eget nulla. Donec imperdiet lacus condimentum justo. In sollicitudin magna vitae libero. Curabitur scelerisque libero et eros imperdiet cursus. Maecenas adipiscing. Integer imperdiet, neque ut fringilla semper, leo nisi tincidunt enim, id accumsan leo nisi a libero. Morbi rutrum hendrerit eros. Vestibulum eget augue vel urna congue faucibus.</p>
+
+<p>Morbi ante sapien, consequat non, consectetuer vitae, pharetra non, dui. Cras tempus posuere quam. Vestibulum quis neque. Duis lobortis urna in elit. Aliquam non tellus. Etiam nisi eros, posuere vel, congue id, fringilla in, risus. Duis semper rutrum risus. Nullam felis massa, lobortis sit amet, posuere tempor, mattis id, tellus. Nulla id arcu interdum risus commodo tincidunt. Vivamus pretium pulvinar pede. Vivamus eget erat. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam bibendum, enim eu venenatis tempor, nunc elit convallis tortor, sit amet vulputate turpis arcu eu pede. Praesent molestie, lacus sed vehicula convallis, enim pede fringilla nunc, at porttitor justo ante a diam. Nunc magna eros, interdum vel, varius eget, volutpat eu, orci. Nunc nec mauris. Nulla facilisi. Vivamus dictum elementum risus. Nam placerat arcu.</p>
diff --git a/src/main/resources/static/dijit/tests/layout/doc2.html b/src/main/resources/static/dijit/tests/layout/doc2.html
new file mode 100644
index 0000000000000000000000000000000000000000..1173b297c983fef93805363ea8a846f237db9de6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/doc2.html
@@ -0,0 +1,13 @@
+<!-- Used from test_RemotePane.html -->
+
+<h1> Document 2</h1>
+
+<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Vivamus risus. Praesent eu lacus et enim laoreet sollicitudin. Quisque mollis mi a lectus. Cras ante. Aliquam tempus justo laoreet justo. Vestibulum egestas feugiat nisi. Nulla ultrices consequat felis. Curabitur dignissim augue vel enim. Fusce tempus tempor mauris. Praesent suscipit pede in nunc. Duis mi neque, malesuada non, volutpat et, nonummy et, ante. Aliquam neque. Nulla rhoncus, turpis eget mattis molestie, magna nulla dictum ligula, quis tempor odio justo vel pede. Donec sit amet tellus. Phasellus sapien. Nulla id massa at nunc condimentum fringilla. Fusce suscipit ipsum et lorem consequat pulvinar. Quisque lacinia sollicitudin tellus.</p>
+
+<p>Nulla massa lectus, porttitor vitae, dignissim vel, iaculis eget, mi. Vestibulum sed lorem. Nullam convallis elit id leo. Aliquam est purus, rutrum at, sodales non, nonummy a, justo. Proin at diam vel nibh dictum rhoncus. Duis nisl. Etiam orci. Integer hendrerit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In ac erat. Sed velit orci, sodales quis, commodo ut, elementum sed, nibh. Cras mattis vulputate nisl. Mauris eu nulla sed orci dignissim laoreet. Morbi commodo, est vitae pharetra ullamcorper, ante nisl ultrices velit, sit amet vulputate turpis elit id lacus. Vestibulum diam. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
+
+<p>Praesent rutrum nunc quis felis. Morbi tempor. Quisque porta magna imperdiet magna. Ut gravida, ipsum eu euismod consectetuer, nisl lectus posuere diam, vel dignissim elit nisi sit amet lorem. Curabitur non nunc. Morbi metus. Nulla facilisi. Sed et ante. Etiam ac lectus. Duis tristique molestie sem. Pellentesque nec quam. Nullam pellentesque ullamcorper sem.</p>
+
+<p>Duis ut massa eget arcu porttitor pharetra. Curabitur malesuada nisi id eros. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Vivamus massa. Donec quis justo ut tortor faucibus suscipit. Vivamus commodo neque eget nulla. Donec imperdiet lacus condimentum justo. In sollicitudin magna vitae libero. Curabitur scelerisque libero et eros imperdiet cursus. Maecenas adipiscing. Integer imperdiet, neque ut fringilla semper, leo nisi tincidunt enim, id accumsan leo nisi a libero. Morbi rutrum hendrerit eros. Vestibulum eget augue vel urna congue faucibus.</p>
+
+<p>Morbi ante sapien, consequat non, consectetuer vitae, pharetra non, dui. Cras tempus posuere quam. Vestibulum quis neque. Duis lobortis urna in elit. Aliquam non tellus. Etiam nisi eros, posuere vel, congue id, fringilla in, risus. Duis semper rutrum risus. Nullam felis massa, lobortis sit amet, posuere tempor, mattis id, tellus. Nulla id arcu interdum risus commodo tincidunt. Vivamus pretium pulvinar pede. Vivamus eget erat. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam bibendum, enim eu venenatis tempor, nunc elit convallis tortor, sit amet vulputate turpis arcu eu pede. Praesent molestie, lacus sed vehicula convallis, enim pede fringilla nunc, at porttitor justo ante a diam. Nunc magna eros, interdum vel, varius eget, volutpat eu, orci. Nunc nec mauris. Nulla facilisi. Vivamus dictum elementum risus. Nam placerat arcu.</p>
diff --git a/src/main/resources/static/dijit/tests/layout/doc3.html b/src/main/resources/static/dijit/tests/layout/doc3.html
new file mode 100644
index 0000000000000000000000000000000000000000..32206d654e7587ee28bceacc9c24cbc792753525
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/doc3.html
@@ -0,0 +1,2 @@
+<!-- Used by ContentPane-auto-require.html -->
+<button type="button" data-dojo-type="dijit/form/Button" id="button1">Click Me!</button>
diff --git a/src/main/resources/static/dijit/tests/layout/getResponse.php b/src/main/resources/static/dijit/tests/layout/getResponse.php
new file mode 100644
index 0000000000000000000000000000000000000000..ab79b4dbcd12e35a9635aa693eb3d7c450d587e1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/getResponse.php
@@ -0,0 +1,57 @@
+<?php
+	// this just bounces a message as a response, and optionally emulates network latency.
+
+	// default delay is 0 sec, to change:
+	// getResponse.php?delay=[Int milliseconds]
+
+	// to change the message returned
+	// getResponse.php?mess=whatever%20string%20you%20want.
+
+	// to select a predefined message
+	// getResponse.php?messId=0
+
+	error_reporting(E_ALL ^ E_NOTICE);
+
+	$delay = 1; // 1 micro second to avoid zero division in messId 2
+	if(isset($_GET['delay']) && is_numeric($_GET['delay'])){
+		$delay = (intval($_GET['delay']) * 1000);
+	}
+
+	if(isset($_GET['messId']) && is_numeric($_GET['messId'])){
+		switch($_GET['messId']){
+			case 0:
+				echo "<h3>WARNING This should NEVER be seen, delayed by 2 sec!</h3>";
+				$delay = 2;
+				break;
+			case 1:
+				echo "<div data-dojo-type='TestWidget'>Testing attr('href', ...)</div>";
+				break;
+			case 2:
+				echo "<div data-dojo-type='TestWidget'>Delayed attr('href', ...) test</div>
+					  <div data-dojo-type='TestWidget'>Delayed by " . ($delay/1000000) . " sec.</div>";
+				break;
+			case 3:
+				echo "IT WAS the best of times, it was the worst of <a id='timeref' href='http://www.timeanddate.com/worldclock/'>times</a>, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope, it was the winter of despair, we had everything before us, we had nothing before us, we were all going direct to Heaven, we were all going direct the other way -- in short, the period was so far like the present period, that some of its noisiest authorities insisted on its being received, for good or for evil, in the superlative degree of comparison only";
+				break;
+			case 4:
+				echo "There were a king with a large jaw and a queen with a plain face, on the throne of England; there were a king with a large jaw and a queen with a fair face, on the throne of France. In both countries it was clearer than crystal to the lords of the State preserves of loaves and fishes, that things in general were settled for ever.";
+				break;
+			case 5:
+				echo "It was the year of Our Lord one thousand seven hundred and seventy- five. Spiritual revelations were conceded to England at that favoured period, as at this. Mrs. Southcott had recently attained her five-and- twentieth blessed birthday, of whom a prophetic private in the Life Guards had heralded the sublime appearance by announcing that arrangements were made for the swallowing up of London and Westminster. Even the Cock-lane ghost had been laid only a round dozen of years, after rapping out its messages, as the spirits of this very year last past (supernaturally deficient in originality) rapped out theirs. Mere messages in the earthly order of events had lately come to the English Crown and People, from a congress of British subjects in America:";
+				break;
+			default:
+				echo "unknown messId:". htmlentities($_GET['messId']);
+		}
+	}
+
+	if(isset($_GET['bounceGetStr']) &&  $_GET['bounceGetStr']){
+		echo "<div id='bouncedGetStr'>".htmlentities($_SERVER["QUERY_STRING"])."</div>";
+	}
+
+	if(isset($_GET['message']) && $_GET['message']){
+		echo htmlentities($_GET['message']);
+	}
+
+	usleep($delay);
+
+?>
diff --git a/src/main/resources/static/dijit/tests/layout/mobile.html b/src/main/resources/static/dijit/tests/layout/mobile.html
new file mode 100644
index 0000000000000000000000000000000000000000..db92fd092575f97e1eb3ce5f7f9d31e538086d30
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/mobile.html
@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+
+		<title>Layout widgets mobile test page</title>
+
+		<link href="../../icons/commonIcons.css" rel="stylesheet">
+
+		<script type="text/javascript" src="../boilerplate.js"></script>
+
+		<script language="JavaScript" type="text/javascript">
+			require([
+				"dojo/parser",
+
+				// Modules that the parser will automatically pull in, but put here to avoid spurious exceptions
+				"dijit/layout/AccordionContainer",
+				"dijit/layout/BorderContainer",
+				"dijit/layout/ContentPane",
+				"dijit/layout/TabContainer",
+
+				"dojo/domReady!"
+			], function(parser){
+				parser.parse();
+			});
+		</script>
+	</head>
+	<body>
+		<h1>Accordion</h1>
+		<div id="ac" data-dojo-type="dijit/layout/AccordionContainer" style="height: 300px">
+			<div id="acp1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:true,
+				title:"Pane 1", iconClass:"dijitEditorIcon dijitEditorIconSave", tooltip:"tooltip for simple pane" '>
+				<p>
+					Nunc consequat nisi vitae quam. Suspendisse sed nunc. Proin
+					suscipit porta magna. Duis accumsan nunc in velit. Nam et nibh.
+					Nulla facilisi. Cras venenatis urna et magna. Aenean magna mauris,
+					bibendum sit amet, semper quis, aliquet nec, sapien.  Aliquam
+					aliquam odio quis erat. Etiam est nisi, condimentum non, lacinia
+					ac, vehicula laoreet, elit. Sed interdum augue sit amet quam
+					dapibus semper. Nulla facilisi. Pellentesque lobortis erat nec
+					quam.
+				</p>
+			</div>
+			<div id="acp2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='
+					title:"Pane 2", iconClass:"dijitEditorIcon dijitEditorIconSave", tooltip:"tooltip for simple pane" '>
+				<label for="cpInput">Input for focus testing:</label>
+				<input id="cpInput" aria-label="fringilla" value="fringilla in, sodales">
+				<p>
+					Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</p>
+			</div>
+		</div>
+
+
+		<h1>BorderContainer</h1>
+		<div id="bc" data-dojo-type="dijit/layout/BorderContainer" style="height: 200px; width: 100%">
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:50%", splitter:true'>
+				1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+				2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</div>
+		</div>
+
+		<h1>TabContainer</h1>
+		<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"height:200px"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+				1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+				2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 3", closable:true'>
+				Tab 3 contents
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 4", closable:true'>
+				Tab 4 contents
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 5", closable:true'>
+				Tab 5 contents
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/module.js b/src/main/resources/static/dijit/tests/layout/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..5302467a4eb67f0b19fc7bcd81e3a7fe71fb6ef1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/module.js
@@ -0,0 +1,43 @@
+define(["doh/main", "require", "dojo/sniff"], function(doh, require, has){
+
+	var test_robot = has("trident") || has("ff") || has("chrome") < 45;
+
+	doh.register("layout.ContentPane", require.toUrl("./ContentPane.html"), 999999);
+	doh.register("layout.test_ContentPane", require.toUrl("./test_ContentPane.html"), 999999);
+	doh.register("layout.ContentPaneLayout", require.toUrl("./ContentPaneLayout.html"), 999999);
+	doh.register("layout.ContentPane-remote", require.toUrl("./ContentPane-remote.html"), 999999);
+	doh.register("layout.ContentPane-auto-require", require.toUrl("./ContentPane-auto-require.html"), 999999);
+
+	if(test_robot){
+		doh.register("layout.robot.GUI", require.toUrl("./robot/GUI.html"), 999999);
+	}
+
+	doh.register("layout.LayoutContainer_v1", require.toUrl("./LayoutContainer_v1.html"), 999999);
+	doh.register("layout.LayoutContainer", require.toUrl("./LayoutContainer.html"), 999999);
+
+	doh.register("layout.StackContainer", require.toUrl("./StackContainer.html"), 999999);
+	doh.register("layout.NestedStackContainer", require.toUrl("./nestedStack.html"), 999999);
+
+	doh.register("layout.TabContainer", require.toUrl("./TabContainer.html"), 999999);
+	if(test_robot){
+		doh.register("layout.robot.TabContainer_a11y", require.toUrl("./robot/TabContainer_a11y.html"), 999999);
+		doh.register("layout.robot.TabContainer_mouse", require.toUrl("./robot/TabContainer_mouse.html"), 999999);
+		doh.register("layout.robot.TabContainer_noLayout", require.toUrl("./robot/TabContainer_noLayout.html"), 999999);
+	}
+	doh.register("layout.TabContainerTitlePane", require.toUrl("./TabContainerTitlePane.html"), 999999);
+	
+	doh.register("layout.AccordionContainer", require.toUrl("./AccordionContainer.html"), 999999);
+	if(test_robot){
+		doh.register("layout.robot.AccordionContainer_a11y", require.toUrl("./robot/AccordionContainer_a11y.html"), 999999);
+		doh.register("layout.robot.AccordionContainer_mouse", require.toUrl("./robot/AccordionContainer_mouse.html"), 999999);
+	}
+
+	doh.register("layout.BorderContainer", require.toUrl("./BorderContainer.html"), 999999);
+	if(test_robot){
+		doh.register("layout.robot.BorderContainer", require.toUrl("./robot/BorderContainer.html"), 999999);
+		doh.register("layout.robot.BorderContainer_full", require.toUrl("./robot/BorderContainer_full.html"), 999999);
+		doh.register("layout.robot.BorderContainer_complex", require.toUrl("./robot/BorderContainer_complex.html"), 999999);
+		doh.register("layout.robot.BorderContainer_nested", require.toUrl("./robot/BorderContainer_nested.html"), 999999);
+	}
+
+});
diff --git a/src/main/resources/static/dijit/tests/layout/multipleLayoutWidgets.php b/src/main/resources/static/dijit/tests/layout/multipleLayoutWidgets.php
new file mode 100644
index 0000000000000000000000000000000000000000..016832b3ad775389654aecb188c3846c5e8ea36b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/multipleLayoutWidgets.php
@@ -0,0 +1,14 @@
+<?php
+	// If you call this file like multipleLayoutWidgets.php?id=foo then the id's of the created widgets
+	// will be based on the string "foo"
+	$id = htmlspecialchars($_GET['id']);
+?>
+This file has some nested layout widgets, and when this file is loaded the TabContainer and
+BorderContainer below should get resize() called on them
+<div data-dojo-type="dijit/layout/TabContainer" id="<?php echo $id ?>TabContainer" data-dojo-props='style:"width: 300px; height: 300px;","aria-label":"<?php echo $id ?>"'>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>doc4 tab1</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>doc4 tab2</div>
+</div>
+<div data-dojo-type="dijit/layout/BorderContainer" id="<?php echo $id ?>BorderContainer" data-dojo-props='style:"width: 300px; height: 300px;","aria-label":"<?php echo $id ?>"'>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>inner border container</div>
+</div>
diff --git a/src/main/resources/static/dijit/tests/layout/nestedStack.html b/src/main/resources/static/dijit/tests/layout/nestedStack.html
new file mode 100644
index 0000000000000000000000000000000000000000..ca6574128b2f3be7a46d1877cd8a75d05d0b5433
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/nestedStack.html
@@ -0,0 +1,201 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>TabContainerLite in StackContainer</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/declare",
+			"dojo/dom-geometry",
+			"dojo/dom-style",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/layout/_LayoutWidget",
+			"dijit/tests/helpers",
+
+			// just used by parser
+			"dijit/form/Button",
+			"dijit/layout/ContentPane",
+			"dijit/layout/StackContainer",
+			"dijit/layout/StackController",
+			"dijit/layout/TabContainer",
+			"dojo/domReady!"
+		], function(doh, declare, domGeom, domStyle, parser, registry, _LayoutWidget, helpers){
+
+			// This keeps track of which panes were resized, and their hidden/visible state
+			// when they were resized.
+			var resizeLog = {};
+
+			// This keeps track of how many times each pane was resized
+			var resizeCnt = {};
+
+			onResize = function(widget){
+				// called when a ContentPane or TabContainer is resized
+				console.log("resize on " + widget.id + ", display is " + domStyle.get(widget.domNode, "display"));
+				resizeLog[widget.id] = domStyle.get(widget.domNode, "style");
+				resizeCnt[widget.id] = (resizeCnt[widget.id] || 0) + 1;
+			};
+
+			declare("TestLayoutContained", _LayoutWidget, {
+				startup: function(){
+					this.inherited(arguments);
+					this._started = true;
+				},
+				resize: function(){
+					this.inherited(arguments);
+					this._contentBox = domGeom.getContentBox(this.domNode);
+					this._resized = true;
+				}
+			});
+
+			doh.register("parse", function(){
+				parser.parse();
+			});
+
+			doh.registerGroup("after load", [
+				{
+					name: "TabContainer 1 visible and resized",
+					runTest: function(t){
+						doh.is(1, resizeCnt["tab1"], "TabContainer 1 was resized once");
+						doh.is("block", domStyle.get(registry.byId("tab1").domNode, "display"), "TabContainer 1 is visible");
+						doh.t(resizeLog["tab1"] != "none", "TabContainer 1 was visible when it was resized");
+					}
+				},
+				{
+					name: "TabContainer 1 content pane 1 visible and resized",
+					runTest: function(t){
+						doh.is(1, resizeCnt["tab1cp1"], "Tab 1 was resized once");
+						doh.t(helpers.isVisible(registry.byId("tab1cp1")), "TabContainer1 Tab 1 is visible");
+						doh.t(resizeLog["tab1cp1"] != "none", "Tab 1 was visible when it was resized");
+					}
+				},
+				{
+					name: "TabContainer 1 content pane 2 hidden",
+					runTest: function(t){
+						doh.f(!"tab1cp2" in resizeCnt, "tab 2 hasn't been resized");
+						doh.t(helpers.isHidden(registry.byId("tab1cp2").domNode.parentNode), "TabContainer1 Tab 2 is hidden");
+					}
+				},
+				{
+					name: "TabContainer 2 hidden and unsized",
+					runTest: function(t){
+						doh.f(!"tab2" in resizeCnt, "TabContainer 2 hasn't been resized");
+						doh.t(helpers.isHidden(registry.byId("tab2").domNode.parentNode, "display"), "TabContainer 2 is hidden");
+					}
+				},
+				{
+					name: "TabContainer 2 content pane 1 unsized",
+					runTest: function(t){
+						doh.f(!"tab2cp1" in resizeCnt, "TabContainer 2 tab 1 hasn't been resized");
+					}
+				}
+			]);
+
+			doh.registerGroup("selecting TabContainer 2", [
+				function setUp(){
+					registry.byId("myStackContainerPR").selectChild("tab2");
+				},
+				{
+					name: "TabContainer 1 hidden",
+					runTest: function(t){
+						doh.t(helpers.isHidden(registry.byId("tab1").domNode.parentNode), "TabContainer1 is hidden");
+					}
+				},
+				{
+					name: "TabContainer 2 visible and resized",
+					runTest: function(t){
+						doh.is(1, resizeCnt["tab2"], "TabContainer 2 was resized once");
+						doh.t(helpers.isVisible(registry.byId("tab2").domNode.parentNode), "TabContainer 2 is visible");
+						doh.t(resizeLog["tab2"] != "none", "TabContainer 2 was visible when it was resized");
+					}
+				},
+				{
+					name: "TabContainer 2 content pane 1 visible and resized",
+					runTest: function(t){
+						doh.is(1, resizeCnt["tab2cp1"], "Tab 2 was resized once");
+						doh.t(helpers.isVisible(registry.byId("tab2cp1").domNode.parentNode), "TabContainer2 Tab 1 is visible");
+						doh.t(resizeLog["tab2cp1"] != "none", "Tab 2 was visible when it was resized");
+					}
+				}
+			]);
+
+			doh.registerGroup("resize of ContentPane contents", [
+				{
+					name: "nested layout widgets haven't been resized yet",
+					runTest: function(t){
+						doh.f(deferredOne._resized, "nested layout widget not yet resized");
+					}
+				},
+				{
+					name: "select tab 2 of TabContainer 2",
+					runTest: function(t){
+						registry.byId("tab2").selectChild("tab2cp2");
+					}
+				},
+				{
+					name: "resize was called on nested layout widgets after tab was made visible",
+					runTest: function(t){
+						doh.is(1, resizeCnt["tab2cp2"], "Tab 2 was resized once");
+						doh.t(deferredOne._resized, "deferredOne nested layout widget was resized");
+
+						var sizeAtResize = deferredOne._contentBox;
+						doh.t(sizeAtResize.w > 50, "content box has measurable width of " + sizeAtResize.w);
+						doh.t(sizeAtResize.h > 10, "content box has measurable height of " + sizeAtResize.h);
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body role="main">
+	<h1>Integration: TabContainer in StackContainer</h1>
+	<br>
+	<button id="previousPR" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainerPR").back() }'>&lt;</button>
+	<span data-dojo-type="dijit/layout/StackController" data-dojo-props='containerId:"myStackContainerPR"'></span>
+	<button id="nextPR" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("myStackContainerPR").forward() }'>&gt;</button>
+	<div id="myStackContainerPR" data-dojo-type="dijit/layout/StackContainer"
+		data-dojo-props='style:"height:150px; width: 400px;"'>
+			<div id="tab1" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='title:"tab container 1"'>
+				<script type="dojo/aspect" data-dojo-method="resize">
+					onResize(this);
+				</script>
+				<div id="tab1cp1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"TC1/tab1", href:"tab1.html"'>
+					<script type="dojo/aspect" data-dojo-method="resize">
+						onResize(this);
+					</script>
+				</div>
+				<div id="tab1cp2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"TC1/tab2", href:"tab2.html"'>
+					<script type="dojo/aspect" data-dojo-method="resize">
+						onResize(this);
+					</script>
+				</div>
+			</div>
+			<div id="tab2" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='title:"tab container 2"'>
+				<script type="dojo/aspect" data-dojo-method="resize">
+					onResize(this);
+				</script>
+				<div id="tab2cp1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"TC2/tab 1", href:"tab1.html"'>
+					<script type="dojo/aspect" data-dojo-method="resize">
+						onResize(this);
+					</script>
+				</div>
+				<div id="tab2cp2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"TC2/tab 2"'>
+					<script type="dojo/aspect" data-dojo-method="resize">
+						onResize(this);
+					</script>
+					<div><div>
+						<div data-dojo-id="deferredZero" data-dojo-type="TestLayoutContained">test nested layout widget</div>
+						<div data-dojo-id="deferredOne" data-dojo-type="TestLayoutContained">another test nested layout widget</div>
+					</div></div>
+				</div>
+			</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/robot/AccordionContainer_a11y.html b/src/main/resources/static/dijit/tests/layout/robot/AccordionContainer_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..477cc91ecb6ade030eaba14b950975b0cac7508d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/AccordionContainer_a11y.html
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot AccordionContainer A11Y Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx", "dojo/dom", "dojo/keys",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, keys, helpers){
+
+				robot.initRobot('../test_AccordionContainer.html');
+
+				var registry, focus;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						registry = robot.window.require("dijit/registry");
+						focus = robot.window.require("dijit/focus");
+					}
+				]);
+
+				doh.register("Accordion A11Y tests", [
+					{
+						name: "basic operation",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							robot.sequence(function(){
+								dom.byId("beforeMarkupAccordion").focus();
+							}, 500, 500);
+
+							// Tab into accordion, landing on title of first pane
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(/A Simple Pane/.test(helpers.innerText(focus.curNode)), "tabbed to first pane's title");
+							}), 500);
+
+							// Use down arrow to get to second pane's title
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.f(/A Simple Pane/.test(helpers.innerText(focus.curNode)), "moved away from first pane's title");
+								doh.t(/Lazy Load Pane/.test(helpers.innerText(focus.curNode)), "moved to second pane's title");
+								doh.is("lazyLoadPane", registry.byId("markupAccordion").get("selectedChildWidget").id, "second pane is now selected");
+							}), 500);
+
+							// Tab into second pane's content area, landing on link inside pane
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("WebA11y", helpers.innerText(focus.curNode), "tabbed into second pane");
+							}), 500);
+
+							// tab out of AccordionContainer
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("afterMarkupAccordion", focus.curNode.id, "tabbed out of accordion");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+				
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/layout/robot/AccordionContainer_mouse.html b/src/main/resources/static/dijit/tests/layout/robot/AccordionContainer_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..d0bf94ba2b22e203a0e9a75b4995fe9b06463068
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/AccordionContainer_mouse.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot AccordionContainer Mouse Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx", "dojo/domReady!"
+			], function(doh, robot){
+
+				robot.initRobot('../test_AccordionContainer.html');
+
+				var registry;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("Accordion Mouse tests",[
+					{
+						name: "basic operation",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							// Click open second pane
+							robot.mouseMoveAt("lazyLoadPane_button_title", 500, 1);
+							robot.mouseClick({left: true}, 500);
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("lazyLoadPane", registry.byId("markupAccordion").get("selectedChildWidget").id, "second pane is now selected");
+							}), 500);
+
+							// Click open fourth pane
+							robot.mouseMoveAt("embeddedLayoutPane_button_title", 500, 1);
+							robot.mouseClick({left: true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("embeddedLayoutPane", registry.byId("markupAccordion").get("selectedChildWidget").id, "fourth pane is now selected");
+							}), 2000);
+
+							return d;
+						}
+					}
+				]);
+				
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/layout/robot/BorderContainer.html b/src/main/resources/static/dijit/tests/layout/robot/BorderContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..04634b164cced44738e10ff5f69b818b91add03f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/BorderContainer.html
@@ -0,0 +1,176 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot BorderContainer Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx", "dojo/dom", "dojo/dom-geometry", "dojo/keys",
+				"dijit/tests/helpers", "dijit/tests/layout/robot/borderContainerTestFunctions", "dojo/domReady!"
+			], function(doh, robot, dom, geom, keys, helpers, bcTest){
+
+				robot.initRobot('../test_BorderContainer.html');
+
+				var focus;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						focus = robot.window.require("dijit/focus");
+					}
+				]);
+
+				doh.register("mouse", [
+					{
+						name: "expand right pane",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var oTop = geom.position(dom.byId("border2-top")),
+								oCenter = geom.position(dom.byId("border2-center")),
+								oRight = geom.position(dom.byId("border2-trailing")),
+								oBottom = geom.position(dom.byId("border2-bottom"));
+
+							// Drag slider to expand pane 
+							var size = geom.position("border2-trailing_splitter");
+							robot.mouseMoveAt("border2-trailing_splitter", 500);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("border2-trailing_splitter", 500, 100,
+								size.w/2 + (geom.isBodyLtr() ? -100 : 100), size.h/2);
+							robot.mouseRelease({left: true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								var nTop = geom.position(dom.byId("border2-top")),
+									nCenter = geom.position(dom.byId("border2-center")),
+									nRight = geom.position(dom.byId("border2-trailing")),
+									nBottom = geom.position(dom.byId("border2-bottom"));
+					
+								doh.t(bcTest.within(oRight.w + 100, nRight.w, 10), "right width went from " + oRight.w + " to " + nRight.w);
+								doh.t(bcTest.within(oTop.w - 100, nTop.w, 10), "top width went from " + oTop.w + " to " + nTop.w);
+								doh.t(bcTest.within(oCenter.w - 100, nCenter.w, 10), "center width went from " + oCenter.w + " to " + nCenter.w);
+								doh.t(bcTest.within(oBottom.w - 100, nBottom.w, 10), "bottom width went from " + nBottom.w + " to " + nBottom.w);
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "shrink bottom pane",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var oTop = geom.position(dom.byId("border2-top")),
+								oCenter = geom.position(dom.byId("border2-center")),
+								oRight = geom.position(dom.byId("border2-trailing")),
+								oBottom = geom.position(dom.byId("border2-bottom"));
+
+							// Drag slider to shrink pane 
+							var size = geom.position("border2-bottom_splitter");
+							robot.mouseMoveAt("border2-bottom_splitter", 500);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("border2-bottom_splitter", 500, 100, size.w/2, size.h/2 + 10);
+							robot.mouseRelease({left: true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								var nTop = geom.position(dom.byId("border2-top")),
+									nCenter = geom.position(dom.byId("border2-center")),
+									nRight = geom.position(dom.byId("border2-trailing")),
+									nBottom = geom.position(dom.byId("border2-bottom"));
+					
+								doh.t(bcTest.within(oBottom.h - 10, nBottom.h, 10), "bottom height went from " + oBottom.h + " to " + nBottom.h);
+								doh.t(bcTest.within(oCenter.h + 10, nCenter.h, 10), "center height went from " + oCenter.h + " to " + nCenter.h);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("keyboard", [
+					{
+						name: "tabIndex",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							robot.sequence(function(){
+								dom.byId("toggleLeftButton").focus();
+							}, 500, 500);
+
+							// Tab into second BorderContainer, landing on link
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("a link", helpers.innerText(focus.curNode), "tabbed to link");
+							}), 500);
+
+							// Tab past ComboBox to get to splitter for bottom panel
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("border2-bottom_splitter", focus.curNode.id, "focus on bottom splitter");
+							}), 500);
+
+							// Tab to get to splitter for right panel
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("border2-trailing_splitter", focus.curNode.id, "focus on bottom splitter");
+							}), 500);
+
+							// tab out of BorderContainer, into the next one
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("a link", helpers.innerText(focus.curNode), "tabbed to link in next BC");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "expand/contract",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var oSize, nSize;
+
+							// contract bottom pane
+							robot.sequence(function(){
+								dom.byId("border2-bottom_splitter").focus();
+								oSize = geom.position("border2-bottom");
+							}, 500, 500);
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								nSize = geom.position("border2-bottom");
+								doh.t(nSize.h < oSize.h, "contracted bottom pane");
+							}), 500);
+
+							// expand trailing pane
+							robot.sequence(function(){
+								dom.byId("border2-trailing_splitter").focus();
+								oSize = geom.position("border2-trailing");
+							}, 500, 500);
+							robot.keyPress(geom.isBodyLtr() ? keys.LEFT_ARROW : keys.RIGHT_ARROW, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								nSize = geom.position("border2-trailing");
+								doh.t(nSize.w > oSize.w, "expanded trailing pane");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+				
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/layout/robot/BorderContainer_complex.html b/src/main/resources/static/dijit/tests/layout/robot/BorderContainer_complex.html
new file mode 100644
index 0000000000000000000000000000000000000000..c2ac0c7811a1e2fd37e00fa743cc8005091736f3
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/BorderContainer_complex.html
@@ -0,0 +1,320 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot BorderContainer complex Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx", "dojo/aspect", "dojo/dom", "dojo/dom-geometry", "dojo/keys",
+				"dijit/tests/helpers", "dijit/tests/layout/robot/borderContainerTestFunctions", "dojo/domReady!"
+			], function(doh, robot, aspect, dom, geom, keys, helpers, bcTest){
+
+				robot.initRobot('../test_BorderContainer_complex.html');
+
+				var registry, focus;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						registry = robot.window.require("dijit/registry");
+						focus = robot.window.require("dijit/focus");
+					}
+				]);
+
+				doh.register("API", [
+					function initialConditions(){
+						bcTest.checkBCpanes(registry.byId("border1"));
+					}
+				]);
+
+				//test some basic functionality of the complex widgets to get a feel for whether they work inside the border container
+				doh.register("tabContainer", [
+					{
+						name: "tab2Selected",
+						runTest: function(t){
+							doh.f(registry.byId("tab1").selected, "tab1 not selected");
+							doh.t(registry.byId("tab2").selected, "tab2 selected");
+							doh.f(registry.byId("tab3").selected, "tab3 not selected");
+							doh.f(registry.byId("tab4").selected, "tab4 not selected");
+							doh.f(registry.byId("tab5").selected, "tab5 not selected");
+							doh.f(registry.byId("tab6").selected, "tab6 not selected");
+						}
+					},
+					{
+						name: "tabsCanBeShownWhenSelected_tab1",
+						timeout: 3000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("mainTabContainer_tablist_tab1", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("mainTabContainer_tablist_tab1", focus.curNode.id, "current focus");
+								doh.is("tab1", registry.byId("mainTabContainer").selectedChildWidget.id, "selectedChildWidget");
+								doh.t(helpers.isVisible(registry.byId("tab1")), "tab1 visible");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "tabsCanBeShownWhenSelected_tab2",
+						timeout: 3000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							robot.keyPress(keys.RIGHT_ARROW, 1000, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("mainTabContainer_tablist_tab2", focus.curNode.id, "current focus");
+								doh.is("tab2", registry.byId("mainTabContainer").selectedChildWidget.id, "selectedChildWidget");
+								doh.t(helpers.isVisible(registry.byId("tab2")), "tab2 visible");
+								doh.t(helpers.isHidden(registry.byId("tab1")), "tab1 hidden");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "tabsCanBeShownWhenSelected_tab3",
+						timeout: 3000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							robot.keyPress(keys.RIGHT_ARROW, 1000, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("mainTabContainer_tablist_tab3", focus.curNode.id, "current focus");
+								doh.is("tab3", registry.byId("mainTabContainer").selectedChildWidget.id, "selectedChildWidget");
+								doh.t(helpers.isVisible(registry.byId("tab3")), "tab3 visible");
+								doh.t(helpers.isHidden(registry.byId("tab2")), "tab2 hidden");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "tabsCanBeShownWhenSelected_tab4",
+						timeout: 3000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							robot.keyPress(keys.RIGHT_ARROW, 1000, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("mainTabContainer_tablist_tab4", focus.curNode.id, "current focus");
+								doh.is("tab4", registry.byId("mainTabContainer").selectedChildWidget.id, "selectedChildeWidget");
+								doh.t(helpers.isVisible(registry.byId("tab4")), "Tab4 is hidden");
+								doh.t(helpers.isHidden(registry.byId("tab3")), "Tab3 is visible");
+							}), 1000);
+							
+							return d;
+						}
+					},
+					{
+						name: "tabsCanBeShownWhenSelected_tab5",
+						timeout: 3000,
+						runTest: function(t){
+							var d = new doh.Deferred();		
+							robot.keyPress(keys.RIGHT_ARROW, 1000, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("mainTabContainer_tablist_tab5", focus.curNode.id, "current focus");
+								doh.is("tab5", registry.byId("mainTabContainer").selectedChildWidget.id, "selectedChildWidget");
+								doh.t(helpers.isVisible(registry.byId("tab5")), "tab5 visible");
+								doh.t(helpers.isHidden(registry.byId("tab4")), "tab4 hidden");
+							}), 1000);
+							
+							return d;
+						}
+					},
+					{
+						name: "tabsCanBeShownWhenSelected_tab6",
+						timeout: 3000,
+						runTest: function(t){
+							var d = new doh.Deferred();		
+							robot.keyPress(keys.RIGHT_ARROW, 1000, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("mainTabContainer_tablist_tab6", focus.curNode.id, "current focus");
+								doh.is("tab6", registry.byId("mainTabContainer").selectedChildWidget.id, "selectedChildWidget");
+								doh.t(helpers.isVisible(registry.byId("tab6")), "tab6 visible");
+								doh.t(helpers.isHidden(registry.byId("tab5")), "tab5 hidden");
+							}), 1000);
+							
+							return d;
+						}
+					}					
+				]);
+				
+				doh.register("AccordionContainer", [
+					{
+						name: "pane1Selected",
+						runTest: function(t){
+							doh.t(registry.byId("ap1").selected, "ap1 selected");
+							doh.f(registry.byId("ap2").selected, "ap2 not selected");
+							doh.f(registry.byId("ap3").selected, "ap3 not selected");
+							doh.t(helpers.isVisible(registry.byId("ap1")), "ap1 is visible");
+							doh.t(helpers.isHidden(registry.byId("ap2")), "ap2 is hidden");
+							doh.t(helpers.isHidden(registry.byId("ap3")), "ap3 is hidden");
+						}
+					},
+					{
+						name: "focus ap1 title bar",
+						runTest: function(t){
+							registry.byId("ap1_button").focusNode.focus();
+						}
+					},
+					{
+						name: "select ap2",
+						timeout: 3000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							// Connect to _hideChild() as a trick to tell when animation is finished
+							handle = aspect.after(registry.byId("ac1"), "_hideChild", function(){
+								setTimeout(d.getTestCallback(function(){
+									doh.is("ap2_button", focus.curNode.parentNode.id, "current focus");
+									doh.is("ap2", registry.byId("ac1").selectedChildWidget.id, "selectedChildWidget");
+									doh.t(helpers.isVisible(registry.byId("ap2")), "ap2 visible");
+									doh.t(helpers.isHidden(registry.byId("ap1")), "ap1 hidden");
+								}), 0);
+							});
+							
+							robot.keyPress(keys.DOWN_ARROW, 1000, {});
+
+							return d;
+						},
+						tearDown: function(){
+							handle.remove();
+						}
+					},
+					{
+						name: "select ap3",
+						timeout: 3000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							// Connect to _hideChild() as a trick to tell when animation is finished
+							handle = aspect.after(registry.byId("ac1"), "_hideChild", function(){
+								setTimeout(d.getTestCallback(function(){
+									doh.is("ap3_button", focus.curNode.parentNode.id, "current focus");
+									doh.is("ap3", registry.byId("ac1").selectedChildWidget.id, "selectedChildWidget");
+									doh.t(helpers.isVisible(registry.byId("ap3")), "ap3 visible");
+									doh.t(helpers.isHidden(registry.byId("ap2")), "ap2 hidden");
+								}), 0);
+							}, true);
+							
+							robot.keyPress(keys.DOWN_ARROW, 1000, {});
+
+							return d;
+						},
+						tearDown: function(){
+							handle.remove();
+						}
+					},
+					{
+						name: "resize accordion",
+						timeout: 6000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var accordion = geom.position(dom.byId("ac1"));
+							var centerPane = geom.position(dom.byId("mainCP"));
+							var centerPaneRight = centerPane.x + centerPane.w;
+							var filteringSelectWidth = geom.position(registry.byId("filteringSelect").domNode).w;
+							var move = filteringSelectWidth - centerPane.w + 30;
+
+							// Drag slider to shrink pane 
+							var size = geom.position("ac1_splitter");
+							robot.mouseMoveAt("ac1_splitter", 0, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("ac1_splitter", 500, 1, size.w/2-move, size.h/2);
+							robot.sequence(function(){
+								var newCenterPane = geom.position(dom.byId("mainCP"));
+								var newCenterPaneRight = newCenterPane.x + newCenterPane.w;
+								// center could overlap right pane
+								var move2 = centerPaneRight - newCenterPaneRight;
+								robot.mouseMoveAt("ac1_splitter", 500, 1, size.w/2-move2, size.h/2);
+								move += move2;
+							
+								robot.mouseRelease({left: true}, 500);
+								robot.sequence(d.getTestCallback(function(){
+									// test that the margin box for the accordion pane grows the same size as the splitter moved
+									var newAccordion = geom.position(dom.byId("ac1"));
+									doh.is(Math.round(newAccordion.w), Math.round(accordion.w-move), 'old accordion w = ' + accordion.w + ', new w = ' + newAccordion.w);
+									
+									// test that the center content got smaller by the same size that the splitter moved
+									var newCenterPane = geom.position(dom.byId("mainCP"));
+									var newCenterPaneRight = newCenterPane.x + newCenterPane.w;
+									doh.is(Math.round(newCenterPane.w), Math.round(centerPane.w+move-centerPaneRight+newCenterPaneRight), 'old center pane w = ' + centerPane.w + ', new w = ' + newCenterPane.w);
+								}), 500);
+							}, 500);
+
+							return d;
+						}
+					}
+				]);
+				
+				var filteringSelect, handler;
+				doh.register("filteringSelect", [
+					{
+						name: "changeValue",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							filteringSelect = registry.byId("filteringSelect");
+							handler = filteringSelect.on("change", function(e){
+								d.callback(true);
+							});
+							
+							filteringSelect.focus();
+							robot.keyPress(keys.DOWN_ARROW, 1000, {});
+							robot.keyPress(keys.DOWN_ARROW, 1000, {});
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+							
+							return d;
+						},
+						tearDown: function(t){
+							handler.remove();
+						}
+					}
+				]); 
+				
+				doh.register("editor", [
+					{
+						name: "changeValue",
+						timeout: 3000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+														
+							robot.sequence(function(){
+								var editor = registry.byId("editor1");
+								editor.setValue("<div id='myDiv'>This is my new text</div>");
+							}, 1000); 
+							
+							robot.sequence(d.getTestCallback(function(){
+								var myDiv = registry.byId("editor1").editNode.childNodes[0];
+								doh.is("myDiv", myDiv.id, "myDiv was not the first child node as expected");
+								doh.t(helpers.isVisible(myDiv), "myDiv is visible");
+							}), 1000);
+							
+							return d;
+						}
+					}
+				]);
+				
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/robot/BorderContainer_full.html b/src/main/resources/static/dijit/tests/layout/robot/BorderContainer_full.html
new file mode 100644
index 0000000000000000000000000000000000000000..59945c4dcc1e27c85dbf0a7a0b9d712e05b3ad09
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/BorderContainer_full.html
@@ -0,0 +1,117 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot BorderContainer full Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx", "dojo/dom", "dojo/dom-geometry", "dojo/window",
+				"dijit/tests/helpers", "dijit/tests/layout/robot/borderContainerTestFunctions","dojo/domReady!"
+			], function(doh, robot, dom, geom, window, helpers, bcTest){
+
+				robot.initRobot('../test_BorderContainer_full.html');
+
+				var registry;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("API", [
+					function initialConditions(){
+						var bc = registry.byId("main");
+						bcTest.checkBCpanes(bc);
+						doh.t(5, bc.getChildren().length, "# of children");
+					},
+					
+					function testFullScreen(){
+						var borderContainerPos = geom.position(dom.byId("main"));
+						var view = window.getBox();
+						doh.t(borderContainerPos.h-view.h < 3, "borderContainerPos.h-view.h = " + borderContainerPos.h-view.h);
+						doh.t(borderContainerPos.w-view.w < 3, "borderContainerPos.w-view.w = " + borderContainerPos.w-view.w);
+					}
+				]);
+
+				doh.register("mouse", [
+					{
+						name: "expand right pane",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var oTop = geom.position(dom.byId("main-top")),
+								oCenter = geom.position(dom.byId("main-center")),
+								oRight = geom.position(dom.byId("main-trailing")),
+								oBottom = geom.position(dom.byId("main-bottom"));
+
+							// Drag slider to expand pane
+							var size = geom.position("main-trailing_splitter");
+							robot.mouseMoveAt("main-trailing_splitter", 500);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("main-trailing_splitter", 500, 100,
+								size.w/2 + (geom.isBodyLtr() ? -100 : 100), size.h/2);
+							robot.mouseRelease({left: true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								var nTop = geom.position(dom.byId("main-top")),
+									nCenter = geom.position(dom.byId("main-center")),
+									nRight = geom.position(dom.byId("main-trailing")),
+									nBottom = geom.position(dom.byId("main-bottom"));
+
+								doh.t(bcTest.within(oRight.w + 100, nRight.w, 10), "right width went from " + oRight.w + " to " + nRight.w);
+								doh.t(bcTest.within(oTop.w - 100, nTop.w, 10), "top width went from " + oTop.w + " to " + nTop.w);
+								doh.t(bcTest.within(oCenter.w - 100, nCenter.w, 10), "center width went from " + oCenter.w + " to " + nCenter.w);
+								doh.t(bcTest.within(oBottom.w - 100, nBottom.w, 10), "bottom width went from " + nBottom.w + " to " + nBottom.w);
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "shrink bottom pane",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var oTop = geom.position(dom.byId("main-top")),
+								oCenter = geom.position(dom.byId("main-center")),
+								oRight = geom.position(dom.byId("main-trailing")),
+								oBottom = geom.position(dom.byId("main-bottom"));
+
+							// Drag slider to shrink pane
+							var size = geom.position("main-bottom_splitter");
+							robot.mouseMoveAt("main-bottom_splitter", 500);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("main-bottom_splitter", 500, 100, size.w/2, size.h/2 + 10);
+							robot.mouseRelease({left: true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								var nTop = geom.position(dom.byId("main-top")),
+									nCenter = geom.position(dom.byId("main-center")),
+									nRight = geom.position(dom.byId("main-trailing")),
+									nBottom = geom.position(dom.byId("main-bottom"));
+
+								doh.t(bcTest.within(oBottom.h - 10, nBottom.h, 10), "bottom height went from " + oBottom.h + " to " + nBottom.h);
+								doh.t(bcTest.within(oCenter.h + 10, nCenter.h, 10), "center height went from " + oCenter.h + " to " + nCenter.h);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/robot/BorderContainer_nested.html b/src/main/resources/static/dijit/tests/layout/robot/BorderContainer_nested.html
new file mode 100644
index 0000000000000000000000000000000000000000..55ca48ee7901f11e9e35d63172e294ff86dac6ef
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/BorderContainer_nested.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot BorderContainer nested Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/dom", "dojo/dom-geometry", "dojo/keys",
+				"dijit/tests/helpers", "dijit/tests/layout/robot/borderContainerTestFunctions", "dojo/domReady!"
+			], function(doh, robot, array, dom, geom, keys, helpers, bcTest){
+
+				function checkLayoutPriorityBC(){
+					bcTest.checkAbove("top bar above second top bar", "top1", "top2");
+					bcTest.checkAbove("second top bar above inner top bar", "top2", "top3");
+					bcTest.checkLeft("outer left vs. inner left", "left1", "left2");
+					bcTest.checkLeft("inner left vs. inner top", "left2", "top3");
+					bcTest.checkLeft("inner left vs. inner bottom", "left2", "bottom3");
+					bcTest.checkAbove("inner top vs. center", "top3", "center");
+					bcTest.checkAbove("center vs. inner bottom", "center", "bottom3");
+					bcTest.checkLeft("inner right vs. inner top", "top3", "right2");
+					bcTest.checkLeft("inner right vs. center", "center", "right2");
+					bcTest.checkAbove("inner bottom bar above second bottom bar", "bottom3", "bottom2");
+					bcTest.checkAbove("second bottom bar above bottom bar", "bottom2", "bottom1");
+				}
+
+				robot.initRobot('../test_BorderContainer_nested.html');
+
+				var registry;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("initial layout", [
+					function nestedBC(){
+						bcTest.checkBCpanes(registry.byId("nbc"));
+						doh.t(helpers.isVisible(registry.byId("nbc")));
+						bcTest.checkInside("nbc", "tc");
+					},
+					function layoutPriorityBC(){
+						registry.byId("tc").selectChild(registry.byId("pbc"));	
+						doh.t(helpers.isVisible(registry.byId("pbc")), "second pane visible");
+
+						// Check layout of BorderContainer panes relative to each other
+						checkLayoutPriorityBC();
+
+						// Check that all panes within BC borders
+						var children = registry.byId("pbc").getChildren();
+						doh.is(11, children.length, "# of children");
+						array.forEach(children, function(child){
+							bcTest.checkInside(child, registry.byId("pbc"));
+						});
+					}							
+				]);
+
+				// Verify that tab stops are as per original markup (i.e., children are still in the
+				// logical order specified in the original markup).   The tabstops not listed here
+				// are for the splitters themselves.
+				doh.register("tabIndex", function tabstops(){
+					var tabstops = tabOrder(registry.byId("pbc").domNode);
+					doh.is(21, tabstops.length);
+					doh.is("tabstop #1", tabstops[0].value);
+					doh.is("tabstop #3", tabstops[2].value);
+					doh.is("tabstop #5", tabstops[4].value);
+					doh.is("tabstop #7", tabstops[6].value);
+					doh.is("tabstop #9", tabstops[8].value);
+					doh.is("tabstop #11", tabstops[10].value);
+					doh.is("tabstop #12", tabstops[12].value);
+					doh.is("tabstop #14", tabstops[14].value);
+					doh.is("tabstop #16", tabstops[16].value);
+					doh.is("tabstop #18", tabstops[18].value);
+					doh.is("tabstop #20", tabstops[20].value);
+				});
+
+				doh.register("keyboard", [
+					{
+						name: "top1",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var top1Size, centerSize;
+
+							robot.sequence(function(){
+								dom.byId("top1_splitter").focus();
+								
+								top1Size = geom.position("top1");
+								centerSize = geom.position("center");
+							}, 500, 500);
+
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(bcTest.within(top1Size.h + 3, geom.position("top1").h, 0.5), "top size increased");
+								doh.t(bcTest.within(centerSize.h - 3, geom.position("center").h, 0.5), "center size decreased");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "right1",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var right1Size, centerSize, top2Size, bottom1Size;
+
+							robot.sequence(function(){
+								dom.byId("right1_splitter").focus();
+								
+								right1Size = geom.position("right1");
+								centerSize = geom.position("center");
+								top2Size = geom.position("top2");
+								bottom1Size = geom.position("bottom1");
+							}, 500, 500);
+
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(bcTest.within(right1Size.w + 3, geom.position("right1").w, 0.5), "right size increased");
+								doh.t(bcTest.within(centerSize.w - 3, geom.position("center").w, 0.5), "center size decreased");
+								doh.t(bcTest.within(centerSize.w - 3, geom.position("top3").w, 0.5), "inner top size decreased");
+								doh.t(bcTest.within(centerSize.w - 3, geom.position("bottom3").w, 0.5), "inner bottom size decreased");
+								doh.t(bcTest.within(top2Size.h, geom.position("top2").h, 0.5), "top2 height unchanged");
+								doh.t(bcTest.within(top2Size.w, geom.position("top2").w, 0.5), "top2 width unchanged");
+								doh.t(bcTest.within(bottom1Size.h, geom.position("bottom1").h, 0.5), "bottom1 height unchanged");
+								doh.t(bcTest.within(bottom1Size.w, geom.position("bottom1").w, 0.5), "bottom1 width unchanged");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/robot/GUI.html b/src/main/resources/static/dijit/tests/layout/robot/GUI.html
new file mode 100644
index 0000000000000000000000000000000000000000..cf9b7df6c3a0d5a864a6486e8e2d5abdf4c34f18
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/GUI.html
@@ -0,0 +1,311 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot GUI Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom",
+				"dijit/tests/helpers", "dijit/tests/layout/robot/borderContainerTestFunctions", "dojo/domReady!"
+			], function(doh, robot, dom, helpers, bcTest){
+	
+				robot.initRobot('../test_Gui.html');
+
+				var registry;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("API", [
+					function initialConditions(){
+						bcTest.checkBCpanes(registry.byId("main"), "main checkBCpanes"); // This test will fail in opera because it thinks that the center content is taller than the border container.  However, it displays fine.
+						bcTest.checkBCpanes(registry.byId("mainSplit"), "mainSplit bcTest.checkBCpanes");
+						bcTest.checkBCpanes(registry.byId("embeddedBC"), "embeddedBC bcTest.checkBCpanes");
+						bcTest.checkBCpanes(registry.byId("bottomSplit"), "bottomSplit bcTest.checkBCpanes");
+						bcTest.checkInside(registry.byId("topTabs1"), registry.byId("centerSplit"), "topTabs1 inside centerSplit");
+						doh.t(helpers.isVisible(registry.byId("basicFormTab").domNode.parentNode), "basicFormTab visible");
+					}
+				]);
+
+				doh.register("test_left_accordion", [
+					{
+						name: "open ac pane 2",
+						timeout: 4000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+														
+							robot.mouseMoveAt("ac_pane2_button", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden(registry.byId("ac_pane1").domNode), "pane1 hidden");
+								doh.t(helpers.isVisible(registry.byId("ac_pane2").domNode), "pane2 visible");
+								doh.t(helpers.isHidden(registry.byId("ac_pane3").domNode), "pane3 hidden");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("test_Top_Tab_Container", [
+					{
+						name: "open top tab 2",
+						timeout: 9000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							//Drag splitter to the left to make more room for the tab container
+							robot.mouseMoveAt("leftAccordion_splitter", 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("leftAccordion_splitter", 500, 100, -100, 100);
+							robot.mouseRelease({left: true}, 500);
+							
+							robot.mouseMoveAt("topTabs1_tablist_tabAccordion", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("dijit_layout_ContentPane_2_button", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible(registry.byId("dijit_layout_ContentPane_2")), "Accordion tab 2 is not visible");
+								doh.t(helpers.isHidden(registry.byId("dijit_layout_ContentPane_4").domNode), "Accordion tab 4 is not hidden");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "open top tab 3",
+						timeout: 9000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("topTabs1_tablist_textareaTab", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("dijit_layout_ContentPane_6_button", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible(registry.byId("tabAccordionContainer").domNode), "Accordion container is not visible");
+								doh.t(helpers.isVisible(registry.byId("dijit_layout_ContentPane_6")), "Accordion tab 4 is not visible");
+								doh.t(helpers.isHidden(registry.byId("dijit_layout_ContentPane_7").domNode), "Accordion tab 3 is not hidden");
+								doh.t(helpers.isVisible(registry.byId("bbtab1").domNode), "Nested tab1 is not visible");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "open top tab 3 and close nested tab",
+						timeout: 4000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt(registry.byId("accTabs_tablist_bbtab3").closeNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+														
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(undefined, registry.byId("accTabs_tablist_bbtab3"), "accTabs_tablist_bbtab3 undefined");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "open top tab 4",
+						timeout: 5000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("topTabs1_tablist_titlePaneCP", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								var children = registry.byId("titlePaneCP").domNode.childNodes;
+								doh.is(3, children.length);
+								doh.t(helpers.isVisible(children[1].parentNode), "The title pane child node is not visible");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "open top tab 4 and close title pane",
+						timeout: 4000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt(registry.byId("tp").focusNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								var titlePane = registry.byId("tp");
+								doh.f(titlePane.open);
+								doh.t(helpers.isHidden(dom.byId("tp_pane").parentNode), "Title pane is not hidden");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "open top tab 5",
+						timeout: 5000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("topTabs1_tablist_tabContainerInTabCP", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("tabContainerInTabCP_tablist_basicFormTab2", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible(registry.byId("basicFormTab2").domNode.parentNode), "The embedded tab content is not visible");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "close top tab 5",
+						timeout: 4000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt(registry.byId("topTabs1_tablist_tabContainerInTabCP").closeNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(undefined, registry.byId("topTabs1_tablist_tabContainerInTabCP"), "topTabs1_tablist_tabContainerInTabCP undefined");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+				
+				doh.register("test_Center_tab_containers", [
+					{
+						name: "open tab 2",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+														
+							//Drag splitter up to make more room for the tab container
+							robot.mouseMoveAt("topTabs1_splitter", 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("topTabs1_splitter", 500, 100, 100, -200);
+							robot.mouseRelease({left: true}, 500);
+							
+							robot.mouseMoveAt("bottomTabs1_tablist_btabB", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								bcTest.checkInside(registry.byId("bottomTabs1"), registry.byId("embeddedBC"), "bottomTabs1 inside embeddedBC");
+								bcTest.checkInside(registry.byId("bottomTabs2"), registry.byId("embeddedBC"), "bottomTabs2 inside embeddedBC");
+								doh.t(helpers.isVisible(registry.byId("btabB").domNode), "Tab 2 is not visible");
+								doh.t(helpers.isHidden(registry.byId("btabA").domNode), "Tab 1 is not hidden");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "close tab 3",
+						timeout: 4000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+														
+							robot.mouseMoveAt(registry.byId("bottomTabs1_tablist_btabC").closeNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(undefined, registry.byId("bottomTabs1_tablist_btabC"), "bottomTabs1_tablist_btabC undefined");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+				
+				doh.register("test_Bottom_tab_containers", [
+					{
+						name: "test1",
+						timeout: 5000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+														
+							//Drag splitter up to make more room for the tab container
+							robot.mouseMoveAt("bottomTabs_splitter", 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("bottomTabs_splitter", 500, 100, 100, -200);
+							robot.mouseRelease({left: true}, 500);
+														
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible(registry.byId("dijit_layout_ContentPane_9").domNode), "dijit_layout_ContentPane_9 visible");
+								doh.t(helpers.isVisible(registry.byId("dijit_layout_ContentPane_9_splitter").domNode), "dijit_layout_ContentPane_9_splitter visible");
+								doh.t(helpers.isVisible(registry.byId("btabAA").domNode), "btabAA visible");
+								doh.t(helpers.isVisible(registry.byId("dijit_layout_ContentPane_10").domNode), "dijit_layout_ContentPane_10 visible");
+								doh.t(helpers.isVisible(registry.byId("dijit_layout_ContentPane_10_splitter").domNode), "dijit_layout_ContentPane_10_splitter visible");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "test2",
+						timeout: 4000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("bottomTabs_tablist_btab2", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible(registry.byId("btab2").domNode), "btab2 visible");
+								doh.t(helpers.isHidden(registry.byId("dijit_layout_ContentPane_9").domNode), "dijit_layout_ContentPane_9 visible");
+								doh.t(helpers.isHidden(registry.byId("dijit_layout_ContentPane_9_splitter").domNode), "dijit_layout_ContentPane_9_splitter visible");
+								doh.t(helpers.isHidden(registry.byId("btabAA").domNode), "btabAA visible");
+								doh.t(helpers.isHidden(registry.byId("dijit_layout_ContentPane_10").domNode), "dijit_layout_ContentPane_10 visible");
+								doh.t(helpers.isHidden(registry.byId("dijit_layout_ContentPane_10_splitter").domNode), "dijit_layout_ContentPane_10_splitter visible");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "test3",
+						timeout: 6000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt(registry.byId("bottomTabs_tablist_btab3").closeNode, 500, 1);
+							robot.mouseClick({left:true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(undefined, registry.byId("bottomTabs_tablist_btab3"), "bottomTabs_tablist_btab3 undefined");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/robot/TabContainer_a11y.html b/src/main/resources/static/dijit/tests/layout/robot/TabContainer_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..54b7ac27d05407796614a738d97b49d2a9508c76
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/TabContainer_a11y.html
@@ -0,0 +1,591 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot TabContainer A11Y Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/keys", "dojo/query", "dojo/sniff", "dojo/window",
+				"dijit/tests/helpers"
+			], function(doh, robot, dom, keys, query, has, winUtils, helpers){
+	
+				robot.initRobot('../test_TabContainer.html');
+
+				var registry;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+				
+				doh.register("aria", [
+					{
+						name: "tab container attributes",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							var tc = registry.byId("mainTabContainer");
+							
+							doh.is("tabpanel", tc.containerNode.children[0].getAttribute("role"), "containerNode child role");
+							doh.is("mainTabContainer_tablist_tab1", tc.containerNode.children[0].getAttribute("aria-labelledby"), "containerNode.child (the tabpanel) labelledby");
+							
+							var tablist = tc.tablist;
+							
+							// The tablist that stretches across the top
+							doh.is("tablist", tablist.containerNode.getAttribute("role"), "tablist role");
+							doh.is("tab", tablist.getChildren()[0].focusNode.getAttribute("role"), "tablist child's role should be tab");
+							
+							// Now the drop down button
+							doh.is("button", tablist._menuBtn.domNode.getAttribute("role"), "_menuBtn role");
+							doh.f(tablist._menuBtn.domNode.getAttribute("aria-expanded"), "aria-expanded should initially be absent");
+							doh.f(tablist._menuBtn.domNode.getAttribute("aria-owns"), "aria-owns should initially be absent");
+
+							// Now open the drop down to verify changes in aria-expanded, aria-owns, and aria-labelledby
+							tablist._menuBtn.focus();
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(tablist._menuBtn.domNode.getAttribute("aria-expanded"), "aria-expanded with open dropdown");
+								doh.is("mainTabContainer_menu", tablist._menuBtn.domNode.getAttribute("aria-owns"), "menuBtn should own the menu dropdown");
+								
+								var menu = registry.byId("mainTabContainer_menu");
+								doh.is("menu", menu.domNode.getAttribute("role"), "the dropdown role");
+								doh.is("mainTabContainer_tablist_menuBtn", menu.domNode.getAttribute("aria-labelledby"), "aria-labelledby on menu dropdown");
+							
+							}), 500);
+							
+							return d;
+						}
+					}
+				]);
+
+				doh.register("basic navigation", [
+					{
+						name: "focus on button before TabContainer",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							// Note: for this to work, focus needs to start somewhere else; otherwise there will be no
+							// focus event.
+							helpers.onFocus(d.getTestCallback(function(node){
+							}));
+
+							query("button")[0].focus();							
+
+							return d;
+						}
+					},
+					{
+						name: "tab into main TabContainer",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is("mainTabContainer_tablist_tab2", node.id, "focus");
+							}));
+
+							robot.keyPress(keys.TAB, 500, {});
+
+							return d;
+						}
+					},
+					{
+						name: "move to tab 3 with RIGHT arrow",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							helpers.onFocus(d.getTestCallback(function(node){
+								var tc = registry.byId("mainTabContainer");
+								doh.is('mainTabContainer_tablist_tab3', node.id, "currently chosen tab");
+								doh.is("tab3", tc.selectedChildWidget.id, "currently displayed pane");
+							}));
+							
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							
+							return d;
+						}
+					},
+					{
+						name: "move to tab 2 with LEFT arrow",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							var tc = registry.byId("mainTabContainer");							
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('mainTabContainer_tablist_tab2', node.id, "currently chosen tab");
+								doh.is("tab2", tc.selectedChildWidget.id, "currently chosen pane");
+							}));
+							
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+
+							return d;
+						}
+					},
+
+					{
+						name: "move to tab 3 again with RIGHT arrow",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							helpers.onFocus(d.getTestCallback(function(node){
+							}));
+							
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							
+							return d;
+						}
+					},
+					{
+						name: "move to inlined subcontainer tab with RIGHT arrow",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							helpers.onFocus(d.getTestCallback(function(node){
+							}));
+							
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							
+							return d;
+						}
+					},
+					
+					{
+						name: "TAB focus to nested tab",
+						timeout: 10000,
+						runTest: function(t){
+								var d = new doh.Deferred();
+
+								helpers.onFocus(d.getTestCallback(function(node){
+									doh.is('inlined_tablist_tab2href', node.id);
+								}));								
+								
+								robot.keyPress(keys.TAB, 750);
+
+								return d;
+						}
+					},
+
+					{
+						name: "move to second nested tab button",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							helpers.onFocus(d.getTestCallback(function(node){
+							}));
+							
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							
+							return d;
+						}
+					},
+					{
+						name: "shift-TAB to parent tabs from nested tabs",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							helpers.onFocus(d.getTestCallback(function(node){
+							}));
+
+							robot.keyPress(keys.TAB, 750, {shift:true});
+							
+							return d;
+						}
+					},
+					{
+						name: "left arrow to tab 3",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('mainTabContainer_tablist_tab3', node.id);
+							}));
+
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							
+							return d;
+						}
+					},
+					{
+						name: "right arrow to inline subtabcontainer",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							helpers.onFocus(d.getTestCallback(function(node){
+							}));
+
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							
+							return d;
+						}
+					},
+					{
+						name: "verify nested tablist keeps it's state",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							//verify that the third nested tab is still selected
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('inlined_tablist_subtab3', node.id);
+							}));
+
+							robot.keyPress(keys.TAB, 750, {});	// give IE8 time to complete slide animation
+							
+							return d;
+						}
+					}
+				]);
+
+				doh.register("HOME/END keys", [
+					{
+						name: "focus tab 3",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							registry.byId("mainTabContainer").selectChild(registry.byId("tab3"), false);
+
+							setTimeout(d.getTestErrback(function(){
+								// on IE the focus event lands after control releases (after the NEXT test has set its focus handler) so do 0 timeout to let focus happen
+								dom.byId("mainTabContainer_tablist_tab3href").focus();
+								setTimeout(d.getTestCallback(function(){}),0);
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "home key",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+								
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('mainTabContainer_tablist_tab1', node.id);
+							}));
+
+							robot.keyPress(keys.HOME, 500, {});
+
+							return d;
+						}
+					},
+					{
+						name: "end key",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+								
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('mainTabContainer_tablist_embedded', node.id);
+							}));
+
+							robot.keyPress(keys.END, 500, {});
+
+							return d;
+						}
+					},
+					{
+						name: "verify left/right arrows still work",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+								
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('mainTabContainer_tablist_tab4href', node.id);
+							}));
+
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("disabled tabs",[
+					{
+						name: "setup",
+						runTest: function(){
+
+							// disable first, last, and middle tab
+							registry.byId("tab1").set("disabled", true);
+							registry.byId("tab3").set("disabled", true);
+							registry.byId("embedded").set("disabled", true);
+
+							// set second tab as selected
+							registry.byId("mainTabContainer").selectChild(registry.byId("tab2"));
+						}
+					},
+
+					{
+						name: "focus on button before TabContainer",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							helpers.onFocus(d.getTestCallback(function(node){
+							}));
+
+							query("button")[0].focus();
+
+							return d;
+						}
+					},
+					{
+						name: "tab into main TabContainer",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is("mainTabContainer_tablist_tab2", node.id, "focus");
+							}));
+
+							robot.keyPress(keys.TAB, 500, {});
+
+							return d;
+						}
+					},
+					{
+						name: "skip over tab 3 with RIGHT arrow",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							helpers.onFocus(d.getTestCallback(function(node){
+								var tc = registry.byId("mainTabContainer");
+								doh.is('mainTabContainer_tablist_inlined', node.id, "currently chosen tab");
+								doh.is("inlined", tc.selectedChildWidget.id, "currently displayed pane");
+							}));
+
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+
+							return d;
+						}
+					},
+					{
+						name: "skip over tab 3 with LEFT arrow",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var tc = registry.byId("mainTabContainer");
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('mainTabContainer_tablist_tab2', node.id, "currently chosen tab");
+								doh.is("tab2", tc.selectedChildWidget.id, "currently chosen pane");
+							}));
+
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+
+							return d;
+						}
+					},
+					{
+						name: "end key should skip disabled tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('mainTabContainer_tablist_tab4href', node.id);
+							}));
+
+							robot.keyPress(keys.END, 500, {});
+
+							return d;
+						}
+					},
+					{
+						name: "home key should skip disabled tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('mainTabContainer_tablist_tab2', node.id);
+							}));
+
+							robot.keyPress(keys.HOME, 500, {});
+
+							return d;
+						}
+					},
+
+					{
+						name: "teardown",
+						runTest: function(){
+							// disable first, last, and middle tab
+							registry.byId("tab1").set("disabled", false);
+							registry.byId("tab3").set("disabled", false);
+							registry.byId("embedded").set("disabled", false);
+						}
+					}
+				]);
+
+				doh.register("closing tabs", [
+					{
+						name: "close tab with DELETE button",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var tc = registry.byId("mainTabContainer");
+
+							// Select "SplitContainer from href tab"
+							tc.selectChild("tab4href");
+
+							// Go to "Embedded layout widgets" tab, and close it.
+							// This puts focus back on "SplitContainer from href".
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							robot.keyPress(keys.DELETE, 750, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(6, tc.getChildren().length, "six tabs left");
+								doh.is("tab4href", tc.selectedChildWidget.id, "selection moved to previous tab");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "close tab with CTRL-W button",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							robot.sequence(function(){
+								dom.byId("mainTabContainer_tablist_tab1").focus();
+							}, 500);
+
+							// Go to "Tab 3", and close it.
+							// This puts the focus back on "Tab 2".
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 750, {});
+							robot.keyPress(keys.LEFT_ARROW, 750, {});
+							if(has("chrome")){
+								// on chrome ctrl+w isn't trapped, and closes the whole browser!
+								robot.keyPress(keys.DELETE, 750, {});
+							}else{
+								robot.keyPress("w", 750, {ctrl:true});
+							}
+
+							var tc = registry.byId("mainTabContainer");
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(5, tc.getChildren().length);
+								doh.is("tab2", tc.selectedChildWidget.id, "selection moved to previous tab");
+							}), 500);
+							return d;
+						}
+					}
+				]);
+
+				// Run test about opening context menu via keyboard, except on:
+				//	- safari/mac where it doesn't work unless VoiceOver is turned on (#9927)
+				//	- webkit/win, where in suite mode (runTests.html), F10 triggers context menu
+				//		in both the iframe and the outer window
+				if(!has("webkit")){
+					doh.register("closing tabs via context menu", {
+						name: "close tab through context menu",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var tc = registry.byId("ttabs");
+							winUtils.scrollIntoView(tc.domNode);
+							doh.is(4, tc.getChildren().length, "num tabs before trying to close one");
+
+							dom.byId("ttabs_tablist_ttab1").focus();
+
+							// Open context menu via keyboard
+							if(has("mac")){
+								robot.keyPress(keys.SPACE, 500, {
+									ctrl: true
+								});
+							}else{
+								robot.keyPress(keys.F10, 500, {
+									shift: true
+								});
+							}
+
+							// Close tab
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(3, tc.getChildren().length, "remaining tabs");
+								doh.is("ttab2", tc.selectedChildWidget.id,
+										"selection moved to next tab (since first tab was deleted)");
+							}), 500);
+
+							return d;
+						}
+					});
+				}
+
+				doh.register("up/down arrows", [
+					{
+						name: "move to tab with DOWN button",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var tc = registry.byId("ltabs");
+							winUtils.scrollIntoView(tc.domNode);
+
+							dom.byId("ltabs_tablist_HanselGretel1").focus();
+							setTimeout(d.getTestErrback(function(){
+								helpers.onFocus(d.getTestCallback(function(node){
+									doh.is('ltabs_tablist_GreenTwigs1', node.id, "currently chosen tab");
+									doh.is("GreenTwigs1", tc.selectedChildWidget.id, "currently displayed pane");
+								}));
+
+								robot.keyPress(keys.DOWN_ARROW, 500, {});
+							}), 0);
+
+							return d;
+						}
+					},
+					{
+						name: "move to tab with UP button",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var tc = registry.byId("ltabs");
+							helpers.onFocus(d.getTestCallback(function(node){
+								doh.is('ltabs_tablist_HanselGretel1', node.id, "currently chosen tab");
+								doh.is("HanselGretel1", tc.selectedChildWidget.id, "currently chosen pane");
+							}));
+
+							robot.keyPress(keys.UP_ARROW, 500, {});
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/layout/robot/TabContainer_mouse.html b/src/main/resources/static/dijit/tests/layout/robot/TabContainer_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..fcc594cd31aa8bcd36a586da264dcc0e626c89e3
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/TabContainer_mouse.html
@@ -0,0 +1,343 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot TabContainer Mouse Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/dom-geometry", "dojo/on", "dojo/query",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, geom, on, query, helpers){
+
+				robot.initRobot('../test_TabContainer.html');
+
+				var registry, focus;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						registry = robot.window.require("dijit/registry");
+						doh.t(!!registry, "got registry");
+					}
+				]);
+	
+				doh.register("general", [
+					{
+						name: "tab hover state",
+						timeout: 5000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							// workaround DOH robot bug where iframe overlay not removed
+							robot.mouseClick({left: true}, 500);
+
+							robot.mouseMoveAt('mainTabContainer_tablist_tab3', 500);
+
+							on.once(dom.byId('mainTabContainer_tablist_tab3'), "mouseover", function(){
+								setTimeout(d.getTestCallback(function(){
+									// Check that .dijitTabHover class was applied
+									var tabHover = query(".dijitTabHover #mainTabContainer_tablist_tab3");
+									doh.is(1, tabHover.length);
+								}), 0);
+							});
+							
+							return d;
+						}
+					},
+					{
+						name: "click on a tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt('mainTabContainer_tablist_tab3', 500);
+							robot.mouseClick({left: true}, 500);
+							
+							var tc = registry.byId("mainTabContainer");
+							
+							helpers.onFocus(d.getTestCallback(function(curNode){
+								// verify tab button is selected
+								doh.is('mainTabContainer_tablist_tab3', curNode.id, "verify chosen tab is in its chosen state and focused");
+
+								// verify pane is shown
+								doh.is("tab3", tc.selectedChildWidget.id, "verify that the appropriate contentpane is displayed");
+								doh.t(helpers.isVisible(registry.byId("tab3")), "tab3 shown");
+								doh.t(helpers.isHidden(registry.byId("tab2")), "tab2 hidden");
+							}), 500);
+							
+							return d;
+						}
+					},
+					{
+						name: "scrolling",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							// save original position of one of the tab labels
+							var pos0 = geom.position("mainTabContainer_tablist_tab2").x,
+								pos1,
+								pos2;
+
+							// Initially scrolled all the way to the left, so left scroll button
+							// should be disabled
+							doh.t(registry.byId("mainTabContainer_tablist_leftBtn").get("disabled"), "left scroll button disabled");
+							doh.f(registry.byId("mainTabContainer_tablist_rightBtn").get("disabled"), "right scroll button enabled");
+
+							// Scroll to the right
+							robot.mouseMoveAt('mainTabContainer_tablist_rightBtn', 500);
+							robot.mouseClick({left: true}, 500);
+							robot.sequence(d.getTestErrback(function(){
+								pos1 = geom.position("mainTabContainer_tablist_tab2").x;
+								doh.t(pos1 < pos0, "scrolled to the right: " + pos1 + " < " + pos0);
+								doh.f(registry.byId("mainTabContainer_tablist_leftBtn").get("disabled"), "left scroll button enabled");
+							}), 500);
+							
+							// And then scroll back to the left
+							robot.mouseMoveAt('mainTabContainer_tablist_leftBtn', 500);
+							robot.mouseClick({left: true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								pos2 = geom.position("mainTabContainer_tablist_tab2").x;
+								doh.t(pos2 > pos1, "scrolled to the left: " + pos2 + " > " + pos1);
+							}), 500);
+							
+							return d;
+						}
+					},
+					{
+						name: "close button hover state",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt(query('.dijitTabCloseButton', registry.byId("mainTabContainer_tablist_tab3").domNode)[0], 500);
+							
+							// verify the close button is in its hover state
+							robot.sequence(d.getTestCallback(function(){
+								var closeHover = query(".dijitTabCloseButtonHover", registry.byId("mainTabContainer_tablist_tab3").domNode);
+								doh.is(1, closeHover.length, "close button hover CSS");
+							}), 500);
+							
+							return d;
+						}
+					},
+					{
+						name: "close a tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt(query('.dijitTabCloseButton', registry.byId("mainTabContainer_tablist_tab3").domNode)[0], 500);
+							robot.mouseClick({left: true}, 500);
+							
+							var tc = registry.byId("mainTabContainer");
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(6, tc.getChildren().length);
+							}), 500);
+							
+							return d;
+						}
+					},
+					{
+						name: "choose a tab from TabContainer's menu",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("mainTabContainer_tablist_menuBtn", 500);
+							robot.mouseClick({left: true}, 500);
+							robot.mouseMoveAt("tab4href_stcMi", 500);
+							robot.mouseClick({left: true}, 1000);
+							
+							// verify SplitContainer tab is displayed (but it doesn't get focus, see #10727)
+							robot.sequence(d.getTestCallback(function(){
+								// Check that tab button is scrolled correctly into view
+								// TODO: this check won't work in RTL mode
+								var tc = registry.byId("mainTabContainer");
+
+								var leftButton = dom.byId("mainTabContainer_tablist_leftBtn");
+								var tablistLeft = geom.position(leftButton).x + geom.position(leftButton).w;
+	
+								var rightButton = dom.byId("mainTabContainer_tablist_rightBtn");
+								var tablistRight = geom.position(rightButton).x;
+	
+								var tab = registry.byId("mainTabContainer_tablist_tab4href");
+	
+								var tabLeft = geom.position(tab.domNode).x;
+								var tabRight = geom.position(tab.domNode).x + geom.position(tab.domNode).w;
+	
+								var isTabVisible = (tablistLeft < tabLeft && tablistRight > tabRight);
+
+								doh.t(isTabVisible, "verify tab is in display area");
+								
+								// And verify that pane is shown
+								doh.is("tab4href", tc.selectedChildWidget.id, "verify that the appropriate contentpane is displayed");
+								doh.t(helpers.isVisible(registry.byId("tab4href")), "tab4 shown");
+								doh.t(helpers.isHidden(registry.byId("tab1")), "tab1 hidden");
+							}), 1000);
+							
+							return d;
+						}
+					}
+				]);
+
+				doh.register("disabled tabs", [
+					{
+						name: "setup",
+						runTest: function(){
+							tc = registry.byId("mainTabContainer");
+							tc.selectChild(registry.byId("tab1"));
+							registry.byId("tab2").set("closable", true);
+							registry.byId("tab2").set("disabled", true);
+						}
+					},
+					{
+						name: "click disabled tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt('mainTabContainer_tablist_tab2', 500);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("tab1", tc.selectedChildWidget.id, "selected pane not changed");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "close disabled tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var nChildren = tc.getChildren().length;
+							robot.mouseMoveAt(query('.dijitTabCloseButton', registry.byId("mainTabContainer_tablist_tab2").domNode)[0], 500);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(nChildren, tc.getChildren().length, "num children didn't change");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "choose disabled tab from TabContainer's menu",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("mainTabContainer_tablist_menuBtn", 500);
+							robot.mouseClick({left: true}, 500);
+							robot.mouseMoveAt("tab2_stcMi", 500);
+							robot.mouseClick({left: true}, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("tab1", tc.selectedChildWidget.id, "selected pane not changed");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "re-enable tab",
+						runTest: function(){
+							registry.byId("tab2").set("disabled", false);
+						}
+					},
+					{
+						name: "click enabled tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt('mainTabContainer_tablist_tab2', 500);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("tab2", tc.selectedChildWidget.id, "selected pane changed");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "close enabled tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var nChildren = tc.getChildren().length;
+							robot.mouseMoveAt(query('.dijitTabCloseButton', registry.byId("mainTabContainer_tablist_tab2").domNode)[0], 500);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(nChildren-1, tc.getChildren().length, "num children decreased");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("initially disabled tab", [
+					{
+						name: "setup",
+						runTest: function(){
+							tc = registry.byId("nomenu");
+							tc.selectChild(registry.byId("nomenu_tab2"));
+						}
+					},
+					{
+						name: "click disabled tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("nomenu_tablist_nomenu_tab3", 500);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("nomenu_tab2", tc.selectedChildWidget.id, "selected pane not changed");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "close disabled tab",
+						timeout: 10000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							var nChildren = tc.getChildren().length;
+							robot.mouseMoveAt(query('.dijitTabCloseButton', registry.byId("nomenu_tablist_nomenu_tab3").domNode)[0], 500);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(nChildren, tc.getChildren().length, "num children didn't change");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/layout/robot/TabContainer_noLayout.html b/src/main/resources/static/dijit/tests/layout/robot/TabContainer_noLayout.html
new file mode 100644
index 0000000000000000000000000000000000000000..3b6eef2101844c152078ad1d873e2fc0775feb33
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/TabContainer_noLayout.html
@@ -0,0 +1,265 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot TabContainer No Layout Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/aspect", "dojo/dom", "dojo/dom-geometry", "dojo/json", "dojo/query"
+			], function(doh, robot, aspect, dom, geom, json, query){
+
+				function checkInside(childDomNode, parentDomNode){
+					var cp = geom.position(childDomNode, true),
+						pp = geom.position(parentDomNode, true);
+	
+					doh.t(
+						cp.y > pp.y && cp.y+cp.h < pp.y+pp.h &&
+						cp.x > pp.x && cp.x+cp.w < pp.x+pp.w,
+						childDomNode.id + "child not inside " + parentDomNode.id + json.stringify(cp) + json.stringify(pp)
+					);
+				}
+
+				var oldPos, tab, handler;
+			
+				robot.initRobot('../test_TabContainer_noLayout.html');
+
+				var registry;
+
+				doh.register("setup", [
+					function setup(){
+						// get pointers to singletons loaded on test page
+						registry = robot.window.require("dijit/registry");
+					}
+				]);
+
+				doh.register("plain TabContainer",[
+					{
+						name: "tab1",
+						timeout: 8000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							tab = registry.byId('tab1');
+							handler = aspect.after(tab, 'onDownloadEnd', function(){
+								setTimeout(d.getTestCallback(function(){
+									var h1 = query('h1', dom.byId('tab1'))[0];
+									var p1 = query('p', dom.byId('tab1'))[0];
+									var div1 = query('div', dom.byId('tab1'))[0];
+								
+									checkInside(h1, registry.byId("plainTabContainer").domNode);
+									checkInside(p1, registry.byId("plainTabContainer").domNode);
+									checkInside(div1, registry.byId("plainTabContainer").domNode);
+								
+									oldPos = geom.position(dom.byId("textAfterTabContainer1"), true);
+								}), 500);
+							});
+							
+							robot.mouseMoveAt('plainTabContainer_tablist_tab1', 0, 1);
+							robot.mouseClick({left: true}, 500);
+							
+							return d;
+						},
+						tearDown: function(t){
+							handler.remove();
+						}
+					},
+					{
+						name: "tab2",
+						timeout: 4000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							tab = registry.byId('tab2');
+							handler = aspect.after(tab, 'onDownloadEnd', function(){
+								setTimeout(d.getTestCallback(function(){
+									var h2 = query('h1', dom.byId('tab2'))[0];
+									var p2 = query('p', dom.byId('tab2'))[0];
+								
+									checkInside(h2, registry.byId("plainTabContainer").domNode);
+									checkInside(p2, registry.byId("plainTabContainer").domNode);
+								
+									var newPos = geom.position(dom.byId("textAfterTabContainer1"), true);
+									doh.isNot(oldPos.y, newPos.y, "oldpos y vs. newpos y");
+									oldPos = newPos;
+								}), 1000);
+							});
+							
+							robot.mouseMoveAt('plainTabContainer_tablist_tab2', 0, 1);
+							robot.mouseClick({left: true}, 500);
+							
+							return d;
+						},
+						tearDown: function(t){
+							handler.remove();
+						}
+					},
+					{
+						name: "tab3",
+						timeout: 4000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							tab = registry.byId('tab3');
+							handler = aspect.after(tab, '_onShow', function(){
+								setTimeout(d.getTestCallback(function(){
+									checkInside(dom.byId("h3"), registry.byId("plainTabContainer").domNode);
+									checkInside(dom.byId("p3"), registry.byId("plainTabContainer").domNode);
+									checkInside(dom.byId("p4"), registry.byId("plainTabContainer").domNode);
+									checkInside(dom.byId("p5"), registry.byId("plainTabContainer").domNode);
+									checkInside(dom.byId("b3"), registry.byId("plainTabContainer").domNode);
+									checkInside(dom.byId("b4"), registry.byId("plainTabContainer").domNode);
+									checkInside(dom.byId("foo"), registry.byId("plainTabContainer").domNode);
+								
+									var newPos = geom.position(dom.byId("textAfterTabContainer1"), true);
+									doh.isNot(oldPos.y, newPos.y, "oldpos y vs. newpos y");
+									oldPos = newPos;
+								}), 1000);
+							});
+							
+							robot.mouseMoveAt('plainTabContainer_tablist_tab3', 0, 1);
+							robot.mouseClick({left: true}, 500);
+							
+							return d;
+						},
+						tearDown: function(t){
+							handler.remove();
+						}
+					},
+					{
+						name: "tab4_innerTab1",
+						timeout: 12000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							tab = registry.byId('tab4');
+							handler = aspect.after(tab, '_onShow', function(){
+								handler.remove();
+								handler = null;
+								setTimeout(d.getTestErrback(function(){
+									tab = registry.byId('tab4a');
+									handler = aspect.after(tab, '_onShow', function(){
+										handler.remove();
+										handler = null;
+										setTimeout(d.getTestCallback(function(){
+											var h1 = query('h1', dom.byId('tab4a'))[0];
+											var p1 = query('p', dom.byId('tab4a'))[0];
+											var div1 = query('div', dom.byId('tab4a'))[0];
+								
+											checkInside(h1, registry.byId("plainTabContainer").domNode);
+											checkInside(p1, registry.byId("plainTabContainer").domNode);
+											checkInside(div1, registry.byId("plainTabContainer").domNode);
+								
+											var newPos = geom.position(dom.byId("textAfterTabContainer1"), true);
+											doh.isNot(oldPos.y, newPos.y, "oldpos y vs. newpos y");
+											oldPos = newPos;
+										}), 1000);
+									});
+									robot.mouseMoveAt('tab4_tablist_tab4a', 0, 1);
+									robot.mouseClick({left: true}, 500);
+								}), 1000);
+							});
+
+							robot.mouseMoveAt('plainTabContainer_tablist_tab4', 0, 1);
+							robot.mouseClick({left: true}, 500);
+							
+							return d;
+						},
+						tearDown: function(t){
+							if(handler){
+								handler.remove();
+							}
+						}
+					},
+					{
+						name: "tab4_innerTab2",
+						timeout: 4000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+							
+							tab = registry.byId('tab4b');
+							handler = aspect.after(tab, '_onShow', function(){
+								setTimeout(d.getTestCallback(function(){
+									var h2 = query('h1', dom.byId('tab4b'))[0];
+									var p2 = query('p', dom.byId('tab4b'))[0];
+
+									checkInside(h2, registry.byId("plainTabContainer").domNode);
+									checkInside(p2, registry.byId("plainTabContainer").domNode);
+								
+									var newPos = geom.position(dom.byId("textAfterTabContainer1"), true);
+									doh.isNot(oldPos.y, newPos.y, "oldpos y vs. newpos y");
+									oldPos = newPos;
+								}), 1000);
+							});
+							
+							robot.mouseMoveAt('tab4_tablist_tab4b', 0, 1);
+							robot.mouseClick({left: true}, 500);
+							
+							return d;
+						},
+						tearDown: function(t){
+							handler.remove();
+						}
+					},
+
+					{
+						name: "addTab",
+						timeout: 8000,
+						runTest: function(t){
+							var d = new doh.Deferred();
+
+							tab = registry.byId('plainTabContainer');
+							handler = aspect.after(tab, 'addChild', function(){
+								setTimeout(function(){
+									robot.mouseMoveAt('plainTabContainer_tablist_newTab6', 0, 1);
+									robot.mouseClick({left: true}, 500);
+									robot.sequence(d.getTestCallback(function(){
+										var newTab = dom.byId("newTab6");
+										doh.is("Contents of Tab 6", newTab.innerHTML);
+										checkInside(newTab, registry.byId("plainTabContainer").domNode);
+
+										var newPos = geom.position(dom.byId("textAfterTabContainer1"), true);
+										doh.isNot(oldPos.y, newPos.y, "oldpos y vs. newpos y");
+									}), 1000);
+								}, 1000)
+							});
+							robot.mouseMoveAt('addTabButton', 0, 1);
+							robot.mouseClick({left: true}, 500);
+
+							return d;
+						},
+						tearDown: function(t){
+							handler.remove();
+						}
+					},
+					{
+						timeout: 4000,
+						name: "destroy",
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt('destroyTabContainer', 0, 1);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(undefined, dom.byId("plainTabContainer"), 'widget was not removed');
+							}), 2000);
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/robot/borderContainerTestFunctions.js b/src/main/resources/static/dijit/tests/layout/robot/borderContainerTestFunctions.js
new file mode 100644
index 0000000000000000000000000000000000000000..17325b582c607b3f70828443992c0ea9e9ffc3e4
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/robot/borderContainerTestFunctions.js
@@ -0,0 +1,115 @@
+define(["dojo/_base/kernel", "dojo/_base/array", "dojo/dom-geometry", "dojo/json"], function(dojo, array, geom, json){
+
+	function dijitById(id){
+		return dojo.global.require("dijit/registry").byId(id);
+	}
+
+	var exports = {
+		checkInside: function(/*Widget*/ child, /*Widget*/ parent, /*String?*/ comment){
+			// summary:
+			//		Test that child is fully inside of parent
+	
+			child = dijitById(child);
+			parent = dijitById(parent);
+	
+			var cp = geom.position(child.domNode, true),
+				pp = geom.position(parent.domNode, true);
+
+			// Adjust for IE10+ fractional values
+			pp.w = Math.ceil(pp.w);
+
+			doh.t(
+				cp.y >= pp.y && cp.y+cp.h <= pp.y+pp.h &&
+				cp.x >= pp.x && cp.x+cp.w <= pp.x+pp.w,
+				(comment ? comment + ": " : "") + child.region + " inside " + parent.id + json.stringify(cp) + json.stringify(pp)
+			);
+		},
+
+		checkAbove: function(/*String*/ comment, /*Widget*/ above, /*Widget*/ below){
+			// summary:
+			//		Test that child is fully above parent
+	
+			above = dijitById(above);
+			below = dijitById(below);
+	
+			var ap = geom.position(above.domNode, true),
+				bp = geom.position(below.domNode, true);
+	
+			doh.t(ap.y+ap.h < bp.y,
+				comment + " " + above.region + " above " + below.region + json.stringify(ap) + json.stringify(bp)
+			);
+		},
+
+		checkLeft: function(/*String*/ comment, /*Widget*/ left, /*Widget*/ right){
+			// summary:
+			//		Test that child is fully left of parent
+	
+			left = dijitById(left);
+			right = dijitById(right);
+	
+			var lp = geom.position(left.domNode, true),
+				rp = geom.position(right.domNode, true);
+	
+			doh.t(lp.x+lp.w < rp.x,
+				comment + " " + left.region + " to left of " + right.region + json.stringify(lp) + json.stringify(rp)
+			);
+		},
+
+		checkBCpanes: function(/*BorderContainer*/ bc, /*String*/ comment){
+			// summary:
+			//		Check that all the panes in this BorderContainer are in sane
+			//		positions relative to each other.   Assumes at most one pane
+			//		in each region.
+			var children = bc.getChildren(),
+				regions = {};
+	
+			// Check all panes inside BorderContainer
+			array.forEach(children, function(child, comment){
+				exports.checkInside(child, bc, comment);
+				regions[child.region] = child;
+			});
+	
+			// Check pane positions relative to each other
+			array.forEach(children, function(child){
+				switch(child.region){
+					case "top":
+						array.forEach(bc.design == "sidebar" ? ["center", "bottom"] : ["left", "center", "right", "bottom"], function(region){
+							if(regions[region]){
+								exports.checkAbove(bc.id, child, regions[region], comment);
+							}
+						});
+						break;
+					case "bottom":
+						array.forEach(bc.design == "sidebar" ? ["center", "top"] : ["left", "center", "right", "top"], function(region){
+							if(regions[region]){
+								exports.checkAbove(bc.id, regions[region], child, comment);
+							}
+						});
+						break;
+					case "left":
+						array.forEach(bc.design == "sidebar" ? ["top", "center", "bottom", "right"] : ["right"], function(region){
+							if(regions[region]){
+								exports.checkLeft(bc.id, child, regions[region], comment);
+							}
+						});
+						break;
+					case "right":
+						array.forEach(bc.design == "sidebar" ? ["top", "center", "bottom", "left"] : ["left"], function(region){
+							if(regions[region]){
+								exports.checkLeft(bc.id, regions[region], child, comment);
+							}
+						});
+						break;
+				}
+			});
+		},
+
+		within: function(/*Number*/ a, /*Number*/ b, /*Number*/ range){
+			// summary:
+			//		Returns true if a and b are within range
+			return Math.abs(a-b) <= range;
+		}
+	};
+
+	return exports;
+});
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/layout/runTests.html b/src/main/resources/static/dijit/tests/layout/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..afed0fe4f3a55fecd45d928244d94a9540765b8b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/runTests.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+	<title>Dijit Unit Test Runner</title>
+	<meta http-equiv="REFRESH" content="0;url=../../../util/doh/runner.html?testModule=dijit/tests/layout/module"></HEAD>
+	<BODY>
+		Redirecting to D.O.H runner.
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/layout/tab1.html b/src/main/resources/static/dijit/tests/layout/tab1.html
new file mode 100644
index 0000000000000000000000000000000000000000..a37b927ff8cb758accb95bf148628aa1e436ed89
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/tab1.html
@@ -0,0 +1,6 @@
+
+<h1>Tab 1</h1>
+
+<p>I am tab 1. I was loaded externally. <a href="http://www.weba11y.com">WebA11y</a>(something to get focus)</p>
+
+<div label="foo!">blah</div>
diff --git a/src/main/resources/static/dijit/tests/layout/tab2.html b/src/main/resources/static/dijit/tests/layout/tab2.html
new file mode 100644
index 0000000000000000000000000000000000000000..ed1ad764ea32a8f7384fe691680e9a99fd0c5c66
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/tab2.html
@@ -0,0 +1,3 @@
+<h1>Tab 2</h1>
+
+<p>I am tab 2. I was loaded externally as well.</p>
diff --git a/src/main/resources/static/dijit/tests/layout/tab3.html b/src/main/resources/static/dijit/tests/layout/tab3.html
new file mode 100644
index 0000000000000000000000000000000000000000..d3caa5da706997baf425433423d6121eb250c13f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/tab3.html
@@ -0,0 +1,39 @@
+<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='nested:true'>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Subtab #1"'>
+		<p>This is a nested tab container BUT loaded via an href.</p>
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Subtab #2"'>
+		<p>
+		Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus.
+		</p>
+		<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+		imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+		nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+		massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+		pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+		quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+		felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+		quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+		rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+		semper velit ante id metus. Praesent massa dolor, porttitor sed,
+		pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+		tortor pharetra congue. Suspendisse pulvinar.
+		</p>
+		<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+		ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+		nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+		lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+		est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+		dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+		nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+		pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+		sociosqu ad litora torquent per conubia nostra, per inceptos
+		hymenaeos.
+		</p>
+	</div>
+</div>
diff --git a/src/main/resources/static/dijit/tests/layout/tab3_noLayout.html b/src/main/resources/static/dijit/tests/layout/tab3_noLayout.html
new file mode 100644
index 0000000000000000000000000000000000000000..f9bb61c1ee8340349db1db4f25c53b6938bf3445
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/tab3_noLayout.html
@@ -0,0 +1,39 @@
+<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='doLayout:false'>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Subtab #1"'>
+		<p>This is a nested tab container BUT loaded via an href.</p>
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Subtab #2"'>
+		<p>
+		Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus.
+		</p>
+		<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+		imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+		nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+		massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+		pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+		quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+		felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+		quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+		rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+		semper velit ante id metus. Praesent massa dolor, porttitor sed,
+		pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+		tortor pharetra congue. Suspendisse pulvinar.
+		</p>
+		<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+		ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+		nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+		lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+		est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+		dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+		nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+		pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+		sociosqu ad litora torquent per conubia nostra, per inceptos
+		hymenaeos.
+		</p>
+	</div>
+</div>
diff --git a/src/main/resources/static/dijit/tests/layout/tab4.html b/src/main/resources/static/dijit/tests/layout/tab4.html
new file mode 100644
index 0000000000000000000000000000000000000000..c919adad3e990d327b99e6a1fb9ed963927f13d2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/tab4.html
@@ -0,0 +1,40 @@
+<div data-dojo-type="dijit/layout/SplitContainer" data-dojo-props='orientation:"vertical"'>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"split #1"'>
+		<p>Top of split container loaded via an href.</p>
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"split #2"'>
+		<p>Bottom of split container loaded via an href.</p>
+		<p>
+		Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus.
+		</p>
+		<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+		imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+		nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+		massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+		pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+		quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+		felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+		quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+		rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+		semper velit ante id metus. Praesent massa dolor, porttitor sed,
+		pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+		tortor pharetra congue. Suspendisse pulvinar.
+		</p>
+		<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+		ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+		nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+		lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+		est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+		dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+		nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+		pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+		sociosqu ad litora torquent per conubia nostra, per inceptos
+		hymenaeos.
+		</p>
+	</div>
+</div>
diff --git a/src/main/resources/static/dijit/tests/layout/test_AccordionContainer.html b/src/main/resources/static/dijit/tests/layout/test_AccordionContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..64d977c01bf8e241d50df0dd21b376c384df209f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_AccordionContainer.html
@@ -0,0 +1,302 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Accordion Widget Demo</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/layout/AccordionContainer",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dijit/layout/TabContainer",
+			"dojo/domReady!"
+		], function(parser, _registry){
+			parser.parse();
+
+			// Set up global, used in button onclick handlers
+			registry = _registry;
+
+			createAccordion = function(){
+				var html='<div data-dojo-type="dijit/layout/AccordionContainer" id="Accordion" style="height: 300px;">' +
+						'<div data-dojo-type="dijit/layout/ContentPane" title="first" id="first">first</div>' +
+						'<div data-dojo-type="dijit/layout/ContentPane" title="second" id="second">second</div>' +
+						'</div>';
+				registry.byId("accPane").set("content",html);
+			};
+		});
+	</script>
+
+	<style type="text/css">
+		.somePadding .dijitAccordionBody {
+			padding: 5px;
+		}
+		.extremePadding .dijitAccordionBody {
+			padding: 50px;
+		}
+	</style>
+</head>
+<body class="claro" style="padding: 50px;" role="main">
+
+	<h1 class="testTitle">AccordionContainer Tests</h1>
+
+	<h2>Accordion from markup:</h2>
+
+	<input id="beforeMarkupAccordion" aria-label="before markup" value="for tabIndex testing"/>
+	<div id="markupAccordion" data-dojo-type="dijit/layout/AccordionContainer" data-dojo-props='style:"width: 400px; height: 300px; overflow: hidden"'>
+		<div id="pane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:true,
+			title:"A Simple Pane", iconClass:"dijitEditorIcon dijitEditorIconSave", tooltip:"tooltip for simple pane" '>
+				<select aria-label="select a color">
+					<option>red</option>
+					<option>blue</option>
+					<option>green</option>
+				</select>
+				<p>
+				Nunc consequat nisi vitae quam. Suspendisse sed nunc. Proin
+				suscipit porta magna. Duis accumsan nunc in velit. Nam et nibh.
+				Nulla facilisi. Cras venenatis urna et magna. Aenean magna mauris,
+				bibendum sit amet, semper quis, aliquet nec, sapien.  Aliquam
+				aliquam odio quis erat. Etiam est nisi, condimentum non, lacinia
+				ac, vehicula laoreet, elit. Sed interdum augue sit amet quam
+				dapibus semper. Nulla facilisi. Pellentesque lobortis erat nec
+				quam.
+				</p>
+				<p>
+				Sed arcu magna, molestie at, <input aria-label="Lorem" value="fringilla in, sodales"/> fringilla in, sodales eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+				</p>
+		</div>
+
+		<!-- test lazy loading.   margin style for testing size calculations. -->
+		<div id="lazyLoadPane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Lazy Load Pane", iconClass:"dijitEditorIcon dijitEditorIconCopy", href:"tab1.html",
+			style:"margin: 5px;"'></div>
+
+		<div id="borderContainerPane" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='title:"BorderContainer Pane", iconClass:"dijitEditorIcon dijitEditorIconPaste"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:50%", splitter:true'>
+			1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+			Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+			vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+			augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+			metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+			ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+			euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+			risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+			porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+			faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+			consequat quis, varius interdum, nulla. Donec neque tortor,
+			sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+			ut eros sit amet ante pharetra interdum.
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+			2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+			Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+			vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+			augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+			metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+			ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+			euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+			risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+			porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+			faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+			consequat quis, varius interdum, nulla. Donec neque tortor,
+			sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+			ut eros sit amet ante pharetra interdum.
+			</div>
+		</div>
+
+		<div id="embeddedLayoutPane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Embedded layout widgets", iconClass:"dijitEditorIcon dijitEditorIconCut"'>
+			<p>
+				The pane has some text, plus two embedded layout widgets, which should
+				appear correctly even though the pane is initially hidden.
+			</p>
+			<p>
+				Here's a BorderContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='style:"height:200px; width:300px"'>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:100px", splitter:true'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				And a TabContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"height:200px; width:300px"'>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				Text after the widgets.
+			</p>
+		</div>
+	</div>
+	<input aria-label="after" id="afterMarkupAccordion" value="for tabIndex testing"/>
+	<button onclick="registry.byId('pane1').set('title', 'My First Pane');">Change title of first pane</button>
+	<button onclick="registry.byId('pane1').set('iconClass', 'plusIcon');">Change icon of first pane</button>
+	<button onclick="registry.byId('markupAccordion').removeChild(registry.byId('lazyLoadPane'));">Remove lazy-load pane</button>
+
+	<p></p>
+	<h2>Accordion with padding</h2>
+	<div data-dojo-type="dijit/layout/AccordionContainer"
+		data-dojo-props='style:"width: 400px; height: 300px; overflow: hidden"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"somePadding", title:"Some Padding"'>
+			<p>
+				Nunc consequat nisi vitae quam. Suspendisse sed nunc. Proin
+				suscipit porta magna. Duis accumsan nunc in velit. Nam et nibh.
+				Nulla facilisi. Cras venenatis urna et magna. Aenean magna mauris,
+				bibendum sit amet, semper quis, aliquet nec, sapien.  Aliquam
+				aliquam odio quis erat. Etiam est nisi, condimentum non, lacinia
+				ac, vehicula laoreet, elit. Sed interdum augue sit amet quam
+				dapibus semper. Nulla facilisi. Pellentesque lobortis erat nec
+				quam.
+			</p>
+			<p>
+				Sed arcu magna, molestie at, <input aria-label="ipsum" value="fringilla in, sodales"/> eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</p>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"No Padding"'>
+			<p>
+				Nunc consequat nisi vitae quam. Suspendisse sed nunc. Proin
+				suscipit porta magna. Duis accumsan nunc in velit. Nam et nibh.
+				Nulla facilisi. Cras venenatis urna et magna. Aenean magna mauris,
+				bibendum sit amet, semper quis, aliquet nec, sapien.  Aliquam
+				aliquam odio quis erat. Etiam est nisi, condimentum non, lacinia
+				ac, vehicula laoreet, elit. Sed interdum augue sit amet quam
+				dapibus semper. Nulla facilisi. Pellentesque lobortis erat nec
+				quam.
+			</p>
+			<p>
+				Sed arcu magna, molestie at, <input aria-label="fringill" value="fringilla in, sodales"/> eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</p>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"extremePadding", title:"ContentPane w/ Extreme Padding"'>
+			<p>
+				Nunc consequat nisi vitae quam. Suspendisse sed nunc. Proin
+				suscipit porta magna. Duis accumsan nunc in velit. Nam et nibh.
+				Nulla facilisi. Cras venenatis urna et magna. Aenean magna mauris,
+				bibendum sit amet, semper quis, aliquet nec, sapien.  Aliquam
+				aliquam odio quis erat. Etiam est nisi, condimentum non, lacinia
+				ac, vehicula laoreet, elit. Sed interdum augue sit amet quam
+				dapibus semper. Nulla facilisi. Pellentesque lobortis erat nec
+				quam.
+			</p>
+			<p>
+				Sed arcu magna, molestie at, <input aria-label="fringilla" value="fringilla in, sodales"/> eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</p>
+		</div>
+	</div>
+	
+	<br><br>
+	<h2>Accordion container destroy</h2>
+	<div id="accPane" data-dojo-type="dijit/layout/ContentPane" >
+	</div>
+	Click the button twice - it will work correctly unless there was a problem destroying the accordion, in which case the second time
+	the Accordion will not be created and you will see an error like <b>Tried to register widget with id==first_button but that id is already registered</b><br/>
+	<button type="button" onclick="createAccordion();">create Accordion</button>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_BorderContainer.html b/src/main/resources/static/dijit/tests/layout/test_BorderContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..761f1b09dcdc39bdefd99a6873a9c5218000f1ec
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_BorderContainer.html
@@ -0,0 +1,268 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>dijit/layout/BorderContainer Test</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<style type="text/css">
+		/* styles for this test */
+		.dijitContentPane:focus { color: cyan; font-weight: bold }
+		body { margin-left: 20px }
+		#mondrian .dijitSplitter { border: 0; background: black !important }
+		#mondrian .dijitSplitterH { height: 10px }
+		#mondrian .dijitSplitterV { width: 10px }
+		#mondrian .dijitSplitterThumb { display: none }
+		#mondrian .dijitSplitterActive { background-color: blue }
+		.dj_webkit #mondrian .dijitSplitter:focus {
+			/* override orange focus border w/something easier to see (response to a11y bug report) */
+			outline: 5px blue;
+		}
+		#mondrian SPAN { display: none }
+		#mondrian:hover SPAN { display: inline }
+		#mondrian .dijitContentPane { padding: 0 }
+
+	</style>
+
+	<script type="text/javascript">
+		var bc, cp1, cp2, cp3;
+
+		require([
+			"dojo/_base/array",
+			"dojo/aspect",
+			"dojo/dom",
+			"dojo/dom-style",
+			"dojo/json",
+			"dojo/on",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dijit/form/FilteringSelect",
+			"dojo/domReady!"
+		], function(array, aspect, dom, domStyle, json, on, parser, registry, BorderContainer, ContentPane, FilteringSelect){
+
+			togglePanel = function(button, id){
+				var leftPanel = registry.byId(id);
+				if(leftPanel){
+					registry.byId('border1').removeChild(leftPanel);
+					leftPanel.destroy();
+					button.innerHTML='Add left panel';
+				}else{
+					var container = registry.byId('border1');
+					var div = document.createElement('div');
+					div.innerHTML='left';
+					container.domNode.appendChild(div);
+					leftPanel = new ContentPane({id: id, region:'left', style:'background-color: #acb386; width:200px', splitter:true, minSize:150, maxSize:250}, div);
+					registry.byId('border1').addChild(leftPanel);
+					button.innerHTML='Remove left panel';
+				}
+			};
+	
+			function watchSplitters(bc){
+				var out = dom.byId("watchedOutput");
+				var moveConnects = {};
+				array.forEach(["top", "left"], function(region){
+					var spl = bc.getSplitter(region);
+	
+					aspect.after(spl, "_startDrag", function(){
+	
+						domStyle.set(spl.child.domNode, "opacity", "0.4");
+						moveConnects[spl.widgetId] = on(spl.domNode, "mousemove", function(evt){
+	
+							out.innerHTML = spl.region + ": " + json.stringify({
+								x: !spl.horizontal ? spl.domNode.style[spl.region] : 0,
+								y: spl.horizontal ? spl.domNode.style[spl.region] : 0
+							});
+						})
+	
+					});
+					aspect.after(spl, "_stopDrag", function(evt){
+						domStyle.set(spl.child.domNode, "opacity", 1);
+						moveConnects[spl.widgetId].remove();
+						delete moveConnects[spl.widgetId];
+					});
+				})
+			}
+
+			parser.parse();
+
+			watchSplitters( registry.byId("watchedBC") );
+				
+			bc = new BorderContainer({style:'height:400px;width:500px;border:1px solid black'}, dom.byId('main'));
+
+			cp1 = new ContentPane({region:'top',style:'height:100px;background-color:red',splitter:true, id:"cp1"});
+			cp1.domNode.innerHTML = "top pane";
+			bc.addChild(cp1);
+
+			cp2 = new ContentPane({region:'center',style:'background-color:green', id:'cp2'});
+			cp2.domNode.innerHTML = "center pane";
+			bc.addChild(cp2);
+
+			cp3 = new ContentPane({region:'left', splitter: true, style:'width: 100px;', id:'cp3'});
+			cp3.domNode.innerHTML = "left pane";
+			
+			bc.startup();
+        });
+
+	</script>
+</head>
+<body class="claro" role="region" aria-label="main">
+	<h2 class="testTitle">dijit/layout/BorderContainer tests</h2>
+	<p>Headline layout (default), left is constrained - min:150, max:250</p>
+	<div id="border1" data-dojo-type="dijit/layout/BorderContainer"
+		data-dojo-props='style:"width: 1000px; height: 300px; border: 2px solid blue;"'>
+		<div role="banner" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-top", region:"top", style:"background-color: #b39b86; border: 15px black solid; height: 50px;", splitter:true'>
+			top bar (resizable)
+		</div>
+		<div role="navigation" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-left", region:"left", style:"background-color: #acb386; border: 10px green solid; width: 100px;",
+		splitter:true, minSize:150, maxSize:250'>
+			left (resizable b/w 150 &rarr; 250)
+		</div>
+		<div role="main" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-center", region:"center", style:"background-color: #f5ffbf; padding: 10px;"'>
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+			<select aria-label="select" data-dojo-type="dijit/form/FilteringSelect">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-right", region:"right", style:"background-color: #acb386; width: 100px;"'>
+			right (fixed size)
+		</div>
+		<div role="contentinfo" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border1-bottom", region:"bottom", style:"background-color: #b39b86; height: 50px;", splitter:true'>
+			bottom bar (resizable)
+		</div>
+	</div>
+
+	<button id="toggleLeftButton" onClick="togglePanel(this, 'border1-left')">Remove left panel</button>
+	<br />
+
+	<p>Sidebar layout, BiDi sensitive, liveSplitters: false</p>
+	<div id="border2" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='design:"sidebar", liveSplitters:false,
+		style:"border: 20px solid black; width: 1000px; height: 300px;"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-leading", region:"leading", style:"background-color: #acb386; width: 100px;"'>
+			leading (fixed size)
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-top", region:"top", style:"background-color: #b39b86; height: 80px;"'>
+			top bar (fixed size)
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-center", region:"center", style:"background-color: #f5ffbf; padding: 10px;"'>
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+			<select aria-label="select" data-dojo-type="dijit/form/FilteringSelect">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-bottom", region:"bottom", style:"background-color: #b39b86; height: 80px;", splitter:true'>
+			bottom bar (resizable)
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"border2-trailing", region:"trailing", style:"background-color: #acb386; width: 100px;", splitter:true'>
+			trailing (resizable)
+		</div>
+	</div>
+
+	<p>gutters=false layout</p>
+
+	<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='design:"sidebar", gutters:false,
+		style:"border: 20px solid black; width: 1000px; height: 300px;"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"leading", style:"background-color: #acb386; width: 100px;"'>
+			leading
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", style:"background-color: #b39b86; height: 80px;"'>
+			top bar
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", style:"background-color: #f5ffbf; padding: 10px;"'>
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+			<select aria-label="select" data-dojo-type="dijit/form/FilteringSelect">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", style:"background-color: #b39b86; height: 80px;"'>
+			bottom bar
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"trailing", style:"background-color: #acb386; width: 100px;"'>
+			trailing
+		</div>
+	</div>
+
+	<p>Vertical panels only with splitters</p>
+
+	<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='design:"sidebar",
+		style:"border: 2px solid black; width: 1000px; height: 300px; padding: 10px;"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", style:"background-color: #b39b86; height: 80px;", splitter:true'>
+			top bar
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", style:"background-color: #f5ffbf; padding: 10px;"'>
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+			<select aria-label="select" data-dojo-type="dijit/form/FilteringSelect">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", style:"background-color: #b39b86; height: 80px;", splitter:true'>
+			bottom bar
+		</div>
+	</div>
+
+	<br />
+	<p>More fun with layouts</p>
+
+	<div id="mondrian" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='design:"sidebar", gutters:false, persist:true, style:"height: 300px; width: 400px;"'>
+		<div id="mondrian_top" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", style:"height: 100px", splitter:true'>
+			<div id="mondrian_top_bc" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='persist:true, gutters:false, style:"height: 100px; width: 100%"'>
+				<div id="top_a" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"leading", style:"width: 125px", splitter:true'><span>top a</span></div>
+				<div id="top_b" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", style:"background-color: yellow", splitter:true'><span>top b</span></div>
+			</div>
+		</div>
+		<div id="mondrian_bottom" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", style:"height: 100px", splitter:true'>
+			<div id="mondrian_bottom_bc" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='persist:true, gutters:false, style:"height: 100px; width: 100%"'>
+				<div id="bottom_c" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", style:"height: 40px; background-color: blue;", splitter:true'><span>bottom c</span></div>
+				<div id="bottom_d" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'><span>bottom d</span></div>
+			</div>
+		</div>
+		<div id="mondrian_leading" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"leading", style:"width: 100px", splitter:true'>
+			<div id="mondrian_leading_bc" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='persist:true, gutters:false, style:"height: 300px; width: 100%"'>
+				<div id="leading_e" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'><span>leading e</span></div>
+				<div id="leading_f" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", style:"height: 100px; background-color: red", splitter:true'><span>leading f</span></div>
+			</div>
+		</div>
+		<div id="trailing_g" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", splitter:true'><span>trailing g</span></div>
+		<div id="trailing_h" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"trailing", style:"width: 100px", splitter:true'><span>trailing g</span></div>
+	</div>
+
+	<br />
+	<p>Watching the splitter events</p>
+	<div id="watchedBC" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='persist:false, gutters:false, style:"height: 200px; width: 100%"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", splitter:true, style:"background-color: #ccffcc; height: 50px;"'>Top:</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"background-color: #ccccff; width: 40px", splitter:true'><span>Left</span></div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", style:"background-color: #ffffcc"'><span>Center</span></div>
+	</div>
+
+	<p>Splitter coords output:</p>
+	<div id="watchedOutput" style="border: 1px solid #999">nothing moving</div>
+
+	
+	<h2 class="testTitle">dijit/layout/BorderContainer programmatic test</h2>
+	<div id='main'></div>
+
+	<button id="addLeft" onclick="bc.addChild(cp3);">add left pane</button>
+	<button id="removeLeft" onclick="bc.removeChild(cp3);">remove left pane</button>
+	<button id="addTop" onclick="bc.addChild(cp1);">add top pane</button>
+	<button id="removeTop" onclick="bc.removeChild(cp1);">remove top pane</button>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_BorderContainer_complex.html b/src/main/resources/static/dijit/tests/layout/test_BorderContainer_complex.html
new file mode 100644
index 0000000000000000000000000000000000000000..54efea90564c7b0cc507aebda17674837ffa4784
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_BorderContainer_complex.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>dijit/layout/BorderContainer Test - complex layout</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/layout/AccordionContainer",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dijit/Editor",
+			"dijit/form/FilteringSelect",
+			"dijit/layout/SplitContainer",
+			"dijit/layout/TabContainer",
+			"dijit/Tooltip",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">dijit/layout/BorderContainer complex layout test</h1>
+
+	<div id="border1" data-dojo-type="dijit/layout/BorderContainer"
+		data-dojo-props='style:"border: 2px solid black; width: 90%; height: 500px; padding: 10px;" '>
+		<div id="ac1" data-dojo-type="dijit/layout/AccordionContainer"
+			data-dojo-props='region:"left", style:"background-color: #acb386; width: 400px;", splitter:true'>
+			<div id="ap1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"a"'>
+				left bar
+			</div>
+			<div id="ap2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"b"'>
+				<p>
+					Nunc consequat nisi vitae quam. Suspendisse sed nunc. Proin
+					suscipit porta magna. Duis accumsan nunc in velit. Nam et nibh.
+					Nulla facilisi. Cras venenatis urna et magna. Aenean magna mauris,
+					bibendum sit amet, semper quis, aliquet nec, sapien.  Aliquam
+					aliquam odio quis erat. Etiam est nisi, condimentum non, lacinia
+					ac, vehicula laoreet, elit. Sed interdum augue sit amet quam
+					dapibus semper. Nulla facilisi. Pellentesque lobortis erat nec
+					quam.
+				</p>
+				<p>
+					Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</p>
+			</div>
+			<div id="ap3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"c"'>
+				<p>The quick brown fox jumps over the lazy dog.  The quick brown fox jumps over the lazy dog.  The quick brown fox jumps over the lazy dog.</p>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/AccordionContainer"
+			data-dojo-props='region:"right", style:"background-color: #acb386; width: 80px;"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"a"'>
+				right bar
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"b"'>
+				<p>
+					Nunc consequat nisi vitae quam. Suspendisse sed nunc. Proin
+					suscipit porta magna. Duis accumsan nunc in velit. Nam et nibh.
+					Nulla facilisi. Cras venenatis urna et magna. Aenean magna mauris,
+					bibendum sit amet, semper quis, aliquet nec, sapien.  Aliquam
+					aliquam odio quis erat. Etiam est nisi, condimentum non, lacinia
+					ac, vehicula laoreet, elit. Sed interdum augue sit amet quam
+					dapibus semper. Nulla facilisi. Pellentesque lobortis erat nec
+					quam.
+				</p>
+				<p>
+					Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</p>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"c"'>
+				<p>The quick brown fox jumps over the lazy dog.  The quick brown fox jumps over the lazy dog.  The quick brown fox jumps over the lazy dog.</p>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", style:"background-color: #b39b86; height: 150px;", splitter:true'>
+
+			<div id="mainTabContainer" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 100%; height: 20em;"'>
+
+				<div id="tab1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"../../../dijit/tests/layout/tab1.html", title:"Tab 1"'></div>
+
+				<div id="tab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"../../../dijit/tests/layout/tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+
+				<div id="tab3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 3"'>
+					<h1>I am tab 3</h1>
+					<p>And I was already part of the page! That's cool, no?</p>
+					<p id="foo">tooltip on this paragraph</p>
+					<div data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["foo"]'>I'm a tooltip!</div>
+					<button data-dojo-type="dijit/form/Button">I'm a button </button>
+					<br>
+					<button data-dojo-type="dijit/form/Button">So am I!</button>
+					<p>
+					Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+					semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+					porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+					Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+					Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+					risus.
+					</p>
+					<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+					imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+					nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+					massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+					pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+					quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+					felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+					quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+					rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+					semper velit ante id metus. Praesent massa dolor, porttitor sed,
+					pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+					tortor pharetra congue. Suspendisse pulvinar.
+					</p>
+				</div>
+
+				<div id="tab4" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='title:"Inlined Sub TabContainer"'>
+					<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"../../../dijit/tests/layout/tab1.html"' title="SubTab 1"></div>
+					<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"../../../dijit/tests/layout/tab2.html", selected:true' title="SubTab 2"></div>
+				</div>
+
+				<div id="tab5" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"../../../dijit/tests/layout/tab3.html"' title="Sub TabContainer from href"></div>
+
+				<div id="tab6" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"../../../dijit/tests/layout/tab4.html"' title="SplitContainer from href"></div>
+
+			</div>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", style:"background-color: #b39b86; height: 150px;"'>
+			<div style="border: 1px solid black;">
+				<div id="editor1" aria-label="editor" data-dojo-type="dijit/Editor" ><p>bottom bar (edit me)</p></div>
+			</div>
+		</div>
+		<div id="mainCP" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", style:"background-color: #f5ffbf; padding: 10px;"'>
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+			<select id="filteringSelect" aria-label="filtering select" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props='style:"width:4em;"'>
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_BorderContainer_experimental.html b/src/main/resources/static/dijit/tests/layout/test_BorderContainer_experimental.html
new file mode 100644
index 0000000000000000000000000000000000000000..44e5b8d4e50b1836af7d2480bd597e8111da312e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_BorderContainer_experimental.html
@@ -0,0 +1,267 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>BorderContainer Experiments | The Dojo Toolkit</title>
+
+		<script src="../boilerplate.js"></script>
+
+		<style type="text/css">
+			#pane1 { background-color:red;
+			}
+			#pane2{
+				background-color:green;
+			}
+			#pane3 {
+				background-color:blue;
+			}
+			#pane0 {
+				background-color:#ededed;
+			}
+			.wrapper { padding:25px; }
+			.bc { margin:10px; border:2px solid #ededed; }
+		</style>
+
+		<script type="text/javascript">
+			require([
+				"dojo/_base/array",
+				"dojo/_base/declare",
+				"dojo/dom",
+				"dojo/dom-construct",
+				"dojo/dom-style",
+				"dojo/parser",
+				"dojo/query",
+				"dijit/registry",
+				"dijit/layout/BorderContainer",
+				"dijit/form/Button",
+				"dijit/layout/ContentPane",
+				"dojo/domReady!"
+			], function(array, declare, dom, domConstruct, domStyle, parser, query,
+						registry, BorderContainer, Button, ContentPane){
+
+				var open = false;
+
+
+				declare("my.BorderContainer", BorderContainer,{
+
+					opts: {
+						// single pane view
+						"a":{
+							panes: [
+								{ id: "pane0", sizeable:false, region:"center", style: { width:"100%", height:"100%" } },
+								{ id: "pane1", hidden:true },
+								{ id: "pane2", hidden:true },
+								{ id: "pane3", hidden:true }
+							]
+						},
+						// top / bottom view
+						"ah":{
+							panes: [
+								{ id: "pane0", sizeable:false, region:"center", style: { width:"100%", height:"50%" } },
+								{ id: "pane1", sizeable:true, region:"bottom", style: { width:"100%", height:"50%" } },
+								{ id: "pane2", hidden:true },
+								{ id: "pane3", hidden:true }
+							]
+						},
+						// left / right view
+						"av":{
+							panes: [
+								{ id: "pane0", sizeable:true, region:"left", style: { width:"50%", height:"100%" } },
+								{ id: "pane1", sizeable:false, region:"center", style: { width:"50%", height:"100%" } },
+								{ id: "pane2", hidden:true },
+								{ id: "pane3", hidden:true }
+							]
+						}
+
+					},
+
+					_clearSplitters: function(){
+						// cleanup all splitters on the page
+						query(".dijitSplitter",this.domNode).forEach(function(n){
+							registry.byNode(n).destroy();
+						});
+						query(".dijitSplitterCover").forEach(domConstruct.destroy);
+						delete this._splitters;
+						this._splitters = {};
+					},
+	
+					setLayoutENUM: function(lay){
+						// set the layout to a predefined setup
+						if(this._layoutSetting != lay){
+	
+							this._layoutSetting = lay;
+							var struct = this.opts[lay] || false;
+							this._clearSplitters();
+	
+							array.forEach(struct.panes,function(pane,i){
+								// setup each pane
+								var d = registry.byId(pane.id);
+								d.region = pane.region || "center";
+								d.splitter = pane.sizeable;
+								if(pane.minSize){ d.minSize = pane.minSize; }
+								if(pane.maxSize){ d.maxSize = pane.maxSize; }
+								if(pane.hidden){
+									// reset this widget to our hidden holder node
+									this.extractChild(d,dom.byId("holder"));
+									d.splitter = null;
+									d.region = null;
+									d.maxSize = null;
+									d.minSize = null;
+								}else{
+									if(pane.style){
+										// object setter via style only in trunk:
+										domStyle.set(d.domNode, pane.style);
+									}
+									this.addChild(d,i);
+								}
+							},this);
+						}
+						this.layout();
+					},
+	
+					extractChild: function(/*dijit/_WidgetBase*/ child, /*DomNode*/ node){
+						// a non-destructive cleanup for the bordercontainer.
+						// cleanup a widget, and append it's domNode to some
+						// other node in the dom
+						var region = child.region;
+						var splitter = this._splitters[region];
+						if(splitter){
+							registry.byNode(splitter).destroy();
+							delete this._splitters[region];
+						}
+						delete this["_"+region];
+						node.appendChild(child.domNode);
+						if(this._started){
+							this._layoutChildren();
+						}
+						return child.domNode;
+					}
+				});
+	
+				parser.parse();
+
+				// make buttons
+				array.forEach(["a","av","ah"],function(n){
+
+					var but = new Button({
+						label: "Set "+n,
+						onClick: function(){
+							console.log(n);
+							layout.setLayoutENUM(n);
+						}
+					});
+					dom.byId("buttons").appendChild(but.domNode);
+					but.startup();
+				})
+
+			});
+		</script>
+
+    </head>
+    <body class="claro" role="main">
+
+		<script type="dojo/require">
+			fx: "dojo/_base/fx",
+			registry: "dijit/registry"
+		</script>
+
+		<h1>This is a test</h1>
+		<p>This is only a test. An experiment in dynamically altering a BorderContainer's layout
+		(a seemingly unsupported feature just yet). It Demonstrates how to programatically alter/animate
+		the size of non-center regions though, and several simple layout configurations
+		</p>
+
+		<div>
+			<h3>Layouts:</h3>
+			<div id="buttons"></div>
+		</div>
+
+		<div id="container" data-dojo-id="layout" data-dojo-type="my.BorderContainer" data-dojo-props='style:"width:600px; height:300px; border:3px solid #333;"'>
+			<div id="pane0" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center" '>
+				pane0
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='"class":"bc", style:"height:200px"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+				Sinlge pane - l1
+			</div>
+		</div>
+
+		<div class="wrapper">
+			<h3>two panes, vertical split:</h3>
+
+
+			<div id="animBC" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='"class":"bc", style:"height:200px"'>
+				<div id="sizing1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='style:"background-color:red", region:"left", splitter:true'>
+					Sinlge pane - left
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='region:"center"'>
+					Sinlge pane - center
+					<button data-dojo-type="dijit/form/Button">
+					Size Me
+					<script type="dojo/method" data-dojo-event="onClick">
+						var n = registry.byId("sizing1").domNode;
+						fx.animateProperty({
+							node:n,
+							duration:1000,
+							properties: { width: { end: (open ? "100" : "400"), units:"px" } },
+							onEnd: function(){
+								open = !open;
+								registry.byId("animBC").layout();
+							}
+						}).play(1);
+					</script>
+				</button>
+				</div>
+			</div>
+
+			<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='"class":"bc", style:"height:200px"'>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", splitter:true'>
+					Single pane - center (splitter) (this is unsupported, and does not work)
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"right"'>
+					Single pane - right (no splitter)
+				</div>
+			</div>
+
+			<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='"class":"bc", style:"height:200px"'>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+					Single pane - center (no splitter)
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"right", splitter:true'>
+					Single pane - right (splitter)
+				</div>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='"class":"bc", style:"width:200px; height:400px;"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", splitter:true'>
+				Single pane - top (splitter)
+
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+				Single pane - center
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='"class":"bc", style:"width:200px; height:400px;"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+				Single pane - center
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", splitter:true'>
+				Single Pane Bottom (splitter)
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", splitter:true'>
+				Single Pane Top (splitter)
+			</div>
+		</div>
+
+		<div id="holder" style="visibility:hidden">
+			<div id="pane1" data-dojo-type="dijit/layout/ContentPane" >pane 1</div>
+			<div id="pane2" data-dojo-type="dijit/layout/ContentPane" >pane 2</div>
+			<div id="pane3" data-dojo-type="dijit/layout/ContentPane" >pane 3</div>
+		</div>
+
+    </body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_BorderContainer_full.html b/src/main/resources/static/dijit/tests/layout/test_BorderContainer_full.html
new file mode 100644
index 0000000000000000000000000000000000000000..542993c81a062ccafbff4bed3d717e9694cd069a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_BorderContainer_full.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>dijit/layout/BorderContainer Test - Full Screen</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<style type="text/css">
+		html, body, #main{
+			width: 100%;	/* make the body expand to fill the visible window */
+			height: 100%;
+			overflow: hidden;	/* erase window level scrollbars */
+			padding: 0 0 0 0;
+			margin: 0 0 0 0;
+			font: 10pt Arial,Myriad,Tahoma,Verdana,sans-serif;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dijit/form/FilteringSelect",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+	<div id="main" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='design:"sidebar" '>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"main-leading", region:"leading", style:"background-color: #acb386; width: 100px;"'>
+			leading
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"main-top", region:"top", style:"background-color: #b39b86; height: 100px;"'>
+			top bar
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"main-center", region:"center", style:"background-color: #f5ffbf; padding: 10px;"'>
+			main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+			(to check we're copying children around properly).<br />
+			<select aria-label="select" data-dojo-type="dijit/form/FilteringSelect">
+				<option value="1">foo</option>
+				<option value="2">bar</option>
+				<option value="3">baz</option>
+			</select>
+			Here's some text that comes AFTER the combo box.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"main-bottom", region:"bottom", style:"background-color: #b39b86; height: 100px;", splitter:true'>
+			bottom bar
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"main-trailing", region:"trailing", style:"background-color: #acb386; width: 100px;", splitter:true'>
+			trailing
+		</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_BorderContainer_nested.html b/src/main/resources/static/dijit/tests/layout/test_BorderContainer_nested.html
new file mode 100644
index 0000000000000000000000000000000000000000..323bd172c1e15f780e14b50763314c730d7cb032
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_BorderContainer_nested.html
@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>dijit/layout/BorderContainer Nested Test</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dijit/form/FilteringSelect",
+			"dijit/layout/TabContainer",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h2 class="testTitle">dijit/layout/BorderContainer Nested tests</h2>
+
+	<p>
+		The second tab holds a single BorderContainer but specifying layoutPriority on it's children to have multiple children
+		for each region.
+	</p>
+	<p>
+		The first tab holds a BorderContainer which nests another BorderContainer, simulating multiple children in a single region.
+	</p>
+
+	<div id="tc" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width:800px;height:600px;"'>
+		<div id="nbc" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='title:"Nested BC"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"background-color: #acb386; width: 100px;"'>
+				left
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"right", style:"background-color: #acb386; width: 100px;"'>
+				right
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", style:"background-color: #b39b86; height: 100px;"'>
+				top bar
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", style:"background-color: #b39b86; height: 100px;"'>
+				bottom bar
+			</div>
+
+			<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='region:"center", design:"sidebar"'>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"background-color: #acb386; width: 100px;"'>
+					left inner
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"right", style:"background-color: #acb386; width: 100px;"'>
+					right inner
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", style:"background-color: #b39b86; height: 100px;"'>
+					inner top bar
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", style:"background-color: #b39b86; height: 100px;"'>
+					inner bottom bar
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", style:"background-color: #f5ffbf; padding: 10px;"'>
+					main panel with <a href="http://www.dojotoolkit.org/">a link</a>.<br />
+					(to check we're copying children around properly).<br />
+					<select aria-label="select" data-dojo-type="dijit/form/FilteringSelect">
+						<option value="1">foo</option>
+						<option value="2">bar</option>
+						<option value="3">baz</option>
+					</select>
+					Here's some text that comes AFTER the combo box.
+				</div>
+			</div>
+		</div>
+
+		<div id="pbc" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='title:"layoutPriority BC"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"top1", region:"top", splitter:true, layoutPriority: 1, style:"background-color: #077; color: white; height: 50px;"'>
+				<label for="top1_input">top bar (layoutPriority == 1)</label>
+				<input id="top1_input" value="tabstop #1"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"top2", region:"top", splitter:true, layoutPriority: 2, style:"background-color: #f5ffbf; height: 50px;"'>
+				<label for="top2_input">second top bar (layoutPriority == 2)</label>
+				<input id="top2_input" value="tabstop #3"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"left1", region:"left", splitter:true, layoutPriority: 3, style:"background-color: #770; width: 100px;"'>
+				<label for="left1_input">left (layoutPriority == 3)</label>
+				<input id="left1_input" value="tabstop #5"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"left2", region:"left", splitter:true, layoutPriority: 4, style:"background-color: #acb386; width: 100px;"'>
+				<label for="left2_input">inner left (layoutPriority == 4)</label>
+				<input id="left2_input" value="tabstop #7"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"top3", region:"top", splitter:true, layoutPriority: 5, style:"background-color: #b39b86; height: 50px;"'>
+				<label for="top3_input">inner top bar (layoutPriority == 5)</label>
+				<input id="top3_input" value="tabstop #9"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"center", region:"center", style:"background-color: #f5ffbf; padding: 10px;"'>
+				<label for="center_input">center</label>
+				<input id="center_input" value="tabstop #11"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"bottom3", region:"bottom", splitter:true, layoutPriority: 5, style:"background-color: #b39b86; height: 50px;"'>
+				<label for="bottom3_input">inner bottom bar (layoutPriority == 5)</label>
+				<input id="bottom3_input" value="tabstop #12"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"right2", region:"right", splitter:true, layoutPriority: 4, style:"background-color: #acb386; width: 100px;"'>
+				<label for="right2_input">inner right (layoutPriority == 4)</label>
+				<input id="right2_input" value="tabstop #14"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"right1", region:"right", splitter:true, layoutPriority: 3, style:"background-color: #770; width: 100px;"'>
+				<label for="right1_input">right (layoutPriority == 3)</label>
+				<input id="right1_input" value="tabstop #16"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id:"bottom2", region:"bottom", splitter:true, layoutPriority: 2, style:"background-color: #f5ffbf; height: 50px;"'>
+				<label for="bottom2_input">second bottom bar (layoutPriority == 2)</label>
+				<input id="bottom2_input" value="tabstop #18"/>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='id: "bottom1", region:"bottom", splitter:true, layoutPriority: 1, style:"background-color: #077; color: white; height: 50px;"'>
+				<label for="bottom1_input">bottom bar (layoutPriority == 1)</label>
+				<input id="bottom1_input" value="tabstop #20"/>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_ContentPane.html b/src/main/resources/static/dijit/tests/layout/test_ContentPane.html
new file mode 100644
index 0000000000000000000000000000000000000000..cac73ef5de17adc4b5845bdf3d04c439ac579ac1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_ContentPane.html
@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>ContentPane Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<style>
+		.box {
+			position: relative;
+			background-color: white;
+			border: 2px solid black;
+			padding: 8px;
+			margin: 4px;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/declare",
+			"dojo/dom",
+			"dojo/dom-construct",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/_WidgetBase",
+			"dijit/_TemplatedMixin",
+			"dijit/layout/ContentPane",
+			"dijit/Dialog",
+			"dojo/domReady!"
+		], function(doh, declare, dom, domConstruct, parser,
+					registry, _WidgetBase, _TemplatedMixin){
+
+
+			// create a do nothing, only for test widget
+			declare("TestWidget", [_WidgetBase, _TemplatedMixin], {
+				templateString: "<span class='dojoxTestWidget'></span>"
+			});
+
+			doh.register("parse", function(){
+				parser.parse();
+
+				pane1 = registry.byId('parsedPane');
+				dialogCtrPane = registry.byId("dialogContainer");
+			});
+
+			doh.register("basicChecks", [
+				{
+					name: 'setContent',
+					runTest: function(t){
+						console.log("basicChecks: " + this.name);
+						var msg = "Simple Test";
+						pane1.set('content', msg);
+						t.is(msg, pane1.domNode.innerHTML);
+					}
+				},
+				{
+					name: 'parseInitialContent',
+					runTest: function(t){
+						console.log("basicChecks: " + this.name);
+						var parserTest = registry.byId("parserTest");
+						t.t(parserTest);
+					}
+				},
+				{
+					name: 'parseNewContent',
+					runTest: function(t){
+						console.log("basicChecks: " + this.name);
+						dialogCtrPane.set(
+							"content",
+							'<div data-dojo-type="dijit/Dialog" id="sacrificialDlg" title="Life is short for this fellow">'
+							+'	<p>This dialog should be cleanly destroyed when the unit tests run</p>'
+							+'</div>'
+						);
+
+						t.t(registry.byId("sacrificialDlg"));
+						t.f(registry.byId("parserTest"));
+					}
+				},
+				{
+					name: 'empty',
+					runTest: function(t){
+						console.log("basicChecks: " + this.name);
+						t.t(registry.byId("sacrificialDlg"));
+
+						var dialog = registry.byId("sacrificialDlg");
+						// dialog is supposed to move its domNode to the body..
+						// we need to check it gets cleanly removed when we set content on the CP
+						t.t(dialog);
+						t.t(dialog.domNode.parentNode == document.body);
+
+						dialogCtrPane.set('content', "new content, no more dialog");
+						t.f(registry.byId("sacrificialDlg"));
+						t.f(dom.byId("sacrificialDlg"));
+					}
+				},
+				{
+					name: 'reuse',
+					runTest: function(t){
+						console.log("basicChecks: " + this.name);
+						// do the same thing over again - we should be error free
+						dialogCtrPane.set(
+							"content",
+							'<div data-dojo-type="dijit/Dialog" id="sacrificialDlg" title="Life is short for this fellow">'
+							+'	<p>This dialog should be cleanly destroyed when the unit tests run</p>'
+							+'</div>'
+						);
+						var dialog = registry.byId("sacrificialDlg");
+						// dialog is supposed to move its domNode to the body..
+						// we need to check it gets cleanly removed when we set content on the CP
+						t.t(dialog);
+						t.t(dialog.domNode.parentNode == document.body);
+					}
+				},
+				{
+					name: 'destroy',
+					runTest: function(t){
+						console.log("basicChecks: " + this.name);
+
+						// manually stick a widget into the ContentPane
+						var manualWidget = new TestWidget({id: "destroyTestWidget"});
+						domConstruct.place(manualWidget.domNode, dialogCtrPane.domNode, "last");
+
+						// make sure widget created via get('content') and also the above widget are there
+						t.t(registry.byId("sacrificialDlg"), "dialog in dialogContainer still there");
+						t.t(registry.byId("destroyTestWidget"), "test widget in dialogContainer still there");
+
+						// when we kill the CP, it should also destroy any widgets created when we set content,
+						// and for backwards-compatibility reasons, any widgets that user stuck in there
+						// manually too
+						dialogCtrPane.destroyRecursive();
+
+						// make sure everything got deleted
+						t.f(registry.byId("dialogContainer"));
+						t.f(registry.byId("sacrificialDlg"), "dialog in dialogContainer was destroyed");
+						t.f(registry.byId("destroyTestWidget"), "test widget in dialogContainer was destroyed");
+						t.f(dom.byId("sacrificialDlg"));
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit layout.ContentPane tests</h1>
+		<p>pre-container paragraph</p>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box"'>
+			some text (top-level container)
+
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box"'>
+
+				text in the inner container (1)
+
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box", href:"tab2.html"'>
+					hi
+				</div>
+
+				text in the inner container (2)
+
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box"'>
+					inner-inner 2
+				</div>
+
+				text in the inner container (3)
+
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box"'>
+					inner-inner 3
+				</div>
+
+				text in the inner container (4)
+
+			</div>
+
+			some more text (top-level container)
+		</div>
+
+		<p>mid-container paragraph</p>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box"'>
+			2nd top-level container
+		</div>
+
+		<p>post-container paragraph</p>
+
+		<div id="test" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box", href:"combotab.html" '>
+			<p style='background-color:yellow;border:1px solid red;text-align:center;'>This text should automatically be replaced by downloaded content from combotab.html</p>
+		</div>
+
+		<hr/>
+		<p>ContentPanes used by the unit tests to verify functionality
+		<div id='parsedPane' data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box" '>
+			Some Content Here
+		</div>
+		<div id='dialogContainer' data-dojo-type="dijit/layout/ContentPane" data-dojo-props='"class":"box" '>
+			<div id="parserTest" data-dojo-type="TestWidget" ></div>
+		</div>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_Gui.html b/src/main/resources/static/dijit/tests/layout/test_Gui.html
new file mode 100644
index 0000000000000000000000000000000000000000..4dbda5ad6c0c83336d4fe707b29b3b69060dde6d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_Gui.html
@@ -0,0 +1,255 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dijit UI Tester</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<style type="text/css">
+		html, body {
+			height: 100%;
+			width: 100%;
+			padding: 0;
+			margin: 0;
+			border: 0;
+			background: #fff;
+		}
+		#main {
+			font-size: 0.9em;
+			height: 100%;
+			width: 100%;
+			padding: 5px;
+			margin: 0;
+		}
+
+		/* initial sizing */
+		#leftAccordion {
+			width: 25%;
+		}
+		#bottomTabs {
+			height: 40%;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/AccordionContainer",
+			"dijit/layout/TabContainer",
+			"dijit/layout/ContentPane",
+			"dijit/TitlePane",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<!-- "main" BorderContainer just contains page title and another BorderContainer -->
+	<div id="main" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='gutters:true, style:"height:700px;"'>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", splitter:false'>This test is to make sure nested layout elements work fine in regards to double borders etc. You need a screen with a very high resolution to not get cramped tabs and other weird visual effects </div>
+
+		<!-- "mainSplit" BorderContainer has all the real content -->
+		<div id="mainSplit" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='liveSplitters:false, design:"sidebar",
+			region:"center" '>
+
+			<div id="leftAccordion" data-dojo-type="dijit/layout/AccordionContainer"
+				data-dojo-props='minSize:20, style:"width: 300px;", region:"leading", splitter:true'>
+
+				<div id="ac_pane1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Popups and Alerts"'>
+				</div>
+
+				<div id="ac_pane2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Dojo Tree from Store"'>
+				</div>
+
+				<div id="ac_pane3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Calendar", selected:true'>
+				</div>
+
+				<div id="ac_pane4" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Color Picker"'>
+				</div>
+
+			</div><!-- end AccordionContainer -->
+
+			<div id="centerSplit" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='liveSplitters:false, region:"center"'>
+				<!-- top tabs (marked as "center" to take up the main part of the BorderContainer) -->
+				<div id="topTabs1" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='region:"top", tabStrip:true, splitter:true, style:"height:200px;"'>
+
+					<div id="basicFormTab" data-dojo-type="dijit/layout/ContentPane"
+						data-dojo-props='title:"Basic Form Widgets",
+						style:"padding:10px;display:none;"'>
+						Hi friends of dijit
+					</div> <!-- end of basic form widgets -->
+					<div id="tabAccordion" data-dojo-type="dijit/layout/AccordionContainer"
+						data-dojo-props='title:"Accordion in Tab",
+						minSize:20,
+						style:"width: 100%;"'>
+
+						<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Popups and Alerts"'>
+						</div>
+
+						<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Dojo Tree from Store"'>
+						</div>
+
+						<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Calendar", selected:true'>
+						</div>
+
+						<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Color Picker"'>
+						</div>
+
+					</div><!-- end AccordionContainer -->
+
+					<div id="textareaTab" data-dojo-type="dijit/layout/ContentPane"
+						data-dojo-props='
+						title:"Accordion in Content Tab"'>
+
+						<div id="tabAccordionContainer" data-dojo-type="dijit/layout/AccordionContainer"
+							data-dojo-props='minSize:20, style:"width: 100%;" '>
+
+							<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Popups and Alerts"'>
+							</div>
+
+							<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tabs in Accordion"'>
+								<!-- bottom right tabs -->
+								<div id="mainSplit1" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='liveSplitters:false, design:"sidebar",
+									style:"padding: 0px;width: 300px; height: 100px"'>
+
+									<div id="accTabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabPosition:"top", region:"center"'>
+
+										<!-- btab 1 -->
+										<div id="bbtab1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:true, title:"Info", style:" padding:10px;"'>
+										</div><!-- end:info btab1 -->
+
+										<div id="bbtab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Alternate Themes", style:"padding:20px;"'>
+										</div><!-- btab2 -->
+
+										<div id="bbtab3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Bottom 3", closable:true'>
+										</div><!-- btab3 -->
+
+									</div><!-- end Bottom TabContainer -->
+								</div>
+							</div>
+
+							<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Calendar", selected:true'>
+							</div>
+
+							<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Color Picker"'>
+							</div>
+
+						</div><!-- end AccordionContainer -->
+
+					</div><!-- end of Textarea/Editor tab -->
+
+
+					<div id="titlePaneCP" data-dojo-type="dijit/layout/ContentPane"
+						data-dojo-props='title:"Title Pane in Content Pane",
+						doLayout:false,
+						style:"display:none;"'>
+
+						Here's some text, then a TitlePane:
+						<div id="tp" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Color Picker"'>
+							Hi friends of dijit
+						</div>
+						... and some more text.
+					</div>
+
+					<div id="tabContainerInTabCP" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='title:"TabContainer in Tab", nested:true, closable:true'>
+						<div id="basicFormTab1" data-dojo-type="dijit/layout/ContentPane"
+							data-dojo-props='title:"Basic Form Widgets 1",
+							style:"padding:10px; display:none;"'>
+						    Hi friends of dijit
+						</div>
+						<div id="basicFormTab2" data-dojo-type="dijit/layout/ContentPane"
+							data-dojo-props='title:"Basic Form Widgets 2",
+							style:"padding:10px; display:none;"'>
+						    Tab 2 content
+						</div>
+					</div>
+
+					<div id="closableTab" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Closable ContentPane w/TabContainer",
+						style:"display:none; padding:0px;", closable:true'>
+
+						<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='title:"Tab in Tab", nested:true'>
+
+							<div id="basicFormTab3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Basic Form Widgets 3", style:"padding:10px;display:none;"'>
+							    Hi friends of dijit
+							</div>
+							<div id="basicFormTab4" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Basic Form Widgets 4", style:"padding:10px;display:none;"'>
+							    Hi friends of dijit
+							</div>
+						</div>
+					</div>
+				</div><!-- end of region="center" TabContainer -->
+				<div id="embeddedBC" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='liveSplitters:false, region:"center"'>
+					<div id="bottomTabs1" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabStrip:true,
+						tabPosition:"left-h", region:"top", style:"height: 50%;", splitter:true'>
+
+						<!-- btab 1 -->
+						<div id="btabA" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:true, title:"Info", style:"padding:10px;"'>
+
+						</div><!-- end:info btabA -->
+
+						<div id="btabB" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Alternate Themes", style:"padding:20px;"'>
+
+						</div><!-- btabB -->
+
+						<div id="btabC" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Bottom 3", closable:true'>
+
+						</div><!-- btabC -->
+
+					</div><!-- end Bottom TabContainer -->
+					<div id="bottomTabs2" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabStrip:true,
+						tabPosition:"right-h", region:"center"'>
+
+						<!-- btab 1 -->
+						<div id="btabD" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:true, title:"Info", style:"padding:10px;"'>
+
+						</div><!-- end:info btabD -->
+
+						<div id="btabE" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Alternate Themes", style:"padding:20px;"'>
+
+						</div><!-- btabE -->
+
+						<div id="btabF" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Bottom 3", closable:true'>
+
+						</div><!-- btabF -->
+
+					</div><!-- end Bottom TabContainer -->
+				</div>
+				<!-- bottom right tabs -->
+				<div id="bottomTabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabStrip:true,
+					tabPosition:"bottom", region:"bottom", splitter:true'>
+
+					<!-- btab 1 -->
+					<div id="bottomSplit" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='selected:true, liveSplitters:false, design:"sidebar",
+						region:"center", title:"BorderContainer in Tabs", style:"padding: 5px; width: 100%"'>
+						<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", splitter:true'>This test is to make sure nested layout elements work fine in regards to double borders etc. You need a screen with a very high resolution to not get cramped tabs and other weird visual effects </div>
+						<div id="bottomTabs22" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabPosition:"top", region:"center", splitter:true'>
+
+							<!-- btab 1 -->
+							<div id="btabAA" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:true, title:"Info", style:"padding:10px;"'>Hi</div>
+						</div>
+
+						<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"bottom", splitter:true'>This test is to make sure nested layout elements work fine in regards to double borders etc. You need a screen with a very high resolution to not get cramped tabs and other weird visual effects </div>
+
+					</div>
+
+					<div id="btab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Alternate Themes", style:"padding:20px;"'>
+
+					</div><!-- btab2 -->
+
+					<div id="btab3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Bottom 3", closable:true'>
+
+					</div><!-- btab3 -->
+
+				</div><!-- end Bottom TabContainer -->
+			</div>
+		</div> <!-- end of "mainSplit" BorderContainer -->
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"trailing", splitter:true, style:"width: 10%;"'>Hi </div>
+
+	</div><!-- end of "main" BorderContainer -->
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_SplitContainer.html b/src/main/resources/static/dijit/tests/layout/test_SplitContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..c6c9d1fafb5d7a1df8f66f686d007e3a28c5a558
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_SplitContainer.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+	<title>SplitContainer Widget Demo</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../css/dijitTests.css";
+		.dojoContentPane {
+			padding:1em;
+		}
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		djConfig="isDebug: true, parseOnLoad: true"></script>
+
+	<!-- only needed for alternate theme testing: do NOT use in your code! -->
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.layout.SplitContainer");
+		dojo.require("dijit.layout.ContentPane");
+
+		// these exist inside our href splitcontainer
+		dojo.require("dijit.form.Button");
+		dojo.require("dijit.form.ComboBox");
+		var programaticExample = function(){
+
+			var rootNode = dojo.byId("holderNode");
+			// add two children
+			var pane1 = rootNode.appendChild(document.createElement('div'));
+			var pane2 = rootNode.appendChild(document.createElement('div'));
+			var pane3 = rootNode.appendChild(document.createElement('div'));
+
+			// set the content. can use xhrGet, also
+			pane1.innerHTML = "Pane one test"; pane2.innerHTML = "Pane two test";
+
+			// should use css, but this works:
+			dojo.style(rootNode,"height","150px");
+			dojo.style(rootNode,"border","1px solid #333");
+
+			// make them contentpanes
+			var cp1 = new dijit.layout.ContentPane({ sizeShare:20 },pane1);
+			var cp2 = new dijit.layout.ContentPane({ sizeShare:30 },pane2);
+			var cp3 = new dijit.layout.ContentPane({
+				href: "doc0.html",
+				sizeShare:30
+			},pane3).startup();
+
+			// init the splitcontainer
+			var split = new dijit.layout.SplitContainer({
+				orientation:"horizontal",
+				sizerWidth:7
+			},rootNode).startup();
+
+		};
+		dojo.ready(programaticExample);
+
+		// for testing SplitContainer.addChild()
+		ctr = 1;
+		function addChild(parentId, position){
+			dijit.byId(parentId).addChild(new dijit.layout.ContentPane({
+				id: "ContentPane" + ctr,
+				innerHTML: "added child #" + ctr++
+			}), position);
+		}
+	</script>
+</head>
+<body role="main">
+	<h1 class="testTitle">Dijit Split Container Test - DEPRECATED!</h1>
+	<p><strong>dijit.layout.SplitContainer is deprecated use
+	BorderContainer with splitter instead -- will be removed in version: 2</strong></p>
+	<p>HTML before</p>
+
+	<div dojoType="dijit.layout.SplitContainer"
+		id="split1"
+		orientation="vertical"
+		sizerWidth="7"
+		activeSizing="false"
+		style="border: 1px solid #bfbfbf; width: 400px; height: 300px;"
+	>
+		<div dojoType="dijit.layout.ContentPane" sizeMin="10" sizeShare="50">
+			this box has three split panes
+		</div>
+		<div dojoType="dijit.layout.ContentPane" sizeMin="20" sizeShare="50"
+			style="background-color: yellow; border: 3px solid purple;">
+			in vertical mode
+		</div>
+		<div dojoType="dijit.layout.ContentPane" sizeMin="10" sizeShare="50">
+			without active resizing
+		</div>
+	</div>
+	<button onclick="addChild('split1');">add child at end</button>
+	<button onclick="addChild('split1', 'first');">add child at beginning</button>
+	<button onclick="addChild('split1', 3);">addChild(child, 3)</button>
+	<button onclick="addChild('split1', dijit.byId('split1').getChildren().length-1);">addChild(child, getChildren().length-1)</button>
+	<br><br>
+
+	<div dojoType="dijit.layout.SplitContainer"
+		orientation="horizontal"
+		sizerWidth="7"
+		activeSizing="true"
+		style="border: 1px solid #bfbfbf; float: left; width: 400px; height: 300px;">
+		<div dojoType="dijit.layout.ContentPane" sizeMin="20" sizeShare="20">
+			this box has two horizontal panes
+		</div>
+		<div dojoType="dijit.layout.ContentPane" sizeMin="50" sizeShare="50">
+			with active resizing, a smaller sizer, different starting sizes and minimum sizes
+		</div>
+	</div>
+
+	<p style="clear: both;">HTML after</p>
+
+the following splitter contains two iframes, see whether the resizer works ok in this situation
+<div dojoType="dijit.layout.SplitContainer"
+	orientation="horizontal"
+	sizerWidth="5"
+	activeSizing="false"
+	style="border: 2px solid black; float: left; width: 100%; height: 300px;"
+>
+	<div dojoType="dijit.layout.ContentPane" sizeMin="20" sizeShare="20">
+		<iframe style="width: 100%; height: 100%" title="iframe"></iframe>
+	</div>
+	<div dojoType="dijit.layout.ContentPane" sizeMin="50" sizeShare="50">
+		<iframe style="width: 100%; height: 100%" title="iframe2"></iframe>
+	</div>
+</div>
+
+<h3>Programatic Example:</h3>
+<div id="holderNode"></div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_TabContainer.html b/src/main/resources/static/dijit/tests/layout/test_TabContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..3025b65be63aa0a89e44aba3d6ec27387b073c92
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_TabContainer.html
@@ -0,0 +1,1051 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TabContainer Demo</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+
+		function testClose(pane,tab){
+		  return confirm("Please confirm that you want tab "+tab.title+" closed");
+		}
+
+		require([
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/layout/ContentPane",
+
+			// widgets used by the parser, preloading so not included in the elapsed time measurement
+			"dijit/layout/BorderContainer",
+			"dijit/layout/TabContainer",
+			"dijit/Tooltip",
+			"dijit/form/Button",
+			"dojo/domReady!"
+		], function(parser, registry, ContentPane){
+			startTime = new Date();
+			parser.parse().then(function(){
+				var elapsed = new Date().getTime() - startTime;
+				var p = document.createElement("p");
+				p.appendChild(document.createTextNode("Widgets loaded in " + elapsed + "ms"));
+				document.body.appendChild(p);
+			});
+
+			var progTabCounter = 1;
+			makeTab = function(){
+				var tc = registry.byId("mainTabContainer");
+				var cp = new ContentPane({
+					title: 'Programmatically created tab ' + (progTabCounter++) ,
+					closable: true
+				});
+				cp.domNode.innerHTML = "I was created programmatically!";
+				tc.addChild(cp, 0);
+			};
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<script type="dojo/require">
+		registry: "dijit/registry"
+	</script>
+
+	<h1 class="testTitle">Dijit layout.TabContainer tests</h1>
+
+	<p>These tabs are made up of local and external content. Tab 1 and Tab 2 are loading
+	files tab1.html and tab2.html. Tab 3 and Another Tab are using content that is already
+	part of this page.   Tab2 is initially selected. Attribute tabStrip is set to true
+	</p>
+
+	<p>
+		More tabs can be displayed in the first two TabContainers by clicking the
+		drop down control to the right of the widget.  If the tabs are not wider than
+		the widget, the scrolling controls should disappear - this can be tested by closing the
+		closable tabs.
+	</p>
+
+	<button id="firstButton" onclick="makeTab()">Click To Add Tab</button>
+
+	<br><br>
+
+	<div id="mainTabContainer" data-dojo-type="dijit/layout/TabContainer"
+				data-dojo-props='persist:false, tabStrip:true' style="width: 400px;height: 20em;">
+
+		<div id="tab1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1", iconClass:"plusIcon",
+			tooltip:"Tooltip for tab #1"'></div>
+
+		<div id="tab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", iconClass:"noteIcon", selected:true'></div>
+
+		<div id="tab3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 3",
+				iconClass:"dijitEditorIcon dijitEditorIconSave", closable:true'>
+			<h1>I am tab 3</h1>
+			<p>And I was already part of the page! That's cool, no?</p>
+			<p id="foo">tooltip on this paragraph</p>
+			<div data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["foo"]'>I'm a tooltip!</div>
+			<button data-dojo-type="dijit/form/Button">I'm a button </button>
+			<br>
+			<button data-dojo-type="dijit/form/Button">So am I!</button>
+			<p>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+			semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+			porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+			Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+			Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+			risus.
+			</p>
+			<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+			imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+			nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+			massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+			pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+			quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+			felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+			quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+			rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+			semper velit ante id metus. Praesent massa dolor, porttitor sed,
+			pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+			tortor pharetra congue. Suspendisse pulvinar.
+			</p>
+		</div>
+
+		<div id="inlined" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='title:"Inlined Sub TabContainer", iconClass:"plusIcon", nested:true'>
+			<div id="tab1href" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", onLoad:function(){ console.log("load of SubTab 1"); }, iconClass:"plusIcon" ' title="SubTab 1"></div>
+			<div id="tab2href" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", onLoad:function(){ console.log("load of SubTab 2"); }, selected:true,  iconClass:"dijitEditorIcon dijitEditorIconSave"' title="SubTab 2"></div>
+			<div id="subtab3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"SubTab 3",  iconClass:"dijitEditorIcon dijitEditorIconCut"'>
+				<h1>I am tab 3, inlined.</h1>
+			</div>
+			<div id="subtab4" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"SubTab 4", iconClass:"dijitEditorIcon dijitEditorIconCopy"'>
+				<h1>I am tab 4, inlined.</h1>
+			</div>
+		</div>
+
+		<div id="tab3href" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab3.html", refreshOnShow:true, closable:true,
+				iconClass:"dijitEditorIcon dijitEditorIconSave"' title="Sub TabContainer from href" style="padding: 0"></div>
+		<div id="tab4href" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab4.html",
+				closable:true, iconClass:"dijitEditorIcon dijitEditorIconCut"' title="SplitContainer from href"></div>
+		<div id="embedded" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Embedded layout widgets",
+				closable:true, iconClass:"dijitEditorIcon dijitEditorIconCopy"'>
+			<p>
+				The tab has some text, plus two embedded layout widgets, which should
+				appear correctly even though the tab is initially hidden.
+			</p>
+			<p>
+				Here's a BorderContainer:
+			</p>
+			<div id="bc" data-dojo-type="dijit/layout/BorderContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", splitter:true' style="width: 100px">
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				And a TabContainer:
+			</p>
+			<div id="embeddedTC" data-dojo-type="dijit/layout/TabContainer" style="height:200px; width:300px">
+				<div id="embeddedTab1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div id="embeddedTab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				Text after the widgets.
+			</p>
+		</div>
+	</div>
+
+	<button onclick="registry.byId('tab1').set('title', 'Tab 1 Renamed');">Rename Tab #1</button>
+	<button onclick="registry.byId('tab2').set('title', 'Tab 2 Renamed To Something Very Long');">Rename Tab #2</button>
+	<button onclick="registry.byId('tab1').set('closable', !registry.byId('tab1').get('closable'));">Toggle Tab #1 closable</button>
+	<button onclick="registry.byId('tab3').set('disabled', !registry.byId('tab3').get('disabled'));">Toggle Tab #3 disabled</button>
+
+	<br/>
+	<p>
+		This tab container has the Menu function for selecting tabs disabled, using useMenu: false</b>.
+		Also, "Tab 3" is initially disabled.
+	</p>
+	<div data-dojo-type="dijit/layout/TabContainer" id="nomenu" data-dojo-props='useMenu:false,
+				persist:false, tabStrip:true' style="width: 400px;height: 20em;">
+		<div data-dojo-type="dijit/layout/ContentPane" id="nomenu_tab1" data-dojo-props='href:"tab1.html", title:"Tab 1"'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" id="nomenu_tab2" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane"  id="nomenu_tab3" data-dojo-props='title:"Tab 3", closable:true, disabled: true'>
+			<h1>I am tab 3</h1>
+			<p>I was initially a disabled tab (button below TabContainer can enable/disable me).</p>
+			<p id="foo2">tooltip on this paragraph</p>
+			<div data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["foo2"]'>I'm a tooltip!</div>
+			<button data-dojo-type="dijit/form/Button">I'm a button </button>
+			<br>
+			<button data-dojo-type="dijit/form/Button">So am I!</button>
+			<p>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+			semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+			porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+			Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+			Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+			risus.
+			</p>
+			<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+			imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+			nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+			massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+			pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+			quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+			felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+			quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+			rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+			semper velit ante id metus. Praesent massa dolor, porttitor sed,
+			pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+			tortor pharetra congue. Suspendisse pulvinar.
+			</p>
+		</div>
+
+		<div data-dojo-type="dijit/layout/TabContainer"  data-dojo-props='closable:true, title:"Inlined Sub TabContainer", nested:true'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", onLoad:function(){ console.log("load of SubTab 1"); }' title="SubTab 1"></div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", onLoad:function(){ console.log("load of SubTab 2"); }, selected:true' title="SubTab 2"></div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 3"'>
+				<h1>I am tab 3, inlined.</h1>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 4"'>
+				<h1>I am tab 4, inlined.</h1>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab3.html", closable:true, refreshOnShow:true' style="padding: 0" title="Sub TabContainer from href"></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab4.html", closable:true' title="SplitContainer from href"></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='closable:true, title:"Embedded layout widgets"'>
+			<p>
+				The tab has some text, plus two embedded layout widgets, which should
+				appear correctly even though the tab is initially hidden.
+			</p>
+			<p>
+				Here's a BorderContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/BorderContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", splitter:true' style="width:100px">
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				And a TabContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/TabContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				Text after the widgets.
+			</p>
+		</div>
+	</div>
+	<button onclick="registry.byId('nomenu_tab3').set('disabled', !registry.byId('nomenu_tab3').get('disabled'));">Toggle Tab #3 disabled</button>
+
+
+	<br/>
+
+	<p>Tabs w/only icons (except in high-contrast mode where labels display):</p>
+	<div id="iconTabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabPosition:"top"' style="width: 100%; height: 10em;">
+		<div id="iconTab1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Cut", tooltip:"tooltip for cut button", showTitle:false, iconClass:"dijitEditorIcon dijitEditorIconCut"'>Cut icon tab</div>
+		<div id="iconTab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Copy", showTitle:false, iconClass:"dijitEditorIcon dijitEditorIconCopy"'>Copy icon tab</div>
+		<div id="iconTab3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Paste", showTitle:false, iconClass:"dijitEditorIcon dijitEditorIconPaste"'>Paste icon tab</div>
+	</div>
+
+
+	<p>
+		This tab container has the Slider function for selecting tabs disabled, using <b>useSlider="false"</b>
+	</p>
+	<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='useSlider:false,
+				persist:false, tabStrip:true' style="width: 400px;height: 20em;">
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1"'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"Tab 3", closable:true'>
+			<h1>I am tab 3</h1>
+			<p>And I was already part of the page! That's cool, no?</p>
+			<p id="foo3">tooltip on this paragraph</p>
+			<div data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["foo3"]'>I'm a tooltip!</div>
+			<button data-dojo-type="dijit/form/Button">I'm a button </button>
+			<br>
+			<button data-dojo-type="dijit/form/Button">So am I!</button>
+			<p>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+			semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+			porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+			Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+			Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+			risus.
+			</p>
+			<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+			imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+			nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+			massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+			pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+			quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+			felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+			quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+			rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+			semper velit ante id metus. Praesent massa dolor, porttitor sed,
+			pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+			tortor pharetra congue. Suspendisse pulvinar.
+			</p>
+		</div>
+
+		<div data-dojo-type="dijit/layout/TabContainer"  data-dojo-props='closable:true, title:"Inlined Sub TabContainer", nested:true'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", onLoad:function(){ console.log("load of SubTab 1"); }' title="SubTab 1"></div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", onLoad:function(){ console.log("load of SubTab 2"); }, selected:true' title="SubTab 2"></div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 3"'>
+				<h1>I am tab 3, inlined.</h1>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 4"'>
+				<h1>I am tab 4, inlined.</h1>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab3.html", closable:true, refreshOnShow:true'
+		   title="Sub TabContainer from href" style="padding: 0" ></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab4.html", closable:true' title="SplitContainer from href"></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='closable:true, title:"Embedded layout widgets"'>
+			<p>
+				The tab has some text, plus two embedded layout widgets, which should
+				appear correctly even though the tab is initially hidden.
+			</p>
+			<p>
+				Here's a BorderContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/BorderContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", splitter:true' style="width:100px" >
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				And a TabContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/TabContainer"  style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				Text after the widgets.
+			</p>
+		</div>
+	</div>
+	<br/>
+	<p>
+		This tab container has the tab strip disabled, using <b>tabStrip:false</b>
+	</p>
+	<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabStrip:false,
+				persist:false' style="width: 400px;height: 20em;">
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1"'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"Tab 3", closable:true'>
+			<h1>I am tab 3</h1>
+			<p>And I was already part of the page! That's cool, no?</p>
+			<p id="foo4">tooltip on this paragraph</p>
+			<div data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["foo4"]'>I'm a tooltip!</div>
+			<button data-dojo-type="dijit/form/Button">I'm a button </button>
+			<br>
+			<button data-dojo-type="dijit/form/Button">So am I!</button>
+			<p>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+			semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+			porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+			Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+			Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+			risus.
+			</p>
+			<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+			imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+			nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+			massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+			pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+			quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+			felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+			quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+			rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+			semper velit ante id metus. Praesent massa dolor, porttitor sed,
+			pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+			tortor pharetra congue. Suspendisse pulvinar.
+			</p>
+		</div>
+
+		<div data-dojo-type="dijit/layout/TabContainer"  data-dojo-props='closable:true, title:"Inlined Sub TabContainer", nested:true'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", onLoad:function(){ console.log("load of SubTab 1"); }' title="SubTab 1"></div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", onLoad:function(){ console.log("load of SubTab 2"); }, selected:true' title="SubTab 2"></div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 3"'>
+				<h1>I am tab 3, inlined.</h1>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 4"'>
+				<h1>I am tab 4, inlined.</h1>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab3.html", closable:true, refreshOnShow:true' style="padding: 0" title="Sub TabContainer from href"></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab4.html", closable:true' title="SplitContainer from href"></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='closable:true, title:"Embedded layout widgets"'>
+			<p>
+				The tab has some text, plus two embedded layout widgets, which should
+				appear correctly even though the tab is initially hidden.
+			</p>
+			<p>
+				Here's a BorderContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/BorderContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", splitter:true' style="width:100px">
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				And a TabContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/TabContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				Text after the widgets.
+			</p>
+		</div>
+	</div>
+
+	<p>These tabs are made up of local and external content. Tab 1 and Tab 2 are loading
+	files tab1.html and tab2.html. Tab 3 and Another Tab are using content that is already
+	part of this page.   Tab2 is initially selected. Attribute tabStrip is set to true,
+	and the tabPosition is "bottom"
+	</p>
+
+	<div id="mainTabContainerBottom" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabPosition:"bottom",
+				persist:true, tabStrip:true' style="width: 400px; height: 20em;">
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1"'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='closable:true, title:"Tab 3"'>
+			<h1>I am tab 3</h1>
+			<p>And I was already part of the page! That's cool, no?</p>
+			<p id="foo5">tooltip on this paragraph</p>
+			<div data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["foo5"]'>I'm a tooltip!</div>
+			<button data-dojo-type="dijit/form/Button">I'm a button </button>
+			<br>
+			<button data-dojo-type="dijit/form/Button">So am I!</button>
+			<p>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+			semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+			porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+			Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+			Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+			risus.
+			</p>
+			<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+			imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+			nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+			massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+			pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+			quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+			felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+			quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+			rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+			semper velit ante id metus. Praesent massa dolor, porttitor sed,
+			pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+			tortor pharetra congue. Suspendisse pulvinar.
+			</p>
+		</div>
+
+		<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='closable:true, title:"Inlined Sub TabContainer", nested:true'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", onLoad:function(){ console.log("load of SubTab 1"); }' title="SubTab 1"></div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html",  onLoad:function(){ console.log("load of SubTab 2"); }, selected:true' title="SubTab 2"></div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 3"'>
+				<h1>I am tab 3, inlined.</h1>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 4"'>
+				<h1>I am tab 4, inlined.</h1>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab3.html", closable:true, refreshOnShow:true' title="Sub TabContainer from href" style="padding:0"></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab4.html", closable:true' title="SplitContainer from href"></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='closable:true, title:"Embedded layout widgets"'>
+			<p>
+				The tab has some text, plus two embedded layout widgets, which should
+				appear correctly even though the tab is initially hidden.
+			</p>
+			<p>
+				Here's a BorderContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/BorderContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", splitter:true' style="width:100px">
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				And a TabContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/TabContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				Text after the widgets.
+			</p>
+		</div>
+	</div>
+	<br>
+	<p>
+		This tab container has its tabs at the bottom, and the tab strip disabled
+	</p>
+
+	<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabPosition:"bottom",
+				persist:true, tabStrip:false' style="width: 400px; height: 20em;">
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1"'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='closable:true, title:"Tab 3"'>
+			<h1>I am tab 3</h1>
+			<p>And I was already part of the page! That's cool, no?</p>
+			<p id="foo6">tooltip on this paragraph</p>
+			<div data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["foo6"]'>I'm a tooltip!</div>
+			<button data-dojo-type="dijit/form/Button">I'm a button </button>
+			<br>
+			<button data-dojo-type="dijit/form/Button">So am I!</button>
+			<p>
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+			semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+			porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+			Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+			Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+			risus.
+			</p>
+			<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+			imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+			nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+			massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+			pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+			quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+			felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+			quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+			rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+			semper velit ante id metus. Praesent massa dolor, porttitor sed,
+			pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+			tortor pharetra congue. Suspendisse pulvinar.
+			</p>
+		</div>
+
+		<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='closable:true, title:"Inlined Sub TabContainer", nested:true'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", onLoad:function(){ console.log("load of SubTab 1"); }' title="SubTab 1"></div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html",  onLoad:function(){ console.log("load of SubTab 2"); }, selected:true' title="SubTab 2"></div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 3"'>
+				<h1>I am tab 3, inlined.</h1>
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane"  data-dojo-props='title:"SubTab 4"'>
+				<h1>I am tab 4, inlined.</h1>
+			</div>
+		</div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab3.html", closable:true, refreshOnShow:true' title="Sub TabContainer from href" style="padding: 0" ></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab4.html", closable:true' title="SplitContainer from href"></div>
+
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='closable:true, title:"Embedded layout widgets"'>
+			<p>
+				The tab has some text, plus two embedded layout widgets, which should
+				appear correctly even though the tab is initially hidden.
+			</p>
+			<p>
+				Here's a BorderContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/BorderContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", splitter:true' style="width:100px" >
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				And a TabContainer:
+			</p>
+			<div data-dojo-type="dijit/layout/TabContainer" style="height:200px; width:300px">
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+					1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+					2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+					Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+					vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+					augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+					metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+					ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+					euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+					risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+					porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+					faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+					consequat quis, varius interdum, nulla. Donec neque tortor,
+					sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+					ut eros sit amet ante pharetra interdum.
+				</div>
+			</div>
+			<p>
+				Text after the widgets.
+			</p>
+		</div>
+	</div>
+
+	<p>
+		The next example is with closable tabs.
+		Tab 1 and Tab 3 can be closed; Tab 3 has a confirm box.
+	</p>
+
+	<div id="ttabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabPosition:"top",
+		onFocus:function(){ console.log("user focus handler") },
+		onBlur:function(){ console.log("user blur handler") }
+	' style="width: 100%; height: 10em;">
+		<div id="ttab1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"First", closable:true'></div>
+		<div id="ttab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Second"'></div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Third", onClose:testClose, closable:true'>
+			<h1>I am tab 3</h1>
+			<p>And I was already part of the page! That's cool, no?</p>
+			<p>If you try to close me there should be a confirm dialog.</p>
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Fourth", onClose:null, closable:true'>
+			<h1>I am tab 4</h1>
+			<p>I have no onClose function.</p>
+			<p>Clicking the X should close me.</p>
+		</div>
+	</div>
+
+	<p>Tabs with titles on the bottom:</p>
+
+	<div id="btabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabPosition:"bottom"' style="width: 100%; height: 10em;">
+		<div id="btab1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1", closable:true'></div>
+		<div id="btab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, onLoad:function(){ console.debug("Tab2 onLoad"); }, title:"Tab 2"'></div>
+	</div>
+
+	<p>Tabs with titles on the left and tabStrip="false":</p>
+
+	<div id="ltabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabStrip:false, tabPosition:"left-h"' style="width:500px;height:100px">
+		<div id="LittleRed1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Little Red Cap"'>
+			Once upon a time there was a dear little girl who was loved by
+			every one who looked at her, but most of all by her grandmother,
+			and there was nothing that she would not have given to the child.
+		</div>
+		<div id="HanselGretel1" data-dojo-type="dijit/layout/ContentPane"
+		     data-dojo-props='title:"Hansel and Gretel", closable:true, selected:true'>
+			Hard by a great forest dwelt a poor wood-cutter with his wife
+			and his two children. The boy was called Hansel and the girl Gretel.
+			He had little to bite and to break, and once when great dearth fell
+			on the land, he could no longer procure even daily bread.
+		</div>
+		<div id="GreenTwigs1" data-dojo-type="dijit/layout/ContentPane"
+		 data-dojo-props='title:"The Three Green Twigs"'>
+			There was once upon a time a hermit who lived in a forest at the foot
+			of a mountain, and passed his time in prayer and good works,
+			and every evening he carried, to the glory of God, two pails of water
+			up the mountain.
+		</div>
+	</div>
+
+	<p>Tabs with titles on the left and tabStrip=true:</p>
+
+	<div id="ltabsStrip" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabStrip:true, tabPosition:"left-h"' style="width:500px;height:100px">
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Little Red Cap"'>
+			Once upon a time there was a dear little girl who was loved by
+			every one who looked at her, but most of all by her grandmother,
+			and there was nothing that she would not have given to the child.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane"
+		     data-dojo-props='title:"Hansel and Gretel", closable:true, selected:true'>
+			Hard by a great forest dwelt a poor wood-cutter with his wife
+			and his two children. The boy was called Hansel and the girl Gretel.
+			He had little to bite and to break, and once when great dearth fell
+			on the land, he could no longer procure even daily bread.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane"
+		 data-dojo-props='title:"The Three Green Twigs"'>
+			There was once upon a time a hermit who lived in a forest at the foot
+			of a mountain, and passed his time in prayer and good works,
+			and every evening he carried, to the glory of God, two pails of water
+			up the mountain.
+		</div>
+	</div>
+
+	<p>Tabs with titles on the right and tabStrip=true:</p>
+
+	<div id="rtabsStrip" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabStrip:true, tabPosition:"right-h"' style="width:500px;height:100px">
+		<div id="LittleRed2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Little Red Cap"'>
+			Once upon a time there was a dear little girl who was loved by
+			every one who looked at her, but most of all by her grandmother,
+			and there was nothing that she would not have given to the child.
+		</div>
+		<div id="HanselGretel2" data-dojo-type="dijit/layout/ContentPane"
+		     data-dojo-props='title:"Hansel and Gretel", closable:true, selected:true'>
+			Hard by a great forest dwelt a poor wood-cutter with his wife
+			and his two children. The boy was called Hansel and the girl Gretel.
+			He had little to bite and to break, and once when great dearth fell
+			on the land, he could no longer procure even daily bread.
+		</div>
+		<div id="GreenTwigs2" data-dojo-type="dijit/layout/ContentPane"
+		 data-dojo-props='title:"The Three Green Twigs"'>
+			There was once upon a time a hermit who lived in a forest at the foot
+			of a mountain, and passed his time in prayer and good works,
+			and every evening he carried, to the glory of God, two pails of water
+			up the mountain.
+		</div>
+	</div>
+
+	<p>Tabs with titles on the right and tabStrip=false:</p>
+
+	<div id="rtabs" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='tabStrip:false, tabPosition:"right-h"' style="width:500px;height:100px">
+		<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Little Red Cap"'>
+			Once upon a time there was a dear little girl who was loved by
+			every one who looked at her, but most of all by her grandmother,
+			and there was nothing that she would not have given to the child.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane"
+		     data-dojo-props='title:"Hansel and Gretel", closable:true, selected:true'>
+			Hard by a great forest dwelt a poor wood-cutter with his wife
+			and his two children. The boy was called Hansel and the girl Gretel.
+			He had little to bite and to break, and once when great dearth fell
+			on the land, he could no longer procure even daily bread.
+		</div>
+		<div data-dojo-type="dijit/layout/ContentPane"
+		 data-dojo-props='title:"The Three Green Twigs"'>
+			There was once upon a time a hermit who lived in a forest at the foot
+			of a mountain, and passed his time in prayer and good works,
+			and every evening he carried, to the glory of God, two pails of water
+			up the mountain.
+		</div>
+	</div>
+
+	<h3>Typical rendering time</h3>
+	<table style="border:1px solid black;">
+	  <tr><th>IE</th><th>Firefox (mac)</th></tr>
+	  <tr><td>1719</td><td>922</td></tr>
+	</table>
+	<h3>Rendering time</h3>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_TabContainer_CSS.html b/src/main/resources/static/dijit/tests/layout/test_TabContainer_CSS.html
new file mode 100644
index 0000000000000000000000000000000000000000..b240e0756c9061c5ef906aafb1a6deccdaec280a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_TabContainer_CSS.html
@@ -0,0 +1,107 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html dir="ltr" lang="en">
+    <head>
+		<title>TabContainer CSS Glitch Tests</title>
+
+		<script src="../boilerplate.js"></script>
+
+		<style>
+			#tabContainer1 {
+				height: 200px;
+				margin-bottom: 50px;
+			}
+		</style>
+
+		<script>
+			require([
+				"dojo/parser",
+				"dijit/registry",
+				"dijit/layout/TabContainer", "dijit/layout/ContentPane",
+				"dijit/form/DropDownButton", "dijit/TooltipDialog",
+				"dojo/domReady!"
+			], function(parser, registry, TabContainer, ContentPane){
+
+				parser.parse().then(function(){
+					var tabsPane1 = registry.byId('tabContainer1');
+					var tab1 = new ContentPane({title: "My tab 1", content: "border line to right of tab does not show  (now resize your browser and the border line will appear)"});
+					tabsPane1.addChild(tab1);
+				});
+			});
+		</script>
+    </head>
+
+    <body class="claro" role="main">
+		<h1>TabContainer CSS Glitch Tests</h1>
+		<p>
+			Collected tests for problems with missing borders for TabContainer,
+			in particular problems with the border between the tab buttons and the tab content.
+		</p>
+
+		<h2>Borders in TooltipDialog</h2>
+		<p>
+			Open TooltipDialog and make sure the horizontal border between tab buttons and content
+			don't extend past the edge of the TabContainer.   Also check that button for second tab
+			(unselected tab) is visible on IE6.
+		</p>
+		<div data-dojo-type="dijit/form/DropDownButton">
+			<span>Show Tooltip Dialog with TabContainer</span>
+			<div id="tabTooltip" data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Tab Container Tooltip"'>
+				<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 400px; height: 300px;"'>
+					<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"First tab"'>
+						<p>
+							This is the first tab.
+						</p>
+						<p>
+						Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+						semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+						porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+						Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+						Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+						risus.
+						</p>
+					</div>
+					<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Second tab"'>
+						<p>
+							This is the second tab.
+						</p>
+						<p>
+						<a href="http://www.lipsum.com/">ipsum dolor sit amet</a>, consectetuer adipiscing elit. Aenean
+						semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+						porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+						Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+						Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+						risus.
+						</p>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<h2>Initial missing border</h2>
+		<p>
+			Make sure the TabContainers below show the border between tab buttons and tab content.
+			Previously it didn't show on initial page load, but showed after resize.
+		</p>
+        <div id='tabContainer1' data-dojo-type='dijit/layout/TabContainer' data-dojo-props="tabPosition: 'top'"></div>
+
+		<h2>Missing border on zoom</h2>
+		<p>
+			Make sure separating border doesn't disappear on zoom
+			(<i>not</i> text-size increase/decrease but zoom).
+			Problem used to occur on FF/windows and IE8.
+		</p>
+		<div id="myTC" data-dojo-type="dijit/layout/TabContainer" style="width: 400px; height: 200px;" tabPosition="left-h" tabStrip="false">
+			<div id="LittleRed1" data-dojo-type="dijit/layout/ContentPane" title="One" >
+				Once upon a time there was a dear little girl who was loved by
+				every one who looked at her, but most of all by her grandmother,
+				and there was nothing that she would not have given to the child.
+			</div>
+			<div id="HanselGretel1" data-dojo-type="dijit/layout/ContentPane" title="Two" selected="true" >
+				Some content here.
+			</div>
+			<div id="GreenTwigs1" data-dojo-type="dijit/layout/ContentPane" title="The Three Green Twigs" >
+				Yet more content.
+			</div>
+		</div>
+    </body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/layout/test_TabContainer_noLayout.html b/src/main/resources/static/dijit/tests/layout/test_TabContainer_noLayout.html
new file mode 100644
index 0000000000000000000000000000000000000000..01f7f75703aea68f429bb39c2883f9d6e3d2ded6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/layout/test_TabContainer_noLayout.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TabContainer doLayout=false Demo</title>
+
+	<script src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		function testClose(pane,tab){
+			return confirm("Please confirm that you want tab "+tab.title+" closed");
+		}
+
+		require([
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/layout/ContentPane",
+			"dijit/layout/TabContainer",
+			"dijit/Tooltip",
+			"dojo/domReady!"
+		], function(parser, registry, ContentPane){
+
+			var tab = 6;
+
+			addTab = function(){
+				cp = new ContentPane({id: 'newTab' + tab, title: 'Tab' + tab, closable: true});
+				cp.domNode.innerHTML = "Contents of Tab " + tab++;
+				registry.byId("plainTabContainer").addChild(cp);
+			};
+
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<script type="dojo/require">
+		registry: "dijit/registry"
+	</script>
+
+	<h1 class="testTitle">Dijit layout.TabContainer doLayout=false tests</h1>
+
+	<p>
+		This tests tabs in doLayout=false mode, in which case the tab container's height ==
+		the height of the currently selected tab.
+	</p>
+	<p>
+		With doLayout=false mode tabs only (the default) tabPosition=top is supported.
+	</p>
+
+	<button id="addTabButton" onclick="addTab();">add tab</button>
+	<button id="destroyTabContainer" onclick="registry.byId('plainTabContainer').destroyRecursive();">destroy tab container</button>
+
+	<div id="plainTabContainer" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='doLayout:false, style:"width: 700px;"'>
+
+		<div id="tab1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html", title:"Tab 1"'></div>
+
+		<div id="tab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", refreshOnShow:true, title:"Tab 2", selected:true'></div>
+
+		<div id="tab3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 3"'>
+			<h1 id="h3">I am tab 3</h1>
+			<p id="p3">And I was already part of the page! That's cool, no?</p>
+			<span id="foo">tooltip on this span</span>
+			<div data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["foo"]'>I'm a tooltip!</div>
+			<button id="b3" data-dojo-type="dijit/form/Button">I'm a button </button>
+			<br>
+			<button id="b4" data-dojo-type="dijit/form/Button">So am I!</button>
+			<p id="p4">
+			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+			semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+			porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+			Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+			Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+			risus.
+			</p>
+			<p id="p5">Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+			imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+			nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+			massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+			pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+			quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+			felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+			quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+			rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+			semper velit ante id metus. Praesent massa dolor, porttitor sed,
+			pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+			tortor pharetra congue. Suspendisse pulvinar.
+			</p>
+		</div>
+
+		<div id="tab4" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='title:"Tab 4", doLayout:false, nested:true'>
+			<div id="tab4a" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab1.html"' title="SubTab 1"></div>
+			<div id="tab4b" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab2.html", selected:true' title="SubTab 2"></div>
+		</div>
+
+		<div id="tab5" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"tab3_noLayout.html", doLayout:false' title="Tab 5"></div>
+	</div>
+
+	<p id="textAfterTabContainer1">
+		Some text here.  This should appear directly below the TabContainer,
+		and the position will change based on the current height of the TabContainer.
+	</p>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/loose.html b/src/main/resources/static/dijit/tests/loose.html
new file mode 100644
index 0000000000000000000000000000000000000000..5bf592382ec9a2cf8cdc7e624dc4a4ffee5d99a6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/loose.html
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0 Transitional//EN'
+		'http://www.w3.org/TR/html4/loose.dtd'>
+<html>
+<head>
+<script src="_loadTest.js"></script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/loremIpsum.html b/src/main/resources/static/dijit/tests/loremIpsum.html
new file mode 100644
index 0000000000000000000000000000000000000000..2f2f4ff9d72d599ed6b3611b1454a873df0a97bc
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/loremIpsum.html
@@ -0,0 +1,99 @@
+<div>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+	<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus. </p>
+</div>
+
diff --git a/src/main/resources/static/dijit/tests/mobile.html b/src/main/resources/static/dijit/tests/mobile.html
new file mode 100644
index 0000000000000000000000000000000000000000..9144a48747e05ee4fb85fbbe20cb2c8c27e343af
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/mobile.html
@@ -0,0 +1,201 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<title>General widgets mobile test page</title>
+		<link href="../icons/commonIcons.css" rel="stylesheet">
+		<script type="text/javascript" src="boilerplate.js"></script>
+
+		<script language="JavaScript" type="text/javascript">
+			require([
+				"dojo/parser",
+
+				"dijit/MenuBar",
+				"dijit/PopupMenuBarItem",
+				"dijit/DropDownMenu",
+				"dijit/MenuItem",
+				"dijit/MenuSeparator",
+				"dijit/PopupMenuItem",
+				"dijit/Menu",
+
+				"dijit/Toolbar",
+				"dijit/ToolbarSeparator",
+				"dijit/ColorPalette",
+				"dijit/TooltipDialog",
+				"dijit/Dialog",
+
+				"dijit/ProgressBar",
+				"dijit/InlineEditBox",
+				"dijit/TitlePane",
+
+				"dijit/Tree",
+				"dojo/data/ItemFileReadStore",
+				"dijit/tree/ForestStoreModel",
+
+				"dijit/form/Button",
+				"dijit/form/DropDownButton",
+				"dijit/form/ComboButton",
+				"dijit/form/ToggleButton",
+				"dijit/form/TextBox",
+				"dijit/form/DateTextBox",
+				"dijit/form/TimeTextBox",
+
+				"dojo/domReady!"
+			], function(parser){
+				parser.parse();
+			});
+		</script>
+	</head>
+	<body>
+		<div id="menubar" data-dojo-type="dijit/MenuBar">
+			<div id="file" data-dojo-type="dijit/PopupMenuBarItem">
+				<span>File</span>
+				<div id="fileMenu" data-dojo-type="dijit/DropDownMenu">
+					<div id="new" data-dojo-type="dijit/MenuItem">New</div>
+					<div id="open" data-dojo-type="dijit/MenuItem">Open</div>
+					<div id="separator" data-dojo-type="dijit/MenuSeparator"></div>
+					<div id="save" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIconSave"'>Save</div>
+					<div id="saveas" data-dojo-type="dijit/MenuItem">Save As...</div>
+				</div>
+			</div>
+			<div id="edit" data-dojo-type="dijit/PopupMenuBarItem">
+				<span>Edit</span>
+				<div id="editMenu" data-dojo-type="dijit/DropDownMenu">
+					<div id="cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+						onClick:function(){ console.log("not actually cutting anything, just a test!"); }, accelKey:"Ctrl+X"'>Cut</div>
+					<div id="copy" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+						onClick:function(){ console.log("not actually copying anything, just a test!") }, accelKey:"Ctrl+C"'>Copy</div>
+					<div id="paste" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+						onClick:function(){ console.log("not actually pasting anything, just a test!") }, accelKey:"Ctrl+V"'>Paste</div>
+				</div>
+			</div>
+			<div id="view" data-dojo-type="dijit/PopupMenuBarItem">
+				<span>View</span>
+				<div id="viewMenu" data-dojo-type="dijit/DropDownMenu">
+					<div data-dojo-type="dijit/MenuItem">Normal</div>
+					<div data-dojo-type="dijit/MenuItem">Outline</div>
+					<div data-dojo-type="dijit/PopupMenuItem">
+						<span>Zoom</span>
+						<div id="zoomMenu" data-dojo-type="dijit/DropDownMenu">
+							<div data-dojo-type="dijit/MenuItem">50%</div>
+							<div data-dojo-type="dijit/MenuItem">75%</div>
+							<div data-dojo-type="dijit/MenuItem">100%</div>
+							<div data-dojo-type="dijit/MenuItem">150%</div>
+							<div data-dojo-type="dijit/MenuItem">200%</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div id="toolbar1" data-dojo-type="dijit/Toolbar">
+			<div id="toolbar1.cut" data-dojo-type="dijit/form/Button" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut", showLabel:false'>Cut</div>
+			<div id="toolbar1.bold" data-dojo-type="dijit/form/ToggleButton" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconBold", showLabel:false'>Bold2</div>
+			<span data-dojo-type="dijit/ToolbarSeparator"></span>
+			<div id="toolbar1.ttdialog" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"plusIcon", showLabel:true'>
+				<span>TD</span>
+				<div id="tooltipDlg" data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Enter Login information",
+					execute:function(args){ console.log("submitted w/args:\n" + JSON.stringify(args, true)); }'>
+					<table>
+						<tr>
+							<td><label for="user">User:</label></td>
+							<td><input id="user" data-dojo-type=dijit/form/TextBox type="text" name="user"></td>
+						</tr>
+						<tr>
+							<td><label for="password">Password:</label></td>
+							<td><input id="password" data-dojo-type=dijit/form/TextBox type="password" name="pwd"></td>
+						</tr>
+						<tr>
+							<td colspan="2" style="text-align:center;">
+								<button data-dojo-type=dijit/form/Button data-dojo-props='type:"submit", name:"submit"'>Login</button></td>
+						</tr>
+					</table>
+				</div
+			></div>
+			<div id="toolbar1.backcolor" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconBackColor", showLabel:true'>
+				<span>CP</span>
+				<div id="toolbar1.colorPalette" data-dojo-type="dijit/ColorPalette" data-dojo-props='style:"display: none", palette:"7x10", onChange:function(){ console.log(this.value); }'></div>
+			</div
+			><div id="toolbar1.combo" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options", iconClass:"plusIcon", showLabel:true,
+				onClick:function(){ console.log("clicked combo save") }'>
+				<span>Menu</span>
+				<div id="saveMenu" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+					<div data-dojo-type="dijit/MenuItem"  data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+						onClick:function(){ console.log("not actually saving anything, just a test!") }'>Save</div>
+					<div data-dojo-type="dijit/MenuItem"
+						data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!") }'>Save As</div>
+				</div>
+			</div>
+			<div id="toolbar1.dialog" data-dojo-type="dijit/form/Button" onclick="dialog.show();"
+				 data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCreateLink"'>Dialog</div>
+		</div>
+
+		<div data-dojo-id="dialog" data-dojo-type="dijit/Dialog" data-dojo-props='title:"My Dialog",
+				onExecute:function(){ console.log("OK button pressed") },
+				onCancel:function(){ console.log("Cancel button pressed") },
+				"aria-describedby":"intro",
+				execute:function(args){ console.log("submitted w/args:\n" + JSON.stringify(args, true)); }'>
+			<div class="dijitDialogPaneContentArea">
+				<label for="fname">First:</label>
+				<br>
+				<input id="fname" name="fname" data-dojo-type="dijit/form/TextBox">
+				<br>
+
+				<label for="lname">Last:</label>
+				<br>
+				<input id="lname" name="lname" data-dojo-type="dijit/form/TextBox">
+				<br>
+
+				<label for="loc">Location:</label>
+				<br>
+				<input id="loc" name="loc" data-dojo-type="dijit/form/TextBox">
+				<br>
+
+				<label for="date">Date:</label>
+				<br>
+				<input id="date" name="date" data-dojo-type="dijit/form/DateTextBox">
+				<br>
+
+				<label for="time">Time:</label>
+				<br>
+				<input id="time" name="time" data-dojo-type="dijit/form/TimeTextBox">
+				<br>
+
+				<label for="desc">Description:</label>
+				<br>
+				<input id="desc" name="desc" data-dojo-type="dijit/form/DateTextBox">
+			</div>
+			<div class="dijitDialogPaneActionBar">
+				<button id="dialogbutton1" data-dojo-type="dijit/form/Button" data-dojo-props='type:"submit" '>OK</button>
+				<button id="dialogbutton2" data-dojo-type="dijit/form/Button" data-dojo-props='type:"button", onClick:function(){ dialog.onCancel(); }
+						'>Cancel</button>
+			</div>
+		</div>
+
+		<br>
+		<div id="tp" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane #2"'>
+			<form>
+				<label for="age">Age:</label> <input id="age"><br>
+				<label for="disc">Discount card:</label> <input id="disc" type="checkbox"><br>
+				<button>Submit</button><br>
+			</form>
+		</div>
+
+		<br>
+		<div id="setTestBar" data-dojo-type="dijit/ProgressBar" data-dojo-props='style:"width:90%",
+			maximum:200, value:"20" '></div>
+
+		<br>
+		<div data-dojo-id="continentStore" data-dojo-type="dojo/data/ItemFileReadStore" data-dojo-props='url:"_data/countries.json"'></div>
+		<div data-dojo-id="continentModel" data-dojo-type="dijit/tree/ForestStoreModel" data-dojo-props='store:continentStore, query:{type:"continent"},
+			rootId:"continentRoot", rootLabel:"Continents", childrenAttrs:["children"]'></div>
+
+		<div id="mytree" data-dojo-type="dijit/Tree" data-dojo-props='model:continentModel, openOnClick:true'>
+		</div>
+
+		<br>
+		InlineEditBox: <span id="ieb" data-dojo-type="dijit/InlineEditBox" data-dojo-props='width:"200px", title:"recipient name"'></span>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/module.js b/src/main/resources/static/dijit/tests/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..cd71ef18bb1fe54830bfceadcc602997976ad316
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/module.js
@@ -0,0 +1,14 @@
+define([
+	"./_base/module",
+	"./infrastructure-module",
+
+	"./general-module",
+	"./tree/module",
+	"./editor/module",
+	"./form/module",
+	"./layout/module",
+
+	"./_BidiSupport/module"
+], 1);
+
+
diff --git a/src/main/resources/static/dijit/tests/place-clip.html b/src/main/resources/static/dijit/tests/place-clip.html
new file mode 100644
index 0000000000000000000000000000000000000000..b0002f9f73fca9c59e5d5e49980f43683b01fbdf
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/place-clip.html
@@ -0,0 +1,267 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>dijit/place on clipped nodes unit test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<style type="text/css">
+		html, body, div {
+			border: none;
+			margin: 0px;
+			padding: 0px;
+		}
+
+		.around {
+			/* the around-node (ex: a ComboBox or TextBox) */
+			color: white;
+			background: blue;
+		}
+
+		.clip {
+			/* ancestor of an around-node that clips the around-node */
+			display: inline-block;
+			#display: inline;
+			overflow: hidden;
+			background: gray;
+
+			padding: 10px 0px;
+			margin: 0px 100px;
+			width: 100px;
+		}
+
+		#popup {
+			position: absolute;
+			width: 25px;
+			background: red;
+			color: white;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom", "dojo/dom-geometry", "dojo/window",
+			"dijit/place", "dojo/parser", "dojo/domReady!"
+		], function(doh, dom, domGeometry, winUtils, place, parser){
+
+			parser.parse();
+
+			// The around nodes
+			var aroundOne = dom.byId("around1"),
+				aroundTwo = dom.byId("around2"),
+				aroundThree = dom.byId("around3"),
+				abs1 = dom.byId("absAround1"),
+				abs2 = dom.byId("absAround2"),
+				abs3 = dom.byId("absAround3");
+
+			// The popup (aka dropdown)
+			var popup = dom.byId("popup"),
+				pp,
+				ret;
+
+			doh.register("aroundOne", [
+				function plain(t){
+					ret = place.around(popup, aroundOne, [
+						"before-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(100, pp.x + pp.w, "popup hugs left side of clipping div");
+
+					ret = place.around(popup, aroundOne, [
+						"after-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(200, pp.x, "popup hugs right side of clipping div");
+				},
+				function aroundOneScrolled(t){
+					// Programatically scroll to the right
+					dom.byId("clip1").scrollLeft = 50;
+
+					// Same tests as before
+					ret = place.around(popup, aroundOne, [
+						"before-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(100, pp.x + pp.w, "popup hugs left side of clipping div");
+
+					ret = place.around(popup, aroundOne, [
+						"after-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(200, pp.x, "popup hugs right side of clipping div");
+				},
+				function aroundOneScrollbar(t){
+					// Show scroll bar
+					dom.byId("clip1").style.overflow = "scroll";
+
+					// Same tests as before
+					ret = place.around(popup, aroundOne, [
+						"before-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(100, pp.x + pp.w, "popup hugs left side of clipping div");
+
+					ret = place.around(popup, aroundOne, [
+						"after-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(200, pp.x, "popup hugs right side of clipping div");
+				}
+
+			]);
+
+			doh.register("aroundTwo", [
+				function plain(t){
+					ret = place.around(popup, aroundTwo, [
+						"before-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(100, pp.x + pp.w, "popup hugs left side of outer clipping div");
+
+					ret = place.around(popup, aroundTwo, [
+						"after-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(200, pp.x, "popup hugs right side of outer clipping div");
+				}
+			]);
+
+			doh.register("aroundThree", [
+				function plain(t){
+					ret = place.around(popup, aroundThree, [
+						"before-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(150, pp.x + pp.w, "popup hugs left side of inner clipping div");
+
+					ret = place.around(popup, aroundThree, [
+						"after-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(250, pp.x, "popup hugs right side of inner clipping div");
+				}
+			]);
+
+			doh.register("absolutely positioned nodes", [
+				function aroundNodeAbsolute(t){
+					ret = place.around(popup, abs1, [
+						"before-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(50, pp.x + pp.w, "popup hugs left side of absolutely positioned around node");
+
+					ret = place.around(popup, abs1, [
+						"after-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(350, pp.x, "popup hugs right side of absolutely positioned around node");
+				},
+				function aroundNodeParentAbsolute(t){
+					ret = place.around(popup, abs2, [
+						"before-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(60, pp.x + pp.w, "popup hugs left side of absolutely positioned around node wrapper");
+
+					ret = place.around(popup, abs2, [
+						"after-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(120, pp.x, "popup hugs right side of absolutely positioned around node wrapper");
+				},
+				function absoluteInRelative(t){
+					ret = place.around(popup, abs3, [
+						"before-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(110, pp.x + pp.w, "popup hugs left side of position:absolute parent");
+
+					ret = place.around(popup, abs3, [
+						"after-centered"
+					], true);
+
+					pp = domGeometry.position(popup);
+					doh.is(170, pp.x, "popup hugs right side of position:relative grandparent (which clips parent)");
+				}
+			]);
+			doh.run();
+		});
+
+	</script>
+</head>
+<body class="claro" dir="ltr">
+	<h1>Dijit Place Clipping Unit Test</h1>
+
+	<!-- the popup "widget" -->
+	<div id="popup">
+		p
+	</div>
+
+	<!-- around node one is clipped by surrounding div. -->
+	<div id="clip1" class="clip">
+		<div id="around1" class="around" style="width: 500px; height: 50px;">123456789abcdef</div>
+	</div>
+
+	<!-- around node one is clipped by clip2b, and even more by clip2a -->
+	<br/>
+	<div id="clip2a" class="clip">
+		<div id="clip2b" style="width: 200px; margin: 0px; background: white" class="clip">
+			<div id="noclip2">
+				<div id="around2" class="around" style="width: 500px; height: 50px;">123456789abcdef</div>
+			</div>
+		</div>
+	</div>
+
+	<!-- around node one is clipped by clip3b, but not by clip2a since that is bigger -->
+	<br/>
+	<div id="clip3a" style="width: 200px; background: yellow; padding: 10px 50px;" class="clip">
+		<div id="clip3b" style="margin: 0px" class="clip">
+			<div id="noclip3">
+				<div id="around3" class="around" style="width: 500px; height: 50px;">123456789abcdef</div>
+			</div>
+		</div>
+	</div>
+
+	<!-- position absolute around node is not affected by a parent with width set
+		(unless parent has position:relative or position:absolute) -->
+	<br/>
+	<div id="clip4" class="clip">
+		<div id="absAround1" class="around" style="width: 300px; height: 50px; position: absolute; left: 50px; top:500px;">absolute</div>
+	</div>
+
+	<!-- here the around node absAround2 is position:static, but it's parent clip5b is position:absolute,
+		so the grandparent clip5a is irrelevant -->
+	<br/>
+	<div id="clip5a" style="width: 50px; background: yellow; padding: 10px 50px;" class="clip">
+		<div id="clip5b" style="position: absolute; left: 60px; top: 600px; width: 60px; background: navy; margin: 0px;" class="clip">
+			<div id="absAround2" class="around" style="width: 500px; height: 50px;">parent absolute</div>
+		</div>
+	</div>
+
+	<!-- here the around node absAround3 is position:static, it's parent clip6b is position:absolute,
+		but the grandparent clip6a is position:relative, so it can clip -->
+	<br/>
+	<div id="clip6a" style="width: 70px; height: 70px; background: #adff2f; padding: 0px; position: relative;" class="clip">
+		<div id="clip6b" style="position: absolute; left: 10px; top: 0px; width: 150px; background: navy; margin: 0px;" class="clip">
+			<div id="absAround3" class="around" style="width: 500px; height: 50px;">grandparent relative</div>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/place-margin.html b/src/main/resources/static/dijit/tests/place-margin.html
new file mode 100644
index 0000000000000000000000000000000000000000..85e21dd12cc1ff8c040ec832c2b1a3f9c5da0e7c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/place-margin.html
@@ -0,0 +1,104 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>dijit/place with margin on body unit test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<style type="text/css">
+		html {
+			overflow: hidden; /* ie6 needs this */
+		}
+		body {
+			height: 100%;
+			padding: 0;
+			border: 0;
+
+			/* testing for margin on <body>, see #16148 */
+			position: relative;
+			top: 0;
+			margin-top: 40px;
+			margin-left: 10px;
+			margin-right: 20px;
+		}
+
+		.aroundNode {
+			position: absolute;
+			width: 20px;
+			height: 20px;
+			background: yellow;
+		}
+
+		#popup {
+			position: absolute;
+			width: 75px;
+			background: blue;
+			color: white;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom", "dojo/dom-geometry", "dojo/window",
+			"dijit/place", "dojo/domReady!"
+		], function(doh, dom, domGeometry, winUtils, place){
+
+			// The around nodes
+			var aroundTop = dom.byId("aroundTop"),
+				aroundLeft = dom.byId("aroundLeft"),
+				aroundRight = dom.byId("aroundRight");
+
+			// The popup (aka dropdown)
+			var popup = dom.byId("popup");
+
+			doh.register("around with body margin", [
+				function aroundT(t){
+					// Dropdown from "aroundTop" node.
+					var ret = place.around(popup, aroundTop, [
+						"below"	// aroundTop's bottom-left corner with the popup's top-left corner
+					], true);
+
+					doh.is("20px", popup.style.top, "underneath around node");
+				},
+				function aroundL(t){
+					// middle left popup from "aroundLeft" node
+					var ret = place.around(popup, aroundLeft, [
+						"after-centered"	// aroundLeft's middle-right with the popup's middle-left
+					], true);
+
+					var popupPos = domGeometry.position(popup);
+					var aroundPos = domGeometry.position(aroundLeft);
+					doh.is(Math.round(aroundPos.x + aroundPos.w), Math.round(popupPos.x), "after around node");
+				},
+				function aroundR(t){
+					// This will put the drop-down to the left of the "aroundRight" node
+					var ret = place.around(popup, aroundRight, ["before-centered"], true);
+
+					var popupPos = domGeometry.position(popup);
+					var aroundPos = domGeometry.position(aroundRight);
+					doh.is(Math.round(popupPos.x + popupPos.w), Math.round(aroundPos.x),
+							"right aligned with around node");
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body style="position: relative; top: 0; margin-top: 40px;">
+	<h1>Dijit Place With Margin On BODY Unit Test</h1>
+	<div id="aroundTop" class="aroundNode" style="top: 0px; left: 50%">T</div>
+	<div id="aroundLeft" class="aroundNode" style="bottom: 30%; left: 0px;">L</div>
+	<div id="aroundRight" class="aroundNode" style="bottom: 30%; right: 0px;">R</div>
+
+	<div id="popup">
+		I'm a drop down, wider and taller than the around nodes I'm placed next to.
+	</div>
+	<div style="height: 200px">
+		<!-- spacer -->
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/place.html b/src/main/resources/static/dijit/tests/place.html
new file mode 100644
index 0000000000000000000000000000000000000000..2ae1507d713f95f9b2495d800ea2eff325237d7d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/place.html
@@ -0,0 +1,251 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>dijit/place unit test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<style type="text/css">
+		html {
+			overflow: hidden; /* ie6 needs this */
+		}
+		body {
+			height: 100%;
+			padding: 0;
+			margin: 10px; /* negative test for #16148; shouldn't affect placement unless body position relative/absolute */
+			border: 0;
+		}
+
+		.aroundNode {
+			position: absolute;
+			width: 20px;
+			height: 20px;
+			background: yellow;
+		}
+
+		#popup {
+			position: absolute;
+			width: 75px;
+			background: blue;
+			color: white;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom", "dojo/dom-geometry", "dojo/window",
+			"dijit/place", "dojo/domReady!"
+		], function(doh, dom, domGeometry, winUtils, place){
+
+			// The around nodes
+			var aroundTop = dom.byId("aroundTop"),
+				aroundBottom = dom.byId("aroundBottom"),
+				aroundLeft = dom.byId("aroundLeft"),
+				aroundRight = dom.byId("aroundRight");
+
+			// The popup (aka dropdown)
+			var popup = dom.byId("popup");
+
+			doh.register("at", [
+				function atTL(t){
+					// Place popup at (10,7)... place.at() should choose the top-left corner, because
+					// any of the other corner would make the popup go partially off the screen
+					var ret = place.at(popup, {x: 10, y:7}, ["TR", "BR", "BL", "TL"]);
+
+					doh.is("TL", ret.corner, "top left corner chosen");
+					doh.is("10px", popup.style.left, "x coord");
+					doh.is("7px", popup.style.top, "y coord");
+					doh.is(75, ret.w, "it's 75px wide");
+				},
+				function atTooltip(t){
+					// Same as above test except that shape of drop down changes depending on where it's positioned.
+					// Simulates tooltip placement (tooltip shape changes b/c of the arrow).
+
+					function layoutNode(node, aroundCorner, nodeCorner){
+						node.style.width = (nodeCorner == "TL" ? "80px" : "75px");
+					}
+					var ret = place.at(
+							popup,
+							{x: 10, y: 7},		// center of aroundNode
+							["TR", "BR", "BL", "TL"],
+							{x: 5, y: 5},		// half of width and height of aroundNode
+							layoutNode
+					);
+
+					doh.is("TL", ret.corner, "popup's corner");
+					doh.is("BR", ret.aroundCorner, "around corner");
+					doh.is("80px", popup.style.width, "layout node width");
+					popup.style.width = "75px";
+				},
+				function atTR(t){
+					// Place popup at top right... place.at() should choose the top-right corner, because
+					// any of the other corner would make the popup go partially off the screen
+					var viewport = winUtils.getBox(),
+						ret = place.at(popup, {x: viewport.w-10, y:7}, ["TL", "BR", "TR", "BL"]),
+						popupCoords = domGeometry.position(popup);
+
+					doh.is("TR", ret.corner, "top left corner chosen");
+					doh.is(viewport.w-10, popupCoords.x + popupCoords.w, "x coord");
+					doh.is("7px", popup.style.top, "y coord");
+					doh.is(75, ret.w, "it's 75px wide");
+				}
+			]);
+
+			doh.register("around", [
+				function aroundT(t){
+					// Dropdown from "aroundTop" node. Should pick the second choice, since the first
+					// goes off screen.
+					var ret = place.around(popup, aroundTop, [
+						"above",	// aroundTop's top-left corner with the popup's bottom-left corner (fails)
+						"below",	// aroundTop's bottom-left corner with the popup's top-left corner (works)
+						"below-alt"	// aroundTop's bottom-right corner with the popup's top-right corner (works)
+					], true);
+
+					doh.is("BL", ret.aroundCorner, "around corner");
+					doh.is("TL", ret.corner, "popup's corner");
+					doh.is("20px", popup.style.top, "underneath around node");
+					doh.is(Math.round(domGeometry.position(aroundTop).x), Math.round(popup.style.left.replace("px", "")),
+							"left sides aligned");
+				},
+				function aroundTooltip(t){
+					// Same as above test except that shape of drop down changes depending on where it's positioned.
+					// Simulates tooltip placement (tooltip shape changes b/c of the arrow).
+					// Should pick the third choice this time
+
+					function layoutNode(node, aroundCorner, nodeCorner){
+						node.style.width = (nodeCorner == "TL" ? "5000px" : "75px");
+					}
+					var ret = place.around(popup, aroundTop, [
+						"above",	// aroundTop's top-left corner with the popup's bottom-left corner (fails)
+						"below",	// aroundTop's bottom-left corner with the popup's top-left corner (works)
+						"below-alt"	// aroundTop's bottom-right corner with the popup's top-right corner (works)
+					], true, layoutNode);
+
+					doh.is("BR", ret.aroundCorner, "around corner");
+					doh.is("TR", ret.corner, "popup's corner");
+					doh.is("20px", popup.style.top, "underneath around node");
+					doh.is(Math.round(domGeometry.position(aroundTop).x+domGeometry.position(aroundTop).w),
+						Math.round(domGeometry.position(popup).x+domGeometry.position(popup).w),
+						"right sides aligned");
+				},
+				function aroundB(t){
+					// Dropdown from "aroundBottom" node. Should go above aroundNode so that
+					// popup doesn't go offscreen
+					var ret = place.around(popup, aroundBottom, [
+						"below",	// aroundBottom's bottom-left corner with the popup's top-left corner (fails)
+						"above",	// aroundBottom's top-left corner with the popup's bottom-left corner (works)
+						"below-alt"	// aroundBottom's bottom-right corner with the popup's top-right corner (fails)
+					], true);
+
+					doh.is("TL", ret.aroundCorner, "around corner");
+					doh.is("BL", ret.corner, "popup's corner");
+					doh.is(Math.round(domGeometry.position(aroundBottom).y),
+							Math.round(domGeometry.position(popup).y + domGeometry.position(popup).h), "above around node");
+				},
+				function aroundBM(t){
+					// bottom middle popup from "aroundBottom" node
+					var ret = place.around(popup, aroundBottom, [
+						"above-centered",	// aroundBottom's top-middle with the popup's bottom-middle (works)
+						"below-centered"	// aroundBottom's bottom-middle with the popup's top-middle (fails)
+					], true);
+
+					doh.is("TM", ret.aroundCorner, "around middle");
+					doh.is("BM", ret.corner, "popup's middle");
+					var popupPos = domGeometry.position(popup);
+					var aroundPos = domGeometry.position(aroundBottom);
+					doh.is(Math.round(aroundPos.y), Math.round(popupPos.y + popupPos.h), "above around node");
+					doh.t(aroundPos.x > popupPos.x, "starts before around node");
+					doh.t(aroundPos.x < (popupPos.x + popupPos.w), "ends after around node");
+				},
+				function aroundTM(t){
+					// top middle popup from "aroundTop" node
+					var ret = place.around(popup, aroundTop, [
+						"above-centered",	// aroundTop's top-middle with the popup's bottom-middle (fails)
+						"below-centered"	// aroundTop's bottom-middle with the popup's top-middle (works)
+					], true);
+
+					doh.is("BM", ret.aroundCorner, "around middle");
+					doh.is("TM", ret.corner, "popup's middle");
+					var popupPos = domGeometry.position(popup);
+					var aroundPos = domGeometry.position(aroundTop);
+					doh.is(Math.round(aroundPos.y + aroundPos.h), Math.round(popupPos.y), "below around node");
+					doh.t(aroundPos.x > popupPos.x, "starts before around node");
+					doh.t(aroundPos.x < (popupPos.x + popupPos.w), "ends after around node");
+				},
+				function aroundML(t){
+					// middle left popup from "aroundLeft" node
+					var ret = place.around(popup, aroundLeft, [
+						"after-centered",	// aroundLeft's middle-right with the popup's middle-left (works)
+						"before-centered"	// aroundLeft's middle-left with the popup's middle-right (fails)
+					], true);
+
+					doh.is("MR", ret.aroundCorner, "around middle");
+					doh.is("ML", ret.corner, "popup's middle");
+					var popupPos = domGeometry.position(popup);
+					var aroundPos = domGeometry.position(aroundLeft);
+					doh.is(Math.round(aroundPos.x + aroundPos.w), Math.round(popupPos.x), "after around node");
+					doh.t(aroundPos.y > popupPos.y, "starts before around node");
+					doh.t(aroundPos.y < (popupPos.y + popupPos.h), "ends after around node");
+				},
+				function aroundMR(t){
+					// middle left popup from "aroundRight" node
+					var ret = place.around(popup, aroundRight, [
+						"after-centered",	// aroundRight's middle-right with the popup's middle-left (fails)
+						"before-centered"	// aroundRight's middle-left with the popup's middle-right (works)
+					], true);
+
+					doh.is("ML", ret.aroundCorner, "around middle");
+					doh.is("MR", ret.corner, "popup's middle");
+					var popupPos = domGeometry.position(popup);
+					var aroundPos = domGeometry.position(aroundRight);
+					doh.is(Math.round(popupPos.x + popupPos.w), Math.round(aroundPos.x), "before around node");
+					doh.t(aroundPos.y > popupPos.y, "starts before around node");
+					doh.t(aroundPos.y < (popupPos.y + popupPos.h), "ends after around node");
+				},
+				function aroundMLB(t){
+					// This will put the drop-down below the "aroundLeft" node, first trying to right-align
+					// but since that doesn't work then trying to left-align.
+					var ret = place.around(popup, aroundLeft, ["below-alt"], true);
+
+					doh.is("BL", ret.aroundCorner, "around left");
+					doh.is("TL", ret.corner, "popup's left");
+					var popupPos = domGeometry.position(popup);
+					var aroundPos = domGeometry.position(aroundLeft);
+					doh.is(Math.round(aroundPos.y + aroundPos.h), Math.round(popupPos.y), "below around node");
+					doh.is(aroundPos.x, popupPos.x, "left aligned with around node");
+				},
+				function aroundMRT(t){
+					// This will put the drop-down above the "aroundRight" node, first trying to left-align
+					// but since that doesn't work then trying to right-align.
+					var ret = place.around(popup, aroundRight, ["above"], true);
+
+					doh.is("TR", ret.aroundCorner, "around right");
+					doh.is("BR", ret.corner, "popup's right");
+					var popupPos = domGeometry.position(popup);
+					var aroundPos = domGeometry.position(aroundRight);
+					doh.is(Math.round(popupPos.x + popupPos.w), Math.round(aroundPos.x + aroundPos.w),
+							"right aligned with around node");
+					doh.is(Math.round(popupPos.y + popupPos.h), Math.round(aroundPos.y),
+							"above around node");
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body>
+	<h1>Dijit Place Unit Test</h1>
+	<div id="aroundTop" class="aroundNode" style="top: 0; left: 50%">T</div>
+	<div id="aroundLeft" class="aroundNode" style="bottom: 30%; left: 0;">L</div>
+	<div id="aroundRight" class="aroundNode" style="bottom: 30%; right: 1px;">R</div>
+	<div id="aroundBottom" class="aroundNode" style="bottom: 5px; left: 50%;">B</div>
+
+	<div id="popup">
+		I'm a drop down, wider and taller than the around nodes I'm placed next to.
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/popup.html b/src/main/resources/static/dijit/tests/popup.html
new file mode 100644
index 0000000000000000000000000000000000000000..fc80255ff51aa1589b325b1430ef2fb4b757557e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/popup.html
@@ -0,0 +1,615 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+	<title>popup and BackgroundIFrame unit test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<style type="text/css">
+		body {
+			height: 100%;
+			padding: 0;
+			margin: 0;
+		}
+
+		div {
+			background: white;
+			border: solid 1px gray;
+		}
+
+		/* the menu type test widgets */
+		.choice div {
+			width: 200px;
+			cursor: pointer;
+		}
+		.choice div:hover {
+			background: #ccc;
+		}
+	</style>
+
+	<script type="text/javascript">
+		function log(str){
+			console.log(str);
+		}
+
+		require([
+			"doh/runner",
+			"dojo/_base/declare",
+			"dojo/dom", "dojo/dom-construct", "dojo/dom-geometry", "dojo/dom-style",
+			"dojo/query", "dojo/sniff", "dojo/_base/window", "dojo/window",
+			"dijit/popup", "dijit/registry", "dijit/_WidgetBase", "dijit/_TemplatedMixin",
+			"dijit/tests/helpers", "dojo/domReady!"
+		], function(doh, declare, dom, domConstruct, domGeometry, domStyle, query, has, win, winUtils,
+					popupUtil, registry, _WidgetBase, _TemplatedMixin){
+
+
+			declare("SimpleDropDownButton", [_WidgetBase, _TemplatedMixin], {
+				// summary:
+				//		A button that shows a popup.
+				//		Supply popup as parameter when instantiating this widget.
+
+				label: "show popup",
+				orient: ["below"],
+
+				templateString: "<button data-dojo-attach-event='onclick: openPopup'>${label}</button>",
+
+				openPopup: function(){
+					var self = this;
+
+					popupUtil.open({
+						popup: this.popup,
+						parent: this,
+						around: this.domNode,
+						orient: this.orient,
+						onCancel: function(){
+							log(self.id + ": cancel of child");
+						},
+						onExecute: function(){
+							log(self.id + ": execute of child");
+							popupUtil.close(self.popup);
+							self.open = false;
+						}
+					});
+
+					this.open = true;
+				},
+
+				closePopup: function(){
+					if(this.open){
+						log(this.id + ": close popup due to blur");
+						popupUtil.close(this.popup);
+						this.open = false;
+					}
+				},
+
+				_onBlur: function(){
+					// summary:
+					//		This is called from focus manager and when we get the signal we
+					//		need to close the drop down
+					this.closePopup();
+				}
+			});
+
+			declare("SimplePopup",  [_WidgetBase, _TemplatedMixin], {
+				// summary:
+				//		A trivial popup widget
+
+				templateString: "<span>i'm a popup</span>"
+			});
+
+			declare("Tooltip", [_WidgetBase, _TemplatedMixin], {
+				// summary:
+				//		A popup with an orient() method to adjust arrows
+
+				templateString: "<span>i'm a tooltip</span>",
+				constructor: function(){
+					this.orientCalls = [];
+				},
+				orient: function(node, aroundCorner, corner, spaceAvailable, aroundNodeCoords){
+					this.orientCalls.push({
+						node: node,
+						aroundCorner: aroundCorner,
+						corner: corner,
+						spaceAvailable: spaceAvailable,
+						aroundNodeCoords: aroundNodeCoords
+					});
+				},
+				onOpen: function(pos){
+					// should be called with pos.corner and pos.aroundCorner set
+					this.onOpenArg = pos;
+				}
+			});
+
+			declare("SimpleChoiceWidget",  [_WidgetBase, _TemplatedMixin], {
+				// summary:
+				//		A list of values; select a value by pressing an entry in the list.
+
+				choice1: "1",
+				choice2: "2",
+				choice3: "3",
+
+				templateString:
+					"<div class='choice'>" +
+						"<div data-dojo-attach-event='onclick: onClick'>${choice1}</div>" +
+						"<div data-dojo-attach-event='onclick: onClick'>${choice2}</div>" +
+						"<div data-dojo-attach-event='onclick: onClick'>${choice3}</div>" +
+					"</div>",
+
+				onClick: function(e){
+					this.onChange(e.target.innerHTML);
+				},
+
+				onChange: function(val){
+					// summary:
+					//		When this widget is used as a popup, popup monitors calls
+					//		to onChange and then closes the popup
+					log(this.id + ": selected " + val);
+				}
+			});
+
+			declare("LotsOfChoicesWidget",  [_WidgetBase], {
+				// summary:
+				//		A list of values; select a value by pressing an entry in the list.
+
+				length: 100,
+
+				postCreate: function(){
+					for(var i=0; i< this.length; i++){
+						domConstruct.place("<div>choice #" + i + "</div>", this.domNode);
+					}
+				}
+			});
+
+			// Create a button that displays a simple drop down
+			choiceDropDown = new SimpleChoiceWidget();
+			(choiceDropDownButton = new SimpleDropDownButton({
+				id: "choiceDropDownButton",
+				label: "show choice drop down",
+				popup: choiceDropDown
+			})).placeAt(dom.byId("widgets"));
+
+			// Create a tall drop down, should get scroll bar
+			tallChoiceDropDown = new LotsOfChoicesWidget({length: 100});
+			(tallChoiceDropDownButton = new SimpleDropDownButton({
+				id: "tallChoiceDropDownButton",
+				label: "show tall drop down",
+				popup: tallChoiceDropDown
+			})).placeAt(dom.byId("widgets"));
+
+			declare("DialogWithPopupWidget",  [_WidgetBase, _TemplatedMixin], {
+				// summary:
+				//		This is a dialog that contains a button that spawns a drop down.
+				//		Supply popup as an argument to this widget.
+
+				title: "I'm a dialog",
+				label: "click me",
+
+				templateString:
+					"<div style='width: 300px'>" +
+						"<div>${title}</div>" +
+						"<input><br>" +
+						"<button data-dojo-attach-point='button'>${label}</button><br>" +
+						"<button data-dojo-attach-event='onclick: onExecute'>OK</button>" +
+					"</div>",
+
+				postCreate: function(){
+					// Convert the plain button into a SimpleDropDownButton widget.
+					// Having it be a widget is important because that's how the popup
+					// code knows where a stack of nested popups (typically menus) ends.
+					// (In this case closing a stack of menus shouldn't close the dialog.)
+
+					new SimpleDropDownButton({
+						id: this.id + "PopupButton",
+						label: this.label,
+						popup: this.popup,
+						orient: ["after"]	// so popup doesn't cover OK button
+					}, this.button);
+				},
+
+				onExecute: function(){
+					// summary:
+					//		Called when OK button is pressed.
+					//		If this is used as a popup this signals to the parent that
+					//		Dialog can be closed.
+					console.log(this.id + ": executed");
+				}
+			});
+
+			// Create a button that displays a dialog that displays a choice widget
+			dialogDropDownButton = new SimpleDropDownButton({
+				id: "showSimpleDialogButton",
+				label: "show dialog",
+				popup: new DialogWithPopupWidget({
+					id: "simpleDialog",
+					label: 'show simple choice drop down',
+					popup: new SimpleChoiceWidget({
+						id: "choiceFromDialog"
+					})
+				})
+			}).placeAt(dom.byId("widgets"));
+
+			declare("NestedPopupOpener",  [_WidgetBase, _TemplatedMixin], {
+				// summary:
+				//		Clicking a value in this list will open a nested popup.
+				//		Specify popup1 and popup2 as parameters to this widget.
+
+				templateString:
+					"<div class='choice'>" +
+						"<div data-dojo-attach-event='onclick: onClick'>popup1</div>" +
+						"<div data-dojo-attach-event='onclick: onClick'>popup2</div>" +
+					"</div>",
+
+				onClick: function(e){
+					var id = this.id,
+						popup = this[e.target.innerHTML];
+					log(id + ": opening popup " + popup.id);
+					this.openPopup(popup);
+				},
+
+				openPopup: function(popup){
+					popupUtil.open({
+						popup: popup,
+						parent: this,
+						around: this.domNode,
+						orient: ["after", "before"],
+						onCancel: function(){
+							log(id + ": cancel of child " + popup.id);
+						},
+						onExecute: function(){
+							log(id + ": execute of child " + popup.id);
+							popupUtil.close(popup);
+						}
+					})
+				},
+
+				closePopup: function(popup){
+					popupUtil.close(popup);
+				}
+			});
+
+			// Create a button that displays a nested drop down.
+			nestedOpener = new NestedPopupOpener({
+				id: 'nestedPopupOpener',
+				popup1: (nestedChoice1 = new SimpleChoiceWidget({
+					id: "nestedChoice1"
+				})),
+				popup2: (nestedChoice2 = new SimpleChoiceWidget({
+					id: "nestedChoice2",
+					choice1: "4",
+					choice2: "5",
+					choice3: "6"
+				}))
+			});
+			nestedDropDownButton = new SimpleDropDownButton({
+				id: "showNestedMenuButton",
+				label: "show nested drop down",
+				popup: nestedOpener
+			}).placeAt(dom.byId("widgets"));
+
+			// Create a button that displays a dialog that displays a nested drop down
+			dialogNestedChoice1 = new SimpleChoiceWidget({
+				id: "dialogNestedChoice1"
+			});
+			dialogNestedChoice2 = new SimpleChoiceWidget({
+				id: "dialogNestedChoice2",
+				choice1: "4",
+				choice2: "5",
+				choice3: "6"
+			});
+			dialogNestedPopupOpener = new NestedPopupOpener({
+				id: "nestedPopupOpenerFromDialog",
+				popup1: dialogNestedChoice1,
+				popup2: dialogNestedChoice2
+			});
+			dialogWithNestedPopup = new DialogWithPopupWidget({
+				id: "buttonInComplexDialog",
+				label: 'show nested menu',
+				popup: dialogNestedPopupOpener
+			});
+			dialogDropDownButton = new SimpleDropDownButton({
+				id: "showComplexDialogButton",
+				label: "show dialog w/nested menu",
+				popup: dialogWithNestedPopup
+			}).placeAt(dom.byId("widgets"));
+
+			// For testing, create an unattached widget and unattached DOMNode
+			new SimplePopup({id: "spw"}).placeAt(win.body());
+			domConstruct.place("<span id='sdn'>simple dom node</span>", win.body());
+
+			doh.register("API", [
+					function repeatMoveOffScreen(){
+						// Previously, calling moveOffScreen twice would cause an exception
+						popupUtil.moveOffScreen(registry.byId("spw"));
+						popupUtil.moveOffScreen(registry.byId("spw"));
+					}
+			]);
+
+			doh.register("simple open and close", [
+				function initialConditions(t){
+					// If the popup code has cached any iframes, make sure they are hidden
+					query("iframe").forEach(function(node){
+						console.log("found iframe", node);
+						doh.is("none", node.style.display, "background iframe is hidden");
+					});
+				},
+
+				// Create popup on the edge of another widget
+				function openAround(){
+					var d = new doh.Deferred();
+
+					var around = choiceDropDownButton,
+						popup = choiceDropDown;
+
+					around.openPopup();
+
+					setTimeout(d.getTestCallback(function(){
+						doh.t(isVisible(popup.domNode), "popup is visible");
+
+						if(has("config-bgIframe")){
+							// Test the BackgroundIFrame
+							var iframes = query("iframe");
+							doh.is(1, iframes.length, "one background iframe");
+
+							var popupCoords = domGeometry.position(popup.domNode),
+								iframeCoords = domGeometry.position(iframes[0]);
+							doh.is(popupCoords.x, iframeCoords.x, "x is same: " + popupCoords.x);
+							doh.is(popupCoords.y, iframeCoords.y, "y is same: " + popupCoords.y);
+							doh.is(popupCoords.w, iframeCoords.w, "w is same: " + popupCoords.w);
+							doh.is(popupCoords.h, iframeCoords.h, "h is same: " + popupCoords.h);
+							doh.is("", iframes[0].style.display, "not display:none");
+						}
+						// TODO: test stack
+					}), 500);
+
+					return d;
+				},
+
+				function closeAround(){
+					// Close the popup
+					var around = choiceDropDownButton,
+						popup = choiceDropDown;
+
+					around.closePopup();
+
+					// Make sure the popup is hidden
+					doh.is("none", popup.domNode.parentNode.style.display, "popup is hidden");
+				}
+			]);
+
+			doh.register("nested open and close", [
+				// Open first level
+				function openAround(){
+					var d = new doh.Deferred();
+
+					var around = nestedDropDownButton,
+						popup = nestedOpener,
+						nestedPopup = nestedChoice1;
+
+					around.openPopup();
+
+					setTimeout(d.getTestCallback(function(){
+						doh.t(isVisible(popup.domNode), "popup is visible");
+
+						if(has("ie") <= 6){
+							// Test the BackgroundIFrame
+							var iframes = query("iframe", popup.domNode.parentNode);
+							doh.is(1, iframes.length, "one background iframe on IE6");
+
+							var popupCoords = domGeometry.position(popup.domNode),
+								iframeCoords = domGeometry.position(iframes[0]);
+							doh.is(popupCoords.x, iframeCoords.x, "x is same: " + popupCoords.x);
+							doh.is(popupCoords.y, iframeCoords.y, "y is same: " + popupCoords.y);
+							doh.is(popupCoords.w, iframeCoords.w, "w is same: " + popupCoords.w);
+							doh.is(popupCoords.h, iframeCoords.h, "h is same: " + popupCoords.h);
+							doh.is("", iframes[0].style.display, "not display:none");
+						}
+						// TODO: test stack
+					}), 500);
+
+					return d;
+				},
+
+				function openNested(){
+					var d = new doh.Deferred();
+
+					var around = nestedDropDownButton,
+						popup = nestedOpener,
+						nestedPopup = nestedChoice1;
+
+					popup.openPopup(nestedPopup);
+
+					setTimeout(d.getTestCallback(function(){
+						doh.t(isVisible(nestedPopup.domNode), "nested popup is visible");
+
+						if(has("ie") <= 6){
+							// Test the BackgroundIFrame
+							var iframes = query("iframe", popup.domNode.parentNode);
+							doh.is(1, iframes.length, "one background iframe for popup");
+
+							iframes = query("iframe", nestedPopup.domNode.parentNode);
+							doh.is(1, iframes.length, "another background iframe for nested popup");
+
+							var popupCoords = domGeometry.position(nestedPopup.domNode),
+								iframeCoords = domGeometry.position(iframes[0]);
+							doh.is(popupCoords.x, iframeCoords.x, "x is same: " + popupCoords.x);
+							doh.is(popupCoords.y, iframeCoords.y, "y is same: " + popupCoords.y);
+							doh.is(popupCoords.w, iframeCoords.w, "w is same: " + popupCoords.w);
+							doh.is(popupCoords.h, iframeCoords.h, "h is same: " + popupCoords.h);
+							doh.is("", iframes[0].style.display, "not display:none");
+						}
+						// TODO: test stack
+					}), 500);
+
+					return d;
+				},
+
+				function closeAround(){
+					// Close the layer of popups
+					var around = nestedDropDownButton,
+						popup = nestedOpener,
+						nestedPopup = nestedChoice1;
+
+					around.closePopup();
+
+					// Make sure the popups are both hidden
+					// (in a future release this might change to display:none etc but currently it's visibility:hidden)
+					doh.is("none", popup.domNode.parentNode.style.display, "popup is hidden");
+					doh.is("none", nestedPopup.domNode.parentNode.style.display, "nested popup is hidden");
+				}
+			]);
+
+			// Make sure there are no hidden tab stops when popups are closed.
+			// This test doesn't work on safari (due to safari bugs) although there aren't any hidden tab stops.
+			doh.register("no hidden tab stops", function hiddenTabStops(){
+				var tabbable = tabOrder();
+				doh.is("inputAtStart", tabbable[0].id, "first tabbable node");
+				doh.is("inputAtEnd", tabbable[tabbable.length - 1].id, "last tabbable node");
+			});
+
+			doh.register("x/y placement", function xyPlacement(){
+				// Trivial test of x/y placement.    Could also test other orientations.
+				var popup = new SimpleChoiceWidget();
+
+				popupUtil.open({
+					popup: popup,
+					orient: "R",
+					x: 10,
+					y: 15
+				});
+
+				var popupCoords = domGeometry.position(popup.domNode);
+				doh.is(10, popupCoords.x, "popup x coord");
+				doh.is(15, popupCoords.y, "popup y coord");
+
+				popupUtil.close(popup);
+			});
+
+			doh.register("orientCallback", [
+				function setup(){
+					tooltip = new Tooltip({});
+					(tooltipDropDownButton = new SimpleDropDownButton({
+						id: "tooltipDropDownButton",
+						label: "show tooltip",
+						popup: tooltip
+					})).placeAt(dom.byId("widgets"));
+				},
+				function orientCallbackAround(){
+					// Test whether orient() is called correctly for popup around a node
+					tooltipDropDownButton.openPopup();
+					tooltipDropDownButton.closePopup();
+
+					// The final call to orient(), as well as the call to onOpen(), should have been for the final
+					// position of the node, where corner == TL and aroundCorner == BL
+					doh.t(tooltip.orientCalls.length, "orient was called");
+					var final = tooltip.orientCalls.pop();
+					doh.is("TL", final.corner, "popup corner");
+					doh.is("BL", final.aroundCorner, "aroundNode corner");
+
+					doh.t(tooltip.onOpenArg, "onOpen called");
+					doh.is("TL", tooltip.onOpenArg.corner, "popup corner");
+					doh.is("BL", tooltip.onOpenArg.aroundCorner, "aroundNode corner");
+				},
+				function orientCallbackAt(){
+					// Test whether orient() is called correctly for popup around a point
+					tooltip.orientCalls = [];
+					delete tooltip.onOpenArg;
+
+					popupUtil.open({
+						popup: tooltip,
+						orient: "R",
+						x: 10,
+						y: 15
+					});
+
+					// The final call to orient(), as well as the call to onOpen(), should have been for the final
+					// position of the node, where corner == TL and aroundCorner == BR (they are caddy-corner).
+					doh.t(tooltip.orientCalls.length, "orient was called");
+					var final = tooltip.orientCalls.pop();
+					doh.is("TL", final.corner, "popup corner");
+					doh.is("BR", final.aroundCorner, "aroundNode corner");
+
+					doh.t(tooltip.onOpenArg, "onOpen called");
+					doh.is("TL", tooltip.onOpenArg.corner, "popup corner");
+					doh.is("BR", tooltip.onOpenArg.aroundCorner, "aroundNode corner");
+				}
+			]);
+
+			// Test that onCancel goes back one level.
+			// Call nestedChoice2.onCancel() and that should trigger nestedChoice2 to close
+			// but nestedOpener stays open.
+			// (TODO)
+
+			// Test that onChange/onExecute goes back to top of popup chain.
+			// Call dialogNestedChoice2.onChange() and that should trigger dialogNestedChoice2
+			// and dialogNestedPopupOpener to close, but not dialogWithNestedPopup.
+			// (TODO)
+
+			// ---------------------
+			// a11y tests
+
+			// Test that ESC key closes one level of a popup chain.
+			// Focus nestedChoice2 and type ESC, and that should trigger nestedChoice2 to close
+			// but nestedOpener stays open.
+			// (TODO)
+
+			// Test that TAB key cancels back to top of popup chain.
+			// Focus nestedChoice2 and type TAB, and that should trigger dialogNestedChoice2
+			// and dialogNestedPopupOpener to close, but not dialogWithNestedPopup.
+			// (TODO)
+
+			doh.register("a11y tests", function ariaOnWrapper(){
+				var popup = new SimpleChoiceWidget({id: "scwPopup"});
+
+				popupUtil.open({
+					popup: popup,
+					orient: "R",
+					x: 10,
+					y: 15
+				});
+
+				var w = popup.domNode;
+				doh.is("region", w.parentNode.getAttribute("role"), "popup's wrapper node needs role=region");
+				doh.is("scwPopup", w.parentNode.getAttribute("aria-label"), "popup's wrapper node needs aria-label");
+			});
+
+			doh.register("scrollbar tests", [
+				function scrollbarAt(){
+					var popup = new LotsOfChoicesWidget({id: "tallPopup1"});
+
+					popupUtil.open({
+						popup: popup,
+						orient: "R",
+						x: 10,
+						y: 15
+					});
+
+					var w = popup.domNode;
+					doh.t(domStyle.get(w, "height") > winUtils.getBox().h, "popup is taller than the viewport");
+					doh.t(domStyle.get(w.parentNode, "height") < winUtils.getBox().h, "but wrapper " +
+							domStyle.get(w.parentNode, "height") + " is shorter than viewport " + winUtils.getBox().h);
+				},
+				function scrollbarAround(){
+					tallChoiceDropDownButton.openPopup();
+
+					var w = tallChoiceDropDown.domNode;
+					doh.t(domStyle.get(w, "height") > winUtils.getBox().h, "popup is taller than the viewport");
+					doh.t(domStyle.get(w.parentNode, "height") < winUtils.getBox().h, "but wrapper is shorter than viewport");
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body>
+	<h1>popup and BackgroundIFrame Unit Test</h1>
+	<label for="inputAtStart">label:</label><input id="inputAtStart">
+	<div style="height: 150px; overflow: auto; margin: 10px 0px;">
+		<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis cursus odio eu nisl ultrices dictum. Sed tincidunt metus et magna placerat eget vehicula dolor faucibus. Nunc nec augue ac mi rutrum congue. Donec at augue felis. Proin et lectus at mauris adipiscing pulvinar tempor vitae lacus. Aliquam erat volutpat. Sed eget sem eu turpis ultrices ullamcorper sed ut augue. Nunc in augue lectus. Curabitur ac posuere libero. Duis luctus dignissim nisl suscipit vehicula. Cras ut augue odio. Integer blandit ligula congue erat pellentesque nec egestas mi hendrerit</p>
+		<span id="widgets"></span>
+		<p>Nunc sollicitudin nisl sed est porta vitae viverra nulla rutrum. Praesent erat tortor, scelerisque sit amet gravida a, sodales a libero. Pellentesque nec arcu nulla, id laoreet orci. Vivamus sit amet quam eu ante pulvinar rhoncus sit amet non ipsum. Sed mattis felis sed risus tincidunt in sagittis justo rhoncus. Praesent ut justo feugiat neque gravida convallis eget mattis felis. Vestibulum vitae velit ante, sed convallis sem. Curabitur gravida volutpat odio eget tincidunt. Mauris pellentesque placerat massa ut venenatis. Mauris ultrices hendrerit dui vel fermentum.</p>
+	</div>
+	<label for="inputAtEnd">label:</label><input id="inputAtEnd">
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/quirks.html b/src/main/resources/static/dijit/tests/quirks.html
new file mode 100644
index 0000000000000000000000000000000000000000..21ecd833536d033c7c2decece26daf7638bce9c6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/quirks.html
@@ -0,0 +1,5 @@
+<html>
+<head>
+<script src="_loadTest.js"></script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/registry.html b/src/main/resources/static/dijit/tests/registry.html
new file mode 100644
index 0000000000000000000000000000000000000000..a593f95d7d66dbadbe1030a3c775c5aadb34413c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/registry.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>dijit/registry unit test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array", "dojo/_base/declare", "dojo/dom", "dojo/parser", "dojo/_base/window",
+			"dijit/_WidgetBase", "dijit/registry",
+			"dojo/domReady!"
+		], function(doh, array, declare, dom, parser, win, _WidgetBase, registry){
+
+			declare("foo", _WidgetBase, {
+				name: "",
+				attr1: 0,
+				attr2: 0
+			});
+	
+			declare("bar", _WidgetBase, {
+				name: "",
+				attr1: 0,
+				attr2: 0
+			});
+	
+			declare("Baz", _WidgetBase, {
+				name: "",
+				attr1: 1,
+				attr2: 1
+			});
+
+			doh.register("parse", function(){
+				parser.parse();
+			});
+
+			doh.register("dijit/registry", [
+				function byId(){
+					doh.is(registry.byId("three").name, "your");
+					doh.f(registry.byId("nonexistent"));
+				},
+				function toArray(){
+					var wa = registry.toArray();
+
+					doh.is(4, wa.length, "length");
+
+					var wda = array.map(wa, function(w){
+						return w.domNode;
+					});
+
+					var w = registry.byNode(wda[0]);
+					doh.is(w.declaredClass, "foo");
+				},
+				function getEnclosingWidget(){
+					doh.is(registry.getEnclosingWidget(dom.byId("not-a-widget")), null);
+					doh.is(registry.getEnclosingWidget(dom.byId("three")).name, "your");
+					doh.is(registry.getEnclosingWidget(dom.byId("three.one")).name, "your");
+					doh.is(registry.getEnclosingWidget(dom.byId("three.one.one")).name, "your");
+				},
+				function findWidgets(){
+					doh.is(3, registry.findWidgets(win.body()).length);
+					doh.is(1, registry.findWidgets(dom.byId("threeWrapper")).length);
+				},
+				function destroy(){
+					registry.byId("two").destroy();
+					registry.byId("four").destroy();
+					var names = array.map(registry.toArray(), function(widget){ return widget.name; });
+					doh.is(names.join(" "), "bob your");
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+<body>
+	<h1>Dijit/registry Unit Test</h1>
+	<div id="one" data-dojo-type="foo" data-dojo-props='name:"bob", attr1:10, attr2:10'></div>
+	<div id="two" data-dojo-type="foo" data-dojo-props='name:"is", attr1:5, attr2:10'></div>
+	<div id="threeWrapper">
+		<div id="three" data-dojo-type="bar" data-dojo-props='name:"your", attr1:5, attr2:5'>
+			<div id="three.one">
+				<div id="three.one.one"></div>
+				<div id="four" data-dojo-type="bar" data-dojo-props='name:"uncle", attr1:10, attr2:5'></div>
+			</div>
+		</div>
+	</div>
+	<div id="not-a-widget"></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/resources/TestContextRequireWidget.js b/src/main/resources/static/dijit/tests/resources/TestContextRequireWidget.js
new file mode 100644
index 0000000000000000000000000000000000000000..223dc13a23788f281f0dc09bc1af164e1bc425d5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/resources/TestContextRequireWidget.js
@@ -0,0 +1,17 @@
+define([
+	"require",
+	"dojo/_base/declare",
+	"dijit/_WidgetBase",
+	"dijit/_TemplatedMixin",
+	"dijit/_WidgetsInTemplateMixin",
+	"./TestWidget"
+], function(require, declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin){
+
+	// This module requires utilises a relative MID in the template.  Because of the synchronous nature of the widget
+	// lifecycle, you need to require in any modules in the template into the parent module (as auto-require will not
+	// work) as well as require in the context require and pass it as part of the declare.
+	return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
+		templateString: '<div><div data-dojo-type="./TestWidget" data-dojo-attach-point="fooNode"></div></div>',
+		contextRequire: require
+	});
+});
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/resources/TestWidget.js b/src/main/resources/static/dijit/tests/resources/TestWidget.js
new file mode 100644
index 0000000000000000000000000000000000000000..4873302856861f05d4ae4fd4b5a41b203ed96527
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/resources/TestWidget.js
@@ -0,0 +1,10 @@
+define([
+	"dojo/_base/declare",
+	"dijit/_WidgetBase",
+	"dijit/_TemplatedMixin"
+], function(declare, _WidgetBase, _TemplatedMixin){
+	return declare([_WidgetBase, _TemplatedMixin], {
+		templateString: '<div data-dojo-attach-point="fooNode">TestWidget</div>',
+		foo: "bar"
+	});
+});
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/resources/helloWorld.pdf b/src/main/resources/static/dijit/tests/resources/helloWorld.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..cc648dd837f3f55c14a9fadd02a90360e061c7be
Binary files /dev/null and b/src/main/resources/static/dijit/tests/resources/helloWorld.pdf differ
diff --git a/src/main/resources/static/dijit/tests/robot/BgIframe.html b/src/main/resources/static/dijit/tests/robot/BgIframe.html
new file mode 100644
index 0000000000000000000000000000000000000000..e60230c4e5b0cc2f54cec27f7d52196b01bfcef9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/BgIframe.html
@@ -0,0 +1,173 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot bgIframe Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/dom", "dojo/on", "dojo/sniff", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, array, dom, on, has, winUtils, helpers){
+
+				robot.initRobot('../test_bgIframe.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+				});
+
+				array.forEach(["pdf", "flash"], function(xId){
+					doh.register(xId, [
+					{
+						name: "dialog_" + xId,
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							winUtils.scrollIntoView(xId);
+
+							var wasClicked = false;
+							var connection;
+							
+							// show the dialog; show it programmatically because we may have just scrolled the "show
+							// dialog" button off the screen)
+							registry.byId("dialog").show();
+							
+							// drag the dialog on top of the pdf
+							robot.mouseMoveAt(registry.byId("dialog").titleNode, 2000,  1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(xId, 500,  1000);
+							robot.mouseRelease({left: true}, 500);
+							
+							robot.sequence(function(){
+								connection = on(registry.byId("dialog").containerNode, "click", function(e){ wasClicked = true; });
+							}, 500); 
+							
+							// click on the dialog
+							robot.mouseMoveAt(registry.byId("dialog").containerNode, 1, 1);
+							robot.mouseClick({left: true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								connection.remove();
+								// derify the native select did not disappear
+								doh.t(helpers.isVisible(dom.byId("dropDown_" + xId, robot.doc)), "The native select is not visible");
+								
+								registry.byId("dialog").hide();
+								
+								doh.t(wasClicked, "Dialog was not visible because the onclick did not fire.");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "tooltip_" + xId,
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var tooltipWasClicked = false;
+							var connection, oldHide;
+							
+							// dhow the tooltip
+							robot.mouseMoveAt("two_" + xId, 500, 1);
+							
+							robot.sequence(function(){ 
+								var tooltip = registry.byId("dijit__MasterTooltip_0");
+								oldHide = tooltip.hide;
+								tooltip.hide = function(aroundNode){
+									// don't allow the tooltip to be hidden
+								};
+								connection = on(tooltip.domNode, "click",
+									function(e){
+										tooltipWasClicked = true;
+										tooltip.hide = oldHide;
+										tooltip.hide(tooltip.aroundNode);
+									}
+								);
+							}, 2000); 
+							
+							// Click on the tooltip
+							robot.mouseMoveAt("dijit__MasterTooltip_0", 1, 1);
+							robot.mouseClick({left: true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								connection.remove();
+								doh.t(tooltipWasClicked, "The tooltip is not visible because the onclick event was not fired.");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "dateTextBox_" + xId,
+						timeout: 7000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var wasClicked = false;
+							var connection;
+							
+							// Show the popup
+							var textbox = registry.byId("dateText_" + xId);
+							robot.mouseMoveAt(textbox._buttonNode, 500, 1);
+							robot.mouseClick({left: true}, 500);
+							
+							robot.sequence(function(){
+								connection = on(registry.byId("dateText_"+xId+"_popup").domNode, "click", function(e){ wasClicked = true; });
+							}, 2000); 
+							
+							// Click on the popup
+							robot.mouseMoveAt("dateText_"+xId+"_popup", 1, 1, 10, 10);
+							robot.mouseClick({left: true}, 500);
+							
+							robot.sequence(d.getTestCallback(function(){
+								connection.remove();
+								doh.t(wasClicked);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "menu_" + xId,
+						timeout: 7000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var wasClicked = false;
+							registry.byId("copy_"+xId).onClick = function(e){ wasClicked = true; };
+
+							// Show the popup
+							var button = registry.byId("menuButton_" + xId);
+							robot.mouseMoveAt(button.domNode, 500, 1);
+							robot.mouseClick({left: true}, 500);
+
+							// Click on the popup
+							robot.mouseMoveAt("copy_"+xId);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(wasClicked);
+							}), 1000);
+
+							return d;
+						}
+					}
+					]);
+				});
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Calendar_a11y.html b/src/main/resources/static/dijit/tests/robot/Calendar_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..370b52ffb6853a72a7b2b17b951667760342933c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Calendar_a11y.html
@@ -0,0 +1,402 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Calendar A11Y Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/date", "dojo/date/locale", "dojo/dom", "dojo/keys", "dojo/_base/lang",
+				"dojo/query", "dojo/sniff",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, array, date, datelocale, dom, keys, lang, query, has, helpers){
+
+				robot.initRobot('../test_Calendar.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+				});
+
+				// refs to Calendar widgets
+				var cal1, cal5;
+
+				// log of calls to onChange handler
+				var changes = [];
+
+				doh.register("API", [
+					function noValue(){
+						// refs to Calendar widget
+						cal1 = registry.byId('calendar1');
+
+						// Although Calendar and DateTextBox prototypes defined value as Date("")
+						// (so that the parser knows value is a Date rather than a string),
+						// the convention is to use null to represent a blank DateTextBox or Calendar w/no selection
+						doh.is(null, registry.byId("calendar1").get("value"), 'initial get("value"), no selection');
+
+						cal1.set("value", new Date(2009, 8, 16));
+						doh.is(0, date.compare(new Date(2009, 8, 16), cal1.get('value')), 'get("value") after set');
+
+						cal1.set("value", null);
+						doh.is(null, cal1.get("value"), 'get("value") after set to null');
+					},
+
+					function initialValue(){
+						cal5 = registry.byId("calendar5");
+
+						var selectedDate = query(".dijitCalendarSelectedDate", cal5.domNode);
+						doh.is(1, selectedDate.length, "date is selected");
+						doh.is("14", helpers.innerText(selectedDate[0]), "selected date");
+
+						var selectedMonth = query(".dijitCalendarCurrentMonthLabel", cal5.domNode);
+						doh.is(1, selectedMonth.length, "month is selected");
+						doh.is("March", helpers.innerText(selectedMonth[0]), "selected month");
+
+						var selectedYear = query(".dijitCalendarSelectedYear", cal5.domNode);
+						doh.is(1, selectedYear.length, "year is selected");
+						doh.is("2008", helpers.innerText(selectedYear[0]), "selected year");
+					}
+				]);
+				
+				// Test aria roles, etc.
+				doh.register("aria", function(){
+					// test all days are loaded correctly
+					var dateCells = registry.byId("calendar1").dateCells;
+					array.forEach(dateCells, function(cellNode){
+						doh.is("false", cellNode.getAttribute("aria-selected"), "aria-selected should be false at startup");
+						doh.is(undefined, cellNode.getAttribute("aria-disabled should be undefined at startup"), "aria-disabled");
+					});
+										
+					// disable weekends
+					array.forEach(registry.toArray(), function(c){
+						if(c.isDisabledDate){
+							c.isDisabledDate = datelocale.isWeekend;
+							c._populateGrid();
+						}
+					});
+					
+					// select a day
+					registry.byId("calendar1").set("value",  new Date(2009, 8, 15));
+					
+					array.forEach(dateCells, function(cellNode, index){
+						var selected = cellNode.getAttribute("aria-selected");
+						var disabled = cellNode.getAttribute("aria-disabled");
+						helpers.innerText(cellNode)==="15" ? doh.is("true", selected, "aria-selected should be true: "+helpers.innerText(cellNode))
+											       : doh.is("false", selected, "aria-selected should still be true: "+helpers.innerText(cellNode));
+						(index%7==0) || (index%7==6) ? doh.is("true", disabled, "aria-disabled should be true for weekends: "+index)
+													 : doh.t((disabled==undefined || disabled=="" || disabled=="false"), "aria-disabled should still be undefined, 'false', or ''. Index was: "+index+" Value was: "+disabled);
+					});
+					
+					// enable all again
+					array.forEach(registry.toArray(), function(c){
+						if(c.isDisabledDate){
+							c.isDisabledDate = function(){return false;};
+							c._populateGrid();
+						}
+					});
+					
+					// select a different day
+					registry.byId("calendar1").set("value",  new Date(2009, 8, 17));
+					
+					array.forEach(dateCells, function(cellNode, index){
+						var selected = cellNode.getAttribute("aria-selected");
+						var disabled = cellNode.getAttribute("aria-disabled");
+						helpers.innerText(cellNode)==="17" ? doh.is("true", selected, "aria-selected should be true for day 17: "+helpers.innerText(cellNode))
+											       : doh.is("false", selected, "aria-selected should be false again: "+helpers.innerText(cellNode));
+						doh.t((disabled==undefined || disabled=="" || disabled=="false"), "aria-disabled should be undefined, 'false', or '' again");
+					});
+					
+				});
+
+				// Tabindex test makes sure that there's exactly one tab stop on the calendar at all times
+				doh.register("tabindex", [
+					{
+						name: "forward",
+						timeout: 10000,
+						setUp: function(){
+							cal1.set("value", new Date(2009, 8, 16));
+
+							dom.byId("before").focus();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Tab in
+							robot.keyPress(keys.TAB, 1000, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(16, helpers.innerText(dfocus.curNode), "first tab goes to selected day");
+							})), 500);
+
+							// Move around some
+							robot.keyPress(keys.RIGHT_ARROW, 0, {});
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(24, helpers.innerText(dfocus.curNode), "move around some");
+							})), 500);
+
+							// Tab out
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.is("after", dfocus.curNode.id, "next tab leaves calendar");
+							})), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "reverse",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// shift-tab back into calendar, should go to previously focused day
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(24, helpers.innerText(dfocus.curNode), "shift-tab returns to previously focused day");
+							})), 500);
+
+							// shift-tab out
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.is("before", dfocus.curNode.id, "next shift-tab leaves calendar");
+							})), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "advance a month",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Tab in
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(24, helpers.innerText(dfocus.curNode), "first tab goes to selected day");
+							})), 500);
+
+							// Move to next month
+							robot.keyPress(keys.PAGE_DOWN, 0, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(24, helpers.innerText(dfocus.curNode), "moved to same day, but new month");
+							})), 500);
+
+							// Tab out
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.is("after", dfocus.curNode.id, "next tab leaves calendar");
+							})), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "reverse again",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// shift-tab back into calendar, should go to previously focused day
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(24, helpers.innerText(dfocus.curNode), "shift-tab returns to previously focused day");
+							})), 500);
+
+							// shift-tab out
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.is("before", dfocus.curNode.id, "next shift-tab leaves calendar");
+							})), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				// Make sure that all the navigation and selection keystrokes work
+				doh.register("navigation", [
+					{
+						name: "arrow navigation",
+						timeout: 10000,
+						setUp: function(){
+							// refs to Calendar widget
+						    	cal1 = registry.byId('calendar1');
+							cal1.set("value", new Date(2009, 8, 16));
+
+					    	// setup onChange handler to monitor onChange calls on cal1
+							cal1.on("change", function(val){
+								console.log('onchange w/value: ', val);
+								changes.push(val);
+							});
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(function(){
+								// monitor onchange events
+								changes = [];
+								cal1.focus();
+							}, 500);
+
+							// Initial conditions
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								// 16th is selected
+								var selected = query(".dijitCalendarSelectedDate", cal1.domNode);
+								doh.is(1, selected.length, "one selected node");
+								doh.is("16", helpers.innerText(selected[0]));
+
+								// initial focus is on selected value
+								doh.is("16", helpers.innerText(dfocus.curNode));
+
+								// and get("value") working
+								doh.is(0, date.compare(new Date(2009, 8, 16), cal1.get('value')), 'get("value")');
+							})), 1000);
+
+							// Mouse moves around focus without changing value
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								// focus moved from 16 to 17
+								doh.is(17, helpers.innerText(dfocus.curNode));
+
+								doh.is(0, date.compare(new Date(2009, 8, 16), cal1.get('value')), 'value unchanged');
+								
+								// 16th is still selected
+								var selected = query(".dijitCalendarSelectedDate", cal1.domNode);
+								doh.is(1, selected.length, "one selected node");
+								doh.is("16", helpers.innerText(selected[0]));
+							})), 500);
+							robot.keyPress(keys.RIGHT_ARROW, 0, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(18, helpers.innerText(dfocus.curNode));
+							})), 500);
+							robot.keyPress(keys.DOWN_ARROW, 0, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(25, helpers.innerText(dfocus.curNode));
+							})), 500);
+							robot.keyPress(keys.LEFT_ARROW, 0, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(24, helpers.innerText(dfocus.curNode));
+							})), 500);
+							robot.keyPress(keys.UP_ARROW, 0, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(17, helpers.innerText(dfocus.curNode));
+							})), 500);
+							robot.keyPress(keys.UP_ARROW, 0, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is(10, helpers.innerText(dfocus.curNode));
+							})), 500);
+							robot.keyPress(keys.ENTER, 0, {});
+
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								var value = cal1.get('value');
+								doh.is(0, date.compare(new Date(2009, 8, 10), value), 'actual value is ' + value);
+								doh.is(1, changes.length, 'onchange events');
+								doh.is(0, date.compare(new Date(2009, 8, 10), changes[0]),
+										'value reported by onchange: ' + changes[0] +
+										', should be ' + new Date(2009, 8, 10));
+							})), 1000);
+							return d;
+						}
+					},
+					{
+						name: "month navigation",
+						timeout: 5000,
+						setUp: function(){
+							// refs to Calendar widget
+					   	 	cal1 = registry.byId('calendar1');
+							cal1.set("value", new Date(2008, 0, 31));
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(function(){
+								cal1.focus();
+							}, 500);
+
+							robot.keyPress(keys.PAGE_DOWN, 1000, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								// focus moved from jan 31 to feb 29
+								doh.is(29, helpers.innerText(dfocus.curNode));
+
+								doh.is(0, date.compare(new Date(2008, 0, 31), cal1.get('value')), 'value unchanged (first page down)');
+
+								// month label should have changed
+								var monthLabel = query(".dijitCalendarCurrentMonthLabel", cal1.domNode);
+								doh.is(1, monthLabel.length, "one month label");
+								doh.is("February", helpers.innerText(monthLabel[0]));
+
+								// jan 31 from previous month still visible, should be shown as selected
+								var selected = query(".dijitCalendarSelectedDate", cal1.domNode);
+								doh.is(1, selected.length, "no selected node");
+							})), 500);
+
+							robot.keyPress(keys.PAGE_DOWN, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								// focus moved from jan 31 to feb 29
+								doh.is(29, helpers.innerText(dfocus.curNode));
+
+								doh.is(0, date.compare(new Date(2008, 0, 31), cal1.get('value')), 'value unchanged (second page down)');
+								
+								// since january no longer visible, no selected date should be visible
+								var selected = query(".dijitCalendarSelectedDate", cal1.domNode);
+								doh.is(0, selected.length, "no selected node");
+							})), 500);
+
+							robot.keyPress(keys.SPACE, 500, {});
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								var value = cal1.get('value');
+								doh.is(0, date.compare(new Date(2008, 2, 29), value), 'actual value is ' + value);
+							})), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "month+year navigation",
+						timeout: 5000,
+						setUp: function(){
+							// refs to Calendar widget
+						    	cal1 = registry.byId('calendar1');
+							cal1.set("value", new Date(2008, 1, 15));
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(function(){
+								cal1.focus();
+							}, 500);
+
+							robot.keyPress(keys.END, 1000, {});
+							// Chrome switches tabs with ctrl+page up/down (not even a keydown is generated), yet not Safari.
+							// I don't see a way to do feature-detection since browser window focus is lost.
+							robot.keyPress(keys.PAGE_DOWN, 500, has("chrome") ? {alt:true} : {ctrl:true});
+							robot.keyPress(keys.PAGE_UP, 500, has("chrome") ? {alt:true} : {ctrl:true});
+							robot.keyPress(keys.PAGE_UP, 500, has("chrome") ? {alt:true} : {ctrl:true});
+							robot.keyPress(keys.ENTER, 500);
+
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								var value = cal1.get('value');
+								doh.is(0, date.compare(new Date(2007, 1, 28), value), 'actual value is ' + value);
+							})), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/ColorPalette.html b/src/main/resources/static/dijit/tests/robot/ColorPalette.html
new file mode 100644
index 0000000000000000000000000000000000000000..f256f2fb01b66069615497b7c93f73cdc6104202
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/ColorPalette.html
@@ -0,0 +1,280 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot ColorPalette Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/dom-class", "dojo/keys", "dojo/_base/lang", "dojo/query", "dojo/sniff",
+				"dojo/domReady!"
+			], function(doh, robot, dom, domClass, keys, lang, query, has){
+
+				robot.initRobot('../test_ColorPalette.html');
+
+				var big, small, prog;
+
+				// log of calls to onChange handler
+				var changes = [];
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+
+					// refs to ColorPalette widgets
+					big = registry.byId("big");
+					small = registry.byId("small");
+					prog = registry.byId("prog");
+
+					// setup onChange handler to monitor onChange calls
+					big.on("change", function(val){
+						console.log('onchange w/value: ', val);
+						changes.push(val);
+					});
+				});
+
+				doh.register("dijit.ColorPalette tests", [
+					{
+						name: "initial conditions",
+						runTest: function(){
+							doh.f(big.get('value'), "no value for big");
+							doh.f(small.get('value'), "no value for small");
+							doh.f(prog.get('value'), "no value for prog");
+						}
+					},
+					{
+						name: "accessibility roles and attributes",
+						runTest: function(){
+							doh.is(big.domNode.getAttribute("role"), "grid", "domNode role is grid");
+
+							var result = big.domNode.getAttribute("aria-label");
+							doh.t(!!result, "aria-label for big");
+
+							var table = query("table", big.domNode)[0];
+							doh.is(table.getAttribute("role"), "presentation", "table should be presentation");
+
+							var row = query("tr", table)[0];
+							doh.is(row.getAttribute("role"), "row", "tr should be role=row since domNode role=grid");
+
+							var td = query("td", row)[0];
+							doh.is(td.getAttribute("role"), "gridcell", "td role should be gridcell");
+						}
+					},
+					
+					// TODO: when attr() is implemented as a setter, add tests like big.set("value", "#ffc0cb")
+
+					{
+						name: "focus",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							big.focus();
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(0, changes.length, "no onchange events yet");
+								
+								// test that focus is on top left cell
+								var focus = dfocus.curNode;
+								doh.t(focus, "something is focused");
+								var imgNode = focus.getElementsByTagName("img")[0];
+								doh.t(imgNode, "found image node");
+
+								var dye = big._getDye(focus);
+								doh.is("#ffffff", dye.getValue(), "focused on white");
+							}), 500);
+							
+							return d;
+						}
+					},
+
+					{
+						name: "arrow navigation",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								enterPressed = false;
+
+							// Move around some
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+							
+							// Focus should follow the current position for the benefit of screen readers.
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								var focus = dfocus.curNode;
+								doh.t(focus, "something is focused");
+								
+								var imgNode = focus.getElementsByTagName("img")[0];
+								doh.t(imgNode, "found image node");
+
+								var dye = big._getDye(focus);
+								doh.is("#ffc0cb", dye.getValue(), "focused on right color");
+							})), 1000);
+
+							// Setup handler to catch onChange event from ENTER keypress below
+							handle = big.on("change", d.getTestCallback(lang.hitch(this, function(val){
+								handle.remove();
+								handle = null;
+
+								doh.is("#ffc0cb", val, "onChange() argument");
+								doh.is("#ffc0cb", big.get("value"), "get('value')");
+
+								doh.is(1, changes.length, 'just one onchange event');
+								doh.t(enterPressed, "onChange event didn't come until enter key was pressed");
+								
+								big.set('value', null);
+								doh.is(big.get('value'), null, "value has been cleared");
+							})));
+
+							// Select the current value
+							robot.sequence(function(){
+								enterPressed = true;
+							}, 0);
+							robot.keyPress(keys.ENTER, 500, {});
+
+							return d;
+						},
+						tearDown: function(){
+							if(handle){
+								handle.remove();
+							}
+						}
+					},
+
+					{
+						name: "tab stops",
+						timeout: 10000,
+						runTest: function(){
+							// After the navigation above, make sure that there's (still) exactly one
+							// tab stop associated w/the color picker
+							var d = new doh.Deferred();
+
+							dom.byId("beforeBig").focus();
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("pink", dfocus.curNode.title, "tab into colorpalette, focus goes to pink (last focused cell)")
+							}), 1000);
+
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("afterBig", dfocus.curNode.id, "another tab, went to input after ColorPalette")
+							}), 1000);
+
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("pink", dfocus.curNode.title, "shift-tab back into colorpalette")
+							}), 1000);
+
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("beforeBig", dfocus.curNode.id, "another shift-tab, to input before ColorPalette")
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "small palette (keyboard)",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// go to small colorpalette
+							dom.byId("beforeSmall").focus();
+							robot.keyPress(keys.TAB, 500, {});
+
+							// select a value
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								var value = small.get('value');
+								doh.is("#ffff00", value);
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "small palette (mouse)",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Testing nls too...
+							var red = query("td[title=rojo]", small.domNode);
+							doh.is(1, red.length, "found rojo (red)");
+
+							robot.mouseMoveAt(red[0], 500);
+							robot.mouseClick({left: true}, 500);
+							if(has("mozilla")){
+								// workaround robot bug where first mouse click doesn't happen occasionally :-(
+								robot.mouseClick({left: true}, 500);
+							}
+							
+							var green = query("td[title=verde]", small.domNode);
+							doh.is(1, green.length, "found verde (green)");
+
+							// Make sure <img> alt and title are translated.  Not sure why they are being set at all though.
+							var greenImg = query("img", green[0]);
+							doh.is(1, greenImg.length, "found <img> inside of <td>");
+							doh.is("verde", greenImg[0].getAttribute("alt"), "img.alt");
+							doh.is("verde", greenImg[0].getAttribute("title"), "img.title");
+
+							robot.mouseMoveAt(green[0], 500);
+							robot.mouseClick({left: true}, 500);
+							if(has("mozilla")){
+								// workaround robot bug where first mouse click doesn't happen occasionally :-(
+								robot.mouseClick({left: true}, 500);
+							}
+
+							robot.sequence(d.getTestCallback(function(){
+								// test that value set
+								var value = small.get('value');
+								doh.is("#008000", value, "value");
+								
+								// test that focus also got set
+								var focus = dfocus.curNode;
+								doh.t(focus, "something is focused");
+								var imgNode = focus.getElementsByTagName("img")[0];
+								doh.t(imgNode, "found image node");
+								var dye = small._getDye(focus);
+								doh.is("#008000", dye.getValue(), "focused");
+								
+								// test that selected style was removed from previously selected cell and added to new selection
+								doh.f(domClass.contains(red[0], "dijitPaletteCellSelected"),
+									"Red swatch should not have selected class, actual class is: " + red[0].className);
+								doh.t(domClass.contains(green[0], "dijitPaletteCellSelected"),
+									"Green swatch should have selected class, actual class is: " + green[0].className);
+							}), 1000);
+							
+							
+							return d;
+						}
+					},
+					function valuePreselected(){
+						var cp = registry.byId("valuePreselected");
+						doh.is("#0000ff", cp.get("value"), "get('value')");
+						doh.is("blue", query(".dijitPaletteCellSelected img", cp.domNode)[0].alt, "marked");
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/ConfirmDialog_a11y.html b/src/main/resources/static/dijit/tests/robot/ConfirmDialog_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..b3ade4edae510ee835cac6d40d794ebca6768eb6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/ConfirmDialog_a11y.html
@@ -0,0 +1,111 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>robot ConfirmDialog A11Y Test</title>
+
+	<style>
+		<style>
+		@import "../../../util/doh/robot/robot.css";
+	</style>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx",
+			"dojo/dom", "dojo/keys",
+			"dijit/tests/helpers", "dojo/domReady!"
+		], function(doh, robot, dom, keys, helpers){
+
+			robot.initRobot('../test_ConfirmDialog.html');
+
+			doh.register(function setup(){
+				dfocus = robot.window.require("dijit/focus");
+			});
+
+			doh.register("Form", [
+				{
+					name: "OK",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Open drop down
+						dom.byId("loginButton").focus();
+						robot.keyPress(keys.SPACE, 1000, {});
+
+						// Enter some data
+						robot.typeKeys("scott", 1000, 800);
+						robot.keyPress(keys.TAB, 500, {});
+						robot.typeKeys("tiger", 1000, 800);
+
+						// Submit
+						robot.keyPress(keys.TAB, 500, {});
+						robot.keyPress(keys.SPACE, 500, {});
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(helpers.isHidden("loginDlg"), "dialog hidden");
+							doh.is("scott/tiger", dom.byId("formData").value, "form data");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "cancel",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Open drop down
+						dom.byId("loginButton").focus();
+						robot.keyPress(keys.SPACE, 1000, {});
+
+						// Cancel
+						robot.keyPress(keys.TAB, 500, {});
+						robot.keyPress(keys.TAB, 500, {});
+						robot.keyPress(keys.TAB, 500, {});
+						robot.keyPress(keys.SPACE, 500, {});
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(helpers.isHidden("loginDlg"), "dialog hidden");
+							doh.is("", dom.byId("formData").value, "form data");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "tabbing loops around",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Open drop down
+						dom.byId("loginButton").focus();
+						robot.keyPress(keys.SPACE, 1000, {});	// focuses "name"
+
+						robot.keyPress(keys.TAB, 500, {});	// to "password"
+						robot.keyPress(keys.TAB, 500, {});	// to "OK"
+						robot.keyPress(keys.TAB, 500, {});	// to "Cancel"
+						robot.keyPress(keys.TAB, 500, {});	// to "name"
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("user", dfocus.curNode.name, "focus looped back to name field");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/ConfirmTooltipDialog_a11y.html b/src/main/resources/static/dijit/tests/robot/ConfirmTooltipDialog_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..b5c582dc26e29d606d913fb4a2175a8163b3ac01
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/ConfirmTooltipDialog_a11y.html
@@ -0,0 +1,140 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>robot ConfirmDialog A11Y Test</title>
+
+<style>
+	<style>
+	@import "../../../util/doh/robot/robot.css";
+</style>
+
+<!-- required: dojo.js -->
+<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true"></script>
+
+<script type="text/javascript">
+require([
+	"doh/runner", "dojo/robotx",
+	"dojo/dom", "dojo/keys",
+	"dijit/tests/helpers", "dojo/domReady!"
+], function(doh, robot, dom, keys, helpers){
+
+	robot.initRobot('../test_ConfirmTooltipDialog.html');
+
+	doh.register(function setup(){
+		dfocus = robot.window.require("dijit/focus");
+	});
+
+	doh.register("ColorPicker", [
+		{
+			name: "OK",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Open drop down
+				dom.byId("colorButton").focus();
+				robot.keyPress(keys.SPACE, 1000, {});
+
+				// Select a color
+				robot.keyPress(keys.RIGHT_ARROW, 500, {});
+				robot.keyPress(keys.DOWN_ARROW, 500, {});
+				robot.keyPress(keys.SPACE, 500, {});
+
+				// Submit
+				robot.keyPress(keys.TAB, 500, {});
+				robot.keyPress(keys.SPACE, 500, {});
+
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(helpers.isHidden("colorDlg"), "dialog hidden");
+					doh.is("#ffc0cb", dom.byId("selectedColor").value, "selected color");
+				}), 500);
+
+				return d;
+			}
+		},
+
+		{
+			name: "Cancel",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Open drop down
+				dom.byId("colorButton").focus();
+				robot.keyPress(keys.SPACE, 1000, {});
+
+				// Cancel
+				robot.keyPress(keys.TAB, 500, {});
+				robot.keyPress(keys.TAB, 500, {});
+				robot.keyPress(keys.SPACE, 500, {});
+
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(helpers.isHidden("colorDlg"), "dialog hidden");
+					doh.is("", dom.byId("selectedColor").value, "selected color");
+				}), 500);
+
+				return d;
+			}
+		}
+	]);
+
+	doh.register("Form", [
+		{
+			name: "OK",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Open drop down
+				dom.byId("loginButton").focus();
+				robot.keyPress(keys.SPACE, 1000, {});
+
+				// Enter some data
+				robot.typeKeys("scott", 1000, 800);
+				robot.keyPress(keys.TAB, 500, {});
+				robot.typeKeys("tiger", 1000, 800);
+
+				// Submit
+				robot.keyPress(keys.TAB, 500, {});
+				robot.keyPress(keys.SPACE, 500, {});
+
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(helpers.isHidden("loginDlg"), "dialog hidden");
+					doh.is("scott/tiger", dom.byId("formData").value, "form data");
+				}), 500);
+
+				return d;
+			}
+		},
+
+		{
+			name: "tabbing loops around",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Open drop down
+				dom.byId("loginButton").focus();
+				robot.keyPress(keys.SPACE, 1000, {});	// focuses "name"
+
+				robot.keyPress(keys.TAB, 500, {});	// to "password"
+				robot.keyPress(keys.TAB, 500, {});	// to "OK"
+				robot.keyPress(keys.TAB, 500, {});	// to "Cancel"
+				robot.keyPress(keys.TAB, 500, {});	// to "name"
+
+				robot.sequence(d.getTestCallback(function(){
+					doh.is("user", dfocus.curNode.name, "focus looped back to name field");
+				}), 500);
+
+				return d;
+			}
+		}
+	]);
+
+	doh.run();
+});
+</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Dialog_a11y.html b/src/main/resources/static/dijit/tests/robot/Dialog_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..1e850690d9229d8be08244ee11181f387205554a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Dialog_a11y.html
@@ -0,0 +1,621 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Dialog A11Y Test</title>
+
+		<style>
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/aspect", "dojo/dom", "dojo/dom-class", "dojo/dom-style", "dojo/keys",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, aspect, dom, domClass, domStyle, keys, helpers){
+
+				robot.initRobot('../test_Dialog.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+					DialogUnderlay = robot.window.require("dijit/DialogUnderlay");
+				});
+
+				doh.register("keyboard tests (cancel)", [
+					{
+						name: "open dialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Click the button.  We do this manually rather than calling Dialog.show()
+							// so we can later test that focus is restored (to the previous position)
+							// when the dialog is closed
+							dom.byId("dialog1button").focus();
+							robot.keyPress(keys.SPACE, 1000, {});
+							robot.typeKeys("Bill", 1000, 800);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("dialog1"), "dialog 1 has been made visible");
+								doh.is("name", dfocus.curNode.id, "focus is on the first field");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "tab to the date field",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.TAB, 500, {});
+							robot.typeKeys("Japan", 1000, 1000);
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("date", dfocus.curNode.id, "focus is on the date field");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open and close date drop down",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.keyPress(keys.ESCAPE, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("date", dfocus.curNode.id, "focus is still on the date field");
+								doh.t(helpers.isVisible("dialog1"), "dialog 1 wasn't closed");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "tabbing loops around",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("name", dfocus.curNode.id, "focus looped back to name field");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "reverse-tabbing loops around",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.TAB, 500, {shift: true});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("ok", dfocus.curNode.id, "focus looped back to submit button");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close via ESC",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.ESCAPE, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("dialog1"), "dialog 1 was closed");
+								doh.is("dialog1button", dfocus.curNode.id, "focus returned to button");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("keyboard tests (submit)", [
+					{
+						name: "submit some data",
+						timeout: 15000,
+						setUp: function(){
+							registry.byId("dialog1").reset();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Setup handler to catch submitted data
+							var data;
+							aspect.after(registry.byId("dialog1"), "execute", function(vals){
+								data = vals;
+							}, true);
+
+							// Open the dialog
+							dom.byId("dialog1button").focus();
+							robot.keyPress(keys.SPACE, 1000, {});
+
+							// Enter some info
+							robot.typeKeys("Ted", 2000, 600);
+							robot.keyPress(keys.TAB, 500, {});
+							robot.typeKeys("America", 1000, 1400);
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 1000, {});
+							robot.keyPress(keys.TAB, 1000, {});
+							robot.keyPress(keys.TAB, 1000, {});
+
+							// Submit
+							robot.keyPress(keys.SPACE, 1000, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("dialog1"), "dialog 1 was closed on submit");
+								doh.t(data, "got submit data");
+								doh.is("Ted", data.name, "Name");
+								doh.is("America", data.loc, "Location");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("keyboard tests (cancel via Cancel button)", [
+					{
+						name: "close Dialog via Cancel button",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Test which callbacks are called on cancel
+							var executed = false, canceled = false;
+							aspect.after(registry.byId("ABDlg1"), "execute", function(vals){
+								executed = true;
+							}, true);
+							registry.byId("ABDlg1").on("cancel", function(){
+								canceled = true;
+							});
+
+							// Open the dialog
+							dom.byId("ABDlg1Btn").focus();
+							robot.keyPress(keys.SPACE, 1000, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("ABDlg1"), "dialog opened");
+							}), 1000);
+
+							// Cancel
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("ABDlg1"), "dialog closed on cancel");
+								doh.t(canceled, "cancel callback was called");
+								doh.f(executed, "execute callback wasn't called");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				// Test aria roles, etc.
+				doh.register("aria", function(){
+					var dlog = registry.byId("dialog1");
+					doh.is("dialog", dlog.domNode.getAttribute("role"), "role");
+					doh.is("dialog1_title", dlog.domNode.getAttribute("aria-labelledby"), "aria-labelledby");
+					doh.isNot(undefined, dom.byId("dialog1_title"), "label node exists");
+					doh.isNot("", helpers.innerText(dom.byId("dialog1_title")), "label node has text");
+					// dijit.Dialog does not implement aria-expanded as of this writing -- should it?
+				});
+
+				// Focus tests for special cases.   Focus for normal cases was already tested above.
+				doh.register("special focus", [
+					{
+						name: "no focusable elements",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Click the button.  We do this manually rather than calling Dialog.show()
+							// so we can later test that focus is restored (to the previous position)
+							// when the dialog is closed
+							dom.byId("unmovablebutton").focus();
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #1");
+								doh.t(domClass.contains(dfocus.curNode, "dijitDialogCloseIcon"), "focus is on the close button #1");
+							}), 1000);
+
+							// Tab key shouldn't change the focus
+							robot.keyPress(keys.TAB, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #2");
+								doh.t(domClass.contains(dfocus.curNode, "dijitDialogCloseIcon"), "focus is on the close button #2");
+							}), 500);
+
+							// Space key should close the dialog
+							robot.keyPress(keys.SPACE, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #3");
+								doh.is("unmovablebutton", dfocus.curNode.id, "focus is back on the button that opened the dialog #1");
+							}), 500);
+
+							// Open the dialog again
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #4");
+								doh.t(domClass.contains(dfocus.curNode, "dijitDialogCloseIcon"), "focus is on the close button #4");
+							}), 500);
+
+							// Esc key should also close the dialog
+							robot.keyPress(keys.ESCAPE, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #5");
+								doh.is("unmovablebutton", dfocus.curNode.id, "focus is back on the button that opened the dialog #2");
+							}), 500);
+
+							return d;
+						}
+					},
+					
+					{
+						name: "input type=file",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Click the button.  We do this manually rather than calling Dialog.show()
+							// so we can later test that focus is restored (to the previous position)
+							// when the dialog is closed
+							dom.byId("filebutton").focus();
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #1");
+								doh.is("afile", dfocus.curNode.id, "focus is on the input type=file");
+							}), 1000);
+
+							// Esc key should close the dialog
+							robot.keyPress(keys.ESCAPE, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #2");
+								doh.is("filebutton", dfocus.curNode.id, "focus is back on the button that opened the dialog");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "radio button as last element",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Click the button.  We do this manually rather than calling Dialog.show()
+							// so we can later test that focus is restored (to the previous position)
+							// when the dialog is closed
+							dom.byId("RadioButtonDlgBtn").focus();
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #1");
+								doh.is("textarea-radio-test", dfocus.curNode.id, "focus is on the textarea");
+							}), 1000);
+
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #2");
+								doh.is("textarea-radio-test", dfocus.curNode.id, "focus wraps around back to the textarea");
+							}), 500);
+
+							// Esc key should close the dialog
+							robot.keyPress(keys.ESCAPE, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(dfocus.curNode, "focus is somewhere #3");
+								doh.is("RadioButtonDlgBtn", dfocus.curNode.id, "focus is back on the button that opened the dialog");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("keyboard tests (multiple dialogs)", [
+					{
+						name: "open first dialog",
+						timeout: 10000,
+						setUp: function(){
+							registry.byId("dialog1").reset();
+						},
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Click the button.  We do this manually rather than calling Dialog.show()
+							// so we can later test that focus is restored (to the previous position)
+							// when the dialog is closed
+							dom.byId("dialog1button").focus();
+							robot.keyPress(keys.SPACE, 1000, {});
+							robot.typeKeys("lower", 1000, 1000);
+
+							// Move focus to second field
+							robot.keyPress(keys.TAB, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("dialog1"), "dialog 1 is visible");
+
+								var dialog1Z = domStyle.get(registry.byId("dialog1").domNode, "zIndex"),
+									underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+
+								doh.t(dialog1Z > underlayZ, "dialog1 (zIndex=" + dialog1Z +
+									") above underlay (zIndex=" + underlayZ + ")");
+
+								doh.is("loc", dfocus.curNode.id, "focus is on the second field");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open second dialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							registry.byId("tabDialog").show();
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("tabDialog"), "tab dialog has been made visible");
+								doh.t(helpers.isVisible("dialog1"), "dialog 1 is still visible");
+
+								var tabDialogZ = domStyle.get(registry.byId("tabDialog").domNode, "zIndex"),
+									dialog1Z = domStyle.get(registry.byId("dialog1").domNode, "zIndex"),
+									underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+
+								doh.t(tabDialogZ > underlayZ, "tabDialog (zIndex=" + tabDialogZ +
+									") above underlay (zIndex=" + underlayZ + ")");
+								doh.t(dialog1Z < underlayZ, "dialog1 (zIndex=" + dialog1Z +
+									") below underlay (zIndex=" + underlayZ + ")");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "cancel second dialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.ESCAPE, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("tabDialog"), "tab dialog has been hidden");
+								doh.t(helpers.isVisible("dialog1"), "dialog 1 is still visible");
+
+								var dialog1Z = domStyle.get(registry.byId("dialog1").domNode, "zIndex"),
+									underlayZ = domStyle.get(DialogUnderlay._singleton.domNode, "zIndex");
+
+								doh.t(dialog1Z > underlayZ, "dialog1 (zIndex=" + dialog1Z +
+									") above underlay (zIndex=" + underlayZ + ")");
+
+								doh.is("loc", dfocus.curNode.id, "focus is on the second field");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "cancel first dialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.ESCAPE, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("dialog1"), "dialog 1 was closed");
+								doh.is("dialog1button", dfocus.curNode.id, "focus returned to button");
+							}), 2000);
+
+							return d;
+						}
+					}
+				]);
+
+				// Testing if focus somehow gets shifted to an element behind the underlay, by (for example)
+				// access keys, or tabbing in from the URL bar, or clicking the underlay, thus focusing <body>.
+				doh.register("focus return", [
+					{
+						name: "open first",
+						timeout: 10000,
+						runTest: function(){
+							return registry.byId('dialog1').show();
+						}
+					},
+					{
+						name: "open second",
+						timeout: 10000,
+						runTest: function(){
+							var fifthDlg = registry.byId('fifthDlg');
+							return fifthDlg.show().then(function(){
+								return fifthDlg.onLoadDeferred;
+							});
+						}
+					},
+					{
+						name: "focus main page",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dom.byId("plainInput").focus();
+
+							setTimeout(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("fifthDlg"), "dialog 5 still visible");
+								doh.is("timeref", dfocus.curNode && dfocus.curNode.id,
+										"focus remains on / returned to dialog");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "close second",
+						timeout: 10000,
+						runTest: function(){
+							return registry.byId('fifthDlg').hide();
+						}
+					},
+					{
+						name: "focus main page again",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dom.byId("plainInput").focus();
+
+							setTimeout(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("dialog1"), "dialog 1 still visible");
+								doh.is("name", dfocus.curNode && dfocus.curNode.id,
+										"focus remains on / returned to dialog");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "close first",
+						timeout: 10000,
+						runTest: function(){
+							return registry.byId('dialog1').hide();
+						}
+					}
+				]);
+
+				// Negative test for "focus return".   If the execute() handler shifts focus somewhere,
+				// make sure it isn't automatically shifted back to the Dialog (which is fading out but
+				// not yet hidden).
+				doh.register("focus in execute", [
+					{
+						name: "use dialog",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Open the dialog
+							dom.byId("insertTextButton", robot.doc).focus();
+							robot.keyPress(keys.SPACE, 500, {});
+
+							// Enter some info
+							robot.typeKeys("Hello world", 2000, 600);
+
+							// Submit
+							robot.keyPress(keys.TAB, 1000, {});
+							robot.keyPress(keys.SPACE, 1000, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("editor", dfocus.curNode.id, "focus returned to editor");
+								doh.is("Hello world", dom.byId("editor", robot.doc).value, "text inserted");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("closable", [
+					{
+						name: "open dialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dom.byId("unclosableButton").focus();
+							robot.keyPress(keys.SPACE, 1000, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("unclosable"), "visible");
+								doh.t(helpers.isHidden(registry.byId("unclosable").closeButtonNode), "close icon hidden");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close via ESC",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.ESCAPE, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("unclosable"), "still visible");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close via ENTER on OK button",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("unclosable"), "hidden");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Dialog_focusDestroy.html b/src/main/resources/static/dijit/tests/robot/Dialog_focusDestroy.html
new file mode 100644
index 0000000000000000000000000000000000000000..4eec5199c67ad0d3c78f8af36943211d15e008ee
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Dialog_focusDestroy.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot dialog focus destroy Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/keys", "dojo/_base/lang", "dojo/domReady!"
+			], function(doh, robot, dom, keys, lang){
+				robot.initRobot('../test_Dialog_focusDestroy.html');
+
+				doh.register("TestDestroy", [
+					{
+						name: "destroy",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("testInput", 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.BACKSPACE, 500);
+							robot.keyPress(keys.BACKSPACE, 500);
+							robot.keyPress(keys.BACKSPACE, 500);
+							robot.keyPress("a", 1000);
+							robot.mouseMoveAt("showDialog", 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress("a", 1000);
+							robot.mouseMoveAt("destroyButton", 500);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("testInput", 500);
+							robot.mouseClick({left:true}, 500);
+							robot.keyPress(keys.BACKSPACE, 500);
+							robot.keyPress("b", 1000);
+							
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								var inputBox = dom.byId("testInput");
+								doh.is("b", inputBox.value);
+							})), 1000);
+
+							return d;
+						}
+					}
+				]);
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Dialog_mouse.html b/src/main/resources/static/dijit/tests/robot/Dialog_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..5f23e1c798b440d3da7a6cb2098177473f67ce5e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Dialog_mouse.html
@@ -0,0 +1,381 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>robot Dialog Mouse Test</title>
+
+<style>
+	@import "../../../util/doh/robot/robot.css";
+</style>
+
+<!-- required: dojo.js -->
+<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true"></script>
+
+<script type="text/javascript">
+require([
+	"doh/runner", "dojo/robotx",
+	"dojo/aspect", "dojo/dom", "dojo/keys", "dojo/query",
+	"dijit/tests/helpers", "dojo/domReady!"
+], function(doh, robot, aspect, dom, keys, query, helpers){
+
+	robot.initRobot('../test_Dialog.html');
+
+	doh.register(function setup(){
+		// get pointer to registry in the iframe
+		registry = robot.window.require("dijit/registry");
+		dfocus = robot.window.require("dijit/focus");
+	});
+
+
+	doh.register("dijit.Dialog mouse tests (cancel)", [
+		{
+			name: "open dialog",
+			timeout: 4000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				var oldOnClick = registry.byId("dialog1button").onClick;
+				registry.byId("dialog1button").onClick = function(){
+					registry.byId("dialog1").show().then(d.getTestCallback(function(){
+						doh.t(helpers.isVisible("dialog1"), "dialog 1 has been made visible");
+						doh.is("name", dfocus.curNode.id, "focus is on the first field");
+					}));
+					registry.byId("dialog1button").onClick = oldOnClick;
+				};
+
+				// Open the dialog
+				robot.mouseMoveAt("dialog1button", 1000);
+				robot.mouseClick({left: true}, 1000);
+
+				return d;
+			}
+		},
+
+		{
+			name: "test that other controls on page can't be clicked",
+			timeout: 4000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				robot.mouseMoveAt("plainInput", 500);
+				robot.mouseClick({left: true}, 1000);
+
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(helpers.isVisible("dialog1"), "dialog 1 still visible");
+					doh.isNot("plainInput", dfocus.curNode && dfocus.curNode.id,
+							"focus did not go to plain input");
+				}), 1000);
+
+				return d;
+			}
+		},
+
+		{
+			name: "open date drop down",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				helpers.onFocus(d.getTestCallback(function(){
+					var calDomNode = query(".dijitCalendarContainer");
+					doh.t(1, calDomNode.length, "found calendar");
+					doh.t(helpers.isVisible(calDomNode[0]), "calendar is being shown");
+					doh.t(dom.isDescendant(dfocus.curNode, calDomNode[0]), "focus is on the calendar");
+				}), 500);	// Focus might first go to input, then to calendar, so wait for that
+
+
+				robot.mouseMoveAt(function(){
+					return query(".dijitArrowButton", registry.byId("date").domNode)[0];
+				}, 500);
+				robot.mouseClick({left: true}, 1000);
+
+				return d;
+			}
+		},
+
+		{
+			name: "close date drop down",
+			timeout: 4000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				robot.mouseMove(10, 10, 500);
+				robot.mouseClick({left: true}, 1000);
+
+				robot.sequence(d.getTestCallback(function(){
+					var calDomNode = query(".dijitCalendarContainer");
+					doh.t(calDomNode.length == 0 || helpers.isHidden(calDomNode[0]), "calendar has disappeared");
+					doh.t(helpers.isVisible("dialog1"), "dialog 1 wasn't closed");
+				}), 1000);
+
+				return d;
+			}
+		},
+
+		{
+			name: "cancel dialog",
+			timeout: 5000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				var button = query("#dialog1 .dijitDialogCloseIcon")[0];
+				robot.mouseMoveAt(button, 500);
+				robot.mouseClick({left: true}, 500);
+
+				robot.sequence(d.getTestCallback(function(node){
+					doh.t(helpers.isHidden("dialog1"), "dialog 1 was closed");
+				}), 500);
+
+				return d;
+			}
+		}
+	]);
+
+	doh.register("dijit.Dialog mouse tests (submit)", [
+		{
+			name: "submit some data",
+			timeout: 15000,
+			setUp: function(){
+				registry.byId("dialog1").reset();
+			},
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Setup handler to catch submitted data
+				var data;
+				aspect.after(registry.byId("dialog1"), "execute", function(vals){
+					data = vals;
+				}, true);
+
+				// Open the dialog
+				robot.mouseMoveAt("dialog1button", 500, 1);
+				robot.mouseClick({left: true}, 500);
+
+				// Enter some info
+				robot.mouseMoveAt("name", 500, 1);
+				robot.mouseClick({left: true}, 500);
+				robot.typeKeys("Ted", 500, 600);
+
+				robot.mouseMoveAt("loc", 500, 1);
+				robot.mouseClick({left: true}, 500);
+				robot.typeKeys("America", 500, 1400);
+
+				// Submit
+				robot.mouseMoveAt("ok", 500, 1);
+				robot.mouseClick({left: true}, 500);
+
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(helpers.isHidden("dialog1"), "dialog 1 was closed on submit");
+					doh.t(data, "got submit data");
+					doh.is("Ted", data.name, "Name");
+					doh.is("America", data.loc, "Location");
+				}), 1000);
+
+				return d;
+			}
+		}
+	]);
+
+	doh.register("dijit.Dialog mouse tests (unfocusable open button)", [
+		{
+			name: "open #1",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Open the dialog
+				robot.mouseMoveAt("SelfDestructDlgBtn2", 1000);
+				robot.mouseClick({left: true}, 1000);
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(registry.byId("SelfDestructDlg"), "dialog created");
+					doh.t(helpers.isVisible("SelfDestructDlgBtn2"), "dialog has been made visible");
+					doh.is("SelfDestructDlgInput", dfocus.curNode.id, "focus is on the first field");
+				}), 1000);
+
+				return d;
+			}
+		},
+		{
+			name: "close #1",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Close the dialog
+				robot.mouseMoveAt(function(){
+					return query("#SelfDestructDlg .dijitDialogCloseIcon")[0];
+				}, 1000);
+				robot.mouseClick({left: true}, 1000);
+				robot.sequence(d.getTestCallback(function(){
+					doh.f(registry.byId("SelfDestructDlg"), "dialog destroyed");
+
+					var focus = dfocus.curNode;
+					doh.f(focus, "focus should have been cleared, but set to " +
+							focus + (focus && focus.tagName) + (focus && focus.id));
+				}), 1000);
+
+				return d;
+			}
+		},
+		{
+			name: "open #2",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Open the dialog
+				robot.mouseMoveAt("SelfDestructDlgBtn2", 1000);
+				robot.mouseClick({left: true}, 1000);
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(registry.byId("SelfDestructDlg"), "dialog created");
+					doh.t(helpers.isVisible("SelfDestructDlgBtn2"), "dialog has been made visible");
+					doh.is("SelfDestructDlgInput", dfocus.curNode.id, "focus is on the first field");
+				}), 1000);
+
+				return d;
+			}
+		},
+		{
+			name: "close #2",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Close the dialog
+				robot.mouseMoveAt(function(){
+					return query("#SelfDestructDlg .dijitDialogCloseIcon")[0];
+				}, 1000);
+				robot.mouseClick({left: true}, 1000);
+				robot.sequence(d.getTestCallback(function(){
+					doh.f(registry.byId("SelfDestructDlg"), "dialog destroyed");
+
+					var focus = dfocus.curNode;
+					doh.f(focus, "focus should have been cleared, but set to " +
+							focus + (focus && focus.tagName) + (focus && focus.id));
+				}), 1000);
+
+				return d;
+			}
+		}
+	]);
+
+	// Opening a context menu shifts focus away from the Dialog but we shouldn't automatically shift focus back
+	doh.register("context menu", [
+		{
+			name: "open first",
+			timeout: 10000,
+			runTest: function(){
+				return registry.byId('dialog1').show();
+			}
+		},
+		{
+			name: "open context menu",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				robot.mouseMoveAt("dialog1", 500);
+				robot.mouseClick({right: true}, 1000);
+
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(helpers.isVisible("dialog1"), "dialog 1 still visible");
+					doh.t(helpers.isVisible("dialog1ContextMenu"), "context menu visible");
+					doh.is("firstMenuItem", dfocus.curNode && dfocus.curNode.id,
+							"focus on Menu");
+				}), 1000);
+
+				return d;
+			}
+		},
+		{
+			name: "close first",
+			timeout: 10000,
+			runTest: function(){
+				return registry.byId('dialog1').hide();
+			}
+		}
+	]);
+
+	doh.register("ESC", [
+		{
+			name: "open dialog",
+			timeout: 4000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Open the dialog
+				robot.mouseMoveAt("dialog1button", 1000);
+				robot.mouseClick({left: true}, 1000);
+				robot.sequence(d.getTestCallback(function(){}));
+
+				return d;
+			}
+		},
+
+		{
+			name: "click background",
+			timeout: 4000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				robot.mouseMoveAt("plainInput", 500);
+				robot.mouseClick({left: true}, 1000);
+
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(helpers.isVisible("dialog1"), "dialog 1 still visible");
+					doh.isNot("plainInput", dfocus.curNode && dfocus.curNode.id,
+							"focus did not go to plain input");
+				}), 1000);
+
+				return d;
+			}
+		},
+
+		{
+			name: "close via ESC",
+			timeout: 4000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				robot.keyPress(keys.ESCAPE, 500, {});
+
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(helpers.isHidden("dialog1"), "dialog 1 was closed");
+				}), 1000);
+
+				return d;
+			}
+		}
+	]);
+
+	doh.register("dijit.Dialog InlineEditBox w/Editor tests", [
+		{
+			name: "#17225",
+			timeout: 10000,
+			runTest: function(){
+				var d = new doh.Deferred();
+
+				// Open the dialog
+				robot.mouseMoveAt("iebDialogBtn", 1000);
+				robot.mouseClick({left: true}, 1000);
+
+				// Open second InlineEditBox
+				robot.mouseMoveAt("inlineRTE2", 1000);
+				robot.mouseClick({left: true}, 1000);
+
+				// Test that editor didn't close immediately and focus move back to the first field
+				robot.sequence(d.getTestCallback(function(){
+					doh.t(helpers.isVisible("RTE2"), "editor 2 visible");
+				}), 1000);
+
+				return d;
+			}
+		}
+	]);
+
+	doh.run();
+});
+</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Fieldset.html b/src/main/resources/static/dijit/tests/robot/Fieldset.html
new file mode 100644
index 0000000000000000000000000000000000000000..b3b4281488d19a60c8377d7f1c6a0756c89205e2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Fieldset.html
@@ -0,0 +1,94 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Fieldset Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/keys",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, keys, helpers){
+
+				robot.initRobot('../test_Fieldset.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+				});
+
+				doh.register("keyboard", [
+					{
+						name: "tabbing",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dom.byId("first", robot.document).focus();
+
+							// go to first legend
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("Fieldset 1", helpers.innerText(dfocus.curNode).replace("-", ""));
+							}), 500);
+
+							// go to second legend
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("Fieldset 2", helpers.innerText(dfocus.curNode).replace("-", ""));
+							}), 500);
+
+							// go to last input
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("last", dfocus.curNode.id);
+							}), 500);
+
+							// go to second legend
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("Fieldset 2", helpers.innerText(dfocus.curNode).replace("-", ""));
+							}), 500);
+
+							// go to first legend
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("Fieldset 1", helpers.innerText(dfocus.curNode).replace("-", ""));
+							}), 500);
+
+							// go to first input
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("first", dfocus.curNode.id)
+							}), 500);
+
+							return d;
+						}
+					}
+
+					// TODO: add basic tests for open/close
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/InlineEditBox.html b/src/main/resources/static/dijit/tests/robot/InlineEditBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..f76e73fcdcf835adfcba329998e0317775782dba
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/InlineEditBox.html
@@ -0,0 +1,430 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot InlineEditBox Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/aspect", "dojo/date/locale", "dojo/keys", "dojo/_base/lang", "dojo/query",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, array, aspect, datelocale, keys, lang, query, helpers){
+				robot.initRobot('../test_InlineEditBox.html');
+
+				function moveAndClick(node){
+					robot.mouseMoveAt(node, 500, 1);
+					robot.mouseClick({left: true}, 500);
+				}
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+				});
+
+				doh.register("dijit.InlineEditBox autosave tests", [
+					{
+						name: "CurrencyTextBox invalid value: blur",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("dollar_as");
+							moveAndClick(inlineBox.domNode);
+							robot.typeKeys("dollar", 1000, 1200); // invalid
+							moveAndClick("predefined");
+							robot.sequence(d.getTestCallback(function(){
+								var currencyTextBox = inlineBox.wrapperWidget.editWidget;
+								doh.is('dollar', currencyTextBox.get("displayedValue"), "displayedValue");
+								doh.f(currencyTextBox.isValid(), "!isValid");
+								inlineBox.cancel(false);
+								doh.is('', inlineBox.get("value"), "value");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "CurrencyTextBox invalid value: ENTER",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("dollar_as");
+							var displayedValue, isValid;
+							moveAndClick(inlineBox.domNode);
+							robot.typeKeys("dollar", 1000, 1200); // invalid
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(function(){
+								var currencyTextBox = inlineBox.wrapperWidget.editWidget;
+								displayedValue = currencyTextBox.get("displayedValue");
+								isValid = currencyTextBox.isValid();
+							}, 1000);
+							robot.keyPress(keys.ESCAPE, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is('dollar', displayedValue, "displayedValue");
+								doh.f(isValid, "!isValid");
+								doh.is('', inlineBox.get("value"), "value");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "CurrencyTextBox valid value: blur",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("dollar_as");
+							moveAndClick(inlineBox.domNode);
+							robot.typeKeys("123", 1000, 600);
+							moveAndClick("predefined");
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("$123.00", inlineBox.get("value"), "value");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "CurrencyTextBox valid value: ENTER",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("dollar_as");
+							moveAndClick(inlineBox.domNode);
+							robot.typeKeys("234", 1000, 600);
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is('$234.00', inlineBox.get("value"), "value");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "CurrencyTextBox valid value: ESCAPE",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("dollar_as");
+							moveAndClick(inlineBox.domNode);
+							robot.typeKeys("345", 1000, 600);
+							robot.keyPress(keys.ESCAPE, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("$234.00", inlineBox.get("value"), "value");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "CurrencyTextBox valid value: TAB",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("dollar_as");
+							moveAndClick(inlineBox.domNode);
+							robot.typeKeys("456", 1000, 600);
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is('$456.00', inlineBox.get("value"), "value");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "Focus test",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("editable");
+							var initialOnChange = inlineBox._onChangeValue;
+							inlineBox.set("value", "");
+							inlineBox.edit();
+							robot.typeKeys("editable", 1000, 1600);
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 1500, {}); // wait more than 1 second to TAB
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.typeKeys("567", 500, 600);
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.keyPress(keys.TAB, 500, {shift:true}); // do this fast
+							robot.keyPress(keys.TAB, 500, {shift:true}); // do this fast
+							robot.keyPress(keys.ENTER, 500, {}); // quickly back to editable
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+							robot.typeKeys(" again", 1000, 1200);
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(undefined, initialOnChange, "no onChange value");
+								doh.is('$567.00', registry.byId("dollar_as").get("value"), "value");
+								doh.is('editable again', inlineBox.get("value"), "value");
+								doh.is('editable again', inlineBox._onChangeValue, "onChange value");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "Textarea test",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("textarea");
+							moveAndClick(inlineBox.domNode);
+							robot.typeKeys("line 1", 1000, 1200);
+							robot.keyPress(keys.ENTER, 500, {});
+							robot.typeKeys("line 2", 500, 1200);
+							moveAndClick("predefined");
+							robot.sequence(d.getTestCallback(function(){
+								doh.is('line 1\\nline 2', inlineBox.get("value").replace(/\n/g, "\\n"), "textarea programmatic value was " + inlineBox.get("value").replace(/\n/g, "\\n"));
+								doh.is('line 1<br>line 2', inlineBox.domNode.innerHTML.toLowerCase(), "textarea rendered value was " + inlineBox.domNode.innerHTML);
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				// Testing that the initial display value of the InlineEditBox gets sent to the editor.
+				// For example, in this markup:
+				//		<span dojoType="dijit.InlineEditBox" ...>01/05/2007</span>
+				// When the editor is clicked the calendar should open to that date.
+				array.forEach([
+					{ widget: "CurrencyTextBox", id: "dollar", textValue: "$2,000", widgetValue: 2000 },
+					{ widget: "NumberTextBox", id: "quantity", textValue: "3", widgetValue: 3 },
+					{ widget: "ComboBox", id: "item", textValue: "refrigerators", widgetValue: "refrigerators" },
+					{ widget: "DateTextBox", id: "purchase", textValue: "01/05/2007", widgetValue: datelocale.parse("01/05/2007", {datePattern: 'MM/dd/yyyy', selector:'date'}) },
+					{ widget: "FilteringSelect", id: "state", textValue: "Pennsylvania", widgetValue: "PA" },
+					{ widget: "Select", id: "country", textValue: "United States of America", widgetValue: "US" }
+				], function(test){
+					doh.register("preDefinedValue " + test.widget, {
+						timeout: 8000,
+ 						name: test.id,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId(test.id);
+							var handler = aspect.after(inlineBox, 'edit', function(){
+								handler.remove();
+								var editWidget = inlineBox.wrapperWidget.editWidget;
+								handler = aspect.after(editWidget, '_onFocus', function(){
+									handler.remove();
+									robot.sequence(function(){
+										var
+										textValue = test.textValue,
+										value = inlineBox.get("value"),
+										visible = helpers.isVisible(editWidget),
+										expected = test.widgetValue,
+										actual = editWidget.get("value"),
+										showHandler = aspect.after(inlineBox, 'save', d.getTestCallback(function(){
+											cancelHandler.remove();
+											showHandler.remove();
+											doh.t(false, "Save was clicked");
+										}), true),
+										cancelHandler = aspect.after(inlineBox, 'onCancel', function(){
+											cancelHandler.remove();
+											showHandler.remove();
+											robot.sequence(d.getTestCallback(function(){
+												doh.is(textValue, value, "inline text value");
+												doh.t(visible, "editor widget should be visible");
+												doh.is(typeof expected, typeof actual, "editor value typeof");
+												doh.is(expected.toString(), actual.toString(), "editor widget value");
+												doh.t(helpers.isHidden(inlineBox.wrapperWidget), "editor widget should be hidden");
+											}), 500);
+										}, true),
+										buttons = query(".dijitButton", inlineBox.domNode.parentNode);
+										moveAndClick(buttons[buttons.length-2]); // Save should be disabled so nothing happens
+										moveAndClick(buttons[buttons.length-1]);
+									}, 1500);
+								}, true);
+							}, true);
+							moveAndClick(inlineBox.domNode);
+							return d;
+						}
+					})
+				});
+
+				doh.register("renderAsHtml", [
+
+					// "plain text" mode, < > & have no special meaning
+					{
+						name: "false",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// confirm initial displayed value
+							var inlineBox = registry.byId("renderAsHtml_false");
+							doh.is("&lt;B&gt;not bold&lt;/B&gt;&amp;lt;input&amp;gt;", lang.trim(inlineBox.domNode.innerHTML),
+								"confirm initial value (with special chars) wasn't modified");
+							doh.is("<B>not bold</B>&lt;input&gt;", inlineBox.get("value"),
+								"confirm initial get('value')");
+
+							// launch editor, and make sure that special characters aren't mangled
+							moveAndClick(inlineBox.domNode);
+							robot.sequence(d.getTestErrback(function(){
+								var editor = inlineBox.wrapperWidget.editWidget;
+								doh.is("<B>not bold</B>&lt;input&gt;", editor.get("value"), "initial editor value");
+							}), 1000);
+
+							// edit value and save		
+							robot.keyPress(keys.RIGHT_ARROW, 1000, {});
+							robot.typeKeys("end", 2000, 1000);
+							robot.keyPress(keys.ENTER, 500, {});
+
+							// check that display value didn't mangle special characters
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("&lt;B&gt;not bold&lt;/B&gt;&amp;lt;input&amp;gt;end", lang.trim(inlineBox.domNode.innerHTML),
+									"displayed value after edit");
+								doh.is("<B>not bold</B>&lt;input&gt;end", inlineBox.get("value"),
+									"get('value') after edit");
+							}), 1000);
+
+							return d;
+						}	
+					},
+
+					// HTML mode, display mode has rich text, which is passed to editor
+					{
+						name: "true",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// confirm initial displayed value
+							var inlineBox = registry.byId("renderAsHtml_true");
+							doh.is("&lt;b&gt;not bold&lt;/b&gt;<b>bold</b>&amp;lt;input&amp;gt;",
+								lang.trim(inlineBox.domNode.innerHTML).toLowerCase(),
+								"confirm initial value (with special chars) wasn't modified");
+							doh.is("&lt;b&gt;not bold&lt;/b&gt;<b>bold</b>&amp;lt;input&amp;gt;",
+								inlineBox.get("value").toLowerCase(),
+								"confirm initial get('value')");
+
+							// launch editor, and make sure that value was passed to editor as HTML
+							moveAndClick(inlineBox.domNode);
+							robot.sequence(d.getTestErrback(function(){
+								var editor = inlineBox.wrapperWidget.editWidget;
+								doh.is("&lt;b&gt;not bold&lt;/b&gt;<b>bold</b>&amp;lt;input&amp;gt;",
+									editor.get("value").toLowerCase(),
+									"initial editor value");
+							}), 1000);
+
+							// edit value and save		
+							robot.keyPress(keys.RIGHT_ARROW, 1000, {});
+							robot.typeKeys("end", 2000, 1000);
+							robot.keyPress(keys.ENTER, 500, {});
+
+							// check that display value didn't mangle special characters
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("&lt;b&gt;not bold&lt;/b&gt;<b>bold</b>&amp;lt;input&amp;gt;end",
+									lang.trim(inlineBox.domNode.innerHTML).toLowerCase(),
+									"displayed value after edit");
+								doh.is("&lt;b&gt;not bold&lt;/b&gt;<b>bold</b>&amp;lt;input&amp;gt;end",
+									inlineBox.get("value").toLowerCase(),
+									"get('value') after edit");
+							}), 1000);
+
+							return d;
+						}	
+					}
+				]);
+
+				doh.register("focus tests", [
+					{
+						name: "RTE",
+						timeout: 7000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("inlineRTE");
+							var handler = aspect.after(inlineBox, 'edit', function(){
+								handler.remove();
+								handler = aspect.after(inlineBox, 'save', function(){
+									handler.remove();
+									setTimeout(d.getTestCallback(function(){
+										doh.t(helpers.isHidden(inlineBox.wrapperWidget), "editor widget should be visible");
+										doh.t(inlineBox.get("value").indexOf('!start!') >= 0, "value changed");
+									}), 1000);
+								});
+								robot.typeKeys("!start!", 1, 1400);
+								var buttons = query(".saveButton", inlineBox.domNode.parentNode);
+								moveAndClick(buttons[buttons.length-1]);
+							});
+							moveAndClick(inlineBox.domNode);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("positioning", [
+					{
+						name: "offscreen",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("areaEditable");
+							inlineBox.edit();
+							moveAndClick("disableAreaEditable");
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(inlineBox.get("disabled"), "disabled");
+								inlineBox.set('disabled', false);
+								inlineBox.cancel();
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				doh.register("programmatic", [
+					{
+						name: "create",
+						timeout: 4000,
+						runTest: function(){
+							// Actually, it was already created by test_InlineEditBox
+							numWidgetsBeforeProgCreate = registry.length;
+							robot.window.programmaticCreate();
+							doh.t(!!robot.window.programmatic);
+						}
+					},
+					{
+						name: "set()",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = registry.byId("editable");
+							inlineBox.set("value", "programmatic value");
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("programmatic value", inlineBox._onChangeValue, "programmatic set causes onChange");
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "edit",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var inlineBox = robot.window.programmatic;
+							inlineBox.edit();
+							inlineBox.wrapperWidget.editWidget.set('value', 'changed');
+							inlineBox.save();
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("changed", inlineBox._onChangeValue, "editing causes onChange");
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "destroy",
+						timeout: 4000,
+						runTest: function(){
+							robot.window.programmatic.destroy();
+							var numWidgetsAfterDestroy = registry.length;
+							doh.is(numWidgetsBeforeProgCreate, numWidgetsAfterDestroy,
+									"no orphaned widgets");
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Menu_a11y.html b/src/main/resources/static/dijit/tests/robot/Menu_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..91d67f41200fda69c58da8a55e25d6c6ab81361c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Menu_a11y.html
@@ -0,0 +1,1074 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Menu Keyboard Tests</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/dom", "dojo/dom-class", "dojo/dom-geometry",
+				"dojo/keys", "dojo/query", "dojo/sniff",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, array, dom, domClass, domGeom, keys, query, has, helpers){
+
+				robot.initRobot('../test_Menu.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+				});
+
+				doh.register("dijit.MenuBar general keyboard tests", [
+					{
+						name: "start focus on the link, outside of menubar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(dfocus.curNode, "something has focus");
+								doh.is("random link", dfocus.curNode.innerHTML, "focus on the link");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "tab to the menubar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu,
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("File", helpers.innerText(dfocus.curNode), "focus on File menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "arrow to the edit menu",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});		// TODO: use left arrow in RTL mode
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("Edit", helpers.innerText(dfocus.curNode), "focus on Edit MenuItem");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "shift-tab back",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.TAB, 500, {shift:true});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("random link", helpers.innerText(dfocus.curNode),
+										"focus back on the link");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open file menu",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500, 500);
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu
+							robot.keyPress(keys.TAB, 500, {});
+
+							// and then down arrow to menu... focus should go to "New"
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("New", helpers.innerText(dfocus.curNode).substr(0, 3),
+										"focus on New menu item of the File menu (indirectly checks that menu is visible)");
+
+								// Check aria-labelledby property
+								var menuNode;
+								for(var menuNode = dfocus.curNode; menuNode.getAttribute("role") != "menu";
+									menuNode = menuNode.parentNode){}
+								var menuLabelNode = dom.byId(menuNode.getAttribute("aria-labelledby"), robot.doc),
+									menuLabel = helpers.innerText(menuLabelNode);
+								doh.is("File", menuLabel, "label of menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "click 'new' using enter key",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var clicked = false;
+							registry.byId("new").onClick = function(){ clicked = true; };
+
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(clicked, "new was clicked");
+								doh.t(helpers.isHidden("fileMenu"), "File menu disappeared");
+								doh.f(domClass.contains("file", "dijitMenuItemSelected"),
+									"File MenuBarItem should no longer have selected effect, actual class is: " + dom.byId("file").className);
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open submenu",
+						timeout: 8000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500, 500);
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu item
+							robot.keyPress(keys.TAB, 500, {});
+
+							// and then move to "View" menu item
+							robot.typeKeys("v", 500, 200);
+
+							// open the Zoom submenu (landing on first item)
+							robot.typeKeys("z", 500, 200);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(/50%/.test(helpers.innerText(dfocus.curNode)), "focus on '50%'");
+								robot.keyPress(keys.ENTER, 0, {}, true); // close popup menus
+							}), 1000, 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("dijit.MenuBar focus after execute", [
+					{
+						name: "open edit menu",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500, 500);
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu
+							robot.keyPress(keys.TAB, 500, {});
+
+							// arrow to edit menu
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});		// TODO: use left arrow in RTL mode
+
+							// and then down arrow to menu... focus should go to "Cut"
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("Cut", helpers.innerText(dfocus.curNode).substr(0, 3));
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "click 'cut' using enter key",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								// Although "Edit" is not marked as selected, and although the MenuBar is in passive
+								// mode, focus should be back on "Edit"
+								doh.is("Edit", helpers.innerText(dfocus.curNode), "focus back on Edit in MenuBar")
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "right arrow to view",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// arrow to view MenuBarItem
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});		// TODO: use left arrow in RTL mode
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("View", helpers.innerText(dfocus.curNode));
+								doh.t(domClass.contains(dom.byId("view"), "dijitMenuItemSelected"),
+										"View MenuBarItem should have selected class, actual class is:" + dom.byId("view").className);
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("dijit.MenuBar repeat open keyboard tests", [
+					{
+						name: "start focus on the link, outside of menubar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(dfocus.curNode, "something has focus");
+								doh.is("random link", dfocus.curNode.innerHTML, "focus on the link");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "tab to the menubar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu,
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("File", helpers.innerText(dfocus.curNode), "focus on File menu");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open file menu #1",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("New", helpers.innerText(dfocus.curNode).substr(0, 3),
+										"focus on New MenuItem");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close file menu #1",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("File", helpers.innerText(dfocus.curNode),
+										"focus on File MenuBarItem again");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open file menu #2",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("New", helpers.innerText(dfocus.curNode).substr(0, 3),
+										"focus on New MenuItem again");
+							}), 750);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close file menu #2",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("File", helpers.innerText(dfocus.curNode),
+										"focus on File MenuBarItem yet again");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				// Using left-arrow to back up (#10437)
+				doh.register("dijit.MenuBar left arrow tests", [
+					{
+						name: "start focus on the link, outside of menubar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(dfocus.curNode, "something has focus");
+								doh.is("random link", dfocus.curNode.innerHTML, "focus on the link");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "tab to the menubar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu,
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("{F}ile", registry.getEnclosingWidget(dfocus.curNode).label,
+										"focus on File MenuItem");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "arrow to the view menu",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});		// TODO: use left arrow in RTL mode
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});		// TODO: use left arrow in RTL mode
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("View", helpers.innerText(dfocus.curNode),
+										"focus on View MenuItem");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "down to the zoom menuitem",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.DOWN_ARROW, 500, {});	// focuses "Normal", first menu item
+							robot.keyPress(keys.DOWN_ARROW, 500, {});	// focuses "Outline", second menu item
+							robot.keyPress(keys.DOWN_ARROW, 500, {});	// focuses "Zoom", third menu item
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("{Z}oom", registry.getEnclosingWidget(dfocus.curNode).label,
+										"focus on Zoom MenuItem");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open the zoom menu",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("50%", registry.getEnclosingWidget(dfocus.curNode).label,
+										"focus on Zoom MenuItem");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close Zoom menu, back to View menu",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("{Z}oom", registry.getEnclosingWidget(dfocus.curNode).label,
+										"focus on Zoom MenuItem");
+
+								doh.is(0, query("#zoomMenu .dijitMenuItemSelected").length,
+									"dijitMenuItemSelected removed from Zoom Menu")
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close View menu, back to MenuBar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// This should move focus to "Edit" in the MenuBar, which then opens
+							// the drop down and focuses on the first item (Cut)
+							robot.keyPress(keys.LEFT_ARROW, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("C{u}t", registry.getEnclosingWidget(dfocus.curNode).label,
+										"focus on first MenuItem in Edit Menu");
+
+								doh.is(0, query("#viewMenu .dijitMenuItemSelected").length,
+									"dijitMenuItemSelected removed from View Menu")
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("dijit.MenuBar nested click focus test", [
+					{
+						name: "start focus on the link, outside of menubar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(dfocus.curNode, "something has focus");
+								doh.is("random link", dfocus.curNode.innerHTML, "focus on the link");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "tab to the menubar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu,
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("{F}ile", registry.getEnclosingWidget(dfocus.curNode).label,
+										"focus on File MenuItem");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "arrow to the view menu",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});		// TODO: use left arrow in RTL mode
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});		// TODO: use left arrow in RTL mode
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("View", helpers.innerText(dfocus.curNode), "focus on View MenuItem");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "down to the zoom menuitem",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.DOWN_ARROW, 250, {});	// focuses "Normal", first menu item
+							robot.keyPress(keys.DOWN_ARROW, 250, {});	// focuses "Outline", second menu item
+							robot.keyPress(keys.DOWN_ARROW, 250, {});	// focuses "Zoom", third menu item
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("{Z}oom", registry.getEnclosingWidget(dfocus.curNode).label,
+										"focus on Zoom MenuItem");
+							}), 250);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open the zoom menu",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.RIGHT_ARROW, 250, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("50%", registry.getEnclosingWidget(dfocus.curNode).label,
+										"focus on Zoom MenuItem");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "click to close Zoom menu, focus back to MenuBar",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// This should move focus to "Edit" in the MenuBar, which then opens
+							// the drop down and focuses on the first item (Cut)
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("{V}iew", registry.getEnclosingWidget(dfocus.curNode).label,
+										"focus on first View item in MenuBar");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("dijit.MenuBar MenuBarItem tests", [
+					{
+						name: "navigate to MenuBarItem",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500, 500);
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu,
+							robot.keyPress(keys.TAB, 500, {});
+
+							// arrow six times gets to "Click me!"
+							for(var i=0; i<6; i++){
+								robot.keyPress(keys.RIGHT_ARROW, 250, {});		// TODO: use left arrow in RTL mode
+							}
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("Click me! (Z)", helpers.innerText(dfocus.curNode),
+										"focus on MenuBarItem");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "down arrow",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// down arrow... should have no effect since there's no menu
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("Click me! (Z)", helpers.innerText(dfocus.curNode),
+										"focus is still on MenuBarItem");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "click",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var clicked;
+							robot.window.noPopupMenuBarItem.on("click", function(){ clicked = true; });
+
+							robot.keyPress(keys.SPACE, 250, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(clicked, "clicked");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "right arrow",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// right arrow show go back to File menu
+							robot.keyPress(keys.RIGHT_ARROW, 250, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("File", helpers.innerText(dfocus.curNode), "focus moved to File menu");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				// Run test about opening context menu via keyboard, except on safari/mac where that isn't
+				// possible (#9927)
+				if(!has("mac") || !has("webkit")){
+					var tests = has("mac") ?
+						[
+							{label: "ctrl-space", key: keys.SPACE, options: {ctrl: true}}
+						] :
+						[
+							{label: "context menu key", key: 525, options: {}},	// 93 in JS but 525 in Java
+							{label: "shift-F10", key: keys.F10, options: {shift: true}}
+						];
+					doh.register("Context menu keyboard tests", array.map(tests, function(test){
+						return {
+							name: "open global context menu via " + test.label,
+							timeout: 5000,
+							runTest: function(){
+								var d = new doh.Deferred();
+
+								// Focus random element to make sure menu is opened near focus point.
+								robot.sequence(function(){
+									dom.byId("input").focus();
+								}, 500);
+
+								// open via keyboard
+								robot.keyPress(test.key, 500, test.options);
+
+								robot.sequence(d.getTestErrback(function(){
+									var menu = registry.byId("windowContextMenu");
+									doh.t(helpers.isVisible(menu), "menu is now shown");
+
+									var menuCoords = domGeom.position(menu.domNode),
+										aroundCoords = domGeom.position("input");
+
+									// Check that menu's top left corner is near focus point,
+									// rather than upper-left hand corner of browser window.
+									doh.t(menuCoords.x < aroundCoords.x + 100, "x < 100", "actual x: " + menuCoords.x);
+									doh.t(menuCoords.y < aroundCoords.y + 50, "y < 50", "actual y: " + menuCoords.y);
+									doh.t(menuCoords.x >= aroundCoords.x, "x >= 0", "actual x: " + menuCoords.x);
+									doh.t(menuCoords.y >= aroundCoords.y, "y >= 0", "actual y: " + menuCoords.y);
+									doh.t(domClass.contains("windowContextMenuFirstChoice", "dijitMenuItemSelected"),
+											"first choice selected");
+
+									robot.keyPress(keys.ESCAPE, 250, {}); // close context menu
+
+									robot.sequence(d.getTestCallback(function(){
+										doh.t(helpers.isHidden(menu), "menu disappeared");
+									}), 1000);
+								}), 1000);
+
+								return d;
+							}
+						};
+					}));
+				}
+
+				doh.register("Left click menu keyboard tests", {
+					name: "open left click context menu",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Tab to node to be opened by keyboard.
+						robot.sequence(function(){
+							dom.byId("input").focus();
+						}, 500);
+						robot.keyPress(keys.TAB, 500);
+
+						// open via keyboard
+						robot.keyPress(keys.SPACE, 500);
+
+						robot.sequence(d.getTestErrback(function(){
+							var menu = registry.byId("leftClickContextMenu");
+							doh.t(helpers.isVisible(menu), "menu is now shown");
+
+							// Check that menu's top is near focus point, rather than upper-left hand corner of browser
+							// window.  Since the focus node is on the right of the screen though, it might be to the
+							// left.
+							var menuCoords = domGeom.position(menu.domNode);
+							doh.t(menuCoords.x > 100, "actual x: " + menuCoords.x);
+							doh.t(menuCoords.y > 100, "actual y: " + menuCoords.y);
+							doh.t(domClass.contains("leftClickMenuFirstChoice", "dijitMenuItemSelected"),
+									"first choice selected");
+
+							robot.keyPress(keys.ESCAPE, 250, {}); // close context menu
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden(menu), "menu disappeared");
+							}), 1000);
+						}), 1000);
+
+						return d;
+					}
+				});
+
+				doh.register("Cancellation (ESCAPE) tests", [
+					{
+						name: "MenuBar selection and cancellation",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500, 500);
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu,
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.keyPress(keys.DOWN_ARROW, 500, {}); // open File menu
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("fileMenu"), "File menu should be visible");
+							}), 1000);
+
+							robot.keyPress(keys.ESCAPE, 250, {}); // close File menu
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isHidden("fileMenu"), "File menu is hidden after cancel");
+								doh.t(domClass.contains("file", "dijitMenuItemSelected"),
+									"File MenuBarItem should have selected class, actual class is: " + dom.byId("file").className);
+							}), 1000);
+
+							robot.keyPress(keys.RIGHT_ARROW, 250, {}); // move to Edit menu
+							robot.sequence(d.getTestErrback(function(){
+								doh.f(domClass.contains("file", "dijitMenuItemSelected"),
+									"File MenuBarItem should not have selected class, actual class is: " + dom.byId("file").className);
+								doh.t(helpers.isHidden("editMenu"), "Edit menu is hidden after cancel and select");
+								doh.t(domClass.contains("edit", "dijitMenuItemSelected"),
+									"Edit MenuBarItem should have selected class, actual class is: " + dom.byId("edit").className);
+							}), 500);
+
+							robot.typeKeys("e", 250, 1000); // open Edit menu
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("editMenu"), "edit menu appeared");
+							}), 1000);
+
+							robot.typeKeys("p", 250, 300); // select paste
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isHidden("editMenu"), "edit menu disappeared");
+							}), 1000);
+
+							robot.typeKeys("f", 250, 300); // open File menu
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("fileMenu"), "File menu should be visible");
+							}), 1000);
+
+							robot.keyPress(keys.RIGHT_ARROW, 75, {}); // #9846
+							robot.keyPress(keys.RIGHT_ARROW, 75, {}); // move to View menu
+							robot.keyPress(keys.LEFT_ARROW, 75, {}); // move to Edit menu
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("editMenu"), "Edit menu should be visible and File menu hidden");
+								doh.t(helpers.isHidden("fileMenu"), "File menu should be hidden and Edit menu visible");
+							}), 1000);
+
+							robot.keyPress(keys.ESCAPE, 250, {}); // close Edit menu
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("editMenu"), "edit menu disappeared");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("CheckedMenuItem", [
+					{
+						name: "initial conditions",
+						runTest: function(){
+							doh.is("true", registry.byId("checked1").domNode.getAttribute("aria-checked"), "checked1 aria-checked");
+							doh.t(registry.byId("checked1").checked, "checked1 value");
+							doh.is("false", registry.byId("checked2").domNode.getAttribute("aria-checked"), "checked2 aria-checked");
+							doh.f(registry.byId("checked2").checked, "checked2 value");
+						}
+					},
+
+					{
+						name: "nav to checked1",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start at the link
+							robot.sequence(function(){
+								dom.byId("link").focus();
+							}, 500, 500);
+
+							// tab to the MenuBar, then to the left hand menu
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+
+							// down arrow to "checked 1"
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("checked1", dfocus.curNode.getAttribute("id"), "focus on checked1");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "click checked1",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.SPACE, 250, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(registry.byId("checked1").checked, "checked1 --> unchecked");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "nav to checked2",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("checked2", dfocus.curNode.getAttribute("id"), "focus on checked2");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "click checked2",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.SPACE, 250, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(registry.byId("checked2").checked, "checked2 --> checked");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("keyboard search", [
+					{
+						name: "multi-char search failure",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							dom.byId("link").focus();
+
+							// tab to the MenuBar, then to the left hand menu
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+							robot.keyPress(keys.DOWN_ARROW, 250, {});
+							robot.keyPress(keys.RIGHT_ARROW, 250, {});
+							robot.typeKeys("sd", 500, 400); // multi-char letter search should fail
+
+							robot.sequence(d.getTestCallback(function(){
+								var menu = registry.byId("navMenuSub2");
+								doh.f(helpers.isVisible(menu), "sub-sub-menu is not shown");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "search with SPACE",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.typeKeys("submenu Item t", 600, 2000); // multi letter search should work
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("Submenu Item Two", registry.getEnclosingWidget(dfocus.curNode).label, "focus on second MenuItem in sub Menu");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "search with full text to make sure it's found",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.typeKeys("sUBMENU iTEM oNE", 600, 3000); // multi letter search should work
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("Submenu Item One", registry.getEnclosingWidget(dfocus.curNode).label, "focus on second MenuItem in sub Menu");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "search with full text to make sure it's moving",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.typeKeys("submenu item two", 600, 3000); // multi letter search should work
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("Submenu Item Two", registry.getEnclosingWidget(dfocus.curNode).label, "focus on second MenuItem in sub Menu");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "search again with the same full text to make sure it's not just picking the next item",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.typeKeys("submenu item two", 600, 3000); // multi letter search should work
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("Submenu Item Two", registry.getEnclosingWidget(dfocus.curNode).label, "focus on second MenuItem in sub Menu");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "search opens sub-menu",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.typeKeys("sds", 600, 3500); // single letter search should work after long delays
+
+							robot.sequence(d.getTestCallback(function(){
+								var menu = registry.byId("navMenuSub2");
+								doh.t(helpers.isVisible(menu), "sub-sub-menu is shown");
+								doh.is("Sub-sub-menu Item Two", registry.getEnclosingWidget(dfocus.curNode).label, "focus on second MenuItem in sub-sub Menu");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "SPACE closes menu after keyboard search",
+						timeout: 9000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.typeKeys(" ", 600, 300);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(helpers.isVisible(registry.byId("navMenuSub1")), "sub-menu is shown");
+								doh.f(helpers.isVisible(registry.byId("navMenuSub2")), "sub-sub-menu is shown");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Menu_iframe.html b/src/main/resources/static/dijit/tests/robot/Menu_iframe.html
new file mode 100644
index 0000000000000000000000000000000000000000..84cfd3739bff87199244b066122449506094159a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Menu_iframe.html
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Menu iframe Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+			
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/dom-style", "dojo/keys", "dojo/_base/lang", "dojo/query",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, domClass, keys, lang, query, helpers){
+
+				robot.initRobot('../test_Menu_iframe.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+				});
+
+				var handler, menu;
+				doh.register("TestMenuIFrame", [
+					{
+						name: "detachMenu",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							menu = registry.byId("menu");
+							handler = menu.on('open', function(){
+								d.errback(new doh._AssertFailure('user context menu should not have opened'));
+							});
+							robot.mouseMoveAt("detachMenu", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("iframe", 1000, 1);
+							robot.sequence(function(){
+								robot.keyPress(keys.ESCAPE, 1000, {}, true);
+							}, 0);
+							robot.mouseClick({right:true}, 500);
+							
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.f(helpers.isVisible(menu.domNode), "menu hidden");
+							})), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(handler){
+								handler.remove();
+							}
+						}
+					},
+					{
+						name: "reattachMenu",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.window.scrollTo(0,0);
+							robot.mouseMove(30, 30, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("reattachMenu", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("iframe", 500, 1);
+							robot.mouseClick({right:true}, 500);
+							
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								var menu = registry.byId("menu");
+								doh.t(helpers.isVisible(menu.domNode), "menu visible");
+							})), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "resetToDoc",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("resetToDoc", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("iframe", 500, 1);
+							robot.mouseClick({right:true}, 500);
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								var menu = registry.byId("menu");
+								doh.t(helpers.isVisible(menu.domNode), "menu visible");
+
+								var iframe = dom.byId("iframe");
+								var heading = query("h1", iframe.contentWindow.document)[0];
+								doh.is("Document 0", heading.innerHTML, "heading.innerHTML");
+							})), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "detachMenu2",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							menu = registry.byId("menu");
+							handler = menu.on('open', function(){
+								d.errback(new doh._AssertFailure('user context menu should not have opened'));
+							});
+							robot.mouseMoveAt("detachMenu", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("iframe", 1000, 1);
+							robot.sequence(function(){
+								robot.keyPress(keys.ESCAPE, 1000, {}, true);
+							}, 0);
+							robot.mouseClick({right:true}, 500);
+							
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.f(helpers.isVisible(menu.domNode), "menu hidden");
+							})), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(handler){
+								handler.remove();
+							}
+						}
+					},
+					{
+						name: "reattachMenu2",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.window.scrollTo(0,0);
+							robot.mouseMove(30, 30, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("reattachMenu", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("iframe", 500, 1);
+							robot.mouseClick({right:true}, 500);
+							
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								var menu = registry.byId("menu");
+								doh.t(helpers.isVisible(menu.domNode), "menu visible");
+							})), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "resetToBill",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("resetToBill", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("iframe", 500, 1);
+							robot.mouseClick({right:true}, 500);
+							
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								var menu = registry.byId("menu");
+								doh.t(helpers.isVisible(menu.domNode), "menu visible");
+
+								var iframe = dom.byId("iframe");
+								var div = query("div", iframe.contentWindow.document)[0];
+								doh.is("bill was here", div.innerHTML, "div.innerHTML");
+							})), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "detachMenu3",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							menu = registry.byId("menu");
+							handler = menu.on('open', function(){
+								d.errback(new doh._AssertFailure('user context menu should not have opened'));
+							});
+							robot.mouseMoveAt("detachMenu", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("iframe", 1000, 1);
+							robot.sequence(function(){
+								robot.keyPress(keys.ESCAPE, 1000, {}, true);
+							}, 0);
+							robot.mouseClick({right:true}, 500);
+							
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.f(helpers.isVisible(menu.domNode), "menu hidden");
+							})), 1000);
+
+							return d;
+						},
+						tearDown: function(){
+							if(handler){
+								handler.remove();
+							}
+						}
+					},
+					{
+						name: "reattachMenu3",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.window.scrollTo(0,0);
+							robot.mouseMove(30, 30, 500);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("reattachMenu", 500, 1);
+							robot.mouseClick({left:true}, 500);
+							robot.mouseMoveAt("iframe", 500, 1);
+							robot.mouseClick({right:true}, 500);
+							
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								var menu = registry.byId("menu");
+								doh.t(helpers.isVisible(menu.domNode), "menu visible");
+							})), 1000);
+
+							return d;
+						}
+					}
+				]);
+				
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Menu_mouse.html b/src/main/resources/static/dijit/tests/robot/Menu_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..137b97b9f4e4fa778d7216880188ff569f525b3a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Menu_mouse.html
@@ -0,0 +1,662 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Menu Mouse Tests</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/dom-class", "dojo/dom-geometry", "dojo/keys",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, domClass, domGeom, keys, helpers){
+
+				robot.initRobot('../test_Menu.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+				});
+
+				doh.register("dijit.MenuBar mouse tests", [
+
+					{
+						name: "mouse over file MenuBarItem",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Check initial conditions
+							doh.f(domClass.contains("file", "dijitMenuItemHover"), "File MenuBarItem doesn't have hover effect");
+							doh.t(helpers.isHidden("fileMenu"), "File menu is hidden");
+
+							// Move over the File MenuBarItem
+							robot.mouseMoveAt("file", 500, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								// The "File" MenuBarItem should be highlighted
+								doh.t(domClass.contains("file", "dijitMenuItemHover"),
+									"File MenuBarItem should have hover effect, actual class is: " + dom.byId("file").className);
+
+								// However, just moving over the MenuBarItem shouldn't have opened the menu
+								doh.t(helpers.isHidden("fileMenu"), "File menu is hidden");
+							}), 1000);	// 1000ms == give IE time to make that background iframe
+
+							return d;
+						}
+					},
+
+					{
+						name: "click on file MenuBarItem",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// click the File MenuBarItem
+							robot.mouseMoveAt("file", 500, 1);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// The "File" MenuBarItem should have the selected class in addition to the hover
+								// class
+								doh.t(domClass.contains("file", "dijitMenuItemHover"),
+									"File MenuBarItem should have hover effect, actual class is: " + dom.byId("file").className);
+								doh.t(domClass.contains("file", "dijitMenuItemSelected"),
+									"File MenuBarItem should have selected class, actual class is: " + dom.byId("file").className);
+
+								// And the file menu should be visible
+								doh.t(helpers.isVisible("fileMenu"), "File menu is visible");
+
+								// But the first item in the file menu should not be selected, since we opened via mouse not keyboard (#10716)
+								doh.f(domClass.contains("new", "dijitMenuItemSelected"),
+									"New MenuItem should not have selected class, actual class is: " + dom.byId("new").className);
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "hover edit menu item",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("edit", 500, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Since we've already activated the MenuBar by clicking "File",
+								// hovering over "Edit" should automatically show the edit menu
+								doh.t(helpers.isVisible("editMenu"), "Edit menu is visible");
+
+								// And also, the file menu should have disappeared
+								doh.t(helpers.isHidden("fileMenu"), "File menu is hidden");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "move to copy",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("copy", 500, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(domClass.contains("edit", "dijitMenuItemHover"),
+									"Edit MenuBarItem shouldn't have hover effect anymore, actual class is: " + dom.byId("edit").className);
+								doh.t(domClass.contains("edit", "dijitMenuItemSelected"),
+									"Edit MenuBarItem should still have selected class, actual class is: " + dom.byId("edit").className);
+
+								doh.t(domClass.contains("copy", "dijitMenuItemHover"),
+									"Copy Menu item should have hover effect, actual class is: " + dom.byId("copy").className);
+								doh.t(domClass.contains("copy", "dijitMenuItemSelected"),
+									"Copy Menu item should have selected effect, actual class is: " + dom.byId("copy").className);
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "click copy",
+						timeout: 2000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var w = registry.byId("copy");
+							var orig = w.onClick;
+							w.onClick = d.getTestCallback(function(){
+								w.onClick = orig;
+								doh.t(helpers.isHidden("editMenu"), "edit menu disappeared");
+								doh.f(domClass.contains("edit", "dijitMenuItemSelected"),
+									"Edit MenuBarItem should no longer have selected effect, actual class is: " + dom.byId("edit").className);
+							});
+
+							robot.mouseClick({left: true}, 1);
+
+							return d;
+						}
+					},
+
+					{
+						name: "mouse over file MenuBarItem again",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Check initial conditions
+							doh.f(domClass.contains("file", "dijitMenuItemHover"), "File MenuBarItem doesn't have hover effect");
+							doh.t(helpers.isHidden("fileMenu"), "File menu is hidden");
+
+							// Move over the File MenuBarItem
+							robot.mouseMoveAt("file", 500, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// The "File" MenuBarItem should be highlighted
+								doh.t(domClass.contains("file", "dijitMenuItemHover"),
+									"File MenuBarItem should have hover effect, actual class is: " + dom.byId("file").className);
+
+								// However, it shouldn't be "selected", and
+								// just moving over the MenuBarItem shouldn't have opened the menu,
+								// given that after clicking above, the MenuBar should have reverted to it's
+								// "dormant" state so that it needs to be clicked again before menus show up automatically
+								doh.f(domClass.contains("file", "dijitMenuItemSelected"),
+									"File MenuBarItem shouldn't have selected effect, actual class is: " + dom.byId("file").className);
+								doh.t(helpers.isHidden("fileMenu"), "File menu is hidden");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+
+				doh.register("Navigation menu mouse tests", [
+
+					{
+						name: "mouse over enabled submenu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Check initial conditions
+							doh.f(domClass.contains("navMenuPopupItem1", "dijitMenuItemHover"), "navMenuPopupItem1 MenuItem doesn't have hover effect");
+							doh.t(helpers.isHidden("navMenuSub1"), "sub menu is hidden");
+
+							robot.mouseMoveAt("navMenuPopupItem1", 500, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// The "enabled submenu" MenuItem should be highlighted
+								doh.t(domClass.contains("navMenuPopupItem1", "dijitMenuItemHover"),
+									"'Enabled Submenu' MenuItem should have hover effect, actual class is: " + dom.byId("navMenuPopupItem1").className);
+
+								// However, just moving over the MenuItem shouldn't have opened the menu
+								doh.t(helpers.isHidden("navMenuSub1"), "sub menu is hidden");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open submenu",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(domClass.contains("navMenuPopupItem1", "dijitMenuItemHover"),
+									"'Enabled Submenu' MenuItem should have hover effect, actual class is: " + dom.byId("navMenuPopupItem1").className);
+								doh.t(domClass.contains("navMenuPopupItem1", "dijitMenuItemSelected"),
+									"'Enabled Submenu' MenuItem should have selected effect, actual class is: " + dom.byId("navMenuPopupItem1").className);
+
+								// And the sub menu should be visible
+								doh.t(helpers.isVisible("navMenuSub1"), "sub menu is visible");
+
+								// But the first item in the sub menu should be selected, since opened by mouse, see #10716
+								doh.f(domClass.contains("navMenuSub1_item1", "dijitMenuItemSelected"),
+									"first item in sub menu should have selected class, actual class is: " + dom.byId("new").className);
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "toggle CheckedMenuItem",
+						timeout: 3000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.f(registry.byId("checked2").get('checked'), "not initially checked");
+
+							robot.mouseMoveAt("checked2", 500, 1);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(registry.byId("checked2").get('checked'), "now it's checked");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Context menu mouse tests", [
+					{
+						name: "open global context menu (mouse)",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var menu = registry.byId("windowContextMenu");
+
+							doh.t(helpers.isHidden(menu), "menu should be initially hidden");
+
+							// click random point on screen
+							robot.mouseMoveAt("input", 500, 500);
+							robot.mouseClick({right: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible(menu), "menu is now shown");
+
+								var inputCoords = domGeom.position("input");
+									menuCoords = domGeom.position(menu.domNode);
+
+								doh.t(menuCoords.x > inputCoords.x, "to right of link left edge");
+								doh.t(menuCoords.x < inputCoords.x + inputCoords.w, "to left of link right edge");
+								doh.t(menuCoords.y > inputCoords.y, "menu (" + menuCoords.y + ") starts below top of link (" + inputCoords.y + ")");
+								doh.t(menuCoords.y < inputCoords.y + inputCoords.h, "menu (" + menuCoords.y + ") starts above bottom of link (" + inputCoords.y + "+" + inputCoords.h + ")");
+
+								doh.f(domClass.contains("windowContextMenuFirstChoice", "dijitMenuItemSelected"), "first choice not marked as selected");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close global context menu (mouse)",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var menu = registry.byId("windowContextMenu");
+
+							// close menu from above test
+							robot.mouseMove(2, 2, 100);
+							robot.mouseClick({left: true}, 100);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden(menu), "menu should be hidden again");
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open context menu over form widget (mouse)",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred();
+	
+							var menu = registry.byId("windowContextMenu");
+	
+							doh.t(helpers.isHidden(menu), "menu should be initially hidden");
+	
+							// right-click on form widget
+							robot.mouseMoveAt("formwidget", 500, 1);
+							robot.mouseClick({right: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible(menu), "menu is now shown");
+	
+								var widgetCoords = domGeom.position("formwidget");
+									menuCoords = domGeom.position(menu.domNode);
+
+								doh.t(((menuCoords.x > widgetCoords.x) && (menuCoords.x < (widgetCoords.x + widgetCoords.w))) ||
+									(((menuCoords.x + menuCoords.w) > widgetCoords.x) && ((menuCoords.x + menuCoords.w) < (widgetCoords.x + widgetCoords.w))),
+									"begins or ends within the form widget horizontal boundaries");
+								doh.t(((menuCoords.y > widgetCoords.y) && (menuCoords.y < (widgetCoords.y + widgetCoords.h))) ||
+									(((menuCoords.y + menuCoords.h) > widgetCoords.y) && ((menuCoords.y + menuCoords.h) < (widgetCoords.y + widgetCoords.h))),
+									"begins or ends within the form widget vertical boundaries");
+
+								var cm = dom.byId("windowContextMenu");
+								doh.is("region", cm.parentNode.getAttribute("role"), "context menu's wrapper node needs role=region");
+                				doh.is("windowContextMenu", cm.parentNode.getAttribute("aria-label"), "menu's wrapper node needs aria-label");
+							}), 1000);
+	
+							return d;
+						}
+					},
+
+					{
+						name: "close form widget context menu (mouse)",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var menu = registry.byId("windowContextMenu");
+
+							// close menu from above test
+							robot.mouseMove(2, 2, 100);
+							robot.mouseClick({left: true}, 100);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden(menu), "menu should be hidden again");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Left click menu mouse test", {
+					name: "open left click context menu",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.mouseMoveAt("input2", 500, 1);
+						robot.mouseClick({left: true}, 500);
+
+						robot.sequence(d.getTestErrback(function(){
+							var menu = registry.byId("leftClickContextMenu");
+							doh.t(helpers.isVisible(menu), "menu is now shown");
+
+							// close menu
+							robot.mouseMove(2, 2, 100);
+							robot.mouseClick({left: true}, 100);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden(menu), "menu disappeared");
+							}), 1000);
+						}), 1000);
+
+						return d;
+					}
+				});
+
+				doh.register("More MenuBar mouse tests", [
+					{
+						name: "MenuBar selection and cancellation",
+						timeout: 15000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("file", 500, 1000);
+							robot.mouseClick({left: true}, 500); // click File
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("fileMenu"), "File menu should be visible #1");
+							}), 1000);
+
+							robot.mouseClick({left: true}, 500); // close File menu
+							robot.mouseMoveAt("edit", 500, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isHidden("fileMenu"), "File menu is hidden #1");
+								doh.t(helpers.isHidden("editMenu"), "Edit menu is hidden #1");
+
+								doh.f(domClass.contains("file", "dijitMenuItemSelected"),
+									"File MenuBarItem should not have selected class, actual class is: " + dom.byId("file").className);
+								doh.f(domClass.contains("file", "dijitMenuItemHover"),
+									"File MenuBarItem shouldn't have hover effect anymore, actual class is: " + dom.byId("edit").className);
+								doh.t(domClass.contains("edit", "dijitMenuItemHover"),
+									"Edit MenuBarItem should have hover effect, actual class is: " + dom.byId("edit").className);
+							}), 1000);
+
+							robot.mouseClick({left: true}, 500); // open edit menu
+							robot.mouseMoveAt("paste", 1000, 1);
+							robot.mouseClick({left: true}, 500); // click paste, closing edit menu
+							robot.mouseMoveAt("edit", 1000, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(domClass.contains("edit", "dijitMenuItemHover"),
+									"Edit MenuBarItem should still have hover effect, actual class is: " + dom.byId("edit").className);
+								doh.t(helpers.isHidden("editMenu"), "edit menu disappeared #1");
+							}), 1000);
+
+							robot.mouseMoveAt("file", 500, 500);
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isHidden("fileMenu"), "File menu should be hidden #2");
+							}), 500);
+
+							robot.sequence(function(){
+								var
+								fileMenu = registry.byId("fileMenu"),
+								editMenu = registry.byId("editMenu"),
+								handler = fileMenu.on("open", function(){
+									handler.remove();
+									setTimeout(d.getTestErrback(function(){
+										doh.t(helpers.isVisible(fileMenu), "File menu should be visible #2");
+										handler = fileMenu.on("close", function(){
+											handler.remove();
+											setTimeout(d.getTestErrback(function(){
+												doh.t(helpers.isHidden(fileMenu), "File menu should be hidden #3");
+												handler = editMenu.on("open", function(){
+													handler.remove();
+													setTimeout(d.getTestErrback(function(){
+														doh.t(helpers.isVisible(editMenu), "Edit menu should be visible");
+														handler = editMenu.on("close",
+															function(){
+																handler.remove();
+																setTimeout(d.getTestCallback(function(){
+																	doh.t(helpers.isHidden(editMenu), "Edit menu disappeared #2");
+																}), 150);
+															});
+														var paste = domGeom.position('paste');
+														robot._mouseMove(paste.x + (paste.w >> 1), paste.y + paste.h + 20, false, 1);
+														// click point on screen under the Edit menu
+														robot.mouseClick({left: true}, 100);
+													}), 150);
+												});
+											robot.mouseMoveAt("edit", 0, 1);
+											}), 150);
+										});
+										robot.mouseMoveAt("view", 0, 1); // #9846
+									}), 150);
+								});
+							}, 1);
+							robot.mouseClick({left: true}, 1); // click File that starts the event sequence above
+
+							return d;
+						}
+					},
+
+					{
+						name: "MenuBar navigation with BOTH mouse and keyboard",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// click random point on screen
+							robot.mouseMoveAt("link", 500, 500);
+							robot.mouseClick({left: true}, 500); // click link to focus it
+
+							robot.mouseMoveAt("view", 500, 500);
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(domClass.contains("view", "dijitMenuItemHover"),
+									"View MenuBarItem should have hover effect, actual class is: " + dom.byId("view").className);
+								doh.t(helpers.isHidden("viewMenu"), "View menu is hidden");
+							}), 500);
+
+							// tab to the MenuBar... then focus should automatically shift to "File" menu,
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isHidden("fileMenu"), "File menu is hidden");
+								doh.t(domClass.contains("file", "dijitMenuItemSelected"),
+									"File MenuBarItem should have selected class, actual class is: " + dom.byId("file").className);
+								doh.f(domClass.contains("view", "dijitMenuItemHover"),
+									"View MenuBarItem shouldn't have hover effect anymore, actual class is: " + dom.byId("view").className);
+							}), 1000);
+
+							robot.mouseMoveAt("edit", 500, 500);
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(domClass.contains("edit", "dijitMenuItemHover"),
+									"Edit MenuBarItem should have hover effect, actual class is: " + dom.byId("edit").className);
+								doh.t(helpers.isHidden("editMenu"), "View menu is hidden");
+							}), 500);
+
+							// Move to View item with keyboard.  Focus should still on "File".  Previously this test
+							// assumed that hovering "edit" would move focus there.
+							robot.keyPress(keys.RIGHT_ARROW, 1000, {});
+							robot.keyPress(keys.RIGHT_ARROW, 1000, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("viewMenu"), "View menu is hidden");
+								doh.t(domClass.contains("view", "dijitMenuItemSelected"),
+									"View MenuBarItem should have selected class, actual class is: " + dom.byId("file").className);
+								doh.f(domClass.contains("edit", "dijitMenuItemHover"),
+									"Edit MenuBarItem shouldn't have hover effect anymore, actual class is: " + dom.byId("edit").className);
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Menu diagonal movement tests", [
+					{
+						name: "Menu selection via sloppy movement",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("navMenuPopupItem1", 500, 500); // move to Enabled submenu
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isHidden("navMenuSub1"), "Enabled submenu should be hidden");
+							}), 500);
+
+							robot.mouseClick({left: true}, 500); // click Enabled Submenu
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("navMenuSub1"), "Enabled submenu should be visible");
+							}), 1000);
+
+							robot.mouseMoveAt("navMenuDisabledItem", 500, 500);
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isHidden("navMenuSub1"), "Enabled submenu should be hidden");
+							}), 1000); // linger long enough for menu to close
+
+							robot.mouseMoveAt("navMenuPopupItem1", 500, 500); // move back to Enabled submenu
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("navMenuSub1"), "Enabled submenu should be visible");
+							}), 1000); // linger long enough for menu to open
+
+							robot.mouseMoveAt("navMenuDisabledItem", 500, 50); // QUICKLY move to the next menu item
+							robot.sequence(d.getTestErrback(function(){
+							}), 200, 50);
+
+							robot.mouseMoveAt("navMenuSub1_item2", 0, 50); // QUICKLY move to the popup menu
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("navMenuSub1"), "Enabled submenu 1 should be visible");
+								doh.t(domClass.contains("navMenuSub1_item2", "dijitMenuItemHover"),
+									"Submenu 1, item 2 navigation MenuItem should have hover effect, actual class is: " + dom.byId("navMenuDisabledItem").className);
+								doh.t(domClass.contains("navMenuPopupItem1", "dijitMenuItemSelected"),
+									"'Enabled Submenu' MenuItem should have selected effect, actual class is: " + dom.byId("navMenuPopupItem1").className);
+								var popup = domGeom.position('navMenuSub1_popup');
+								robot._mouseMove(popup.x + (popup.w >> 1), popup.y + popup.h + 20, false, 500);
+							}), 500, 1000);
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("navMenuSub1"), "Enabled submenu 1 menu still there");
+							}), 1000);
+
+							// click point on screen under the menu
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("navMenuSub1"), "Enabled submenu 1 menu disappeared");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("passivePopupDelay", [
+					function setup(){
+						registry.byId("menubar").set("passivePopupDelay", 300);
+					},
+					{
+						name: "mouse over file MenuBarItem",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Check initial conditions
+							doh.f(domClass.contains("file", "dijitMenuItemHover"), "File MenuBarItem doesn't have hover effect");
+							doh.t(helpers.isHidden("fileMenu"), "File menu is hidden");
+
+							// Move over the File MenuBarItem
+							robot.mouseMoveAt("file", 500, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("fileMenu"), "File menu is visible");
+								doh.f(domClass.contains("new", "dijitMenuItemSelected"),
+										"New MenuItem should not have selected class, actual class is: " + dom.byId("new").className);
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "hover edit menu item",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("edit", 500, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Since we've already activated the MenuBar by clicking "File",
+								// hovering over "Edit" should automatically show the edit menu
+								doh.t(helpers.isVisible("editMenu"), "Edit menu is visible");
+
+								// And also, the file menu should have disappeared
+								doh.t(helpers.isHidden("fileMenu"), "File menu is hidden");
+							}), 500);
+
+							return d;
+						}
+					},
+
+
+					{
+						name: "close menu by click",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("link", 500, 500);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(helpers.isVisible("editMenu"), "Edit menu is hidden");
+							}), 500);
+
+							return d;
+						}
+					}
+
+				]);
+
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/TitlePane.html b/src/main/resources/static/dijit/tests/robot/TitlePane.html
new file mode 100644
index 0000000000000000000000000000000000000000..b9edc6d2eda783a4f3f056ffdd300b30d72635b2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/TitlePane.html
@@ -0,0 +1,307 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot TitlePane Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/aspect", "dojo/dom", "dojo/keys", "dojo/_base/lang", "dojo/query", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, aspect, dom, keys, lang, query, winUtils, helpers){
+
+				robot.initRobot('../test_TitlePane.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+				});
+
+				var pane1, pane2, pane3, href1, href2;
+
+				doh.register("api", [
+					{
+						name: "setup",
+						runTest: function(){
+					    	pane1 = registry.byId("testPane1");
+					    	pane2 = registry.byId("pane_2");
+					    	pane3 = registry.byId("closed");		// initially closed
+							href1 = registry.byId("href1");	// initially closed href, href load completes after expand
+							href2 = registry.byId("href2");	// initially closed href, href load completes during expand
+						}
+					},
+					{
+						name: "title",
+						runTest: function(){
+							doh.is("Title Pane #1", pane1.get("title"), "title attr");
+							doh.is("Title Pane #1", helpers.innerText(pane1.titleNode), "inner text");
+							
+							pane1.set("title", "modified title");
+
+							doh.is("modified title", pane1.get("title"), "title attr modified");
+							doh.is("modified title", helpers.innerText(pane1.titleNode), "inner text modified");
+						}
+					},
+
+					{
+						name: "open",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							doh.t(pane1.domNode.offsetHeight > 100, "pane 1 is open");
+							doh.t(pane1.get("open"), "pane1.open is true");
+
+							pane1.set("open", false);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(pane1.domNode.offsetHeight < 100, "pane 1 is closed");
+								doh.f(pane1.get("open"), "pane1.open is false");
+							}), 500);
+							
+							return d;
+						}
+					}
+				]);
+
+				doh.register("keyboard", [
+					{
+						name: "tabbing",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							dom.byId("input").focus();
+
+							// should go to title bar
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.is(pane1.focusNode, dfocus.curNode,"focused on pane1 title")
+							}), 500);
+
+							// should skip hidden content and go to button
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.is(dom.byId("titleButton"), dfocus.curNode,"focused on title button after pane")
+							}), 500);
+
+							// go back to title bar
+							robot.keyPress(keys.TAB, 500, {shift: true});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(pane1.focusNode, dfocus.curNode,"focused on pane1 title")
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.SPACE, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(pane1.domNode.offsetHeight > 100, "pane 1 is open");
+								doh.t(pane1.get("open"), "pane1.open is true");
+							}), 500);
+							
+							return d;
+						}
+					},
+					
+					{
+						name: "close",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.keyPress(keys.ENTER, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(pane1.domNode.offsetHeight < 100, "pane 1 is closed");
+							}), 500);
+							
+							return d;
+						}
+					}
+				]);
+
+				doh.register("height checks", [
+					{
+						name: "content change",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var height1, height2, height3;
+
+							robot.sequence(d.getTestErrback(function(){
+								pane1.set("open", true);
+							}), 500);
+
+							// Changing the content while open should change the height
+							robot.sequence(d.getTestErrback(function(){
+								height1 = pane1.domNode.offsetHeight;
+								pane1.set("content", pane1.get("content") + "<br>new line");
+							}), 500);
+							robot.sequence(d.getTestErrback(function(){
+								height2 = pane1.domNode.offsetHeight;
+								doh.t(height2 > height1,  "expected height increase, actually went from " + height1 + " to " + height2);
+							}), 500);
+
+							// Change the content while closed should also change the height (when it is next opened)
+							robot.sequence(d.getTestErrback(function(){
+								pane1.set("open", false);
+							}), 500);
+							robot.sequence(d.getTestErrback(function(){
+								pane1.set("content", pane1.get("content") + "<br>another new line");
+								pane1.set("open", true);
+							}), 500);
+							robot.sequence(d.getTestCallback(function(){
+								height3 = pane1.domNode.offsetHeight;
+								doh.t(height3 > height2, "expected height increase, actually went from " + height2 + " to " + height3);
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "href loading",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Open the href pane, causing the href to load
+							winUtils.scrollIntoView(registry.byId("inner").domNode);
+							robot.sequence(d.getTestErrback(function(){
+								href1.set("open", true);
+							}), 1000);
+
+							// Initially it should display "Loading..." with a small height (enough for that one message)
+							var height1, height2;
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("Loading...", lang.trim(helpers.innerText(href1.containerNode)));
+								height1 = href1.domNode.offsetHeight;
+							}), 1500);
+
+							// Then the real content should be loaded and height should change to accommodate it
+							robot.sequence(d.getTestCallback(function(){
+								doh.isNot("Loading...", lang.trim(helpers.innerText(href1.containerNode)), "actual content");
+								height2 = href1.domNode.offsetHeight;
+								doh.t(height2 > height1, "expected height increase, actually went from " + height1 + " to " + height2);
+							}), 3000);
+
+							return d;
+						}
+					},
+					{
+						name: "href load complete during expand",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Opening the href pane will cause it to expand, and during the expansion the load
+							// will finish.   Make sure height shows full content
+							href2.set("open", true);
+
+							robot.sequence(d.getTestCallback(function(){
+								var height = href2.domNode.offsetHeight;
+								doh.t(height > 100, "height for full content not just loading message: " + height);
+							}), 2000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("layout", [
+					{
+						name: "resize event",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// The first time pane3 is opened the tab container should get a resize event
+							var resized = false;
+							aspect.after(registry.byId("tabContainer"), "resize", function(){ resized = true;}, true);
+
+							doh.f(pane3.get("open"), "pane3 is closed");
+							pane3.set("open", true);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(resized, "tabcontainer was resized");
+							}), 500);
+							
+							return d;
+						}
+					}
+				]);
+
+				doh.register("TitlePane in AccordionContainer", [
+					{
+						name: "initial conditions",
+						runTest: function(){
+							// none of the TitlePane's inside of the AccordionContainer should have loaded
+							// their href, since they are closed
+					    	doh.f(robot.window["actp1Loaded"], "closed TitlePane in open accordion pane not loaded");
+					    	doh.t(robot.window["actp2Loaded"], "open TitlePane in open accordion pane loaded");
+					    	doh.f(robot.window["actp3Loaded"], "first TitlePane in closed accordion pane not loaded");
+					    	doh.f(robot.window["actp4Loaded"], "open TitlePane in closed accordion pane not loaded");
+						}
+					},
+
+					{
+						name: "switch open accordion pane",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							registry.byId("ac").selectChild(registry.byId("accp2"));
+
+							setTimeout(d.getTestCallback(function(){
+						    	doh.f(robot.window["actp1Loaded"], "closed TitlePane in newly closed accordion pane not loaded");
+						    	doh.f(robot.window["actp3Loaded"], "closed TitlePane in newly opened accordion pane not loaded");
+						    	doh.t(robot.window["actp4Loaded"], "opened TitlePane in newly opened accordion pane loaded");
+							}), 500);
+							
+							return d;
+						}
+					},
+
+					{
+						name: "open a TitlePane",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							registry.byId("actp3").set("open", true);
+
+							setTimeout(d.getTestCallback(function(){
+						    	doh.t(robot.window["actp3Loaded"], "opening TitlePane causes href to load");
+							}), 500);
+							
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Toolbar.html b/src/main/resources/static/dijit/tests/robot/Toolbar.html
new file mode 100644
index 0000000000000000000000000000000000000000..61fc8921bf3970a7b39702ce0428e6ac0bba87ba
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Toolbar.html
@@ -0,0 +1,287 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Toolbar Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/dom", "dojo/keys", "dojo/_base/lang", "dojo/query",
+				"dojo/domReady!"
+			], function(doh, robot, array, dom, keys, lang, query){
+				robot.initRobot('../test_Toolbar.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+
+					toolbar1Before = dom.byId("toolbar1Before", robot.doc);
+					toolbar1 = registry.byId("toolbar1");
+					toolbar1After = dom.byId("toolbar1After", robot.doc);
+					toolbar2 = registry.byId("toolbar2");
+					toolbar3 = registry.byId("toolbar3");
+					toolbar4 = registry.byId("toolbar4");
+				});
+
+				var toolbar1Before, toolbar1After, toolbar1, toolbar2, toolbar3, toolbar4;
+
+				doh.register("initial conditions", [
+					{
+						name: "creation",
+						runTest: function(){
+							// make sure that all the toolbars exist
+							doh.t(toolbar1, "toolbar 1");
+							doh.t(toolbar2, "toolbar 2");
+							doh.t(toolbar3, "toolbar 3");
+							doh.t(toolbar4, "toolbar 4");
+							
+							// and that labels are shown except when showLabel==false
+							var cutText = query("#toolbar1_cut .dijitButtonText", robot.doc)[0];
+							doh.is(0, cutText.offsetWidth, "cut button - text hidden");						
+
+							var copyText = query("#toolbar1_copy .dijitButtonText", robot.doc)[0];
+							doh.t(copyText.offsetWidth > 0, "copy button - text shown");						
+						}
+					}
+				]);
+					
+				doh.register("keyboard", [
+					{
+						name: "tab in and out",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								toolbar1Before.focus();
+							})), 500);
+
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_cut", dfocus.curNode.id, "cut, first visit");
+							})), 1000);
+
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1After", dfocus.curNode.id);
+							})), 1000);
+
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_cut", dfocus.curNode.id, "cut, second visit");
+							})), 1000);
+
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.is("toolbar1Before", dfocus.curNode.id, "back before toolbar1");
+							})), 1000);
+
+							return d;
+						}
+					},
+	
+					{
+						name: "left/right arrow keys",
+						timeout: 40000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Disable a bunch of buttons to make sure that left/right arrow
+							// keys skip over disabled buttons, and also that initial focus
+							// goes to the first enabled button
+							array.forEach(["toolbar1_cut", "toolbar1_copy", "toolbar1_bold", "toolbar1_backcolor",
+								"toolbar1_forecolor", "toolbar1_combo2"], function(widgetName){
+								registry.byId(widgetName).set("disabled", true);
+							});
+
+							// Initial focus (upon tabbing into toolbar) should go to first enabled button
+							toolbar1Before.focus();
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_italic", dfocus.curNode.id, "italic, first visit");
+							})), 1000);
+
+							// Remaining enabled positions that left/right arrow should navigate to (not including the initial leftmost button),
+							var focusPoints = ["toolbar1_dialog", "toolbar1_combo_button", "toolbar1_combo_arrow", "toolbar1_insertorderedlist"];
+
+							// Use right arrow key to visit every enabled button (and for combobutton to hit left and right sides)
+							array.forEach(focusPoints, function(str){
+								robot.keyPress(keys.RIGHT_ARROW, 500, {});
+								robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+									doh.is(str, dfocus.curNode.id, str + ", first visit");
+								})), 1000);
+							});
+
+							// Now go backwards
+							focusPoints.reverse();
+							focusPoints.shift();
+							array.forEach(focusPoints, function(str){
+								robot.keyPress(keys.LEFT_ARROW, 500, {});
+								robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+									doh.is(str, dfocus.curNode.id, str + ", second visit");
+								})), 1000);
+							});
+
+							// Test the TAB key takes us to the <input> after the toolbar.
+							// This confirms that the currently focused toolbar button
+							// is in the correct position in the tab order (ie, the position specified
+							// for the toolbar itself), and that there are no stray tabstops on the toolbar itself
+							// or on the other buttons. 
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1After", dfocus.curNode.id, "first time past toolbar1");
+							})), 1000);
+
+							// Make sure that we can still shift-tab back to before the toolbar too
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_italic", dfocus.curNode.id, "italic, after shift-tab back into toolbar");
+							})), 1000);
+
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.is("toolbar1Before", dfocus.curNode.id, "back before toolbar1");
+							})), 1000);
+
+							return d;
+						}
+					},
+	
+					{
+						name: "home/end keys",
+						timeout: 40000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Initial focus (upon tabbing into toolbar) should go to first enabled button,
+							// which is "italic", since "cut" and "copy" are disabled
+							toolbar1Before.focus();
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_italic", dfocus.curNode.id, "first button");
+							})), 1000);
+
+							// End key should go to last button
+							robot.keyPress(keys.END, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_insertorderedlist", dfocus.curNode.id, "last button");
+							})), 1000);
+
+							// Home key should go to first enabled button again
+							// which is "italic", since "cut" and "copy" are disabled
+							robot.keyPress(keys.HOME, 500, {});
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								doh.is("toolbar1_italic", dfocus.curNode.id, "first button again");
+							})), 1000);
+
+							return d;
+						}
+					},
+
+					// Test drop down ability.   These tests are probably redundant with the Button tests themselves,
+					// so they aren't strictly necessary.
+					{
+						name: "drop downs",
+						timeout: 60000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Re-enable the ToolipDialog and ColorPalette drop down so that we can test it
+							registry.byId("toolbar1_dialog").set("disabled", false);
+							registry.byId("toolbar1_backcolor").set("disabled", false);
+
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								toolbar1Before.focus();
+							})), 500);
+
+							// Tab into toolbar and move to tooltip dialog button
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.RIGHT_ARROW, 500, {});
+
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_dialog", dfocus.curNode.id, "dialog button, first visit");
+							})), 1000);
+
+							// Open the dialog, focus should go to first input
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("user", dfocus.curNode.id);
+							})), 1000);
+
+							// ESC should restore focus to toolbar dialog button
+							robot.keyPress(keys.ESCAPE, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_dialog", dfocus.curNode.id, "dialog button, second visit");
+							})), 1000);
+
+							// Open the dialog again
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("user", dfocus.curNode.id, "user, again");
+							})), 1000);
+
+							// Submit should also restore focus to toolbar dialog button, assuming that it
+							// doesn't reset the focus somewhere else (like into the editor)
+							robot.keyPress(keys.TAB, 500);
+							robot.keyPress(keys.TAB, 500);
+							robot.keyPress(keys.ENTER, 500);
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_dialog", dfocus.curNode.id, "dialog button, third visit");
+							})), 1000);
+
+							// Try the ColorPalette
+							robot.keyPress(keys.RIGHT_ARROW, 500);
+							robot.keyPress(keys.DOWN_ARROW, 500);
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.t(dom.isDescendant(dfocus.curNode, registry.byId("toolbar1_colorPalette").domNode),
+									"focus inside colorpalette, actual focus is: " + (dfocus.curNode ?
+										(dfocus.curNode.id||"no id") : "no focus"));
+							})), 1000);
+							robot.keyPress(keys.RIGHT_ARROW, 500);	// navigation in the ColorPalette
+							robot.keyPress(keys.DOWN_ARROW, 500);	// navigation in the ColorPalette
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.t(dom.isDescendant(dfocus.curNode, registry.byId("toolbar1_colorPalette").domNode),
+									"focus still inside colorpalette, actual focus is: " + (dfocus.curNode ?
+										(dfocus.curNode.id||"no id") : "no focus"));
+							})), 1000);
+							
+							// pressing tab in the colorpalette should move focus back to the toolbar
+							robot.keyPress(keys.TAB, 500);
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								doh.is("toolbar1_backcolor", dfocus.curNode.id, "back on colorpalette button");
+							})), 1000);
+
+							// try the ComboButton
+							robot.keyPress(keys.RIGHT_ARROW, 500);
+							robot.keyPress(keys.RIGHT_ARROW, 500);
+							robot.keyPress(keys.DOWN_ARROW, 500);
+							robot.sequence(d.getTestErrback(lang.hitch(this, function(){
+								// TODO: test that focus is on menu
+							})), 1000);
+							robot.keyPress(keys.SPACE, 500);	// select first menu option
+							robot.sequence(d.getTestCallback(lang.hitch(this, function(){
+								// TODO: test that focus is returned to button
+							})), 1000);
+
+							return d;
+						}
+					}
+
+				]);
+				// TODO: mouse
+				
+				
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/TooltipDialog_a11y.html b/src/main/resources/static/dijit/tests/robot/TooltipDialog_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..94d901faa3bab3ff394a892350fce898e38487d1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/TooltipDialog_a11y.html
@@ -0,0 +1,448 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot TooltipDialog A11y Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx", "dojo/keys",
+				"dojo/domReady!"
+			], function(doh, robot, keys){
+				robot.initRobot('../test_TooltipDialog.html');
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+				});
+
+				doh.register("TooltipDialog normal operation", [
+					{
+						name: "aria roles and attributes",
+						timeout: 5000,
+						button: null,
+						runTest: function(){
+							var d = new doh.Deferred();
+							button = registry.byId("tooltipDlgButton");
+							
+							doh.is("button", button._popupStateNode.getAttribute("role"), "button _popupStateNode role");
+							doh.t(button._popupStateNode.getAttribute("aria-haspopup"), "aria-haspopup on button");
+							doh.is("tooltipDlgButton_label", button._popupStateNode.getAttribute("aria-labelledby"), "aria-labelledby");
+							doh.f(button._popupStateNode.getAttribute("aria-expanded"), "initially missing aria-expanded");
+							doh.f(button._popupStateNode.getAttribute("aria-owns"), "initally missing aria-owns");
+							
+							// now open the drop down
+							robot.sequence(function(){
+								button.focus();
+							}, 500, 500);
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){								
+								doh.t(button._popupStateNode.getAttribute("aria-expanded"), "now aria-expanded should be true");
+								doh.is("tooltipDlg", button._popupStateNode.getAttribute("aria-owns"), "should aria-own the Dlg");
+
+								// Check roles and attributes on the dialog
+								var dlg = registry.byId("tooltipDlg");
+								doh.is("alertdialog", dlg.domNode.getAttribute("role"), "Dlg.domNode should have a role");
+								doh.is("tooltipDlgButton", dlg.domNode.getAttribute("aria-labelledby"), "aria-labelledby should point back to button");
+								
+								var dd = dlg.domNode;
+								doh.is("region", dd.parentNode.getAttribute("role"), "TooltipDialog's wrapper needs role=region since the node gets appended to the end");
+								doh.is("tooltipDlg", dd.parentNode.getAttribute("aria-label"), "TooltipDialog's wrapper needs aria-label since role=region");
+							}), 1000);
+						
+							return d;
+						},
+						tearDown: function(){
+							button.closeDropDown();
+						}
+					},
+					{
+						name: "basic navigation",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var button = registry.byId("tooltipDlgButton");
+
+							// open TooltipDialog
+							robot.sequence(function(){
+								button.focus();
+							}, 1000, 1000);
+							robot.keyPress(keys.SPACE, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should be showing");
+							}), 1000);
+
+							// shift-tab should loop around to last field
+							robot.keyPress(keys.TAB, 500, {shift: true});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("submit", dfocus.curNode.id, "focused on button");
+							}), 1000);
+
+							// tab should loop around to first field
+							robot.keyPress(keys.TAB, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.is("inline", dfocus.curNode.id, "focused on InlineEditBox");
+							}), 1000);
+
+							// close TooltipDialog
+							robot.keyPress(keys.ESCAPE, 500, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(button._opened, "TooltipDialog should not be showing after Esc");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "nested popup",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var button = registry.byId("tooltipDlgButton"),
+								select = registry.byId("combo");
+
+							// open TooltipDialog, advance to FilteringSelect
+							robot.sequence(function(){
+								button.focus();
+							}, 500);
+							robot.keyPress(keys.SPACE, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should be showing");
+								doh.is("combo", dfocus.curNode.id, "focused on combo");
+							}), 1000);
+
+							// pick second option
+							robot.keyPress(keys.DOWN_ARROW, 0, {});
+							robot.keyPress(keys.DOWN_ARROW, 1000, {});
+							robot.keyPress(keys.DOWN_ARROW, 500, {});
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should still be showing");
+								doh.is("pepperoni", select.get("value"), "selected pepperoni");
+							}), 1000);
+
+							// close TooltipDialog
+							robot.keyPress(keys.ESCAPE, 0, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(button._opened, "TooltipDialog closed");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("interacton with autosave InlineEditBox", [
+					{
+						name: "InlineEditBox edit mode, change value, then Esc",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var button = registry.byId("tooltipDlgButton"),
+								inlineEditBox = registry.byId("inline"),
+								initialValue = inlineEditBox.get("value");
+
+							// open TooltipDialog
+							robot.sequence(function(){
+								button.focus();
+							}, 500);
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should be showing");
+								doh.f(inlineEditBox.editing, "InlineEditBox not in edit mode yet");
+							}), 1000);
+
+							// edit InlineEditBox
+							robot.keyPress(keys.SPACE, 0, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should still be showing");
+								doh.t(inlineEditBox.editing, "InlineEditBox in edit mode");
+							}), 1000);
+
+							// type something
+							robot.typeKeys("esc", 0, 600);
+
+							// abort edit
+							robot.keyPress(keys.ESCAPE, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should still still be showing");
+								doh.f(inlineEditBox.editing, "Esc should have exited InlineEditBox edit mode");
+								doh.is(initialValue, inlineEditBox.get("value"), "initial value was inline");
+							}), 1000);
+
+							// close TooltipDialog
+							robot.keyPress(keys.ESCAPE, 0, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(button._opened, "TooltipDialog closed");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "InlineEditBox edit mode, change value, then Tab",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var button = registry.byId("tooltipDlgButton"),
+								inlineEditBox = registry.byId("inline");
+
+							// open TooltipDialog
+							robot.sequence(function(){
+								button.focus();
+							}, 500);
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should be showing");
+								doh.f(inlineEditBox.editing, "InlineEditBox not in edit mode yet");
+							}), 1000);
+
+							// edit InlineEditBox
+							robot.keyPress(keys.SPACE, 0, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should still be showing");
+								doh.t(inlineEditBox.editing, "InlineEditBox in edit mode");
+							}), 1000);
+
+							// type something
+							robot.typeKeys("tab", 0, 600);
+
+							// save edit
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should still still be showing");
+								doh.f(inlineEditBox.editing, "Tab should have exited InlineEditBox edit mode");
+								doh.is("tab", inlineEditBox.get("value"), "value changed to tab");
+							}), 1000);
+
+							// close TooltipDialog
+							robot.keyPress(keys.ESCAPE, 0, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(button._opened, "TooltipDialog closed");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "InlineEditBox edit mode, change value, then Enter",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var button = registry.byId("tooltipDlgButton"),
+								inlineEditBox = registry.byId("inline");
+
+							// open TooltipDialog
+							robot.sequence(function(){
+								button.focus();
+							}, 500);
+							robot.keyPress(keys.SPACE, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should be showing");
+								doh.f(inlineEditBox.editing, "InlineEditBox not in edit mode yet");
+							}), 1000);
+
+							// edit InlineEditBox
+							robot.keyPress(keys.SPACE, 0, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should still be showing");
+								doh.t(inlineEditBox.editing, "InlineEditBox in edit mode");
+							}), 1000);
+
+							// type something
+							robot.typeKeys("enter", 0, 600);
+
+							// save edit
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should still still be showing");
+								doh.f(inlineEditBox.editing, "Tab should have exited InlineEditBox edit mode");
+								doh.is("enter", inlineEditBox.get("value"), "value changed to enter");
+							}), 1000);
+
+							// close TooltipDialog
+							robot.keyPress(keys.ESCAPE, 0, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.f(button._opened, "TooltipDialog closed");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "InlineEditBox double edit (esc, enter)",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var button = registry.byId("tooltipDlgButton");
+								inlineEditBox = registry.byId("inline");
+
+							// open TooltipDialog
+							robot.sequence(function(){
+								button.focus();
+							}, 500);
+							robot.keyPress(keys.SPACE, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should be showing");
+							}), 1000);
+
+							// start editing
+							robot.keyPress(keys.SPACE, 500, {});
+
+							// abort editing, then re-enter edit mode
+							robot.keyPress(keys.ESCAPE, 1000, {});
+							robot.keyPress(keys.ENTER, 1000, {});
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(button._opened, "TooltipDialog should still be showing");
+								doh.t(inlineEditBox.editing, "Enter should have reentered edit mode");
+								inlineEditBox.cancel(true);
+								button.closeDropDown(true);
+							}), 2000);
+							return d;
+						}
+					},
+					{
+						name: "InlineEditBox double edit (enter, enter)",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var button = registry.byId("tooltipDlgButton"),
+								inlineEditBox = registry.byId("inline");
+
+							// open TooltipDialog
+							robot.sequence(function(){
+								button.focus();
+							}, 1000, 1000);
+							robot.keyPress(keys.SPACE, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should be showing");
+							}), 1000);
+
+							// start editing
+							robot.keyPress(keys.SPACE, 500, {});
+							robot.typeKeys("enter #2", 1000, 1000);
+
+							// save via ENTER key, the press ENTER again to re-edit
+							robot.keyPress(keys.ENTER, 200, {});
+							robot.keyPress(keys.ENTER, 1000, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(button._opened, "TooltipDialog should still be showing");
+								doh.t(inlineEditBox.editing, "2nd Enter should have reentered edit mode");
+								inlineEditBox.cancel(true);
+								button.closeDropDown(true);
+							}), 2000);
+							return d;
+						}
+					},
+					{
+						name: "InlineEditBox focused after Tab/Shift+Tab",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var button = registry.byId("tooltipDlgButton"),
+								inlineEditBox = registry.byId("inline");
+
+							// open TooltipDialog
+							robot.sequence(function(){
+								button.focus();
+							}, 1000, 1000);
+							robot.keyPress(keys.SPACE, 500, {});
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(button._opened, "TooltipDialog should be showing");
+							}), 1000);
+
+							// start editing
+							robot.keyPress(keys.SPACE, 500, {});
+							robot.typeKeys("tab", 1000, 600);
+
+							// tab forward, then back (first tab will cancel edit)
+							robot.keyPress(keys.TAB, 100, {});
+							robot.keyPress(keys.TAB, 1000, {shift:true});
+
+							// re-enter edit mode
+							robot.keyPress(keys.ENTER, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(button._opened, "TooltipDialog should still be showing");
+								doh.t(inlineEditBox.editing, "Enter after shift+Tab should have reentered edit mode");
+								inlineEditBox.cancel(true);
+								button.closeDropDown(true);
+							}), 2000);
+							return d;
+						}
+					},
+					{
+						name: "href",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							var button = registry.byId("slowLoadButton"),
+								dialog = registry.byId("slowLoad");
+
+							// Setup handler to continue test after dialog is opened and content loaded
+							dialog.onLoad = function(){
+								setTimeout(d.getTestErrback(function(){
+									doh.t(button._opened, "TooltipDialog should be showing");
+									doh.t(/Delayed by 0.5 sec/.test(dialog.domNode.innerHTML), "data was loaded");
+
+									// Close TooltipDialog
+									robot.keyPress(keys.ESCAPE, 500, {});
+									robot.sequence(d.getTestCallback(function(){
+										doh.f(button._opened, "TooltipDialog should not be showing after Esc");
+									}), 1000);
+								}), 0);
+							};
+
+							// Open TooltipDialog
+							robot.sequence(function(){
+								button.focus();
+							}, 0);
+							robot.keyPress(keys.SPACE, 500, {});
+
+							return d;
+						},
+						tearDown: function(){
+							registry.byId("slowLoad").onLoad = function(){};
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/TooltipDialog_mouse.html b/src/main/resources/static/dijit/tests/robot/TooltipDialog_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..838590f6c7a5bdab74132d867a2c7390ac0c79d3
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/TooltipDialog_mouse.html
@@ -0,0 +1,407 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot TooltipDialog Mouse Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/query",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, query, helpers){
+				robot.initRobot('../test_TooltipDialog.html');
+
+				doh.register("setup", function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+				});
+
+				doh.register("Select", [
+					{
+						name: "open TooltipDialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("tooltipDlgButton", 1000);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog visible");
+								doh.is("inline", dfocus.curNode.id, "focus on InlineEditBox (first field in TooltipDialog)")
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "pick option from Select drop down",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								select = registry.byId("select");
+							
+							// open Select
+							robot.mouseMoveAt("select", 0);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still be showing");
+								doh.t(helpers.isVisible("select_menu"), "Select Menu showing too");
+							}), 1000);
+							
+							// pick second option
+							robot.mouseMoveAt(function(){
+								return query("tr", dom.byId("select_menu"))[1];
+							}, 0);
+							robot.mouseClick({left: true}, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("select_menu"), "Select Menu closed");
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still still be showing");
+								doh.is("peppers", select.get("value"), "selected peppers");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close Select by clicking TooltipDialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								select = registry.byId("select");
+							
+							// open Select
+							robot.mouseMoveAt("select", 0);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still be showing");
+								doh.t(helpers.isVisible("select_menu"), "Select Menu showing too");
+							}), 1000);
+							
+							// click unfocusable area of TooltipDialog to get select to close
+							// (but TooltipDialog itself should remain open)
+							robot.mouseMoveAt(function(){
+								return query("label[for='select']", dom.byId("tooltipDlg"))[0];
+							}, 0);
+							robot.mouseClick({left: true}, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("select_menu"), "Select Menu closed");
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still still be showing");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "close select by clicking another control",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								select = registry.byId("select");
+							
+							// open Select
+							robot.mouseMoveAt("select", 0);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still be showing");
+								doh.t(helpers.isVisible("select_menu"), "Select Menu showing too");
+							}), 1000);
+							
+							// click TextBox to get select to close
+							robot.mouseMoveAt("text", 0);
+							robot.mouseClick({left: true}, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("select_menu"), "Select Menu closed");
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still still be showing");
+								doh.is("text", dfocus.curNode && dfocus.curNode.id, "focused on textbox")
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close TooltipDialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMove(10, 10, 0);
+							robot.mouseClick({left: true}, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("tooltipDlg"), "Tooltip dialog closed");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("InlineEditBox", [
+					{
+						name: "auto-save",
+						timeout: 20000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								inlineEditBox = registry.byId("inline");
+							
+							// open TooltipDialog
+							robot.mouseMoveAt("tooltipDlgButton", 500);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog visible");
+							}), 1000);
+
+							// start editing InlineEditBox
+							robot.mouseMoveAt("inline", 0, 500, 10, 5);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still be showing");
+								doh.t(inlineEditBox.editing, "InlineEditBox in edit mode");
+							}), 1000);
+							
+							// type something
+							robot.typeKeys("changed", 0, 600);
+
+							// close InlineEditBox by clicking on blank area of TooltipDialog
+							robot.mouseMoveAt("tooltipDlg", 0, 500, 10, 20);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestErrback(function(){
+								doh.f(inlineEditBox.editing, "InlineEditBox no longer in edit mode");
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still still be showing");
+								doh.is("changed", inlineEditBox.get("value"), "value changed to changed");
+							}), 1000);
+
+							// close TooltipDialog
+							robot.mouseMove(10, 10, 0);
+							robot.mouseClick({left: true}, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("tooltipDlg"), "Tooltip dialog closed");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("DateTextBox", [
+					{
+						name: "open TooltipDialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("tooltipDlgButton", 1000);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog visible");
+								doh.is("inline", dfocus.curNode.id, "focus on InlineEditBox (first field in TooltipDialog)")
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open DateTextBox by clicking arrow",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								date = registry.byId("date2");
+
+							// click arrow to open
+							robot.mouseMoveAt(function(){
+								return query(".dijitArrowButton", date.domNode)[0];
+							}, 0);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still be showing");
+								doh.t(helpers.isVisible("date2_popup"), "Calendar showing too");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close DateTextBox by clicking arrow",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								date = registry.byId("date2");
+
+							// click arrow to open
+							robot.mouseMoveAt(function(){
+								return query(".dijitArrowButton", date.domNode)[0];
+							}, 0);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("tooltipDlg"), "TooltipDialog should still be showing");
+								doh.t(helpers.isHidden("date2_popup"), "calendar closed");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close TooltipDialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMove(10, 10, 0);
+							robot.mouseClick({left: true}, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("tooltipDlg"), "Tooltip dialog closed");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Menu", [
+					{
+						name: "open outer TooltipDialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("outerDdBtn", 1000);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("outerTtDialog"), "Outer TooltipDialog visible");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "open inner TooltipDialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("innerDdBtn", 1000);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("innerTtDialog"), "Inner TooltipDialog visible");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open submenu",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("popupMenuItem", 0);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("innerTtDialog"), "inner TooltipDialog should still be showing");
+								doh.t(helpers.isVisible("submenu"), "nested Menu showing too");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close submenu by clicking inner TooltipDialog",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("plaintext", 0);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("innerTtDialog"), "Inner TooltipDialog should still be showing");
+								doh.t(helpers.isHidden("submenu"), "SubMenu was closed");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "open submenu again",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							robot.mouseMoveAt("popupMenuItem", 0);
+							robot.mouseClick({left: true}, 1000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isVisible("innerTtDialog"), "inner TooltipDialog should still be showing");
+								doh.t(helpers.isVisible("submenu"), "nested Menu showing too");
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close submenu by clicking another control",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							// click TextBox to get submenu to close
+							robot.mouseMoveAt("name", 0);
+							robot.mouseClick({left: true}, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("submenu"), "submenu closed");
+								doh.t(helpers.isVisible("innerTtDialog"), "TooltipDialog should still still be showing");
+								doh.is("name", dfocus.curNode && dfocus.curNode.id, "focused on textbox")
+							}), 1000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "close both TooltipDialogs",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMove(10, 10, 0);
+							robot.mouseClick({left: true}, 1000);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden("innerTtDialog"), "inner Tooltip dialog closed");
+								doh.t(helpers.isHidden("outerTtDialog"), "inner Tooltip dialog closed");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Tooltip_a11y.html b/src/main/resources/static/dijit/tests/robot/Tooltip_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..ee73f6ca01706d7f28eceae6e860213960df797e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Tooltip_a11y.html
@@ -0,0 +1,390 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Tooltip A11Y Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/dom-geometry", "dojo/keys", "dojo/_base/lang", "dojo/_base/window", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, domGeom, keys, lang, win, winUtils, helpers){
+
+				robot.initRobot('../test_Tooltip.html');
+
+				doh.register("setup", function(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					Tooltip = robot.window.require("dijit/Tooltip");
+
+					// Avoid the page being scrolled when you run the test twice (via browser's refresh button)
+					win.body().parentNode.scrollTop = 0;	// works on FF
+					win.body().scrollTop = 0;	// works on safari
+				});
+
+				// Pointer to master tooltip.  This gets set in the first test when the
+				// first tooltip is shown
+				var masterTT;
+
+				doh.register("dijit.Tooltip keyboard tests", [
+					{
+						name: "show on focus",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								around = dom.byId("four");
+
+							robot.sequence(function(){
+								around.focus();
+								masterTT = Tooltip._masterTT;
+								doh.t(!masterTT || helpers.isHidden(masterTT.domNode), "tooltip either hidden or doesn't exist yet");
+							}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// At this point the master tooltip should have been created, so save in
+								// global variable
+								masterTT = Tooltip._masterTT;
+
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+
+								// make sure tooltip is in right place (but note that it could be to the
+								// left of the right depending on page BIDI setting)
+								var aroundCoords = domGeom.position(around),
+									tooltipCoords = domGeom.position(masterTT.domNode);
+								doh.t((aroundCoords.y + aroundCoords.h) <= (tooltipCoords.y + tooltipCoords.h), "lower aligned");
+								doh.t(aroundCoords.y  >= tooltipCoords.y, "upper aligned");
+
+								// Make sure it has right content
+								doh.is("tooltip on a button", lang.trim(helpers.innerText(masterTT.domNode)), "tooltip text");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "hide on blur",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Tab off of the "button w/tooltip" to the "remove button",
+							// which doesn't have a tooltip
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isHidden(masterTT.domNode), "tooltip hidden");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "show another tooltip",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								around = dom.byId("seven");
+
+							// Tab off of the "remove button" to the <select>
+							robot.keyPress(keys.TAB, 500, {});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+
+								// make sure tooltip is on the screen (in LTR mode it needs to go to the
+								// left of the <select>, not to the right like it usually does)
+								var viewportCoords = winUtils.getBox(),
+									tooltipCoords = domGeom.position(masterTT.domNode);
+								console.log("viewport coords: ", viewportCoords, "tooltip coords: ", tooltipCoords);
+								doh.t(tooltipCoords.x > 0, "x > 0");
+								doh.t(tooltipCoords.x + tooltipCoords.w <= viewportCoords.w, "t.x + t.w");
+								doh.t(tooltipCoords.y > 0, "y > 0");
+								doh.t(tooltipCoords.y + tooltipCoords.h <= viewportCoords.h, "t.y + t.h");
+
+								// Make sure it has the new content.
+								// There's a newline in this tooltip text, so to make comparison easier do substr()
+								doh.is("tooltip on a select", lang.trim(helpers.innerText(masterTT.domNode)).substr(0, 19), "tooltip text");
+							}), 2000);
+
+							return d;
+						}
+					}
+
+				]);
+
+				doh.register("dijit.Tooltip negative keyboard tests", [
+					// Test that quickly going over a node doesn't cause the tooltip
+					// to show up
+ 					{
+						name: "jump over",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								around = dom.byId("one");
+
+							// Focus onto something w/out a tooltip to make currently displayed tooltip disappear
+							robot.sequence(d.getTestErrback(function(){
+								dom.byId("removeButton").focus();
+							}), 50);
+
+							// Focus on a node w/a tooltip
+							robot.sequence(d.getTestErrback(function(){
+								around.focus();
+							}), 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(helpers.isHidden(masterTT.domNode), "tooltip should be hidden on initial focus, but text shown is: " +
+										lang.trim(helpers.innerText(masterTT.domNode)));
+							}), 50);
+
+							// But then tab away after 100ms, before tooltip is shown
+							robot.keyPress(keys.TAB, 50, {shift: true});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden(masterTT.domNode), "tooltip still hidden after tabbing away");
+							}), 1000);
+
+							return d;
+						}
+					}
+            	]);
+
+				doh.register("dijit.Tooltip API tests", [
+
+					// These tests are for a tooltip attached to multiple nodes,
+					// and for dynamically changing the nodes that a tooltip is attached to.
+
+					// Initially, the tooltip is attached to "t1 text" and "t3 text".
+					// It should show for either of them.
+					// "t2 text" shouldn't show until we connect the tooltip to that node.
+
+					{
+						name: "setup",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								tooltip = registry.byId("t_tooltip");
+
+							// While we are at it, test set('label', ...) too
+							tooltip.set('label', 'bill was here');
+
+							var connectIds = tooltip.get("connectId");
+							doh.is(2, connectIds.length, "2 connect ids initially");
+							doh.is("t1", connectIds[0]);
+							doh.is("t3", connectIds[1]);
+						}
+					},
+
+					{
+						name: "tooltip connected to 't1 text'",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								around = dom.byId("t1");
+
+							robot.sequence(function(){
+								winUtils.scrollIntoView(around);
+								around.focus();
+							}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+
+								// Make sure it has right content
+								doh.is("bill was here", lang.trim(helpers.innerText(masterTT.domNode)), "tooltip text");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "tooltip *not* connected to 't2 text'",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								around = dom.byId("t2");
+
+							robot.sequence(function(){
+								winUtils.scrollIntoView(around);
+								around.focus();
+							}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isHidden(masterTT.domNode), "tooltip hidden");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "'t3 text' is connected to the tooltip",
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								around = dom.byId("t3");
+
+							robot.sequence(function(){
+								winUtils.scrollIntoView(around);
+								around.focus();
+							}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip visible");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "connect to 't2 text'",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								tooltip = registry.byId("t_tooltip"),
+								around = dom.byId("t2");
+
+							tooltip.addTarget("t2");
+
+							var connectIds = tooltip.get("connectId");
+							doh.is(3, connectIds.length, "3 connect ids");
+							doh.is("t1", connectIds[0]);
+							doh.is("t3", connectIds[1]);
+							doh.is("t2", connectIds[2]);
+
+							// Focus "t2 text" and make sure tooltip shows
+							winUtils.scrollIntoView(around);
+							around.focus();
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "disconnect from 't3 text'",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								tooltip = registry.byId("t_tooltip"),
+								around = dom.byId("t3");
+
+							tooltip.removeTarget("t3");
+							var connectIds = tooltip.get("connectId");
+							doh.is(2, connectIds.length, "2 connect ids");
+							doh.is("t1", connectIds[0]);
+							doh.is("t2", connectIds[1]);
+
+							// Focus "t3 text" and make sure tooltip doesn't show
+							winUtils.scrollIntoView(around);
+							around.focus();
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isHidden(masterTT.domNode), "tooltip hidden");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "reset connectId array",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								tooltip = registry.byId("t_tooltip"),
+								around = dom.byId("t2");
+
+							// Move focus somewhere out of the way
+							dom.byId("t5").focus();
+
+							// Disconnecting from "t2 text", and adding "t4 text"
+							tooltip.set("connectId", ["t3", "t4"]);
+
+							// Focus "t2 text" and make sure tooltip doesn't show anymore
+							winUtils.scrollIntoView(around);
+							around.focus();
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isHidden(masterTT.domNode), "tooltip hidden");
+							}), 2000);
+
+							return d;
+						}
+					},
+					{
+						name: "further testing connectId array reset worked",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								tooltip = registry.byId("t_tooltip"),
+								around = dom.byId("t4");
+
+							// Focus "t4 text" and make sure tooltip shows
+							winUtils.scrollIntoView(around);
+							around.focus();
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip visible");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					// Nominal tests for old dojoType syntax, remove in 2.0
+					function oldDojoTypeSyntax(){
+						var tooltip = registry.byId("oldmulti1,oldmulti2_tooltip");
+						doh.is(2, tooltip.get("connectId").length);
+						doh.is("oldmulti1", tooltip.get("connectId")[0]);
+						doh.is("oldmulti2", tooltip.get("connectId")[1]);
+					}
+				]);
+
+				doh.register("Focus on nested element", [
+					{
+						name: "Focus on nested element",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Focus an input where the containing div has a tooltip.
+							// Should show a tooltip on the div.
+							dom.byId("nestedInput").focus();
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+
+								var tooltipPos = domGeom.position(masterTT.domNode),
+									anchorPos = domGeom.position("nested");
+								doh.t(Math.round(tooltipPos.x) >= Math.round(anchorPos.x + anchorPos.w),
+										"tooltip pos " + tooltipPos.x + " > anchor right edge at " +
+												anchorPos.x + " + " + anchorPos.w);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Tooltip_mouse.html b/src/main/resources/static/dijit/tests/robot/Tooltip_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..3b6a7d29fbb400624aca4617d38302eb50b8492f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Tooltip_mouse.html
@@ -0,0 +1,357 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Tooltip Mouse Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+		require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/dom-geometry", "dojo/_base/lang", "dojo/query", "dojo/window",
+				"dijit/tests/helpers", "dojo/domReady!"
+			], function(doh, robot, dom, domGeom, lang, query, winUtils, helpers){
+				robot.initRobot('../test_Tooltip.html');
+
+				// Pointer to master tooltip.  This gets set in the first test when the
+				// first tooltip is shown
+				var masterTT;
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+					dfocus = robot.window.require("dijit/focus");
+					Tooltip = robot.window.require("dijit/Tooltip");
+				});
+
+				doh.register("dijit.Tooltip mouse tests", [
+					{
+						name: "show on mouse over",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								around = dom.byId("four");
+
+							robot.mouseMoveAt("four", 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// At this point the master tooltip should have been created, so save in
+								// global variable
+								masterTT = Tooltip._masterTT;
+
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "hide on unhover",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Move off of the "button w/tooltip" to node which doesn't have a tooltip
+							robot.mouseMoveAt(query("h1")[0], 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isHidden(masterTT.domNode), "tooltip hidden");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "click to focus, then mouse away",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("id1", 500);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+								doh.is("id1", dfocus.curNode && dfocus.curNode.id, "node is focused");
+							}), 2000);
+
+							// Move off of the focused node to node which doesn't have a tooltip
+							robot.mouseMoveAt(query("h1")[0], 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isHidden(masterTT.domNode), "tooltip hidden");
+							}), 2000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Tooltip on Menu", [
+					{
+						name: "show tooltip on MenuItem",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Click the DropDownButton to open the Menu
+							robot.mouseMoveAt("ddb", 500);
+							robot.mouseClick({left: true}, 500);
+
+							// Move over the MenuItem to show the tooltip
+							robot.mouseMoveAt("copy", 2000);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+								doh.is("tooltip for copy", lang.trim(helpers.innerText(masterTT.domNode)), "tooltip text");
+							}), 750);
+
+							return d;
+						}
+					},
+
+					{
+						name: "hide Tooltip on Menu close",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Click the MenuItem to close the menu
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(helpers.isHidden(registry.byId("ddm").domNode), "menu hidden");
+								doh.t(masterTT && helpers.isHidden(masterTT.domNode), "tooltip hidden");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Tooltip in TitlePane", [
+					{
+						name: "show tooltip on span in TitlePane",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("tpTooltipTarget", 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+								doh.is("tooltip on TitlePane span", lang.trim(helpers.innerText(masterTT.domNode)), "tooltip text");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Mouse over nested div", [
+					{
+						name: "mouse over nested div",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Start with mouse to the left of the nested divs
+							robot.mouseMoveAt("nested", 500, 0, -50, 0);
+
+							// Then move to inner div.   The onmouseenter event will occur with evt.target == inner div
+							robot.mouseMoveAt("nested", 500, 0);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+
+								var tooltipPos = domGeom.position(masterTT.domNode),
+									anchorPos = domGeom.position("nested");
+								doh.t(tooltipPos.x >= anchorPos.x + anchorPos.w,
+										"tooltip pos " + tooltipPos.x + " > anchor right edge at " +
+												anchorPos.x + " + " + anchorPos.w);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("Delegation", [
+					function scrollIntoView(){
+						// Scroll the whole table into view to make tooltip position tests work correctly
+						winUtils.scrollIntoView("myTable");
+					},
+					{
+						name: "mouse over row 1",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("myTable-row1", 500, 0);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+								doh.is("Tooltip for row 1", lang.trim(helpers.innerText(masterTT.domNode)), "tooltip text");
+
+								var tooltipPos = domGeom.position(masterTT.domNode),
+									anchorPos = domGeom.position("myTable-row1");
+								doh.t(tooltipPos.y + tooltipPos.h/2 >= anchorPos.y,
+										"tooltip pos " + tooltipPos.y + " height " + tooltipPos.h +
+										"anchor " + anchorPos.y + " + height " + anchorPos.h);
+								doh.t(tooltipPos.y + tooltipPos.h/2 <= anchorPos.y + anchorPos.h,
+										"tooltip pos " + tooltipPos.y + " height " + tooltipPos.h +
+										"anchor " + anchorPos.y + " + height " + anchorPos.h);
+							}), 800);
+
+							return d;
+						}
+					},
+					{
+						name: "mouse over row 3",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("myTable-row3", 500, 0);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+								doh.is("Tooltip for row 3", lang.trim(helpers.innerText(masterTT.domNode)), "tooltip text");
+
+								var tooltipPos = domGeom.position(masterTT.domNode),
+									anchorPos = domGeom.position("myTable-row3");
+								doh.t(tooltipPos.y + tooltipPos.h/2 >= anchorPos.y,
+										"tooltip pos " + tooltipPos.y + " height " + tooltipPos.h +
+										"anchor " + anchorPos.y + " + height " + anchorPos.h);
+								doh.t(tooltipPos.y + tooltipPos.h/2 <= anchorPos.y + anchorPos.h,
+										"tooltip pos " + tooltipPos.y + " height " + tooltipPos.h +
+										"anchor " + anchorPos.y + " + height " + anchorPos.h);
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "mouse over row 4",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("myTable-row4", 500, 0);
+
+							robot.sequence(d.getTestCallback(function(){
+								// should be no tooltip for rows >= 4
+								doh.t(masterTT && helpers.isHidden(masterTT.domNode), "tooltip hidden");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "mouse over row 2",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt("myTable-row2", 500, 0);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+								doh.is("Tooltip for row 2", lang.trim(helpers.innerText(masterTT.domNode)), "tooltip text");
+
+								var tooltipPos = domGeom.position(masterTT.domNode),
+									anchorPos = domGeom.position("myTable-row2");
+								doh.t(tooltipPos.y + tooltipPos.h/2 >= anchorPos.y,
+										"tooltip pos " + tooltipPos.y + " height " + tooltipPos.h +
+										"anchor " + anchorPos.y + " + height " + anchorPos.h);
+								doh.t(tooltipPos.y + tooltipPos.h/2 <= anchorPos.y + anchorPos.h,
+										"tooltip pos " + tooltipPos.y + " height " + tooltipPos.h +
+										"anchor " + anchorPos.y + " + height " + anchorPos.h);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+			doh.register("hideDelay", [
+				{
+					name: "mouse over button",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.mouseMoveAt("four", 500);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip shown");
+						}), 2000);
+
+						return d;
+					}
+				},
+
+				{
+					name: "mouse over tooltip",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.mouseMoveAt(masterTT.domNode, 500);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip still shown");
+						}), 2000);
+
+						return d;
+					}
+				},
+
+				{
+					name: "mouse over button again",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.mouseMoveAt("four", 500);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(masterTT && helpers.isVisible(masterTT.domNode), "tooltip still shown");
+						}), 2000);
+
+						return d;
+					}
+				},
+
+
+				{
+					name: "mouse away",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// move to node that doesn't have a tooltip
+						robot.mouseMoveAt(query("h1")[0], 500);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(masterTT && helpers.isHidden(masterTT.domNode), "tooltip hidden");
+						}), 2000);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/Tooltip_mouse_quirks.html b/src/main/resources/static/dijit/tests/robot/Tooltip_mouse_quirks.html
new file mode 100644
index 0000000000000000000000000000000000000000..c2a8765e85a450f5078904b47c02875b65ca298a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/Tooltip_mouse_quirks.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Tooltip Mouse Quirks Test</title>
+
+		<style>
+			@import "../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/query",
+				"dojo/domReady!"
+			], function(doh, robot, query){
+
+				robot.initRobot("../quirks.html?file=test_Tooltip.html");
+
+				doh.register(function setup(){
+					// get pointer to registry in the iframe
+					registry = robot.window.require("dijit/registry");
+				});
+
+				doh.register("dijit.Tooltip mouse quirks tests", [
+					// Test that BackgroundIFrame has right proportions; this used to fail in quirks mode
+					// because the BackgroundIFrame would overlap the calendar, blocking clicks on elements on the right.
+					{
+						name: "BackgroundIframe",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseMoveAt(query(".dijitArrowButton", registry.byId("dtb").domNode)[0], 500);
+							robot.mouseClick({left: true}, 500);
+
+							// Click Dec 4, 2010
+							robot.mouseMoveAt(function(){
+								return query(".dijitCalendarDateLabel", registry.byId("dtb_popup").domNode)[6];
+							} , 1000);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("12/4/2010", registry.byId("dtb").get("displayedValue"));
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/_KeyNavContainer.html b/src/main/resources/static/dijit/tests/robot/_KeyNavContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..772989995b1a9e5e55337bd6832045ccb0b89c32
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/_KeyNavContainer.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>_KeyNavContainer robot test</title>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+			data-dojo-config="isDebug: true, async: true"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx", "dojo/dom", "dojo/keys"
+		], function(doh, robot, dom, keys){
+
+			robot.initRobot('../test_KeyNavContainer.html');
+
+			doh.register(function setup(){
+				// get pointer to registry in the iframe
+				registry = robot.window.require("dijit/registry");
+				dfocus = robot.window.require("dijit/focus");
+			});
+
+			doh.register("keyboard", [
+				{
+					name: "multi char search with spaces",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var c = registry.byId("keyboard");
+						c.set("multiCharSearchDuration", 100);
+
+						// Tab in
+						robot.sequence(d.getTestErrback(function(){
+							dom.byId("input").focus();
+						}), 100);
+						robot.keyPress(keys.TAB, 100, {});
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("Alabama", dfocus.curNode.innerHTML);
+						}), 100);
+
+						// Type multi-character string with a space; make sure we navigate to the right item
+						robot.typeKeys("new m", 100);
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("New Mexico", dfocus.curNode.innerHTML);
+							doh.is(0, dom.byId("clicks").innerHTML, "no keyboard click events")
+						}), 100);
+
+						// Now that 100ms have elapsed, the search should be canceled, and each space typed
+						// should generate an a11y click event
+						robot.keyPress(keys.SPACE, 10, {});
+						robot.keyPress(keys.SPACE, 10, {});
+						robot.keyPress(keys.SPACE, 10, {});
+						robot.sequence(d.getTestErrback(function(){
+							doh.is(3, dom.byId("clicks").innerHTML, "three keyboard click events");
+						}), 100);
+
+						// And make sure that we can search to somewhere else
+						robot.typeKeys("n", 100);
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("New York", dfocus.curNode.innerHTML);
+						}), 100);
+
+						return d;
+					}
+				}
+			]);
+			doh.run();
+		});
+
+	</script>
+</head>
+<body class="claro">
+
+	<label for="input">before:</label><input id="input"/>
+	<div id="container" data-dojo-type="TestContainer">
+		<!-- comment just to make sure that numbering isn't thrown off -->
+		<div id="zero" data-dojo-type="TestContained">zero</div>
+		<div id="one" data-dojo-type="TestContained">one</div>
+		<div id="two" data-dojo-type="TestContained">two</div>
+		<div id="three" data-dojo-type="TestContained">three</div>
+	</div>
+
+	<div id="keyboard" data-dojo-type="TestContainer">
+		<div data-dojo-type="TestContained" value="AL">Alabama</div>
+		<div data-dojo-type="TestContained" value="AK">Alaska</div>
+		<div data-dojo-type="TestContained" value="AZ">Arizona</div>
+		<div data-dojo-type="TestContained" value="AR">Arkansas</div>
+		<div data-dojo-type="TestContained" value="CA">California</div>
+		<div data-dojo-type="TestContained" value="NH">New Hampshire</div>
+		<div data-dojo-type="TestContained" value="NJ">New Jersey</div>
+		<div data-dojo-type="TestContained" value="NM">New Mexico</div>
+		<div data-dojo-type="TestContained" value="NY">New York</div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/_Widget-deferredConnect.html b/src/main/resources/static/dijit/tests/robot/_Widget-deferredConnect.html
new file mode 100644
index 0000000000000000000000000000000000000000..422eeb68854ba7c37b16474ee37de76e70e44f78
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/_Widget-deferredConnect.html
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>robot deferred connect tests</title>
+
+	<style>
+		@import "../../../util/doh/robot/robot.css";
+	</style>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, async: true"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx", "dojo/domReady!"
+		], function(doh, robot){
+			robot.initRobot('../_Widget-deferredConnect.html');
+
+			// Test that deferred connections get set up correctly when they need to be
+			// (_Widget only does the dojo.connect() for onmousemove if it needs to)
+			doh.register("deferredConnect", [
+				{
+					name: "mouse move on widget where onmousemove overridden",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						robot.mouseMoveAt("overrode", 500);
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(robot.window.overrodeMouseMoved, "overrode button event handler fired");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					name: "mouse move on widget where onmousemove connected",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						robot.mouseMoveAt("connect", 500);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(robot.window.connectedMouseMoved, "connected button event handler fired");
+						}), 500);
+						return d;
+					}
+				},
+				{
+					name: "mouse move on widget where onmousemove overridden and connected",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						robot.mouseMoveAt("both", 500);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(robot.window.bothOverrodeMouseMoved, "dojo/method handler fired");
+							doh.t(robot.window.bothConnectedMouseMoved, "dojo/connect handler fired");
+						}), 500);
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/_Widget-ondijitclick_a11y.html b/src/main/resources/static/dijit/tests/robot/_Widget-ondijitclick_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..27b89981b6813caa8b69624c7d39dab27a0f575d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/_Widget-ondijitclick_a11y.html
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+
+	<title>Test Dijit Internal Event: "ondijitclick"</title>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js" data-dojo-config="isDebug: true, async: true"></script>
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx",
+			"dojo/_base/array", "dojo/aspect", "dojo/dom", "dojo/keys", "dojo/on", "dojo/domReady!"
+		], function(doh, robot, array, aspect, dom, keys, on){
+
+			robot.initRobot('../_Widget-ondijitclick.html');
+
+			// Event monitoring
+			var widgetClicks = 0, buttonClicks = 0, button2Clicks = 0, thirdClicks = 0;
+			var w;
+
+			doh.register(function setup(){
+				// get pointer to registry in the iframe
+				registry = robot.window.require("dijit/registry");
+			});
+
+			doh.register("setup", function(){
+				robot.sequence(function(){
+					w = registry.byId("first");
+					aspect.after(w, "_onClick", function(){
+						widgetClicks++;
+					}, true);
+					on(dom.byId("plainbutton", robot.doc), "click", function(){
+						buttonClicks++;
+					});
+					on(dom.byId("plainbutton2", robot.doc), "click", function(){
+						button2Clicks++;
+					});
+					on(dom.byId("third", robot.doc), "click", function(){
+						thirdClicks++;
+					});
+				});
+			});
+
+			// Test ondijitclick on a <div> which refocuses onto a native <button> node.
+			// Make sure that the <button> doesn't get a spurious click event.
+			array.forEach(["SPACE", "ENTER"], function(key){
+
+				doh.register("ondijitclick by " + key, [
+					{
+						name: "ondijitclick by " + key,
+						timeout: 5000,
+						runTest: function(){
+							widgetClicks = buttonClicks = 0;
+							var d = new doh.Deferred();
+
+							// Keyboard-click the widget
+							robot.sequence(function(){
+								w.domNode.focus();
+							}, 500);
+							robot.keyDown(keys[key], 250, {});
+							robot.keyUp(keys[key], 250, {});
+
+							// Check that ondijitclick fired but no spurious event
+							// on the widget that got focused in the ondijitclick handler
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(1, widgetClicks, "ondijitclick handler fired");
+								doh.is(0, buttonClicks, "spurious button click event");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "ondijitclick by " + key + " w/modifier",
+						timeout: 5000,
+						runTest: function(){
+							widgetClicks = buttonClicks = 0;
+							var d = new doh.Deferred();
+
+							robot.sequence(function(){
+								w.domNode.focus();
+							}, 500);
+				
+							// Try shift-space/shift-enter.
+							// Don't try ctrl-space or meta-space since those keystrokes have special functions
+							// (like context menu) in various browsers.
+
+							var shift;
+							aspect.after(w, "onClick", function(evt){
+								shift = evt.shiftKey;
+							}, true);
+
+							robot.keyPress(keys[key], 100, {shift: true});
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(1, widgetClicks, "ondijitclick handler fired");
+								doh.t(shift, "shift flag was set");
+								doh.is(0, buttonClicks, "button click handler wasn't fired");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+			});
+
+			// Test ondijitclick on a <div> which refocuses onto a native <textarea> node.
+			// Tests that the keyboard event gets suppressed so it doesn't modify the focused node.
+			array.forEach(["SPACE","ENTER"], function(key){
+
+				doh.register("focus to textarea by " + key, [
+					{
+						name: "ondijitclick by " + key,
+						timeout: 5000,
+						runTest: function(){
+							var d = new doh.Deferred(),
+								w = registry.byId("second");
+
+							// Keyboard-click the widget
+							robot.sequence(function(){
+								w.domNode.focus();
+							}, 500);
+							robot.keyPress(keys[key], 500, {});
+
+							// Check that ondijitclick fired but that focused textarea didn't get the key
+							robot.sequence(d.getTestCallback(function(){
+								doh.is("hello world", dom.byId("textarea", robot.doc).value);
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+			});
+
+			// Test onclick on a <button> which refocuses onto a <div> w/an ondijitclick handler.
+			// Make sure that the <div> doesn't get a spurious click event.
+			array.forEach(["SPACE", "ENTER"], function(key){
+
+				doh.register("focus to ondijitclick-div by " + key, [
+					{
+						name: "click by " + key,
+						timeout: 5000,
+						runTest: function(){
+							button2Clicks = thirdClicks = 0;
+
+							var d = new doh.Deferred(),
+								button = dom.byId("plainbutton2", robot.doc);
+
+							// Keyboard-click the native button
+							robot.sequence(function(){
+								button.focus();
+							}, 500);
+							robot.keyPress(keys[key], 500, {});
+
+							// Check that ondijitclick didn't fire
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(1, button2Clicks, "button2 was clicked (and focus moved to ondijitclick-div)");
+								doh.is(0, thirdClicks, "ondijitclick-div didn't get a spurious click event");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+			});
+
+			// Test clicking on a <button> with an ondijitclick handler.
+			// The main danger is getting two click events because the browser natively handles space-->click
+			array.forEach(["SPACE", "ENTER"], function(key){
+
+				doh.register("click ondijitclick button by " + key, [
+					{
+						name: "click by " + key,
+						timeout: 5000,
+						runTest: function(){
+
+							var d = new doh.Deferred(),
+								buttonWidget = registry.byId("widgetbutton"),
+								buttonNode = dom.byId("widgetbutton", robot.doc);
+
+							buttonWidget.clickCount = 0;
+
+							// Keyboard-click the widget button
+							robot.sequence(function(){
+								buttonNode.focus();
+							}, 500);
+							robot.keyPress(keys[key], 500, {});
+
+							// Check that ondijitclick fired exactly once
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(1, buttonWidget.clickCount, "one click event");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+			});
+
+			doh.register("bubbling", [
+				{
+					name: "bubbling",
+					timeout: 5000,
+					runTest: function(){
+
+						var d = new doh.Deferred(),
+							outerDiv = dom.byId("outer", robot.doc),
+							buttonNode = dom.byId("bubbleTestWidget", robot.doc),
+							buttonWidget = registry.byId("bubbleTestWidget");
+
+						// Listen for click events on the outer DOMNode.
+						var clicks = 0;
+						on(outerDiv, "click", function(){
+							clicks++;
+						});
+
+						// Keyboard-click the widget button
+						robot.sequence(function(){
+							buttonNode.focus();
+						}, 500);
+						robot.keyPress(keys.ENTER, 500, {});
+
+						// Check that one click event bubbled
+						robot.sequence(d.getTestCallback(function(){
+							doh.is(1, buttonWidget.clickCount, "one click event");
+							doh.is(1, clicks, "one click event bubbled");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/_Widget-ondijitclick_mouse.html b/src/main/resources/static/dijit/tests/robot/_Widget-ondijitclick_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..62d4a4176a122e833158637688e014eff983922e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/_Widget-ondijitclick_mouse.html
@@ -0,0 +1,116 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+
+	<title>Test Dijit Internal Event: "ondijitclick"</title>
+
+	<script type="text/javascript" src="../../../dojo/dojo.js" data-dojo-config="isDebug: true"></script>
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx",
+			"dojo/aspect", "dojo/dom", "dojo/on", "dojo/domReady!"
+		], function(doh, robot, aspect, dom, on){
+
+			robot.initRobot('../_Widget-ondijitclick.html');
+
+			// Event monitoring
+			var widgetClicks = 0, buttonClicks = 0;
+			var w;
+
+			doh.register(function setup(){
+				// get pointer to registry in the iframe
+				registry = robot.window.require("dijit/registry");
+			});
+
+			doh.register("ondijitclick w/mouse", {
+				timeout:5000,
+				runTest:function(){
+					var d = new doh.Deferred();
+
+					robot.sequence(function(){
+						w = registry.byId("first");
+						aspect.after(w, "_onClick", function(){
+							widgetClicks++;
+						}, true);
+						on(dom.byId("plainbutton", robot.doc), "click", function(){
+							buttonClicks++;
+						});
+						w.domNode.focus();
+					}, 100);
+
+					// click the widget
+					robot.mouseMoveAt("first", 500);
+					robot.mouseClick({left: true}, 500);
+
+					robot.sequence(d.getTestCallback(function(){
+						doh.is(1, widgetClicks, "ondijitclick handler fired once");
+					}), 1000);
+
+					return d;
+				}
+			});
+
+			// Test clicking on a <button> with an ondijitclick handler.
+			doh.register("click ondijitclick button", [
+				{
+					name: "click",
+					timeout: 5000,
+					runTest: function(){
+
+						var d = new doh.Deferred(),
+							buttonWidget = registry.byId("widgetbutton");
+
+						buttonWidget.clickCount = 0;
+
+						robot.mouseMoveAt("widgetbutton", 500);
+						robot.mouseClick({left: true}, 500);
+
+						// Check that ondijitclick fired exactly once
+						robot.sequence(d.getTestCallback(function(){
+							doh.is(1, buttonWidget.clickCount, "one click event");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.register("bubbling", [
+				{
+					name: "bubbling",
+					timeout: 5000,
+					runTest: function(){
+
+						var d = new doh.Deferred(),
+							outerDiv = dom.byId("outer", robot.doc),
+							buttonNode = dom.byId("bubbleTestWidget", robot.doc),
+							buttonWidget = registry.byId("bubbleTestWidget");
+
+						// Listen for click events on the outer DOMNode.
+						var clicks = 0;
+						on(outerDiv, "click", function(){
+							clicks++;
+						});
+
+						// click the widget button
+						robot.mouseMoveAt("bubbleTestWidget", 500);
+						robot.mouseClick({left: true}, 500);
+
+						// Check that one click event bubbled
+						robot.sequence(d.getTestCallback(function(){
+							doh.is(1, buttonWidget.clickCount, "one click event");
+							doh.is(1, clicks, "one click event bubbled");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/robot/typematic.html b/src/main/resources/static/dijit/tests/robot/typematic.html
new file mode 100644
index 0000000000000000000000000000000000000000..bd2746d2c78c77b7e9477aa55ee45c868ed35c74
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/robot/typematic.html
@@ -0,0 +1,103 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>typematic DOH Robot test</title>
+
+	<style>
+		@import "../../../util/doh/robot/robot.css";
+	</style>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx",
+			"dojo/dom", "dojo/keys",
+			"dojo/domReady!"
+		], function(doh, robot, dom, keys){
+			robot.initRobot('../test_typematic.html');
+
+			doh.register("press and hold test", [
+				{
+					name: "keyboard",
+					timeout: 9000,
+					runTest: function(){
+						var
+								d = new doh.Deferred(),
+								input = dom.byId("typematicInput"),
+								v;
+						input.value = "";
+						input.focus();
+
+						robot.keyDown(keys.CTRL, 1000);
+						robot.keyDown(keys.F11, 200);
+						robot.sequence(function(){
+							v = input.value; // get value before releasing key to reduce timing dependence on the robot
+						}, 2000);
+						robot.keyUp(keys.F11, 100);
+						robot.keyUp(keys.CTRL, 100);
+
+						robot.sequence(d.getTestCallback(function(){
+							// allow off by 1
+							doh.t(v == "aaaaaaaaaa" || v == "aaaaaaaaaaa" || v == "aaaaaaaaaaaa", "a letters typed " + v);
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "mouse",
+					timeout: 5000,
+					runTest: function(){
+						var
+								d = new doh.Deferred(),
+								input = dom.byId("typematicInput"),
+								v;
+						input.value = "";
+
+						robot.mouseMoveAt("typematicButton", 500, 1);
+						robot.mousePress({left: true}, 500);
+						robot.sequence(function(){
+							v = input.value; // get value before releasing button to reduce timing dependence on the robot
+						}, 1000);
+						robot.mouseRelease({left: true}, 100);
+
+						robot.sequence(d.getTestCallback(function(){
+							// allow off by 1
+							doh.t(v == "bbbbbb" || v == "bbbbbbb" || v == "bbbbbbbb", "b letters typed " + v);
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "double click",
+					timeout: 5000,
+					runTest: function(){
+						var
+								d = new doh.Deferred(),
+								input = dom.byId("typematicInput");
+						input.value = "";
+
+						robot.mouseMoveAt("typematicButton", 500, 1);
+						robot.mousePress({left: true}, 500);
+						robot.mouseRelease({left: true}, 100);
+						robot.mousePress({left: true}, 100);
+						robot.mouseRelease({left: true}, 100);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("bb", input.value, "b letters typed " + input.value);
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/runTests.html b/src/main/resources/static/dijit/tests/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..163bde12911c6f2d55a57f062eec6fa189ed9cb2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/runTests.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+	<title>Dijit Unit Test Runner</title>
+	<meta http-equiv="REFRESH" content="0;url=../../util/doh/runner.html?testModule=dijit.tests.module"></HEAD>
+	<BODY>
+		Redirecting to D.O.H runner.
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/strict.html b/src/main/resources/static/dijit/tests/strict.html
new file mode 100644
index 0000000000000000000000000000000000000000..37f8d75c55f524b53f2fdf3972564d8ec8d20d5e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/strict.html
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<script src="_loadTest.js"></script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Calendar.html b/src/main/resources/static/dijit/tests/test_Calendar.html
new file mode 100644
index 0000000000000000000000000000000000000000..f60f03f4059ab7d241ff3cd7160ba125df0d3a6b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Calendar.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Calendar Widget Test</title>
+
+		<script type="text/javascript" src="boilerplate.js"></script>
+
+		<style>
+			#calendar5 .dijitCalendarDateTemplate { height: 50px; width: 50px; border: 1px solid #ccc; vertical-align: top }
+			#calendar5 .dijitCalendarDateLabel, #calendar5 .dijitCalendarDateTemplate { text-align: inherit }
+			#calendar5 .dijitCalendarDayLabel { font-weight: bold }
+			#calendar5 .dijitCalendarSelectedYear { font-size: 1.5em }
+			#calendar5 .dijitCalendarMonthLabel { font-family: serif; letter-spacing: 0.2em; font-size: 2em }
+			.blue { color: blue !important /* override claro rule */ }
+		</style>
+
+		<script type="text/javascript">
+			require([
+				"dojo/_base/declare",
+				"dojo/date/locale",
+				"dojo/parser",
+				"dijit/Calendar",
+				"dojo/domReady!"
+			], function(declare, locale, parser, Calendar){
+				declare("BigCalendar", Calendar, {
+					isDisabledDate: locale.isWeekend,
+					getClassForDate: function(date){
+						if(!(date.getDate() % 10)){ return "blue"; } // apply special style to all days divisible by 10
+					}
+				});
+
+				parser.parse();
+
+				disableWeekends = function(){
+					calendar1.isDisabledDate = locale.isWeekend;
+					calendar1._populateGrid();
+				};
+			});
+
+			function myHandler(id,newValue){
+				console.debug("onChange for id = " + id + ", value: " + newValue);
+			}
+		</script>
+	</head>
+	<body class="claro" role="main">
+
+		<h1 class="testTitle">Dijit Calendar Test</h1>
+
+		<label for="before">input before: </label><input id="before"/>
+		<input id="calendar1" data-dojo-id="calendar1" data-dojo-type="dijit/Calendar" summary="Small calendar" data-dojo-props='onChange:function(v){ myHandler(this.id, v) }'/>
+		<label for="after">input after: </label><input id="after"/>
+		<p>
+			<a href="#" onclick="disableWeekends();">disable weekends</a>
+		</p>
+
+		<p>Big Calendar</p>
+		<input id="calendar5" data-dojo-type="BigCalendar" data-dojo-props='dayWidth:"abbr"' value="2008-03-14"/>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_ColorPalette.html b/src/main/resources/static/dijit/tests/test_ColorPalette.html
new file mode 100644
index 0000000000000000000000000000000000000000..4de8525768403a4f61ad3b49184f30a5958811c8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_ColorPalette.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>ColorPalette Test</title>
+
+	<script src="boilerplate.js" data-dojo-config="extraLocale: ['en-us', 'es-mx']"></script>
+
+	<script type="text/javascript">
+		require(["dojo/dom", "dojo/parser", "dijit/ColorPalette", "dojo/domReady!"],
+				function(dom, parser, ColorPalette){
+
+			setColor = function(color){
+				var theSpan = dom.byId("outputSpan");
+				theSpan.style.color = color;
+				theSpan.innerHTML = color;
+			};
+
+			parser.parse();
+
+			var date0 = new Date();
+			var palette = new ColorPalette({palette: "7x10", id: "prog", "aria-label": "programatic label"}, "programPalette");
+			console.log("creation time for 7x10 palette: " + (new Date() - date0) );
+		});
+
+	</script>
+</head>
+
+<body class="claro" role="main">
+
+	<h1 class="testTitle">dijit.ColorPalette test:</h1>
+
+	<p>Large color palette (7x10), English tooltips:</p>
+	<label for="beforeBig">label:</label><input id="beforeBig" value="for tabIndex testing"/>
+	<div id="big" data-dojo-type="dijit/ColorPalette" data-dojo-props='onChange:function(){ setColor(this.value); }, lang:"en-us", "aria-label":"This is the palette label"'></div>
+	<label for="afterBig">Test color is:</label> <span id="outputSpan"></span>.
+	<input id="afterBig" value="for tabIndex testing"/>
+
+	<p>Small color palette (3x4), Spanish tooltips:</p>
+	<label for="beforeSmall">label:</label><input id="beforeSmall" value="for tabIndex testing"/>
+	<div id="small" data-dojo-type="dijit/ColorPalette" data-dojo-props='palette:"3x4", lang:"es-mx","aria-label":"Small color palette"'></div>
+	<label for="afterSmall">label:</label><input id="afterSmall" value="for tabIndex testing"/>
+
+	<p>Default color palette (7x10) created programatically:</p>
+	<div id="programPalette"></div>
+
+	<p>ColorPalette with value pre-selected, using old style parser parameters:</p>
+	<label for="beforeValuePreselected">label:"</label><input id="beforeValuePreselected" value="for tabIndex testing"/>
+	<label for="valuePreselected">label for color palette</label><div id="valuePreselected" dojoType="dijit.ColorPalette" value="#0000ff"></div>
+	<label for="afterValuePreselected">label:</label><input id="afterValuePreselected" value="for tabIndex testing"/>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_ColorPalette_quirks.html b/src/main/resources/static/dijit/tests/test_ColorPalette_quirks.html
new file mode 100644
index 0000000000000000000000000000000000000000..fc06de9b7e73420917dc9aa45af8d2943b1b73ed
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_ColorPalette_quirks.html
@@ -0,0 +1,5 @@
+<html>
+<head>
+<script type="text/javascript" src="_loadTest.js" file="test_ColorPalette.html"></script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_ConfirmDialog.html b/src/main/resources/static/dijit/tests/test_ConfirmDialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..8213d32a365e6deba455bd9290aaba286e8dac6b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_ConfirmDialog.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>ConfirmDialog Widget Tests</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+
+			// used by parser
+			"dijit/ConfirmDialog",
+			"dijit/form/Button",
+			"dijit/form/TextBox",
+
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit.ConfirmDialog tests</h1>
+	<script type="dojo/require">
+		registry: "dijit/registry"
+	</script>
+
+	<button id="loginButton" data-dojo-type="dijit/form/Button"
+			data-dojo-props='onClick:function(){ registry.byId("loginDlg").show() }'>Show Confirm Dialog</button>
+
+	<div id="loginDlg" data-dojo-type="dijit/ConfirmDialog" title="Login" data-dojo-props='
+				execute:function(args){ console.log("submitted w/args: ", args); }'>
+		<script type="dojo/method" data-dojo-event="execute">
+			var value = this.get("value");
+			document.getElementById("formData").value = value.user + "/" + value.password;
+			console.log("login as " + value.user + ", " + value.password);
+		</script>
+		<script type="dojo/method" data-dojo-event="onCancel">
+			document.getElementById("formData").value = "";
+		</script>
+		<table role="presentation">
+			<tr>
+				<td><label for="user">User:</label></td>
+				<td><input id="user" name="user" data-dojo-type=dijit/form/TextBox></td>
+			</tr>
+			<tr>
+				<td><label for="password">Password:</label></td>
+				<td><input id="password" name="password" type=password data-dojo-type=dijit/form/TextBox></td>
+			</tr>
+		</table>
+	</div>
+
+	<br>
+	<label for="formData">Form data:</label><input id="formData" readonly>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_ConfirmTooltipDialog.html b/src/main/resources/static/dijit/tests/test_ConfirmTooltipDialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..cda03ca37f5824e2bb6678005e1e16c6c4c239f4
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_ConfirmTooltipDialog.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>ConfirmTooltipDialog Widget Tests</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/form/DropDownButton",
+			"dijit/ConfirmTooltipDialog",
+			"dijit/ColorPalette",
+			"dijit/form/TextBox",
+			"dijit/form/_FormMixin",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">dijit.ConfirmTooltipDialog tests</h1>
+
+	<div id="colorButton" data-dojo-type="dijit/form/DropDownButton">
+		<span>Color</span>
+		<div id="colorDlg" data-dojo-type="dijit/ConfirmTooltipDialog" title="Pick color">
+			<script type="dojo/method" data-dojo-event="onExecute">
+				var color = this.get("value").color;
+				document.getElementById("selectedColor").value = color;
+				console.log("picked color " + color);
+			</script>
+			<script type="dojo/method" data-dojo-event="onCancel">
+				document.getElementById("selectedColor").value = "";
+			</script>
+			<div data-dojo-type="dijit/ColorPalette" name="color"></div>
+		</div>
+	</div>
+
+	<label for="selectedColor">Selected color:</label>
+	<input readonly id="selectedColor">
+	|
+
+	<div id="loginButton" data-dojo-type="dijit/form/DropDownButton">
+		<span>Login</span>
+		<div id="loginDlg" data-dojo-type="dijit/ConfirmTooltipDialog"
+			 title="Enter Login information">
+			<script type="dojo/method" data-dojo-event="onExecute">
+				var value = this.get("value");
+				document.getElementById("formData").value = value.user + "/" + value.password;
+				console.log("login as " + value.user + ", " + value.password);
+			</script>
+			<script type="dojo/method" data-dojo-event="onCancel">
+				document.getElementById("formData").value = "";
+			</script>
+			<table role="presentation">
+				<tr>
+					<td><label for="user">User:</label></td>
+					<td><input id="user" name="user" data-dojo-type=dijit/form/TextBox></td>
+				</tr>
+				<tr>
+					<td><label for="password">Password:</label></td>
+					<td><input id="password" name="password" type=password data-dojo-type=dijit/form/TextBox></td>
+				</tr>
+			</table>
+		</div>
+	</div>
+
+	<label for="formData">Form data:</label>
+	<input readonly id="formData">
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Declaration.html b/src/main/resources/static/dijit/tests/test_Declaration.html
new file mode 100644
index 0000000000000000000000000000000000000000..174c61804eb7f405ab2778ac8c053f32191967a1
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Declaration.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Dojo Toolkit - Declaration test</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/on",
+			"dojo/parser",
+			"dijit/Declaration",
+			"dijit/ProgressBar",
+				"dojo/domReady!"
+		], function(doh, on, parser){
+
+			doh.register("dijit.Declaration", [
+				function parse(){
+					// run parser inside of DOH so we can tell if there are any exceptions
+					parser.parse();
+
+					// test instantiation of dojo.Declaration widgets
+					doh.t(hideButtonA, "hideButtonA instantiated");
+					doh.t(hideButtonB, "hideButtonB instantiated");
+					doh.t(hideButton2A, "hideButton2A instantiated");
+					doh.t(hideButton2B, "hideButton2B instantiated");
+				},
+
+				function basicTests(){	
+					// test <script type="dojo/method">	
+					doh.t(HideButton.prototype.myHandler, "myHandler method added to HideButton prototype");
+					doh.t(HideButton2.prototype.myHandler, "myHandler method added to HideButton2 prototype");
+	
+					// test prototype extension	
+					doh.t(mPrototypeExecuted, "m prototype executed");
+	
+					// test parameters
+					doh.is("blah", m1.foo, "m1.foo");
+					doh.is(73, m2.progress, "m2.progress");
+	
+					// test <script type="dojo/aspect">
+					doh.t(foo1, "foo1 exists");
+					doh.t(/modified by dojo\/aspect method=startup/.test(foo1.domNode.innerHTML), "dojo/aspect fired");
+				},
+
+				function functions(){
+					doh.is(3, m1.plus(1, 2), "testing function definition with data-dojo-args")
+				},
+
+				function events(){
+					doh.t(button1, "button created");
+					doh.t(button1.onButtonClick, "onButtonClick exists");
+
+					var clicked = false;
+					button1.on("ButtonClick", function(){
+						clicked = true;
+					});
+					on.emit(button1.domNode, "click", {});
+					doh.t(clicked, "clicked");
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro">
+	<h3>Simple macro:</h3>
+	<p>(Check to make sure that links contain employee number)
+	<div data-dojo-type="dijit/Declaration" data-dojo-props='widgetClass:"Employee", defaults:{ empid: 123, name: "" }'>
+		<span>${name}</span>
+		<a href="update.php?id=${empid}">update</a>
+		<a href="delete.php?id=${empid}">delete</a>
+	</div>
+	<div data-dojo-type="Employee" data-dojo-props='empid:100, name:"Alan Allen"'></div>
+	<div data-dojo-type="Employee" data-dojo-props='empid:101, name:"Bob Brown"'></div>
+	<div data-dojo-type="Employee" data-dojo-props='empid:102, name:"Cathy Cameron"'></div>
+
+	<h3>Using data-dojo-attach-event, data-dojo-attach-point</h3>
+	<div data-dojo-type="dijit/Declaration" data-dojo-props='widgetClass:"HideButton"'>
+		XXX<button data-dojo-attach-event="onclick: myHandler" data-dojo-attach-point="containerNode"></button>XXX
+		<script type='dojo/method' data-dojo-event='myHandler'>
+			this.domNode.style.display="none";
+		</script>
+	</div>
+	<button data-dojo-id="hideButtonA" data-dojo-type="HideButton" >Click to hide</button>
+	<button data-dojo-id="hideButtonB" data-dojo-type="HideButton" >Click to hide #2</button>
+
+	<h3>Extending another widget</h3>
+	<p>HideButton2 extends HideButton (above) and changes the template (but keeps the onclick handler).</p>
+	<span data-dojo-type="dijit/Declaration" data-dojo-props='widgetClass:"HideButton2", mixins:["HideButton"]'>
+		YYY<button data-dojo-attach-event="onclick: myHandler" data-dojo-attach-point="containerNode"></button>YYY
+	</span>
+	<button data-dojo-id="hideButton2A" data-dojo-type="HideButton2" >Hide me extended</button>
+	<button data-dojo-id="hideButton2B" data-dojo-type="HideButton2" >Hide me extended #2</button>
+
+	<h3>Using dojo/method:</h3>
+	<div data-dojo-type="dijit/Declaration" data-dojo-props='widgetClass:"m", defaults:{ foo: "thud", progress: 10 }'>
+		<script type='dojo/method' data-dojo-event='postCreate'>
+			console.log("in postCreate ", this, arguments);
+			mPrototypeExecuted = true;
+			this.inherited(arguments);
+			this.baz.innerHTML += " (created via custom postCreate) ";
+		</script>
+		<script type='dojo/method' data-dojo-event='plus' data-dojo-args="a, b">
+			return a + b;
+		</script>
+
+		<p>thinger blah stuff ${foo}</p>
+
+		<div data-dojo-type="dijit/ProgressBar" data-dojo-props='style:"width:400px", maximum:200,
+			progress:${progress}'></div>
+		<p data-dojo-attach-point='baz'>baz thud</p>
+	</div>
+
+	<div data-dojo-id="m1" data-dojo-type="m" data-dojo-props='foo:"blah", progress:50'></div>
+	<div data-dojo-id="m2" data-dojo-type="m" data-dojo-props='foo:"thinger", progress:73'></div>
+
+	<h3>Using dojo/aspect:</h3>
+	<div data-dojo-type="dijit/Declaration" data-dojo-props='widgetClass:"foo", defaults:{ foo: "thud", progress: 10 }'>
+		<script type='dojo/aspect' data-dojo-method='startup'>
+			this.baz.innerHTML += " (modified by dojo/aspect method=startup) ";
+		</script>
+
+		<p>thinger blah stuff ${foo}</p>
+
+		<div data-dojo-type="dijit/ProgressBar" data-dojo-props='style:"width:400px", maximum:200,
+			progress:${progress}'></div>
+		<p data-dojo-attach-point='baz'>baz thud</p>
+	</div>
+
+	<div data-dojo-id="foo1" data-dojo-type="foo" data-dojo-props='foo:"blah", progress:50'></div>
+	<div data-dojo-id="foo2" data-dojo-type="foo" data-dojo-props='foo:"thinger", progress:73'></div>
+
+	<h3>data-dojo-attach-event on root node</h3>
+	<div data-dojo-type="dijit/Declaration"
+		 	data-dojo-props='widgetClass:"button"'
+			data-dojo-attach-event="onclick: onButtonClick">
+		<script type='dojo/method' data-dojo-event='onButtonClick'>
+			console.log("in onButtonClicked");
+		</script>
+		click me
+	</div>
+
+	<button data-dojo-id="button1" data-dojo-type="button">click me</button>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Declaration_1.x.html b/src/main/resources/static/dijit/tests/test_Declaration_1.x.html
new file mode 100644
index 0000000000000000000000000000000000000000..464f9dae21e3de8359d8448c1bd7d0494272e3ac
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Declaration_1.x.html
@@ -0,0 +1,131 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+
+	<title>Dojo Toolkit - Declaration test</title>
+	<style type="text/css">
+		@import "../themes/claro/document.css";
+		@import "css/dijitTests.css";
+	</style>
+
+	<!-- required: a default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../dojo/dojo.js"
+		djConfig="isDebug: true"></script>
+
+	<!-- not needed, for testing alternate themes -->
+	<script type="text/javascript" src="_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dijit.Declaration");
+		dojo.require("dijit.ProgressBar");
+		dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+		dojo.require("doh.runner");
+
+		dojo.ready(function(){
+			doh.register("dijit.Declaration_1.x", [
+				function parse(){
+					// run parser inside of DOH so we can tell if there are any exceptions
+					dojo.parser.parse();
+
+					// test instantiation of dojo.Declaration widgets
+					doh.t(hideButtonA, "hideButtonA instantiated");
+					doh.t(hideButtonB, "hideButtonB instantiated");
+					doh.t(hideButton2A, "hideButton2A instantiated");
+					doh.t(hideButton2B, "hideButton2B instantiated");
+				},
+
+				function basicTests(){	
+					// test <script type="dojo/method">	
+					doh.t(HideButton.prototype.myHandler, "myHandler method added to HideButton prototype");
+					doh.t(HideButton2.prototype.myHandler, "myHandler method added to HideButton2 prototype");
+	
+					// test prototype extension	
+					doh.t(mPrototypeExecuted, "m prototype executed");
+	
+					// test parameters
+					doh.is("blah", m1.foo, "m1.foo");
+					doh.is(73, m2.progress, "m2.progress");
+	
+					// test <script type="dojo/connect">
+					doh.t(foo1, "foo1 exists");
+					doh.t(/modified by dojo\/connect event=startup/.test(foo1.domNode.innerHTML), "dojo/connect fired");
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro">
+	<h3>Simple macro:</h3>
+	<p>(Check to make sure that links contain employee number)
+	<div dojoType="dijit.Declaration" widgetClass="Employee" defaults="{ empid: 123, name: '' }">
+		<span>${name}</span>
+		<a href="update.php?id=${empid}">update</a>
+		<a href="delete.php?id=${empid}">delete</a>
+	</div>
+	<div dojoType="Employee" empid="100" name="Alan Allen"></div>
+	<div dojoType="Employee" empid="101" name="Bob Brown"></div>
+	<div dojoType="Employee" empid="102" name="Cathy Cameron"></div>
+
+	<h3>Using dojoAttachEvent, dojoAttachPoint</h3>
+	<div dojoType="dijit.Declaration" widgetClass="HideButton">
+		XXX<button dojoAttachEvent="onclick: myHandler" dojoAttachPoint="containerNode"></button>XXX
+		<script type='dojo/method' event='myHandler'>
+			this.domNode.style.display="none";
+		</script>
+	</div>
+	<button dojoType="HideButton" jsId="hideButtonA">Click to hide</button>
+	<button dojoType="HideButton" jsId="hideButtonB">Click to hide #2</button>
+
+	<h3>Extending another widget</h3>
+	<p>HideButton2 extends HideButton (above) and changes the template (but keeps the onclick handler).</p>
+	<span dojoType="dijit.Declaration" widgetClass="HideButton2" mixins="HideButton">
+		YYY<button dojoAttachEvent="onclick: myHandler" dojoAttachPoint="containerNode"></button>YYY
+	</span>
+	<button dojoType="HideButton2" jsId="hideButton2A">Hide me extended</button>
+	<button dojoType="HideButton2" jsId="hideButton2B">Hide me extended #2</button>
+
+	<h3>Using dojo/method:</h3>
+	<div dojoType="dijit.Declaration" widgetClass="m" defaults="{ foo: 'thud', progress: 10 }">
+		<script type='dojo/method' event='postCreate'>
+			console.log("in postCreate ", this, arguments);
+			mPrototypeExecuted = true;
+			this.inherited(arguments);
+			this.baz.innerHTML += " (created via custom postCreate) ";
+		</script>
+
+		<p>thinger blah stuff ${foo}</p>
+
+		<div style="width:400px" maximum="200"
+			progress="${progress}" dojoType="dijit.ProgressBar"></div>
+		<p dojoAttachPoint='baz'>baz thud</p>
+	</div>
+
+	<div dojoType="m" jsId="m1" foo="blah" progress="50"></div>
+	<div dojoType="m" jsId="m2" foo="thinger" progress="73"></div>
+
+	<h3>Using dojo/connect:</h3>
+	<div dojoType="dijit.Declaration" widgetClass="foo" defaults="{ foo: 'thud', progress: 10 }">
+		<script type='dojo/connect' event='startup'>
+			this.baz.innerHTML += " (modified by dojo/connect event=startup) ";
+		</script>
+
+		<p>thinger blah stuff ${foo}</p>
+
+		<div style="width:400px" maximum="200"
+			progress="${progress}" dojoType="dijit.ProgressBar"></div>
+		<p dojoAttachPoint='baz'>baz thud</p>
+	</div>
+
+	<div dojoType="foo" jsId="foo1" foo="blah" progress="50"></div>
+	<div dojoType="foo" jsId="foo2" foo="thinger" progress="73"></div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Dialog.html b/src/main/resources/static/dijit/tests/test_Dialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..88d21f7a89aed821d314c1ddd517129c975ec565
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Dialog.html
@@ -0,0 +1,715 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dialog Widget Tests</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<style type="text/css">
+		form { margin-bottom : 0; }
+		table { border: none; }
+		#dialog3_underlay { background-color: #027 }
+		#fifthDlg_underlay { background-color: yellow; }
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"dojo/_base/lang",
+			"dojo/date/stamp",
+			"dojo/dom",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/Dialog",
+
+			// used by parser
+			"dijit/Editor",
+			"dijit/_editor/plugins/AlwaysShowToolbar",
+			"dijit/InlineEditBox",
+			"dijit/Menu",
+			"dijit/MenuItem",
+			"dijit/MenuSeparator",
+			"dijit/form/Button",
+			"dijit/form/TextBox",
+			"dijit/form/DateTextBox",
+			"dijit/form/TimeTextBox",
+			"dijit/form/FilteringSelect",
+			"dijit/layout/BorderContainer",
+			"dijit/layout/ContentPane",
+			"dijit/layout/TabContainer",
+
+			"dojo/domReady!"
+		], function(lang, stamp, dom, parser, registry, Dialog){
+
+			var thirdDlg;
+			createDialog = function(){
+				if(!thirdDlg){
+					var pane = dom.byId('thirdDialog');
+					// should specify a width on dialogs with <p> tags, otherwise they get too wide
+					thirdDlg = new dijit.Dialog({
+						id: "dialog3",
+						title: "Programmatic Dialog Creation",
+						style: {width: '300px'}
+					},pane);
+				}
+				setTimeout(function(){ thirdDlg.show(); },"3000");
+			};
+
+			open2Dialogs = function (){
+				registry.byId('dialog1').show();
+				setTimeout(lang.hitch(registry.byId('fifthDlg'), 'show'), 1000);
+			};
+
+			showSelfDestructDlg = function(){
+				//for testing #12436
+				var dlg = new Dialog({
+					id: 'SelfDestructDlg',
+					title: 'Self-Destruct Dialog',
+					content: 'This dialog will destroy itself onHide.<br/><input type="text" id="SelfDestructDlgInput" />',
+					onHide: function(){
+						// Use setTimeout() to avoid memory leak warning for sIEve
+						setTimeout(function(){
+							dlg.destroyRecursive();
+						}, 0);
+					}
+				});
+				dlg.show();
+			};
+
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<script type="dojo/require">
+		dom: "dojo/dom",
+		registry: "dijit/registry"
+	</script>
+
+	<h1 class="testTitle">Dijit.Dialog tests</h1>
+
+	<h2>General Dialogs:</h2>
+	<button id="dialog1button" data-dojo-type="dijit/form/Button"  data-dojo-props='onClick:function(){ registry.byId("dialog1").show() }'>Show Dialog</button> |
+
+	<div id="dialog1" data-dojo-type="dijit/Dialog" data-dojo-props='title:"First Dialog",
+			"aria-describedby":"intro",
+			onFocus:function(){ console.log("user focus handler") },
+			onBlur:function(){ console.log("user blur handler") },
+			execute:function(args){ console.log("submitted w/args: ", args); }'>
+		<div id="intro" style="width:30em;">Introductory information spoken by screen reader if aria-describedby is
+		added to the declaration of dialog above with value equal to the id of the container element for this text. This technique
+		will work in Dojo 1.4. </div>
+		<table style="position:relative;" role="presentation">
+			<tr>
+				<td><label for="name">Name: </label></td>
+				<td><input id="name" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text", name:"name" '/></td>
+			</tr>
+			<tr>
+				<td><label for="loc">Location: </label></td>
+				<td><input id="loc" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text", name:"loc" '/></td>
+			</tr>
+			<tr>
+				<td><label for="date">Date: </label></td>
+				<td><input id="date" data-dojo-type="dijit/form/DateTextBox" data-dojo-props='type:"text", name:"date" '/></td>
+			</tr>
+			<tr>
+				<td><label>Time: </label></td>
+				<td><div id="time" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/TimeTextBox", editorParams:{type:"text", name:"time"}, width:"100px", style:"width:100px;"'></div></td>
+			</tr>
+			<tr>
+				<td><label for="desc">Description: </label></td>
+				<td><input id="desc" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text", name:"desc" '/></td>
+			</tr>
+			<tr>
+				<td colspan="2" style="text-align:center;">
+					<button id="ok" data-dojo-type="dijit/form/Button" type="submit">OK</button></td>
+			</tr>
+		</table>
+	</div>
+
+	<div id="dialog1ContextMenu" data-dojo-type="dijit/Menu" data-dojo-props='targetNodeIds:["dialog1"], style:"display: none;"'>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='disabled:true'
+				id="firstMenuItem">Dialog1 Menu</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Hello world"); }'
+			 	id="enabledMenuItem">Enabled Item</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='disabled:true'>Disabled Item</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+			onClick:function(){ console.log("not actually cutting anything, just a test!") }'>Cut</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+			onClick:function(){ console.log("not actually copying anything, just a test!") }'>Copy</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+			onClick:function(){ console.log("not actually pasting anything, just a test!") }'>Paste</div>
+	</div>
+
+
+	<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ createDialog(); }, title:"shows after 3 second delay, with blue background"'>Programatic Dialog (3 second delay)</button> |
+
+
+	<div id="thirdDialog" style="display: none;">
+		<form>
+		<input>
+		<br>
+		<button>hello</button>
+		<br><label for="select3">select label</label>
+		<select id="select3">
+			<option>Lorem</option>
+			<option>ipsum</option>
+			<option>dolor</option>
+			<option>sit</option>
+			<option>amet</option>
+		</select>
+		</form>
+		<p>
+		Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+		semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+		porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+		Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+		Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+		risus.
+		</p>
+	</div>
+
+	<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("tabDialog").show() }'>Show TabContainer Dialog</button> |
+
+	<div id="tabDialog" data-dojo-type="dijit/Dialog" data-dojo-props='title:"TabContainer Dialog"'>
+		<div id="tc" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 400px; height: 400px;"'>
+			<div id="cp1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"First tab"'>
+				<p>
+					This is the first tab.
+				</p>
+				<p>
+				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+				semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+				porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+				Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+				Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+				risus.
+				</p>
+			</div>
+			<div id="cp2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Second tab"'>
+				<p>
+					This is the second tab.
+				</p>
+				<p>
+				Make it overflow. <a href="http://www.lipsum.com/">ipsum dolor sit amet</a>, consectetuer adipiscing elit. Aenean
+				semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+				porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+				Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+				Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+				risus.
+				</p>
+				<p>
+				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+				semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+				porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+				Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+				Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+				risus.
+				</p>
+				<p>
+				Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+				semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+				porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+				Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+				Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+				risus.
+				</p>
+			</div>
+		</div>
+	</div>
+
+	<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("fifthDlg").show(); }'>Test slow loading HREF Dialog</button> |
+
+	<div id="fifthDlg" data-dojo-type="dijit/Dialog" data-dojo-props='href:"layout/getResponse.php?delay=3000&amp;messId=3",
+		style:"width: 300px", title:"From HREF (slow network simulated)"'></div>
+
+	<button id="filebutton" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("file").show() }'>Show File Dialog</button>
+
+	<div id="file" data-dojo-type="dijit/Dialog" data-dojo-props='title:"File Dialog",
+			onFocus:function(){ console.log("user focus handler") },
+			onBlur:function(){ console.log("user blur handler") },
+			execute:function(args){ console.log("submitted w/args: ", args); }, style:"min-width: 350px"'>
+		<!-- note: style="min-width: 350px" to workaround FF bug where width is too short, see http://bugs.dojotoolkit.org/ticket/5976 -->
+			<label for="afile">ID File: </label>
+			<input id="afile" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"file", name:"afile" '/>
+	</div>
+
+	<button id="unmovablebutton" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("unmovable").show() }'>Show Unmovable</button>
+
+	<div id="unmovable" data-dojo-type="dijit/Dialog" data-dojo-props='title:"unmovable", draggable:false'>
+		<p>You should not be able to <br /> drag this dialog</p>
+	</div>
+
+	<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("preventer").show() }'>Show Close prevention</button>
+
+	<div id="preventer" data-dojo-type="dijit/Dialog" data-dojo-props='title:"Confirm Close"'>
+		I am done entering data:
+		<button id="preventerOK" data-dojo-type="dijit/form/Button" type="submit" onClick='return confirm("Are you sure?");'>OK</button>
+	</div>
+
+	<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("embedded").show() }'>Dialog w/embedded layout widgets</button> |
+
+	<div id="embedded" data-dojo-type="dijit/Dialog" data-dojo-props='title:"Embedded layout widgets",
+		onShow:function(){ this.domNode.setAttribute("aria-describedby", "describe"); } '>
+		<p id="describe">
+			The pane has some text, plus two embedded layout widgets, which should
+			appear correctly even though the pane is initially hidden.
+		</p>
+		<p>
+			Here's a BorderContainer:
+		</p>
+		<div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props='style:"height:200px; width:300px"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"left", style:"width:100px", splitter:true'>
+				1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center"'>
+				2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</div>
+		</div>
+		<p>
+			And a TabContainer:
+		</p>
+		<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"height:200px; width:300px"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 1"'>
+				1Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tab 2"'>
+				2Sed arcu magna, molestie at, fringilla in, sodales eu, elit.
+				Curabitur mattis lorem et est. Quisque et tortor. Integer bibendum
+				vulputate odio. Nam nec ipsum. Vestibulum mollis eros feugiat
+				augue. Integer fermentum odio lobortis odio. Nullam mollis nisl non
+				metus. Maecenas nec nunc eget pede ultrices blandit. Ut non purus
+				ut elit convallis eleifend. Fusce tincidunt, justo quis tempus
+				euismod, magna nulla viverra libero, sit amet lacinia odio diam id
+				risus. Ut varius viverra turpis. Morbi urna elit, imperdiet eu,
+				porta ac, pharetra sed, nisi. Etiam ante libero, ultrices ac,
+				faucibus ac, cursus sodales, nisl. Praesent nisl sem, fermentum eu,
+				consequat quis, varius interdum, nulla. Donec neque tortor,
+				sollicitudin sed, consequat nec, facilisis sit amet, orci. Aenean
+				ut eros sit amet ante pharetra interdum.
+			</div>
+		</div>
+		<p>
+			Text after the widgets.
+		</p>
+	</div>
+	
+	
+	<!-- Action Bar test case -->
+	<button id="ABDlg1Btn" data-dojo-type="dijit/form/Button"  data-dojo-props='onClick:function(){ registry.byId("ABDlg1").show() }'>Show Dialog With Action Buttons</button>
+	<div id="ABDlg1" data-dojo-type="dijit/Dialog" data-dojo-props='title:"ActionBar Dialog 1",
+			onExecute:function(){ console.log("OK button pressed") },
+			onCancel:function(){ console.log("Cancel button pressed") },
+			"aria-describedby":"intro",
+			execute:function(args){ console.log("submitted w/args: ", args); }'>
+		<div class="dijitDialogPaneContentArea">
+			<div id="ABintro1" style="width:30em;">Introductory information spoken by screen reader if aria-describedby is
+			added to the declaration of dialog above with value equal to the id of the container element for this text. This technique
+			will work in Dojo 1.4. </div>
+		</div>
+		
+		
+		<div class="dijitDialogPaneActionBar">
+			<button id="ABdialog1button1" data-dojo-type="dijit/form/Button" type="submit">OK</button>
+			<button id="ABdialog1button2" data-dojo-type="dijit/form/Button" type="button" data-dojo-props='onClick:function(){ registry.byId("ABDlg1").onCancel(); }
+					'>Cancel</button>
+		</div>
+	</div>
+	
+	<button id="NABDlgBtn" data-dojo-type="dijit/form/Button"  data-dojo-props='onClick:function(){ registry.byId("NABDlg").show() }'>Show Dialog With No Action Buttons</button>
+	<div id="NABDlg" data-dojo-type="dijit/Dialog" data-dojo-props='title:"No Action Bar Dialog",
+			"aria-describedby":"intro",
+			onFocus:function(){ console.log("user focus handler") },
+			onBlur:function(){ console.log("user blur handler") },
+			execute:function(args){ console.log("submitted w/args: ", args); }'>
+				
+		<div class="dijitDialogPaneContentArea">
+			<div id="NABintro" style="width:30em;">Introductory information spoken by screen reader if aria-describedby is
+			added to the declaration of dialog above with value equal to the id of the container element for this text. This technique
+			will work in Dojo 1.4. </div>
+			<table>
+				<tr>
+					<td><label for="NABname">Name: </label></td>
+					<td><input id="NABname" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text", name:"NABname" '/></td>
+				</tr>
+				<tr>
+					<td><label for="NABloc">Location: </label></td>
+					<td><input id="NABloc" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text", name:"NABloc" '/></td>
+				</tr>
+				<tr>
+					<td><label for="NABdate">Date: </label></td>
+					<td><input id="NABdate" data-dojo-type="dijit/form/DateTextBox" data-dojo-props='type:"text", name:"NABdate" '/></td>
+				</tr>
+				<tr>
+					<td><label for="NABdesc">Description: </label></td>
+					<td><input id="NABdesc" data-dojo-type="dijit/form/TextBox" data-dojo-props='type:"text", name:"NABdesc" '/></td>
+				</tr>
+			</table>
+		</div>
+	</div>
+
+
+	<button id="layeredDialogs" data-dojo-type="dijit/form/Button"  data-dojo-props='onClick:open2Dialogs'>Show 2 Dialogs</button>
+
+	<button id="iframeDlg" data-dojo-type="dijit/form/Button"  data-dojo-props='onClick:function(){ registry.byId("dlgFrame").show(); }'>Show iframe in dialog</button>
+	<div id="dlgFrame" data-dojo-type="dijit/Dialog" data-dojo-props='title:"Search"'>
+		<iframe title="Test IFrame" src="layout/getResponse.php?delay=3000&amp;messId=3" style="width:600px; height: 400px;">
+	</iframe>
+				
+	</div>
+
+	<button id="RadioButtonDlgBtn" data-dojo-type="dijit/form/Button"  data-dojo-props='onClick:function(){ registry.byId("RadioButtonDlg").show() }'>Show Dialog With Radio Button at End</button>
+	<div id="RadioButtonDlg" data-dojo-type="dijit/Dialog" data-dojo-props='title:"Radio Button Dialog"'>
+	  <div class="dijitDialogPaneContentArea">
+	    <textarea id="textarea-radio-test" width="400" height="200"></textarea>
+	    <fieldset>
+	      <legend>Best Pet</legend>
+	      <input id="dograd" type="radio" name="pet" checked="checked"/>
+	      <label for="dograd">Dog</label> -
+	      <input id="catrad" type="radio" name="pet"/>
+	      <label for="catrad">Cat</label>
+	    </fieldset>
+	  </div>
+	</div>
+	
+	<button id="SelfDestructDlgBtn" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:showSelfDestructDlg'>Show Self-Destruct Dialog</button>
+	<div id="SelfDestructDlgBtn2" style="border: 1px solid black;" class="dijitInline" onclick="showSelfDestructDlg();" role="button">Show Self-Destruct Dialog (unfocusable div)</div>
+
+	<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ createDialog() }, title:"shows after 3 second delay, with blue background"'>Programatic Dialog (3 second delay)</button> |
+
+	<button id="unclosableButton" data-dojo-type="dijit/form/Button"  data-dojo-props='onClick:function(){ registry.byId("unclosable").show() }'>Show Unclosable Dialog</button> |
+
+	<div id="unclosable" data-dojo-type="dijit/Dialog" title="Unclosable Dialog" data-dojo-props="closable:false">
+		<div class="dijitDialogPaneContentArea">
+			This dialog has no close icon and the ESCAPE key won't close it.  You need to use the buttons.
+		</div>
+		<div class="dijitDialogPaneActionBar">
+			<button id="unclosableSubmit" data-dojo-type="dijit/form/Button" type="submit">OK</button>
+			<button id="unclosableCancel" data-dojo-type="dijit/form/Button" type="button"
+					onClick='registry.byId("unclosable").onCancel();'>Cancel</button>
+		</div>
+	</div>
+
+	<button id="iebDialogBtn" data-dojo-type="dijit/form/Button"
+			data-dojo-props='onClick:function(){ registry.byId("iebDialog").show(); }'>
+		Show Dialog With InlineEditBox Editors
+	</button> |
+	<div id="iebDialog" data-dojo-type="dijit/Dialog" title="Test Dialog with Autosave Inline Rich Text Editors">
+		<h2>Editor 1</h2>
+		<div id="inlineRTE1" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/Editor",
+            autoSave:true, renderAsHtml:true,
+            editorParams:{id: "RTE1", height: "", extraPlugins: ["dijit._editor.plugins.AlwaysShowToolbar"]}'>
+			first text
+		</div>
+
+		<h2>Editor 2</h2>
+		<div id="inlineRTE2" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/Editor",
+            autoSave:true, renderAsHtml:true,
+            editorParams:{id: "RTE2", height: "", extraPlugins: ["dijit._editor.plugins.AlwaysShowToolbar"]}'>
+			second text
+		</div>
+
+		<h2>Editor 3</h2>
+		<div id="inlineRTE3" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/Editor",
+            autoSave:true, renderAsHtml:true,
+            editorParams:{id: "RTE3", height: "", extraPlugins: ["dijit._editor.plugins.AlwaysShowToolbar"]}'>
+			third text
+		</div>
+
+	</div>
+
+	<h2>Simulated Editor with Dialog:</h2>
+	<div id="editorDialog" data-dojo-type="dijit/Dialog" title="Insert Text" data-dojo-props="refocus: false">
+		<script type="dojo/method" data-dojo-event="execute">
+			var editor = dom.byId("editor"), newVal = dom.byId("dialogTextarea").value;
+			console.log("focusing editor and setting value to " + newVal);
+			editor.focus();
+			editor.value = newVal;
+		</script>
+		<p>
+			Enter text then hit OK.
+			Focus will be shifted to "editor" below and text will be inserted.
+		</p>
+		<textarea id="dialogTextarea" style="width: 90%" placeholder="enter text here"></textarea>
+		<br>
+		<button data-dojo-type="dijit/form/Button" type="submit">OK</button>
+	</div>
+	<div style="background-color: #eee; border: solid gray 1px; width: 90%;">
+		<button id="insertTextButton" onclick="registry.byId('editorDialog').show();">insert text</button>
+	</div>
+	<textarea id="editor" style="width: 90%; border: solid gray 1px; border-top: none;">
+		The button above will open a Dialog to reset the text in this textarea.
+	</textarea>
+
+	<p><b><i>(scroll down to see more links to click, for testing positioning / scroll handling)</i></b></p>
+
+	<p>
+	Here's a form.  Try clicking the programatic dialog link, then focusing on the form.
+	After the dialog closes focus should be returned to the form
+	</p>
+
+	<form>
+	<label for="plainInput">plainInput</label>
+	<input id="plainInput"/>
+	<br>
+	<button id="plainButton">hello</button>
+	<br>
+	<label for="plainButtonSelect">planeButton Select:</label>
+	<select id="plainButtonSelect">
+		<option>Lorem</option>
+		<option>ipsum</option>
+		<option>dolor</option>
+		<option>sit</option>
+		<option>amet</option>
+	</select>
+	</form>
+
+
+	<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+	imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+	nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+	massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+	pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+	quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+	felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+	quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+	rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+	semper velit ante id metus. Praesent massa dolor, porttitor sed,
+	pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+	tortor pharetra congue. Suspendisse pulvinar.
+	</p>
+	<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+	ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+	nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+	lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+	est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+	dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+	nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+	pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+	sociosqu ad litora torquent per conubia nostra, per inceptos
+	hymenaeos.
+	</p>
+	<form>
+		<div style="text-align:center;">
+		  <label for="centerSelect">select:</label>
+			<select id="centerSelect">
+				<option>1</option>
+				<option>2</option>
+			</select>
+		</div>
+	</form>
+	<p>Mauris pharetra lorem sit amet sapien. Nulla libero metus, tristique
+	et, dignissim a, tempus et, metus. Ut libero. Vivamus tempus purus vel
+	ipsum. Quisque mauris urna, vestibulum commodo, rutrum vitae, ultrices
+	vitae, nisl. Class aptent taciti sociosqu ad litora torquent per
+	conubia nostra, per inceptos hymenaeos. Nulla id erat sit amet odio
+	luctus eleifend. Proin massa libero, ultricies non, tincidunt a,
+	vestibulum non, tellus. Nunc nunc purus, lobortis a, pulvinar at,
+	egestas a, mi. Cras adipiscing velit a mauris. Morbi felis. Etiam at
+	felis. Cras eget eros et justo mattis pulvinar. Nullam at justo id
+	risus porttitor dignissim. Vestibulum sed velit vel metus tincidunt
+	tempus. Nunc euismod nisl id dolor tristique tincidunt. Nullam placerat
+	turpis sed odio. Curabitur in est id nibh tempus ultrices. Aliquam
+	consectetuer dapibus eros. Aliquam nisl.
+	</p>
+	<div id="reallyWide">[spacer]</div>
+	<p>
+	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+	semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+	porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+	Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+	Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+	risus.
+	</p>
+	<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+	imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+	nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+	massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+	pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+	quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+	felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+	quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+	rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+	semper velit ante id metus. Praesent massa dolor, porttitor sed,
+	pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+	tortor pharetra congue. Suspendisse pulvinar.
+	</p>
+	<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+	ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+	nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+	lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+	est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+	dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+	nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+	pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+	sociosqu ad litora torquent per conubia nostra, per inceptos
+	hymenaeos.
+	</p>
+	<form>
+		<div style="text-align:center;">
+			<label for="twoOptionSelect">select:</label>
+			<select id="twoOptionSelect">
+				<option>1</option>
+				<option>2</option>
+			</select>
+		</div>
+	</form>
+	<p>Mauris pharetra lorem sit amet sapien. Nulla libero metus, tristique
+	et, dignissim a, tempus et, metus. Ut libero. Vivamus tempus purus vel
+	ipsum. Quisque mauris urna, vestibulum commodo, rutrum vitae, ultrices
+	vitae, nisl. Class aptent taciti sociosqu ad litora torquent per
+	conubia nostra, per inceptos hymenaeos. Nulla id erat sit amet odio
+	luctus eleifend. Proin massa libero, ultricies non, tincidunt a,
+	vestibulum non, tellus. Nunc nunc purus, lobortis a, pulvinar at,
+	egestas a, mi. Cras adipiscing velit a mauris. Morbi felis. Etiam at
+	felis. Cras eget eros et justo mattis pulvinar. Nullam at justo id
+	risus porttitor dignissim. Vestibulum sed velit vel metus tincidunt
+	tempus. Nunc euismod nisl id dolor tristique tincidunt. Nullam placerat
+	turpis sed odio. Curabitur in est id nibh tempus ultrices. Aliquam
+	consectetuer dapibus eros. Aliquam nisl.
+	</p>
+
+	<p>
+	<button data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ registry.byId("dialog1").show() }'>Show Dialog</button> |
+	<!-- showing a dialog from an anchor with inline onclick="" is a solution to page onUnLoad firing
+		but you must return false; alternatively, you can dojo.connect() to the anchor links, and
+		e.preventDefault() on the event object passed. using href="javascript:" inline causes onUnLoad
+		to destroy all widgets in IE6
+	-->
+	<a href="http://dojotoolkit.org" onclick="registry.byId('dialog1').show(); return false; ">Show Dialog</a>
+	</p>
+
+	<p>
+	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+	semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+	porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+	Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+	Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+	risus.
+	</p>
+	<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+	imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+	nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+	massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+	pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+	quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+	felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+	quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+	rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+	semper velit ante id metus. Praesent massa dolor, porttitor sed,
+	pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+	tortor pharetra congue. Suspendisse pulvinar.
+	</p>
+	<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+	ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+	nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+	lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+	est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+	dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+	nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+	pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+	sociosqu ad litora torquent per conubia nostra, per inceptos
+	hymenaeos.
+	</p>
+	<p>Mauris pharetra lorem sit amet sapien. Nulla libero metus, tristique
+	et, dignissim a, tempus et, metus. Ut libero. Vivamus tempus purus vel
+	ipsum. Quisque mauris urna, vestibulum commodo, rutrum vitae, ultrices
+	vitae, nisl. Class aptent taciti sociosqu ad litora torquent per
+	conubia nostra, per inceptos hymenaeos. Nulla id erat sit amet odio
+	luctus eleifend. Proin massa libero, ultricies non, tincidunt a,
+	vestibulum non, tellus. Nunc nunc purus, lobortis a, pulvinar at,
+	egestas a, mi. Cras adipiscing velit a mauris. Morbi felis. Etiam at
+	felis. Cras eget eros et justo mattis pulvinar. Nullam at justo id
+	risus porttitor dignissim. Vestibulum sed velit vel metus tincidunt
+	tempus. Nunc euismod nisl id dolor tristique tincidunt. Nullam placerat
+	turpis sed odio. Curabitur in est id nibh tempus ultrices. Aliquam
+	consectetuer dapibus eros. Aliquam nisl.
+	</p>
+
+	<p>
+	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+	semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+	porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+	Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+	Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+	risus.
+	</p>
+	<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+	imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+	nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+	massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+	pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+	quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+	felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+	quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+	rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+	semper velit ante id metus. Praesent massa dolor, porttitor sed,
+	pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+	tortor pharetra congue. Suspendisse pulvinar.
+	</p>
+	<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+	ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+	nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+	lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+	est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+	dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+	nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+	pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+	sociosqu ad litora torquent per conubia nostra, per inceptos
+	hymenaeos.
+	</p>
+	<p>Mauris pharetra lorem sit amet sapien. Nulla libero metus, tristique
+	et, dignissim a, tempus et, metus. Ut libero. Vivamus tempus purus vel
+	ipsum. Quisque mauris urna, vestibulum commodo, rutrum vitae, ultrices
+	vitae, nisl. Class aptent taciti sociosqu ad litora torquent per
+	conubia nostra, per inceptos hymenaeos. Nulla id erat sit amet odio
+	luctus eleifend. Proin massa libero, ultricies non, tincidunt a,
+	vestibulum non, tellus. Nunc nunc purus, lobortis a, pulvinar at,
+	egestas a, mi. Cras adipiscing velit a mauris. Morbi felis. Etiam at
+	felis. Cras eget eros et justo mattis pulvinar. Nullam at justo id
+	risus porttitor dignissim. Vestibulum sed velit vel metus tincidunt
+	tempus. Nunc euismod nisl id dolor tristique tincidunt. Nullam placerat
+	turpis sed odio. Curabitur in est id nibh tempus ultrices. Aliquam
+	consectetuer dapibus eros. Aliquam nisl.
+	</p>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Dialog_focusDestroy.html b/src/main/resources/static/dijit/tests/test_Dialog_focusDestroy.html
new file mode 100644
index 0000000000000000000000000000000000000000..7fa0d214829fbcd74242caed8bc147ddd3a563f4
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Dialog_focusDestroy.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dialog Widget Dojo Tests</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<style type="text/css">
+		body { font-family : sans-serif; }
+		form { margin-bottom : 0; }
+		table { border: none; }
+		#dialog3_underlay { background-color: #027 }
+	</style>
+
+
+	<script type="text/javascript">
+		require(["dojo/parser", "dijit/Dialog", "dijit/form/Button", "dojo/domReady!"], function(parser, Dialog, Button){
+
+			createAndShow = function(){
+				var node = document.createElement("div");
+				document.body.appendChild(node);
+				var dlg = new Dialog({ title: "test input focus" }, node);
+
+				var input = document.createElement("input");
+				input.tabIndex = 0;
+				dlg.containerNode.appendChild(input);
+
+				var btn = new Button({
+					id: "destroyButton",
+					label: "Close",
+					onClick: function(){
+						console.log("destroying, while visible");
+						dlg.destroy();
+					}
+				});
+				dlg.containerNode.appendChild(btn.domNode);
+
+				dlg.show();
+			};
+
+			parser.parse();
+
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit layout.Dialog tests</h1>
+
+	<p>If you input this box, you can type. You should be able to type and use backspace/etc
+	when you destroy the visible dialog. refs <a href="http://trac.dojotoolkit.org/ticket/5351">#5351</a>
+	</p>
+
+	<label for="testInput">testInput:</label><input id="testInput" name="foo" value="bar" />
+
+	<button id="showDialog" data-dojo-type="dijit/form/Button" data-dojo-props='onClick:function(){ createAndShow() }'>Show Dialog</button>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Fieldset.html b/src/main/resources/static/dijit/tests/test_Fieldset.html
new file mode 100644
index 0000000000000000000000000000000000000000..ef53e3c03e3dd138a3f65b7fb153b1ddfe7e1dff
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Fieldset.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Fieldset Widget Tests</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+
+			// used by parser
+			"dijit/Fieldset",
+			"dijit/form/TextBox",
+
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+</head>
+<body>
+	<h1>Fieldset Test</h1>
+	<label for="first">focus here first:</label><input id="first">
+	<fieldset data-dojo-type="dijit/Fieldset" title="Fieldset 1" id="f1">
+		<label for="f1i1">input 1:</label> <input data-dojo-type="dijit/form/TextBox" id="f1i1"><br>
+		<label for="f1i2">input 2:</label> <input data-dojo-type="dijit/form/TextBox" id="f1i2">
+	</fieldset>
+	<fieldset data-dojo-type="dijit/Fieldset" title="Fieldset 2" id="f2">
+		<label for="f2i1">input 1:</label> <input data-dojo-type="dijit/form/TextBox" id="f2i1"><br>
+		<label for="f2i2">input 2:</label> <input data-dojo-type="dijit/form/TextBox" id="f2i2">
+	</fieldset>
+	<label for="last">last focus point:</label><input id="last">
+</body>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/tests/test_InlineEditBox.html b/src/main/resources/static/dijit/tests/test_InlineEditBox.html
new file mode 100644
index 0000000000000000000000000000000000000000..7f0246d5063f29dbc17e185dea041e918c446a2d
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_InlineEditBox.html
@@ -0,0 +1,256 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+		<title>Inline Edit Box Test</title>
+
+		<script type="text/javascript" src="boilerplate.js"></script>
+
+		<style type="text/css">
+			.inlineEdit { background-color: #CCC76A; }
+
+			/* some style rules on nodes just to test that style gets copied to the edit widget */
+			p { font-family: cursive; }
+			.letter p { font-family: monospace; }
+			h3 { font-family: helvetica; font-style: italic; }
+		</style>
+
+		<script type="text/javascript">
+			require([
+				"dojo/parser",
+				"dijit/InlineEditBox",
+
+				// used by parser
+				"dojo/data/ItemFileReadStore",
+				"dijit/form/Textarea",
+				"dijit/form/TextBox",
+				"dijit/form/DateTextBox",
+				"dijit/form/CurrencyTextBox",
+				"dojo/currency",
+				"dijit/form/ComboBox",
+				"dijit/form/FilteringSelect",
+				"dijit/form/NumberSpinner",
+				"dijit/form/Select",
+				"dijit/Editor",
+				"dijit/_editor/plugins/AlwaysShowToolbar",
+				"dojo/domReady!"
+			], function(parser, InlineEditBox){
+				parser.parse();
+
+				// programmatic creation
+				programmaticCreate = function(){
+					programmatic = new InlineEditBox({renderAsHtml: true, onChange:myHandler },
+						document.createElement("div"));	// shouldn't have to specify a srcNodeRef, but you do.
+					programmatic.placeAt("programmaticContainer");
+				};
+			});
+
+			function myHandler(newValue){
+				this._onChangeValue = newValue;	// used by robot test file
+				console.debug("onChange for id = " + this.id + ", value: " + newValue);
+			}
+		</script>
+	</head>
+	<body class="claro">
+
+		<h1 class="testTitle">Dijit InlineEditBox Test</h1>
+
+		<span data-dojo-id="stateStore" data-dojo-type="dojo/data/ItemFileReadStore" data-dojo-props='url:"_data/states.json"'></span>
+		<span data-dojo-id="countryStore" data-dojo-type="dojo/data/ItemFileReadStore" data-dojo-props='url:"_data/countries.json"'></span>
+		<span data-dojo-id="productStore" data-dojo-type="dojo/data/ItemFileReadStore" >
+			<script type="dojo/method">
+				this._jsonData =
+					{ identifier: 'name',
+					  label: 'name',
+					  items: [
+						{ name: "refrigerator" },
+						{ name: "freezer" },
+						{ name: "stove" },
+						{ name: "heater" }
+					]};
+			</script>
+		</span>
+
+		<h2>Form Letter with blanks</h2>
+		<div class="letter">
+			<h3 id="editable" data-dojo-type="dijit/InlineEditBox" data-dojo-props='value:"markup value", onChange:myHandler, autoSave:true, title:"company name"'></h3>
+			<p>
+				Dear <span id="MrSmith" data-dojo-type="dijit/InlineEditBox" data-dojo-props='width:"200px", title:"recipient name"'></span>,
+			</p>
+			<p class="letter">
+				Thank you for your recent order.
+				Please remit
+				<span id="dollar_as" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/CurrencyTextBox", editorParams:{currency: "USD"}, width:"100px", title:"dollar amount"'></span>&nbsp;for
+				your purchase of
+				<span data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/NumberSpinner", editorParams:{constraints: {places:0} }, width:"70px", title:"quantity"'></span>&nbsp;deluxe
+				<span data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/ComboBox", title:"item name",
+					editorParams:{searchAttr: "name", store: productStore, autocomplete: false, hasDownArrow: false},
+					 width:"200px"'></span>&nbsp;on
+				<span data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/DateTextBox", width:"200px", title:"purchase date as mm/dd/yy"'></span>&nbsp;in
+				<span data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/FilteringSelect",
+					editorParams:{searchAttr: "name", keyAttr: "abbreviation", store: stateStore, autocomplete: true, hasDownArrow: true},
+					 width:"200px", title:"state of purchase"'></span>&nbsp;
+				<nobr>(<span data-dojo-type="dijit/InlineEditBox"
+					data-dojo-props='editor:"dijit/form/Select", width:"200px", title:"country", editorParams:{ store: countryStore }'
+				></span>)</nobr>.
+			</p>
+			<p id="textarea" data-dojo-type="dijit/InlineEditBox" data-dojo-props='autoSave:true, editor:"dijit/form/Textarea", title:"additional details"'></p>
+			<p>
+				Sincerely,
+			</p>
+			<span data-dojo-type="dijit/InlineEditBox" data-dojo-props='style:"margin-left: 2em; font-family: cursive;", width:"400px", title:"sender name"                                                                           '></span>
+		</div>
+		<hr style="margin-bottom: 1em;"/>
+
+		<h2>Form Letter with <span id="predefined">predefined values</span>, and no auto-save</h2>
+		<div class="letter">
+			<h3 id="editable2" data-dojo-type="dijit/InlineEditBox" data-dojo-props='onChange:myHandler, autoSave:false, title:"company name"'>
+				Bob Vance Refrigeration
+			</h3>
+			<p>
+				Dear <span data-dojo-type="dijit/InlineEditBox" data-dojo-props='width:"200px", autoSave:false, title:"recipient name"'>John</span>,
+			</p>
+			<p class="letter">
+				Thank you for your recent order.
+				Please remit
+				<span id="dollar" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/CurrencyTextBox", editorParams:{currency: "USD"}, width:"100px", autoSave:false, title:"dollar amount"'>$2,000</span>
+				for your purchase of
+				<span id="quantity" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/NumberSpinner", editorParams:{constraints: {places:0} }, width:"70px", autoSave:false, title:"quantity"'>3</span>
+				deluxe
+				<span id="item" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/ComboBox",
+					editorParams:{searchAttr: "name", store: productStore, autocomplete: false, hasDownArrow: false},
+					 width:"200px", autoSave:false, title:"item name"'>refrigerators</span>
+				on
+				<!--
+					normally the server is in charge of formatting the displayed date pattern (01/05/2007) below
+					in the client's locale (since the user is expecting to see it that way and so is DateTextBox),
+					but since this test is static HTML, we instead hardcode the displayed value and use editorParams
+					to tell DateTextBox to expect that pattern regardless of the machine's locale
+				-->
+				<span id="purchase" data-dojo-type="dijit/InlineEditBox"
+					data-dojo-props='editor:"dijit/form/DateTextBox", editorParams:{constraints: {datePattern: "MM/dd/yyyy"}},
+					width:"200px", autoSave:false, title:"purchase date as mm/dd/yy"'>01/05/2007</span>
+				in
+				<span id="state" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/FilteringSelect",
+					editorParams:{searchAttr: "name", keyAttr: "abbreviation", store: stateStore, autocomplete: true, hasDownArrow: false},
+					 width:"200px", autoSave:false, title:"state of purchase"'>
+					 Pennsylvania
+				</span>&nbsp;
+				<nobr>(<span id="country" data-dojo-type="dijit/InlineEditBox"
+					data-dojo-props='editor:"dijit/form/Select", width:"200px", autoSave:false, title:"country",
+					editorParams:{ store: countryStore }'
+				>United States of America</span>)</nobr>.
+			</p>
+			<p data-dojo-type="dijit/InlineEditBox" data-dojo-props='autoSave:false, editor:"dijit/form/Textarea", title:"additional details"'>
+				We sincerely appreciate your business and hope we can do business again.
+			</p>
+			<p>
+				Sincerely,
+			</p>
+			<span data-dojo-type="dijit/InlineEditBox" data-dojo-props='style:"margin-left: 2em; font-family: cursive;", width:"400px", autoSave:false, title:"sender name"'>Bob Vance</span>
+		</div>
+		<hr style="margin-bottom: 1em;"/>
+
+
+		<h2>Inline-block Text (of 400px width)</h2>
+		<div>
+			The following section uses inline block text of 400px.
+			When clicking the editable text it should bring up an editor which is also 400px wide.
+		</div>
+		(before plain inline) <fieldset class="dijitInline"><div style="width: 400px;">hello world</div></fieldset> (after plain inline)
+		<br>
+		(before editable inline)
+		<fieldset class="dijitInline"><div data-dojo-type="dijit/InlineEditBox" data-dojo-props='onChange:myHandler, width:"400px", style:"width: 400px;"'>
+			hello world
+		</div></fieldset>
+		(after editable inline)
+		<hr style="width:100%;"/>
+
+		<h2>Pararagraph</h2>
+		(before plain paragraph)
+		<p>
+		Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+semper velit ante id metus. Praesent massa dolor, porttitor sed,
+pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+tortor pharetra congue. Suspendisse pulvinar.
+		</p>
+		(before editable paragraph.  the editable paragraph has Save/Cancel buttons when open.)
+		<p id="areaEditable" data-dojo-type="dijit/InlineEditBox" data-dojo-props='autoSave:false, editor:"dijit/form/Textarea"'>
+			Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+semper velit ante id metus. Praesent massa dolor, porttitor sed,
+pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+tortor pharetra congue. Suspendisse pulvinar.
+		</p>
+		These buttons will
+		<button id="disableAreaEditable" onClick="dijit.byId('areaEditable').set('disabled', true)">disable</button> /
+		<button onClick="dijit.byId('areaEditable').set('disabled', false)">enable</button>
+		the InlineEditBox above.
+		<hr style="width:100%;"/>
+
+		<h2>Editor</h2>
+		<div id="inlineRTE" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit.Editor",
+			autoSave:false, renderAsHtml:true,
+			editorParams:{height: "", extraPlugins: ["dijit._editor.plugins.AlwaysShowToolbar"]}'>
+			<b>Aliquam</b> vitae enim. <i>Duis</i> scelerisque metus auctor est venenatis
+imperdiet. <span style="text-decoration: underline;"> Fusce</span> dignissim porta augue. Nulla vestibulum. Integer lorem
+nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+semper velit ante id metus. Praesent massa dolor, porttitor sed,
+pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+tortor pharetra congue. Suspendisse pulvinar.
+		</div>
+		<p>
+			Note: since the Editor may return a result containing one or more &lt;p&gt; nodes,
+			don't make the InlineEditBox itself a &lt;p&gt; because that would cause nested
+			&lt;p&gt;s, which is illegal, and messes up IE
+		</p>
+
+		<h2>FilteringSelect (no down arrow, and save/cancel buttons):</h2>
+		before
+		<span id="filteringSelect2" data-dojo-type="dijit/InlineEditBox" data-dojo-props='editor:"dijit/form/FilteringSelect",
+			editorParams:{searchAttr: "name", keyAttr: "abbreviation", store: stateStore, autocomplete: true, hasDownArrow: false},
+			 width:"200px", autoSave:false'>
+			Indiana
+		</span>
+		<button onclick="dijit.byId('filteringSelect2').edit();return false;">Edit previous value</button>
+		after
+		<hr style="width:100%;"/>
+
+		<h2>Programmatically created:</h2>
+		<button type=button onclick="programmaticCreate();">create</button>
+		<button type=button onclick="programmatic.destroy();">destroy</button>
+		<div id="programmaticContainer"></div>
+
+		<hr style="width:100%;"/>
+		<h2>Complex renderAsHtml="false"</h2>
+		<div id="renderAsHtml_false" data-dojo-type="dijit/InlineEditBox" data-dojo-props='renderAsHtml:false, width:"400px", style:"width:400px;"'>
+			&lt;B&gt;not bold&lt;/B&gt;&amp;lt;input&amp;gt;
+		</div>
+		<hr style="width:100%;"/>
+		<h2>Complex renderAsHtml="true"</h2>
+		<div id="renderAsHtml_true" data-dojo-type="dijit/InlineEditBox" data-dojo-props='renderAsHtml:true, width:"400px", style:"width:400px;"'>
+			&lt;B&gt;not bold&lt;/B&gt;<B>bold</B>&amp;lt;input&amp;gt;
+		</div>
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_KeyNavContainer.html b/src/main/resources/static/dijit/tests/test_KeyNavContainer.html
new file mode 100644
index 0000000000000000000000000000000000000000..080378aaa7752906033d39d7e7fc161ff226be26
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_KeyNavContainer.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>KeyNavContainer test</title>
+
+	<script src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/_base/declare", "dojo/dom", "dojo/keys", "dojo/_base/lang", "dojo/on", "dojo/parser",
+			"dijit/a11yclick", "dijit/_WidgetBase", "dijit/_KeyNavContainer",
+			"dojo/domReady!"
+		], function(declare, dom, keys, lang, on, parser, a11yclick, _WidgetBase, _KeyNavContainer){
+
+			declare("TestContainer", [_WidgetBase, _KeyNavContainer], {
+				postCreate: function(){
+					this.inherited(arguments);
+					this.connectKeyNavHandlers([keys.LEFT_ARROW, keys.UP_ARROW], [keys.RIGHT_ARROW, keys.DOWN_ARROW]);
+				}
+			});
+	
+			declare("TestContained", _WidgetBase, {
+				// _KeyNavContainer requires children to have focus()
+				focus: function(){
+					this.domNode.focus();
+				}
+			});
+
+			// For testing keyboard search
+			declare("KeyboardContainer", TestContainer, {
+				postCreate: function(){
+					this.inherited(arguments);
+					on(this.domNode, a11yclick.click, lang.hitch(this, function(){
+						console.log("a11yclick");
+						dom.byId("clicks").innerHTML = dom.byId("clicks").innerHTML - -1;
+					}));
+				}
+			});
+
+			parser.parse();
+		});
+	</script>
+</head>
+<body>
+	<h1>_KeyNavContainer Tests</h1>
+
+	<label for="input">focus point:</label><input id="input"/>
+
+	<div id="keyboard" data-dojo-type="KeyboardContainer" style="border: 1px solid black;">
+		<div data-dojo-type="TestContained" value="AL">Alabama</div>
+		<div data-dojo-type="TestContained" value="AK">Alaska</div>
+		<div data-dojo-type="TestContained" value="AZ">Arizona</div>
+		<div data-dojo-type="TestContained" value="AR">Arkansas</div>
+		<div data-dojo-type="TestContained" value="CA">California</div>
+		<div data-dojo-type="TestContained" value="NH">New Hampshire</div>
+		<div data-dojo-type="TestContained" value="NJ">New Jersey</div>
+		<div data-dojo-type="TestContained" value="NM">New Mexico</div>
+		<div data-dojo-type="TestContained" value="NY">New York</div>
+	</div>
+
+	a11yclick events: <span id="clicks">0</span>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Menu.html b/src/main/resources/static/dijit/tests/test_Menu.html
new file mode 100644
index 0000000000000000000000000000000000000000..9f15e7c8f06b5f9549e525398cd2e9dfdfa9192a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Menu.html
@@ -0,0 +1,480 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Menu System Test</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<style type="text/css">
+		body { padding: 0; }
+
+		/* styling for left-hand-side navigation menu to become a column equal to length of page */
+		#formattingTable {
+			border: 0;
+			border-spacing: 0;
+		}
+		#contentContainer { padding: 2em; }
+
+		#navMenu {
+			/* make the sidebar menu blend in with the whole sidebar */
+			border: none;
+		}
+	</style>
+
+
+	<script type="text/javascript">
+
+		require([
+			"dojo/dom",
+			"dojo/parser",	// scan page for widgets and instantiate them
+	
+			"dijit/Menu",
+			"dijit/MenuItem",
+			"dijit/PopupMenuItem",
+			"dijit/CheckedMenuItem",
+			"dijit/RadioMenuItem",
+			"dijit/MenuSeparator",
+	
+			"dijit/MenuBar",
+			"dijit/MenuBarItem",
+			"dijit/PopupMenuBarItem",
+	
+			"dijit/ColorPalette",
+			"dijit/form/TextBox",
+					
+			"dojo/domReady!"
+		], function(dom, parser, Menu, MenuItem, PopupMenuItem, CheckedMenuItem, RadioMenuItem, MenuSeparator){
+
+			// Programmatic menu
+			var pMenu;
+
+			function createMenu(){
+				// create a menu programmatically
+				function fClick(){console.log("clicked!")}
+	
+				pMenu = new Menu({targetNodeIds:["prog_menu"], id:"progMenu"});
+				pMenu.addChild(new MenuItem({label:"Programmatic Context Menu", disabled:true}));
+				pMenu.addChild(new MenuSeparator());
+				pMenu.addChild(new MenuItem({label:"Simple menu item", onClick:fClick, accelKey:"Shift+S"}));
+				pMenu.addChild(new MenuItem({label:"Another menu item", onClick:fClick, accelKey:"Ctrl+A"}));
+				pMenu.addChild(new MenuItem({label:"With an icon", iconClass:"dijitEditorIcon dijitEditorIconCut", onClick:fClick}));
+				var mItem = new MenuItem({label:"dojo.event clicking", accelKey: "Alt+D"});
+				mItem.on("click", function(){console.log("click! handler created via dojo.connect()")});
+				pMenu.addChild(mItem);
+	
+				mItem = new CheckedMenuItem({label:"checkable menu item"});
+				pMenu.addChild(mItem);
+	
+				var pSubMenu = new Menu({parentMenu:pMenu, id:"progSubMenu"});
+				pSubMenu.addChild(new MenuItem({label:"Submenu item", onClick:fClick}));
+				pSubMenu.addChild(new MenuItem({label:"Submenu item", onClick:fClick}));
+				
+				var pSubSubMenu = new Menu({parentMenu:pSubMenu, id:"progSubSubMenu"});
+				pSubSubMenu.addChild(new MenuItem({label:"SubSubmenu item", onClick:fClick}));
+				pSubSubMenu.addChild(new MenuItem({label:"SubSubmenu item", onClick:fClick}));
+				pSubMenu.addChild(new PopupMenuItem({label:"SubSubmenu", popup:pSubSubMenu, id:"progPopupMenuItem2"}));
+	
+				pMenu.addChild(new PopupMenuItem({label:"Submenu", popup:pSubMenu, id:"progPopupMenuItem"}));
+	
+				pMenu.startup();
+			}
+
+			function updateButton(/*Boolean*/ created){
+				// Update the text of the button and the right click div according to whether or not the programmatic
+				// conext menu exists.
+				dom.byId("prog_menu").innerHTML= created ?
+					"This div has a programmatic context menu on it that's different to the page menu." :
+					"No programmatic menu on this div, should get page level menu.";
+				dom.byId("createDestroyButton").innerHTML = created ? "destroy programmatic menu" :
+					"create programmatic menu";
+			}
+
+			// need to explicitly update our button state, otherwise the
+			// browser will remember the last state of them before reloading
+			// (so a programmatic menu is created, reload, and "the create
+			// programmatic menu" button is still in disabled state)
+			updateButton(false);
+
+			createDestroyMenu = function(){
+				// Create programmatic menu, or if it's already created, then destroy it.
+				if(pMenu){
+					pMenu.destroyRecursive();
+					pMenu = null;
+				}else{
+					createMenu();
+				}
+				updateButton(pMenu);
+			};
+
+			parser.parse();
+		});
+    </script>
+</head>
+<body class="claro" role="main">
+
+	<div id="windowContextMenu" data-dojo-type="dijit/Menu" data-dojo-props='contextMenuForWindow:true, style:"display: none;"'>
+		<div data-dojo-type="dijit/MenuItem" id="windowContextMenuFirstChoice"
+			 data-dojo-props='onClick:function(){ console.log("Hello world"); }'>Context Menu</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='disabled:true, onClick:function(){ alert("this should NOT appear"); }'>Disabled Item</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+			onClick:function(){ console.log("not actually cutting anything, just a test!") }, accelKey:"Ctrl+X"'>Cut</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+			onClick:function(){ console.log("not actually copying anything, just a test!") }, accelKey:"Ctrl+C"'>Copy</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+			onClick:function(){ console.log("not actually pasting anything, just a test!") }, accelKey:"Ctrl+V"'>Paste</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div id="enabledSubmenu" data-dojo-type="dijit/PopupMenuItem" >
+			<span>Enabled Submenu</span>
+			<div id="submenu2" data-dojo-type="dijit/Menu" >
+				<div id="submenu2_item1" data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!") }'>Submenu Item One</div>
+				<div id="submenu2_item2" data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!") }'>Submenu Item Two</div>
+				<div id="deeperSubmenu" data-dojo-type="dijit/PopupMenuItem" >
+					<span>Deeper Submenu</span>
+					<div id="submenu4" data-dojo-type="dijit/Menu" >
+						<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 1!") }'>Sub-sub-menu Item One</div>
+						<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 2!") }'>Sub-sub-menu Item Two</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/PopupMenuItem" data-dojo-props='disabled:true'>
+			<span>Disabled Submenu</span>
+			<div id="submenu3" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+				<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!") }'>Submenu Item One</div>
+				<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!") }'>Submenu Item Two</div>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/PopupMenuItem">
+			<span>Different popup</span>
+			<div data-dojo-type="dijit/ColorPalette"></div>
+		</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/CheckedMenuItem" data-dojo-props='checked:true, onChange:function(val){ console.log("Now set to " + val); }'>Checked</div>
+		<div data-dojo-type="dijit/CheckedMenuItem">Not Checked</div>
+		<div data-dojo-type="dijit/CheckedMenuItem" data-dojo-props='checked:true, disabled:true'>Checked Disabled</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/PopupMenuItem">
+			<span>Bigger Submenu</span>
+			<div id="bigsubmenu" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+				<div data-dojo-type="dijit/MenuItem">Item One</div>
+				<div data-dojo-type="dijit/MenuItem">Item Two</div>
+				<div data-dojo-type="dijit/MenuItem">Item Three</div>
+				<div data-dojo-type="dijit/MenuItem">Item Four</div>
+				<div data-dojo-type="dijit/MenuItem">Item Five</div>
+				<div data-dojo-type="dijit/MenuItem">Item Six</div>
+				<div data-dojo-type="dijit/MenuItem">Item Seven</div>
+				<div data-dojo-type="dijit/MenuItem">Item Eight</div>
+				<div data-dojo-type="dijit/MenuItem">Item Nine</div>
+				<div data-dojo-type="dijit/MenuItem">Item Ten</div>
+			</div>
+		</div>
+	</div>
+
+	<div id="leftClickContextMenu" data-dojo-type="dijit/Menu" data-dojo-props='leftClickToOpen:true, targetNodeIds:["input2"], style:"display: none;"'>
+		<div id="leftClickMenuFirstChoice" data-dojo-type="dijit/MenuItem" data-dojo-props='disabled:true'>Left Click Menu</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Hello world"); }'>Enabled Item</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='disabled:true'>Disabled Item</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+			onClick:function(){ console.log("not actually cutting anything, just a test!") }'>Cut</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+			onClick:function(){ console.log("not actually copying anything, just a test!") }'>Copy</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+			onClick:function(){ console.log("not actually pasting anything, just a test!") }'>Paste</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/PopupMenuItem">
+			<span>Enabled Submenu</span>
+			<div id="leftsubmenu2" data-dojo-type="dijit/Menu" >
+				<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!") }'>Submenu Item One</div>
+				<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!") }'>Submenu Item Two</div>
+				<div data-dojo-type="dijit/PopupMenuItem">
+					<span>Deeper Submenu</span>
+					<div id="leftsubmenu4" data-dojo-type="dijit/Menu" >
+						<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 1!") }'>Sub-sub-menu Item One</div>
+						<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 2!") }'>Sub-sub-menu Item Two</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/PopupMenuItem" data-dojo-props='disabled:true'>
+			<span>Disabled Submenu</span>
+			<div id="leftsubmenu3" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+				<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!") }'>Submenu Item One</div>
+				<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!") }'>Submenu Item Two</div>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/PopupMenuItem">
+			<span>Different popup</span>
+			<div data-dojo-type="dijit/ColorPalette"></div>
+		</div>
+	</div>
+
+	<table id="formattingTable" role="presentation">
+		<tr>
+			<td style="width:0;">
+				<!-- This is here for tabIndex testing.
+				     Use textarea since Chrome 1.0 likes it better for TABing and
+				     because it has innerText property and because it doesn't mess
+				     with the URL when clicked -->
+				<textarea aria-label="random link" id="link" tabIndex="0" readOnly class="dijitReset" style="font-family:monospace;font-size:12px;width:84px;text-decoration:underline;overflow:hidden;background-color:transparent;" rows=1>random link</textarea>
+			</td>
+			<td id="menuBarContainer" style="width:100%;">
+				<div id="menubar" data-dojo-type="dijit/MenuBar">
+					<div id="file" data-dojo-type="dijit/PopupMenuBarItem" accessKey="F">
+						<span>{F}ile</span>
+						<div id="fileMenu" data-dojo-type="dijit/Menu" >
+							<div id="new" data-dojo-type="dijit/MenuItem">{N}ew</div>
+							<div id="open" data-dojo-type="dijit/MenuItem">{O}pen</div>
+							<div id="separator" data-dojo-type="dijit/MenuSeparator" ></div>
+							<div id="save" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIconSave"'>{S}ave</div>
+							<div id="saveas" data-dojo-type="dijit/MenuItem">Save {A}s...</div>
+						</div>
+					</div>
+					<div id="edit" data-dojo-type="dijit/PopupMenuBarItem" accessKey="E">
+						<span>{E}dit</span>
+						<div id="editMenu" data-dojo-type="dijit/Menu" >
+							<div id="cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+								onClick:function(){ console.log("not actually cutting anything, just a test!"); }, accelKey:"Ctrl+X"'>C{u}t</div>
+							<div id="copy" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+								onClick:function(){ console.log("not actually copying anything, just a test!") }, accelKey:"Ctrl+C"'>{C}opy</div>
+							<div id="paste" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+								onClick:function(){ console.log("not actually pasting anything, just a test!") }, accelKey:"Ctrl+V"'>{P}aste</div>
+						</div>
+					</div>
+					<div id="view" data-dojo-type="dijit/PopupMenuBarItem" accessKey="V">
+						<span>{V}iew</span>
+						<div id="viewMenu" data-dojo-type="dijit/Menu" >
+							<div data-dojo-type="dijit/MenuItem">Normal</div>
+							<div data-dojo-type="dijit/MenuItem">Outline</div>
+							<div data-dojo-type="dijit/PopupMenuItem">
+								<span>{Z}oom</span>
+								<div id="zoomMenu" data-dojo-type="dijit/Menu" >
+									<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom'">50%</div>
+									<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom'">75%</div>
+									<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom', checked:true">100%</div>
+									<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom'">150%</div>
+									<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom'">200%</div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div id="help" data-dojo-type="dijit/PopupMenuBarItem" accessKey="H">
+						<span>{H}elp</span>
+						<div id="helpMenu" data-dojo-type="dijit/Menu" >
+							<div data-dojo-type="dijit/MenuItem">Help Topics</div>
+							<div data-dojo-type="dijit/MenuItem">About Dijit</div>
+						</div>
+					</div>
+					<div data-dojo-type="dijit/PopupMenuBarItem" data-dojo-props='disabled:true'>
+						<span>{D}isabled</span>
+						<div data-dojo-type="dijit/Menu">
+							<div data-dojo-type="dijit/MenuItem">You should not see this</div>
+						</div>
+					</div>
+					<div data-dojo-type="dijit/PopupMenuBarItem" accessKey="M">
+						<span>E{m}pty</span>
+						<div data-dojo-type="dijit/Menu">
+						</div>
+					</div>
+					<div data-dojo-type="dijit/MenuBarItem" data-dojo-id="noPopupMenuBarItem" accessKey="Z"
+						 data-dojo-props='onClick:function(){ console.log("no submenu, just a clickable MenuItem"); }'>
+						Click me! ({Z})
+					</div>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td id="navMenuContainer" class="dijitMenu" style="vertical-align:top; width:0;">
+
+				<h3 style="margin-bottom: 2em;">Navigation menu:</h3>
+				<div id="navMenu" data-dojo-type="dijit/Menu" aria-label="navigation">
+					<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+						onClick:function(){ console.log("drama!"); }'>Drama</div>
+					<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+						onClick:function(){ console.log("comedy!") }'>Comedy</div>
+					<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+						onClick:function(){ console.log("romance!") }'>Romance</div>
+					<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+						onClick:function(){ console.log("documentary!") }'>Documentary</div>
+					<div data-dojo-type="dijit/MenuSeparator"></div>
+					<div id="navMenuPopupItem1" data-dojo-type="dijit/PopupMenuItem" >
+						<span>{E}nabled Submenu</span>
+						<div id="navMenuSub1" data-dojo-type="dijit/Menu" >
+							<div id="navMenuSub1_item1" data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!") }'>Submenu Item One</div>
+							<div id="navMenuSub1_item2" data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!") }'>Submenu Item Two</div>
+							<div id="navMenuSub1_popup" data-dojo-type="dijit/PopupMenuItem" >
+								<span>Deeper Submenu</span>
+								<div id="navMenuSub2" data-dojo-type="dijit/Menu" >
+									<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 1!") }'>Sub-sub-menu Item One</div>
+									<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 2!") }'>Sub-sub-menu Item Two</div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div id="navMenuDisabledItem" data-dojo-type="dijit/PopupMenuItem" data-dojo-props='disabled:true '>
+						<span>Disabled Submenu</span>
+						<div id="navMenuSub3" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+							<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!") }'>Submenu Item One</div>
+							<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!") }'>Submenu Item Two</div>
+						</div>
+					</div>
+					<div data-dojo-type="dijit/PopupMenuItem">
+						<span>Different popup</span>
+						<div data-dojo-type="dijit/ColorPalette"></div>
+					</div>
+					<div data-dojo-type="dijit/MenuSeparator"></div>
+					<div id="checked1" data-dojo-type="dijit/CheckedMenuItem" data-dojo-props='checked:true, onChange:function(val){ console.log("Now set to " + val); }'>Checked</div>
+					<div id="checked2" data-dojo-type="dijit/CheckedMenuItem" >Not Checked</div>
+					<div data-dojo-type="dijit/CheckedMenuItem" data-dojo-props='checked:true, disabled:true'>Checked Disabled</div>
+				</div>
+			</td>
+
+			<td style="padding: 1em" id="contentContainer">
+
+				<h1 class="testTitle">Dijit Menu System Test</h1>
+
+				<input id="input" value="random input">
+
+				<p>This page contains:</p>
+				<ul>
+					<li>"Navigation bar" Menu widget on left, a.k.a vertical MenuBar
+					<li>MenuBar on top
+					<li>page level context menu (right-click anywhere on page)
+					<li>form widget context menu (right-click on textbox widget)</li>
+					<li>left click context menu (left click on input on far right)
+					<li>Example of programatically created menu
+					<li>Note: while some accelerator (shortcut) keys are displayed in the context menu, they are not actually hooked up to the corresponding actions (if any), they need to be setup explicitly by the user
+				</ul>
+
+				<h3>Form</h3>
+
+				<form>
+					<p style="float:right; text-align: right;">
+						left click to open the menu for this input:<br/>
+						Note: because of the window contextMenu, make sure you get<br/>
+						the right menu by verifying the left<br/>
+						click one starts with "Left Click Menu"<br/>
+						at the very top.
+						<input aria-label="input2" id=input2 value="top-right"/>
+					</p>
+					<input aria-label="input1" id=input1 value="top-left"/>
+					<textarea aria-label="textara" id=textarea>hello there!</textarea><br>
+					<select aria-label="select">
+						<option>check if i</option>
+						<option>bleed through</option>
+						<option>on IE6</option>
+					</select>
+					<button id=button>push me</button><br>
+					<input data-dojo-type="dijit/form/TextBox" aria-label="focus test" id="formwidget" data-dojo-props='style:"width:25em;", value:"dijit.form._FormWidget focus test"'/>
+				</form>
+
+			    <div id="prog_menu" style="clear: both; border:1px solid blue; padding:10px; margin:20px 0;">
+			        Click button below to create special menu on this div.
+			    </div>
+			    <button id="createDestroyButton" onclick="createDestroyMenu();">create programmatic menu</button>
+
+				<div style="height:500px"></div>
+				<p>(this space intentionally left blank to aid testing with controls
+				at the bottom of the browser window)</p>
+				<div style="height:500px"></div>
+				<input id=input3 aria-label="input3" value="bottom-left"/>
+				<p style="text-align:right"><input aria-label="input4" id=input4 value="bottom-right"/></p>
+
+				<p>See also: <a href="form/test_Button.html">form/test_Button</a>
+				(PopupMenu is used with DropDownButton and ComboButton)</p>
+
+				<h3>Mouse opening tests</h3>
+
+				<ul>
+					<li>Right click on the client area of the page (ctrl-click for Macintosh). Menu should open.</li>
+					<li>Right click on each of the form controls above. Menu should open.</li>
+					<li>Right click near the right hand window border. Menu should open to the left of the pointer.</li>
+					<li>Right click near the bottom window border. Menu should open above the pointer.</li>
+				</ul>
+
+
+				<h3>Mouse hover tests</h3>
+
+				<ul>
+					<li>Hover over the first item with the pointer. Item should highlight and get focus.</li>
+					<li>Hover over the second (disabled) item. Item should highlight and get focus.</li>
+					<li>Separator items should not highlight on hover - no items should highlight in this case.</li>
+				</ul>
+
+
+				<h3>Mouse click tests</h3>
+
+				<ul>
+					<li>Click on the first menu item. console.log should log the message "Hello world". The menu should dissapear.</li>
+					<li>Click on the second menu item (disabled). Should not do anything - focus should remain on the disabled item.</li>
+					<li>Click anywhere outside the menu. Menu should close. Focus will be set by the browser based on where the user clicks.</li>
+				</ul>
+
+
+				<h3>Mouse submenu tests</h3>
+
+				<ul>
+					<li>Hover over the "Enabled Submenu" item. Item should highlight and then pop open a submenu after a short (500ms) delay.</li>
+					<li>Hover over any of the other menu items. Submenu should close immediately and deselect the submenu parent item. The newly hovered item should become selected.</li>
+					<li>Hover over the "Disabled Submenu" item. Item should highlight, but no submenu should appear.</li>
+					<li>Clicking on the "Enabled Submenu" item before the submenu has opened (you'll have to be quick!) should immediatley open the submenu.</li>
+					<li>Clicking on the "Enabled Submenu" item <i>after</i> the submenu has opened should have no effect - the item is still selected and the submenu still open.</li>
+					<li>Hover over submenu item 1. Should select it - the parent menu item should stay selected also.</li>
+					<li>Hover over submenu item 2. Should select it - the parent menu item should stay selected also.</li>
+				</ul>
+
+
+				<h3>Keyboard opening tests</h3>
+
+				<ul>
+					<li>On Windows: press shift-f10 with focus on any of the form controls. Should open the menu.</li>
+					<li>On Windows: press the context menu key (located on the right of the space bar on North American keyboards) with focus on any of the form controls. Should open the menu.</li>
+					<li>On Firefox on the Mac: press ctrl-space with focus on any of the form controls. Should open the menu.</li>
+				</ul>
+
+
+				<h3>Keyboard closing tests</h3>
+
+				<ul>
+					<li>Open the menu.</li>
+					<li>Press tab. Should close the menu and return focus to where it was before the menu was opened.</li>
+					<li>Open the menu.</li>
+					<li>Press escape. Should close the menu and return focus to where it was before the menu was opened.</li>
+				</ul>
+
+
+				<h3>Keyboard navigation tests</h3>
+
+				<ul>
+					<li>Open the menu.</li>
+					<li>Pressing up or down arrow should cycle focus through the items in that menu.</li>
+					<li>Pressing enter or space should invoke the menu item.</li>
+					<li>Disabled items receive focus but no action is taken upon pressing enter or space.</li>
+				</ul>
+
+
+				<h3>Keyboard submenu tests</h3>
+
+				<ul>
+					<li>Open the menu.</li>
+					<li>The first item should become selected.</li>
+					<li>Press the right arrow key. Nothing should happen.</li>
+					<li>Press the left arrow key. Nothing should happen.</li>
+					<li>Press the down arrow until "Enabled Submenu" is selected. The submenu should not appear.</li>
+					<li>Press enter. The submenu should appear with the first item selected.</li>
+					<li>Press escape. The submenu should vanish - "Enabled Submenu" should remain selected.</li>
+					<li>Press the right arrow key. The submenu should appear with the first item selected.</li>
+					<li>Press the right arrow key. Nothing should happen.</li>
+					<li>Press the left arrow key. The submenu should close - "Enabled Submenu" should remain selected.</li>
+					<li>Press the left arrow key. The menu should <i>not</i> close and "Enabled Submenu" should remain selected.</li>
+					<li>Press escape. The menu should close and focus should be returned to where it was before the menu was opened.</li>
+				</ul>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Menu_iframe.html b/src/main/resources/static/dijit/tests/test_Menu_iframe.html
new file mode 100644
index 0000000000000000000000000000000000000000..5ad0c637ca0c5debaf83b34f076284a2dfeea4f7
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Menu_iframe.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Menu iframe test</title>
+	<style type="text/css">
+		@import "../themes/claro/claro.css";
+	</style>
+	<script type="text/javascript" src="../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad:true, isDebug:true"></script>
+	<script type="text/javascript">
+		dojo.require("dojo.parser");
+
+		dojo.require("dijit.Menu");
+		dojo.require("dijit.MenuItem");
+
+		function setContents(str){
+			dojo.byId('iframe').src = "javascript:'" + str.replace("'", "\\'") + "'";
+		}
+		function button2(){
+			setContents('<div style="height: 300px; border: solid blue 2px">bill was here</div>');
+		}
+	</script>
+</head>
+<body class="claro" role="main">
+	<div id="menu" data-dojo-type="dijit/Menu" data-dojo-props='targetNodeIds:["iframe"], style:"display:none;"'>
+		<div data-dojo-type="dijit/MenuItem">context menu</div>
+	</div>
+	<div style="border: 1px solid gray; height: 150px;">filler div to offset iframe position (for testing)</div>
+	<div style="position: relative; border: 3px solid blue; padding: 10px;">
+		This is a position:relative div containing an iframe.
+		<iframe title="iframe" id="iframe"
+			src="javascript:'&lt;html&gt;&lt;body style=\'margin: 3em;\'&gt;&lt;div style=\'height:300px;border:1px solid red;\'&gt;right click for menu&lt;/div&gt;&lt;body&gt;&lt;/html&gt;'"
+			style="height: 200px; margin: 30px; padding: 20px; border: solid dotted 10px;" onload="console.log('iframe onload');">
+		</iframe>
+		End of div.
+	</div>
+	<br>
+	<button id="resetToDoc" onclick="dojo.byId('iframe').src='layout/doc0.html'">reset contents to doc0.html</button>
+	<button id="resetToBill" onclick="button2();">reset contents to 'bill was here'</button>
+	<button id="detachMenu" onclick="dijit.byId('menu').unBindDomNode('iframe')">detach menu</button>
+	<button id="reattachMenu" onclick="dijit.byId('menu').bindDomNode('iframe')">re-attach menu</button>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_TitlePane.html b/src/main/resources/static/dijit/tests/test_TitlePane.html
new file mode 100644
index 0000000000000000000000000000000000000000..b809ef6dfdc44cb93ca9dd7ec8b1cf3399145f37
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_TitlePane.html
@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TitlePane Test</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/_base/declare",
+			"dojo/parser",
+			"dijit/TitlePane",
+
+			// widgets used inside subpage loaded via href=
+			"dijit/form/Button",
+			"dijit/form/ComboBox",
+			"dijit/layout/TabContainer",
+			"dijit/layout/AccordionContainer",
+			"dijit/layout/ContentPane",
+
+			"dojo/domReady!"
+		], function(declare, parser, TitlePane){
+
+			randomMessageId = function(){
+				return Math.floor(Math.random() * 3) + 3;
+			};
+
+	
+			declare("TestTitlePane", TitlePane, {
+				templateString: '<div class="dijitTitlePane">' +
+								'    <div class="dijitTitlePaneTitle" data-dojo-attach-point="titleBarNode" style="cursor: default;" id="${id}_titleBarNode">' +
+								        '<span data-dojo-attach-event="ondijitclick:toggle,onkeypress: _onTitleKey" tabindex="0"' +
+								                'role="button" data-dojo-attach-point="focusNode,arrowNode" style="cursor: pointer;">' +
+											'<img src="${_blankGif}" alt="" class="dijitArrowNode" role="presentation"/>' +
+											'<span data-dojo-attach-point="arrowNodeInner" class="dijitArrowNodeInner"></span>' +
+										 '</span>' +
+								        '<span data-dojo-attach-point="titleNode" class="dijitTitlePaneTextNode"></span>' +
+								    '</div>' +
+								    '<div class="dijitTitlePaneContentOuter" data-dojo-attach-point="hideNode">' +
+								        '<div class="dijitReset" data-dojo-attach-point="wipeNode">' +
+								            '<div class="dijitTitlePaneContentInner" data-dojo-attach-point="containerNode" id="${id}_pane" aria-labelledby="${id}_titleBarNode" role="region" tabindex="-1">' +
+								            '</div>' +
+								        '</div>' +
+								    '</div>' +
+								'</div>'
+			});
+	
+		    parser.parse();
+	    });
+	</script>
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">Dijit TitlePane Test</h1>
+
+	<label for="input">input:</label><input id="input" value="for tab testing"/>
+
+	<h1>Test #1: plain title pane, width=300px</h1>
+	<div id="testPane1" data-dojo-id="pane1" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane #1",
+		tooltip:"I\"m the tooltip for Title Pane #1\"s title bar",
+		style:"width: 300px;" '>
+		Lorem Ipsum Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque
+		iaculis, nulla id semper faucibus, pede tellus nonummy magna, vitae adipiscing
+		orci arcu ut augue. Nunc condimentum, magna a vestibulum convallis, libero purus
+		pulvinar orci, sed vestibulum urna sem ut pede. More Ipsum...
+		Sed sollicitudin suscipit risus. Nam ullamcorper. Sed nisl lectus, pellentesque
+		nec, malesuada eget, ornare a, libero. Lorem ipsum dolor sit amet,
+		consectetuer adipiscing elit.
+	</div>
+	<button id="titleButton" type="button" onclick="pane1.set('title', 'New Title')">change title</button>
+	<button id="closeButton" type="button" onclick="pane1.set('open', false)">close pane</button>
+	<h1>Test #2: title pane with form, width=300px</h1>
+
+	<div id="pane_2" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane #2", style:"width: 300px;"'>
+		<form>
+			<label for="age">Age: </label> <input id="age"/><br>
+			<input id="disc" type="checkbox"/><label for="disc">Discount card </label><br>
+			<button>Submit</button><br>
+		</form>
+	</div>
+	<br>
+
+	<h1>Test #3: initially closed pane</h1>
+	<div id="closed" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Initially closed pane", open:false, style:"width:500px;"'>
+		<form>
+			<label for="age2">Age: </label><input id="age2"/><br>
+			<label for="discount">Discount card </label><input type="checkbox" id="discount"/><br>
+			<button>Submit</button><br>
+		</form>
+
+		<p>And a TabContainer, to make sure it lays out correctly:</p>
+		<div id="tabContainer" data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 400px; height: 250px;"'>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"layout/tab1.html", onLoad:function(){ console.log("load of SubTab 1"); }' title="SubTab 1"></div>
+			<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='href:"layout/tab2.html",  onLoad:function(){ console.log("load of SubTab 2"); }, selected:true' title="SubTab 2"></div>
+		</div>
+	</div>
+	<button type="button" onclick="dijit.byId('closed').set('content', 'hello world! (' + new Date() + ')');">reset content</button>
+
+	<h1>Test #4: title pane with href (initially closed)</h1>
+	<p>The pane should open to "Loading..." message and then 3 seconds later it should slide open more to show loaded data.</p>
+	<div id="href1" data-dojo-type="dijit/TitlePane" data-dojo-props='duration:1000, title:"Pane from href", open:false,
+		href:"layout/getResponse.php?delay=3000&amp;messId=3", preventCache:true,
+		style:"width: 400px;"'>
+		Loading...
+	</div>
+
+	<h1>Test #5: title pane with href (initially closed)</h1>
+	<p>The pane should start to open to "Loading..." but halfway through href data will be loaded, and it should expand correctly.</p>
+	<div id="href2" data-dojo-type="dijit/TitlePane" data-dojo-props='duration:1000, title:"Pane from href", open:false,
+		href:"layout/getResponse.php?delay=500&amp;messId=3", preventCache:true,
+		style:"width: 400px;"'>
+		Loading...
+	</div>
+
+	<h1>Test #6: nested title pane</h1>
+	<div id="outer" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Outer pane", style:"width:300px;"'>
+		<p>This is a title pane, containing another title pane ...
+		<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque iaculis, nulla id semper faucibus, pede tellus nonummy magna, vitae adipiscing orci arcu ut augue. Nunc condimentum, magna a vestibulum convallis, libero purus pulvinar orci, sed vestibulum urna sem ut pede.
+More Ipsum...
+
+		<div id="inner" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Inner pane", style:"width:250px;"'>
+			<p>And this is the inner title pane...
+			<p>Sed sollicitudin suscipit risus. Nam ullamcorper. Sed nisl lectus, pellentesque nec, malesuada eget, ornare a, libero. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+		</div>
+
+		<p>And this is the closing line for the outer title pane.
+	</div>
+
+	<h1>Test #7: subclassed title pane (only arrow is selectable and focusable)</h1>
+	<div id="ttp" data-dojo-type="TestTitlePane" data-dojo-props='title:"Title Pane #7", style:"width: 300px;" '>
+		Lorem Ipsum Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque
+		iaculis, nulla id semper faucibus, pede tellus nonummy magna, vitae adipiscing
+		orci arcu ut augue. Nunc condimentum, magna a vestibulum convallis, libero purus
+		pulvinar orci, sed vestibulum urna sem ut pede. More Ipsum...
+		Sed sollicitudin suscipit risus. Nam ullamcorper. Sed nisl lectus, pellentesque
+		nec, malesuada eget, ornare a, libero. Lorem ipsum dolor sit amet,
+		consectetuer adipiscing elit.
+	</div>
+
+	<table style="border: solid blue 2px; margin-top: 1em;">
+		<tr>
+			<td>
+				Here's some text below the title panes (to make sure that closing a title pane releases the space that the content was taking up)
+			</td>
+		</tr>
+	</table>
+	<h1>Test #8: locked open title pane</h1>
+	<div id="locked" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane #8", style:"width: 300px;", toggleable:false '>
+		Lorem Ipsum Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque
+		iaculis, nulla id semper faucibus, pede tellus nonummy magna, vitae adipiscing
+		orci arcu ut augue. Nunc condimentum, magna a vestibulum convallis, libero purus
+		pulvinar orci, sed vestibulum urna sem ut pede. More Ipsum...
+		Sed sollicitudin suscipit risus. Nam ullamcorper. Sed nisl lectus, pellentesque
+		nec, malesuada eget, ornare a, libero. Lorem ipsum dolor sit amet,
+		consectetuer adipiscing elit.
+	</div>
+
+	<h1>Test #9: TitlePane in AccordionContainer</h1>
+	<div id="ac" data-dojo-type="dijit/layout/AccordionContainer" data-dojo-props='style:"width: 400px; height: 300px;" '>
+		<div id="accp1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"pane 1", selected:true'>
+			Here's a closed title pane:
+			<div id="actp1" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane #9", style:"width: 300px;", open:false,
+					href:"layout/tab1.html", onLoad:function(){ console.log("load of actp1"); actp1Loaded = true; }'>
+			</div>
+			and an open one:
+			<div id="actp2" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane #10", style:"width: 300px;", open:true,
+					href:"layout/tab2.html", onLoad:function(){ console.log("load of actp2"); actp2Loaded = true; }'>
+			</div>
+		</div>
+		<div id="accp2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"pane 2" '>
+			Here's a closed title pane:
+			<div id="actp3" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane #11", style:"width: 300px;", open:false,
+					href:"layout/tab1.html", onLoad:function(){ console.log("load of actp3"); actp3Loaded = true; }'>
+			</div>
+			and an open one:
+			<div id="actp4" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane #12", style:"width: 300px;", open:true,
+					href:"layout/tab2.html", onLoad:function(){ console.log("load of actp4"); actp4Loaded = true; }'>
+			</div>
+		</div>
+		<div id="accp3" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"pane 3 (single child)" '>
+			<div id="actp5" data-dojo-type="dijit/TitlePane" data-dojo-props='title:"Title Pane #13"'>
+				hello world, my height should match this text, not the height of the containing ContentPane
+			</div>
+		</div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Toolbar.html b/src/main/resources/static/dijit/tests/test_Toolbar.html
new file mode 100644
index 0000000000000000000000000000000000000000..5ca886140eb25a7e3ea793e397b2ab197deb0127
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Toolbar.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dojo Toolbar Widget Test</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/_base/array",
+			"dojo/dom",
+			"dojo/parser",
+	
+			"dijit/Toolbar",
+			"dijit/form/Button",
+
+			"dijit/ToolbarSeparator",
+			"dijit/Declaration",
+			"dijit/form/DropDownButton",
+			"dijit/form/ComboButton",
+			"dijit/form/ToggleButton",
+	
+			"dijit/ColorPalette",
+			"dijit/TooltipDialog",
+			"dijit/form/TextBox",
+	
+			"dijit/Menu",
+			"dijit/MenuItem",
+	
+			"dojo/domReady!"
+		], function(array, dom, parser, Toolbar, Button){
+
+			// programatic creation
+			array.forEach(["toolbar2", "toolbar3", "toolbar4"], function(toolbarId){
+				var toolbar = new Toolbar({}, dom.byId(toolbarId));
+				array.forEach(["Cut", "Copy", "Paste"], function(label){
+					var button = new Button({
+                        id: toolbarId+"."+label,
+                        // note: should always specify a label, for accessibility reasons.
+                        // Just set showLabel=false if you don't want it to be displayed normally
+                        label: label,
+                        showLabel: (toolbarId != "toolbar2"),
+                        iconClass: toolbarId == "toolbar4" ? "" : "dijitEditorIcon dijitEditorIcon"+label
+                    });
+                    toolbar.addChild(button);
+				});
+			});
+
+			parser.parse();
+		});
+	</script>
+</head>
+<body class="claro">
+	<h1 class="testTitle">Toolbar test</h1>
+
+	<span data-dojo-type="dijit/Declaration" data-dojo-props='widgetClass:"ToolbarSectionStart", defaults:{ label: "Label"}'>
+		<span data-dojo-type="dijit/ToolbarSeparator"></span><i>${label}:</i>
+	</span>
+
+	<h2>Toolbar from markup</h2>
+
+	<input id="toolbar1Before" value="input before toolbar1"/>
+	<div id="toolbar1" data-dojo-type="dijit/Toolbar"
+			><div data-dojo-type="ToolbarSectionStart" data-dojo-props='label:"Buttons"'></div
+			><div id="toolbar1_cut" data-dojo-type="dijit/form/Button" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut", showLabel:false'>Cut</div
+			><div id="toolbar1_copy" data-dojo-type="dijit/form/Button" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy", showLabel:true'>Copy</div
+
+			><div data-dojo-type="ToolbarSectionStart" data-dojo-props='label:"Toggles"'></div
+			><div id="toolbar1_bold" data-dojo-type="dijit/form/ToggleButton" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconBold", showLabel:false'>Bold</div
+			><div id="toolbar1_italic" data-dojo-type="dijit/form/ToggleButton" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconItalic", showLabel:true'>Italic</div
+
+><!--
+			<span data-dojo-type="dijit/ToolbarSeparator">&nbsp;</span>
+
+			<span dojo:type="ToolbarButtonGroup" name="justify" defaultButton="justifyleft" preventDeselect="true" showLabel="false">
+				<div data-dojo-type="dijit/form/ToggleButton" iconClass="dijitEditorIcon dijitEditorIconJustifyLeft" name="justify" showLabel="false">Left</div>
+				<div data-dojo-type="dijit/form/ToggleButton" iconClass="dijitEditorIcon dijitEditorIconJustifyRight" name="justify" showLabel="false">Right</div>
+				<div data-dojo-type="dijit/form/ToggleButton" iconClass="dijitEditorIcon dijitEditorIconJustifyCenter" name="justify" showLabel="false">Center</div>
+			 </span>
+-->
+
+			<div data-dojo-type="ToolbarSectionStart" data-dojo-props='label:"Dropdowns"'></div
+			><div id="toolbar1_dialog" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"plusIcon", showLabel:true'>
+				<span>TooltipDialog</span>
+				<div id="tooltipDlg" data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Enter Login information",
+					execute:function(args){ console.log("submitted w/args:\n" + dojo.toJson(args, true)); }'>
+					<table>
+						<tr>
+							<td><label for="user">User:</label></td>
+							<td><input id="user" data-dojo-type=dijit.form.TextBox data-dojo-props='type:"text", name:"user" '/></td>
+						</tr>
+						<tr>
+							<td><label for="password">Password:</label></td>
+							<td><input id="password" data-dojo-type=dijit.form.TextBox data-dojo-props='type:"password", name:"pwd"'/></td>
+						</tr>
+						<tr>
+							<td colspan="2" style="text-align:center;">
+								<button data-dojo-type=dijit.form.Button data-dojo-props='type:"submit", name:"submit"'>Login</button></td>
+						</tr>
+					</table>
+				</div
+			></div
+			><div id="toolbar1_backcolor" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconBackColor", showLabel:true'>
+				<span>ColorPalette</span>
+				<div id="toolbar1_colorPalette" data-dojo-type="dijit/ColorPalette" data-dojo-props='style:"display: none", palette:"7x10", onChange:function(){ console.log(this.value); }'></div>
+			</div
+			><div id="toolbar1_forecolor" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconForeColor", showLabel:false'>
+				<span>Foreground</span>
+				<div id="toolbar1_colorPalette2" data-dojo-type="dijit/ColorPalette" data-dojo-props='style:"display: none", palette:"3x4", onChange:function(){ console.log(this.value); }'></div>
+			</div
+
+			><div data-dojo-type="ToolbarSectionStart" data-dojo-props='label:"Combos"'></div
+			><div id="toolbar1_combo" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options", iconClass:"plusIcon", showLabel:true,
+				onClick:function(){ console.log("clicked combo save") }'>
+				<span>Menu</span>
+				<div id="saveMenu" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+					<div data-dojo-type="dijit/MenuItem"  data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+						onClick:function(){ console.log("not actually saving anything, just a test!") }'>Save</div>
+					<div data-dojo-type="dijit/MenuItem"
+						data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!") }'>Save As</div>
+				</div>
+			</div
+			><div id="toolbar1_combo2" data-dojo-type="dijit/form/ComboButton" data-dojo-props='optionsTitle:"save options2", iconClass:"plusIcon", showLabel:false,
+				onClick:function(){ console.log("clicked combo save") }'>
+				<span>Menu2</span>
+				<div id="saveMenu2" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+					<div data-dojo-type="dijit/MenuItem"  data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconSave",
+						onClick:function(){ console.log("not actually saving anything, just a test!") }'>Save</div>
+					<div data-dojo-type="dijit/MenuItem"
+						data-dojo-props='onClick:function(){ console.log("not actually saving anything, just a test!") }'>Save As</div>
+				</div>
+			</div
+
+			><span data-dojo-type="dijit/ToolbarSeparator"></span
+			><div id="toolbar1_insertorderedlist" data-dojo-type="dijit/form/Button" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconInsertOrderedList", showLabel:false'>Ordered list</div
+	></div>
+	<input id="toolbar1After" value="input after toolbar1"/>
+
+	<h2>Toolbar from script with icons only</h2>
+	<div id="toolbar2"></div>
+
+	<h2>Toolbar from script with text and icons</h2>
+	<div id="toolbar3"></div>
+
+	<h2>Toolbar from script with text only</h2>
+	<div id="toolbar4"></div>
+
+    <!-- leave some space before the console window -->
+    <br><br>
+  </body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_Tooltip.html b/src/main/resources/static/dijit/tests/test_Tooltip.html
new file mode 100644
index 0000000000000000000000000000000000000000..0ada689d329e26e5bf7d27c61872afa284924ece
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_Tooltip.html
@@ -0,0 +1,271 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dojo Tooltip Widget Test</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<style type="text/css">
+		#instructionTable.td { padding: 20px; }
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"dojo/dom",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/Tooltip",
+
+			"dijit/ColorPalette",
+			"dijit/form/DateTextBox",
+			"dijit/form/DropDownButton",
+			"dijit/DropDownMenu",
+			"dijit/MenuItem",
+			"dijit/TitlePane",
+				
+			"dojo/domReady!"
+		], function(dom, parser, registry, Tooltip){
+			updateDynamicIds = function(){
+				dom.byId("t_connected_id").innerHTML = "Tooltip connected with nodes: " + registry.byId("t_tooltip").get("connectId");
+			};
+			addDynamicTarget = function(id){
+				registry.byId("t_tooltip").addTarget(id);
+				updateDynamicIds();
+			};
+			removeDynamicTarget = function(id){
+				registry.byId("t_tooltip").removeTarget(id);
+				updateDynamicIds();
+			};
+	
+			setDefaultAlign = function(array){
+				Tooltip.defaultPosition = array;
+				dom.byId('current').innerHTML = "Current: " + array;
+			};
+
+			console.log("on load func");
+			var tt = new Tooltip({label:"programmatically created tooltip", connectId:["programmaticTest"]});
+			console.log("created", tt, tt.id);
+
+			parser.parse();
+
+			registry.byId("t_tooltip").on("show",function(t, p){
+				console.log("Dynamic target tooltip onShow", t, p);//To check correct order in event call
+				if(!p || !p.length){ p = Tooltip.defaultPosition; }
+				dom.byId("t_shown").innerHTML = "Tooltip shown for node " + t.id + " at position " + p;
+			});
+			registry.byId("t_tooltip").on("hide", function(){
+				console.log("Dynamic target tooltip onHide");//To check correct order in event call
+				dom.byId("t_shown").innerHTML = "Tooltip hidden";
+			});
+			updateDynamicIds();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Tooltip test</h1>
+
+	<p>Mouse-over or focus the items below to test tooltips.</p>
+	<table id="instructionTable" role="presentation">
+		<tr>
+			<td>
+				Change tooltip positioning search list:
+			</td>
+			<td>
+				Set background color:
+			</td>
+			<td>
+				Prompt message test (for quirks mode):
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<button onclick="setDefaultAlign(['above-centered', 'below-centered']);">above-centered, below-centered</button>
+				<button onclick="setDefaultAlign(['after-centered', 'before-centered']);">after-centered, before-centered</button>
+				<button onclick="setDefaultAlign(['above', 'below']);">above, below</button>
+				<!-- unsupported (and currently broken)
+				<button onclick="setDefaultAlign(['after', 'before']);">after, before</button>
+				-->
+				<div id=current>
+					Current: default (unchanged)
+				</div>
+			</td>
+			<td>
+				<div data-dojo-type="dijit/ColorPalette" data-dojo-props='onChange:function(val){ dojo.query("body").style("background", val); }'></div>
+			</td>
+			<td>
+				<input data-dojo-type="dijit/form/DateTextBox"  aria-label="label" data-dojo-props='id: "dtb", value: "2010-12-15", promptMessage: "Please Enter a date in dd/MM/yyyy format", style:"width: 8em;"'>
+			</td>
+		</tr>
+	</table>
+
+	<label for="ddb">Drop down menu items have tooltips:</label>
+	<button id="ddb" data-dojo-type="dijit/form/DropDownButton">
+		<span>DropDown</span>
+		<span id="ddm" data-dojo-type="dijit/DropDownMenu">
+			<span id="cut" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+				onClick:function(){ console.log("not actually cutting anything, just a test!"); }'>Cut</span>
+			<span id="copy" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+				onClick:function(){ console.log("not actually copying anything, just a test!"); }'>Copy</span>
+			<span id="paste" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+				onClick:function(){ console.log("not actually pasting anything, just a test!"); }'>Paste</span>
+		</span>
+	</button>
+	<span id="cut_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["cut"]'>tooltip for cut</span>
+	<span id="copy_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["copy"]'>tooltip for copy</span>
+	<span id="paste_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["paste"]'>tooltip for paste</span>
+
+	<div id="tp2" dojoType="dijit.TitlePane" title="Tooltip on span in TitlePane" style="width: 300px;">
+		<span id="tpTooltipTarget">hover me for tooltip</span>
+		<span dojoType="dijit.Tooltip" connectId="tpTooltipTarget">tooltip on TitlePane span</span>
+	</div>
+
+	<input value="input, no tooltip" aria-label="label" />
+	<div>
+		<span id="one" class="tt" tabindex="0"> focusable text </span>
+		<span id="one_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["one"]'>
+			<b>
+				<span style="color: blue;">rich formatting</span>
+				<span style="color: red; font-size: x-large;"><i>!</i></span>
+			</b>
+		</span>
+	</div>
+	<span id="oneA" class="tt"> plain text (not focusable) </span>
+	<span id="oneA_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["oneA"]'>
+		<span> keyboard users can not access this tooltip</span>
+	</span>
+    <a id="three" href="#bogus">anchor</a>
+	<span id="three_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["three"]'>tooltip on a link </span>
+	<p></p>
+
+	<span id="programmaticTest">this text has a programmatically created tooltip</span>
+	<br>
+
+	<button id="four">button w/tooltip</button>
+	<span id="btnTt" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["four"]'>tooltip on a button</span>
+	<button id="removeButton" onclick="registry.byId('btnTt').destroy()">Remove</button> tooltip from "button w/tooltip".
+
+	<span style="float: right">
+		Test tooltip on right aligned element.  Tooltip should flow to the left --&gt;
+		<select id="seven" aria-label="label">
+			<option value="alpha">Alpha</option>
+			<option value="beta">Beta</option>
+			<option value="gamma">Gamma</option>
+			<option value="delta">Delta</option>
+		</select>
+
+		<span id="seven_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["seven"]'>
+			tooltip on a select<br>
+			two line tooltip.
+		</span>
+	</span>
+
+	<p></p>
+
+	<form>
+		<input id="id1" value="#1" aria-label="1" /><br>
+		<input id="id2" value="#2" aria-label="2"/><br>
+		<input id="id3" value="#3" aria-label="3"/><br>
+		<input id="id4" value="#4" aria-label="4"/><br>
+		<input id="id5" value="#5" aria-label="5"/><br>
+		<input id="id6" value="#6" aria-label="6"/><br>
+	</form>
+	<br>
+
+	<div style="overflow: auto; height: 100px; position: relative; border: solid blue 3px;">
+		<span id="s1">s1 text</span><br><br><br>
+		<span id="s2">s2 text</span><br><br><br>
+		<span id="s3">s3 text</span><br><br><br>
+		<span id="s4">s4 text</span><br><br><br>
+		<span id="s5">s5 text</span><br><br><br>
+	</div>
+
+	<span id="id1_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id1"]'>
+
+	tooltip for #1<br>
+	long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;long&nbsp;text<br>
+	make sure that this works properly with a really narrow window
+	</span>
+
+	<span id="id2_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id2"]'>tooltip for #2</span>
+	<span id="id3_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id3"]'>tooltip for #3</span>
+	<span id="id4_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id4"]'>tooltip for #4</span>
+	<span id="id5_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id5"]'>tooltip for #5</span>
+	<span id="id6_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["id6"]'>tooltip for #6</span>
+
+	<span id="s1_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["s1"]'>s1 tooltip</span>
+	<span id="s2_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["s2"]'>s2 tooltip</span>
+	<span id="s3_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["s3"]'>s3 tooltip</span>
+	<span id="s4_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["s4"]'>s4 tooltip</span>
+	<span id="s5_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["s5"]'>s5 tooltip</span>
+
+	<h3>One Tooltip for multiple connect nodes</h3>
+	<span data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["multi1","multi2"], id:"multi1,multi2_tooltip", style:"display:none;"'>multi tooltip</span>
+	<a id="multi1" href="#bogus">multi1</a><br><a id="multi2" href="#bogus">multi2</a>
+
+	<h3>One Tooltip for multiple connect nodes w/ dojoType</h3>
+	<span dojoType="dijit.Tooltip" connectId="oldmulti1, oldmulti2" id="oldmulti1,oldmulti2_tooltip" style="display:none">multi tooltip dojoType</span>
+	<a id="oldmulti1" href="#bogus">multi1</a><br><a id="oldmulti2" href="#bogus">multi2</a>
+
+
+	<h3>Dynamic target tooltip</h3>
+	<div>
+		<button onclick="addDynamicTarget('t1');">Add</button>
+		<button onclick="removeDynamicTarget('t1');">Remove</button>
+		<span id="t1" tabIndex="0">t1 text</span><br>
+		<button onclick="addDynamicTarget('t2');">Add</button>
+		<button onclick="removeDynamicTarget('t2');">Remove</button>
+		<span id="t2" tabIndex="0">t2 text</span><br>
+		<button onclick="addDynamicTarget('t3');">Add</button>
+		<button onclick="removeDynamicTarget('t3');">Remove</button>
+		<span id="t3" tabIndex="0">t3 text</span><br>
+		<button onclick="addDynamicTarget('t4');">Add</button>
+		<button onclick="removeDynamicTarget('t4');">Remove</button>
+		<span id="t4" tabIndex="0">t4 text</span><br>
+		<button onclick="addDynamicTarget('t5');">Add</button>
+		<button onclick="removeDynamicTarget('t5');">Remove</button>
+		<span id="t5" tabIndex="0">t5 text</span><br>
+	</div>
+	<span id="t_connected_id"></span><br>
+	<span id="t_shown">Tooltip hidden (initial)</span>
+
+	<span id="t_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["t1","t3"]'>Dynamic target tooltip</span>
+
+	<h3>Nested div test:</h3>
+	<div dir="ltr" style="margin: 0px 100px;">
+		<input id="inputBeforeNested" value="before" aria-label="label">
+		<div id="nested" style="width: 300px;background-color: yellow">
+			Mouse over the inner blue div should show the tooltip on this outer yellow div.
+			<div style="width: 100px; height: 100px; background-color: blue; color: white;">
+				inner blue div
+			</div>
+			Likewise, focusing the input should put the tooltip on the outer yellow div
+			<br>
+			<input id="nestedInput" value="focus me" aria-label="label">
+		</div>
+		<span id="nested_tooltip" data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:"nested"'>
+			Tooltip on yellow outer div
+		</span>
+	</div>
+
+	<h3>Delegation test:</h3>
+	<p>Tooltip should appear for first three rows of the table, customized per row.</p>
+	<span id="delegation_tooltip" data-dojo-type="dijit/Tooltip"
+		  data-dojo-props='connectId:"myTable", selector: "tr"'>
+		<script type="dojo/method" data-dojo-event="getContent" data-dojo-args="node">
+			var row = node.getAttribute("row");
+			return row <= 3 ? ("Tooltip for row " + row) : null;
+		</script>
+		This text will never appear; instead getContent() will run.
+	</span>
+	<table id="myTable">
+		<tr id="myTable-row1" row=1><td>row</td><td>1</td></tr>
+		<tr id="myTable-row2" row=2><td>row</td><td>2</td></tr>
+		<tr id="myTable-row3" row=3><td>row</td><td>3</td></tr>
+		<tr id="myTable-row4" row=4><td>row</td><td>4</td></tr>
+		<tr id="myTable-row5" row=5><td>row</td><td>5</td></tr>
+	</table>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_TooltipDialog.html b/src/main/resources/static/dijit/tests/test_TooltipDialog.html
new file mode 100644
index 0000000000000000000000000000000000000000..84b2b0548311d233c3937db24d5ac351319db5e6
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_TooltipDialog.html
@@ -0,0 +1,482 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>TooltipDialog Widget Tests</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<style type="text/css">
+		body { font-family : sans-serif; }
+		form { margin-bottom : 0; }
+		table { border: none; }
+		.claro .tooltipLink .dijitButtonNode,
+		.claro .tooltipLink .dijitButtonNode .dijitDropDownButtonHover,
+		.claro .buttonLink .dijitButtonNode,
+		.claro .buttonLink .dijitButtonHover .dijitButtonNode {
+			background: none !important;
+			border:none;
+		}
+		.claro .tooltipLink .dijitArrowButtonInner {
+			display:none;
+		}
+		.claro .tooltipLink button,
+		.claro .tooltipLink button .dijitButtonText,
+		.claro .buttonLink button .dijitButtonText {
+			text-decoration:underline !important;
+			color:blue;
+			display:inline;
+		}
+	</style>
+
+	<script type="text/javascript">
+		require([
+			"dojo/_base/declare",
+			"dojo/dom",
+			"dojo/date/stamp",
+			"dojo/parser",
+			"dijit/_WidgetBase",
+			"dijit/_TemplatedMixin",
+			"dijit/TooltipDialog",
+			"dijit/layout/ContentPane",
+			"dijit/form/DropDownButton",
+	
+			"dijit/form/Form",
+			"dijit/form/TextBox",
+			"dijit/form/DateTextBox",
+			"dijit/form/TimeTextBox",
+			"dijit/form/FilteringSelect",
+			"dijit/form/Select",
+	
+			"dijit/layout/TabContainer",
+			"dijit/InlineEditBox",
+	
+			"dijit/Menu",
+			"dijit/MenuItem",
+			"dijit/PopupMenuItem",
+			"dijit/MenuSeparator",
+				
+			"dojo/domReady!"
+		], function(declare, dom, stamp, parser, _WidgetBase, _TemplatedMixin, TooltipDialog, ContentPane, DropDownButton){
+
+			// create a do nothing, only for test widget
+			declare("TestWidget", [_WidgetBase, _TemplatedMixin], {
+				templateString: "<div style='margin: 10px; border: inset #700 4px; padding: 5px;' data-dojo-attach-point='containerNode'></div>"
+			});
+
+			// scan page for widgets and instantiate them
+			parser.parse();
+
+			// Nested TooltipDialog that contains a nested Menu
+			var innerTtDialog = new TooltipDialog({
+				id: "innerTtDialog",
+				content:
+					'<div data-dojo-type="dijit/Menu" id="navMenu"><div data-dojo-type="dijit/MenuItem" iconClass="dijitEditorIcon dijitEditorIconCut" >Drama</div><div data-dojo-type="dijit/MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy" >Comedy</div><div data-dojo-type="dijit/MenuItem" iconClass="dijitEditorIcon dijitEditorIconPaste" >Romance</div><div data-dojo-type="dijit/MenuSeparator"></div><div data-dojo-type="dijit/PopupMenuItem" id="popupMenuItem"><span>Action</span><div data-dojo-type="dijit/Menu" id="submenu"><div data-dojo-type="dijit/MenuItem">Diehard</div><div data-dojo-type="dijit/MenuItem">Indiana Jones</div></div></div></div>'
+					+ '<label for="name">Name:</label><br><input data-dojo-type="dijit/form/TextBox" id="name" name="name"><br>'
+					+ '<label for="hobby">Hobby:</label><br><input data-dojo-type="dijit/form/TextBox" id="hobby" name="hobby"><br>'
+					+ '<button data-dojo-type="dijit/form/Button" type="button">Save</button>'
+					+ '<div id="plaintext">plain text</div>'
+			 });
+
+			var innerDdBtn = new DropDownButton({
+				id: "innerDdBtn",
+				label: "Inner TooltipDialog (innerTtDialog)",
+				dropDown: innerTtDialog
+			});
+
+			var ddDialogCp = new ContentPane({
+				id: "ddDialogCp",
+				title: '',
+				refreshOnShow: true
+			});
+			ddDialogCp.startup();
+			ddDialogCp.set("content", innerDdBtn);
+
+			var outerTtDialog = new TooltipDialog({
+			   id: "outerTtDialog",
+			   content:ddDialogCp
+			});
+
+			var launcherBtn = new DropDownButton({
+				id: "outerDdBtn",
+				label: "Nested TooltipDialog (ttDialog)",
+				dropDown: outerTtDialog
+			});
+
+			dom.byId("dropdownButtonContainer").appendChild(launcherBtn.domNode);
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">dijit.TooltipDialog tests</h1>
+	<div id="tooltipDlgButton" data-dojo-type="dijit/form/DropDownButton">
+		<span>Show Tooltip Dialog</span>
+		<div id="tooltipDlg" data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Enter Login information"'>
+			<table role="presentation">
+				<tr>
+					<td><label>InlineEditBox:</label></td>
+					<td><div id="inline" data-dojo-type=dijit/InlineEditBox data-dojo-props='editorParams:{type:"text", name:"inline"}'>inline</div></td>
+				</tr>
+				<tr>
+					<td><label for="text">TextBox:</label></td>
+					<td><input id="text" data-dojo-type=dijit/form/TextBox data-dojo-props='name:"text" '/></td>
+				</tr>
+				<tr>
+					<td><label for="date2">Date:</label></td>
+					<td><input id="date2" data-dojo-type=dijit/form/DateTextBox data-dojo-props='name:"date" '/></td>
+				</tr>
+				<tr>
+					<td><label for="time2">Time:</label></td>
+					<td><input id="time2" data-dojo-type=dijit/form/TimeTextBox data-dojo-props='name:"time" '/></td>
+				</tr>
+				<tr>
+					<td><label for="combo">FilteringSelect:</label></td>
+					<td>
+						<select id="combo" data-dojo-type=dijit/form/FilteringSelect data-dojo-props='name:"combo", hasDownArrow:true'>
+							<option value="cheese">cheese</option>
+							<option value="pepperoni">pepperoni</option>
+							<option value="sausage">sausage</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td><label for="select">Select:</label></td>
+					<td>
+						<select id="select" data-dojo-type=dijit/form/Select data-dojo-props='name:"select" '>
+							<option value="olives">olives</option>
+							<option value="peppers">peppers</option>
+							<option value="tomatoes">tomatoes</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2" style="text-align:center;">
+						<button id="submit" data-dojo-type=dijit/form/Button data-dojo-props='type:"submit", name:"submit" '>Order</button>
+					</td>
+				</tr>
+			</table>
+			<div style="width: 300px;">Note: This tooltip dialog has a bunch of nested drop downs for testing keyboard and click handling</div>
+		</div>
+	</div> |
+
+	<div data-dojo-type="dijit/form/DropDownButton">
+		<span>Show Tooltip Dialog with TabContainer</span>
+		<div id="tabTooltip" data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Tab Container Tooltip"'>
+			<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props='style:"width: 400px; height: 300px;"'>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"First tab"'>
+					<p>
+						This is the first tab.
+					</p>
+					<p>
+					Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+					semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+					porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+					Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+					Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+					risus.
+					</p>
+				</div>
+				<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Second tab"'>
+					<p>
+						This is the second tab.
+					</p>
+					<p>
+					<a href="http://www.lipsum.com/">ipsum dolor sit amet</a>, consectetuer adipiscing elit. Aenean
+					semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+					porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+					Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+					Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+					risus.
+					</p>
+				</div>
+			</div>
+		</div>
+	</div> |
+
+	<div id="slowLoadButton" data-dojo-type="dijit/form/DropDownButton">
+		<span>Test slowloading HREF Tooltip Dialog</span>
+		<div id="slowLoad" data-dojo-type="dijit/TooltipDialog" data-dojo-props='href:"layout/getResponse.php?delay=500&amp;messId=2",
+			title:"tooltip dialog with no focusable items"'></div>
+	</div> |
+
+	<div data-dojo-type="dijit/form/DropDownButton" data-dojo-props='"class":"tooltipLink"'>
+		<span>What is this?</span>
+		<div data-dojo-id="tooltipHelpDlg" data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"Test Dialog tooltip", style:"width:350px" '>
+			<div data-dojo-type="dijit/form/Button" data-dojo-props='"class":"buttonLink", style:"float:right;font-size:x-small", title:"close", tabIndex:"0" '>[close]
+				<script type="dojo/method" data-dojo-event="onClick">
+						tooltipHelpDlg.onCancel();
+				</script>
+			</div>
+			<div role="alert" style="margin-top:1em">
+				<strong>Important!</strong> This is a tooltip dialog with just text! It could be used
+				to provide help. It will stay open until the user explicitly closes it via pressing escape, clicking [close] or by
+				clicking somewhere else on the page.  To make certain a screen reader will speak this text (at least in Firefox 3),
+				the div containing the text was given an
+				<a href="http://www.w3.org/WAI/PF/aria/">ARIA</a> role of alert. In the future the tooltip
+				dialog may be given a role of alertdialog.
+			</div>
+
+		</div>
+	</div>
+
+	<span id="dropdownButtonContainer">
+		<!-- programatically created nested TooltipDialog will be placed here -->
+	</span>
+
+	<div data-dojo-type="dijit/form/DropDownButton">
+		<span>TooltipDialog w/ActionBar</span>
+		<div data-dojo-type="dijit/TooltipDialog" id="loginform" data-dojo-props="title: 'Login...'">
+			<form data-dojo-type="dijit/form/Form">
+				<table>
+					<tr><td><label for="username2">Username:</label></td><td><input type="text" id="username2" data-dojo-type="dijit/form/TextBox" /></td></tr>
+					<tr><td><label for="password2">Password:</label></td><td><input type="password" id="password2" data-dojo-type="dijit/form/TextBox" /></td></tr>
+				</table>
+				<div class="dijitDialogPaneActionBar">
+					<button data-dojo-type="dijit/form/Button" type="reset">Reset</button>
+					<button data-dojo-type="dijit/form/Button" type="submit">Login</button>
+				</div>
+			</form>
+		</div>
+	</div>
+
+	<div data-dojo-type="dijit/form/DropDownButton" data-dojo-props="dropDownPosition: ['below-centered', 'above-centered']">
+		<span>Centered TooltipDialog</span>
+		<div data-dojo-type="dijit/TooltipDialog" id="loginform3" data-dojo-props="title: 'Login...'">
+			<form data-dojo-type="dijit/form/Form">
+				<table>
+					<tr><td><label for="username3">Username:</label></td><td><input type="text" id="username3" data-dojo-type="dijit/form/TextBox" /></td></tr>
+					<tr><td><label for="password3">Password:</label></td><td><input type="password" id="password3" data-dojo-type="dijit/form/TextBox" /></td></tr>
+				</table>
+				<div class="dijitDialogPaneActionBar">
+					<button data-dojo-type="dijit/form/Button" type="reset">Reset</button>
+					<button data-dojo-type="dijit/form/Button" type="submit">Login</button>
+				</div>
+			</form>
+		</div>
+	</div>
+
+
+	<p><b><i>(scroll down to see more links to click, for testing positioning / scroll handling)</i></b></p>
+
+	<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+	imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+	nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+	massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+	pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+	quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+	felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+	quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+	rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+	semper velit ante id metus. Praesent massa dolor, porttitor sed,
+	pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+	tortor pharetra congue. Suspendisse pulvinar.
+	</p>
+	<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+	ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+	nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+	lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+	est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+	dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+	nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+	pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+	sociosqu ad litora torquent per conubia nostra, per inceptos
+	hymenaeos.
+	</p>
+	<form>
+		<div style="text-align:center;">
+			<select aria-label="select">
+				<option>1</option>
+				<option>2</option>
+			</select>
+		</div>
+	</form>
+	<p>Mauris pharetra lorem sit amet sapien. Nulla libero metus, tristique
+	et, dignissim a, tempus et, metus. Ut libero. Vivamus tempus purus vel
+	ipsum. Quisque mauris urna, vestibulum commodo, rutrum vitae, ultrices
+	vitae, nisl. Class aptent taciti sociosqu ad litora torquent per
+	conubia nostra, per inceptos hymenaeos. Nulla id erat sit amet odio
+	luctus eleifend. Proin massa libero, ultricies non, tincidunt a,
+	vestibulum non, tellus. Nunc nunc purus, lobortis a, pulvinar at,
+	egestas a, mi. Cras adipiscing velit a mauris. Morbi felis. Etiam at
+	felis. Cras eget eros et justo mattis pulvinar. Nullam at justo id
+	risus porttitor dignissim. Vestibulum sed velit vel metus tincidunt
+	tempus. Nunc euismod nisl id dolor tristique tincidunt. Nullam placerat
+	turpis sed odio. Curabitur in est id nibh tempus ultrices. Aliquam
+	consectetuer dapibus eros. Aliquam nisl.
+	</p>
+	<div data-dojo-type="dijit/form/DropDownButton" data-dojo-props='style:"float:right;clear:right;" '>
+		<span>dropdown at right</span>
+	<div id="dialogright" data-dojo-type="dijit/TooltipDialog" >
+			<div style="white-space:nowrap;">Aliquam vitae enim. Duis scelerisque metus auctor est venenatis</div>
+	</div>
+	</div>
+	<p>
+	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+	semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+	porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+	Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+	Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+	risus.
+	</p>
+	<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+	imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+	nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+	massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+	pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+	quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+	felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+	quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+	rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+	semper velit ante id metus. Praesent massa dolor, porttitor sed,
+	pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+	tortor pharetra congue. Suspendisse pulvinar.
+	</p>
+
+	<div data-dojo-type="dijit/form/DropDownButton" data-dojo-props='title:"Enter Login information2"'>
+		<span>Show Tooltip Dialog pointing upwards, with links</span>
+		<div data-dojo-type="dijit/TooltipDialog" data-dojo-props='title:"General Information Dialog"'>
+			<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+			ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+			nonummy mollis. <a href="http://www.lipsum.com/">Vestibulum</a> vel purus ac pede semper accumsan. Vivamus
+			lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+			est quam sed urna. Phasellus adipiscing justo in <a href="http://www.lipsum.com/">ipsum</a>. Duis sagittis
+			dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+			nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+			pretium sollicitudin sapien. <a href="http://www.lipsum.com/">Suspendisse imperdiet</a>. Class aptent taciti
+			sociosqu ad litora torquent per conubia nostra, per inceptos
+			hymenaeos.
+			</p>
+		</div>
+	</div>
+	(will go up if there isn't enough space on the bottom of the screen)
+
+	<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+	ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+	nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+	lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+	est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+	dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+	nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+	pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+	sociosqu ad litora torquent per conubia nostra, per inceptos
+	hymenaeos.
+	</p>
+	<form>
+		<div style="text-align:center;">
+			<select aria-label="select">
+				<option>1</option>
+				<option>2</option>
+			</select>
+		</div>
+	</form>
+	<p>Mauris pharetra lorem sit amet sapien. Nulla libero metus, tristique
+	et, dignissim a, tempus et, metus. Ut libero. Vivamus tempus purus vel
+	ipsum. Quisque mauris urna, vestibulum commodo, rutrum vitae, ultrices
+	vitae, nisl. Class aptent taciti sociosqu ad litora torquent per
+	conubia nostra, per inceptos hymenaeos. Nulla id erat sit amet odio
+	luctus eleifend. Proin massa libero, ultricies non, tincidunt a,
+	vestibulum non, tellus. Nunc nunc purus, lobortis a, pulvinar at,
+	egestas a, mi. Cras adipiscing velit a mauris. Morbi felis. Etiam at
+	felis. Cras eget eros et justo mattis pulvinar. Nullam at justo id
+	risus porttitor dignissim. Vestibulum sed velit vel metus tincidunt
+	tempus. Nunc euismod nisl id dolor tristique tincidunt. Nullam placerat
+	turpis sed odio. Curabitur in est id nibh tempus ultrices. Aliquam
+	consectetuer dapibus eros. Aliquam nisl.
+	</p>
+	<p>
+	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+	semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+	porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+	Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+	Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+	risus.
+	</p>
+	<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+	imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+	nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+	massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+	pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+	quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+	felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+	quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+	rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+	semper velit ante id metus. Praesent massa dolor, porttitor sed,
+	pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+	tortor pharetra congue. Suspendisse pulvinar.
+	</p>
+	<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+	ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+	nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+	lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+	est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+	dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+	nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+	pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+	sociosqu ad litora torquent per conubia nostra, per inceptos
+	hymenaeos.
+	</p>
+	<p>Mauris pharetra lorem sit amet sapien. Nulla libero metus, tristique
+	et, dignissim a, tempus et, metus. Ut libero. Vivamus tempus purus vel
+	ipsum. Quisque mauris urna, vestibulum commodo, rutrum vitae, ultrices
+	vitae, nisl. Class aptent taciti sociosqu ad litora torquent per
+	conubia nostra, per inceptos hymenaeos. Nulla id erat sit amet odio
+	luctus eleifend. Proin massa libero, ultricies non, tincidunt a,
+	vestibulum non, tellus. Nunc nunc purus, lobortis a, pulvinar at,
+	egestas a, mi. Cras adipiscing velit a mauris. Morbi felis. Etiam at
+	felis. Cras eget eros et justo mattis pulvinar. Nullam at justo id
+	risus porttitor dignissim. Vestibulum sed velit vel metus tincidunt
+	tempus. Nunc euismod nisl id dolor tristique tincidunt. Nullam placerat
+	turpis sed odio. Curabitur in est id nibh tempus ultrices. Aliquam
+	consectetuer dapibus eros. Aliquam nisl.
+	</p>
+
+	<p>
+	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean
+	semper sagittis velit. Cras in mi. Duis porta mauris ut ligula. Proin
+	porta rutrum lacus. Etiam consequat scelerisque quam. Nulla facilisi.
+	Maecenas luctus venenatis nulla. In sit amet dui non mi semper iaculis.
+	Sed molestie tortor at ipsum. Morbi dictum rutrum magna. Sed vitae
+	risus.
+	</p>
+	<p>Aliquam vitae enim. Duis scelerisque metus auctor est venenatis
+	imperdiet. Fusce dignissim porta augue. Nulla vestibulum. Integer lorem
+	nunc, ullamcorper a, commodo ac, malesuada sed, dolor. Aenean id mi in
+	massa bibendum suscipit. Integer eros. Nullam suscipit mauris. In
+	pellentesque. Mauris ipsum est, pharetra semper, pharetra in, viverra
+	quis, tellus. Etiam purus. Quisque egestas, tortor ac cursus lacinia,
+	felis leo adipiscing nisi, et rhoncus elit dolor eget eros. Fusce ut
+	quam. Suspendisse eleifend leo vitae ligula. Nulla facilisi. Nulla
+	rutrum, erat vitae lacinia dictum, pede purus imperdiet lacus, ut
+	semper velit ante id metus. Praesent massa dolor, porttitor sed,
+	pulvinar in, consequat ut, leo. Nullam nec est. Aenean id risus blandit
+	tortor pharetra congue. Suspendisse pulvinar.
+	</p>
+	<p>Vestibulum convallis eros ac justo. Proin dolor. Etiam aliquam. Nam
+	ornare elit vel augue. Suspendisse potenti. Etiam sed mauris eu neque
+	nonummy mollis. Vestibulum vel purus ac pede semper accumsan. Vivamus
+	lobortis, sem vitae nonummy lacinia, nisl est gravida magna, non cursus
+	est quam sed urna. Phasellus adipiscing justo in ipsum. Duis sagittis
+	dolor sit amet magna. Suspendisse suscipit, neque eu dictum auctor,
+	nisi augue tincidunt arcu, non lacinia magna purus nec magna. Praesent
+	pretium sollicitudin sapien. Suspendisse imperdiet. Class aptent taciti
+	sociosqu ad litora torquent per conubia nostra, per inceptos
+	hymenaeos.
+	</p>
+	<p>Mauris pharetra lorem sit amet sapien. Nulla libero metus, tristique
+	et, dignissim a, tempus et, metus. Ut libero. Vivamus tempus purus vel
+	ipsum. Quisque mauris urna, vestibulum commodo, rutrum vitae, ultrices
+	vitae, nisl. Class aptent taciti sociosqu ad litora torquent per
+	conubia nostra, per inceptos hymenaeos. Nulla id erat sit amet odio
+	luctus eleifend. Proin massa libero, ultricies non, tincidunt a,
+	vestibulum non, tellus. Nunc nunc purus, lobortis a, pulvinar at,
+	egestas a, mi. Cras adipiscing velit a mauris. Morbi felis. Etiam at
+	felis. Cras eget eros et justo mattis pulvinar. Nullam at justo id
+	risus porttitor dignissim. Vestibulum sed velit vel metus tincidunt
+	tempus. Nunc euismod nisl id dolor tristique tincidunt. Nullam placerat
+	turpis sed odio. Curabitur in est id nibh tempus ultrices. Aliquam
+	consectetuer dapibus eros. Aliquam nisl.
+	</p>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_UIWindowIssue_child.html b/src/main/resources/static/dijit/tests/test_UIWindowIssue_child.html
new file mode 100644
index 0000000000000000000000000000000000000000..a4b5dd9034c5d180e3400afd2049415ed1646251
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_UIWindowIssue_child.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Focus Issue Child</title>
+	<script>
+	// open the parent, if user tries to open the child directly
+	if (parent == window)
+		location.href = './test_UIWindowIssue_main.html';
+	</script>
+	<script type="text/javascript" src="../../dojo/dojo.js"
+		data-dojo-config="parseOnLoad:false, isDebug:true"></script>
+	<script type="text/javascript">
+		dojo.require("dojo.parser");
+		dojo.require("dijit.Menu");
+		dojo.require("dijit.MenuItem");
+		dojo.require("dijit.PopupMenuItem");
+		dojo.require("dijit.CheckedMenuItem");
+		dojo.require("dijit.MenuSeparator");
+
+		// set objects in parent
+		for (var v in {'dijit':true, 'dojo':true, 'dojox':true})
+			parent[v] = window[v];
+
+		// set context
+		dojo.setContext(window, parent.document);
+		
+		// fix focus issue
+		dojo.ready(function(){
+			var handle = dijit.registerWin(dojo.doc.parentWindow || dojo.doc.defaultView);
+			if(dojo.isIE){
+				dojo.addOnWindowUnload(function(){
+					dijit.unregisterWin(handle);
+					handle = null;
+				})
+			}
+		});
+
+		// parse the UI frame
+		dojo.parser.parse();
+
+	</script>
+</head>
+<body bgcolor="#e0e0e0">
+	this frame is for loading script only
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_UIWindowIssue_main.html b/src/main/resources/static/dijit/tests/test_UIWindowIssue_main.html
new file mode 100644
index 0000000000000000000000000000000000000000..111302aa1350d4271fe334dc089949c9f467acdf
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_UIWindowIssue_main.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Focus Issue</title>
+	<style type="text/css">
+		@import "../themes/claro/claro.css";
+	</style>
+</head>
+<body class="claro">
+	<iframe style="width:100%;height:2em;" src="./test_UIWindowIssue_child.html"></iframe>
+
+	<div id="menu" data-dojo-type="dijit/Menu" data-dojo-props="contextMenuForWindow:true" style="display:none;">
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Hello world"); }'>Context Menu</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='disabled:true, onClick:function(){ alert("this should NOT appear"); }'>Disabled Item</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+			onClick:function(){ console.log("not actually cutting anything, just a test!") }, accelKey:"Ctrl+X"'>Cut</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+			onClick:function(){ console.log("not actually copying anything, just a test!") }, accelKey:"Ctrl+C"'>Copy</div>
+		<div data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+			onClick:function(){ console.log("not actually pasting anything, just a test!") }, accelKey:"Ctrl+V"'>Paste</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div id="enabledSubmenu" data-dojo-type="dijit/PopupMenuItem" >
+			<span>Enabled Submenu</span>
+			<div id="submenu2" data-dojo-type="dijit/Menu" >
+				<div id="submenu2_item1" data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!") }'>Submenu Item One</div>
+				<div id="submenu2_item2" data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!") }'>Submenu Item Two</div>
+				<div id="deeperSubmenu" data-dojo-type="dijit/PopupMenuItem" >
+					<span>Deeper Submenu</span>
+					<div id="submenu4" data-dojo-type="dijit/Menu" >
+						<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 1!") }'>Sub-sub-menu Item One</div>
+						<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Sub-submenu 2!") }'>Sub-sub-menu Item Two</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/PopupMenuItem" data-dojo-props='disabled:true'>
+			<span>Disabled Submenu</span>
+			<div id="submenu3" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+				<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 1!") }'>Submenu Item One</div>
+				<div data-dojo-type="dijit/MenuItem" data-dojo-props='onClick:function(){ console.log("Submenu 2!") }'>Submenu Item Two</div>
+			</div>
+		</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/CheckedMenuItem" data-dojo-props='checked:true, onChange:function(val){ console.log("Now set to " + val); }'>Checked</div>
+		<div data-dojo-type="dijit/CheckedMenuItem">Not Checked</div>
+		<div data-dojo-type="dijit/CheckedMenuItem" data-dojo-props='checked:true, disabled:true'>Checked Disabled</div>
+		<div data-dojo-type="dijit/MenuSeparator"></div>
+		<div data-dojo-type="dijit/PopupMenuItem">
+			<span>Bigger Submenu</span>
+			<div id="bigsubmenu" data-dojo-type="dijit/Menu" data-dojo-props='style:"display: none;"'>
+				<div data-dojo-type="dijit/MenuItem">Item One</div>
+				<div data-dojo-type="dijit/MenuItem">Item Two</div>
+				<div data-dojo-type="dijit/MenuItem">Item Three</div>
+				<div data-dojo-type="dijit/MenuItem">Item Four</div>
+				<div data-dojo-type="dijit/MenuItem">Item Five</div>
+				<div data-dojo-type="dijit/MenuItem">Item Six</div>
+				<div data-dojo-type="dijit/MenuItem">Item Seven</div>
+				<div data-dojo-type="dijit/MenuItem">Item Eight</div>
+				<div data-dojo-type="dijit/MenuItem">Item Nine</div>
+				<div data-dojo-type="dijit/MenuItem">Item Ten</div>
+			</div>
+		</div>
+	</div>
+
+	<p>To test:
+	<ul>
+	<li>Right mouse click anywhere on the page to see the context menu</li>
+	<li>Mouse-over "Enabled Submenu"</li>
+	<li>Make sure the submenu is positioned properly</li>
+	</ul>
+	</p>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_bgIframe.html b/src/main/resources/static/dijit/tests/test_bgIframe.html
new file mode 100644
index 0000000000000000000000000000000000000000..3398a00bab785a1ddfd3c7f4b9a6ca845f50a118
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_bgIframe.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+	<title>Dojo Toolkit - Background Iframe test</title>
+
+	<script type="text/javascript" src="boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dijit/Dialog",
+			"dijit/DropDownMenu",
+			"dijit/MenuItem",
+			"dijit/form/DateTextBox",
+			"dijit/form/Button",
+			"dijit/Tooltip",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+	</script>
+
+</head>
+<body class="claro">
+	<span data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["one_pdf"]'>
+		This is one tooltip.
+	</span>
+	<span data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["two_pdf"]'>
+		This is another tooltip.  A little longer...
+	</span>
+	<span data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["one_flash"]'>
+		This is one tooltip.
+	</span>
+	<span data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:["two_flash"]'>
+		This is another tooltip.  A little longer...
+	</span>
+	<button id="showDialog" data-dojo-type="dijit/form/Button">
+		Show Dialog
+		<script type="dojo/connect" data-dojo-event="onClick">
+			dialog.show();
+		</script>
+	</button>
+	<table>
+			<tr>
+				<td></td>
+				<td>
+					<input id="dateText_pdf" data-dojo-type="dijit/form/DateTextBox" data-dojo-props='type:"text" '/>
+					<button id="menuButton_pdf" title="edit title" value="Edit" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"noteIcon"'>
+						<span>Edit<b>!</b></span>
+						<span id="menu_pdf" data-dojo-type="dijit/DropDownMenu" >
+							<span id="cut_pdf" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+								onClick:function(){ console.log("not actually cutting anything, just a test!"); }'>Cut</span>
+							<span id="copy_pdf" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+								onClick:function(){ console.log("not actually copying anything, just a test!"); }'>Copy</span>
+							<span id="paste_pdf" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+								onClick:function(){ console.log("not actually pasting anything, just a test!"); }'>Paste</span>
+						</span>
+					</button>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<div style="width: 200px;">
+						This &lt;select&gt; will disappear on IE6
+						when the dialog is displayed.
+						But the dialog's iframe shouldn't make it disappear because they shouldn't overlap.
+					</div>
+					<select id="dropDown_pdf">
+						<option>cat</option>
+						<option>dog</option>
+						<option>mouse</option>
+					</select>
+					<br><br>
+
+					<div id="one_pdf">Mouse over this to see the tooltip</div>
+					<br>
+					<div id="two_pdf">Mouse over this to see a different tooltip</div>
+				</td>
+				<td id="pdf_td">
+					<embed id="pdf" src="resources/helloWorld.pdf" width="500" height="375">
+				</td>
+			</tr>
+	</table>
+	<table>
+			<tr>
+				<td></td>
+				<td>
+					<input id="dateText_flash" data-dojo-type="dijit/form/DateTextBox" data-dojo-props='type:"text" '/>
+					<button id="menuButton_flash" title="edit title" value="Edit" data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"noteIcon"'>
+						<span>Edit<b>!</b></span>
+						<span id="menu_flash" data-dojo-type="dijit/DropDownMenu" >
+							<span id="cut_flash" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCut",
+								onClick:function(){ console.log("not actually cutting anything, just a test!"); }'>Cut</span>
+							<span id="copy_flash" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconCopy",
+								onClick:function(){ console.log("not actually copying anything, just a test!"); }'>Copy</span>
+							<span id="paste_flash" data-dojo-type="dijit/MenuItem" data-dojo-props='iconClass:"dijitEditorIcon dijitEditorIconPaste",
+								onClick:function(){ console.log("not actually pasting anything, just a test!"); }'>Paste</span>
+						</span>
+					</button>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<div style="width: 200px;">
+						This select will disappear on IE6
+						when the dialog is displayed.
+						But the dialog's iframe shouldn't make it disappear because they shouldn't overlap.
+					</div>
+					<select id="dropDown_flash">
+						<option>cat</option>
+						<option>dog</option>
+						<option>mouse</option>
+					</select>
+					<br><br>
+
+					<div id="one_flash">Mouse over this to see the tooltip</div>
+					<br>
+					<div id="two_flash">Mouse over this to see a different tooltip</div>
+				</td>
+				<td>
+					<embed id="flash" src="../../dojox/av/resources/video.swf" width="400" height="300" />
+				</td>
+			</tr>
+	</table>
+	<div id="dialog" data-dojo-id="dialog" data-dojo-type="dijit/Dialog">
+		Hello!
+	</div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/test_typematic.html b/src/main/resources/static/dijit/tests/test_typematic.html
new file mode 100644
index 0000000000000000000000000000000000000000..31c7e00ecb2e4c03d3ac859ea82e04637fdb77e3
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/test_typematic.html
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>Typematic Test</title>
+	<style type="text/css">
+		@import "../themes/claro/document.css";
+		@import "../themes/claro/claro.css";
+		@import "css/dijitTests.css";
+	</style>
+
+	<script type="text/javascript" src="../../dojo/dojo.js"
+			data-dojo-config="isDebug: true"></script>
+	<script type="text/javascript">
+		dojo.require("dijit.typematic");
+
+		var lastCount = 0;
+		function typematicCallBack(count, node, evt){
+			var inputNode = dojo.byId('typematicInput');
+			if(node == inputNode){
+				key = "a";
+			}else{
+				key = "b";
+			}
+			if(-1 == count){
+				console.debug((lastCount + 1) + ' ' + key + ' events');
+			}else{
+				lastCount = count;
+				inputNode.value += key;
+			}
+			inputNode.focus();
+		}
+		dojo.ready(function(){
+			var keyNode = dojo.byId('typematicInput');
+			var mouseNode = dojo.byId('typematicButton');
+			dijit.typematic.addKeyListener(keyNode,
+					{
+						keyCode: dojo.keys.F11,
+						shiftKey: false,
+						metaKey: false,
+						ctrlKey: true // ALT is optional since its unspecified
+					},
+					this, typematicCallBack, 200, 200);
+			dijit.typematic.addMouseListener(mouseNode,
+					this, typematicCallBack, 0.9, 200);
+
+			try{
+				// Focus the input so it's easier for user to start typing.
+				// Doesn't work well in IE6 though, when this test is loaded from robot/typematic.html,
+				// Apparently the robot code sets up a cover <div> over this page and IE doesn't want to focus
+				// the input since it's hidden.
+				keyNode.focus();
+			}catch(e){
+			}
+		});
+	</script>
+</head>
+<body class="claro">
+
+<h2>Dijit typematic tests</h2>
+Press and hold the <b>ctrl+F11</b> keys (ALT optional, but not Shift or Meta) to see a's typed (constant rate) in the
+input field,<br>
+or left-mouse click the button and hold down to see b's typed (increasing rate) in the input field.<br>
+<input id="typematicInput" size="500">
+<button id="typematicButton">to B or not to B</button>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/CustomLabel.html b/src/main/resources/static/dijit/tests/tree/CustomLabel.html
new file mode 100644
index 0000000000000000000000000000000000000000..e3ffd440bf9ba91a5518098b117a8bde835bdad5
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/CustomLabel.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dijit Tree Custom Label Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/parser",
+			"dijit/registry",
+			"dijit/tests/helpers",
+
+			// Accessed by parser
+			"dojo/data/ItemFileReadStore",
+			"dijit/Tree",
+			"dijit/tree/ForestStoreModel",
+			"dojo/domReady!"
+		], function(doh, parser, registry, helpers){
+
+			doh.register("Test custom label", [
+				function parse(){
+					return parser.parse();
+				},
+				{
+					name: "wait for load",
+					timeout: 10000,
+					runTest: helpers.waitForLoad
+				},
+				{
+					name: "testLabels",
+					timeout: 1000,
+					runTest: function(){
+						var nameTree = registry.byId("nameTree");
+						var nameChildren = nameTree.rootNode.getChildren();
+						doh.is("Arizona", nameChildren[3].label);
+						doh.is("Colorado", nameChildren[9].label);
+
+						var codeTree = registry.byId("codeTree");
+						var codeChildren = codeTree.rootNode.getChildren();
+						doh.is("AZ", codeChildren[3].label);
+						doh.is("CO", codeChildren[9].label);
+
+						var customTree = registry.byId("customTree");
+						var customChildren = customTree.rootNode.getChildren();
+						doh.is("Arizona (AZ)", customChildren[3].label);
+						doh.is("Colorado (CO)", customChildren[9].label);
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit Tree Custom Label Test</h1>
+
+	<div data-dojo-id="store" data-dojo-type="dojo/data/ItemFileReadStore" data-dojo-props='url:"../_data/states.json"'></div>
+
+	<h2>Standard label (state names)</h2>
+	<div data-dojo-id="nameModel" data-dojo-type="dijit/tree/ForestStoreModel" data-dojo-props='store:store, rootLabel:"States"'></div>
+	<div id="nameTree" data-dojo-type="dijit/Tree" data-dojo-props='model:nameModel, openOnClick:true'></div>
+
+	<h2>LabelAttr (state abbreviation)</h2>
+	<div data-dojo-id="codeModel" data-dojo-type="dijit/tree/ForestStoreModel" data-dojo-props='store:store, rootLabel:"States", labelAttr:"abbreviation"'></div>
+	<div id="codeTree" data-dojo-type="dijit/Tree" data-dojo-props='model:codeModel, openOnClick:true'></div>
+
+	<h2>Custom label via callback</h2>
+	<div data-dojo-id="customModel" data-dojo-type="dijit/tree/ForestStoreModel" data-dojo-props='store:store'>
+		<script type="dojo/method" data-dojo-event="getLabel" data-dojo-args="item">
+			if(item.root){ return "States"; }
+			return (store.getLabel(item) + " (" + store.getIdentity(item) + ")");
+		</script>
+	</div>
+	<div id="customTree" data-dojo-type="dijit/Tree" data-dojo-props='model:customModel, openOnClick:true'></div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/Tree_ForestStoreModel.html b/src/main/resources/static/dijit/tests/tree/Tree_ForestStoreModel.html
new file mode 100644
index 0000000000000000000000000000000000000000..79f654e242a9b1f3ae5bd559b59963a2e82087d0
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/Tree_ForestStoreModel.html
@@ -0,0 +1,400 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+
+<!--
+	Test file for Tree against ForestStoreModel.
+	To be removed in 2.0 in favor of Tree_ObjectStoreModel.html
+	Put new tests in Tree_ObjectStoreModel.html
+--->
+
+<html lang="en">
+<head>
+	<title>dijit.Tree against dijit.tree.ForestStoreModel Automated Tests</title>
+
+	<style type="text/css">
+		@import "../../../dojo/resources/dnd.css";
+		@import "../../../dojo/tests/dnd/dndDefault.css";
+	</style>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/data/ItemFileWriteStore",
+			"dojo/dom",
+			"dojo/dom-attr",
+			"dojo/dom-class",
+			"dijit/Tree",
+			"dijit/tree/ForestStoreModel",
+			"dijit/tree/TreeStoreModel",
+			"dijit/tree/dndSource",
+			"dijit/tests/helpers",
+			"dojo/domReady!"
+		], function(doh, ItemFileWriteStore, dom, domAttr, domClass, Tree, ForestStoreModel, TreeStoreModel, dndSource, helpers){
+
+			doh.register("setup", function(){
+				myStore = new ItemFileWriteStore({url:'../_data/countries.json'});
+				doh.t(myStore, "store created");
+
+				myModel = new ForestStoreModel({
+					store: myStore,
+					query: {type:'continent'},
+					rootId: "earth",
+					rootLabel: "Earth",
+					childrenAttrs: ["children"]
+				});
+				doh.t(myModel, "model created");
+			});
+			doh.register("paths", [
+				function create(){
+					var d = new doh.Deferred();
+
+					myTree = new Tree({
+						id: "myTree",
+						model: myModel,
+						persist: false,		// persist==true is too hard to test
+						dndController: dndSource
+					});
+					doh.t(myTree, "tree created");
+
+					dom.byId("container").appendChild(myTree.domNode);
+					myTree.startup();
+
+					myTree.onLoadDeferred.then(d.getTestCallback(function(){
+						// Give the tree time to load, and the do checks that it
+						// loaded correctly
+						doh.t(myTree.rootNode, "root node exists");
+						doh.t(myTree.rootNode.isExpanded, "root node is expanded");
+
+						var children = myTree.rootNode.getChildren();
+						doh.is(6, children.length, "six children");
+						doh.is("Africa", children[0].label, "first child");
+						doh.f(children[0].isExpanded, "first child not expanded");
+						doh.is("South America", children[5].label, "last child");
+
+						// Last child has special CSS for drawing the grid lines
+						doh.f(domClass.contains(children[3].domNode, "dijitTreeIsLast"), "middle node doesn't have dijitTreeIsLast");
+						doh.t(domClass.contains(children[5].domNode, "dijitTreeIsLast"), "last node has dijitTreeIsLast");
+					}));
+					return d;
+				},
+
+				{
+					name: "createWithPath",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						myTree2 = new Tree({
+							id: "myTree2",
+							model: myModel,
+							persist: false,		// persist==true is too hard to test
+							dndController: dndSource,
+							path: ["earth", "EU", "IT"]
+						});
+						doh.t(myTree2, "myTree2 created");
+
+						dom.byId("container2").appendChild(myTree2.domNode);
+						myTree2.startup();
+
+						myTree2.onLoadDeferred.then(d.getTestCallback(function(){
+							doh.t(myTree2.rootNode, "root node exists");
+							doh.t(myTree2.rootNode.isExpanded, "root node is expanded");
+							doh.t(myTree2.rootNode.getChildren()[3].isExpanded, "europe node is expanded");
+							doh.is(myTree2.rootNode.getChildren()[3].getChildren()[3], myTree2.selectedNode, "selected correct node");
+						}));
+
+						return d;
+					}
+				},
+				function copyPath(){
+					var d = new doh.Deferred();
+
+					myTree.set("path", myTree2.get("path")).then(d.getTestCallback(function(){
+						doh.t(myTree.rootNode.isExpanded, "root node is expanded");
+						doh.t(myTree.rootNode.getChildren()[3].isExpanded, "europe node is expanded");
+						doh.is(myTree.rootNode.getChildren()[3].getChildren()[3], myTree.get("selectedNode"), "selected correct node");
+					}));
+
+					return d;
+				},
+
+				{
+					name: "copyPathByIds",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						myTree.set("path", ["earth", "NA", "CA", "Ottawa"]).then(d.getTestErrback(function(){
+							var path = dojo.map(myTree.get("path"), function(item){ return myTree.model.getIdentity(item); });
+							doh.is(["earth", "NA", "CA", "Ottawa"], path, "path got set on myTree");
+
+							myTree2.set("path", path).then(d.getTestCallback(function(){
+								doh.t(myTree2.rootNode.isExpanded, "root node is expanded");
+								doh.t(myTree2.rootNode.getChildren()[4].isExpanded, "north america node is expanded");
+								doh.t(myTree2.rootNode.getChildren()[4].getChildren()[1].isExpanded, "canada node is expanded");
+								doh.is(myTree2.rootNode.getChildren()[4].getChildren()[1].getChildren()[0], myTree2.get("selectedNode"), "selected correct node");
+							}));
+						}));
+
+						return d;
+					}
+				},
+
+				function setPathToNull(){
+					var d = new doh.Deferred();
+
+					myTree2.set("path", []).then(d.getTestCallback(function(){
+						doh.is(null, myTree2.get("selectedNode"), "no selected node");
+					}));
+					return d;
+				},
+
+				function setPathToRoot(){
+					var d = new doh.Deferred();
+
+					myTree2.set("path", ["earth"]).then(d.getTestCallback(function(){
+						doh.is(myTree2.rootNode, myTree2.get("selectedNode"), "selected root node");
+					}));
+					return d;
+				},
+
+				{
+					name: "setPaths",
+					timeout: 5000,
+					runTest: function() {
+						var d = new doh.Deferred();
+
+						myTree2.set("paths", [
+							["earth", "AF", "KE", "Nairobi"],
+							["earth", "NA", "MX", "Guadalajara"]
+						]).then(d.getTestCallback(function () {
+							var ids = dojo.map(myTree2.selectedItems, function (x) {
+								return myTree2.model.getIdentity(x);
+							}).sort();
+							doh.is(["Guadalajara", "Nairobi"], ids);
+						}));
+						return d;
+					}
+				}
+			]);
+
+			doh.register("data store", [
+				function itemUpdate(){
+					// Test that Tree noticed when data store items change, and updates accordingly
+
+					var item = myTree.rootNode.getChildren()[3].item;
+					myStore.setValue(item, "name", "EU");
+
+					doh.is("EU", helpers.innerText(myTree.rootNode.getChildren()[3].labelNode), "label changed");
+				},
+
+				function topLevelItemDelete(){
+					// Delete a top level item.   ForestStoreModel needs to realize that the top level
+					// children have changed and notify Tree
+
+					// Remove "South America"
+					var item = myTree.rootNode.getChildren()[5].item;
+					myStore.deleteItem(item);
+
+					var children = myTree.rootNode.getChildren();
+					doh.is(5, children.length, "five children");
+					doh.is("North America", children[4].label, "last child");
+					doh.t(domClass.contains(children[4].domNode, "dijitTreeIsLast"),
+							"North america has become the last node so it gets the CSS class for that");
+				},
+
+				function openANode(){
+					var d = new doh.Deferred();
+
+					var asia = myTree.rootNode.getChildren()[1];
+
+					doh.is(0, asia.getChildren().length, "no children loaded yet");
+
+					myTree._onExpandoClick({node: asia});
+
+					setTimeout(d.getTestCallback(function(){
+						// Give the tree time to load the children, and the do checks that it
+						// loaded correctly
+
+						var children = asia.getChildren();
+						doh.is(4, children.length, "four children");
+						doh.is("China", children[0].label, "first child");
+						doh.is("Mongolia", children[3].label, "last child");
+					}), 750);
+					return d;
+				},
+
+				function selectAnItem(){
+					myTree.set('selectedItem','CN');
+					doh.is('CN',myTree.model.getIdentity(myTree.get('selectedItem')));
+				},
+
+				function nestedItemDelete(){
+					// Delete a nested item
+
+					// Remove "China"
+					var asia = myTree.rootNode.getChildren()[1],
+						china = asia.getChildren()[0];
+					myStore.deleteItem(china.item);
+
+					var children = asia.getChildren();
+					doh.is(3, children.length, "three children");
+				},
+
+				function topLevelItemInsert(){
+					// Create a new top level item as last child.
+					// ForestStoreModel needs to realize that the top level children have changed and notify Tree.
+
+					myStore.newItem({
+						id: 'PA',
+						name:'Pacifica',
+						type:'continent',
+						children: []
+					});
+
+					var children = myTree.rootNode.getChildren();
+					doh.is(6, children.length, "six children");
+					doh.is("Pacifica", children[5].label, "last child");
+					doh.f(domClass.contains(children[4].domNode, "dijitTreeIsLast"),
+						"North America no longer last child");
+					doh.t(domClass.contains(children[5].domNode, "dijitTreeIsLast"),
+						"Pacifica is last child");
+				},
+
+				function topLevelItemModify(){
+					// Modify a top level item so it's no longer top level.
+					// ForestStoreModel needs to realize that the top level children have changed and notify Tree.
+
+					myStore.fetchItemByIdentity({
+						identity: 'PA',
+						onItem: function(item){
+							// in real life we would need to give the item a parent,
+							// but this is enough for testing
+							myStore.setValue(item, 'type', 'country');
+						}
+					});
+
+					var children = myTree.rootNode.getChildren();
+					doh.is(5, children.length, "five children again");
+				},
+
+				function nestedItemModify(){
+					// Modify a nested item so it matches the query for top level items in the tree.
+					// ForestStoreModel needs to realize that the top level children have changed and notify Tree.
+
+					myStore.fetchItemByIdentity({
+						identity: 'PA',
+						onItem: function(item){
+							// in real life we would need to give the item a parent,
+							// but this is enough for testing
+							myStore.setValue(item, 'type', 'continent');
+						}
+					});
+
+					var children = myTree.rootNode.getChildren();
+					doh.is(6, children.length, "six children again");
+				},
+
+				function destroyTree(){
+					// Just running this to make sure we don't get an exception
+					console.log("destroying tree");
+					myTree.destroy();
+					myTree2.destroy();
+				}
+			]);
+
+			doh.register("delete selected node", [
+				{
+					name: "create",
+					timeout: 10000,
+					runTest: function() {
+						var d = new doh.Deferred();
+
+						myTree = new Tree({
+							id: "myTree",
+							model: myModel,
+							persist: false,		// persist==true is too hard to test
+							path: ["earth", "EU", "IT"]
+						});
+						doh.t(myTree, "tree created");
+
+						dom.byId("container").appendChild(myTree.domNode);
+						myTree.startup();
+
+						myTree.onLoadDeferred.then(d.getTestCallback(function () {
+							var item = myTree.get("selectedItem");
+							doh.is("IT", myStore.getValue(item, "id"));
+						}));
+						return d;
+					}
+				},
+
+				function deleteSelectedItem(){
+					myStore.deleteItem(myTree.get("selectedItem"));
+				},
+
+				function selectNewItem(){
+					myTree.set("path", ["earth", "EU", "FR"]);
+					var item = myTree.get("selectedItem");
+					doh.is("FR", myStore.getValue(item, "id"));
+				}
+			]);
+
+			// Make sure that Tree doesn't have spurious lang="" dir="" on nodes
+			doh.register("nobidi", {
+				name: "noLangDir",
+				timeout: 10000,
+				runTest: function () {
+					var d = new doh.Deferred();
+					myStore = new dojo.data.ItemFileWriteStore({url: '../_data/countries.json'});
+					doh.t(myStore, "store created");
+
+					myModel = new ForestStoreModel({
+						store: myStore,
+						query: {type: 'continent'},
+						rootId: "earth",
+						rootLabel: "Earth",
+						childrenAttrs: ["children"]
+					});
+					doh.t(myModel, "model created");
+
+					myTree = new Tree({
+						id: "noDirTree",
+						model: myModel,
+						persist: false,		// persist==true is too hard to test
+						dndController: dndSource
+					});
+					doh.t(myTree, "tree created");
+
+					dom.byId("container").appendChild(myTree.domNode);
+					myTree.startup();
+
+					myTree.onLoadDeferred.then(d.getTestCallback(function(){
+						// Give the tree time to load, and the do checks that it
+						// loaded correctly
+						doh.t(myTree.rootNode, "root node exists");
+						doh.t(myTree.rootNode.isExpanded, "root node is expanded");
+						doh.f(domAttr.has(myTree.rootNode, "lang"), "no (empty) lang attribute on root TreeNode");
+						doh.f(domAttr.has(myTree.rootNode, "dir"), "no (empty) dir attribute on root TreeNode");
+
+						var children = myTree.rootNode.getChildren();
+						doh.f(domAttr.has(children[2], "lang"), "no (empty) lang attribute on child TreeNode");
+						doh.f(domAttr.has(children[2], "dir"), "no (empty) dir attribute on child TreeNode");
+					}));
+					return d;
+				}
+			});
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit.Tree / dijit.tree.ForestStoreModel Automated Tests</h1>
+	<div id="container"> <!--  tree will go here --></div>
+	<div id="container2"> <!--  tree2 will go here --></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/Tree_ObjectStoreModel.html b/src/main/resources/static/dijit/tests/tree/Tree_ObjectStoreModel.html
new file mode 100644
index 0000000000000000000000000000000000000000..9693c167fd85f3154b1ac42b13c690193f1df2d2
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/Tree_ObjectStoreModel.html
@@ -0,0 +1,1304 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>dijit.Tree / dijit.tree.ObjectStoreModel automated test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/_base/array",
+			"dojo/aspect",
+			"dojo/cookie",
+			"dojo/dom-class",
+			"dojo/_base/lang",
+			"dojo/on",
+			"dojo/_base/window",
+			"dojo/promise/all",
+			"dojo/store/Memory",
+			"dojo/store/Observable",
+			"dijit/focus",
+			"dijit/registry",
+			"dijit/Tree",
+			"dijit/tree/ObjectStoreModel",
+			"dijit/tree/dndSource",
+			"dijit/tests/_data/geography",
+			"dijit/tests/AsyncMemoryStore",
+			"dijit/tests/helpers",	// functions to help test
+			"dojo/domReady!"
+		], function(doh, array, aspect, cookie, domClass, lang, on, win, all, Memory, Observable,
+					focus, registry, Tree, ObjectStoreModel, dndSource, data, AsyncMemoryStore, helpers){
+
+			var myStore, myModel, myTree, myTree2, cache;
+
+			// Create / reset the data store and model, setting global-ish variables myStore and myModel
+			function setupStoreAndModel(/*Function*/ Store, /*Boolean*/ isObservable, idDataType){
+				if(!Store){
+					Store = Memory;
+				}
+
+				// Clone to sandbox tests that change data
+				var datacopy = lang.clone(data);
+
+				// id datatype switch:
+				// assume fetched data id is of type 'string', overwrite if needed
+				// store original id in a cache, so it can be retrieved later
+				var _id, i=0, l=datacopy.length;
+				cache = {};
+				for(i=0;i<l;i++){
+					_id = datacopy[i].id;
+					cache[_id] = idDataType=="float" ? Math.random() : idDataType=="int" ? i+1 : _id;
+					datacopy[i].id = cache[_id];
+				}
+				// replace parent
+				for(i=0;i<l;i++){
+					if(datacopy[i].hasOwnProperty("parent")){
+						datacopy[i].parent = cache[datacopy[i].parent];
+					}
+				}
+				// Create test store.
+				myStore = new Store({
+					data: datacopy
+				});
+
+				// Since dojo.store.Memory doesn't have various store methods we need, we have to add them manually
+				myStore.getChildren = function(object){
+					// Add a getChildren() method to store for the data model where
+					// children objects point to their parent (aka relational model)
+					return this.query({parent: this.getIdentity(object)});
+				};
+
+				if(isObservable){
+					aspect.around(myStore, "put", function(originalPut){
+						// To support DnD, the store must support put(child, {parent: parent}).
+						// Since our store is relational, that just amounts to setting child.parent
+						// to the parent's id.
+						return function(obj, options){
+							if(options && options.parent){
+								obj.parent = options.parent.id;
+							}
+							return originalPut.call(myStore, obj, options);
+						}
+					});
+
+					// Wrap the store in Observable so that updates to the store are reflected
+					myStore = new Observable(myStore);
+				}
+
+				doh.t(myStore, "store created");
+
+				// Create the model
+				myModel = new ObjectStoreModel({store: myStore, query: {id: cache["earth"]}});
+				doh.t(myModel, "model created");
+			}
+
+			// Register tests for specified store / observable
+			function registerBasicTests(/*Boolean*/ async, /*Boolean*/ isObservable){
+				var category = (async ? "async " : "sync ") + (isObservable ? "observable ": "") + "store: ";
+
+				doh.register(category + "setup", function(){
+					setupStoreAndModel(async ? AsyncMemoryStore : Memory, isObservable);
+				});
+
+				doh.register(category + "basic", [
+					{
+						name: "create",
+						timeout: 5000,
+						runTest: function(){
+							myTree = new Tree({
+								id: "myTree",
+								model: myModel,
+								persist: false,		// persist==true is too hard to test
+								dndController: dndSource
+							}).placeAt(win.body());
+							doh.t(myTree, "tree created");
+
+							myTree.startup();
+
+							// Give the tree time to load, and the do checks that it loaded correctly
+							return myTree.onLoadDeferred.then(function(){
+								var world = myTree.rootNode;
+								doh.t(world, "root node exists");
+								doh.is("The earth", world.label, "world node label");
+								doh.t(world.isExpanded, "root node is expanded");
+								doh.t(domClass.contains(world.domNode, "dijitTreeIsRoot"), "root node has dijitTreeIsRoot");
+
+								var children = world.getChildren();
+								doh.is(6, children.length, "six children");
+								doh.is("Africa", children[0].label, "first child");
+								doh.f(domClass.contains(children[0].domNode, "dijitTreeIsRoot"), "first child doesn't have dijitTreeIsRoot");
+								doh.f(children[0].isExpanded, "first child not expanded");
+								doh.is("South America", children[5].label, "last child");
+
+								// Last child has special CSS for drawing the grid lines
+								doh.f(domClass.contains(children[3].domNode, "dijitTreeIsLast"), "middle node doesn't have dijitTreeIsLast");
+								doh.t(domClass.contains(children[5].domNode, "dijitTreeIsLast"), "last node has dijitTreeIsLast");
+							});
+						}
+					},
+
+					function openEurope(){
+						var d = new doh.Deferred();
+
+						var world = myTree.rootNode;
+						var europe = world.getChildren()[3];
+
+						doh.is("Europe", europe.label, "europe node label");
+						doh.t(europe, "europe node exists");
+
+						// Click on Europe to open it
+						on.emit(europe.expandoNode, "click", {bubbles: true});
+
+						// Give the children time to load, and the do checks that they
+						// loaded correctly
+						setTimeout(d.getTestCallback(function(){
+							doh.t(europe.isExpanded, "europe node is expanded");
+
+							var children = europe.getChildren();
+							doh.is(4, children.length, "children count");
+							doh.is("Germany", children[0].label, "first child");
+							doh.f(children[0].isExpanded, "first child not expanded");
+							doh.is("Italy", children[3].label, "last child");
+
+							// Last child has special CSS for drawing the grid lines
+							doh.f(domClass.contains(children[1].domNode, "dijitTreeIsLast"), "middle node doesn't have dijitTreeIsLast");
+							doh.t(domClass.contains(children[3].domNode, "dijitTreeIsLast"), "last node has dijitTreeIsLast");
+						}), 750);
+						return d;
+					},
+
+					function openAsia(){
+						var d = new doh.Deferred();
+
+						var world = myTree.rootNode;
+						var asia = world.getChildren()[1];
+						doh.is("Asia", asia.label, "asia node label");
+						doh.t(asia, "asia node exists");
+
+						// Click on Europe to open it
+						on.emit(asia.expandoNode, "click", {bubbles: true});
+
+						// Give the children time to load, and the do checks that they
+						// loaded correctly
+						setTimeout(d.getTestCallback(function(){
+							doh.t(asia.isExpanded, "asia node is expanded");
+
+							var children = asia.getChildren();
+							doh.is(4, children.length, "children count");
+							doh.is("China", children[0].label, "first child");
+							doh.is("Mongolia", children[3].label, "last child");
+						}), 750);
+						return d;
+					}
+				]);
+
+				if(isObservable){
+					doh.register(category + "data store binding", [
+						function itemUpdate(){
+							// Test that Tree notices when data store items change, and updates accordingly
+
+							myStore.put({ id: "ES", name: "España", type: "country", parent: "EU" });
+
+							var world = myTree.rootNode;
+							var europe = world.getChildren()[3];
+							doh.is("España", helpers.innerText(europe.getChildren()[2].labelNode), "label changed");
+						},
+
+						function topLevelItemDelete(){
+							// Delete a top level item.
+
+							// Remove "South America"
+							myStore.remove("SA");
+
+							var world = myTree.rootNode;
+							var children = world.getChildren();
+							doh.is(5, children.length, "five children");
+							doh.is("North America", children[4].label, "last child");
+							doh.t(domClass.contains(children[4].domNode, "dijitTreeIsLast"),
+									"North america has become the last node so it gets the CSS class for that");
+						},
+
+						function nestedItemDelete(){
+							// Delete a nested item
+
+							// Remove "China"
+							myStore.remove("CN");
+
+							var world = myTree.rootNode;
+							var asia = world.getChildren()[1];
+							var children = asia.getChildren();
+							doh.is(3, children.length, "three children");
+						},
+
+						function topLevelItemInsert(){
+							// Create a new top level item as last child.
+							// ForestStoreModel needs to realize that the top level children have changed and notify Tree.
+
+							myStore.add({
+								id: "PA",
+								name: "Pacifica",
+								type: "continent",
+								parent: "earth"
+							});
+
+							var world = myTree.rootNode;
+							var children = world.getChildren();
+
+							doh.is(6, children.length, "six children");
+							doh.is("Pacifica", children[5].label, "last child");
+							doh.f(domClass.contains(children[4].domNode, "dijitTreeIsLast"),
+									"North America no longer last child");
+							doh.t(domClass.contains(children[5].domNode, "dijitTreeIsLast"),
+									"Pacifica is last child");
+						},
+
+						function topLevelItemModify(){
+							// Modify a top level item so it's no longer top level.
+
+							myStore.put({
+								id: "PA",
+								name: "Pacifica",
+								type: "continent",
+								parent: "AS"
+							});
+
+							var world = myTree.rootNode;
+							doh.is(5, world.getChildren().length, "world children");
+
+							var asia = world.getChildren()[1];
+							doh.is(4, asia.getChildren().length, "asia children");
+						},
+
+						function nestedItemModify(){
+							// Modify a nested item so it matches the query for top level items in the tree.
+
+							myStore.put({
+								id: "PA",
+								name: "Pacifica",
+								type: "continent",
+								parent: "earth"
+							});
+
+							var world = myTree.rootNode;
+							var asia = world.getChildren()[1];
+							doh.is(3, asia.getChildren().length, "asia children");
+						}
+					]);
+
+					doh.register(category + "DnD", [
+						// Drag Germany from Europe to Asia
+						function dragGermanyToAsia(){
+							return all([myStore.get("AS"), myStore.get("EU"), myStore.get("DE")]).then(function(items){
+								var asiaItem = items[0],
+									europeItem = items[1],
+									germanyItem = items[2];
+								return myModel.pasteItem(germanyItem, europeItem, asiaItem);
+							}).then(function(){
+								// Check tree state
+								var world = myTree.rootNode;
+								var asia = world.getChildren()[1];
+								var europe = world.getChildren()[3];
+								doh.is(3, europe.getChildren().length, "europe children");
+								doh.is(4, asia.getChildren().length, "asia children");
+								doh.is("Germany", asia.getChildren()[3].label, "last child of asia");
+							});
+						},
+
+						// Drag Germany from Asia to Europe
+						function dragGermanyToEurope(){
+							return all([myStore.get("AS"), myStore.get("EU"), myStore.get("DE")]).then(function(items){
+								var asiaItem = items[0],
+									europeItem = items[1],
+									germanyItem = items[2];
+								return myModel.pasteItem(germanyItem, asiaItem, europeItem);
+							}).then(function(){
+								// Check tree state
+								var world = myTree.rootNode;
+								var asia = world.getChildren()[1];
+								var europe = world.getChildren()[3];
+								doh.is(3, asia.getChildren().length, "asia children");
+								doh.is(4, europe.getChildren().length, "europe children");
+								doh.is("Germany", europe.getChildren()[3].label, "last child of europe");
+							});
+						},
+
+						function openAfrica(){
+							var d = new doh.Deferred();
+
+							var world = myTree.rootNode;
+							var africa = world.getChildren()[0];
+							doh.is("Africa", africa.label, "africa node label");
+							doh.t(africa, "africa node exists");
+
+							// Click on Africa to open it
+							on.emit(africa.expandoNode, "click", {bubbles: true});
+
+							// Give the children time to load, and the do checks that they
+							// loaded correctly
+							setTimeout(d.getTestCallback(function(){
+								doh.t(africa.isExpanded, "node is expanded");
+
+								var children = africa.getChildren();
+								doh.is(3, children.length, "children count");
+							}), 750);
+
+							return d;
+						},
+
+						function openKenya(){
+							var d = new doh.Deferred();
+
+							var world = myTree.rootNode;
+							var africa = world.getChildren()[0];
+							var kenya = africa.getChildren()[1];
+							doh.t(kenya, "kenya node exists");
+							doh.is("Kenya", kenya.label, "kenya node label");
+
+							// Click on Kenya to open it
+							on.emit(kenya.expandoNode, "click", {bubbles: true});
+
+							// Give the children time to load, and the do checks that they
+							// loaded correctly
+							setTimeout(d.getTestCallback(function(){
+								doh.t(kenya.isExpanded, "node is expanded");
+
+								var children = kenya.getChildren();
+								doh.is(2, children.length, "children count");
+							}), 750);
+
+							return d;
+						},
+
+						// Dragging open node to make sure it stays open.
+						function dragKenyaToAsia(){
+							// Get some pointers to TreeNodes
+							var world = myTree.rootNode;
+							var africa = world.getChildren()[0];
+							var asia = world.getChildren()[1];
+							var kenya = africa.getChildren()[1];
+
+							return all([myStore.get("AS"), myStore.get("AF"), myStore.get("KE")]).then(function(items){
+								var asiaItem = items[0],
+									africaItem = items[1],
+									kenyaItem = items[2];
+								return myModel.pasteItem(kenyaItem, africaItem, asiaItem);
+							}).then(function(){
+								// Confirm Tree state
+								doh.is(4, asia.getChildren().length, "asia children");
+								doh.is("Kenya", asia.getChildren()[3].label, "last child of asia");
+								doh.is(kenya, asia.getChildren()[3], "same TreeNode as before");
+								doh.t(kenya.isExpanded, "node is still expanded");
+								doh.is(2, kenya.getChildren().length, "same children count as before");
+							});
+						},
+
+						// Put Kenya back in Africa
+						function dragKenyaToAfrica(){
+							return all([myStore.get("AS"), myStore.get("AF"), myStore.get("KE")]).then(function(items){
+								var asiaItem = items[0],
+									africaItem = items[1],
+									kenyaItem = items[2];
+								return myModel.pasteItem(kenyaItem, asiaItem, africaItem);
+							}).then(function(){
+								var world = myTree.rootNode;
+								var africa = world.getChildren()[0];
+								var asia = world.getChildren()[1];
+								doh.is(3, asia.getChildren().length, "asia children");
+								doh.is(3, africa.getChildren().length, "africa children");
+							});
+						},
+
+						// Drag Europe onto root, to make sure it doesn't disappear (#16692)
+						function dragEuropeToRoot(){
+							var world = myTree.rootNode;
+							doh.is(6, world.getChildren().length, "world children before paste");
+							return all([myStore.get("earth"), myStore.get("EU")]).then(function(items){
+								var worldItem = items[0],
+									europeItem = items[1];
+								return myModel.pasteItem(europeItem, worldItem, worldItem);
+							}).then(function(){
+								doh.is(6, world.getChildren().length, "world children after paste");
+							});
+						}
+					]);
+				}
+				doh.register(category + "tearDown", function destroyTree(){
+					myTree.destroy();
+					myModel.destroy();
+				});
+			}
+
+			registerBasicTests(false, true);
+			registerBasicTests(true, true);
+			registerBasicTests(true, false);
+
+			// Other tests, currently only run on synchronous observable store
+			function registerPathsTests(datatype){
+				// use datatype to switch between int|float|string (default)
+				// cleanup:
+				datatype = datatype == "float" ? "float" : datatype == "int" ? "int" : "string";
+				function typePath(path){
+					if(datatype!="string"){
+						return array.map(path,function(item){
+							return cache[item];
+						});
+					}
+					return path;
+				}
+				// return original id from cache
+				function fromCache(val){
+					for(var k in cache){
+						if(cache[k]===val){
+							return k;
+						}
+					}
+				}
+				doh.register("paths_"+datatype, [
+					function reset(){
+						setupStoreAndModel(Memory, true, datatype);
+					},
+
+					{
+						name: "getPath",
+						timeout: 5000,
+						runTest: function(){
+							myTree = new Tree({
+								id: "myTree",
+								model: myModel,
+								persist: false,		// persist==true is too hard to test
+								dndController: dndSource,
+								autoExpand: true
+							}).placeAt(win.body());
+							doh.t(myTree, "tree created");
+
+							myTree.startup();
+
+							return myTree.onLoadDeferred.then(function (){
+								// Select the node.   can't emit "click" because dndSelector listens for mousedown & mouseup.
+								// And before the mousedown, we need a mouseover event, so _dndContainer.js sets this.current.
+								var europe = myTree.rootNode.getChildren()[3];
+								var france = europe.getChildren()[1];
+								on.emit(france.labelNode, navigator.pointerEnabled ? "pointerover" : navigator.msPointerEnabled ? "MSPointerOver" : "mouseover", {bubbles: true});
+								on.emit(france.labelNode, navigator.pointerEnabled ? "pointerdown" : navigator.msPointerEnabled ? "MSPointerDown" : "mousedown", {button: dojo.mouseButtons.LEFT, bubbles: true});
+								on.emit(france.labelNode, navigator.pointerEnabled ? "pointerup" : navigator.msPointerEnabled ? "MSPointerUp" : "mouseup", {button: dojo.mouseButtons.LEFT, bubbles: true});
+
+								var path = myTree.get("path");
+								doh.is("earth, EU, FR", array.map(myTree.get("path"), function (obj){
+									return fromCache(obj.id);
+								}).join(", "), "serialized path");
+							});
+						}
+					},
+
+					{
+						name: "createWithPath",
+						timeout: 5000,
+						runTest: function(){
+							myTree2 = new Tree({
+								id: "myTree2",
+								model: myModel,
+								persist: false,		// persist==true is too hard to test
+								dndController: dndSource,
+								path: typePath(["earth", "EU", "IT"])
+							}).placeAt(win.body());
+							doh.t(myTree2, "myTree2 created");
+
+							myTree2.startup();
+
+							return myTree2.onLoadDeferred.then(function(){
+								doh.t(myTree2.rootNode, "root node exists");
+								doh.t(myTree2.rootNode.isExpanded, "root node is expanded");
+								doh.t(myTree2.rootNode.getChildren()[3].isExpanded, "europe node is expanded");
+								doh.is("Italy", myTree2.selectedNode.label, "selected correct node");
+							});
+						}
+					},
+
+					function copyPath(){
+						var world = myTree.rootNode;
+
+						return myTree.set("path", myTree2.get("path")).then(function(items){
+							doh.is("earth, EU, IT", array.map(items, function(item){
+								return fromCache(item.id);
+							}).join(", "));
+							doh.t(world.isExpanded, "root node is expanded");
+							doh.t(world.getChildren()[3].isExpanded, "europe node is expanded");
+							doh.is("Italy", myTree.get("selectedNode").label, "selected correct node");
+						});
+					},
+
+					{
+						name: "copyPathByIds",
+						timeout: 5000,
+						runTest: function(){
+							var testpath = typePath(["earth", "NA", "CA", "Ottawa"]);
+
+							return myTree.set("path", testpath).then(function(){
+								var path = array.map(myTree.get("path"), function(item){ return item.id; });
+								doh.is(testpath, path, "path got set on myTree");
+
+								return myTree2.set("path", path).then(function(){
+									doh.t(myTree2.rootNode.isExpanded, "root node is expanded");
+									doh.t(myTree2.rootNode.getChildren()[4].isExpanded, "north america node is expanded");
+									doh.t(myTree2.rootNode.getChildren()[4].getChildren()[1].isExpanded, "canada node is expanded");
+									doh.is("Ottawa", myTree2.get("selectedNode").label, "selected correct node");
+								});
+							});
+						}
+					},
+
+					function setPathToNull(){
+						return myTree2.set("path", []).then(function(){
+							doh.is(null, myTree2.get("selectedNode"), "no selected node");
+						});
+					},
+
+					function setPathToRoot(){
+						return myTree2.set("path", typePath(["earth"])).then(function(){
+							doh.is(myTree2.rootNode, myTree2.get("selectedNode"), "selected root node");
+						});
+					},
+
+					{
+						name: "setPaths",
+						timeout: 5000,
+						runTest: function(){
+							return myTree2.set("paths", [
+								typePath(["earth", "AF", "KE", "Nairobi"]),
+								typePath(["earth", "NA", "MX", "Guadalajara"])
+							]).then(function(paths){
+								doh.is("earth, AF, KE, Nairobi", array.map(paths[0], function(item){
+									return fromCache(item.id);
+								}).join(", "));
+								doh.is("earth, NA, MX, Guadalajara", array.map(paths[1], function(item){
+									return fromCache(item.id);
+								}).join(", "));
+								var ids = array.map(myTree2.selectedItems, function(x){
+									return myTree2.model.getIdentity(x);
+								}).sort();
+								doh.is(typePath(["Guadalajara", "Nairobi"]).sort(), ids);
+							});
+						}
+					},
+
+					function setEmptyPath(){
+						// setting an empty path is interpreted as selecting nothing
+						return myTree2.set("path", []).then(function(){
+							doh.is(0, myTree2.get("selectedNodes").length, "no nodes selected");
+						});
+					},
+					function setInvalidPath(){
+						var d = new doh.Deferred();
+
+						myTree2.set("path", typePath(["earth", "AF", "KE", "Narnia"])).then(
+							function(){
+								d.errback("Should have gotten error trying to set invalid path");
+							},
+							d.getTestCallback(function(e){
+								doh.t(e instanceof Tree.PathError, "got PathError");
+							})
+						);
+
+						return d;
+					},
+
+					function destroyTree(){
+						myTree.destroy();
+						myTree2.destroy();
+					}
+				]);
+			}
+
+			registerPathsTests("string");
+			registerPathsTests("int");
+			registerPathsTests("float");
+
+			doh.register("delete selected node", [
+				function reset(){
+					setupStoreAndModel(Memory, true);
+				},
+
+				{
+					name: "create",
+					timeout: 10000,
+					runTest: function(){
+						myTree = new Tree({
+							id: "myTree",
+							model: myModel,
+							persist: false,		// persist==true is too hard to test
+							path: ["earth", "EU", "IT"]
+						}).placeAt(win.body());
+						doh.t(myTree, "tree created");
+
+						myTree.startup();
+
+						return myTree.onLoadDeferred.then(function(){
+							doh.is("IT", myTree.get("selectedItem").id);
+						});
+					}
+				},
+
+				function deleteSelectedItem(){
+					myStore.remove("IT");
+				},
+
+				function selectNewItem(){
+					// Since EU is already open this set("path", ...) should execute immediately
+					myTree.set("path", ["earth", "EU", "FR"]);
+					doh.is("FR", myTree.get("selectedItem").id);
+				},
+
+				function tearDown(){
+					myTree.destroy();
+					myModel.destroy();
+				}
+			]);
+
+
+			doh.register("nobidi", [
+				function reset(){
+					setupStoreAndModel(Memory, true);
+				},
+
+				{
+					name: "create",
+					timeout: 10000,
+					runTest: function(){
+						myTree = new Tree({
+							id: "myTree",
+							model: myModel,
+							persist: false,		// persist==true is too hard to test
+							path: ["earth", "EU", "IT"]
+						}).placeAt(win.body());
+						doh.t(myTree, "tree created");
+					}
+				},
+
+				// Make sure that Tree doesn't have spurious lang="" dir="" on nodes
+				function noLangDir(){
+					doh.t(myTree.rootNode, "root node exists");
+					doh.t(myTree.rootNode.isExpanded, "root node is expanded");
+					doh.f(domClass.contains(myTree.rootNode, "lang"), "no (empty) lang attribute on root TreeNode");
+					doh.f(domClass.contains(myTree.rootNode, "dir"), "no (empty) dir attribute on root TreeNode");
+
+					var children = myTree.rootNode.getChildren();
+					doh.f(domClass.contains(children[2], "lang"), "no (empty) lang attribute on child TreeNode");
+					doh.f(domClass.contains(children[2], "dir"), "no (empty) dir attribute on child TreeNode");
+				},
+
+				function tearDown(){
+					myTree.destroy();
+					myModel.destroy();
+				}
+			]);
+
+			doh.register("expand/contract", [
+				function reset(){
+					setupStoreAndModel(Memory, true);
+				},
+
+				{
+					name: "initiallyExpanded",
+					timeout: 10000,
+					runTest: function(){
+						myTree = new Tree({
+							id: "myTreeExpand",
+							model: myModel,
+							persist: false,		// persist==true is too hard to test
+							autoExpand: true
+						}).placeAt(win.body());
+						doh.t(myTree, "tree created");
+
+						myTree.startup();
+
+						return myTree.onLoadDeferred.then(function(){
+							var world = myTree.rootNode;
+							doh.t(world, "root node exists");
+							doh.t(world.isExpanded, "root node is expanded");
+
+							var children = world.getChildren();
+							doh.is(6, children.length, "world children");
+							doh.t(children[0].isExpanded, "Africa expanded");
+							doh.t(children[0].getChildren()[1].isExpanded, "Kenya expanded too");
+							doh.is(2, children[0].getChildren()[1].getChildren().length, "Kenya children");
+							doh.t(children[4].isExpanded, "North America expanded");
+							doh.is(3, children[4].getChildren().length, "North America children");
+						});
+					}
+				},
+				{
+					name: "collapseAll",
+					timeout: 10000,
+					runTest: function(){
+						return myTree.collapseAll().then(function(){
+							var world = myTree.rootNode;
+							doh.t(world, "root node exists");
+							doh.f(world.isExpanded, "root node collapsed");
+
+							var children = world.getChildren();
+							doh.is(6, children.length, "world children");
+							doh.f(children[0].isExpanded, "Africa collapsed");
+							doh.f(children[0].getChildren()[1].iscollapsed, "Kenya collapsed too");
+							doh.is(2, children[0].getChildren()[1].getChildren().length, "Kenya children");
+							doh.f(children[4].isExpanded, "North America collapsed");
+							doh.is(3, children[4].getChildren().length, "North America children");
+						});
+					}
+				},
+				{
+					name: "expandAll",
+					timeout: 10000,
+					runTest: function(){
+						myTree.destroy();
+
+						myTree = new Tree({
+							id: "myTreeExpand",
+							model: myModel,
+							persist: false,		// persist==true is too hard to test
+							autoExpand: false
+						}).placeAt(win.body());
+						doh.t(myTree, "tree created");
+
+						myTree.startup();
+
+						return myTree.onLoadDeferred.then(function(){
+							var world = myTree.rootNode;
+							doh.t(world, "root node exists");
+							doh.t(world.isExpanded, "root node is expanded");
+
+							var children = world.getChildren();
+							doh.is(6, children.length, "world children");
+							doh.f(children[0].isExpanded, "Africa collapsed");
+
+							return myTree.expandAll().then(function(){
+								var children = world.getChildren();
+								doh.t(children[0].isExpanded, "Africa expanded");
+								doh.t(children[0].getChildren()[2].isExpanded, "Kenya expanded too");
+								doh.t(children[4].isExpanded, "North America expanded");
+								doh.is(3, children[4].getChildren().length, "North America children");
+							});
+						});
+					}
+				},
+				{
+					name: "collapseShowRootFalseTree",
+					timeout: 5000,
+					runTest: function(){
+						myTree.destroy();
+
+						myTree = new Tree({
+							id: "myTreeExpand",
+							model: myModel,
+							persist: false,		// persist==true is too hard to test
+							showRoot: false
+						}).placeAt(win.body());
+						doh.t(myTree, "tree created");
+
+						myTree.startup();
+
+						return myTree.onLoadDeferred.then(function(){
+							var world = myTree.rootNode;
+							return myTree._expandNode(world.getChildren()[0]).then(function(){
+								var children = world.getChildren();
+								doh.t(children[0].isExpanded, "Africa expanded");
+
+								// While we are here, check that dijitTreeIsRoot class applied to first level of
+								// children, since the actual root node is hidden.
+								doh.t(domClass.contains(children[0].domNode, "dijitTreeIsRoot"),
+										"first level children have dijitTreeIsRoot");
+
+								return myTree.collapseAll().then(function(){
+									doh.t(world, "root node exists");
+									doh.t(world.isExpanded, "root node expanded (because it's hidden");
+
+									doh.f(children[0].isExpanded, "Africa collapsed");
+									doh.t(helpers.isVisible(children[0]), "Africa node visible");
+								});
+							});
+						});
+					}
+				},
+
+				function tearDown(){
+					myTree.destroy();
+					myModel.destroy();
+				}
+			]);
+
+			doh.register("persistence", [
+				// Reset the data to original values
+				function reset(){
+					setupStoreAndModel();
+				},
+
+				{
+					name: "create",
+					timeout: 5000,
+					runTest: function(){
+						if(registry.byId("myTree")){
+							registry.byId("myTree").destroy();
+						}
+						cookie("myTreeSaveStateCookie", "");
+
+						myTree = new Tree({
+							id: "myTree",
+							model: myModel,
+							persist: true
+						}).placeAt(win.body());
+						doh.t(myTree, "tree created");
+
+						myTree.startup();
+
+						return myTree.onLoadDeferred;
+					}
+				},
+
+				{
+					name: "expand and contract",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var world = myTree.rootNode;
+						na = world.getChildren()[4];
+						doh.is("North America", na.label, "North America node label");
+
+						// Click on North America to open it
+						on.emit(na.expandoNode, "click", {bubbles: true});
+
+						// Wait for animation to complete
+						setTimeout(d.getTestErrback(function(){
+							mx = na.getChildren()[0];
+							doh.is("Mexico", mx.label, "Mexico node label");
+
+							// Click on Mexico to open it
+							on.emit(mx.expandoNode, "click", {bubbles: true});
+
+							// Wait for animation to complete.
+							setTimeout(d.getTestErrback(function(){
+								// Click on North America again, to close it
+								on.emit(na.expandoNode, "click", {bubbles: true});
+								setTimeout(d.getTestCallback(function(){
+									// Wait for close animation to finish and then return success
+								}), 500);
+							}), 500);
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "recreate tree",
+					timeout: 5000,
+					runTest: function(){
+						myTree.destroy();
+
+						myTree = new Tree({
+							id: "myTree",
+							model: myModel,
+							persist: true
+						}).placeAt(win.body());
+						doh.t(myTree, "tree created");
+
+						myTree.startup();
+
+						return myTree.onLoadDeferred;
+					}
+				},
+
+				{
+					name: "check tree state",
+					timeout: 5000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var world = myTree.rootNode;
+						var na = world.getChildren()[4];
+						doh.is("North America", na.label, "North America node label");
+
+						doh.f(na.isExpanded, "North America collapsed");
+
+						// Click on North America to open it
+						on.emit(na.expandoNode, "click", {bubbles: true});
+
+						setTimeout(d.getTestCallback(function(){
+							doh.t(na.isExpanded, "North America expanded");
+							mx = na.getChildren()[0];
+							doh.is("Mexico", mx.label, "Mexico node label");
+							doh.t(mx.isExpanded, "Mexico expanded");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				function tearDown(){
+					myTree.destroy();
+					myModel.destroy();
+				}
+			]);
+
+			// Tests that TreeNodes that are destroyed don't linger in selection, etc.
+			doh.register("destroyed nodes", [
+				// Reset the data to original values
+				function reset(){
+					setupStoreAndModel(Memory, true);
+				},
+
+				{
+					name: "create",
+					timeout: 5000,
+					runTest: function(){
+						cookie("myDeleteTreeSaveStateCookie", "");
+						myTree = new Tree({
+							id: "myDeleteTree",
+							model: myModel,
+							persist: true
+						}).placeAt(win.body());
+						doh.t(myTree, "tree created");
+
+						myTree.startup();
+						doh.is("earth", cookie("myDeleteTreeSaveStateCookie"), "initial persistence cookie just earth");
+					}
+				},
+
+				{
+					name: "removedFromSelection",
+					timeout: 10000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						// Select Mexico city
+						myTree.set("path", ["earth", "NA", "MX", "Mexico City"]).then(d.getTestErrback(function(){
+							doh.is(1, myTree.get("paths").length, "one selected node");
+							var selectedNode = myTree.get("selectedNode");
+
+							// Ancestors of the selected node should be expanded, and that should be saved
+							// in the cookie
+							doh.is("earth,earth/NA,earth/NA/MX", cookie("myDeleteTreeSaveStateCookie"),
+									"Earth, North America, Mexico should be listed as expanded");
+
+							// Remove selection's ancestor
+							myStore.remove("NA");
+
+							// use setTimeout() to give Tree time to realize this isn't a drag & drop, but that
+							// the North America subtree was truly deleted
+							setTimeout(d.getTestCallback(function(){
+								doh.t(selectedNode._destroyed, "the selected node was destroyed (along with it's ancestor)");
+								doh.is(0, myTree.get("paths").length, "no selected nodes");
+								doh.is("earth", cookie("myDeleteTreeSaveStateCookie"),
+										"North America and Mexico should have been removed from list of expanded nodes")
+							}), 100);
+						}));
+						return d;
+					}
+				},
+
+				{
+					name: "reinsert deleted descendants",
+					timeout: 5000,
+					runTest: function(){
+						myStore.put({ id: "NA", name:"North America", type:"continent", parent: "earth" });
+						myStore.put({ id: "MX", name:"Mexico", type:"country",  population:"108 million", area:"1,972,550 sq km",
+								parent: "NA" });
+						myStore.put({ id: "Mexico City", name:"Mexico City", type:"city", population:"19 million", timezone:"-6 UTC", parent: "MX"});
+						myStore.put({ id: "Guadalajara", name:"Guadalajara", type:"city", population:"4 million", timezone:"-6 UTC", parent: "MX" });
+
+						return myTree.set("path", ["earth", "NA", "MX", "Mexico City"]).then(function(){
+							var node = myTree.get("selectedNode");
+							doh.isNot(null, node, "got a selected node");
+							doh.f(node._destroyed, "not destroyed");
+							doh.f(node.getParent()._destroyed, "parent not destroyed");
+							doh.f(node.getParent().getParent()._destroyed, "grandparent not destroyed");
+						});
+					}
+				},
+
+				function tearDown(){
+					myTree.destroy();
+					myModel.destroy();
+				}
+			]);
+
+			doh.register("HTML tree", {
+				name: "create",
+				timeout: 10000,
+				runTest: function(){
+					var d = new doh.Deferred();
+
+					// Create test store.
+					htmlData = array.map(data, function(o){
+						var n = lang.clone(o);
+						n.name = "<i>" + o.name + "</i>";
+						return n;
+					});
+					htmlStore = new Memory({
+						data: htmlData
+					});
+
+					// Since dojo.store.Memory doesn't have various store methods we need, we have to add them manually
+					htmlStore.getChildren = function(object){
+						// Add a getChildren() method to store for the data model where
+						// children objects point to their parent (aka relational model)
+						return this.query({parent: this.getIdentity(object)});
+					};
+
+					// Create the model
+					htmlModel = new ObjectStoreModel({
+						store: htmlStore,
+						labelType: "html",
+						query: {id: "earth"}
+					});
+					doh.t(htmlModel, "model created");
+
+					htmlTree = new Tree({
+						id: "htmlTree",
+						model: htmlModel
+					}).placeAt(win.body());
+					doh.t(htmlTree, "tree created");
+
+					htmlTree.startup();
+
+					world = htmlTree.rootNode;
+
+					return htmlTree.expandAll().then(function(){
+						doh.t(world, "root node exists");
+						doh.is("<i>The earth</i>", world.label, "world node label");
+						doh.is("<i>the earth</i>", world.labelNode.innerHTML.toLowerCase(), "world node labelNode.innerHTML");
+
+						var children = world.getChildren();
+						doh.is("<i>Africa</i>", children[0].label, "first child");
+						doh.is("<i>africa</i>", children[0].labelNode.innerHTML.toLowerCase(), "first child labelNode.innerHTML");
+					});
+				},
+
+				tearDown: function(){
+					htmlTree.destroy();
+					htmlModel.destroy();
+				}
+			});
+
+			doh.register("plain text tree", {
+				name: "create",
+				timeout: 10000,
+				runTest: function(){
+					var d = new doh.Deferred();
+
+					// Create test store.
+					plainTextData = array.map(data, function(o){
+						var n = lang.clone(o);
+						n.name = "<>&" + o.name;
+						return n;
+					});
+					plainTextStore = new Memory({
+						data: plainTextData
+					});
+
+					// Since dojo.store.Memory doesn't have various store methods we need, we have to add them manually
+					plainTextStore.getChildren = function(object){
+						// Add a getChildren() method to store for the data model where
+						// children objects point to their parent (aka relational model)
+						return this.query({parent: this.getIdentity(object)});
+					};
+
+					// Create the model
+					plainTextModel = new ObjectStoreModel({
+						store: plainTextStore,
+						labelType: "text",
+						query: {id: "earth"}
+					});
+					doh.t(plainTextModel, "model created");
+
+					plainTextTree = new Tree({
+						id: "plainTextTree",
+						model: plainTextModel
+					}).placeAt(win.body());
+					doh.t(plainTextTree, "tree created");
+
+					plainTextTree.startup();
+
+					world = plainTextTree.rootNode;
+
+					return plainTextTree.expandAll().then(function(){
+						doh.t(world, "root node exists");
+						doh.is("<>&The earth", world.label, "world node label");
+						doh.is("<>&The earth", helpers.innerText(world.labelNode), "world node labelNode.innerText");
+
+						var children = world.getChildren();
+						doh.is("<>&Africa", helpers.innerText(children[0].labelNode), "first child");
+					});
+				},
+
+				tearDown: function(){
+					plainTextTree.destroy();
+					plainTextModel.destroy();
+				}
+			});
+
+			// Repeat of suite in Tree_a11y.html, but here to run against ObjectStoreModel instead of TreeStoreModel.
+			var myTree_before = document.createElement("input");
+			doh.register("destroy and focus", [
+				{
+					name: "create",
+					timeout: 5000,
+					runTest: function(){
+						setupStoreAndModel(Memory, true);
+
+						win.body().appendChild(myTree_before);
+						myTree = new Tree({
+							id: "myTree",
+							model: myModel,
+							persist: false,		// persist==true is too hard to test
+							dndController: dndSource
+						}).placeAt(win.body());
+						doh.t(myTree, "tree created");
+
+						myTree.startup();
+
+						return myTree.expandAll();
+					}
+				},
+
+				{
+					name: "destroy previously focused node",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Go to Africa node
+						var rootNode = registry.byId("myTree").getChildren()[0];
+						rootNode.getChildren()[0].focus();
+
+						setTimeout(d.getTestErrback(function(){
+							doh.is("Africa", myTree.focusedChild.label, "focus");
+							var previouslyFocusedChild = myTree.focusedChild;
+
+							// Tab out of Tree, and then destroy previously focused node.
+							myTree_before.focus();
+							setTimeout(d.getTestErrback(function(){
+								var store = myTree.model.store;
+								store.remove("AF");
+
+								// Refocus Tree.  Since previously focused node was destroyed,
+								// focus should go to The earth.
+								setTimeout(d.getTestErrback(function(){
+									myTree.focus();
+									setTimeout(d.getTestCallback(function(){
+										doh.is("The earth", focus.curNode.innerHTML, "focus");
+									}), 500);
+								}), 500);
+							}), 500);
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "destroy previously focused node's ancestor",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Go to China node
+						var rootNode = registry.byId("myTree").getChildren()[0];
+						rootNode.getChildren()[0].getChildren()[0].focus();
+
+						setTimeout(d.getTestErrback(function(){
+							doh.is("China", myTree.focusedChild.label, "focus");
+							var previouslyFocusedChild = myTree.focusedChild;
+
+							// Tab out of Tree, and then destroy previously focused node's ancestor
+							myTree_before.focus();
+							setTimeout(d.getTestErrback(function(){
+								var store = myTree.model.store;
+								store.remove("AS");
+
+								// Refocus Tree.  Since previously focused node was destroyed,
+								// focus should go to The earth.
+								setTimeout(d.getTestErrback(function(){
+									myTree.focus();
+									setTimeout(d.getTestCallback(function(){
+										doh.is("The earth", focus.curNode.innerHTML, "focus");
+									}), 500);
+								}), 500);
+							}), 500);
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "destroy currently focused node",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Go to Oceania node
+						var rootNode = registry.byId("myTree").getChildren()[0];
+						rootNode.getChildren()[0].focus();
+
+						setTimeout(d.getTestErrback(function(){
+							doh.is("Oceania", myTree.focusedChild.label, "focus");
+
+							// Destroy currently focused node
+							setTimeout(d.getTestErrback(function(){
+								var store = myTree.model.store;
+								store.remove("OC");
+
+								// Focus should go to The earth
+								setTimeout(d.getTestCallback(function(){
+									doh.is("The earth", focus.curNode.innerHTML, "focus");
+								}), 500);
+							}), 500);
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "destroy currently focused node's ancestor",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Go to Germany node
+						var rootNode = registry.byId("myTree").getChildren()[0];
+						rootNode.getChildren()[0].getChildren()[0].focus();
+
+						setTimeout(d.getTestErrback(function(){
+							doh.is("Germany", myTree.focusedChild.label, "focus");
+
+							// Destroy currently focused node's ancestor
+							setTimeout(d.getTestErrback(function(){
+								var store = myTree.model.store;
+								store.remove("EU");
+
+								// Focus should go to The earth
+								setTimeout(d.getTestCallback(function(){
+									doh.is("The earth", focus.curNode.innerHTML, "focus");
+								}), 500);
+							}), 500);
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+
+ 		});
+	</script>
+
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">dijit/Tree using dijit/tree/ObjectStore (against dojo/store) Automated Test</h1>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/Tree_with_JRS.html b/src/main/resources/static/dijit/tests/tree/Tree_with_JRS.html
new file mode 100644
index 0000000000000000000000000000000000000000..4e9de51bc460c8c7c0b4b6e3fd0eb2f31feec265
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/Tree_with_JRS.html
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+	<title>dijit/Tree with dojox/data/JsonRestStore automated test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner",
+			"dojo/dom",
+			"dojo/on",
+			"dijit/Tree",
+			"dijit/tree/ForestStoreModel",
+			"dijit/tree/dndSource",
+			"dojox/data/JsonRestStore",
+			"dojo/domReady!"
+		], function(doh, dom, on, Tree, ForestStoreModel, dndSource, JsonRestStore){
+
+			var myTree;
+
+			doh.register("Tree with dojox/data/JsonRestStore test", [
+				{
+					timeout: 3000,
+					name: "create",
+					runTest: function(){
+						var
+							d = new doh.Deferred(),
+							myStore = new JsonRestStore({target:"./", labelAttribute:"name"}),
+							myModel = new ForestStoreModel({
+								store: myStore,
+								deferItemLoadingUntilExpand: true,
+								query: "treeTestRoot",
+								childrenAttrs: ["children"]
+							});
+						myTree = new Tree({
+							id: "myTree",
+							model: myModel,
+							label: "Example",
+							persist: false,		// persist==true is too hard to test
+							dndController: "dijit.tree.dndSource" 
+						});
+						doh.t(myTree, "tree created");
+
+						dom.byId("container").appendChild(myTree.domNode);
+						myTree.startup();
+						myTree.onLoadDeferred.then(d.getTestCallback(function(){
+							// Give the tree time to load, and the do checks that it
+							// loaded correctly
+							doh.t(myTree.rootNode, "root node exists");
+							doh.t(myTree.rootNode.isExpanded, "root node is expanded");
+
+							var children = myTree.rootNode.getChildren();
+							doh.is(5, children.length, "six children");
+							doh.is("node1", children[0].label, "first child");
+							doh.f(children[0].isExpanded, "first child not expanded");
+						}));
+						return d;
+					}
+				},
+				{
+					timeout: 2000,
+					name: "open a node",
+					runTest: function(){
+						var d = new doh.Deferred(),
+							first = myTree.rootNode.getChildren()[0];
+
+						on.emit(first.expandoNode, "click", {bubbles: true});
+
+						setTimeout(d.getTestErrback(function(){
+							var firstFirst = first.getChildren()[0];
+							on.emit(firstFirst.expandoNode, "click", {bubbles: true});
+							setTimeout(d.getTestCallback(function(){
+								var children = firstFirst.getChildren();
+								doh.is(2, children.length, "two children");
+								doh.is("node1.1.1", children[0].label, "first child");
+							}), 750);
+						}), 750);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+	</script>
+
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">dijit/Tree with dojox/data/JsonRestStore automated test</h1>
+	<div id="container"> <!--  tree will go here --></div>
+	<div id="container2"> <!--  tree2 will go here --></div>
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/module.js b/src/main/resources/static/dijit/tests/tree/module.js
new file mode 100644
index 0000000000000000000000000000000000000000..01db07b3352235e67c376f714d4adaeeb2d5d8da
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/module.js
@@ -0,0 +1,22 @@
+define(["doh/main", "require", "dojo/sniff"], function(doh, require, has){
+
+	var test_robot = has("trident") || has("ff") || has("chrome") < 45;
+
+	doh.register("tree.CustomLabel", require.toUrl("./CustomLabel.html"), 999999);
+	doh.register("tree.Tree_ForestStoreModel", require.toUrl("./Tree_ForestStoreModel.html"), 999999);
+	doh.register("tree.Tree_with_JRS", require.toUrl("./Tree_with_JRS.html"), 999999);
+	doh.register("tree.Tree_ObjectStoreModel", require.toUrl("./Tree_ObjectStoreModel.html"), 999999);
+
+	if(test_robot){
+		doh.register("tree.robot.Tree_a11y", require.toUrl("./robot/Tree_a11y.html"), 999999);
+		doh.register("tree.robot.Tree_mouse", require.toUrl("./robot/Tree_mouse.html"), 999999);
+		doh.register("tree.robot.Tree_Custom_TreeNode", require.toUrl("./robot/Tree_Custom_TreeNode.html"), 999999);
+		doh.register("tree.robot.Tree_DnD", require.toUrl("./robot/Tree_dnd.html"), 999999);
+		doh.register("tree.robot.Tree_selector", require.toUrl("./robot/Tree_selector.html"), 999999);
+		doh.register("tree.robot.Tree_selector_only",
+			require.toUrl("./robot/Tree_selector.html?controller=selector"), 999999);
+		doh.register("tree/robot.Tree_DnD_multiParent", require.toUrl("./robot/Tree_dnd_multiParent.html"), 999999);
+		doh.register("tree.robot.Tree_v1", require.toUrl("./robot/Tree_v1.html"), 999999);
+	}
+
+});
diff --git a/src/main/resources/static/dijit/tests/tree/node1.1 b/src/main/resources/static/dijit/tests/tree/node1.1
new file mode 100644
index 0000000000000000000000000000000000000000..21d19236a91b2b23409800cbb0b4344ec1bb452b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/node1.1
@@ -0,0 +1,4 @@
+{ id: 'node1.1',name:'node1.1', someProperty:'somePropertyA1', children: [
+			{ $ref: 'node1.1.1', name: 'node1.1.1'},
+			{ $ref: 'node1.1.2', name: 'node1.1.2'}
+]}
diff --git a/src/main/resources/static/dijit/tests/tree/node1.2 b/src/main/resources/static/dijit/tests/tree/node1.2
new file mode 100644
index 0000000000000000000000000000000000000000..b221fabb3aa949ce882f4f3e6c3525d6954ed5de
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/node1.2
@@ -0,0 +1 @@
+{ id: 'node1.2',name:'node1.2', someProperty:'somePropertyA2'}
diff --git a/src/main/resources/static/dijit/tests/tree/places.json b/src/main/resources/static/dijit/tests/tree/places.json
new file mode 100644
index 0000000000000000000000000000000000000000..064a4e5c46cd22ffb15da0ec365ee29a1e31bd82
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/places.json
@@ -0,0 +1,29 @@
+{
+	"identifier": "id",
+	"label": "name",
+	"items": [
+		{ "id": "root", "children": [
+			{"_reference": "h0"},
+			{"_reference": "h1"},
+			{"_reference": "h2"},
+			{"_reference": "h3"},
+			{"_reference": "h4"} ]},
+		{ "id": "h0", "name":"South Africa", "type": "header", "children":[ {"_reference": "p0"}] },
+		{ "id": "h1", "name":"Ireland", "type": "header", "children":[ {"_reference": "p1"},  {"_reference": "p2"}] },
+		{ "id": "h2", "name":"France", "type": "header",  "children":[ {"_reference": "p3"},  {"_reference": "p4"}] },
+		{ "id": "h3", "name":"Canada", "type": "header",
+				"children":[ {"_reference": "p5"},  {"_reference": "p6"},  {"_reference": "p7"},  {"_reference": "p8"} ] },
+		{ "id": "h4", "name":"Korea", "type": "header", "children":[ {"_reference": "p9"}] },
+
+		{ "id": "p0", "name":"Joburg", "type": "place"},
+		{ "id": "p1", "name":"Knocknahilan", "type": "place"  },
+		{ "id": "p2", "name":"Kinsale",  "type": "place" },
+		{ "id": "p3", "name":"Lyon",  "type": "place" },
+		{ "id": "p4", "name":"Nice", "type": "place" },
+		{ "id": "p5", "name":"Toronto",  "type": "place"},
+		{ "id": "p6", "name":"Hudson Bay", "type": "place"},
+		{ "id": "p7", "name":"Quebec",  "type": "place" },
+		{ "id": "p8", "name":"Polar Bear County", "type": "place" },
+		{ "id": "p9", "name":"Jeonju", "type": "place" }
+	]
+}
diff --git a/src/main/resources/static/dijit/tests/tree/robot/Tree_Custom_TreeNode.html b/src/main/resources/static/dijit/tests/tree/robot/Tree_Custom_TreeNode.html
new file mode 100644
index 0000000000000000000000000000000000000000..7b440d50b9a16902711a5893cb73b231be53e1bb
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/robot/Tree_Custom_TreeNode.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>robot Custom TreeNode Test</title>
+
+	<style>
+		@import "../../../../util/doh/robot/robot.css";
+	</style>
+
+	<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx",
+			"dojo/keys", "dojo/query",
+			"dijit/tests/helpers","dojo/domReady!"
+		], function(doh, robot, keys, query, helpers){
+
+			var tree,registry;
+
+			robot.initRobot('../test_Custom_TreeNode.html');
+
+			doh.register("_setup", [
+				{
+					name: "wait for widgets to load",
+					timeout: 10000,
+					runTest: helpers.waitForLoad
+				},
+				function setVars(){
+					registry = robot.window.require("dijit/registry");
+					tree = dojo.global.tree;
+				}
+			]);
+
+			doh.register("arrow navigation", [
+				{
+					name: "right arrow, down arrow",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var firstVisibleNode = query(".dijitTreeLabel", robot.doc)[1];
+						firstVisibleNode.focus();
+
+						robot.keyPress(keys.RIGHT_ARROW, 100);
+						robot.keyPress(keys.RIGHT_ARROW, 100);
+						robot.sequence(d.getTestCallback(function(){
+							var focus = dojo.global.dijit.focus.curNode;
+							doh.is("Child_0", helpers.innerText(focus), "focused on first child");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+</html>
+
diff --git a/src/main/resources/static/dijit/tests/tree/robot/Tree_a11y.html b/src/main/resources/static/dijit/tests/tree/robot/Tree_a11y.html
new file mode 100644
index 0000000000000000000000000000000000000000..92d148a177b6341b19ea39bc1f728e7c863a1e54
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/robot/Tree_a11y.html
@@ -0,0 +1,792 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>robot Tree A11y Test</title>
+
+	<style>
+		@import "../../../../util/doh/robot/robot.css";
+	</style>
+
+	<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx",
+			"dojo/_base/array", "dojo/dom", "dojo/keys", "dojo/query", "dojo/window",
+			"dijit/tests/helpers", "dojo/domReady!"
+		], function(doh, robot, array, dom, keys, query, winUtils, helpers){
+
+			var treeIds = ["mytree", "tree2"];
+	
+			function testTreeItemRole(/*dijit._TreeNode*/ inRoot, /*dijit.Tree*/ inTree){
+				if(inRoot){
+					var expectedrole = inTree.showRoot || inRoot !== inTree.rootNode ? 'treeitem' : 'presentation';
+					doh.is(expectedrole, inRoot.labelNode.getAttribute("role"), inRoot.label + "[" + inTree.id + "]: aria role (" + expectedrole + ")");
+
+					// recurse
+					var children = inRoot.getChildren();
+					for(var i = 0; i < children.length; i++){
+						testTreeItemRole(children[i], inTree);
+					}
+				}
+			}
+	
+			robot.initRobot('../test_Tree.html');
+
+			var registry, focus, mytree;
+
+			doh.register("_setup", [
+				{
+					name: "wait for widgets to load",
+					timeout: 20000,
+					runTest: helpers.waitForLoad
+				},
+				function setVars(){
+					registry = robot.window.require("dijit/registry");
+					focus = robot.window.require("dijit/focus");
+					mytree = registry.byId("mytree");
+				}
+			]);
+
+			// Aria role and properties tests.
+			// These tests should probably be moved to the non-robot Tree_ObjectStoreModel.html.
+			doh.register("a11yAria", [
+				function ariaTreeRole(){
+					for(var i=0; i < treeIds.length; i++){
+						var tree = registry.byId(treeIds[i]), expectedrole = tree.showRoot ? 'tree': 'presentation';
+						doh.is(expectedrole, tree.domNode.getAttribute("role"), tree.id + ": aria role (" + expectedrole + ")");
+					}
+
+					tree = registry.byId("tree2");  // the rootless tree
+					doh.is("tree", tree.rootNode.containerNode.getAttribute("role"), "rootless tree has role on containerNode");
+					doh.f(tree.rootNode.labelNode.hasAttribute("aria-selected"), "labelNode.hasAttribute('aria-selected')");
+				},
+
+				{
+					name: "ariaTreeItemStateExpanded",
+					timeout: 8000,
+					runTest: function(){
+						return mytree.expandAll().then(function(){
+							query('[widgetId]', mytree.containerNode).map(registry.byNode).forEach(function(/*TreeNode*/ inItem){
+								if(inItem.isExpandable){
+									doh.is("true", inItem.labelNode.getAttribute("aria-expanded"), inItem.label + "[" + mytree.id + "]: aria state expanded=true");
+								}else{
+									// On IE9 getAttribute("aria-expanded") returns "", on other browsers null
+									var attr = inItem.labelNode.getAttribute("aria-expanded");
+									doh.t(attr === null || attr === "", inItem.label + "[" + mytree.id + "]: aria state expanded=false");
+								}
+							});
+						});
+					}
+				},
+
+				function ariaTreeItemRole(){
+					for(var i=0; i < treeIds.length; i++){
+						var tree = registry.byId(treeIds[i]);
+						testTreeItemRole(tree.rootNode, tree);
+					}
+
+					// role=group containers should have aria label
+					var rn = mytree.rootNode;
+					var labelId1 = rn.containerNode.getAttribute('aria-labelledby');
+					doh.is("Continents", innerText(dom.byId(labelId1)), "labelledby");
+
+					var firstChild = rn.getChildren()[0].containerNode;
+					var labelId2 = firstChild.getAttribute('aria-labelledby');
+					doh.is("Africa", innerText(dom.byId(labelId2)), "labelledby");
+				},
+
+				{
+					name: "ariaTreeItemStateCollapsed",
+					timeout: 8000,
+					runTest: function(){
+						return mytree.collapseAll().then(function(){
+							query('[widgetId]', mytree.containerNode).map(registry.byNode).forEach(function(/*TreeNode*/ inItem){
+								if(inItem.isExpandable){
+									doh.is("false", inItem.labelNode.getAttribute("aria-expanded"), inItem.label + "[" + mytree.id + "]: aria state expanded=false");
+								}else{
+									// On IE9 getAttribute("aria-expanded") returns "", on other browsers null
+									var attr = inItem.labelNode.getAttribute("aria-expanded");
+									doh.t(attr === null || attr === "", inItem.label + "[" + mytree.id + "]: aria state expanded=false");
+								}
+							});
+						});
+					}
+				}
+			]);
+
+			// Basic keyboard navigation:
+			//		- tabbing in/out of tree
+			//		- arrow keys
+			//		- home/end
+			//		- space/enter to select tree nodes (although this is also covered in Tree_selector.html)
+
+			function toggle(func, expanded){
+				return function(){
+					var d = new doh.Deferred();
+
+					var mytree = registry.byId("mytree");
+
+					doh.is(expanded, mytree.focusedChild.isExpanded, "original state");
+
+					func(mytree.focusedChild.click );
+
+					robot.sequence(d.getTestCallback(function(){
+						doh.is(!expanded, mytree.focusedChild.isExpanded, "after state");
+					}), 500);
+
+					return d;
+				};
+			}
+			doh.register("basic keyboard", [
+				{
+					name: "setup",
+					timeout: 8000,
+					runTest: function(){
+						// Close all tree nodes except for Africa and Sudan, South America, and the root node itself
+						return mytree.collapseAll().then(function(){
+							return mytree.set("paths", [
+								["continentRoot", "AF", "SD", "Khartoum"],
+								["continentRoot", "SA", "AR"]				// Argentina
+							]);
+						});
+					}
+				},
+
+				{
+					name: "tab in",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						dom.byId("mytree_before", robot.doc).focus();
+
+						robot.keyPress(keys.TAB, 300);			// should go to Continents
+
+						robot.sequence(d.getTestCallback(function(){
+							var curNode = focus.curNode;
+							doh.is("Continents", curNode.innerHTML, "focused on continents");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "down arrow #1",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.keyPress(keys.DOWN_ARROW, 300);		// move down to Africa
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Africa", mytree.focusedChild.label, "Africa is focused");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "left arrow",
+					timeout: 6000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						doh.t(mytree.focusedChild.isExpanded, "initially expanded");
+
+						// first left arrow closes Africa, without moving focus
+						robot.keyPress(keys.LEFT_ARROW, 300);
+						robot.sequence(d.getTestErrback(function(){
+							doh.f(mytree.focusedChild.isExpanded, "now it's closed");
+							doh.is("Africa", mytree.focusedChild.label, "still on Africa");
+						}), 1000);
+
+						// second left arrow goes to Africa's parent
+						robot.keyPress(keys.LEFT_ARROW, 300);
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Continents", mytree.focusedChild.label, "goes to parent");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "right arrow",
+					timeout: 6000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// move from Continents to Africa
+						robot.keyPress(keys.RIGHT_ARROW, 300);
+
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("Africa", focus.curNode.innerHTML, "Africa is focused");
+						}), 500);
+
+						// expand Africa node, focus still on Africa
+						robot.keyPress(keys.RIGHT_ARROW, 300);
+
+						robot.sequence(d.getTestErrback(function(){
+							doh.t(mytree.focusedChild.isExpanded, "now it's expanded");
+							doh.is("Africa", focus.curNode.innerHTML, "Africa still focused");
+						}), 1000);
+
+						// next right arrow (or down arrow) will move to child
+						robot.keyPress(keys.RIGHT_ARROW, 300);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Egypt", mytree.focusedChild.label, "Egypt is focused");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "down arrow #2",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// testing that down arrow goes through all visible nodes, popping up and down parent-child
+						// hierarchy
+
+						// Tests that down arrow goes to child, ie from Sudan to Khartoum
+						robot.keyPress(keys.DOWN_ARROW, 300);
+						robot.keyPress(keys.DOWN_ARROW, 300);
+						robot.keyPress(keys.DOWN_ARROW, 300);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Khartoum", mytree.focusedChild.label, "went down to child of Sudan");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "select Khartoum",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.keyPress(keys.ENTER, 300);			// select it
+
+						robot.sequence(d.getTestCallback(function(){
+							var item = mytree.get("selectedItem"),
+									label = mytree.model.getLabel(item);
+							doh.is("Khartoum", label, "selected");
+							doh.is("Khartoum", mytree.focusedChild.label, "and still focused");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "down arrow #3",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Test that down arrow pops up two levels
+						robot.keyPress(keys.DOWN_ARROW, 300);
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Asia", mytree.focusedChild.label, "popped up to great uncle of Khartoum");
+
+							var item = mytree.get("selectedItem"),
+									label = mytree.model.getLabel(item);
+							doh.is("Khartoum", label, "but Khartoum is still selected");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "ENTER to open",
+					timeout: 4000,
+					runTest: toggle(function(){
+						robot.keyPress(keys.ENTER, 300);        // since openOnClick==true, this opens the node
+					}, false)
+				},
+
+				{
+					name: "ENTER to close",
+					timeout: 4000,
+					runTest: toggle(function(){
+						robot.keyPress(keys.ENTER, 300);        // since openOnClick==true, this closes the node
+					}, true)
+				},
+
+				{
+					name: "up arrow",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// up arrow should go to node visually above current node, not necessarily it's
+						// previous sibling
+						robot.keyPress(keys.UP_ARROW, 300);
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("Khartoum", focus.curNode.innerHTML, "not Africa");
+						}), 500);
+
+
+						robot.keyPress(keys.UP_ARROW, 300);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Sudan", focus.curNode.innerHTML, "not Africa");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "end",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.keyPress(keys.END, 300);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Argentina", focus.curNode.innerHTML);
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "home",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.keyPress(keys.HOME, 300);			// go to Continents
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Continents", focus.curNode.innerHTML, "Africa is focused");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "tab out",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.keyPress(keys.TAB, 300);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("mytreeDestroyButton", focus.curNode.id);
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "shift-tab in",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.keyPress(keys.TAB, 300, {shift: true});
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Continents", focus.curNode.innerHTML, "focused on continents");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "shift-tab out",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.keyPress(keys.TAB, 300, {shift: true});
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("mytree_before", focus.curNode.id, "focus went to input before tree");
+							query(".dijitTreeLabel", "mytree").every(function(node, idx){
+								var ti = node.getAttribute("tabindex");
+								doh.is("-1", ti, "-1 tab index on TreeNode" + idx);
+							});
+							doh.is(0, mytree.domNode.getAttribute("tabindex"), "0 tabindex on Tree.domNode itself");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			// TODO: tests on tree with showRoot=false
+
+			// Test for typing "a" to navigate to nodes that start with "a", etc.
+			doh.register("keyboard search tests", [
+				{
+					name: "Setup tree",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var tree = registry.byId("mytree");
+
+						// Close all tree nodes except for Asia and Oceania
+						array.forEach(tree.rootNode.getChildren(), function(child, idx){
+							if(child.label == "Asia" || child.label == "Oceania"){
+								console.log("expanding " + child.label);
+								if(!child.isExpanded){
+									tree._expandNode(child);
+								}
+							}else{
+								console.log("collapsing " + child.label);
+								if(child.isExpanded){
+									tree._collapseNode(child);
+								}
+							}
+						});
+
+						robot.sequence(d.getTestCallback(function(){
+							// Just waiting for animation to finish...
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "Focus on Continents",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var tree = registry.byId("mytree");
+						tree.focusNode(tree.rootNode);
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.t(tree.rootNode.labelNode, "focused on continents");
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "First 'A' key goes to Africa",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// From Continents node, press "A".   Should go to Africa.
+						robot.keyPress("a", 100);
+						robot.sequence(d.getTestCallback(function(){
+							var focusedWidget = registry.getEnclosingWidget(focus.curNode);
+							doh.t(focusedWidget, "there is a focused widget");
+							doh.is("Africa", focusedWidget.label);
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "Second 'A' key goes to Asia",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// From Africa node, press "A" again.   Should go to Asia.
+						robot.keyPress("a", 100);
+						robot.sequence(d.getTestCallback(function(){
+							var focusedWidget = registry.getEnclosingWidget(focus.curNode);
+							doh.t(focusedWidget, "there is a focused widget");
+							doh.is("Asia", focusedWidget.label);
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "Third 'A' key goes to Australia (nested node)",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var oceania = registry.byId("mytree").rootNode.getChildren()[2];
+						doh.t(oceania, "found Oceania node");
+						doh.t(oceania.isExpanded, "Oceania node is expanded");
+
+						robot.keyPress("a", 100);
+						robot.sequence(d.getTestCallback(function(){
+							var focusedWidget = registry.getEnclosingWidget(focus.curNode);
+							doh.t(focusedWidget, "there is a focused widget");
+							doh.is("Australia", focusedWidget.label);
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "Fourth 'A' key loops back to Africa",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						robot.keyPress("a", 100);
+						robot.sequence(d.getTestCallback(function(){
+							var focusedWidget = registry.getEnclosingWidget(focus.curNode);
+							doh.t(focusedWidget, "there is a focused widget");
+							doh.is("Africa", focusedWidget.label);
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "multi-key navigation (co)",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// After the 500ms delay above plus 750 delay here, character should start a new search.
+						// Skip over China and go to Continents.
+						robot.typeKeys("co", 750);
+
+						robot.sequence(d.getTestCallback(function(){
+							var focusedWidget = registry.getEnclosingWidget(focus.curNode);
+							doh.t(focusedWidget, "there is a focused widget");
+							doh.is("Continents", focusedWidget.label);
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "multi-key navigation (as)",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// After the 500ms delay above plus 750 delay here, character should start a new search.
+						// By typing AS should skip over Africa and go to Asia.
+						robot.typeKeys("as", 750);
+
+						robot.sequence(d.getTestCallback(function(){
+							var focusedWidget = registry.getEnclosingWidget(focus.curNode);
+							doh.t(focusedWidget, "there is a focused widget");
+							doh.is("Asia", focusedWidget.label);
+						}), 500);
+
+						return d;
+					}
+				},
+				{
+					name: "multi-key navigation clears",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// After the 500ms delay above plus 750 delay here, character should start a new search
+						robot.typeKeys("n", 750);
+
+						robot.sequence(d.getTestCallback(function(){
+							var focusedWidget = registry.getEnclosingWidget(focus.curNode);
+							doh.t(focusedWidget, "there is a focused widget");
+							doh.is("North America", focusedWidget.label);
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.register("keyboard on auto expand tree", [
+				{
+					name: "end key",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						var node = dom.byId("mytree3_before", robot.doc);
+						winUtils.scrollIntoView(node);
+						node.focus();
+
+						robot.keyPress(keys.TAB, 300);			// go to start of tree
+						robot.keyPress(keys.END, 300);			// go to end
+
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Argentina", robot.window.require("dijit/focus").curNode.innerHTML, "end key went to this node");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.register("destroy and focus", [
+				{
+					name: "setup",
+					timeout: 8000,
+					runTest: function(){
+						return mytree.expandAll();
+					}
+				},
+
+				{
+					name: "destroy previously focused node",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Go to Africa node
+						dom.byId("mytree_before", robot.doc).focus();
+						robot.keyPress(keys.TAB, 300);
+						robot.keyPress(keys.HOME, 300);
+						robot.keyPress(keys.DOWN_ARROW, 300);
+
+						var previouslyFocusedChild;
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("Africa", mytree.focusedChild.label, "focus");
+							previouslyFocusedChild = mytree.focusedChild;
+						}), 500);
+
+
+						// Tab out of Tree, and then destroy previously focused node.
+						robot.keyPress(keys.TAB, 300, {shift: true});
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("mytree_before", focus.curNode.id, "focus");
+
+							var store = mytree.model.store;
+							var item = previouslyFocusedChild.item;
+							store.deleteItem(item);
+						}), 500);
+
+						// Refocus Tree.  Since previously focused node was destroyed, focus should go to Continents.
+						robot.keyPress(keys.TAB, 300);
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Continents", focus.curNode.innerHTML, "focus");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "destroy previously focused node's ancestor",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						dom.byId("mytree_before", robot.doc).focus();
+						robot.keyPress(keys.TAB, 300);
+						robot.keyPress(keys.HOME, 300);
+						robot.keyPress(keys.DOWN_ARROW, 300);		// move down to Asia (since Africa is gone)
+						robot.keyPress(keys.DOWN_ARROW, 300);		// move down to China
+
+						var previouslyFocusedChild;
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("China", mytree.focusedChild.label, "focus");
+							previouslyFocusedChild = mytree.focusedChild;
+						}), 500);
+
+						// Tab out, and then destroy Asia (previously focused node's ancestor)
+						robot.keyPress(keys.TAB, 300, {shift: true});
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("mytree_before", focus.curNode.id, "focus");
+
+							var store = mytree.model.store;
+							var item = previouslyFocusedChild.getParent().item;
+							store.deleteItem(item);
+						}), 500);
+
+						// Refocus Tree.  Since previously focused node's ancestor was destroyed,
+						// focus should go to Continents.
+						robot.keyPress(keys.TAB, 300);
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Continents", focus.curNode.innerHTML, "focus");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "destroy currently focused node",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Go to Oceania node
+						dom.byId("mytree_before", robot.doc).focus();
+						robot.keyPress(keys.TAB, 300);
+						robot.keyPress(keys.HOME, 300);
+						robot.keyPress(keys.DOWN_ARROW, 300);
+
+						// Destroy it
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("Oceania", mytree.focusedChild.label, "focus");
+
+							var store = mytree.model.store;
+							var item = mytree.focusedChild.item;
+							store.deleteItem(item);
+						}), 500);
+
+						// Focus should go to Continents
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Continents", mytree.focusedChild.label, "focus");
+						}), 500);
+
+						return d;
+					}
+				},
+
+				{
+					name: "destroy currently focused node's ancestor",
+					timeout: 4000,
+					runTest: function(){
+						var d = new doh.Deferred();
+
+						// Go to Germany node
+						dom.byId("mytree_before", robot.doc).focus();
+						robot.keyPress(keys.TAB, 300);
+						robot.keyPress(keys.HOME, 300);
+						robot.keyPress(keys.DOWN_ARROW, 300);	// to Europe
+						robot.keyPress(keys.DOWN_ARROW, 300);	// to Germany
+
+						// Destroy Europe (Germany's ancestor)
+						robot.sequence(d.getTestErrback(function(){
+							doh.is("Germany", mytree.focusedChild.label, "focus");
+
+							var store = mytree.model.store;
+							var item = mytree.focusedChild.getParent().item;
+							store.deleteItem(item);
+						}), 500);
+
+						// Focus should go to Continents
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Continents", mytree.focusedChild.label, "focus");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+</html>
+
diff --git a/src/main/resources/static/dijit/tests/tree/robot/Tree_dnd.html b/src/main/resources/static/dijit/tests/tree/robot/Tree_dnd.html
new file mode 100644
index 0000000000000000000000000000000000000000..15c8eb47d1dd3bffeb4a6a86e5d8dd9a5b58cdd8
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/robot/Tree_dnd.html
@@ -0,0 +1,783 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Tree DnD Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dom", "dojo/dom-class", "dojo/dom-geometry", "dojo/keys",
+				"dojo/query", "dojo/sniff", "dojo/window",
+				"dijit/tests/helpers", "dijit/tests/tree/robot/Tree_dnd", "dojo/domReady!"
+			], function(doh, robot, dom, domClass, domGeom, keys, query, has, winUtils, helpers, dndHelpers){
+
+				robot.initRobot('../test_Tree_DnD.html');
+
+				dndHelpers.setup();
+
+				// Dragging from an external source and dropping onto the Tree,
+				// creating a duplicate of the dragged item
+				doh.register("drop into", [
+					{
+						name: "drag 'Apple' over 'Fruits'",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								fruitsTreeNode = dndHelpers.findTreeNode("itemTree", "Fruits");
+							doh.f(fruitsTreeNode.isExpanded, "fruitsTreeNode is initially closed");
+							doh.t(fruitsTreeNode.isExpandable, "but has (or may have) children");
+
+							// Check state of store too
+							var children = dndHelpers.getNamesOfChildrenOfItem("Fruits");
+							doh.is(1, children.categories.length, "one category child");
+							doh.is("Citrus", children.categories[0]);
+							doh.is(0, children.items.length, "no item children yet");
+
+							// (Try to) make sure drag source and drop source are both in viewport
+							winUtils.scrollIntoView(fruitsTreeNode.domNode);
+
+							// Drag "Apple" onto Fruits.
+							robot.mouseMoveAt("1001", 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(fruitsTreeNode.labelNode, 500, 2000);
+
+							robot.sequence(d.getTestCallback(function(){
+								// TODO: check drag avatar shows drop is valid (ie, avatar is green)
+								doh.t(domClass.contains(fruitsTreeNode.rowNode, "dijitTreeRowHover"), "tree node has hover class");
+								doh.t(domClass.contains(fruitsTreeNode.rowNode, "dojoDndItemOver"), "tree node has DND drop class");
+							}), 500);
+
+							return d;
+						}
+					},
+					{
+						name: "drop 'Apple' on to 'Fruits'",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that new item was created and added to the store.
+								var children = dndHelpers.getNamesOfChildrenOfItem("Fruits");
+								doh.is(1, children.categories.length, "one category child");
+								doh.is("Citrus", children.categories[0]);
+								doh.is(1, children.items.length, "one item child");
+								doh.is("Apple", children.items[0]);
+
+								// Check that data store update was reflected in the tree
+								var fruitsTreeNode = dndHelpers.findTreeNode("itemTree", "Fruits");
+
+								doh.t(fruitsTreeNode.isExpanded, "drop caused the node to expand");
+								var treeNodeChildren = fruitsTreeNode.getChildren();
+								doh.is(2, treeNodeChildren.length, "2 TreeNode children");
+								doh.is("Apple", helpers.innerText(treeNodeChildren[0].labelNode));
+								doh.is("Citrus", helpers.innerText(treeNodeChildren[1].labelNode));
+							}), 1000);	// 1000ms to wait for 'Fruits' node to expand and show 'Apple' node
+
+							return d;
+						}
+					}
+				]);
+
+				// Moving an item w/in the tree
+				doh.register("re-parent an item", [
+					{
+						name: "drag 'Apple' from 'Fruits' to 'Citrus'",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								fruitsTreeNode = dndHelpers.findTreeNode("itemTree", "Fruits"),
+								appleTreeNode = dndHelpers.findTreeNode("itemTree", "Apple"),
+								citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus");
+							winUtils.scrollIntoView("itemTree");
+							// Drag "Apple" into "Citrus".
+							robot.mouseMoveAt(appleTreeNode.labelNode, 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(citrusTreeNode.labelNode, 500, 1000);
+							robot.mouseMoveAt(citrusTreeNode.labelNode, 500, 1000);// If prev. mouseMove caused scroll, readjust
+
+							robot.sequence(d.getTestErrback(function(){
+								// Avatar should be green indicating a drop is OK
+								var avatars = query(".dojoDndAvatar");
+								doh.is(1, avatars.length, "found avatar");
+								var canDrop = query(".dojoDndAvatarCanDrop");
+								doh.is(1, canDrop.length, "able to drop")
+							}), 2000);
+
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								var myStore = robot.window.myStore;
+
+								// Check that data store item was orphaned from Fruits
+								var fruitsItemChildren = dndHelpers.getNamesOfChildrenOfItem("Fruits");
+								doh.is(0, fruitsItemChildren.items.length, "no item children");
+
+								// Check that data store update was reflected in the tree
+								var fruitsTreeNode = dndHelpers.findTreeNode("itemTree", "Fruits");
+
+								var fruitsTreeNodeChildren = fruitsTreeNode.getChildren();
+								doh.is(1, fruitsTreeNodeChildren.length, "1 TreeNode children");
+								doh.is("Citrus", helpers.innerText(fruitsTreeNodeChildren[0].labelNode));
+
+								// ... and parented to Citrus item
+								var citrusItemChildren = dndHelpers.getNamesOfChildrenOfItem("Citrus");
+								doh.is(2, citrusItemChildren.items.length, "two item children");
+								doh.is("Orange", citrusItemChildren.items[0]);
+								doh.is("Apple", citrusItemChildren.items[1]);
+
+								// Check that data store update was reflected in the tree
+								var citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus");
+
+								var citrusTreeNodeChildren = citrusTreeNode.getChildren();
+								doh.is(2, citrusTreeNodeChildren.length, "2 TreeNode children for Citrus");
+								doh.is("Orange", helpers.innerText(citrusTreeNodeChildren[0].labelNode), "child of Citrus TreeNode");
+								doh.is("Apple", helpers.innerText(citrusTreeNodeChildren[1].labelNode), "child of Citrus TreeNode");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					{
+						name: "drag 'Apple' over 'Orange'",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								appleTreeNode = dndHelpers.findTreeNode("itemTree", "Apple"),
+								orangeTreeNode = dndHelpers.findTreeNode("itemTree", "Orange");
+
+							robot.mouseMoveAt(appleTreeNode.labelNode, 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(orangeTreeNode.labelNode, 500, 1000);
+
+							robot.sequence(d.getTestErrback(function(){
+								// Avatar should be red, since 'Orange' is not a container node.
+								var avatars = query(".dojoDndAvatar");
+								doh.is(1, avatars.length, "found avatar");
+								var canDrop = query(".dojoDndAvatarCanDrop");
+								doh.is(0, canDrop.length, "shouldn't be able to drop")
+							}), 2000);
+
+							robot.mouseRelease({left: true}, 500);
+							robot.sequence(d.getTestCallback(function() {
+							}));
+
+							return d;
+						}
+					},
+
+					{
+						name: "drag 'Cereals' to be after 'Fruits' (reordering)",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								fruitsTreeNode = dndHelpers.findTreeNode("collectionsTree", "Fruits (2)"),
+								cerealsTreeNode = dndHelpers.findTreeNode("collectionsTree", "Cereals (0)"),
+								fruitsTreeNodeSize = domGeom.getContentBox(fruitsTreeNode.domNode);
+
+							// (Try to) make sure drag source and drop source are both in viewport
+							winUtils.scrollIntoView(cerealsTreeNode.domNode);
+
+							// Drag 'Cereals' and drop near bottom edge of 'Fruits'.
+							// It should become Fruits next-sibling aka Vegetables' prior-sibling
+							// Note: if mousemove duration is too small itemTree doesn't get onmouseout event on IE6/7,
+							// causing subsequent JS exceptions
+							robot.mouseMoveAt(cerealsTreeNode.domNode, 500, 100);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(fruitsTreeNode.domNode, 500, 1000, 50, fruitsTreeNodeSize.h - 2);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								var myStore = robot.window.myStore;
+
+								// Check that order of children was changed
+								var foodsItemChildren = dndHelpers.getNamesOfChildrenOfItem("Foods").categories;
+								doh.is(3, foodsItemChildren.length, "3 categories");
+								doh.is("Fruits", foodsItemChildren[0]);
+								doh.is("Cereals", foodsItemChildren[1]);
+								doh.is("Vegetables", foodsItemChildren[2]);
+
+								// Check that data store update was reflected in the tree
+								var
+									foodsTreeNode = dndHelpers.findTreeNode("collectionsTree", "Foods (1)"),
+									foodsTreeNodeChildren = foodsTreeNode.getChildren();
+								doh.is(3, foodsTreeNodeChildren.length, "3 TreeNode children");
+								doh.is("Fruits (2)", helpers.innerText(foodsTreeNodeChildren[0].labelNode));
+								doh.is("Cereals (0)", helpers.innerText(foodsTreeNodeChildren[1].labelNode));
+								doh.is("Vegetables (0)", helpers.innerText(foodsTreeNodeChildren[2].labelNode));
+
+								// Check that Fruits tree node wasn't expanded just because we dropped after it
+								doh.f(fruitsTreeNode.isExpanded, "fruit tree node not expanded");
+							}), 2000);
+
+							return d;
+						}
+					},
+
+					// We need to expand the Fruits TreeNode for the benefit of the next test,
+					// and we do it as a separate test so that citrusTreeNode will exist etc.
+					// by the time the next test starts.
+					{
+						name: "expand 'Fruits' TreeNode",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								fruitsTreeNode = dndHelpers.findTreeNode("collectionsTree", "Fruits (2)");
+							robot.mouseMoveAt(fruitsTreeNode.expandoNode, 0, 1);
+							robot.mouseClick({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// This is just here to wait for the expand operation to take place,
+								// and then notify DOH that we are finished
+							}), 1000);
+							return d;
+						}
+					},
+
+					{
+						name: "drag 'Vegetables' to be after 'Citrus' (reordering)",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								vegetablesTreeNode = dndHelpers.findTreeNode("collectionsTree", "Vegetables (0)"),
+								citrusTreeNode = dndHelpers.findTreeNode("collectionsTree", "Citrus (1)"),
+								citrusTreeNodeSize = domGeom.getContentBox(citrusTreeNode.domNode);
+
+							// (Try to) make sure drag source and drop source are both in viewport
+							winUtils.scrollIntoView(vegetablesTreeNode.domNode);
+
+							// Drag 'Vegetables' and drop near bottom edge of 'Citrus'.
+							// It should become Citrus' next-sibling
+							robot.mouseMoveAt(vegetablesTreeNode.domNode, 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(citrusTreeNode.domNode, 1000, 2000, 50, citrusTreeNodeSize.h - 2);
+							robot.mouseRelease({left: true}, 500);
+							robot.mouseRelease({left: true}, 500);	// workaround interimittent robot bug
+
+							robot.sequence(d.getTestCallback(function(){
+								var myStore = robot.window.myStore;
+
+								// Check that order of children in data store was changed
+								var foodsItemChildren = dndHelpers.getNamesOfChildrenOfItem("Foods").categories;
+								doh.is(2, foodsItemChildren.length, "2 categories under foods");
+								doh.is("Fruits", foodsItemChildren[0]);
+								doh.is("Cereals", foodsItemChildren[1]);
+
+								var fruitsItemChildren = dndHelpers.getNamesOfChildrenOfItem("Fruits").categories;
+								doh.is(2, fruitsItemChildren.length, "2 categories under fruits");
+								doh.is("Citrus", fruitsItemChildren[0]);
+								doh.is("Vegetables", fruitsItemChildren[1]);
+
+								// Check that data store update was reflected in the tree
+								var
+									foodsTreeNode = dndHelpers.findTreeNode("collectionsTree", "Foods (1)"),
+									foodsTreeNodeChildren = foodsTreeNode.getChildren();
+								doh.is(2, foodsTreeNodeChildren.length, "2 TreeNode children for foods");
+								doh.is("Fruits (2)", helpers.innerText(foodsTreeNodeChildren[0].labelNode));
+								doh.is("Cereals (0)", helpers.innerText(foodsTreeNodeChildren[1].labelNode));
+
+								var fruitsTreeNode = dndHelpers.findTreeNode("collectionsTree", "Fruits (2)"),
+								fruitsTreeNodeChildren = fruitsTreeNode.getChildren();
+								doh.is(2, fruitsTreeNodeChildren.length, "2 TreeNode children for fruits");
+								doh.is("Citrus (1)", helpers.innerText(fruitsTreeNodeChildren[0].labelNode));
+								doh.is("Vegetables (0)", helpers.innerText(fruitsTreeNodeChildren[1].labelNode));
+							}), 500);
+
+							return d;
+						}
+					},
+
+					{
+						name: "drag 'Citrus' over parent, itself",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus"),
+								fruitsTreeNode = dndHelpers.findTreeNode("itemTree", "Fruits");
+
+							robot.mouseMoveAt(citrusTreeNode.labelNode, 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(fruitsTreeNode.labelNode, 500, 1000);
+
+							robot.sequence(d.getTestErrback(function(){
+								// Avatar should be red, since dropping an item onto its own parent is meaningless
+								var avatars = query(".dojoDndAvatar");
+								doh.is(1, avatars.length, "found avatar");
+								var canDrop = query(".dojoDndAvatarCanDrop");
+								doh.is(0, canDrop.length, "shouldn't be able to drop")
+							}), 2000);
+
+							robot.mouseMoveAt(citrusTreeNode.labelNode, 500, 1);
+
+							robot.sequence(d.getTestErrback(function(){
+								// Avatar should be red, since dropping an item onto itself is meaningless
+								var avatars = query(".dojoDndAvatar");
+								doh.is(1, avatars.length, "found avatar");
+								var canDrop = query(".dojoDndAvatarCanDrop");
+								doh.is(0, canDrop.length, "shouldn't be able to drop")
+							}), 2000);
+
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("drag between trees", [
+					{
+						name: "move 'Vegetables' from left tree to right tree, from 'Fruits' to 'Foods'",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								vegetablesTreeNode = dndHelpers.findTreeNode("collectionsTree", "Vegetables (0)"),
+								foodsTreeNode = registry.byId("itemTree").rootNode;
+
+							robot.mouseMoveAt(vegetablesTreeNode.labelNode, 0, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(foodsTreeNode.labelNode, 500, 1000);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								var myStore = robot.window.myStore;
+
+								// Check that data store item was orphaned from Fruits
+								var fruitsItemChildren = dndHelpers.getNamesOfChildrenOfItem("Fruits");
+								doh.is(1, fruitsItemChildren.categories.length, "one fruits child");
+								doh.is("Citrus", fruitsItemChildren.categories[0], "fruit child 0");
+
+								// And added to Foods
+								var foodsItemChildren = dndHelpers.getNamesOfChildrenOfItem("Foods");
+								doh.is(3, foodsItemChildren.categories.length, "three foods children");
+								doh.is("Fruits", foodsItemChildren.categories[0], "food child 0");
+								doh.is("Cereals", foodsItemChildren.categories[1], "food child 1");
+								doh.is("Vegetables", foodsItemChildren.categories[2], "food child 2");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("drop in Tree outside of a treeNode", [
+					{
+						name: "drop 'Orange' within Tree but not over a TreeNode",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							var orangeTreeNode = dndHelpers.findTreeNode("itemTree", "Orange");
+
+							robot.mouseMoveAt(orangeTreeNode.labelNode, 0, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("itemTree", 500, 500, 5, 100);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								var org = dndHelpers.findTreeNode("itemTree", "Orange");
+								doh.t( org != null);
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+
+				// special function to allow dragging within a very short test window
+				function dragSourceToItemTree(srcId, destId, after){
+					var
+						child = dom.byId(srcId, robot.doc),
+						parent = child.parentNode,
+						childPos = domGeom.position(child),
+						parentPos = domGeom.position(parent),
+						destTreeNode = dndHelpers.findTreeNode("itemTree", destId);
+					winUtils.scrollIntoView(parent);
+					parent.scrollTop += childPos.y + childPos.h - parentPos.y - parentPos.h;
+					robot.mouseMoveAt(srcId, 500, 1);
+					robot.mousePress({left: true}, 500);
+					robot.mouseMoveAt(srcId, 1000, 500, (childPos.w >> 1) + 2, childPos.h >> 1); // start drag before scrolling to dest
+					robot.sequence(function(){
+						winUtils.scrollIntoView("itemTree");
+					}, 0);
+					robot.mouseMoveAt(destTreeNode.labelNode, 500, 1); // move to dest center
+					robot.mouseMoveAt(destTreeNode.labelNode, 500, 500, 0,
+						after
+							? (domGeom.position(destTreeNode.domNode).h - domGeom.position(destTreeNode.labelNode).y + domGeom.position(destTreeNode.domNode).y - 1)
+							: -2
+					);
+					robot.mouseRelease({left: true}, 500);
+				}
+
+				//=================
+				// Testing drag before and after items
+				// Dragging from an external source and dropping onto the Tree, creating a duplicate of the dragged item
+				//-----------------
+				doh.register("drag before and after items", [
+					{
+						name: "drag before the first item",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Drag "Banana" before Orange.
+							dragSourceToItemTree("1003", "Orange", !"after");
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that data store update was reflected in the tree
+								var citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus");
+								var treeNodeChildren = citrusTreeNode.getChildren();
+								doh.is(3, treeNodeChildren.length, "3 TreeNode children");
+								doh.is("Banana", helpers.innerText(treeNodeChildren[0].labelNode));
+								doh.is("Orange", helpers.innerText(treeNodeChildren[1].labelNode));
+								doh.is("Apple",  helpers.innerText(treeNodeChildren[2].labelNode));
+
+								// ... and parented to Citrus item
+								var citrusItemChildren = dndHelpers.getNamesOfChildrenOfItem("Citrus");
+								doh.is(3, citrusItemChildren.items.length, "three item children");
+								doh.is("Banana", citrusItemChildren.items[0]);
+								doh.is("Orange", citrusItemChildren.items[1]);
+								doh.is("Apple",  citrusItemChildren.items[2]);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "drag after the first item",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Drag "Tomato" after Banana.
+							dragSourceToItemTree("1004", "Banana", "after");
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that data store update was reflected in the tree
+								var citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus");
+								var treeNodeChildren = citrusTreeNode.getChildren();
+								doh.is(4, treeNodeChildren.length, "4 TreeNode children");
+								doh.is("Banana", helpers.innerText(treeNodeChildren[0].labelNode));
+								doh.is("Tomato", helpers.innerText(treeNodeChildren[1].labelNode));
+								doh.is("Orange", helpers.innerText(treeNodeChildren[2].labelNode));
+								doh.is("Apple",  helpers.innerText(treeNodeChildren[3].labelNode));
+
+								// ... and parented to Citrus item
+								var citrusItemChildren = dndHelpers.getNamesOfChildrenOfItem("Citrus");
+								doh.is(4, citrusItemChildren.items.length, "four item children");
+								doh.is("Banana", citrusItemChildren.items[0]);
+								doh.is("Tomato", citrusItemChildren.items[1]);
+								doh.is("Orange", citrusItemChildren.items[2]);
+								doh.is("Apple",  citrusItemChildren.items[3]);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "drag before in the middle of the list of items",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Drag "Pepper" before Orange.
+							dragSourceToItemTree("1005", "Orange", !"after");
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that data store update was reflected in the tree
+								var citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus");
+								var treeNodeChildren = citrusTreeNode.getChildren();
+								doh.is(5, treeNodeChildren.length, "5 TreeNode children");
+								doh.is("Banana", helpers.innerText(treeNodeChildren[0].labelNode));
+								doh.is("Tomato", helpers.innerText(treeNodeChildren[1].labelNode));
+								doh.is("Pepper", helpers.innerText(treeNodeChildren[2].labelNode));
+								doh.is("Orange", helpers.innerText(treeNodeChildren[3].labelNode));
+								doh.is("Apple",  helpers.innerText(treeNodeChildren[4].labelNode));
+
+								// ... and parented to Citrus item
+								var citrusItemChildren = dndHelpers.getNamesOfChildrenOfItem("Citrus");
+								doh.is(5, citrusItemChildren.items.length, "five item children");
+								doh.is("Banana", citrusItemChildren.items[0]);
+								doh.is("Tomato", citrusItemChildren.items[1]);
+								doh.is("Pepper", citrusItemChildren.items[2]);
+								doh.is("Orange", citrusItemChildren.items[3]);
+								doh.is("Apple",  citrusItemChildren.items[4]);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "drag after in the middle of the list of items",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Drag "Wheat" after Orange.
+							dragSourceToItemTree("1006", "Orange", "after");
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that data store update was reflected in the tree
+								var citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus");
+								var treeNodeChildren = citrusTreeNode.getChildren();
+								doh.is(6, treeNodeChildren.length, "6 TreeNode children");
+								doh.is("Banana", helpers.innerText(treeNodeChildren[0].labelNode));
+								doh.is("Tomato", helpers.innerText(treeNodeChildren[1].labelNode));
+								doh.is("Pepper", helpers.innerText(treeNodeChildren[2].labelNode));
+								doh.is("Orange", helpers.innerText(treeNodeChildren[3].labelNode));
+								doh.is("Wheat",  helpers.innerText(treeNodeChildren[4].labelNode));
+								doh.is("Apple",  helpers.innerText(treeNodeChildren[5].labelNode));
+
+								// ... and parented to Citrus item
+								var citrusItemChildren = dndHelpers.getNamesOfChildrenOfItem("Citrus");
+								doh.is(6, citrusItemChildren.items.length, "six item children");
+								doh.is("Banana", citrusItemChildren.items[0]);
+								doh.is("Tomato", citrusItemChildren.items[1]);
+								doh.is("Pepper", citrusItemChildren.items[2]);
+								doh.is("Orange", citrusItemChildren.items[3]);
+								doh.is("Wheat",  citrusItemChildren.items[4]);
+								doh.is("Apple",  citrusItemChildren.items[5]);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "drag before on the last item",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Drag "Corn" before Apple.
+							dragSourceToItemTree("1007", "Apple", !"after");
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that data store update was reflected in the tree
+								var citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus");
+								var treeNodeChildren = citrusTreeNode.getChildren();
+								doh.is(7, treeNodeChildren.length, "7 TreeNode children");
+								doh.is("Banana", helpers.innerText(treeNodeChildren[0].labelNode));
+								doh.is("Tomato", helpers.innerText(treeNodeChildren[1].labelNode));
+								doh.is("Pepper", helpers.innerText(treeNodeChildren[2].labelNode));
+								doh.is("Orange", helpers.innerText(treeNodeChildren[3].labelNode));
+								doh.is("Wheat",  helpers.innerText(treeNodeChildren[4].labelNode));
+								doh.is("Corn",   helpers.innerText(treeNodeChildren[5].labelNode));
+								doh.is("Apple",  helpers.innerText(treeNodeChildren[6].labelNode));
+
+								// ... and parented to Citrus item
+								var citrusItemChildren = dndHelpers.getNamesOfChildrenOfItem("Citrus");
+								doh.is(7, citrusItemChildren.items.length, "seven item children");
+								doh.is("Banana", citrusItemChildren.items[0]);
+								doh.is("Tomato", citrusItemChildren.items[1]);
+								doh.is("Pepper", citrusItemChildren.items[2]);
+								doh.is("Orange", citrusItemChildren.items[3]);
+								doh.is("Wheat",  citrusItemChildren.items[4]);
+								doh.is("Corn",   citrusItemChildren.items[5]);
+								doh.is("Apple",  citrusItemChildren.items[6]);
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "drag after on the last item",
+						timeout: 10000,
+						runTest: function(){
+							var d = new doh.Deferred();
+
+							// Drag "Spinach" after Apple.
+							dragSourceToItemTree("1008", "Apple", "after");
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that data store update was reflected in the tree
+								var citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus");
+								var treeNodeChildren = citrusTreeNode.getChildren();
+								doh.is(8, treeNodeChildren.length, "8 TreeNode children");
+								doh.is("Banana", helpers.innerText(treeNodeChildren[0].labelNode));
+								doh.is("Tomato", helpers.innerText(treeNodeChildren[1].labelNode));
+								doh.is("Pepper", helpers.innerText(treeNodeChildren[2].labelNode));
+								doh.is("Orange", helpers.innerText(treeNodeChildren[3].labelNode));
+								doh.is("Wheat",  helpers.innerText(treeNodeChildren[4].labelNode));
+								doh.is("Corn",   helpers.innerText(treeNodeChildren[5].labelNode));
+								doh.is("Apple",  helpers.innerText(treeNodeChildren[6].labelNode));
+								doh.is("Spinach",helpers.innerText(treeNodeChildren[7].labelNode));
+
+								// ... and parented to Citrus item
+								var citrusItemChildren = dndHelpers.getNamesOfChildrenOfItem("Citrus");
+								doh.is(8, citrusItemChildren.items.length, "eight item children");
+								doh.is("Banana", citrusItemChildren.items[0]);
+								doh.is("Tomato", citrusItemChildren.items[1]);
+								doh.is("Pepper", citrusItemChildren.items[2]);
+								doh.is("Orange", citrusItemChildren.items[3]);
+								doh.is("Wheat",  citrusItemChildren.items[4]);
+								doh.is("Corn",   citrusItemChildren.items[5]);
+								doh.is("Apple",  citrusItemChildren.items[6]);
+								doh.is("Spinach",citrusItemChildren.items[7]);
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("multi-dnd", [
+					{
+						name: "click on a new node and drag should select it",
+						timeout: 15000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								fruitsTreeNode = dndHelpers.findTreeNode("itemTree", "Fruits"),
+								cerealsTreeNode = dndHelpers.findTreeNode("itemTree", "Cereals"),
+								tree = registry.byId("itemTree");
+
+							// click fruit item
+							robot.mouseMoveAt(fruitsTreeNode.rowNode, 0, 1);
+							robot.mouseClick({left: true}, 500);
+
+							// drag cereal node to fruits node
+							robot.mouseMoveAt(cerealsTreeNode.rowNode, 0, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(fruitsTreeNode.rowNode, 500, 1000);
+							robot.mouseRelease({left: true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								doh.t(fruitsTreeNode == cerealsTreeNode.getParent());
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "drag parent and child to another child should do nothing",
+						timeout: 15000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus"),
+								citrusParent = citrusTreeNode.getParent(),
+								orangeTreeNode = dndHelpers.findTreeNode("itemTree", "Orange"),
+								appleTreeNode = dndHelpers.findTreeNode("itemTree", "Apple"),
+								tree = registry.byId("itemTree");
+
+							doh.is(citrusTreeNode, orangeTreeNode.getParent(), 'orange is child of citrus');
+
+							// click Citrus item
+							robot.mouseMoveAt(citrusTreeNode.rowNode, 0, 1);
+							robot.mouseClick({left: true}, 500);
+
+							// ctrl-click Orange item
+							robot.mouseMoveAt(orangeTreeNode.rowNode, 0, 1);
+							robot.keyDown(has("mac") ? keys.META : keys.CTRL, 500);
+							robot.mouseClick({left: true}, 500);
+							robot.keyUp(has("mac") ? keys.META : keys.CTRL, 500);
+
+							// drag to Apple Foods
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(appleTreeNode.rowNode, 500, 500);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(citrusParent, citrusTreeNode.getParent(), 'citrus parent should not change');
+								doh.is(citrusTreeNode, orangeTreeNode.getParent(), 'orange should still be under citrus');
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "drag parent and child should only reparent parent",
+						timeout: 15000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								citrusTreeNode = dndHelpers.findTreeNode("itemTree", "Citrus"),
+								orangeTreeNode = dndHelpers.findTreeNode("itemTree", "Orange"),
+								cerealsTreeNode = dndHelpers.findTreeNode("itemTree", "Cereals"),
+								tree = registry.byId("itemTree");
+
+							doh.is(citrusTreeNode, orangeTreeNode.getParent(), 'orange is child of citrus');
+
+							// click Citrus category
+							robot.mouseMoveAt(citrusTreeNode.rowNode, 0, 1);
+							robot.mouseClick({left: true}, 500);
+
+							// ctrl-click Orange item
+							robot.mouseMoveAt(orangeTreeNode.rowNode, 0, 1);
+							robot.keyDown(has("mac") ? keys.META : keys.CTRL, 500);
+							robot.mouseClick({left: true}, 500);
+							robot.keyUp(has("mac") ? keys.META : keys.CTRL, 500);
+
+							// drag to Cereals category
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(cerealsTreeNode.rowNode, 500, 500);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(cerealsTreeNode, citrusTreeNode.getParent(), 'citrus should be under cereals');
+								doh.is(citrusTreeNode, orangeTreeNode.getParent(), 'orange should still be under citrus');
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "drag multiple items",
+						timeout: 15000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								vegetablesTreeNode = dndHelpers.findTreeNode("itemTree", "Vegetables"),
+								cerealsTreeNode = dndHelpers.findTreeNode("itemTree", "Cereals"),
+								foodsTreeNode = dndHelpers.findTreeNode("itemTree", "Foods"),
+								tree = registry.byId("itemTree");
+
+							// click Vegetables item
+							robot.mouseMoveAt(vegetablesTreeNode.rowNode, 0, 1);
+							robot.mouseClick({left: true}, 500);
+
+							// ctrl-click cereals item
+							robot.mouseMoveAt(cerealsTreeNode.rowNode, 0, 1);
+							robot.keyDown(has("mac") ? keys.META : keys.CTRL, 500);
+							robot.mouseClick({left: true}, 500);
+							robot.keyUp(has("mac") ? keys.META : keys.CTRL, 500);
+
+							// Drop onto root item Foods.
+							// Note that Vegetables is already a child of Foods.
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(foodsTreeNode.rowNode, 500, 500);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(foodsTreeNode, vegetablesTreeNode.getParent());
+								doh.is(foodsTreeNode, cerealsTreeNode.getParent());
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/robot/Tree_dnd.js b/src/main/resources/static/dijit/tests/tree/robot/Tree_dnd.js
new file mode 100644
index 0000000000000000000000000000000000000000..a238beddfffac041634866bcbf4a61c09123d7e9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/robot/Tree_dnd.js
@@ -0,0 +1,130 @@
+/*
+ * Helper functions for Tree_dnd.html and Tree_dnd_multiParent.html tests
+ */
+
+define([
+	"doh/runner", "dojo/robotx",
+	"dojo/_base/array", "dojo/dnd/autoscroll", "dojo/dom", "dojo/dom-geometry", "dojo/query", "dojo/_base/window",
+	"dijit/tests/helpers"
+], function(doh, robot, array, autoscroll, dom, domGeom, query, win, helpers){
+
+	var exports = {
+		setup: function setup(){
+			doh.register("setup screen", function(){
+				// Hide boilerplate text so it's easier to drag on small screen
+				query("h1,h2,p", robot.doc).style("display", "none");
+
+				// Disable auto-scrolling because otherwise the viewport scrolls as robot.mouseMoveAt()
+				// moves the mouse, literally making the the drop target a moving target
+				// (and mouseMoveAt() doesn't take this possibility into account).
+				autoscroll.autoScrollNodes = function(){};
+
+				// Scroll viewport to (try to) make sure that both tree and drag-source
+				// are simultaneously in view.
+				var scroll = domGeom.position(dom.byId("1001", robot.doc)).y;
+				win.body(robot.doc).parentNode.scrollTop = scroll;	// works on FF
+				win.body(robot.doc).scrollTop = scroll;	// works on safari
+			});
+
+			// Wait for trees to load
+			doh.register("wait for load",  {
+					name: "wait for load",
+					timeout: 10000,
+					runTest: helpers.waitForLoad
+			});
+			doh.register("setup vars", function(){
+				registry = robot.window.require("dijit/registry");
+			});
+		},
+
+		findTreeNode: function findTreeNode(/*String*/ treeId, /*String*/ label){
+			// summary:
+			//		Find the TreeNode with the specified label in the given tree.
+			//		Assumes that there's only one TreeNode w/that label (i.e. it
+			//		breaks if certain items have multiple parents and appear in the
+			//		tree multiple times)
+			var nodes = query(".dijitTreeLabel", dom.byId(treeId, robot.doc));
+			for(var i=0; i<nodes.length; i++){
+				if(helpers.innerText(nodes[i]) == label){
+					return registry.getEnclosingWidget(nodes[i]);	// TreeNode
+				}
+			}
+			return null;
+		},
+
+		findTreeNodeByPath: function findTreeNodeByPath(/*String*/ treeId, /*String[] */ path){
+			// summary:
+			//		Find the TreeNode with the specified path (like ["Fruits", "Apple"] in a tree like:
+			//	|	* Foods
+			//	|		* Vegetables
+			//	|		* Fruits
+			//	|			* Orange
+			//	|			* Apple
+			//		Path shouldn't include the root node.
+
+			var tree = registry.byId(treeId);
+			for(var i=0, node=tree.rootNode; i<path.length; i++){
+				var pathElem = path[i], matchingChildNode;
+				for(var j=0, children=node.getChildren(); j < children.length; j++){
+					if(children[j].label == pathElem){
+						matchingChildNode = children[j];
+						break;
+					}
+				}
+				if(!matchingChildNode){
+					return null;
+				}
+				node = matchingChildNode;
+			}
+			return node;
+		},
+
+		getChildrenOfItem: function getChildrenOfItem(/*String*/ name){
+			// summary:
+			//		Return the children of the data store item w/the specified name
+			//		Note that test_Tree_Dnd.html splits the children up into the "children"
+			//		and "items" attributes.
+
+			// Get the parent item
+			// Note that the ItemFileWriteStore's callback will happen immediately.
+			var myStore = robot.window.myStore,
+				parentItem;
+			myStore.fetch({
+				query: {name: name},
+				onItem: function(item){ parentItem = item; }
+			});
+
+			// Get the children, which are stored in two separate attributes,
+			// categories (like 'Fruits') and items (ie, leaf nodes)  (like 'Apple')
+			return {
+				categories: myStore.getValues(parentItem, 'children'),
+				items: myStore.getValues(parentItem, 'items')
+			};
+		},
+
+		mapItemsToNames: function mapItemsToNames(ary){
+			// summary:
+			//		Convert an array of items into an array of names
+			var myStore = robot.window.myStore;
+			return array.map(ary, function(item){
+				return myStore.getValue(item, "name");
+			});
+		},
+
+		getNamesOfChildrenOfItem: function getNamesOfChildrenOfItem(/*String*/ name){
+			// summary:
+			//		Return the names of the (items that are) children of the item w/the specified name
+
+			// Get the parent item (according to
+			var obj = exports.getChildrenOfItem(name);
+			return {
+				categories: exports.mapItemsToNames(obj.categories),
+				items: exports.mapItemsToNames(obj.items)
+			};
+		}
+	};
+
+	return exports;
+});
+
+
diff --git a/src/main/resources/static/dijit/tests/tree/robot/Tree_dnd_multiParent.html b/src/main/resources/static/dijit/tests/tree/robot/Tree_dnd_multiParent.html
new file mode 100644
index 0000000000000000000000000000000000000000..d0979e579a82e57b2743fe85bc67247fd12c3b5a
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/robot/Tree_dnd_multiParent.html
@@ -0,0 +1,316 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Tree DnD Multi-parent Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/dnd/common", "dojo/dom", "dojo/dom-class", "dojo/keys", "dojo/query", "dojo/sniff",
+				"dijit/tests/helpers", "dijit/tests/tree/robot/Tree_dnd", "dojo/domReady!"
+			], function(doh, robot, dndCommon, dom, domClass, keys, query, has, helpers, dndHelpers){
+
+				robot.initRobot('../test_Tree_DnD.html');
+
+				dndHelpers.setup();
+
+				doh.register("multi-parent tests", [
+					{
+						name: "add 'Fruits' as parent of vegetables",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								vegetablesTreeNode = dndHelpers.findTreeNodeByPath("collectionsTree", ["Vegetables (0)"]),	// the left tree
+								fruitsTreeNode = dndHelpers.findTreeNodeByPath("itemTree", ["Fruits"]);	// right tree
+
+							robot.mouseMoveAt("collectionsTree", 500, 1); // scroll source parent into view
+							robot.mouseMoveAt(vegetablesTreeNode.domNode, 500, 1);
+							// Drag and Drop, *copying* in order to add a parent rather than change
+							robot.keyDown(keys.copyKey, 500);
+							if(has("mac")){
+								// I can't get DOH robot to generate the mousePress event w/metaKey=true so
+								// hack it
+								robot.sequence(function(){
+									realIsCopyKey = dndCommon.getCopyKeyState;
+									dndCommon.getCopyKeyState = function(){ return true; }
+								});
+							}
+
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt("itemTree", 500, 500); // move to dest parent to scroll it into view
+							robot.mouseMoveAt(fruitsTreeNode.labelNode, 0, 500);
+							robot.mouseRelease({left: true}, 500);
+							robot.keyUp(keys.copyKey, 500);
+							if(has("mac")){
+								// See if(has("mac")) above
+								robot.sequence(function(){
+									dndCommon.getCopyKeyState = realIsCopyKey;
+								});
+							}
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that Vegetables remains a child of Foods
+								var children = dndHelpers.getNamesOfChildrenOfItem("Foods");
+								doh.is(3, children.categories.length, "foods category child");
+								doh.is("Fruits", children.categories[0]);
+								doh.is("Vegetables", children.categories[1]);
+								doh.is("Cereals", children.categories[2]);
+
+								// Check that Vegetables added as child of Fruits
+								var children2 = dndHelpers.getNamesOfChildrenOfItem("Fruits");
+								doh.is(2, children2.categories.length, "foods category child");
+								doh.is("Citrus", children2.categories[0]);
+								doh.is("Vegetables", children2.categories[1]);
+
+								// Check that new item *wasn't* created
+								var items;
+								robot.window.myStore.fetch({
+									onComplete: function(i){ items = i; }
+								});
+								doh.is(6, items.length, "# of items in store");
+
+								// Check that data store update was reflected in the tree
+								doh.t(fruitsTreeNode.isExpanded, "drop caused the node to expand");
+								var treeNodeChildren = fruitsTreeNode.getChildren();
+								doh.is(2, treeNodeChildren.length, "2 TreeNode children");
+								doh.is("Citrus", helpers.innerText(treeNodeChildren[0].labelNode));
+								doh.is("Vegetables", helpers.innerText(treeNodeChildren[1].labelNode));
+							}), 1000);	// 1000ms to wait for 'Fruits' node to expand and show 'Apple' node
+
+							return d;
+						}
+					},
+					{
+						name: "move Foods/Vegetables to Foods/Cereal/Vegetables",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								vegetablesTreeNode = dndHelpers.findTreeNodeByPath("itemTree", ["Vegetables"]),
+								cerealsTreeNode = dndHelpers.findTreeNodeByPath("itemTree", ["Cereals"]);
+
+							robot.window.scrollTo(0, 9000); // scroll to bottom to try and prevent the DnD code from autoscrolling
+
+							// Drag and Drop
+							robot.mouseMoveAt(vegetablesTreeNode.domNode, 500, 1);
+							robot.mouseClick({left: true}, 500); // helps prevent screen jitter
+							robot.mousePress({left: true}, 1000);
+							robot.mouseMoveAt(vegetablesTreeNode.labelNode, 500, 500, 0, 0); // move mouse slightly to trigger DnD
+							robot.mouseMoveAt(cerealsTreeNode.domNode, 500, 100); // double move to allow for autoscrolling jitter
+							robot.mouseMoveAt(cerealsTreeNode.domNode, 500, 100);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that Vegetables remains a child of Fruits
+								var children = dndHelpers.getNamesOfChildrenOfItem("Fruits");
+								doh.is(2, children.categories.length, "fruits category child");
+								doh.is("Citrus", children.categories[0]);
+								doh.is("Vegetables", children.categories[1]);
+
+								// Check that Vegetables added as child of Cereals
+								children = dndHelpers.getNamesOfChildrenOfItem("Cereals");
+								doh.is(1, children.categories.length, "cereals category child");
+								doh.is("Vegetables", children.categories[0]);
+
+								// Check that Vegetables no longer a child of Foods
+								children = dndHelpers.getNamesOfChildrenOfItem("Foods");
+								doh.is(2, children.categories.length, "foods category child");
+								doh.is("Fruits", children.categories[0]);
+								doh.is("Cereals", children.categories[1]);
+
+								// Check that new item *wasn't* created
+								var items;
+								robot.window.myStore.fetch({
+									onComplete: function(i){ items = i; }
+								});
+								doh.is(6, items.length, "# of items in store");
+							}), 1000);	// 1000ms to wait for 'Fruits' node to expand and show 'Apple' node
+
+							return d;
+						}
+					},
+					{
+						name: "move Fruits/Vegetables to Fruits/Citrus",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								vegetablesTreeNode = dndHelpers.findTreeNodeByPath("itemTree", ["Fruits", "Vegetables"]),
+								citrusTreeNode = dndHelpers.findTreeNodeByPath("itemTree", ["Fruits", "Citrus"]);
+
+							// Drag and Drop
+							robot.mouseMoveAt(vegetablesTreeNode.labelNode, 500, 1);
+							robot.mouseClick({left: true}, 500); // helps prevent screen jitter
+							robot.mousePress({left: true}, 1000);
+							robot.mouseMoveAt(vegetablesTreeNode.labelNode, 500, 500, 0, 0); // move mouse slightly to trigger DnD
+							robot.mouseMoveAt(citrusTreeNode.labelNode, 0, 500);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+								// Check that Vegetables remains a child of Cereals
+								var children = dndHelpers.getNamesOfChildrenOfItem("Cereals");
+								doh.is(1, children.categories.length, "cereals category child");
+								doh.is("Vegetables", children.categories[0]);
+
+								// Check that Vegetables added as child of Citrus
+								children = dndHelpers.getNamesOfChildrenOfItem("Citrus");
+								doh.is(1, children.categories.length, "citrus category child");
+								doh.is("Vegetables", children.categories[0]);
+								doh.is(1, children.items.length, "citrus item child");
+								doh.is("Orange", children.items[0]);
+
+								// Check that Vegetables removed as child of Fruits
+								children = dndHelpers.getNamesOfChildrenOfItem("Fruits");
+								doh.is(1, children.categories.length, "fruits category child");
+								doh.is("Citrus", children.categories[0]);
+
+								// Check that new item *wasn't* created
+								var items;
+								robot.window.myStore.fetch({
+									onComplete: function(i){ items = i; }
+								});
+								doh.is(6, items.length, "# of items in store");
+							}), 1000);	// 1000ms to wait for 'Fruits' node to expand and show 'Apple' node
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("external drop tests", [
+					{
+						name: "drop banana on fruits",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								fruitsTreeNode = dndHelpers.findTreeNodeByPath("itemTree", ["Fruits"]);	// right tree
+
+							var node = dom.byId("1003", robot.doc);
+							robot.mouseMoveAt(node.parentNode, 500, 1, 0, 0); // move to source parent node to help prevent DnD autoscrolling
+							robot.mouseMoveAt(node, 500, 1); // move to source banana node
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(node.parentNode, 500, 100); //  move just a little to start the DnD operation before scrolling
+							robot.mouseMoveAt("itemTree", 500, 500); // go to target parent top to allow for better scrolling of the destination
+							robot.mouseMoveAt(fruitsTreeNode.labelNode, 1000, 500);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+
+								var children = dndHelpers.getChildrenOfItem("Fruits");
+								doh.is(1, children.items.length, "new item added");
+								doh.is(1003, children.items[0].id, "id of new item came from dropped node");
+								doh.is("Banana", children.items[0].name, "name of new item came from dropped node");
+
+								robot.window.myStore.fetch({
+									query: { name: "Banana" },
+									queryOptions: { deep: true },
+									onComplete: function(i){ items = i; }
+								});
+								doh.is(1, items.length, "1 banana item in store");
+							}), 1000);
+
+							return d;
+						}
+					},
+					{
+						name: "drop banana on cereal",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								cerealsTreeNode = dndHelpers.findTreeNodeByPath("itemTree", ["Cereals"]);					// right tree
+
+							var node = dom.byId("1003", robot.doc);
+							robot.mouseMoveAt(node.parentNode, 500, 1, 0, 0); // move to source parent node to help prevent DnD autoscrolling
+							robot.mouseMoveAt(node, 500, 1); // move to source banana node
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(node.parentNode, 500, 100); //  move just a little to start the DnD operation before scrolling
+							robot.mouseMoveAt("itemTree", 500, 100); // go to target parent top to allow for better scrolling of the destination
+							robot.mouseMoveAt(cerealsTreeNode.labelNode, 1000, 500);
+							robot.mouseRelease({left: true}, 500);
+
+							robot.sequence(d.getTestCallback(function(){
+
+								var children = dndHelpers.getChildrenOfItem("Cereals");
+								doh.is(1, children.items.length, "banana is child of cereals");
+								doh.is(1003, children.items[0].id, "id of item came from dropped node");
+								doh.is("Banana", children.items[0].name, "name of new item came from dropped node");
+
+								var children2 = dndHelpers.getChildrenOfItem("Fruits");
+								doh.is(1, children2.items.length, "banana still a child of fruits");
+								doh.is(1003, children2.items[0].id, "id of new item came from dropped node");
+								doh.is("Banana", children2.items[0].name, "name of new item came from dropped node");
+
+								robot.window.myStore.fetch({
+									query: { name: "Banana" },
+									queryOptions: { deep: true },
+									onComplete: function(i){ items = i; }
+								});
+								doh.is(1, items.length, "1 banana item in store (with 2 parents)");
+							}), 1000);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.register("illegal drop", [
+					// This tests dropping a node onto another node when both nodes represent the same item.
+					{
+						name: "try to drop Vegetables as child of Vegetables",
+						timeout: 10000,
+						runTest: function(){
+							var
+								d = new doh.Deferred(),
+								drag = dndHelpers.findTreeNodeByPath("itemTree", ["Cereals", "Vegetables"]),
+								aboveDrop = dndHelpers.findTreeNodeByPath("itemTree", ["Fruits", "Citrus"]);
+								drop = dndHelpers.findTreeNodeByPath("itemTree", ["Fruits", "Citrus", "Vegetables"]);
+
+							doh.is(drop.item.id, drag.item.id, "both nodes point to same item");
+
+							// Drag bottom vegetables node over Citrus
+							robot.mouseMoveAt(drag.domNode, 500, 1);
+							robot.mousePress({left: true}, 500);
+							robot.mouseMoveAt(aboveDrop.labelNode, 0, 500);
+
+							robot.sequence(d.getTestErrback(function(){
+								var avatar = query(".dojoDndAvatar", robot.doc);
+								doh.t(avatar && avatar[0], "avatar found");
+								doh.t(domClass.contains(avatar[0], "dojoDndAvatarCanDrop"), "can drop");
+							}), 500);
+
+							// Now move it to over first Vegetables node.   Should be red icon indicating drop-unallowed
+							robot.mouseMoveAt(drop.labelNode, 0, 500);
+							robot.sequence(d.getTestErrback(function(){
+								var avatar = query(".dojoDndAvatar", robot.doc);
+								doh.t(avatar && avatar[0], "avatar found");
+								doh.f(domClass.contains(avatar[0], "dojoDndAvatarCanDrop"), "can't drop");
+							}), 500);
+
+							// Try to drop anyway, and make sure Tree structure doesn't change
+							robot.mouseRelease({left: true}, 500);
+							robot.sequence(d.getTestCallback(function(){
+								doh.is(0, drop.getChildren().length, "drop node has no children");
+								doh.t(drag == dndHelpers.findTreeNodeByPath("itemTree", ["Cereals", "Vegetables"]),
+										"drag node still in same place");
+							}), 500);
+
+							return d;
+						}
+					}
+				]);
+
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/robot/Tree_mouse.html b/src/main/resources/static/dijit/tests/tree/robot/Tree_mouse.html
new file mode 100644
index 0000000000000000000000000000000000000000..677fa04f8fe3e3c0152d113d105bc069971c965c
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/robot/Tree_mouse.html
@@ -0,0 +1,230 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>robot Tree Mouse Test</title>
+
+	<style>
+		@import "../../../../util/doh/robot/robot.css";
+	</style>
+
+	<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"doh/runner", "dojo/robotx",
+			"dojo/aspect", "dojo/query",
+			"dijit/tests/helpers", "dojo/domReady!"
+		], function(doh, robot, aspect, query, helpers){
+
+			robot.initRobot('../test_Tree.html');
+
+			var registry, focus, mytree, africa, asia;
+
+			doh.register("_setup", [
+				{
+					name: "wait for widgets to load",
+					timeout: 20000,
+					runTest: helpers.waitForLoad
+				},
+				function setVars(){
+					registry = robot.window.require("dijit/registry");
+					focus = robot.window.require("dijit/focus");
+					mytree = registry.byId("mytree");
+
+					// find TreeNodes for Africa, Asia (this assumes that we haven't loaded any of mytree's
+					// grandchild TreeNodes yet)
+					var nodes = query(".dijitTreeLabel");
+					africa = registry.getEnclosingWidget(nodes[1]);
+					asia = registry.getEnclosingWidget(nodes[2]);
+				}
+			]);
+
+			function toggle(func, expanded){
+				return function(){
+					var d = new doh.Deferred();
+
+					doh.is(expanded, africa.isExpanded, "original state");
+
+					func(d);
+
+					robot.sequence(d.getTestCallback(function(){
+						doh.is(!expanded, africa.isExpanded, "after state");
+					}), 500);
+
+					return d;
+				};
+			}
+
+			doh.register("label click", [
+				{
+					name: "click to open",
+					timeout: 8000,
+					runTest: toggle(function(d){
+						robot.mouseMoveAt(africa.labelNode);
+						robot.mouseClick({left:true}, 100);
+						robot.sequence(d.getTestErrback(function(){
+							doh.is(1, robot.window.mouseDowns, "mouse down reported");
+						}), 500);
+					}, false)
+				},
+
+				{
+					name: "click to close",
+					timeout: 8000,
+					runTest: toggle(function(){
+						robot.mouseClick({left:true}, 100);
+					}, true)
+				},
+
+				{
+					name: "double click to open",
+					timeout: 8000,
+					setUp: function(){
+						mytree.openOnClick = false;
+						mytree.openOnDblClick = true;
+					},
+					runTest: toggle(function(){
+						robot.mouseClick({left:true}, 100);
+						robot.mouseClick({left:true}, 100);
+					}, false)
+				},
+
+				{
+					name: "double click to close",
+					timeout: 8000,
+					runTest: toggle(function(){
+						robot.mouseClick({left:true}, 100);
+						robot.mouseClick({left:true}, 100);
+					}, true)
+				}
+			]);
+
+			doh.register("not a click", [
+				{
+					name: "setup",
+					timeout: 8000,
+					runTest: function(){
+						mytree.set("openOnClick", true);
+						return mytree.collapseAll().then(function(){
+							return mytree.set("path", ["continentRoot", "EU", "FR"]);
+						});
+					}
+				},
+
+				{
+					name: "mouse down france, up on italy",
+					timeout: 8000,
+					runTest: function(){
+						var labels = query(".dijitTreeLabel"),
+							europe = labels.filter(function(node){
+								return node.innerHTML == "Europe";
+							})[0],
+							france = labels.filter(function(node){
+								return node.innerHTML == "France";
+							})[0],
+							italy = labels.filter(function(node){
+								return node.innerHTML == "Italy";
+							})[0];
+
+						var d = new doh.Deferred();
+
+						robot.mouseMoveAt(france, 500, 0);
+						robot.mousePress({left:true}, 500);
+						robot.mouseMoveAt(italy, 500, 0);
+						robot.mouseRelease({left:true}, 500);
+						robot.sequence(d.getTestCallback(function(){
+							var europeNode = registry.getEnclosingWidget(europe);
+							doh.t(europeNode.isExpanded, "europe node still expanded");
+							doh.isNot("Europe", mytree.focusedChild.label, "focus didn't shift to Europe");
+						}), 500);
+
+						return d;
+					}
+				}
+			]);
+
+			doh.register("focus", [
+				{
+					name: "setup",
+					runTest: function(){
+						// prevent TreeNodes from moving around as we are moving the mouse to find them
+						mytree.set("openOnClick", false);
+					}
+				},
+				{
+					name: "focus africa",
+					timeout: 8000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						robot.mouseMoveAt(africa.labelNode);
+						robot.mouseClick({left:true}, 100);
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("Africa", helpers.innerText(focus.curNode));
+						}), 500);
+						return d;
+					}
+				},
+
+				{
+					name: "blur tree",
+					timeout: 8000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						robot.mouseMoveAt("mytree_before");
+						robot.mouseClick({left:true}, 100);
+						robot.sequence(d.getTestCallback(function(){
+							doh.is("mytree_before", focus.curNode.id);
+						}), 500);
+						return d;
+					}
+				},
+
+				{
+					name: "click on asia's expando",
+					timeout: 8000,
+					runTest: function(){
+						var d = new doh.Deferred(),
+							africaGotFocus;
+						aspect.after(africa, "focus", function(){
+							africaGotFocus = true;
+						});
+						robot.mouseMoveAt(asia.expandoNode);
+						robot.mouseClick({left:true}, 100);
+						robot.sequence(d.getTestCallback(function(){
+							// Clicking the expando or anywhere on the row should focus that row.
+							// In addition, there shouldn't even be a momentary (possibly scroll inducing) focus on
+							// the previously focused row.
+							doh.is("Asia", helpers.innerText(focus.curNode));
+							doh.f(africaGotFocus, "africa didn't get momentary focus");
+						}), 500);
+						return d;
+					}
+				},
+
+				{
+					name: "focus long label",
+					timeout: 8000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						var thinTree = registry.byId('thinTree');
+						var rootNode = thinTree.rootNode;
+
+						robot.mouseMoveAt(rootNode.expandoNode);
+						robot.mouseClick({left: true}, 100);
+						robot.sequence(d.getTestCallback(function(){
+							doh.f(rootNode.isExpanded, 'Clicking expando of node with long label should collapse node');
+							doh.is(0, thinTree.domNode.scrollLeft, 'Focusing node with long label should not scroll container');
+						}), 500);
+						return d;
+					}
+				}
+			]);
+
+			doh.run();
+		});
+
+	</script>
+</head>
+</html>
+
diff --git a/src/main/resources/static/dijit/tests/tree/robot/Tree_selector.html b/src/main/resources/static/dijit/tests/tree/robot/Tree_selector.html
new file mode 100644
index 0000000000000000000000000000000000000000..179aa63c3c7b644e4a502d0a4ca29cd6da745ec0
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/robot/Tree_selector.html
@@ -0,0 +1,261 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>robot Tree selector Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			require([
+				"doh/runner", "dojo/robotx",
+				"dojo/_base/array", "dojo/dom", "dojo/dom-geometry", "dojo/keys", "dojo/sniff", "dojo/window",
+				"dijit/tests/tree/robot/Tree_dnd", "dojo/domReady!"
+			], function(doh, robot, array, dom, domGeom, keys, has, winUtils, dndHelpers){
+
+				function clickItem(modifiers){
+					var i;
+					for(i = 0; i < modifiers.length; i++){
+						robot.keyDown(modifiers[i], 250);
+					}
+					robot.mouseClick({left: true}, 250);
+					for(i = modifiers.length - 1; i >= 0; i--){
+						robot.keyUp(modifiers[i], 250);
+					}
+				}
+
+				function pressEnter(modifiers){
+					var i;
+					for(i = 0; i < modifiers.length; i++){
+						robot.keyDown(modifiers[i], 250);
+					}
+
+					// Use ENTER on mac because meta-space controls the IME (switching input language),
+					// but SPACE on IE6 because ctrl-shift-ENTER doesn't do anything (although not sure
+					// why we are testing ctrl-shift combination anyway)
+					robot.keyPress(has("mac") ? keys.ENTER : keys.SPACE, 250);
+
+					for(i = modifiers.length - 1; i >= 0; i--){
+						robot.keyUp(modifiers[i], 250);
+					}
+				}
+				function mouseSelectExpendo(tree, item, modifiers, k){
+					robot.mouseMoveAt(item.expandoNode, 250);
+					clickItem(modifiers);
+					robot.sequence(k);
+				}
+				function mouseSelect(tree, item, modifiers, k){
+					robot.mouseMoveAt(item.domNode, 250, 200);
+					clickItem(modifiers);
+					robot.sequence(k);
+				}
+				function keyboardSelect(tree, item, modifiers, k){
+					var curFocus = robot.window.require("dijit/focus").curNode,
+						focused = dom.isDescendant(curFocus, dom.byId("itemTree", robot.doc));
+					if(!focused){
+						robot.keyPress(keys.TAB, 250);
+						robot.sequence(function(){ keyboardSelect(tree, item, modifiers, k); }, 250);
+						return;
+					}
+
+					focused_node = curFocus.parentNode.parentNode.parentNode;
+					var diff = domGeom.position(item.domNode).y - domGeom.position(focused_node).y;
+					if(diff != 0){
+						if(diff > 0){
+							robot.keyPress(keys.DOWN_ARROW, 500);
+						}else{
+							robot.keyPress(keys.UP_ARROW, 500);
+						}
+					}else{
+						pressEnter(modifiers);
+						robot.sequence(k);
+						return;
+					}
+					robot.sequence(function(){ keyboardSelect(tree, item, modifiers, k); }, 500);
+				}
+
+				function getSelected(tree){
+					//in IE, for(var i in object) will not honor the order the properties are set
+					//(it's in the order properties are first set even delete a property won't
+					//change it)
+					var selected = tree.dndController.getSelectedTreeNodes();
+					selected.sort(function(a, b){return a.item.id<b.item.id?-1:1});
+					return selected;
+				}
+				function testSingleItem(selector, clicker, itemName){
+					var d = new doh.Deferred();
+
+					// Find the fruitsTreeNode category
+					var fruitsTreeNode = dndHelpers.findTreeNode("itemTree", itemName || "Fruits");
+					var tree = registry.byId("itemTree");
+
+					// select fruit item
+					selector(tree, fruitsTreeNode, [], function(){
+						robot.sequence(d.getTestErrback(function(){
+							var selected = getSelected(tree);
+
+							doh.is(1, selected.length);
+							doh.is(fruitsTreeNode, selected[0]);
+
+							//ctrl-click the item to deselect it
+							clicker([has("mac") ? keys.META : keys.CTRL]);
+
+							robot.sequence(d.getTestCallback(function(){
+								var selected = getSelected(tree);
+
+								doh.is(0, selected.length);
+							}), 500);
+						}), 500);
+					});
+					return d;
+				}
+				function testCtrlSelect(selector, clicker){
+					var d = new doh.Deferred();
+
+					// Find the fruitsTreeNode category
+					var fruitsTreeNode = dndHelpers.findTreeNode("itemTree", "Fruits");
+					var tree = registry.byId("itemTree");
+
+					// select fruit item
+					selector(tree, fruitsTreeNode, [], function(){
+						robot.sequence(function(){
+							winUtils.scrollIntoView(dom.byId("itemTree", robot.doc));
+						}, 500);
+
+						// ctrl-click Cereals item
+						var cerealsTreeNode = dndHelpers.findTreeNode("itemTree", "Cereals");
+						selector(tree, cerealsTreeNode,
+								 [has("mac") ? keys.META : keys.CTRL], function(){
+							 robot.sequence(d.getTestCallback(function(){
+								 var selected = getSelected(tree);
+
+								 doh.is(2, selected.length);
+								 doh.is(fruitsTreeNode, selected[0]);
+								 doh.is(cerealsTreeNode, selected[1]);
+								 doh.is(cerealsTreeNode, tree.dndController.anchor, 'anchor should be the Cereals item');
+							 }), 500); });
+					});
+					return d;
+				}
+				function _getCtrlShiftTest(selector, keys){
+					return function(){
+						var d = new doh.Deferred();
+
+						// Find the fruitsTreeNode category
+						var fruitsTreeNode = dndHelpers.findTreeNode("itemTree", "Fruits");
+						var cerealsTreeNode = dndHelpers.findTreeNode("itemTree", "Cereals");
+						var vegetablesTreeNode = dndHelpers.findTreeNode("itemTree", "Vegetables");
+						var tree = registry.byId("itemTree");
+
+						// select fruit item (no modifiers)
+						selector(tree, fruitsTreeNode, [], atFruits);
+
+						function atFruits(){
+							// shift-select Cereals item
+							selector(tree, cerealsTreeNode, keys, atCereals);
+						}
+						function atCereals(){
+							robot.sequence(d.getTestErrback(function(){
+								var selected = getSelected(tree);
+
+								doh.is(3, selected.length);
+								doh.is(fruitsTreeNode, selected[0]);
+								doh.is(vegetablesTreeNode, selected[1]);
+								doh.is(cerealsTreeNode, selected[2]);
+								doh.is(fruitsTreeNode, tree.dndController.anchor, 'anchor should not change 1');
+
+								// shift-select Vegetables item
+								keyboardSelect(tree, vegetablesTreeNode, keys, atVegetables);
+							}));
+						}
+
+						function atVegetables(){
+							robot.sequence(d.getTestCallback(function(){
+								var selected = getSelected(tree);
+								doh.is(2, selected.length);
+								doh.is(fruitsTreeNode, selected[0]);
+								doh.is(vegetablesTreeNode, selected[1]);
+								doh.is(fruitsTreeNode, tree.dndController.anchor, 'anchor should not change 2');
+							}));
+						}
+
+						return d;
+					};
+				}
+
+				var controller = '', ind=window.location.href.indexOf("?controller=");
+				
+				if(ind > -1){
+					controller = window.location.href.substr(ind + 12);
+					controller = controller.split('&')[0];
+				}
+				robot.initRobot('../test_Tree_DnD.html?testController=' + controller);
+
+				dndHelpers.setup();
+
+				doh.register("focus page", {
+					name: "focus page",
+					timeout: 20000,
+					runTest: function(){
+						var d = new doh.Deferred();
+						robot.mouseMove(10, 10, 100, 100);
+						robot.mouseClick({left:true}, 100);
+						robot.sequence(function(){
+                            //Focus the page, so tabbing will work.
+							d.callback(true);
+						}, 250);
+						return d;
+					}
+				});
+				doh.register("item selection (keyboard)", itemSelection(keyboardSelect, pressEnter) );
+				doh.register("item selection (mouse)", itemSelection(mouseSelect, clickItem) );
+				doh.register({name:"item selection (mouse on expando)", timeout: 15000, runTest: function(){
+					return testSingleItem(mouseSelectExpendo, clickItem, 'Cereals');
+				}});
+
+				// Failsafe to clear pressed keys in case above tests timeout etc.
+				doh.register("clear pressed keys", function(){
+					var d = new doh.Deferred();
+					array.forEach([keys.META, keys.CTRL, keys.SHIFT], function(key){
+						robot.keyUp(key, 250);
+					});
+					robot.sequence(function(){
+						d.callback(true);
+					});
+					return d;
+				});
+
+				function itemSelection(selector, clicker){
+					return [
+						{
+							name: "select/deselect a single item",
+							timeout: 15000,
+							runTest: function(){ return testSingleItem(selector, clicker); }
+						},
+						{
+							name: "ctrl select",
+							timeout: 15000,
+							runTest: function(){ return testCtrlSelect(selector, clicker); }
+						},
+						{
+							name: "shift select",
+							timeout: 15000,
+							runTest: _getCtrlShiftTest(selector, [keys.SHIFT])
+						},
+						{
+							name: "ctrl shift select",
+							timeout: 15000,
+							runTest: _getCtrlShiftTest(selector, [has("mac") ? keys.META : keys.CTRL, keys.SHIFT])
+						}
+					];
+				}
+				
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/robot/Tree_v1.html b/src/main/resources/static/dijit/tests/tree/robot/Tree_v1.html
new file mode 100644
index 0000000000000000000000000000000000000000..07d97173312b973852b8661edd93d08a571ab358
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/robot/Tree_v1.html
@@ -0,0 +1,183 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+	<head>
+		<title>doh.robot Tree_v1 Test</title>
+
+		<style>
+			@import "../../../../util/doh/robot/robot.css";
+		</style>
+
+		<!-- required: dojo.js -->
+		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
+
+		<script type="text/javascript">
+			dojo.require("dijit.robotx");
+			dojo.require("dijit.tests.helpers");	// functions to help test
+
+			dojo.ready(function(){
+				doh.robot.initRobot('../test_Tree_v1.html');
+
+				doh.register("_setup", [
+					{
+						name: "wait for widgets to load",
+						timeout: 10000,
+						runTest: waitForLoad
+					},
+					function setVars(){
+						registry = dojo.global.require("dijit/registry");
+					}
+				]);
+							
+				doh.register("Test tree 1", [
+					{
+						name: "expand first child",
+						timeout: 7000,
+						runTest: function(){
+							var d = new doh.Deferred();
+														
+							var myTree = registry.byId("mytree");
+							var children = myTree.rootNode.getChildren();
+								
+							doh.robot.mouseMoveAt(children[0].contentNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							doh.robot.mouseMoveAt(children[4].contentNode, 1000, 1);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.t(children[0].isExpanded, "failed to expand africa child node");
+								doh.t(children[4].isExpanded, "failed to expand north america child node");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "click Africa's first child",
+						timeout: 7000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							var myTree = registry.byId("mytree");
+							var rootChildren = myTree.rootNode.getChildren();
+							var africaChildren = rootChildren[0].getChildren();
+							var naChildren = rootChildren[4].getChildren();
+							doh.robot.mouseMoveAt(naChildren[0].contentNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							
+							doh.robot.mouseMoveAt(africaChildren[0].contentNode, 1000, 1);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("Egypt was clicked", africaChildren[0].labelNode.innerHTML);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "click Mexico's first child",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							var myTree = registry.byId("mytree");
+							var rootChildren = myTree.rootNode.getChildren();
+							var naChildren = rootChildren[4].getChildren();
+							var mexicoChildren = naChildren[0].getChildren();
+							
+							doh.robot.mouseMoveAt(mexicoChildren[0].contentNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("Mexico City was clicked", mexicoChildren[0].labelNode.innerHTML);
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "close tree nodes",
+						timeout: 7000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							var myTree = registry.byId("mytree");
+							var rootChildren = myTree.rootNode.getChildren();
+							var naChildren = rootChildren[4].getChildren();
+							
+							doh.robot.mouseMoveAt(naChildren[0].contentNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							
+							doh.robot.mouseMoveAt(rootChildren[4].contentNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+							
+							doh.robot.mouseMoveAt(rootChildren[0].contentNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(naChildren[0].isExpanded, "failed to close Mexico child node");
+								doh.f(rootChildren[0].isExpanded, "failed to close Africa child node");
+								doh.f(rootChildren[4].isExpanded, "failed to close North America child node");
+							}), 500);
+							return d;
+						}
+					},
+					{
+						name: "Destroy tree",
+						timeout: 4000,
+						runTest: function(){
+							registry.byId("mytree").destroy();
+
+							doh.is(undefined, registry.byId("mytree"), "tree was not destroyed");
+							doh.is(undefined, dojo.byId("mytree"), 'widget was removed');
+						}
+					}
+				]);
+				
+				doh.register("Test tree 2", [
+					{
+						name: "expand first node",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							var myTree = registry.byId("tree2");
+							var children = myTree.rootNode.getChildren();
+							
+							var ex = children[0].expandoNode;
+							doh.robot.mouseMoveAt(children[0].expandoNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.f(isVisible(myTree.rootNode.labelNode), "root node is visible");
+								doh.t(children[0].isExpanded, "failed to expand first node");
+								
+								var style = dojo.getComputedStyle(children[0].iconNode);
+								doh.t(style.backgroundImage.indexOf("folderIcons.")>0, "custom icon was not used");
+							}), 1000);
+							return d;
+						}
+					},
+					{
+						name: "click Africa",
+						timeout: 4000,
+						runTest: function(){
+							var d = new doh.Deferred();
+							
+							var myTree = registry.byId("tree2");
+							var rootChildren = myTree.rootNode.getChildren();
+														
+							doh.robot.mouseMoveAt(rootChildren[0].contentNode, 500, 1);
+							doh.robot.mouseClick({left: true}, 500);
+
+							doh.robot.sequence(d.getTestCallback(function(){
+								doh.is("Africa (population: 900 million)", rootChildren[0].labelNode.innerHTML);
+							}), 1000);
+							return d;
+						}
+					}
+				]);
+				
+				doh.run();
+			});
+		</script>
+	</head>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/runTests.html b/src/main/resources/static/dijit/tests/tree/runTests.html
new file mode 100644
index 0000000000000000000000000000000000000000..5ecdbb1c05ee6f9290ad751cb8b9b851b2e7ce9e
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/runTests.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+	<title>Dijit Unit Test Runner</title>
+	<meta http-equiv="REFRESH" content="0;url=../../../util/doh/runner.html?testModule=dijit.tests.tree.module"></HEAD>
+	<BODY>
+		Redirecting to D.O.H runner.
+	</BODY>
+</HTML>
diff --git a/src/main/resources/static/dijit/tests/tree/test_Custom_TreeNode.html b/src/main/resources/static/dijit/tests/tree/test_Custom_TreeNode.html
new file mode 100644
index 0000000000000000000000000000000000000000..452a4e0a0a441a4e2c893c25d4d569434813d55f
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/test_Custom_TreeNode.html
@@ -0,0 +1,95 @@
+<!DOCTYPE HTML>
+<html lang="en">
+    <head>
+        <title>Custom TreeNode Test</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+		<script src="../boilerplate.js" type="text/javascript"></script>
+
+        <script type="text/javascript">
+			require([
+				"dojo/_base/declare", "dojo/data/ItemFileReadStore", "dojo/dom-construct",
+				"dijit/_WidgetBase", "dijit/Tree", "dijit/tree/ForestStoreModel",
+				"dojo/domReady!"
+			], function(declare, ItemFileReadStore, domConstruct,
+						_WidgetBase, Tree, ForestStoreModel){
+
+				declare("SuperSmartLink", _WidgetBase, {
+					buildRendering: function(){
+						this.domNode = document.createElement("A");
+						this.domNode.href = "http://ibm.com";
+						this.inherited(arguments);
+					}
+				});
+
+				declare("SuperSmartTreeNode", Tree._TreeNode, {
+					postCreate: function(){
+						this.inherited(arguments);
+						this._smartLink = new SuperSmartLink();
+						this.contentNode.appendChild(this._smartLink.domNode);
+						// in real application this is done by template modification tree node class
+						domConstruct.place(this.labelNode, this._smartLink.domNode, "first");
+					}
+				});
+
+				declare("SuperSmartTree", Tree, {
+					focusNode: function(node){
+						this.inherited(arguments);
+						this.dndController.setSelection([node]);
+					},
+
+					_createTreeNode: function(args){
+						return new SuperSmartTreeNode(args);
+					}
+				});
+
+				var getChildren  = function(depth, parent){
+					var classChildren = [];
+					for (var i = 0; i < 3; i++){
+						var child = {
+							id: parent+"_" + i,
+							name: parent+"_" + i
+						};
+						if (depth < 2 && i === 0){
+							child.children = getChildren(depth+1, child.id);
+						}
+						classChildren.push(child);
+					}
+					return classChildren;
+				};
+
+				var store = new ItemFileReadStore({
+					data: {
+						identifier: 'id',
+						label: 'name',
+						items: [
+							{id:"rrroot", name:"The Root", type:"", children: getChildren(0, "Child")}
+						]
+					}
+				});
+
+				var model = new ForestStoreModel({
+					store: store,
+					query:{type:'*'},
+					childrenAttrs: ["children"]
+				});
+
+				tree = new SuperSmartTree({
+					"model": model,
+					showRoot: false,
+					persist: false
+
+				}).placeAt("AAA");
+
+				tree.startup();
+			});
+        </script>
+    </head>
+    <body class="claro" role="main"> 
+        <h1 class="title">Please expand Continent node</h1>
+		<div id="AAA" style="overflow: auto; height: 1000px">
+		</div>
+		Footer is here
+    </body>	
+</html>
+
diff --git a/src/main/resources/static/dijit/tests/tree/test_Tree.html b/src/main/resources/static/dijit/tests/tree/test_Tree.html
new file mode 100644
index 0000000000000000000000000000000000000000..3b878a96504c1e59f50e4099f7a252842b9c0a3b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/test_Tree.html
@@ -0,0 +1,175 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dijit Tree Test</title>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/parser",
+			"dojo/data/ItemFileWriteStore",
+			"dijit/Tree",
+			"dijit/tree/ForestStoreModel",
+			"dijit/ColorPalette",
+			"dijit/Menu",
+			"dijit/MenuItem",
+			"dijit/PopupMenuItem",
+			"dojo/domReady!"
+		], function(parser){
+			parser.parse();
+		});
+
+		// Global variable used by mytree (and in turn referenced by Tree_mouse.html robot test)
+		mouseDowns = 0;
+	</script>
+
+</head>
+<body class="claro" role="main">
+
+	<script type="dojo/require">
+		registry: "dijit/registry"
+	</script>
+
+	<h1 class="testTitle">Dijit Tree Test</h1>
+
+	<div data-dojo-id="continentStore" data-dojo-type="dojo/data/ItemFileWriteStore" data-dojo-props='url:"../_data/countries.json"'></div>
+	<div data-dojo-id="continentModel" data-dojo-type="dijit/tree/ForestStoreModel" data-dojo-props='store:continentStore, query:{type:"continent"},
+		rootId:"continentRoot", rootLabel:"Continents", childrenAttrs:["children"]'></div>
+	<div data-dojo-id="wideModel" data-dojo-type="dijit/tree/ForestStoreModel" data-dojo-props='store:continentStore, query:{type:"continent"},
+		rootId:"continentRoot", rootLabel:"Long label that causes scrolling", childrenAttrs:["children"]'></div>
+
+	<h2 id="mytreeLabel">Tree with hardcoded root node (not corresponding to any item in the store)</h2>
+	<p>
+		Clicking a folder node will open/close it (openOnclick==true),
+		and clicking a leaf node will log a message to the console.
+	</p>
+	<label for="mytree_before">before:</label><input id="mytree_before"/>
+	<div id="mytree" data-dojo-type="dijit/Tree" aria-labelledby="mytreeLabel"
+		 data-dojo-props='model:continentModel, openOnClick:true, onLoad:function(){ console.log("loaded mytree (first tree)"); }'>
+		<script type="dojo/method" data-dojo-event="onClick" data-dojo-args="item">
+			console.log("Execute of node " + continentStore.getLabel(item)
+				+", population=" + continentStore.getValue(item, "population"));
+		</script>
+		<script type="dojo/method" data-dojo-event="onOpen" data-dojo-args="item">
+			console.log("Open of node " + (continentStore.getLabel(item) || "root"));
+		</script>
+		<script type="dojo/method" data-dojo-event="onClose" data-dojo-args="item">
+			console.log("Close of node " + (continentStore.getLabel(item) || "root"));
+		</script>
+		<script type="dojo/method" data-dojo-event="onMouseDown" data-dojo-args="evt">
+			mouseDowns++;
+		</script>
+	</div>
+
+	<button id="mytreeDestroyButton" onclick="dijit.byId('mytree').destroyRecursive();">destroy</button>
+
+	<h2 id="tree2Label">A rootless tree (no "continents" node) with context menus, and custom icons</h2>
+
+	<label for="tree2_before">before:</label><input id="tree2_before"/>
+	<div id="tree2" data-dojo-type="dijit/Tree" aria-labelledby="tree2Label" data-dojo-props='model:continentModel, showRoot:false, openOnClick:true,onLoad:function(){ console.log("loaded tree2 (second tree)"); }'>
+		<script type="dojo/method" data-dojo-event="getIconClass" data-dojo-args="item, opened">
+           return (item == this.model.root || continentStore.getValue(item, "type") == "continent") ?
+                   (opened ? "customFolderOpenedIcon" : "customFolderClosedIcon") :
+                    "noteIcon";
+		</script>
+		<script type="dojo/method" data-dojo-event="onClick" data-dojo-args="item">
+			console.log("Execute of node " + this.model.getLabel(item)
+				+", population=" + continentStore.getValue(item, "population"));
+		</script>
+	</div>
+
+	<ul id="tree_menu" data-dojo-type="dijit/Menu"
+			data-dojo-props='style:"display: none;", targetNodeIds: ["tree2"], selector: ".dijitTreeNode"'>
+		<li data-dojo-type="dijit/MenuItem">
+			<script type="dojo/on" data-dojo-event="click">
+				// get a hold of the dijit.TreeNode that was the source of this open event
+				var tn = registry.byNode(this.getParent().currentTarget);
+
+				// now print the data store item that backs the tree node
+				console.debug("menu click for item: ", tn.item.name);
+			</script>
+			Click Me
+		</li>
+	</ul>
+
+	<button id="tree2ExpandAll" onclick="dijit.byId('tree2').expandAll();">expand all</button>
+	<button onclick="dijit.byId('tree2').collapseAll();">collapse all</button>
+
+	<h2 id="mytree3Label">Double click, expand on load, direct style setting, tooltip test tree</h2>
+	<p>
+		Double-Clicking a folder node will open/close it (openOnDblClick==true),
+		and clicking or Double Clicking a leaf node will log a message to the console.
+	</p>
+	<label for="mytree3_before">before:</label> <input id="mytree3_before"/>
+	<div id="mytree3" aria-labelledby="mytree3Label"  data-dojo-type="dijit/Tree"
+		 data-dojo-props='store:continentStore, query:{type:"continent"},
+		label:"Continents", openOnClick:false, openOnDblClick:true,
+		autoExpand:true, onLoad:function(){ console.log("loaded mytree3 (third tree)"); }'>
+		<script type="dojo/method" data-dojo-event="getLabelStyle" data-dojo-args="item,opened">
+			if(item && continentStore.getValue(item,"type") == "continent"){
+				return {color: "red"};
+			}else{
+				return {color: "green"};
+			}
+		</script>
+		<script type="dojo/method" data-dojo-event="getIconStyle" data-dojo-args="item,opened">
+			if(item && continentStore.getValue(item,"type") == "continent"){
+				return {
+					backgroundImage: "url('../images/flatScreen.gif')",
+					height: "32px",
+					width: "32px"
+				};
+			}else{
+				return null;
+			}
+		</script>
+		<script type="dojo/method" data-dojo-event="getIconClass" data-dojo-args="item, opened">
+	       if(!item || continentStore.getValue(item, "type") != "continent")
+				return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "dijitLeaf"
+	       	else
+	       		return "";
+		</script>
+		<script type="dojo/method" data-dojo-event="getTooltip" data-dojo-args="item,opened">
+			return item && ("Tooltip for " + this.model.getLabel(item));
+		</script>
+		<script type="dojo/method" data-dojo-event="onDblClick" data-dojo-args="item">
+			console.log("Execute of node " + this.model.getLabel(item)
+				+", population=" + continentStore.getValue(item, "population"));
+		</script>
+	</div>
+
+	<h2 id="thinTreeLabel">Tree w/horizontal scroll</h2>
+	<p>
+		For checking that selection and highlighting effect goes all the way to the right.
+	</p>
+	<p>
+		Expand North America and check highlighting for United States, plus shorter labels.
+		Then collapse North America and make sure horizontal scrollbar disappears.
+	</p>
+	<p>
+		Also check whether the Tree's initial display is correct.
+		Since the Tree persists, try refreshing the page when the tree is in an open state, and when it's in a closed
+		state.
+	</p>
+	<div id="thinTree" style="width: 170px; border: solid 1px #759dc0"
+		 data-dojo-type="dijit/Tree" aria-labelledby="thinTreeLabel"  data-dojo-props="model:wideModel">
+		<script type="dojo/aspect" data-dojo-advice="after" data-dojo-method="_adjustWidths">
+			console.log(this.id + ": adjusted widths of nodes");
+		</script>
+	</div>
+	<button onclick="dijit.byId('thinTree').expandAll();">expand all</button>
+	<button onclick="dijit.byId('thinTree').collapseAll();">collapse all</button>
+	<button onclick="dijit.byId('thinTree').set('paths', [['continentRoot','AF'],['continentRoot','NA','US']]);">
+		set paths to Africa, US
+	</button>
+	<button onclick="continentStore.fetchItemByIdentity({identity: 'US', onItem: function(item){ continentStore.setValue(item, 'name', 'A very very very long name for USA'); }});">
+		set long name for USA
+	</button>
+	<button onclick="continentStore.fetchItemByIdentity({identity: 'US', onItem: function(item){ continentStore.setValue(item, 'name', 'USA'); }});">
+		set short name for USA
+	</button>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/test_Tree_DnD.html b/src/main/resources/static/dijit/tests/tree/test_Tree_DnD.html
new file mode 100644
index 0000000000000000000000000000000000000000..aacd21e786928673733ea3bf27a95f54831b82e9
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/test_Tree_DnD.html
@@ -0,0 +1,205 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dijit Tree Test</title>
+
+	<style type="text/css">
+		@import "../../../dojo/resources/dnd.css";
+		@import "../../../dojo/tests/dnd/dndDefault.css";
+	</style>
+
+	<script type="text/javascript" src="../boilerplate.js"></script>
+
+	<script type="text/javascript">
+		require([
+			"dojo/aspect",
+			"dojo/dnd/Source",
+			"dojo/data/ItemFileWriteStore",
+			"dojo/dom",
+			"dojo/parser",
+			"dojo/topic",
+			"dijit/registry",
+			"dijit/Tree",
+			"dijit/tree/TreeStoreModel",
+			/testController=selector/.test(window.location.search) ? "dijit/tree/_dndSelector" : "dijit/tree/dndSource",
+			"dijit/Menu",
+			"dijit/form/Button",
+			"dijit/focus",	// not used directly, but needed by robot test drivers, ex: Tree_Selector.html
+			"dojo/domReady!"
+		], function(aspect, Source, ItemFileWriteStore, dom, parser, topic,
+					registry, Tree, TreeStoreModel, testController){
+
+			myStore = new ItemFileWriteStore({
+				url: "../_data/categories.json"
+			});
+
+			catModel = new TreeStoreModel({
+				store: myStore,
+				query: {id: "0"}
+			});
+
+			//create a custom label for tree one consisting of the label property pluss the value of the numberOfItems Column
+			catTreeCustomLabel = function(item){
+				var label = myStore.getLabel(item);
+				var num = myStore.hasAttribute(item, "numberOfItems") ? myStore.getValues(item,"numberOfItems") : "?";
+				return label + ' (' + num+ ')';
+			};
+
+			//on item tree , we want to drop on containers, the root node itself, or between items in the containers
+			itemTreeCheckItemAcceptance = function(node, source, position){
+				/*
+				 source.forInSelectedItems(function(item){
+				 console.log("testing to drop item of type " + item.type[0] + " and data " + item.data + ", position " + position);
+				 });
+				 */
+				var item = registry.getEnclosingWidget(node).item;
+				if(item && (item.root || myStore.hasAttribute(item,"numberOfItems"))){
+					return true;
+				}
+				return position != "over";
+			};
+
+			// on collection tree, only accept itself as the source tree
+			collectionTreeCheckItemAcceptance = function(node,source,position){
+				return source.tree && source.tree.id == "collectionsTree";
+			};
+
+			dndAccept = function(source, nodes){
+				return this.tree.id != "myTree";
+			};
+
+			getIcon = function(item){
+				if(!item || myStore.hasAttribute(item, "numberOfItems")){
+					return "myFolder";
+				}
+				return "myItem"
+			};
+
+			Tree.prototype.dndController = testController;
+
+			parser.parse();
+
+			selected = [];
+	
+			globalId = 1000;
+			lastSelected = null;
+	
+			// record the selection from tree 1
+			topic.subscribe("myTree", function(message){
+				if(message.event == "execute"){
+					// console.log("Tree1 Select: ",dijit.byId("myTree").store.getLabel(message.item));
+					lastSelected = selected["myTree"] = message.item;
+				}
+			});
+
+			// record the selection from tree 2
+			topic.subscribe("myTree2", function(message){
+				if(message.event == "execute"){
+					// console.log("Tree2 Select: ",dijit.byId("myTree2").store.getLabel(message.item));
+					lastSelected = selected["myTree2"] = message.item;
+				}
+			});
+
+			// connect to the add button and have it add a new container to the store as necessary
+			registry.byId("addButton").on("click", function(){
+				var pInfo = {
+					parent: lastSelected,
+					attribute: "children"
+				};
+
+				myStore.newItem({
+					name: dom.byId('newCat').value,
+					numberOfItems:0,
+					id:globalId++
+				}, pInfo);
+			});
+
+			// since we don't have a server, we're going to connect to the store and
+			// do a few things the server/store combination would normal be taking care of for us.
+			// TODO: This isn't monitoring moves, deletes, etc.  Instead of this code, why not monitor
+			// when an items children[] list changes?
+			aspect.after(myStore, "onNew", function(item, pInfo){
+				var p = pInfo && pInfo.item;
+				if(p){
+					var currentTotal = myStore.getValues(p, "numberOfItems")[0];
+					myStore.setValue(p, "numberOfItems", ++currentTotal);
+				}
+			}, true);
+		});
+	</script>
+
+	<style>
+		.myFolder{
+			width: 16px;
+			height: 16px;
+			background: blue;
+		}
+
+		.myItem{
+			width: 16px;
+			height: 16px;
+			background: green;
+
+		}
+	</style>
+
+</head>
+<body class="claro" role="main">
+	<h1 class="testTitle">Dijit Tree Test - Drag And Drop Support</h1>
+
+	<div role="presentation" style="float: left; width: 50%;">
+
+		<h2>Items: </h2>
+		<p>List of Items to be categorized<p>
+			<div data-dojo-id="c2" data-dojo-type="dojo/dnd/Source" class="container" style="height:100px; overflow:auto;">
+			<div class="dojoDndItem" id="1001">Apple</div>
+			<div class="dojoDndItem" id="1002">Orange</div>
+			<div class="dojoDndItem" id="1003">Banana</div>
+			<div class="dojoDndItem" id="1004">Tomato</div>
+			<div class="dojoDndItem" id="1005">Pepper</div>
+			<div class="dojoDndItem" id="1006">Wheat</div>
+			<div class="dojoDndItem" id="1007">Corn</div>
+			<div class="dojoDndItem" id="1008">Spinach</div>
+			<div class="dojoDndItem" id="1009">Cucumber</div>
+			<div class="dojoDndItem" id="1010">Carrot</div>
+			<div class="dojoDndItem" id="1011">Potato</div>
+			<div class="dojoDndItem" id="1012">Grape</div>
+			<div class="dojoDndItem" id="1013">Lemon</div>
+			<div class="dojoDndItem" id="1014">Lettuce</div>
+			<div class="dojoDndItem" id="1015">Peanut</div>
+		</div>
+
+		<h2>Collection Count Summary</h2>
+		<p>
+			You can't drop items onto this tree, but you can reorder categories. The between threshold
+			is set to 5, so if you are near the top or bottom of a node the drop will be above or below it.
+		</p>
+		<div id="collectionsTree" data-dojo-type="dijit/Tree" data-dojo-props='"class":"container", model:catModel,
+			getLabel:catTreeCustomLabel, betweenThreshold:5,
+			checkAcceptance:dndAccept, checkItemAcceptance:collectionTreeCheckItemAcceptance, getIconClass:getIcon,
+			persist:false'></div>
+
+		<h2>Custom</h2>
+		<p>Should add this category to the store.  The second parameter is the value for numberOfItems.</p>
+		<div class="container">
+			<label for="newCat">New category:</label><input id="newCat" type="text" value="Pottedmeat" /><label for="numItems">numberOfItems:</label><input id="numItems" type="text" value="0" size="3"/><div id="addButton" data-dojo-type="dijit/form/Button">Add Category</div>
+		</div>
+	</div>
+
+	<h2>Collection</h2>
+	<p>
+		Drop items from table on left onto this tree, only on to categories or between other items; should fail to let you drop on other items.
+		Can also move items within this tree. The drag threshold is set to 8, between threshold is set to 5, so you have a few pixels
+		of buffer before drag operations start.
+	</p>
+	<div data-dojo-id="itemModel" data-dojo-type="dijit/tree/TreeStoreModel" data-dojo-props='store:myStore, query:{id: "0"}, childrenAttrs:["items", "children"]'></div>
+	<div id="itemTree" data-dojo-type="dijit/Tree" data-dojo-props='"class":"container", model:itemModel,
+		checkAcceptance:dndAccept, checkItemAcceptance:itemTreeCheckItemAcceptance,
+		dragThreshold:8,
+		betweenThreshold:5,
+		getIconClass:getIcon,
+		persist:false'></div>
+
+	</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/test_Tree_v1.html b/src/main/resources/static/dijit/tests/tree/test_Tree_v1.html
new file mode 100644
index 0000000000000000000000000000000000000000..62b1322b9b8a98c2d2d04d8d27d7e91ef11cf203
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/test_Tree_v1.html
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+		"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title>Dijit Tree V1 API Test</title>
+
+	<style type="text/css">
+		@import "../../themes/claro/document.css";
+		@import "../css/dijitTests.css";
+	</style>
+
+	<!-- required: the default dijit theme: -->
+	<link id="themeStyles" rel="stylesheet" href="../../../dijit/themes/claro/claro.css"/>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../../dojo/dojo.js"
+		data-dojo-config="isDebug: true, parseOnLoad: true"></script>
+
+	<!-- only needed for alternate theme testing: -->
+	<script type="text/javascript" src="../_testCommon.js"></script>
+
+	<script type="text/javascript">
+		dojo.require("dijit.dijit"); // optimize: load dijit layer
+		dojo.require("dojo.data.ItemFileReadStore");
+		dojo.require("dijit.Tree");
+		dojo.require("dijit.ColorPalette");
+		dojo.require("dojo.parser");	// scan page for widgets and instantiate them
+	</script>
+</head>
+<body class="claro" role="main">
+
+	<h1 class="testTitle">Dijit Tree V1 API Test</h1>
+	<p>
+		This file is for testing the old Tree API's, where the store is specified directly
+		rather than specifying a model which connects to a store.
+	</p>
+	<div dojoType="dojo.data.ItemFileReadStore" jsId="continentStore"
+		url="../_data/countries.json"></div>
+
+	<h3>Tree with hardcoded root node (not corresponding to any item in the store)</h3>
+	<p>Clicking a folder node will open/close it (openOnclick==true), and clicking a leaf node will change the display name of the leaf node.</p>
+	<div dojoType="dijit.Tree" id="mytree" store="continentStore" query="{type:'continent'}"
+		onfocus="console.log('user focus handler')"
+		onblur="console.log('user blur handler')"
+		label="Continents" openOnClick="true" persist="false">
+		<script type="dojo/method" data-dojo-event="onClick" data-dojo-args="item">
+			this.getNodesByItem(item)[0].labelNode.innerHTML=item.name[0] + " was clicked";
+		</script>
+	</div>
+
+	<button onclick="dijit.byId('mytree').destroyRecursive();">destroy</button>
+
+	<h2>A rootless tree (no "continents" node) with custom icons</h2>
+
+	<div dojoType="dijit.Tree" id="tree2" store="continentStore" query="{type:'continent'}" persist="false">
+		<script type="dojo/method" event="getIconClass" args="item, opened">
+           return (!item || continentStore.getValue(item, "type") == "continent") ?
+                   (opened ? "customFolderOpenedIcon" : "customFolderClosedIcon") :
+                    "noteIcon";
+		</script>
+		<script type="dojo/method" data-dojo-event="onClick" data-dojo-args="item">
+			this.getNodesByItem(item)[0].labelNode.innerHTML = item.name[0] 
+				+ " (population: " + continentStore.getValue(item, "population") +")";
+		</script>
+</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/tests/tree/treeTestRoot b/src/main/resources/static/dijit/tests/tree/treeTestRoot
new file mode 100644
index 0000000000000000000000000000000000000000..4a9adf10818c282fd829623904433356b2f4451b
--- /dev/null
+++ b/src/main/resources/static/dijit/tests/tree/treeTestRoot
@@ -0,0 +1,10 @@
+[ 
+	{ id: 'node1', name:'node1', someProperty:'somePropertyA', children:[
+			{ $ref: 'node1.1', name: 'node1.1', children: true},
+			{ $ref: 'node1.2', name: 'node1.2'}
+	]},
+	{ id: 'node2', name:'node2', someProperty:'somePropertyB'},
+	{ id: 'node3', name:'node3', someProperty:'somePropertyC'},
+	{ id: 'node4', name:'node4', someProperty:'somePropertyA'},
+	{ id: 'node5', name:'node5', someProperty:'somePropertyB'}
+]
diff --git a/src/main/resources/static/dijit/themes/a11y/README.txt b/src/main/resources/static/dijit/themes/a11y/README.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a80935429ecc4312dc9a46447c3a10edaa324fac
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/a11y/README.txt
@@ -0,0 +1,3 @@
+This folder contains images used by all themes when in "high-contrast" mode.
+
+If you think you need to put something here, please talk to Becky or Bill first.
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/a11y/colors3x4.png b/src/main/resources/static/dijit/themes/a11y/colors3x4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5125cb6562adc096fe6bdc61372de8eb647c2359
Binary files /dev/null and b/src/main/resources/static/dijit/themes/a11y/colors3x4.png differ
diff --git a/src/main/resources/static/dijit/themes/a11y/colors7x10.png b/src/main/resources/static/dijit/themes/a11y/colors7x10.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1354aff56d25062351d0d1b9d93d6e7dc296b28
Binary files /dev/null and b/src/main/resources/static/dijit/themes/a11y/colors7x10.png differ
diff --git a/src/main/resources/static/dijit/themes/a11y/indeterminate_progress.gif b/src/main/resources/static/dijit/themes/a11y/indeterminate_progress.gif
new file mode 100644
index 0000000000000000000000000000000000000000..66f535cd891a4500e799446bc321e7dbc226152e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/a11y/indeterminate_progress.gif differ
diff --git a/src/main/resources/static/dijit/themes/claro/Calendar.css b/src/main/resources/static/dijit/themes/claro/Calendar.css
new file mode 100644
index 0000000000000000000000000000000000000000..99c1dd2ceb0798c985f5699780c7fc6193c31c7c
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Calendar.css
@@ -0,0 +1,301 @@
+/* Calendar
+ * 
+ * Styling Calendar mainly includes:
+ * 
+ * 1. Calendar container
+ * 		.dijitCalendar - main container
+ * 		.dijitCalendarHover / .dijitCalendarActive - states e.g. hover,active
+ * 
+ * 2. Month
+ * 		.dijitCalendarMonthContainer
+ * 		.dijitCalendarMonthLabel
+ *      .dijitCalendarDecrease / .dijitCalendarDecrease - icons for switching to previous/next month
+ *      .dijitCalendarArrowActive .dijitCalendarDecrease - states e.g. hover,active
+ * 
+ * 3. Date
+ * 		.dijitCalendarDayLabelTemplate - week day column header e.g. S M T W T F S
+ * 		.dijitCalendarDateTemplate - date label wrapper
+ * 		.dijitCalendarPreviousMonth .dijitCalendarDateLabel - special labels for previous or next month
+ *      .dijitCalendarSelectedDate .dijitCalendarDateLabel - styles for selected date
+ * 		.dijitCalendarDisabledDate .dijitCalendarDateLabel - styles for disabled date
+ * 		.dijitCalendarActiveDate .dijitCalendarDateLabel - states e.g. hover,active
+ * 
+ * 4. Year
+ * 		.dijitCalendarYearContainer
+ * 		.dijitCalendarYearLabel
+ * 		.dijitCalendarPreviousYear /.dijitCalendarNextYear
+ *      .dijitCalendarNextYearHover / .dijitCalendarPreviousYearHover - states e.g. hover,active
+ *      
+ * 5. Dropdown Month Menu
+ * 		.dijitCalendarMonthMenu - menu container     
+ * 		.dijitCalendarMonthMenu .dijitCalendarMonthLabel - month label in menu item
+ * 		.dijitCalendarMonthMenu .dijitCalendarMonthLabelHover - menu item hover state
+ */
+.claro .dijitCalendar {
+  border: solid 1px #b5bcc7;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  background-color: #cfe5fa;
+  background-image: url("images/calendar.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(#ffffff 0px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(#ffffff 0px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(#ffffff 0px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(#ffffff 0px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0) 100%);
+  text-align: center;
+  padding: 6px 5px 3px 5px;
+}
+.dj_ie6 .claro .dijitCalendar {
+  background-image: none;
+}
+.claro .dijitCalendar img {
+  border: none;
+}
+.claro .dijitCalendarHover,
+.claro .dijitCalendar:hover,
+.claro .dijitCalendarActive {
+  /* treat dijitCalendarActive like hover since there's
+	 * no concept of clicking a Calendar as a whole (although you can click things inside the calendar)
+	 */
+
+  background-color: #abd6ff;
+  border: solid 1px #759dc0;
+}
+.claro .dijitCalendar table {
+  border-collapse: separate;
+}
+.claro .dijitCalendarMonthContainer th {
+  text-align: center;
+  padding-bottom: 4px;
+  vertical-align: middle;
+}
+.claro .dijitCalendarMonthLabel {
+  color: #000000;
+  font-size: 1.091em;
+  padding: 0 4px;
+}
+/* next/previous month arrows */
+.claro .dijitCalendarIncrementControl {
+  width: 18px;
+  height: 16px;
+  background-image: url("images/calendarArrows.png");
+  background-repeat: no-repeat;
+}
+.dj_ie6 .claro .dijitCalendarIncrementControl {
+  background-image: url("images/calendarArrows8bit.png");
+}
+.claro .dijitCalendarIncrease {
+  background-position: -18px 0;
+}
+.claro .dijitCalendarArrowHover .dijitCalendarDecrease,
+.claro .dijitCalendarArrow:hover .dijitCalendarDecrease {
+  background-position: -36px 0;
+}
+.claro .dijitCalendarArrowHover .dijitCalendarIncrease,
+.claro .dijitCalendarArrow:hover .dijitCalendarIncrease {
+  background-position: -55px 0;
+}
+.claro .dijitCalendarArrowActive .dijitCalendarDecrease,
+.claro .dijitCalendarArrow:active .dijitCalendarDecrease {
+  background-position: -72px 0;
+}
+.claro .dijitCalendarArrowActive .dijitCalendarIncrease,
+.claro .dijitCalendarArrow:active .dijitCalendarIncrease {
+  background-position: -91px 0;
+}
+.claro .dijitA11ySideArrow {
+  /* text +/- labels instead of arrow icons, for high contrast mode */
+
+  display: none;
+}
+.claro .dijitCalendarDayLabelTemplate {
+  padding-bottom: 0;
+  text-align: center;
+  border-bottom: 1px solid #b5bcc7;
+  padding: 0 3px 2px;
+}
+.claro .dijitCalendarDayLabel {
+  padding: 0 4px 0 4px;
+  font-weight: bold;
+  font-size: 0.909em;
+  text-align: center;
+  color: #000000;
+}
+.claro .dijitCalendarDateTemplate {
+  background-color: #ffffff;
+  border-bottom: 1px solid #d3d3d3;
+  padding-top: 0;
+  font-size: 0.909em;
+  font-family: Arial;
+  font-weight: bold;
+  letter-spacing: .05em;
+  text-align: center;
+  color: #000000;
+}
+.dj_ie6 .claro .dijitCalendarDateTemplate {
+  background-image: none;
+}
+.claro .dijitCalendarPreviousMonth,
+.claro .dijitCalendarNextMonth {
+  background-color: #e5f2fe;
+  background-image: none;
+  border-bottom: solid 1px #d3d3d3;
+  /* todo: redundant with above .dijitCalendarDateTemplate rule */
+}
+.claro .dijitCalendarDateTemplate .dijitCalendarDateLabel {
+  text-decoration: none;
+  display: block;
+  padding: 3px 5px 3px 4px;
+  border: solid 1px #ffffff;
+  /* intentionally matches background-color, no visible border until hover/selection */
+
+  background-color: rgba(171, 212, 251, 0);
+  /* transparent causes black-flash animation problem on webkit */
+
+  -webkit-transition-property: background-color, border;
+  -moz-transition-property: background-color, border;
+  transition-property: background-color, border;
+  -webkit-transition-duration: 0.35s;
+  -moz-transition-duration: 0.35s;
+  transition-duration: 0.35s;
+}
+.claro .dijitCalendarPreviousMonth .dijitCalendarDateLabel,
+.claro .dijitCalendarNextMonth .dijitCalendarDateLabel {
+  color: #759dc0;
+  border-color: #e5f2fe;
+  /* intentionally matches background-color, no visible border until hover/selection */
+
+}
+.claro .dijitCalendarYearContainer {
+  vertical-align: middle;
+}
+.claro .dijitCalendarYearControl {
+  padding: 1px 2px 2px 2px;
+}
+.claro .dijitCalendarYearLabel {
+  padding: 2px 0 0 0;
+  margin: 0;
+  font-size: 1.17em;
+}
+.claro .dijitCalendarYearLabel span {
+  /* trying to center next/current/previous year vertically, doesn't work on IE6/7 though */
+
+  vertical-align: middle;
+}
+.claro .dijitCalendarSelectedYear {
+  padding: 0 3px;
+}
+.claro .dijitCalendarNextYear,
+.claro .dijitCalendarPreviousYear {
+  padding: 1px 6px 1px 6px;
+  font-size: 0.909em;
+}
+.claro .dijitCalendarSelectedYear {
+  font-size: 1.091em;
+  color: #000000;
+}
+/* End Normal Calendar Style */
+/* Hovered Calendar Style */
+.claro .dijitCalendarHoveredDate .dijitCalendarDateLabel,
+.claro .dijitCalendarLite .dijitCalendarEnabledDate:hover .dijitCalendarDateLabel {
+  background-color: #abd6ff;
+  border: solid 1px #759dc0;
+  color: #000000;
+  -webkit-transition-duration: 0.2s;
+  -moz-transition-duration: 0.2s;
+  transition-duration: 0.2s;
+}
+.claro .dijitCalendarNextYearHover,
+.claro .dijitCalendarNextYear:hover,
+.claro .dijitCalendarPreviousYearHover,
+.claro .dijitCalendarPreviousYear:hover {
+  color: #000000;
+  border: solid 1px #ffffff;
+  padding: 0 5px 0 5px;
+  /* reduced by 1 to make room for border */
+
+  background-color: #e5f2fe;
+}
+/* End Hovered Calendar Style */
+/* Active Calendar Style */
+.claro .dijitCalendarNextYearActive,
+.claro .dijitCalendarNextYear:active .claro .dijitCalendarPreviousYearActive,
+.claro .dijitCalendarPreviousYear:active {
+  border: solid 1px #759dc0;
+  padding: 0 5px 0 5px;
+  /* reduced by 1 to make room for border */
+
+  background-color: #7dbdfa;
+}
+.claro .dijitCalendarActiveDate .dijitCalendarDateLabel,
+.claro .dijitCalendarEnabledDate:active .dijitCalendarDateLabel {
+  background-color: #7dbdfa;
+  border: solid 1px #ffffff;
+  -webkit-transition-duration: 0.1s;
+  -moz-transition-duration: 0.1s;
+  transition-duration: 0.1s;
+}
+.dj_ie6 .claro .dijitCalendarActiveDate .dijitCalendarDateLabel {
+  background-image: none;
+}
+/* End Active Calendar Style */
+/* Selected Calendar Style */
+.claro .dijitCalendarSelectedDate .dijitCalendarDateLabel {
+  color: #000000;
+  background-color: #abd6ff;
+  border-color: #759dc0;
+}
+/* End Selected Calendar Style */
+/* Disabled Calendar Style*/
+.claro .dijitCalendarDisabledDate .dijitCalendarDateLabel {
+  color: #818181;
+  text-decoration: line-through;
+}
+/* End Disabled Calendar Style */
+/* Styling for month DropDownButton */
+.claro .dijitCalendar .dijitDropDownButton {
+  margin: 0;
+}
+.claro .dijitCalendar .dijitButtonText {
+  padding: 1px 0 3px;
+  margin-right: -4px;
+}
+.claro .dijitCalendar .dijitDropDownButton .dijitButtonNode {
+  padding: 0 3px 0 2px;
+  border: solid 1px #b5bcc7;
+  -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
+  -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
+  box-shadow: 0 0 0 rgba(0, 0, 0, 0);
+  background-color: transparent;
+  background-image: none;
+}
+.claro .dijitCalendar .dijitDropDownButtonHover .dijitButtonNode,
+.claro .dijitCalendar .dijitDropDownButton:hover .dijitButtonNode {
+  background-color: #e5f2fe;
+  border: solid 1px #ffffff;
+}
+/* Styling for month drop down list */
+.claro .dijitCalendarMonthMenu {
+  border-color: #759dc0;
+  background-color: #ffffff;
+  text-align: center;
+  background-image: none;
+}
+.claro .dijitCalendarMonthMenu .dijitCalendarMonthLabel {
+  border-top: solid 1px #ffffff;
+  /* intentionally invisible until hover */
+
+  border-bottom: solid 1px #ffffff;
+  padding: 2px 0;
+}
+.claro .dijitCalendarMonthMenu .dijitCalendarMonthLabelHover,
+.claro .dijitCalendarMonthMenu .dijitCalendarMonthLabelActive {
+  border-color: #759dc0;
+  border-width: 1px 0;
+  background-color: #abd6ff;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0));
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0));
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0));
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0));
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr= #ffffff , endColorstr= #abd6ff );
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Calendar.less b/src/main/resources/static/dijit/themes/claro/Calendar.less
new file mode 100644
index 0000000000000000000000000000000000000000..266f60b44e4c23dfad9b324075ae68f7b1864b58
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Calendar.less
@@ -0,0 +1,279 @@
+/* Calendar
+ * 
+ * Styling Calendar mainly includes:
+ * 
+ * 1. Calendar container
+ * 		.dijitCalendar - main container
+ * 		.dijitCalendarHover / .dijitCalendarActive - states e.g. hover,active
+ * 
+ * 2. Month
+ * 		.dijitCalendarMonthContainer
+ * 		.dijitCalendarMonthLabel
+ *      .dijitCalendarDecrease / .dijitCalendarDecrease - icons for switching to previous/next month
+ *      .dijitCalendarArrowActive .dijitCalendarDecrease - states e.g. hover,active
+ * 
+ * 3. Date
+ * 		.dijitCalendarDayLabelTemplate - week day column header e.g. S M T W T F S
+ * 		.dijitCalendarDateTemplate - date label wrapper
+ * 		.dijitCalendarPreviousMonth .dijitCalendarDateLabel - special labels for previous or next month
+ *      .dijitCalendarSelectedDate .dijitCalendarDateLabel - styles for selected date
+ * 		.dijitCalendarDisabledDate .dijitCalendarDateLabel - styles for disabled date
+ * 		.dijitCalendarActiveDate .dijitCalendarDateLabel - states e.g. hover,active
+ * 
+ * 4. Year
+ * 		.dijitCalendarYearContainer
+ * 		.dijitCalendarYearLabel
+ * 		.dijitCalendarPreviousYear /.dijitCalendarNextYear
+ *      .dijitCalendarNextYearHover / .dijitCalendarPreviousYearHover - states e.g. hover,active
+ *      
+ * 5. Dropdown Month Menu
+ * 		.dijitCalendarMonthMenu - menu container     
+ * 		.dijitCalendarMonthMenu .dijitCalendarMonthLabel - month label in menu item
+ * 		.dijitCalendarMonthMenu .dijitCalendarMonthLabelHover - menu item hover state
+ */
+
+@import "variables";
+
+.claro .dijitCalendar {
+	border: solid 1px @border-color;
+	.border-radius(4px);
+
+	// Background color and alpha-gradient
+	background-color: @calendar-background-color;
+	background-image: url("images/calendar.png");	// fallback for browsers that don't support CSS gradients
+	background-repeat: repeat-x;	// so bottom of calendar isn't affected by gradient image repeating
+	.alpha-white-gradient(1, 0px, 0.4, 2px, 0, 100%);
+
+	text-align:center;
+	padding:6px 5px 3px 5px;
+}
+.dj_ie6 .claro .dijitCalendar {
+	background-image:none;	// because on IE6 background-image overrides background-color
+}
+.claro .dijitCalendar img {
+	border:none;
+}
+.claro .dijitCalendarHover, .claro .dijitCalendar:hover,
+.claro .dijitCalendarActive {
+	/* treat dijitCalendarActive like hover since there's
+	 * no concept of clicking a Calendar as a whole (although you can click things inside the calendar)
+	 */
+	background-color: @hovered-background-color;
+	border:solid 1px @hovered-border-color;
+}
+.claro .dijitCalendar table {
+  border-collapse: separate;	// in case user CSS has set border-collapse: collapse for tables
+}
+.claro .dijitCalendarMonthContainer th {
+	text-align:center;
+	padding-bottom:4px;
+	vertical-align:middle;
+}
+.claro .dijitCalendarMonthLabel {
+	color: @text-color;
+	font-size: 1.091em;
+	padding: 0 4px;
+}
+
+/* next/previous month arrows */
+.claro .dijitCalendarIncrementControl {
+	width:18px;
+	height:16px;
+	background-image: url(@image-calendar-arrows);
+	background-repeat: no-repeat;
+}
+.dj_ie6 .claro .dijitCalendarIncrementControl {
+	background-image: url(@image-calendar-arrows-ie6);
+}
+.claro .dijitCalendarIncrease {
+	background-position:-18px 0;
+}
+.claro .dijitCalendarArrowHover .dijitCalendarDecrease,
+.claro .dijitCalendarArrow:hover .dijitCalendarDecrease {
+	background-position:-36px 0;
+}
+.claro .dijitCalendarArrowHover .dijitCalendarIncrease,
+.claro .dijitCalendarArrow:hover .dijitCalendarIncrease {
+	background-position:-55px 0;
+}
+.claro .dijitCalendarArrowActive .dijitCalendarDecrease,
+.claro .dijitCalendarArrow:active .dijitCalendarDecrease {
+	background-position:-72px 0;
+}
+.claro .dijitCalendarArrowActive .dijitCalendarIncrease,
+.claro .dijitCalendarArrow:active .dijitCalendarIncrease {
+	background-position:-91px 0;
+}
+.claro .dijitA11ySideArrow {
+	/* text +/- labels instead of arrow icons, for high contrast mode */
+	display: none;
+}
+
+.claro .dijitCalendarDayLabelTemplate {
+	padding-bottom:0;
+	text-align:center;
+	border-bottom:1px solid @border-color;
+	padding:0 3px 2px;
+}
+.claro .dijitCalendarDayLabel {
+	padding:0 4px 0 4px;
+	font-weight:bold;
+	font-size:0.909em;
+	text-align:center;
+	color: @text-color;
+}
+.claro .dijitCalendarDateTemplate {
+	text-align:center;
+	background-color:@calendar-currentmonth-background-color;
+	border-bottom: 1px solid @minor-border-color;
+	padding-top:0;
+	font-size:0.909em;
+	font-family: Arial;
+	font-weight:bold;
+	letter-spacing:.05em;
+	text-align:center;
+	color: @text-color;
+}
+.dj_ie6 .claro .dijitCalendarDateTemplate {
+	background-image: none;
+}
+.claro .dijitCalendarPreviousMonth,
+.claro .dijitCalendarNextMonth {
+	background-color: @calendar-adjacentmonth-background-color;
+	background-image:none;
+	border-bottom:solid 1px @minor-border-color;	/* todo: redundant with above .dijitCalendarDateTemplate rule */	
+}
+.claro .dijitCalendarDateTemplate .dijitCalendarDateLabel {
+	text-decoration:none;
+	display:block;
+	padding:3px 5px 3px 4px;
+	border:solid 1px @calendar-currentmonth-background-color;	/* intentionally matches background-color, no visible border until hover/selection */
+	background-color:rgba(171,212,251,0);	/* transparent causes black-flash animation problem on webkit */
+	.transition-property(background-color, border);
+ 	.transition-duration(.35s);
+}
+.claro .dijitCalendarPreviousMonth .dijitCalendarDateLabel,
+.claro .dijitCalendarNextMonth .dijitCalendarDateLabel{
+	color: @calendar-adjacentmonth-text-color;
+	border-color: @calendar-adjacentmonth-background-color;	/* intentionally matches background-color, no visible border until hover/selection */
+}
+
+.claro .dijitCalendarYearContainer {
+	vertical-align:middle;
+}
+.claro .dijitCalendarYearControl {
+	padding: 1px 2px 2px 2px;
+}
+.claro .dijitCalendarYearLabel {
+	padding: 2px 0 0 0;
+	margin: 0;
+	font-size: 1.17em;
+}
+.claro .dijitCalendarYearLabel span {
+	/* trying to center next/current/previous year vertically, doesn't work on IE6/7 though */
+	vertical-align:middle;
+}
+.claro .dijitCalendarSelectedYear {
+	padding:0 3px;
+}
+.claro .dijitCalendarNextYear,
+.claro .dijitCalendarPreviousYear {
+	padding: 1px 6px 1px 6px;
+	font-size:0.909em;
+}
+.claro .dijitCalendarSelectedYear {
+	font-size:1.091em;
+	color:@selected-text-color;
+}
+/* End Normal Calendar Style */
+/* Hovered Calendar Style */
+.claro .dijitCalendarHoveredDate .dijitCalendarDateLabel,
+.claro .dijitCalendarLite .dijitCalendarEnabledDate:hover .dijitCalendarDateLabel {
+	background-color:@hovered-background-color;
+	border:solid 1px @hovered-border-color;
+	color:@hovered-text-color;
+	.transition-duration(.2s);
+}
+.claro .dijitCalendarNextYearHover, .claro .dijitCalendarNextYear:hover,
+.claro .dijitCalendarPreviousYearHover, .claro .dijitCalendarPreviousYear:hover {
+	color:@hovered-text-color;
+	border:solid 1px @calendar-button-hovered-border-color;
+	padding: 0 5px 0 5px;	/* reduced by 1 to make room for border */
+	background-color: @calendar-button-hovered-background-color;
+}
+/* End Hovered Calendar Style */
+/* Active Calendar Style */
+.claro .dijitCalendarNextYearActive, .claro .dijitCalendarNextYear:active
+.claro .dijitCalendarPreviousYearActive, .claro .dijitCalendarPreviousYear:active {
+	border: solid 1px @calendar-button-pressed-border-color;
+	padding: 0 5px 0 5px;	/* reduced by 1 to make room for border */
+	background-color:@calendar-button-pressed-background-color;
+}
+.claro .dijitCalendarActiveDate .dijitCalendarDateLabel,
+.claro .dijitCalendarEnabledDate:active .dijitCalendarDateLabel {
+	background-color: @calendar-date-pressed-background-color;
+	border:solid 1px @calendar-date-pressed-border-color;
+	.transition-duration(.1s);
+}
+.dj_ie6 .claro .dijitCalendarActiveDate .dijitCalendarDateLabel {
+	background-image:none;
+}
+/* End Active Calendar Style */
+/* Selected Calendar Style */
+.claro .dijitCalendarSelectedDate .dijitCalendarDateLabel {
+	color:@selected-text-color;
+	background-color: @calendar-date-selected-background-color;
+	border-color: @calendar-date-selected-border-color;
+}
+/* End Selected Calendar Style */
+/* Disabled Calendar Style*/
+.claro .dijitCalendarDisabledDate .dijitCalendarDateLabel {
+	color: @disabled-text-color;
+	text-decoration:line-through;
+}
+
+/* End Disabled Calendar Style */
+
+/* Styling for month DropDownButton */
+
+.claro .dijitCalendar .dijitDropDownButton {
+	margin: 0;
+}
+.claro .dijitCalendar .dijitButtonText {
+	padding: 1px 0 3px;
+	margin-right:-4px;
+}
+.claro .dijitCalendar .dijitDropDownButton .dijitButtonNode {
+	padding: 0 3px 0 2px;
+	border:solid 1px @border-color;
+	.box-shadow(0 0 0 rgba(0,0,0,0));
+
+    // Override background settings from vanilla .dijitButtonNode.   We want to inherit background of Calendar.
+	background-color: transparent;
+	background-image: none;
+}
+.claro .dijitCalendar .dijitDropDownButtonHover .dijitButtonNode,
+.claro .dijitCalendar .dijitDropDownButton:hover .dijitButtonNode {
+	background-color: @calendar-button-hovered-background-color;
+	border:solid 1px @calendar-button-hovered-border-color;
+}
+
+/* Styling for month drop down list */
+
+.claro .dijitCalendarMonthMenu {
+	border-color: @popup-border-color;
+	background-color: @menu-background-color;
+	text-align:center;
+	background-image: none;
+}
+.claro .dijitCalendarMonthMenu .dijitCalendarMonthLabel {
+	border-top: solid 1px @menu-background-color;		/* intentionally invisible until hover */
+	border-bottom: solid 1px @menu-background-color;
+	padding: 2px 0;
+}
+.claro .dijitCalendarMonthMenu .dijitCalendarMonthLabelHover,
+.claro .dijitCalendarMonthMenu .dijitCalendarMonthLabelActive {
+	border-color: @hovered-border-color;
+	border-width:1px 0;
+	.gradient-and-filter(@hovered-background-color, 70, 0);
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Calendar_rtl.css b/src/main/resources/static/dijit/themes/claro/Calendar_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..5892a64bf89d3a358738df2cdbf74e3fcb373d39
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Calendar_rtl.css
@@ -0,0 +1,18 @@
+.claro .dijitCalendarRtl .dijitCalendarIncrease {
+  background-position: 0 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarDecrease {
+  background-position: -18px 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarArrowHover .dijitCalendarIncrease {
+  background-position: -36px 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarArrowHover .dijitCalendarDecrease {
+  background-position: -55px 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarArrowActive .dijitCalendarIncrease {
+  background-position: -72px 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarArrowActive .dijitCalendarDecrease {
+  background-position: -91px 0;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Calendar_rtl.less b/src/main/resources/static/dijit/themes/claro/Calendar_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..713717bd7d4a89af9c033dccf5a1ee525c5e710f
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Calendar_rtl.less
@@ -0,0 +1,19 @@
+.claro .dijitCalendarRtl .dijitCalendarIncrease{
+	background-position: 0 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarDecrease {
+	background-position: -18px 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarArrowHover .dijitCalendarIncrease {
+	background-position: -36px 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarArrowHover .dijitCalendarDecrease {
+	background-position: -55px 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarArrowActive .dijitCalendarIncrease {
+	background-position: -72px 0;
+}
+.claro .dijitCalendarRtl .dijitCalendarArrowActive .dijitCalendarDecrease {
+	background-position: -91px 0;
+}
+
diff --git a/src/main/resources/static/dijit/themes/claro/ColorPalette.css b/src/main/resources/static/dijit/themes/claro/ColorPalette.css
new file mode 100644
index 0000000000000000000000000000000000000000..6b959200a23981e73bd27029888a6c0503212635
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/ColorPalette.css
@@ -0,0 +1,42 @@
+/* ColorPalette
+ * 
+ * Styling of the ColorPalette consists of the following:
+ * 
+ * 1. the whole color palette
+ *		.dijitColorPalette - for outline, border, and background color of the whole color palette
+ *		Note: outline does not work for IE
+ *
+ * 2. the color swatch 
+ *		.dijitColorPalette .dijitPaletteImg
+ *		transparent (but clickable) <img> node inside of each <td>, overlaying the color swatch.
+ *		displays border around a color swatch
+ *
+ * 3. hovered swatch
+ * 		.dijitColorPalette .dijitPaletteCell:hover .dijitPaletteImg
+ *		the hovered state of the color swatch - adds border
+ * 	
+ * 4. active and selected swatch
+ * 		.dijitColorPalette .dijitPaletteCell:active .dijitPaletteImg
+ *		.dijitColorPalette .dijitPaletteCellSelected .dijitPaletteImg
+ *		adds border for active or selected state
+ */
+.claro .dijitColorPalette {
+  border: 1px solid #b5bcc7;
+  background: #ffffff;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.claro .dijitColorPalette .dijitPaletteImg {
+  /* transparent (but clickable) <img> node inside of each <td>, overlaying the color swatch.
+	 * displays border around a color swatch
+	 * overrides border color in dijit.css */
+
+  border: 1px solid #d3d3d3;
+}
+.claro .dijitColorPalette .dijitPaletteCell:hover .dijitPaletteImg {
+  border: 1px solid #000000;
+}
+.claro .dijitColorPalette .dijitPaletteCell:active .dijitPaletteImg,
+.claro .dijitColorPalette .dijitPaletteTable .dijitPaletteCellSelected .dijitPaletteImg {
+  border: 2px solid #000000;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/ColorPalette.less b/src/main/resources/static/dijit/themes/claro/ColorPalette.less
new file mode 100644
index 0000000000000000000000000000000000000000..ffa3ac051337adb317e2d4b21d620741a0f493fc
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/ColorPalette.less
@@ -0,0 +1,44 @@
+/* ColorPalette
+ * 
+ * Styling of the ColorPalette consists of the following:
+ * 
+ * 1. the whole color palette
+ *		.dijitColorPalette - for outline, border, and background color of the whole color palette
+ *		Note: outline does not work for IE
+ *
+ * 2. the color swatch 
+ *		.dijitColorPalette .dijitPaletteImg
+ *		transparent (but clickable) <img> node inside of each <td>, overlaying the color swatch.
+ *		displays border around a color swatch
+ *
+ * 3. hovered swatch
+ * 		.dijitColorPalette .dijitPaletteCell:hover .dijitPaletteImg
+ *		the hovered state of the color swatch - adds border
+ * 	
+ * 4. active and selected swatch
+ * 		.dijitColorPalette .dijitPaletteCell:active .dijitPaletteImg
+ *		.dijitColorPalette .dijitPaletteCellSelected .dijitPaletteImg
+ *		adds border for active or selected state
+ */
+
+@import "variables";
+
+.claro  .dijitColorPalette {
+	border: 1px solid @border-color;
+	background: @colorpalette-background-color;
+	.border-radius(0);
+}
+
+.claro .dijitColorPalette .dijitPaletteImg {
+	/* transparent (but clickable) <img> node inside of each <td>, overlaying the color swatch.
+	 * displays border around a color swatch
+	 * overrides border color in dijit.css */
+	border: 1px solid @minor-border-color;
+}
+.claro .dijitColorPalette .dijitPaletteCell:hover .dijitPaletteImg {
+	border: 1px solid @swatch-hovered-border-color;
+}
+.claro .dijitColorPalette .dijitPaletteCell:active .dijitPaletteImg,
+.claro .dijitColorPalette .dijitPaletteTable .dijitPaletteCellSelected .dijitPaletteImg {
+	border: 2px solid @swatch-selected-border-color;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Common.css b/src/main/resources/static/dijit/themes/claro/Common.css
new file mode 100644
index 0000000000000000000000000000000000000000..ba9dcec039a6464f0d6491b092caf18c859c19c8
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Common.css
@@ -0,0 +1,100 @@
+/* ========= Styling rules to affect widgets ========= */
+.claro .dijitPopup {
+  -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25);
+  box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25);
+}
+.claro .dijitTooltipDialogPopup {
+  /* exception popups: do not use a shadow on these because they aren't rectangular */
+
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+/* The highlight is shown in the ComboBox menu.  TODO: move to form/Common.less */
+.claro .dijitComboBoxHighlightMatch {
+  background-color: #abd6ff;
+}
+.claro .dijitFocusedLabel {
+  /* for checkboxes or radio buttons, hatch border around the corresponding label, to indicate focus */
+
+  outline: 1px dotted #494949;
+}
+/* Drag and Drop*/
+.claro .dojoDndItem {
+  border-color: rgba(0, 0, 0, 0);
+  -webkit-transition-duration: 0.25s;
+  -moz-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+  -webkit-transition-property: background-color, border-color;
+  -moz-transition-property: background-color, border-color;
+  transition-property: background-color, border-color;
+}
+.claro .dojoDndItemOver {
+  background-color: #abd6ff;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 1px;
+  border: solid 1px #759dc0;
+  color: #000000;
+}
+.claro .dojoDndItemAnchor,
+.claro .dojoDndItemSelected {
+  background-color: #cfe5fa;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 1px;
+  border: solid 1px #759dc0;
+  color: #000000;
+}
+.claro .dojoDndItemBefore,
+.claro .dojoDndItemAfter {
+  border-color: #759dc0;
+}
+.claro table.dojoDndAvatar {
+  border: 1px solid #b5bcc7;
+  border-collapse: collapse;
+  background-color: #ffffff;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25);
+}
+.claro .dojoDndAvatarHeader td {
+  height: 20px;
+  padding-left: 21px;
+}
+.claro.dojoDndMove .dojoDndAvatarHeader,
+.claro.dojoDndCopy .dojoDndAvatarHeader {
+  background-image: url("images/dnd.png");
+  background-repeat: no-repeat;
+  background-position: 2px -122px;
+}
+.claro .dojoDndAvatarItem td {
+  padding: 5px;
+}
+.claro.dojoDndMove .dojoDndAvatarHeader {
+  background-color: #f58383;
+  background-position: 2px -103px;
+}
+.claro.dojoDndCopy .dojoDndAvatarHeader {
+  background-color: #f58383;
+  background-position: 2px -68px;
+}
+.claro.dojoDndMove .dojoDndAvatarCanDrop .dojoDndAvatarHeader {
+  background-color: #97e68d;
+  background-position: 2px -33px;
+}
+.claro.dojoDndCopy .dojoDndAvatarCanDrop .dojoDndAvatarHeader {
+  background-color: #97e68d;
+  background-position: 2px 2px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Common.less b/src/main/resources/static/dijit/themes/claro/Common.less
new file mode 100644
index 0000000000000000000000000000000000000000..078d6fdca807e884bd4855b0ac7153f9c521f094
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Common.less
@@ -0,0 +1,86 @@
+/* ========= Styling rules to affect widgets ========= */
+
+@import "variables";
+
+.claro .dijitPopup {
+	.box-shadow(0 1px 5px rgba(0,0,0,0.25));
+}
+.claro .dijitTooltipDialogPopup {
+	/* exception popups: do not use a shadow on these because they aren't rectangular */
+	.box-shadow(none);
+}
+
+/* The highlight is shown in the ComboBox menu.  TODO: move to form/Common.less */
+.claro .dijitComboBoxHighlightMatch {
+	background-color: @select-matchedtext-background-color;
+}
+
+.claro .dijitFocusedLabel {
+	/* for checkboxes or radio buttons, hatch border around the corresponding label, to indicate focus */
+	outline: 1px dotted @focus-outline-color;
+}
+
+/* Drag and Drop*/
+.claro .dojoDndItem {
+	border-color: rgba(0,0,0,0);	// rgba() instead of none to prevent flash on hover fade-in
+	.transition-duration(.25s);
+	.transition-property(background-color, border-color)
+}
+.claro .dojoDndItemOver {
+    // Hovered item.  Matches dijitTreeRowHover.
+	background-color:@hovered-background-color;
+	.standard-gradient;
+	padding: 1px;	// reduce from 2px in dijit.css
+	border:solid 1px @hovered-border-color;
+	color:@hovered-text-color;
+}
+.claro .dojoDndItemAnchor,
+.claro .dojoDndItemSelected {
+    // Selected items(s).   Matches dijitTreeRowSelected.
+	background-color:@selected-background-color;
+	.standard-gradient;
+	padding: 1px;	// reduce from 2px in dijit.css
+	border:solid 1px @selected-border-color;
+	color:@selected-text-color;
+}
+
+.claro .dojoDndItemBefore,
+.claro .dojoDndItemAfter {
+    // line to indicate that user is dropping before/after this dojoDndItem
+	border-color: @dnd-dropseparator-color;
+}
+
+.claro table.dojoDndAvatar {
+	border: 1px solid @border-color;
+	border-collapse: collapse;
+	background-color: @dnd-avatar-background-color;
+	.box-shadow(0 1px 3px rgba(0, 0, 0, .25));
+}
+.claro .dojoDndAvatarHeader td	{ 
+	height: 20px;
+	padding-left:21px;
+}
+.claro.dojoDndMove .dojoDndAvatarHeader, .claro.dojoDndCopy .dojoDndAvatarHeader {
+	background-image: url(@image-dnd);
+	background-repeat: no-repeat;
+	background-position:2px -122px;
+}
+.claro .dojoDndAvatarItem td {
+	padding: 5px;
+}
+.claro.dojoDndMove .dojoDndAvatarHeader	{
+	background-color: @dnd-avatar-header-background-color; 
+	background-position:2px -103px;
+}
+.claro.dojoDndCopy .dojoDndAvatarHeader	{
+	background-color: @dnd-avatar-header-background-color; 
+	background-position:2px -68px;
+}
+.claro.dojoDndMove .dojoDndAvatarCanDrop .dojoDndAvatarHeader	{
+	background-color: @dnd-avatar-candrop-header-background-color; 
+	background-position:2px -33px;
+}
+.claro.dojoDndCopy .dojoDndAvatarCanDrop .dojoDndAvatarHeader	{
+	background-color: @dnd-avatar-candrop-header-background-color;
+	background-position:2px 2px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Dialog.css b/src/main/resources/static/dijit/themes/claro/Dialog.css
new file mode 100644
index 0000000000000000000000000000000000000000..c2460f470efa0e426a5e0ecb73bf449c881891e2
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Dialog.css
@@ -0,0 +1,223 @@
+/* Dialog 
+ * 
+ * Styling Dialog includes two sections: Dialog and Tooltip & TooltipDialog
+ * 
+ * Dialog:
+ * 1. Dialog (default styling): 
+ * 		.dijitDialog - styles for dialog's bounding box
+ *
+ * 2. Dialog title 
+ * 		.dijitDialogTitleBar - styles for the title container at the top of dialog
+ * 		.dijitDialogTitle - the text container in dialog title
+ * 
+ * 3. Dialog content 
+ * 		.dijitDialogPaneContent - main container for content area and action bar
+ * 		.dijitDialogPaneContentArea - styles for content container
+ * 
+ * 4. Dialog action bar 
+ * 		.dijitDialogPaneActionBar - styles for action buttons lie at the bottom of dialog pane content
+ * 
+ * 5. Dialog underlay 
+ * 		.dijitDialogUnderlay - div under the dialog which used for separate dialog and page content
+ * 
+ * 
+ * Tooltip & TooltipDialog:
+ * 1. tooltip content container: 
+ * 		.dijitTooltipContainer - tooltip content container
+ *
+ * 2. tooltip connector: 
+ * 		.dijitTooltipConnector - tooltip anchor includes 4 direction(up, down, left, right)
+ */
+.claro .dijitDialog {
+  border: 1px solid #759dc0;
+  -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25);
+  box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25);
+}
+.claro .dijitDialogPaneContent {
+  background: #ffffff repeat-x top left;
+  border-top: 1px solid #759dc0;
+  padding: 10px 8px;
+  position: relative;
+}
+.claro .dijitDialogPaneContentArea {
+  /* trick to get action bar (gray bar at bottom with OK/cancel buttons) to span from
+	 * left to right but still indent dialog content
+	 */
+  margin: -10px -8px;
+  padding: 10px 8px;
+}
+.claro .dijitDialogPaneActionBar {
+  /* gray bar at bottom of dialog with OK/Cancel buttons */
+
+  background-color: #efefef;
+  padding: 3px 5px 2px 7px;
+  text-align: right;
+  border-top: 1px solid #d3d3d3;
+}
+.claro .dijitDialogPaneContent .dijitDialogPaneActionBar {
+  margin: 10px -8px -10px;
+}
+.claro .dijitTooltipDialog .dijitDialogPaneActionBar {
+  -webkit-border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  margin: 10px -10px -8px;
+}
+.claro .dijitDialogPaneActionBar .dijitButton {
+  float: none;
+}
+.claro .dijitDialogTitleBar {
+  /* outer container for the titlebar of the dialog */
+
+  border: 1px solid #ffffff;
+  border-top: none;
+  background-color: #abd6ff;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 5px 7px 4px 7px;
+}
+.claro .dijitDialogTitle {
+  /* typography and styling of the dialog title */
+
+  padding: 0 1px;
+  font-size: 1.091em;
+  color: #000000;
+}
+.claro .dijitDialogCloseIcon {
+  /* the default close icon for the dialog */
+
+  background: url("images/dialogCloseIcon.png");
+  background-repeat: no-repeat;
+  position: absolute;
+  right: 5px;
+  height: 15px;
+  width: 21px;
+}
+.dj_ie6 .claro .dijitDialogCloseIcon {
+  background-image: url("images/dialogCloseIcon8bit.png");
+}
+.claro .dijitDialogCloseIconHover {
+  background-position: -21px;
+}
+.claro .dijitDialogCloseIcon:active {
+  background-position: -42px;
+}
+/* Tooltip and TooltipDialog */
+.claro .dijitTooltip,
+.claro .dijitTooltipDialog {
+  /* the outermost dom node, holding the connector and container */
+
+  background: transparent;
+  /* make the area on the sides of the arrow transparent */
+
+}
+.dijitTooltipBelow {
+  /* leave room for arrow above content */
+
+  padding-top: 13px;
+  padding-left: 3px;
+  padding-right: 3px;
+}
+.dijitTooltipAbove {
+  /* leave room for arrow below content */
+
+  padding-bottom: 13px;
+  padding-left: 3px;
+  padding-right: 3px;
+}
+.claro .dijitTooltipContainer {
+  /* the part with the text */
+
+  background-color: #ffffff;
+  background-image: -moz-linear-gradient(bottom, rgba(207, 229, 250, 0.1) 0px, #ffffff 10px);
+  background-image: -webkit-linear-gradient(bottom, rgba(207, 229, 250, 0.1) 0px, #ffffff 10px);
+  background-image: -o-linear-gradient(bottom, rgba(207, 229, 250, 0.1) 0px, #ffffff 10px);
+  background-image: linear-gradient(bottom, rgba(207, 229, 250, 0.1) 0px, #ffffff 10px);
+  background-position: bottom;
+  border: 1px solid #759dc0;
+  padding: 6px 8px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25);
+  font-size: 1em;
+  color: #000000;
+}
+.claro .dijitTooltipConnector {
+  /* the arrow piece */
+
+  border: 0;
+  z-index: 2;
+  background-image: url("images/tooltip.png");
+  background-repeat: no-repeat;
+  width: 16px;
+  height: 14px;
+}
+.dj_ie6 .claro .dijitTooltipConnector {
+  background-image: url("images/tooltip8bit.png");
+}
+.claro .dijitTooltipBelow .dijitTooltipConnector {
+  /* the arrow piece for tooltips below an element */
+
+  top: 0;
+  left: 3px;
+  background-position: -31px 0;
+  width: 16px;
+  height: 14px;
+}
+.claro .dijitTooltipAbove .dijitTooltipConnector {
+  /* the arrow piece for tooltips above an element */
+
+  bottom: 0;
+  left: 3px;
+  background-position: -15px 0;
+  width: 16px;
+  height: 14px;
+}
+.dj_ie7 .claro .dijitTooltipAbove .dijitTooltipConnector,
+.dj_ie6 .claro .dijitTooltipAbove .dijitTooltipConnector {
+  bottom: -1px;
+}
+.claro .dijitTooltipABRight .dijitTooltipConnector {
+  /* above or below tooltip, but the arrow appears on the right,
+		and the right edges of target and tooltip are aligned rather than the left.
+		Override above rules for .dijitTooltipBelow, .dijitTooltipAbove */
+
+  left: auto;
+  right: 3px;
+}
+.claro .dijitTooltipLeft {
+  padding-right: 14px;
+}
+.claro .dijitTooltipLeft .dijitTooltipConnector {
+  /* the arrow piece for tooltips to the left of an element, bottom borders aligned */
+
+  right: 0;
+  background-position: 0 0;
+  width: 16px;
+  height: 14px;
+}
+.claro .dijitTooltipRight {
+  padding-left: 14px;
+}
+.claro .dijitTooltipRight .dijitTooltipConnector {
+  /* the arrow piece for tooltips to the right of an element, bottom borders aligned */
+
+  left: 0;
+  background-position: -48px 0;
+  width: 16px;
+  height: 14px;
+}
+.claro .dijitDialogUnderlay {
+  background: #ffffff;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Dialog.less b/src/main/resources/static/dijit/themes/claro/Dialog.less
new file mode 100644
index 0000000000000000000000000000000000000000..eee3cdaf7c8ea522ed4308e009617fa475105fdb
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Dialog.less
@@ -0,0 +1,215 @@
+/* Dialog 
+ * 
+ * Styling Dialog includes two sections: Dialog and Tooltip & TooltipDialog
+ * 
+ * Dialog:
+ * 1. Dialog (default styling): 
+ * 		.dijitDialog - styles for dialog's bounding box
+ *
+ * 2. Dialog title 
+ * 		.dijitDialogTitleBar - styles for the title container at the top of dialog
+ * 		.dijitDialogTitle - the text container in dialog title
+ * 
+ * 3. Dialog content 
+ * 		.dijitDialogPaneContent - main container for content area and action bar
+ * 		.dijitDialogPaneContentArea - styles for content container
+ * 
+ * 4. Dialog action bar 
+ * 		.dijitDialogPaneActionBar - styles for action buttons lie at the bottom of dialog pane content
+ * 
+ * 5. Dialog underlay 
+ * 		.dijitDialogUnderlay - div under the dialog which used for separate dialog and page content
+ * 
+ * 
+ * Tooltip & TooltipDialog:
+ * 1. tooltip content container: 
+ * 		.dijitTooltipContainer - tooltip content container
+ *
+ * 2. tooltip connector: 
+ * 		.dijitTooltipConnector - tooltip anchor includes 4 direction(up, down, left, right)
+ */
+
+@import "variables";
+
+.claro .dijitDialog {
+	border: 1px solid @popup-border-color;
+	.box-shadow(0 1px 5px rgba(0,0,0,0.25));
+} 
+
+.claro .dijitDialogPaneContent {
+	background: @pane-background-color repeat-x top left;
+	border-top: 1px solid @popup-border-color;
+	padding:10px 8px;
+	position: relative;
+}
+
+.claro .dijitDialogPaneContentArea {
+	/* trick to get action bar (gray bar at bottom with OK/cancel buttons) to span from
+	 * left to right but still indent dialog content
+	 */ 
+	margin: -10px -8px;
+	padding: 10px 8px;
+}
+
+.claro .dijitDialogPaneActionBar {
+	/* gray bar at bottom of dialog with OK/Cancel buttons */
+	background-color: @bar-background-color;
+	padding: 3px 5px 2px 7px;
+	text-align: right;
+	border-top: 1px solid @minor-border-color;
+}
+.claro .dijitDialogPaneContent .dijitDialogPaneActionBar {
+	margin: 10px -8px -10px;	// Offsets 10px padding on dijitDialogPaneContent
+}
+
+.claro .dijitTooltipDialog .dijitDialogPaneActionBar {
+  -webkit-border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  margin: 10px -10px -8px;
+}
+.claro .dijitDialogPaneActionBar .dijitButton {
+	float: none;
+}
+
+.claro .dijitDialogTitleBar {
+	/* outer container for the titlebar of the dialog */
+	border: 1px solid @dialog-titlebar-border-color;
+	border-top:none;
+	background-color: @dialog-titlebar-background-color;
+	.standard-gradient;
+	padding: 5px 7px 4px 7px;
+}
+
+.claro .dijitDialogTitle {
+	/* typography and styling of the dialog title */
+	padding: 0 1px;
+	font-size:1.091em;
+	color: @text-color;
+}
+
+.claro .dijitDialogCloseIcon {
+	/* the default close icon for the dialog */
+	background: url(@image-dialog-close);
+	background-repeat:no-repeat;
+	position: absolute;
+	right: 5px;
+	height: 15px;
+	width: 21px;
+}
+.dj_ie6 .claro .dijitDialogCloseIcon {
+	background-image: url(@image-dialog-close-ie6);
+}
+.claro .dijitDialogCloseIconHover {
+	background-position:-21px;
+}
+.claro .dijitDialogCloseIcon:active {
+	background-position:-42px;
+}
+
+/* Tooltip and TooltipDialog */
+
+.claro .dijitTooltip,
+.claro .dijitTooltipDialog {
+	/* the outermost dom node, holding the connector and container */
+	background: transparent;	/* make the area on the sides of the arrow transparent */
+}
+.dijitTooltipBelow {
+	/* leave room for arrow above content */
+	padding-top: 13px;
+	padding-left:3px;
+	padding-right:3px;
+}
+
+.dijitTooltipAbove {
+	/* leave room for arrow below content */
+	padding-bottom: 13px;
+	padding-left:3px;
+	padding-right:3px;
+}
+
+.claro .dijitTooltipContainer {
+	/* the part with the text */
+	background-color:@popup-background-color;
+	.linear-gradient(bottom, @tooltip-gradient-color 0px, @popup-background-color 10px);
+	background-position:bottom;
+	border:1px solid @popup-border-color;
+	padding:6px 8px;
+	.border-radius(4px);
+	.box-shadow(0 1px 3px rgba(0,0,0,0.25));
+	font-size: 1em;
+	color: @text-color;
+} 
+
+.claro .dijitTooltipConnector {
+	/* the arrow piece */
+	border: 0;
+	z-index: 2;
+	background-image:url(@image-tooltip);
+	background-repeat:no-repeat;
+	width:16px;
+	height:14px;
+}
+.dj_ie6 .claro .dijitTooltipConnector {
+	background-image:url(@image-tooltip-ie6);
+}
+
+.claro .dijitTooltipBelow .dijitTooltipConnector {
+	/* the arrow piece for tooltips below an element */
+	top: 0;
+	left: 3px;
+	background-position:-31px 0;
+	width:16px;
+	height:14px;
+}
+
+.claro .dijitTooltipAbove .dijitTooltipConnector {
+	/* the arrow piece for tooltips above an element */
+	bottom: 0;
+	left: 3px;
+	background-position:-15px 0;
+	width:16px;
+	height:14px;
+}
+.dj_ie7 .claro .dijitTooltipAbove .dijitTooltipConnector,
+.dj_ie6 .claro .dijitTooltipAbove .dijitTooltipConnector {
+	bottom: -1px;
+}
+
+.claro .dijitTooltipABRight .dijitTooltipConnector {
+	/* above or below tooltip, but the arrow appears on the right,
+		and the right edges of target and tooltip are aligned rather than the left.
+		Override above rules for .dijitTooltipBelow, .dijitTooltipAbove */
+	left: auto;
+	right: 3px;
+}
+
+
+.claro .dijitTooltipLeft {
+	padding-right: 14px;
+}
+.claro .dijitTooltipLeft .dijitTooltipConnector {
+	/* the arrow piece for tooltips to the left of an element, bottom borders aligned */
+	right: 0;
+	background-position:0 0;
+	width:16px;
+	height:14px;
+}
+
+.claro .dijitTooltipRight {
+	padding-left: 14px;
+}
+.claro .dijitTooltipRight .dijitTooltipConnector {
+	/* the arrow piece for tooltips to the right of an element, bottom borders aligned */
+	left: 0;
+	background-position:-48px 0;
+	width:16px;
+	height:14px;
+}
+
+.claro .dijitDialogUnderlay {
+	background: @dialog-underlay-color;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Dialog_rtl.css b/src/main/resources/static/dijit/themes/claro/Dialog_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..34930eb644962694322e95b4943ab1eccc145614
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Dialog_rtl.css
@@ -0,0 +1,9 @@
+/* Dialog */
+.claro .dijitDialogRtl .dijitDialogCloseIcon {
+  right: auto;
+  left: 5px;
+}
+.claro .dijitDialogRtl .dijitDialogPaneActionBar {
+  text-align: left;
+  padding: 3px 7px 2px 5px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Dialog_rtl.less b/src/main/resources/static/dijit/themes/claro/Dialog_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..452fe930b1d284481fe33582d9c7353bd99f4965
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Dialog_rtl.less
@@ -0,0 +1,13 @@
+/* Dialog */
+
+@import "variables";
+
+.claro .dijitDialogRtl .dijitDialogCloseIcon {
+	right: auto;
+	left: 5px;
+}
+
+.claro .dijitDialogRtl .dijitDialogPaneActionBar {
+	text-align: left;
+	padding: 3px 7px 2px 5px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Editor.css b/src/main/resources/static/dijit/themes/claro/Editor.css
new file mode 100644
index 0000000000000000000000000000000000000000..0d6f59c45b424340dbfd17c7c35977c11df7db32
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Editor.css
@@ -0,0 +1,55 @@
+/* Editor 
+ * 
+ * Styling Editor means styling the Editor inside iframe container (dijitEditorIFrameContainer)
+ * 
+ * 1. Editor iframe container (default styling): 
+ * 		.dijitEditorIFrameContainer - normal state styles: background-color, border, padding
+ *
+ * 2. hovered Editor iframe container (ie, mouse hover on editor)
+ * 		.dijitEditorHover .dijitEditorIFrameContainer/dijitEditorIFrame - styles when mouse hover on the container
+ * 
+ * 3. focused Editor iframe container (ie, mouse focus on the editor pane)
+ * 		.dijitEditorFocused .dijitEditorIFrameContainer/dijitEditorIFrame - styles when container focused
+ * 
+ * 3. disabled Editor iframe container 
+ * 		.dijitEditorDisabled - editor's inner iframe container disable status styles: background, border
+ */
+.claro .dijitEditorIFrameContainer {
+  padding: 3px 3px 1px 10px;
+}
+.claro .dijitEditorIFrame {
+  background-color: #ffffff;
+}
+.claro .dijitEditor {
+  border: 1px solid #b5bcc7;
+}
+.claro .dijitEditor .dijitEditorIFrameContainer {
+  background-color: #ffffff;
+  background-repeat: repeat-x;
+}
+.claro .dijitEditorHover .dijitEditorIFrameContainer,
+.claro .dijitEditorHover .dijitEditorIFrameContainer .dijitEditorIFrame {
+  background-color: #e5f2fe;
+}
+.claro .dijitEditorFocused .dijitEditorIFrameContainer,
+.claro .dijitEditorFocused .dijitEditorIFrameContainer .dijitEditorIFrame {
+  background-color: #ffffff;
+}
+.claro .dijitEditorHover .dijitEditorIFrameContainer,
+.claro .dijitEditorFocused .dijitEditorIFrameContainer {
+  background-image: -moz-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: -webkit-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: -o-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+}
+/* Disabled */
+.claro .dijitEditorDisabled {
+  border: 1px solid #d3d3d3;
+  color: #818181;
+}
+.claro .dijitDisabled .dijitEditorIFrame,
+.claro .dijitDisabled .dijitEditorIFrameContainer,
+.claro .dijitDisabled .dijitEditorIFrameContainer .dijitEditorIFrame {
+  background-color: #efefef;
+  background-image: none;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Editor.less b/src/main/resources/static/dijit/themes/claro/Editor.less
new file mode 100644
index 0000000000000000000000000000000000000000..ddc59ccb418ea5968567815af115250af3eec550
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Editor.less
@@ -0,0 +1,57 @@
+/* Editor 
+ * 
+ * Styling Editor means styling the Editor inside iframe container (dijitEditorIFrameContainer)
+ * 
+ * 1. Editor iframe container (default styling): 
+ * 		.dijitEditorIFrameContainer - normal state styles: background-color, border, padding
+ *
+ * 2. hovered Editor iframe container (ie, mouse hover on editor)
+ * 		.dijitEditorHover .dijitEditorIFrameContainer/dijitEditorIFrame - styles when mouse hover on the container
+ * 
+ * 3. focused Editor iframe container (ie, mouse focus on the editor pane)
+ * 		.dijitEditorFocused .dijitEditorIFrameContainer/dijitEditorIFrame - styles when container focused
+ * 
+ * 3. disabled Editor iframe container 
+ * 		.dijitEditorDisabled - editor's inner iframe container disable status styles: background, border
+ */
+
+@import "variables";
+
+.claro .dijitEditorIFrameContainer{
+	padding:3px 3px 1px 10px;
+}
+.claro .dijitEditorIFrame {
+	background-color: @textbox-background-color;
+}
+.claro .dijitEditor {
+	border: 1px solid @border-color;
+}
+.claro .dijitEditor .dijitEditorIFrameContainer{
+	background-color: @textbox-background-color;
+	background-repeat:repeat-x;
+}
+.claro .dijitEditorHover .dijitEditorIFrameContainer,
+.claro .dijitEditorHover .dijitEditorIFrameContainer .dijitEditorIFrame{
+	background-color: @textbox-hovered-background-color;
+}
+.claro .dijitEditorFocused .dijitEditorIFrameContainer,
+.claro .dijitEditorFocused .dijitEditorIFrameContainer .dijitEditorIFrame{
+	background-color: @textbox-focused-background-color;
+}
+.claro .dijitEditorHover .dijitEditorIFrameContainer,
+.claro .dijitEditorFocused .dijitEditorIFrameContainer {
+	.textbox-background-image;
+}
+
+/* Disabled */
+.claro .dijitEditorDisabled {
+	border: 1px solid @disabled-border-color;
+	color: @disabled-text-color;
+}
+
+.claro .dijitDisabled .dijitEditorIFrame,
+.claro .dijitDisabled .dijitEditorIFrameContainer,
+.claro .dijitDisabled .dijitEditorIFrameContainer .dijitEditorIFrame {
+	background-color: @textbox-disabled-background-color;
+	background-image: none;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Editor_rtl.css b/src/main/resources/static/dijit/themes/claro/Editor_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..01ae2e55656cf3ea9d168dfca517935069f13e61
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Editor_rtl.css
@@ -0,0 +1,11 @@
+/* Editor */
+.claro .dijitEditorRtl .dijitEditorIFrameContainer {
+  padding: 3px 10px 1px 3px;
+}
+.dj_ie6 .claro .dijitEditorRtl .dijitEditorIFrameContainer,
+.dj_ie7 .claro .dijitEditorRtl .dijitEditorIFrameContainer,
+.dj_ie8 .claro .dijitEditorRtl .dijitEditorIFrameContainer {
+  padding: 3px 0px 1px 10px;
+  margin-right: 0px;
+  border: 0px solid #d3d3d3;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Editor_rtl.less b/src/main/resources/static/dijit/themes/claro/Editor_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..3d79db4f09b93e8b36e93234fed2749221a26121
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Editor_rtl.less
@@ -0,0 +1,16 @@
+/* Editor */
+
+@import "variables";
+
+.claro .dijitEditorRtl .dijitEditorIFrameContainer {
+	padding: 3px 10px 1px 3px;
+}
+
+.dj_ie6 .claro .dijitEditorRtl .dijitEditorIFrameContainer,
+.dj_ie7 .claro .dijitEditorRtl .dijitEditorIFrameContainer,
+.dj_ie8 .claro .dijitEditorRtl .dijitEditorIFrameContainer {
+	// remove excessive right margin (due to IE bug)
+	padding: 3px 0px 1px 10px;
+	margin-right: 0px;
+	border: 0px solid #d3d3d3;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/InlineEditBox.css b/src/main/resources/static/dijit/themes/claro/InlineEditBox.css
new file mode 100644
index 0000000000000000000000000000000000000000..0cd14579d945ede7f0d22e44254ab09cc605f6c4
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/InlineEditBox.css
@@ -0,0 +1,20 @@
+/* InlineEditBox
+ * 
+ * Styling InlineEditBox mainly includes:
+ * 
+ * 1. Normal state
+ * 		.dijitInlineEditBoxDisplayMode  - for border
+ * 
+ * 2. Hover state
+ * 		.dijitInlineEditBoxDisplayModeHover - for border and background color
+ */
+.claro .dijitInlineEditBoxDisplayMode {
+  border: 1px solid transparent;
+}
+.claro .dijitInlineEditBoxDisplayModeHover {
+  background-color: #e5f2fe;
+  border: solid 1px #759dc0;
+}
+.dj_ie6 .claro .dijitInlineEditBoxDisplayMode {
+  border: none;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/InlineEditBox.less b/src/main/resources/static/dijit/themes/claro/InlineEditBox.less
new file mode 100644
index 0000000000000000000000000000000000000000..a7162be1b3da31742c3e67b8b3560f56aa1ba054
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/InlineEditBox.less
@@ -0,0 +1,25 @@
+/* InlineEditBox
+ * 
+ * Styling InlineEditBox mainly includes:
+ * 
+ * 1. Normal state
+ * 		.dijitInlineEditBoxDisplayMode  - for border
+ * 
+ * 2. Hover state
+ * 		.dijitInlineEditBoxDisplayModeHover - for border and background color
+ */
+
+@import "variables";
+
+.claro .dijitInlineEditBoxDisplayMode {
+	border: 1px solid transparent;
+}
+
+.claro .dijitInlineEditBoxDisplayModeHover {
+	background-color: @textbox-hovered-background-color;
+	border: solid 1px @hovered-border-color;
+}
+
+.dj_ie6 .claro .dijitInlineEditBoxDisplayMode {
+	border: none;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Menu.css b/src/main/resources/static/dijit/themes/claro/Menu.css
new file mode 100644
index 0000000000000000000000000000000000000000..9716c3e821a90180be06969df2b46858304a231f
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Menu.css
@@ -0,0 +1,183 @@
+/* Menu 
+
+There are three areas of styling for the Menu:  
+ 
+ 1. The menu 
+ 	There are three types of menus:
+ 	i) Context Menu
+ 	ii) Drop down Menu
+ 	iii) Navigation Menu
+ 	All three types of menus are affected by the .dijitMenu class in which you can set the background-color, padding and border
+ 	.dijitMenu affects the drop down menu in TimeTextBox, Calendar, ComboBox and FilteringSelect
+  .dijitMenuTable - for padding - also affects Select widget 	
+
+ 2. The menu bar
+ 	.dijitMenuBar - for border, margins, padding, background-color of the menu bar
+ 	.dijitMenuBar .dijitMenuItem - for padding, text color of menu items in the menu bar (overrides .dijitMenuItem) 
+ 	
+ 3. Menu items - items in the menu.  
+ 	.dijitMenuItem - for color
+ 	.dijitMenuItemHover, .dijitMenuItemSelected - for background-color, border, text color, padding of a menu item or menubar item that has been hovered over or selected	
+ 	.dijitMenuItemActive - for background-color of an active (mousedown) menu item
+	td.dijitMenuItemIconCell - for padding around a  menu item's icon
+	td.dijitMenuItemLabel - for padding around a menu item's label	
+	.dijitMenuSeparatorTop - for border, top border, of the separator
+	.dijitMenuSeparatorBottom - for bottom margin of the separator
+	
+	Styles specific to ComboBox and FilteringSelect widgets: 
+	.dijitComboBoxMenu .dijitMenuItem - for padding and border of a menu item in a ComboBox or FilteringSelect widget's menu
+	.dijitComboBoxMenu .dijitMenuItemSelected- for text color, background-color and border of a menu item in a ComboBox or FilteringSelect widget's menu
+
+*/
+.claro .dijitMenuBar {
+  border: 1px solid #b5bcc7;
+  margin: 0;
+  padding: 0;
+  background-color: #efefef;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+.claro .dijitMenu {
+  background-color: #ffffff;
+  border: 1px solid #759dc0;
+}
+.claro .dijitMenuItem {
+  color: #000000;
+}
+.claro .dijitMenuBar .dijitMenuItem {
+  padding: 6px 10px 7px;
+  margin: -1px;
+}
+.claro .dijitMenuBar .dijitMenuItemHover,
+.claro .dijitMenuBar .dijitMenuItemSelected {
+  border: solid 1px #759dc0;
+  padding: 5px 9px 6px;
+}
+/* this prevents jiggling upon hover of a menu item */
+.claro .dijitMenuTable {
+  border-collapse: separate;
+  border-spacing: 0 0;
+  padding: 0;
+}
+.claro .dijitMenu .dijitMenuItem td,
+.claro .dijitComboBoxMenu .dijitMenuItem {
+  padding: 2px;
+  border-width: 1px 0 1px 0;
+  border-style: solid;
+  border-color: #ffffff;
+}
+/* hover over a MenuItem or MenuBarItem */
+.claro .dijitMenu .dijitMenuItemHover td,
+.claro .dijitMenu .dijitMenuItemSelected td,
+.claro .dijitMenuItemHover,
+.claro .dijitComboBoxMenu .dijitMenuItemHover,
+.claro .dijitMenuItemSelected {
+  border-color: #759dc0;
+  background-color: #abd6ff;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+.claro .dijitMenuItemActive {
+  background-image: url("images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+.dj_ie .claro .dijitMenuActive .dijitMenuItemHover,
+.dj_ie .claro .dijitMenuActive .dijitMenuItemSelected,
+.dj_ie .claro .dijitMenuPassive .dijitMenuItemHover,
+.dj_ie .claro .dijitMenuPassive .dijitMenuItemSelected {
+  padding-top: 6px;
+  padding-bottom: 5px;
+  margin-top: -3px;
+}
+.claro td.dijitMenuItemIconCell {
+  padding: 2px;
+  margin: 0 0 0 4px;
+}
+.claro td.dijitMenuItemLabel {
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+.claro .dijitMenuExpand {
+  width: 7px;
+  height: 7px;
+  background-image: url("images/spriteArrows.png");
+  background-position: -14px 0;
+  margin-right: 3px;
+  margin-bottom: 4px;
+}
+.claro .dijitMenuSeparatorTop {
+  height: auto;
+  margin-top: 1px;
+  /* prevents spacing above/below separator */
+
+  border-bottom: 1px solid #b5bcc7;
+}
+.claro .dijitMenuSeparatorBottom {
+  height: auto;
+  margin-bottom: 1px;
+}
+/* the checked menu item */
+.claro .dijitCheckedMenuItem .dijitMenuItemIcon,
+.claro .dijitRadioMenuItem .dijitMenuItemIcon {
+  background-image: url("form/images/checkboxRadioButtonStates.png");
+  background-repeat: no-repeat;
+  background-position: -15px 50%;
+  /* unchecked checkbox */
+
+  width: 15px;
+  height: 16px;
+}
+.dj_ie6 .claro .dijitCheckedMenuItem .dijitMenuItemIcon,
+.dj_ie6 .claro .dijitRadioMenuItem .dijitMenuItemIcon {
+  background-image: url("form/images/checkboxAndRadioButtons_IE6.png");
+}
+.claro .dijitCheckedMenuItemChecked .dijitCheckedMenuItemIcon {
+  background-position: 0 50%;
+  /* checked checkbox */
+
+}
+.claro .dijitRadioMenuItem .dijitMenuItemIcon {
+  background-position: -105px 50%;
+  /* unfilled circle */
+
+}
+.claro .dijitRadioMenuItemChecked .dijitMenuItemIcon {
+  background-position: -90px 50%;
+  /* filled circle */
+
+}
+/*ComboBox Menu*/
+.claro .dijitComboBoxMenu {
+  margin-left: 0;
+  background-image: none;
+}
+.claro .dijitMenu .dijitMenuItemSelected td,
+.claro .dijitComboBoxMenu .dijitMenuItemSelected {
+  color: #000000;
+  border-color: #759dc0;
+  background-color: #abd6ff;
+}
+.claro .dijitComboBoxMenuActive .dijitMenuItemSelected {
+  background-color: #7dbdfa;
+  /* TODO: why is this a different color than normal .dijitMenuItemSelected? */
+
+}
+.claro .dijitMenuPreviousButton,
+.claro .dijitMenuNextButton {
+  font-style: italic;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Menu.less b/src/main/resources/static/dijit/themes/claro/Menu.less
new file mode 100644
index 0000000000000000000000000000000000000000..86ab7b91d2338670645a88b645f8ed24a8b8e7c4
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Menu.less
@@ -0,0 +1,176 @@
+/* Menu 
+
+There are three areas of styling for the Menu:  
+ 
+ 1. The menu 
+ 	There are three types of menus:
+ 	i) Context Menu
+ 	ii) Drop down Menu
+ 	iii) Navigation Menu
+ 	All three types of menus are affected by the .dijitMenu class in which you can set the background-color, padding and border
+ 	.dijitMenu affects the drop down menu in TimeTextBox, Calendar, ComboBox and FilteringSelect
+  .dijitMenuTable - for padding - also affects Select widget 	
+
+ 2. The menu bar
+ 	.dijitMenuBar - for border, margins, padding, background-color of the menu bar
+ 	.dijitMenuBar .dijitMenuItem - for padding, text color of menu items in the menu bar (overrides .dijitMenuItem) 
+ 	
+ 3. Menu items - items in the menu.  
+ 	.dijitMenuItem - for color
+ 	.dijitMenuItemHover, .dijitMenuItemSelected - for background-color, border, text color, padding of a menu item or menubar item that has been hovered over or selected	
+ 	.dijitMenuItemActive - for background-color of an active (mousedown) menu item
+	td.dijitMenuItemIconCell - for padding around a  menu item's icon
+	td.dijitMenuItemLabel - for padding around a menu item's label	
+	.dijitMenuSeparatorTop - for border, top border, of the separator
+	.dijitMenuSeparatorBottom - for bottom margin of the separator
+	
+	Styles specific to ComboBox and FilteringSelect widgets: 
+	.dijitComboBoxMenu .dijitMenuItem - for padding and border of a menu item in a ComboBox or FilteringSelect widget's menu
+	.dijitComboBoxMenu .dijitMenuItemSelected- for text color, background-color and border of a menu item in a ComboBox or FilteringSelect widget's menu
+
+*/
+
+@import "variables";
+
+.claro .dijitMenuBar {
+	border: 1px solid @border-color;
+	margin: 0;
+	padding: 0;
+	background-color: @bar-background-color;
+	.standard-gradient;
+}
+
+.claro .dijitMenu {
+	background-color:@menu-background-color;
+	border: 1px solid @popup-border-color;
+}
+
+.claro .dijitMenuItem {
+	color: @text-color;
+}
+.claro .dijitMenuBar .dijitMenuItem {
+	padding: 6px 10px 7px;
+	margin:-1px;
+}
+.claro .dijitMenuBar .dijitMenuItemHover,
+.claro .dijitMenuBar .dijitMenuItemSelected {
+	// on hover or selection of MenuBar item, add border and reduce padding to compensate
+	border:solid 1px @hovered-border-color;
+	padding: 5px 9px 6px;
+}
+
+/* this prevents jiggling upon hover of a menu item */
+.claro .dijitMenuTable {
+	border-collapse:separate;
+	border-spacing:0 0;
+	padding:0;
+}
+
+.claro .dijitMenu .dijitMenuItem td,
+.claro .dijitComboBoxMenu .dijitMenuItem {
+	padding: @textbox-padding;	// Make drop down menu text line up with text in <input>.
+	border-width:1px 0 1px 0;
+	border-style:solid;
+	border-color: @select-dropdownitem-background-color;
+}
+
+/* hover over a MenuItem or MenuBarItem */
+.claro .dijitMenu .dijitMenuItemHover td,
+.claro .dijitMenu .dijitMenuItemSelected td,
+.claro .dijitMenuItemHover,
+.claro .dijitComboBoxMenu .dijitMenuItemHover,
+.claro .dijitMenuItemSelected {
+	// note: seems like the selected MenuItem should use @pressed-background-color
+	// and .active-gradient, but claro didn't to that
+	border-color: @hovered-border-color;
+	background-color: @hovered-background-color;
+	.standard-gradient;
+}
+
+.claro .dijitMenuItemActive {
+	// todo: seems like the selected MenuItem should come here
+	// todo: seems like should use @pressed-background-color
+	.active-gradient;
+}
+.dj_ie .claro .dijitMenuActive .dijitMenuItemHover,
+.dj_ie .claro .dijitMenuActive .dijitMenuItemSelected,
+.dj_ie .claro .dijitMenuPassive .dijitMenuItemHover,
+.dj_ie .claro .dijitMenuPassive .dijitMenuItemSelected {
+	// Selectivity set to override ComboBox rules below.
+	// If this rule isn't present, on IE6 hovering an item in the ComboBox drop down causes two
+	// items to be highlighted (except when hovering the first item in the list)
+	padding-top: 6px;
+	padding-bottom: 5px;
+	margin-top: -3px;
+}
+
+.claro td.dijitMenuItemIconCell {
+	padding: 2px;
+	margin: 0 0 0 4px;
+}
+.claro td.dijitMenuItemLabel {
+	padding-top: 5px;
+	padding-bottom: 5px;
+}
+.claro .dijitMenuExpand {
+	width: 7px;
+	height: 7px;
+	background-image: url(@image-arrow-sprite);
+	background-position: -14px 0;
+	margin-right:3px;
+	margin-bottom: 4px;
+}
+.claro .dijitMenuSeparatorTop {
+	height: auto;
+	margin-top:1px; /* prevents spacing above/below separator */
+	border-bottom: 1px solid @border-color
+}
+.claro .dijitMenuSeparatorBottom{
+	height: auto;
+	margin-bottom:1px;
+}
+/* the checked menu item */
+.claro .dijitCheckedMenuItem .dijitMenuItemIcon,
+.claro .dijitRadioMenuItem .dijitMenuItemIcon {
+	background-image: url(@image-form-checkbox-and-radios);
+	background-repeat:no-repeat;
+	background-position: -15px 50%;	/* unchecked checkbox */
+	width:15px;
+	height:16px;
+}
+.dj_ie6 .claro .dijitCheckedMenuItem .dijitMenuItemIcon,
+.dj_ie6 .claro .dijitRadioMenuItem .dijitMenuItemIcon {
+	background-image: url(@image-form-checkbox-and-radios-ie6);
+}
+.claro .dijitCheckedMenuItemChecked .dijitCheckedMenuItemIcon {
+	background-position: 0 50%;	/* checked checkbox */
+}
+.claro .dijitRadioMenuItem .dijitMenuItemIcon {
+  background-position: -105px 50%;	/* unfilled circle */
+}
+.claro .dijitRadioMenuItemChecked .dijitMenuItemIcon {
+  background-position: -90px 50%;	/* filled circle */
+}
+
+/*ComboBox Menu*/
+.claro .dijitComboBoxMenu {
+	margin-left:0;
+	background-image: none;
+}
+
+.claro .dijitMenu .dijitMenuItemSelected td,
+.claro .dijitComboBoxMenu .dijitMenuItemSelected {
+	// TODO: combine with above rules for selected items?
+	// But the selected item in a Select drop down is different than when MenuBarItem "File" is highlighted
+	// because the user is on the file menu?
+	color:@selected-text-color;
+	border-color:@hovered-border-color;
+	background-color:@hovered-background-color;
+}
+
+.claro .dijitComboBoxMenuActive .dijitMenuItemSelected {
+	background-color: @select-dropdownitem-hovered-background-color;	/* TODO: why is this a different color than normal .dijitMenuItemSelected? */
+}
+.claro .dijitMenuPreviousButton, .claro .dijitMenuNextButton {
+	font-style: italic;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Menu_rtl.css b/src/main/resources/static/dijit/themes/claro/Menu_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..2b96cbae730eeaf0b5ad49c2c7a0444bf4a8142b
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Menu_rtl.css
@@ -0,0 +1,8 @@
+.claro .dijitMenuItemRtl .dijitMenuExpand {
+  background-position: -7px 0;
+  margin-right: 0;
+  margin-left: 3px;
+}
+.claro .dijitMenuItemRtl .dijitMenuItemIcon {
+  margin: 0 4px 0 0;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Menu_rtl.less b/src/main/resources/static/dijit/themes/claro/Menu_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..6f669f5fd8b44b610cb4d71ada9b0a9728a166c8
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Menu_rtl.less
@@ -0,0 +1,11 @@
+@import "variables";
+
+.claro .dijitMenuItemRtl .dijitMenuExpand {
+	background-position: -7px 0;
+	margin-right: 0;
+	margin-left: 3px;
+}
+
+.claro .dijitMenuItemRtl .dijitMenuItemIcon {
+	margin:0 4px 0 0;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/ProgressBar.css b/src/main/resources/static/dijit/themes/claro/ProgressBar.css
new file mode 100644
index 0000000000000000000000000000000000000000..1b7cf675161d856f39d0c7ae807ac08f58ba4959
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/ProgressBar.css
@@ -0,0 +1,71 @@
+/* ProgressBar
+ * 
+ * Styling of the ProgressBar consists of the following:
+ * 
+ * 1. the base progress bar
+ *		.dijitProgressBar -	sets margins for the progress bar
+ *
+ * 2. the empty bar
+ *		.dijitProgressBarEmpty  - sets background img and color for bar or parts of bar that are not finished yet
+ *		Also sets border color for whole bar
+ *
+ * 3. tile mode
+ * 		.dijitProgressBarTile
+ *		inner container for finished portion when in 'tile' (image) mode 
+ * 	
+ * 4. full bar mode
+ * 		.dijitProgressBarFull
+ *		adds border to right side of the filled portion of bar
+ *
+ * 5. text for label of  bar
+ *		.dijitProgressBarLabel - sets text color, which must contrast with both the "Empty" and "Full" parts. 
+ * 	
+ * 6. indeterminate mode
+ *		.dijitProgressBarIndeterminate .dijitProgressBarTile 
+ * 		sets animated gif for the progress bar in 'indeterminate' mode
+ */
+.claro .dijitProgressBar {
+  margin: 2px 0 2px 0;
+}
+.claro .dijitProgressBarEmpty {
+  /* outer container and background of the bar that's not finished yet*/
+
+  background-color: #ffffff;
+  border-color: #759dc0;
+}
+.claro .dijitProgressBarTile {
+  /* inner container for finished portion when in 'tile' (image) mode */
+
+  background-color: #abd6ff;
+  background-image: url("images/progressBarFull.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.93) 0px, rgba(255, 255, 255, 0.41) 1px, rgba(255, 255, 255, 0.7) 2px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.93) 0px, rgba(255, 255, 255, 0.41) 1px, rgba(255, 255, 255, 0.7) 2px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.93) 0px, rgba(255, 255, 255, 0.41) 1px, rgba(255, 255, 255, 0.7) 2px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.93) 0px, rgba(255, 255, 255, 0.41) 1px, rgba(255, 255, 255, 0.7) 2px, rgba(255, 255, 255, 0) 100%);
+  background-attachment: scroll;
+}
+.dj_ie6 .claro .dijitProgressBarTile {
+  background-image: none;
+}
+.claro .dijitProgressBarFull {
+  border: 0px solid #759dc0;
+  border-right-width: 1px;
+  -webkit-transition-property: width;
+  -moz-transition-property: width;
+  transition-property: width;
+  -webkit-transition-duration: 0.25s;
+  -moz-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+}
+.claro .dijitProgressBarLabel {
+  /* Set to a color that contrasts with both the "Empty" and "Full" parts. */
+
+  color: #000000;
+}
+.claro .dijitProgressBarIndeterminate .dijitProgressBarTile {
+  /* use an animated gif for the progress bar in 'indeterminate' mode;
+		background-color won't appear unless user has turned off background images */
+
+  background: #efefef url("images/progressBarAnim.gif") repeat-x top;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/ProgressBar.less b/src/main/resources/static/dijit/themes/claro/ProgressBar.less
new file mode 100644
index 0000000000000000000000000000000000000000..2bc2914a9f160cc1c040b51e3178c8a932627cb2
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/ProgressBar.less
@@ -0,0 +1,65 @@
+/* ProgressBar
+ * 
+ * Styling of the ProgressBar consists of the following:
+ * 
+ * 1. the base progress bar
+ *		.dijitProgressBar -	sets margins for the progress bar
+ *
+ * 2. the empty bar
+ *		.dijitProgressBarEmpty  - sets background img and color for bar or parts of bar that are not finished yet
+ *		Also sets border color for whole bar
+ *
+ * 3. tile mode
+ * 		.dijitProgressBarTile
+ *		inner container for finished portion when in 'tile' (image) mode 
+ * 	
+ * 4. full bar mode
+ * 		.dijitProgressBarFull
+ *		adds border to right side of the filled portion of bar
+ *
+ * 5. text for label of  bar
+ *		.dijitProgressBarLabel - sets text color, which must contrast with both the "Empty" and "Full" parts. 
+ * 	
+ * 6. indeterminate mode
+ *		.dijitProgressBarIndeterminate .dijitProgressBarTile 
+ * 		sets animated gif for the progress bar in 'indeterminate' mode
+ */
+ 
+ @import "variables";
+ 
+.claro .dijitProgressBar {
+	margin:2px 0 2px 0;
+}
+.claro .dijitProgressBarEmpty {
+	/* outer container and background of the bar that's not finished yet*/
+	background-color: @progressbar-empty-background-color;
+	border-color: @progressbar-border-color;
+}
+.claro .dijitProgressBarTile {
+	/* inner container for finished portion when in 'tile' (image) mode */
+	background-color: @progressbar-full-background-color;
+
+	// gradient background using CSS gradient, with fallback to image for IE
+	background-image: url("images/progressBarFull.png");
+	background-repeat: repeat-x;
+	.alpha-white-gradient(0.93,0px, 0.41,1px, 0.7,2px, 0,100%);
+	background-attachment: scroll;	// override strange "fixed" setting from dijit.css
+}
+.dj_ie6 .claro .dijitProgressBarTile {
+	background-image: none;
+} 
+.claro .dijitProgressBarFull {
+	border: 0px solid @progressbar-border-color;
+	border-right-width: 1px;
+	.transition-property(width);
+	.transition-duration(.25s);
+}
+.claro .dijitProgressBarLabel {
+	/* Set to a color that contrasts with both the "Empty" and "Full" parts. */
+	color: @progressbar-text-color;
+}
+.claro .dijitProgressBarIndeterminate .dijitProgressBarTile {
+	/* use an animated gif for the progress bar in 'indeterminate' mode;
+		background-color won't appear unless user has turned off background images */
+	background: @bar-background-color url(@image-progressbar-anim) repeat-x top;
+} 
diff --git a/src/main/resources/static/dijit/themes/claro/ProgressBar_rtl.css b/src/main/resources/static/dijit/themes/claro/ProgressBar_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..c70d8e868aa1cae6b454840b3727b0c972078e31
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/ProgressBar_rtl.css
@@ -0,0 +1,16 @@
+/* ProgressBar
+ * 
+ * Styling of the ProgressBar when RTL direction is specified
+ */
+.claro .dijitProgressBarRtl .dijitProgressBarFull {
+  border-left-width: 1px;
+  border-right-width: 0px;
+}
+.claro .dijitProgressBarIndeterminateRtl .dijitProgressBarTile {
+  -moz-transform: scaleX(-1);
+  -o-transform: scaleX(-1);
+  -webkit-transform: scaleX(-1);
+  transform: scaleX(-1);
+  filter: FlipH;
+  -ms-filter: "FlipH";
+}
diff --git a/src/main/resources/static/dijit/themes/claro/ProgressBar_rtl.less b/src/main/resources/static/dijit/themes/claro/ProgressBar_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..2091edc2c27e2f028f8104ce5d1011a0d18cfbb6
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/ProgressBar_rtl.less
@@ -0,0 +1,20 @@
+/* ProgressBar
+ * 
+ * Styling of the ProgressBar when RTL direction is specified
+ */
+ 
+@import "variables";
+ 
+.claro  .dijitProgressBarRtl .dijitProgressBarFull {
+	border-left-width: 1px;
+	border-right-width: 0px;
+}
+
+.claro .dijitProgressBarIndeterminateRtl .dijitProgressBarTile {
+	-moz-transform: scaleX(-1);
+	-o-transform: scaleX(-1);
+	-webkit-transform: scaleX(-1);
+	transform: scaleX(-1);
+	filter: FlipH;
+	-ms-filter: "FlipH";
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/README b/src/main/resources/static/dijit/themes/claro/README
new file mode 100644
index 0000000000000000000000000000000000000000..0a254623f29543781bdba4599aca6f89479de2a1
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/README
@@ -0,0 +1,11 @@
+These are "less" files that compile into the CSS of claro.
+
+1. Install node from http://nodejs.org/#download
+	
+2. To compile all the files:
+
+  $ cd dijit/themes/claro
+  $ node compile.js
+
+
+See http://lesscss.org/ and https://github.com/cloudhead/less.js/ for more information.
diff --git a/src/main/resources/static/dijit/themes/claro/TimePicker.css b/src/main/resources/static/dijit/themes/claro/TimePicker.css
new file mode 100644
index 0000000000000000000000000000000000000000..d1573b7a2271b68a6a522559894bdb0210c3638c
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/TimePicker.css
@@ -0,0 +1,112 @@
+/* Time Picker 
+ *
+ * Styling the Time Picker consists of the following: 
+ *
+ * 1. minor time values
+ * 		.dijitTimePickerTick - set text color, size, background color of minor values
+ * 		.dijitTimePickerTickHover - set hover style of minor time values
+ * 		dijitTimePickerTickSelected - set selected style of minor time values
+ *
+ * 2. major time values - 1:00, 2:00, times on the hour 
+ * 		set text color, size, background color, left/right margins for "zoom" affect
+ * 		.dijitTimePickerMarkerHover - to set hover style of major time values
+ * 		.dijitTimePickerMarkerSelected - set selected style of major time values
+ * 
+ * 3. up and down arrow buttons
+ * 		.dijitTimePicker .dijitButtonNode - background-color, border
+ * 		.dijitTimePicker .dijitUpArrowHover, .dijitTimePicker .dijitDownArrowHover - set background-color for hover state
+ *
+ *	Other classes provide the fundamental structure of the TimePicker and should not be modified. 
+ */
+/* override Button.css */
+.claro .dijitTimePicker .dijitButtonNode {
+  padding: 0 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.claro .dijitTimePicker {
+  border: 1px #b5bcc7 solid;
+  border-top: none;
+  border-bottom: none;
+  background-color: #fff;
+  /* TODO: useless?   Appears to be overridden by settings on individual elements */
+
+}
+.claro .dijitTimePickerItem {
+  /* dijitTimePickerItem refers to both Tick's (minor values like 2:15, 2:30, 2:45) and Marker's (major values like 2PM, 3PM) */
+
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  border-top: solid 1px #b5bcc7;
+  border-bottom: solid 1px #b5bcc7;
+  margin-top: -1px;
+}
+.claro .dijitTimePickerTick {
+  /* minor value */
+
+  color: #818181;
+  background-color: #efefef;
+  font-size: 0.818em;
+}
+.claro .dijitTimePickerMarker {
+  /* major value - 1:00, 2:00, times on the hour */
+
+  background-color: #e5f2fe;
+  font-size: 1em;
+  white-space: nowrap;
+}
+.claro .dijitTimePickerTickHover,
+.claro .dijitTimePickerMarkerHover,
+.claro .dijitTimePickerMarkerSelected,
+.claro .dijitTimePickerTickSelected {
+  background-color: #7dbdfa;
+  color: #000000;
+}
+.claro .dijitTimePickerMarkerSelected,
+.claro .dijitTimePickerTickSelected {
+  font-size: 1em;
+}
+.claro .dijitTimePickerTick .dijitTimePickerItemInner {
+  padding: 1px;
+  margin: 0;
+}
+.claro .dijitTimePicker .dijitButtonNode {
+  border-left: none;
+  border-right: none;
+  border-color: #b5bcc7;
+  background-color: #efefef;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+.claro .dijitTimePicker .dijitArrowButtonInner {
+  height: 100%;
+  /* hack claro.button.css */
+
+  background-image: url("form/images/commonFormArrows.png");
+  background-repeat: no-repeat;
+  background-position: -140px 45%;
+}
+.claro .dijitTimePicker .dijitDownArrowButton .dijitArrowButtonInner {
+  background-position: -35px 45%;
+}
+/* hover */
+.claro .dijitTimePicker .dijitUpArrowHover,
+.claro .dijitTimePicker .dijitDownArrowHover {
+  background-color: #abd6ff;
+}
+.claro .dijitTimePicker .dijitUpArrowHover .dijitArrowButtonInner {
+  background-position: -175px 45%;
+}
+.claro .dijitTimePicker .dijitDownArrowHover .dijitArrowButtonInner {
+  background-position: -70px 45%;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/TimePicker.less b/src/main/resources/static/dijit/themes/claro/TimePicker.less
new file mode 100644
index 0000000000000000000000000000000000000000..caacbe987c07f834f3241d52f23763b53d106d09
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/TimePicker.less
@@ -0,0 +1,98 @@
+/* Time Picker 
+ *
+ * Styling the Time Picker consists of the following: 
+ *
+ * 1. minor time values
+ * 		.dijitTimePickerTick - set text color, size, background color of minor values
+ * 		.dijitTimePickerTickHover - set hover style of minor time values
+ * 		dijitTimePickerTickSelected - set selected style of minor time values
+ *
+ * 2. major time values - 1:00, 2:00, times on the hour 
+ * 		set text color, size, background color, left/right margins for "zoom" affect
+ * 		.dijitTimePickerMarkerHover - to set hover style of major time values
+ * 		.dijitTimePickerMarkerSelected - set selected style of major time values
+ * 
+ * 3. up and down arrow buttons
+ * 		.dijitTimePicker .dijitButtonNode - background-color, border
+ * 		.dijitTimePicker .dijitUpArrowHover, .dijitTimePicker .dijitDownArrowHover - set background-color for hover state
+ *
+ *	Other classes provide the fundamental structure of the TimePicker and should not be modified. 
+ */
+
+@import "variables";
+
+/* override Button.css */
+.claro .dijitTimePicker .dijitButtonNode {
+	padding: 0 0;
+	.border-radius(0);
+}
+.claro .dijitTimePicker {
+	border:1px @border-color solid;
+	border-top:none;
+	border-bottom:none;
+	background-color:#fff;	/* TODO: useless?   Appears to be overridden by settings on individual elements */
+}
+.claro .dijitTimePickerItem {
+	/* dijitTimePickerItem refers to both Tick's (minor values like 2:15, 2:30, 2:45) and Marker's (major values like 2PM, 3PM) */
+	.standard-gradient;
+	border-top:solid 1px @border-color;
+	border-bottom:solid 1px @border-color;
+	margin-top:-1px;
+}
+.claro .dijitTimePickerTick {
+	/* minor value */
+	color:@timepicker-minorvalue-text-color;
+	background-color:@timepicker-minorvalue-background-color;
+	font-size:0.818em;
+}
+.claro .dijitTimePickerMarker {
+	/* major value - 1:00, 2:00, times on the hour */
+	background-color: @timepicker-majorvalue-background-color;
+	font-size: 1em;
+	white-space: nowrap;
+}
+.claro .dijitTimePickerTickHover,
+.claro .dijitTimePickerMarkerHover,
+.claro .dijitTimePickerMarkerSelected,
+.claro .dijitTimePickerTickSelected {
+	background-color: @timepicker-value-hovered-background-color;
+	color:@timepicker-value-hovered-text-color;
+}
+.claro .dijitTimePickerMarkerSelected,
+.claro .dijitTimePickerTickSelected {
+	font-size: 1em;
+}
+
+.claro .dijitTimePickerTick .dijitTimePickerItemInner {
+	padding:1px;
+	margin:0;
+}
+.claro .dijitTimePicker .dijitButtonNode {
+	border-left:none;
+	border-right:none;
+	border-color:@border-color;
+	background-color: @unselected-background-color;
+	.standard-gradient;
+}
+.claro .dijitTimePicker .dijitArrowButtonInner {
+	height: 100%; /* hack claro.button.css */
+	background-image: url(@image-form-common-arrows);
+	background-repeat: no-repeat;
+	background-position:-140px 45%;
+}
+.claro .dijitTimePicker .dijitDownArrowButton .dijitArrowButtonInner {
+	background-position:-35px 45%;
+}
+/* hover */
+.claro .dijitTimePicker .dijitUpArrowHover, 
+.claro .dijitTimePicker .dijitDownArrowHover {
+	background-color: @timepicker-arrow-hovered-background-color;
+}
+.claro .dijitTimePicker .dijitUpArrowHover .dijitArrowButtonInner {
+	background-position:-175px 45%;
+}
+.claro .dijitTimePicker .dijitDownArrowHover .dijitArrowButtonInner {
+	background-position:-70px 45%;
+}
+
+// TODO: should have active rule, for clicking a .dijitTimePickerItem
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/TitlePane.css b/src/main/resources/static/dijit/themes/claro/TitlePane.css
new file mode 100644
index 0000000000000000000000000000000000000000..87d82a6da285a4858d3d7616529d28030b3ef579
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/TitlePane.css
@@ -0,0 +1,93 @@
+/* TitlePane and Fieldset
+ * 
+ * Styling TitlePane means styling the TitlePane title and its content container  (dijitTitlePane)
+ * 
+ * TitlePane title:
+ * 1. TitlePane title (default styling): 
+ * 		.dijitTitlePaneTitle - TitlePane's title div style: background-color, border
+ *
+ * 2. hovered TitlePane title (ie, mouse hover on a title bar)
+ * 		.dijitTitlePaneTitleHover - styles when mouse hover on the title div
+ * 
+ * 3. active TitlePane title (ie, mouse down on a title bar)
+ * 		.dijitTitlePaneTitleActive - styles when mouse down on the title div
+ * 
+ * 
+ * TitlePane Content Container:
+ * 1. outer/inner container: 
+ * 		.dijitTitlePaneContentOuter / dijitTitlePaneContentInner - styles for the content outer div
+ */
+.claro .dijitTitlePaneTitle {
+  background-color: #efefef;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  border: 1px solid #b5bcc7;
+  padding: 0 7px 3px 7px;
+  min-height: 17px;
+  color: #494949;
+}
+.claro .dijitFieldset {
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.claro .dijitTitlePaneTitleOpen,
+.claro .dijitTitlePaneTitleFixedOpen {
+  background-color: #cfe5fa;
+  color: #000000;
+}
+.claro .dijitTitlePaneTitleHover {
+  background-color: #abd6ff;
+  border-color: #759dc0;
+}
+.claro .dijitTitlePaneTitleActive {
+  background-color: #7dbdfa;
+  border-color: #759dc0;
+  background-image: url("images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+.claro .dijitTitlePaneTitleFocus {
+  margin-top: 3px;
+  padding-bottom: 2px;
+}
+.claro .dijitTitlePane .dijitArrowNode,
+.claro .dijitFieldset .dijitArrowNode {
+  background-image: url("images/spriteArrows.png");
+  background-repeat: no-repeat;
+  height: 8px;
+  width: 7px;
+}
+.claro .dijitTitlePaneTitleOpen .dijitArrowNode,
+.claro .dijitFieldsetTitleOpen .dijitArrowNode {
+  background-position: 0 0;
+}
+.claro .dijitTitlePaneTitleClosed .dijitArrowNode,
+.claro .dijitFieldsetTitleClosed .dijitArrowNode {
+  background-position: -14px 0;
+}
+.claro .dijitTitlePaneContentOuter {
+  background: #ffffff;
+  border: 1px solid #b5bcc7;
+  border-top: none;
+}
+.claro .dijitTitlePaneContentInner {
+  padding: 10px;
+}
+.claro .dijitFieldsetContentInner {
+  padding: 4px;
+}
+.claro .dijitTitlePaneTextNode,
+.claro .dijitFieldsetLegendNode {
+  margin-left: 4px;
+  margin-right: 4px;
+  vertical-align: text-top;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/TitlePane.less b/src/main/resources/static/dijit/themes/claro/TitlePane.less
new file mode 100644
index 0000000000000000000000000000000000000000..833fcccfc108de3e7144e533fdc46b49ae040cce
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/TitlePane.less
@@ -0,0 +1,78 @@
+/* TitlePane and Fieldset
+ * 
+ * Styling TitlePane means styling the TitlePane title and its content container  (dijitTitlePane)
+ * 
+ * TitlePane title:
+ * 1. TitlePane title (default styling): 
+ * 		.dijitTitlePaneTitle - TitlePane's title div style: background-color, border
+ *
+ * 2. hovered TitlePane title (ie, mouse hover on a title bar)
+ * 		.dijitTitlePaneTitleHover - styles when mouse hover on the title div
+ * 
+ * 3. active TitlePane title (ie, mouse down on a title bar)
+ * 		.dijitTitlePaneTitleActive - styles when mouse down on the title div
+ * 
+ * 
+ * TitlePane Content Container:
+ * 1. outer/inner container: 
+ * 		.dijitTitlePaneContentOuter / dijitTitlePaneContentInner - styles for the content outer div
+ */
+
+@import "variables";
+
+.claro .dijitTitlePaneTitle {
+	background-color: @unselected-background-color;
+	.standard-gradient;
+	border:1px solid @border-color;
+	padding: 0 7px 3px 7px;
+	min-height:17px;
+	color: @unselected-text-color;
+}
+.claro .dijitFieldset {
+  .border-radius(4px);
+}
+.claro .dijitTitlePaneTitleOpen, .claro .dijitTitlePaneTitleFixedOpen {
+  background-color: @selected-background-color;
+  color: @text-color;
+}
+.claro .dijitTitlePaneTitleHover {
+	background-color: @hovered-background-color;
+	border-color: @hovered-border-color;
+}
+.claro .dijitTitlePaneTitleActive {
+	background-color: @pressed-background-color;
+	border-color: @pressed-border-color;
+	.active-gradient;
+}
+.claro .dijitTitlePaneTitleFocus {
+	margin-top:3px;
+	padding-bottom:2px;
+}
+.claro .dijitTitlePane .dijitArrowNode, .claro .dijitFieldset .dijitArrowNode {
+	background-image: url(@image-arrow-sprite);
+	background-repeat: no-repeat;
+	height: 8px;
+	width: 7px;
+}
+.claro .dijitTitlePaneTitleOpen .dijitArrowNode,  .claro .dijitFieldsetTitleOpen .dijitArrowNode,{
+	background-position: 0 0;
+}
+.claro .dijitTitlePaneTitleClosed .dijitArrowNode, .claro .dijitFieldsetTitleClosed .dijitArrowNode {
+	background-position: -14px 0;
+}
+.claro .dijitTitlePaneContentOuter {
+	background: @pane-background-color;
+	border:1px solid @border-color;
+	border-top:none;
+}
+.claro .dijitTitlePaneContentInner{
+	padding:10px;
+}
+.claro .dijitFieldsetContentInner {
+  padding: 4px;
+}
+.claro .dijitTitlePaneTextNode, .claro .dijitFieldsetLegendNode {
+	margin-left: 4px;
+	margin-right: 4px;
+	vertical-align:text-top;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/TitlePane_rtl.css b/src/main/resources/static/dijit/themes/claro/TitlePane_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..12d21bd6d90862d661a4b55f8144dd0165ead429
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/TitlePane_rtl.css
@@ -0,0 +1,5 @@
+/* TitlePane */
+.claro .dijitTitlePaneRtl .dijitClosed .dijitArrowNode,
+.claro .dijitFieldsetRtl .dijitFieldsetTitleClosed .dijitArrowNode {
+  background-position: -7px 0;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/TitlePane_rtl.less b/src/main/resources/static/dijit/themes/claro/TitlePane_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..4481d90a2c062daebdb44694827424e9cc58ec93
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/TitlePane_rtl.less
@@ -0,0 +1,7 @@
+/* TitlePane */
+
+@import "variables";
+
+.claro .dijitTitlePaneRtl .dijitClosed .dijitArrowNode, .claro .dijitFieldsetRtl .dijitFieldsetTitleClosed .dijitArrowNode {
+	background-position: -7px 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/Toolbar.css b/src/main/resources/static/dijit/themes/claro/Toolbar.css
new file mode 100644
index 0000000000000000000000000000000000000000..20ae6f286c64f00e44b512f34eb4aff17c45fdd0
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Toolbar.css
@@ -0,0 +1,211 @@
+/* Toolbar 
+ * 
+ * Styling Toolbar means styling the toolbar container and the widget inside toolbar  (dijitToolbar)
+ * 
+ * 1. toolbar (default styling): 
+ * 		.dijitToolbar - styles for outer container
+ *
+ * 2. widget inside toolbar
+ * 		.dijitToolbar .dijitButtonNode   - Button widget
+ * 					  .dijitComboButton  - ComboButton widget
+ * 					  .dijitDropDownButton  - DropDownButton widget
+ * 					  .dijitToggleButton  - ToggleButton widget
+ * 		
+ * 3. hovered widget inside toolbar (ie, mouse hover on the widget inside)
+ * 			.dijitToolbar .dijitButtonNodeHover  - styles for hovered Button widget
+ * 
+ * 4. actived widget inside toolbar (ie, mouse down on the widget inside)
+ * 			.dijitToolbar .dijitButtonNodeActive  - mouse down on Button widget
+ */
+.claro .dijitToolbar {
+  border-bottom: 1px solid #b5bcc7;
+  background-color: #efefef;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 2px 0 2px 4px;
+  zoom: 1;
+}
+.claro .dijitToolbar label {
+  padding: 0 3px 0 6px;
+}
+/** override claro/form/Button.css, and also ComboBox down arrow **/
+.claro .dijitToolbar .dijitButton .dijitButtonNode,
+.claro .dijitToolbar .dijitDropDownButton .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButton .dijitButtonNode,
+.claro .dijitToolbar .dijitToggleButton .dijitButtonNode,
+.claro .dijitToolbar .dijitComboBox .dijitButtonNode {
+  border-width: 0;
+  /* on hover/active, border-->1px, padding-->1px */
+
+  padding: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  -webkit-transition-property: background-color;
+  -moz-transition-property: background-color;
+  transition-property: background-color;
+  -webkit-transition-duration: 0.3s;
+  -moz-transition-duration: 0.3s;
+  transition-duration: 0.3s;
+  background-color: rgba(171, 214, 255, 0);
+  background-image: none;
+  /* cancel gradient for normal buttons, we don't want any gradient besides toolbar's on non-hovered buttons */
+
+}
+.dj_ie .claro .dijitToolbar .dijitButton .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitDropDownButton .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitComboButton .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitToggleButton .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitComboBox .dijitButtonNode {
+  background-color: transparent;
+  /* for IE, which doesn't understand rgba(...) */
+
+}
+/* hover status */
+.dj_ie .claro .dijitToolbar .dijitButtonHover .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitDropDownButtonHover .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitComboButton .dijitButtonNodeHover,
+.dj_ie .claro .dijitToolbar .dijitComboButton .dijitDownArrowButtonHover,
+.dj_ie .claro .dijitToolbar .dijitToggleButtonHover .dijitButtonNode {
+  /* button should still turn blue on hover, so need to override .dj_ie rules above */
+
+  background-color: #abd6ff;
+}
+/* active status */
+.dj_ie .claro .dijitToolbar .dijitButtonActive .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitDropDownButtonActive .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitComboButtonActive .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitToggleButtonActive .dijitButtonNode {
+  /* button should still turn blue on press, so need to override .dj_ie rules above */
+
+  background-color: #abd6ff;
+}
+.claro .dijitToolbar .dijitComboButton .dijitStretch {
+  /* no rounded border on side adjacent to arrow */
+
+  -moz-border-radius: 2px 0 0 2px;
+  border-radius: 2px 0 0 2px;
+}
+.claro .dijitToolbar .dijitComboButton .dijitArrowButton {
+  /* no rounded border on side adjacent to button */
+
+  -moz-border-radius: 0 2px 2px 0;
+  border-radius: 0 2px 2px 0;
+}
+.claro .dijitToolbar .dijitComboBox .dijitButtonNode {
+  padding: 0;
+}
+/* hover status */
+.claro .dijitToolbar .dijitButtonHover .dijitButtonNode,
+.claro .dijitToolbar .dijitDropDownButtonHover .dijitButtonNode,
+.claro .dijitToolbar .dijitToggleButtonHover .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNode {
+  border-width: 1px;
+  background-color: #abd6ff;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 1px;
+}
+.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton {
+  background-color: #f3ffff;
+}
+.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNodeHover,
+.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButtonHover {
+  background-color: #abd6ff;
+}
+/* active status */
+.claro .dijitToolbar .dijitButtonActive .dijitButtonNode,
+.claro .dijitToolbar .dijitDropDownButtonActive .dijitButtonNode,
+.claro .dijitToolbar .dijitToggleButtonActive .dijitButtonNode {
+  border-width: 1px;
+  background-color: #7dbdfa;
+  background-image: url("images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 1px;
+}
+.claro .dijitToolbar .dijitComboButtonActive {
+  -webkit-transition-duration: 0.2s;
+  -moz-transition-duration: 0.2s;
+  transition-duration: 0.2s;
+  border-width: 1px;
+  padding: 0;
+}
+.claro .dijitToolbar .dijitComboButtonActive .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButton {
+  background-color: #f3ffff;
+  padding: 2px;
+}
+.claro .dijitToolbar .dijitComboButtonActive .dijitButtonNodeActive {
+  background-color: #7dbdfa;
+  background-image: url("images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+.claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButtonActive {
+  background-color: #7dbdfa;
+  background-image: url("images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+/* Avoid double border between button and arrow */
+.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton,
+.claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButton {
+  border-left-width: 0;
+}
+.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton {
+  padding-left: 2px;
+  /* since there's no left border, don't reduce from 2px --> 1px */
+
+}
+/* toggle button checked status */
+.claro .dijitToolbar .dijitToggleButtonChecked .dijitButtonNode {
+  margin: 0;
+  /* remove margin and add a border */
+
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  border-color: #759dc0;
+  background-color: #ffffff;
+  padding: 1px;
+}
+.claro .dijitToolbarSeparator {
+  /* separator icon in the editor sprite */
+
+  background: url("../../icons/images/editorIconsEnabled.png");
+}
+/* Toolbar inside of disabled Editor */
+.claro .dijitDisabled .dijitToolbar {
+  background: none;
+  background-color: #efefef;
+  border-bottom: 1px solid #d3d3d3;
+}
+.claro .dijitToolbar .dijitComboBoxDisabled .dijitArrowButtonInner {
+  background-position: 0 50%;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Toolbar.less b/src/main/resources/static/dijit/themes/claro/Toolbar.less
new file mode 100644
index 0000000000000000000000000000000000000000..90b9009e2509846885b2297b7f61d21405c3de52
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Toolbar.less
@@ -0,0 +1,173 @@
+/* Toolbar 
+ * 
+ * Styling Toolbar means styling the toolbar container and the widget inside toolbar  (dijitToolbar)
+ * 
+ * 1. toolbar (default styling): 
+ * 		.dijitToolbar - styles for outer container
+ *
+ * 2. widget inside toolbar
+ * 		.dijitToolbar .dijitButtonNode   - Button widget
+ * 					  .dijitComboButton  - ComboButton widget
+ * 					  .dijitDropDownButton  - DropDownButton widget
+ * 					  .dijitToggleButton  - ToggleButton widget
+ * 		
+ * 3. hovered widget inside toolbar (ie, mouse hover on the widget inside)
+ * 			.dijitToolbar .dijitButtonNodeHover  - styles for hovered Button widget
+ * 
+ * 4. actived widget inside toolbar (ie, mouse down on the widget inside)
+ * 			.dijitToolbar .dijitButtonNodeActive  - mouse down on Button widget
+ */
+
+@import "variables";
+
+.claro .dijitToolbar {
+	border-bottom: 1px solid @border-color;
+	background-color: @bar-background-color;
+	.standard-gradient;
+	padding: 2px 0 2px 4px;
+	zoom: 1;
+}
+
+.claro .dijitToolbar label {
+	padding: 0 3px 0 6px;
+}
+
+/** override claro/form/Button.css, and also ComboBox down arrow **/
+.claro .dijitToolbar .dijitButton .dijitButtonNode,
+.claro .dijitToolbar .dijitDropDownButton .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButton .dijitButtonNode,
+.claro .dijitToolbar .dijitToggleButton .dijitButtonNode,
+.claro .dijitToolbar .dijitComboBox .dijitButtonNode {
+	border-width: 0;	/* on hover/active, border-->1px, padding-->1px */
+	padding: 2px;
+	.border-radius(@toolbar-button-border-radius);
+	.box-shadow(none);
+	.transition-property(background-color);
+	.transition-duration(.3s);
+
+	background-color:rgba(171,214,255,0);
+	background-image: none;	/* cancel gradient for normal buttons, we don't want any gradient besides toolbar's on non-hovered buttons */
+}
+.dj_ie .claro .dijitToolbar .dijitButton .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitDropDownButton .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitComboButton .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitToggleButton .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitComboBox .dijitButtonNode {
+	background-color: transparent;   /* for IE, which doesn't understand rgba(...) */
+}
+
+/* hover status */
+.dj_ie .claro .dijitToolbar .dijitButtonHover .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitDropDownButtonHover .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitComboButton .dijitButtonNodeHover,
+.dj_ie .claro .dijitToolbar .dijitComboButton .dijitDownArrowButtonHover,
+.dj_ie .claro .dijitToolbar .dijitToggleButtonHover .dijitButtonNode {
+    /* button should still turn blue on hover, so need to override .dj_ie rules above */
+	background-color: @button-hovered-background-color;
+}
+
+/* active status */
+.dj_ie .claro .dijitToolbar .dijitButtonActive .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitDropDownButtonActive .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitComboButtonActive .dijitButtonNode,
+.dj_ie .claro .dijitToolbar .dijitToggleButtonActive .dijitButtonNode {
+    /* button should still turn blue on press, so need to override .dj_ie rules above */
+	background-color: @button-pressed-background-color;
+}
+
+.claro .dijitToolbar .dijitComboButton .dijitStretch {
+	/* no rounded border on side adjacent to arrow */
+	.border-radius(@toolbar-button-border-radius 0 0 @toolbar-button-border-radius);
+}
+.claro .dijitToolbar .dijitComboButton .dijitArrowButton {
+	/* no rounded border on side adjacent to button */
+	.border-radius(0 @toolbar-button-border-radius @toolbar-button-border-radius 0);
+}
+
+.claro .dijitToolbar .dijitComboBox .dijitButtonNode {
+	padding: 0;
+}
+
+/* hover status */
+.claro .dijitToolbar .dijitButtonHover .dijitButtonNode,
+.claro .dijitToolbar .dijitDropDownButtonHover .dijitButtonNode,
+.claro .dijitToolbar .dijitToggleButtonHover .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNode {
+	border-width:1px;
+	background-color: @hovered-background-color;
+	.standard-gradient;
+	padding: 1px;
+}
+.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton {
+	background-color: @toolbar-combobutton-hovered-unhoveredsection-background-color;
+}
+.claro .dijitToolbar .dijitComboButtonHover .dijitButtonNodeHover,
+.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButtonHover {
+	background-color: @hovered-background-color;
+}
+
+/* active status */
+.claro .dijitToolbar .dijitButtonActive .dijitButtonNode,
+.claro .dijitToolbar .dijitDropDownButtonActive .dijitButtonNode,
+.claro .dijitToolbar .dijitToggleButtonActive .dijitButtonNode {
+	border-width: 1px;
+	background-color:@pressed-background-color;
+	.active-gradient;
+	padding: 1px;
+}
+.claro .dijitToolbar .dijitComboButtonActive {
+	.transition-duration(.2s);
+	border-width: 1px;
+	padding: 0;
+}
+.claro .dijitToolbar .dijitComboButtonActive .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButton {
+	background-color: @toolbar-combobutton-hovered-unhoveredsection-background-color;
+	padding: 2px;
+}
+.claro .dijitToolbar .dijitComboButtonActive .dijitButtonNodeActive {
+	background-color: @pressed-background-color;
+	.active-gradient;
+}
+.claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButtonActive {
+	background-color: @pressed-background-color;
+	.active-gradient;
+}
+
+/* Avoid double border between button and arrow */
+.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton,
+.claro .dijitToolbar .dijitComboButtonActive .dijitDownArrowButton {
+	border-left-width: 0;
+}
+.claro .dijitToolbar .dijitComboButtonHover .dijitDownArrowButton {
+	padding-left: 2px;		/* since there's no left border, don't reduce from 2px --> 1px */
+}
+
+/* toggle button checked status */
+.claro .dijitToolbar .dijitToggleButtonChecked .dijitButtonNode {
+	margin: 0;	/* remove margin and add a border */
+	border-width: 1px;
+	border-style: solid;
+	background-image: none;
+	border-color: @selected-border-color;
+	background-color: @toolbar-button-checked-background-color;
+	padding: 1px;
+}
+
+.claro .dijitToolbarSeparator {
+	/* separator icon in the editor sprite */
+	background: url(@image-editor-icons-enabled);
+}
+
+/* Toolbar inside of disabled Editor */
+.claro .dijitDisabled .dijitToolbar {
+	background:none;
+	background-color:@disabled-background-color;
+	border-bottom: 1px solid @disabled-border-color;
+}
+
+.claro .dijitToolbar .dijitComboBoxDisabled .dijitArrowButtonInner {
+	background-position:0 50%;
+}
+
diff --git a/src/main/resources/static/dijit/themes/claro/Toolbar_rtl.css b/src/main/resources/static/dijit/themes/claro/Toolbar_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..c54a34cc6c5c0d69d25cd833ddd36b896678007d
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Toolbar_rtl.css
@@ -0,0 +1,32 @@
+/* Toolbar RTL */
+/* Repeated rules from Toolbar.css to override rule from Button_rtl.css, which is loaded after Toolbar.css */
+.claro .dijitToolbar .dijitComboButtonRtl .dijitButtonNode {
+  border-width: 0;
+  padding: 2px;
+}
+.claro .dijitToolbar .dijitComboButtonRtlHover .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButtonRtlActive .dijitButtonNode {
+  border-width: 1px;
+  padding: 1px;
+}
+.claro .dijitToolbar .dijitComboButtonRtl .dijitStretch {
+  /* no rounded border on side adjacent to arrow */
+
+  -moz-border-radius: 0 2px 2px 0;
+  border-radius: 0 2px 2px 0;
+}
+.claro .dijitToolbar .dijitComboButtonRtl .dijitArrowButton {
+  /* no rounded border on side adjacent to button */
+
+  -moz-border-radius: 2px 0 0 2px;
+  border-radius: 2px 0 0 2px;
+}
+.claro .dijitToolbar .dijitComboButtonRtlHover .dijitArrowButton,
+.claro .dijitToolbar .dijitComboButtonRtlActive .dijitArrowButton {
+  /* border between button and arrow */
+
+  border-left-width: 1px;
+  border-right-width: 0;
+  padding-left: 1px;
+  padding-right: 2px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Toolbar_rtl.less b/src/main/resources/static/dijit/themes/claro/Toolbar_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..8d31c88f4ab8c257293c77158bba92bf764c65ee
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Toolbar_rtl.less
@@ -0,0 +1,32 @@
+/* Toolbar RTL */
+
+@import "variables";
+
+/* Repeated rules from Toolbar.css to override rule from Button_rtl.css, which is loaded after Toolbar.css */
+.claro .dijitToolbar .dijitComboButtonRtl .dijitButtonNode {
+	border-width: 0;
+	padding: 2px;
+}
+.claro .dijitToolbar .dijitComboButtonRtlHover .dijitButtonNode,
+.claro .dijitToolbar .dijitComboButtonRtlActive .dijitButtonNode {
+	border-width: 1px;
+	padding: 1px;
+}
+
+.claro .dijitToolbar .dijitComboButtonRtl .dijitStretch {
+	/* no rounded border on side adjacent to arrow */
+	.border-radius(0 2px 2px 0);
+}
+.claro .dijitToolbar .dijitComboButtonRtl .dijitArrowButton {
+	/* no rounded border on side adjacent to button */
+	.border-radius(2px 0 0 2px);
+}
+
+.claro .dijitToolbar .dijitComboButtonRtlHover .dijitArrowButton,
+.claro .dijitToolbar .dijitComboButtonRtlActive .dijitArrowButton {
+	/* border between button and arrow */
+	border-left-width: 1px;
+	border-right-width: 0;
+	padding-left: 1px;
+	padding-right: 2px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Tree.css b/src/main/resources/static/dijit/themes/claro/Tree.css
new file mode 100644
index 0000000000000000000000000000000000000000..048902f9eedcce7d161781495a8fc16be33f91c7
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Tree.css
@@ -0,0 +1,147 @@
+/* Tree 
+ * 
+ * Styling Tree mostly means styling the TreeRow (dijitTreeRow)
+ * There are 4 basic states to style:
+ * 
+ * Tree Row:
+ * 1. tree row (default styling): 
+ * 		.dijitTreeRow - styles for each row of the tree
+ *
+ * 2. hovered tree row (mouse hover on a tree row)
+ * 		.dijitTreeRowHover - styles when mouse over on one row
+ * 
+ * 3. active tree row (mouse down on a tree row)
+ * 		.dijitTreeRowActive - styles when mouse down on one row
+ * 
+ * 4. selected tree row
+ * 		dijitTreeRowSelected - style when the row has been selected
+ * 
+ * Tree Expando:
+ * 	    dijitTreeExpando - the expando at the left of the text of each tree row
+ * 
+ * Drag and Drop on TreeNodes: (insert line on dijitTreeContent node so it'll aligned w/ target element)
+ * 		.dijitTreeNode .dojoDndItemBefore/.dojoDndItemAfter - use border style simulate a separate line
+ */
+.claro .dijitTreeNode {
+  zoom: 1;
+  /* force layout on IE (TODO: may not be needed anymore) */
+
+}
+.claro .dijitTreeIsRoot {
+  background-image: none;
+}
+/* Styling for basic tree node (unhovered, unselected)
+ * Also use this styling when dropping between items on the tree (in other words, don't
+ * use hover effect)
+ */
+.claro .dijitTreeRow,
+.claro .dijitTreeNode .dojoDndItemBefore,
+.claro .dijitTreeNode .dojoDndItemAfter {
+  /* so insert line shows up on IE when dropping after a target element */
+
+  padding: 4px 0 2px 0;
+  background-color: none;
+  background-color: transparent;
+  background-color: rgba(171, 214, 255, 0);
+  background-position: 0 0;
+  background-repeat: repeat-x;
+  border: solid 0 transparent;
+  color: #000000;
+  -webkit-transition-property: background-color, border-color;
+  -moz-transition-property: background-color, border-color;
+  transition-property: background-color, border-color;
+  -webkit-transition-duration: 0.25s;
+  -moz-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+  -webkit-transition-timing-function: ease-out;
+  -moz-transition-timing-function: ease-out;
+  transition-timing-function: ease-out;
+}
+.claro .dijitTreeRowSelected {
+  background-color: #cfe5fa;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 3px 0 1px;
+  border-color: #759dc0;
+  border-width: 1px 0;
+  color: #000000;
+}
+.claro .dijitTreeRowHover {
+  background-color: #abd6ff;
+  background-image: url("images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 3px 0 1px;
+  border-color: #759dc0;
+  border-width: 1px 0;
+  color: #000000;
+  -webkit-transition-duration: 0.25s;
+  -moz-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+}
+.claro .dijitTreeRowActive {
+  background-color: #7dbdfa;
+  background-image: url("images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 3px 0 1px;
+  border-color: #759dc0;
+  border-width: 1px 0;
+  color: #000000;
+}
+.claro .dijitTreeRowFocused {
+  background-repeat: repeat;
+}
+/* expando (open/closed) icon */
+.claro .dijitTreeExpando {
+  background-image: url("images/treeExpandImages.png");
+  width: 16px;
+  height: 16px;
+  background-position: -35px 0;
+  /* for dijitTreeExpandoOpened */
+
+}
+.dj_ie6 .claro .dijitTreeExpando {
+  background-image: url("images/treeExpandImages8bit.png");
+}
+.claro .dijitTreeRowHover .dijitTreeExpandoOpened {
+  background-position: -53px 0;
+}
+.claro .dijitTreeExpandoClosed {
+  background-position: 1px 0;
+}
+.claro .dijitTreeRowHover .dijitTreeExpandoClosed {
+  background-position: -17px 0;
+}
+.claro .dijitTreeExpandoLeaf,
+.dj_ie6 .claro .dijitTreeExpandoLeaf {
+  background-image: none;
+}
+.claro .dijitTreeExpandoLoading {
+  background-image: url("../../icons/images/loadingAnimation.gif");
+  background-position: 0 0;
+}
+/* Drag and Drop on TreeNodes
+ * Put insert line on dijitTreeContent node so it's aligned w/
+ * (ie, indented equally with) target element, even
+ * though dijitTreeRowNode is the actual "drag object"
+ */
+.claro .dijitTreeNode .dojoDndItemBefore .dijitTreeContent {
+  border-top: 2px solid #759dc0;
+}
+.claro .dijitTreeNode .dojoDndItemAfter .dijitTreeContent {
+  border-bottom: 2px solid #759dc0;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Tree.less b/src/main/resources/static/dijit/themes/claro/Tree.less
new file mode 100644
index 0000000000000000000000000000000000000000..0f2bc570089a52fda45ed90fc5f096cc52d8f223
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Tree.less
@@ -0,0 +1,129 @@
+/* Tree 
+ * 
+ * Styling Tree mostly means styling the TreeRow (dijitTreeRow)
+ * There are 4 basic states to style:
+ * 
+ * Tree Row:
+ * 1. tree row (default styling): 
+ * 		.dijitTreeRow - styles for each row of the tree
+ *
+ * 2. hovered tree row (mouse hover on a tree row)
+ * 		.dijitTreeRowHover - styles when mouse over on one row
+ * 
+ * 3. active tree row (mouse down on a tree row)
+ * 		.dijitTreeRowActive - styles when mouse down on one row
+ * 
+ * 4. selected tree row
+ * 		dijitTreeRowSelected - style when the row has been selected
+ * 
+ * Tree Expando:
+ * 	    dijitTreeExpando - the expando at the left of the text of each tree row
+ * 
+ * Drag and Drop on TreeNodes: (insert line on dijitTreeContent node so it'll aligned w/ target element)
+ * 		.dijitTreeNode .dojoDndItemBefore/.dojoDndItemAfter - use border style simulate a separate line
+ */
+
+@import "variables";
+
+.claro .dijitTreeNode {
+    zoom: 1;	/* force layout on IE (TODO: may not be needed anymore) */
+}
+.claro .dijitTreeIsRoot {
+    background-image: none;
+}
+
+/* Styling for basic tree node (unhovered, unselected)
+ * Also use this styling when dropping between items on the tree (in other words, don't
+ * use hover effect)
+ */
+.claro .dijitTreeRow,
+.claro .dijitTreeNode .dojoDndItemBefore,
+.claro .dijitTreeNode .dojoDndItemAfter {
+	/* so insert line shows up on IE when dropping after a target element */
+	padding: 4px 0 2px 0;
+
+	background-color: none;	// IE6 doesn't understand rgba() or transparent below
+	background-color: transparent;	// IE8 doesn't understand rgba() below
+	background-color: rgba(171,214,255,0);	// rgba() instead of transparent to prevent flash on hover fade-in
+	background-position:0 0;
+	background-repeat:repeat-x;
+
+	border: solid 0 transparent;
+
+	color: @text-color;
+
+	.transition-property(background-color, border-color);
+	.transition-duration(.25s);
+	.transition-timing-function(ease-out);
+}
+
+.claro .dijitTreeRowSelected {
+	background-color: @selected-background-color;
+	.standard-gradient;
+	padding: 3px 0 1px;
+	border-color: @selected-border-color;
+	border-width: 1px 0;
+	color: @selected-text-color;
+}
+.claro .dijitTreeRowHover {
+	background-color: @hovered-background-color;
+	.standard-gradient;
+	padding: 3px 0 1px;
+	border-color: @hovered-border-color;
+	border-width: 1px 0;
+	color: @hovered-text-color;
+	.transition-duration(.25s);
+}
+.claro .dijitTreeRowActive {
+	background-color:@pressed-background-color;
+	.active-gradient;
+	padding: 3px 0 1px;
+	border-color: @pressed-border-color;
+	border-width: 1px 0;
+	color: @selected-text-color;
+}
+.claro .dijitTreeRowFocused {
+	background-repeat: repeat;
+}
+
+/* expando (open/closed) icon */
+
+.claro .dijitTreeExpando {
+	background-image: url(@image-tree-expand);
+    width: 16px;
+    height: 16px;
+	background-position: -35px 0;		/* for dijitTreeExpandoOpened */
+}
+.dj_ie6 .claro .dijitTreeExpando {
+	background-image: url(@image-tree-expand-ie6);
+}
+.claro .dijitTreeRowHover .dijitTreeExpandoOpened {
+	background-position: -53px 0;
+}
+.claro .dijitTreeExpandoClosed {
+	background-position: 1px 0;
+}
+.claro .dijitTreeRowHover .dijitTreeExpandoClosed {
+	background-position: -17px 0;
+}
+.claro .dijitTreeExpandoLeaf,
+.dj_ie6 .claro .dijitTreeExpandoLeaf {
+	background-image:none;
+}
+
+.claro .dijitTreeExpandoLoading {
+	background-image: url(@image-loading-animation);
+	background-position: 0 0;
+}
+
+/* Drag and Drop on TreeNodes
+ * Put insert line on dijitTreeContent node so it's aligned w/
+ * (ie, indented equally with) target element, even
+ * though dijitTreeRowNode is the actual "drag object"
+ */
+.claro .dijitTreeNode .dojoDndItemBefore .dijitTreeContent {
+	border-top: 2px solid @dnd-dropseparator-color;		// TODO: normal separator is just 1px, why is this 2px?
+}
+.claro .dijitTreeNode .dojoDndItemAfter .dijitTreeContent {
+	border-bottom: 2px solid @dnd-dropseparator-color;	// TODO: normal separator is just 1px, why is this 2px?
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Tree_rtl.css b/src/main/resources/static/dijit/themes/claro/Tree_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..85895a2d5699254d22fc37cb9df93e3db33ba6bd
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Tree_rtl.css
@@ -0,0 +1,5 @@
+/* Tree_rtl */
+.claro .dijitTreeRtl .dijitTreeExpandoLoading {
+  background-image: url("../../icons/images/loadingAnimation_rtl.gif");
+  background-position: 100% 0;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/Tree_rtl.less b/src/main/resources/static/dijit/themes/claro/Tree_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..6044c46c1c1c88049d661b112220950c7b43b575
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/Tree_rtl.less
@@ -0,0 +1,8 @@
+/* Tree_rtl */
+
+@import "variables";
+
+.claro .dijitTreeRtl .dijitTreeExpandoLoading {
+	background-image: url(@image-loading-animation-rtl);
+	background-position: 100% 0;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/claro.css b/src/main/resources/static/dijit/themes/claro/claro.css
new file mode 100644
index 0000000000000000000000000000000000000000..d3cb2688c36aa4a9d7d9414cb5d22f1e1e52458a
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/claro.css
@@ -0,0 +1,28 @@
+@import url("../dijit.css");
+@import url("../../icons/commonIcons.css");/*sprite containing common icons to be used by all themes*/
+@import url("Common.css");
+@import url("form/Common.css");
+@import url("form/Button.css");
+@import url("form/Checkbox.css");
+@import url("form/RadioButton.css");
+@import url("form/Select.css");
+@import url("layout/TabContainer.css");
+@import url("Dialog.css");
+@import url("layout/AccordionContainer.css");
+@import url("layout/ContentPane.css");
+@import url("Calendar.css");
+@import url("Menu.css");
+@import url("form/Slider.css");
+@import url("ColorPalette.css");
+@import url("InlineEditBox.css");
+@import url("ProgressBar.css");
+@import url("TimePicker.css");
+@import url("layout/BorderContainer.css");
+@import url("Tree.css"); 
+@import url("Toolbar.css");
+@import url("Editor.css");/*in order to test button or menu item with icon */
+@import url("../../icons/editorIcons.css"); /*sprite for editor icons to be used by all themes*/
+@import url("TitlePane.css");
+@import url("form/NumberSpinner.css");
+
+@import url("claro_rtl.css");
diff --git a/src/main/resources/static/dijit/themes/claro/claro_rtl.css b/src/main/resources/static/dijit/themes/claro/claro_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..fd050ed5aa1b13f4636f5920e0bab94da3fee951
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/claro_rtl.css
@@ -0,0 +1,17 @@
+/* RTL files */
+@import url("../dijit_rtl.css");
+@import url("form/Common_rtl.css");
+@import url("form/Button_rtl.css");
+@import url("layout/TabContainer_rtl.css");
+@import url("form/Slider_rtl.css");
+@import url("Dialog_rtl.css");
+@import url("Editor_rtl.css");
+@import url("../../icons/editorIcons_rtl.css");/* RTL sprite for editor icons to be used by all themes*/
+@import url("../../icons/commonIcons_rtl.css");/* RTL sprite for common icons to be used by all themes*/
+@import url("TitlePane_rtl.css");
+@import url("Menu_rtl.css");
+@import url("Calendar_rtl.css");
+@import url("Toolbar_rtl.css");
+@import url("Tree_rtl.css");
+@import url("ProgressBar_rtl.css");
+
diff --git a/src/main/resources/static/dijit/themes/claro/compile.js b/src/main/resources/static/dijit/themes/claro/compile.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5765b47db724be7cd18532ccecb2ccdb7275892
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/compile.js
@@ -0,0 +1,52 @@
+// Script to process all the less files and convert them to CSS files
+// Run from themes/dijit/claro like:
+//
+//	$ node compile.js
+
+var fs = require('fs'),		// file system access
+	path = require('path'),	// get directory from file name
+	less = require('../../../util/less/lib/less');	// less processor
+
+var options = {
+	compress: false,
+	optimization: 1,
+	silent: false
+};
+
+var allFiles = [].concat(
+		fs.readdirSync("."),
+		fs.readdirSync("form").map(function(fname){ return "form/"+fname; }),
+		fs.readdirSync("layout").map(function(fname){ return "layout/"+fname; })
+	),
+	lessFiles = allFiles.filter(function(name){ return name && name != "variables.less" && /\.less$/.test(name); });
+
+lessFiles.forEach(function(fname){
+	console.log("=== " + fname);
+	fs.readFile(fname, 'utf-8', function(e, data){
+		if(e){
+			console.error("lessc: " + e.message);
+			process.exit(1);
+		}
+
+		new(less.Parser)({
+			paths: [path.dirname(fname)],
+			optimization: options.optimization,
+			filename: fname
+		}).parse(data, function(err, tree){
+			if(err){
+				less.writeError(err, options);
+				process.exit(1);
+			}else{
+				try{
+					var css = tree.toCSS({ compress: options.compress }),
+						outputFname = fname.replace('.less', '.css');
+					var fd = fs.openSync(outputFname, "w");
+					fs.writeSync(fd, css, 0, "utf8");
+				}catch(e){
+					less.writeError(e, options);
+					process.exit(2);
+				}
+			}
+		});
+	});
+});
diff --git a/src/main/resources/static/dijit/themes/claro/document.css b/src/main/resources/static/dijit/themes/claro/document.css
new file mode 100644
index 0000000000000000000000000000000000000000..ffaac44fa61dfc9fa353c84fdb0b39878abc7ae2
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/document.css
@@ -0,0 +1,43 @@
+@import url("../../../dojo/resources/dojo.css");
+/* ======= Styling for the document itself (overriding dojo.css) ======== */
+.claro {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-size: .688em;
+  color: #131313;
+}
+/* Headings */
+.claro h1 {
+  font-size: 1.545em;
+  margin-bottom: 0.727em;
+}
+.claro h2 {
+  font-size: 1.364em;
+  line-height: 1.455em;
+  margin-top: 1em;
+  margin-bottom: 0.60em;
+  font-weight: normal;
+}
+.claro h3,
+.claro h4,
+.claro h5,
+.claro h6 {
+  font-size: 1.091em;
+  font-weight: normal;
+}
+/* paragraphs, quotes and lists */
+.claro p {
+  line-height: 1.3em;
+}
+/* pre and code */
+.claro pre,
+.claro code {
+  font-family: inherit;
+  background-color: #efefef;
+  border: 1px solid #d3d3d3;
+}
+/* tables */
+.claro table.dojoTabular thead,
+.claro table.dojoTabular tfoot {
+  background-color: #efefef;
+  border: 1px solid #d3d3d3;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/document.less b/src/main/resources/static/dijit/themes/claro/document.less
new file mode 100644
index 0000000000000000000000000000000000000000..7f86356722ceeceac5e924034075d730db1aee54
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/document.less
@@ -0,0 +1,45 @@
+/* ======= Styling for the document itself (overriding dojo.css) ======== */
+
+@import "variables";
+@import url("../../../dojo/resources/dojo.css");
+
+.claro {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-size: .688em;
+  color: @document-text-color;
+}
+
+/* Headings */
+.claro h1 {
+	font-size: 1.545em; 
+	margin-bottom:0.727em;
+}
+.claro h2 { 
+	font-size: 1.364em; 
+	line-height: 1.455em; 
+	margin-top:1em; 
+	margin-bottom:0.60em;
+	font-weight: normal;
+}
+.claro h3, .claro h4, .claro h5, .claro h6 {
+	font-size:1.091em; 
+	font-weight: normal; 
+}
+
+/* paragraphs, quotes and lists */
+.claro p { 
+	line-height: 1.3em;
+}
+
+/* pre and code */
+.claro pre, .claro code { 
+	font-family:inherit; 
+	background-color: @document-shadedsection-background-color; 
+	border: 1px solid @document-border-color;
+}
+
+/* tables */
+.claro table.dojoTabular thead, .claro table.dojoTabular tfoot { 
+	background-color: @document-shadedsection-background-color; 
+	border: 1px solid @document-border-color; 
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Button.css b/src/main/resources/static/dijit/themes/claro/form/Button.css
new file mode 100644
index 0000000000000000000000000000000000000000..f7718c105deed31e96a1852ee2f2fa984055d9ba
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Button.css
@@ -0,0 +1,168 @@
+/* Button | DropDownButton | ComboButton | ToggleButton
+ * 
+ * Styling Buttons mainly includes:
+ * 
+ * 1. Containers
+ * 		.dijitButton
+ * 		.dijitDropDownButton
+ * 		.dijitComboButton
+ * 		.dijitButtonNode - common button/arrow wrapper shared across all three button types 
+ *
+ * 2. Button text
+ * 		.dijitButtonText
+ * 
+ * 3. Arrows - only for DropDownButton and ComboButton
+ * 	     There are total four directions arrows - down, left, right, up:
+ * 		.dijitArrowButtonInner - down arrow by default
+ *      .dijitLeftArrowButton .dijitArrowButtonInner - left arrow
+ *      .dijitRightArrowButton .dijitArrowButtonInner - right arrow
+ *      .dijitUpArrowButton .dijitArrowButtonInner - up arrow
+ * 
+ * 4. States - Hover, Active, Disabled, e.g.
+ * 		.dijitButtonHover .dijitButtonNode
+ * 		.dijitButtonActive .dijitButtonNode
+ * 		.dijitButtonDisabled .dijitButtonNode
+ *      
+ *      .dijitDisabled .dijitArrowButtonInner  - disabled arrow states 
+ */
+.claro .dijitButtonNode {
+  /* rules for dijit.form.*Button widgets and arrow nodes on ComboBox, Spinner etc. */
+
+  -webkit-transition-property: background-color;
+  -moz-transition-property: background-color;
+  transition-property: background-color;
+  -webkit-transition-duration: 0.3s;
+  -moz-transition-duration: 0.3s;
+  transition-duration: 0.3s;
+}
+.claro .dijitButton .dijitButtonNode,
+.claro .dijitDropDownButton .dijitButtonNode,
+.claro .dijitComboButton .dijitButtonNode,
+.claro .dijitToggleButton .dijitButtonNode {
+  /* rules for the dijit.form.*Button widgets (see also ComboButton section below) */
+
+  border: 1px solid #759dc0;
+  padding: 2px 4px 4px 4px;
+  color: #000000;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
+  background-color: #bcd8f4;
+  background-image: url("images/buttonEnabled.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(#ffffff 0px, rgba(255, 255, 255, 0) 3px, rgba(255, 255, 255, 0.75) 100%);
+  background-image: -webkit-linear-gradient(#ffffff 0px, rgba(255, 255, 255, 0) 3px, rgba(255, 255, 255, 0.75) 100%);
+  background-image: -o-linear-gradient(#ffffff 0px, rgba(255, 255, 255, 0) 3px, rgba(255, 255, 255, 0.75) 100%);
+  background-image: linear-gradient(#ffffff 0px, rgba(255, 255, 255, 0) 3px, rgba(255, 255, 255, 0.75) 100%);
+  _background-image: none;
+}
+.claro .dijitComboButton .dijitArrowButton {
+  border-left-width: 0;
+  padding: 4px 2px 4px 2px;
+  /* TODO: still needed? */
+
+}
+/*arrow styles for down/up/left/right directions*/
+.claro .dijitArrowButtonInner {
+  width: 15px;
+  height: 15px;
+  margin: 0 auto;
+  background-image: url("../form/images/buttonArrows.png");
+  background-repeat: no-repeat;
+  background-position: -51px 53%;
+}
+.claro .dijitLeftArrowButton .dijitArrowButtonInner {
+  background-position: -77px 53%;
+}
+.claro .dijitRightArrowButton .dijitArrowButtonInner {
+  background-position: -26px 53%;
+}
+.claro .dijitUpArrowButton .dijitArrowButtonInner {
+  background-position: 0 53%;
+}
+.claro .dijitDisabled .dijitArrowButtonInner {
+  background-position: -151px 53%;
+}
+.claro .dijitDisabled .dijitLeftArrowButton .dijitArrowButtonInner {
+  background-position: -177px 53%;
+}
+.claro .dijitDisabled .dijitRightArrowButton .dijitArrowButtonInner {
+  background-position: -126px 53%;
+}
+.claro .dijitDisabled .dijitUpArrowButton .dijitArrowButtonInner {
+  background-position: -100px 53%;
+}
+.claro .dijitButtonText {
+  padding: 0 0.3em;
+  text-align: center;
+}
+/* hover status */
+.claro .dijitButtonHover .dijitButtonNode,
+.claro .dijitDropDownButtonHover .dijitButtonNode,
+.claro .dijitComboButton .dijitButtonNodeHover,
+.claro .dijitComboButton .dijitDownArrowButtonHover,
+.claro .dijitToggleButtonHover .dijitButtonNode {
+  background-color: #86bdf2;
+  color: #000000;
+  -webkit-transition-duration: 0.2s;
+  -moz-transition-duration: 0.2s;
+  transition-duration: 0.2s;
+}
+/* active, checked status */
+.claro .dijitButtonActive .dijitButtonNode,
+.claro .dijitDropDownButtonActive .dijitButtonNode,
+.claro .dijitComboButtonActive .dijitButtonNode,
+.claro .dijitToggleButtonActive .dijitButtonNode,
+.claro .dijitToggleButtonChecked .dijitButtonNode {
+  background-color: #86bdf2;
+  -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2);
+  -webkit-transition-duration: 0.1s;
+  -moz-transition-duration: 0.1s;
+  transition-duration: 0.1s;
+}
+/* disabled status */
+.claro .dijitButtonDisabled,
+.claro .dijitDropDownButtonDisabled,
+.claro .dijitComboButtonDisabled,
+.claro .dijitToggleButtonDisabled {
+  background-image: none;
+  outline: none;
+}
+.claro .dijitButtonDisabled .dijitButtonNode,
+.claro .dijitDropDownButtonDisabled .dijitButtonNode,
+.claro .dijitComboButtonDisabled .dijitButtonNode,
+.claro .dijitToggleButtonDisabled .dijitButtonNode {
+  background-color: #efefef;
+  border: solid 1px #d3d3d3;
+  color: #818181;
+  -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
+  -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0);
+  box-shadow: 0 0 0 rgba(0, 0, 0, 0);
+  background-image: url("images/buttonDisabled.png");
+  background-image: -moz-linear-gradient(#ffffff 0%, rgba(255, 255, 255, 0) 40%);
+  background-image: -webkit-linear-gradient(#ffffff 0%, rgba(255, 255, 255, 0) 40%);
+  background-image: -o-linear-gradient(#ffffff 0%, rgba(255, 255, 255, 0) 40%);
+  background-image: linear-gradient(#ffffff 0%, rgba(255, 255, 255, 0) 40%);
+  _background-image: none;
+}
+.claro .dijitComboButtonDisabled .dijitArrowButton {
+  border-left-width: 0;
+}
+/* for ComboButton */
+.claro table.dijitComboButton {
+  border-collapse: separate;
+  /* override dijit.css so that ComboBox rounded corners work */
+
+}
+.claro .dijitComboButton .dijitStretch {
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+.claro .dijitComboButton .dijitArrowButton {
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Button.less b/src/main/resources/static/dijit/themes/claro/form/Button.less
new file mode 100644
index 0000000000000000000000000000000000000000..5d59532371b2545e5897b2bff828cef5647142a6
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Button.less
@@ -0,0 +1,164 @@
+/* Button | DropDownButton | ComboButton | ToggleButton
+ * 
+ * Styling Buttons mainly includes:
+ * 
+ * 1. Containers
+ * 		.dijitButton
+ * 		.dijitDropDownButton
+ * 		.dijitComboButton
+ * 		.dijitButtonNode - common button/arrow wrapper shared across all three button types 
+ *
+ * 2. Button text
+ * 		.dijitButtonText
+ * 
+ * 3. Arrows - only for DropDownButton and ComboButton
+ * 	     There are total four directions arrows - down, left, right, up:
+ * 		.dijitArrowButtonInner - down arrow by default
+ *      .dijitLeftArrowButton .dijitArrowButtonInner - left arrow
+ *      .dijitRightArrowButton .dijitArrowButtonInner - right arrow
+ *      .dijitUpArrowButton .dijitArrowButtonInner - up arrow
+ * 
+ * 4. States - Hover, Active, Disabled, e.g.
+ * 		.dijitButtonHover .dijitButtonNode
+ * 		.dijitButtonActive .dijitButtonNode
+ * 		.dijitButtonDisabled .dijitButtonNode
+ *      
+ *      .dijitDisabled .dijitArrowButtonInner  - disabled arrow states 
+ */
+
+@import "../variables";
+
+.claro .dijitButtonNode {
+	/* rules for dijit.form.*Button widgets and arrow nodes on ComboBox, Spinner etc. */
+	.transition-property(background-color);
+ 	.transition-duration(.3s);
+}
+
+.claro .dijitButton .dijitButtonNode,
+.claro .dijitDropDownButton .dijitButtonNode,
+.claro .dijitComboButton .dijitButtonNode,
+.claro .dijitToggleButton .dijitButtonNode {
+	/* rules for the dijit.form.*Button widgets (see also ComboButton section below) */
+	border: 1px solid @button-border-color;
+	padding: 2px 4px 4px 4px;
+	color: @text-color;
+	.border-radius(@button-border-radius);
+	.box-shadow(0 1px 1px rgba(0,0,0,0.15));
+
+	background-color: desaturate(darken(@button-background-color, 10), 20);
+
+	// Alpha transparency layer to add gradient to above background color.
+	// Use CSS gradient with fallback to image for IE.
+	background-image: url("images/buttonEnabled.png");
+	background-repeat: repeat-x;
+	.alpha-white-gradient(1, 0px, 0, 3px, 0.75, 100%);
+	_background-image: none;	// IE6 can't handle background-color and background-image at once.
+}
+
+
+.claro .dijitComboButton .dijitArrowButton {
+	border-left-width: 0;
+	padding: 4px 2px 4px 2px;	/* TODO: still needed? */
+}
+
+/*arrow styles for down/up/left/right directions*/
+.claro .dijitArrowButtonInner {
+	width: 15px;
+	height: 15px;
+	margin: 0 auto;
+	background-image:url("../@{image-form-button-arrows}");
+	background-repeat:no-repeat;
+	background-position:-51px 53%;
+}
+.claro .dijitLeftArrowButton .dijitArrowButtonInner {
+	background-position: -77px 53%;
+}
+.claro .dijitRightArrowButton .dijitArrowButtonInner {
+	background-position: -26px 53%;
+}
+.claro .dijitUpArrowButton .dijitArrowButtonInner {
+	background-position: 0 53%;
+}
+.claro .dijitDisabled .dijitArrowButtonInner {
+	background-position: -151px 53%;
+}
+.claro .dijitDisabled .dijitLeftArrowButton .dijitArrowButtonInner {
+	background-position: -177px 53%;
+}
+.claro .dijitDisabled .dijitRightArrowButton .dijitArrowButtonInner {
+	background-position: -126px 53%;
+}
+.claro .dijitDisabled .dijitUpArrowButton .dijitArrowButtonInner {
+	background-position: -100px 53%;
+}
+
+.claro .dijitButtonText {
+	padding: 0 0.3em;
+	text-align: center;
+}
+
+
+
+
+
+/* hover status */
+.claro .dijitButtonHover .dijitButtonNode,
+.claro .dijitDropDownButtonHover .dijitButtonNode,
+.claro .dijitComboButton .dijitButtonNodeHover, 
+.claro .dijitComboButton .dijitDownArrowButtonHover,
+.claro .dijitToggleButtonHover .dijitButtonNode {
+	background-color: desaturate(darken(@button-hovered-background-color, 10), 20);
+	color:@text-color;
+ 	.transition-duration(.2s);
+}
+
+/* active, checked status */
+.claro .dijitButtonActive .dijitButtonNode, 
+.claro .dijitDropDownButtonActive .dijitButtonNode,
+.claro .dijitComboButtonActive .dijitButtonNode,
+.claro .dijitToggleButtonActive .dijitButtonNode,
+.claro .dijitToggleButtonChecked .dijitButtonNode {
+	background-color: desaturate(darken(@button-pressed-background-color, 10), 20);
+	.box-shadow(inset 0px 1px 1px rgba(0, 0, 0, 0.2));
+ 	.transition-duration(.1s);
+}
+
+/* disabled status */
+.claro .dijitButtonDisabled,
+.claro .dijitDropDownButtonDisabled,
+.claro .dijitComboButtonDisabled,
+.claro .dijitToggleButtonDisabled {
+	background-image: none;
+	outline: none;
+}
+
+.claro .dijitButtonDisabled .dijitButtonNode,
+.claro .dijitDropDownButtonDisabled .dijitButtonNode,
+.claro .dijitComboButtonDisabled .dijitButtonNode,
+.claro .dijitToggleButtonDisabled .dijitButtonNode {
+	background-color: @disabled-background-color;
+	border: solid 1px @disabled-border-color;
+	color: @disabled-text-color;
+	.box-shadow(0 0 0 rgba(0,0,0,0));
+
+	// Change the gradient from light to dark.
+	// Again using CSS gradient with fallback to image for IE.
+	background-image: url("images/buttonDisabled.png");
+	.alpha-white-gradient(1, 0%, 0, 40%);
+	_background-image: none;	// IE6 can't handle background-color and background-image at once.
+}
+
+.claro .dijitComboButtonDisabled .dijitArrowButton{ 
+	border-left-width: 0;
+}
+/* for ComboButton */
+.claro table.dijitComboButton {
+	border-collapse: separate;	/* override dijit.css so that ComboBox rounded corners work */
+}
+
+.claro .dijitComboButton .dijitStretch {
+	.border-radius(@button-border-radius 0 0 @button-border-radius);
+}
+.claro .dijitComboButton .dijitArrowButton {
+	.border-radius(0 @button-border-radius @button-border-radius 0);
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Button_rtl.css b/src/main/resources/static/dijit/themes/claro/form/Button_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..2d5b08bff078f6d77d561d5b978aee300423f4fd
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Button_rtl.css
@@ -0,0 +1,13 @@
+/* Combo Button */
+.claro .dijitComboButtonRtl .dijitStretch {
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.claro .dijitComboButtonRtl .dijitArrowButton {
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+  padding: 3px 0 4px;
+  border-left-width: 1px;
+  border-right-width: 0;
+}
+/* End Combo Button */
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/form/Button_rtl.less b/src/main/resources/static/dijit/themes/claro/form/Button_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..6225d6847ba9eab19d5f7b3e2a6b8f0137a2519c
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Button_rtl.less
@@ -0,0 +1,16 @@
+@import "../variables";
+
+/* Combo Button */
+
+.claro .dijitComboButtonRtl .dijitStretch {
+	.border-radius(0 @button-border-radius @button-border-radius 0);
+}
+
+.claro .dijitComboButtonRtl .dijitArrowButton {
+	.border-radius(@button-border-radius 0 0  @button-border-radius);
+	padding:3px 0 4px;
+	border-left-width: 1px;
+	border-right-width: 0;
+}
+
+/* End Combo Button */
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/form/Checkbox.css b/src/main/resources/static/dijit/themes/claro/form/Checkbox.css
new file mode 100644
index 0000000000000000000000000000000000000000..fb4e726b6628e6f96b296ee862dbd0c50527acf3
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Checkbox.css
@@ -0,0 +1,75 @@
+/* CheckBox
+ * 
+ * Styling CheckBox mainly includes:
+ * 
+ * 1. Containers
+ * 		.dijitCheckBox|.dijitCheckBoxIcon - for border, padding, width|height and background image
+ * 
+ * 2. CheckBox within ToggleButton
+ * 		.dijitToggleButton|.dijitToggleButtonChecked .* - for background image
+ * 
+ * 3. Checked state
+ * 		.dijitCheckBoxChecked - for checked background-color|image
+ * 		.dijitToggleButtonChecked - for border, background-color|image, display and width|height
+ * 
+ * 4. Hover state
+ * 		.dijitCheckBoxHover|.dijitCheckBoxCheckedHover - for background image
+ * 
+ * 5. Disabled state
+ * 		.dijitCheckBoxDisabled|.dijitCheckBoxCheckedDisabled - for background image
+ */
+.claro .dijitToggleButton .dijitCheckBoxIcon {
+  background-image: url("../images/checkmarkNoBorder.png");
+}
+.dj_ie6 .claro .dijitToggleButton .dijitCheckBoxIcon {
+  background-image: url("../images/checkmarkNoBorder.gif");
+}
+.claro .dijitCheckBox,
+.claro .dijitCheckBoxIcon {
+  background-image: url("../form/images/checkboxRadioButtonStates.png");
+  /* checkbox sprite image */
+
+  background-repeat: no-repeat;
+  width: 15px;
+  height: 16px;
+  margin: 0 2px 0 0;
+  padding: 0;
+}
+.dj_ie6 .claro .dijitCheckBox,
+.dj_ie6 .claro .dijitCheckBoxIcon {
+  background-image: url("../form/images/checkboxAndRadioButtons_IE6.png");
+  /* checkbox sprite image */
+
+}
+.claro .dijitCheckBox,
+.claro .dijitToggleButton .dijitCheckBoxIcon {
+  /* unchecked */
+
+  background-position: -15px;
+}
+.claro .dijitCheckBoxChecked,
+.claro .dijitToggleButtonChecked .dijitCheckBoxIcon {
+  /* checked */
+
+  background-position: 0;
+}
+.claro .dijitCheckBoxDisabled {
+  /* disabled */
+
+  background-position: -75px;
+}
+.claro .dijitCheckBoxCheckedDisabled {
+  /* disabled but checked */
+
+  background-position: -60px;
+}
+.claro .dijitCheckBoxHover {
+  /* hovering over an unchecked enabled checkbox */
+
+  background-position: -45px;
+}
+.claro .dijitCheckBoxCheckedHover {
+  /* hovering over an checked enabled checkbox */
+
+  background-position: -30px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Checkbox.less b/src/main/resources/static/dijit/themes/claro/form/Checkbox.less
new file mode 100644
index 0000000000000000000000000000000000000000..6ce444800fff61aa17a34a5b6d3dfd09cb148f7d
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Checkbox.less
@@ -0,0 +1,79 @@
+/* CheckBox
+ * 
+ * Styling CheckBox mainly includes:
+ * 
+ * 1. Containers
+ * 		.dijitCheckBox|.dijitCheckBoxIcon - for border, padding, width|height and background image
+ * 
+ * 2. CheckBox within ToggleButton
+ * 		.dijitToggleButton|.dijitToggleButtonChecked .* - for background image
+ * 
+ * 3. Checked state
+ * 		.dijitCheckBoxChecked - for checked background-color|image
+ * 		.dijitToggleButtonChecked - for border, background-color|image, display and width|height
+ * 
+ * 4. Hover state
+ * 		.dijitCheckBoxHover|.dijitCheckBoxCheckedHover - for background image
+ * 
+ * 5. Disabled state
+ * 		.dijitCheckBoxDisabled|.dijitCheckBoxCheckedDisabled - for background image
+ */
+
+@import "../variables";
+
+.claro .dijitToggleButton .dijitCheckBoxIcon {
+	background-image: url("../@{image-checkmark}");
+}
+
+.dj_ie6 .claro .dijitToggleButton .dijitCheckBoxIcon {
+	background-image: url("../@{image-checkmark-ie6}");
+}
+
+.claro .dijitCheckBox,
+.claro .dijitCheckBoxIcon		/* inside a toggle button */	{
+	background-image: url("../@{image-form-checkbox-and-radios}"); /* checkbox sprite image */
+	background-repeat: no-repeat;
+	width: 15px;
+	height: 16px;
+	margin: 0 2px 0 0;
+	padding: 0;
+}
+
+.dj_ie6 .claro .dijitCheckBox,
+.dj_ie6 .claro .dijitCheckBoxIcon		/* inside a toggle button */	{
+	background-image: url("../@{image-form-checkbox-and-radios-ie6}"); /* checkbox sprite image */
+}
+
+.claro .dijitCheckBox,
+.claro .dijitToggleButton .dijitCheckBoxIcon {
+	/* unchecked */
+	background-position: -15px;
+}
+
+.claro .dijitCheckBoxChecked,
+.claro .dijitToggleButtonChecked .dijitCheckBoxIcon {
+	/* checked */
+	background-position: -0;
+}
+
+.claro .dijitCheckBoxDisabled {
+	/* disabled */
+	background-position: -75px;
+}
+
+.claro .dijitCheckBoxCheckedDisabled {
+	/* disabled but checked */
+	background-position: -60px;
+}
+
+.claro .dijitCheckBoxHover {
+	/* hovering over an unchecked enabled checkbox */
+	background-position: -45px;
+}
+
+.claro .dijitCheckBoxCheckedHover {
+	/* hovering over an checked enabled checkbox */
+	background-position: -30px;
+}
+
+
diff --git a/src/main/resources/static/dijit/themes/claro/form/Common.css b/src/main/resources/static/dijit/themes/claro/form/Common.css
new file mode 100644
index 0000000000000000000000000000000000000000..4194871b6f9c3bbc6c1d32c05297b3a76ab4c1b6
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Common.css
@@ -0,0 +1,227 @@
+/* claro/form/Common.css */
+/*========================= common css =========================*/
+/* 'dijitTextBox' refers to 'dijit(TextBox|DateTextBox|CurrencyTextBox|...)' */
+.claro .dijitTextBox,
+.claro .dijitInputInner {
+  color: #000000;
+}
+.claro .dijitValidationTextBoxError .dijitValidationContainer {
+  background-color: #d46464;
+  background-image: url("../form/images/error.png");
+  background-position: top center;
+  border: solid #d46464 0;
+  width: 9px;
+}
+.claro .dijitTextBoxError .dijitValidationContainer {
+  border-left-width: 1px;
+}
+.claro .dijitValidationTextBoxError .dijitValidationIcon {
+  width: 0;
+  background-color: transparent;
+  /* so the INPUT doesn't obscure the border in rtl+a11y */
+
+}
+/* Padding for the input area of TextBox based widgets, and corresponding padding for the
+ * down arrow button and the placeholder.   placeholder is explicitly listed  because
+ * dijitPlaceHolder is absolutely positioned, so padding set on dijitInputField
+ * won't affect it
+ */
+.claro .dijitTextArea,
+.claro .dijitInputField .dijitPlaceHolder {
+  padding: 2px;
+}
+.claro .dijitSelect .dijitInputField,
+.claro .dijitTextBox .dijitInputField {
+  padding: 1px 2px;
+}
+.dj_gecko .claro .dijitTextBox .dijitInputInner,
+.dj_webkit .claro .dijitTextBox .dijitInputInner {
+  padding-left: 1px;
+  padding-right: 1px;
+}
+.claro .dijitSelect,
+.claro .dijitSelect .dijitButtonContents,
+.claro .dijitTextBox,
+.claro .dijitTextBox .dijitButtonNode {
+  /* color for (outer) border on *TextBox widgets, and border between input and buttons on ComboBox and Spinner */
+
+  border-color: #b5bcc7;
+  -webkit-transition-property: background-color, border;
+  -moz-transition-property: background-color, border;
+  transition-property: background-color, border;
+  -webkit-transition-duration: 0.35s;
+  -moz-transition-duration: 0.35s;
+  transition-duration: 0.35s;
+}
+.claro .dijitSelect,
+.claro .dijitTextBox {
+  background-color: #ffffff;
+}
+/* hover */
+.claro .dijitSelectHover,
+.claro .dijitSelectHover .dijitButtonContents,
+.claro .dijitTextBoxHover,
+.claro .dijitTextBoxHover .dijitButtonNode {
+  border-color: #759dc0;
+  -webkit-transition-duration: 0.25s;
+  -moz-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+}
+.claro .dijitTextBoxHover {
+  background-color: #e5f2fe;
+  background-image: -moz-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: -webkit-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: -o-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+}
+/* error state */
+.claro .dijitSelectError,
+.claro .dijitSelectError .dijitButtonContents,
+.claro .dijitTextBoxError,
+.claro .dijitTextBoxError .dijitButtonNode {
+  border-color: #d46464;
+}
+/* focused state */
+.claro .dijitSelectFocused,
+.claro .dijitSelectFocused .dijitButtonContents,
+.claro .dijitTextBoxFocused,
+.claro .dijitTextBoxFocused .dijitButtonNode {
+  border-color: #759dc0;
+  -webkit-transition-duration: 0.1s;
+  -moz-transition-duration: 0.1s;
+  transition-duration: 0.1s;
+}
+.claro .dijitTextBoxFocused {
+  background-color: #ffffff;
+  background-image: -moz-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: -webkit-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: -o-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+}
+.claro .dijitTextBoxFocused .dijitInputContainer {
+  background: #ffffff;
+}
+.claro .dijitSelectErrorFocused,
+.claro .dijitSelectErrorFocused .dijitButtonContents,
+.claro .dijitTextBoxErrorFocused,
+.claro .dijitTextBoxErrorFocused .dijitButtonNode {
+  border-color: #ce5050;
+}
+/* disabled state */
+.claro .dijitSelectDisabled,
+.claro .dijitSelectDisabled .dijitButtonContents,
+.claro .dijitTextBoxDisabled,
+.claro .dijitTextBoxDisabled .dijitButtonNode {
+  border-color: #d3d3d3;
+}
+.claro .dijitSelectDisabled,
+.claro .dijitTextBoxDisabled,
+.claro .dijitTextBoxDisabled .dijitInputContainer {
+  background-color: #efefef;
+  background-image: none;
+}
+.claro .dijitSelectDisabled,
+.claro .dijitTextBoxDisabled,
+.claro .dijitTextBoxDisabled .dijitInputInner {
+  color: #818181;
+}
+.dj_webkit .claro .dijitDisabled input {
+  /* because WebKit lightens disabled input/textarea no matter what color you specify */
+
+  color: #757575;
+}
+.dj_webkit .claro textarea.dijitTextAreaDisabled {
+  /* because WebKit lightens disabled input/textarea no matter what color you specify */
+
+  color: #1b1b1b;
+}
+/*========================= for special widgets =========================*/
+/* Input boxes with an arrow (for a drop down) */
+.claro .dijitSelect .dijitArrowButtonInner,
+.claro .dijitComboBox .dijitArrowButtonInner {
+  background-image: url("../form/images/commonFormArrows.png");
+  background-position: -35px 53%;
+  background-repeat: no-repeat;
+  margin: 0;
+  width: 16px;
+}
+.claro .dijitComboBox .dijitArrowButtonInner {
+  border: 1px solid #ffffff;
+}
+.claro .dijitToolbar .dijitComboBox .dijitArrowButtonInner {
+  border: none;
+}
+.claro .dijitToolbar .dijitComboBox .dijitArrowButtonInner {
+  border: none;
+}
+/* Add 1px vertical padding to the <input> where user types and the validation icon,
+   to match the 1px border on arrow button */
+.claro .dijitSelectLabel,
+.claro .dijitTextBox .dijitInputInner,
+.claro .dijitValidationTextBox .dijitValidationContainer {
+  padding: 1px 0;
+}
+.claro .dijitComboBox .dijitButtonNode {
+  background-color: #efefef;
+  background-image: url("../images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+/* Arrow "hover" effect:
+ * The arrow button should change color whenever the mouse is in a position such that clicking it
+ * will toggle the drop down.   That's either (1) anywhere over the ComboBox or (2) over the arrow
+ * button, depending on the openOnClick setting for the widget.
+ */
+.claro .dijitComboBoxOpenOnClickHover .dijitButtonNode,
+.claro .dijitComboBox .dijitDownArrowButtonHover,
+.claro .dijitComboBoxFocused .dijitArrowButton {
+  background-color: #abd6ff;
+}
+.claro .dijitComboBoxOpenOnClickHover .dijitArrowButtonInner,
+.claro .dijitComboBox .dijitDownArrowButtonHover .dijitArrowButtonInner {
+  background-position: -70px 53%;
+}
+/* Arrow Button change when drop down is open */
+.claro .dijitComboBox .dijitHasDropDownOpen {
+  background-color: #7dbdfa;
+  background-image: url("../images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 1px;
+}
+.dj_iequirks .claro .dijitComboBox .dijitHasDropDownOpen {
+  padding: 1px 0;
+}
+.claro .dijitComboBox .dijitHasDropDownOpen .dijitArrowButtonInner {
+  background-position: -70px 53%;
+  border: 0 none;
+}
+/* disabled state */
+.claro div.dijitComboBoxDisabled .dijitArrowButtonInner {
+  /* specific selector set to override background-position setting from Button.js
+	 * (.claro .dijitComboBoxDisabled .dijitArrowButtonInner) */
+
+  background-position: 0 50%;
+  background-color: #efefef;
+}
+/*========================= hacks for browsers =========================*/
+/* it seems the input[type="hidden"] has a height (16px) too... this may cause the widget's height calculate error */
+.dj_ff3 .claro .dijitInputField input[type="hidden"] {
+  display: none;
+  height: 0;
+  width: 0;
+}
+.dj_borderbox .claro .dijitComboBox .dijitHasDropDownOpen .dijitArrowButtonInner {
+  width: 18px;
+}
+.dj_borderbox .claro .dijitComboBoxFocused .dijitHasDropDownOpen .dijitArrowButtonInner {
+  width: 16px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Common.less b/src/main/resources/static/dijit/themes/claro/form/Common.less
new file mode 100644
index 0000000000000000000000000000000000000000..30ba3e3d6274c091a14f6a0e93e563559f4d6f6d
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Common.less
@@ -0,0 +1,243 @@
+/* claro/form/Common.css */
+
+/*========================= common css =========================*/
+
+@import "../variables";
+
+/* 'dijitTextBox' refers to 'dijit(TextBox|DateTextBox|CurrencyTextBox|...)' */
+
+.claro .dijitTextBox,
+.claro .dijitInputInner {
+    // .dijitInputInner selector needed for ValidationTextBox on IE6 because <input> doesn't inherit
+    // the color setting from the ancestor div.dijitTextBox
+	color: @text-color;
+}
+
+.claro .dijitValidationTextBoxError .dijitValidationContainer {
+	background-color: @erroricon-background-color;
+	background-image: url("../@{image-form-error}");
+	background-position: top center;
+	border: solid @erroricon-background-color 0;
+	width: 9px;
+}
+
+.claro .dijitTextBoxError .dijitValidationContainer {
+	border-left-width: 1px;
+}
+
+.claro .dijitValidationTextBoxError .dijitValidationIcon {
+	width: 0;
+	background-color: transparent; /* so the INPUT doesn't obscure the border in rtl+a11y */
+}
+
+/* Padding for the input area of TextBox based widgets, and corresponding padding for the
+ * down arrow button and the placeholder.   placeholder is explicitly listed  because
+ * dijitPlaceHolder is absolutely positioned, so padding set on dijitInputField
+ * won't affect it
+ */
+.claro .dijitTextArea,
+.claro .dijitInputField .dijitPlaceHolder {
+	padding: @textbox-padding;
+}
+
+.claro .dijitSelect .dijitInputField,
+.claro .dijitTextBox .dijitInputField {
+	// Subtract 1px from top/bottom because we add 1px to other nodes, see rules below.
+	// Although we are theoretically only adding 1px to top/bottom browsers seem to pad inputs by 1px on left/right,
+	// although that varies by so compensate for that too.
+	padding: @textbox-padding - 1px  @textbox-padding;
+}
+
+.dj_gecko .claro .dijitTextBox .dijitInputInner,
+.dj_webkit .claro .dijitTextBox .dijitInputInner {
+	// Although we are theoretically only adding 1px to top/bottom, some browsers seem to pad inputs by 1px on left/right,
+	// so compensate for that too.
+	padding-left: @textbox-padding - 1px;
+	padding-right: @textbox-padding - 1px;
+}
+
+.claro .dijitSelect,
+.claro .dijitSelect .dijitButtonContents,
+.claro .dijitTextBox,
+.claro .dijitTextBox .dijitButtonNode {
+	/* color for (outer) border on *TextBox widgets, and border between input and buttons on ComboBox and Spinner */
+	border-color: @border-color;
+	.transition-property(background-color, border);
+ 	.transition-duration(.35s);
+}
+
+.claro .dijitSelect,
+.claro .dijitTextBox {
+	background-color: @textbox-background-color;
+}
+
+/* hover */
+.claro .dijitSelectHover,
+.claro .dijitSelectHover .dijitButtonContents,
+.claro .dijitTextBoxHover,
+.claro .dijitTextBoxHover .dijitButtonNode {
+	border-color: @hovered-border-color;
+ 	.transition-duration(.25s);
+}
+
+.claro .dijitTextBoxHover {
+	background-color: @textbox-hovered-background-color;
+	.textbox-background-image;
+}
+
+/* error state */
+.claro .dijitSelectError,
+.claro .dijitSelectError .dijitButtonContents,
+.claro .dijitTextBoxError,
+.claro .dijitTextBoxError .dijitButtonNode {
+	border-color: @error-border-color;
+}
+
+/* focused state */
+.claro .dijitSelectFocused,
+.claro .dijitSelectFocused .dijitButtonContents,
+.claro .dijitTextBoxFocused,
+.claro .dijitTextBoxFocused .dijitButtonNode {
+	border-color:@focused-border-color;
+ 	.transition-duration(.1s);
+}
+
+.claro .dijitTextBoxFocused {
+	background-color: @textbox-focused-background-color;
+	.textbox-background-image;
+}
+.claro .dijitTextBoxFocused .dijitInputContainer {
+	background: @textbox-focused-background-color;
+}
+
+.claro .dijitSelectErrorFocused,
+.claro .dijitSelectErrorFocused .dijitButtonContents,
+.claro .dijitTextBoxErrorFocused,
+.claro .dijitTextBoxErrorFocused .dijitButtonNode {
+	border-color: @error-focused-border-color;
+}
+
+/* disabled state */
+.claro .dijitSelectDisabled,
+.claro .dijitSelectDisabled .dijitButtonContents,
+.claro .dijitTextBoxDisabled,
+.claro .dijitTextBoxDisabled .dijitButtonNode {
+	border-color: @disabled-border-color;
+}
+
+.claro .dijitSelectDisabled,
+.claro .dijitTextBoxDisabled,
+.claro .dijitTextBoxDisabled .dijitInputContainer {
+	background-color: @textbox-disabled-background-color;
+	background-image: none;
+}
+
+.claro .dijitSelectDisabled,
+.claro .dijitTextBoxDisabled,
+.claro .dijitTextBoxDisabled .dijitInputInner {
+	color: @disabled-text-color;
+}
+
+.dj_webkit .claro .dijitDisabled input {
+    /* because WebKit lightens disabled input/textarea no matter what color you specify */
+	color: darken(@disabled-text-color, 5%)
+}
+
+.dj_webkit .claro textarea.dijitTextAreaDisabled {
+    /* because WebKit lightens disabled input/textarea no matter what color you specify */
+	color: darken(@disabled-text-color, 40%)
+}
+
+/*========================= for special widgets =========================*/
+
+/* Input boxes with an arrow (for a drop down) */
+
+.claro .dijitSelect .dijitArrowButtonInner,
+.claro .dijitComboBox .dijitArrowButtonInner {
+	background-image: url("../@{image-form-common-arrows}");
+	background-position:-35px 53%;
+	background-repeat: no-repeat;
+	margin: 0;
+	width:16px;
+}
+
+.claro .dijitComboBox .dijitArrowButtonInner {
+	border: 1px solid @arrowbutton-inner-border-color;	// white gutter around the arrow button
+}
+
+.claro .dijitToolbar .dijitComboBox .dijitArrowButtonInner {
+	border: none;
+}
+
+.claro .dijitToolbar .dijitComboBox .dijitArrowButtonInner {
+	border: none;
+}
+
+/* Add 1px vertical padding to the <input> where user types and the validation icon,
+   to match the 1px border on arrow button */
+.claro .dijitSelectLabel,
+.claro .dijitTextBox .dijitInputInner,
+.claro .dijitValidationTextBox .dijitValidationContainer {
+	padding: 1px 0;
+}
+
+.claro .dijitComboBox .dijitButtonNode {
+	background-color: @arrowbutton-background-color;
+	.standard-gradient("../");
+}
+
+/* Arrow "hover" effect:
+ * The arrow button should change color whenever the mouse is in a position such that clicking it
+ * will toggle the drop down.   That's either (1) anywhere over the ComboBox or (2) over the arrow
+ * button, depending on the openOnClick setting for the widget.
+ */
+.claro .dijitComboBoxOpenOnClickHover .dijitButtonNode,
+.claro .dijitComboBox .dijitDownArrowButtonHover,
+.claro .dijitComboBoxFocused .dijitArrowButton {
+	background-color:@arrowbutton-hovered-background-color;
+}
+
+.claro .dijitComboBoxOpenOnClickHover .dijitArrowButtonInner,
+.claro .dijitComboBox .dijitDownArrowButtonHover .dijitArrowButtonInner {
+	background-position:-70px 53%;
+}
+
+/* Arrow Button change when drop down is open */
+.claro .dijitComboBox .dijitHasDropDownOpen {	// .dijitHasDropDown is on dijitArrowButton node
+	background-color: @pressed-background-color;
+	.active-gradient("../");
+	padding: 1px;		// Since no border on arrow button (see rule below)
+}	
+
+.dj_iequirks .claro .dijitComboBox .dijitHasDropDownOpen {
+	padding: 1px 0;
+}
+
+.claro .dijitComboBox .dijitHasDropDownOpen .dijitArrowButtonInner {
+	background-position:-70px 53%;
+	border: 0 none;
+}
+
+/* disabled state */
+.claro div.dijitComboBoxDisabled .dijitArrowButtonInner {
+	/* specific selector set to override background-position setting from Button.js
+	 * (.claro .dijitComboBoxDisabled .dijitArrowButtonInner) */
+	background-position:0 50%;
+	background-color:@disabled-background-color;
+}
+
+/*========================= hacks for browsers =========================*/
+/* it seems the input[type="hidden"] has a height (16px) too... this may cause the widget's height calculate error */
+.dj_ff3 .claro .dijitInputField input[type="hidden"] {
+	display: none;
+	height: 0;
+	width: 0;
+}
+
+.dj_borderbox .claro .dijitComboBox .dijitHasDropDownOpen .dijitArrowButtonInner {
+	width:18px;				// quirks mode means border-box sizing, so 18px with the border (same as 16px without border)
+}
+
+.dj_borderbox .claro .dijitComboBoxFocused .dijitHasDropDownOpen .dijitArrowButtonInner {
+	width:16px;				// when no border, then back to 16px just like content-box sizing
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Common_rtl.css b/src/main/resources/static/dijit/themes/claro/form/Common_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..62e7be5cbcf34af1af6282ab61f21320d5774a6e
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Common_rtl.css
@@ -0,0 +1,5 @@
+/* claro/form/Common_rtl.css */
+.claro .dijitTextBoxRtlError .dijitValidationContainer {
+  border-left-width: 0;
+  border-right-width: 1px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Common_rtl.less b/src/main/resources/static/dijit/themes/claro/form/Common_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..342ad46448d80220907ed82df8699eead47c5e83
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Common_rtl.less
@@ -0,0 +1,8 @@
+/* claro/form/Common_rtl.css */
+
+@import "../variables";
+
+.claro .dijitTextBoxRtlError .dijitValidationContainer {
+	border-left-width: 0;
+	border-right-width: 1px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/NumberSpinner.css b/src/main/resources/static/dijit/themes/claro/form/NumberSpinner.css
new file mode 100644
index 0000000000000000000000000000000000000000..94a3e50a05d2789a188403cda967d69aa900e575
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/NumberSpinner.css
@@ -0,0 +1,156 @@
+/* NumberSpinner - namespace "dijitSpinner"
+ * 
+ * Styling NumberSpinner mainly includes:
+ * 
+ * 1. Arrows
+ * 		Outer containers: .dijitSpinnerButtonContainer|.dijitSpinnerButtonInner  - for border, padding and position
+ * 		Arrows: .dijitArrowButton|.dijitUpArrowButton.|dijitDownArrowButton
+ * 		Inner container: .dijitArrowButtonInner - for border, padding, width|height and background image
+ * 
+ * 2. Hover state
+ * 		.dijitUpArrowButtonHover|.dijitDownArrowButtonHover .*  - for background color|image
+ * 
+ * 3. Active state
+ * 		.dijitUpArrowButtonActive|.dijitDownArrowButtonActive .*  - for border, padding, margin and background color|image
+ * 
+ * 4. Focused state
+ * 		.dijitSpinnerFocused .* - for background color|image
+ * 
+ * 5. Disabled state
+ * 		.dijitSpinnerDisabled .* - for background color|image
+ */
+.claro .dijitSpinnerButtonContainer {
+  overflow: hidden;
+  position: relative;
+  width: auto;
+  padding: 0 2px;
+}
+.claro .dijitSpinnerButtonContainer .dijitSpinnerButtonInner {
+  border-width: 1px 0;
+  /* reserve space to match the claro combobox button border with border and not padding to make IE happier */
+
+  border-style: solid none;
+}
+/* button */
+.claro .dijitSpinner .dijitArrowButton {
+  width: auto;
+  background-color: #efefef;
+  background-image: url("../images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  overflow: hidden;
+}
+.dj_iequirks .claro .dijitSpinner .dijitArrowButton {
+  overflow: visible;
+  /* 0 height w/o this */
+
+}
+.claro .dijitSpinner .dijitSpinnerButtonInner {
+  width: 15px;
+}
+/* up & down button icons */
+.claro .dijitSpinner .dijitArrowButtonInner {
+  border: solid 1px #ffffff;
+  border-bottom-width: 0;
+  /* 2 top borders = 1 top+bottom border in ComboBox */
+
+  background-image: url("../form/images/commonFormArrows.png");
+  background-repeat: no-repeat;
+  height: 100%;
+  width: 15px;
+  padding-left: 1px;
+  padding-right: 1px;
+  /* for up arrow */
+
+  background-position: -139px center;
+  /* override button.css (TODO: move to Common.css since ComboBox needs this too) */
+
+  display: block;
+  margin: -1px 0 -1px 0;
+  /* compensate for inner border */
+
+}
+.dj_iequirks .claro .dijitSpinner .dijitArrowButtonInner,
+.dj_ie6 .claro .dijitSpinner .dijitArrowButtonInner,
+.dj_ie7 .claro .dijitSpinner .dijitArrowButtonInner,
+.dj_ie8 .claro .dijitSpinner .dijitArrowButtonInner {
+  margin-top: 0;
+  /* since its bottom aligned */
+
+}
+.dj_iequirks .claro .dijitSpinner .dijitArrowButtonInner {
+  width: 19px;
+}
+.claro .dijitSpinner .dijitDownArrowButton .dijitArrowButtonInner {
+  background-position: -34px;
+}
+.claro .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+  padding: 0;
+}
+/** hover & focused status **/
+.claro .dijitUpArrowButtonActive,
+.claro .dijitDownArrowButtonActive {
+  background-color: #abd6ff;
+}
+.claro .dijitSpinner .dijitUpArrowButtonHover,
+.claro .dijitSpinner .dijitDownArrowButtonHover,
+.claro .dijitSpinnerFocused .dijitArrowButton {
+  background-color: #abd6ff;
+}
+.claro .dijitSpinner .dijitUpArrowButtonHover .dijitArrowButtonInner {
+  background-position: -174px;
+}
+.claro .dijitSpinner .dijitDownArrowButtonHover .dijitArrowButtonInner {
+  background-position: -69px;
+}
+.claro .dijitSpinnerFocused {
+  background-color: #ffffff;
+  background-image: none;
+}
+/* mouse down status */
+.claro .dijitSpinner .dijitDownArrowButtonActive,
+.claro .dijitSpinner .dijitUpArrowButtonActive {
+  background-color: #7dbefa;
+  background-image: url("../images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+.claro .dijitSpinner .dijitUpArrowButtonActive .dijitArrowButtonInner,
+.claro .dijitSpinner .dijitDownArrowButtonActive .dijitArrowButtonInner {
+  /* hide inner border while button is depressed */
+
+  border: 0;
+  padding: 1px;
+  margin-right: 2px;
+  margin-bottom: 1px;
+}
+.claro .dijitSpinner .dijitUpArrowButtonActive .dijitArrowButtonInner {
+  background-position: -173px;
+}
+.claro .dijitSpinner .dijitDownArrowButtonActive .dijitArrowButtonInner {
+  background-position: -68px;
+}
+/* disabled */
+.claro .dijitSpinnerDisabled .dijitArrowButtonInner {
+  background-color: #efefef;
+}
+.claro .dijitSpinnerDisabled .dijitUpArrowButton .dijitArrowButtonInner {
+  background-position: -104px;
+}
+.claro .dijitSpinnerDisabled .dijitDownArrowButton .dijitArrowButtonInner {
+  background-position: 1px;
+}
+/** hacks for browsers **/
+/* for IE 7, when div is enlarged, 
+ * should be no empty space between dijitInputLayoutContainer and dijitSpinner*/
+.dj_ie7 .claro .dijitSpinner {
+  overflow: visible;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/NumberSpinner.less b/src/main/resources/static/dijit/themes/claro/form/NumberSpinner.less
new file mode 100644
index 0000000000000000000000000000000000000000..e15c7821d85fd46adb4901333c1346b6912a1718
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/NumberSpinner.less
@@ -0,0 +1,150 @@
+/* NumberSpinner - namespace "dijitSpinner"
+ * 
+ * Styling NumberSpinner mainly includes:
+ * 
+ * 1. Arrows
+ * 		Outer containers: .dijitSpinnerButtonContainer|.dijitSpinnerButtonInner  - for border, padding and position
+ * 		Arrows: .dijitArrowButton|.dijitUpArrowButton.|dijitDownArrowButton
+ * 		Inner container: .dijitArrowButtonInner - for border, padding, width|height and background image
+ * 
+ * 2. Hover state
+ * 		.dijitUpArrowButtonHover|.dijitDownArrowButtonHover .*  - for background color|image
+ * 
+ * 3. Active state
+ * 		.dijitUpArrowButtonActive|.dijitDownArrowButtonActive .*  - for border, padding, margin and background color|image
+ * 
+ * 4. Focused state
+ * 		.dijitSpinnerFocused .* - for background color|image
+ * 
+ * 5. Disabled state
+ * 		.dijitSpinnerDisabled .* - for background color|image
+ */
+
+@import "../variables";
+
+.claro .dijitSpinnerButtonContainer {
+	overflow: hidden;
+	position: relative;
+	width: auto;
+	padding: 0 2px;
+}
+.claro .dijitSpinnerButtonContainer .dijitSpinnerButtonInner {
+	border-width: 1px 0; /* reserve space to match the claro combobox button border with border and not padding to make IE happier */
+	border-style: solid none;
+}
+
+/* button */
+.claro .dijitSpinner .dijitArrowButton {
+	width:auto;
+	background-color: @arrowbutton-background-color;
+	.standard-gradient("../");
+	overflow: hidden;
+}
+.dj_iequirks .claro .dijitSpinner .dijitArrowButton {
+	overflow: visible; /* 0 height w/o this */
+}
+
+.claro .dijitSpinner .dijitSpinnerButtonInner {
+	width: 15px;
+}
+/* up & down button icons */
+.claro .dijitSpinner .dijitArrowButtonInner {
+	border:solid 1px @arrowbutton-inner-border-color;
+	border-bottom-width: 0; /* 2 top borders = 1 top+bottom border in ComboBox */
+	background-image: url("../@{image-form-common-arrows}");
+	background-repeat: no-repeat;
+	height: 100%;
+	width:15px;
+	padding-left: 1px;
+	padding-right: 1px;
+
+	/* for up arrow */
+	background-position:-139px center;
+
+	/* override button.css (TODO: move to Common.css since ComboBox needs this too) */
+	display: block;
+	margin: -1px 0 -1px 0;	/* compensate for inner border */
+}
+
+.dj_iequirks .claro .dijitSpinner .dijitArrowButtonInner,
+.dj_ie6 .claro .dijitSpinner .dijitArrowButtonInner,
+.dj_ie7 .claro .dijitSpinner .dijitArrowButtonInner,
+.dj_ie8 .claro .dijitSpinner .dijitArrowButtonInner {
+	margin-top: 0; /* since its bottom aligned */
+}
+
+.dj_iequirks .claro .dijitSpinner .dijitArrowButtonInner {
+	width: 19px;
+}
+.claro .dijitSpinner .dijitDownArrowButton .dijitArrowButtonInner {
+	background-position:-34px;
+}
+.claro .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	padding: 0;
+}
+
+/** hover & focused status **/
+
+.claro .dijitUpArrowButtonActive,
+.claro .dijitDownArrowButtonActive {
+	background-color:@arrowbutton-pressed-background-color;
+}
+
+.claro .dijitSpinner .dijitUpArrowButtonHover,
+.claro .dijitSpinner .dijitDownArrowButtonHover,
+.claro .dijitSpinnerFocused .dijitArrowButton {
+	background-color: @arrowbutton-hovered-background-color;
+}
+
+.claro .dijitSpinner .dijitUpArrowButtonHover .dijitArrowButtonInner {
+	background-position:-174px;
+}
+.claro .dijitSpinner .dijitDownArrowButtonHover .dijitArrowButtonInner {
+	background-position:-69px;
+}
+
+.claro .dijitSpinnerFocused {
+	background-color: @textbox-focused-background-color;
+	background-image: none;
+}
+
+/* mouse down status */
+.claro .dijitSpinner .dijitDownArrowButtonActive,
+.claro .dijitSpinner .dijitUpArrowButtonActive {
+	background-color: #7dbefa;		// TODO.  Mailed Jason about inconsistent ComboBox/Spinner behavior.
+	.active-gradient("../");
+}
+.claro .dijitSpinner .dijitUpArrowButtonActive .dijitArrowButtonInner,
+.claro .dijitSpinner .dijitDownArrowButtonActive .dijitArrowButtonInner {
+	/* hide inner border while button is depressed */
+	border: 0;
+	padding: 1px;
+	margin-right:2px;
+	margin-bottom:1px;
+}
+.claro .dijitSpinner .dijitUpArrowButtonActive .dijitArrowButtonInner {
+	background-position:-173px;
+}
+.claro .dijitSpinner .dijitDownArrowButtonActive .dijitArrowButtonInner {
+	background-position:-68px;
+}
+
+/* disabled */
+
+.claro .dijitSpinnerDisabled .dijitArrowButtonInner {
+	background-color: @disabled-background-color;
+}
+.claro .dijitSpinnerDisabled .dijitUpArrowButton .dijitArrowButtonInner {
+	background-position:-104px;
+}
+.claro .dijitSpinnerDisabled .dijitDownArrowButton .dijitArrowButtonInner {
+	background-position:1px;
+}
+
+/** hacks for browsers **/
+
+/* for IE 7, when div is enlarged, 
+ * should be no empty space between dijitInputLayoutContainer and dijitSpinner*/
+.dj_ie7 .claro .dijitSpinner {
+	overflow:visible;
+} 
diff --git a/src/main/resources/static/dijit/themes/claro/form/RadioButton.css b/src/main/resources/static/dijit/themes/claro/form/RadioButton.css
new file mode 100644
index 0000000000000000000000000000000000000000..063e1db8aa8f3f3db314b01c153e32a88a4fcd19
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/RadioButton.css
@@ -0,0 +1,83 @@
+/* RadioButton
+ * 
+ * Styling RadioButton mainly includes:
+ * 
+ * 1. Containers
+ * 		.dijitRadio|.dijitRadioIcon - for border, padding, width|height and background image
+ * 
+ * 2. RadioButton within ToggleButton
+ * 		.dijitToggleButton|.dijitToggleButtonChecked .* - for background image
+ * 
+ * 3. Checked state
+ * 		.dijitRadioChecked - for checked background-color|image
+ * 		.dijitToggleButtonChecked - for border, background-color|image, display and width|height
+ * 
+ * 4. Hover state
+ * 		.dijitRadioHover|.dijitRadioCheckedHover - for background image
+ * 
+ * 5. Disabled state
+ * 		.dijitRadioDisabled|.dijitRadioCheckedDisabled - for background image
+ */
+.claro .dijitToggleButton .dijitRadio,
+.claro .dijitToggleButton .dijitRadioIcon {
+  background-image: url("../form/images/checkboxRadioButtonStates.png");
+}
+.dj_ie6 .claro .dijitToggleButton .dijitRadio,
+.dj_ie6 .claro .dijitToggleButton .dijitRadioIcon {
+  background-image: url("../form/images/checkboxAndRadioButtons_IE6.png");
+}
+.claro .dijitRadio,
+.claro .dijitRadioIcon {
+  /* inside a toggle button */
+
+  background-image: url("../form/images/checkboxRadioButtonStates.png");
+  /* checkbox sprite image */
+
+  background-repeat: no-repeat;
+  width: 15px;
+  height: 15px;
+  margin: 0 2px 0 0;
+  padding: 0;
+}
+.dj_ie6 .claro .dijitRadio,
+.dj_ie6 .claro .dijitRadioIcon {
+  /* inside a toggle button */
+
+  background-image: url("../form/images/checkboxAndRadioButtons_IE6.png");
+  /* checkbox sprite image */
+
+}
+.claro .dijitRadio {
+  /* unselected */
+
+  background-position: -105px;
+}
+.claro .dijitToggleButton .dijitRadioIcon {
+  /* unselected */
+
+  background-position: -107px;
+}
+.claro .dijitRadioDisabled {
+  /* unselected and disabled */
+
+  background-position: -165px;
+}
+.claro .dijitRadioHover {
+  /* hovering over an unselected enabled radio button */
+
+  background-position: -135px;
+}
+.claro .dijitRadioChecked {
+  background-position: -90px;
+}
+.claro .dijitToggleButtonChecked .dijitRadioIcon {
+  background-position: -92px;
+}
+.claro .dijitRadioCheckedHover {
+  background-position: -120px;
+}
+.claro .dijitRadioCheckedDisabled {
+  /* selected but disabled */
+
+  background-position: -150px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/RadioButton.less b/src/main/resources/static/dijit/themes/claro/form/RadioButton.less
new file mode 100644
index 0000000000000000000000000000000000000000..f48cb67ecf40f40b30ce5221b94b7063057a6ddf
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/RadioButton.less
@@ -0,0 +1,84 @@
+/* RadioButton
+ * 
+ * Styling RadioButton mainly includes:
+ * 
+ * 1. Containers
+ * 		.dijitRadio|.dijitRadioIcon - for border, padding, width|height and background image
+ * 
+ * 2. RadioButton within ToggleButton
+ * 		.dijitToggleButton|.dijitToggleButtonChecked .* - for background image
+ * 
+ * 3. Checked state
+ * 		.dijitRadioChecked - for checked background-color|image
+ * 		.dijitToggleButtonChecked - for border, background-color|image, display and width|height
+ * 
+ * 4. Hover state
+ * 		.dijitRadioHover|.dijitRadioCheckedHover - for background image
+ * 
+ * 5. Disabled state
+ * 		.dijitRadioDisabled|.dijitRadioCheckedDisabled - for background image
+ */
+
+@import "../variables";
+
+.claro .dijitToggleButton .dijitRadio,
+.claro .dijitToggleButton .dijitRadioIcon {
+	background-image: url("../@{image-form-checkbox-and-radios}");
+}
+
+.dj_ie6 .claro .dijitToggleButton .dijitRadio,
+.dj_ie6 .claro .dijitToggleButton .dijitRadioIcon {
+	background-image: url("../@{image-form-checkbox-and-radios-ie6}");
+}
+
+.claro .dijitRadio,
+.claro .dijitRadioIcon	{		/* inside a toggle button */
+	background-image: url("../@{image-form-checkbox-and-radios}"); /* checkbox sprite image */
+	background-repeat: no-repeat;
+	width: 15px;
+	height: 15px;
+	margin: 0 2px 0 0;
+	padding: 0;
+}
+
+.dj_ie6 .claro .dijitRadio,
+.dj_ie6 .claro .dijitRadioIcon	{		/* inside a toggle button */
+	background-image: url("../@{image-form-checkbox-and-radios-ie6}"); /* checkbox sprite image */
+}
+
+.claro .dijitRadio{
+	/* unselected */
+	background-position: -105px;
+}
+
+.claro .dijitToggleButton .dijitRadioIcon {
+	/* unselected */
+	background-position: -107px;
+}
+
+.claro .dijitRadioDisabled {
+	/* unselected and disabled */
+	background-position: -165px;
+}
+
+.claro .dijitRadioHover {
+	/* hovering over an unselected enabled radio button */
+	background-position: -135px;
+}
+
+.claro .dijitRadioChecked{
+	background-position: -90px;
+}
+
+.claro .dijitToggleButtonChecked .dijitRadioIcon {
+	background-position: -92px;
+}
+
+.claro .dijitRadioCheckedHover{
+	background-position: -120px;
+}
+
+.claro .dijitRadioCheckedDisabled {
+	/* selected but disabled */
+	background-position: -150px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Select.css b/src/main/resources/static/dijit/themes/claro/form/Select.css
new file mode 100644
index 0000000000000000000000000000000000000000..3ed970f887a7d4e4dc3e57fee9c91aff8355ea6f
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Select.css
@@ -0,0 +1,94 @@
+/* Select
+ * 
+ * Styling Select mainly includes:
+ * 
+ * 1. Containers
+ * 		.dijitSelect - for border, background-color
+ * 		.dijitButtonContents - for border
+ *
+ * 2. Arrow
+ * 		.dijitArrowButton - for border, padding and background-color|image
+ * 		.dijitArrowButtonInner - for border, background-color|image, display and width|height
+ * 
+ * 3. Menu
+ * 		.dijitSelectMenu .* - for border, padding
+ * 
+ * 4. Various states
+ * 		.dijitSelectHover|.dijitSelectFocused|.dijitSelectDisabled .* - for border, padding and background-color|image 
+ */
+/* normal status */
+.claro .dijitSelect .dijitArrowButtonContainer {
+  border: 1px solid #ffffff;
+}
+.claro .dijitSelect .dijitArrowButton {
+  padding: 0;
+  background-color: #efefef;
+  background-image: url("../images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+.claro .dijitSelect .dijitArrowButton .dijitArrowButtonInner {
+  height: 16px;
+}
+/* hover status */
+.claro .dijitSelectHover {
+  background-color: #e5f2fe;
+  background-image: -moz-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: -webkit-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: -o-linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-image: linear-gradient(rgba(127, 127, 127, 0.2) 0%, rgba(127, 127, 127, 0) 2px);
+  background-repeat: repeat-x;
+}
+.claro .dijitSelectHover .dijitArrowButton {
+  background-color: #abd6ff;
+}
+.claro .dijitSelectHover .dijitArrowButton .dijitArrowButtonInner {
+  background-position: -70px 53%;
+}
+/* focused status */
+.claro .dijitSelectFocused .dijitArrowButton {
+  background-color: #7dbefa;
+  background-image: url("../images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+}
+.claro .dijitSelectFocused .dijitArrowButton {
+  border: none;
+  padding: 1px;
+}
+.claro .dijitSelectFocused .dijitArrowButton .dijitArrowButtonInner {
+  background-position: -70px 53%;
+}
+/* disable status */
+.claro .dijitSelectDisabled {
+  border-color: #d3d3d3;
+  background-color: #efefef;
+  background-image: none;
+  color: #818181;
+}
+.claro .dijitSelectDisabled .dijitArrowButton .dijitArrowButtonInner {
+  background-position: 0 53%;
+}
+/* Dropdown menu style for select */
+.claro .dijitSelectMenu td.dijitMenuItemIconCell,
+.claro .dijitSelectMenu td.dijitMenuArrowCell {
+  /* so that arrow and icon cells from MenuItem are not displayed */
+
+  display: none;
+}
+.claro .dijitSelectMenu td.dijitMenuItemLabel {
+  /* line up menu text with text in select box (in LTR and RTL modes) */
+
+  padding: 2px;
+}
+.claro .dijitSelectMenu .dijitMenuSeparatorTop {
+  border-bottom: 1px solid #759dc0;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Select.less b/src/main/resources/static/dijit/themes/claro/form/Select.less
new file mode 100644
index 0000000000000000000000000000000000000000..72e1534a2e77fe789e42e815f107521355ff16b3
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Select.less
@@ -0,0 +1,93 @@
+/* Select
+ * 
+ * Styling Select mainly includes:
+ * 
+ * 1. Containers
+ * 		.dijitSelect - for border, background-color
+ * 		.dijitButtonContents - for border
+ *
+ * 2. Arrow
+ * 		.dijitArrowButton - for border, padding and background-color|image
+ * 		.dijitArrowButtonInner - for border, background-color|image, display and width|height
+ * 
+ * 3. Menu
+ * 		.dijitSelectMenu .* - for border, padding
+ * 
+ * 4. Various states
+ * 		.dijitSelectHover|.dijitSelectFocused|.dijitSelectDisabled .* - for border, padding and background-color|image 
+ */
+
+@import "../variables";
+
+/* normal status */
+.claro .dijitSelect .dijitArrowButtonContainer {
+	border: 1px solid @arrowbutton-inner-border-color;
+}
+
+.claro .dijitSelect .dijitArrowButton {
+	padding: 0;
+	background-color: @arrowbutton-background-color;
+	.standard-gradient("../");
+}
+
+.claro .dijitSelect .dijitArrowButton .dijitArrowButtonInner {
+	height:16px;
+}
+
+/* hover status */
+.claro .dijitSelectHover {
+	background-color: @textbox-hovered-background-color;
+	.textbox-background-image;
+	background-repeat: repeat-x;
+}
+
+.claro .dijitSelectHover .dijitArrowButton {
+	background-color:@arrowbutton-hovered-background-color;
+}
+
+.claro .dijitSelectHover .dijitArrowButton .dijitArrowButtonInner {
+	background-position:-70px 53%;
+}
+
+/* focused status */
+.claro .dijitSelectFocused .dijitArrowButton {
+	background-color:#7dbefa;		// TODO.  Mailed Jason about inconsistent ComboBox/Spinner behavior.
+	.active-gradient("../");
+}
+
+.claro .dijitSelectFocused .dijitArrowButton {
+	border: none;
+	padding: 1px;
+}
+
+.claro .dijitSelectFocused .dijitArrowButton .dijitArrowButtonInner {
+	background-position:-70px 53%;
+}
+
+/* disable status */
+.claro .dijitSelectDisabled {
+	border-color: @disabled-border-color;
+	background-color: @disabled-background-color;
+	background-image: none;
+	color: @disabled-text-color;
+}
+
+.claro .dijitSelectDisabled .dijitArrowButton .dijitArrowButtonInner {
+	background-position:0 53%
+}
+
+/* Dropdown menu style for select */
+.claro .dijitSelectMenu td.dijitMenuItemIconCell,
+.claro .dijitSelectMenu td.dijitMenuArrowCell { 
+	/* so that arrow and icon cells from MenuItem are not displayed */
+	display: none;  
+}
+
+.claro .dijitSelectMenu td.dijitMenuItemLabel {
+	/* line up menu text with text in select box (in LTR and RTL modes) */
+	padding: @textbox-padding;
+}
+
+.claro .dijitSelectMenu .dijitMenuSeparatorTop {
+	border-bottom:1px solid @focused-border-color;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Slider.css b/src/main/resources/static/dijit/themes/claro/form/Slider.css
new file mode 100644
index 0000000000000000000000000000000000000000..3ffcda1d7a763ab3b2447677f90a13ba215b2e3c
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Slider.css
@@ -0,0 +1,348 @@
+/* Slider 
+ * 
+ * Styling Slider mainly includes styling the Slider progress bar (dijitSliderProgressBar)
+ * 
+ * Slider progress bar:
+ * 1. Slider progress bar (default styling): 
+ * 		.dijitSliderProgressBarH - progress bar at the middle of horizontal slider
+ * 		.dijitSliderLeftBumper - bar at the left of horizontal slider
+ * 		.dijitSliderRightBumper - bar at the right of horizontal slider
+ * 		.dijitSliderProgressBarV - progress bar at the middle of vertical slider
+ * 		.dijitSliderTopBumper - bar at the top of vertical slider
+ * 		.dijitSliderBottomtBumper - bar at the bottom of vertical slider
+ * 
+ * 2. hovered Slider progress bar (ie, mouse hover on progress bar)
+ * 		.dijitSliderHover .dijitSliderProgressBarH(horizontal) - hovered bar style: background, border
+ * 
+ * 3. focused Slider progress bar (ie, mouse focused on progress bar)
+ * 		.dijitSliderFocused .dijitSliderProgressBarH(horizontal) - focus bar style: background, border
+ * 
+ * 4. disabled/read-only Slider progress bar 
+ * 		.dijitSliderDisabled .dijitSliderProgressBarH(horizontal) - bar styles when slider is disabled
+ * 
+ * 
+ * Slider Thumbs:
+ * 1. Slider Thumbs (default styling): 
+ * 		.dijitSliderImageHandleH / .dijitSliderImageHandleV - styles for the controller on the progress bar
+ * 
+ * 2. hovered Slider Thumbs (ie, mouse hover on slider thumbs)
+ * 		.dijitSliderHover .dijitSliderImageHandleH - hovered controller style
+ * 
+ * 3. focused Slider progress bar (ie, mouse focused on slider thumbs)
+ * 		.dijitSliderFocused .dijitSliderImageHandleV - focused controller style
+ * 
+ * 
+ * Slider Increment/Decrement Buttons:
+ * 1. Slider Increment/Decrement Buttons (default styling): 
+ * 		.dijitSliderDecrementIconH - decrement icon which lies at the left of horizontal slider
+ * 		.dijitSliderIncrementIconH - increment icon which lies at the right of horizontal slider
+ * 		.dijitSliderDecrementIconV - decrement icon which lies at the bottom of vertical slider
+ * 		.dijitSliderIncrementIconV - increment icon which lies at the top of vertical slider
+ * 
+ * 2. hovered Slider Increment/Decrement Buttons (mouse hover on the icons)
+ * 		.dijitSliderHover .dijitSliderDecrementIconH - for background, border
+ * 
+ * 3. active Slider Increment/Decrement Buttons (mouse down on the icons)
+ * 		.dijitSliderActive .dijitSliderIncrementIconV - for background, border
+ * 
+ * 4. disabled/read-only Slider Increment/Decrement Buttons
+ * 		.dijitSliderDisabled .dijitSliderDecrementIconH - styles for the icons in disabled slider
+ * 		.dijitSliderReadOnly .dijitSliderIncrementIconV - styles for the icons in read-only slider
+ */
+.claro .dijitSliderBar {
+  border-style: solid;
+  outline: 1px;
+}
+.claro .dijitSliderFocused .dijitSliderBar {
+  border-color: #759dc0;
+}
+.claro .dijitSliderHover .dijitSliderBar {
+  border-color: #759dc0;
+}
+.claro .dijitSliderDisabled .dijitSliderBar {
+  background-image: none;
+  border-color: #d3d3d3;
+}
+.claro .dijitRuleLabelsContainer {
+  color: #000000;
+}
+/* Horizontal Slider */
+.claro .dijitRuleLabelsContainerH {
+  padding: 2px 0;
+}
+.claro .dijitSlider .dijitSliderProgressBarH,
+.claro .dijitSlider .dijitSliderLeftBumper {
+  border-color: #b5bcc7;
+  background-color: #cfe5fa;
+  background-image: -moz-linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px);
+  background-image: -webkit-linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px);
+  background-image: -o-linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px);
+  background-image: linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px);
+}
+.claro .dijitSlider .dijitSliderRemainingBarH,
+.claro .dijitSlider .dijitSliderRightBumper {
+  border-color: #b5bcc7;
+  background-color: #ffffff;
+}
+.claro .dijitSliderRightBumper {
+  border-right: solid 1px #b5bcc7;
+}
+.claro .dijitSliderLeftBumper {
+  border-left: solid 1px #b5bcc7;
+}
+.claro .dijitSliderHover .dijitSliderProgressBarH,
+.claro .dijitSliderHover .dijitSliderLeftBumper {
+  background-color: #abd6ff;
+  border-color: #759dc0;
+}
+.claro .dijitSliderHover .dijitSliderRemainingBarH,
+.claro .dijitSliderHover .dijitSliderRightBumper {
+  background-color: #ffffff;
+  border-color: #759dc0;
+}
+.claro .dijitSliderFocused .dijitSliderProgressBarH,
+.claro .dijitSliderFocused .dijitSliderLeftBumper {
+  background-color: #abd6ff;
+  border-color: #759dc0;
+  -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2);
+}
+.claro .dijitSliderFocused .dijitSliderRemainingBarH,
+.claro .dijitSliderFocused .dijitSliderRightBumper {
+  background-color: #ffffff;
+  border-color: #759dc0;
+  -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.2);
+}
+.claro .dijitSliderDisabled .dijitSliderProgressBarH,
+.claro .dijitSliderDisabled .dijitSliderLeftBumper {
+  background-color: #d3d3d3;
+  /* left side of slider, fill matches border */
+
+  background-image: none;
+}
+.claro .dijitSliderDisabled .dijitSliderRemainingBarH,
+.claro .dijitSliderDisabled .dijitSliderRightBumper {
+  background-color: #efefef;
+}
+/* Vertical Slider */
+.claro .dijitRuleLabelsContainerV {
+  padding: 0 2px;
+}
+.claro .dijitSlider .dijitSliderProgressBarV,
+.claro .dijitSlider .dijitSliderBottomBumper {
+  border-color: #b5bcc7;
+  background-color: #cfe5fa;
+  background-image: -moz-linear-gradient(left, #ffffff 0px, rgba(255, 255, 255, 0) 1px);
+  background-image: -webkit-linear-gradient(left, #ffffff 0px, rgba(255, 255, 255, 0) 1px);
+  background-image: -o-linear-gradient(left, #ffffff 0px, rgba(255, 255, 255, 0) 1px);
+  background-image: linear-gradient(left, #ffffff 0px, rgba(255, 255, 255, 0) 1px);
+}
+.claro .dijitSlider .dijitSliderRemainingBarV,
+.claro .dijitSlider .dijitSliderTopBumper {
+  border-color: #b5bcc7;
+  background-color: #ffffff;
+}
+.claro .dijitSliderBottomBumper {
+  border-bottom: solid 1px #b5bcc7;
+}
+.claro .dijitSliderTopBumper {
+  border-top: solid 1px #b5bcc7;
+}
+.claro .dijitSliderHover .dijitSliderProgressBarV,
+.claro .dijitSliderHover .dijitSliderBottomBumper {
+  background-color: #abd6ff;
+  border-color: #759dc0;
+}
+.claro .dijitSliderHover .dijitSliderRemainingBarV,
+.claro .dijitSliderHover .dijitSliderTopBumper {
+  background-color: #ffffff;
+  border-color: #759dc0;
+}
+.claro .dijitSliderFocused .dijitSliderProgressBarV,
+.claro .dijitSliderFocused .dijitSliderBottomBumper {
+  background-color: #abd6ff;
+  border-color: #759dc0;
+  -webkit-box-shadow: inset 1px 0px 1px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: inset 1px 0px 1px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 1px 0px 1px rgba(0, 0, 0, 0.2);
+}
+.claro .dijitSliderFocused .dijitSliderRemainingBarV,
+.claro .dijitSliderFocused .dijitSliderTopBumper {
+  background-color: #ffffff;
+  border-color: #759dc0;
+  -webkit-box-shadow: inset 1px 0px 1px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: inset 1px 0px 1px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 1px 0px 1px rgba(0, 0, 0, 0.2);
+}
+.claro .dijitSliderDisabled .dijitSliderProgressBarV,
+.claro .dijitSliderDisabled .dijitSliderBottomBumper {
+  background-color: #d3d3d3;
+  /* bottom side of slider, fill matches border */
+
+}
+.claro .dijitSliderDisabled .dijitSliderRemainingBarV,
+.claro .dijitSliderDisabled .dijitSliderTopBumper {
+  background-color: #efefef;
+}
+/* ------- Thumbs ------- */
+.claro .dijitSliderImageHandleH {
+  border: 0;
+  width: 18px;
+  height: 16px;
+  background-image: url("../form/images/sliderThumbs.png");
+  background-repeat: no-repeat;
+  background-position: 0 0;
+}
+.claro .dijitSliderHover .dijitSliderImageHandleH {
+  background-position: -18px 0;
+}
+.claro .dijitSliderFocused .dijitSliderImageHandleH {
+  background-position: -36px 0;
+}
+.claro .dijitSliderProgressBarH .dijitSliderThumbHover {
+  background-position: -36px 0;
+}
+.claro .dijitSliderProgressBarH .dijitSliderThumbActive {
+  background-position: -36px 0;
+}
+.claro .dijitSliderReadOnly .dijitSliderImageHandleH,
+.claro .dijitSliderDisabled .dijitSliderImageHandleH {
+  background-position: -54px 0;
+}
+.claro .dijitSliderImageHandleV {
+  border: 0;
+  width: 18px;
+  height: 16px;
+  background-image: url("../form/images/sliderThumbs.png");
+  background-repeat: no-repeat;
+  background-position: -289px 0;
+}
+.claro .dijitSliderHover .dijitSliderImageHandleV {
+  background-position: -307px 0;
+}
+.claro .dijitSliderFocused .dijitSliderImageHandleV {
+  background-position: -325px 0;
+}
+.claro .dijitSliderProgressBarV .dijitSliderThumbHover {
+  background-position: -325px 0;
+}
+.claro .dijitSliderProgressBarV .dijitSliderThumbActive {
+  background-position: -325px 0;
+}
+.claro .dijitSliderReadOnly .dijitSliderImageHandleV,
+.claro .dijitSliderDisabled .dijitSliderImageHandleV {
+  background-position: -343px 0;
+}
+/* ---- Increment/Decrement Buttons ---- */
+.claro .dijitSliderButtonContainerH {
+  padding: 1px 3px 1px 2px;
+}
+.claro .dijitSliderButtonContainerV {
+  padding: 3px 1px 2px 1px;
+}
+.claro .dijitSliderDecrementIconH,
+.claro .dijitSliderIncrementIconH,
+.claro .dijitSliderDecrementIconV,
+.claro .dijitSliderIncrementIconV {
+  background-image: url("../form/images/commonFormArrows.png");
+  background-repeat: no-repeat;
+  background-color: #efefef;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  border: solid 1px #b5bcc7;
+  font-size: 1px;
+}
+.claro .dijitSliderDecrementIconH,
+.claro .dijitSliderIncrementIconH {
+  height: 12px;
+  width: 9px;
+}
+.claro .dijitSliderDecrementIconV,
+.claro .dijitSliderIncrementIconV {
+  height: 9px;
+  width: 12px;
+}
+.claro .dijitSliderActive .dijitSliderDecrementIconH,
+.claro .dijitSliderActive .dijitSliderIncrementIconH,
+.claro .dijitSliderActive .dijitSliderDecrementIconV,
+.claro .dijitSliderActive .dijitSliderIncrementIconV,
+.claro .dijitSliderHover .dijitSliderDecrementIconH,
+.claro .dijitSliderHover .dijitSliderIncrementIconH,
+.claro .dijitSliderHover .dijitSliderDecrementIconV,
+.claro .dijitSliderHover .dijitSliderIncrementIconV {
+  /* dijitSliderActive should be treated as dijitSliderHover since "clicking the slider" has no meaning */
+
+  border: solid 1px #759dc0;
+  background-color: #ffffff;
+}
+.claro .dijitSliderDecrementIconH {
+  background-position: -357px 50%;
+}
+.claro .dijitSliderActive .dijitSliderDecrementIconH .claro .dijitSliderHover .dijitSliderDecrementIconH {
+  background-position: -393px 50%;
+}
+.claro .dijitSliderIncrementIconH {
+  background-position: -251px 50%;
+}
+.claro .dijitSliderActive .dijitSliderIncrementIconH .claro .dijitSliderHover .dijitSliderIncrementIconH {
+  background-position: -283px 50%;
+}
+.claro .dijitSliderDecrementIconV {
+  background-position: -38px 50%;
+}
+.claro .dijitSliderActive .dijitSliderDecrementIconV .claro .dijitSliderHover .dijitSliderDecrementIconV {
+  background-position: -73px 50%;
+}
+.claro .dijitSliderIncrementIconV {
+  background-position: -143px 49%;
+}
+.claro .dijitSliderActive .dijitSliderIncrementIconV .claro .dijitSliderHover .dijitSliderIncrementIconV {
+  background-position: -178px 49%;
+}
+.claro .dijitSliderButtonContainerV .dijitSliderDecrementButtonHover,
+.claro .dijitSliderButtonContainerH .dijitSliderDecrementButtonHover,
+.claro .dijitSliderButtonContainerV .dijitSliderIncrementButtonHover,
+.claro .dijitSliderButtonContainerH .dijitSliderIncrementButtonHover {
+  background-color: #cfe5fa;
+}
+.claro .dijitSliderButtonContainerV .dijitSliderDecrementButtonActive,
+.claro .dijitSliderButtonContainerH .dijitSliderDecrementButtonActive,
+.claro .dijitSliderButtonContainerV .dijitSliderIncrementButtonActive,
+.claro .dijitSliderButtonContainerH .dijitSliderIncrementButtonActive {
+  background-color: #abd6ff;
+  border-color: #759dc0;
+}
+.claro .dijitSliderButtonInner {
+  visibility: hidden;
+}
+.claro .dijitSliderDisabled .dijitSliderBar {
+  border-color: #d3d3d3;
+}
+.claro .dijitSliderReadOnly *,
+.claro .dijitSliderDisabled * {
+  border-color: #d3d3d3;
+  color: #818181;
+}
+.claro .dijitSliderReadOnly .dijitSliderDecrementIconH,
+.claro .dijitSliderDisabled .dijitSliderDecrementIconH {
+  background-position: -321px 50%;
+  background-color: #efefef;
+}
+.claro .dijitSliderReadOnly .dijitSliderIncrementIconH,
+.claro .dijitSliderDisabled .dijitSliderIncrementIconH {
+  background-position: -215px 50%;
+  background-color: #efefef;
+}
+.claro .dijitSliderReadOnly .dijitSliderDecrementIconV,
+.claro .dijitSliderDisabled .dijitSliderDecrementIconV {
+  background-position: -3px 49%;
+  background-color: #efefef;
+}
+.claro .dijitSliderReadOnly .dijitSliderIncrementIconV,
+.claro .dijitSliderDisabled .dijitSliderIncrementIconV {
+  background-position: -107px 49%;
+  background-color: #efefef;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Slider.less b/src/main/resources/static/dijit/themes/claro/form/Slider.less
new file mode 100644
index 0000000000000000000000000000000000000000..2c5bfe914de8ecfee79ac0a74789c008301b8250
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Slider.less
@@ -0,0 +1,344 @@
+/* Slider 
+ * 
+ * Styling Slider mainly includes styling the Slider progress bar (dijitSliderProgressBar)
+ * 
+ * Slider progress bar:
+ * 1. Slider progress bar (default styling): 
+ * 		.dijitSliderProgressBarH - progress bar at the middle of horizontal slider
+ * 		.dijitSliderLeftBumper - bar at the left of horizontal slider
+ * 		.dijitSliderRightBumper - bar at the right of horizontal slider
+ * 		.dijitSliderProgressBarV - progress bar at the middle of vertical slider
+ * 		.dijitSliderTopBumper - bar at the top of vertical slider
+ * 		.dijitSliderBottomtBumper - bar at the bottom of vertical slider
+ * 
+ * 2. hovered Slider progress bar (ie, mouse hover on progress bar)
+ * 		.dijitSliderHover .dijitSliderProgressBarH(horizontal) - hovered bar style: background, border
+ * 
+ * 3. focused Slider progress bar (ie, mouse focused on progress bar)
+ * 		.dijitSliderFocused .dijitSliderProgressBarH(horizontal) - focus bar style: background, border
+ * 
+ * 4. disabled/read-only Slider progress bar 
+ * 		.dijitSliderDisabled .dijitSliderProgressBarH(horizontal) - bar styles when slider is disabled
+ * 
+ * 
+ * Slider Thumbs:
+ * 1. Slider Thumbs (default styling): 
+ * 		.dijitSliderImageHandleH / .dijitSliderImageHandleV - styles for the controller on the progress bar
+ * 
+ * 2. hovered Slider Thumbs (ie, mouse hover on slider thumbs)
+ * 		.dijitSliderHover .dijitSliderImageHandleH - hovered controller style
+ * 
+ * 3. focused Slider progress bar (ie, mouse focused on slider thumbs)
+ * 		.dijitSliderFocused .dijitSliderImageHandleV - focused controller style
+ * 
+ * 
+ * Slider Increment/Decrement Buttons:
+ * 1. Slider Increment/Decrement Buttons (default styling): 
+ * 		.dijitSliderDecrementIconH - decrement icon which lies at the left of horizontal slider
+ * 		.dijitSliderIncrementIconH - increment icon which lies at the right of horizontal slider
+ * 		.dijitSliderDecrementIconV - decrement icon which lies at the bottom of vertical slider
+ * 		.dijitSliderIncrementIconV - increment icon which lies at the top of vertical slider
+ * 
+ * 2. hovered Slider Increment/Decrement Buttons (mouse hover on the icons)
+ * 		.dijitSliderHover .dijitSliderDecrementIconH - for background, border
+ * 
+ * 3. active Slider Increment/Decrement Buttons (mouse down on the icons)
+ * 		.dijitSliderActive .dijitSliderIncrementIconV - for background, border
+ * 
+ * 4. disabled/read-only Slider Increment/Decrement Buttons
+ * 		.dijitSliderDisabled .dijitSliderDecrementIconH - styles for the icons in disabled slider
+ * 		.dijitSliderReadOnly .dijitSliderIncrementIconV - styles for the icons in read-only slider
+ */
+
+@import "../variables";
+
+.claro .dijitSliderBar {
+	border-style: solid;
+	outline: 1px;
+}
+.claro .dijitSliderFocused .dijitSliderBar {
+	border-color: @focused-border-color;
+}
+.claro .dijitSliderHover .dijitSliderBar {
+	border-color: @hovered-border-color;
+}
+.claro .dijitSliderDisabled .dijitSliderBar {
+	background-image: none;
+	border-color: @disabled-border-color;
+}
+.claro .dijitRuleLabelsContainer {
+	color: @text-color;
+}
+
+/* Horizontal Slider */
+
+.claro .dijitRuleLabelsContainerH {
+	padding: 2px 0;
+}
+.claro .dijitSlider .dijitSliderProgressBarH,
+.claro .dijitSlider .dijitSliderLeftBumper{
+	border-color: @border-color;
+	background-color: @slider-fullbar-background-color;
+	.alpha-white-gradient (top, 1,0px, 1,1px, 0,2px);
+}
+.claro .dijitSlider .dijitSliderRemainingBarH,
+.claro .dijitSlider .dijitSliderRightBumper{
+	border-color: @border-color;
+	background-color: @slider-remainingbar-background-color;
+}
+.claro .dijitSliderRightBumper {
+	border-right: solid 1px @border-color;
+}
+.claro .dijitSliderLeftBumper {
+	border-left: solid 1px @border-color;
+}
+.claro .dijitSliderHover .dijitSliderProgressBarH,
+.claro .dijitSliderHover .dijitSliderLeftBumper{
+	background-color: @slider-hovered-fullbar-background-color;
+	border-color: @hovered-border-color;
+}
+.claro .dijitSliderHover .dijitSliderRemainingBarH,
+.claro .dijitSliderHover .dijitSliderRightBumper{
+	background-color: @slider-hovered-remainingbar-background-color;
+	border-color: @hovered-border-color;
+}
+.claro .dijitSliderFocused .dijitSliderProgressBarH,
+.claro .dijitSliderFocused .dijitSliderLeftBumper{
+	background-color: @slider-focused-fullbar-background-color;
+	border-color: @focused-border-color;
+	.box-shadow(inset 0px 1px 1px rgba(0, 0, 0, 0.2));
+}
+.claro .dijitSliderFocused .dijitSliderRemainingBarH,
+.claro .dijitSliderFocused .dijitSliderRightBumper{
+	background-color: @slider-focused-remainingbar-background-color;
+	border-color: @focused-border-color;
+	.box-shadow(inset 0px 1px 1px rgba(0, 0, 0, 0.2));
+}
+.claro .dijitSliderDisabled .dijitSliderProgressBarH,
+.claro .dijitSliderDisabled .dijitSliderLeftBumper{
+	background-color: @disabled-border-color;		/* left side of slider, fill matches border */
+	background-image:none;
+}
+.claro .dijitSliderDisabled .dijitSliderRemainingBarH,
+.claro .dijitSliderDisabled .dijitSliderRightBumper{
+	background-color: @disabled-background-color;
+}
+
+/* Vertical Slider */
+
+.claro .dijitRuleLabelsContainerV {
+	padding: 0 2px;
+}
+.claro .dijitSlider .dijitSliderProgressBarV,
+.claro .dijitSlider .dijitSliderBottomBumper{
+	border-color: @border-color;
+	background-color: @slider-fullbar-background-color;
+	.alpha-white-gradient (left, 1,0px, 0,1px);
+}
+.claro .dijitSlider .dijitSliderRemainingBarV,
+.claro .dijitSlider .dijitSliderTopBumper{
+	border-color: @border-color;
+	background-color: @slider-remainingbar-background-color;
+}
+.claro .dijitSliderBottomBumper {
+	border-bottom: solid 1px @border-color;
+}
+.claro .dijitSliderTopBumper {
+	border-top: solid 1px @border-color;
+}
+.claro .dijitSliderHover .dijitSliderProgressBarV,
+.claro .dijitSliderHover .dijitSliderBottomBumper{
+	background-color: @slider-hovered-fullbar-background-color;
+	border-color: @hovered-border-color;
+}
+.claro .dijitSliderHover .dijitSliderRemainingBarV,
+.claro .dijitSliderHover .dijitSliderTopBumper{
+	background-color: @slider-hovered-remainingbar-background-color;
+	border-color: @hovered-border-color;
+}
+.claro .dijitSliderFocused .dijitSliderProgressBarV,
+.claro .dijitSliderFocused .dijitSliderBottomBumper{
+	background-color: @slider-focused-fullbar-background-color;
+	border-color: @focused-border-color;
+	.box-shadow(inset 1px 0px 1px rgba(0, 0, 0, 0.2));
+}
+.claro .dijitSliderFocused .dijitSliderRemainingBarV,
+.claro .dijitSliderFocused .dijitSliderTopBumper{
+	background-color: @slider-focused-remainingbar-background-color;
+	border-color: @focused-border-color;
+	.box-shadow(inset 1px 0px 1px rgba(0, 0, 0, 0.2));
+}
+.claro .dijitSliderDisabled .dijitSliderProgressBarV,
+.claro .dijitSliderDisabled .dijitSliderBottomBumper{
+	background-color: @disabled-border-color;	/* bottom side of slider, fill matches border */
+}
+.claro .dijitSliderDisabled .dijitSliderRemainingBarV,
+.claro .dijitSliderDisabled .dijitSliderTopBumper{
+	background-color: @disabled-background-color;
+}
+
+
+/* ------- Thumbs ------- */
+
+.claro .dijitSliderImageHandleH {
+	border: 0;
+	width: 18px;
+	height: 16px;
+	background-image: url("../@{image-form-slider-thumbs}");
+	background-repeat:no-repeat;
+	background-position:0 0;
+}
+.claro .dijitSliderHover .dijitSliderImageHandleH {
+	background-position:-18px 0;
+}
+.claro .dijitSliderFocused .dijitSliderImageHandleH {
+	background-position:-36px 0;
+}
+.claro .dijitSliderProgressBarH .dijitSliderThumbHover{
+	background-position:-36px 0;
+}
+.claro .dijitSliderProgressBarH .dijitSliderThumbActive{
+	background-position:-36px 0;
+}
+.claro .dijitSliderReadOnly .dijitSliderImageHandleH,
+.claro .dijitSliderDisabled .dijitSliderImageHandleH {
+	background-position:-54px 0;
+}
+.claro .dijitSliderImageHandleV {
+	border: 0;
+	width: 18px;
+	height: 16px;
+	background-image: url("../@{image-form-slider-thumbs}");
+	background-repeat:no-repeat;
+	background-position:-289px 0;
+}
+.claro .dijitSliderHover .dijitSliderImageHandleV {
+	background-position:-307px 0;
+}
+.claro .dijitSliderFocused .dijitSliderImageHandleV {
+	background-position:-325px 0;
+}
+.claro .dijitSliderProgressBarV .dijitSliderThumbHover{
+	background-position:-325px 0;
+}
+.claro .dijitSliderProgressBarV .dijitSliderThumbActive{
+	background-position:-325px 0;
+}
+.claro .dijitSliderReadOnly .dijitSliderImageHandleV,
+.claro .dijitSliderDisabled .dijitSliderImageHandleV {
+	background-position:-343px 0;
+}
+
+/* ---- Increment/Decrement Buttons ---- */
+
+.claro .dijitSliderButtonContainerH{
+	padding: 1px 3px 1px 2px;
+}
+.claro .dijitSliderButtonContainerV{
+	padding: 3px 1px 2px 1px;
+}
+.claro .dijitSliderDecrementIconH,
+.claro .dijitSliderIncrementIconH,
+.claro .dijitSliderDecrementIconV,
+.claro .dijitSliderIncrementIconV {
+	background-image: url("../@{image-form-common-arrows}");
+	background-repeat:no-repeat;
+	background-color: @arrowbutton-background-color;
+	.border-radius(2px);
+	border: solid 1px @border-color;
+	font-size: 1px;
+}
+.claro .dijitSliderDecrementIconH,
+.claro .dijitSliderIncrementIconH {
+	height: 12px;
+	width: 9px;
+}
+.claro .dijitSliderDecrementIconV,
+.claro .dijitSliderIncrementIconV {
+	height: 9px;
+	width: 12px;
+}
+.claro .dijitSliderActive .dijitSliderDecrementIconH,
+.claro .dijitSliderActive .dijitSliderIncrementIconH,
+.claro .dijitSliderActive .dijitSliderDecrementIconV,
+.claro .dijitSliderActive .dijitSliderIncrementIconV,
+.claro .dijitSliderHover .dijitSliderDecrementIconH,
+.claro .dijitSliderHover .dijitSliderIncrementIconH,
+.claro .dijitSliderHover .dijitSliderDecrementIconV,
+.claro .dijitSliderHover .dijitSliderIncrementIconV {
+	/* dijitSliderActive should be treated as dijitSliderHover since "clicking the slider" has no meaning */
+	border: solid 1px @hovered-border-color;
+	background-color: @slider-hoveredButton-background-color;
+}
+
+.claro .dijitSliderDecrementIconH {
+	background-position:-357px 50%;
+}
+.claro .dijitSliderActive .dijitSliderDecrementIconH
+.claro .dijitSliderHover .dijitSliderDecrementIconH {
+	background-position:-393px 50%;
+}
+.claro .dijitSliderIncrementIconH {
+	background-position:-251px 50%;
+}
+.claro .dijitSliderActive .dijitSliderIncrementIconH
+.claro .dijitSliderHover .dijitSliderIncrementIconH {
+	background-position:-283px 50%;
+}
+.claro .dijitSliderDecrementIconV {
+	background-position:-38px 50%;
+}
+.claro .dijitSliderActive .dijitSliderDecrementIconV
+.claro .dijitSliderHover .dijitSliderDecrementIconV {
+	background-position:-73px 50%;
+}
+.claro .dijitSliderIncrementIconV {
+	background-position:-143px 49%;
+}
+.claro .dijitSliderActive .dijitSliderIncrementIconV
+.claro .dijitSliderHover .dijitSliderIncrementIconV {
+	background-position:-178px 49%;
+}
+.claro .dijitSliderButtonContainerV .dijitSliderDecrementButtonHover,
+.claro .dijitSliderButtonContainerH .dijitSliderDecrementButtonHover,
+.claro .dijitSliderButtonContainerV .dijitSliderIncrementButtonHover,
+.claro .dijitSliderButtonContainerH .dijitSliderIncrementButtonHover {
+	background-color: @slider-button-hovered-background-color;
+}
+.claro .dijitSliderButtonContainerV .dijitSliderDecrementButtonActive,
+.claro .dijitSliderButtonContainerH .dijitSliderDecrementButtonActive,
+.claro .dijitSliderButtonContainerV .dijitSliderIncrementButtonActive,
+.claro .dijitSliderButtonContainerH .dijitSliderIncrementButtonActive {
+	background-color: @slider-button-pressed-background-color;
+	border-color:@pressed-border-color;
+}
+.claro .dijitSliderButtonInner {
+	visibility: hidden;
+}
+.claro .dijitSliderDisabled .dijitSliderBar{
+	border-color: @disabled-border-color;
+}
+.claro .dijitSliderReadOnly *,.claro .dijitSliderDisabled * {
+	border-color: @disabled-border-color;
+	color: @disabled-text-color;
+}
+.claro .dijitSliderReadOnly .dijitSliderDecrementIconH,
+.claro .dijitSliderDisabled .dijitSliderDecrementIconH {
+	background-position:-321px 50%;
+	background-color:@disabled-background-color;
+}
+.claro .dijitSliderReadOnly .dijitSliderIncrementIconH,
+.claro .dijitSliderDisabled .dijitSliderIncrementIconH {
+	background-position:-215px 50%;
+	background-color:@disabled-background-color;
+}
+.claro .dijitSliderReadOnly .dijitSliderDecrementIconV,
+.claro .dijitSliderDisabled .dijitSliderDecrementIconV {
+	background-position:-3px 49%;
+	background-color:@disabled-background-color;
+}
+.claro .dijitSliderReadOnly .dijitSliderIncrementIconV,
+.claro .dijitSliderDisabled .dijitSliderIncrementIconV {
+	background-position:-107px 49%;
+	background-color:@disabled-background-color;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Slider_rtl.css b/src/main/resources/static/dijit/themes/claro/form/Slider_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..0f390936c8dfd852aacdb012707f1f165daf5ceb
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Slider_rtl.css
@@ -0,0 +1,26 @@
+.claro .dijitSliderRtl .dijitSliderProgressBarH,
+.claro .dijitSliderRtl .dijitSliderRemainingBarH,
+.claro .dijitSliderRtl .dijitSliderLeftBumper,
+.claro .dijitSliderRtl .dijitSliderRightBumper,
+.claro .dijitSliderRtl .dijitSliderTopBumper {
+  background-position: top right;
+}
+.claro .dijitSliderRtl .dijitSliderProgressBarV,
+.claro .dijitSliderRtl .dijitSliderRemainingBarV,
+.claro .dijitSliderRtl .dijitSliderBottomBumper {
+  background-position: bottom right;
+}
+.claro .dijitSliderRtl .dijitSliderLeftBumper {
+  border-left-width: 0;
+  border-right-width: 1px;
+}
+.claro .dijitSliderRtl .dijitSliderRightBumper {
+  border-left-width: 1px;
+  border-right-width: 0;
+}
+.claro .dijitSliderRtl .dijitSliderIncrementIconH {
+  background-position: -357px 50%;
+}
+.claro .dijitSliderRtl .dijitSliderDecrementIconH {
+  background-position: -251px 50%;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/Slider_rtl.less b/src/main/resources/static/dijit/themes/claro/form/Slider_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..66a711668d305081595b901d600ac9a53f2903b7
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/Slider_rtl.less
@@ -0,0 +1,33 @@
+@import "../variables";
+
+.claro .dijitSliderRtl .dijitSliderProgressBarH,
+.claro .dijitSliderRtl .dijitSliderRemainingBarH,
+.claro .dijitSliderRtl .dijitSliderLeftBumper,
+.claro .dijitSliderRtl .dijitSliderRightBumper,
+.claro .dijitSliderRtl .dijitSliderTopBumper {
+	background-position: top right;
+}
+
+.claro .dijitSliderRtl .dijitSliderProgressBarV,
+.claro .dijitSliderRtl .dijitSliderRemainingBarV,
+.claro .dijitSliderRtl .dijitSliderBottomBumper {
+	background-position: bottom right;
+}
+
+.claro .dijitSliderRtl .dijitSliderLeftBumper {
+	border-left-width: 0;
+	border-right-width: 1px;
+}
+
+.claro .dijitSliderRtl .dijitSliderRightBumper {
+	border-left-width: 1px;
+	border-right-width: 0;
+}
+
+.claro .dijitSliderRtl .dijitSliderIncrementIconH {
+	background-position:-357px 50%;
+}
+
+.claro .dijitSliderRtl .dijitSliderDecrementIconH {
+	background-position:-251px 50%;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/buttonArrows.png b/src/main/resources/static/dijit/themes/claro/form/images/buttonArrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..642eff39becbd2ff04cd0d5a612e362fbf5502af
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/form/images/buttonArrows.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/buttonDisabled.png b/src/main/resources/static/dijit/themes/claro/form/images/buttonDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..faf57ba1dc8063532533618b3c7300ff217da1a4
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/form/images/buttonDisabled.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/buttonDisabled.svg b/src/main/resources/static/dijit/themes/claro/form/images/buttonDisabled.svg
new file mode 100644
index 0000000000000000000000000000000000000000..72a51a01799fb03497c0c83aeb7fc7b97e788f7a
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/images/buttonDisabled.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for buttonDisabled.png, which is used by IE7-9 for Button gradients.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match gradients defined in Button.css.  It is however an approximation, since generated
+	output has a constant height, rather than matching the height of each button.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="1px" height="18px" viewBox="0 0 1 18" preserveAspectRatio="none">
+
+	<defs>
+		<linearGradient id="disabled" gradientUnits="objectBoundingBox" x1="0%" y1="0%" x2="0%" y2="100%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
+			<stop offset="50%" stop-color="#ffffff" stop-opacity="0"/>
+		</linearGradient>
+	</defs>
+
+	<!--
+		Swatch for disabled buttons.   It will only fill the top part of the disabled buttons.
+		The bottom of disabled buttons are pure background-color
+	-->
+	<rect x="0" y="0" width="1" height="18" fill="url(#disabled)"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/buttonEnabled.png b/src/main/resources/static/dijit/themes/claro/form/images/buttonEnabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..0932a99475940467ea1eca547eff3633ca0f4750
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/form/images/buttonEnabled.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/buttonEnabled.svg b/src/main/resources/static/dijit/themes/claro/form/images/buttonEnabled.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d9e564ab855c6fc991aaa694b03ff2d339f45645
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/form/images/buttonEnabled.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for buttonEnabled.png, which is used by IE7-9 for Button gradients.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match gradients defined in Button.css.  It is however an approximation, since generated
+	output has a constant height, rather than matching the height of each button.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="1px" height="149px" viewBox="0 0 1 149" preserveAspectRatio="none">
+
+	<defs>
+		<linearGradient id="enabled" gradientUnits="objectBoundingBox" x1="0%" y1="0%" x2="0%" y2="100%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
+			<stop offset="2%" stop-color="#ffffff" stop-opacity="0"/>
+			<stop offset="15%" stop-color="#ffffff" stop-opacity="0.7"/> <!-- near bottom of average height buttons -->
+		</linearGradient>
+	</defs>
+
+	<!--
+		Swatch for enabled buttons.   It's 149px tall to account for tall buttons, but usually
+		only the top will be visible.
+	-->
+	<rect x="0" y="0" width="1" height="149" fill="url(#enabled)"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/checkboxAndRadioButtons_IE6.png b/src/main/resources/static/dijit/themes/claro/form/images/checkboxAndRadioButtons_IE6.png
new file mode 100644
index 0000000000000000000000000000000000000000..92d222178d538f4b1b551e643edc2faad413196e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/form/images/checkboxAndRadioButtons_IE6.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/checkboxRadioButtonStates.png b/src/main/resources/static/dijit/themes/claro/form/images/checkboxRadioButtonStates.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d06a82883c7d31be0191e592f1dcafec8cf5def
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/form/images/checkboxRadioButtonStates.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/commonFormArrows.png b/src/main/resources/static/dijit/themes/claro/form/images/commonFormArrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d04742edd283b7415ea9a404fcab04d2e30d7d8
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/form/images/commonFormArrows.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/error.png b/src/main/resources/static/dijit/themes/claro/form/images/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..46de1cd8bbe3d1ea9fc30907497469d20901aeee
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/form/images/error.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/form/images/sliderThumbs.png b/src/main/resources/static/dijit/themes/claro/form/images/sliderThumbs.png
new file mode 100644
index 0000000000000000000000000000000000000000..70ab2fe2982de32c1945dfe06679c618d703a7fb
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/form/images/sliderThumbs.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/activeGradient.png b/src/main/resources/static/dijit/themes/claro/images/activeGradient.png
new file mode 100644
index 0000000000000000000000000000000000000000..e70daaa86158f48934986937c115ce65021bf283
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/activeGradient.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/activeGradient.svg b/src/main/resources/static/dijit/themes/claro/images/activeGradient.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8ab6ce9c13603a189cd8d7d49a33829549b2df98
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/images/activeGradient.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for standardGradient.png, which is used by IE7-9 for light-to-dark gradient of many widgets.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from .standard-gradient() mixin in variables.css.
+	It is however an approximation, since generated
+	output has a constant height, rather than matching the height of each node.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="1px" height="16px" viewBox="0 0 1 1" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="0%" y1="0%" x2="0%" y2="100%">
+			<stop offset="0%" stop-color="rgb(190,190,190)" stop-opacity="0.98"/>
+			<stop offset="20%" stop-color="#ffffff" stop-opacity="0.65"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="0"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="1" height="1" fill="url(#gradient)"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/images/calendar.png b/src/main/resources/static/dijit/themes/claro/images/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..d892e495492dc520c37941f8e1542d61c2647b59
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/calendar.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/calendarArrows.png b/src/main/resources/static/dijit/themes/claro/images/calendarArrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..73333ada9d79c59f5d39cce4c4956a471db18d5c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/calendarArrows.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/calendarArrows8bit.png b/src/main/resources/static/dijit/themes/claro/images/calendarArrows8bit.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8652600f2491d83aab286229e20250b90400465
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/calendarArrows8bit.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/checkmarkNoBorder.gif b/src/main/resources/static/dijit/themes/claro/images/checkmarkNoBorder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..324bfb3cd35ca828bb25b3d690f8a29a902a4cb7
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/checkmarkNoBorder.gif differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/checkmarkNoBorder.png b/src/main/resources/static/dijit/themes/claro/images/checkmarkNoBorder.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae3271a17b87a3c70010f57ffd12cd213c82068d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/checkmarkNoBorder.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/dialogCloseIcon.png b/src/main/resources/static/dijit/themes/claro/images/dialogCloseIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f69a1e7d197341798fda4218bf241d162f5202b0
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/dialogCloseIcon.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/dialogCloseIcon8bit.png b/src/main/resources/static/dijit/themes/claro/images/dialogCloseIcon8bit.png
new file mode 100644
index 0000000000000000000000000000000000000000..200c0afb0f0877c04d09894f842d0ef772a02126
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/dialogCloseIcon8bit.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/dnd.png b/src/main/resources/static/dijit/themes/claro/images/dnd.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e1d89902be7b632d91ae3056cd27912008a2216
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/dnd.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/progressBarAnim.gif b/src/main/resources/static/dijit/themes/claro/images/progressBarAnim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..30c0d9d873856b0cd82beff409cc2383461c0560
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/progressBarAnim.gif differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/progressBarFull.png b/src/main/resources/static/dijit/themes/claro/images/progressBarFull.png
new file mode 100644
index 0000000000000000000000000000000000000000..90c9eaa2c291439472ec6edcd21541fc711f27bb
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/progressBarFull.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/spriteArrows.png b/src/main/resources/static/dijit/themes/claro/images/spriteArrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9d99ab16f1a67a6680eb9ab045c4113ed71b854
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/spriteArrows.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/standardGradient.png b/src/main/resources/static/dijit/themes/claro/images/standardGradient.png
new file mode 100644
index 0000000000000000000000000000000000000000..72241f1f8e78be4213e449cab152eddeba945b91
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/standardGradient.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/standardGradient.svg b/src/main/resources/static/dijit/themes/claro/images/standardGradient.svg
new file mode 100644
index 0000000000000000000000000000000000000000..807c3c70b8e05e64967a694fe5ac3fa55fb71e43
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/images/standardGradient.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for standardGradient.png, which is used by IE7-9 for light-to-dark gradient of many widgets.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from .standard-gradient() mixin in variables.css.
+	It is however an approximation, since generated
+	output has a constant height, rather than matching the height of each node.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px" viewBox="0 0 1 1" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="0%" y1="0%" x2="0%" y2="100%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="0.7"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="0"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="1" height="1" fill="url(#gradient)"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/images/tooltip.png b/src/main/resources/static/dijit/themes/claro/images/tooltip.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d279cdef8794c03d3b41adbc529ba3d4783f975
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/tooltip.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/tooltip8bit.png b/src/main/resources/static/dijit/themes/claro/images/tooltip8bit.png
new file mode 100644
index 0000000000000000000000000000000000000000..00350722acf4cf8fa35be3bacc80b41b6dc79c2e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/tooltip8bit.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/treeExpandImages.png b/src/main/resources/static/dijit/themes/claro/images/treeExpandImages.png
new file mode 100644
index 0000000000000000000000000000000000000000..350a1ddefeea8f808ebf08489ecb90a466a1b628
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/treeExpandImages.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/images/treeExpandImages8bit.png b/src/main/resources/static/dijit/themes/claro/images/treeExpandImages8bit.png
new file mode 100644
index 0000000000000000000000000000000000000000..294ce7a8bd98f228bbd6c3aa11a862e5244471b5
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/images/treeExpandImages8bit.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/AccordionContainer.css b/src/main/resources/static/dijit/themes/claro/layout/AccordionContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..be0c851a1879ea89984eb41880b35cc6b576f91f
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/AccordionContainer.css
@@ -0,0 +1,123 @@
+/* Accordion
+ * 
+ * Styling AccordionContainer basically means styling the accordion pane (dijitAccordionInnerContainer)
+ * and the title inside of it (dijitAccordionTitle).   There are 4 basic states to style:
+ * 
+ * 1. closed pane (and default styling): 
+ * 		.dijitAccordionInnerContainer - container for each accordion child
+ * 		.dijitAccordionTitle - title for each accordion child
+ *
+ * 2. active closed pane (ie, mouse down on a title bar)
+ * 		.dijitAccordionInnerContainerActive - for background-color, border
+ * 		.dijitAccordionInnerContainerActive dijitAccordionTitle - for text color
+ * 
+ * 3. open pane (expanded child)
+ *		.dijitAccordionChildWrapper - wraps around the child widget (typically ContentPane)
+ *			setting a margin so that there's blue trim all the way around the child
+ *
+ * 		These rules need to override the closed pane active:
+ *
+ * 		.dijitAccordionInnerContainerSelected - for background-color, border
+ * 		.dijitAccordionInnerContainerSelected .dijitAccordionTitle - for text color
+ * 
+ * 4. hovered pane, open or closed
+ * 		The selectors below affect hovering over both a closed pane (ie, hovering a title bar),
+ * 		and hovering over an open pane.   Also, treat mouse down on an open pane as a hover:
+ *
+ * 		.dijitAccordionInnerContainerHover, .dijitAccordionInnerContainerSelectedActive - for background-color, border
+ * 		.dijitAccordionInnerContainerHover .dijitAccordionTitle - for text color
+ */
+.claro .dijitAccordionContainer {
+  border: none;
+}
+.claro .dijitAccordionInnerContainer {
+  background-color: #efefef;
+  /* gray, for closed pane */
+
+  border: solid 1px #b5bcc7;
+  margin-bottom: 1px;
+  -webkit-transition-property: background-color, border;
+  -moz-transition-property: background-color, border;
+  transition-property: background-color, border;
+  -webkit-transition-duration: 0.3s;
+  -moz-transition-duration: 0.3s;
+  transition-duration: 0.3s;
+  -webkit-transition-timing-function: linear;
+  -moz-transition-timing-function: linear;
+  transition-timing-function: linear;
+}
+.claro .dijitAccordionTitle {
+  background-color: transparent;
+  /* pick up color from dijitAccordionInnerContainer */
+
+  background-image: url("../images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  padding: 5px 7px 2px 7px;
+  min-height: 17px;
+  color: #494949;
+}
+.claro .dijitAccordionContainer .dijitAccordionChildWrapper {
+  /* this extends the blue trim styling of the title bar to wrapping around the node.
+	 * done by setting margin
+	 */
+
+  background-color: #ffffff;
+  border: 1px solid #759dc0;
+  margin: 0 2px 2px;
+}
+.claro .dijitAccordionContainer .dijitAccordionContainer-child {
+  /* this is affecting the child widget itself */
+
+  padding: 9px;
+}
+/* Hover state for closed pane */
+.claro .dijitAccordionInnerContainerHover {
+  border: 1px solid #759dc0;
+  background-color: #abd6ff;
+  -webkit-transition-duration: 0.2s;
+  -moz-transition-duration: 0.2s;
+  transition-duration: 0.2s;
+}
+.claro .dijitAccordionInnerContainerHover .dijitAccordionTitle {
+  color: #000000;
+}
+/* Active state for closed pane */
+.claro .dijitAccordionInnerContainerActive {
+  border: 1px solid #759dc0;
+  background-color: #7dbdfa;
+  -webkit-transition-duration: 0.1s;
+  -moz-transition-duration: 0.1s;
+  transition-duration: 0.1s;
+}
+.claro .dijitAccordionInnerContainerActive .dijitAccordionTitle {
+  background-image: url("../images/activeGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(190, 190, 190, 0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  color: #000000;
+}
+/* Open (a.k.a. selected) pane */
+.claro .dijitAccordionInnerContainerSelected {
+  border-color: #759dc0;
+  background-color: #cfe5fa;
+}
+.claro .dijitAccordionInnerContainerSelected .dijitAccordionTitle {
+  color: #000000;
+  background-image: url("../images/standardGradient.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.7) 0%, rgba(255, 255, 255, 0) 100%);
+  _background-image: none;
+  /* avoid effect when clicking the title of the open pane */
+
+}
diff --git a/src/main/resources/static/dijit/themes/claro/layout/AccordionContainer.less b/src/main/resources/static/dijit/themes/claro/layout/AccordionContainer.less
new file mode 100644
index 0000000000000000000000000000000000000000..f0668a2316bbb8bd763e685a653ac0a9f9a7b0e0
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/AccordionContainer.less
@@ -0,0 +1,100 @@
+/* Accordion
+ * 
+ * Styling AccordionContainer basically means styling the accordion pane (dijitAccordionInnerContainer)
+ * and the title inside of it (dijitAccordionTitle).   There are 4 basic states to style:
+ * 
+ * 1. closed pane (and default styling): 
+ * 		.dijitAccordionInnerContainer - container for each accordion child
+ * 		.dijitAccordionTitle - title for each accordion child
+ *
+ * 2. active closed pane (ie, mouse down on a title bar)
+ * 		.dijitAccordionInnerContainerActive - for background-color, border
+ * 		.dijitAccordionInnerContainerActive dijitAccordionTitle - for text color
+ * 
+ * 3. open pane (expanded child)
+ *		.dijitAccordionChildWrapper - wraps around the child widget (typically ContentPane)
+ *			setting a margin so that there's blue trim all the way around the child
+ *
+ * 		These rules need to override the closed pane active:
+ *
+ * 		.dijitAccordionInnerContainerSelected - for background-color, border
+ * 		.dijitAccordionInnerContainerSelected .dijitAccordionTitle - for text color
+ * 
+ * 4. hovered pane, open or closed
+ * 		The selectors below affect hovering over both a closed pane (ie, hovering a title bar),
+ * 		and hovering over an open pane.   Also, treat mouse down on an open pane as a hover:
+ *
+ * 		.dijitAccordionInnerContainerHover, .dijitAccordionInnerContainerSelectedActive - for background-color, border
+ * 		.dijitAccordionInnerContainerHover .dijitAccordionTitle - for text color
+ */
+
+@import "../variables";
+
+.claro .dijitAccordionContainer {
+	border:none;
+}
+.claro .dijitAccordionInnerContainer {
+	background-color: @unselected-background-color;	/* gray, for closed pane */
+	border:solid 1px @border-color;
+	margin-bottom:1px;
+	.transition-property(background-color,border);
+ 	.transition-duration(.3s);
+	.transition-timing-function(linear);
+}
+.claro .dijitAccordionTitle {
+	background-color: transparent;	/* pick up color from dijitAccordionInnerContainer */
+	.standard-gradient("../");
+	padding: 5px 7px 2px 7px;
+	min-height:17px;
+	color:@unselected-text-color;
+}
+
+.claro .dijitAccordionContainer .dijitAccordionChildWrapper {
+	/* this extends the blue trim styling of the title bar to wrapping around the node.
+	 * done by setting margin
+	 */
+	background-color:@pane-background-color;
+	border:1px solid @selected-border-color;
+	margin: 0 2px 2px;
+}
+	
+.claro .dijitAccordionContainer .dijitAccordionContainer-child {
+	/* this is affecting the child widget itself */
+	padding: 9px;
+}
+
+/* Hover state for closed pane */
+
+.claro .dijitAccordionInnerContainerHover {
+	border:1px solid @hovered-border-color;
+	background-color:@hovered-background-color;
+	.transition-duration(.2s);
+}
+
+.claro .dijitAccordionInnerContainerHover .dijitAccordionTitle {
+	color:@hovered-text-color;
+}
+
+/* Active state for closed pane */
+
+.claro .dijitAccordionInnerContainerActive {
+	border:1px solid @selected-border-color;
+	background-color:@pressed-background-color;
+	.transition-duration(.1s);
+}
+.claro .dijitAccordionInnerContainerActive .dijitAccordionTitle {
+	.active-gradient("../");
+	color:@selected-text-color;
+}
+
+/* Open (a.k.a. selected) pane */
+
+.claro .dijitAccordionInnerContainerSelected {
+	border-color:@selected-border-color;
+	background-color: @selected-background-color;
+}
+.claro .dijitAccordionInnerContainerSelected .dijitAccordionTitle {
+	color:@selected-text-color;
+	.standard-gradient("../");	/* avoid effect when clicking the title of the open pane */
+}
+
diff --git a/src/main/resources/static/dijit/themes/claro/layout/BorderContainer.css b/src/main/resources/static/dijit/themes/claro/layout/BorderContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..ede0b501091ff8bf52b42d7aab986c69ca022b17
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/BorderContainer.css
@@ -0,0 +1,133 @@
+/* BorderContainer 
+
+Splitters and gutters separate panes within a BorderContainer. Splitters can be moved up and down (horizonal splitters) or left and right (vertical splitters), while Gutters are static. A "thumb" is the slit on a Splitter that indicates it is movable. 
+
+Styling the BorderContainer widget consists of the following: 
+
+.dijitBorderContainer - for border and padding of the entire border container
+
+.dijitSplitContainer-child, .dijitBorderContainer-child - for border or child panes of the border container. By default borders are put on all children of BorderContainer.  
+
+.dijitBorderContainer-dijitTabContainerTop,
+.dijitBorderContainer-dijitTabContainerBottom,
+.dijitBorderContainer-dijitTabContainerLeft,
+.dijitBorderContainer-dijitTabContainerRight,
+.dijitBorderContainer-dijitAccordionContainer   -for border of the border containers within TabContainer or AccordionContainer widget
+
+.dijitBorderContainer-dijitBorderContainer - for border and padding of nested BorderContainers
+
+Splitters and gutters:  
+
+.dijitSplitterH, .dijitGutterH - for height, background, and border of a horizontal splitter and gutter 
+.dijitSplitterH .dijitSplitterThumb - for color, height/width of the thumb on a horizontal splitter
+.dijitSplitterV, .dijitGutterV - - for height, background, and border of a vertical splitter and gutter 
+.dijitSplitterV .dijitSplitterThumb - for color, height/width of the thumb on a vertical splitter
+.dijitSplitterHHover - for background-color of a hovered horizontal splitter
+.dijitSplitterHHover .dijitSplitterThumb - for background-color of a hovered thumb on a horizontal splitter
+.dijitSplitterVHover  - for background-color of a hovered vertical splitter
+.dijitSplitterVHover .dijitSplitterThumb - for background-color of a hovered thumb on a vertical splitter
+.dijitSplitterHActive - for background-color of an active horizontal splitter
+.dijitSplitterVActive - for background-color of an active horizontal splitter
+*/
+.claro .dijitBorderContainer {
+  /* matches the width of the splitters between panes */
+
+  padding: 5px;
+}
+.claro .dijitSplitContainer-child,
+.claro .dijitBorderContainer-child {
+  /* By default put borders on all children of BorderContainer,
+	 *  to give illusion of borders on the splitters themselves.
+	 */
+
+  border: 1px #b5bcc7 solid;
+}
+.claro .dijitBorderContainer-dijitTabContainerTop,
+.claro .dijitBorderContainer-dijitTabContainerBottom,
+.claro .dijitBorderContainer-dijitTabContainerLeft,
+.claro .dijitBorderContainer-dijitTabContainerRight,
+.claro .dijitBorderContainer-dijitAccordionContainer {
+  /* except that TabContainer defines borders on it's sub-nodes (tablist and dijitTabPaneWrapper),
+	 * so override rule setting border on domNode
+	 */
+
+  border: none;
+}
+.claro .dijitBorderContainer-dijitBorderContainer {
+  /* make nested BorderContainers look like a single big widget with lots of splitters */
+
+  border: 0;
+  padding: 0;
+}
+/* Splitters and gutters */
+.claro .dijitSplitterH,
+.claro .dijitGutterH {
+  background: none;
+  border: 0;
+  height: 5px;
+}
+.dj_ios .claro .dijitSplitterH,
+.dj_android .claro .dijitSplitterH {
+  height: 11px;
+}
+.claro .dijitSplitterH .dijitSplitterThumb {
+  background: #b5bcc7 none;
+  height: 1px;
+  top: 2px;
+  width: 19px;
+}
+.dj_ios .claro .dijitSplitterH .dijitSplitterThumb,
+.dj_android .claro .dijitSplitterH .dijitSplitterThumb {
+  top: 5px;
+}
+.claro .dijitSplitterV,
+.claro .dijitGutterV {
+  background: none;
+  border: 0;
+  width: 5px;
+  margin: 0;
+}
+.dj_ios .claro .dijitSplitterV,
+.dj_android .claro .dijitSplitterV {
+  width: 11px;
+}
+.claro .dijitSplitterV .dijitSplitterThumb {
+  background: #b5bcc7 none;
+  height: 19px;
+  left: 2px;
+  width: 1px;
+  margin: 0;
+}
+.dj_ios .claro .dijitSplitterV .dijitSplitterThumb,
+.dj_android .claro .dijitSplitterV .dijitSplitterThumb {
+  left: 5px;
+}
+/* hovered splitter */
+.claro .dijitSplitterHHover,
+.claro .dijitSplitterVHover {
+  font-size: 1px;
+  background-color: #cfe5fa;
+}
+.claro .dijitSplitterHHover {
+  background-image: -moz-linear-gradient(left, #ffffff 0px, rgba(255, 255, 255, 0) 50%, #ffffff 100%);
+  background-image: -webkit-linear-gradient(left, #ffffff 0px, rgba(255, 255, 255, 0) 50%, #ffffff 100%);
+  background-image: -o-linear-gradient(left, #ffffff 0px, rgba(255, 255, 255, 0) 50%, #ffffff 100%);
+  background-image: linear-gradient(left, #ffffff 0px, rgba(255, 255, 255, 0) 50%, #ffffff 100%);
+}
+.claro .dijitSplitterVHover {
+  background-image: -moz-linear-gradient(top, #ffffff 0px, rgba(255, 255, 255, 0) 50%, #ffffff 100%);
+  background-image: -webkit-linear-gradient(top, #ffffff 0px, rgba(255, 255, 255, 0) 50%, #ffffff 100%);
+  background-image: -o-linear-gradient(top, #ffffff 0px, rgba(255, 255, 255, 0) 50%, #ffffff 100%);
+  background-image: linear-gradient(top, #ffffff 0px, rgba(255, 255, 255, 0) 50%, #ffffff 100%);
+}
+.claro .dijitSplitterHHover .dijitSplitterThumb,
+.claro .dijitSplitterVHover .dijitSplitterThumb {
+  background: #759dc0 none;
+}
+/* active splitter */
+.claro .dijitSplitterHActive,
+.claro .dijitSplitterVActive {
+  font-size: 1px;
+  background-color: #abd6ff;
+  background-image: none;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/layout/BorderContainer.less b/src/main/resources/static/dijit/themes/claro/layout/BorderContainer.less
new file mode 100644
index 0000000000000000000000000000000000000000..194daf297731d4ba46fde447cfd480a3e8027796
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/BorderContainer.less
@@ -0,0 +1,135 @@
+/* BorderContainer 
+
+Splitters and gutters separate panes within a BorderContainer. Splitters can be moved up and down (horizonal splitters) or left and right (vertical splitters), while Gutters are static. A "thumb" is the slit on a Splitter that indicates it is movable. 
+
+Styling the BorderContainer widget consists of the following: 
+
+.dijitBorderContainer - for border and padding of the entire border container
+
+.dijitSplitContainer-child, .dijitBorderContainer-child - for border or child panes of the border container. By default borders are put on all children of BorderContainer.  
+
+.dijitBorderContainer-dijitTabContainerTop,
+.dijitBorderContainer-dijitTabContainerBottom,
+.dijitBorderContainer-dijitTabContainerLeft,
+.dijitBorderContainer-dijitTabContainerRight,
+.dijitBorderContainer-dijitAccordionContainer   -for border of the border containers within TabContainer or AccordionContainer widget
+
+.dijitBorderContainer-dijitBorderContainer - for border and padding of nested BorderContainers
+
+Splitters and gutters:  
+
+.dijitSplitterH, .dijitGutterH - for height, background, and border of a horizontal splitter and gutter 
+.dijitSplitterH .dijitSplitterThumb - for color, height/width of the thumb on a horizontal splitter
+.dijitSplitterV, .dijitGutterV - - for height, background, and border of a vertical splitter and gutter 
+.dijitSplitterV .dijitSplitterThumb - for color, height/width of the thumb on a vertical splitter
+.dijitSplitterHHover - for background-color of a hovered horizontal splitter
+.dijitSplitterHHover .dijitSplitterThumb - for background-color of a hovered thumb on a horizontal splitter
+.dijitSplitterVHover  - for background-color of a hovered vertical splitter
+.dijitSplitterVHover .dijitSplitterThumb - for background-color of a hovered thumb on a vertical splitter
+.dijitSplitterHActive - for background-color of an active horizontal splitter
+.dijitSplitterVActive - for background-color of an active horizontal splitter
+*/
+
+@import "../variables";
+
+.claro .dijitBorderContainer {
+	/* matches the width of the splitters between panes */
+	padding: 5px;
+}
+
+.claro .dijitSplitContainer-child,
+.claro .dijitBorderContainer-child {
+	/* By default put borders on all children of BorderContainer,
+	 *  to give illusion of borders on the splitters themselves.
+	 */
+	border: 1px @border-color solid;
+}
+
+.claro .dijitBorderContainer-dijitTabContainerTop,
+.claro .dijitBorderContainer-dijitTabContainerBottom,
+.claro .dijitBorderContainer-dijitTabContainerLeft,
+.claro .dijitBorderContainer-dijitTabContainerRight,
+.claro .dijitBorderContainer-dijitAccordionContainer {
+	/* except that TabContainer defines borders on it's sub-nodes (tablist and dijitTabPaneWrapper),
+	 * so override rule setting border on domNode
+	 */
+	 border: none;
+
+}
+.claro .dijitBorderContainer-dijitBorderContainer {
+	/* make nested BorderContainers look like a single big widget with lots of splitters */
+	border: 0;
+	padding: 0;
+}
+
+/* Splitters and gutters */
+
+.claro .dijitSplitterH,
+.claro .dijitGutterH {
+	background:none;
+	border:0;
+	height:5px;
+}
+.dj_ios .claro .dijitSplitterH, .dj_android .claro .dijitSplitterH {
+  height: 11px;
+}
+
+.claro .dijitSplitterH .dijitSplitterThumb {
+	background:@border-color none;
+	height:1px;
+	top:2px;
+	width:19px;
+}
+.dj_ios .claro .dijitSplitterH .dijitSplitterThumb, .dj_android .claro .dijitSplitterH .dijitSplitterThumb{
+  top:5px;
+}
+.claro .dijitSplitterV,
+.claro .dijitGutterV {
+	background:none;
+	border:0;
+	width:5px;
+	margin: 0;
+}
+.dj_ios .claro .dijitSplitterV, .dj_android .claro .dijitSplitterV {
+  width: 11px;
+}
+
+.claro .dijitSplitterV .dijitSplitterThumb {
+	background:@border-color none;
+	height:19px;
+	left:2px;
+	width:1px;
+	margin: 0;
+}
+.dj_ios .claro .dijitSplitterV .dijitSplitterThumb, .dj_android .claro .dijitSplitterV .dijitSplitterThumb{
+  left:5px;
+}
+
+/* hovered splitter */
+.claro .dijitSplitterHHover,
+.claro .dijitSplitterVHover {
+	font-size: 1px;
+	background-color: @splitter-hovered-background-color;
+}
+
+.claro .dijitSplitterHHover {
+	.alpha-white-gradient (left, 1,0px,  0,50%, 1,100%);
+}
+
+.claro .dijitSplitterVHover {
+	.alpha-white-gradient (top, 1,0px,  0,50%, 1,100%);
+}
+
+.claro .dijitSplitterHHover .dijitSplitterThumb,
+.claro .dijitSplitterVHover .dijitSplitterThumb {
+	background:@hovered-border-color none;
+}
+
+
+/* active splitter */
+.claro .dijitSplitterHActive,
+.claro .dijitSplitterVActive {
+	font-size: 1px;
+	background-color:@splitter-dragged-background-color;
+	background-image: none;		// color all the way across, not gradient like in hover mode
+}
diff --git a/src/main/resources/static/dijit/themes/claro/layout/ContentPane.css b/src/main/resources/static/dijit/themes/claro/layout/ContentPane.css
new file mode 100644
index 0000000000000000000000000000000000000000..7499a53d18ac71c101741a42f4a4c3beda598c95
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/ContentPane.css
@@ -0,0 +1,39 @@
+/* ContentPane 
+ *	
+ * .dijitContentPane
+ * 	set padding for basic content pane
+ * 	
+ * Nested layouts:
+ * 
+ * .dijitTabContainerTop-dijitContentPane,
+ * .dijitTabContainerLeft-dijitContentPane,
+ * .dijitTabContainerBottom-dijitContentPane,
+ * .dijitTabContainerRight-dijitContentPane
+ * 	set background-color and padding of ContentPanes nested within TabContainer (can do top, left, bottom, or right) or Accordion Container
+ *
+ * .dijitAccordionContainer-dijitContentPane
+ * 	set background-color and padding of ContentPane nested within Accordion
+ *
+ * .dijitSplitContainer-dijitContentPane, 
+ *	set background-color and padding of ContentPane nested within a SplitContainer 
+ *
+ * .dijitBorderContainer-dijitContentPane
+ *	set background-color and padding of ContentPane nested within a BorderContainer 
+ */
+.claro .dijitContentPane {
+  padding: 8px;
+}
+/* nested layouts */
+.claro .dijitTabContainerTop-dijitContentPane,
+.claro .dijitTabContainerLeft-dijitContentPane,
+.claro .dijitTabContainerBottom-dijitContentPane,
+.claro .dijitTabContainerRight-dijitContentPane,
+.claro .dijitAccordionContainer-dijitContentPane {
+  background-color: #ffffff;
+  padding: 8px;
+}
+.claro .dijitSplitContainer-dijitContentPane,
+.claro .dijitBorderContainer-dijitContentPane {
+  background-color: #ffffff;
+  padding: 8px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/layout/ContentPane.less b/src/main/resources/static/dijit/themes/claro/layout/ContentPane.less
new file mode 100644
index 0000000000000000000000000000000000000000..83329bdb7c9c243c93c992df1c09f9f326bc3a68
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/ContentPane.less
@@ -0,0 +1,43 @@
+/* ContentPane 
+ *	
+ * .dijitContentPane
+ * 	set padding for basic content pane
+ * 	
+ * Nested layouts:
+ * 
+ * .dijitTabContainerTop-dijitContentPane,
+ * .dijitTabContainerLeft-dijitContentPane,
+ * .dijitTabContainerBottom-dijitContentPane,
+ * .dijitTabContainerRight-dijitContentPane
+ * 	set background-color and padding of ContentPanes nested within TabContainer (can do top, left, bottom, or right) or Accordion Container
+ *
+ * .dijitAccordionContainer-dijitContentPane
+ * 	set background-color and padding of ContentPane nested within Accordion
+ *
+ * .dijitSplitContainer-dijitContentPane, 
+ *	set background-color and padding of ContentPane nested within a SplitContainer 
+ *
+ * .dijitBorderContainer-dijitContentPane
+ *	set background-color and padding of ContentPane nested within a BorderContainer 
+ */
+
+@import "../variables";
+
+.claro .dijitContentPane {
+	padding: 8px;
+}		
+
+/* nested layouts */
+.claro .dijitTabContainerTop-dijitContentPane,
+.claro .dijitTabContainerLeft-dijitContentPane,
+.claro .dijitTabContainerBottom-dijitContentPane,
+.claro .dijitTabContainerRight-dijitContentPane,
+.claro .dijitAccordionContainer-dijitContentPane {
+	background-color: @pane-background-color;
+	padding: 8px;		
+}
+.claro .dijitSplitContainer-dijitContentPane,
+.claro .dijitBorderContainer-dijitContentPane {
+	background-color: @pane-background-color;		
+	padding: 8px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/layout/TabContainer.css b/src/main/resources/static/dijit/themes/claro/layout/TabContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..50ac4ad681e7875834c9b0e27fff5f91b5c897ab
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/TabContainer.css
@@ -0,0 +1,398 @@
+/* TabContainer 
+ * 
+ * Styling TabContainer means styling the TabList and Its content container  (dijitTitlePane)
+ * 
+ * Tab List: (including 4 kinds of tab location)
+ * 		.dijitTabContainerTop-tabs     - tablist container at top
+ * 		.dijitTabContainerBottom-tabs  - tablist container at bottom
+ * 		.dijitTabContainerLeft-tabs    - tablist container at left
+ * 		.dijitTabContainerRight-tabs   - tablist container at right
+ * 
+ * Tab Strip Button:
+ * 		.dijitTabStripIcon - tab strip button icon
+ * 		.dijitTabStripMenuIcon - down arrow icon position
+ * 		.dijitTabStripSlideLeftIcon - left arrow icon position
+ * 		.dijitTabStripSlideRightIcon - right arrow icon position
+ * 
+ * 		.tabStripButtonDisabled - styles for disabled tab strip buttons
+ * 
+ * Tab Button:
+ * 		.dijitTabContainerTop-tabs .dijitTab     - styles for top tab button container
+ * 		.dijitTabContainerBottom-tabs .dijitTab  - styles for bottom tab button container
+ * 		.dijitTabContainerLeft-tabs .dijitTab    - styles for left tab button container
+ * 		.dijitTabContainerRight-tabs .dijitTab   - styles for right tab button container
+ * 
+ * 		.dijitTabContainerTop-tabs .dijitTabChecked .dijitTab
+ * 				- styles for selected status of top tab button
+ * 		same to Bottom, Left, Right Tabs
+ * 
+ * 		.dijitTabHover .dijitTab   - styles when mouse hover on tab buttons
+ * 		.dijitTabActive .dijitTab  - styles when mouse down on tab buttons
+ * 		.dijitTabChecked .dijitTab  - styles when on buttons of selected tab
+ * 
+ * 		.dijitTabCloseButton - the close action buttons lie at the right top of each tab button on closable tabs
+ * 		.dijitTabCloseButtonHover - styles when mouse hover on close action button
+ * 		.dijitTabCloseButtonActive - styles when mouse down on close action button
+ * 
+ * Tab Button: (checked status)
+ * 
+ * Tab Content Container:
+ * 		.dijitTabContainerTop-dijitContentPane
+ * 		.dijitTabContainerBottom-dijitContentPane
+ * 		.dijitTabContainerLeft-dijitContentPane
+ * 		.dijitTabContainerRight-dijitContentPane - for background and padding
+ * 
+ * Nested Tabs:
+ * 		.dijitTabContainerNested - Container for nested tabs
+ * 		.dijitTabContainerTabListNested - tab list container for nested tabs
+ */
+/*** some common features ***/
+.claro .dijitTabPaneWrapper {
+  background: #ffffff;
+}
+.claro .dijitTabPaneWrapper,
+.claro .dijitTabContainerTop-tabs,
+.claro .dijitTabContainerBottom-tabs,
+.claro .dijitTabContainerLeft-tabs,
+.claro .dijitTabContainerRight-tabs {
+  /* todo: add common class name for this div */
+
+  border-color: #b5bcc7;
+}
+.claro .dijitTabCloseButton {
+  background: url("../layout/images/tabClose.png") no-repeat;
+  width: 14px;
+  height: 14px;
+  margin-left: 5px;
+  margin-right: -5px;
+}
+.claro .dijitTabCloseButtonHover {
+  background-position: -14px;
+}
+.claro .dijitTabCloseButtonActive {
+  background-position: -28px;
+}
+.claro .dijitTabSpacer {
+  /* set the spacer invisible.  note that height:0 doesn't work on IE/quirks, it's still 10px. */
+
+  display: none;
+}
+.claro .dijitTab {
+  border: 1px solid #b5bcc7;
+  background-color: #efefef;
+  -webkit-transition-property: background-color, border;
+  -moz-transition-property: background-color, border;
+  transition-property: background-color, border;
+  -webkit-transition-duration: 0.35s;
+  -moz-transition-duration: 0.35s;
+  transition-duration: 0.35s;
+  color: #494949;
+}
+.claro .dijitTabHover {
+  border-color: #759dc0;
+  background-color: #abd6ff;
+  -webkit-transition-duration: 0.25s;
+  -moz-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+  color: #000000;
+}
+.claro .dijitTabActive {
+  border-color: #759dc0;
+  background-color: #7dbdfa;
+  color: #000000;
+  -webkit-transition-duration: 0.1s;
+  -moz-transition-duration: 0.1s;
+  transition-duration: 0.1s;
+}
+.claro .dijitTabChecked {
+  border-color: #b5bcc7;
+  background-color: #cfe5fa;
+  color: #000000;
+}
+.claro .dijitTabDisabled {
+  background-color: #d3d3d3;
+}
+.claro .tabStripButton {
+  background-color: transparent;
+  border: none;
+}
+/*** end common ***/
+/*************** top tab ***************/
+.claro .dijitTabContainerTop-tabs .dijitTab {
+  /* unselected (and not hovered/pressed) tab */
+
+  top: 1px;
+  /* used for overlap */
+
+  margin-right: 1px;
+  padding: 3px 6px;
+  border-bottom-width: 0;
+  min-width: 60px;
+  text-align: center;
+  background-image: url("images/tabTopUnselected.png");
+  background-repeat: repeat-x;
+  background-image: -moz-linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  -webkit-box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.04);
+  -moz-box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.04);
+}
+.claro .dijitTabContainerTop-tabs .dijitTabChecked {
+  /* selected tab */
+
+  padding-bottom: 4px;
+  padding-top: 9px;
+  background-image: url("images/tabTopSelected.png");
+  background-image: -moz-linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px, #ffffff 7px);
+  background-image: -webkit-linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px, #ffffff 7px);
+  background-image: -o-linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px, #ffffff 7px);
+  background-image: linear-gradient(top, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px, #ffffff 7px);
+  -webkit-box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.05);
+}
+/** end top tab **/
+/*************** bottom tab ***************/
+.claro .dijitTabContainerBottom-tabs .dijitTab {
+  /* unselected (and not hovered/pressed) tab */
+
+  top: -1px;
+  /* used for overlap */
+
+  margin-right: 1px;
+  padding: 3px 6px;
+  border-top-width: 0;
+  min-width: 60px;
+  text-align: center;
+  background-image: url("images/tabBottomUnselected.png");
+  background-repeat: repeat-x;
+  background-position: bottom;
+  background-image: -moz-linear-gradient(bottom, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(bottom, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(bottom, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(bottom, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
+  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
+}
+/* selected tab */
+.claro .dijitTabContainerBottom-tabs .dijitTabChecked {
+  padding-bottom: 9px;
+  padding-top: 4px;
+  background-image: url("images/tabBottomSelected.png");
+  background-image: -moz-linear-gradient(bottom, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px, #ffffff 7px);
+  background-image: -webkit-linear-gradient(bottom, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px, #ffffff 7px);
+  background-image: -o-linear-gradient(bottom, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px, #ffffff 7px);
+  background-image: linear-gradient(bottom, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0) 2px, #ffffff 7px);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+/** end bottom tab **/
+/*************** left tab ***************/
+.claro .dijitTabContainerLeft-tabs .dijitTab {
+  /* unselected (and not hovered/pressed) tab */
+
+  left: 1px;
+  /* used for overlap */
+
+  margin-bottom: 1px;
+  padding: 3px 8px 4px 4px;
+  background-image: url("images/tabLeftUnselected.png");
+  background-repeat: repeat-y;
+  background-image: -moz-linear-gradient(left, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(left, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(left, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(left, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+}
+/* selected tab */
+.claro .dijitTabContainerLeft-tabs .dijitTabChecked {
+  border-right-width: 0;
+  padding-right: 9px;
+  background-image: url("images/tabLeftSelected.png");
+  background-image: -moz-linear-gradient(left, rgba(255, 255, 255, 0.5) 0px, #ffffff 30px);
+  background-image: -webkit-linear-gradient(left, rgba(255, 255, 255, 0.5) 0px, #ffffff 30px);
+  background-image: -o-linear-gradient(left, rgba(255, 255, 255, 0.5) 0px, #ffffff 30px);
+  background-image: linear-gradient(left, rgba(255, 255, 255, 0.5) 0px, #ffffff 30px);
+  -webkit-box-shadow: -1px 0 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: -1px 0 2px rgba(0, 0, 0, 0.05);
+  box-shadow: -1px 0 2px rgba(0, 0, 0, 0.05);
+}
+/** end left tab **/
+/*************** right tab ***************/
+.claro .dijitTabContainerRight-tabs .dijitTab {
+  /* unselected (and not hovered/pressed) tab */
+
+  left: -1px;
+  /* used for overlap */
+
+  margin-bottom: 1px;
+  padding: 3px 8px 4px 4px;
+  background-image: url("images/tabRightUnselected.png");
+  background-repeat: repeat-y;
+  background-position: right;
+  background-image: -moz-linear-gradient(right, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(right, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(right, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(right, #ffffff 0px, #ffffff 1px, rgba(255, 255, 255, 0.1) 2px, rgba(255, 255, 255, 0.6) 7px, rgba(255, 255, 255, 0) 100%);
+}
+.claro .dijitTabContainerRight-tabs .dijitTabChecked {
+  /* selected tab */
+
+  padding-left: 5px;
+  border-left-width: 0;
+  background-image: url("images/tabRightSelected.png");
+  background-image: -moz-linear-gradient(right, rgba(255, 255, 255, 0.5) 0px, #ffffff 30px);
+  background-image: -webkit-linear-gradient(right, rgba(255, 255, 255, 0.5) 0px, #ffffff 30px);
+  background-image: -o-linear-gradient(right, rgba(255, 255, 255, 0.5) 0px, #ffffff 30px);
+  background-image: linear-gradient(right, rgba(255, 255, 255, 0.5) 0px, #ffffff 30px);
+  -webkit-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.07);
+  -moz-box-shadow: 1px 0 2px rgba(0, 0, 0, 0.07);
+  box-shadow: 1px 0 2px rgba(0, 0, 0, 0.07);
+}
+/** end right tab **/
+/** round corner **/
+.claro .dijitTabContainerTop-tabs .dijitTab {
+  -moz-border-radius: 2px 2px 0 0;
+  border-radius: 2px 2px 0 0;
+}
+.claro .dijitTabContainerBottom-tabs .dijitTab {
+  -moz-border-radius: 0 0 2px 2px;
+  border-radius: 0 0 2px 2px;
+}
+.claro .dijitTabContainerLeft-tabs .dijitTab {
+  -moz-border-radius: 2px 0 0 2px;
+  border-radius: 2px 0 0 2px;
+}
+.claro .dijitTabContainerRight-tabs .dijitTab {
+  -moz-border-radius: 0 2px 2px 0;
+  border-radius: 0 2px 2px 0;
+}
+/************ left/right scroll buttons + menu button ************/
+.claro .tabStripButton {
+  background-color: #e5f2fe;
+  border: 1px solid #b5bcc7;
+}
+.claro .dijitTabListContainer-top .tabStripButton {
+  padding: 4px 3px;
+  margin-top: 7px;
+  background-image: -moz-linear-gradient(top, #ffffff 0px, rgba(255, 255, 255, 0.1) 1px, rgba(255, 255, 255, 0.6) 6px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(top, #ffffff 0px, rgba(255, 255, 255, 0.1) 1px, rgba(255, 255, 255, 0.6) 6px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(top, #ffffff 0px, rgba(255, 255, 255, 0.1) 1px, rgba(255, 255, 255, 0.6) 6px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(top, #ffffff 0px, rgba(255, 255, 255, 0.1) 1px, rgba(255, 255, 255, 0.6) 6px, rgba(255, 255, 255, 0) 100%);
+}
+.claro .dijitTabListContainer-bottom .tabStripButton {
+  padding: 4px 3px;
+  margin-bottom: 7px;
+  background-image: -moz-linear-gradient(bottom, #ffffff 0px, rgba(255, 255, 255, 0.1) 1px, rgba(255, 255, 255, 0.6) 6px, rgba(255, 255, 255, 0) 100%);
+  background-image: -webkit-linear-gradient(bottom, #ffffff 0px, rgba(255, 255, 255, 0.1) 1px, rgba(255, 255, 255, 0.6) 6px, rgba(255, 255, 255, 0) 100%);
+  background-image: -o-linear-gradient(bottom, #ffffff 0px, rgba(255, 255, 255, 0.1) 1px, rgba(255, 255, 255, 0.6) 6px, rgba(255, 255, 255, 0) 100%);
+  background-image: linear-gradient(bottom, #ffffff 0px, rgba(255, 255, 255, 0.1) 1px, rgba(255, 255, 255, 0.6) 6px, rgba(255, 255, 255, 0) 100%);
+}
+.claro .tabStripButtonHover {
+  background-color: #abd6ff;
+}
+.claro .tabStripButtonActive {
+  background-color: #7dbdfa;
+}
+.claro .dijitTabStripIcon {
+  height: 15px;
+  width: 15px;
+  margin: 0 auto;
+  background: url("../form/images/buttonArrows.png") no-repeat -75px 50%;
+  background-color: transparent;
+}
+.claro .dijitTabStripSlideRightIcon {
+  background-position: -24px 50%;
+}
+.claro .dijitTabStripMenuIcon {
+  background-position: -51px 50%;
+}
+/*disabled styles for tab strip buttons*/
+.claro .dijitTabListContainer-top .tabStripButtonDisabled,
+.claro .dijitTabListContainer-bottom .tabStripButtonDisabled {
+  background-color: #d3d3d3;
+  border: 1px solid #b5bcc7;
+  /* to match border of TabContainer itself */
+
+}
+.claro .tabStripButtonDisabled .dijitTabStripSlideLeftIcon {
+  background-position: -175px 50%;
+}
+.claro .tabStripButtonDisabled .dijitTabStripSlideRightIcon {
+  background-position: -124px 50%;
+}
+.claro .tabStripButtonDisabled .dijitTabStripMenuIcon {
+  background-position: -151px 50%;
+}
+/* Nested Tabs */
+.claro .dijitTabContainerNested .dijitTabListWrapper {
+  height: auto;
+}
+.claro .dijitTabContainerNested .dijitTabContainerTop-tabs {
+  border-bottom: solid 1px #b5bcc7;
+  padding: 2px 2px 4px;
+}
+.claro .dijitTabContainerTabListNested .dijitTab {
+  background-color: rgba(255, 255, 255, 0);
+  border: none;
+  padding: 4px;
+  border-color: rgba(118, 157, 192, 0);
+  -webkit-transition-property: background-color, border-color;
+  -moz-transition-property: background-color, border-color;
+  transition-property: background-color, border-color;
+  -webkit-transition-duration: 0.3s;
+  -moz-transition-duration: 0.3s;
+  transition-duration: 0.3s;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  top: 0;
+  /* to override top: 1px/-1px for normal tabs */
+
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  background-image: url("images/tabNested.png") repeat-x;
+  background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.61) 0%, rgba(255, 255, 255, 0) 17%, rgba(255, 255, 255, 0) 83%, rgba(255, 255, 255, 0.61) 100%);
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.61) 0%, rgba(255, 255, 255, 0) 17%, rgba(255, 255, 255, 0) 83%, rgba(255, 255, 255, 0.61) 100%);
+  background-image: -o-linear-gradient(rgba(255, 255, 255, 0.61) 0%, rgba(255, 255, 255, 0) 17%, rgba(255, 255, 255, 0) 83%, rgba(255, 255, 255, 0.61) 100%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.61) 0%, rgba(255, 255, 255, 0) 17%, rgba(255, 255, 255, 0) 83%, rgba(255, 255, 255, 0.61) 100%);
+}
+.claro .dijitTabContainerTabListNested .dijitTabHover {
+  background-color: #e5f2fe;
+  border: solid 1px #cfe5fa;
+  padding: 3px;
+  -webkit-transition-duration: 0.2s;
+  -moz-transition-duration: 0.2s;
+  transition-duration: 0.2s;
+}
+.claro .dijitTabContainerTabListNested .dijitTabHover .tabLabel {
+  text-decoration: none;
+}
+.claro .dijitTabContainerTabListNested .dijitTabActive {
+  border: solid 1px #759dc0;
+  padding: 3px;
+  -webkit-transition-duration: 0.1s;
+  -moz-transition-duration: 0.1s;
+  transition-duration: 0.1s;
+}
+.claro .dijitTabContainerTabListNested .dijitTabChecked {
+  padding: 3px;
+  border: solid 1px #759dc0;
+  background-color: #cfe5fa;
+}
+.claro .dijitTabContainerTabListNested .dijitTabChecked .tabLabel {
+  text-decoration: none;
+  background-image: none;
+}
+.claro .dijitTabPaneWrapperNested {
+  border: none;
+  /* prevent double border */
+
+}
+.claro .dijitTabContainer .dijitTab,
+.claro .dijitTabContainer .tabStripButton {
+  _background-image: none;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/layout/TabContainer.less b/src/main/resources/static/dijit/themes/claro/layout/TabContainer.less
new file mode 100644
index 0000000000000000000000000000000000000000..daa067d9a69328b65bc29167142333690abdb83b
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/TabContainer.less
@@ -0,0 +1,360 @@
+/* TabContainer 
+ * 
+ * Styling TabContainer means styling the TabList and Its content container  (dijitTitlePane)
+ * 
+ * Tab List: (including 4 kinds of tab location)
+ * 		.dijitTabContainerTop-tabs     - tablist container at top
+ * 		.dijitTabContainerBottom-tabs  - tablist container at bottom
+ * 		.dijitTabContainerLeft-tabs    - tablist container at left
+ * 		.dijitTabContainerRight-tabs   - tablist container at right
+ * 
+ * Tab Strip Button:
+ * 		.dijitTabStripIcon - tab strip button icon
+ * 		.dijitTabStripMenuIcon - down arrow icon position
+ * 		.dijitTabStripSlideLeftIcon - left arrow icon position
+ * 		.dijitTabStripSlideRightIcon - right arrow icon position
+ * 
+ * 		.tabStripButtonDisabled - styles for disabled tab strip buttons
+ * 
+ * Tab Button:
+ * 		.dijitTabContainerTop-tabs .dijitTab     - styles for top tab button container
+ * 		.dijitTabContainerBottom-tabs .dijitTab  - styles for bottom tab button container
+ * 		.dijitTabContainerLeft-tabs .dijitTab    - styles for left tab button container
+ * 		.dijitTabContainerRight-tabs .dijitTab   - styles for right tab button container
+ * 
+ * 		.dijitTabContainerTop-tabs .dijitTabChecked .dijitTab
+ * 				- styles for selected status of top tab button
+ * 		same to Bottom, Left, Right Tabs
+ * 
+ * 		.dijitTabHover .dijitTab   - styles when mouse hover on tab buttons
+ * 		.dijitTabActive .dijitTab  - styles when mouse down on tab buttons
+ * 		.dijitTabChecked .dijitTab  - styles when on buttons of selected tab
+ * 
+ * 		.dijitTabCloseButton - the close action buttons lie at the right top of each tab button on closable tabs
+ * 		.dijitTabCloseButtonHover - styles when mouse hover on close action button
+ * 		.dijitTabCloseButtonActive - styles when mouse down on close action button
+ * 
+ * Tab Button: (checked status)
+ * 
+ * Tab Content Container:
+ * 		.dijitTabContainerTop-dijitContentPane
+ * 		.dijitTabContainerBottom-dijitContentPane
+ * 		.dijitTabContainerLeft-dijitContentPane
+ * 		.dijitTabContainerRight-dijitContentPane - for background and padding
+ * 
+ * Nested Tabs:
+ * 		.dijitTabContainerNested - Container for nested tabs
+ * 		.dijitTabContainerTabListNested - tab list container for nested tabs
+ */
+
+@import "../variables";
+
+.unselected-tab-gradient (@direction) {
+    // white line, dark line, then fade from light to dark
+	.alpha-white-gradient (@direction, 1,0px, 1,1px, 0.1,2px, 0.6,7px, 0,100%);
+}
+.topBottom-selected-tab-gradient (@direction) {
+	.alpha-white-gradient (@direction, 1,0px,  1,1px, 0,2px, 1,7px);	// white line, blue line, remainder white
+}
+/*** some common features ***/
+.claro .dijitTabPaneWrapper {
+	background:@pane-background-color;
+}
+.claro .dijitTabPaneWrapper,
+.claro .dijitTabContainerTop-tabs,
+.claro .dijitTabContainerBottom-tabs,
+.claro .dijitTabContainerLeft-tabs,
+.claro .dijitTabContainerRight-tabs {
+	/* todo: add common class name for this div */
+	border-color: @border-color;
+}
+.claro .dijitTabCloseButton {
+	background: url("../@{image-layout-tab-close}") no-repeat;
+	width: 14px;
+	height: 14px;
+	margin-left: 5px;
+	margin-right:-5px;
+}
+.claro .dijitTabCloseButtonHover {
+	background-position:-14px;
+}
+.claro .dijitTabCloseButtonActive {
+	background-position:-28px;
+}
+.claro .dijitTabSpacer {
+	/* set the spacer invisible.  note that height:0 doesn't work on IE/quirks, it's still 10px. */
+	display: none;
+}
+.claro .dijitTab {
+	border: 1px solid @border-color;
+	background-color:@unselected-background-color;
+	.transition-property(background-color, border);
+ 	.transition-duration(.35s);
+	color:@unselected-text-color;
+}
+.claro .dijitTabHover {
+	border-color: @hovered-border-color;
+	background-color:@hovered-background-color;
+ 	.transition-duration(.25s);
+	color:@hovered-text-color;
+}
+.claro .dijitTabActive {
+	border-color: @pressed-border-color;
+	background-color:@pressed-background-color;
+	color:@selected-text-color;
+	.transition-duration(.1s);
+}
+.claro .dijitTabChecked {
+    // selected tab
+	border-color: @border-color;			// don't use @selected-border-color because need to match border of TabContainer
+	background-color: @selected-background-color;
+	color: @selected-text-color;
+}
+.claro .dijitTabDisabled {
+	background-color: @tab-disabled-background-color;
+}
+
+.claro .tabStripButton {
+	background-color: transparent;
+	border: none;
+}
+/*** end common ***/
+
+
+/*************** top tab ***************/
+.claro .dijitTabContainerTop-tabs .dijitTab {
+    /* unselected (and not hovered/pressed) tab */
+	top: 1px;	/* used for overlap */
+	margin-right: 1px;
+	padding:3px 6px;
+	border-bottom-width: 0;
+	min-width: 60px;
+	text-align: center;
+
+	// gradient (CSS gradient, with backup image for IE6-9)
+	background-image: url("images/tabTopUnselected.png");
+	background-repeat: repeat-x;
+	.unselected-tab-gradient(top);
+
+ 	.box-shadow(0 -1px 1px rgba(0, 0, 0, 0.04));
+}
+
+.claro .dijitTabContainerTop-tabs .dijitTabChecked {
+	/* selected tab */
+	padding-bottom: 4px;
+	padding-top: 9px;
+
+	// gradient (CSS gradient, with backup image for IE6-9)
+	background-image: url("images/tabTopSelected.png");
+	.topBottom-selected-tab-gradient (top);
+
+	.box-shadow(0 -1px 2px rgba(0, 0, 0, 0.05));
+}
+
+/** end top tab **/
+
+
+/*************** bottom tab ***************/
+.claro .dijitTabContainerBottom-tabs .dijitTab {
+	/* unselected (and not hovered/pressed) tab */
+	top: -1px;	/* used for overlap */
+	margin-right: 1px;
+	padding:3px 6px;
+	border-top-width: 0;
+	min-width: 60px;
+	text-align: center;
+
+	// gradient (CSS gradient, with backup image for IE6-9)
+	background-image: url("images/tabBottomUnselected.png");
+	background-repeat: repeat-x;
+	background-position: bottom;
+	.unselected-tab-gradient(bottom);
+
+	.box-shadow(0 1px 1px rgba(0, 0, 0, 0.04));
+}
+
+/* selected tab */
+.claro .dijitTabContainerBottom-tabs .dijitTabChecked {
+	padding-bottom: 9px;
+	padding-top: 4px;
+
+	// gradient (CSS gradient, with backup image for IE6-9)
+	background-image: url("images/tabBottomSelected.png");
+	.topBottom-selected-tab-gradient (bottom);
+
+	.box-shadow(0 1px 2px rgba(0, 0, 0, 0.05));
+}
+/** end bottom tab **/
+
+/*************** left tab ***************/
+.claro .dijitTabContainerLeft-tabs .dijitTab {
+	/* unselected (and not hovered/pressed) tab */
+	left: 1px;	/* used for overlap */
+	margin-bottom: 1px;
+	padding:3px 8px 4px 4px;
+
+	// gradient (CSS gradient, with backup image for IE6-9)
+	background-image: url("images/tabLeftUnselected.png");
+	background-repeat: repeat-y;
+	.unselected-tab-gradient(left);
+}
+
+/* selected tab */
+.claro .dijitTabContainerLeft-tabs .dijitTabChecked {
+	border-right-width: 0;
+	padding-right: 9px;
+
+	// gradient (CSS gradient, with backup image for IE6-9)
+	background-image: url("images/tabLeftSelected.png");
+	.alpha-white-gradient (left, 0.5,0px, 1,30px);  // 1/2 inch blue gradient, remainder white
+
+	.box-shadow(-1px 0 2px rgba(0, 0, 0, .05));
+}
+/** end left tab **/
+
+/*************** right tab ***************/
+.claro .dijitTabContainerRight-tabs .dijitTab {
+	/* unselected (and not hovered/pressed) tab */
+	left: -1px;	/* used for overlap */
+	margin-bottom: 1px;
+	padding:3px 8px 4px 4px;
+
+	// gradient (CSS gradient, with backup image for IE6-9)
+	background-image: url("images/tabRightUnselected.png");
+	background-repeat: repeat-y;
+	background-position: right;
+	.unselected-tab-gradient(right);
+}
+.claro .dijitTabContainerRight-tabs .dijitTabChecked {
+	/* selected tab */
+	padding-left: 5px;
+	border-left-width: 0;
+
+	// gradient (CSS gradient, with backup image for IE6-9)
+	background-image: url("images/tabRightSelected.png");
+	.alpha-white-gradient (right, 0.5,0px, 1,30px);	// 1/2 inch blue gradient, remainder white
+
+	.box-shadow(1px 0 2px rgba(0, 0, 0, 0.07));
+}
+/** end right tab **/
+
+/** round corner **/
+.claro .dijitTabContainerTop-tabs .dijitTab {
+	.border-radius(2px 2px 0 0);
+}
+.claro .dijitTabContainerBottom-tabs .dijitTab {
+	.border-radius(0 0 2px 2px);
+}
+.claro .dijitTabContainerLeft-tabs .dijitTab {
+	.border-radius(2px 0 0 2px);
+}
+
+.claro .dijitTabContainerRight-tabs .dijitTab {
+	.border-radius(0 2px 2px 0);
+}
+
+/************ left/right scroll buttons + menu button ************/
+.claro .tabStripButton {
+	background-color:@button-background-color;
+	border: 1px solid @border-color;
+}
+.claro .dijitTabListContainer-top .tabStripButton {
+	padding: 4px 3px;
+	margin-top:7px;
+	.alpha-white-gradient (top, 1,0px, 0.1,1px, 0.6,6px, 0,100%);	// to match unselected tab, but had to tweak numbers
+}
+.claro .dijitTabListContainer-bottom .tabStripButton {
+	padding:4px 3px;
+	margin-bottom:7px;
+	.alpha-white-gradient (bottom, 1,0px, 0.1,1px, 0.6,6px, 0,100%);	// to match unselected tab, but had to tweak numbers
+}
+.claro .tabStripButtonHover {
+	background-color:@hovered-background-color;
+}
+.claro .tabStripButtonActive {
+	background-color:@pressed-background-color;
+}
+.claro .dijitTabStripIcon {
+	height:15px;
+	width:15px;
+	margin: 0 auto;
+	background:url("../@{image-form-button-arrows}") no-repeat -75px 50%;
+	background-color: transparent;
+}
+.claro .dijitTabStripSlideRightIcon{
+	background-position: -24px 50%;
+}
+.claro .dijitTabStripMenuIcon {
+	background-position: -51px 50%;
+}
+
+/*disabled styles for tab strip buttons*/
+.claro .dijitTabListContainer-top .tabStripButtonDisabled,
+.claro .dijitTabListContainer-bottom .tabStripButtonDisabled {
+	background-color:@tab-disabled-background-color;
+	border:1px solid @border-color;	/* to match border of TabContainer itself */
+}
+.claro .tabStripButtonDisabled .dijitTabStripSlideLeftIcon {
+	background-position:-175px 50%;
+}
+.claro .tabStripButtonDisabled .dijitTabStripSlideRightIcon {
+	background-position: -124px 50%;
+}
+.claro .tabStripButtonDisabled .dijitTabStripMenuIcon {
+	background-position: -151px 50%;
+} 
+/* Nested Tabs */
+.claro .dijitTabContainerNested .dijitTabListWrapper {
+	height: auto;
+}
+.claro .dijitTabContainerNested .dijitTabContainerTop-tabs {
+	border-bottom:solid 1px @border-color;
+	padding:2px 2px 4px;
+}
+.claro .dijitTabContainerTabListNested .dijitTab {
+	background-color:rgba(255, 255, 255, 0);
+	border: none;
+	padding: 4px;
+	border-color: rgba(118,157,192,0);
+	.transition-property(background-color, border-color);
+ 	.transition-duration(.3s);
+	.border-radius(2px);
+	top: 0;/* to override top: 1px/-1px for normal tabs */
+	.box-shadow(none);
+
+	// CSS gradient with fallback to image for IE
+	background-image: url("images/tabNested.png") repeat-x;
+	.alpha-white-gradient (0.61,0%, 0,17%, 0,83%, 0.61,100%);
+}
+.claro .dijitTabContainerTabListNested .dijitTabHover {
+	background-color: @nestedtab-hovered-background-color;
+	border:solid 1px @nestedtab-hovered-border-color;
+	padding: 3px;	// 4px above padding - 1px compensation for border
+	.transition-duration(.2s);
+}
+.claro .dijitTabContainerTabListNested .dijitTabHover .tabLabel {
+	text-decoration: none;
+}
+.claro .dijitTabContainerTabListNested .dijitTabActive {
+	border:solid 1px @nestedtab-selected-border-color;
+	padding: 3px;
+	.transition-duration(.1s);
+}
+.claro .dijitTabContainerTabListNested .dijitTabChecked {
+	padding: 3px;
+	border:solid 1px @selected-border-color;
+	background-color:@selected-background-color;
+}
+.claro .dijitTabContainerTabListNested .dijitTabChecked .tabLabel {
+	text-decoration: none;
+	background-image:none;
+}
+.claro .dijitTabPaneWrapperNested {
+	border: none;/* prevent double border */
+}
+
+.claro .dijitTabContainer .dijitTab,
+.claro .dijitTabContainer .tabStripButton {
+    // IE6 can't handle background-image and background-color on same node
+	_background-image: none;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/layout/TabContainer_rtl.css b/src/main/resources/static/dijit/themes/claro/layout/TabContainer_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..130dc13c8e0b49e2a14be92a62e445be0fb99390
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/TabContainer_rtl.css
@@ -0,0 +1,5 @@
+.claro .dijitTabContainerTop-tabs .dijitTabRtl,
+.claro .dijitTabContainerBottom-tabs .dijitTabRtl {
+  margin-right: 0;
+  margin-left: 1px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/layout/TabContainer_rtl.less b/src/main/resources/static/dijit/themes/claro/layout/TabContainer_rtl.less
new file mode 100644
index 0000000000000000000000000000000000000000..c6cec49fdf6800bfe2c12abf14080443c64479d6
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/TabContainer_rtl.less
@@ -0,0 +1,7 @@
+@import "../variables";
+
+.claro .dijitTabContainerTop-tabs .dijitTabRtl,
+.claro .dijitTabContainerBottom-tabs .dijitTabRtl {
+	margin-right: 0;
+	margin-left: 1px;
+}
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomSelected.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomSelected.png
new file mode 100644
index 0000000000000000000000000000000000000000..f92b05f45175ec4ad5467ee880c99885e6357d17
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomSelected.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomSelected.svg b/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomSelected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4e6ff6d430bb620f13e4d6ec81294312889a53c7
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomSelected.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for tabBottomSelected.png, which is used by IE7-9 for selected tabs.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from .topBottom-selected-tab-gradient() from TabContainer.less.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="1px" height="250px" viewBox="0 0 1 250" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="0%" y1="0%" x2="0%" y2="100%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="0"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="1" height="242" fill="white"/>
+	<rect x="0" y="242" width="1" height="6" fill="url(#gradient)"/>
+	<rect x="0" y="248" width="1" height="2" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomUnselected.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomUnselected.png
new file mode 100644
index 0000000000000000000000000000000000000000..7815d9cfb6995e24d16a65cc2cf81c7c53136966
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomUnselected.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomUnselected.svg b/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomUnselected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4193238e80276a61d146cc910839e1266c8229c6
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/images/tabBottomUnselected.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for tabBottomUnselected.png, which is used by IE7-9 for the selected tabs.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from TabContainer.less.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="1px" height="16px" viewBox="0 0 1 16" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="0%" y1="100%" x2="0%" y2="0%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
+			<stop offset="6%" stop-color="#ffffff" stop-opacity="1"/>
+			<stop offset="13%" stop-color="#ffffff" stop-opacity="0.2"/>
+			<stop offset="43%" stop-color="#ffffff" stop-opacity="0.6"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="0"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="1" height="16" fill="url(#gradient)"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabClose.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabClose.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3b23639381f2808499778b66b86f728a64c7f5e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabClose.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftSelected.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftSelected.png
new file mode 100644
index 0000000000000000000000000000000000000000..9700afb3783708688a6cb82d64631579dc0271de
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftSelected.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftSelected.svg b/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftSelected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..12e7d8a64ddf0c2e784b732855e6ceacd3a92814
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftSelected.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for tabLeftSelected.png, which is used by IE7-9 for selected tabs.
+	Compile to png with batik, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from TabContainer.less.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="1000px" height="1px" viewBox="0 0 1000 1" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="0%" y1="0%" x2="100%" y2="0%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="0.5"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="1"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="30" height="1" fill="url(#gradient)"/>
+	<rect x="30" y="0" width="970" height="1" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftUnselected.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftUnselected.png
new file mode 100644
index 0000000000000000000000000000000000000000..412390e08ef051fc95ba65bc0671c2c229c99047
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftUnselected.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftUnselected.svg b/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftUnselected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e31c211b715c3641117e025c5f4c8dfd2824be37
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/images/tabLeftUnselected.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for tabLeftUnselected.png, which is used by IE7-9 for the selected tabs.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from TabContainer.less.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="150px" height="1px" viewBox="0 0 100 1" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="0%" y1="0%" x2="100%" y2="0%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="0.5"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="0"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="150" height="1" fill="url(#gradient)"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabNested.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabNested.png
new file mode 100644
index 0000000000000000000000000000000000000000..0140cf45b47b057b7e0c20735afea2385a0d0166
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabNested.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabRightSelected.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabRightSelected.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a2843499317cef81459b655e3ecdc196dd64729
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabRightSelected.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabRightSelected.svg b/src/main/resources/static/dijit/themes/claro/layout/images/tabRightSelected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d8d3d674a3b67b9e70ad47c836880808feab84b5
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/images/tabRightSelected.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for tabRightSelected.png, which is used by IE7-9 for selected tabs.
+	Compile to png with batik, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from TabContainer.less.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="1000px" height="1px" viewBox="0 0 1000 1" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="100%" y1="0%" x2="0%" y2="0%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="0.5"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="1"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="970" height="1" fill="white"/>
+	<rect x="970" y="0" width="30" height="1" fill="url(#gradient)"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabRightUnselected.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabRightUnselected.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bdd00e4d9490bf4b4f28875448263609d969f7c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabRightUnselected.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabRightUnselected.svg b/src/main/resources/static/dijit/themes/claro/layout/images/tabRightUnselected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d1379a7179aa1319f84454e2509b8c4f8938ecd7
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/images/tabRightUnselected.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for tabRightUnselected.png, which is used by IE7-9 for the selected tabs.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from TabContainer.less.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="150px" height="1px" viewBox="0 0 100 1" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="100%" y1="0%" x2="0%" y2="0%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="0.5"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="0"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="150" height="1" fill="url(#gradient)"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabTopSelected.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabTopSelected.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4d57725814ce6e9468f030e48c6a093fcab1791
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabTopSelected.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabTopSelected.svg b/src/main/resources/static/dijit/themes/claro/layout/images/tabTopSelected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d06e646ea16dba5156039c7b45a43fa72daaba37
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/images/tabTopSelected.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for tabTopSelected.png, which is used by IE7-9 for the selected tabs.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from .topBottom-selected-tab-gradient() from TabContainer.less.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="1px" height="250px" viewBox="0 0 1 250" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="0%" y1="0%" x2="0%" y2="100%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="0"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="1"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="1" height="2" fill="white"/>
+	<rect x="0" y="2" width="1" height="6" fill="url(#gradient)"/>
+	<rect x="0" y="8" width="1" height="242" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabTopUnselected.png b/src/main/resources/static/dijit/themes/claro/layout/images/tabTopUnselected.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c34545f52a67c6453f50f01ce8d43b5df9c04e3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/claro/layout/images/tabTopUnselected.png differ
diff --git a/src/main/resources/static/dijit/themes/claro/layout/images/tabTopUnselected.svg b/src/main/resources/static/dijit/themes/claro/layout/images/tabTopUnselected.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c55e92532d529f34e2a9ce461995b02ad3e31ec2
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/layout/images/tabTopUnselected.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<!--
+	Source file for tabTopUnSelected.png, which is used by IE7-9 for the selected tabs.
+	Compile to png with batik, gimp, or online tool ex: http://www.fileformat.info/convert/image/svg2raster.htm
+
+	Output should match CSS gradient from TabContainer.less.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" width="1px" height="16px" viewBox="0 0 1 16" preserveAspectRatio="none">
+	<defs>
+		<linearGradient id="gradient" gradientUnits="objectBoundingBox" x1="0%" y1="0%" x2="0%" y2="100%">
+			<stop offset="0%" stop-color="#ffffff" stop-opacity="1"/>
+			<stop offset="6%" stop-color="#ffffff" stop-opacity="1"/>
+			<stop offset="13%" stop-color="#ffffff" stop-opacity="0.2"/>
+			<stop offset="43%" stop-color="#ffffff" stop-opacity="0.6"/>
+			<stop offset="100%" stop-color="#ffffff" stop-opacity="0"/>
+		</linearGradient>
+	</defs>
+	<rect x="0" y="0" width="1" height="16" fill="url(#gradient)"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/claro/variables.less b/src/main/resources/static/dijit/themes/claro/variables.less
new file mode 100644
index 0000000000000000000000000000000000000000..bdc8bf68f7ad8761e6f8356430d0ba072bb9efc2
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/claro/variables.less
@@ -0,0 +1,379 @@
+// General
+
+@primary-color: #cfe5fa;													// Base color for entire theme
+@secondary-color: #efefef;												// Base color for bar-backgrounds
+@text-color: #000;													// Text color for enabled widgets
+@disabled-color: #d3d3d3;												// Base for disabled backgrounds and borders
+@error-color: #d46464;
+
+@container-background-color:#fff;										// Backgrounds for various content areas such as TitlePane, ContentPane and Inputs (if changed, adjust selected tab to match)
+
+@minor-selected-color: spin(saturate(darken(@primary-color, 6), 19), 0);						// Color for various arrows and buttons
+@base-border-color: spin(desaturate(darken(@primary-color, 29), 44), -1);		// Augmented and used directly by variables to create border colors for various widgets
+@unfocused-clickable-color: spin(saturate(lighten(@primary-color, 5), 10), 0);				// Background color for enabled buttons, text inputs
+@border-color: spin(desaturate(darken(@primary-color, 15), 67), 8);						// Border color for (enabled, unhovered) TextBox, Slider, Accordion, BorderContainer, TabContainer
+@minor-border-color: @disabled-color;									// Color of borders inside widgets: horizontal line in Calendar between weeks, around color swatches in ColorPalette, above Dialog action bar
+@popup-border-color: @base-border-color;								// Border for Dialog, Menu, Tooltip.   Must also update tooltip.png (the arrow image file) to match
+
+
+@disabled-border-color: @disabled-color;								// Border color for disabled/readonly Button, TextBox etc. widgets
+@disabled-background-color: @secondary-color;							// Disabled button, textbox, etc.
+@disabled-text-color: darken(@secondary-color, 43);											// Text color for disabled/readonly widgets
+
+@unselected-background-color: @secondary-color;							// Background color for unselected/unopened tab button, accordion pane, TitlePane, Menu items
+@unselected-text-color: darken(@secondary-color, 65);										// Text color for unselected/unopened tab button, accordion pane, TitlePane, Menu items
+
+@hovered-border-color: @base-border-color;								// Hover of textbox, tab label, BorderContainer splitter, Calendar, etc.
+@hovered-background-color: @minor-selected-color;	// Background color for hover of Button, MenuBar, Accordion pane, Calendar... anything that has a (non-white) color to start with and gets darker on hover
+@hovered-text-color: @text-color;										// Used for title of select Accordion pane, label of select tab, hovered Menu item, etc.
+
+@pressed-border-color:  @base-border-color;								// During click on Calendar day, Slider up/down buttons, tab button, etc.
+@pressed-background-color: spin(saturate(darken(@primary-color, 16), 12), 0);					// Background color while clicking on Accordion/TitlePane title bar, tab button, Calendar day, Toolbar button, Tree row.
+
+@selected-border-color: @base-border-color;  							// Selected AccordionPane, tab of nested TabContainer (but plain TabContainer is special)
+@selected-background-color: @primary-color;								// Selected Accordion pane, nested tab label, Tree row
+@selected-text-color: @text-color;										// title of selected Accordion pane, label of selected tab, hovered Menu item, etc.
+
+@bar-background-color: @secondary-color;								// MenuBar, Toolbar, action bar at bottom of dialog
+@pane-background-color: @container-background-color;					// Background color of Accordion panes, Dialogs, etc.
+@popup-background-color: @container-background-color;					// Background for Dialog.   TODO: currently use for ColorPalette, maybe should change.
+
+
+
+// Buttons
+@button-border-color:  @base-border-color;								// Border for (stand-alone) buttons in normal, hovered, or active state
+@button-background-color: @unfocused-clickable-color;					// Background color for (unhovered) buttons
+@button-hovered-background-color: @minor-selected-color;	// Background color for hovered buttons
+@button-pressed-background-color: @minor-selected-color;				// Background color for active buttons
+@button-border-radius: 4px;												// Rounded corner radius for buttons (except in toolbar)
+
+// Input widgets
+@focused-border-color: @base-border-color;								// Focused textbox, editor, select, etc.
+@error-border-color: @error-color;											// Border for textbox in error state
+@error-focused-border-color: darken(@error-color, 5);									// Border of textbox in error state, and focused
+@erroricon-background-color: @error-color;									// Background color for exclamation point validation icon (for TextBox in error state)
+@textbox-background-color: @container-background-color;					// Default background color of TextBox based widgets
+@textbox-hovered-background-color: @unfocused-clickable-color;			// Background color when hovering a unfocused TextBox, Select, Editor, or other input widget
+@textbox-focused-background-color: @textbox-background-color;
+@textbox-error-background-color: @textbox-background-color;
+@textbox-disabled-background-color: @disabled-background-color;
+
+@textbox-padding: 2px;	// Padding for Textbox, Textarea, etc.
+
+// CheckBox, RadioButton
+@focus-outline-color: darken(@secondary-color, 65);											// Color for artificial focus outline around labels of checkboxes
+
+// TabContainer
+@nestedtab-hovered-background-color: @unfocused-clickable-color;
+@nestedtab-hovered-border-color: @primary-color;
+@nestedtab-selected-border-color: @selected-border-color;
+@nestedtab-selected-background-color: @minor-selected-color;
+@tab-disabled-background-color: @disabled-color;						// For disabled tabs of a TabContainer (not officially supported)
+
+// Arrow buttons (stand alone, or inside ComboBox / ComboButton / Spinner / etc.
+@arrowbutton-background-color: @secondary-color;
+@arrowbutton-hovered-background-color: @minor-selected-color;			// Color of arrow when hovering ComboBox.   But hovering Spinner doesn't change arrow color (TODO)
+@arrowbutton-pressed-background-color: @minor-selected-color;
+@arrowbutton-inner-border-color: @container-background-color;									// Typically the arrows have an inner white border (a.k.a. padding) and then an outer black-ish border
+
+// Slider
+// Note: any changes here require corresponding changes in form/images/sliderThumbs.png
+@slider-fullbar-background-color: @primary-color;							// Background color for part of slider bar before (to the left or below) the handle
+@slider-remainingbar-background-color: @container-background-color;			// Background color for part of slider bar after (to the right or above) the handle
+@slider-hovered-fullbar-background-color: @minor-selected-color;			// Background color for part of bar of hovered slider before (to the left or below) the handle
+@slider-hovered-remainingbar-background-color: @container-background-color;	// Background color for part of bar of hovered slider after (to the right or above) the handle
+@slider-hoveredButton-background-color: @container-background-color;		// Background color of slider increment/decrement buttons when mouse is over slider but not over the buttons
+@slider-focused-fullbar-background-color: @minor-selected-color;			// Background color for part of bar of focused slider before (to the left or below) the handle
+@slider-focused-remainingbar-background-color: @container-background-color;	// Background color for part of bar of focused slider after (to the right or above) the handle
+@slider-button-hovered-background-color: @primary-color;					// Background color of slider increment/decrement buttons when mouse is over the buttons
+@slider-button-pressed-background-color: @minor-selected-color;				// Background color of slider increment/decrement buttons while button is depressed
+
+// Select, ComboBox
+@select-dropdownitem-background-color: @container-background-color;			// Background color for items in the drop down list of a ComboBox/Select
+@select-dropdownitem-hovered-background-color: @pressed-background-color;	// Background color for the hovered item in the drop down list of a ComboBox/Select
+@select-matchedtext-background-color: @minor-selected-color;				// Background color of text in ComboBox drop down that matches typed in phrase
+
+// Menus
+@menu-background-color: @popup-background-color;
+
+// Calendar
+@calendar-background-color: @primary-color;
+@calendar-currentmonth-background-color: @container-background-color;		// Background color for days of the current month
+@calendar-adjacentmonth-background-color: @unfocused-clickable-color;		// Background color used for days from previous or next month
+@calendar-adjacentmonth-text-color: @base-border-color;						// Text color used for days from previous or next month
+@calendar-date-pressed-border-color: @container-background-color;			// For some reason pressing a day of the month (as opposed to hovering it) makes the border go away, is this intentional?
+@calendar-date-pressed-background-color: @pressed-background-color;
+@calendar-date-selected-border-color: @selected-border-color;
+@calendar-date-selected-background-color: @minor-selected-color;
+@calendar-button-hovered-background-color: @unfocused-clickable-color;		// for hover or next/previous year, and month drop down (TODO: border and background are built in to calendarArrows.png, can't control from here)
+@calendar-button-hovered-border-color: @container-background-color;			// for hover or next/previous year, and month drop down
+@calendar-button-pressed-background-color: @pressed-background-color;
+@calendar-button-pressed-border-color: @pressed-border-color;
+
+
+// ProgressBar
+@progressbar-border-color: @popup-border-color;								// Border color of progress bar
+@progressbar-full-background-color:@minor-selected-color;					// Background color for part of progress bar indicating amount completed
+@progressbar-empty-background-color: @container-background-color;			// Background color for part of progress bar indicating amount remaining
+@progressbar-text-color: @text-color;										// Color of progress bar text (ex: "35%").  Must contrast with both empty and full background colors.
+
+// TimePicker
+@timepicker-minorvalue-background-color: @secondary-color;	// For 3:15, 3:30, 3:45 but not 3:00 or 4:00
+@timepicker-minorvalue-text-color: darken(@secondary-color, 43);
+@timepicker-majorvalue-background-color: @unfocused-clickable-color;	// For 3:00, 4:00, 5:00, etc.
+@timepicker-value-hovered-background-color: @pressed-background-color;
+@timepicker-value-hovered-text-color: @hovered-text-color;
+@timepicker-arrow-hovered-background-color: @minor-selected-color;
+
+// ColorPalette
+@colorpalette-background-color: @container-background-color;
+@swatch-border-color: @minor-border-color;
+@swatch-hovered-border-color: #000;
+@swatch-selected-border-color: #000;
+
+// Dialog
+@dialog-underlay-color: @container-background-color;			// the thing that grays out the screen when a dialog is shown
+@dialog-titlebar-border-color: @container-background-color;	// Inner border around the title sectionof a Dialog, inside the main border of the Dialog and the border between title and content
+@dialog-titlebar-background-color: @minor-selected-color;
+
+// Tooltip
+@tooltip-gradient-color: fade(@primary-color,10%);		// a little swath of color at the bottom of tooltips
+
+// BorderContainer
+@splitter-hovered-background-color: @primary-color;	// Color of splitter when user hovers it, before mouse down
+@splitter-dragged-background-color: @minor-selected-color;	// Color of splitter while it's being dragged
+
+// Toolbar
+@toolbar-button-checked-background-color: @container-background-color;								// a toggled-on button in the toolbar
+@toolbar-combobutton-hovered-unhoveredsection-background-color: spin(saturate(lighten(@primary-color, 8), 19), -29);	// when user hovers a ComboButton in a Toolbar, the other half of the button turns this color
+@toolbar-button-border-radius: 2px;			// Rounded corner radius for buttons for buttons in toolbar
+
+// DnD
+@dnd-avatar-background-color: @container-background-color;					// Background color of little Dialog-type box indicating dragged items
+@dnd-avatar-header-background-color: #f58383;		// Title bar for dragged items
+@dnd-avatar-candrop-header-background-color: #97e68d;// Title bar for dragged items when they can be dropped
+@dnd-dropseparator-color: @base-border-color;					// Color of line indicating that user is about to drop between items A & B
+
+// Document level
+@document-text-color: #131313;								// Text color for document itself (text outside of widgets)
+@document-shadedsection-background-color: @bar-background-color;// background color used for <pre>, <code>, and table header rows
+@document-border-color: @disabled-color;								// Border for <pre>, <code>, tables, etc.
+
+// Icons, arrows, etc.
+@image-arrow-sprite: "images/spriteArrows.png";
+@image-calendar-arrows: "images/calendarArrows.png";
+@image-calendar-arrows-ie6: "images/calendarArrows8bit.png";
+@image-checkmark: "images/checkmarkNoBorder.png";
+@image-checkmark-ie6: "images/checkmarkNoBorder.gif";
+@image-dialog-close: "images/dialogCloseIcon.png";
+@image-dialog-close-ie6: "images/dialogCloseIcon8bit.png";
+@image-dnd: "images/dnd.png";
+@image-editor-icons-enabled: "../../icons/images/editorIconsEnabled.png";
+@image-form-button-arrows: "form/images/buttonArrows.png";
+@image-form-checkbox-and-radios: "form/images/checkboxRadioButtonStates.png";
+@image-form-checkbox-and-radios-ie6: "form/images/checkboxAndRadioButtons_IE6.png";
+@image-form-common-arrows: "form/images/commonFormArrows.png";
+@image-form-error: "form/images/error.png";
+@image-form-slider-thumbs: "form/images/sliderThumbs.png";
+@image-layout-tab-close: "layout/images/tabClose.png";	// [x] icon to close a tab
+@image-loading-animation: "../../icons/images/loadingAnimation.gif";
+@image-loading-animation-rtl: "../../icons/images/loadingAnimation_rtl.gif";
+@image-tooltip: "images/tooltip.png";	// arrow connectors
+@image-tooltip-ie6: "images/tooltip8bit.png";	// arrow connectors (8 bit)
+@image-tree-expand: "images/treeExpandImages.png";
+@image-tree-expand-ie6: "images/treeExpandImages8bit.png";
+@image-progressbar-anim: "images/progressBarAnim.gif";
+
+// Mixins
+
+.border-radius (@radius) {
+	-moz-border-radius: @radius;
+	border-radius: @radius;
+}
+
+.box-shadow (@value) {
+	-webkit-box-shadow: @value;
+	-moz-box-shadow: @value;
+	box-shadow: @value;
+}
+
+.transition-property (@value) {
+	-webkit-transition-property: @value;
+	-moz-transition-property: @value;
+	transition-property: @value;
+}
+
+.transition-property (@value1, @value2) {
+	-webkit-transition-property: @value1, @value2;
+	-moz-transition-property: @value1, @value2;
+	transition-property: @value1, @value2;
+}
+
+.transition-duration (@value) {
+	-webkit-transition-duration: @value;
+	-moz-transition-duration: @value;
+	transition-duration: @value;
+}
+
+.transition-duration (@value1, @value2) {
+	-webkit-transition-duration: @value1, @value2;
+	-moz-transition-duration: @value1, @value2;
+	transition-duration: @value1, @value2;
+}
+
+.transition-timing-function (@value) {
+	-webkit-transition-timing-function: @value;
+	-moz-transition-timing-function: @value;
+	transition-timing-function: @value;
+}
+
+.linear-gradient (@value1, @value2) {
+	// summary:
+	//		Expands to browser specific background-image specifications for a linear-gradient (2 stops)
+ 	background-image: -moz-linear-gradient(@value1, @value2); // FF3.6 - FF15 (FF16+ supports linear-gradient)
+ 	background-image: -webkit-linear-gradient(@value1, @value2); // Chrome10+, Safari5.1+
+ 	background-image: -o-linear-gradient(@value1, @value2); // Opera 11.10+
+ 	background-image: linear-gradient(@value1, @value2);
+}
+.linear-gradient (@value1, @value2, @value3) {
+ 	background-image: -moz-linear-gradient(@value1, @value2, @value3); // FF3.6 - FF15 (FF16+ supports linear-gradient)
+ 	background-image: -webkit-linear-gradient(@value1, @value2, @value3); // Chrome10+, Safari5.1+
+ 	background-image: -o-linear-gradient(@value1, @value2, @value3); // Opera 11.10+
+ 	background-image: linear-gradient(@value1, @value2, @value3);
+}
+.linear-gradient (@value1, @value2, @value3, @value4) {
+ 	background-image: -moz-linear-gradient(@value1, @value2, @value3, @value4); // FF3.6 - FF15 (FF16+ supports linear-gradient)
+ 	background-image: -webkit-linear-gradient(@value1, @value2, @value3, @value4); // Chrome10+, Safari5.1+
+ 	background-image: -o-linear-gradient(@value1, @value2, @value3, @value4); // Opera 11.10+
+ 	background-image: linear-gradient(@value1, @value2, @value3, @value4);
+}
+.linear-gradient (@value1, @value2, @value3, @value4, @value5) {
+ 	background-image: -moz-linear-gradient(@value1, @value2, @value3, @value4, @value5); // FF3.6 - FF15 (FF16+ supports linear-gradient)
+ 	background-image: -webkit-linear-gradient(@value1, @value2, @value3, @value4, @value5); // Chrome10+, Safari5.1+
+ 	background-image: -o-linear-gradient(@value1, @value2, @value3, @value4, @value5); // Opera 11.10+
+ 	background-image: linear-gradient(@value1, @value2, @value3, @value4, @value5);
+}
+.linear-gradient (@value1, @value2, @value3, @value4, @value5, @value6) {
+ 	background-image: -moz-linear-gradient(@value1, @value2, @value3, @value4, @value5, @value6); // FF3.6 - FF15 (FF16+ supports linear-gradient)
+ 	background-image: -webkit-linear-gradient(@value1, @value2, @value3, @value4, @value5, @value6); // Chrome10+, Safari5.1+
+ 	background-image: -o-linear-gradient(@value1, @value2, @value3, @value4, @value5, @value6); // Opera 11.10+
+ 	background-image: linear-gradient(@value1, @value2, @value3, @value4, @value5, @value6);
+}
+.linear-gradient (@value1, @value2, @value3, @value4, @value5, @value6, @value7) {
+ 	background-image: -moz-linear-gradient(@value1, @value2, @value3, @value4, @value5, @value6, @value7); // FF3.6 - FF15 (FF16+ supports linear-gradient)
+ 	background-image: -webkit-linear-gradient(@value1, @value2, @value3, @value4, @value5, @value6, @value7); // Chrome10+, Safari5.1+
+ 	background-image: -o-linear-gradient(@value1, @value2, @value3, @value4, @value5, @value6, @value7); // Opera 11.10+
+ 	background-image: linear-gradient(@value1, @value2, @value3, @value4, @value5, @value6, @value7);
+}
+
+.alpha-white-gradient (@opacity1, @stop1, @opacity2, @stop2) {
+	// summary:
+	//		For setting up white background-image with variable transparency.
+	// example:
+	//		Gradient starts at top (0%) with 30% opacity, and then ends at bottom (100%) with full transparency
+	//		|	.alpha-white-gradient(0.3, 0%, 0, 100%)
+	//
+	.linear-gradient(rgba(255,255,255,@opacity1) @stop1, rgba(255,255,255,@opacity2) @stop2);
+}
+.alpha-white-gradient (@start, @opacity1, @stop1, @opacity2, @stop2) {
+	.linear-gradient(@start, rgba(255,255,255,@opacity1) @stop1, rgba(255,255,255,@opacity2) @stop2);
+}
+.alpha-white-gradient (@opacity1, @stop1, @opacity2, @stop2, @opacity3, @stop3) {
+	.linear-gradient(rgba(255,255,255,@opacity1) @stop1, rgba(255,255,255,@opacity2) @stop2, rgba(255,255,255, @opacity3) @stop3);
+}
+.alpha-white-gradient (@start, @opacity1, @stop1, @opacity2, @stop2, @opacity3, @stop3) {
+	.linear-gradient(@start, rgba(255,255,255,@opacity1) @stop1, rgba(255,255,255,@opacity2) @stop2, rgba(255,255,255, @opacity3) @stop3);
+}
+.alpha-white-gradient (@opacity1, @stop1, @opacity2, @stop2, @opacity3, @stop3, @opacity4, @stop4) {
+	.linear-gradient(rgba(255,255,255,@opacity1) @stop1, rgba(255,255,255,@opacity2) @stop2, rgba(255,255,255, @opacity3) @stop3, rgba(255,255,255, @opacity4) @stop4);
+}
+.alpha-white-gradient (@start, @opacity1, @stop1, @opacity2, @stop2, @opacity3, @stop3, @opacity4, @stop4) {
+	.linear-gradient(@start, rgba(255,255,255,@opacity1) @stop1, rgba(255,255,255,@opacity2) @stop2, rgba(255,255,255, @opacity3) @stop3, rgba(255,255,255, @opacity4) @stop4);
+}
+.alpha-white-gradient (@start, @opacity1, @stop1, @opacity2, @stop2, @opacity3, @stop3, @opacity4, @stop4, @opacity5, @stop5) {
+	.linear-gradient(@start, rgba(255,255,255,@opacity1) @stop1, rgba(255,255,255,@opacity2) @stop2, rgba(255,255,255, @opacity3) @stop3, rgba(255,255,255, @opacity4) @stop4, rgba(255,255,255, @opacity5) @stop5);
+}
+.alpha-white-gradient (@start, @opacity1, @stop1, @opacity2, @stop2, @opacity3, @stop3, @opacity4, @stop4, @opacity5, @stop5, @opacity6, @stop6) {
+	.linear-gradient(@start, rgba(255,255,255,@opacity1) @stop1, rgba(255,255,255,@opacity2) @stop2, rgba(255,255,255, @opacity3) @stop3, rgba(255,255,255, @opacity4) @stop4, rgba(255,255,255, @opacity5) @stop5, rgba(255,255,255, @opacity6) @stop6);
+}
+
+.gradient-and-filter (@color, @fade1, @fade2) {
+	// summary:
+	//		Sets up a background color with a vertical gradient.
+	//		In order to make transitions work properly on mozilla and webkit, this is done by combining
+	//		a background-color which will be changed based on state (ex: hover) with a constant
+	//		white alpha-transparency background-image.  On IE it creates a DXImageTransform filter.
+	// @color:
+	//		The color
+	// @fade1:
+	//		The percent to fade at the top
+	// @fade2:
+	//		The percent to fade at the bottom
+	background-color: @color; // the base color
+	.linear-gradient(fadeout(#fff, 100-@fade1), fadeout(#fff, 100-@fade2));
+	filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr="lighten(@color, @fade1)~", endColorstr="lighten(@color, @fade2)~")"; // IE
+}
+.horizontal-gradient-and-filter (@color, @fade1, @fade2) {
+	// summary:
+	//		Sets up a background color with a horizontal gradient.
+	//		In order to make transitions work properly on mozilla and webkit, this is done by combining
+	//		a background-color which will be changed based on state (ex: hover) with a constant
+	//		white alpha-transparency background-image.  On IE it creates a DXImageTransform filter.
+	// @color:
+	//		The color
+	// @fade1:
+	//		The percent to fade at the top
+	// @fade2:
+	//		The percent to fade at the bottom
+	background-color: @color; // the base color
+	.linear-gradient(left, fadeout(#fff, 100-@fade1), fadeout(#fff, 100-@fade2));
+	filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr="lighten(@color, @fade1)~", endColorstr="lighten(@color, @fade2)~"gradientType=1)"; // IE
+}
+
+
+// Mixins defining gradients
+
+.textbox-background-image () {
+	// summary:
+	//		Background image used for hovered TextBoxes and similar controls.
+	//		It's just a small inset shadow below the top border (inside of the TextBox).
+	.linear-gradient(rgba(127,127,127,0.2) 0%, rgba(127,127,127,0) 2px);
+}
+
+.standard-gradient (@pathToRoot: "") {
+	// summary:
+	//		Light to dark background-image used by widgets with short height (~16px) including:
+	//			- MenuBar, and hovered MenuItem/MenuBarItem
+	//			- arrow icon wrapper for Select, ComboBox, Spinner
+	//			- Toolbar and hovered Toolbar buttons
+	//			- TitlePane title bar, AccordionContainer title bar, Dialog title bar
+
+	// Fallback for IE
+	background-image: url("@{pathToRoot}images/standardGradient.png");
+	background-repeat: repeat-x;
+
+	// CSS gradient for other browsers
+	.alpha-white-gradient(0.7, 0%, 0, 100%);
+
+	// IE6 can't handle a background-image with transparency and a background-color; the color is blocked out
+	_background-image: none;
+}
+.active-gradient (@pathToRoot: "") {
+	// summary:
+	//		Light to dark background-image with an inset gray shadow at the top,
+	//		used by widgets when they are active (ie: mousedown) or selected, including:
+	//			- active MenuItem/MenuBarItem
+	//			- arrow icon wrapper for Select, ComboBox, Spinner when active or drop down is open
+	//			- active Toolbar buttons
+	//			- active TitlePane title bar, AccordionContainer title bar
+
+	// Fallback for IE
+	background-image: url("@{pathToRoot}images/activeGradient.png");
+	background-repeat: repeat-x;
+
+	// CSS gradient for other browsers
+	.linear-gradient(rgba(190,190,190,0.98) 0px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0) 100%);
+
+	// IE6 can't handle a background-image with transparency and a background-color; the color is blocked out
+	_background-image: none;
+}
diff --git a/src/main/resources/static/dijit/themes/dijit.css b/src/main/resources/static/dijit/themes/dijit.css
new file mode 100644
index 0000000000000000000000000000000000000000..3d2118e58d15a22b246357208ac334bdfee5c0ee
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/dijit.css
@@ -0,0 +1,2248 @@
+/*
+	Essential styles that themes can inherit.
+	In other words, works but doesn't look great.
+*/
+
+
+
+/****
+		GENERIC PIECES
+ ****/
+
+.dijitReset {
+	/* Use this style to null out padding, margin, border in your template elements
+		so that page specific styles don't break them.
+		- Use in all TABLE, TR and TD tags.
+	*/
+	margin:0;
+	border:0;
+	padding:0;
+	font: inherit;
+	line-height:normal;
+	color: inherit;
+}
+.dj_a11y .dijitReset {
+	-moz-appearance: none; /* remove predefined high-contrast styling in Firefox */
+}
+
+.dijitInline {
+	/*  To inline block elements.
+		Similar to InlineBox below, but this has fewer side-effects in Moz.
+		Also, apparently works on a DIV as well as a FIELDSET.
+	*/
+	display:inline-block;			/* webkit and FF3 */
+	#zoom: 1; /* set hasLayout:true to mimic inline-block */
+	#display:inline; /* don't use .dj_ie since that increases the priority */
+	border:0;
+	padding:0;
+	vertical-align:middle;
+	#vertical-align: auto;	/* makes TextBox,Button line up w/native counterparts on IE6 */
+}
+
+table.dijitInline {
+	/* To inline tables with a given width set */
+	display:inline-table;
+	box-sizing: content-box; -moz-box-sizing: content-box;
+}
+
+.dijitHidden {
+	/* To hide unselected panes in StackContainer etc. */
+	position: absolute; /* remove from normal document flow to simulate display: none */
+	visibility: hidden; /* hide element from view, but don't break scrolling, see #18612 */
+}
+.dijitHidden * {
+	visibility: hidden !important; /* hide visibility:visible descendants of class=dijitHidden nodes, see #18799 */
+}
+
+.dijitVisible {
+	/* To show selected pane in StackContainer etc. */
+	display: block !important;	/* override user's display:none setting via style setting or indirectly via class */
+	position: relative;			/* to support setting width/height, see #2033 */
+	visibility: visible;
+}
+
+.dj_ie6 .dijitComboBox .dijitInputContainer,
+.dijitInputContainer {
+	/* for positioning of placeHolder */
+	#zoom: 1;
+	overflow: hidden;
+	float: none !important; /* needed to squeeze the INPUT in */
+	position: relative;
+}
+.dj_ie7 .dijitInputContainer {
+	float: left !important; /* needed by IE to squeeze the INPUT in */
+	clear: left;
+	display: inline-block !important; /* to fix wrong text alignment in textdir=rtl text box */
+}
+
+.dj_ie .dijitSelect input,
+.dj_ie input.dijitTextBox,
+.dj_ie .dijitTextBox input {
+	font-size: 100%;
+}
+.dijitSelect .dijitButtonText {
+	float: left;
+	vertical-align: top;
+}
+TABLE.dijitSelect {
+	padding: 0 !important; /* messes up border alignment */
+	border-collapse: separate; /* so jsfiddle works with Normalized CSS checked */
+}
+.dijitTextBox .dijitSpinnerButtonContainer,
+.dijitTextBox .dijitArrowButtonContainer,
+.dijitValidationTextBox .dijitValidationContainer {
+	float: right;
+	text-align: center;
+}
+.dijitSelect input.dijitInputField,
+.dijitTextBox input.dijitInputField {
+	/* override unreasonable user styling of buttons and icons */
+	padding-left: 0 !important;
+	padding-right: 0 !important;
+}
+.dijitValidationTextBox .dijitValidationContainer {
+	display: none;
+}
+
+.dijitTeeny {
+	font-size:1px;
+	line-height:1px;
+}
+
+.dijitOffScreen { /* these class attributes should supersede any inline positioning style */
+	position: absolute !important;
+	left: -10000px !important;
+	top: -10000px !important;
+}
+
+/*
+ * Popup items have a wrapper div (dijitPopup)
+ * with the real popup inside, and maybe an iframe too
+ */
+.dijitPopup {
+	position: absolute;
+	background-color: transparent;
+	margin: 0;
+	border: 0;
+	padding: 0;
+	-webkit-overflow-scrolling: touch;
+}
+
+.dijitPositionOnly {
+	/* Null out all position-related properties */
+	padding: 0 !important;
+	border: 0 !important;
+	background-color: transparent !important;
+	background-image: none !important;
+	height: auto !important;
+	width: auto !important;
+}
+
+.dijitNonPositionOnly {
+	/* Null position-related properties */
+	float: none !important;
+	position: static !important;
+	margin: 0 0 0 0 !important;
+	vertical-align: middle !important;
+}
+
+.dijitBackgroundIframe {
+	/* iframe used to prevent problems with PDF or other applets overlaying menus etc */
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	z-index: -1;
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+
+.dijitDisplayNone {
+	/* hide something.  Use this as a class rather than element.style so another class can override */
+	display:none !important;
+}
+
+.dijitContainer {
+	/* for all layout containers */
+	overflow: hidden;	/* need on IE so something can be reduced in size, and so scrollbars aren't temporarily displayed when resizing */
+}
+
+/****
+		A11Y
+ ****/
+.dj_a11y .dijitIcon,
+.dj_a11y div.dijitArrowButtonInner, /* is this only for Spinner?  if so, it should be deleted */
+.dj_a11y span.dijitArrowButtonInner,
+.dj_a11y img.dijitArrowButtonInner,
+.dj_a11y .dijitCalendarIncrementControl,
+.dj_a11y .dijitTreeExpando {
+	/* hide icon nodes in high contrast mode; when necessary they will be replaced by character equivalents
+	 * exception for input.dijitArrowButtonInner, because the icon and character are controlled by the same node */
+	display: none;
+}
+.dijitSpinner div.dijitArrowButtonInner {
+	display: block; /* override previous rule */
+}
+
+.dj_a11y .dijitA11ySideArrow {
+	display: inline !important; /* display text instead */
+	cursor: pointer;
+}
+
+/*
+ * Since we can't use shading in a11y mode, and since the underline indicates today's date,
+ * use a border to show the selected date.
+ * Avoid screen jitter when switching selected date by compensating for the selected node's
+ * border w/padding on other nodes.
+ */
+.dj_a11y .dijitCalendarDateLabel {
+	padding: 1px;
+	border: 0px !important;
+}
+.dj_a11y .dijitCalendarSelectedDate .dijitCalendarDateLabel {
+	border-style: solid !important;
+	border-width: 1px !important;
+	padding: 0;
+}
+.dj_a11y .dijitCalendarDateTemplate {
+	padding-bottom: 0.1em !important;	/* otherwise bottom border doesn't appear on IE */
+	border: 0px !important;
+}
+.dj_a11y .dijitButtonNode {
+	border: black outset medium !important;
+
+	/* In claro, hovering a toolbar button reduces padding and adds a border.
+	 * Not needed in a11y mode since Toolbar buttons always have a border.
+	 */
+	padding: 0 !important;
+}
+.dj_a11y .dijitArrowButton {
+	padding: 0 !important;
+}
+
+.dj_a11y .dijitButtonContents {
+	margin: 0.15em; /* Margin needed to make focus outline visible */
+}
+
+.dj_a11y .dijitTextBoxReadOnly .dijitInputField,
+.dj_a11y .dijitTextBoxReadOnly .dijitButtonNode {
+	border-style: outset!important;
+	border-width: medium!important;
+	border-color: #999 !important;
+	color:#999 !important;
+}
+
+/* button inner contents - labels, icons etc. */
+.dijitButtonNode * {
+	vertical-align: middle;
+}
+.dijitSelect .dijitArrowButtonInner,
+.dijitButtonNode .dijitArrowButtonInner {
+	/* the arrow icon node */
+	background: no-repeat center;
+	width: 12px;
+	height: 12px;
+	direction: ltr; /* needed by IE/RTL */
+}
+
+/****
+	3-element borders:  ( dijitLeft + dijitStretch + dijitRight )
+	These were added for rounded corners on dijit.form.*Button but never actually used.
+ ****/
+
+.dijitLeft {
+	/* Left part of a 3-element border */
+	background-position:left top;
+	background-repeat:no-repeat;
+}
+
+.dijitStretch {
+	/* Middle (stretchy) part of a 3-element border */
+	white-space:nowrap;			/* MOW: move somewhere else */
+	background-repeat:repeat-x;
+}
+
+.dijitRight {
+	/* Right part of a 3-element border */
+	#display:inline;				/* IE7 sizes to outer size w/o this */
+	background-position:right top;
+	background-repeat:no-repeat;
+}
+
+/* Buttons */
+.dj_gecko .dj_a11y .dijitButtonDisabled .dijitButtonNode {
+	opacity: 0.5;
+}
+
+.dijitToggleButton,
+.dijitButton,
+.dijitDropDownButton,
+.dijitComboButton {
+	/* outside of button */
+	margin: 0.2em;
+	vertical-align: middle;
+}
+
+.dijitButtonContents {
+	display: block;		/* to make focus border rectangular */
+}
+td.dijitButtonContents {
+	display: table-cell;	/* but don't affect Select, ComboButton */
+}
+
+.dijitButtonNode img {
+	/* make text and images line up cleanly */
+	vertical-align:middle;
+	/*margin-bottom:.2em;*/
+}
+
+.dijitToolbar .dijitComboButton {
+	/* because Toolbar only draws a border around the hovered thing */
+	border-collapse: separate;
+}
+
+.dijitToolbar .dijitToggleButton,
+.dijitToolbar .dijitButton,
+.dijitToolbar .dijitDropDownButton,
+.dijitToolbar .dijitComboButton {
+	margin: 0;
+}
+
+.dijitToolbar .dijitButtonContents {
+	/* just because it used to be this way */
+	padding: 1px 2px;
+}
+
+
+.dj_webkit .dijitToolbar .dijitDropDownButton {
+	padding-left: 0.3em;
+}
+.dj_gecko .dijitToolbar .dijitButtonNode::-moz-focus-inner {
+	padding:0;
+}
+
+.dijitSelect {
+	border:1px solid gray;
+}
+.dijitButtonNode {
+	/* Node that is acting as a button -- may or may not be a BUTTON element */
+	border:1px solid gray;
+	margin:0;
+	line-height:normal;
+	vertical-align: middle;
+	#vertical-align: auto;
+	text-align:center;
+	white-space: nowrap;
+}
+.dj_webkit .dijitSpinner .dijitSpinnerButtonContainer {
+	/* apparent WebKit bug where messing with the font coupled with line-height:normal X 2 (dijitReset & dijitButtonNode)
+	can be different than just a single line-height:normal, visible in InlineEditBox/Spinner */
+	line-height:inherit;
+}
+.dijitTextBox .dijitButtonNode {
+	border-width: 0;
+}
+
+.dijitSelect,
+.dijitSelect *,
+.dijitButtonNode,
+.dijitButtonNode * {
+	cursor: pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+
+.dj_ie .dijitButtonNode {
+	/* ensure hasLayout */
+	zoom: 1;
+}
+
+.dj_ie .dijitButtonNode button {
+	/*
+		disgusting hack to get rid of spurious padding around button elements
+		on IE. MSIE is truly the web's boat anchor.
+	*/
+	overflow: visible;
+}
+
+div.dijitArrowButton {
+	float: right;
+}
+
+/******
+	TextBox related.
+	Everything that has an <input>
+*******/
+
+.dijitTextBox {
+	border: solid black 1px;
+	#overflow: hidden; /* #6027, #6067 */
+	width: 15em;	/* need to set default size on outer node since inner nodes say <input style="width:100%"> and <td width=100%>.  user can override */
+	vertical-align: middle;
+}
+
+.dijitTextBoxReadOnly,
+.dijitTextBoxDisabled {
+	color: gray;
+}
+.dj_safari .dijitTextBoxDisabled input {
+	color: #B0B0B0; /* because Safari lightens disabled input/textarea no matter what color you specify */
+}
+.dj_safari textarea.dijitTextAreaDisabled {
+	color: #333; /* because Safari lightens disabled input/textarea no matter what color you specify */
+}
+.dj_gecko .dijitTextBoxReadOnly input.dijitInputField, /* disable arrow and validation presentation inputs but allow real input for text selection */
+.dj_gecko .dijitTextBoxDisabled input {
+	-moz-user-input: none; /* prevent focus of disabled textbox buttons */
+}
+
+.dijitPlaceHolder {
+	/* hint text that appears in a textbox until user starts typing */
+	color: #AAAAAA;
+	font-style: italic;
+	position: absolute;
+	top: 0;
+	left: 0;
+	#filter: ""; /* make this show up in IE6 after the rendering of the widget */
+	white-space: nowrap;
+	pointer-events: none;   /* so cut/paste context menu shows up when right clicking */
+}
+
+.dijitTimeTextBox {
+	width: 8em;
+}
+
+/* rules for webkit to deal with fuzzy blue focus border */
+.dijitTextBox input:focus {
+	outline: none;	/* blue fuzzy line looks wrong on combobox or something w/validation icon showing */
+}
+.dijitTextBoxFocused {
+	outline: 5px -webkit-focus-ring-color;
+}
+
+.dijitSelect input,
+.dijitTextBox input {
+	float: left; /* needed by IE to remove secret margin */
+}
+.dj_ie6 input.dijitTextBox,
+.dj_ie6 .dijitTextBox input {
+	float: none;
+}
+.dijitInputInner {
+	/* for when an <input> is embedded inside an inline-block <div> with a size and border */
+	border:0 !important;
+	background-color:transparent !important;
+	width:100% !important;
+	/* IE dislikes horizontal tweaking combined with width:100% so punish everyone for consistency */
+	padding-left: 0 !important;
+	padding-right: 0 !important;
+	margin-left: 0 !important;
+	margin-right: 0 !important;
+}
+.dj_a11y .dijitTextBox input {
+	margin: 0 !important;
+}
+.dijitValidationTextBoxError input.dijitValidationInner,
+.dijitSelect input,
+.dijitTextBox input.dijitArrowButtonInner {
+	/* <input> used to display arrow icon/validation icon, or in arrow character in high contrast mode.
+	 * The css below is a trick to hide the character in non-high-contrast mode
+	 */
+	text-indent: -2em !important;
+	direction: ltr !important;
+	text-align: left !important;
+	height: auto !important;
+	#text-indent: 0 !important;
+	#letter-spacing: -5em !important;
+	#text-align: right !important;
+}
+.dj_ie .dijitSelect input,
+.dj_ie .dijitTextBox input,
+.dj_ie input.dijitTextBox {
+	overflow-y: visible; /* inputs need help expanding when padding is added or line-height is adjusted */
+	line-height: normal; /* strict mode */
+}
+.dijitSelect .dijitSelectLabel span {
+	line-height: 100%;
+}
+.dj_ie .dijitSelect .dijitSelectLabel {
+	line-height: normal;
+}
+.dj_ie6 .dijitSelect .dijitSelectLabel,
+.dj_ie7 .dijitSelect .dijitSelectLabel,
+.dj_ie8 .dijitSelect .dijitSelectLabel,
+.dj_iequirks .dijitSelect .dijitSelectLabel,
+.dijitSelect td,
+.dj_ie6 .dijitSelect input,
+.dj_iequirks .dijitSelect input,
+.dj_ie6 .dijitSelect .dijitValidationContainer,
+.dj_ie6 .dijitTextBox input,
+.dj_ie6 input.dijitTextBox,
+.dj_iequirks .dijitTextBox input.dijitValidationInner,
+.dj_iequirks .dijitTextBox input.dijitArrowButtonInner,
+.dj_iequirks .dijitTextBox input.dijitSpinnerButtonInner,
+.dj_iequirks .dijitTextBox input.dijitInputInner,
+.dj_iequirks input.dijitTextBox {
+	line-height: 100%; /* IE7 problem where the icon is vertically way too low w/o this */
+}
+.dj_a11y input.dijitValidationInner,
+.dj_a11y input.dijitArrowButtonInner {
+	/* (in high contrast mode) revert rules from above so character displays */
+	text-indent: 0 !important;
+	width: 1em !important;
+	#text-align: left !important;
+	color: black !important;
+}
+.dijitValidationTextBoxError .dijitValidationContainer {
+	display: inline;
+	cursor: default;
+}
+
+/* ComboBox & Spinner */
+
+.dijitSpinner .dijitSpinnerButtonContainer,
+.dijitComboBox .dijitArrowButtonContainer {
+	/* dividing line between input area and up/down button(s) for ComboBox and Spinner */
+	border-width: 0 0 0 1px !important; /* !important needed due to wayward ".theme .dijitButtonNode" rules */
+}
+.dj_a11y .dijitSelect .dijitArrowButtonContainer,
+.dijitToolbar .dijitComboBox .dijitArrowButtonContainer {
+	/* overrides above rule plus mirror-image rule in dijit_rtl.css to have no divider when ComboBox in Toolbar */
+	border-width: 0 !important;
+}
+
+.dijitComboBoxMenu {
+	/* Drop down menu is implemented as <ul> <li/> <li/> ... but we don't want circles before each item */
+	list-style-type: none;
+}
+.dijitSpinner .dijitSpinnerButtonContainer .dijitButtonNode {
+	/* dividing line between input area and up/down button(s) for ComboBox and Spinner */
+	border-width: 0;
+}
+.dj_ie .dj_a11y .dijitSpinner .dijitSpinnerButtonContainer .dijitButtonNode {
+	clear: both; /* IE workaround */
+}
+
+.dj_ie .dijitToolbar .dijitComboBox {
+	/* make combobox buttons align properly with other buttons in a toolbar */
+	vertical-align: middle;
+}
+
+/* Spinner */
+
+.dijitTextBox .dijitSpinnerButtonContainer {
+	width: 1em;
+	position: relative !important;
+	overflow: hidden;
+}
+.dijitSpinner .dijitSpinnerButtonInner {
+	width:1em;
+	visibility:hidden !important; /* just a sizing element */
+	overflow-x:hidden;
+}
+.dijitComboBox .dijitButtonNode,
+.dijitSpinnerButtonContainer .dijitButtonNode {
+	border-width: 0;
+}
+.dj_a11y .dijitSpinnerButtonContainer .dijitButtonNode {
+	border-width: 0px !important;
+	border-style: solid !important;
+}
+.dj_a11y .dijitTextBox .dijitSpinnerButtonContainer,
+.dj_a11y .dijitSpinner .dijitArrowButtonInner,
+.dj_a11y .dijitSpinnerButtonContainer input {
+	width: 1em !important;
+}
+.dj_a11y .dijitSpinner .dijitArrowButtonInner {
+	margin: 0 auto !important; /* should auto-center */
+}
+.dj_ie .dj_a11y .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	padding-left: 0.3em !important;
+	padding-right: 0.3em !important;
+	margin-left: 0.3em !important;
+	margin-right: 0.3em !important;
+	width: 1.4em !important;
+}
+.dj_ie7 .dj_a11y .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	padding-left: 0 !important; /* manually center INPUT: character is .5em and total width = 1em */
+	padding-right: 0 !important;
+	width: 1em !important;
+}
+.dj_ie6 .dj_a11y .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	margin-left: 0.1em !important;
+	margin-right: 0.1em !important;
+	width: 1em !important;
+}
+.dj_iequirks .dj_a11y .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	margin-left: 0 !important;
+	margin-right: 0 !important;
+	width: 2em !important;
+}
+.dijitSpinner .dijitSpinnerButtonContainer .dijitArrowButton {
+	/* note: .dijitInputLayoutContainer makes this rule override .dijitArrowButton settings
+	 * for dijit.form.Button
+	 */
+	padding: 0;
+	position: absolute !important;
+	right: 0;
+	float: none;
+	height: 50%;
+	width: 100%;
+	bottom: auto;
+	left: 0;
+	right: auto;
+}
+.dj_iequirks .dijitSpinner .dijitSpinnerButtonContainer .dijitArrowButton {
+	width: auto;
+}
+.dj_a11y .dijitSpinnerButtonContainer .dijitArrowButton {
+	overflow: visible !important;
+}
+.dijitSpinner .dijitSpinnerButtonContainer .dijitDownArrowButton {
+	top: 50%;
+	border-top-width: 1px !important;
+}
+.dijitSpinner .dijitSpinnerButtonContainer .dijitUpArrowButton {
+	#bottom: 50%;	/* otherwise (on some machines) top arrow icon too close to splitter border (IE6/7) */
+	top: 0;
+}
+.dijitSpinner .dijitArrowButtonInner {
+	margin: auto;
+	overflow-x: hidden;
+	height: 100% !important;
+}
+.dj_iequirks .dijitSpinner .dijitArrowButtonInner {
+	height: auto !important;
+}
+.dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	-moz-transform: scale(0.5);
+	-moz-transform-origin: center top;
+	-webkit-transform: scale(0.5);
+	-webkit-transform-origin: center top;
+	-o-transform: scale(0.5);
+	-o-transform-origin: center top;
+	transform: scale(0.5);
+	transform-origin: left top;
+	padding-top: 0;
+	padding-bottom: 0;
+	padding-left: 0 !important;
+	padding-right: 0 !important;
+	width: 100%;
+	visibility: hidden;
+}
+.dj_ie .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	zoom: 50%; /* emulate transform: scale(0.5) */
+}
+.dijitSpinner .dijitSpinnerButtonContainer .dijitArrowButtonInner {
+	overflow: hidden;
+}
+
+.dj_a11y .dijitSpinner .dijitSpinnerButtonContainer .dijitArrowButton {
+	width: 100%;
+}
+.dj_iequirks .dj_a11y .dijitSpinner .dijitSpinnerButtonContainer .dijitArrowButton {
+	width: 1em; /* matches .dj_a11y .dijitTextBox .dijitSpinnerButtonContainer rule - 100% is the whole screen width in quirks */
+}
+.dj_a11y .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	vertical-align:top;
+	visibility: visible;
+}
+.dj_a11y .dijitSpinnerButtonContainer {
+	width: 1em;
+}
+
+/****
+		dijit.form.CheckBox
+ 	 &
+  		dijit.form.RadioButton
+ ****/
+
+.dijitCheckBox,
+.dijitRadio,
+.dijitCheckBoxInput {
+	padding: 0;
+	border: 0;
+	width: 16px;
+	height: 16px;
+	background-position:center center;
+	background-repeat:no-repeat;
+	overflow: hidden;
+}
+
+.dijitCheckBox input,
+.dijitRadio input {
+	margin: 0;
+	padding: 0;
+	display: block;
+}
+
+.dijitCheckBoxInput {
+	/* place the actual input on top, but invisible */
+	opacity: 0;
+}
+
+.dj_ie .dijitCheckBoxInput {
+	filter: alpha(opacity=0);
+}
+
+.dj_a11y .dijitCheckBox,
+.dj_a11y .dijitRadio {
+	/* in a11y mode we display the native checkbox (not the icon), so don't restrict the size */
+	width: auto !important;
+	height: auto !important;
+}
+.dj_a11y .dijitCheckBoxInput {
+	opacity: 1;
+	filter: none;
+	width: auto;
+	height: auto;
+}
+
+.dj_a11y .dijitFocusedLabel {
+	/* for checkboxes or radio buttons in high contrast mode, use border rather than outline to indicate focus (outline does not work in FF)*/
+	border: 1px dotted;
+	outline: 0px !important;
+}
+
+/****
+		dijit.ProgressBar
+ ****/
+
+.dijitProgressBar {
+    z-index: 0; /* so z-index settings below have no effect outside of the ProgressBar */
+}
+.dijitProgressBarEmpty {
+	/* outer container and background of the bar that's not finished yet*/
+	position:relative;overflow:hidden;
+	border:1px solid black; 	/* a11y: border necessary for high-contrast mode */
+	z-index:0;			/* establish a stacking context for this progress bar */
+}
+
+.dijitProgressBarFull {
+	/* outer container for background of bar that is finished */
+	position:absolute;
+	overflow:hidden;
+	z-index:-1;
+	top:0;
+	width:100%;
+}
+.dj_ie6 .dijitProgressBarFull {
+	height:1.6em;
+}
+
+.dijitProgressBarTile {
+	/* inner container for finished portion */
+	position:absolute;
+	overflow:hidden;
+	top:0;
+	left:0;
+	bottom:0;
+	right:0;
+	margin:0;
+	padding:0;
+	width: 100%;    /* needed for IE/quirks */
+	height:auto;
+	background-color:#aaa;
+	background-attachment: fixed;
+}
+
+.dj_a11y .dijitProgressBarTile {
+	/* a11y:  The border provides visibility in high-contrast mode */
+	border-width:2px;
+	border-style:solid;
+	background-color:transparent !important;
+}
+
+.dj_ie6 .dijitProgressBarTile {
+	/* width:auto works in IE6 with position:static but not position:absolute */
+	position:static;
+	/* height:auto or 100% does not work in IE6 */
+	height:1.6em;
+}
+
+.dijitProgressBarIndeterminate .dijitProgressBarTile {
+	/* animated gif for 'indeterminate' mode */
+}
+
+.dijitProgressBarIndeterminateHighContrastImage {
+	display:none;
+}
+
+.dj_a11y .dijitProgressBarIndeterminate .dijitProgressBarIndeterminateHighContrastImage {
+	display:block;
+	position:absolute;
+	top:0;
+	bottom:0;
+	margin:0;
+	padding:0;
+	width:100%;
+	height:auto;
+}
+
+.dijitProgressBarLabel {
+	display:block;
+	position:static;
+	width:100%;
+	text-align:center;
+	background-color:transparent !important;
+}
+
+/****
+		dijit.Tooltip
+ ****/
+
+.dijitTooltip {
+	position: absolute;
+	z-index: 2000;
+	display: block;
+	/* make visible but off screen */
+	left: 0;
+	top: -10000px;
+	overflow: visible;
+}
+
+.dijitTooltipContainer {
+	border: solid black 2px;
+	background: #b8b5b5;
+	color: black;
+	font-size: small;
+}
+
+.dijitTooltipFocusNode {
+	padding: 2px 2px 2px 2px;
+}
+
+.dijitTooltipConnector {
+	position: absolute;
+}
+.dj_a11y .dijitTooltipConnector {
+	display: none;	/* won't show b/c it's background-image; hide to avoid border gap */
+}
+
+.dijitTooltipData {
+	display:none;
+}
+
+/* Layout widgets. This is essential CSS to make layout work (it isn't "styling" CSS)
+   make sure that the position:absolute in dijitAlign* overrides other classes */
+
+.dijitLayoutContainer {
+	position: relative;
+	display: block;
+	overflow: hidden;
+}
+
+.dijitAlignTop,
+.dijitAlignBottom,
+.dijitAlignLeft,
+.dijitAlignRight {
+	position: absolute;
+	overflow: hidden;
+}
+
+body .dijitAlignClient { position: absolute; }
+
+/*
+ * BorderContainer
+ *
+ * .dijitBorderContainer is a stylized layout where panes have border and margin.
+ * .dijitBorderContainerNoGutter is a raw layout.
+ */
+.dijitBorderContainer, .dijitBorderContainerNoGutter {
+	position:relative;
+	overflow: hidden;
+    z-index: 0; /* so z-index settings below have no effect outside of the BorderContainer */
+}
+
+.dijitBorderContainerPane,
+.dijitBorderContainerNoGutterPane {
+	position: absolute !important;	/* !important to override position:relative in dijitTabContainer etc. */
+	z-index: 2;		/* above the splitters so that off-by-one browser errors don't cover up border of pane */
+}
+
+.dijitBorderContainer > .dijitTextArea {
+	/* On Safari, for SimpleTextArea inside a BorderContainer,
+		don't want to display the grip to resize */
+	resize: none;
+}
+
+.dijitGutter {
+	/* gutter is just a place holder for empty space between panes in BorderContainer */
+	position: absolute;
+	font-size: 1px;		/* needed by IE6 even though div is empty, otherwise goes to 15px */
+}
+
+/* SplitContainer
+
+	'V' == container that splits vertically (up/down)
+	'H' = horizontal (left/right)
+*/
+
+.dijitSplitter {
+	position: absolute;
+	overflow: hidden;
+	z-index: 10;		/* above the panes so that splitter focus is visible on FF, see #7583*/
+	background-color: #fff;
+	border-color: gray;
+	border-style: solid;
+	border-width: 0;
+}
+.dj_ie .dijitSplitter {
+	z-index: 1;	/* behind the panes so that pane borders aren't obscured see test_Gui.html/[14392] */
+}
+
+.dijitSplitterActive {
+	z-index: 11 !important;
+}
+
+.dijitSplitterCover {
+	position:absolute;
+	z-index:-1;
+	top:0;
+	left:0;
+	width:100%;
+	height:100%;
+}
+
+.dijitSplitterCoverActive {
+	z-index:3 !important;
+}
+
+/* #6945: stop mouse events */
+.dj_ie .dijitSplitterCover {
+	background: white;
+	opacity: 0;
+}
+.dj_ie6 .dijitSplitterCover,
+.dj_ie7 .dijitSplitterCover,
+.dj_ie8 .dijitSplitterCover {
+	filter: alpha(opacity=0);
+}
+
+.dijitSplitterH {
+	height: 7px;
+	border-top:1px;
+	border-bottom:1px;
+	cursor: row-resize;
+	-webkit-tap-highlight-color: transparent;
+}
+.dijitSplitterV {
+	width: 7px;
+	border-left:1px;
+	border-right:1px;
+	cursor: col-resize;
+	-webkit-tap-highlight-color: transparent;
+}
+.dijitSplitContainer {
+	position: relative;
+	overflow: hidden;
+	display: block;
+}
+
+.dijitSplitPane {
+	position: absolute;
+}
+
+.dijitSplitContainerSizerH,
+.dijitSplitContainerSizerV {
+	position:absolute;
+	font-size: 1px;
+	background-color: ThreeDFace;
+	border: 1px solid;
+	border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight;
+	margin: 0;
+}
+
+.dijitSplitContainerSizerH .thumb, .dijitSplitterV .dijitSplitterThumb {
+	overflow:hidden;
+	position:absolute;
+	top:49%;
+}
+
+.dijitSplitContainerSizerV .thumb, .dijitSplitterH .dijitSplitterThumb {
+	position:absolute;
+	left:49%;
+}
+
+.dijitSplitterShadow,
+.dijitSplitContainerVirtualSizerH,
+.dijitSplitContainerVirtualSizerV {
+	font-size: 1px;
+	background-color: ThreeDShadow;
+	-moz-opacity: 0.5;
+	opacity: 0.5;
+	filter: Alpha(Opacity=50);
+	margin: 0;
+}
+
+.dijitSplitContainerSizerH, .dijitSplitContainerVirtualSizerH {
+	cursor: col-resize;
+}
+
+.dijitSplitContainerSizerV, .dijitSplitContainerVirtualSizerV {
+	cursor: row-resize;
+}
+
+.dj_a11y .dijitSplitterH {
+	border-top:1px solid #d3d3d3 !important;
+	border-bottom:1px solid #d3d3d3 !important;
+}
+.dj_a11y .dijitSplitterV {
+	border-left:1px solid #d3d3d3 !important;
+	border-right:1px solid #d3d3d3 !important;
+}
+
+/* ContentPane */
+
+.dijitContentPane {
+	display: block;
+	overflow: auto;	/* if we don't have this (or overflow:hidden), then Widget.resizeTo() doesn't make sense for ContentPane */
+	-webkit-overflow-scrolling: touch;
+}
+
+.dijitContentPaneSingleChild {
+	/*
+	 * if the ContentPane holds a single layout widget child which is being sized to match the content pane,
+	 * then the ContentPane should never get a scrollbar (but it does due to browser bugs, see #9449
+	 */
+	overflow: hidden;
+}
+
+.dijitContentPaneLoading .dijitIconLoading,
+.dijitContentPaneError .dijitIconError {
+	margin-right: 9px;
+}
+
+/* TitlePane and Fieldset */
+
+.dijitTitlePane {
+	display: block;
+	overflow: hidden;
+}
+.dijitFieldset {
+	border: 1px solid gray;
+}
+.dijitTitlePaneTitle, .dijitFieldsetTitle {
+	cursor: pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+.dijitTitlePaneTitleFixedOpen, .dijitTitlePaneTitleFixedClosed,
+.dijitFieldsetTitleFixedOpen, .dijitFieldsetTitleFixedClosed {
+	/* TitlePane or Fieldset that cannot be toggled */
+	cursor: default;
+}
+.dijitTitlePaneTitle * {
+	vertical-align: middle;
+}
+.dijitTitlePane .dijitArrowNodeInner, .dijitFieldset .dijitArrowNodeInner {
+	/* normally, hide arrow text in favor of icon */
+	display: none;
+}
+.dj_a11y .dijitTitlePane .dijitArrowNodeInner, .dj_a11y .dijitFieldset .dijitArrowNodeInner {
+	/* ... except in a11y mode, then show text arrow */
+	display: inline;
+	font-family: monospace;		/* because - and + are different widths */
+}
+.dj_a11y .dijitTitlePane .dijitArrowNode, .dj_a11y .dijitFieldset .dijitArrowNode {
+	/* ... and hide icon (TODO: just point dijitIcon class on the icon, and it hides automatically) */
+	display: none;
+}
+.dijitTitlePaneTitleFixedOpen .dijitArrowNode, .dijitTitlePaneTitleFixedOpen .dijitArrowNodeInner,
+.dijitTitlePaneTitleFixedClosed .dijitArrowNode, .dijitTitlePaneTitleFixedClosed .dijitArrowNodeInner,
+.dijitFieldsetTitleFixedOpen .dijitArrowNode, .dijitFieldsetTitleFixedOpen .dijitArrowNodeInner,
+.dijitFieldsetTitleFixedClosed .dijitArrowNode, .dijitFieldsetTitleFixedClosed .dijitArrowNodeInner {
+	/* don't show the open close icon or text arrow; it makes the user think the pane is closable */
+	display: none !important;	/* !important to override above a11y rules to show text arrow */
+}
+
+.dj_ie6 .dijitTitlePaneContentOuter,
+.dj_ie6 .dijitTitlePane .dijitTitlePaneTitle {
+	/* force hasLayout to ensure borders etc, show up */
+	zoom: 1;
+}
+
+/* Color Palette
+ * Sizes designed so that table cell positions match icons in underlying image,
+ * which appear at 20x20 intervals.
+ */
+
+.dijitColorPalette {
+	border: 1px solid #999;
+	background: #fff;
+	position: relative;
+}
+
+.dijitColorPalette .dijitPaletteTable {
+	/* Table that holds the palette cells, and overlays image file with color swatches.
+	 * padding/margin to align table with image.
+	 */
+	padding: 2px 3px 3px 3px;
+	position: relative;
+	overflow: hidden;
+	outline: 0;
+	border-collapse: separate;
+}
+.dj_ie6 .dijitColorPalette .dijitPaletteTable,
+.dj_ie7 .dijitColorPalette .dijitPaletteTable,
+.dj_iequirks .dijitColorPalette .dijitPaletteTable {
+	/* using padding above so that focus border isn't cutoff on moz/webkit,
+	 * but using margin on IE because padding doesn't seem to work
+	 */
+	padding: 0;
+	margin: 2px 3px 3px 3px;
+}
+
+.dijitColorPalette .dijitPaletteCell {
+	/* <td> in the <table> */
+	font-size: 1px;
+	vertical-align: middle;
+	text-align: center;
+	background: none;
+}
+.dijitColorPalette .dijitPaletteImg {
+	/* Called dijitPaletteImg for back-compat, this actually wraps the color swatch with a border and padding */
+	padding: 1px;		/* white area between gray border and color swatch */
+	border: 1px solid #999;
+	margin: 2px 1px;
+	cursor: default;
+	font-size: 1px;		/* prevent <span> from getting bigger just to hold a character */
+}
+.dj_gecko .dijitColorPalette .dijitPaletteImg {
+	padding-bottom: 0;	/* workaround rendering glitch on FF, it adds an extra pixel at the bottom */
+}
+.dijitColorPalette .dijitColorPaletteSwatch {
+	/* the actual part where the color is */
+	width: 14px;
+	height: 12px;
+}
+.dijitPaletteTable td {
+		padding: 0;
+}
+.dijitColorPalette .dijitPaletteCell:hover .dijitPaletteImg {
+	/* hovered color swatch */
+	border: 1px solid #000;
+}
+
+.dijitColorPalette .dijitPaletteCell:active .dijitPaletteImg,
+.dijitColorPalette .dijitPaletteTable .dijitPaletteCellSelected .dijitPaletteImg {
+	border: 2px solid #000;
+	margin: 1px 0;	/* reduce margin to compensate for increased border */
+}
+
+
+.dj_a11y .dijitColorPalette .dijitPaletteTable,
+.dj_a11y .dijitColorPalette .dijitPaletteTable * {
+	/* table cells are to catch events, but the swatches are in the PaletteImg behind the table */
+	background-color: transparent !important;
+}
+
+/* AccordionContainer */
+
+.dijitAccordionContainer {
+	border:1px solid #b7b7b7;
+	border-top:0 !important;
+}
+.dijitAccordionTitle {
+	cursor: pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+.dijitAccordionTitleSelected {
+	cursor: default;
+}
+
+/* images off, high-contrast mode styles */
+.dijitAccordionTitle .arrowTextUp,
+.dijitAccordionTitle .arrowTextDown {
+	display: none;
+	font-size: 0.65em;
+	font-weight: normal !important;
+}
+
+.dj_a11y .dijitAccordionTitle .arrowTextUp,
+.dj_a11y .dijitAccordionTitleSelected .arrowTextDown {
+	display: inline;
+}
+
+.dj_a11y .dijitAccordionTitleSelected .arrowTextUp {
+	display: none;
+}
+
+.dijitAccordionChildWrapper {
+	/* this is the node whose height is adjusted */
+	overflow: hidden;
+}
+
+/* Calendar */
+
+.dijitCalendarContainer table {
+	width: auto;	/* in case user has specified a width for the TABLE nodes, see #10553 */
+	clear: both;    /* clear margin created for left/right month arrows; needed on IE10 for CalendarLite */
+}
+.dijitCalendarContainer th, .dijitCalendarContainer td {
+	padding: 0;
+	vertical-align: middle;
+}
+
+.dijitCalendarMonthContainer {
+	text-align: center;
+}
+.dijitCalendarDecrementArrow {
+	float: left;
+}
+.dijitCalendarIncrementArrow {
+	float: right;
+}
+
+.dijitCalendarYearLabel {
+    white-space: nowrap;    /* make sure previous, current, and next year appear on same row */
+}
+
+.dijitCalendarNextYear {
+	margin:0 0 0 0.55em;
+}
+
+.dijitCalendarPreviousYear {
+	margin:0 0.55em 0 0;
+}
+
+.dijitCalendarIncrementControl {
+	vertical-align: middle;
+}
+
+.dijitCalendarIncrementControl,
+.dijitCalendarDateTemplate,
+.dijitCalendarMonthLabel,
+.dijitCalendarPreviousYear,
+.dijitCalendarNextYear {
+	cursor: pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+
+.dijitCalendarDisabledDate {
+	color: gray;
+	text-decoration: line-through;
+	cursor: default;
+}
+
+.dijitSpacer {
+	/* don't display it, but make it affect the width */
+  	position: relative;
+  	height: 1px;
+  	overflow: hidden;
+  	visibility: hidden;
+}
+
+/* Styling for month drop down list */
+
+.dijitCalendarMonthMenu .dijitCalendarMonthLabel {
+	text-align:center;
+}
+
+/* Menu */
+
+.dijitMenu {
+	border:1px solid black;
+	background-color:white;
+}
+.dijitMenuTable {
+	border-collapse:collapse;
+	border-width:0;
+	background-color:white;
+}
+
+/* workaround for webkit bug #8427, remove this when it is fixed upstream */
+.dj_webkit .dijitMenuTable td[colspan="2"]{
+	border-right:hidden;
+}
+
+.dijitMenuItem {
+	text-align: left;
+	white-space: nowrap;
+	padding:.1em .2em;
+	cursor:pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+
+/*
+No need to show a focus border since it's obvious from the shading, and there's a .dj_a11y .dijitMenuItemSelected
+rule below that handles the high contrast case when there's no shading.
+Hiding the focus border also works around webkit bug https://code.google.com/p/chromium/issues/detail?id=125779.
+*/
+.dijitMenuItem:focus {
+	outline: none
+}
+
+.dijitMenuPassive .dijitMenuItemHover,
+.dijitMenuItemSelected {
+	/*
+	 * dijitMenuItemHover refers to actual mouse over
+	 * dijitMenuItemSelected is used after a menu has been "activated" by
+	 * clicking it, tabbing into it, or being opened from a parent menu,
+	 * and denotes that the menu item has focus or that focus is on a child
+	 * menu
+	 */
+	background-color:black;
+	color:white;
+}
+
+.dijitMenuItemIcon, .dijitMenuExpand {
+	background-repeat: no-repeat;
+}
+
+.dijitMenuItemDisabled * {
+	/* for a disabled menu item, just set it to mostly transparent */
+	opacity:0.5;
+	cursor:default;
+}
+.dj_ie .dj_a11y .dijitMenuItemDisabled,
+.dj_ie .dj_a11y .dijitMenuItemDisabled *,
+.dj_ie .dijitMenuItemDisabled * {
+	color: gray;
+	filter: alpha(opacity=35);
+}
+
+.dijitMenuItemLabel {
+	vertical-align: middle;
+}
+
+.dj_a11y .dijitMenuItemSelected {
+	border: 1px dotted black !important;	/* for 2.0 use outline instead, to prevent jitter */
+}
+
+.dj_a11y .dijitMenuItemSelected .dijitMenuItemLabel {
+	border-width: 1px;
+	border-style: solid;
+}
+.dj_ie8 .dj_a11y .dijitMenuItemLabel {
+	position:static;
+}
+
+.dijitMenuExpandA11y {
+	display: none;
+}
+.dj_a11y .dijitMenuExpandA11y {
+	display: inline;
+}
+
+.dijitMenuSeparator td {
+	border: 0;
+	padding: 0;
+}
+
+/* separator can be two pixels -- set border of either one to 0 to have only one */
+.dijitMenuSeparatorTop {
+	height: 50%;
+	margin: 0;
+	margin-top:3px;
+	font-size: 1px;
+}
+
+.dijitMenuSeparatorBottom {
+	height: 50%;
+	margin: 0;
+	margin-bottom:3px;
+	font-size: 1px;
+}
+
+/* CheckedMenuItem and RadioMenuItem */
+.dijitMenuItemIconChar {
+	display: none;		/* don't display except in high contrast mode */
+	visibility: hidden;	/* for high contrast mode when menuitem is unchecked: leave space for when it is checked */
+}
+.dj_a11y .dijitMenuItemIconChar {
+	display: inline;	/* display character in high contrast mode, since icon doesn't show */
+}
+.dijitCheckedMenuItemChecked .dijitMenuItemIconChar,
+.dijitRadioMenuItemChecked .dijitMenuItemIconChar {
+	visibility: visible; /* menuitem is checked */
+}
+.dj_ie .dj_a11y .dijitMenuBar .dijitMenuItem {
+	/* so bottom border of MenuBar appears on IE7 in high-contrast mode */
+	margin: 0;
+}
+
+/* StackContainer */
+
+.dijitStackController .dijitToggleButtonChecked * {
+	cursor: default;	/* because pressing it has no effect */
+}
+
+/***
+TabContainer
+
+Main class hierarchy:
+
+.dijitTabContainer - the whole TabContainer
+   .dijitTabController / .dijitTabListContainer-top - wrapper for tab buttons, scroll buttons
+	 .dijitTabListWrapper / .dijitTabContainerTopStrip - outer wrapper for tab buttons (normal width)
+		.nowrapTabStrip / .dijitTabContainerTop-tabs - inner wrapper for tab buttons (50K width)
+   .dijitTabPaneWrapper - wrapper for content panes, has all borders except the one between content and tabs
+***/
+
+.dijitTabContainer {
+    z-index: 0; /* so z-index settings below have no effect outside of the TabContainer */
+    overflow: visible; /* prevent off-by-one-pixel errors from hiding bottom border (opposite tab labels) */
+}
+.dj_ie6 .dijitTabContainer {
+    /* workaround IE6 problem when tall content overflows TabContainer, see editor/test_FullScreen.html */
+   overflow: hidden;
+
+}
+.dijitTabContainerNoLayout {
+	width: 100%;	/* otherwise ScrollingTabController goes to 50K pixels wide */
+}
+
+.dijitTabContainerBottom-tabs,
+.dijitTabContainerTop-tabs,
+.dijitTabContainerLeft-tabs,
+.dijitTabContainerRight-tabs {
+    z-index: 1;
+	overflow: visible !important;  /* so tabs can cover up border adjacent to container */
+}
+
+.dijitTabController {
+    z-index: 1;
+}
+.dijitTabContainerBottom-container,
+.dijitTabContainerTop-container,
+.dijitTabContainerLeft-container,
+.dijitTabContainerRight-container {
+	z-index:0;
+	overflow: hidden;
+	border: 1px solid black;
+}
+.nowrapTabStrip {
+	width: 50000px;
+	display: block;
+	position: relative;
+    text-align: left;  /* just in case ancestor has non-standard setting */
+    z-index: 1;
+}
+.dijitTabListWrapper {
+	overflow: hidden;
+    z-index: 1;
+}
+
+.dj_a11y .tabStripButton img {
+	/* hide the icons (or rather the empty space where they normally appear) because text will appear instead */
+	display: none;
+}
+
+.dijitTabContainerTop-tabs {
+	border-bottom: 1px solid black;
+}
+.dijitTabContainerTop-container {
+	border-top: 0;
+}
+
+.dijitTabContainerLeft-tabs {
+	border-right: 1px solid black;
+	float: left;    /* needed for IE7 RTL mode */
+}
+.dijitTabContainerLeft-container {
+	border-left: 0;
+}
+
+.dijitTabContainerBottom-tabs {
+	border-top: 1px solid black;
+}
+.dijitTabContainerBottom-container {
+	border-bottom: 0;
+}
+
+.dijitTabContainerRight-tabs {
+	border-left: 1px solid black;
+	float: left;    /* needed for IE7 RTL mode */
+}
+.dijitTabContainerRight-container {
+	border-right: 0;
+}
+
+div.dijitTabDisabled, .dj_ie div.dijitTabDisabled {
+	cursor: auto;
+}
+
+.dijitTab {
+	position:relative;
+	cursor:pointer;
+	-webkit-tap-highlight-color: transparent;
+	white-space:nowrap;
+	z-index:3;
+}
+.dijitTab * {
+	/* make tab icons and close icon line up w/text */
+	vertical-align: middle;
+}
+.dijitTabChecked {
+	cursor: default;	/* because clicking will have no effect */
+}
+
+.dijitTabContainerTop-tabs .dijitTab {
+	top: 1px;	/* to overlap border on .dijitTabContainerTop-tabs */
+}
+.dijitTabContainerBottom-tabs .dijitTab {
+	top: -1px;	/* to overlap border on .dijitTabContainerBottom-tabs */
+}
+.dijitTabContainerLeft-tabs .dijitTab {
+	left: 1px;	/* to overlap border on .dijitTabContainerLeft-tabs */
+}
+.dijitTabContainerRight-tabs .dijitTab {
+	left: -1px;	/* to overlap border on .dijitTabContainerRight-tabs */
+}
+
+
+.dijitTabContainerTop-tabs .dijitTab,
+.dijitTabContainerBottom-tabs .dijitTab {
+	/* Inline-block */
+	display:inline-block;			/* webkit and FF3 */
+	#zoom: 1; /* set hasLayout:true to mimic inline-block */
+	#display:inline; /* don't use .dj_ie since that increases the priority */
+}
+
+.tabStripButton {
+	z-index: 12;
+}
+
+.dijitTabButtonDisabled .tabStripButton {
+	display: none;
+}
+
+
+.dijitTabCloseButton {
+	margin-left: 1em;
+}
+
+.dijitTabCloseText {
+	display:none;
+}
+
+.dijitTab .tabLabel {
+	/* make sure tabs w/close button and w/out close button are same height, even w/small (<15px) font.
+	 * assumes <=15px height for close button icon.
+	 */
+	min-height: 15px;
+	display: inline-block;
+}
+.dijitNoIcon {
+	/* applied to <img>/<span> node when there is no icon specified */
+	display: none;
+}
+.dj_ie6 .dijitTab .dijitNoIcon {
+	/* because min-height (on .tabLabel, above) doesn't work on IE6 */
+	display: inline;
+	height: 15px;
+	width: 1px;
+}
+
+/* images off, high-contrast mode styles */
+
+.dj_a11y .dijitTabCloseButton {
+	background-image: none !important;
+	width: auto !important;
+	height: auto !important;
+}
+
+.dj_a11y .dijitTabCloseText {
+	display: inline;
+}
+
+.dijitTabPane,
+.dijitStackContainer-child,
+.dijitAccordionContainer-child {
+	/* children of TabContainer, StackContainer, and AccordionContainer shouldn't have borders
+	 * b/c a border is already there from the TabContainer/StackContainer/AccordionContainer itself.
+	 */
+    border: none !important;
+}
+
+/* InlineEditBox */
+.dijitInlineEditBoxDisplayMode {
+	border: 1px solid transparent;	/* so keyline (border) on hover can appear without screen jump */
+	cursor: text;
+}
+
+.dj_a11y .dijitInlineEditBoxDisplayMode,
+.dj_ie6 .dijitInlineEditBoxDisplayMode {
+	/* except that IE6 doesn't support transparent borders, nor does high contrast mode */
+	border: none;
+}
+
+.dijitInlineEditBoxDisplayModeHover,
+.dj_a11y .dijitInlineEditBoxDisplayModeHover,
+.dj_ie6 .dijitInlineEditBoxDisplayModeHover {
+	/* An InlineEditBox in view mode (click this to edit the text) */
+	background-color: #e2ebf2;
+	border: solid 1px black;
+}
+
+.dijitInlineEditBoxDisplayModeDisabled {
+	cursor: default;
+}
+
+/* Tree */
+.dijitTree {
+	overflow: auto;	/* for scrollbars when Tree has a height setting, and to prevent wrapping around float elements, see #11491 */
+	-webkit-tap-highlight-color: transparent;
+}
+
+.dijitTreeContainer {
+	float: left;	/* for correct highlighting during horizontal scroll, see #16132 */
+}
+
+.dijitTreeIndent {
+	/* amount to indent each tree node (relative to parent node) */
+	width: 19px;
+}
+
+.dijitTreeRow, .dijitTreeContent {
+	white-space: nowrap;
+}
+
+.dj_ie .dijitTreeLabel:focus {
+	/* workaround IE9 behavior where down arrowing through TreeNodes doesn't show focus outline */
+	outline: 1px dotted black;
+}
+
+.dijitTreeRow img {
+	/* make the expando and folder icons line up with the label */
+	vertical-align: middle;
+}
+
+.dijitTreeContent {
+    cursor: default;
+}
+
+.dijitExpandoText {
+	display: none;
+}
+
+.dj_a11y .dijitExpandoText {
+	display: inline;
+	padding-left: 10px;
+	padding-right: 10px;
+	font-family: monospace;
+	border-style: solid;
+	border-width: thin;
+	cursor: pointer;
+}
+
+.dijitTreeLabel {
+	margin: 0 4px;
+}
+
+/* Dialog */
+
+.dijitDialog {
+	position: absolute;
+	z-index: 999;
+	overflow: hidden;	/* override overflow: auto; from ContentPane to make dragging smoother */
+}
+
+.dijitDialogTitleBar {
+	cursor: move;
+}
+.dijitDialogFixed .dijitDialogTitleBar {
+	cursor:default;
+}
+.dijitDialogCloseIcon {
+	cursor: pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+.dijitDialogPaneContent {
+	-webkit-overflow-scrolling: touch;
+}
+.dijitDialogUnderlayWrapper {
+	position: absolute;
+	left: 0;
+	top: 0;
+	z-index: 998;
+	display: none;
+	background: transparent !important;
+}
+
+.dijitDialogUnderlay {
+	background: #eee;
+	opacity: 0.5;
+}
+
+.dj_ie .dijitDialogUnderlay {
+	filter: alpha(opacity=50);
+}
+
+/* images off, high-contrast mode styles */
+.dj_a11y .dijitSpinnerButtonContainer,
+.dj_a11y .dijitDialog {
+	opacity: 1 !important;
+	background-color: white !important;
+}
+
+.dijitDialog .closeText {
+	display:none;
+	/* for the onhover border in high contrast on IE: */
+	position:absolute;
+}
+
+.dj_a11y .dijitDialog .closeText {
+	display:inline;
+}
+
+/* Slider */
+
+.dijitSliderMoveable {
+	z-index:99;
+	position:absolute !important;
+	display:block;
+	vertical-align:middle;
+}
+
+.dijitSliderMoveableH {
+	right:0;
+}
+.dijitSliderMoveableV {
+	right:50%;
+}
+
+.dj_a11y div.dijitSliderImageHandle,
+.dijitSliderImageHandle {
+	margin:0;
+	padding:0;
+	position:relative !important;
+	border:8px solid gray;
+	width:0;
+	height:0;
+	cursor: pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+.dj_iequirks .dj_a11y .dijitSliderImageHandle {
+	font-size: 0;
+}
+.dj_ie7 .dijitSliderImageHandle {
+	overflow: hidden; /* IE7 workaround to make slider handle VISIBLE in non-a11y mode */
+}
+.dj_ie7 .dj_a11y .dijitSliderImageHandle {
+	overflow: visible; /* IE7 workaround to make slider handle VISIBLE in a11y mode */
+}
+.dj_a11y .dijitSliderFocused .dijitSliderImageHandle {
+	border:4px solid #000;
+	height:8px;
+	width:8px;
+}
+
+.dijitSliderImageHandleV {
+	top:-8px;
+	right: -50%;
+}
+
+.dijitSliderImageHandleH {
+	left:50%;
+	top:-5px;
+	vertical-align:top;
+}
+
+.dijitSliderBar {
+	border-style:solid;
+	border-color:black;
+	cursor: pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+
+.dijitSliderBarContainerV {
+	position:relative;
+	height:100%;
+	z-index:1;
+}
+
+.dijitSliderBarContainerH {
+	position:relative;
+	z-index:1;
+}
+
+.dijitSliderBarH {
+	height:4px;
+	border-width:1px 0;
+}
+
+.dijitSliderBarV {
+	width:4px;
+	border-width:0 1px;
+}
+
+.dijitSliderProgressBar {
+	background-color:red;
+	z-index:1;
+}
+
+.dijitSliderProgressBarV {
+	position:static !important;
+	height:0;
+	vertical-align:top;
+	text-align:left;
+}
+
+.dijitSliderProgressBarH {
+	position:absolute !important;
+	width:0;
+	vertical-align:middle;
+	overflow:visible;
+}
+
+.dijitSliderRemainingBar {
+	overflow:hidden;
+	background-color:transparent;
+	z-index:1;
+}
+
+.dijitSliderRemainingBarV {
+	height:100%;
+	text-align:left;
+}
+
+.dijitSliderRemainingBarH {
+	width:100% !important;
+}
+
+/* the slider bumper is the space consumed by the slider handle when it hangs over an edge */
+.dijitSliderBumper {
+	overflow:hidden;
+	z-index:1;
+}
+
+.dijitSliderBumperV {
+	width:4px;
+	height:8px;
+	border-width:0 1px;
+}
+
+.dijitSliderBumperH {
+	width:8px;
+	height:4px;
+	border-width:1px 0;
+}
+
+.dijitSliderBottomBumper,
+.dijitSliderLeftBumper {
+	background-color:red;
+}
+
+.dijitSliderTopBumper,
+.dijitSliderRightBumper {
+	background-color:transparent;
+}
+
+.dijitSliderDecoration {
+	text-align:center;
+}
+
+.dijitSliderDecorationC,
+.dijitSliderDecorationV {
+	position: relative; /* needed for IE+quirks+RTL+vertical (rendering bug) but add everywhere for custom styling consistency but this messes up IE horizontal sliders */
+}
+
+.dijitSliderDecorationH {
+	width: 100%;
+}
+
+.dijitSliderDecorationV {
+	height: 100%;
+	white-space: nowrap;
+}
+
+.dijitSliderButton {
+	font-family:monospace;
+	margin:0;
+	padding:0;
+	display:block;
+}
+
+.dj_a11y .dijitSliderButtonInner {
+	visibility:visible !important;
+}
+
+.dijitSliderButtonContainer {
+	text-align:center;
+	height:0;	/* ??? */
+}
+.dijitSliderButtonContainer * {
+	cursor: pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+
+.dijitSlider .dijitButtonNode {
+	padding:0;
+	display:block;
+}
+
+.dijitRuleContainer {
+	position:relative;
+	overflow:visible;
+}
+
+.dijitRuleContainerV {
+	height:100%;
+	line-height:0;
+	float:left;
+	text-align:left;
+}
+
+.dj_opera .dijitRuleContainerV {
+	line-height:2%;
+}
+
+.dj_ie .dijitRuleContainerV {
+	line-height:normal;
+}
+
+.dj_gecko .dijitRuleContainerV {
+	margin:0 0 1px 0; /* mozilla bug workaround for float:left,height:100% block elements */
+}
+
+.dijitRuleMark {
+	position:absolute;
+	border:1px solid black;
+	line-height:0;
+	height:100%;
+}
+
+.dijitRuleMarkH {
+	width:0;
+	border-top-width:0 !important;
+	border-bottom-width:0 !important;
+	border-left-width:0 !important;
+}
+
+.dijitRuleLabelContainer {
+	position:absolute;
+}
+
+.dijitRuleLabelContainerH {
+	text-align:center;
+	display:inline-block;
+}
+
+.dijitRuleLabelH {
+	position:relative;
+	left:-50%;
+}
+
+.dijitRuleLabelV {
+	/* so that long labels don't overflow to multiple rows, or overwrite slider itself */
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.dijitRuleMarkV {
+	height:0;
+	border-right-width:0 !important;
+	border-bottom-width:0 !important;
+	border-left-width:0 !important;
+	width:100%;
+	left:0;
+}
+
+.dj_ie .dijitRuleLabelContainerV {
+	margin-top:-.55em;
+}
+
+.dj_a11y .dijitSliderReadOnly,
+.dj_a11y .dijitSliderDisabled {
+	opacity:0.6;
+}
+.dj_ie .dj_a11y .dijitSliderReadOnly .dijitSliderBar,
+.dj_ie .dj_a11y .dijitSliderDisabled .dijitSliderBar {
+	filter: alpha(opacity=40);
+}
+
+/* + and - Slider buttons: override theme settings to display icons */
+.dj_a11y .dijitSlider .dijitSliderButtonContainer div {
+	font-family: monospace; /* otherwise hyphen is larger and more vertically centered */
+	font-size: 1em;
+	line-height: 1em;
+	height: auto;
+	width: auto;
+	margin: 0 4px;
+}
+
+/* Icon-only buttons (often in toolbars) still display the text in high-contrast mode */
+.dj_a11y .dijitButtonContents .dijitButtonText,
+.dj_a11y .dijitTab .tabLabel {
+	display: inline !important;
+}
+.dj_a11y .dijitSelect .dijitButtonText {
+	display: inline-block !important;
+}
+
+/* TextArea, SimpleTextArea */
+.dijitTextArea {
+	width:100%;
+	overflow-y: auto;	/* w/out this IE's SimpleTextArea goes to overflow: scroll */
+}
+.dijitTextArea[cols] {
+	width:auto; /* SimpleTextArea cols */
+}
+.dj_ie .dijitTextAreaCols {
+	width:auto;
+}
+
+.dijitExpandingTextArea {
+	/* for auto exanding textarea (called Textarea currently, rename for 2.0) don't want to display the grip to resize */
+	resize: none;
+}
+
+
+/* Toolbar
+ * Note that other toolbar rules (for objects in toolbars) are scattered throughout this file.
+ */
+
+.dijitToolbarSeparator {
+	height: 18px;
+	width: 5px;
+	padding: 0 1px;
+	margin: 0;
+}
+
+/* Editor */
+.dijitIEFixedToolbar {
+	position:absolute;
+	/* top:0; */
+	top: expression(eval((document.documentElement||document.body).scrollTop));
+}
+
+.dijitEditor {
+	display: block;	/* prevents glitch on FF with InlineEditBox, see #8404 */
+}
+
+.dijitEditorDisabled,
+.dijitEditorReadOnly {
+	color: gray;
+}
+
+/* TimePicker */
+
+.dijitTimePicker {
+	background-color: white;
+}
+.dijitTimePickerItem {
+	cursor:pointer;
+	-webkit-tap-highlight-color: transparent;
+}
+.dijitTimePickerItemHover {
+	background-color:gray;
+	color:white;
+}
+.dijitTimePickerItemSelected {
+	font-weight:bold;
+	color:#333;
+	background-color:#b7cdee;
+}
+.dijitTimePickerItemDisabled {
+	color:gray;
+	text-decoration:line-through;
+}
+
+.dijitTimePickerItemInner {
+	text-align:center;
+	border:0;
+	padding:2px 8px 2px 8px;
+}
+
+.dijitTimePickerTick,
+.dijitTimePickerMarker {
+	border-bottom:1px solid gray;
+}
+
+.dijitTimePicker .dijitDownArrowButton {
+	border-top: none !important;
+}
+
+.dijitTimePickerTick {
+	color:#CCC;
+}
+
+.dijitTimePickerMarker {
+	color:black;
+	background-color:#CCC;
+}
+
+.dj_a11y .dijitTimePickerItemSelected .dijitTimePickerItemInner {
+	border: solid 4px black;
+}
+.dj_a11y .dijitTimePickerItemHover .dijitTimePickerItemInner {
+	border: dashed 4px black;
+}
+
+
+.dijitToggleButtonIconChar {
+	/* character (instead of icon) to show that ToggleButton is checked */
+	display:none !important;
+}
+.dj_a11y .dijitToggleButton .dijitToggleButtonIconChar {
+	display:inline !important;
+	visibility:hidden;
+}
+.dj_ie6 .dijitToggleButtonIconChar, .dj_ie6 .tabStripButton .dijitButtonText {
+	font-family: "Arial Unicode MS";	/* otherwise the a11y character (checkmark, arrow, etc.) appears as a box */
+}
+.dj_a11y .dijitToggleButtonChecked .dijitToggleButtonIconChar {
+	display: inline !important; /* In high contrast mode, display the check symbol */
+	visibility:visible !important;
+}
+
+.dijitArrowButtonChar {
+	display:none !important;
+}
+.dj_a11y .dijitArrowButtonChar {
+	display:inline !important;
+}
+
+.dj_a11y .dijitDropDownButton .dijitArrowButtonInner,
+.dj_a11y .dijitComboButton .dijitArrowButtonInner {
+	display:none !important;
+}
+
+/* Select */
+.dj_a11y .dijitSelect {
+	border-collapse: separate !important;
+	border-width: 1px;
+	border-style: solid;
+}
+.dj_ie .dijitSelect {
+	vertical-align: middle; /* Set this back for what we hack in dijit inline */
+}
+.dj_ie6 .dijitSelect .dijitValidationContainer,
+.dj_ie8 .dijitSelect .dijitButtonText {
+	vertical-align: top;
+}
+.dj_ie6 .dijitTextBox .dijitInputContainer,
+.dj_iequirks .dijitTextBox .dijitInputContainer,
+.dj_ie6 .dijitTextBox .dijitArrowButtonInner,
+.dj_ie6 .dijitSpinner .dijitSpinnerButtonInner,
+.dijitSelect .dijitSelectLabel {
+	vertical-align: baseline;
+}
+
+.dijitNumberTextBox {
+	text-align: left;
+	direction: ltr;
+}
+
+.dijitNumberTextBox .dijitInputInner {
+	text-align: inherit; /* input */
+}
+
+.dijitNumberTextBox input.dijitInputInner,
+.dijitCurrencyTextBox input.dijitInputInner,
+.dijitSpinner input.dijitInputInner {
+	text-align: right;
+}
+
+.dj_ie8 .dijitNumberTextBox input.dijitInputInner, .dj_ie9 .dijitNumberTextBox input.dijitInputInner,
+.dj_ie8 .dijitCurrencyTextBox input.dijitInputInner, .dj_ie9 .dijitCurrencyTextBox input.dijitInputInner,
+.dj_ie8 .dijitSpinner input.dijitInputInner, .dj_ie9 .dijitSpinner input.dijitInputInner {
+	/* workaround bug where caret invisible in empty textboxes */
+	padding-right: 1px !important;
+}
+
+.dijitToolbar .dijitSelect {
+	margin: 0;
+}
+.dj_webkit .dijitToolbar .dijitSelect {
+	padding-left: 0.3em;
+}
+.dijitSelect .dijitButtonContents {
+	padding: 0;
+	white-space: nowrap;
+	text-align: left;
+	border-style: none solid none none;
+	border-width: 1px;
+}
+.dijitSelectFixedWidth .dijitButtonContents {
+	width: 100%;
+}
+
+.dijitSelectMenu .dijitMenuItemIcon {
+	/* avoid blank area in left side of menu (since we have no icons) */
+	display:none;
+}
+.dj_ie6 .dijitSelectMenu .dijitMenuItemLabel,
+.dj_ie7 .dijitSelectMenu .dijitMenuItemLabel {
+	/* Set back to static due to bug in ie6/ie7 - See Bug #9651 */
+	position: static;
+}
+
+/* Fix the baseline of our label (for multi-size font elements) */
+.dijitSelectLabel *
+{
+	vertical-align: baseline;
+}
+
+/* Styling for the currently-selected option (rich text can mess this up) */
+.dijitSelectSelectedOption * {
+	font-weight: bold;
+}
+
+/* Fix the styling of the dropdown menu to be more combobox-like */
+.dijitSelectMenu {
+	border-width: 1px;
+}
+
+/* Used in cases, such as FullScreen plugin, when we need to force stuff to static positioning. */
+.dijitForceStatic {
+	position: static !important;
+}
+
+/**** Disabled cursor *****/
+.dijitReadOnly *,
+.dijitDisabled *,
+.dijitReadOnly,
+.dijitDisabled {
+	/* a region the user would be able to click on, but it's disabled */
+	cursor: default;
+}
+
+/* Drag and Drop */
+.dojoDndItem {
+    padding: 2px;  /* will be replaced by border during drag over (dojoDndItemBefore, dojoDndItemAfter) */
+
+	/* Prevent magnifying-glass text selection icon to appear on mobile webkit as it causes a touchout event */
+	-webkit-touch-callout: none;
+	-webkit-user-select: none; /* Disable selection/Copy of UIWebView */
+}
+.dojoDndHorizontal .dojoDndItem {
+    /* make contents of horizontal container be side by side, rather than vertical */
+    #display: inline;
+    display: inline-block;
+}
+
+.dojoDndItemBefore,
+.dojoDndItemAfter {
+	border: 0px solid #369;
+}
+.dojoDndItemBefore {
+    border-width: 2px 0 0 0;
+    padding: 0 2px 2px 2px;
+}
+.dojoDndItemAfter {
+    border-width: 0 0 2px 0;
+    padding: 2px 2px 0 2px;
+}
+.dojoDndHorizontal .dojoDndItemBefore {
+    border-width: 0 0 0 2px;
+    padding: 2px 2px 2px 0;
+}
+.dojoDndHorizontal .dojoDndItemAfter {
+    border-width: 0 2px 0 0;
+    padding: 2px 0 2px 2px;
+}
+
+.dojoDndItemOver {
+	cursor:pointer;
+}
+.dj_gecko .dijitArrowButtonInner INPUT,
+.dj_gecko INPUT.dijitArrowButtonInner {
+	-moz-user-focus:ignore;
+}
+.dijitFocused .dijitMenuItemShortcutKey {
+	text-decoration: underline;
+}
diff --git a/src/main/resources/static/dijit/themes/dijit_rtl.css b/src/main/resources/static/dijit/themes/dijit_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..13bea86c651b1d00e3694799b8aacb7f3740d899
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/dijit_rtl.css
@@ -0,0 +1,185 @@
+.dijitRtl .dijitOffScreen {
+	/* align on the right side rather than the left so no horizontal scroll bar shown */
+	left: auto !important;
+	right: -10000px !important;
+}
+
+.dijitRtl .dijitPlaceHolder {
+	left: auto;
+	right: 0;
+}
+
+/* Menu */
+
+.dijitMenuItemRtl {
+	text-align: right;
+}
+
+/* Button */
+
+.dj_iequirks .dijitComboButtonRtl button {
+	/* workaround bug where label invisible (themeTesterQuirk.html?dir=rtl) */
+	float:left;
+}
+.dj_ie .dijitTextBoxRtl .dijitInputContainer {
+	clear: right;
+}
+
+/* TextBox, ComboBox, Spinner */
+
+.dijitTextBoxRtl .dijitValidationContainer,
+.dijitTextBoxRtl .dijitSpinnerButtonContainer,
+.dijitComboBoxRtl .dijitArrowButtonContainer {
+	/* combobox and spinner: line between the input area and the drop down button */
+	border-right-width: 1px !important;
+	border-left-width: 0 !important;
+}
+
+.dijitSpinnerRtl .dijitSpinnerButtonContainer .dijitArrowButton {
+	right: 0;
+	left: auto;
+}
+
+.dijitSelectRtl .dijitButtonText {
+	float: right;
+}
+
+.dijitTextBoxRtl .dijitSpinnerButtonContainer,
+.dijitValidationTextBoxRtl .dijitValidationContainer,
+.dijitTextBoxRtl .dijitArrowButtonContainer {
+	float: left;
+}
+
+div.dijitNumberTextBoxRtl {
+	text-align: right;
+}
+
+/* Calendar */
+
+.dijitCalendarRtl .dijitCalendarDecrementArrow {
+	float: right;
+}
+
+.dijitCalendarRtl .dijitCalendarIncrementArrow {
+	float: left;
+}
+
+.dijitCalendarRtl .dijitCalendarNextYear {
+	margin:0 0.55em 0 0;
+}
+
+.dijitCalendarRtl .dijitCalendarPreviousYear {
+	margin:0 0 0 0.55em;
+}
+
+
+/* Slider */
+
+.dijitSliderRtl .dijitSliderImageHandleV {
+	left:auto;
+}
+
+.dijitSliderRtl .dijitSliderImageHandleH {
+	left:-50%;
+}
+
+.dijitSliderRtl .dijitSliderMoveableH {
+	right:auto;
+	left:0;
+}
+
+.dijitSliderRtl .dijitRuleContainerV {
+	float:right;
+}
+
+.dj_ie .dijitSliderRtl .dijitRuleContainerV {
+	text-align:right;
+}
+
+.dj_ie .dijitSliderRtl .dijitRuleLabelV {
+	text-align:left;
+}
+
+.dj_ie .dijitSliderRtl .dijitRuleLabelH {
+	zoom:1;
+}
+
+.dijitSliderRtl .dijitSliderProgressBarH {
+	/* workarounds for IE and FF */
+	float:right;
+	right:0;
+	left:auto;
+}
+
+/* ContentPane*/
+
+.dijitRtl .dijitContentPaneLoading .dijitIconLoading,
+.dijitRtl .dijitContentPaneError .dijitIconError {
+	margin-right: 0;
+	margin-left: 9px;
+}
+
+/* TabContainer */
+
+.dijitTabControllerRtl .nowrapTabStrip {
+    text-align: right;  /* just in case ancestor has non-standard setting */
+}
+.dijitTabRtl .dijitTabCloseButton {
+	margin-left: 0;
+	margin-right: 1em;
+}
+.dj_ie6 .dijitTabRtl .tabLabel,
+.dj_ie6 .dijitTabContainerRight-tabs .dijitTabRtl,
+.dj_ie6 .dijitTabContainerLeft-tabs .dijitTabRtl,
+.dj_ie7 .dijitTabContainerRight-tabs .dijitTabRtl,
+.dj_ie7 .dijitTabContainerLeft-tabs .dijitTabRtl {
+	zoom: 1;
+}
+.dj_ie6 .dijitTabContainerRight-tabs .dijitTabRtl,
+.dj_ie7 .dijitTabContainerRight-tabs .dijitTabRtl {
+    left: 0;
+}
+
+.dj_ie6 .dijitTabContainerRightRtl .dijitTabContainerRight-tabs,
+.dj_ie6 .dijitTabContainerLeftRtl .dijitTabContainerLeft-tabs {
+    /* otherwise tab labels invisible */
+	width: 1%;
+}
+
+/* TimePicker */
+.dj_ie .dijitTimePickerRtl .dijitTimePickerItem {
+	width:100%;
+}
+
+
+/* ColorPalette */
+.dijitColorPaletteRtl .dijitColorPaletteUnder {
+	/* needed in RTL mode when DropDownButton expands the ColorPalette beyond it's natural width */
+	left: auto;
+	right: 0;
+}
+
+/* Select */
+.dijitSelectRtl .dijitButtonContents {
+	border-style: none none none solid;
+	text-align: right;
+}
+
+/* Tree */
+
+.dijitTreeRtl .dijitTreeContainer {
+	float: right;	/* for correct highlighting during horizontal scroll, see #16132 */
+}
+
+/* DnD
+ * These rules should apply for containers that are dir=rtl (either set directly, or inherited)
+ * but seems the best we can do is look for .dijitRtl on an ancestor node.
+ */
+.dijitRtl .dojoDndHorizontal .dojoDndItemBefore {
+    border-width: 0 2px 0 0;
+    padding: 2px 0 2px 2px;
+}
+.dijitRtl .dojoDndHorizontal .dojoDndItemAfter {
+    border-width: 0 0 0 2px;
+    padding: 2px 2px 2px 0;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/Calendar.css b/src/main/resources/static/dijit/themes/nihilo/Calendar.css
new file mode 100644
index 0000000000000000000000000000000000000000..d3ef3a8aead0342be6d3b88232e9917118927382
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Calendar.css
@@ -0,0 +1,160 @@
+/* Calendar*/
+
+.nihilo .dijitCalendarIncrementControl {
+	/* next/prev month buttons */
+	width:15px;
+	height:15px;
+	background-image: url("images/spriteRoundedIconsSmall.png");
+	background-repeat: no-repeat
+}
+.dj_ie6 .nihilo .dijitCalendarIncrementControl {
+	font-size:.1em;
+	background-image: url("images/spriteRoundedIconsSmall.gif");
+}
+
+.nihilo .dijitA11ySideArrow {
+	display: none;
+}
+
+.nihilo .dijitCalendarDecrease {
+	background-position: top left;
+}
+.nihilo .dijitCalendarIncrease {
+	background-position: -30px top;
+}
+
+.nihilo table.dijitCalendarContainer {
+	font-size: 100%;
+	border-spacing: 0;
+	border-collapse: separate;
+	margin: 0;
+}
+
+.nihilo .dijitCalendarMonthContainer {
+	/* month header cell */
+	background:#d3d3d3 url("images/titleBar.png") repeat-x top;
+	padding-top:.3em;
+	padding-bottom:.2em;
+	text-align:center;
+}
+.dj_ie6 .nihilo .dijitCalendarMonthContainer th {
+	padding-top:.2em;
+	padding-bottom:.1em;
+}
+
+.nihilo .dijitCalendarDayLabelTemplate {
+	/* day of week labels */
+	background:#fefefe;
+	font-weight:normal;
+	padding-top:.15em;
+	padding-bottom:.2em;
+	border-bottom: 1px solid #eeeeee;
+	color:#293a4b;
+	text-align:center;
+}
+
+.nihilo .dijitCalendarBodyContainer {
+	border-bottom: 1px solid #eeeeee;
+}
+
+.nihilo .dijitCalendarMonthLabel {
+	color:#293a4b;
+	font-weight: bold;
+	padding: 0 4px;
+}
+
+.nihilo .dijitCalendarDateTemplate {
+	/* style for each day cell */
+	font-size: 0.9em;
+	font-weight: bold;
+	text-align: center;
+	padding: 0.3em 0.3em 0.05em 0.3em;
+	letter-spacing: 1px;
+	background-color: #fdfdfd;
+	border:#fdfdfd solid 1px !important;
+}
+
+.dj_ie .nihilo .dijitCalendarDateTemplate {
+	padding: 0.1em .33em 0.02em .33em;
+}
+
+.nihilo .dijitCalendarPreviousMonth,
+.nihilo .dijitCalendarNextMonth 		{
+	/* days that are part of the previous or next month */
+	color:#999999;
+	background-color:#f5f5f5 !important;
+	border:#f5f5f5 solid 1px !important;
+}
+
+.nihilo .dijitCalendarCurrentMonth {
+	/* days that are part of this month */
+}
+
+.nihilo .dijitCalendarDisabledDate {
+	text-decoration:line-through !important;
+}
+
+.nihilo .dijitCalendarCurrentDate {
+	/* cell for today's date */
+	text-decoration:underline;
+	font-weight:bold;
+}
+
+.nihilo .dijitCalendarSelectedDate {
+	/* cell for the selected date */
+	background-color:#ffe284 !important;
+	color:black !important;
+	border:#f7c95c solid 1px !important;
+}
+
+
+.nihilo .dijitCalendarYearContainer {
+	/* footer of the table that contains the year display/selector */
+	background:white url("images/titleBar.png") repeat-x top;
+}
+
+.nihilo .dijitCalendarYearLabel {
+	/* container for all of 3 year labels */
+	margin:0;
+	padding:0.4em 0 0.25em 0;
+	text-align:center;
+	font-size: 1.17em;
+}
+
+.nihilo .dijitCalendarSelectedYear {
+	/* label for selected year */
+	font-weight:bolder;
+	color:black;
+	padding:0.2em;
+	padding-bottom:0.1em;
+	background-color:#ffe284 !important;
+	border:#f7c95c solid 1px !important;
+}
+
+.nihilo .dijitCalendarNextYear,
+.nihilo .dijitCalendarPreviousYear {
+	/* label for next/prev years */
+	color:black !important;
+	font-weight:normal;
+}
+
+/* Styling for month DropDownButton */
+
+.nihilo .dijitCalendar .dijitDropDownButton {
+	margin: 0;
+}
+.nihilo .dijitCalendar .dijitButtonText {
+	padding: 0;
+}
+.nihilo .dijitCalendar .dijitDropDownButton .dijitButtonNode {
+	background-color: transparent;
+	background-image: none;
+	padding: 0;
+}
+
+/* Styling for month drop down list */
+
+.nihilo .dijitCalendarMonthMenu .dijitCalendarMonthLabelHover {
+	background-color: #ffe284;
+	color: #243C5F;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/Calendar_rtl.css b/src/main/resources/static/dijit/themes/nihilo/Calendar_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..6fc06f4e3088b0911f49b29d92836113b9cfcafa
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Calendar_rtl.css
@@ -0,0 +1,9 @@
+/* Calendar */
+
+.dijitRtl .nihilo .dijitCalendarDecrease {
+	background-position: -30px top;
+}
+
+.dijitRtl .nihilo .dijitCalendarIncrease {
+	background-position: 0 top;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/ColorPalette.css b/src/main/resources/static/dijit/themes/nihilo/ColorPalette.css
new file mode 100644
index 0000000000000000000000000000000000000000..8fbe9d7ef7f4283aa4faa485349a0d309d9ebe93
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/ColorPalette.css
@@ -0,0 +1,5 @@
+.dijitColorPalette {
+	border:1px solid #d3d3d3;
+	background:#fff;
+	-moz-border-radius: 0 !important;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/Common.css b/src/main/resources/static/dijit/themes/nihilo/Common.css
new file mode 100644
index 0000000000000000000000000000000000000000..1a1c7f9309ec609e8f4b7bf41d9a8bae7111a0a6
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Common.css
@@ -0,0 +1,15 @@
+.nihilo .dojoDndItemOver {
+	background-image: url(images/treeHover.png);
+}
+
+/* DnD avatar-specific settings */
+/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */
+.nihilo table.dojoDndAvatar { -moz-border-radius: 0; border: 1px solid #ccc; border-collapse: collapse; background-color: #fff; font-size: 75%; color: black;}
+.nihilo .dojoDndAvatar td	{ border: none; }
+.nihilo .dojoDndAvatar tr	{ border: none; }
+.nihilo .dojoDndAvatarHeader td	{ height: 20px; padding: 0 0 0 21px; }
+.nihilo .dojoDndAvatarItem td { padding: 2px;}
+.nihilo.dojoDndMove .dojoDndAvatarHeader	{background-color: #f58383; background-image: url(images/dndNoMove.png); background-repeat: no-repeat; background-position: 2px center;}
+.nihilo.dojoDndCopy .dojoDndAvatarHeader	{background-color: #f58383; background-image: url(images/dndNoCopy.png); background-repeat: no-repeat; background-position: 2px center;}
+.nihilo.dojoDndMove .dojoDndAvatarCanDrop .dojoDndAvatarHeader	{background-color: #97e68d; background-image: url(images/dndMove.png); background-repeat: no-repeat; background-position: 2px center;}
+.nihilo.dojoDndCopy .dojoDndAvatarCanDrop .dojoDndAvatarHeader	{background-color: #97e68d; background-image: url(images/dndCopy.png); background-repeat: no-repeat; background-position: 2px center;}
diff --git a/src/main/resources/static/dijit/themes/nihilo/Dialog.css b/src/main/resources/static/dijit/themes/nihilo/Dialog.css
new file mode 100644
index 0000000000000000000000000000000000000000..248260467de6d41f684d636ae70baffc17aef1fe
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Dialog.css
@@ -0,0 +1,144 @@
+/* Dialog */
+
+.nihilo .dijitDialog {
+	background: #eee;
+	border: 1px solid #d3d3d3;
+	-webkit-box-shadow: 0 5px 10px #adadad;
+	padding: 0;
+}
+
+.nihilo .dijitDialog .dijitDialogTitle {
+	/* typography and styling of the dialog title */
+	font-size: 0.9em;
+	color: #243C5F;
+	font-weight: bold;
+	padding: 0 4px;
+}
+
+.nihilo .dijitDialog .dijitDialogPaneContent {
+	background: #ffffff;
+	border-top: 1px solid #d3d3d3;
+	padding:10px;
+
+}
+
+.nihilo .dijitDialogTitleBar {
+	/* outer container for the titlebar of the dialog */
+	background: #fafafa url("images/titleBar.png") repeat-x top left;
+	padding: 5px 6px 3px 6px;
+	outline:0; /* remove this line if keyboard focus on dialog startup is an issue. tab still takes you to first focusable element */
+}
+
+.nihilo .dijitDialogCloseIcon {
+	/* the default close icon for the dialog */
+	background-image: url("images/spriteRoundedIconsSmall.png");
+	background-repeat: no-repeat;
+	background-position: -60px 0;
+	position: absolute;
+	vertical-align: middle;
+	right: 6px;
+	top: 4px;
+	height: 15px;
+	width: 15px;
+}
+.dj_ie6 .nihilo .dijitDialogCloseIcon {
+	background-image: url("images/spriteRoundedIconsSmall.gif");
+}
+.nihilo .dijitDialogCloseIconHover {
+	background-position: -60px -15px;
+}
+
+/* Tooltip and TooltipDialog */
+
+.nihilo .dijitTooltip,
+.nihilo .dijitTooltipDialog {
+	/* the outermost dom node, holding the connector and container */
+	background: transparent;	/* make the area on the sides of the arrow transparent */
+}
+
+.dijitTooltipBelow {
+	/* leave room for arrow above content */
+	padding-top: 10px;
+}
+
+.dijitTooltipAbove {
+	/* leave room for arrow below content */
+	padding-bottom: 10px;
+}
+
+.nihilo .dijitTooltipContainer {
+	/* The part with the text. */
+	background-color: #fff;
+	border:1px solid #d3d3d3;
+	padding:0.45em;
+}
+
+.nihilo .dijitTooltipConnector {
+	/* the arrow piece */
+	border:0;
+	z-index: 2;
+}
+
+.nihilo .dijitTooltipABRight .dijitTooltipConnector {
+	/* above or below tooltip, but the arrow appears on the right,
+		and the right edges of target and tooltip are aligned rather than the left */
+	left: auto !important;
+	right: 6px;
+}
+
+.nihilo .dijitTooltipBelow .dijitTooltipConnector {
+	/* the arrow piece for tooltips below an element */
+	top: 0;
+	left: 6px;
+	background:url("images/tooltipConnectorUp.png") no-repeat top left;
+	width:17px;
+	height:11px;
+}
+
+.dj_ie .nihilo .dijitTooltipBelow .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorUp.gif");
+}
+
+.nihilo .dijitTooltipAbove .dijitTooltipConnector {
+	/* the arrow piece for tooltips above an element */
+	bottom: 0;
+	left: 6px;
+	background:url("images/tooltipConnectorDown.png") no-repeat top left;
+	width:17px;
+	height:11px;
+}
+.dj_ie .nihilo .dijitTooltipAbove .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorDown.gif");
+}
+.dj_ie6 .nihilo .dijitTooltipAbove .dijitTooltipConnector {
+	bottom: -5px;
+}
+
+.nihilo .dijitTooltipLeft {
+	padding-right: 10px;
+}
+.nihilo .dijitTooltipLeft .dijitTooltipConnector {
+	/* the arrow piece for tooltips to the left of an element, bottom borders aligned */
+	right: 0;
+	background:url("images/tooltipConnectorRight.png") no-repeat top left;
+	width:11px;
+	height:17px;
+}
+.dj_ie .nihilo .dijitTooltipLeft .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorRight.gif");
+}
+
+.nihilo .dijitTooltipRight {
+	padding-left: 10px;
+}
+.nihilo .dijitTooltipRight .dijitTooltipConnector {
+	/* the arrow piece for tooltips to the right of an element, bottom borders aligned */
+	left: 0;
+	background:url("images/tooltipConnectorLeft.png") no-repeat top left;
+	width:11px;
+	height:17px;
+}
+.dj_ie .nihilo .dijitTooltipRight .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorLeft.gif");
+}
+
diff --git a/src/main/resources/static/dijit/themes/nihilo/Dialog_rtl.css b/src/main/resources/static/dijit/themes/nihilo/Dialog_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..5e0cffc3d4a5059939665ff2a7078212b32863e6
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Dialog_rtl.css
@@ -0,0 +1,6 @@
+/* Dialog */
+
+.dijitRtl .nihilo .dijitDialogTitleBar .dijitDialogCloseIcon {
+	right: auto;
+	left: 5px;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/Editor.css b/src/main/resources/static/dijit/themes/nihilo/Editor.css
new file mode 100644
index 0000000000000000000000000000000000000000..108aae78cf33840f4a1345e9770bdae825813053
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Editor.css
@@ -0,0 +1,16 @@
+.nihilo .dijitToolbar .dijitToolbarSeparator {
+	background: url('../../icons/images/editorIconsEnabled.png'); /* separator in editor icons sprite image - enabled state */
+}
+
+/**** ICONS *****/
+
+.nihilo .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsEnabled.png'); /* editor icons sprite image - enabled state */
+	background-repeat: no-repeat;
+	width: 18px;
+	height: 18px;
+	text-align: center;
+}
+.nihilo .dijitDisabled .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsDisabled.png'); /* editor icons sprite image - disabled state */
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/Editor_rtl.css b/src/main/resources/static/dijit/themes/nihilo/Editor_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..ca1cc0c86938b46e72fdf85e589f1c2163644164
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Editor_rtl.css
@@ -0,0 +1,9 @@
+/* Editor */
+.dijitRtl .nihilo .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsEnabled_rtl.png'); /* editor icons sprite image - enabled state */
+}
+.dijitRtl .nihilo .dijitDisabled .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsDisabled_rtl.png'); /* editor icons sprite image - disabled state */
+}
+
+
diff --git a/src/main/resources/static/dijit/themes/nihilo/Menu.css b/src/main/resources/static/dijit/themes/nihilo/Menu.css
new file mode 100644
index 0000000000000000000000000000000000000000..8d247f35b964f78426a81f6759ab4624d64caec3
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Menu.css
@@ -0,0 +1,80 @@
+
+/* Menu */
+.nihilo .dijitMenu,
+.nihilo .dijitMenuBar {
+	border: 1px solid #d3d3d3;
+	margin: 0;
+	padding: 0;
+	background-color: #fff;
+}
+
+.nihilo .dijitBorderContainer .dijitMenuBar {
+	border: 1px #ccc solid;
+}
+
+.nihilo .dijitMenuItem {
+	font-family: sans-serif;
+	margin: 0;
+	color: #243C5F;
+}
+.nihilo .dijitMenuBar .dijitMenuItem {
+	padding: 4px 5px;
+}
+
+.nihilo .dijitMenuPreviousButton, .nihilo .dijitMenuNextButton {
+	font-style: italic;
+}
+.nihilo .dijitMenuItem TD {
+	padding:1px;
+}
+
+.nihilo .dijitMenuPassive .dijitMenuItemHover,
+.nihilo .dijitComboBoxMenu .dijitMenuItemHover,
+.nihilo .dijitMenuItemSelected {
+	background-color: #ffe284; /* #95a0b0; #555555; #aaaaaa; #646464;  #60a1ea; #848484; */
+	color: #243C5F;
+}
+
+.nihilo .dijitMenuItemIcon {
+	width: 15px;
+	height: 15px;
+}
+
+.nihilo .dijitMenuExpand {
+	width:15px;
+	height:15px;
+	background-image: url('images/spriteRoundedIconsSmall.png');
+	background-position: -30px top;
+}
+.dj_ie6 .nihilo .dijitMenuExpand {
+	background-image:url('images/spriteRoundedIconsSmall.gif');
+}
+
+.nihilo .dijitMenuSeparator {
+	height: 1px;
+}
+
+/* separator can be two pixels -- set border of either one to 0 to have only one */
+.nihilo .dijitMenuSeparatorTop {
+	border-bottom: 1px solid #fff; /*97adcb; */
+}
+
+.nihilo .dijitMenuSeparatorBottom {
+	border-top: 1px solid #d3d3d3;
+}
+
+/* the checked menu item */
+.nihilo .dijitCheckedMenuItem .dijitMenuItemIcon  {
+	background-image: url('images/spriteCheckbox.gif');
+	background-position: -80px;
+}
+.nihilo .dijitCheckedMenuItemChecked .dijitMenuItemIcon {
+	background-position: -64px;
+}
+.nihilo .dijitRadioMenuItem .dijitMenuItemIcon {
+	background-image: url('images/spriteRadio.gif');
+	background-position: -80px;
+}
+.nihilo .dijitRadioMenuItemChecked .dijitMenuItemIcon {
+	background-position: -64px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/Menu_rtl.css b/src/main/resources/static/dijit/themes/nihilo/Menu_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..40b3b4124a95935b7f0daf01ed4260d834928fc2
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Menu_rtl.css
@@ -0,0 +1,10 @@
+/* Menu */
+
+.dijitRtl .nihilo .dijitMenuItem .dijitMenuItemIcon {
+	padding-left: 3px;
+	padding-right: 0;
+}
+
+.dijitRtl .nihilo .dijitMenuItem .dijitMenuExpand {
+	background-position: 0 top;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/ProgressBar.css b/src/main/resources/static/dijit/themes/nihilo/ProgressBar.css
new file mode 100644
index 0000000000000000000000000000000000000000..99d94f1dcd55e44f86ec7bc2a1d7ad85b3c9df60
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/ProgressBar.css
@@ -0,0 +1,34 @@
+
+/****
+		dijit.ProgressBar
+ ****/
+
+.nihilo .dijitProgressBar {
+	margin:2px 0 2px 0;
+}
+
+.nihilo .dijitProgressBarEmpty{
+	/* outer container and background of the bar that's not finished yet*/
+	background:#fff url("images/progressBarEmpty.png") repeat-x center center;
+	border-color: #f8d582 #f8d582 #f8d582 #f8d582;
+}
+
+.nihilo .dijitProgressBarTile{
+	/* inner container for finished portion when in 'tile' (image) mode */
+	background:#f0f0f0 url("images/progressBarFull.png") repeat-x center center;
+}
+
+.nihilo .dijitProgressBarFull {
+	border: 0px solid #f8d582;
+	border-right-width: 1px;
+}
+
+.nihilo .dijitProgressBarLabel {
+	/* Set to a color that contrasts with both the "Empty" and "Full" parts. */
+	color:#293a4b;
+}
+
+.nihilo .dijitProgressBarIndeterminate .dijitProgressBarTile {
+	/* use an animated gif for the progress bar in 'indeterminate' mode */
+	background:#cad2de url("images/progressBarAnim.gif") repeat-x center center;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/ProgressBar_rtl.css b/src/main/resources/static/dijit/themes/nihilo/ProgressBar_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..a71f5a6b0cf0b63aea725e5e697fe35c711b98be
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/ProgressBar_rtl.css
@@ -0,0 +1,21 @@
+
+/****
+		dijit.ProgressBar
+ ****/
+
+.nihilo .dijitProgressBarRtl .dijitProgressBarFull {
+	border-left-width: 1px;
+	border-right: 0px;
+}
+
+.nihilo .dijitProgressBarIndeterminateRtl .dijitProgressBarTile {
+	-moz-transform: scaleX(-1);
+	-o-transform: scaleX(-1);
+	-webkit-transform: scaleX(-1);
+	transform: scaleX(-1);
+	filter: FlipH;
+	-ms-filter: "FlipH";
+}
+
+
+
diff --git a/src/main/resources/static/dijit/themes/nihilo/TimePicker.css b/src/main/resources/static/dijit/themes/nihilo/TimePicker.css
new file mode 100644
index 0000000000000000000000000000000000000000..6054e6b604bf95aa7dcaa3c630079b00d1b4cc04
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/TimePicker.css
@@ -0,0 +1,33 @@
+/* Time Picker */
+.nihilo .dijitTimePickerTick,
+.nihilo .dijitTimePickerMarker {
+	border-color: #eeeeee;
+}
+
+.nihilo .dijitTimePickerTick {
+	color: gray;
+}
+
+.nihilo .dijitTimePickerMarker {
+	background:#d3d3d3 url("images/titleBar.png") repeat-x top;
+	color:#293a4b;
+	font-weight: bold;
+}
+
+.nihilo .dijitTimePickerItemSelected {
+	color: black;
+	background: #ffe284 none;
+}
+
+.nihilo .dijitTimePickerItemHover {
+	background: #d6d6dd none;
+	color:black;
+}
+
+.nihilo .dijitTimePickerTick .dijitTimePickerItemInner {
+	font-size: 0.8em;
+}
+
+.nihilo .dijitTimePickerItemSelected .dijitTimePickerItemInner {
+	font-size: 1em;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/TimePicker_rtl.css b/src/main/resources/static/dijit/themes/nihilo/TimePicker_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..50848c3fb70c537fe2c20a1435d956e359e50b87
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/TimePicker_rtl.css
@@ -0,0 +1,4 @@
+.dj_ie6-rtl .nihilo .dijitTimePickerMarkerHover,
+.dj_ie7-rtl .nihilo .dijitTimePickerMarkerHover {
+        border-top: 0; /* IE6/7 bug causes mouseover/out event storm */
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/TitlePane.css b/src/main/resources/static/dijit/themes/nihilo/TitlePane.css
new file mode 100644
index 0000000000000000000000000000000000000000..f690929103cd6b7e3325c845acc86b462a4882c5
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/TitlePane.css
@@ -0,0 +1,54 @@
+/**
+ * dijit.TitlePane and dijit.Fieldset
+ *
+ */
+
+.nihilo .dijitTitlePaneTitle {
+	background: #cccccc;
+	background:#fff url("images/titleBar.png") repeat-x top left;
+	border:1px solid #bfbfbf;
+	padding:3px 4px;
+	font-size: 0.9em;
+	font-weight: bold;
+	color: #6d6d6d;
+}
+.nihilo .dijitTitlePaneTitleHover  {
+	background: #f9f9f9 url("images/accordionItemActive.png") top repeat-x;
+}
+
+.nihilo .dijitTitlePane .dijitArrowNode,
+.nihilo .dijitFieldset .dijitArrowNode {
+	width:15px;
+	height:15px;
+}
+
+.nihilo .dijitTitlePaneTextNode {
+	color: #243C5F;
+}
+
+.nihilo .dijitTitlePane .dijitClosed .dijitArrowNode, .nihilo .dijitFieldset .dijitFieldsetTitleClosed .dijitArrowNode {
+	background: url('images/spriteRoundedIconsSmall.png') no-repeat -30px top;
+}
+.dj_ie6 .nihilo .dijitTitlePane .dijitClosed .dijitArrowNode, .dj_ie6 .nihilo .dijitFieldset .dijitFieldsetTitleClosed .dijitArrowNode {
+	background:url('images/spriteRoundedIconsSmall.gif') no-repeat -30px top;
+}
+.nihilo .dijitTitlePane .dijitOpen .dijitArrowNode, .nihilo .dijitFieldset .dijitFieldsetTitleOpen .dijitArrowNode {
+	background:url('images/spriteRoundedIconsSmall.png') no-repeat -15px top;
+}
+.dj_ie6 .nihilo .dijitTitlePane .dijitOpen .dijitArrowNode, .dj_ie6 .nihilo .dijitFieldset .dijitFieldsetTitleClosed .dijitArrowNode {
+	background:url('images/spriteRoundedIconsSmall.gif') no-repeat -15px top;
+}
+
+.nihilo .dijitTitlePaneContentOuter {
+	background: #ffffff;
+	border:1px solid #bfbfbf;
+	border-top: 0;
+}
+.nihilo .dijitTitlePaneContentInner {
+	padding:10px;
+}
+
+.nihilo .dijitTitlePaneTextNode {
+	margin-left: 4px;
+	margin-right: 4px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/TitlePane_rtl.css b/src/main/resources/static/dijit/themes/nihilo/TitlePane_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..9af4446feff6ef1b68753d6c37ce305159af53a3
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/TitlePane_rtl.css
@@ -0,0 +1,3 @@
+.nihilo .dijitTitlePaneRtl .dijitClosed .dijitArrowNode, .nihilo .dijitFieldsetRtl .dijitFieldsetTitleClosed .dijitArrowNode {
+	background-position: 0 top;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/Toolbar.css b/src/main/resources/static/dijit/themes/nihilo/Toolbar.css
new file mode 100644
index 0000000000000000000000000000000000000000..1c3e32702c83af082077431022278b831921786a
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Toolbar.css
@@ -0,0 +1,65 @@
+.nihilo .dijitToolbar {
+	border-bottom: 1px solid #ccc;
+	background:#eaeaea url("images/titleBar.png") repeat-x top left;
+}
+
+/* setting a min-height on ditor toolbar */
+.dj_ie6 .nihilo .dijitToolbar {
+	height: 10px;
+}
+
+.nihilo .dijitToolbar .dijitButtonNode,
+.nihilo .dijitToolbar .dijitComboButton .dijitButtonContents,
+.nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButton {
+	background: none;
+	margin: 0;
+	padding: 0;
+	border: none;
+	font-size: 12px;
+}
+
+.nihilo .dijitToolbar .dijitButton,
+.nihilo .dijitToolbar .dijitToggleButton,
+.nihilo .dijitToolbar .dijitDropDownButton,
+.nihilo .dijitToolbar .dijitComboButton .dijitButtonContents,
+.nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButton {
+	background: none;
+	padding: 1px;	/* on hover etc., margin replaced w/border */
+}
+
+.nihilo .dijitToolbar .dijitButtonChecked,
+.nihilo .dijitToolbar .dijitToggleButtonChecked {
+	background-color:#ffeeb9;
+	border:1px solid #f7c95c;
+	padding: 0;
+}
+
+.nihilo .dijitToolbar .dijitButtonCheckedHover,
+.nihilo .dijitToolbar .dijitToggleButtonCheckedHover
+ {
+	background-color:#ffe284;
+	border:1px solid #f7c95c;
+	padding: 0;
+}
+
+.nihilo .dijitToolbar .dijitButtonHover,
+.nihilo .dijitToolbar .dijitToggleButtonHover,
+.nihilo .dijitToolbar .dijitDropDownButtonHover,
+.nihilo .dijitToolbar .dijitComboButton .dijitButtonContentsHover,
+.nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButtonHover {
+	/* TODO: change this from Hover to Selected so that button is still highlighted while drop down is being used */
+	border: 1px solid #f7c95c;
+	padding: 0;
+	background-color:#ffe284;
+}
+
+.nihilo .dijitToolbar label {
+	padding: 3px 3px 0 6px;
+}
+
+.dj_ie .nihilo .dijitToolbar .dijitComboButton .dijitButtonContentsFocused,
+.dj_ie .nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused {
+	/* focus border doesn't appear on <td> for IE, so need to add it manually */
+	border: 1px #555 dotted !important;
+	padding: 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/Tree.css b/src/main/resources/static/dijit/themes/nihilo/Tree.css
new file mode 100644
index 0000000000000000000000000000000000000000..a33b9696e3feced8e50608c0b7745ad5afc3b3c8
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Tree.css
@@ -0,0 +1,100 @@
+/* Tree */
+
+.nihilo .dijitTreeNode {
+    background : url('images/treeI.gif') no-repeat;
+    background-position : top left;
+    background-repeat : repeat-y;
+    zoom: 1;
+}
+
+/* left vertical line (grid) for all nodes */
+.nihilo .dijitTreeIsLast {
+    background: url('images/treeI_half.gif') no-repeat;
+}
+
+.nihilo .dijitTreeRowHover {
+	/* using a transparent png so that we can still see grid lines, which are (unfortunately) behind the dijitRowNode that we are hovering over */
+	background-image: url(images/treeHover.png);
+	background-repeat: repeat;
+	background-color: transparent !important;
+}
+
+.nihilo .dijitTreeLabel {
+	font-weight: normal;
+	margin-left: 3px;
+}
+
+.nihilo .dijitTreeIsRoot {
+    margin-left: 0;
+    background-image: none;
+}
+
+.nihilo .dijitTreeExpando {
+    width: 18px;
+    height: 18px;
+}
+
+.nihilo .dijitTreeRow {
+	/* so insert line shows up on IE when dropping after a target element */
+	padding-bottom: 2px;
+}
+
+.nihilo .dijitTreeContent {
+    min-height: 18px;
+    min-width: 18px;
+    padding-left:1px;
+}
+
+.nihilo .dijitTreeExpandoOpened {
+	background: url('images/spriteTree.gif') no-repeat -18px top;
+}
+
+.nihilo .dijitTreeExpandoClosed {
+	background-image: url('images/spriteTree.gif');
+}
+
+.nihilo .dijitTreeExpandoLeaf {
+	background: url('images/spriteTree.gif') no-repeat -36px top;
+}
+
+.nihilo .dijitTreeExpandoLoading {
+	background-image: url('images/treeExpand_loading.gif');
+}
+
+.nihilo .dijitTreeIcon {
+	width: 16px;
+	height: 16px;
+}
+
+.nihilo .dijitFolderOpened {
+	background: url('images/spriteDivIcons.gif') no-repeat -16px top;
+}
+
+.nihilo .dijitFolderClosed {
+	background: url('images/spriteDivIcons.gif') no-repeat top left;
+}
+
+.nihilo .dijitLeaf {
+	background: url('images/spriteDivIcons.gif') no-repeat -32px top;
+}
+
+/* Drag and Drop on TreeNodes
+ * Put insert line on dijitTreeContent node so it's aligned w/
+ * (ie, indented equally with) target element, even
+ * though dijitTreeRowNode is the actual "drag object"
+ */
+.nihilo .dijitTreeNode .dojoDndItemBefore,
+.nihilo .dijitTreeNode .dojoDndItemAfter {
+	border-bottom: none;
+	border-top: none;
+}
+
+.nihilo .dijitTreeNode .dojoDndItemBefore .dijitTreeContent {
+	/* copied from Common.css */
+	border-top: 2px solid #369;
+}
+
+.nihilo .dijitTreeNode .dojoDndItemAfter .dijitTreeContent {
+	/* copied from Common.css */
+	border-bottom: 2px solid #369;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/Tree_rtl.css b/src/main/resources/static/dijit/themes/nihilo/Tree_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..4462ed1bf0a7ff66c9dfd07db8ec1488c1212aa0
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/Tree_rtl.css
@@ -0,0 +1,22 @@
+/* Tree */
+
+.dijitRtl .nihilo .dijitTreeNode,
+.dijitRtl .nihilo .dijitTreeExpandoLeaf {
+	/* disable grid lines for Tree in RTL mode, too hard to support */
+    background-image: none;
+}
+
+.dijitRtl .nihilo .dijitTreeContent {
+    padding-left: 0;
+    padding-right: 1px;
+}
+
+.dijitRtl .nihilo .dijitTreeExpandoOpened {
+	/* todo: icon contains grid line but grid lines disabled above */
+	background: url('images/spriteTree_rtl.gif') no-repeat -18px top;
+}
+
+.dijitRtl .nihilo .dijitTreeExpandoClosed {
+	/* todo: icon contains grid line but grid lines disabled above */
+	background-image: url('images/spriteTree_rtl.gif');
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/form/Button.css b/src/main/resources/static/dijit/themes/nihilo/form/Button.css
new file mode 100644
index 0000000000000000000000000000000000000000..83c719b25ee79c43700934f55b4d1b1217aa7c1c
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/form/Button.css
@@ -0,0 +1,128 @@
+
+/*****
+		dijit.form.Button
+		dijit.form.DropDownButton
+		dijit.form.ComboButton
+		dijit.form.ComboBox (partial)
+		dijit.form.Spinner (partial) (TODO: create NumberSpinner.css file like claro has)
+ *****/
+
+.nihilo .dijitButtonNode {
+	/* enabled state - inner */
+	/* border:1px outset #a0a0a0; */
+	border:1px solid #dedede;
+	border-bottom:1px solid #dedede;
+	padding: 0.1em 0.2em 0.2em 0.2em;
+	background: #fff url("../images/buttonEnabled.png") repeat-x top left;
+}
+
+.nihilo .dijitButtonText {
+	text-align: center;
+	padding: 0 0.3em;
+}
+.nihilo .dijitInputField {
+	padding: 0; /* set padding:0 for .nihilo .dijitSelect .dijitButtonText but with a low priority rule that can be easily trumped by the user */
+}
+
+.nihilo .dijitComboBox .dijitButtonNode {
+	border-width: 0 0 0 1px;
+}
+
+.nihilo .dijitArrowButton {
+	color: #111;
+}
+
+.nihilo .dijitComboButton .dijitDownArrowButton {
+	padding-right:4px;
+}
+
+.nihilo .dijitComboBoxReadOnly,
+.nihilo .dijitSpinnerReadOnly,
+.nihilo .dijitSpinnerReadOnly .dijitButtonNode,
+.nihilo .dijitButtonDisabled .dijitButtonNode,
+.nihilo .dijitToggleButtonDisabled .dijitButtonNode,
+.nihilo .dijitDropDownButtonDisabled .dijitButtonNode,
+.nihilo .dijitComboButtonDisabled .dijitButtonNode,
+.nihilo .dijitComboBoxDisabled,
+.nihilo .dijitSpinnerDisabled,
+.nihilo .dijitSpinnerDisabled .dijitButtonNode {
+	/* disabled state - inner */
+	border-color: #dedede;
+	background:#fafafa url("../images/buttonDisabled.png") top repeat-x;
+	opacity: 0.60;
+}
+.dj_ie6 .nihilo .dijitReadOnly input,
+.dj_ie7 .nihilo .dijitReadOnly input,
+.dj_ie6 .nihilo .dijitComboButtonDisabled .dijitButtonText,
+.dj_ie7 .nihilo .dijitComboButtonDisabled .dijitButtonText {
+	/* opacity doesn't work on table node in IE, work around here */
+	color: #aaa;
+}
+
+
+.nihilo .dijitButtonHover .dijitButtonNode,
+.nihilo .dijitButtonNodeHover,
+.nihilo .dijitToggleButtonHover .dijitButtonNode,
+.nihilo .dijitDropDownButtonHover .dijitButtonNode,
+.nihilo .dijitButtonContentsHover,
+.nihilo .dijitDownArrowButtonHover,
+.nihilo .dijitUpArrowButtonHover {
+	/* hover state - inner */
+	/* TODO: change from Hover to Selected so that button is still highlighted while drop down is being used */
+	color:#243C5F;
+	background:#fcfcfc url("../images/buttonHover.png") repeat-x top left;
+}
+
+.nihilo .dijitUpArrowButtonActive,
+.nihilo .dijitDownArrowButtonActive,
+.nihilo .dijitButtonActive .dijitButtonNode,
+.nihilo .dijitToggleButtonActive .dijitButtonNode,
+.nihilo .dijitDropDownButtonActive .dijitButtonNode,
+.nihilo .dijitComboButton .dijitButtonContentsActive,
+.nihilo .dijitStackController .dijitToggleButtonChecked .dijitButtonNode {
+	/* active state - inner (for when you are pressing a normal button, or
+	 * when a radio-type button is in a depressed state
+	 */
+	border-color:#dedede;
+	background: #f5f5f5 url("../images/buttonActive.png") top left repeat-x;
+}
+
+
+.nihilo .dijitArrowButtonInner {
+	background-image: url("../images/spriteArrows.png");
+	background-repeat: no-repeat;
+	background-position: 0 center;
+	width: 11px;
+	height: 11px;
+}
+.nihilo .dijitLeftArrowButton .dijitArrowButtonInner {
+	background-position: -11px center;
+}
+.nihilo .dijitUpArrowButton .dijitArrowButtonInner {
+	background-position: -22px center;
+}
+.nihilo .dijitRightArrowButton .dijitArrowButtonInner {
+	background-position: -33px center;
+}
+.dj_ie6 .nihilo .dijitArrowButtonInner {
+	background-image: url("../images/spriteArrows.gif");
+}
+.dj_webkit .nihilo .dijitSpinner .dijitUpArrowButton .dijitArrowButtonInner {
+	margin-top: -1px; /* image has too many blank pixels on top */
+}
+.dj_ie .nihilo .dijitSpinner .dijitUpArrowButton .dijitArrowButtonInner {
+	margin-top: 1px; /* image has too many blank pixels on top */
+}
+.nihilo .dijitSpinnerButtonContainer {
+	width: auto;
+	padding: 0;
+}
+.nihilo .dijitSpinner .dijitArrowButton {
+	width: 15px;
+}
+.nihilo .dijitSpinner .dijitSpinnerButtonInner {
+	width: 15px;
+}
+.nihilo .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	padding: 0;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/form/Button_rtl.css b/src/main/resources/static/dijit/themes/nihilo/form/Button_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..07886d058a71c9e4173edb7ada1035a86ff89f99
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/form/Button_rtl.css
@@ -0,0 +1,4 @@
+.nihilo .dijitComboBoxRtl .dijitButtonNode {
+	border-width: 0 0 0 1px;
+}
+
diff --git a/src/main/resources/static/dijit/themes/nihilo/form/Checkbox.css b/src/main/resources/static/dijit/themes/nihilo/form/Checkbox.css
new file mode 100644
index 0000000000000000000000000000000000000000..260666f996a89f6bb26d36201cdb1882acedfa9c
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/form/Checkbox.css
@@ -0,0 +1,67 @@
+
+/*
+ *  CheckBox and Radio Widgets,
+ *	and the CSS to embed a checkbox or radio icon inside a ToggleButton.
+ *
+ *	Order of images in the default sprite (from L to R, checkbox and radio in same image):
+ *		checkbox	normal 	 - checked
+ *							 - unchecked
+ *					disabled - checked
+ *							 - unchecked
+ *					hover 	 - checked
+ *							 - unchecked
+ *
+ *		radio		normal 	 - checked
+ *							 - unchecked
+ *					disabled - checked
+ *							 - unchecked
+ *					hover 	 - checked
+ *							 - unchecked
+*/
+
+.nihilo .dijitToggleButton .dijitCheckBox,
+.nihilo .dijitToggleButton .dijitCheckBoxIcon {
+	background-image: url('../images/spriteCheckbox.gif');
+}
+
+.nihilo .dijitCheckBox,
+.nihilo .dijitCheckBoxIcon {		/* inside a toggle button */
+	background-image: url('../images/spriteCheckbox.gif'); /* checkbox sprite image */
+	background-repeat: no-repeat;
+	width: 16px;
+	height: 16px;
+	margin: 0;
+	padding: 0;
+}
+
+.nihilo .dijitCheckBox,
+.nihilo .dijitToggleButton .dijitCheckBoxIcon {
+	/* unchecked */
+	background-position: -16px;
+}
+
+.nihilo .dijitCheckBoxChecked,
+.nihilo .dijitToggleButtonChecked .dijitCheckBoxIcon {
+	/* checked */
+	background-position: 0;
+}
+
+.nihilo .dijitCheckBoxDisabled {
+	/* disabled */
+	background-position: -48px;
+}
+
+.nihilo .dijitCheckBoxCheckedDisabled {
+	/* disabled but checked */
+	background-position: -32px;
+}
+
+.nihilo .dijitCheckBoxHover {
+	/* hovering over an unchecked enabled checkbox */
+	background-position: -80px;
+}
+
+.nihilo .dijitCheckBoxCheckedHover {
+	/* hovering over a checked enabled checkbox */
+	background-position: -64px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/form/Common.css b/src/main/resources/static/dijit/themes/nihilo/form/Common.css
new file mode 100644
index 0000000000000000000000000000000000000000..31bf95ee3cc332a1dc041f75540d773748b89a5f
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/form/Common.css
@@ -0,0 +1,83 @@
+
+/****
+		dijit.form.TextBox
+		dijit.form.ValidationTextBox
+		dijit.form.SerializableTextBox
+		dijit.form.RangeBoundTextBox
+		dijit.form.NumberTextBox
+		dijit.form.CurrencyTextBox
+		dijit.form.NumberSpinner
+		dijit.form.ComboBox (partial)
+ ****/
+
+.nihilo .dijitInputContainer input {
+	margin: 0 0.1em;
+}
+
+.nihilo .dijitSelect .dijitButtonContents,
+.nihilo .dijitSelect,
+.nihilo .dijitTextBox,
+.nihilo .dijitTextArea {
+	/* 	For all except dijit.form.NumberSpinner:  the actual input element.
+		For TextBox, ComboBox, Spinner: the table that contains the input.
+		Otherwise the actual input element.
+	*/
+	background:#fff url("../images/validationInputBg.png") repeat-x top left;
+	#background:#fff url('../images/validationInputBg.gif') repeat-x top left;
+}
+.nihilo .dijitSelect,
+.nihilo .dijitTextBox,
+.nihilo .dijitTextArea {
+	border:1px solid #d3d3d3;
+}
+
+.nihilo .dijitSelect .dijitArrowButton,
+.nihilo .dijitComboBox .dijitButtonNode {
+	padding: 0 0.2em;
+}
+.nihilo .dijitSelect .dijitButtonContents,
+.nihilo .dijitTextBox .dijitButtonNode {
+	/* line between the input area and the drop down button */
+	border-color: #d3d3d3;
+}
+
+.nihilo .dijitSelectFocused,
+.nihilo .dijitTextBoxFocused,
+.nihilo .dijitTextAreaFocused {
+	/* input field when focused (ie: typing affects it) */
+	border-color:#b3b3b3;
+}
+.nihilo .dijitSelectFocused TD,
+.nihilo .dijitTextBoxFocused .dijitButtonNode,
+.nihilo .dijitSpinner .dijitUpArrowButtonActive,
+.nihilo .dijitSpinner .dijitDownArrowButtonActive {
+	border-color:#d3d3d3;
+}
+.nihilo .dijitSpinnerFocused .dijitDownArrowButton,
+.nihilo .dijitSpinner .dijitUpArrowButtonActive,
+.nihilo .dijitSpinner .dijitDownArrowButtonActive {
+	border-top-color:#d3d3d3;
+}
+
+.nihilo .dijitError {
+	border-color:#b3b3b3;
+	background-color:#f9f7ba;
+	background-image:none;
+}
+
+.nihilo .dijitErrorFocused {
+	background-color:#ff6;
+	background-image:none;
+}
+
+/* Validation errors  */
+.nihilo .dijitValidationTextBoxError .dijitValidationIcon {
+	/* prevent height change when widget goes from valid to invalid state */
+	width: 16px;
+	background: transparent url('../images/warning.png') no-repeat center center;
+}
+
+/* The highlight is shown in the ComboBox menu. */
+.nihilo .dijitComboBoxHighlightMatch {
+	background-color:#d3d3d3;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/form/RadioButton.css b/src/main/resources/static/dijit/themes/nihilo/form/RadioButton.css
new file mode 100644
index 0000000000000000000000000000000000000000..d0dba30200436f0e5cafe3bbe034074f05a3096d
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/form/RadioButton.css
@@ -0,0 +1,66 @@
+/*
+ *  CheckBox and Radio Widgets,
+ *	and the CSS to embed a checkbox or radio icon inside a ToggleButton.
+ *
+ *	Order of images in the default sprite (from L to R, checkbox and radio in same image):
+ *		checkbox	normal 	 - checked
+ *							 - unchecked
+ *					disabled - checked
+ *							 - unchecked
+ *					hover 	 - checked
+ *							 - unchecked
+ *
+ *		radio		normal 	 - checked
+ *							 - unchecked
+ *					disabled - checked
+ *							 - unchecked
+ *					hover 	 - checked
+ *							 - unchecked
+*/
+
+.nihilo .dijitToggleButton .dijitRadio,
+.nihilo .dijitToggleButton .dijitRadioIcon {
+	background-image: url('../images/spriteRadio.gif');
+}
+
+.nihilo .dijitRadio,
+.nihilo .dijitRadioIcon	{		/* inside a toggle button */
+	background-image: url('../images/spriteRadio.gif'); /* checkbox sprite image */
+	background-repeat: no-repeat;
+	width: 16px;
+	height: 16px;
+	margin: 0;
+	padding: 0;
+}
+
+.nihilo .dijitRadio,
+.nihilo .dijitToggleButton .dijitRadioIcon {
+	/* unselected */
+	background-position: -16px;
+}
+
+.nihilo .dijitRadioChecked,
+.nihilo .dijitToggleButtonChecked .dijitRadioIcon {
+	/* selected */
+	background-position: 0;
+}
+
+.nihilo .dijitRadioDisabled {
+	/* unselected and disabled */
+	background-position: -48px;
+}
+
+.nihilo .dijitRadioCheckedDisabled {
+	/* selected but disabled */
+	background-position: -32px;
+}
+
+.nihilo .dijitRadioHover {
+	/* hovering over an unselected enabled radio button */
+	background-position: -80px;
+}
+
+.nihilo .dijitRadioCheckedHover {
+	/* hovering over a selected enabled radio button */
+	background-position: -64px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/form/Select.css b/src/main/resources/static/dijit/themes/nihilo/form/Select.css
new file mode 100644
index 0000000000000000000000000000000000000000..6e6a9c4425cef280bd1040a73c6956eb35c29320
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/form/Select.css
@@ -0,0 +1,46 @@
+.nihilo .dijitSelectError .dijitButtonContents,
+.nihilo .dijitSelectHover .dijitArrowButton,
+.nihilo .dijitSelectActive .dijitArrowButton,
+.nihilo .dijitSelectOpened .dijitArrowButton,
+.nihilo .dijitSelectDisabled .dijitArrowButton,
+.nihilo .dijitSelectReadOnly .dijitArrowButton {
+	background: transparent none;
+}
+
+.nihilo .dijitSelect .dijitArrowButton {
+	background: #bcd5f0 url("../images/buttonEnabled.png") repeat-x top left;
+	border-width: 0;
+}
+
+/* Mirror DropDownButton */
+.nihilo .dijitSelectDisabled,
+.nihilo .dijitSelectDisabled TD {
+    border-color: #dedede !important;
+    background:#fafafa url("../images/buttonDisabled.png") top repeat-x;
+}
+.dj_ie .nihilo .dijitSelectDisabled  TD * {
+	filter: gray() alpha(opacity=50);
+}
+
+.nihilo .dijitSelectHover,
+.nihilo .dijitSelectHover TD {
+    color:#000;
+    background:#fcfcfc url("../images/buttonHover.png") repeat-x top left;
+}
+
+.nihilo .dijitSelectActive,
+.nihilo .dijitSelectOpened,
+.nihilo .dijitSelectActive TD,
+.nihilo .dijitSelectOpened TD {
+    border-color:#dedede !important;
+    background: #f5f5f5 url("../images/buttonActive.png") top left repeat-x;
+}
+
+/* Make the menu look more combobox-like */
+.nihilo .dijitSelectMenu td {
+	padding: 0;
+}
+.nihilo .dijitSelectMenu .dijitMenuItemLabel,
+.nihilo .dijitSelectMenu .dijitMenuArrowCell {
+	padding: 0.1em 0.2em;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/form/Slider.css b/src/main/resources/static/dijit/themes/nihilo/form/Slider.css
new file mode 100644
index 0000000000000000000000000000000000000000..16bcd09800ba94b68710d3d4907b7bba3f32510e
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/form/Slider.css
@@ -0,0 +1,141 @@
+
+/****
+ 	SLIDER
+****/
+
+.nihilo .dijitSliderProgressBarH {
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left;
+}
+
+.nihilo .dijitSliderProgressBarV {
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left;
+}
+
+.nihilo .dijitSliderFocused .dijitSliderProgressBarH,
+.nihilo .dijitSliderFocused .dijitSliderLeftBumper {
+	background-image:url("../images/sliderFullFocus.png");
+}
+
+.nihilo .dijitSliderFocused .dijitSliderProgressBarV,
+.nihilo .dijitSliderFocused .dijitSliderBottomBumper {
+	background-image:url("../images/sliderFullVerticalFocus.png");
+}
+
+.nihilo .dijitSliderRemainingBarV {
+	border-color: #b4b4b4;
+	background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y bottom left;
+}
+
+.nihilo .dijitSliderRemainingBarH {
+	border-color: #b4b4b4;
+	background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left;
+}
+
+.nihilo .dijitSliderBar {
+	border-style: solid;
+	outline:1px;
+	/* border-color: #b4b4b4; */
+}
+.nihilo .dijitSliderFocused .dijitSliderBar {
+	border-color:#727272;
+}
+
+.nihilo .dijitSliderImageHandleH {
+	border:0;
+	width:15px;
+	height:18px;
+	background:url("../images/preciseSliderThumb.png") no-repeat center top;
+	#background:url("../images/preciseSliderThumb.gif") no-repeat center top;
+}
+.nihilo .dijitSliderFocused .dijitSliderImageHandleH {
+	background-image:url("../images/preciseSliderThumbFocus.png");
+	#background-image:url("../images/preciseSliderThumbFocus.gif");
+}
+
+.nihilo .dijitSliderLeftBumper {
+	border-left-width: 1px;
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left;
+}
+
+.nihilo .dijitSliderRightBumper {
+	background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left;
+	border-color: #b4b4b4;
+	border-right-width: 1px;
+}
+
+.nihilo .dijitSliderImageHandleV {
+	border:0;
+	width:20px;
+	height:15px;
+	background:url("../images/sliderThumb.png") no-repeat center center;
+	#background:url("../images/sliderThumb.gif") no-repeat center center;
+}
+
+.nihilo .dijitSliderFocused .dijitSliderImageHandleV {
+	background-image:url("../images/sliderThumbFocus.png");
+	#background-image:url("../images/sliderThumbFocus.gif");
+}
+
+.nihilo .dijitSliderBottomBumper {
+	border-bottom-width: 1px;
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left;
+}
+
+.nihilo .dijitSliderTopBumper {
+	background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y top left;
+	border-color: #b4b4b4;
+	border-top-width: 1px;
+}
+
+.nihilo .dijitSliderIncrementIconH,
+.nihilo .dijitSliderIncrementIconV {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat -45px top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -45px top;
+	width:15px; height:15px;
+}
+.nihilo .dijitSliderIncrementIconH {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -30px top;
+}
+
+.nihilo .dijitSliderDecrementIconH,
+.nihilo .dijitSliderDecrementIconV {
+	width:15px;
+	height:15px;
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat -15px top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -15px top;
+}
+.nihilo .dijitSliderDecrementIconH {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat 0 top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat 0 top;
+}
+
+.nihilo .dijitSliderButtonInner {
+	visibility:hidden;
+}
+
+.nihilo .dijitSliderReadOnly *,
+.nihilo .dijitSliderDisabled * {
+	border-color: #d5d5d5 #bdbdbd #bdbdbd #d5d5d5;
+	color: #bdbdbd;
+}
+.nihilo .dijitSliderReadOnly .dijitSliderDecrementIconH,
+.nihilo .dijitSliderDisabled .dijitSliderDecrementIconH {
+	background-position: 0 -15px;
+}
+.nihilo .dijitSliderReadOnly .dijitSliderIncrementIconH,
+.nihilo .dijitSliderDisabled .dijitSliderIncrementIconH {
+	background-position: -30px -15px;
+}
+.nihilo .dijitSliderReadOnly .dijitSliderDecrementIconV,
+.nihilo .dijitSliderDisabled .dijitSliderDecrementIconV {
+	background-position: -15px -15px;
+}
+.nihilo .dijitSliderReadOnly .dijitSliderIncrementIconV,
+.nihilo .dijitSliderDisabled .dijitSliderIncrementIconV {
+	background-position: -45px -15px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/form/Slider_rtl.css b/src/main/resources/static/dijit/themes/nihilo/form/Slider_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..1523d4a9689db1bf766050cf4faa14965ae97e28
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/form/Slider_rtl.css
@@ -0,0 +1,36 @@
+
+/* Slider */
+
+.dijitRtl .nihilo .dijitSliderProgressBarH,
+.dijitRtl .nihilo .dijitSliderRemainingBarH,
+.dijitRtl .nihilo .dijitSliderLeftBumper,
+.dijitRtl .nihilo .dijitSliderRightBumper,
+.dijitRtl .nihilo .dijitSliderTopBumper {
+	background-position: top right;
+}
+
+.dijitRtl .nihilo .dijitSliderProgressBarV,
+.dijitRtl .nihilo .dijitSliderRemainingBarV,
+.dijitRtl .nihilo .dijitSliderBottomBumper {
+	background-position: bottom right;
+}
+
+.dijitRtl .nihilo .dijitSliderLeftBumper {
+	border-left-width: 0;
+	border-right-width: 1px;
+}
+
+.dijitRtl .nihilo .dijitSliderRightBumper {
+	border-left-width: 1px;
+	border-right-width: 0;
+}
+
+.dijitRtl .nihilo .dijitSliderIncrementIconH {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat left top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat left top;
+}
+
+.dijitRtl .nihilo .dijitSliderDecrementIconH {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -30px top;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/form/TimeTextBox.css b/src/main/resources/static/dijit/themes/nihilo/form/TimeTextBox.css
new file mode 100644
index 0000000000000000000000000000000000000000..d450925b415601abdf28857e4cd3fdccd145d96e
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/form/TimeTextBox.css
@@ -0,0 +1 @@
+@CHARSET "UTF-8";
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/accordionItemActive.png b/src/main/resources/static/dijit/themes/nihilo/images/accordionItemActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..8657115cb81a20617e02f055c39e3cf826b2b921
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/accordionItemActive.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/buttonActive.png b/src/main/resources/static/dijit/themes/nihilo/images/buttonActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe551bc2849e6fa5133b26c228a6f123bcacc6f9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/buttonActive.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/buttonDisabled.png b/src/main/resources/static/dijit/themes/nihilo/images/buttonDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb4d2386d24704a1130942d0e5e4ed603646cdeb
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/buttonDisabled.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/buttonEnabled.png b/src/main/resources/static/dijit/themes/nihilo/images/buttonEnabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..456d62dba7bbcb4f7c6f7b8933c28e7cbe44eb10
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/buttonEnabled.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/buttonHover.png b/src/main/resources/static/dijit/themes/nihilo/images/buttonHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..c11b5d18eb76e1c2fc136ab0f4f97f2553a56212
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/buttonHover.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/dndCopy.png b/src/main/resources/static/dijit/themes/nihilo/images/dndCopy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a8b998f62899a642f6be3f4132132d1c12e237c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/dndCopy.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/dndMove.png b/src/main/resources/static/dijit/themes/nihilo/images/dndMove.png
new file mode 100644
index 0000000000000000000000000000000000000000..8443d30342f0494cae909eeecdc9b6ad149f5e5a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/dndMove.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/dndNoCopy.png b/src/main/resources/static/dijit/themes/nihilo/images/dndNoCopy.png
new file mode 100644
index 0000000000000000000000000000000000000000..64bf88b26a3ddeadf97755bc05ed83c47ecfe683
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/dndNoCopy.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/dndNoMove.png b/src/main/resources/static/dijit/themes/nihilo/images/dndNoMove.png
new file mode 100644
index 0000000000000000000000000000000000000000..682ea1025b914e20e041ddff88a5ef651a7fbb91
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/dndNoMove.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/no.gif b/src/main/resources/static/dijit/themes/nihilo/images/no.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9021a14e210b1107b48bcd16a637aed335ddb3d2
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/no.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumb.gif b/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..53b33e54abdb947bdc92cd8b30359a4153017738
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumb.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumb.png b/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6dc0790e8bf5b5a7a7c5e7455da046e6cfe46f4
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumb.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumbFocus.gif b/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumbFocus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8c6f92eb45865a0b1c3a08f978ad2e2b61d45057
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumbFocus.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumbFocus.png b/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumbFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..939f253afd0b062b9e911ad02f3170db90d2739c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/preciseSliderThumbFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/progressBarAnim.gif b/src/main/resources/static/dijit/themes/nihilo/images/progressBarAnim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..543d0485c2382dfe9475fe74ddd0db5121e03ecf
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/progressBarAnim.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/progressBarEmpty.png b/src/main/resources/static/dijit/themes/nihilo/images/progressBarEmpty.png
new file mode 100644
index 0000000000000000000000000000000000000000..5500b1b619d343d94daa513325bdddbbfdce5109
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/progressBarEmpty.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/progressBarFull.png b/src/main/resources/static/dijit/themes/nihilo/images/progressBarFull.png
new file mode 100644
index 0000000000000000000000000000000000000000..1228e9026aa183ce1dde5d1d79f0559dddcf935a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/progressBarFull.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderEmpty.png b/src/main/resources/static/dijit/themes/nihilo/images/sliderEmpty.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdd9ae953dbd50dc357767c65d69c4550795cecf
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderEmpty.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderEmptyVertical.png b/src/main/resources/static/dijit/themes/nihilo/images/sliderEmptyVertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b5036abcc21463216808fbf77788a2e22004551
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderEmptyVertical.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderFull.png b/src/main/resources/static/dijit/themes/nihilo/images/sliderFull.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbfb2a807023fc92133539cbe3bf670c395f8715
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderFull.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderFullFocus.png b/src/main/resources/static/dijit/themes/nihilo/images/sliderFullFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d07f00c84d79996fb99b9b2280eac93414384b75
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderFullFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderFullVertical.png b/src/main/resources/static/dijit/themes/nihilo/images/sliderFullVertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..195580f11e3916f0a9bb7e0ba4f52a75f0b2d4f9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderFullVertical.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderFullVerticalFocus.png b/src/main/resources/static/dijit/themes/nihilo/images/sliderFullVerticalFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e9bfff0df2300cc4a0eb0b279061cbccbf5de7b
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderFullVerticalFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderThumb.gif b/src/main/resources/static/dijit/themes/nihilo/images/sliderThumb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..29899a4b630782dfe9e4d276ccc775ad47a6e752
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderThumb.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderThumb.png b/src/main/resources/static/dijit/themes/nihilo/images/sliderThumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..6abb20080c6d1e7da0ad17e828b77c4bdcb14082
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderThumb.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderThumbFocus.gif b/src/main/resources/static/dijit/themes/nihilo/images/sliderThumbFocus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f8d306febc6627deffbdf6cb687dd1fbc499eaf8
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderThumbFocus.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/sliderThumbFocus.png b/src/main/resources/static/dijit/themes/nihilo/images/sliderThumbFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4d261eee561019a9ea904c116dc6814d2c30e41
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/sliderThumbFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerH-thumb.png b/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerH-thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b1fff80ec5cfec7d4eaea761792b173df2cc971
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerH-thumb.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerH.png b/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerH.png
new file mode 100644
index 0000000000000000000000000000000000000000..a92cf665ba73eaa69386d67b79226d74ba1c13e3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerH.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerV-thumb.png b/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerV-thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..75676d5daeef49084a5d5997d4799d894cd7eb92
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerV-thumb.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerV.png b/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerV.png
new file mode 100644
index 0000000000000000000000000000000000000000..721cc7debf58cc173574898745447631e49993ba
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/splitContainerSizerV.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteArrows.gif b/src/main/resources/static/dijit/themes/nihilo/images/spriteArrows.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fc81207e70710738804fd4f0803a7f7f6a80fe50
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteArrows.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteArrows.png b/src/main/resources/static/dijit/themes/nihilo/images/spriteArrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..80bb45a799f800bd5de23573cb4f061a35425eb5
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteArrows.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteCheckbox.gif b/src/main/resources/static/dijit/themes/nihilo/images/spriteCheckbox.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d2c4ebfaff2230675f59f5caf94ebe26739b5ed2
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteCheckbox.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteCheckbox.png b/src/main/resources/static/dijit/themes/nihilo/images/spriteCheckbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d1aa92e868a03f0cc9c0b5ae9d91e7f25d0322
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteCheckbox.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteDivIcons.gif b/src/main/resources/static/dijit/themes/nihilo/images/spriteDivIcons.gif
new file mode 100644
index 0000000000000000000000000000000000000000..00ad23a310eede2ed0c8e88c2d37532e71b71ad1
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteDivIcons.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteDivIcons.png b/src/main/resources/static/dijit/themes/nihilo/images/spriteDivIcons.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e9ac30c90a71fda3c457c6c2eb896f1b4266317
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteDivIcons.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteRadio.gif b/src/main/resources/static/dijit/themes/nihilo/images/spriteRadio.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8dd6e578e89939ac92dddcb77a684ebb95955933
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteRadio.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteRadio.png b/src/main/resources/static/dijit/themes/nihilo/images/spriteRadio.png
new file mode 100644
index 0000000000000000000000000000000000000000..eef7ab4b133a2a2136f369ea742dc29af50cd788
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteRadio.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteRoundedIconsSmall.gif b/src/main/resources/static/dijit/themes/nihilo/images/spriteRoundedIconsSmall.gif
new file mode 100644
index 0000000000000000000000000000000000000000..251389a285e06380d4e8eda1ff98e6679c817fbd
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteRoundedIconsSmall.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteRoundedIconsSmall.png b/src/main/resources/static/dijit/themes/nihilo/images/spriteRoundedIconsSmall.png
new file mode 100644
index 0000000000000000000000000000000000000000..baea73d2843a8267eb6144e63bde5b334cb5b9b2
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteRoundedIconsSmall.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteTree.gif b/src/main/resources/static/dijit/themes/nihilo/images/spriteTree.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e546e281b131d5a45571c6fd3a5bb7a30e856f1e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteTree.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteTree.png b/src/main/resources/static/dijit/themes/nihilo/images/spriteTree.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e63248bebf5eed9d2dfc04a8aa696c15e7acee3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteTree.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteTree_rtl.gif b/src/main/resources/static/dijit/themes/nihilo/images/spriteTree_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bbcc64be82efd5aab472b2d7b23b1567a480746b
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteTree_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/spriteTree_rtl.png b/src/main/resources/static/dijit/themes/nihilo/images/spriteTree_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c30c354ca1725d7a772f119c71cc3d3320e8815
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/spriteTree_rtl.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tabBottomActiveC.gif b/src/main/resources/static/dijit/themes/nihilo/images/tabBottomActiveC.gif
new file mode 100644
index 0000000000000000000000000000000000000000..84bffde04bd6e6a88a0cc7aed94b5052f36f1a0a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tabBottomActiveC.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tabBottomEnabledC.gif b/src/main/resources/static/dijit/themes/nihilo/images/tabBottomEnabledC.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9ef9ab08496213ec596cdabcea577af6dd8ea51d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tabBottomEnabledC.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tabBottomHoverC.gif b/src/main/resources/static/dijit/themes/nihilo/images/tabBottomHoverC.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0f533b56704a67192a07ba851f9b4be903d003d3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tabBottomHoverC.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tabContainerSprite.gif b/src/main/resources/static/dijit/themes/nihilo/images/tabContainerSprite.gif
new file mode 100644
index 0000000000000000000000000000000000000000..92044a7f191eee8e86079d6e2e8a34be0c50644e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tabContainerSprite.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/titleBar.png b/src/main/resources/static/dijit/themes/nihilo/images/titleBar.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e01962ffa797d13b9e5962b8de8605d3455f2aa
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/titleBar.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/titleBarActive.png b/src/main/resources/static/dijit/themes/nihilo/images/titleBarActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..661bf599009eea7cf15eb84c710317b4d131ec35
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/titleBarActive.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorDown.gif b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorDown.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9c3849553aa71a67ab40f153223b8394574ccd9d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorDown.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorDown.png b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorDown.png
new file mode 100644
index 0000000000000000000000000000000000000000..7783f90479eefc4abab0ef0e16112d16474bda89
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorDown.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorLeft.gif b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorLeft.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fc947e0a1997c1cd7c0bf170312a93596c2b735c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorLeft.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorLeft.png b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorLeft.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae16d3601c02546717912a59ffba06b5581079cc
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorLeft.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorRight.gif b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorRight.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b0e8097f4b1fe9b8aead6c2b22d23a5702042fbf
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorRight.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorRight.png b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorRight.png
new file mode 100644
index 0000000000000000000000000000000000000000..9532b17dfcd6717cadc739be0cb89047541413d5
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorRight.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorUp.gif b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorUp.gif
new file mode 100644
index 0000000000000000000000000000000000000000..54bcf652c6bf0f540ed3d9a2079fcb5895b0605d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorUp.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorUp.png b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dc5b31b31895a3913a76ed6a225ce05ad0b3472
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/tooltipConnectorUp.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/treeExpand_loading.gif b/src/main/resources/static/dijit/themes/nihilo/images/treeExpand_loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..db9ddd0282895511c648154db2bf621e33fcfbe1
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/treeExpand_loading.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/treeHover.png b/src/main/resources/static/dijit/themes/nihilo/images/treeHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a9e0917fdb80ffca3913981b4b93617d533421e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/treeHover.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/treeI.gif b/src/main/resources/static/dijit/themes/nihilo/images/treeI.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6f669e24015476e1d05b9b69e042a91c9105ad2c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/treeI.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/treeI_half.gif b/src/main/resources/static/dijit/themes/nihilo/images/treeI_half.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e5fd0155bd99e8018ab44f08c8ad22c1a429dbc3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/treeI_half.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/treeI_half_rtl.gif b/src/main/resources/static/dijit/themes/nihilo/images/treeI_half_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..44ad021a36dea29ecf72868965aed52ce393a41d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/treeI_half_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/treeI_rtl.gif b/src/main/resources/static/dijit/themes/nihilo/images/treeI_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0d32a2f731795134a05617873080e36711806100
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/treeI_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/validationInputBg.gif b/src/main/resources/static/dijit/themes/nihilo/images/validationInputBg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c28475c8d4e2f1e6a59369f4ee46c17b700dffce
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/validationInputBg.gif differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/validationInputBg.png b/src/main/resources/static/dijit/themes/nihilo/images/validationInputBg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca0f890daa0379ba0107b802e93d4994e687eb0b
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/validationInputBg.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/images/warning.png b/src/main/resources/static/dijit/themes/nihilo/images/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..07cabeae1065d71cf6724e9e14fd268c7b1672f9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/nihilo/images/warning.png differ
diff --git a/src/main/resources/static/dijit/themes/nihilo/layout/AccordionContainer.css b/src/main/resources/static/dijit/themes/nihilo/layout/AccordionContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..f42db806c97ded9e79cafe7126b13920a2d6f0bb
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/layout/AccordionContainer.css
@@ -0,0 +1,46 @@
+/**
+ * dijit.layout.Accordioncontainer
+ *
+ */
+
+.nihilo .dijitAccordionContainer {
+	border-color: #ccc;
+	background-color: #fff;
+}
+
+/* common */
+
+.nihilo .dijitAccordionTitle {
+	background:#fafafa url("../images/titleBar.png") repeat-x top left;
+	border-top: 1px solid #dedede;
+	padding: 5px 4px 6px 8px;
+	font-size: 0.9em;
+	font-weight: bold;
+	color: #6d6d6d;
+}
+
+.nihilo .dijitAccordionTitleSelected  {
+	background: #f9f9f9 url("../images/accordionItemActive.png") top repeat-x;
+	font-weight: bold;
+	border-top: 1px solid #dedede;
+	border-bottom: 1px solid #dedede;
+	padding: 5px 4px 5px 8px;
+	color: #243C5F;
+}
+
+.nihilo .dijitAccordionArrow {
+	background:url("../images/spriteRoundedIconsSmall.gif") no-repeat -30px top;
+	width:15px;
+	height:15px;
+	margin-top:-1px;
+}
+
+.nihilo .dijitAccordionTitleSelected .dijitAccordionArrow {
+	background:url("../images/spriteRoundedIconsSmall.gif") no-repeat -15px top;
+	margin-top:-1px;
+}
+
+.nihilo .dijitAccordionText {
+	margin-left: 4px;
+	margin-right: 4px;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/layout/AccordionContainer_rtl.css b/src/main/resources/static/dijit/themes/nihilo/layout/AccordionContainer_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..f669a4753a34a51d4854aa81beb7b730f4b57dd0
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/layout/AccordionContainer_rtl.css
@@ -0,0 +1,8 @@
+.dijitRtl .nihilo .dijitAccordionArrow {
+	background-position: 0 top;
+}
+
+.dijitRtl .nihilo .dijitAccordionTitleSelected .dijitAccordionArrow {
+	/* same rule as LTR mode, just listed to override previous rule in this file */
+	background-position: -15px top;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/layout/BorderContainer.css b/src/main/resources/static/dijit/themes/nihilo/layout/BorderContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..493da54e17cbc9067a63a772b1eb0bcb0447b5fb
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/layout/BorderContainer.css
@@ -0,0 +1,76 @@
+/**
+ * dijit.layout.BorderContainer
+ *
+ */
+
+.nihilo .dijitBorderContainer {
+	background-color: #fcfcfc;
+	padding: 5px;
+}
+
+.nihilo .dijitSplitContainer-child,
+.nihilo .dijitBorderContainer-child {
+	/* By default, put borders on all children of BorderContainer,
+	 *  to give illusion of borders on the splitters themselves.
+	 */
+    border: 1px #ccc solid;
+}
+
+.nihilo .dijitBorderContainer-dijitTabContainerTop,
+.nihilo .dijitBorderContainer-dijitTabContainerBottom,
+.nihilo .dijitBorderContainer-dijitTabContainerLeft,
+.nihilo .dijitBorderContainer-dijitTabContainerRight {
+	/* except that TabContainer defines borders on it's sub-nodes (tablist and dijitTabPaneWrapper),
+	 * so override rule setting border on domNode
+	 */
+	 border: none;
+}
+
+.nihilo .dijitBorderContainer-dijitBorderContainer {
+	/* also, make nested BorderContainers look like a single big widget with lots of splitters */
+	border: none;
+	padding: 0;
+}
+
+.nihilo .dijitSplitterH,
+.nihilo .dijitGutterH {
+	background:#FCFCFC;
+	border:0;
+	border-left:0 solid #d3d3d3;
+	border-right:0 solid #d3d3d3;
+	height:5px;
+}
+
+.nihilo .dijitSplitterH .dijitSplitterThumb {
+	background:#8BA0BD none;
+	height:1px;
+	top:2px;
+	width:19px;
+}
+
+.nihilo .dijitSplitterV,
+.nihilo .dijitGutterV {
+	background:#FCFCFC;
+	border:0;
+	border-top:0 solid #d3d3d3;
+	border-bottom:0 solid #d3d3d3;
+	width:5px;
+}
+
+.nihilo .dijitSplitterV .dijitSplitterThumb {
+	background:#8BA0BD none;
+	height:19px;
+	left:2px;
+	width:1px;
+}
+
+/* active splitter */
+.nihilo .dijitSplitterActive {
+	font-size: 1px;
+	background-image: none;
+	background-color: #aaa;
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+	filter: Alpha(Opacity=60);
+	margin: 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/layout/ContentPane.css b/src/main/resources/static/dijit/themes/nihilo/layout/ContentPane.css
new file mode 100644
index 0000000000000000000000000000000000000000..75272db5ac7c5c973fec51aafc59b6d9c2273d5d
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/layout/ContentPane.css
@@ -0,0 +1,21 @@
+/* ContentPane */
+
+.nihilo .dijitContentPane {
+    padding: 0;
+}
+
+/* nested layouts */
+.nihilo .dijitTabContainerTop-dijitContentPane,
+.nihilo .dijitTabContainerLeft-dijitContentPane,
+.nihilo .dijitTabContainerRight-dijitContentPane,
+.nihilo .dijitTabContainerBottom-dijitContentPane,
+.nihilo .dijitAccordionContainer-dijitContentPane {
+    background-color: #fff;
+    padding: 5px;
+}
+
+.nihilo .dijitSplitContainer-dijitContentPane,
+.nihilo .dijitBorderContainer-dijitContentPane {
+    background-color: #fff;		/* override background-color setting on parent .dijitBorderContainer */
+    padding: 5px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/layout/SplitContainer.css b/src/main/resources/static/dijit/themes/nihilo/layout/SplitContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..9f4defadd0965661e857d096b45d97dcc336f03a
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/layout/SplitContainer.css
@@ -0,0 +1,34 @@
+/**
+ * dijit.layout.SplitContainer
+ *
+ */
+
+.nihilo .dijitSplitContainerSizerH {
+	background:url("../images/splitContainerSizerV.png") repeat-y #fff;
+	border:0;
+	border-left:0 solid #d3d3d3;
+	border-right:0 solid #d3d3d3;
+	width:5px;
+}
+
+.nihilo .dijitSplitContainerSizerH .thumb {
+	background:url("../images/splitContainerSizerV-thumb.png") no-repeat;
+	left:1px;
+	width:2px;
+	height:19px;
+}
+
+.nihilo .dijitSplitContainerSizerV {
+	background:url("../images/splitContainerSizerH.png") repeat-x #fff;
+	border:0;
+	border-top:0 solid #d3d3d3;
+	border-bottom:0 solid #d3d3d3;
+	height:2px;
+}
+
+.nihilo .dijitSplitContainerSizerV .thumb {
+	background:url("../images/splitContainerSizerH-thumb.png") no-repeat;
+	top:1px;
+	width:19px;
+	height:5px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/layout/TabContainer.css b/src/main/resources/static/dijit/themes/nihilo/layout/TabContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..dba38c3fab5d8eca19a0c8470b398364b4608b13
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/layout/TabContainer.css
@@ -0,0 +1,406 @@
+/**
+ * dijit.layout.TabContainer
+ */
+@import url("../Menu.css");
+
+/* Classes for all types of tabs (top/bottom/left/right) */
+
+.nihilo .dijitTabContainer .tabStripRBtn {
+	margin-right: 21px;
+}
+.nihilo .dijitTabContainer .tabStripLBtn {
+	margin-left: 21px;
+}
+
+.nihilo .dijitTabContainerBottom .nowrapTabStrip .dijitTab {
+	top: 0;
+}
+
+/* Tabs, shared classes */
+.nihilo .dijitTabPaneWrapper {
+	background:#fff;
+	border:1px solid #ccc;
+	margin: 0;
+	padding: 0;
+}
+
+.nihilo .dijitTab {
+    padding:3px 6px 3px 4px;
+    background: url("../images/tabContainerSprite.gif") repeat-x 0 -350px;
+    position: relative;
+	line-height:normal;
+	margin: 0 1px;	/* space between one tab and the next in top/bottom mode */
+	color: #6d6d6d;
+    border: 1px #dedede solid;
+	border-bottom: 1px #ccc solid;
+}
+
+/* hovered tab */
+.nihilo .dijitTabHover {
+	color: #243C5F;
+	background: url("../images/tabContainerSprite.gif") repeat-x 0 -200px;
+}
+
+/* selected tab */
+.nihilo .dijitTabChecked {
+	background: url("../images/tabContainerSprite.gif") repeat-x 0 -50px;
+	color: #243C5F !important;
+}
+
+/* Nested Tabs */
+.nihilo .dijitTabContainerNested .dijitTabListWrapper {
+	height: auto;
+}
+
+.nihilo .dijitTabContainerTabListNested {
+	background: #FDFDFD;
+	border: none;
+	margin-bottom: 0;		/* override margin: -1px; */
+}
+.nihilo .dijitTabContainerTabListNested .dijitTab {
+	background: none;
+	border: none;
+	top: 0;	/* override top:1px setting of top-level tabs */
+}
+.nihilo .dijitTabContainerTabListNested .dijitTabHover .tabLabel {
+	text-decoration: underline;
+}
+.nihilo .dijitTabContainerTabListNested .dijitTabChecked .tabLabel {
+	text-decoration: underline;
+	font-weight: bold;
+}
+.nihilo .dijitTabContainerSpacerNested {
+	/* thinner line between tab (labels) and content */
+	height: 0;
+	border-bottom: 0;
+}
+.nihilo .dijitTabPaneWrapperNested {
+	border: none;	/* prevent double border */
+}
+
+
+/* Close button */
+.nihilo .dijitTabCloseButton {
+	background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px top;
+	width: 15px;
+	height: 15px;
+	margin-top: -1px;
+}
+
+.dj_ie6 .nihilo .dijitTabCloseButton {
+	background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px top;
+}
+.nihilo .dijitTabCloseButtonHover {
+	background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px -15px;
+}
+.dj_ie6 .nihilo .dijitTabCloseButtonHover {
+	background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px -15px;
+}
+
+/* ================================ */
+/* top tabs */
+.nihilo .dijitTabContainerTop-tabs {
+	border-bottom: none;
+	padding-bottom: 1px;
+	background-position: bottom;
+	padding-left: 3px;
+}
+.nihilo .dijitTabContainerTop-tabs .dijitTab {
+    border-radius: 4px 4px 0 0;
+    -moz-border-radius: 4px 4px 0 0;
+}
+
+.dj_ie6 .nihilo .dijitTabListContainer-top,
+.dj_ie7 .nihilo .dijitTabListContainer-top {
+	z-index: 3;
+}
+
+.dj_ie6 .nihilo .dijitTabContainerTop-tabs,
+.dj_ie7 .nihilo .dijitTabContainerTop-tabs {
+	border-bottom: 1px solid #ccc;
+	padding-bottom: 0;
+}
+
+.nihilo .dijitTabContainerTopNoStrip {
+	padding-top: 3px;
+}
+
+/* top container */
+.nihilo .dijitTabContainerTop-container {
+	border-top: none;
+}
+
+/* selected tab */
+.nihilo .dijitTabContainerTop-tabs .dijitTabChecked {
+	border-bottom-color: #f8f8f8;
+}
+
+/* strip */
+.nihilo .dijitTabContainer .dijitTabContainerTopStrip {
+	border-bottom: none;
+	padding-top: 1px;
+	margin-top: 1px;
+	background: #f2f2f2;
+	border-top: 1px solid #CCC;
+	border-right: 1px solid #CCC;
+	border-left: 1px solid #CCC;
+}
+
+
+/* ================================ */
+/* bottom tabs */
+.nihilo .dijitTabContainerBottom-tabs {
+	border-top: none;
+	background-position: top;
+	padding-left: 3px;
+}
+.nihilo .dijitTabContainerBottom-tabs .dijitTab {
+    border-radius: 0 0 4px 4px;
+    -moz-border-radius: 0 0 4px 4px;
+    border-bottom: none;
+    border-top: 1px solid #ccc;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    background: url("../images/tabBottomEnabledC.gif") repeat-x bottom left;
+}
+
+
+.nihilo .dijitTabContainerBottom-tabs .dijitTabHover {
+	color: #243C5F;
+	background: url("../images/tabBottomHoverC.gif") repeat-x bottom left;
+}
+
+.nihilo .dijitTabContainerBottom-tabs .dijitTabChecked {
+	/* the selected tab (with or without hover) */
+    border-top-color: #f8f8f8;
+	background: url("../images/tabBottomActiveC.gif") repeat-x bottom left;
+}
+
+
+.dj_ie6 .nihilo .dijitTabListContainer-bottom,
+.dj_ie7 .nihilo .dijitTabListContainer-bottom {
+	z-index: 3;
+}
+
+.dj_ie6 .nihilo .dijitTabContainerBottom-tabs,
+.dj_ie7 .nihilo .dijitTabContainerBottom-tabs {
+	border-top: 1px solid #ccc;
+	margin-top: -1px;
+}
+
+/* bottom container */
+.nihilo .dijitTabContainerBottom-container {
+	border-bottom: none;
+}
+
+/* strip */
+.nihilo .dijitTabContainer .dijitTabContainerBottomStrip {
+	border: 1px solid #ccc;
+	background: #f2f2f2;
+	border-top: none;
+	padding-bottom: 2px;
+}
+
+/* top/bottom strip */
+.nihilo .dijitTabContainerBottom-spacer,
+.nihilo .dijitTabContainerTop-spacer {
+	height: 2px;
+	border: 1px solid #ccc;
+}
+
+.nihilo  .dijitTabContainerTop-spacer {
+	margin-top: -1px;
+    background: #f3f3f3;
+}
+.nihilo .dijitTabContainerBottom-spacer {
+	margin-bottom: -1px;
+    background: #f8f8f8;
+}
+
+
+/* ================================ */
+/* right tabs */
+.nihilo .dijitTabContainerRight-tabs {
+	border-color: #ccc;
+	padding-top: 3px;
+}
+.nihilo .dijitTabContainerRight-tabs .dijitTab {
+    border-radius: 0 4px 4px 0;
+    -moz-border-radius: 0 4px 4px 0;
+    border-left: 1px solid #ccc;
+    border-bottom: 1px solid #dedede !important;
+}
+
+.nihilo .dijitTabContainerRight .dijitTabListWrapper {
+	padding-right: 3px;
+}
+.nihilo .dijitTabContainerRight-tabs .dijitTabChecked {
+	border-left: 1px solid #f8f8f8;
+}
+
+
+/* right container */
+.nihilo .dijitTabContainerRight-container {
+	border-right: none;
+}
+
+/* some odd ie bug when borders disappear when setting a bottom margin, this sort of helps */
+.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTab {
+	border-bottom: solid #fff 1px;
+}
+
+/* selected tab */
+.nihilo .dijitTabContainerRight-tabs .dijitTabChecked {
+	border-left-color: #f8f8f8;
+}
+
+/* some odd ie bug when borders disappear when setting a bottom margin, this sort of helps */
+.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTabChecked,
+.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTabCheckedHover {
+	border-bottom: solid #efefef 1px;
+}
+
+/* strip */
+.nihilo .dijitTabContainerRightStrip {
+	padding-right: 2px;
+	border: 1px solid #ccc;
+	border-left: none;
+	background: #f2f2f2;
+}
+
+/* ================================ */
+/* left tabs */
+.nihilo .dijitTabContainerLeft-tabs {
+	border-color: #ccc;
+	padding-top: 3px;
+}
+.nihilo .dijitTabContainerLeft-tabs .dijitTab {
+    border-radius: 4px 0 0 4px;
+    -moz-border-radius: 4px 0 0 4px;
+    border-right: 1px solid #ccc;
+    border-bottom: 1px solid #dedede;
+}
+
+/* selected tab */
+.nihilo .dijitTabContainerLeft-tabs .dijitTabChecked {
+	border-right: 1px solid #f8f8f8;
+}
+
+/* left container */
+.nihilo .dijitTabContainerLeft-container {
+	border-left: none;
+}
+
+
+.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabChecked,
+.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabCheckedHover {
+	border-bottom: solid #efefef 1px;
+}
+
+.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabInnerDiv {
+	border-bottom: solid #fff 1px;
+}
+
+/* strip */
+.nihilo .dijitTabContainerLeftStrip {
+	padding-left: 2px;
+	border: 1px solid #ccc;
+	border-right: none;
+}
+
+.nihilo .dijitTabContainerLeftStrip {
+	background: #f2f2f2;
+}
+
+/* ================================ */
+/* left/right tabs */
+.nihilo .dijitTabContainerLeft-tabs .dijitTab,
+.nihilo .dijitTabContainerRight-tabs .dijitTab {
+	margin: 1px 0;	/* space between one tab and the next in left/right mode */
+}
+
+/* left/right tabstrip */
+.nihilo .dijitTabContainerLeft-spacer,
+.nihilo .dijitTabContainerRight-spacer {
+	width: 2px;
+	border: 1px solid #ccc;
+	background: #f8f8f8;
+}
+
+.nihilo .dijitTabContainerRight-spacer {
+	border-right: none;
+}
+
+.nihilo .dijitTabContainerRight-tabs {
+	padding-top: 3px;
+	height: 100%;
+}
+.nihilo .dijitTabContainerLeft-tabs {
+	height: 100%;
+}
+
+.nihilo .dijitTabContainerLeft-spacer {
+	border-left: none;
+}
+
+/* ================================ */
+
+/* this resets the tabcontainer strip when within a contentpane */
+.nihilo .dijitTabContainerTop-dijitContentPane .dijitTabContainerTop-tabs {
+	border-left: 0 solid #ccc;
+	border-top: 0 solid #ccc;
+	border-right: 0 solid #ccc;
+	padding-top: 0;
+	padding-left: 0;
+}
+
+/* ================================ */
+
+/* Menu and slider control styles */
+.nihilo .dijitTabContainer .tabStripButton {
+	margin-right: 0;
+	padding: 5px 3px 6px 0px;
+}
+
+.dj_ie6 .nihilo .tabStripButton .dijitTabInnerDiv .dijitTabContent,
+.dj_ie7 .nihilo .tabStripButton .dijitTabInnerDiv .dijitTabContent,
+.dj_opera .nihilo .tabStripButton .dijitTabInnerDiv .dijitTabContent {
+	padding-bottom: 7px;
+}
+
+.dj_ie6 .nihilo .tabStrip-disabled .tabStripButton .dijitTabInnerDiv .dijitTabContent,
+.dj_ie7 .nihilo .tabStrip-disabled .tabStripButton .dijitTabInnerDiv .dijitTabContent,
+.dj_opera .nihilo .tabStrip-disabled .tabStripButton .dijitTabInnerDiv .dijitTabContent {
+	padding-top: 4px;
+}
+
+.nihilo .dijitTabStripIcon {
+	height: 14px;
+	width: 14px;
+	background: url(../images/spriteRoundedIconsSmall.png) no-repeat left top;
+}
+
+.dj_ie6 .nihilo .dijitTabStripIcon {
+	background-image: url(../images/spriteRoundedIconsSmall.gif);
+}
+
+.nihilo .dijitTabStripSlideRightIcon {
+	background-position: -30px top;
+}
+
+.nihilo .dijitTabStripMenuIcon {
+	background-position: -15px top;
+}
+
+.nihilo .dijitTabContainerTopNone {
+	padding-top: 0;
+}
+
+.nihilo .dijitTabContainer .tabStripButton-top {
+	margin-top: 1px;
+}
+
+.nihilo .dijitTabContainer .tabStripButton-bottom {
+	border-bottom: medium none;
+	border-top: 1px solid #CCCCCC;
+}
diff --git a/src/main/resources/static/dijit/themes/nihilo/layout/TabContainer_rtl.css b/src/main/resources/static/dijit/themes/nihilo/layout/TabContainer_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..225fc3eba90b87f325b0cdca21c743fcb6ab8d19
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/layout/TabContainer_rtl.css
@@ -0,0 +1,43 @@
+.dijitRtl .nihilo .dijitTab {
+	margin-right:0;
+	margin-left:2px;		/* space between one tab and the next in top/bottom mode */
+}
+
+/* tab strips */
+.dijitRtl .nihilo .dijitTabContainer .tabStripButton {
+	margin-left: 0;
+}
+
+.dijitRtl .nihilo .dijitTabContainerTopStrip,
+.dijitRtl .nihilo .dijitTabContainerBottomStrip,
+.dijitRtl .nihilo .dijitTabContainerTop-tabs,
+.dijitRtl .nihilo .dijitTabContainerBottom-tabs {
+	padding-left: 0;
+	padding-right: 3px;
+}
+
+.dijitRtl .nihilo .dijitTabInnerDiv {
+	padding-left: 3px;
+	padding-right: 4px;
+}
+
+.dijitRtl .nihilo .dijitTabPaneWrapper {
+	#zoom: 1;
+}
+
+.dj_ie-rtl .nihilo .dijitTabContainerLeft-tabs {
+	margin-left: 0 !important;
+}
+
+.dj_ie-rtl .nihilo .dijitTabContainerRight-tabs {
+	margin-right: 0 !important;
+}
+
+.dijitRtl .nihilo .dijitTabContainerLeft-tabs .dijitTab,
+.dijitRtl .nihilo .dijitTabContainerRight-tabs .dijitTab {
+	margin-left:0;
+}
+
+.dj_ie-rtl .nihilo .dijitTab .dijitTabInnerDiv{
+	width : 1%;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/nihilo.css b/src/main/resources/static/dijit/themes/nihilo/nihilo.css
new file mode 100644
index 0000000000000000000000000000000000000000..97ba8f6ebe44ff74bfeb9106b3efecfa25baaea1
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/nihilo.css
@@ -0,0 +1,42 @@
+/*
+	Adds cosmetic styling to Dijit.  Users may swap with a custom theme CSS file.
+
+	NOTES:
+	---
+	Dialog.css contains css classes for both Dialog and Tooltip!
+	This because currently a dijit.TooltipDialog exist. Until this is resolved
+	you need to include Dialog.css for both dijits
+	---
+	Toolbar.css contains classes also used in Editor. Until this is resolved
+	you need to include Toolbar.css for both Toolbar and Editor
+	---
+	Button.css contains classes for combobox,
+
+*/
+
+@import url("../dijit.css");
+@import url("../../icons/commonIcons.css");/*sprite containing common icons to be used by all themes*/
+@import url("Common.css");
+
+@import url("layout/ContentPane.css");
+@import url("layout/TabContainer.css");
+@import url("layout/AccordionContainer.css");
+@import url("layout/SplitContainer.css");
+@import url("layout/BorderContainer.css");
+@import url("form/Common.css");
+@import url("form/Button.css");
+@import url("form/Checkbox.css");
+@import url("form/RadioButton.css");
+@import url("form/Slider.css");
+@import url("form/Select.css");
+@import url("Tree.css");
+@import url("ProgressBar.css");
+@import url("TitlePane.css");
+@import url("Calendar.css");
+@import url("TimePicker.css");
+@import url("Toolbar.css");
+@import url("Dialog.css");
+@import url("Menu.css");
+@import url("Editor.css");
+@import url("../../icons/editorIcons.css"); /* sprite for editor icons to be used by all themes */
+@import url("ColorPalette.css");
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/nihilo/nihilo_rtl.css b/src/main/resources/static/dijit/themes/nihilo/nihilo_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..5c32adeb6ce0b03d9fd2dd404b95ec169dd20615
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/nihilo/nihilo_rtl.css
@@ -0,0 +1,30 @@
+/*
+	Adds cosmetic styling to Dijit.  Users may swap with a custom theme CSS file.
+
+	NOTES:
+	---
+	Dialog.css contains css classes for both Dialog and Tooltip!
+	This because currently a dijit.TooltipDialog exist. Until this is resolved
+	you need to include Dialog.css for both dijits
+	---
+	Toolbar.css contains classes also used in Editor. Until this is resolved
+	you need to include Toolbar.css for both Toolbar and Editor
+	---
+	Button.css contains classes for combobox,
+
+*/
+
+@import url("../dijit_rtl.css");
+@import url("layout/TabContainer_rtl.css");
+@import url("layout/AccordionContainer_rtl.css");
+@import url("form/Slider_rtl.css");
+@import url("form/Button_rtl.css");
+@import url("Tree_rtl.css");
+@import url("TitlePane_rtl.css");
+@import url("Calendar_rtl.css");
+@import url("TimePicker_rtl.css");
+@import url("Dialog_rtl.css");
+@import url("ProgressBar_rtl.css");
+@import url("Menu_rtl.css");
+@import url("Editor_rtl.css");
+@import url("../../icons/editorIcons_rtl.css");/* RTL sprite for editor icons to be used by all themes*/
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/Calendar.css b/src/main/resources/static/dijit/themes/soria/Calendar.css
new file mode 100644
index 0000000000000000000000000000000000000000..98526beb73cccf70010dcbe254f991b660b75721
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Calendar.css
@@ -0,0 +1,160 @@
+/* Calendar*/
+
+.soria .dijitCalendarIncrementControl {
+	/* next/prev month buttons */
+	width:15px;
+	height:15px;
+	background-image: url("images/spriteRoundedIconsSmall.png");
+	background-repeat: no-repeat;
+}
+.dj_ie6 .soria .dijitCalendarIncrementControl {
+	font-size:.1em;
+	background-image: url("images/spriteRoundedIconsSmall.gif");
+}
+
+.soria .dijitA11ySideArrow {
+	display: none;
+}
+
+.soria .dijitCalendarDecrease {
+	background-position: top left;
+}
+.soria .dijitCalendarIncrease {
+	background-position: -30px top;
+}
+
+.soria table.dijitCalendarContainer {
+	font-size: 100%;
+	border-spacing: 0;
+	border-collapse: separate;
+	margin: 0;
+}
+
+.soria .dijitCalendarMonthContainer {
+	/* month header cell */
+	background:#bed7f0 url("images/titleBar.png") repeat-x top;
+	padding-top:.3em;
+	padding-bottom:.2em;
+	text-align:center;
+}
+.dj_ie6 .soria .dijitCalendarMonthContainer th {
+	padding-top:.2em;
+	padding-bottom:.1em;
+}
+
+.soria .dijitCalendarDayLabelTemplate {
+	/* day of week labels */
+	background:#bed7f0;
+	font-weight:normal;
+	padding-top:.15em;
+	padding-bottom:.2em;
+	border-bottom: 1px solid #b1badf;
+	color:#293a4b;
+	text-align:center;
+}
+
+.soria .dijitCalendarBodyContainer {
+	border-bottom: 1px solid #eeeeee;
+}
+
+.soria .dijitCalendarMonthLabel {
+	color:#293a4b;
+	font-weight: bold;
+	padding: 0 4px;
+}
+
+.soria .dijitCalendarDateTemplate {
+	/* style for each day cell */
+	font-size: 0.9em;
+	font-weight: bold;
+	text-align: center;
+	padding: 0.3em 0.3em 0.05em 0.3em;
+	letter-spacing: 1px;
+	background-color: #fff;
+	border:#fff solid 1px !important;
+}
+
+.dj_ie .soria .dijitCalendarDateTemplate {
+	padding: 0.1em .33em 0.02em .33em;
+}
+
+.soria .dijitCalendarPreviousMonth,
+.soria .dijitCalendarNextMonth 		{
+	/* days that are part of the previous or next month */
+	color:#999999;
+	background-color:#fdfdfd !important;
+	border:#fdfdfd solid 1px !important;
+}
+
+.soria .dijitCalendarCurrentMonth {
+	/* days that are part of this month */
+}
+
+.soria .dijitCalendarDisabledDate {
+	text-decoration:line-through !important;
+}
+
+.soria .dijitCalendarCurrentDate {
+	/* cell for today's date */
+	text-decoration:underline;
+	font-weight:bold;
+}
+
+.soria .dijitCalendarSelectedDate {
+	/* cell for the selected date */
+	background-color:#b9cbf1 !important;
+	color:black !important;
+	border:#4b5aaa solid 1px !important;
+}
+
+
+.soria .dijitCalendarYearContainer {
+	/* footer of the table that contains the year display/selector */
+	background:white url("images/titleBar.png") repeat-x top;
+}
+
+.soria .dijitCalendarYearLabel {
+	/* container for all of 3 year labels */
+	margin:0;
+	padding:0.4em 0 0.25em 0;
+	text-align:center;
+	font-size: 1.17em;
+}
+
+.soria .dijitCalendarSelectedYear {
+	/* label for selected year */
+	font-weight:bolder;
+	color:black;
+	padding:0.2em;
+	padding-bottom:0.1em;
+	background-color:#b9cbf1 !important;
+	border:#4b5aaa solid 1px !important;
+}
+
+.soria .dijitCalendarNextYear,
+.soria .dijitCalendarPreviousYear {
+	/* label for next/prev years */
+	color:black !important;
+	font-weight:normal;
+}
+
+/* Styling for month DropDownButton */
+
+.soria .dijitCalendar .dijitDropDownButton {
+	margin: 0;
+}
+.soria .dijitCalendar .dijitButtonText {
+	padding: 0;
+}
+.soria .dijitCalendar .dijitDropDownButton .dijitButtonNode {
+	background-color: transparent;
+	background-image: none;
+	padding: 0;
+}
+
+/* Styling for month drop down list */
+
+.soria .dijitCalendarMonthMenu .dijitCalendarMonthLabelHover {
+	background-color: #d9e6f9;
+	color: #243C5F;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/Calendar_rtl.css b/src/main/resources/static/dijit/themes/soria/Calendar_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..c2350b4ed400c87eb078a16d851f02ee00b43f76
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Calendar_rtl.css
@@ -0,0 +1,9 @@
+/* Calendar */
+
+.dijitRtl .soria .dijitCalendarDecrease {
+	background-position: -30px top;
+}
+
+.dijitRtl .soria .dijitCalendarIncrease {
+	background-position: 0 top;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/ColorPalette.css b/src/main/resources/static/dijit/themes/soria/ColorPalette.css
new file mode 100644
index 0000000000000000000000000000000000000000..85d6dd819800491ee4569f3539d247dfa1e664be
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/ColorPalette.css
@@ -0,0 +1,5 @@
+.dijitColorPalette {
+	border:1px solid #cbcbcb;
+	background:#fff;
+	-moz-border-radius: 0 !important;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/Common.css b/src/main/resources/static/dijit/themes/soria/Common.css
new file mode 100644
index 0000000000000000000000000000000000000000..93efae7baf46b325ecba272c2e12f35e9e55dc70
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Common.css
@@ -0,0 +1,22 @@
+/* DnD hovered and selected node(s) */
+.soria .dojoDndItemOver {
+	background-image: url(images/treeHover.png);
+}
+.soria .dojoDndItemAnchor,
+.soria .dojoDndItemSelected {
+	background-color: #B8CBEC;
+}
+
+
+/* DnD avatar-specific settings */
+/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */
+
+.soria table.dojoDndAvatar { -moz-border-radius: 0; border: 1px solid #ccc; border-collapse: collapse; background-color: #fff; font-size: 75%; color: black;}
+.soria .dojoDndAvatar td	{ border: none; }
+.soria .dojoDndAvatar tr	{ border: none; }
+.soria .dojoDndAvatarHeader td	{ height: 20px; padding: 0 0 0 21px; }
+.soria .dojoDndAvatarItem td { padding: 2px;}
+.soria.dojoDndMove .dojoDndAvatarHeader	{background-color: #f58383; background-image: url(images/dndNoMove.png); background-repeat: no-repeat; background-position: 2px center;}
+.soria.dojoDndCopy .dojoDndAvatarHeader	{background-color: #f58383; background-image: url(images/dndNoCopy.png); background-repeat: no-repeat; background-position: 2px center;}
+.soria.dojoDndMove .dojoDndAvatarCanDrop .dojoDndAvatarHeader	{background-color: #97e68d; background-image: url(images/dndMove.png); background-repeat: no-repeat; background-position: 2px center;}
+.soria.dojoDndCopy .dojoDndAvatarCanDrop .dojoDndAvatarHeader	{background-color: #97e68d; background-image: url(images/dndCopy.png); background-repeat: no-repeat; background-position: 2px center;}
diff --git a/src/main/resources/static/dijit/themes/soria/Dialog.css b/src/main/resources/static/dijit/themes/soria/Dialog.css
new file mode 100644
index 0000000000000000000000000000000000000000..956df8d5e1c2ecb7353f630f128dd0e11b0cc963
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Dialog.css
@@ -0,0 +1,147 @@
+/* Dialog */
+
+.soria .dijitDialog {
+	background: #eee;
+	border: 1px solid #cbcbcb;
+	-webkit-box-shadow: 0 5px 10px #adadad;
+	padding: 0;
+}
+
+.soria .dijitDialog .dijitDialogTitle {
+	/* typography and styling of the dialog title */
+	font-weight: bold;
+	padding: 0 4px;
+	font-size: 0.9em;
+	color: #243C5F;
+}
+
+.soria .dijitDialog .dijitDialogPaneContent {
+	background: #ffffff;
+	border-top: 1px solid #b1badf;
+	padding:10px;
+
+}
+
+.soria .dijitDialogTitleBar {
+	/* outer container for the titlebar of the dialog */
+	background: #fafafa url("images/titleBar.png") repeat-x top left;
+	padding: 5px 6px 3px 6px;
+	outline:0; /* remove this line if keyboard focus on dialog startup is an issue. tab still takes you to first focusable element */
+}
+
+.soria .dijitDialogCloseIcon {
+	/* the default close icon for the dialog */
+	background-image: url("images/spriteRoundedIconsSmallBl.png");
+	background-repeat: no-repeat;
+	background-position: -60px 0;
+	position: absolute;
+	vertical-align: middle;
+	right: 6px;
+	top: 4px;
+	height: 15px;
+	width: 15px;
+}
+.dj_ie6 .soria .dijitDialogCloseIcon {
+	background-image: url("images/spriteRoundedIconsSmallBl.gif");
+}
+.soria .dijitDialogCloseIconHover {
+	background-position: -60px -15px;
+}
+
+/* Tooltip and TooltipDialog */
+
+.soria .dijitTooltip,
+.soria .dijitTooltipDialog {
+	/* the outermost dom node, holding the connector and container */
+	background: transparent;	/* make the area on the sides of the arrow transparent */
+}
+
+.dijitTooltipBelow {
+	/* leave room for arrow above content */
+	padding-top: 10px;
+}
+
+.dijitTooltipAbove {
+	/* leave room for arrow below content */
+	padding-bottom: 10px;
+}
+
+.soria .dijitTooltipContainer {
+	/* The part with the text. */
+	background-color: #fff;
+	border:1px solid #cbcbcb;
+	padding:0.45em;
+}
+
+.soria .dijitTooltipConnector {
+	/* the arrow piece */
+	border:0;
+	z-index: 2;
+}
+
+.soria .dijitTooltipABRight .dijitTooltipConnector {
+	/* above or below tooltip, but the arrow appears on the right,
+		and the right edges of target and tooltip are aligned rather than the left */
+	left: auto !important;
+	right: 6px;
+}
+
+.soria .dijitTooltipBelow .dijitTooltipConnector {
+	/* the arrow piece for tooltips below an element */
+	top: 0;
+	left: 6px;
+	background:url("images/tooltipConnectorUp.png") no-repeat top left;
+	width:17px;
+	height:11px;
+}
+
+.dj_ie .soria .dijitTooltipBelow .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorUp.gif");
+}
+
+.soria .dijitTooltipAbove .dijitTooltipConnector {
+	/* the arrow piece for tooltips above an element */
+	bottom: 0;
+	left: 6px;
+	background:url("images/tooltipConnectorDown.png") no-repeat top left;
+	width:17px;
+	height:11px;
+}
+.dj_ie .soria .dijitTooltipAbove .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorDown.gif");
+}
+.dj_ie .soria .dijitTooltipAbove .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorDown.gif");
+}
+.dj_ie6 .soria .dijitTooltipAbove .dijitTooltipConnector {
+	bottom: -5px;
+}
+
+.soria .dijitTooltipLeft {
+	padding-right: 10px;
+}
+.soria .dijitTooltipLeft .dijitTooltipConnector {
+	/* the arrow piece for tooltips to the left of an element, bottom borders aligned */
+	right: 0;
+	background:url("images/tooltipConnectorRight.png") no-repeat top left;
+	width:11px;
+	height:17px;
+}
+.dj_ie .soria .dijitTooltipLeft .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorRight.gif");
+}
+
+.soria .dijitTooltipRight {
+	padding-left: 10px;
+}
+.soria .dijitTooltipRight .dijitTooltipConnector {
+	/* the arrow piece for tooltips to the right of an element, bottom borders aligned */
+	left: 0;
+	background:url("images/tooltipConnectorLeft.png") no-repeat top left;
+	width:11px;
+	height:17px;
+}
+.dj_ie .soria .dijitTooltipRight .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorLeft.gif");
+}
+
diff --git a/src/main/resources/static/dijit/themes/soria/Dialog_rtl.css b/src/main/resources/static/dijit/themes/soria/Dialog_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..838700af5766d6ca3c8c8fe5b30825fb59c83da2
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Dialog_rtl.css
@@ -0,0 +1,5 @@
+/* Dialog */
+.dijitRtl .soria .dijitDialogTitleBar .dijitDialogCloseIcon {
+	right: auto;
+	left: 5px;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/Editor.css b/src/main/resources/static/dijit/themes/soria/Editor.css
new file mode 100644
index 0000000000000000000000000000000000000000..d2dd2930362b7d5e1fb2fe770f909e892d4221a3
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Editor.css
@@ -0,0 +1,17 @@
+.soria .dijitToolbar .dijitToolbarSeparator {
+	background: url('../../icons/images/editorIconsEnabled.png'); /* separator in editor icons sprite image - enabled state */
+}
+
+/**** ICONS *****/
+
+.soria .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsEnabled.png'); /* editor icons sprite image - enabled state */
+	background-repeat: no-repeat;
+	width: 18px;
+	height: 18px;
+	text-align: center;
+}
+.soria .dijitDisabled .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsDisabled.png'); /* editor icons sprite image - disabled state */
+}
+
diff --git a/src/main/resources/static/dijit/themes/soria/Editor_rtl.css b/src/main/resources/static/dijit/themes/soria/Editor_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..a1f76e8c453e2efe4170baf70dd266d288233853
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Editor_rtl.css
@@ -0,0 +1,7 @@
+/* Editor */
+.dijitRtl .soria .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsEnabled_rtl.png'); /* editor icons sprite image - enabled state */
+}
+.dijitRtl .soria .dijitDisabled .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsDisabled_rtl.png'); /* editor icons sprite image - disabled state */
+}
diff --git a/src/main/resources/static/dijit/themes/soria/Menu.css b/src/main/resources/static/dijit/themes/soria/Menu.css
new file mode 100644
index 0000000000000000000000000000000000000000..d2dffd22ab3e3d86c786946c92735ce40090070a
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Menu.css
@@ -0,0 +1,80 @@
+
+/* Menu */
+.soria .dijitMenu,
+.soria .dijitMenuBar {
+	border: 1px solid #cbcbcb;
+	margin: 0;
+	padding: 0;
+	background-color: #fff;
+}
+
+.soria .dijitBorderContainer .dijitMenuBar {
+	border:1px solid #B1BADF;
+}
+
+.soria .dijitMenuItem {
+	font-family: sans-serif;
+	margin: 0;
+	color: #243C5F;
+}
+.soria .dijitMenuBar .dijitMenuItem {
+	padding: 4px 5px;
+}
+
+.soria .dijitMenuPreviousButton, .soria .dijitMenuNextButton {
+	font-style: italic;
+}
+.soria .dijitMenuItem TD {
+	padding:1px;
+}
+
+.soria .dijitMenuPassive .dijitMenuItemHover,
+.soria .dijitComboBoxMenu .dijitMenuItemHover,
+.soria .dijitMenuItemSelected {
+	background-color: #d9e6f9; /* #95a0b0; #555555; #aaaaaa; #646464;  #60a1ea; #848484; */
+	color: #243C5F;
+}
+
+.soria .dijitMenuItemIcon {
+	width: 15px;
+	height: 15px;
+}
+
+.soria .dijitMenuExpand {
+	width:15px;
+	height:15px;
+	background-image: url('images/spriteRoundedIconsSmall.png');
+	background-position: -30px top;
+}
+.dj_ie6 .soria .dijitMenuExpand {
+	background-image: url('images/spriteRoundedIconsSmall.gif');
+}
+
+.soria .dijitMenuSeparator {
+	height: 1px;
+}
+
+/* separator can be two pixels -- set border of either one to 0 to have only one */
+.soria .dijitMenuSeparatorTop {
+	border-bottom: 1px solid #fff; /*97adcb; */
+}
+
+.soria .dijitMenuSeparatorBottom {
+	border-top: 1px solid #8ba0bd;
+}
+
+/* the checked menu item */
+.soria .dijitCheckedMenuItem .dijitMenuItemIcon  {
+	background-image: url('images/spriteCheckbox.gif');
+	background-position: -80px;
+}
+.soria .dijitCheckedMenuItemChecked .dijitMenuItemIcon {
+	background-position: -64px;
+}
+.soria .dijitRadioMenuItem .dijitMenuItemIcon {
+	background-image: url('images/spriteRadio.gif');
+	background-position: -80px;
+}
+.soria .dijitRadioMenuItemChecked .dijitMenuItemIcon {
+	background-position: -64px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/Menu_rtl.css b/src/main/resources/static/dijit/themes/soria/Menu_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..0e01483947d89ec2cb7c81b47b19905eea0323d5
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Menu_rtl.css
@@ -0,0 +1,10 @@
+/* Menu */
+
+.dijitRtl .soria .dijitMenuItem .dijitMenuItemIcon {
+	padding-left: 3px;
+	padding-right: 0;
+}
+
+.dijitRtl .soria .dijitMenuItem .dijitMenuExpand {
+	background-position: left top;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/ProgressBar.css b/src/main/resources/static/dijit/themes/soria/ProgressBar.css
new file mode 100644
index 0000000000000000000000000000000000000000..19ad2fa8b9de6b20956f310dc62b4249c76ddc72
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/ProgressBar.css
@@ -0,0 +1,34 @@
+
+/****
+		dijit.ProgressBar
+ ****/
+
+.soria .dijitProgressBar {
+	margin:2px 0 2px 0;
+}
+
+.soria .dijitProgressBarEmpty{
+	/* outer container and background of the bar that's not finished yet*/
+	background:#fff url("images/progressBarEmpty.png") repeat-x center center;
+	border-color: #8ba0bd;
+}
+
+.soria .dijitProgressBarTile{
+	/* inner container for finished portion when in 'tile' (image) mode */
+	background:#f0f0f0 url("images/progressBarFull.png") repeat-x center center;
+}
+
+.soria .dijitProgressBarFull {
+	border: 0px solid #8ba0bd;
+	border-right-width: 1px;
+}
+
+.soria .dijitProgressBarLabel {
+	/* Set to a color that contrasts with both the "Empty" and "Full" parts. */
+	color:#293a4b;
+}
+
+.soria .dijitProgressBarIndeterminate .dijitProgressBarTile {
+	/* use an animated gif for the progress bar in 'indeterminate' mode */
+	background:#cad2de url("images/progressBarAnim.gif") repeat-x center center;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/ProgressBar_rtl.css b/src/main/resources/static/dijit/themes/soria/ProgressBar_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..8f805a89eaaad159c81d6189e4a4e0d3bbd2c9b4
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/ProgressBar_rtl.css
@@ -0,0 +1,18 @@
+
+/****
+		dijit.ProgressBar
+ ****/
+
+.soria  .dijitProgressBarRtl .dijitProgressBarFull {
+	border-left-width: 1px;
+	border-right: 0px;
+}
+
+.soria  .dijitProgressBarIndeterminateRtl .dijitProgressBarTile {
+	-moz-transform: scaleX(-1);
+	-o-transform: scaleX(-1);
+	-webkit-transform: scaleX(-1);
+	transform: scaleX(-1);
+	filter: FlipH;
+	-ms-filter: "FlipH";
+}
diff --git a/src/main/resources/static/dijit/themes/soria/TimePicker.css b/src/main/resources/static/dijit/themes/soria/TimePicker.css
new file mode 100644
index 0000000000000000000000000000000000000000..e2f827c9b22c5aacaacb4074992c818d72fac3b9
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/TimePicker.css
@@ -0,0 +1,33 @@
+/* Time Picker */
+.soria .dijitTimePickerTick,
+.soria .dijitTimePickerMarker {
+	border-color: #b1badf;
+}
+
+.soria .dijitTimePickerTick {
+	color: gray;
+}
+
+.soria .dijitTimePickerMarker {
+	background:#bed7f0 url("images/titleBar.png") repeat-x top;
+	color:#293a4b;
+	font-weight: bold;
+}
+
+.soria .dijitTimePickerItemSelected {
+	color: black;
+	background: #b9cbf1 none;
+}
+
+.soria .dijitTimePickerItemHover {
+	background: #60a1ea none;
+	color:white;
+}
+
+.soria .dijitTimePickerTick .dijitTimePickerItemInner {
+	font-size: 0.8em;
+}
+
+.soria .dijitTimePickerItemSelected .dijitTimePickerItemInner {
+	font-size: 1em;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/TimePicker_rtl.css b/src/main/resources/static/dijit/themes/soria/TimePicker_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..a802ba6b6a4243b63984783946ac03ca361222be
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/TimePicker_rtl.css
@@ -0,0 +1,4 @@
+.dj_ie6-rtl .soria .dijitTimePickerMarkerHover,
+.dj_ie7-rtl .soria .dijitTimePickerMarkerHover {
+        border-top: 0; /* IE6/7 bug causes mouseover/out event storm */
+}
diff --git a/src/main/resources/static/dijit/themes/soria/TitlePane.css b/src/main/resources/static/dijit/themes/soria/TitlePane.css
new file mode 100644
index 0000000000000000000000000000000000000000..ad7f4e9e78a12df71378b3e1a62a92831716056d
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/TitlePane.css
@@ -0,0 +1,58 @@
+/**
+ * dijit.TitlePane and dijit.Fieldset
+ *
+ */
+
+.soria .dijitTitlePaneTitle {
+	background: #cccccc;
+	background:#fff url("images/titleBar.png") repeat-x top left;
+	border:1px solid #bfbfbf;
+	padding:3px 4px;
+	font-size: 0.9em;
+	font-weight: bold;
+	color: #6d6d6d;
+}
+.soria .dijitTitlePaneTitleHover {
+	background: #f9f9f9 url("images/accordionItemActive.png") top repeat-x;
+}
+
+.soria .dijitTitlePaneTitle * {
+	vertical-align: middle;
+}
+
+.soria .dijitTitlePane .dijitArrowNode,
+.soria .dijitFieldset .dijitArrowNode {
+	width:15px;
+	height:15px;
+}
+
+.soria .dijitTitlePaneTextNode {
+	color: #243C5F;
+}
+
+.soria .dijitTitlePane .dijitClosed .dijitArrowNode, .soria .dijitFieldset .dijitFieldsetTitleClosed .dijitArrowNode {
+	background: url('images/spriteRoundedIconsSmall.png') no-repeat -30px top;
+}
+.dj_ie6 .soria .dijitTitlePane .dijitClosed .dijitArrowNode, .dj_ie6 .soria .dijitFieldset .dijitFieldsetTitleClosed .dijitArrowNode {
+	background:url('images/spriteRoundedIconsSmall.gif') no-repeat -30px top;
+}
+.soria .dijitTitlePane .dijitOpen .dijitArrowNode, .soria .dijitFieldset .dijitFieldsetTitleOpen .dijitArrowNode {
+	background:url('images/spriteRoundedIconsSmall.png') no-repeat -15px top;
+}
+.dj_ie6 .soria .dijitTitlePane .dijitOpen .dijitArrowNode, .dj_ie6 .soria .dijitFieldset .dijitFieldsetTitleClosed .dijitArrowNode {
+	background:url('images/spriteRoundedIconsSmall.gif') no-repeat -15px top;
+}
+
+.soria .dijitTitlePaneContentOuter {
+	background: #ffffff;
+	border: 1px solid #bfbfbf;
+	border-top: 0;
+}
+.soria .dijitTitlePaneContentInner {
+	padding:10px;
+}
+
+.soria .dijitTitlePaneTextNode {
+	margin-left: 4px;
+	margin-right: 4px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/TitlePane_rtl.css b/src/main/resources/static/dijit/themes/soria/TitlePane_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..5252264f6049a4ac0201e2efcf2152439de4df99
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/TitlePane_rtl.css
@@ -0,0 +1,3 @@
+.soria .dijitTitlePaneRtl .dijitClosed .dijitArrowNode, .soria .dijitFieldsetRtl .dijitFieldsetTitleClosed .dijitArrowNode {
+	background-position: 0 top;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/Toolbar.css b/src/main/resources/static/dijit/themes/soria/Toolbar.css
new file mode 100644
index 0000000000000000000000000000000000000000..8af426a11b0cd1fb5f1b7703ce0ec4d2e9590f1f
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Toolbar.css
@@ -0,0 +1,65 @@
+.soria .dijitToolbar {
+	border-bottom: 1px solid #ccc;
+	background:#eaeaea url("images/titleBar.png") repeat-x top left;
+}
+
+/* setting a min-height on ditor toolbar */
+.dj_ie6 .soria .dijitToolbar {
+	height: 10px;
+}
+
+.soria .dijitToolbar .dijitButtonNode,
+.soria .dijitToolbar .dijitComboButton .dijitButtonContents,
+.soria .dijitToolbar .dijitComboButton .dijitDownArrowButton {
+	background: none;
+	margin: 0;
+	padding: 0;
+	border: none;
+	font-size: 12px;
+}
+
+.soria .dijitToolbar .dijitButton,
+.soria .dijitToolbar .dijitToggleButton,
+.soria .dijitToolbar .dijitDropDownButton,
+.soria .dijitToolbar .dijitComboButton .dijitButtonContents,
+.soria .dijitToolbar .dijitComboButton .dijitDownArrowButton {
+	background: none;
+	padding: 1px;	/* on hover etc., margin replaced w/border */
+}
+
+.soria .dijitToolbar .dijitButtonChecked,
+.soria .dijitToolbar .dijitToggleButtonChecked {
+	background-color:#d8e5f8;
+	border:1px solid #316ac5;
+	padding: 0;
+}
+
+.soria .dijitToolbar .dijitButtonCheckedHover,
+.soria .dijitToolbar .dijitToggleButtonCheckedHover
+ {
+	background-color:#9abbea;
+	border:1px solid #316ac5;
+	padding: 0;
+}
+
+.soria .dijitToolbar .dijitButtonHover,
+.soria .dijitToolbar .dijitToggleButtonHover,
+.soria .dijitToolbar .dijitDropDownButtonHover,
+.soria .dijitToolbar .dijitComboButton .dijitButtonContentsHover,
+.soria .dijitToolbar .dijitComboButton .dijitDownArrowButtonHover {
+	/* TODO: change this from Hover to Selected so that button is still highlighted while drop down is being used */
+	border: 1px solid #316ac5;
+	padding: 0;
+	background-color:#9abbea;
+}
+
+.soria .dijitToolbar label {
+	padding: 3px 3px 0 6px;
+}
+
+.dj_ie .soria .dijitToolbar .dijitComboButton .dijitButtonContentsFocused,
+.dj_ie .soria .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused {
+	/* focus border doesn't appear on <td> for IE, so need to add it manually */
+	border: 1px #777 dotted !important;
+	padding: 0;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/Tree.css b/src/main/resources/static/dijit/themes/soria/Tree.css
new file mode 100644
index 0000000000000000000000000000000000000000..d8edb67dfb1ec0f0c9c8ede06e0be03e7fc62e4f
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Tree.css
@@ -0,0 +1,105 @@
+/* Tree */
+
+.soria .dijitTreeNode {
+    background : url('images/treeI.gif') no-repeat;
+    background-position : top left;
+    background-repeat : repeat-y;
+    zoom: 1;
+}
+
+.soria .dijitTreeRowHover {
+	/* using a transparent png so that we can still see grid lines, which are (unfortunately) behind the dijitRowNode that we are hovering over */
+	background-image: url(images/treeHover.png);
+	background-repeat: repeat;
+	background-color: transparent !important;
+}
+
+
+/* left vertical line (grid) for all nodes */
+.soria .dijitTreeIsLast {
+    background: url('images/treeI_half.gif') no-repeat;
+}
+
+.soria .dijitTreeLabel {
+	font-weight: normal;
+	margin-left: 3px;
+}
+
+.soria .dijitTreeIsRoot {
+    margin-left: 0;
+    background-image: none;
+}
+
+.soria .dijitTreeExpando {
+    width: 18px;
+    height: 18px;
+}
+
+.soria .dijitTreeRow {
+	/* so insert line shows up on IE when dropping after a target element */
+	padding-bottom: 2px;
+}
+
+.soria .dijitTreeContent {
+    min-height: 18px;
+    min-width: 18px;
+    padding-left:1px;
+}
+
+.soria .dijitTreeRowSelected .dijitTreeLabel{
+	background:#b8cbec;
+}
+
+.soria .dijitTreeExpandoOpened {
+	background: url('images/spriteTree.gif') no-repeat -18px top;
+}
+
+.soria .dijitTreeExpandoClosed {
+	background-image: url('images/spriteTree.gif');
+}
+
+.soria .dijitTreeExpandoLeaf {
+	background: url('images/spriteTree.gif') no-repeat -36px top;
+}
+
+.soria .dijitTreeExpandoLoading {
+	background-image: url('images/treeExpand_loading.gif');
+}
+
+.soria .dijitTreeIcon {
+	width: 16px;
+	height: 16px;
+}
+
+.soria .dijitFolderOpened {
+	background: url('images/spriteDivIcons.gif') no-repeat -16px top;
+}
+
+.soria .dijitFolderClosed {
+	background: url('images/spriteDivIcons.gif') no-repeat top left;
+}
+
+.soria .dijitLeaf {
+	background: url('images/spriteDivIcons.gif') no-repeat -32px top;
+}
+
+/* Drag and Drop on TreeNodes
+ * Put insert line on dijitTreeContent node so it's aligned w/
+ * (ie, indented equally with) target element, even
+ * though dijitTreeRowNode is the actual "drag object"
+ */
+.soria .dijitTreeNode .dojoDndItemBefore,
+.soria .dijitTreeNode .dojoDndItemAfter {
+	border-bottom: none;
+	border-top: none;
+}
+
+.soria .dijitTreeNode .dojoDndItemBefore .dijitTreeContent {
+	/* copied from Common.css */
+	border-top: 2px solid #369;
+}
+
+.soria .dijitTreeNode .dojoDndItemAfter .dijitTreeContent {
+	/* copied from Common.css */
+	border-bottom: 2px solid #369;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/Tree_rtl.css b/src/main/resources/static/dijit/themes/soria/Tree_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..44daf3aa8f760a37036e0d2bc3d4eb777d0e2a76
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/Tree_rtl.css
@@ -0,0 +1,22 @@
+/* Tree */
+
+.dijitRtl .soria .dijitTreeNode,
+.dijitRtl .soria .dijitTreeExpandoLeaf {
+	/* disable grid lines for Tree in RTL mode, too hard to support */
+    background-image: none;
+}
+
+.dijitRtl .soria .dijitTreeContent {
+    padding-left: 0;
+    padding-right: 1px;
+}
+
+.dijitRtl .soria .dijitTreeExpandoOpened {
+	/* todo: icon contains grid line but grid lines disabled above */
+	background: url('images/spriteTree_rtl.gif') no-repeat -18px top;
+}
+
+.dijitRtl .soria .dijitTreeExpandoClosed {
+	/* todo: icon contains grid line but grid lines disabled above */
+	background-image: url('images/spriteTree_rtl.gif');
+}
diff --git a/src/main/resources/static/dijit/themes/soria/form/Button.css b/src/main/resources/static/dijit/themes/soria/form/Button.css
new file mode 100644
index 0000000000000000000000000000000000000000..e00c48f58d0ea4d318e378e9f6809efdb1a32b29
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/form/Button.css
@@ -0,0 +1,122 @@
+
+/*****
+		dijit.form.Button
+		dijit.form.DropDownButton
+		dijit.form.ComboButton
+		dijit.form.ComboBox (partial)
+		dijit.form.Spinner (partial) (TODO: create NumberSpinner.css file like claro has)
+ *****/
+
+.soria .dijitButtonNode {
+	/* enabled state - inner */
+	border: 1px solid #8ba0bd;
+	border-bottom:1px solid #657c9c;
+	padding: 0.1em 0.2em 0.2em 0.2em;
+	background: #bcd5f0 url("../images/buttonEnabled.png") repeat-x top left;
+}
+
+.soria .dijitButtonText {
+	text-align: center;
+	padding: 0 0.3em;
+}
+.soria .dijitInputField {
+	padding: 0; /* set padding:0 for .soria .dijitSelect .dijitButtonText but with a low priority rule that can be easily trumped by the user */
+}
+
+.soria .dijitArrowButton {
+	color: #111;
+}
+
+.soria .dijitComboButton .dijitDownArrowButton {
+	padding-right:4px;
+}
+
+.soria .dijitTextBoxReadOnly,
+.soria .dijitTextBoxReadOnly .dijitButtonNode,
+.soria .dijitButtonDisabled .dijitButtonNode,
+.soria .dijitToggleButtonDisabled .dijitButtonNode,
+.soria .dijitDropDownButtonDisabled .dijitButtonNode,
+.soria .dijitComboButtonDisabled .dijitButtonNode,
+.soria .dijitTextBoxDisabled,
+.soria .dijitTextBoxDisabled .dijitButtonNode {
+	/* disabled state - inner */
+	border-color: #b9bbdd #b9bbdd #b9bbdd #b9bbdd;
+	background:#c3d3e5 url("../images/buttonDisabled.png") top repeat-x;
+	opacity: 0.60;
+}
+.dj_ie6 .soria .dijitReadOnly input,
+.dj_ie7 .soria .dijitReadOnly input,
+.dj_ie6 .soria .dijitComboButtonDisabled .dijitButtonText,
+.dj_ie7 .soria .dijitComboButtonDisabled .dijitButtonText {
+	/* opacity doesn't work on table node in IE, work around here */
+	color: #aaa;
+}
+.soria .dijitButtonHover .dijitButtonNode,
+.soria .dijitButtonNodeHover,
+.soria .dijitToggleButtonHover .dijitButtonNode,
+.soria .dijitDropDownButtonHover .dijitButtonNode,
+.soria .dijitButtonContentsHover,
+.soria .dijitUpArrowButtonHover,
+.soria .dijitDownArrowButtonHover {
+	/* hover state - inner */
+	/* TODO: change from Hover to Selected so that button is still highlighted while drop down is being used */
+	color:#243C5F;
+	background:#acc5e2 url("../images/buttonHover.png") repeat-x top left;
+}
+
+.soria .dijitButtonActive .dijitButtonNode,
+.soria .dijitToggleButtonActive .dijitButtonNode,
+.soria .dijitDropDownButtonActive .dijitButtonNode,
+.soria .dijitComboButtonActive .dijitButtonContents,
+.soria .dijitStackController .dijitToggleButtonChecked .dijitButtonNode {
+	/* active state - inner (for when you are pressing a normal button, or
+	 * when a radio-type button is in a depressed state
+	 */
+	border-color:#657c9c;
+	background: #91b4e5 url("../images/buttonActive.png") top left repeat-x;
+}
+.soria .dijitUpArrowButtonActive,
+.soria .dijitDownArrowButtonActive {
+	/* same as above except don't adjust border color (it's controlled by the containing Spinner/ComboBox) */
+	background: #91b4e5 url("../images/buttonActive.png") top left repeat-x;
+}
+
+
+.soria .dijitArrowButtonInner {
+	background-image: url("../images/spriteArrows.png");
+	background-repeat: no-repeat;
+	background-position: 0 center;
+	width: 11px;
+	height: 11px;
+}
+.soria .dijitComboBox .dijitArrowButtonInner {
+        background-position: 0 center;
+}
+.soria .dijitLeftArrowButton .dijitArrowButtonInner {
+	background-position: -11px center;
+}
+.soria .dijitUpArrowButton .dijitArrowButtonInner {
+	background-position: -22px center;
+}
+.soria .dijitRightArrowButton .dijitArrowButtonInner {
+	background-position: -33px center;
+}
+.dj_ie6 .soria .dijitArrowButtonInner {
+	background-image: url("../images/spriteArrows.gif");
+}
+.dj_ie .soria .dijitSpinner .dijitUpArrowButton .dijitArrowButtonInner {
+	margin-top: 1px; /* image has too many blank pixels on top */
+}
+.soria .dijitSpinnerButtonContainer {
+	width: auto;
+	padding: 0;
+}
+.soria .dijitSpinner .dijitArrowButton {
+	width: 15px;
+}
+.soria .dijitSpinner .dijitSpinnerButtonInner {
+	width: 15px;
+}
+.soria .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	padding: 0;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/form/Button_rtl.css b/src/main/resources/static/dijit/themes/soria/form/Button_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..cf47470a9841c23253b4a01884622bb28293d838
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/form/Button_rtl.css
@@ -0,0 +1,3 @@
+.soria .dijitComboBoxRtl .dijitButtonNode {
+	border-width: 0 0 0 1px;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/form/Checkbox.css b/src/main/resources/static/dijit/themes/soria/form/Checkbox.css
new file mode 100644
index 0000000000000000000000000000000000000000..5a72bfc06ec6f9cafdd7be9e6885c90825b84bfe
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/form/Checkbox.css
@@ -0,0 +1,67 @@
+
+/*
+ *  CheckBox and Radio Widgets,
+ *	and the CSS to embed a checkbox or radio icon inside a ToggleButton.
+ *
+ *	Order of images in the default sprite (from L to R, checkbox and radio in same image):
+ *		checkbox	normal 	 - checked
+ *							 - unchecked
+ *					disabled - checked
+ *							 - unchecked
+ *					hover 	 - checked
+ *							 - unchecked
+ *
+ *		radio		normal 	 - checked
+ *							 - unchecked
+ *					disabled - checked
+ *							 - unchecked
+ *					hover 	 - checked
+ *							 - unchecked
+*/
+
+.soria .dijitToggleButton .dijitCheckBox,
+.soria .dijitToggleButton .dijitCheckBoxIcon {
+	background-image: url('../images/spriteCheckbox.gif');
+}
+
+.soria .dijitCheckBox,
+.soria .dijitCheckBoxIcon {		/* inside a toggle button */
+	background-image: url('../images/spriteCheckbox.gif'); /* checkbox sprite image */
+	background-repeat: no-repeat;
+	width: 16px;
+	height: 16px;
+	margin: 0;
+	padding: 0;
+}
+
+.soria .dijitCheckBox,
+.soria .dijitToggleButton .dijitCheckBoxIcon {
+	/* unchecked */
+	background-position: -16px;
+}
+
+.soria .dijitCheckBoxChecked,
+.soria .dijitToggleButtonChecked .dijitCheckBoxIcon {
+	/* checked */
+	background-position: 0;
+}
+
+.soria .dijitCheckBoxDisabled {
+	/* disabled */
+	background-position: -48px;
+}
+
+.soria .dijitCheckBoxCheckedDisabled {
+	/* disabled but checked */
+	background-position: -32px;
+}
+
+.soria .dijitCheckBoxHover {
+	/* hovering over an unchecked enabled checkbox */
+	background-position: -80px;
+}
+
+.soria .dijitCheckBoxCheckedHover {
+	/* hovering over a checked enabled checkbox */
+	background-position: -64px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/form/Common.css b/src/main/resources/static/dijit/themes/soria/form/Common.css
new file mode 100644
index 0000000000000000000000000000000000000000..d6ea6e2756637fc4406ceee74f56a76b6ea1886e
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/form/Common.css
@@ -0,0 +1,84 @@
+
+/****
+		dijit.form.TextBox
+		dijit.form.ValidationTextBox
+		dijit.form.SerializableTextBox
+		dijit.form.RangeBoundTextBox
+		dijit.form.NumberTextBox
+		dijit.form.CurrencyTextBox
+		dijit.form.NumberSpinner
+		dijit.form.ComboBox (partial)
+ ****/
+
+.soria .dijitInputContainer input {
+	margin: 0 0.1em;
+}
+
+.soria .dijitSelect .dijitButtonContents,
+.soria .dijitSelect,
+.soria .dijitTextBox,
+.soria .dijitTextArea {
+	/* 	For all except dijit.form.NumberSpinner:  the actual input element.
+		For TextBox, ComboBox, Spinner: the table that contains the input.
+		Otherwise the actual input element.
+	*/
+	background:#fff url("../images/validationInputBg.png") repeat-x top left;
+	#background:#fff url('../images/validationInputBg.gif') repeat-x top left;
+}
+.soria .dijitSelect,
+.soria .dijitTextBox,
+.soria .dijitTextArea {
+	border:1px solid #8ba0bd;
+}
+
+.soria .dijitSelect .dijitArrowButton,
+.soria .dijitComboBox .dijitButtonNode {
+	padding: 0 0.2em;
+}
+
+.soria .dijitSelect .dijitButtonContents,
+.soria .dijitTextBox .dijitButtonNode {
+	/* line between the input area and the drop down button */
+	border-color: #8ba0bd;
+}
+
+.soria .dijitSelectFocused,
+.soria .dijitTextBoxFocused,
+.soria .dijitTextAreaFocused {
+	/* input field when focused (ie: typing affects it) */
+	border-color:#406b9b;
+}
+.soria .dijitSelectFocused TD,
+.soria .dijitTextBoxFocused .dijitButtonNode,
+.soria .dijitSpinner .dijitUpArrowButtonActive,
+.soria .dijitSpinner .dijitDownArrowButtonActive {
+	border-color:#8ba0bd;
+}
+.soria .dijitSpinnerFocused .dijitDownArrowButton,
+.soria .dijitSpinner .dijitUpArrowButtonActive,
+.soria .dijitSpinner .dijitDownArrowButtonActive {
+	border-top-color:#8ba0bd;
+}
+
+.soria .dijitError {
+	border-color:#f3d118;
+	background-color:#f9f7ba;
+	background-image:none;
+}
+
+.soria .dijitErrorFocused {
+	background-color:#ff6;
+	background-image:none;
+}
+
+/* Validation errors  */
+.soria .dijitValidationTextBoxError .dijitValidationIcon {
+	/* prevent height change when widget goes from valid to invalid state */
+	width: 16px;
+	background: transparent url('../images/warning.png') no-repeat center center;
+}
+
+/* The highlight is shown in the ComboBox menu. */
+.soria .dijitComboBoxHighlightMatch {
+	background-color:#f9f7ba;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/form/RadioButton.css b/src/main/resources/static/dijit/themes/soria/form/RadioButton.css
new file mode 100644
index 0000000000000000000000000000000000000000..1ea27bf65f72c44c8799fde1f1dfc2f4bb133242
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/form/RadioButton.css
@@ -0,0 +1,66 @@
+/*
+ *  CheckBox and Radio Widgets,
+ *	and the CSS to embed a checkbox or radio icon inside a ToggleButton.
+ *
+ *	Order of images in the default sprite (from L to R, checkbox and radio in same image):
+ *		checkbox	normal 	 - checked
+ *							 - unchecked
+ *					disabled - checked
+ *							 - unchecked
+ *					hover 	 - checked
+ *							 - unchecked
+ *
+ *		radio		normal 	 - checked
+ *							 - unchecked
+ *					disabled - checked
+ *							 - unchecked
+ *					hover 	 - checked
+ *							 - unchecked
+*/
+
+.soria .dijitToggleButton .dijitRadio,
+.soria .dijitToggleButton .dijitRadioIcon {
+	background-image: url('../images/spriteRadio.gif');
+}
+
+.soria .dijitRadio,
+.soria .dijitRadioIcon	{		/* inside a toggle button */
+	background-image: url('../images/spriteRadio.gif'); /* checkbox sprite image */
+	background-repeat: no-repeat;
+	width: 16px;
+	height: 16px;
+	margin: 0;
+	padding: 0;
+}
+
+.soria .dijitRadio,
+.soria .dijitToggleButton .dijitRadioIcon {
+	/* unselected */
+	background-position: -16px;
+}
+
+.soria .dijitRadioChecked,
+.soria .dijitToggleButtonChecked .dijitRadioIcon {
+	/* selected */
+	background-position: 0;
+}
+
+.soria .dijitRadioDisabled {
+	/* unselected and disabled */
+	background-position: -48px;
+}
+
+.soria .dijitRadioCheckedDisabled {
+	/* selected but disabled */
+	background-position: -32px;
+}
+
+.soria .dijitRadioHover {
+	/* hovering over an unselected enabled radio button */
+	background-position: -80px;
+}
+
+.soria .dijitRadioCheckedHover {
+	/* hovering over a selected enabled radio button */
+	background-position: -64px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/form/Select.css b/src/main/resources/static/dijit/themes/soria/form/Select.css
new file mode 100644
index 0000000000000000000000000000000000000000..895ab7eaa0067b009b0ec4ac52fb6a6856445c2b
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/form/Select.css
@@ -0,0 +1,47 @@
+/* Make unselected "look" more like a text box and less like a button */
+.soria .dijitSelectError .dijitButtonContents,
+.soria .dijitSelectHover .dijitArrowButton,
+.soria .dijitSelectActive .dijitArrowButton,
+.soria .dijitSelectOpened .dijitArrowButton,
+.soria .dijitSelectDisabled .dijitArrowButton,
+.soria .dijitSelectReadOnly .dijitArrowButton {
+	background: transparent none;
+}
+.soria .dijitSelect .dijitArrowButton {
+	background: #bcd5f0 url("../images/buttonEnabled.png") repeat-x top left;
+	border-width: 0;
+}
+
+/* Mirror DropDownButton */
+.soria .dijitSelectDisabled,
+.soria .dijitSelectDisabled TD {
+	border-color: #b9bbdd !important;
+	background:#c3d3e5 url("../images/buttonDisabled.png") top repeat-x;
+}
+.dj_ie .soria .dijitSelectDisabled TD * {
+	filter: gray() alpha(opacity=50);
+}
+
+.soria .dijitSelectHover,
+.soria .dijitSelectHover TD {
+	border-color:#a5beda #5c7590 #5c7590 #a5beda !important;
+	color:#000;
+	background:#acc5e2 url("../images/buttonHover.png") repeat-x top left;
+}
+
+.soria .dijitSelectActive,
+.soria .dijitSelectOpened,
+.soria .dijitSelectActive TD,
+.soria .dijitSelectOpened TD {
+	border-color:#657c9c !important;
+	background: #91b4e5 url("../images/buttonActive.png") top left repeat-x;
+}
+
+/* Make the menu look more combobox-like */
+.soria .dijitSelectMenu td {
+	padding: 0;
+}
+.soria .dijitSelectMenu .dijitMenuItemLabel,
+.soria .dijitSelectMenu .dijitMenuArrowCell {
+	padding: 0.1em 0.2em;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/form/Slider.css b/src/main/resources/static/dijit/themes/soria/form/Slider.css
new file mode 100644
index 0000000000000000000000000000000000000000..3a68f4631749c836f0d4863caedaa62dff529844
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/form/Slider.css
@@ -0,0 +1,144 @@
+
+/****
+ 	SLIDER
+****/
+
+.soria .dijitSliderProgressBarH {
+	border-color: #b1badf;
+	background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left;
+}
+
+.soria .dijitSliderProgressBarV {
+	border-color: #b1badf;
+	background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left;
+}
+
+.soria .dijitSliderFocused .dijitSliderProgressBarH,
+.soria .dijitSliderFocused .dijitSliderLeftBumper {
+	background-image:url("../images/sliderFullFocus.png");
+}
+
+.soria .dijitSliderFocused .dijitSliderProgressBarV,
+.soria .dijitSliderFocused .dijitSliderBottomBumper {
+	background-image:url("../images/sliderFullVerticalFocus.png");
+}
+
+.soria .dijitSliderRemainingBarV {
+	border-color: #b4b4b4;
+	background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y bottom left;
+}
+
+.soria .dijitSliderRemainingBarH {
+	border-color: #b4b4b4;
+	background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left;
+}
+
+.soria .dijitSliderBar {
+	border-style: solid;
+	outline:1px;
+	/* border-color: #b4b4b4; */
+}
+.soria .dijitSliderFocused .dijitSliderBar {
+	border-color:#8ba0bd;
+}
+
+.soria .dijitSliderImageHandleH {
+	border:0;
+	width:15px;
+	height:18px;
+	background:url("../images/preciseSliderThumb.png") no-repeat center top;
+}
+.soria .dijitSliderFocused .dijitSliderImageHandleH {
+	background-image:url("../images/preciseSliderThumbFocus.png");
+	#background-image:url("../images/preciseSliderThumbFocus.gif");
+}
+
+.dj_ie6 .soria .dijitSliderImageHandleH {
+	background-image:url("../images/preciseSliderThumb.gif");
+}
+
+.soria .dijitSliderLeftBumper {
+	border-left-width: 1px;
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left;
+}
+
+.soria .dijitSliderRightBumper {
+	background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left;
+	border-color: #b4b4b4;
+	border-right-width: 1px;
+}
+
+.soria .dijitSliderImageHandleV {
+	border:0;
+	width:20px;
+	height:15px;
+	background:url("../images/sliderThumb.png") no-repeat center center;
+	#background:url("../images/sliderThumb.gif") no-repeat center center;
+}
+
+.soria .dijitSliderFocused .dijitSliderImageHandleV {
+	background-image:url("../images/sliderThumbFocus.png");
+	#background-image:url("../images/sliderThumbFocus.gif");
+}
+
+.soria .dijitSliderBottomBumper {
+	border-bottom-width: 1px;
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left;
+}
+
+.soria .dijitSliderTopBumper {
+	background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y top left;
+	border-color: #b4b4b4;
+	border-top-width: 1px;
+}
+
+.soria .dijitSliderIncrementIconH,
+.soria .dijitSliderIncrementIconV {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat -45px top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -45px top;
+	width:15px; height:15px;
+}
+.soria .dijitSliderIncrementIconH {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -30px top;
+}
+
+.soria .dijitSliderDecrementIconH,
+.soria .dijitSliderDecrementIconV {
+	width:15px;
+	height:15px;
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat -15px top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -15px top;
+}
+.soria .dijitSliderDecrementIconH {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat 0 top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat 0 top;
+}
+
+.soria .dijitSliderButtonInner {
+	visibility:hidden;
+}
+
+.soria .dijitSliderReadOnly *,
+.soria .dijitSliderDisabled * {
+	border-color: #d5d5d5 #bdbdbd #bdbdbd #d5d5d5;
+	color: #bdbdbd;
+}
+.soria .dijitSliderReadOnly .dijitSliderDecrementIconH,
+.soria .dijitSliderDisabled .dijitSliderDecrementIconH {
+	background-position: 0 -15px;
+}
+.soria .dijitSliderReadOnly .dijitSliderIncrementIconH,
+.soria .dijitSliderDisabled .dijitSliderIncrementIconH {
+	background-position: -30px -15px;
+}
+.soria .dijitSliderReadOnly .dijitSliderDecrementIconV,
+.soria .dijitSliderDisabled .dijitSliderDecrementIconV {
+	background-position: -15px -15px;
+}
+.soria .dijitSliderReadOnly .dijitSliderIncrementIconV,
+.soria .dijitSliderDisabled .dijitSliderIncrementIconV {
+	background-position: -45px -15px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/form/Slider_rtl.css b/src/main/resources/static/dijit/themes/soria/form/Slider_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..d9b67c5040847a8a43daeb033120ee41d7ce6cf1
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/form/Slider_rtl.css
@@ -0,0 +1,36 @@
+
+/* Slider */
+
+.dijitRtl .soria .dijitSliderProgressBarH,
+.dijitRtl .soria .dijitSliderRemainingBarH,
+.dijitRtl .soria .dijitSliderLeftBumper,
+.dijitRtl .soria .dijitSliderRightBumper,
+.dijitRtl .soria .dijitSliderTopBumper {
+	background-position: top right;
+}
+
+.dijitRtl .soria .dijitSliderProgressBarV,
+.dijitRtl .soria .dijitSliderRemainingBarV,
+.dijitRtl .soria .dijitSliderBottomBumper {
+	background-position: bottom right;
+}
+
+.dijitRtl .soria .dijitSliderLeftBumper {
+	border-left-width: 0;
+	border-right-width: 1px;
+}
+
+.dijitRtl .soria .dijitSliderRightBumper {
+	border-left-width: 1px;
+	border-right-width: 0;
+}
+
+.dijitRtl .soria .dijitSliderIncrementIconH {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat left top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat left top;
+}
+
+.dijitRtl .soria .dijitSliderDecrementIconH {
+	background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top;
+	#background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -30px top;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/form/TimeTextBox.css b/src/main/resources/static/dijit/themes/soria/form/TimeTextBox.css
new file mode 100644
index 0000000000000000000000000000000000000000..d450925b415601abdf28857e4cd3fdccd145d96e
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/form/TimeTextBox.css
@@ -0,0 +1 @@
+@CHARSET "UTF-8";
diff --git a/src/main/resources/static/dijit/themes/soria/images/accordionItemActive.gif b/src/main/resources/static/dijit/themes/soria/images/accordionItemActive.gif
new file mode 100644
index 0000000000000000000000000000000000000000..249a1533f473e72dc10dcd3cf6db3ac67c57e683
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/accordionItemActive.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/accordionItemActive.png b/src/main/resources/static/dijit/themes/soria/images/accordionItemActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..789bcfa8180e3610fbdd523d7c395473c91f6d0c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/accordionItemActive.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/buttonActive.png b/src/main/resources/static/dijit/themes/soria/images/buttonActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f318a65d660699ffd1b00cda3638f60db632349
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/buttonActive.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/buttonDisabled.png b/src/main/resources/static/dijit/themes/soria/images/buttonDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1e9cd4b9cad001804f27bc841f2d882e078a5c2
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/buttonDisabled.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/buttonEnabled.png b/src/main/resources/static/dijit/themes/soria/images/buttonEnabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..51ac91e3c6162f5627e134cdfdbe40755f7d5bad
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/buttonEnabled.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/buttonHover.png b/src/main/resources/static/dijit/themes/soria/images/buttonHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..61a6cd602b66c9449754fe4ed6d320aa41505844
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/buttonHover.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/dndCopy.png b/src/main/resources/static/dijit/themes/soria/images/dndCopy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a8b998f62899a642f6be3f4132132d1c12e237c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/dndCopy.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/dndMove.png b/src/main/resources/static/dijit/themes/soria/images/dndMove.png
new file mode 100644
index 0000000000000000000000000000000000000000..8443d30342f0494cae909eeecdc9b6ad149f5e5a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/dndMove.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/dndNoCopy.png b/src/main/resources/static/dijit/themes/soria/images/dndNoCopy.png
new file mode 100644
index 0000000000000000000000000000000000000000..64bf88b26a3ddeadf97755bc05ed83c47ecfe683
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/dndNoCopy.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/dndNoMove.png b/src/main/resources/static/dijit/themes/soria/images/dndNoMove.png
new file mode 100644
index 0000000000000000000000000000000000000000..682ea1025b914e20e041ddff88a5ef651a7fbb91
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/dndNoMove.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumb.gif b/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..53b33e54abdb947bdc92cd8b30359a4153017738
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumb.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumb.png b/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6dc0790e8bf5b5a7a7c5e7455da046e6cfe46f4
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumb.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumbFocus.gif b/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumbFocus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8c6f92eb45865a0b1c3a08f978ad2e2b61d45057
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumbFocus.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumbFocus.png b/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumbFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..939f253afd0b062b9e911ad02f3170db90d2739c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/preciseSliderThumbFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/progressBarAnim.gif b/src/main/resources/static/dijit/themes/soria/images/progressBarAnim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..73e25e1724be8b09242ac637091e89f011b9cd25
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/progressBarAnim.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/progressBarEmpty.png b/src/main/resources/static/dijit/themes/soria/images/progressBarEmpty.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6090e03f7dcd735823f4613e84b4965a6ec08ac
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/progressBarEmpty.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/progressBarFull.png b/src/main/resources/static/dijit/themes/soria/images/progressBarFull.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cedfe34acb7a6b94ca1db2bb120fe2fc411289b
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/progressBarFull.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderEmpty.png b/src/main/resources/static/dijit/themes/soria/images/sliderEmpty.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdd9ae953dbd50dc357767c65d69c4550795cecf
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderEmpty.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderEmptyVertical.png b/src/main/resources/static/dijit/themes/soria/images/sliderEmptyVertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b5036abcc21463216808fbf77788a2e22004551
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderEmptyVertical.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderFull.png b/src/main/resources/static/dijit/themes/soria/images/sliderFull.png
new file mode 100644
index 0000000000000000000000000000000000000000..d969658096bb30338d419c9f7577b493c05361c1
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderFull.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderFullFocus.png b/src/main/resources/static/dijit/themes/soria/images/sliderFullFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..99326aff91facc54d8d7e904644e7252a253a9b3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderFullFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderFullVertical.png b/src/main/resources/static/dijit/themes/soria/images/sliderFullVertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..14cacba23bfabbac24a2db365d05343f6db8eb6c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderFullVertical.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderFullVerticalFocus.png b/src/main/resources/static/dijit/themes/soria/images/sliderFullVerticalFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0316b796e76a5197c9a0775b4a8c100f9492fa96
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderFullVerticalFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderThumb.gif b/src/main/resources/static/dijit/themes/soria/images/sliderThumb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..29899a4b630782dfe9e4d276ccc775ad47a6e752
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderThumb.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderThumb.png b/src/main/resources/static/dijit/themes/soria/images/sliderThumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..6abb20080c6d1e7da0ad17e828b77c4bdcb14082
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderThumb.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderThumbFocus.gif b/src/main/resources/static/dijit/themes/soria/images/sliderThumbFocus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f8d306febc6627deffbdf6cb687dd1fbc499eaf8
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderThumbFocus.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/sliderThumbFocus.png b/src/main/resources/static/dijit/themes/soria/images/sliderThumbFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4d261eee561019a9ea904c116dc6814d2c30e41
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/sliderThumbFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerH-thumb.png b/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerH-thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..65b5e030deaade4fc49d1824e5f9d2564ccd2501
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerH-thumb.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerH.png b/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerH.png
new file mode 100644
index 0000000000000000000000000000000000000000..6030e0f74e9ad747f90df0271854e1ae5cfe278e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerH.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerV-thumb.png b/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerV-thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..848400fdec3d62509cded8b5c0fc523e90715dab
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerV-thumb.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerV.png b/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerV.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cfba5f98fe39c7d8f16d47fc6bc2323fc9c9cd5
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/splitContainerSizerV.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteArrows.gif b/src/main/resources/static/dijit/themes/soria/images/spriteArrows.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fc81207e70710738804fd4f0803a7f7f6a80fe50
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteArrows.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteArrows.png b/src/main/resources/static/dijit/themes/soria/images/spriteArrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..80bb45a799f800bd5de23573cb4f061a35425eb5
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteArrows.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteCheckbox.gif b/src/main/resources/static/dijit/themes/soria/images/spriteCheckbox.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d2c4ebfaff2230675f59f5caf94ebe26739b5ed2
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteCheckbox.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteCheckbox.png b/src/main/resources/static/dijit/themes/soria/images/spriteCheckbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d1aa92e868a03f0cc9c0b5ae9d91e7f25d0322
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteCheckbox.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteDivIcons.gif b/src/main/resources/static/dijit/themes/soria/images/spriteDivIcons.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f5c58e47a0dcfce5380cba10ec120a4c26cedbf3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteDivIcons.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteDivIcons.png b/src/main/resources/static/dijit/themes/soria/images/spriteDivIcons.png
new file mode 100644
index 0000000000000000000000000000000000000000..043882e02737caaa6827ec07ae8946fa5c5b1498
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteDivIcons.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteRadio.gif b/src/main/resources/static/dijit/themes/soria/images/spriteRadio.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8dd6e578e89939ac92dddcb77a684ebb95955933
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteRadio.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteRadio.png b/src/main/resources/static/dijit/themes/soria/images/spriteRadio.png
new file mode 100644
index 0000000000000000000000000000000000000000..eef7ab4b133a2a2136f369ea742dc29af50cd788
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteRadio.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmall.gif b/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmall.gif
new file mode 100644
index 0000000000000000000000000000000000000000..795ea848da796ed02a62592dc5ab36e2de78522b
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmall.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmall.png b/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmall.png
new file mode 100644
index 0000000000000000000000000000000000000000..7eda8750f6ce9206b3af868ca6710f78df128d60
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmall.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmallBl.gif b/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmallBl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..67581811ddbf4578eae9c6fc8b66e8fe1db29b39
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmallBl.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmallBl.png b/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmallBl.png
new file mode 100644
index 0000000000000000000000000000000000000000..74b8c93d806d0642bb2508ca0c7a2cfa1099ac73
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteRoundedIconsSmallBl.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteTree.gif b/src/main/resources/static/dijit/themes/soria/images/spriteTree.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e546e281b131d5a45571c6fd3a5bb7a30e856f1e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteTree.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteTree.png b/src/main/resources/static/dijit/themes/soria/images/spriteTree.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e63248bebf5eed9d2dfc04a8aa696c15e7acee3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteTree.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteTree_rtl.gif b/src/main/resources/static/dijit/themes/soria/images/spriteTree_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bbcc64be82efd5aab472b2d7b23b1567a480746b
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteTree_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/spriteTree_rtl.png b/src/main/resources/static/dijit/themes/soria/images/spriteTree_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c30c354ca1725d7a772f119c71cc3d3320e8815
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/spriteTree_rtl.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tabBottomActiveC.gif b/src/main/resources/static/dijit/themes/soria/images/tabBottomActiveC.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fb61df9a25154f98a5330ff5bea814f2e8867ba4
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tabBottomActiveC.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tabBottomEnabledC.gif b/src/main/resources/static/dijit/themes/soria/images/tabBottomEnabledC.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0a5f0f8e3e4fd8f183c71d037a62562f693a3c04
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tabBottomEnabledC.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tabBottomEnabledSpriteLR.gif b/src/main/resources/static/dijit/themes/soria/images/tabBottomEnabledSpriteLR.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a77da39b667e55b79cd14748a9974f63ce665b47
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tabBottomEnabledSpriteLR.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tabBottomHoverC.gif b/src/main/resources/static/dijit/themes/soria/images/tabBottomHoverC.gif
new file mode 100644
index 0000000000000000000000000000000000000000..47b9da29a27309a950286aeec37e899b3897d9b9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tabBottomHoverC.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tabContainerSprite.gif b/src/main/resources/static/dijit/themes/soria/images/tabContainerSprite.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f0b38421e38440cff987b698dd150ae64b792e9a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tabContainerSprite.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tabLeftChecked.gif b/src/main/resources/static/dijit/themes/soria/images/tabLeftChecked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..439aa6b44954467cb9019fcbc1787233129a94f9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tabLeftChecked.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tabRightChecked.gif b/src/main/resources/static/dijit/themes/soria/images/tabRightChecked.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cfffd1e70e677f18b748279bb351ca42320f5355
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tabRightChecked.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/titleBar.png b/src/main/resources/static/dijit/themes/soria/images/titleBar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9121ea6f5ef9c19a0d09db9b7205198934aeca3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/titleBar.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/titleBarActive.png b/src/main/resources/static/dijit/themes/soria/images/titleBarActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db116b364ad7aaba33c5d4688b1fac434f26a8a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/titleBarActive.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorDown.gif b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorDown.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9c3849553aa71a67ab40f153223b8394574ccd9d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorDown.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorDown.png b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorDown.png
new file mode 100644
index 0000000000000000000000000000000000000000..7783f90479eefc4abab0ef0e16112d16474bda89
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorDown.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorLeft.gif b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorLeft.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fc947e0a1997c1cd7c0bf170312a93596c2b735c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorLeft.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorLeft.png b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorLeft.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae16d3601c02546717912a59ffba06b5581079cc
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorLeft.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorRight.gif b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorRight.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b0e8097f4b1fe9b8aead6c2b22d23a5702042fbf
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorRight.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorRight.png b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorRight.png
new file mode 100644
index 0000000000000000000000000000000000000000..9532b17dfcd6717cadc739be0cb89047541413d5
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorRight.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorUp.gif b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorUp.gif
new file mode 100644
index 0000000000000000000000000000000000000000..54bcf652c6bf0f540ed3d9a2079fcb5895b0605d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorUp.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorUp.png b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dc5b31b31895a3913a76ed6a225ce05ad0b3472
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/tooltipConnectorUp.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/treeExpand_loading.gif b/src/main/resources/static/dijit/themes/soria/images/treeExpand_loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..db9ddd0282895511c648154db2bf621e33fcfbe1
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/treeExpand_loading.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/treeHover.png b/src/main/resources/static/dijit/themes/soria/images/treeHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4d5d5700750c9c33171b5bbc8998e4c182b1cfc
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/treeHover.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/treeI.gif b/src/main/resources/static/dijit/themes/soria/images/treeI.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6f669e24015476e1d05b9b69e042a91c9105ad2c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/treeI.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/treeI_half.gif b/src/main/resources/static/dijit/themes/soria/images/treeI_half.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e5fd0155bd99e8018ab44f08c8ad22c1a429dbc3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/treeI_half.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/treeI_half_rtl.gif b/src/main/resources/static/dijit/themes/soria/images/treeI_half_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..44ad021a36dea29ecf72868965aed52ce393a41d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/treeI_half_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/treeI_rtl.gif b/src/main/resources/static/dijit/themes/soria/images/treeI_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0d32a2f731795134a05617873080e36711806100
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/treeI_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/validationInputBg.gif b/src/main/resources/static/dijit/themes/soria/images/validationInputBg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c28475c8d4e2f1e6a59369f4ee46c17b700dffce
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/validationInputBg.gif differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/validationInputBg.png b/src/main/resources/static/dijit/themes/soria/images/validationInputBg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca0f890daa0379ba0107b802e93d4994e687eb0b
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/validationInputBg.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/images/warning.png b/src/main/resources/static/dijit/themes/soria/images/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..07cabeae1065d71cf6724e9e14fd268c7b1672f9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/soria/images/warning.png differ
diff --git a/src/main/resources/static/dijit/themes/soria/layout/AccordionContainer.css b/src/main/resources/static/dijit/themes/soria/layout/AccordionContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..3e2d22d575aff6d5f3b5bbda26aa2b6a6ff37faf
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/layout/AccordionContainer.css
@@ -0,0 +1,46 @@
+/**
+ * dijit.layout.Accordioncontainer
+ *
+ */
+
+.soria .dijitAccordionContainer {
+	border-color: #b1badf;
+	background-color: #fff;
+}
+
+/* common */
+
+.soria .dijitAccordionTitle {
+	background:#fafafa url("../images/titleBar.png") repeat-x top left;
+	border-top: 1px solid #b9bbdd;
+	padding: 5px 4px 6px 8px;
+	font-size: 0.9em;
+	font-weight: bold;
+	color: #373941;
+}
+
+.soria .dijitAccordionTitleSelected  {
+	background: #f9f9f9 url("../images/accordionItemActive.png") top repeat-x;
+	font-weight: bold;
+	border-top: 1px solid #b9bbdd;
+	border-bottom: 1px solid #b9bbdd;
+	padding: 5px 4px 5px 8px;
+	color: #243C5F;
+}
+
+.soria .dijitAccordionArrow {
+	background:url("../images/spriteRoundedIconsSmallBl.gif") no-repeat -30px top;
+	width:15px;
+	height:15px;
+	margin-top:-1px;
+}
+
+.soria .dijitAccordionTitleSelected .dijitAccordionArrow {
+	background:url("../images/spriteRoundedIconsSmallBl.gif") no-repeat -15px top;
+	margin-top:-1px;
+}
+
+.soria .dijitAccordionText {
+	margin-left: 4px;
+	margin-right: 4px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/layout/AccordionContainer_rtl.css b/src/main/resources/static/dijit/themes/soria/layout/AccordionContainer_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..c6bb820f3a01ff6b84940fa32fbf7373d2f1bb91
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/layout/AccordionContainer_rtl.css
@@ -0,0 +1,8 @@
+.dijitRtl .soria .dijitAccordionArrow {
+	background-position: 0 top;
+}
+
+.dijitRtl .soria .dijitAccordionTitleSelected .dijitAccordionArrow {
+	/* same rule as LTR mode, just listed to override previous rule in this file */
+	background-position: -15px top;
+}
diff --git a/src/main/resources/static/dijit/themes/soria/layout/BorderContainer.css b/src/main/resources/static/dijit/themes/soria/layout/BorderContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..63f2bf36583694718c64fe531145750d47a66873
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/layout/BorderContainer.css
@@ -0,0 +1,77 @@
+/**
+ * dijit.layout.BorderContainer
+ *
+ */
+
+.soria .dijitBorderContainer {
+	background-color: #e1ebfb;
+	padding: 5px;
+}
+
+.soria .dijitSplitContainer-child,
+.soria .dijitBorderContainer-child {
+	/* By default put borders on all children of BorderContainer,
+	 *  to give illusion of borders on the splitters themselves.
+	 */
+	border: 1px #b1badf solid;
+}
+
+.soria .dijitBorderContainer-dijitTabContainerTop,
+.soria .dijitBorderContainer-dijitTabContainerBottom,
+.soria .dijitBorderContainer-dijitTabContainerLeft,
+.soria .dijitBorderContainer-dijitTabContainerRight {
+	/* except that TabContainer defines borders on it's sub-nodes (tablist and dijitTabPaneWrapper),
+	 * so no border on domNode
+	 */
+	 border: none;
+}
+
+.soria .dijitBorderContainer-dijitBorderContainer {
+	/* also, make nested BorderContainers look like a single big widget with lots of splitters */
+	border: none;
+	padding: 0;
+}
+
+
+.soria .dijitSplitterH,
+.soria .dijitGutterH {
+	background: #E1EBFB;
+	border:0;
+	border-left:0 solid #d3d3d3;
+	border-right:0 solid #d3d3d3;
+	height:5px;
+}
+
+.soria .dijitSplitterH .dijitSplitterThumb {
+	background:#B0B0B0 none;
+	height:1px;
+	top:2px;
+	width:19px;
+}
+
+.soria .dijitSplitterV,
+.soria .dijitGutterV {
+	background: #E1EBFB;
+	border:0;
+	border-top:0 solid #d3d3d3;
+	border-bottom:0 solid #d3d3d3;
+	width:5px;
+}
+
+.soria .dijitSplitterV .dijitSplitterThumb {
+	background:#B0B0B0 none;
+	height:19px;
+	left:2px;
+	width:1px;
+}
+
+/* active splitter */
+.soria .dijitSplitterActive {
+	font-size: 1px;
+	background-image: none;
+	background-color: #aaa;
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+	filter: Alpha(Opacity=60);
+	margin: 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/layout/ContentPane.css b/src/main/resources/static/dijit/themes/soria/layout/ContentPane.css
new file mode 100644
index 0000000000000000000000000000000000000000..32398dc08c65e1e45e6d5c2b501efdfba48dab96
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/layout/ContentPane.css
@@ -0,0 +1,21 @@
+/* ContentPane */
+
+.soria .dijitContentPane {
+    padding: 0;
+}
+
+/* nested layouts */
+.soria .dijitTabContainerTop-dijitContentPane,
+.soria .dijitTabContainerLeft-dijitContentPane,
+.soria .dijitTabContainerBottom-dijitContentPane,
+.soria .dijitTabContainerRight-dijitContentPane,
+.soria .dijitAccordionContainer-dijitContentPane {
+    background-color: #fff;
+    padding: 5px;
+}
+
+.soria .dijitSplitContainer-dijitContentPane,
+.soria .dijitBorderContainer-dijitContentPane {
+    background-color: #fff;		/* override background-color setting on parent .dijitBorderContainer */
+    padding: 5px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/layout/SplitContainer.css b/src/main/resources/static/dijit/themes/soria/layout/SplitContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..bf7ca16258850475cfed70450821cc6bcb7c121e
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/layout/SplitContainer.css
@@ -0,0 +1,34 @@
+/**
+ * dijit.layout.SplitContainer
+ *
+ */
+
+.soria .dijitSplitContainerSizerH {
+	background:url("../images/splitContainerSizerV.png") repeat-y #cddef4;
+	border:0;
+	border-left:0 solid #436496;
+	border-right:0 solid #436496;
+	width:5px;
+}
+
+.soria .dijitSplitContainerSizerH .thumb {
+	background:url("../images/splitContainerSizerV-thumb.png") no-repeat #ccc;
+	left:1px;
+	width:2px;
+	height:19px;
+}
+
+.soria .dijitSplitContainerSizerV {
+	background:url("../images/splitContainerSizerH.png") repeat-x #cddef4;
+	border:0;
+	border-top:0 solid #436496;
+	border-bottom:0 solid #436496;
+	height:2px;
+}
+
+.soria .dijitSplitContainerSizerV .thumb {
+	background:url("../images/splitContainerSizerH-thumb.png") no-repeat #ccc;
+	top:1px;
+	width:19px;
+	height:5px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/layout/TabContainer.css b/src/main/resources/static/dijit/themes/soria/layout/TabContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..38a1a77e12f4ab4d98b407f302527a89b95327f1
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/layout/TabContainer.css
@@ -0,0 +1,403 @@
+/**
+ * dijit.layout.TabContainer
+ */
+
+/* Classes for all types of tabs (top/bottom/left/right) */
+
+ .soria .dijitTabContainer .tabStripRBtn {
+	margin-right: 21px;
+}
+ .soria .dijitTabContainer .tabStripLBtn {
+	margin-left: 21px;
+}
+
+ .soria .nowrapTabStrip .dijitTab {
+	top: 2px;
+}
+
+ .soria .dijitTabContainerBottom-tabs .dijitTab {
+	top: -1px;
+	bottom: 2px;
+}
+
+/* Tabs, shared classes */
+.soria .dijitTabPaneWrapper {
+	background:#fff;
+	border:1px solid #B1BADF;
+	margin: 0;
+	padding-left: 0;
+}
+
+.soria .dijitTab {
+    padding:4px 6px 2px 4px;
+    background: url("../images/tabContainerSprite.gif") repeat-x 0 -351px;
+    position: relative;
+	line-height:normal;
+	margin:0 2px 0 0;	/* space between one tab and the next in top/bottom mode */
+	color: #243C5F;
+    border: 1px #8BA0BD solid;
+	border-bottom: 1px #B1BADF solid;
+}
+
+/* hovered tab */
+.soria .dijitTabHover {
+	color: #243C5F;
+	background: url("../images/tabContainerSprite.gif") repeat-x 0 -201px;
+}
+
+/* selected tab*/
+.soria .dijitTabChecked
+{
+	background: url("../images/tabContainerSprite.gif") repeat-x 0 -51px;
+	color: #243C5F !important;
+}
+
+
+.soria .dijitTabListWrapper {
+	z-index: 10;
+}
+
+
+/* Nested Tabs */
+
+.soria .dijitTabContainerTabListNested {
+	background: #D9E9F9;
+	border: none;
+}
+.soria .dijitTabContainerTabListNested .dijitTab {
+	background: none;
+	border: none;
+	top: 0;	/* override top:1px setting of top-level tabs */
+}
+.soria .dijitTabContainerTabListNested .dijitTabHover .tabLabel {
+	text-decoration: underline;
+}
+.soria .dijitTabContainerTabListNested .dijitTabChecked .tabLabel {
+	text-decoration: underline;
+	font-weight: bold;
+}
+.soria .dijitTabContainerSpacerNested .dijitTabSpacer {
+	/* thinner line between tab (labels) and content */
+	height: 0;
+}
+.soria .dijitTabPaneWrapperNested {
+	border: none;	/* prevent double border */
+}
+
+
+/* Close Button */
+.soria .dijitTabCloseButton {
+	width: 15px;
+	height: 15px;
+	background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px top;
+	margin-top: -1px;
+}
+.dj_ie6 .soria .dijitTabCloseButton {
+	background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px top;
+}
+
+.soria .dijitTabCloseButtonHover {
+	background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px -15px;
+}
+.dj_ie6 .soria .dijitTabCloseButtonHover {
+	background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px -15px;
+}
+
+/* ================================ */
+/* top tabs */
+.soria .dijitTabContainerTop-tabs {
+	border-color: #B1BADF;
+	padding-left: 3px;
+}
+.soria .dijitTabContainerTop-tabs .dijitTab {
+    border-radius: 4px 4px 0 0;
+    -moz-border-radius: 4px 4px 0 0;
+}
+
+.soria .dijitTabContainerTopNoStrip {
+	padding-top: 3px;
+}
+
+/* top container */
+.soria .dijitTabContainerTop-container {
+	border-top: none;
+}
+
+.soria .dijitTabContainerTop .dijitTabListWrapper {
+	border-bottom: none;
+}
+
+/*unselected tabs */
+.soria .dijitTabContainerTop-tabs .dijitTab {
+	top: 1px;
+}
+
+/* selected tabs */
+.soria .dijitTabContainerTop-tabs .dijitTabChecked {
+	border-bottom-color: #94b4e6;
+}
+
+/* strip */
+.soria .dijitTabContainerTopStrip {
+	border: 1px solid #B1BADF;
+	margin-top: 1px;
+	padding-top: 1px;
+	background: #F0F4FC;
+}
+
+.soria .dijitTabContainerTopStrip .dijitTabContainerTop-tabs {
+	padding-left: 3px;
+}
+
+
+.soria .dijitTabContainerNested .dijitTabListWrapper {
+	height: auto;
+}
+
+/* ================================ */
+/* bottom tabs */
+.soria .dijitTabContainerBottom-tabs {
+	margin-top: -1px;
+	padding-left: 3px;
+	border-top: 1px solid #B1BADF;
+}
+
+.soria .dijitTabContainerBottom .dijitTabListWrapper {
+	border-top: none;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	float: left;
+}
+
+.soria .dijitTabContainerBottom-tabs .dijitTab {
+    border-bottom: none;
+    border-top: 1px solid #B1BADF;
+    border-radius: 0 0 4px 4px;
+    -moz-border-radius: 0 0 4px 4px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    background: url("../images/tabBottomEnabledC.gif") repeat-x bottom left;
+}
+
+.soria .dijitTabContainerBottom-tabs .dijitTabHover {
+	background: url("../images/tabBottomHoverC.gif") repeat-x bottom left;
+}
+
+.soria .dijitTabContainerBottom-tabs .dijitTabChecked  {
+    border-top-color:#94b4e6;
+	background: url("../images/tabBottomActiveC.gif") repeat-x bottom left;
+}
+
+
+/* bottom container */
+.soria .dijitTabContainerBottom-container {
+	border-bottom: none;
+}
+
+
+/* strip */
+.soria .dijitTabContainerBottomStrip {
+	padding-bottom: 2px;
+	border: 1px solid #B1BADF;
+}
+
+.soria .dijitTabContainerBottomStrip {
+	background: #F0F4FC;
+}
+
+/* top/bottom strip */
+.soria .dijitTabContainerBottom-spacer,
+.soria .dijitTabContainerTop-spacer {
+	height: 2px;
+	border: 1px solid #8ba0bd;
+	background: #94b4e6;
+}
+
+.soria .dijitTabContainerTop-spacer {
+	border-top: none;
+}
+
+.soria .dijitTabContainerBottom-spacer {
+	border-bottom: none;
+}
+
+/* ================================ */
+/* right tabs */
+.soria .dijitTabContainerRight-tabs {
+	height: 100%;
+	border-color: #ccc;
+	padding-top: 3px;
+}
+.soria .dijitTabContainerRight-tabs .dijitTab {
+    border-radius: 0 4px 4px 0;
+    -moz-border-radius: 0 4px 4px 0;
+    border-bottom: none;
+    border-left: 1px solid #B1BADF;
+    border-bottom: 1px solid #B1BADF !important;
+    padding:  4px 6px 2px 8px;
+}
+
+.soria .dijitTabContainerRight-tabs .dijitTabChecked {
+	border-left-color: #94b4e6;
+    background: url("../images/tabRightChecked.gif") no-repeat left top !important;
+}
+
+
+/* right container */
+.soria .dijitTabContainerRight-container {
+	border-right: none;
+}
+
+
+/* some odd ie bug when borders disappear when setting a bottom margin, this sort of helps */
+.dj_ie6 .soria .dijitTabContainerRight-tabs .dijitTab,
+.dj_ie7 .soria .dijitTabContainerRight-tabs .dijitTab {
+	border-bottom: solid #B1BADF 1px;
+	margin-bottom: -1px;
+}
+
+
+/* some odd ie bug when borders disappear when setting a bottom margin, this sort of helps */
+.dj_ie6 .soria .dijitTabContainerRight-tabs .dijitTabChecked,
+.dj_ie7 .soria .dijitTabContainerRight-tabs .dijitTabChecked,
+.dj_ie6 .soria .dijitTabContainerRight-tabs .dijitTabCheckedHover,
+.dj_ie7 .soria .dijitTabContainerRight-tabs .dijitTabCheckedHover {
+	border-bottom: solid #94b4e6 1px;
+	margin-bottom: -1px;
+}
+
+/* strip */
+.soria .dijitTabContainerRightStrip {
+	padding-right: 2px;
+	border: 1px solid #B1BADF;
+	background: #F0F4FC;
+	border-left: none;
+}
+
+/* ================================ */
+/* left tabs */
+.soria .dijitTabContainerLeft-tabs {
+	border-color: #ccc;
+	padding-top: 3px;
+	height: 100%;
+}
+.soria .dijitTabContainerLeft-tabs .dijitTab {
+    border-radius: 4px 0 0 4px;
+    -moz-border-radius: 4px 0 0 4px;
+    border-right: 1px solid #B1BADF;
+    border-bottom: 1px solid #B1BADF;
+}
+
+.soria .dijitTabContainerLeft-tabs .dijitTabChecked {
+	border-right: 1px solid #94b4e6;
+    background: url("../images/tabLeftChecked.gif") no-repeat right top;
+}
+
+/* left container */
+.soria .dijitTabContainerLeft-container {
+	border-left: none;
+}
+
+
+.dj_ie6 .soria .dijitTabContainerLeft-tabs .dijitTab,
+.dj_ie7 .soria .dijitTabContainerLeft-tabs .dijitTab {
+	border-bottom: solid #B1BADF 1px;
+	margin-bottom: -1px;
+}
+
+.dj_ie6 .soria .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTab,
+.dj_ie7 .soria .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTab,
+.dj_ie6 .soria .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTab,
+.dj_ie7 .soria .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTab {
+	border-bottom: solid #94b4e6 1px;
+	margin-bottom: -1px;
+}
+
+/* strip */
+.soria .dijitTabContainerLeftStrip {
+	padding-left: 2px;
+	border: 1px solid #B1BADF;
+	background: #F0F4FC;
+	border-right: none;
+}
+
+/* ================================ */
+/* left/right tabs */
+.soria .dijitTabContainerLeft-tabs .dijitTab,
+.soria .dijitTabContainerRight-tabs .dijitTab {
+    margin: 1px 0;	/* space between one tab and the next in left/right mode */
+}
+
+/* left/right tabstrip */
+.soria .dijitTabContainerLeft-spacer,
+.soria .dijitTabContainerRight-spacer {
+	width: 2px;
+	border: 1px solid #8ba0bd;
+	background: #94b4e6;
+}
+
+.soria .dijitTabContainerLeft-spacer {
+	border-left: none;
+}
+.soria .dijitTabContainerRight-spacer {
+	border-right: none;
+}
+/* ================================ */
+
+/* this resets the tabcontainer strip when within a contentpane */
+.soria .dijitTabContainerTop-dijitContentPane .dijitTabContainerTop-tabs {
+	border-left: 0 solid #ccc;
+	border-top: 0 solid #ccc;
+	border-right: 0 solid #ccc;
+	padding-top: 0;
+	padding-left: 0;
+}
+
+
+/* ================================ */
+
+/* Menu and slider control styles */
+.soria .dijitTabContainer .tabStripButton {
+	margin-right: 0;
+}
+.soria .dijitTabContainer .tabStripButton-top {
+	margin-top: 1px;
+}
+
+.dj_ie6 .soria .tabStripButton .dijitTabContent,
+.dj_ie7 .soria .tabStripButton .dijitTabContent {
+	padding-top: 7px;
+}
+
+.dj_ie6 .soria .tabStrip-disabled .tabStripButton .dijitTabContent,
+.dj_ie7 .soria .tabStrip-disabled .tabStripButton .dijitTabContent {
+	padding-top: 6px;
+}
+
+.soria .dijitTabContainer .tabStripButton-bottom {
+	background: transparent url(../images/tabBottomEnabledSpriteLR.gif) no-repeat scroll left bottom;
+	border-bottom: medium none;
+	border-top: 1px solid #B1BADF;
+}
+
+.soria .dijitTabContainer .tabStripButton-bottom .dijitTab {
+	background: transparent url(../images/tabBottomEnabledSpriteLR.gif) no-repeat scroll right bottom;
+}
+
+.soria .dijitTabStripIcon {
+	height: 14px;
+	width: 14px;
+	background: url(../images/spriteRoundedIconsSmall.png) no-repeat left top ;
+}
+
+.dj_ie6 .soria .dijitTabStripIcon {
+	background-image: url(../images/spriteRoundedIconsSmall.gif);
+}
+
+.soria .dijitTabStripSlideRightIcon {
+	background-position: -30px top;
+}
+
+.soria .dijitTabStripMenuIcon {
+	background-position: -15px top;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/layout/TabContainer_rtl.css b/src/main/resources/static/dijit/themes/soria/layout/TabContainer_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..eba3963b9afed56ff0cf1000af1cadfdbd4d6676
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/layout/TabContainer_rtl.css
@@ -0,0 +1,43 @@
+.dijitRtl .soria .dijitTab {
+	margin-right:0;
+	margin-left:2px;		/* space between one tab and the next in top/bottom mode */
+}
+
+/* tab strips */
+.dijitRtl .soria .dijitTabContainer .tabStripButton {
+	margin-left: 0;
+}
+
+.dijitRtl .soria .dijitTabContainerTopStrip,
+.dijitRtl .soria .dijitTabContainerBottomStrip,
+.dijitRtl .soria .dijitTabContainerTop-tabs,
+.dijitRtl .soria .dijitTabContainerBottom-tabs {
+	padding-left: 0;
+	padding-right: 3px;
+}
+
+.dijitRtl .soria .dijitTabInnerDiv {
+	padding-left: 3px;
+	padding-right: 4px;
+}
+
+.dijitRtl .soria .dijitTabPaneWrapper {
+	#zoom: 1;
+}
+
+.dj_ie-rtl .soria .dijitTabContainerLeft-tabs {
+	margin-left: 0 !important;
+}
+
+.dj_ie-rtl .soria .dijitTabContainerRight-tabs {
+	margin-right: 0 !important;
+}
+
+.dijitRtl .soria .dijitTabContainerLeft-tabs .dijitTab,
+.dijitRtl .soria .dijitTabContainerRight-tabs .dijitTab {
+	margin-left:0;
+}
+
+.dj_ie-rtl .soria .dijitTab .dijitTabInnerDiv{
+	width : 1%;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/soria.css b/src/main/resources/static/dijit/themes/soria/soria.css
new file mode 100644
index 0000000000000000000000000000000000000000..36471d03a13ae565fd373fd605d85d7ed6f633d7
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/soria.css
@@ -0,0 +1,41 @@
+/*
+	Adds cosmetic styling to Dijit.  Users may swap with a custom theme CSS file.
+
+	NOTES:
+	---
+	Dialog.css contains css classes for both Dialog and Tooltip!
+	This because currently a dijit.TooltipDialog exist. Until this is resolved
+	you need to include Dialog.css for both dijits
+	---
+	Toolbar.css contains classes also used in Editor. Until this is resolved
+	you need to include Toolbar.css for both Toolbar and Editor
+	---
+	Button.css contains classes for combobox,
+
+*/
+
+@import url("../dijit.css");
+@import url("../../icons/commonIcons.css");/*sprite containing common icons to be used by all themes*/
+@import url("Common.css");
+@import url("layout/ContentPane.css");
+@import url("layout/TabContainer.css");
+@import url("layout/AccordionContainer.css");
+@import url("layout/SplitContainer.css");
+@import url("layout/BorderContainer.css");
+@import url("form/Common.css");
+@import url("form/Button.css");
+@import url("form/Checkbox.css");
+@import url("form/RadioButton.css");
+@import url("form/Slider.css");
+@import url("form/Select.css");
+@import url("Tree.css");
+@import url("ProgressBar.css");
+@import url("TitlePane.css");
+@import url("Calendar.css");
+@import url("TimePicker.css");
+@import url("Toolbar.css");
+@import url("Dialog.css");
+@import url("Menu.css");
+@import url("Editor.css");
+@import url("../../icons/editorIcons.css"); /* sprite for editor icons to be used by all themes */
+@import url("ColorPalette.css");
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/soria/soria_rtl.css b/src/main/resources/static/dijit/themes/soria/soria_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..895f8223cd52cca3d005a5d8155f1382c0c8ed2b
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/soria/soria_rtl.css
@@ -0,0 +1,30 @@
+/*
+	Adds cosmetic styling to Dijit.  Users may swap with a custom theme CSS file.
+
+	NOTES:
+	---
+	Dialog.css contains css classes for both Dialog and Tooltip!
+	This because currently a dijit.TooltipDialog exist. Until this is resolved
+	you need to include Dialog.css for both dijits
+	---
+	Toolbar.css contains classes also used in Editor. Until this is resolved
+	you need to include Toolbar.css for both Toolbar and Editor
+	---
+	Button.css contains classes for combobox,
+
+*/
+
+@import url("../dijit_rtl.css");
+@import url("layout/TabContainer_rtl.css");
+@import url("layout/AccordionContainer_rtl.css");
+@import url("form/Slider_rtl.css");
+@import url("form/Button_rtl.css");
+@import url("Tree_rtl.css");
+@import url("TitlePane_rtl.css");
+@import url("Calendar_rtl.css");
+@import url("TimePicker_rtl.css");
+@import url("Dialog_rtl.css");
+@import url("ProgressBar_rtl.css");
+@import url("Menu_rtl.css");
+@import url("Editor_rtl.css");
+@import url("../../icons/editorIcons_rtl.css"); /*sprite for editor icons to be used by all themes*/
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/themeTester-orig.html b/src/main/resources/static/dijit/themes/themeTester-orig.html
new file mode 100644
index 0000000000000000000000000000000000000000..457ee2522bd82e81ee965677445a4316a0139dc2
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/themeTester-orig.html
@@ -0,0 +1,1242 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>Dijit Theme Tester</title>
+
+	<!-- required: a default theme -->
+	<link id="themeStyles" rel="stylesheet" href="../../dijit/themes/claro/claro.css"/>
+
+	<style type="text/css">
+		@import "../themes/claro/document.css";
+		@import "../tests/css/dijitTests.css";
+
+		html, body { height: 100%; width: 100%; padding: 0; border: 0; }
+		#main { height: 100%; width: 100%; border: 0; }
+		#header { margin: 0; }
+		#leftAccordion { width: 25%; }
+		#bottomTabs { height: 40%; }
+
+		/* pre-loader specific stuff to prevent unsightly flash of unstyled content */
+		#loader {
+			padding:0;
+			margin:0;
+			position:absolute;
+			top:0; left:0;
+			width:100%; height:100%;
+			background:#ededed;
+			z-index:999;
+			vertical-align:middle;
+		}
+		#loaderInner {
+			padding:5px;
+			position:relative;
+			left:0;
+			top:0;
+			width:175px;
+			background:#3c3;
+			color:#fff;
+		}
+
+		hr.spacer { border:0; background-color:#ededed; width:80%; height:1px; }
+
+		/* rules used to test custom setting of TextBox padding */
+		.inputPadding0 .dijitInputField { padding: 0 !important; }
+		.inputPadding1 .dijitInputField { padding: 1px !important; }
+		.inputPadding2 .dijitInputField { padding: 2px !important; }
+		.inputPadding3 .dijitInputField { padding: 3px !important; }
+		.inputPadding4 .dijitInputField { padding: 4px !important; }
+		.inputPadding5 .dijitInputField { padding: 5px !important; }
+	</style>
+
+	<!-- a check for stray globals: not needed! -->
+	<script type="text/javascript">
+		window.__globalList = {dojo: true, dijit: true, dojox: true, djConfig: true};
+		for(var i in window){
+			window.__globalList[i] = true;
+		}
+	</script>
+
+	<!-- required: dojo.js -->
+	<script type="text/javascript" src="../../dojo/dojo.js"
+		djConfig="parseOnLoad: false, isDebug: true"></script>
+
+	<!-- do not use: only for debugging / testing themes -->
+	<script type="text/javascript" src="../tests/_testCommon.js"></script>
+	<!--
+	<script type="text/javascript" src="http://prototypejs.org/assets/2007/10/16/prototype.js"></script>
+	-->
+
+	<script type="text/javascript"> // dojo.requires()
+
+		dojo.require("dijit.Menu");
+		dojo.require("dijit.MenuItem");
+		dojo.require("dijit.PopupMenuItem");
+		dojo.require("dijit.CheckedMenuItem");
+		dojo.require("dijit.MenuSeparator");
+
+		dojo.require("dijit.Calendar");
+		dojo.require("dijit.ColorPalette");
+		dojo.require("dijit.ProgressBar");
+		dojo.require("dijit.TitlePane");
+		dojo.require("dijit.Tooltip");
+		dojo.require("dijit.Tree");
+
+		dojo.require("dijit.MenuBar");
+		dojo.require("dijit.MenuBarItem");
+		dojo.require("dijit.PopupMenuBarItem");
+
+		dojo.require("dijit.InlineEditBox");
+
+		// editor:
+		dojo.require("dijit.Editor");
+		dojo.require("dijit._editor.plugins.FontChoice");
+		dojo.require("dijit._editor.plugins.LinkDialog");
+
+		// dnd:
+		dojo.require("dojo.dnd.Source");
+
+		// various Form elements
+		dojo.require("dijit.form.CheckBox");
+		dojo.require("dijit.form.RadioButton");
+
+		dojo.require("dijit.form.Textarea");
+		dojo.require("dijit.form.SimpleTextarea");
+		dojo.require("dijit.form.FilteringSelect");
+		dojo.require("dijit.form.Select");
+		dojo.require("dijit.form.TextBox");
+		dojo.require("dijit.form.DateTextBox");
+		dojo.require("dijit.form.TimeTextBox");
+		dojo.require("dijit.form.CurrencyTextBox");
+		dojo.require("dijit.form.NumberSpinner");
+
+		dojo.require("dijit.form.Button");
+		dojo.require("dijit.form.DropDownButton");
+		dojo.require("dijit.form.ComboButton");
+		dojo.require("dijit.form.ToggleButton");
+
+		dojo.require("dijit.form.VerticalSlider");
+		dojo.require("dijit.form.VerticalRuleLabels");
+		dojo.require("dijit.form.VerticalRule");
+		dojo.require("dijit.form.HorizontalSlider");
+		dojo.require("dijit.form.HorizontalRuleLabels");
+		dojo.require("dijit.form.HorizontalRule");
+
+		// layouts used in page
+		dojo.require("dijit.layout.AccordionContainer");
+		dojo.require("dijit.layout.ContentPane");
+		dojo.require("dijit.layout.TabContainer");
+		dojo.require("dijit.layout.BorderContainer");
+		dojo.require("dijit.layout.LinkPane");
+		dojo.require("dijit.Dialog");
+
+		// scan page for widgets and instantiate them
+		dojo.require("dojo.parser");
+
+		// humm?
+		dojo.require("dojo.date.locale");
+
+		// for the Tree
+		dojo.require("dojo.data.ItemFileReadStore");
+
+		// for the colorpalette
+		function setColor(color){
+			var theSpan = dojo.byId("outputSpan");
+			dojo.style(theSpan,"color",color);
+			theSpan.innerHTML = color;
+		}
+
+		// for the calendar
+		function myHandler(id,newValue){
+			console.debug("onChange for id = " + id + ", value: " + newValue);
+		}
+
+		// current setting (if there is one) to override theme default padding on TextBox based widgets
+		currentInputPadding = "";
+
+		function setTextBoxPadding(){
+			// summary:
+			//		Handler for when a MenuItem is clicked to set non-default padding for
+			//		TextBox widgets
+
+			// Effectively ignore clicks on the  currently checked MenuItem
+			if(!this.get("checked")){
+				this.set("checked", true);
+			}
+
+			// val will be "theme default", "0px", "1px", ..., "5px"
+			var val = this.get("label");
+			
+			// Set class on body to get requested padding, and remove any previously set class
+			if(currentInputPadding){
+				dojo.removeClass(dojo.body(), currentInputPadding);
+				currentInputPadding = "";
+			}
+			if(val != "theme default"){
+				currentInputPadding = "inputPadding" + val.replace("px", "");
+				dojo.addClass(dojo.body(), currentInputPadding);
+			}
+
+			// Clear previously checked MenuItem (radio-button effect).
+			dojo.forEach(this.getParent().getChildren(), function(mi){
+				if(mi != this){
+					mi.set("checked", false);
+				}
+			}, this);
+		}
+
+		dojo.addOnLoad(function(){
+
+			var start = new Date().getTime();
+			dojo.parser.parse(dojo.byId('container'));
+			console.info("Total parse time: " + (new Date().getTime() - start) + "ms");
+
+			dojo.byId('loaderInner').innerHTML += " done.";
+			setTimeout(function hideLoader(){
+				var loader = dojo.byId('loader');
+				dojo.fadeOut({ node: loader, duration:500,
+					onEnd: function(){
+						loader.style.display = "none";
+					}
+				}).play();
+			}, 250);
+
+			logStrayGlobals();
+
+			// Fill in menu/links to get to other themes.		
+			// availableThemes[] is just a list of 'official' dijit themes, you can use ?theme=String
+			// for 'un-supported' themes, too. (eg: yours)
+			var availableThemes = [
+				{ theme:"claro", author:"Dojo", baseUri:"../themes/" },
+				{ theme:"tundra", author:"Dojo", baseUri:"../themes/" },
+				{ theme:"soria", author:"nikolai", baseUri:"../themes/" },
+				{ theme:"nihilo", author:"nikolai", baseUri:"../themes/" }
+			];
+
+			var tmpString='';
+			dojo.forEach(availableThemes,function(theme){
+				tmpString += 
+					'<a href="?theme='+theme.theme+'">'+theme.theme+'</'+'a> (' +
+					'<a href="?theme='+theme.theme+'&dir=rtl">RTL</'+'a> ' +
+					'<a href="?theme='+theme.theme+'&a11y=true">high-contrast</'+'a> ' +
+					'<a href="?theme='+theme.theme+'&dir=rtl&a11y=true">RTL+high-contrast</'+'a> )' +
+					' - by: '+theme.author+' <br>';
+				dijit.byId('themeMenu').addChild(new dijit.MenuItem({
+					label: theme.theme,
+					onClick: function(){ location.search = "?theme=" + theme.theme; }
+				}))
+			});
+			dojo.byId('themeData').innerHTML = tmpString;
+		});
+
+		function logStrayGlobals(){
+			// summary:
+			//		Print all the global variables that we've created [by mistake] inside of dojo
+			var strayGlobals = [];
+			for(var i in window){
+				if(!window.__globalList[i]){ strayGlobals.push(i); }
+			}
+			if(strayGlobals.length){
+				console.warn("Stray globals: "+strayGlobals.join(", "));
+			}
+		}
+
+		function logWidgets(){
+			// summary:
+			//		Print all the widgets to console
+			console.log("Widgets in registry:");
+			dijit.registry.forEach(function(w){
+				console.log(w);
+			});
+		}
+
+		function tearDown(){
+			// summary:
+			//		Destroy all widgets, top down, and then check for any orphaned widgets
+			dijit._destroyAll();
+			logWidgets();
+		}
+
+		dojo.addOnLoad(function(){
+			// It's the server's responsibility to localize the date displayed in the (non-edit) version of an InlineEditBox,
+			// but since we don't have a server we'll hack it in the client
+			dijit.byId("backgroundArea").set('value', dojo.date.locale.format(new Date(2005, 11, 30), { selector: 'date' }));
+
+			var nineAm = new Date(0);
+			nineAm.setHours(9);
+			dijit.byId("timePicker").set('value', dojo.date.locale.format(nineAm, { selector: 'time' }));
+		});
+
+		/***
+		dojo.addOnLoad(function(){
+			// use "before advice" to print log message each time resize is called on a layout widget
+			var origResize = dijit.layout._LayoutWidget.prototype.resize;
+			dijit.layout._LayoutWidget.prototype.resize = function(mb){
+				console.log(this + ": resize({w:"+ mb.w + ", h:" + mb.h + "})");
+				origResize.apply(this, arguments);
+			};
+
+			// content pane has no children so just use dojo's builtin after advice
+			dojo.connect(dijit.layout.ContentPane.prototype, "resize", function(mb){
+				console.log(this + ": resize({w:"+ mb.w + ", h:" + mb.h + "})");
+			});
+		});
+		***/
+	</script>
+</head>
+<body class="claro">
+	<!-- basic preloader: -->
+	<div id="loader"><div id="loaderInner" style="direction:ltr;">Loading themeTester ... </div></div>
+
+	<!-- data for tree and combobox -->
+	<div dojoType="dojo.data.ItemFileReadStore" jsId="continentStore"
+		url="../tests/_data/countries.json"></div>
+	<div dojoType="dojo.data.ItemFileReadStore" jsId="stateStore"
+		url="../tests/_data/states.json"></div>
+	<!-- contentMenu popup -->
+	<div dojoType="dijit.Menu" id="submenu1" contextMenuForWindow="true" style="display: none;">
+		<div dojoType="dijit.MenuItem" onClick="alert('Hello world');">Enabled Item</div>
+		<div dojoType="dijit.MenuItem" disabled="true">Disabled Item</div>
+		<div dojoType="dijit.MenuSeparator"></div>
+		<div dojoType="dijit.MenuItem" iconClass="dijitIconCut"
+			onClick="alert('not actually cutting anything, just a test!')">Cut</div>
+		<div dojoType="dijit.MenuItem" iconClass="dijitIconCopy"
+			onClick="alert('not actually copying anything, just a test!')">Copy</div>
+		<div dojoType="dijit.MenuItem" iconClass="dijitIconPaste"
+			onClick="alert('not actually pasting anything, just a test!')">Paste</div>
+		<div dojoType="dijit.MenuSeparator"></div>
+		<div dojoType="dijit.PopupMenuItem">
+			<span>Enabled Submenu</span>
+			<div dojoType="dijit.Menu" id="submenu2">
+				<div dojoType="dijit.MenuItem" onClick="alert('Submenu 1!')">Submenu Item One</div>
+				<div dojoType="dijit.MenuItem" onClick="alert('Submenu 2!')">Submenu Item Two</div>
+				<div dojoType="dijit.PopupMenuItem">
+					<span>Deeper Submenu</span>
+					<div dojoType="dijit.Menu" id="submenu4">
+						<div dojoType="dijit.MenuItem" onClick="alert('Sub-submenu 1!')">Sub-sub-menu Item One</div>
+						<div dojoType="dijit.MenuItem" onClick="alert('Sub-submenu 2!')">Sub-sub-menu Item Two</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div dojoType="dijit.PopupMenuItem" disabled="true">
+			<span>Disabled Submenu</span>
+			<div dojoType="dijit.Menu" id="submenu3" style="display: none;">
+				<div dojoType="dijit.MenuItem" onClick="alert('Submenu 1!')">Submenu Item One</div>
+				<div dojoType="dijit.MenuItem" onClick="alert('Submenu 2!')">Submenu Item Two</div>
+			</div>
+		</div>
+		<div dojoType="dijit.PopupMenuItem">
+			<span>Different popup</span>
+			<div dojoType="dijit.ColorPalette"></div>
+		</div>
+		<div dojoType="dijit.PopupMenuItem">
+			<span>Different popup</span>
+			<div dojoType="dijit.Calendar"></div>
+		</div>
+	</div>
+	<!-- end contextMenu -->
+
+	<div id="main" dojoType="dijit.layout.BorderContainer" liveSplitters="false" design="sidebar">
+
+		<div id="header" dojoType="dijit.MenuBar" region="top">
+			<div dojoType="dijit.PopupMenuBarItem" id="file">
+				<span>File</span>
+				<div dojoType="dijit.Menu" id="fileMenu">
+					<div dojoType="dijit.MenuItem" id="globals" onClick="logStrayGlobals();">Log globals</div>
+					<div dojoType="dijit.MenuItem" id="widgets" onClick="logWidgets();">Log widgets</div>
+					<div dojoType="dijit.MenuItem" id="destroy" iconClass="dijitIconDelete" onClick="tearDown();">Destroy All</div>
+				</div>
+			</div>
+			<div dojoType="dijit.PopupMenuBarItem" id="edit">
+				<span>Edit</span>
+				<div dojoType="dijit.Menu" id="editMenu">
+					<div dojoType="dijit.MenuItem" id="cut" iconClass="dijitIconCut"
+						onClick="console.log('not actually cutting anything, just a test!')">Cut</div>
+					<div dojoType="dijit.MenuItem" id="copy" iconClass="dijitIconCopy"
+						onClick="console.log('not actually copying anything, just a test!')">Copy</div>
+					<div dojoType="dijit.MenuItem" id="paste" iconClass="dijitIconPaste"
+						onClick="console.log('not actually pasting anything, just a test!')">Paste</div>
+					<div dojoType="dijit.MenuSeparator" id="separator"></div>
+					<div dojoType="dijit.MenuItem" id="undo" iconClass="dijitIconUndo">Undo</div>
+				</div>
+			</div>
+			<div dojoType="dijit.PopupMenuBarItem" id="view">
+				<span>View</span>
+				<div dojoType="dijit.Menu" id="viewMenu">
+					<div dojoType="dijit.MenuItem">Normal</div>
+					<div dojoType="dijit.MenuItem">Outline</div>
+					<div dojoType="dijit.PopupMenuItem">
+						<span>Zoom</span>
+						<div dojoType="dijit.Menu" id="zoomMenu">
+							<div dojoType="dijit.MenuItem">50%</div>
+							<div dojoType="dijit.MenuItem">75%</div>
+							<div dojoType="dijit.MenuItem">100%</div>
+							<div dojoType="dijit.MenuItem">150%</div>
+							<div dojoType="dijit.MenuItem">200%</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div dojoType="dijit.PopupMenuBarItem" id="themes">
+				<span>Themes</span>
+				<div dojoType="dijit.Menu" id="themeMenu">
+				</div>
+			</div>
+			<div dojoType="dijit.PopupMenuBarItem" id="dialogs">
+				<span>Dialogs</span>
+				<div dojoType="dijit.Menu" id="dialogMenu">
+					<div dojoType="dijit.MenuItem">
+						<script type="dojo/method" event="onClick">
+							var dlg = dijit.byId('dialog1');
+							dlg.show();
+							// avoid (trying to) restore focus to a closed menu, go to MenuBar instead
+							dlg._savedFocus = dojo.byId("header");
+						</script>
+						slow loading
+					</div>
+					<div dojoType="dijit.MenuItem">
+						<script type="dojo/method" event="onClick">
+							var dlg = dijit.byId('dialogAB');
+							dlg.show();
+							// avoid (trying to) restore focus to a closed menu, go to MenuBar instead
+							dlg._savedFocus = dojo.byId("header");
+						</script>
+						action bar
+					</div>
+				</div>
+			</div>
+			<div dojoType="dijit.PopupMenuBarItem" id="inputPadding">
+				<span>TextBox Padding</span>
+				<div dojoType="dijit.Menu" id="inputPaddingMenu">
+					<div dojoType="dijit.CheckedMenuItem" onClick="setTextBoxPadding" checked>theme default</div>
+					<div dojoType="dijit.CheckedMenuItem" onClick="setTextBoxPadding">0px</div>
+					<div dojoType="dijit.CheckedMenuItem" onClick="setTextBoxPadding">1px</div>
+					<div dojoType="dijit.CheckedMenuItem" onClick="setTextBoxPadding">2px</div>
+					<div dojoType="dijit.CheckedMenuItem" onClick="setTextBoxPadding">3px</div>
+					<div dojoType="dijit.CheckedMenuItem" onClick="setTextBoxPadding">4px</div>
+					<div dojoType="dijit.CheckedMenuItem" onClick="setTextBoxPadding">5px</div>
+				</div>
+			</div>
+			<div dojoType="dijit.PopupMenuBarItem" id="help">
+				<span>Help</span>
+				<div dojoType="dijit.Menu" id="helpMenu">
+					<div dojoType="dijit.MenuItem">Help Topics</div>
+					<div dojoType="dijit.MenuItem">About Dijit</div>
+				</div>
+			</div>
+			<div dojoType="dijit.PopupMenuBarItem" disabled="true">
+				<span>Disabled</span>
+				<div dojoType="dijit.Menu">
+					<div dojoType="dijit.MenuItem">You should not see this</div>
+				</div>
+			</div>
+			<div dojoType="dijit.MenuBarItem" onclick="alert('no submenu, just a clickable MenuItem');">
+				Click me!
+			</div>
+		</div>
+
+		<div dojoType="dijit.layout.AccordionContainer"
+			minSize="20" style="width: 300px;" id="leftAccordion" region="leading" splitter="true">
+
+			<div dojoType="dijit.layout.ContentPane" title="Popups and Alerts"><div style="padding:8px">
+				<h2>Tooltips</h2>
+				<ul>
+					<li>
+					<span id="ttRich"><b>rich</b> <i>text</i> tooltip</span>
+					<span dojoType="dijit.Tooltip" connectId="ttRich" style="display:none;">
+						Embedded <b>bold</b> <i>RICH</i> text <span style="color:#309; font-size:x-large;">weirdness!</span>
+					</span>
+					</li>
+
+					<li><a id="ttOne" href="#bogus">anchor tooltip</a>
+					<span dojoType="dijit.Tooltip" connectId="ttOne" style="display:none;">tooltip on anchor</span>
+					</li>
+				</ul>
+
+				<table style="width: 100%;">
+					<tr>
+						<td></td>
+						<td>
+							<div id="ttBelow" href="#bogus">tooltip below</div>
+							<div dojoType="dijit.Tooltip" connectId="ttBelow" style="display:none; width: 100px;" position="below" >I'm <i>below</i>!</div>
+						</td>
+						<td></td>
+					</tr>
+					<tr>
+						<td>
+							<div id="ttRight" href="#bogus">tooltip after</div>
+							<div dojoType="dijit.Tooltip" connectId="ttRight" style="display:none;" position="after" >I'm on the <i>right</i>!<br>(or left on RTL systems)</div>
+						</td>
+						<td></td>
+						<td>
+							<div id="ttLeft" href="#bogus">tooltip before</div>
+							<div dojoType="dijit.Tooltip" connectId="ttLeft" style="display:none;" position="before,after" >I'm on the <i>left</i>!<br>(or right on RTL systems)</div>
+						</td>
+					</tr>
+					<tr>
+						<td></td>
+						<td>
+							<div id="ttAbove" href="#bogus">tooltip above</div>
+							<div dojoType="dijit.Tooltip" connectId="ttAbove" style="display:none;" position="above" >I'm <i>above</i>!</div>
+						</td>
+						<td></td>
+					</tr>
+				</table>
+
+				<hr class="spacer">
+
+				<h2>Dialogs</h2>
+				<ul>
+					<li><a href="#" onclick="dijit.byId('dialog1').show()">slow loading modal dialog</a></li>
+					<li><a href="#" onclick="dijit.byId('dialogAB').show()">modal dialog w/action bar</a></li>
+				</ul>
+
+				<div dojoType="dijit.form.DropDownButton">
+					<span>Show Tooltip Dialog</span>
+					<div dojoType="dijit.TooltipDialog" id="tooltipDlg" title="Enter Login information"
+						execute="alert('submitted w/args:\n' + dojo.toJson(arguments[0], true));">
+						<table>
+							<tr>
+								<td><label for="user">User:</label></td>
+								<td><input dojoType=dijit.form.TextBox type="text" id="user" name="user" ></td>
+							</tr>
+							<tr>
+								<td><label for="pwd">Password:</label></td>
+								<td><input dojoType=dijit.form.TextBox type="password" id="pwd" name="pwd"></td>
+							</tr>
+							<tr>
+								<td colspan="2" align="center">
+									<button dojoType=dijit.form.Button type="submit" name="submit">Login</button>
+							</tr>
+						</table>
+					</div>
+				</div>
+			</div>
+			</div>
+
+			<div dojoType="dijit.layout.ContentPane" title="Dojo Tree from Store">
+				<!-- tree widget -->
+				<div dojoType="dijit.Tree" store="continentStore" query="{type:'continent'}"
+					label="Continents" openOnClick="true">
+				</div>
+			</div>
+
+			<div dojoType="dijit.layout.ContentPane" title="Calendar" selected="true">
+				<!-- calendar widget pane -->
+				<input id="calendar1" dojoType="dijit.Calendar" onChange="myHandler(this.id,arguments[0])">
+			</div>
+
+			<div dojoType="dijit.layout.ContentPane" title="Color Picker">
+				<p>
+					Selecting a color will change the background color of the page.
+					Use this to test how tooltips and drop downs appear with different backgrounds.
+				</p>
+				<h2 class="testHeader">3x4</h2>
+				<script>
+					function setBackground(color){
+						dojo.query('.dijitAccordionBody').style('background', color);
+						dojo.query('.dijitTabPaneWrapper').style('background', color);
+					}
+				</script>
+				<div dojoType="dijit.ColorPalette"  palette="3x4" onChange="setBackground(arguments[0]);"></div>
+				<h2 class="testHeader">7x10</h2>
+				<div dojoType="dijit.ColorPalette" onChange="setBackground(arguments[0]);"></div>
+			</div>
+			<div dojoType="dijit.layout.TabContainer" useMenu="false" title="Sliding TabContainer"
+						id="slidingTab">
+				<div dojoType="dijit.layout.ContentPane" title="Information">
+					This tab container uses slide controls when the tabs are too wide to fit beside each other.
+					If you make the left column narrow enough, the slide controls should appear.
+				</div>
+				<div dojoType="dijit.layout.ContentPane" title="Rootless Tree" closable="true">
+					<div
+						dojoType="dijit.Tree"
+						id="rootlessTree"
+						store="continentStore"
+						query="{type:'continent'}"
+						openOnClick="true">
+					</div>
+
+				</div>
+				<div dojoType="dijit.layout.TabContainer"
+						id="inlined" closable="true"
+						title="Nested TabContainer" nested="true">
+					<a dojoType="dijit.layout.LinkPane" id="tab1href" href="../tests/layout/tab1.html" onLoad="console.log('load of SubTab 1');">SubTab 1</a>
+					<a dojoType="dijit.layout.LinkPane" id="tab2href" href="../tests/layout/tab2.html"  onLoad="console.log('load of SubTab 2');" selected="true">SubTab 2</a>
+					<div dojoType="dijit.layout.ContentPane" id="subtab3" title="SubTab 3">
+						<h1>I am tab 3, inlined.</h1>
+					</div>
+					<div dojoType="dijit.layout.ContentPane" id="subtab4" title="SubTab 4">
+						<h1>I am tab 4, inlined.</h1>
+					</div>
+				</div>
+				<div dojoType="dijit.layout.ContentPane" title="Menu Bar" closable="true">
+					<div id="menubar" dojoType="dijit.MenuBar">
+					<div dojoType="dijit.PopupMenuBarItem" >
+						<span>File</span>
+						<div dojoType="dijit.Menu">
+							<div dojoType="dijit.MenuItem" iconClass="dijitIconNewTask">New</div>
+							<div dojoType="dijit.MenuItem">Open</div>
+							<div dojoType="dijit.MenuSeparator"></div>
+							<div dojoType="dijit.MenuItem" iconClass="dijitIconSave">Save</div>
+							<div dojoType="dijit.MenuItem">Save As...</div>
+						</div>
+					</div>
+					<div dojoType="dijit.PopupMenuBarItem">
+						<span>Edit</span>
+						<div dojoType="dijit.Menu" >
+							<div dojoType="dijit.MenuItem"  iconClass="dijitIconCut"
+								onClick="console.log('not actually cutting anything, just a test!')">Cut</div>
+							<div dojoType="dijit.MenuItem"  iconClass="dijitIconCopy"
+								onClick="console.log('not actually copying anything, just a test!')">Copy</div>
+							<div dojoType="dijit.MenuItem"  iconClass="dijitIconPaste"
+								onClick="console.log('not actually pasting anything, just a test!')">Paste</div>
+						</div>
+					</div>
+					<div dojoType="dijit.PopupMenuBarItem">
+						<span>View</span>
+						<div dojoType="dijit.Menu">
+							<div dojoType="dijit.MenuItem">Normal</div>
+							<div dojoType="dijit.MenuItem">Outline</div>
+							<div dojoType="dijit.PopupMenuItem">
+								<span>Zoom</span>
+								<div dojoType="dijit.Menu">
+									<div dojoType="dijit.MenuItem">50%</div>
+									<div dojoType="dijit.MenuItem">75%</div>
+									<div dojoType="dijit.MenuItem">100%</div>
+									<div dojoType="dijit.MenuItem">150%</div>
+									<div dojoType="dijit.MenuItem">200%</div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div dojoType="dijit.PopupMenuBarItem">
+						<span>Help</span>
+						<div dojoType="dijit.Menu">
+							<div dojoType="dijit.MenuItem">Help Topics</div>
+							<div dojoType="dijit.MenuItem">About Dijit</div>
+						</div>
+					</div>
+					<div dojoType="dijit.PopupMenuBarItem" disabled="true">
+						<span>Disabled</span>
+						<div dojoType="dijit.Menu">
+							<div dojoType="dijit.MenuItem">You should not see this</div>
+						</div>
+					</div>
+					<div dojoType="dijit.MenuBarItem" onclick="alert('no submenu, just a clickable MenuItem');">
+						Click me!
+					</div>
+				</div>
+				</div>
+			</div>
+
+
+		</div><!-- end AccordionContainer -->
+
+		<!-- top tabs (marked as "center" to take up the main part of the BorderContainer) -->
+		<div dojoType="dijit.layout.TabContainer" region="center" id="topTabs" tabStrip="true">
+
+			<div id="basicFormTab" dojoType="dijit.layout.ContentPane" title="Basic Form Widgets" style="padding:10px;display:none;">
+
+				<h2>Buttons</h2>
+				<p>Buttons can do an action, display a menu, or both:</p>
+
+				Enabled:
+
+				<button dojoType="dijit.form.Button" iconClass="dijitIconTask" onClick='console.debug("clicked simple")'>
+					Simple
+				</button>
+
+				<button dojoType="dijit.form.DropDownButton" iconClass="dijitIconEdit">
+					<span>Drop Down</span>
+					<div dojoType="dijit.Menu" id="editMenu1" style="display: none;">
+						<div dojoType="dijit.MenuItem"
+							iconClass="dijitIconCut"
+							onClick="console.debug('not actually cutting anything, just a test!')">
+							Cut
+						</div>
+
+						<div dojoType="dijit.MenuItem"
+							 iconClass="dijitIconCopy"
+							onClick="console.debug('not actually copying anything, just a test!')">
+							Copy
+						</div>
+
+						<div dojoType="dijit.MenuItem"
+							 iconClass="dijitIconPaste"
+							onClick="console.debug('not actually pasting anything, just a test!')">
+							Paste
+						</div>
+					</div>
+				</button>
+
+				<button dojoType="dijit.form.ComboButton" iconClass="dijitIconSave"
+					optionsTitle='save options'
+					onClick='console.debug("clicked combo save")'>
+					<span>Combo</span>
+					<div dojoType="dijit.Menu" id="saveMenu1" style="display: none;">
+						<div dojoType="dijit.MenuItem"
+							 iconClass="dijitIconSave"
+							onClick="console.debug('not actually saving anything, just a test!')">
+							Save
+						</div>
+						<div dojoType="dijit.MenuItem"
+							onClick="console.debug('not actually saving anything, just a test!')">
+							Save As
+						</div>
+					</div>
+				</button>
+
+				<button dojoType="dijit.form.ToggleButton" checked onChange="console.log('toggled button checked='+arguments[0]);" iconClass="dijitCheckBoxIcon">
+					Toggle
+				</button>
+
+				<hr class="spacer">
+
+				Disabled:
+
+				<button dojoType="dijit.form.Button" iconClass="dijitIconTask" disabled>
+					Simple
+				</button>
+
+				<button dojoType="dijit.form.DropDownButton" iconClass="dijitIconEdit" disabled>
+					<span>Drop Down</span>
+					<div dojoType="dijit.Menu" id="editMenu2" style="display: none;">
+						<div dojoType="dijit.MenuItem"
+							iconClass="dijitIconCut"
+							onClick="console.debug('not actually cutting anything, just a test!')">
+							Cut
+						</div>
+
+						<div dojoType="dijit.MenuItem"
+							 iconClass="dijitIconCopy"
+							onClick="console.debug('not actually copying anything, just a test!')">
+							Copy
+						</div>
+
+						<div dojoType="dijit.MenuItem"
+							 iconClass="dijitIconPaste"
+							onClick="console.debug('not actually pasting anything, just a test!')">
+							Paste
+						</div>
+					</div>
+				</button>
+
+				<button dojoType="dijit.form.ComboButton" iconClass="dijitIconSave"
+					optionsTitle='save options'
+					disabled>
+					<span>Combo</span>
+					<div dojoType="dijit.Menu" id="saveMenu2" style="display: none;">
+						<div dojoType="dijit.MenuItem"
+							 iconClass="dijitIconSave"
+							onClick="console.debug('not actually saving anything, just a test!')">
+							Save
+						</div>
+						<div dojoType="dijit.MenuItem"
+							onClick="console.debug('not actually saving anything, just a test!')">
+							Save As
+						</div>
+					</div>
+				</button>
+
+				<button dojoType="dijit.form.ToggleButton" checked disabled iconClass="dijitCheckBoxIcon">
+					Toggle
+				</button>
+
+				<hr class="spacer">
+
+				<h2>CheckBox</h2>
+				<fieldset>
+					<input id="check1" type="checkBox" dojoType="dijit.form.CheckBox">
+					<label for="check1">unchecked</label>
+
+					<input id="check2" type="checkBox" dojoType="dijit.form.CheckBox" checked="checked">
+					<label for="check2">checked</label>
+
+					<input id="check3" type="checkBox" dojoType="dijit.form.CheckBox" disabled>
+					<label for="check3">disabled</label>
+
+					<input id="check4" type="checkBox" dojoType="dijit.form.CheckBox" checked="checked" disabled>
+					<label for="check4">disabled and checked</label>
+				</fieldset>
+
+				<h2>Radio Buttons</h2>
+				<fieldset>
+					<input type="radio" name="g1" id="g1rb1" value="news" dojoType="dijit.form.RadioButton">
+					<label for="g1rb1">news</label>
+					<input type="radio" name="g1" id="g1rb2" value="talk" dojoType="dijit.form.RadioButton" checked>
+					<label for="g1rb2">talk</label>
+					<input type="radio" name="g1" id="g1rb3" value="weather" dojoType="dijit.form.RadioButton" disabled>
+					<label for="g1rb3">weather (disabled)</label>
+				</fieldset>
+			</div> <!-- end of basic form widgets -->
+
+			<div id="textboxTab" dojoType="dijit.layout.ContentPane" title="Text Input Widgets" style="padding:10px;display:none;">
+
+				<h2>dijit.form.DateTextBox</h2>
+				<label for="date1">Enabled w/placeHolder:</label>
+				<input id="date1" name="date1" type="text" dojoType="dijit.form.DateTextBox" placeHolder="Birthday">
+				<label for="date2">Disabled w/placeHolder:</label>
+				<input id="date2" name="date2" type="text" dojoType="dijit.form.DateTextBox" placeHolder="Birthday" disabled="disabled">
+				<label for="date2">Disabled w/value:</label>
+				<input id="date3" name="date3" type="text" dojoType="dijit.form.DateTextBox" value="2008-12-25" disabled="disabled">
+
+				<h2>dijit.form.TimeTextBox</h2>
+				<label for="time1">Enabled:</label>
+				<input id="time1" name="time1" type="text" dojoType="dijit.form.TimeTextBox" value="T17:45:00">
+				<label for="time2">Disabled:</label>
+				<input id="time2" name="time2" type="text" dojoType="dijit.form.TimeTextBox" value="T17:45:00" disabled>
+
+				<h2>dijit.form.CurrencyTextBox</h2>
+				<label for="currency1">Enabled:</label>
+				<input id="currency1" type="text" name="income1" value="54775.53"
+					dojoType="dijit.form.CurrencyTextBox"
+					required="true"
+					constraints="{fractional:true}"
+					currency="USD"
+					invalidMessage="Invalid amount.  Include dollar sign, commas, and cents.  Cents are mandatory.">
+				<label for="currency2">Disabled:</label>
+				<input id="currency2" type="text" name="income1" value="54775.53"
+					dojoType="dijit.form.CurrencyTextBox"
+					required="true"
+					constraints="{fractional:true}"
+					currency="USD"
+					invalidMessage="Invalid amount.  Include dollar sign, commas, and cents.  Cents are mandatory." disabled>
+
+				<hr class="spacer">
+
+				<h2>dijit.form.NumberSpinner max=100</h2>
+				<label for="spinner1">Enabled: </label>
+				<input dojoType="dijit.form.NumberSpinner" constraints="{max:100,places:0}" id="spinner1" value="10">
+				<label for="spinner2">Disabled: </label>
+				<input dojoType="dijit.form.NumberSpinner" constraints="{max:100,places:0}" id="spinner2" value="10" disabled>
+
+			</div>
+
+			<div id="selectTab" dojoType="dijit.layout.ContentPane" title="Select Widgets" style="padding:10px;display:none;">
+
+				<h2>dijit.form.Select</h2>
+				<label for="selectEnabled">Enabled: </label>
+				<div id="selectEnabled" value="AK" dojoType="dijit.form.Select">
+					<span value="AL"><b>Alabama</b></span>
+					<span value="AK"><font color="red">A</font><font color="orange">l</font><font color="yellow">a</font><font color="green">s</font><font color="blue">k</font><font color="purple">a</font></span>
+					<span value="AZ"><i>Arizona</i></span>
+					<span value="AR"><span class="ark">Arkansas</span></span>
+					<span value="CA"><span style="font-size:25%">C</span><span style="font-size:50%">a</span><span style="font-size:75%">l</span><span style="font-size:90%">i</span><span style="font-size:100%">f</span><span style="font-size:125%">o</span><span style="font-size:133%">r</span><span style="font-size:150%">n</span><span style="font-size:175%">i</span><span style="font-size:200%">a</span></span>
+					<span value="NM" disabled="disabled">New<br>&nbsp;&nbsp;Mexico</span>
+				</div>
+	
+				<label for="selectDisabled">Disabled: </label>
+				<div id="selectDisabled" value="AK" dojoType="dijit.form.Select" disabled>
+					<span value="AL"><b>Alabama</b></span>
+					<span value="AK"><font color="red">A</font><font color="orange">l</font><font color="yellow">a</font><font color="green">s</font><font color="blue">k</font><font color="purple">a</font></span>
+					<span value="AZ"><i>Arizona</i></span>
+					<span value="AR"><span class="ark">Arkansas</span></span>
+					<span value="CA"><span style="font-size:25%">C</span><span style="font-size:50%">a</span><span style="font-size:75%">l</span><span style="font-size:90%">i</span><span style="font-size:100%">f</span><span style="font-size:125%">o</span><span style="font-size:133%">r</span><span style="font-size:150%">n</span><span style="font-size:175%">i</span><span style="font-size:200%">a</span></span>
+					<span value="NM" disabled="disabled">New<br>&nbsp;&nbsp;Mexico</span>
+				</div>
+
+				<hr class="spacer">
+
+				<h2>dijit.form.FilteringSelect</h2>
+				<label for="filteringSelect">Enabled w/placeHolder: </label>
+				<input dojoType="dijit.form.FilteringSelect"
+					placeHolder="State"
+					store="stateStore"
+					searchAttr="name"
+					name="state2"
+					id="filteringSelect"
+				>
+				<label for="filteringSelect2">Disabled w/placeHolder: </label>
+				<input dojoType="dijit.form.FilteringSelect"
+					placeHolder="State"
+					store="stateStore"
+					searchAttr="name"
+					name="state2"
+					id="filteringSelect2"
+					disabled
+				>
+				<label for="filteringSelect3">Disabled w/value: </label>
+				<input dojoType="dijit.form.FilteringSelect"
+					value="California"
+					store="stateStore"
+					searchAttr="name"
+					name="state3"
+					id="filteringSelect3"
+					disabled
+				>
+
+
+			</div>
+
+			<div id="textareaTab" dojoType="dijit.layout.ContentPane" title="Textarea" style="padding:10px;">
+
+				<!--	&#8234; and &#8236; are inserted solely for testing purposes to mark the beginning and end of left-to-right text so that
+					cogniscent browsers don't render garbled punctuation nor exhibit strange home/end key behavior while in right-to-left mode -->
+				<h2>dijit.form.Textarea</h2>
+				<p>Enabled:</p>
+				<textarea dojoType="dijit.form.Textarea" name="areText">This text area will expand and contract as you type &#8234;text.&#8236;
+
+Lorem ipsum dolor sit &#8234;amet,&#8236;
+consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet
+dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci
+tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo &#8234;consequat.&#8236;
+				</textarea>
+
+				<br>
+				<p>Disabled:</p>
+				<textarea dojoType="dijit.form.Textarea" name="areText2" disabled>This text
+				area is disabled and you shouldn't be able to type in &#8234;it.&#8236;
+				</textarea>
+
+
+				<h2>dijit.form.SimpleTextarea</h2>
+				<p></p>
+				<p>Enabled:</p>
+				<textarea dojoType="dijit.form.SimpleTextarea" name="areText">This text area has a constant height and displays a scrollbar when &#8234;necessary.&#8236;
+
+Lorem ipsum dolor sit &#8234;amet,&#8236;
+consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet
+dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci
+tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis
+autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie &#8234;consequat,&#8236;
+vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio
+dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait
+nulla &#8234;facilisi.&#8236;
+				</textarea>
+
+				<p>Disabled:</p>
+				<textarea dojoType="dijit.form.SimpleTextarea" name="areText2" disabled>Lorem ipsum dolor sit &#8234;amet,&#8236;
+				consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet
+				dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci
+				tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis
+				autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie &#8234;consequat,&#8236;
+				vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio
+				dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait
+				nulla &#8234;facilisi.&#8236;
+				</textarea>
+			</div><!-- end of Textarea tab -->
+
+			<div id="editorTab" dojoType="dijit.layout.ContentPane" title="Editor" style="padding:10px;">
+				<p>Enabled:</p>
+				<!-- FIXME:
+					set height on this node to size the whole editor, but causes the tab to not scroll
+					until you select another tab and come back. alternative is no height: here, but that
+					causes editor to become VERY tall, and size to a normal height when selected (like the
+					dijit.form.TextArea in "Form Feel" Tab), but in reverse. refs #3980 and is maybe new bug?
+				-->
+				<div height="175" dojoType="dijit.Editor" extraPlugins="['|', 'createLink', 'fontName']" styleSheets="../themes/claro/document.css">
+					<ul>
+						<li>Lorem <a href="http://dojotoolkit.org">and a link</a>, what do you think?</li>
+						<li>This is the Editor with a Toolbar attached.</li>
+					</ul>
+				</div>
+				<p>Disabled:</p>
+				<div height="175" dojoType="dijit.Editor" extraPlugins="['|', 'createLink', 'fontName']" styleSheets="../themes/claro/document.css" disabled="true">
+					<ul>
+						<li>Lorem <a href="http://dojotoolkit.org">and a link</a>, what do you think?</li>
+						<li>This is the Editor with a Toolbar attached.</li>
+					</ul>
+				</div>
+			</div><!-- end of Editor tab -->
+
+
+			<div dojoType="dijit.layout.ContentPane" title="Sliders" style="padding:10px;display:none;">
+
+
+				<!-- Sliders: -->
+
+				<h2>Enabled</h2>
+				<div style="float:right;">
+				<div dojoType="dijit.form.VerticalSlider"
+					onChange="dojo.byId('slider2input').value=arguments[0];"
+					value="10"
+					maximum="100"
+					minimum="0"
+					discreteValues="11"
+					style="height:176px; clear:both;"
+					id="slider2">
+						<ol dojoType="dijit.form.VerticalRuleLabels" container="leftDecoration"style="width:2em;" labelStyle="right:0px;">
+							<li>0
+							<li>100
+						</ol>
+
+						<div dojoType="dijit.form.VerticalRule" container="leftDecoration" count=11 style="width:5px;"></div>
+						<div dojoType="dijit.form.VerticalRule" container="rightDecoration" count=11 style="width:5px;"></div>
+						<ol dojoType="dijit.form.VerticalRuleLabels" container="rightDecoration"style="width:2em;" maximum="100" count="6" numericMargin="1" constraints="{pattern:'#'}"></ol>
+				</div>
+				<br> Slider2 Value:<input disabled id="slider2input" size="3" value="10" autocomplete="off">
+				</div>
+
+				<div dojoType="dijit.form.HorizontalSlider"
+					onChange="dojo.byId('slider1input').value=dojo.number.format(arguments[0]/100,{places:1,pattern:'#%'});"
+					value="10"
+					maximum="100"
+					minimum="0"
+					showButtons="false"
+					intermediateChanges="true"
+					style="width:50%; height: 20px;"
+					id="horizontal1">
+						<ol dojoType="dijit.form.HorizontalRuleLabels" container="topDecoration" style="height:1.2em;font-size:75%;" numericMargin="1" count="6"></ol>
+						<div dojoType="dijit.form.HorizontalRule" container="topDecoration" count=11 style="height:5px;"></div>
+						<div dojoType="dijit.form.HorizontalRule" container="bottomDecoration" count=5 style="height:5px;"></div>
+						<ol dojoType="dijit.form.HorizontalRuleLabels" container="bottomDecoration" style="height:1em;font-size:75%;">
+							<li>lowest
+							<li>normal
+							<li>highest
+						</ol>
+
+				</div>
+				<br>Value: <input disabled id="slider1input" size="5" value="10.0%" autocomplete="off">
+
+				<div dojoType="dijit.form.HorizontalSlider"
+					minimum="1"
+					value="2"
+					maximum="3"
+					discreteValues="3"
+					showButtons="false"
+					intermediateChanges="true"
+					style="width:300px; height: 40px;"
+					id="horizontal2">
+						<div dojoType="dijit.form.HorizontalRule" container="bottomDecoration" count=3 style="height:5px;"></div>
+						<ol dojoType="dijit.form.HorizontalRuleLabels" container="bottomDecoration"style="height:1em;font-size:75%;">
+							<li><img width=10 height=10 src="../tests/images/note.gif"><br><span style="font-size: small">small</span>
+							<li><img width=15 height=15 src="../tests/images/note.gif"><br><span style="font-size: medium">medium</span>
+
+							<li><img width=20 height=20 src="../tests/images/note.gif"><br><span style="font-size: large">large</span>
+						</ol>
+				</div>
+
+				<h2 style="clear:both">Disabled</h2>
+				<div style="float:right;">
+				<div dojoType="dijit.form.VerticalSlider"
+					value="10"
+					maximum="100"
+					minimum="0"
+					discreteValues="11"
+					style="height:175px; clear:both"
+					disabled>
+						<ol dojoType="dijit.form.VerticalRuleLabels" container="leftDecoration"style="width:2em;" labelStyle="right:0px;">
+							<li>0
+							<li>100
+						</ol>
+
+						<div dojoType="dijit.form.VerticalRule" container="leftDecoration" count=11 style="width:5px;"></div>
+						<div dojoType="dijit.form.VerticalRule" container="rightDecoration" count=11 style="width:5px;"></div>
+						<ol dojoType="dijit.form.VerticalRuleLabels" container="rightDecoration"style="width:2em;" maximum="100" count="6" numericMargin="1" constraints="{pattern:'#'}"></ol>
+				</div>
+				</div>
+				<div dojoType="dijit.form.HorizontalSlider"
+					value="10"
+					maximum="100"
+					minimum="0"
+					showButtons="false"
+					intermediateChanges="true"
+					style="width:50%; height: 20px;"
+					disabled>
+						<ol dojoType="dijit.form.HorizontalRuleLabels" container="topDecoration" style="height:1.2em;font-size:75%;" numericMargin="1" count="6"></ol>
+						<div dojoType="dijit.form.HorizontalRule" container="topDecoration" count=11 style="height:5px;"></div>
+						<div dojoType="dijit.form.HorizontalRule" container="bottomDecoration" count=5 style="height:5px;"></div>
+						<ol dojoType="dijit.form.HorizontalRuleLabels" container="bottomDecoration" style="height:1em;font-size:75%;">
+							<li>lowest
+							<li>normal
+							<li>highest
+						</ol>
+
+				</div>
+
+				<div dojoType="dijit.form.HorizontalSlider"
+					minimum="1"
+					value="2"
+					maximum="3"
+					discreteValues="3"
+					showButtons="false"
+					intermediateChanges="true"
+					style="width:300px; height: 40px;"
+					disabled>
+						<div dojoType="dijit.form.HorizontalRule" container="bottomDecoration" count=3 style="height:5px;"></div>
+						<ol dojoType="dijit.form.HorizontalRuleLabels" container="bottomDecoration"style="height:1em;font-size:75%;">
+							<li><img width=10 height=10 src="../tests/images/note.gif"><br><span style="font-size: small">small</span>
+							<li><img width=15 height=15 src="../tests/images/note.gif"><br><span style="font-size: medium">medium</span>
+							<li><img width=20 height=20 src="../tests/images/note.gif"><br><span style="font-size: large">large</span>
+						</ol>
+				</div>
+			</div>
+
+			<div id="variousTab" dojoType="dijit.layout.ContentPane" title="Various Dijits"
+				style="padding:10px; display:none;">
+
+
+				<h2>TitlePane</h2>
+				<div dojoType="dijit.TitlePane" title="my pane" width="275">
+					<p>This is a title pane.  It can be expanded and collapsed.</p>
+
+					<p>Sed sollicitudin suscipit risus. Nam
+					ullamcorper. Sed nisl lectus, pellentesque nec,
+					malesuada eget, ornare a, libero. Lorem ipsum dolor
+					sit amet, consectetuer adipiscing elit.</p>
+
+				</div><!-- end title pane -->
+
+				<hr class="spacer">
+
+				<h2>ProgressBar</h2>
+				<div style="width:400px;" maximum="200" id="setTestBar"
+					progress="20" dojoType="dijit.ProgressBar"></div>
+
+				Indeterminate:
+				<div style="width:400px;" indeterminate="true" dojoType="dijit.ProgressBar"></div>
+
+			</div><!-- end:various dijits upper tab -->
+
+			<div id="InlineEditBoxTab" dojoType="dijit.layout.ContentPane" title="InlineEditBox"
+				style="padding:10px; display:none;">
+
+				<h2 class="testTitle">dijit.InlineEditBox + dijit.form.TextBox on &lt;h3&gt;</h2>
+
+				(HTML before)
+				<h3 id="editable" style="font-size:larger;" dojoType="dijit.InlineEditBox" onChange="myHandler(this.id,arguments[0])">
+					Edit me - I trigger the onChange callback
+				</h3>
+				(HTML after)
+
+				<hr class="spacer">
+
+				<h2>dijit.InlineEditBox + dijit.form.Textarea</h2>
+
+				(HTML before)
+				<p id="areaEditable" dojoType="dijit.InlineEditBox" editor="dijit.form.Textarea" autoSave="false">
+					I'm one big &#8234;paragraph.&#8236;  Go ahead and edit &#8234;me.&#8236;  I dare &#8234;you.&#8236;
+					The quick brown fox jumped over the lazy &#8234;dog.&#8236;  Blah blah blah blah blah blah &#8234;blah ...&#8236;
+				</p>
+				(HTML after)
+
+				<p>
+					These links will
+					<a href="#" onClick="dijit.byId('areaEditable').set('disabled', true)">disable</a> /
+					<a href="#" onClick="dijit.byId('areaEditable').set('disabled', false)">enable</a>
+					the text area above.
+				</p>
+
+				<hr class="spacer">
+
+				<h2>dijit.form.DateTextBox</h2>
+
+				(HTML inline before)
+				<!-- set programmatically to match locale; a server might generate this content also. -->
+				<span id="backgroundArea" dojoType="dijit.InlineEditBox" editor="dijit.form.DateTextBox" width="170px"></span>
+				(HTML after)
+				<hr class="spacer">
+
+				<h2>dijit.form.TimeTextBox</h2>
+
+				(HTML inline before)
+				<!-- set programmatically to match locale; a server might generate this content also. -->
+				<span id="timePicker" dojoType="dijit.InlineEditBox" editor="dijit.form.TimeTextBox" width="150px"></span>
+				(HTML after)
+
+				<hr class="spacer">
+
+
+				<h2>dijit.form.FilteringSelect + Inline + remote data store</h2>
+				(HTML inline before)
+				<span id="backgroundArea2" dojoType="dijit.InlineEditBox" editor="dijit.form.FilteringSelect"
+					editorParams="{store: stateStore, autoComplete: true, promptMessage: 'Please enter a state'}"
+					width="300px">
+					Indiana
+				</span>
+				(HTML after)
+
+			</div><!-- end InlineEditBox tab -->
+
+			<div id="dndTab" dojoType="dijit.layout.ContentPane" title="DnD"
+				style="padding:10px; display:none;">
+				<div style="float:left; margin:5px;">
+					<h3>Source 1</h3>
+					<div dojoType="dojo.dnd.Source" style="border:3px solid #ccc; padding: 1em 3em; ">
+						<div class="dojoDndItem">Item <strong>X</strong></div>
+						<div class="dojoDndItem">Item <strong>Y</strong></div>
+						<div class="dojoDndItem">Item <strong>Z</strong></div>
+					</div>
+				</div>
+				<div style="float:left; margin:5px; ">
+					<h3>Source 2</h3>
+					<div dojoType="dojo.dnd.Source" style="border:3px solid #ccc; padding: 1em 3em; ">
+						<div class="dojoDndItem">Item <strong>1</strong></div>
+						<div class="dojoDndItem">Item <strong>2</strong></div>
+						<div class="dojoDndItem">Item <strong>3</strong></div>
+					</div>
+				</div>
+			</div><!-- end DnD tab -->
+
+			<div id="closableTab" dojoType="dijit.layout.ContentPane" title="Closable"
+				style="display:none; padding:10px; " closable="true">
+				This pane is closable, just for the icon ...
+			</div>
+		</div><!-- end of region="center" TabContainer -->
+
+		<!-- bottom right tabs -->
+		<div dojoType="dijit.layout.TabContainer" id="bottomTabs"
+			tabPosition="bottom" selectedChild="btab1" region="bottom" splitter="true" tabStrip="true">
+
+			<!-- btab 1 -->
+			<div id="btab1" dojoType="dijit.layout.ContentPane" title="Info" style=" padding:10px; ">
+				<p>You can explore this single page after applying a Theme
+				for use in creation of your own theme.</p>
+
+				<p>I am whole slew of Widgets on a page. Jump to <a href="../tests/">dijit tests</a> to
+				test individual components.</p>
+
+				<p>There is a right-click [context] pop-up menu here, as well.</p>
+			</div><!-- end:info btab1 -->
+
+			<div id="btab2" dojoType="dijit.layout.ContentPane" title="Alternate Themes" style="padding:20px;">
+				<span id="themeData"></span>
+			</div><!-- btab2 -->
+
+			<div id="btab3" dojoType="dijit.layout.ContentPane" title="Bottom 3" closable="true">
+				<p>I am the last Tab</p>
+				<div id="dialog2" dojoType="dijit.Dialog" title="Encased Dialog" style="display:none;">
+				I am the second dialog. I am
+				parented by the Low Tab Pane #3
+				</div>
+			</div><!-- btab3 -->
+
+		</div><!-- end Bottom TabContainer -->
+
+	</div><!-- end of BorderContainer -->
+
+	<!-- dialog in body -->
+	<div id="dialog1" dojoType="dijit.Dialog"
+		title="Floating Modal Dialog from href" style="display:none; width: 400px;"
+		href="../tests/layout/getResponse.php?delay=3000&messId=3" refreshOnShow="true"></div>
+	<div id="dialogAB" dojoType="dijit.Dialog"
+		title="Floating Modal Dialog" style="display:none;">
+		<div class="dijitDialogPaneContentArea">
+			<table>
+				<tr>
+					<td><label for="name">Name: </label></td>
+					<td><input dojoType=dijit.form.TextBox type="text" name="name" id="name"></td>
+				</tr>
+				<tr>
+					<td><label for="loc">Location: </label></td>
+					<td><input dojoType=dijit.form.TextBox type="text" name="loc" id="loc"></td>
+				</tr>
+				<tr>
+					<td><label for="date">Date: </label></td>
+					<td><input dojoType=dijit.form.DateTextBox type="text" name="date" id="date"></td>
+				</tr>
+			</table>
+		</div>
+		
+		
+		<div class="dijitDialogPaneActionBar">
+			<button dojoType="dijit.form.Button" type="submit" id="ABdialog1button1">OK</button>
+			<button dojoType="dijit.form.Button" type="button" onClick="dijit.byId('dialogAB').onCancel();" 
+					id="ABdialog1button2">Cancel</button>
+		</div>
+	</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/themes/themeTester.html b/src/main/resources/static/dijit/themes/themeTester.html
new file mode 100644
index 0000000000000000000000000000000000000000..61c5bf8d1213f140fd803825135ebb030ad4e6bc
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/themeTester.html
@@ -0,0 +1,1360 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+
+<title>Dijit Theme Tester</title>
+
+<script type="text/javascript" src="../tests/boilerplate.js"></script>
+
+<script>
+	var startTime = new Date();
+</script>
+
+<style type="text/css">
+	html, body {
+		height: 100%;
+		width: 100%;
+		padding: 0;
+		border: 0;
+	}
+
+	#main {
+		height: 100%;
+		width: 100%;
+		border: 0;
+	}
+
+/***
+	Uncomment this rule to test border-box sizing
+	* {
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+***/
+
+	#header {
+		margin: 0;
+	}
+
+	#leftAccordion {
+		width: 25%;
+	}
+
+	#bottomTabs {
+		height: 40%;
+	}
+
+	#hs-1width {
+		width: 400px;
+		height: 40px;
+	}
+
+		/* pre-loader specific stuff to prevent unsightly flash of unstyled content */
+	#loader {
+		padding: 0;
+		margin: 0;
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: #ededed;
+		z-index: 999;
+		vertical-align: middle;
+	}
+
+	#loaderInner {
+		padding: 5px;
+		position: relative;
+		left: 0;
+		top: 0;
+		width: 175px;
+		background: #3c3;
+		color: #fff;
+	}
+
+	#indTestBar,
+	#setTestBar {
+		width: 400px;
+	}
+
+	hr.spacer {
+		border: 0;
+		background-color: #ededed;
+		width: 80%;
+		height: 1px;
+	}
+
+		/* rules used to test custom setting of TextBox padding */
+	.inputPadding0 .dijitInputField {
+		padding: 0 !important;
+	}
+
+	.inputPadding1 .dijitInputField {
+		padding: 1px !important;
+	}
+
+	.inputPadding2 .dijitInputField {
+		padding: 2px !important;
+	}
+
+	.inputPadding3 .dijitInputField {
+		padding: 3px !important;
+	}
+
+	.inputPadding4 .dijitInputField {
+		padding: 4px !important;
+	}
+
+	.inputPadding5 .dijitInputField {
+		padding: 5px !important;
+	}
+</style>
+
+<!-- a check for stray globals: not needed! -->
+<script type="text/javascript">
+	window.__globalList = {
+		// ignore globals created by this file
+		setBackground: true,
+		dojo: true,
+		dijit: true,
+		dojox: true,
+		showDialog: true,
+		showDialogAb: true,
+		setTextBoxPadding: true,
+		logStrayGlobals: true,
+		logWidgets: true, tearDown: true,
+		continentStore: true,
+		continentModel: true,
+		dom: true,
+		registry: true,
+		require: true,
+		dojoConfig: true
+	};
+
+	// ignore natural globals
+	for(var i in window){
+		window.__globalList[i] = true;
+	}
+</script>
+
+
+<script type="text/javascript">
+	require([
+		"dojo/_base/array", "dojo/_base/fx", "dojo/_base/window", "dojo/dom", "dojo/dom-class", "dojo/dom-geometry", "dojo/dom-style",
+		"dojo/hccss", "dojo/date/locale", "dojo/parser", "dojo/store/Memory",
+		"dijit/registry", "dijit/tree/ObjectStoreModel",
+
+		"dijit/CheckedMenuItem", "dijit/RadioMenuItem", "dijit/MenuSeparator",
+
+		// Editors used by InlineEditBox.  Must be pre-loaded.
+		"dijit/form/Textarea", "dijit/form/DateTextBox", "dijit/form/TimeTextBox", "dijit/form/FilteringSelect",
+
+		// These plugins are used by the Editor, and need to be pre-loaded
+		"dijit/_editor/plugins/LinkDialog", // for createLink
+		"dijit/_editor/plugins/FontChoice", // for fontName
+
+		// Modules referenced by the parser
+		"dijit/Menu", "dijit/PopupMenuItem", "dijit/ColorPalette", "dijit/layout/BorderContainer", "dijit/MenuBar",
+		"dijit/PopupMenuBarItem", "dijit/layout/AccordionContainer", "dijit/layout/ContentPane", "dijit/ConfirmTooltipDialog",
+		"dijit/Tree", "dijit/layout/TabContainer", "dijit/form/ComboButton", "dijit/form/ToggleButton",
+		"dijit/form/CheckBox", "dijit/form/RadioButton", "dijit/form/CurrencyTextBox", "dijit/form/NumberSpinner",
+		"dijit/form/Select", "dijit/Editor", "dijit/form/VerticalSlider", "dijit/form/VerticalRuleLabels",
+		"dijit/form/VerticalRule", "dijit/form/HorizontalSlider", "dijit/form/HorizontalRuleLabels",
+		"dijit/form/HorizontalRule", "dijit/TitlePane", "dijit/ProgressBar", "dijit/InlineEditBox", "dojo/dnd/Source",
+		"dijit/ConfirmDialog",
+			
+		// Don't call the parser until the DOM has finished loading
+		"dojo/domReady!"
+	], function(array, baseFx, win, dom, domClass, domGeom, domStyle, has, locale, parser, Memory, registry, ObjectStoreModel,
+			CheckedMenuItem, RadioMenuItem, MenuSeparator){
+		// If you are doing box-model sizing then need to tell dom-geometry, see #15104
+		if(domStyle.get(document.body, "boxSizing") == "border-box" ||
+				domStyle.get(document.body, "MozBoxSizing") == "border-box"){
+			domGeom.boxModel = "border-box";
+		}
+
+		// various function ripped out of inline script type=dojo/* blocks
+		showDialog = function(){
+			var dlg = registry.byId('dialog1');
+			dlg.show();
+			// avoid (trying to) restore focus to a closed menu, go to MenuBar instead
+			dlg._savedFocus = dom.byId("header");
+		};
+
+		showDialogAb = function(){
+			var dlg = registry.byId('dialogAB');
+			dlg.show();
+			// avoid (trying to) restore focus to a closed menu, go to MenuBar instead
+			dlg._savedFocus = dom.byId("header");
+		};
+
+		//var setTextBoxPadding;
+		// current setting (if there is one) to override theme default padding on TextBox based widgets
+		var currentInputPadding = "";
+
+		setTextBoxPadding = function(){
+			// summary:
+			//		Handler for when a MenuItem is clicked to set non-default padding for
+			//		TextBox widgets
+
+			// Effectively ignore clicks on the	 currently checked MenuItem
+			if(!this.get("checked")){
+				this.set("checked", true);
+			}
+
+			// val will be "theme default", "0px", "1px", ..., "5px"
+			var val = this.get("label");
+
+			// Set class on body to get requested padding, and remove any previously set class
+			if(currentInputPadding){
+				domClass.remove(win.body(), currentInputPadding);
+				currentInputPadding = "";
+			}
+			if(val != "theme default"){
+				currentInputPadding = "inputPadding" + val.replace("px", "");
+				domClass.add(win.body(), currentInputPadding);
+			}
+
+			// Clear previously checked MenuItem (radio-button effect).
+			array.forEach(this.getParent().getChildren(), function(mi){
+				if(mi != this){
+					mi.set("checked", false);
+				}
+			}, this);
+		};
+
+		logStrayGlobals = function(){
+			// summary:
+			//		Print all the global variables that we've created [by mistake] inside of dojo
+			var strayGlobals = [];
+			for(var i in window){
+				if(!window.__globalList[i]){
+					strayGlobals.push(i);
+				}
+			}
+			if(strayGlobals.length){
+				console.warn("Stray globals: " + strayGlobals.join(", "));
+			}
+		};
+
+		logWidgets = function(){
+			// summary:
+			//		Print all the widgets to console
+			console.log("Widgets in registry:");
+			registry.forEach(function(w){
+				console.log(w);
+			});
+		};
+
+		tearDown = function(){
+			// summary:
+			//		Destroy all widgets, top down, and then check for any orphaned widgets
+			registry._destroyAll();
+			logWidgets();
+		};
+
+		// Data for Tree, ComboBox, InlineEditBox
+		var data = [
+			{ id: "earth", name: "The earth", type: "planet", population: "6 billion"},
+			{ id: "AF", name: "Africa", type: "continent", population: "900 million", area: "30,221,532 sq km",
+				timezone: "-1 UTC to +4 UTC", parent: "earth"},
+			{ id: "EG", name: "Egypt", type: "country", parent: "AF" },
+			{ id: "KE", name: "Kenya", type: "country", parent: "AF" },
+			{ id: "Nairobi", name: "Nairobi", type: "city", parent: "KE" },
+			{ id: "Mombasa", name: "Mombasa", type: "city", parent: "KE" },
+			{ id: "SD", name: "Sudan", type: "country", parent: "AF" },
+			{ id: "Khartoum", name: "Khartoum", type: "city", parent: "SD" },
+			{ id: "AS", name: "Asia", type: "continent", parent: "earth" },
+			{ id: "CN", name: "China", type: "country", parent: "AS" },
+			{ id: "IN", name: "India", type: "country", parent: "AS" },
+			{ id: "RU", name: "Russia", type: "country", parent: "AS" },
+			{ id: "MN", name: "Mongolia", type: "country", parent: "AS" },
+			{ id: "OC", name: "Oceania", type: "continent", population: "21 million", parent: "earth"},
+			{ id: "AU", name: "Australia", type: "country", population: "21 million", parent: "OC"},
+			{ id: "EU", name: "Europe", type: "continent", parent: "earth" },
+			{ id: "DE", name: "Germany", type: "country", parent: "EU" },
+			{ id: "FR", name: "France", type: "country", parent: "EU" },
+			{ id: "ES", name: "Spain", type: "country", parent: "EU" },
+			{ id: "IT", name: "Italy", type: "country", parent: "EU" },
+			{ id: "NA", name: "North America", type: "continent", parent: "earth" },
+			{ id: "MX", name: "Mexico", type: "country", population: "108 million", area: "1,972,550 sq km",
+				parent: "NA" },
+			{ id: "Mexico City", name: "Mexico City", type: "city", population: "19 million", timezone: "-6 UTC", parent: "MX"},
+			{ id: "Guadalajara", name: "Guadalajara", type: "city", population: "4 million", timezone: "-6 UTC", parent: "MX" },
+			{ id: "CA", name: "Canada", type: "country", population: "33 million", area: "9,984,670 sq km", parent: "NA" },
+			{ id: "Ottawa", name: "Ottawa", type: "city", population: "0.9 million", timezone: "-5 UTC", parent: "CA"},
+			{ id: "Toronto", name: "Toronto", type: "city", population: "2.5 million", timezone: "-5 UTC", parent: "CA" },
+			{ id: "US", name: "United States of America", type: "country", parent: "NA" },
+			{ id: "SA", name: "South America", type: "continent", parent: "earth" },
+			{ id: "BR", name: "Brazil", type: "country", population: "186 million", parent: "SA" },
+			{ id: "AR", name: "Argentina", type: "country", population: "40 million", parent: "SA" }
+		];
+
+		// Create test store.
+		continentStore = new Memory({
+			data: data
+		});
+
+		// Since dojo.store.Memory doesn't have various store methods we need, we have to add them manually
+		continentStore.getChildren = function(object){
+			// Add a getChildren() method to store for the data model where
+			// children objects point to their parent (aka relational model)
+			return this.query({parent: this.getIdentity(object)});
+		};
+
+		// Create the model for the Tree
+		continentModel = new ObjectStoreModel({store: continentStore, query: {id: "earth"}});
+
+		var loadCompleteTime = +new Date();
+		console.log("Total load time: " + (loadCompleteTime - startTime) + "ms");
+
+		parser.parse(dom.byId('container')).then(function(){
+			console.info("Total parse time: " + (+new Date() - loadCompleteTime) + "ms");
+
+			dom.byId('loaderInner').innerHTML += " done.";
+			setTimeout(function hideLoader(){
+				baseFx.fadeOut({
+					node: 'loader',
+					duration: 500,
+					onEnd: function(n){
+						n.style.display = "none";
+					}
+				}).play();
+			}, 250);
+
+			logStrayGlobals();
+
+			// availableThemes[] is just a list of 'official' dijit themes, you can use ?theme=String
+			// for 'un-supported' themes, too. (eg: yours)
+			var availableThemes = [
+				{ theme: "claro", author: "Dojo", baseUri: "../themes/" },
+				{ theme: "tundra", author: "Dojo", baseUri: "../themes/" },
+				{ theme: "soria", author: "nikolai", baseUri: "../themes/" },
+				{ theme: "nihilo", author: "nikolai", baseUri: "../themes/" }
+			];
+
+			// Get current theme, a11y, and dir setting for page
+			var curTheme = location.search.replace(/.*theme=([a-z]+).*/, "$1") || "claro",
+				a11y = has("highcontrast") || /a11y=true/.test(location.search),
+				rtl = document.body.parentNode.dir == "rtl";
+			console.log("Theme: " + curTheme + ", high contrast = " + a11y + ", dir = " + (rtl ? "rtl" : "ltr"));
+
+			function setUrl(theme, rtl, a11y){
+				// Function to reload page with specified theme, rtl, and a11y settings
+				location.search = "?theme=" + theme + (rtl ? "&dir=rtl" : "") + (a11y ? "&a11y=true" : "");
+			}
+
+			// Create menu choices to test other themes
+			array.forEach(availableThemes, function(theme){
+				registry.byId('themeMenu').addChild(new RadioMenuItem({
+					id: theme.theme + "_radio",
+					label: theme.theme,
+					group: "theme",
+					checked: theme.theme == curTheme,
+					onClick: function(){
+						// Change theme, keep current a11y and rtl settings
+						setUrl(theme.theme, a11y, rtl);
+					}
+				}));
+			});
+			registry.byId('themeMenu').addChild(new MenuSeparator({}));
+			registry.byId('themeMenu').addChild(new CheckedMenuItem({
+				label: "RTL",
+				checked: rtl,
+				onChange: function(val){
+					// Keep current theme and a11y setting, but use new dir setting
+					setUrl(curTheme, val, a11y);
+				}
+			}));
+			registry.byId('themeMenu').addChild(new CheckedMenuItem({
+				label: "high contrast",
+				checked: a11y,
+				onChange: function(val){
+					// Keep current theme and dir setting, but use high-contrast (or not-high-contrast) setting
+					setUrl(curTheme, rtl, val);
+				}
+			}));
+
+			// It's the server's responsibility to localize the date displayed in the (non-edit) version of an InlineEditBox,
+			// but since we don't have a server we'll hack it in the client
+			registry.byId("backgroundArea").set('value', locale.format(new Date(2005, 11, 30), { selector: 'date' }));
+
+			var nineAm = new Date(0);
+			nineAm.setHours(9);
+			registry.byId("timePicker").set('value', locale.format(nineAm, { selector: 'time' }));
+		});
+	});
+</script>
+</head>
+<body class="claro">
+<!-- basic preloader: -->
+<div id="loader">
+	<div id="loaderInner" style="direction:ltr;">Loading themeTester ...</div>
+</div>
+
+<script type="dojo/require">
+	dom: "dojo/dom",
+	registry: "dijit/registry"
+</script>
+
+<!-- contentMenu popup -->                                                <!-- redundant display:none required here? -->
+<div data-dojo-type="dijit/Menu" id="submenu1" data-dojo-props='contextMenuForWindow:true, style:"display:none"'
+	 style="display: none;">
+	<div data-dojo-type="dijit/MenuItem"
+		 data-dojo-props="onClick:function(){ alert('Hello world'); }">Enabled Item
+	</div>
+	<div data-dojo-type="dijit/MenuItem" data-dojo-props="disabled:true">Disabled Item</div>
+	<div data-dojo-type="dijit/MenuSeparator"></div>
+	<div data-dojo-type="dijit/MenuItem"
+		 data-dojo-props="iconClass:'dijitIconCut', onClick: function(){ alert('not actually cutting anything. Just a test!'); }">
+		Cut
+	</div>
+	<div data-dojo-type="dijit/MenuItem"
+		 data-dojo-props="iconClass:'dijitIconCopy', onClick:function(){ alert('not actually copying anything, just a test!'); }">
+		Copy
+	</div>
+	<div data-dojo-type="dijit/MenuItem"
+		 data-dojo-props="iconClass:'dijitIconPaste', onClick: function(){ alert('not actually pasting anything, just a test!'); }">
+		Paste
+	</div>
+	<div data-dojo-type="dijit/MenuSeparator"></div>
+	<div data-dojo-type="dijit/PopupMenuItem">
+		<span>Enabled Submenu</span>
+
+		<div data-dojo-type="dijit/Menu" id="submenu2">
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="onClick: function(){ alert('Submenu 1!') }">Submenu
+				Item One
+			</div>
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="onClick: function(){ alert('Submenu 2!') }">Submenu
+				Item Two
+			</div>
+			<div data-dojo-type="dijit/PopupMenuItem">
+				<span>Deeper Submenu</span>
+
+				<div data-dojo-type="dijit/Menu" id="submenu4">
+					<div data-dojo-type="dijit/MenuItem" data-dojo-props="onClick:function(){alert('Sub-submenu 1!')}">
+						Sub-sub-menu Item One
+					</div>
+					<div data-dojo-type="dijit/MenuItem" data-dojo-props="onClick:function(){alert('Sub-submenu 2!')}">
+						Sub-sub-menu Item Two
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuItem" data-dojo-props="disabled:true">
+		<span>Disabled Submenu</span>
+
+		<div data-dojo-type="dijit/Menu" id="submenu3" style="display: none;">
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="onClick:function(){alert('Submenu 1!')}">Submenu Item
+				One
+			</div>
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="onClick:function(){alert('Submenu 2!')}">Submenu Item
+				Two
+			</div>
+		</div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuItem">
+		<span>Different popup</span>
+
+		<div data-dojo-type="dijit/ColorPalette"></div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuItem">
+		<span>Different popup</span>
+
+		<div data-dojo-type="dijit/Calendar"></div>
+	</div>
+</div>
+<!-- end contextMenu -->
+
+<div id="main" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props="liveSplitters:false, design:'sidebar'">
+
+<div id="header" data-dojo-type="dijit/MenuBar" data-dojo-props="region:'top'">
+	<div data-dojo-type="dijit/PopupMenuBarItem" id="file">
+		<span>File</span>
+
+		<div data-dojo-type="dijit/Menu" id="fileMenu">
+			<div data-dojo-type="dijit/MenuItem" id="globals" data-dojo-props="onClick: logStrayGlobals">Log globals
+			</div>
+			<div data-dojo-type="dijit/MenuItem" id="widgets" data-dojo-props="onClick: logWidgets">Log widgets</div>
+			<div data-dojo-type="dijit/MenuItem" id="destroy"
+				 data-dojo-props="iconClass:'dijitIconDelete', onClick:tearDown">Destroy All
+			</div>
+		</div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuBarItem" id="edit">
+		<span>Edit</span>
+
+		<div data-dojo-type="dijit/Menu" id="editMenu">
+			<div data-dojo-type="dijit/MenuItem" id="cut" data-dojo-props="
+						iconClass:'dijitIconCut',
+						onClick:function(){ console.log('not actually cutting anything, just a test!') }
+					">Cut
+			</div>
+			<div data-dojo-type="dijit/MenuItem" id="copy" data-dojo-props="
+						iconClass:'dijitIconCopy',
+						onClick: function(){ console.log('not actually copying anything, just a test!') }
+					">Copy
+			</div>
+			<div data-dojo-type="dijit/MenuItem" id="paste" data-dojo-props="iconClass:'dijitIconPaste',
+						onClick: function(){ console.log('not actually pasting anything, just a test!') }">Paste
+			</div>
+			<div data-dojo-type="dijit/MenuSeparator" id="separator"></div>
+			<div data-dojo-type="dijit/MenuItem" id="undo" data-dojo-props="iconClass:'dijitIconUndo'">Undo</div>
+		</div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuBarItem" id="view">
+		<span>View</span>
+
+		<div data-dojo-type="dijit/Menu" id="viewMenu">
+			<div data-dojo-type="dijit/MenuItem">Normal</div>
+			<div data-dojo-type="dijit/MenuItem">Outline</div>
+			<div data-dojo-type="dijit/PopupMenuItem">
+				<span>Zoom</span>
+
+				<div data-dojo-type="dijit/Menu" id="zoomMenu">
+					<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom'">50%</div>
+					<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom'">75%</div>
+					<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom', checked:true">100%</div>
+					<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom'">150%</div>
+					<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'zoom'">200%</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuBarItem" id="themes">
+		<span>Themes</span>
+
+		<div data-dojo-type="dijit/Menu" id="themeMenu"></div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuBarItem" id="dialogs">
+		<span>Dialogs</span>
+
+		<div data-dojo-type="dijit/Menu" id="dialogMenu">
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="onClick: showDialog">slow loading</div>
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="onClick: showDialogAb">action bar</div>
+		</div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuBarItem" id="inputPadding">
+		<span>TextBox Padding</span>
+
+		<div data-dojo-type="dijit/Menu" id="inputPaddingMenu">
+			<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'padding', onClick:setTextBoxPadding, checked:true">theme
+				default
+			</div>
+			<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'padding', onClick:setTextBoxPadding">0px</div>
+			<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'padding', onClick:setTextBoxPadding">1px</div>
+			<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'padding', onClick:setTextBoxPadding">2px</div>
+			<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'padding', onClick:setTextBoxPadding">3px</div>
+			<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'padding', onClick:setTextBoxPadding">4px</div>
+			<div data-dojo-type="dijit/RadioMenuItem" data-dojo-props="group:'padding', onClick:setTextBoxPadding">5px</div>
+		</div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuBarItem" id="help">
+		<span>Help</span>
+
+		<div data-dojo-type="dijit/Menu" id="helpMenu">
+			<div data-dojo-type="dijit/MenuItem">Help Topics</div>
+			<div data-dojo-type="dijit/MenuItem">About Dijit</div>
+		</div>
+	</div>
+	<div data-dojo-type="dijit/PopupMenuBarItem" data-dojo-props="disabled:true">
+		<span>Disabled</span>
+
+		<div data-dojo-type="dijit/Menu">
+			<div data-dojo-type="dijit/MenuItem">You should not see this</div>
+		</div>
+	</div>
+</div>
+
+<div data-dojo-type="dijit/layout/AccordionContainer" data-dojo-props="region:'leading', splitter:true, minSize:20"
+	 style="width: 300px;" id="leftAccordion">
+
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Popups and Alerts"'>
+		<div style="padding:8px">
+			<h2>Tooltips</h2>
+			<ul>
+				<li>
+					<span id="ttRich"><b>rich</b> <i>text</i> tooltip</span>
+					<span data-dojo-type="dijit/Tooltip" data-dojo-props="connectId:'ttRich'" style="display:none;">
+						Embedded <b>bold</b> <i>RICH</i> text <span
+							style="color:#309; font-size:x-large;">weirdness!</span>
+					</span>
+				</li>
+
+				<li><a id="ttOne" href='#bogus'>anchor tooltip</a>
+					<span data-dojo-type="dijit/Tooltip" data-dojo-props='connectId:"ttOne"' style="display:none;">tooltip on anchor</span>
+				</li>
+			</ul>
+
+			<table style="width: 100%;">
+				<tr>
+					<td></td>
+					<td>
+						<div id="ttBelow">tooltip below</div>
+						<div data-dojo-type="dijit/Tooltip"
+							 data-dojo-props="connectId:'ttBelow', position:['below-centered']"
+							 style="display:none; width: 100px;">I'm <i>below</i>!
+						</div>
+					</td>
+					<td></td>
+				</tr>
+				<tr>
+					<td>
+						<div id="ttRight">tooltip after</div>
+						<div data-dojo-type="dijit/Tooltip"
+							 data-dojo-props="connectId:'ttRight', position:['after-centered']" style="display:none;">
+							I'm on the <i>right</i>!<br>(or left on RTL systems)
+						</div>
+					</td>
+					<td></td>
+					<td>
+						<div id="ttLeft">tooltip before</div>
+						<div data-dojo-type="dijit/Tooltip"
+							 data-dojo-props="connectId:'ttLeft', position:['before-centered','after-centered']"
+							 style="display:none;">I'm on the <i>left</i>!<br>(or right on RTL systems)
+						</div>
+					</td>
+				</tr>
+				<tr>
+					<td></td>
+					<td>
+						<div id="ttAbove">tooltip above</div>
+						<div data-dojo-type="dijit/Tooltip"
+							 data-dojo-props="connectId:'ttAbove', position:['above-centered']" style="display:none;">
+							I'm <i>above</i>!
+						</div>
+					</td>
+					<td></td>
+				</tr>
+			</table>
+
+			<hr class="spacer">
+
+			<h2>Dialogs</h2>
+			<ul>
+				<li><a href="#" onclick="registry.byId('dialog1').show()">slow loading modal dialog</a></li>
+				<li><a href="#" onclick="registry.byId('dialogAB').show()">modal dialog w/action bar</a></li>
+			</ul>
+
+			<div data-dojo-type="dijit/form/DropDownButton">
+				<span>Show Tooltip Dialog</span>
+
+				<div data-dojo-type="dijit/ConfirmTooltipDialog" id="tooltipDlg" data-dojo-props='
+						title:"Enter Login information",
+						execute: function(){ alert("submitted w/args:\n" + dojo.toJson(arguments[0], true)); }
+					'>
+					<table>
+						<tr>
+							<td><label for="user">User:</label></td>
+							<td><input data-dojo-type="dijit/form/TextBox" type="text" id="user" name="user"></td>
+						</tr>
+						<tr>
+							<td><label for="pwd">Password:</label></td>
+							<td><input data-dojo-type="dijit/form/TextBox" type="password" id="pwd" name="pwd"></td>
+						</tr>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Tree"'>
+		<!-- tree widget -->
+		<div data-dojo-type="dijit/Tree"
+			 data-dojo-props="model: continentModel, query:{ type:'continent'}, label:'Continents', openOnClick:true"
+				></div>
+	</div>
+
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="title:'Rootless Tree'">
+		<div id="rootlessTree" data-dojo-type="dijit/Tree" data-dojo-props="
+					model:continentModel,
+					query:{ type:'continent' },
+					showRoot: false,
+					openOnClick:true
+				"></div>
+	</div>
+
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='selected:true, title:"Calendar"'>
+		<!-- calendar widget pane -->
+		<input id="calendar1" data-dojo-type="dijit/Calendar">
+	</div>
+
+	<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Color Picker"'>
+		<p>
+			Selecting a color will change the background color of the page.
+			Use this to test how tooltips and drop downs appear with different backgrounds.
+		</p>
+
+		<h2 class="testHeader">3x4</h2>
+		<script>
+			function setBackground(color){
+				dojo.query('.dijitAccordionBody').style('background', color);
+				dojo.query('.dijitTabPaneWrapper').style('background', color);
+			}
+		</script>
+		<div data-dojo-type="dijit/ColorPalette" data-dojo-props="palette:'3x4', onChange:setBackground"></div>
+		<h2 class="testHeader">7x10</h2>
+
+		<div data-dojo-type="dijit/ColorPalette" data-dojo-props="onChange:setBackground"></div>
+	</div>
+</div>
+<!-- end AccordionContainer -->
+
+<!-- top tabs (marked as "center" to take up the main part of the BorderContainer) -->
+<div data-dojo-type="dijit/layout/TabContainer" data-dojo-props="region:'center', tabStrip:true" id="topTabs">
+
+<div id="basicFormTab" data-dojo-type="dijit/layout/ContentPane"
+	 data-dojo-props="title:'Basic Form Widgets', style:'padding:10px;display:none;'">
+
+	<h2>Buttons</h2>
+
+	<p>Buttons can do an action, display a menu, or both:</p>
+
+	Enabled:
+
+	<button data-dojo-type="dijit/form/Button"
+			data-dojo-props="iconClass:'dijitIconTask', onClick:function(){ console.debug('clicked simple') }">
+		Simple
+	</button>
+
+	<div data-dojo-type="dijit/form/DropDownButton" data-dojo-props="iconClass:'dijitIconEdit'">
+		<span>Drop Down</span>
+
+		<div data-dojo-type="dijit/Menu" id="editMenu1" style="display: none;">
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="
+							iconClass:'dijitIconCut',
+							onClick:function(){ console.debug('not actually cutting anything, just a test!') }
+						">Cut
+			</div>
+
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="
+							iconClass:'dijitIconCopy',
+							onClick:function(){ console.debug('not actually copying anyything, just a test!'); }
+						">Copy
+			</div>
+
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="
+							iconClass:'dijitIconPaste',
+							onClick:function(){ console.debug('not actually pasting anyything, just a test!'); }
+						">Paste
+			</div>
+		</div>
+	</div>
+
+	<div data-dojo-type="dijit/form/ComboButton"
+		 data-dojo-props='iconClass:"dijitIconSave", optionsTitle:"save options", onClick:function(){ console.log("clicked combo save"); }'>
+		<span>Combo</span>
+
+		<div data-dojo-type="dijit/Menu" id="saveMenu1" style="display: none;">
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="
+							iconClass:'dijitIconSave',
+							onClick: function(){ console.debug('not actually saving anything, just a test!') }
+						">Save
+			</div>
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="
+							onClick: function(){ console.debug('not actually saving anything, just a test!') }
+						">Save As
+			</div>
+		</div>
+	</div>
+
+	<div data-dojo-type="dijit/form/ToggleButton" data-dojo-props="
+					checked:true, 
+					onChange: function(a){ console.log('toggle button checked=' + a); }, iconClass:'dijitCheckBoxIcon'
+				"> Toggle
+	</div>
+
+	<hr class="spacer">
+
+	Disabled:
+
+	<button data-dojo-type="dijit/form/Button" data-dojo-props='iconClass:"dijitIconTask", disabled:true' disabled>
+		Simple
+	</button>
+
+	<div data-dojo-type="dijit/form/DropDownButton" data-dojo-props='iconClass:"dijitIconEdit", disabled:true'>
+		<span>Drop Down</span>
+		<ul data-dojo-type="dijit/Menu" id="editMenu2" style="display: none;">
+			<li data-dojo-type="dijit/MenuItem" data-dojo-props="
+							iconClass:'dijitIconCut',
+							onClick: function(){ console.debug('not actually cutting anything, just a test!') }
+						">Cut
+			</li>
+
+			<li data-dojo-type="dijit/MenuItem" data-dojo-props="
+							iconClass:'dijitIconCopy',
+							onClick: function(){ console.debug('not actually copying anything, just a test!') }
+						">Copy
+			</li>
+
+			<li data-dojo-type="dijit/MenuItem" data-dojo-props="
+							iconClass:'dijitIconPaste',
+							onClick: function(){ console.debug('not actually pasting anything, just a test!') }
+						">Paste
+			</li>
+		</ul>
+	</div>
+
+	<div data-dojo-type="dijit/form/ComboButton"
+		 data-dojo-props="iconClass:'dijitIconSave', optionsTitle:'save options', disabled:true">
+		<span>Combo</span>
+
+		<div data-dojo-type="dijit/Menu" id="saveMenu2" style="display: none;">
+			<div data-dojo-type="dijit/MenuItem" data-dojo-props="
+							iconCLass:'dijitIconSave',
+							onClick:function(){ console.log('not actually saving anything, just a test!' ); }
+						">Save
+			</div>
+			<div data-dojo-type="dijit/MenuItem"
+				 onClick="console.debug('not actually saving anything, just a test!')">
+				Save As
+			</div>
+		</div>
+	</div>
+
+	<button data-dojo-type="dijit/form/ToggleButton"
+			data-dojo-props="checked:true, disabled:true, iconClass:'dijitCheckBoxIcon'">
+		Toggle
+	</button>
+
+	<hr class="spacer">
+
+	<h2>CheckBox</h2>
+	<fieldset>
+		<input id="check1" type="checkBox" data-dojo-type="dijit/form/CheckBox">
+		<label for="check1">unchecked</label>
+
+		<input id="check2" type="checkBox" data-dojo-type="dijit/form/CheckBox" data-dojo-props="checked:true"
+			   checked="checked">
+		<label for="check2">checked</label>
+
+		<input id="check3" type="checkBox" data-dojo-type="dijit/form/CheckBox" data-dojo-props='disabled:true'
+			   disabled>
+		<label for="check3">disabled</label>
+
+		<input id="check4" type="checkBox" data-dojo-type="dijit/form/CheckBox"
+			   data-dojo-props='disabled:true, checked:true' checked="checked" disabled>
+		<label for="check4">disabled and checked</label>
+	</fieldset>
+
+	<h2>Radio Buttons</h2>
+	<fieldset>
+		<input type="radio" name="g1" id="g1rb1" value="news" data-dojo-type="dijit/form/RadioButton">
+		<label for="g1rb1">news</label>
+		<input type="radio" name="g1" id="g1rb2" value="talk" data-dojo-type="dijit/form/RadioButton"
+			   data-dojo-props='checked:true' checked>
+		<label for="g1rb2">talk</label>
+		<input type="radio" name="g1" id="g1rb3" value="weather" data-dojo-type="dijit/form/RadioButton"
+			   data-dojo-props='disabled:true' disabled>
+		<label for="g1rb3">weather <span dir="ltr">(disabled)</span></label>
+	</fieldset>
+</div>
+<!-- end of basic form widgets -->
+
+<div id="textboxTab" data-dojo-type="dijit/layout/ContentPane"
+	 data-dojo-props='title:"Text Input Widgets", style:"padding:10px;display:none;"'>
+
+	<h2>dijit/form/DateTextBox</h2>
+	<label for="date1">Enabled w/placeHolder:</label>
+	<input id="date1" name="date1" type="text" data-dojo-type="dijit/form/DateTextBox"
+		   data-dojo-props="placeHolder:'Birthday'">
+	<label for="date2">Disabled w/placeHolder:</label>
+	<input id="date2" name="date2" type="text" data-dojo-type="dijit/form/DateTextBox"
+		   data-dojo-props='placeHolder:"Birthday", disabled:true'>
+	<label for="date2">Disabled w/value:</label>
+	<input id="date3" name="date3" type="text" data-dojo-type="dijit/form/DateTextBox"
+		   data-dojo-props='value:"2008-12-25", disabled:true'>
+
+	<h2>dijit/form/TimeTextBox</h2>
+	<label for="time1">Enabled:</label>
+	<input id="time1" name="time1" type="text" data-dojo-type="dijit/form/TimeTextBox" value="T17:45:00">
+	<label for="time2">Disabled:</label>
+	<input id="time2" name="time2" type="text" data-dojo-type="dijit/form/TimeTextBox" value="T17:45:00"
+		   data-dojo-props='disabled:true' disabled>
+
+	<h2>dijit/form/CurrencyTextBox</h2>
+	<label for="currency1">Enabled:</label>
+	<input id="currency1" type="text" name="income1" value="54775.53" data-dojo-type="dijit/form/CurrencyTextBox"
+		   data-dojo-props="
+						required:true, constraints:{ fractional:true }, currency:'USD',
+						value:54775.53,
+						invalidMessage:'Invalid amount.	 Include dollar sign, commas, and cents.  Cents are mandatory.'
+				">
+	<label for="currency2">Disabled:</label>
+	<input id="currency2" type="text" name="income1" value="54775.53"
+		   data-dojo-type="dijit/form/CurrencyTextBox" data-dojo-props="required:true, constraints:{ fractional:true },
+						currency:'USD', invalidMessage:'Invalid amount.	 Include dollar sign, commas, and cents.  Cents are mandatory.',
+						disabled:true
+				">
+
+	<hr class="spacer">
+
+	<h2>dijit/form/NumberSpinner max=100</h2>
+	<label for="spinner1">Enabled: </label>
+	<input data-dojo-type="dijit/form/NumberSpinner" data-dojo-props='constraints:{max:100,places:0}, value:10'
+		   id="spinner1">
+	<label for="spinner2">Disabled: </label>
+	<input data-dojo-type="dijit/form/NumberSpinner"
+		   data-dojo-props='constraints:{max:100,places:0}, value:10, disabled:true' id="spinner2">
+
+</div>
+
+<div id="selectTab" data-dojo-type="dijit/layout/ContentPane"
+	 data-dojo-props="title:'Select Widgets', style:'padding:10px;display:none;'">
+
+	<h2>dijit/form/Select</h2>
+
+	<span id="l_selectEnabled">Enabled:</span>
+	<div id="selectEnabled" data-dojo-type="dijit/form/Select" value="AK" aria-labelledby="l_selectEnabled">
+		<span data-dojo-value="AL"><b>Alabama</b></span>
+		<span data-dojo-value="AK"><span style="color:red">A</span><span style="color:orange">l</span><span
+				style="color:yellow">a</span><span style="color:green">s</span><span style="color:blue">k</span><span
+				style="color:purple">a</span></span>
+		<span data-dojo-value="AZ"><i>Arizona</i></span>
+		<span data-dojo-value="AR"><span class="ark">Arkansas</span></span>
+		<span data-dojo-value="CA"><span style="font-size:25%">C</span><span style="font-size:50%">a</span><span
+				style="font-size:75%">l</span><span style="font-size:90%">i</span><span
+				style="font-size:100%">f</span><span style="font-size:125%">o</span><span
+				style="font-size:133%">r</span><span style="font-size:150%">n</span><span
+				style="font-size:175%">i</span><span style="font-size:200%">a</span></span>
+		<span data-dojo-value="NM">New<br>&nbsp;&nbsp;Mexico</span>
+	</div>
+
+	<span id="l_selectDisabled">Disabled:</span>
+	<div id="selectDisabled" data-dojo-type="dijit/form/Select" value="AK" disabled aria-labelledby="l_selectDisabled">
+		<span data-dojo-value="AL"><b>Alabama</b></span>
+		<span data-dojo-value="AK"><span style="color:red">A</span><span style="color:orange">l</span><span
+				style="color:yellow">a</span><span style="color:green">s</span><span style="color:blue">k</span><span
+				style="color:purple">a</span></span>
+		<span data-dojo-value="AZ"><i>Arizona</i></span>
+		<span data-dojo-value="AR"><span class="ark">Arkansas</span></span>
+		<span data-dojo-value="CA"><span style="font-size:25%">C</span><span style="font-size:50%">a</span><span
+				style="font-size:75%">l</span><span style="font-size:90%">i</span><span
+				style="font-size:100%">f</span><span style="font-size:125%">o</span><span
+				style="font-size:133%">r</span><span style="font-size:150%">n</span><span
+				style="font-size:175%">i</span><span style="font-size:200%">a</span></span>
+		<span data-dojo-value="NM">New<br>&nbsp;&nbsp;Mexico</span>
+	</div>
+
+	<hr class="spacer">
+
+	<h2>dijit/form/FilteringSelect</h2>
+	<label for="filteringSelect">Enabled w/placeHolder: </label>
+	<input id="filteringSelect" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="
+					placeHolder:'place',
+					store:continentStore,
+					searchAttr:'name',
+					name:'state2'
+				">
+
+	<label for="filteringSelect2">Disabled w/placeHolder: </label>
+	<input id="filteringSelect2" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="
+					disabled:true, store:continentStore, name:'state2', searchAttr:'name'
+				">
+
+	<label for="filteringSelect3">Disabled w/value: </label>
+	<input id="filteringSelect3" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="
+					store: continentStore, searchAttr:'name', disabled:true, value:'CA'
+				">
+
+</div>
+
+<div id="textareaTab" data-dojo-type="dijit/layout/ContentPane"
+	 data-dojo-props='title:"Textarea", style:"padding:10px;"'>
+
+	<!--	&#8234; and &#8236; are inserted solely for testing purposes to mark the beginning and end of left-to-right text so that
+		cogniscent browsers don't render garbled punctuation nor exhibit strange home/end key behavior while in right-to-left mode -->
+	<h2>dijit/form/Textarea</h2>
+
+	<p>Enabled:</p>
+	<textarea data-dojo-type="dijit/form/Textarea" data-dojo-props='name:"areText"' name="areText">This text area will
+		expand and contract as you type &#8234;text.&#8236;
+
+		Lorem ipsum dolor sit &#8234;amet,&#8236;
+		consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet
+		dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci
+		tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo &#8234;consequat.&#8236;
+	</textarea>
+
+	<br>
+
+	<p>Disabled:</p>
+	<textarea data-dojo-type="dijit/form/Textarea" data-dojo-props="disabled: true">This text
+		area is disabled and you shouldn't be able to type in &#8234;it.&#8236;
+	</textarea>
+
+
+	<h2>dijit/form/SimpleTextarea</h2>
+
+	<p></p>
+
+	<p>Enabled:</p>
+	<textarea data-dojo-type="dijit/form/SimpleTextarea">This text area has a constant height and displays a scrollbar
+		when &#8234;necessary.&#8236;
+
+		Lorem ipsum dolor sit &#8234;amet,&#8236;
+		consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet
+		dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci
+		tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis
+		autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie &#8234;consequat,&#8236;
+		vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio
+		dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait
+		nulla &#8234;facilisi.&#8236;
+	</textarea>
+
+	<p>Disabled:</p>
+	<textarea data-dojo-type="dijit/form/SimpleTextarea" data-dojo-props="disabled: true">Lorem ipsum dolor sit &#8234;amet,&#8236;
+		consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet
+		dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci
+		tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis
+		autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie &#8234;consequat,&#8236;
+		vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio
+		dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait
+		nulla &#8234;facilisi.&#8236;
+	</textarea>
+</div>
+<!-- end of Textarea tab -->
+
+<div id="editorTab" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Editor", style:"padding:10px;"'>
+	<p>Enabled:</p>
+	<!-- FIXME:
+		set height on this node to size the whole editor, but causes the tab to not scroll
+		until you select another tab and come back. alternative is no height: here, but that
+		causes editor to become VERY tall, and size to a normal height when selected (like the
+		dijit/form/TextArea in "Form Feel" Tab), but in reverse. refs #3980 and is maybe new bug?
+	-->
+	<div data-dojo-type="dijit/Editor"
+		 data-dojo-props="height:175, extraPlugins:['|', 'createLink', 'fontName'], styleSheets:'../themes/claro/document.css'">
+		<ul>
+			<li>Lorem <a href="http://dojotoolkit.org">and a link</a>, what do you think?</li>
+			<li>This is the Editor with a Toolbar attached.</li>
+		</ul>
+	</div>
+	<p>Disabled:</p>
+
+	<div data-dojo-type="dijit/Editor"
+		 data-dojo-props="height:175, extraPlugins:['|', 'createLink', 'fontName'], styleSheets:'../themes/claro/document.css', disabled:true">
+		<ul>
+			<li>Lorem <a href="http://dojotoolkit.org">and a link</a>, what do you think?</li>
+			<li>This is the Editor with a Toolbar attached.</li>
+		</ul>
+	</div>
+</div>
+<!-- end of Editor tab -->
+
+
+<div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="title:'Sliders', style:'padding:10px;display:none;'">
+
+	<!-- Sliders: -->
+
+	<h2>Enabled</h2>
+
+	<div style="float:right;">
+		<div id='slider2' data-dojo-type="dijit/form/VerticalSlider" data-dojo-props="
+						onChange: function(a){ dom.byId('slider2input').value = a; },
+						value:10, maximum:100, minimum:0, discreetValues:11, style:'height:176px; clear:both'
+					">
+			<ol data-dojo-type="dijit/form/VerticalRuleLabels"
+				data-dojo-props="container:'leftDecoration', style:'width:2em;', labelStyle:'right:0px;'">
+				<li>0
+				<li>100
+			</ol>
+
+			<div data-dojo-type="dijit/form/VerticalRule"
+				 data-dojo-props="container:'leftDecoration', style:'width:5px;', count:11"></div>
+			<div data-dojo-type="dijit/form/VerticalRule"
+				 data-dojo-props="container:'rightDecoration', style:'width:5px;', count:11"></div>
+			<ol data-dojo-type="dijit/form/VerticalRuleLabels"
+				data-dojo-props="container:'rightDecoration', style:'width:2em;', maximum:100, count:6, numericMargin:1, constraints:{ pattern:'#' }"></ol>
+		</div>
+		<br> Slider2 Value:<input disabled id="slider2input" size="3" value="10" autocomplete="off">
+	</div>
+
+	<div id="horizontal1" data-dojo-type="dijit/form/HorizontalSlider" data-dojo-props="
+					value:10, maximum:100, minimum:0, showButtons:false, intermediateChanges:true, style:'width:50%; height:20px',
+					onChange: function(a){ dom.byId('slider1input').value = dojo.number.format(a / 100, { places:1, pattern:'#%' }) }
+				">
+		<ol data-dojo-type="dijit/form/HorizontalRuleLabels"
+			data-dojo-props='container:"topDecoration", style:"height:1.2em;font-size:75%;", numericMargin:1, count:6'></ol>
+		<div data-dojo-type="dijit/form/HorizontalRule"
+			 data-dojo-props='container:"topDecoration", count:11, style:"height:5px;"'></div>
+		<div data-dojo-type="dijit/form/HorizontalRule"
+			 data-dojo-props='container:"bottomDecoration", count:5, style:"height:5px;"'></div>
+		<ol data-dojo-type="dijit/form/HorizontalRuleLabels"
+			data-dojo-props='container:"bottomDecoration", style:"height:1em;font-size:75%;"'>
+			<li>lowest
+			<li>normal
+			<li>highest
+		</ol>
+	</div>
+	<br>Value: <input disabled id="slider1input" size="5" value="10.0%" autocomplete="off">
+
+	<div id="horizontal2" data-dojo-type="dijit/form/HorizontalSlider" data-dojo-props="
+					minimum:1, value:2, maximum:3, discreteValues:3, showButtons:false, intermediateChanges:true,
+					style:'width:300px; height:40px'
+				">
+		<div data-dojo-type="dijit/form/HorizontalRule"
+			 data-dojo-props='container:"bottomDecoration", count:3, style:"height:5px;"'></div>
+		<ol data-dojo-type="dijit/form/HorizontalRuleLabels"
+			data-dojo-props='container:"bottomDecoration", style:"height:1em;font-size:75%;"'>
+			<li><img width=10 height=10 src="../tests/images/note.gif"><br><span style="font-size: small">small</span>
+			<li><img width=15 height=15 src="../tests/images/note.gif"><br><span style="font-size: medium">medium</span>
+			<li><img width=20 height=20 src="../tests/images/note.gif"><br><span style="font-size: large">large</span>
+		</ol>
+	</div>
+
+	<h2 style="clear:both">Disabled</h2>
+
+	<div style="float:right;">
+		<div data-dojo-type="dijit/form/VerticalSlider" data-dojo-props="
+						value:10, maximum:100, minimum:0, discreteValues:11, 
+						style:'height:175px; clear:both', disabled:true
+					">
+			<ol data-dojo-type="dijit/form/VerticalRuleLabels"
+				data-dojo-props='container:"leftDecoration", style:"width:2em;", labelStyle:"right:0px;"'>
+				<li>0
+				<li>100
+			</ol>
+
+			<div data-dojo-type="dijit/form/VerticalRule"
+				 data-dojo-props='container:"leftDecoration", count:11, style:"width:5px;"'></div>
+			<div data-dojo-type="dijit/form/VerticalRule"
+				 data-dojo-props='container:"rightDecoration", count:11, style:"width:5px;"'></div>
+			<ol data-dojo-type="dijit/form/VerticalRuleLabels"
+				data-dojo-props='container:"rightDecoration", style:"width:2em;", maximum:100, count:6, numericMargin:1, constraints:{ pattern:"#"}'></ol>
+		</div>
+	</div>
+
+	<div data-dojo-type="dijit/form/HorizontalSlider" id="hs-1width" data-dojo-props="
+					value:10, maximum:100, minimum:0, showButtons:false, intermediateChanges:true, disabled:true
+				">
+		<ol data-dojo-type="dijit/form/HorizontalRuleLabels"
+			data-dojo-props='container:"topDecoration", style:"height:1.2em;font-size:75%;", numericMargin:1, count:6'></ol>
+		<div data-dojo-type="dijit/form/HorizontalRule"
+			 data-dojo-props='container:"topDecoration", count:11, style:"height:5px;"'></div>
+		<div data-dojo-type="dijit/form/HorizontalRule"
+			 data-dojo-props='container:"bottomDecoration", count:5, style:"height:5px;"'></div>
+		<ol data-dojo-type="dijit/form/HorizontalRuleLabels"
+			data-dojo-props='container:"bottomDecoration", style:"height:1em;font-size:75%;"'>
+			<li>lowest
+			<li>normal
+			<li>highest
+		</ol>
+	</div>
+
+	<div data-dojo-type="dijit/form/HorizontalSlider" data-dojo-props="
+					minimum:1, value:2, maximum:3, discreteValues:3, showButtons:false, intermediateChanges:true,
+					style:'width:300px; height:40px', disabled:true
+				">
+		<div data-dojo-type="dijit/form/HorizontalRule"
+			 data-dojo-props='container:"bottomDecoration", count:3, style:"height:5px;"'></div>
+		<ol data-dojo-type="dijit/form/HorizontalRuleLabels"
+			data-dojo-props='container:"bottomDecoration", style:"height:1em;font-size:75%;"'>
+			<li><img width=10 height=10 src="../tests/images/note.gif"><br><span style="font-size: small">small</span>
+			<li><img width=15 height=15 src="../tests/images/note.gif"><br><span style="font-size: medium">medium</span>
+			<li><img width=20 height=20 src="../tests/images/note.gif"><br><span style="font-size: large">large</span>
+		</ol>
+	</div>
+</div>
+
+<div id="variousTab" data-dojo-type="dijit/layout/ContentPane"
+	 data-dojo-props='title:"Various Dijits", style:"padding:10px; display:none;"'>
+
+	<h2>TitlePane</h2>
+
+	<div data-dojo-type="dijit/TitlePane" data-dojo-props="title:'my pane', width:275">
+		<p>This is a title pane. It can be expanded and collapsed.</p>
+
+		<p>Sed sollicitudin suscipit risus. Nam
+			ullamcorper. Sed nisl lectus, pellentesque nec,
+			malesuada eget, ornare a, libero. Lorem ipsum dolor
+			sit amet, consectetuer adipiscing elit.</p>
+
+	</div>
+	<!-- end title pane -->
+
+	<hr class="spacer">
+
+	<h2>ProgressBar</h2>
+
+	<div data-dojo-props="maximum:200, value:20" id="setTestBar" data-dojo-type="dijit/ProgressBar"></div>
+
+	Indeterminate:
+	<div id="indTestBar" data-dojo-props="indeterminate:true" data-dojo-type="dijit/ProgressBar"></div>
+
+</div>
+<!-- end:various dijits upper tab -->
+
+<div id="InlineEditBoxTab" data-dojo-type="dijit/layout/ContentPane"
+	 data-dojo-props='title:"InlineEditBox", style:"padding:10px;"'>
+
+	<h2 class="testTitle">dijit/InlineEditBox + dijit/form/TextBox on &lt;h3&gt;</h2>
+
+	(HTML before)
+	<h3 id="editable" style="font-size:larger;" data-dojo-type="dijit/InlineEditBox">
+		Edit me - I trigger the onChange callback
+	</h3>
+	(HTML after)
+
+	<hr class="spacer">
+
+	<h2>dijit/InlineEditBox + dijit/form/Textarea</h2>
+
+	(HTML before)
+	<p id="areaEditable" data-dojo-type="dijit/InlineEditBox"
+	   data-dojo-props='editor: "dijit/form/Textarea", autoSave:false'>
+		I'm one big &#8234;paragraph.&#8236; Go ahead and edit &#8234;me.&#8236; I dare &#8234;you.&#8236;
+		The quick brown fox jumped over the lazy &#8234;dog.&#8236; Blah blah blah blah blah blah &#8234;blah ...&#8236;
+	</p>
+	(HTML after)
+
+	<p>
+		These links will
+		<a href="#" onclick="registry.byId('areaEditable').set('disabled', true)">disable</a> /
+		<a href="#" onclick="registry.byId('areaEditable').set('disabled', false)">enable</a>
+		the text area above.
+	</p>
+
+	<hr class="spacer">
+
+	<h2>dijit/form/DateTextBox</h2>
+
+	(HTML inline before)
+	<!-- set programmatically to match locale; a server might generate this content also. -->
+	<span id="backgroundArea" data-dojo-type="dijit/InlineEditBox"
+		  data-dojo-props="editor: 'dijit/form/DateTextBox', width:'170px'"></span>
+	(HTML after)
+	<hr class="spacer">
+
+	<h2>dijit/form/TimeTextBox</h2>
+
+	(HTML inline before)
+	<!-- set programmatically to match (; a server might generate this content also. -->
+	<span id="timePicker" data-dojo-type="dijit/InlineEditBox"
+		  data-dojo-props='editor: "dijit/form/TimeTextBox", width:"150px"'></span>
+	(HTML after)
+
+	<hr class="spacer">
+
+
+	<h2>dijit/form/FilteringSelect + Inline + remote data store</h2>
+	(HTML inline before)
+				<span id="backgroundArea2" data-dojo-type="dijit/InlineEditBox" data-dojo-props='
+					editor: "dijit/form/FilteringSelect",
+					editorParams:{ store: continentStore, autoComplete: true, promptMessage: "Please enter a place"},
+					width:"300px"
+				'>The earth</span>
+	(HTML after)
+
+</div>
+<!-- end InlineEditBox tab -->
+
+<div id="dndTab" data-dojo-type="dijit/layout/ContentPane"
+	 data-dojo-props='title:"DnD", style:"padding:10px; display:none;"'>
+	<div style="float:left; margin:5px;">
+		<h3>Vertical Source</h3>
+
+		<div data-dojo-type="dojo/dnd/Source" style="border:3px solid #ccc; padding: 1em 3em; ">
+			<div class="dojoDndItem">Item <strong>X</strong></div>
+			<div class="dojoDndItem">Item <strong>Y</strong></div>
+			<div class="dojoDndItem">Item <strong>Z</strong></div>
+		</div>
+	</div>
+	<div style="float:left; margin:5px; ">
+		<h3>Horizontal</h3>
+
+		<div data-dojo-type="dojo/dnd/Source" data-dojo-props="horizontal: true"
+			 style="border:3px solid #ccc; padding: 1em 3em; ">
+			<div class="dojoDndItem">Item <strong>1</strong></div>
+			<div class="dojoDndItem">Item <strong>2</strong></div>
+			<div class="dojoDndItem">Item <strong>3</strong></div>
+		</div>
+	</div>
+</div>
+<!-- end DnD tab -->
+
+<div data-dojo-type="dijit/layout/TabContainer"
+	 data-dojo-props="closable:true, title:'Nested TabContainer', nested:true" id="inlined">
+	<div data-dojo-type="dijit/layout/ContentPane" id="tab1href"
+		 href='../tests/layout/tab1.html' title="SubTab 1"></div>
+	<div data-dojo-type="dijit/layout/ContentPane" id="tab2href"
+		 href='../tests/layout/tab2.html' title="SubTab 2"></div>
+	<div data-dojo-type="dijit/layout/ContentPane" id="subtab3" title="SubTab 3">
+		<h1>I am tab 3, inlined.</h1>
+	</div>
+	<div data-dojo-type="dijit/layout/ContentPane" id="subtab4"  title="SubTab 4">
+		<h1>I am tab 4, inlined.</h1>
+	</div>
+</div>
+
+<div id="closableTab" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Closable",
+				style:"display:none; padding:10px;", closable:true'>
+	This pane is closable, just for the icon ...
+</div>
+</div>
+<!-- end of region="center" TabContainer -->
+
+<!-- bottom right tabs -->
+<div data-dojo-type="dijit/layout/TabContainer" id="bottomTabs"
+	 data-dojo-props="
+				tabPosition:'bottom', selectedchild:'btab1', region:'bottom',
+				splitter:true, tabStrip:true
+			">
+	<!-- btab 1 -->
+	<div id="btab1" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Info", style:" padding:10px; "'>
+		<p>You can explore this single page after applying a Theme
+			for use in creation of your own theme.</p>
+
+		<p>I am whole slew of Widgets on a page. Jump to <a href="../tests/">dijit tests</a> to
+			test individual components.</p>
+
+		<p>There is a right-click [context] pop-up menu here, as well.</p>
+	</div>
+	<!-- end:info btab1 -->
+
+	<div id="btab2" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='title:"Bottom 2", closable:true'>
+		<p>I am the last Tab</p>
+
+		<div id="dialog2" data-dojo-type="dijit/Dialog" data-dojo-props='title:"Encased Dialog", style:"display:none;"'>
+			I am the second dialog. I am
+			parented by the Low Tab Pane #3
+		</div>
+	</div>
+	<!-- btab2 -->
+
+</div>
+<!-- end Bottom TabContainer -->
+
+</div>
+<!-- end of BorderContainer -->
+
+<!-- dialog in body -->
+<div id="dialog1" data-dojo-type="dijit/ConfirmDialog" style="display:none;" data-dojo-props="
+		title:'Floating Modal Dialog from href',
+		href:'../tests/layout/getResponse.php?delay=3000&amp;messId=3',
+		style: 'width: 400px;',
+		refreshOnShow:true
+	"></div>
+<div id="dialogAB" data-dojo-type="dijit/ConfirmDialog" data-dojo-props="title:'Floating Modal Dialog'" style="display:none;">
+	<table>
+		<tr>
+			<td><label for="name">Name: </label></td>
+			<td><input data-dojo-type="dijit/form/TextBox" type="text" name="name" id="name"></td>
+		</tr>
+		<tr>
+			<td><label for="loc">Location: </label></td>
+			<td><input data-dojo-type="dijit/form/TextBox" type="text" name="loc" id="loc"></td>
+		</tr>
+		<tr>
+			<td><label for="date">Date: </label></td>
+			<td><input data-dojo-type="dijit/form/DateTextBox" type="text" name="date" id="date"></td>
+		</tr>
+	</table>
+</div>
+
+</body>
+</html>
diff --git a/src/main/resources/static/dijit/themes/themeTesterImages/blackButtonEnabled.gif b/src/main/resources/static/dijit/themes/themeTesterImages/blackButtonEnabled.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9174efda3730e94ae92dafb5672db26db0e5d758
Binary files /dev/null and b/src/main/resources/static/dijit/themes/themeTesterImages/blackButtonEnabled.gif differ
diff --git a/src/main/resources/static/dijit/themes/themeTesterImages/blackButtonHover.gif b/src/main/resources/static/dijit/themes/themeTesterImages/blackButtonHover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..16f087cdaf0a7846d95e7c2f412970f877a009d5
Binary files /dev/null and b/src/main/resources/static/dijit/themes/themeTesterImages/blackButtonHover.gif differ
diff --git a/src/main/resources/static/dijit/themes/themeTesterQuirk.html b/src/main/resources/static/dijit/themes/themeTesterQuirk.html
new file mode 100644
index 0000000000000000000000000000000000000000..8414143654d61eb4accbbe09ec3edee0f2ce5c95
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/themeTesterQuirk.html
@@ -0,0 +1,5 @@
+<html>
+<head>
+<script type="text/javascript" src="../tests/_loadTest.js" file="themeTester.html"></script>
+</head>
+</html>
diff --git a/src/main/resources/static/dijit/themes/tundra/Calendar.css b/src/main/resources/static/dijit/themes/tundra/Calendar.css
new file mode 100644
index 0000000000000000000000000000000000000000..0aea25f8376601545243fb1d18c36c503eb8c3d6
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Calendar.css
@@ -0,0 +1,159 @@
+/* Calendar*/
+
+.tundra .dijitCalendarIncrementControl {
+	/* next/prev month buttons */
+	width:15px;
+	height:15px;
+	background-image: url("images/spriteRoundedIconsSmall.png");
+	background-repeat: no-repeat
+}
+.dj_ie6 .tundra .dijitCalendarIncrementControl {
+	font-size:.1em;
+	background-image: url("images/spriteRoundedIconsSmall.gif");
+}
+
+.tundra .dijitA11ySideArrow {
+	display: none;
+}
+
+.tundra .dijitCalendarDecrease {
+	background-position: top left;
+}
+.tundra .dijitCalendarIncrease {
+	background-position: -30px top;
+}
+
+.tundra .dijitCalendarContainer {
+	font-size: 100%;
+	border-spacing: 0;
+	border-collapse: separate;
+	margin: 0;
+}
+
+.tundra .dijitCalendarMonthContainer {
+	/* month header cell */
+	background:#d3d3d3 url("images/titleBar.png") repeat-x top;
+	padding-top:.3em;
+	padding-bottom:.2em;
+	text-align:center;
+}
+.dj_ie6 .tundra .dijitCalendarMonthContainer {
+	padding-top:.2em;
+	padding-bottom:.1em;
+}
+
+.tundra .dijitCalendarDayLabelTemplate {
+	/* day of week labels */
+	background:white url("images/calendarDayLabel.png") repeat-x bottom;
+	font-weight:normal;
+	padding-top:.15em;
+	padding-bottom:0;
+	border-top: 1px solid #eeeeee;
+	color:#293a4b;
+	text-align:center;
+}
+
+.tundra .dijitCalendarBodyContainer {
+	border-bottom: 1px solid #eeeeee;
+}
+
+.tundra .dijitCalendarMonthLabel {
+	color:#293a4b;
+	font-weight: bold;
+	padding: 0 4px;
+}
+
+.tundra .dijitCalendarDateTemplate {
+	/* style for each day cell */
+	font-size: 0.9em;
+	font-weight: bold;
+	text-align: center;
+	padding: 0.3em 0.3em 0.05em 0.3em;
+	letter-spacing: 1px;
+}
+
+.dj_ie .tundra .dijitCalendarDateTemplate {
+	padding: 0.1em .33em 0.02em .33em;
+}
+
+.tundra .dijitCalendarPreviousMonth,
+.tundra .dijitCalendarNextMonth 		{
+	/* days that are part of the previous or next month */
+	color:#999999;
+	background-color:#f8f8f8;
+}
+
+.tundra .dijitCalendarCurrentMonth {
+	/* days that are part of this month */
+	background-color: white;
+}
+
+.tundra .dijitCalendarCurrentDate {
+	/* cell for today's date */
+	text-decoration:underline;
+	font-weight:bold;
+}
+
+.tundra .dijitCalendarHoveredDate {
+	background-color: #e2ebf2;
+}
+
+.tundra .dijitCalendarDisabledDate {
+	text-decoration: line-through;
+	background-color: white;	/* override hover effects above, hover and click on disabled date should have no effect */
+}
+
+.tundra .dijitCalendarSelectedDate {
+	/* cell for the selected date */
+	background-color:#bbc4d0 !important;
+	color:black !important;
+}
+.tundra .dijitCalendarYearContainer {
+	/* footer of the table that contains the year display/selector */
+	background:white url("images/calendarYearLabel.png") repeat-x bottom;
+}
+
+.tundra .dijitCalendarYearLabel {
+	/* container for all of 3 year labels */
+	margin:0;
+	padding:0.4em 0 0.25em 0;
+	text-align:center;
+	font-size: 1.17em;
+}
+
+.tundra .dijitCalendarSelectedYear {
+	/* label for selected year */
+	font-weight:bolder;
+	color:black;
+	padding:0.2em;
+	padding-bottom:0.1em;
+	background-color:#bbc4d0 !important;
+}
+
+.tundra .dijitCalendarNextYear,
+.tundra .dijitCalendarPreviousYear {
+	/* label for next/prev years */
+	color:black !important;
+	font-weight:normal;
+}
+
+/* Styling for month DropDownButton */
+
+.tundra .dijitCalendar .dijitDropDownButton {
+	margin: 0;
+}
+.tundra .dijitCalendar .dijitButtonText {
+	padding: 0;
+}
+.tundra .dijitCalendar .dijitDropDownButton .dijitButtonNode {
+	background-color: transparent;
+	background-image: none;
+	padding: 0;
+}
+
+/* Styling for month drop down list */
+
+.tundra .dijitCalendarMonthMenu .dijitCalendarMonthLabelHover {
+	background-color: #3559ac;
+	color:#fff;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/Calendar_rtl.css b/src/main/resources/static/dijit/themes/tundra/Calendar_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..fbfe27b5d84c8202fcb41b2df33260412c2a0ff1
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Calendar_rtl.css
@@ -0,0 +1,9 @@
+/* Calendar */
+
+.tundra .dijitCalendarRtl .dijitCalendarDecrease {
+	background-position: -30px top;
+}
+
+.tundra .dijitCalendarRtl .dijitCalendarIncrease {
+	background-position: 0 top;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/ColorPalette.css b/src/main/resources/static/dijit/themes/tundra/ColorPalette.css
new file mode 100644
index 0000000000000000000000000000000000000000..38088b84516eb28ca0ce388d360c1afb03e6c928
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/ColorPalette.css
@@ -0,0 +1,5 @@
+.dijitColorPalette {
+	border:1px solid #7eabcd;
+	background:#fff;
+	-moz-border-radius: 0 !important;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/tundra/Common.css b/src/main/resources/static/dijit/themes/tundra/Common.css
new file mode 100644
index 0000000000000000000000000000000000000000..82a133bec1c48555830d38ea65958fa8fe41f4c1
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Common.css
@@ -0,0 +1,32 @@
+/* DnD hovered and selected node(s) */
+.tundra .dojoDndItemOver {
+	background-image: url(images/treeHover.png);
+}
+.tundra .dojoDndItemAnchor,
+.tundra .dojoDndItemSelected {
+	background-color: #E2EBFE;
+}
+
+/* DnD avatar-specific settings */
+/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */
+
+.tundra table.dojoDndAvatar { -moz-border-radius: 0; border: 1px solid #ccc; border-collapse: collapse; background-color: #fff; font-size: 75%; color: black;}
+.tundra .dojoDndAvatar td	{ border: none; }
+.tundra .dojoDndAvatar tr	{ border: none; }
+.tundra .dojoDndAvatarHeader td	{ height: 20px; padding: 0 0 0 21px; }
+.tundra .dojoDndAvatarItem td { padding: 2px;}
+.tundra.dojoDndMove .dojoDndAvatarHeader	{background-color: #f58383; background-image: url(images/dndNoMove.png); background-repeat: no-repeat; background-position: 2px center;}
+.tundra.dojoDndCopy .dojoDndAvatarHeader	{background-color: #f58383; background-image: url(images/dndNoCopy.png); background-repeat: no-repeat; background-position: 2px center;}
+.tundra.dojoDndMove .dojoDndAvatarCanDrop .dojoDndAvatarHeader	{background-color: #97e68d; background-image: url(images/dndMove.png); background-repeat: no-repeat; background-position: 2px center;}
+.tundra.dojoDndCopy .dojoDndAvatarCanDrop .dojoDndAvatarHeader	{background-color: #97e68d; background-image: url(images/dndCopy.png); background-repeat: no-repeat; background-position: 2px center;}
+
+.tundra .dijitIconLoading {
+	background:url('images/loading.gif') no-repeat left center;
+	width: 24px;
+	height: 24px;
+}
+.tundra .dijitIconError {
+	background:url('images/warning.png') no-repeat left center;
+	width: 16px;
+	height: 16px;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/Dialog.css b/src/main/resources/static/dijit/themes/tundra/Dialog.css
new file mode 100644
index 0000000000000000000000000000000000000000..b346f62672f9cdba1617f2babfa3ed3060533f23
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Dialog.css
@@ -0,0 +1,152 @@
+/* Dialog and Tooltip/TooltipDialog */
+
+.tundra .dijitDialog {
+	background: #fff;
+	border: 1px solid #7eabcd;
+	padding: 0;
+	-webkit-box-shadow: 0 5px 10px #adadad;
+}
+
+.tundra .dijitDialogPaneContent {
+	background: #fff;
+	border-top: 1px solid #d3d3d3;
+	padding:10px;
+
+}
+
+.tundra .dijitDialogTitleBar {
+	/* outer container for the titlebar of the dialog */
+	background: #fafafa url("images/titleBar.png") repeat-x top left;
+	padding: 5px 6px 3px 6px;
+	outline:0; /* remove this line if keyboard focus on dialog startup is an issue. tab still takes you to first focusable element */
+}
+
+.tundra .dijitDialogTitle {
+	/* typography and styling of the dialog title */
+	font-weight: bold;
+	padding: 0 4px;
+}
+
+.tundra .dijitDialogCloseIcon {
+	/* the default close icon for the dialog */
+	/* background : url("images/spriteRoundedIconsSmall.png") no-repeat right top; */
+	background: url("images/tabClose.png") no-repeat right top;
+	position: absolute;
+	vertical-align: middle;
+	right: 6px;
+	top: 4px;
+	height: 15px;
+	width: 15px;
+}
+.dj_ie6 .tundra .dijitDialogCloseIcon {
+	background : url("images/tabClose.gif") no-repeat right top;
+}
+
+.tundra .dijitDialogCloseIconHover {
+	background: url("images/tabCloseHover.png") no-repeat right top;
+}
+.dj_ie6 .tundra .dijitDialogCloseIconHover {
+	background : url("images/tabCloseHover.gif") no-repeat right top;
+}
+
+/* Tooltip and TooltipDialog */
+
+.tundra .dijitTooltip,
+.tundra .dijitTooltipDialog {
+	/* the outermost dom node, holding the connector and container */
+	background: transparent;	/* make the area on the sides of the arrow transparent */
+}
+
+.dijitTooltipBelow {
+	/* leave room for arrow above content */
+	padding-top: 13px;
+}
+
+.dijitTooltipAbove {
+	/* leave room for arrow below content */
+	padding-bottom: 13px;
+}
+
+.tundra .dijitTooltipContainer {
+	/*
+		The part with the text.
+	*/
+	background: #ffffff url("images/popupMenuBg.gif") repeat-x bottom left;
+	border: 1px solid #7eabcd;
+	padding: 0.45em;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+}
+
+.tundra .dijitTooltipConnector {
+	/* the arrow piece */
+	border:0;
+	z-index: 2;
+}
+.tundra .dijitTooltipABRight .dijitTooltipConnector {
+	/* above or below tooltip, but the arrow appears on the right,
+		and the right edges of target and tooltip are aligned rather than the left */
+	left: auto !important;
+	right: 3px;
+}
+
+.tundra .dijitTooltipBelow .dijitTooltipConnector {
+	/* the arrow piece for tooltips below an element */
+	top: 0;
+	left: 3px;
+	background:url("images/tooltipConnectorUp.png") no-repeat top left;
+	width:16px;
+	height:14px;
+}
+
+.dj_ie .tundra .dijitTooltipBelow .dijitTooltipConnector {
+	/* use gif for IE7 too, due to png rendering problems on fade-in (see http://trac.dojotoolkit.org/ticket/6555) */
+	background-image: url("images/tooltipConnectorUp.gif");
+}
+
+.tundra .dijitTooltipAbove .dijitTooltipConnector {
+	/* the arrow piece for tooltips above an element */
+	bottom: 0;
+	left: 3px;
+	background:url("images/tooltipConnectorDown.png") no-repeat top left;
+	width:16px;
+	height:14px;
+}
+.dj_ie .tundra .dijitTooltipAbove .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorDown.gif");
+}
+.dj_ie6 .tundra .dijitTooltipAbove .dijitTooltipConnector {
+	bottom: -3px;
+}
+
+.tundra .dijitTooltipLeft {
+	padding-right: 14px;
+}
+.tundra .dijitTooltipLeft .dijitTooltipConnector {
+	/* the arrow piece for tooltips to the left of an element, bottom borders aligned */
+	right: 0;
+	background:url("images/tooltipConnectorRight.png") no-repeat top left;
+	width:16px;
+	height:14px;
+}
+.dj_ie .tundra .dijitTooltipLeft .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorRight.gif");
+}
+
+.tundra .dijitTooltipRight {
+	padding-left: 14px;
+}
+.tundra .dijitTooltipRight .dijitTooltipConnector {
+	/* the arrow piece for tooltips to the right of an element, bottom borders aligned */
+	left: 0;
+	background:url("images/tooltipConnectorLeft.png") no-repeat top left;
+	width:16px;
+	height:14px;
+}
+.dj_ie .tundra .dijitTooltipRight .dijitTooltipConnector {
+	background-image: url("images/tooltipConnectorLeft.gif");
+}
+
+.dj_webkit .tundra .dijitTooltipContainer {
+	-webkit-box-shadow: 0 5px 10px #adadad;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/Dialog_rtl.css b/src/main/resources/static/dijit/themes/tundra/Dialog_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..9337680aa5a84ecfb22774d81ee95883bd51a046
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Dialog_rtl.css
@@ -0,0 +1,5 @@
+/* Dialog */
+.tundra .dijitDialogRtl .dijitDialogCloseIcon {
+	right: auto;
+	left: 5px;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/Editor.css b/src/main/resources/static/dijit/themes/tundra/Editor.css
new file mode 100644
index 0000000000000000000000000000000000000000..b6f07a1f79a90df783c8efc3c6a0d7f7958098bd
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Editor.css
@@ -0,0 +1,16 @@
+.dijitEditor {
+	border:1px solid #bfbfbf;
+	border-top:0;
+}
+
+.tundra .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsEnabled.png'); /* editor icons sprite image - enabled state */
+	background-repeat: no-repeat;
+	width: 18px;
+	height: 18px;
+	text-align: center;
+}
+.tundra .dijitDisabled .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsDisabled.png'); /* editor icons sprite image - disabled state */
+}
+
diff --git a/src/main/resources/static/dijit/themes/tundra/Editor_rtl.css b/src/main/resources/static/dijit/themes/tundra/Editor_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..cd4849e7f85db651126e291a503863066eab277c
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Editor_rtl.css
@@ -0,0 +1,7 @@
+/* Editor */
+.tundra .dijitEditorRtl .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsEnabled_rtl.png'); /* editor icons sprite image - enabled state */
+}
+.tundra .dijitEditorRtlDisabled .dijitEditorIcon {
+	background-image: url('../../icons/images/editorIconsDisabled_rtl.png'); /* editor icons sprite image - disabled state  */
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/Menu.css b/src/main/resources/static/dijit/themes/tundra/Menu.css
new file mode 100644
index 0000000000000000000000000000000000000000..055d02190796387119fd0c24c908679ec3a910d9
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Menu.css
@@ -0,0 +1,88 @@
+.tundra .dijitMenu,
+.tundra .dijitMenuBar {
+	border: 1px solid #7eabcd;
+	margin: 0;
+	padding: 0;
+	background-color: #f7f7f7;
+}
+
+.tundra .dijitMenuTable {
+  border-collapse: separate;
+  border-spacing: 0 0;
+  padding: 0;
+}
+
+.tundra .dijitBorderContainer .dijitMenuBar {
+	border:1px solid #ccc;
+}
+
+.tundra .dijitMenuItem {
+	font-family: sans-serif;
+	margin: 0;
+}
+
+.tundra .dijitMenuItem {
+	padding: 4px 5px;
+}
+
+.tundra .dijitMenuPreviousButton, .tundra .dijitMenuNextButton {
+	font-style: italic;
+}
+.tundra .dijitMenuItem td {
+	padding: 2px;
+}
+
+.tundra .dijitMenuPassive .dijitMenuItemHover,
+.tundra .dijitComboBoxMenu .dijitMenuItemHover,
+.tundra .dijitMenuItemSelected {
+	background-color: #3559ac;
+	color:#fff;
+}
+
+.tundra .dijitMenuItemIcon {
+	width: 16px;
+	height: 16px;
+}
+
+.tundra .dijitMenuExpand {
+	/* arrow to indicate this MenuItem opens a sub-menu */
+	width: 7px;
+	height: 7px;
+	background-image: url('images/spriteArrows.png');
+	background-position: -14px 0;
+}
+.dj_ie6 .tundra .dijitMenuExpand {
+	background-image: url('images/spriteArrows.gif');
+}
+
+/* separator can be two pixels -- set border of either one to 0 to have only one */
+.tundra .dijitMenuSeparatorTop {
+	border-bottom: 1px solid #9b9b9b;
+}
+
+.tundra .dijitMenuSeparatorBottom {
+	border-top: 1px solid #e8e8e8;
+}
+
+/* the checked menu item */
+.tundra .dijitCheckedMenuItem .dijitMenuItemIcon,
+.tundra .dijitRadioMenuItem .dijitMenuItemIcon {
+	background-image: url('images/checkmark.png');
+	background-position: -80px;
+}
+
+.dj_ie6 .tundra .dijitCheckedMenuItem .dijitMenuItemIcon,
+.dj_ie6 .tundra .dijitRadioMenuItem .dijitMenuItemIcon {
+	background-image: url('images/checkmark.gif');
+}
+
+.tundra .dijitCheckedMenuItemChecked .dijitMenuItemIcon {
+	background-position: -64px;
+}
+
+.tundra .dijitRadioMenuItem .dijitMenuItemIcon {
+	background-position: -110px; /* 15px * 8 */
+}
+.tundra .dijitRadioMenuItemChecked .dijitMenuItemIcon {
+	background-position: -95px;	/* 15px * 7 */
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/tundra/Menu_rtl.css b/src/main/resources/static/dijit/themes/tundra/Menu_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..f14859297faab8c54e0f0dc1d85f6b14c9202d1b
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Menu_rtl.css
@@ -0,0 +1,3 @@
+.tundra .dijitMenuItemRtl .dijitMenuExpand {
+	background-position: -7px 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/tundra/ProgressBar.css b/src/main/resources/static/dijit/themes/tundra/ProgressBar.css
new file mode 100644
index 0000000000000000000000000000000000000000..5a9a78674fd73e1b4f15ef2457b2322a511cfeed
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/ProgressBar.css
@@ -0,0 +1,29 @@
+.tundra .dijitProgressBar {
+	margin:2px 0 2px 0;
+}
+
+.tundra .dijitProgressBarEmpty {
+	/* outer container and background of the bar that's not finished yet*/
+	background:#fff url("images/progressBarEmpty.png") repeat-x center center;
+	border-color: #a2a2a2 #b8b8b8 #b8b8b8 #a2a2a2;
+}
+
+.tundra .dijitProgressBarTile {
+	/* inner container for finished portion when in 'tile' (image) mode */
+	background:#f0f0f0 url("images/progressBarFull.png") repeat-x center center;
+}
+
+.tundra .dijitProgressBarFull {
+	border: 0px solid #b8b8b8;
+	border-right-width: 1px;
+}
+
+.tundra .dijitProgressBarLabel {
+	/* Set to a color that contrasts with both the "Empty" and "Full" parts. */
+	color:#293a4b;
+}
+
+.tundra .dijitProgressBarIndeterminate .dijitProgressBarTile {
+	/* use an animated gif for the progress bar in 'indeterminate' mode */
+	background:#cad2de url("images/progressBarAnim.gif") repeat-x center center;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/ProgressBar_rtl.css b/src/main/resources/static/dijit/themes/tundra/ProgressBar_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..24436d700a436c3e7dee826ccd8d5ade641284d1
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/ProgressBar_rtl.css
@@ -0,0 +1,14 @@
+.tundra .dijitProgressBarRtl .dijitProgressBarFull {
+	border-left-width: 1px;
+	border-right: 0px;
+}
+
+.tundra .dijitProgressBarIndeterminateRtl .dijitProgressBarTile {
+	-moz-transform: scaleX(-1);
+	-o-transform: scaleX(-1);
+	-webkit-transform: scaleX(-1);
+	transform: scaleX(-1);
+	filter: FlipH;
+	-ms-filter: "FlipH";
+}
+
diff --git a/src/main/resources/static/dijit/themes/tundra/TimePicker.css b/src/main/resources/static/dijit/themes/tundra/TimePicker.css
new file mode 100644
index 0000000000000000000000000000000000000000..33fc5aee45ead9617432efbf40f298e231644a0f
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/TimePicker.css
@@ -0,0 +1,24 @@
+/* Time Picker */
+.tundra .dijitTimePickerTick,
+.tundra .dijitTimePickerMarker {
+	border-color: #ccc;
+}
+
+.tundra .dijitTimePickerTick {
+	color:gray;
+}
+
+.tundra .dijitTimePickerMarker {
+	background:#d3d3d3 url("images/titleBar.png") repeat-x top;
+	color:#293a4b;
+}
+
+.tundra .dijitTimePickerItemSelected {
+	color: black;
+	background: #bbc4d0 none;
+}
+
+.tundra .dijitTimePickerItemHover {
+	background: #60a1ea none;
+	color:white;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/TimePicker_rtl.css b/src/main/resources/static/dijit/themes/tundra/TimePicker_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..e9e8c74090c20c47c5559633fa82ef60f2027210
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/TimePicker_rtl.css
@@ -0,0 +1,4 @@
+.dj_ie6 .tundra .dijitTimePickerRtl .dijitTimePickerMarkerHover,
+.dj_ie7 .tundra .dijitTimePickerRtl .dijitTimePickerMarkerHover {
+        border-top: 0; /* IE6/7 bug causes mouseover/out event storm */
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/TitlePane.css b/src/main/resources/static/dijit/themes/tundra/TitlePane.css
new file mode 100644
index 0000000000000000000000000000000000000000..2393e695aba9415a9684523d265f5cf741168475
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/TitlePane.css
@@ -0,0 +1,38 @@
+.tundra .dijitTitlePaneTitle {
+	background: #cccccc;
+	background:#fff url("images/titleBar.png") repeat-x bottom left;
+	border:1px solid #bfbfbf;
+	padding:3px 4px;
+}
+.tundra .dijitTitlePaneTitleHover  {
+	background: #f8fafd url("images/accordionItemHover.gif") bottom repeat-x;
+}
+
+.tundra .dijitTitlePane .dijitArrowNode, .tundra .dijitFieldset .dijitArrowNode {
+	background-image: url('images/spriteArrows.png');
+	background-repeat: no-repeat;
+	background-position: 0 0;
+	height: 7px;
+	width: 7px;
+}
+.dj_ie6 .tundra .dijitTitlePane .dijitArrowNode, .dj_ie6 .tundra .dijitFieldset .dijitArrowNode {
+	background-image: url('images/spriteArrows.gif');
+}
+
+.tundra .dijitTitlePane .dijitClosed .dijitArrowNode, .tundra .dijitFieldset .dijitClosed .dijitArrowNode {
+	background-position: -14px 0;
+}
+
+.tundra .dijitTitlePaneContentOuter {
+	background: #ffffff;
+	border:1px solid #bfbfbf;
+	border-top: 0;
+}
+.tundra .dijitTitlePaneContentInner {
+	padding:10px;
+}
+
+.tundra .dijitTitlePaneTextNode, .tundra .dijitFieldsetLegendNode {
+	margin-left: 4px;
+	margin-right: 4px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/tundra/TitlePane_rtl.css b/src/main/resources/static/dijit/themes/tundra/TitlePane_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..bb11f4ad16768ee26ab8bb26f6c22351b8024496
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/TitlePane_rtl.css
@@ -0,0 +1,3 @@
+.tundra .dijitTitlePaneRtl .dijitClosed .dijitArrowNode, .tundra .dijitFieldsetRtl .dijitFieldsetTitleClosed .dijitArrowNode {
+	background-position: -7px 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/tundra/Toolbar.css b/src/main/resources/static/dijit/themes/tundra/Toolbar.css
new file mode 100644
index 0000000000000000000000000000000000000000..ebe9cdae4b1bcadcebf9e1d4c1e17b438ae50f85
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Toolbar.css
@@ -0,0 +1,75 @@
+.tundra .dijitToolbar {
+	border-bottom: 1px solid #ccc;
+	background:#eaeaea url("images/titleBar.png") repeat-x top left;
+}
+
+/* setting a min-height on ditor toolbar */
+.dj_ie6 .tundra .dijitToolbar {
+	height: 10px;
+}
+
+.tundra .dijitToolbar .dijitButtonNode,
+.tundra .dijitToolbar .dijitComboButton .dijitButtonContents,
+.tundra .dijitToolbar .dijitComboButton .dijitDownArrowButton {
+	background: none;
+	margin: 0;
+	padding: 0;
+	border: none;
+	font-size: 12px;
+}
+
+.tundra .dijitToolbar .dijitButton,
+.tundra .dijitToolbar .dijitToggleButton,
+.tundra .dijitToolbar .dijitDropDownButton,
+.tundra .dijitToolbar .dijitComboButton .dijitButtonContents,
+.tundra .dijitToolbar .dijitComboButton .dijitDownArrowButton  {
+	background: none;
+	padding: 1px;
+}
+
+.tundra .dijitToolbar .dijitButtonChecked,
+.tundra .dijitToolbar .dijitToggleButtonChecked {
+	background-color:#d4dff2;
+	border:1px solid #316ac5;
+	padding: 0;	/* reduce padding to compensate for space taken by border */
+}
+
+.tundra .dijitToolbar .dijitButtonCheckedHover,
+.tundra .dijitToolbar .dijitToggleButtonCheckedHover
+ {
+	background-color:#abc1e5;
+	border:1px solid #316ac5;
+	padding: 0;	/* reduce padding to compensate for space taken by border */
+}
+
+.tundra .dijitToolbar .dijitButtonHover,
+.tundra .dijitToolbar .dijitToggleButtonHover,
+.tundra .dijitToolbar .dijitDropDownButtonHover,
+.tundra .dijitToolbar .dijitComboButton .dijitButtonContentsHover,
+.tundra .dijitToolbar .dijitComboButton .dijitDownArrowButtonHover {
+	/* TODO: change this from Hover to Selected so that button is still highlighted while drop down is being used */
+	border: 1px solid #869cbf;
+	padding: 0;	/* reduce padding to compensate for space taken by border */
+	background-color:#e1e5f0;
+}
+
+.tundra .dijitToolbar label {
+	padding: 3px 3px 0 6px;
+}
+
+.dj_ie .tundra .dijitToolbar .dijitComboButton .dijitButtonContentsFocused,
+.dj_ie .tundra .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused {
+	/* focus border doesn't appear on <td> for IE, so need to add it manually */
+	border: 1px #555 dotted !important;
+	padding: 0;
+}
+
+.tundra .dijitToolbarSeparator {
+	/* separator icon in the editor sprite */
+	background: url('../../icons/images/editorIconsEnabled.png');
+}
+
+.tundra .dijitToolbarRtl .dijitToolbarSeparator {
+	/* separator icon in the editor sprite */
+	background-image: url('../../icons/images/editorIconsDisabled.png');
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/Tree.css b/src/main/resources/static/dijit/themes/tundra/Tree.css
new file mode 100644
index 0000000000000000000000000000000000000000..76c81e0b1a5a742f952aea729623b08ee866c06d
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Tree.css
@@ -0,0 +1,96 @@
+/* Tree */
+
+.tundra .dijitTreeNode {
+    background-image : url('images/i.gif');
+    background-repeat : repeat-y;
+    zoom: 1;	/* force layout on IE (TODO: may not be needed anymore) */
+}
+
+/* left vertical line (grid) for all nodes */
+.tundra .dijitTreeIsLast {
+    background: url('images/i_half.gif') no-repeat;
+}
+
+.tundra .dijitTreeIsRoot {
+    margin-left: 0;
+    background-image: none;
+}
+
+.tundra .dijitTreeExpando {
+    width: 18px;
+    height: 18px;
+}
+
+.tundra .dijitTreeRow {
+	/* so insert line shows up on IE when dropping after a target element */
+	padding-bottom: 2px;
+}
+
+.tundra .dijitTreeContent {
+    min-height: 18px;
+    min-width: 18px;
+}
+
+.tundra .dijitTreeRowSelected .dijitTreeLabel {
+	background:#e2ebfe;
+}
+.tundra .dijitTreeRowHover {
+	/* using a transparent png so that we can still see grid lines, which are (unfortunately) behind the dijitRowNode that we are hovering over */
+	background-image: url(images/treeHover.png);
+	background-repeat: repeat;
+	background-color: transparent !important;
+}
+
+.tundra .dijitTreeExpandoOpened {
+	background-image: url('images/treeExpand_minus.gif');
+}
+
+.tundra .dijitTreeExpandoClosed {
+	background-image: url('images/treeExpand_plus.gif');
+}
+
+.tundra .dijitTreeExpandoLeaf {
+	background-image: url('images/treeExpand_leaf.gif');
+}
+
+.tundra .dijitTreeExpandoLoading {
+	background-image: url('images/treeExpand_loading.gif');
+}
+
+.tundra .dijitTreeIcon {
+	width: 16px;
+	height: 16px;
+}
+
+.tundra .dijitFolderOpened {
+	background: url('images/folderOpened.gif') no-repeat;
+}
+
+.tundra .dijitFolderClosed {
+	background: url('images/folderClosed.gif') no-repeat;
+}
+
+.tundra .dijitLeaf {
+	background: url('images/leaf.gif') no-repeat;
+}
+
+/* Drag and Drop on TreeNodes
+ * Put insert line on dijitTreeContent node so it's aligned w/
+ * (ie, indented equally with) target element, even
+ * though dijitTreeRowNode is the actual "drag object"
+ */
+.tundra .dijitTreeNode .dojoDndItemBefore,
+.tundra .dijitTreeNode .dojoDndItemAfter {
+	border-bottom: none;
+	border-top: none;
+}
+
+.tundra .dijitTreeNode .dojoDndItemBefore .dijitTreeContent {
+	/* copied from Common.css */
+	border-top: 2px solid #369;
+}
+
+.tundra .dijitTreeNode .dojoDndItemAfter .dijitTreeContent {
+	/* copied from Common.css */
+	border-bottom: 2px solid #369;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/Tree_rtl.css b/src/main/resources/static/dijit/themes/tundra/Tree_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..607b71ce8b35e0ab9b9a7c50f778f8787ec4a894
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/Tree_rtl.css
@@ -0,0 +1,17 @@
+/* Tree */
+
+.tundra .dijitTreeNodeRtl,
+.tundra .dijitTreeNodeRtl .dijitTreeExpandoLeaf {
+	/* disable grid lines in RTL mode; too hard to support */
+    background-image: none;
+}
+
+.tundra .dijitTreeNodeRtl .dijitTreeExpandoOpened {
+	/* todo: get rid of transparent space in icon files,
+		and just use background-placement (or margin maybe) to get desired alignment */
+	background-image: url('images/treeExpand_minus_rtl.gif');
+}
+
+.tundra .dijitTreeNodeRtl .dijitTreeExpandoClosed {
+	background-image: url('images/treeExpand_plus_rtl.gif');
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/form/Button.css b/src/main/resources/static/dijit/themes/tundra/form/Button.css
new file mode 100644
index 0000000000000000000000000000000000000000..d274745e98c5df134ce926763864227c799144e4
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/form/Button.css
@@ -0,0 +1,138 @@
+
+/*****
+		dijit.form.Button
+		dijit.form.DropDownButton
+		dijit.form.ComboButton
+		dijit.form.ComboBox (partial)
+		dijit.form.Spinner (partial) (TODO: create NumberSpinner.css file like claro has)
+ *****/
+
+.tundra .dijitButtonNode {
+	/* enabled state - inner */
+	border: 1px solid #c0c0c0;
+	border-bottom: 1px solid #9b9b9b;
+	padding: 0.1em 0.2em 0.2em 0.2em;
+	background: #fff url("../images/buttonEnabled.png") repeat-x bottom left;
+}
+.tundra .dijitButtonText {
+	text-align: center;
+	padding: 0 0.3em;
+}
+.tundra .dijitInputField {
+	padding: 0; /* set padding:0 for .tundra .dijitSelect .dijitButtonText but with a low priority rule that can be easily trumped by the user */
+}
+
+.tundra .dijitDisabled .dijitButtonText {
+	color: #7F7F7F;
+}
+
+.tundra .dijitArrowButton {
+	color: #111;
+}
+
+.tundra .dijitComboButton .dijitDownArrowButton {
+	padding-right:4px;
+}
+
+.tundra .dijitTextBoxReadOnly,
+.tundra .dijitTextBoxReadOnly .dijitButtonNode,
+.tundra .dijitButtonDisabled .dijitButtonNode,
+.tundra .dijitToggleButtonDisabled .dijitButtonNode,
+.tundra .dijitDropDownButtonDisabled .dijitButtonNode,
+.tundra .dijitComboButtonDisabled .dijitButtonNode,
+.tundra .dijitTextBoxDisabled,
+.tundra .dijitTextBoxDisabled .dijitButtonNode {
+	/* disabled state - inner */
+	border-color: #d5d5d5 #d5d5d5 #bdbdbd #d5d5d5;
+	background:#e4e4e4 url("../images/buttonDisabled.png") top repeat-x;
+}
+
+.tundra .dijitButtonHover .dijitButtonNode,
+.tundra .dijitButtonNodeHover,
+.tundra .dijitToggleButtonHover .dijitButtonNode,
+.tundra .dijitDropDownButtonHover .dijitButtonNode,
+.tundra .dijitComboButton .dijitButtonContentsHover,
+.tundra .dijitComboButton .dijitDownArrowButtonHover {
+	/* hover state - inner */
+	/* TODO: change from Hover to Selected so that button is still highlighted while drop down is being used */
+	border-color: #a5beda;
+	border-bottom-color:#5c7590;
+	color:#243C5F;
+	background:#fcfdff url("../images/buttonHover.png") repeat-x bottom;
+}
+.tundra .dijitDownArrowButtonHover,
+.tundra .dijitUpArrowButtonHover {
+	/* same as above except don't adjust border color (it's controlled by the containing Spinner/ComboBox) */
+	color:#243C5F;
+	background:#fcfdff url("../images/buttonHover.png") repeat-x bottom;
+}
+
+.tundra .dijitUpArrowButtonActive,
+.tundra .dijitDownArrowButtonActive,
+.tundra .dijitButtonActive .dijitButtonNode,
+.tundra .dijitToggleButtonActive .dijitButtonNode,
+.tundra .dijitDropDownButtonActive .dijitButtonNode,
+.tundra .dijitButtonContentsActive,
+.tundra .dijitStackController .dijitToggleButtonChecked .dijitButtonNode {
+	/* active state - inner (for when you are pressing a normal button, or
+	 * when a radio-type button is in a depressed state
+	 */
+	border-color:#366dba;
+	background: #ededed url("../images/buttonActive.png") bottom repeat-x;
+}
+
+.tundra .dijitArrowButtonInner {
+	background:url("../images/spriteArrows.png") no-repeat scroll 0 center;
+	width: 7px;
+	height: 7px;
+	margin: 0 4px 0 4px;
+}
+.tundra .dijitTextBox .dijitArrowButtonInner {
+	background-position: 0 center;
+}
+.dj_ie6 .tundra .dijitArrowButtonInner {
+	background-image:url("../images/spriteArrows.gif");
+}
+.tundra .dijitLeftArrowButton .dijitArrowButtonInner {
+	background-position: -7px center;
+}
+.tundra .dijitRightArrowButton .dijitArrowButtonInner {
+	background-position: -14px center;
+}
+.tundra .dijitUpArrowButton .dijitArrowButtonInner {
+	background-position: -21px center;
+}
+
+.tundra .dijitDisabled .dijitArrowButtonInner {
+	background-position: -28px center;
+}
+.tundra .dijitDisabled .dijitLeftArrowButton .dijitArrowButtonInner {
+	background-position: -35px center;
+}
+.tundra .dijitDisabled .dijitRightArrowButton .dijitArrowButtonInner {
+	background-position: -42px center;
+}
+.tundra .dijitDisabled .dijitUpArrowButton .dijitArrowButtonInner {
+	background-position: -49px center;
+}
+.dj_ie .tundra .dijitSpinner .dijitDownArrowButton .dijitArrowButtonInner {
+	margin-top: -2px; /* image has too many blank pixels on top */
+}
+.dj_webkit .tundra .dijitSpinner .dijitUpArrowButton .dijitArrowButtonInner,
+.dj_iequirks .tundra .dijitSpinner .dijitDownArrowButton .dijitArrowButtonInner,
+.dj_ie8 .tundra .dijitSpinner .dijitDownArrowButton .dijitArrowButtonInner {
+	margin-top: -1px; /* image has too many blank pixels on top */
+}
+.tundra .dijitSpinnerButtonContainer {
+	width: auto;
+	padding: 0;
+}
+.tundra .dijitSpinner .dijitArrowButton {
+	width: 15px;
+}
+.tundra .dijitSpinner .dijitSpinnerButtonInner {
+	width: 15px;
+}
+.tundra .dijitSpinner .dijitArrowButtonInner .dijitInputField {
+	padding: 0;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/form/Checkbox.css b/src/main/resources/static/dijit/themes/tundra/form/Checkbox.css
new file mode 100644
index 0000000000000000000000000000000000000000..28a7d79c9314475e26cf7d44339cd66797bdce13
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/form/Checkbox.css
@@ -0,0 +1,54 @@
+.tundra .dijitToggleButton .dijitCheckBoxIcon {
+	background-image: url('../images/checkmarkNoBorder.png');
+}
+
+.dj_ie6 .tundra .dijitToggleButton .dijitCheckBoxIcon {
+	background-image: url('../images/checkmarkNoBorder.gif');
+}
+
+.tundra .dijitCheckBox,
+.tundra .dijitCheckBoxIcon		/* inside a toggle button */	{
+	background-image: url('../images/checkmark.png'); /* checkbox sprite image */
+	background-repeat: no-repeat;
+	width: 16px;
+	height: 16px;
+	margin: 0 2px 0 0;
+	padding: 0;
+}
+
+.dj_ie6 .tundra .dijitCheckBox,
+.dj_ie6 .tundra .dijitCheckBoxIcon		/* inside a toggle button */	{
+	background-image: url('../images/checkmark.gif'); /* checkbox sprite image */
+}
+
+.tundra .dijitCheckBox,
+.tundra .dijitToggleButton .dijitCheckBoxIcon {
+	/* unchecked */
+	background-position: -16px;
+}
+
+.tundra .dijitCheckBoxChecked,
+.tundra .dijitToggleButtonChecked .dijitCheckBoxIcon {
+	/* checked */
+	background-position: 0;
+}
+
+.tundra .dijitCheckBoxDisabled {
+	/* disabled */
+	background-position: -48px;
+}
+
+.tundra .dijitCheckBoxCheckedDisabled {
+	/* disabled but checked */
+	background-position: -32px;
+}
+
+.tundra .dijitCheckBoxHover {
+	/* hovering over an unchecked enabled checkbox */
+	background-position: -80px;
+}
+
+.tundra .dijitCheckBoxCheckedHover {
+	/* hovering over a checked enabled checkbox */
+	background-position: -64px;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/form/Common.css b/src/main/resources/static/dijit/themes/tundra/form/Common.css
new file mode 100644
index 0000000000000000000000000000000000000000..2122184dac820a7a19f8894ffdf44420818e70a6
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/form/Common.css
@@ -0,0 +1,83 @@
+
+/****
+		dijit.form.TextBox
+		dijit.form.ValidationTextBox
+		dijit.form.SerializableTextBox
+		dijit.form.RangeBoundTextBox
+		dijit.form.NumberTextBox
+		dijit.form.CurrencyTextBox
+		dijit.form.NumberSpinner
+		dijit.form.ComboBox (partial)
+ ****/
+
+.tundra .dijitInputContainer input {
+	margin: 0 0.1em;
+}
+
+.tundra .dijitTextArea {
+	padding: 3px;
+}
+
+.tundra .dijitSelect .dijitButtonContents,
+.tundra .dijitSelect,
+.tundra .dijitTextBox {
+	/* 	For all except dijit.form.NumberSpinner:  the actual input element.
+		For TextBox, ComboBox, Spinner: the div that contains the input.
+		Otherwise the actual input element.
+	*/
+	background:#fff url("../images/validationInputBg.png") repeat-x top left;
+	#background:#fff url('../images/validationInputBg.gif') repeat-x top left;
+}
+.tundra .dijitSelect,
+.tundra .dijitTextBox {
+	border:1px solid #b3b3b3;
+}
+
+.tundra .dijitSelect .dijitArrowButton,
+.tundra .dijitComboBox .dijitButtonNode {
+	padding: 0 0.2em;
+}
+.tundra .dijitSelect .dijitButtonContents,
+.tundra .dijitTextBox .dijitButtonNode {
+	/* line between the input area and the drop down button, and also between
+	 * the up and down buttons of a spinner
+	 */
+	border-color: #9b9b9b;
+}
+
+.tundra .dijitSelectFocused,
+.tundra .dijitTextBoxFocused {
+	/* input field when focused (ie: typing affects it) */
+	border-color:#406b9b;
+}
+.tundra .dijitSelectFocused TD,
+.tundra .dijitTextBoxFocused .dijitButtonNode {
+	border-color:#366dba;
+}
+
+.tundra .dijitError {
+	background-color:#f9f7ba;
+	background-image:none;
+}
+
+.tundra .dijitErrorFocused {
+	background-color:#f9f999;
+	background-image:none;
+}
+
+/* Validation errors  */
+.tundra .dijitValidationTextBoxError .dijitValidationIcon {
+	/* prevent height change when widget goes from valid to invalid state */
+	width: 16px;
+	background: transparent url('../images/warning.png') no-repeat center center;
+}
+
+/* The highlight is shown in the ComboBox menu. */
+.tundra .dijitComboBoxHighlightMatch {
+	background-color:#a5beda;
+}
+
+.tundra .dijitFocusedLabel {
+	/* for checkboxes or radio buttons, hatch border around the corresponding label, to indicate focus */
+	outline: 1px dotted #666666;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/form/RadioButton.css b/src/main/resources/static/dijit/themes/tundra/form/RadioButton.css
new file mode 100644
index 0000000000000000000000000000000000000000..4dfc0fa6d0815b4c22c345381773c7090ed7faff
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/form/RadioButton.css
@@ -0,0 +1,52 @@
+
+.tundra .dijitRadio,			/* stand alone */
+.tundra .dijitRadioIcon	{		/* inside a toggle button */
+	background-image: url('../images/checkmark.png'); /* checkbox sprite image */
+	background-repeat: no-repeat;
+	width: 16px;
+	height: 16px;
+	margin: 0;
+	padding: 0;
+}
+.dj_ie6 .tundra .dijitRadio,
+.dj_ie6 .tundra .dijitRadioIcon	{
+	background-image: url('../images/checkmark.gif'); /* checkbox sprite image */
+}
+
+.tundra .dijitToggleButton .dijitRadioIcon {
+	/* for checkbox in a toggle button, override above setting to have no border */
+	background-image: url('../images/checkmarkNoBorder.png');
+}
+.dj_ie6 .tundra .dijitToggleButton .dijitRadioIcon {
+	background-image: url('../images/checkmarkNoBorder.gif');
+}
+
+.tundra .dijitRadio,
+.tundra .dijitRadioIcon {
+	/* unselected */
+	background-position: -112px;
+}
+
+.tundra .dijitRadioDisabled {
+	/* unselected and disabled */
+	background-position: -144px;
+}
+
+.tundra .dijitRadioHover {
+	/* hovering over an unselected enabled radio button */
+	background-position: -176px;
+}
+
+.tundra .dijitRadioChecked,
+.tundra .dijitRadioCheckedHover,
+.tundra .dijitToggleButtonChecked .dijitRadioIcon {
+	/* selected.  Since clicking a selected radio button doesn't change anything, there's
+	 * no hover effect on selected radio buttons.
+	 */
+	background-position: -96px;
+}
+
+.tundra .dijitRadioCheckedDisabled {
+	/* selected but disabled */
+	background-position: -128px;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/form/Select.css b/src/main/resources/static/dijit/themes/tundra/form/Select.css
new file mode 100644
index 0000000000000000000000000000000000000000..3e0e77e0abbeccf42ac1bcce5ce7d353457b6f59
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/form/Select.css
@@ -0,0 +1,47 @@
+/* Make unselected content portion "look" more like a text box and less like a button */
+.tundra .dijitSelectError .dijitButtonContents,
+.tundra .dijitSelectHover .dijitArrowButton,
+.tundra .dijitSelectActive .dijitArrowButton,
+.tundra .dijitSelectOpened .dijitArrowButton,
+.tundra .dijitSelectDisabled .dijitArrowButton,
+.tundra .dijitSelectReadOnly .dijitArrowButton {
+	background: transparent none;
+}
+.tundra .dijitSelect .dijitArrowButton {
+	background: #fff url("../images/buttonEnabled.png") repeat-x bottom left;
+	border-width: 0;
+}
+
+/* Mirror DropDownButton */
+.tundra .dijitSelectDisabled,
+.tundra .dijitSelectDisabled TD {
+	border-color: #d5d5d5 #bdbdbd #bdbdbd #d5d5d5 !important;
+	background:#e4e4e4 url("../images/buttonDisabled.png") top repeat-x;
+}
+.dj_ie .tundra .dijitSelectDisabled TD * {
+	filter: gray() alpha(opacity=50);
+}
+
+.tundra .dijitSelectHover,
+.tundra .dijitSelectHover TD {
+	border-color:#a5beda #5c7590 #5c7590 #a5beda !important;
+	color:#243C5F;
+	background:#fcfdff url("../images/buttonHover.png") repeat-x bottom;
+}
+
+.tundra .dijitSelectActive,
+.tundra .dijitSelectOpened,
+.tundra .dijitSelectActive TD,
+.tundra .dijitSelectOpened TD {
+	border-color:#366dba !important;
+	background: #ededed url("../images/buttonActive.png") bottom repeat-x;
+}
+
+/* Make the menu look more combobox-like */
+.tundra .dijitSelectMenu td {
+	padding: 0;
+}
+.tundra .dijitSelectMenu .dijitMenuItemLabel,
+.tundra .dijitSelectMenu .dijitMenuArrowCell {
+	padding: 0.1em 0.2em;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/form/Slider.css b/src/main/resources/static/dijit/themes/tundra/form/Slider.css
new file mode 100644
index 0000000000000000000000000000000000000000..7465e8377172b6fd9b202cad0590ccfe6874a57c
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/form/Slider.css
@@ -0,0 +1,147 @@
+.tundra .dijitSliderProgressBarH {
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left;
+}
+
+.tundra .dijitSliderProgressBarV {
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left;
+}
+
+.tundra .dijitSliderFocused .dijitSliderProgressBarH,
+.tundra .dijitSliderFocused .dijitSliderLeftBumper {
+	background-image:url("../images/sliderFullFocus.png");
+}
+
+.tundra .dijitSliderFocused .dijitSliderProgressBarV,
+.tundra .dijitSliderFocused .dijitSliderBottomBumper {
+	background-image:url("../images/sliderFullVerticalFocus.png");
+}
+
+.tundra .dijitSliderRemainingBarV {
+	border-color: #b4b4b4;
+	background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y bottom left;
+}
+
+.tundra .dijitSliderRemainingBarH {
+	border-color: #b4b4b4;
+	background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left;
+}
+
+.tundra .dijitSliderBar {
+	border-style: solid;
+	outline:1px;
+}
+.tundra .dijitSliderFocused .dijitSliderBar {
+	border-color:#888;
+}
+
+.tundra .dijitSliderImageHandleH {
+	border:0;
+	width:16px;
+	height:16px;
+	background:url("../images/preciseSliderThumb.png") no-repeat center top;
+}
+.tundra .dijitSliderFocused .dijitSliderImageHandleH {
+	background-image:url("../images/preciseSliderThumbFocus.png");
+	#background-image:url("../images/preciseSliderThumbFocus.gif");
+}
+
+.dj_ie6 .tundra .dijitSliderImageHandleH {
+	background-image:url("../images/preciseSliderThumb.gif");
+}
+
+.tundra .dijitSliderLeftBumper {
+	border-left-width: 1px;
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left;
+}
+
+.tundra .dijitSliderRightBumper {
+	background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left;
+	border-color: #b4b4b4;
+	border-right-width: 1px;
+}
+
+.tundra .dijitSliderImageHandleV {
+	border:0;
+	width:16px;
+	height:16px;
+	background:url("../images/sliderThumb.png") no-repeat center center;
+}
+
+.tundra .dijitSliderFocused .dijitSliderImageHandleV {
+	background-image:url("../images/sliderThumbFocus.png");
+}
+.dj_ie6 .tundra .dijitSliderFocused .dijitSliderImageHandleV {
+	background-image:url("../images/sliderThumbFocus.gif");
+}
+
+.tundra .dijitSliderBottomBumper {
+	border-bottom-width: 1px;
+	border-color: #aab0bb;
+	background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left;
+}
+
+.tundra .dijitSliderTopBumper {
+	background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y top left;
+	border-color: #b4b4b4;
+	border-top-width: 1px;
+}
+
+.tundra .dijitSliderDecrementIconH,
+.tundra .dijitSliderDecrementIconV,
+.tundra .dijitSliderIncrementIconH,
+.tundra .dijitSliderIncrementIconV {
+	background-image: url('../images/spriteArrows.png');
+	background-repeat: no-repeat;
+	margin: 5px;
+	height: 7px;
+	width: 7px;
+	font-size: 1px;
+}
+.dj_ie6 .tundra .dijitSliderDecrementIconH,
+.dj_ie6 .tundra .dijitSliderDecrementIconV,
+.dj_ie6 .tundra .dijitSliderIncrementIconH,
+.dj_ie6 .tundra .dijitSliderIncrementIconV {
+	background-image: url('../images/spriteArrows.gif');
+}
+
+.tundra .dijitSliderDecrementIconH {
+	background-position: -7px 0;
+}
+.tundra .dijitSliderIncrementIconH {
+	background-position: -14px 0;
+}
+.tundra .dijitSliderDecrementIconV {
+	background-position: 0 0;
+}
+.tundra .dijitSliderIncrementIconV {
+	background-position: -21px 0;
+}
+
+.tundra .dijitSliderButtonInner {
+	visibility:hidden;
+}
+
+.tundra .dijitSliderReadOnly *,
+.tundra .dijitSliderDisabled * {
+	border-color: #d5d5d5 #bdbdbd #bdbdbd #d5d5d5;
+	color: #bdbdbd;
+}
+.tundra .dijitSliderReadOnly .dijitSliderDecrementIconH,
+.tundra .dijitSliderDisabled .dijitSliderDecrementIconH {
+	background-position: -35px 0;
+}
+.tundra .dijitSliderReadOnly .dijitSliderIncrementIconH,
+.tundra .dijitSliderDisabled .dijitSliderIncrementIconH {
+	background-position: -42px 0;
+}
+.tundra .dijitSliderReadOnly .dijitSliderDecrementIconV,
+.tundra .dijitSliderDisabled .dijitSliderDecrementIconV {
+	background-position: -28px 0;
+}
+.tundra .dijitSliderReadOnly .dijitSliderIncrementIconV,
+.tundra .dijitSliderDisabled .dijitSliderIncrementIconV {
+	background-position: -49px 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/tundra/form/Slider_rtl.css b/src/main/resources/static/dijit/themes/tundra/form/Slider_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..9375c4ecb3e0d7838585fd574a69740c3f0520c1
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/form/Slider_rtl.css
@@ -0,0 +1,31 @@
+.tundra .dijitSliderRtl .dijitSliderProgressBarH,
+.tundra .dijitSliderRtl .dijitSliderRemainingBarH,
+.tundra .dijitSliderRtl .dijitSliderLeftBumper,
+.tundra .dijitSliderRtl .dijitSliderRightBumper,
+.tundra .dijitSliderRtl .dijitSliderTopBumper {
+	background-position: top right;
+}
+
+.tundra .dijitSliderRtl .dijitSliderProgressBarV,
+.tundra .dijitSliderRtl .dijitSliderRemainingBarV,
+.tundra .dijitSliderRtl .dijitSliderBottomBumper {
+	background-position: bottom right;
+}
+
+.tundra .dijitSliderRtl .dijitSliderLeftBumper {
+	border-left-width: 0;
+	border-right-width: 1px;
+}
+
+.tundra .dijitSliderRtl .dijitSliderRightBumper {
+	border-left-width: 1px;
+	border-right-width: 0;
+}
+
+.tundra .dijitSliderRtl .dijitSliderIncrementIconH {
+	background-position: -7px 0;
+}
+
+.tundra .dijitSliderRtl .dijitSliderDecrementIconH {
+	background-position: -14px 0;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/images/accordionItemActive.gif b/src/main/resources/static/dijit/themes/tundra/images/accordionItemActive.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ccff3835a4335cd94adfca2d12f8f605f4c625cd
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/accordionItemActive.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/accordionItemHover.gif b/src/main/resources/static/dijit/themes/tundra/images/accordionItemHover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..96bd3a439aa739f71b47928ebe7972b31c180ec0
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/accordionItemHover.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/buttonActive.png b/src/main/resources/static/dijit/themes/tundra/images/buttonActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..3345c7ea8580d60f6dc6450f8b7efc15a6d7bf51
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/buttonActive.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/buttonDisabled.png b/src/main/resources/static/dijit/themes/tundra/images/buttonDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cf82db358aad62d7df9b8819ef671be853d3eae
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/buttonDisabled.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/buttonEnabled.png b/src/main/resources/static/dijit/themes/tundra/images/buttonEnabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4afbf060e94f010436644aaa29fe51afeecbdbe
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/buttonEnabled.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/buttonHover.png b/src/main/resources/static/dijit/themes/tundra/images/buttonHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f1e46ee42675daaddef7033bf20d1b0dd9f4b0c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/buttonHover.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/calendarDayLabel.png b/src/main/resources/static/dijit/themes/tundra/images/calendarDayLabel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebc08195fe50637eeea6ea78e42de6a9cd1766dd
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/calendarDayLabel.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/calendarMonthLabel.png b/src/main/resources/static/dijit/themes/tundra/images/calendarMonthLabel.png
new file mode 100644
index 0000000000000000000000000000000000000000..dca79c7f9222add329ce23d929c8b7b9ba21ebaa
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/calendarMonthLabel.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/calendarYearLabel.png b/src/main/resources/static/dijit/themes/tundra/images/calendarYearLabel.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c0d9590b4799659db3b3a7dd1db6171b8f1121c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/calendarYearLabel.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/checkmark.gif b/src/main/resources/static/dijit/themes/tundra/images/checkmark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ae6faa95abacc550e7a70e21906d97159167dd6c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/checkmark.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/checkmark.png b/src/main/resources/static/dijit/themes/tundra/images/checkmark.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c4b8319e543c368397a84a1eb946894c0e59ddd
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/checkmark.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/checkmarkNoBorder.gif b/src/main/resources/static/dijit/themes/tundra/images/checkmarkNoBorder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..324bfb3cd35ca828bb25b3d690f8a29a902a4cb7
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/checkmarkNoBorder.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/checkmarkNoBorder.png b/src/main/resources/static/dijit/themes/tundra/images/checkmarkNoBorder.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae3271a17b87a3c70010f57ffd12cd213c82068d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/checkmarkNoBorder.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/circleIcon.gif b/src/main/resources/static/dijit/themes/tundra/images/circleIcon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d582290a556336a15cbfaf32b7679f8845a50132
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/circleIcon.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/circleIcon.png b/src/main/resources/static/dijit/themes/tundra/images/circleIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e414a8938b00dc261acb949da3ec2e37327fea30
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/circleIcon.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/comboArrowDown.gif b/src/main/resources/static/dijit/themes/tundra/images/comboArrowDown.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e00a87b36ab1b596dfe61d49af171b3a452f027f
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/comboArrowDown.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/dijitProgressBarAnim.gif b/src/main/resources/static/dijit/themes/tundra/images/dijitProgressBarAnim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..167a3e0d5d6052990938d0dedf9aff5d37a7cd26
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/dijitProgressBarAnim.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/dijitProgressBarAnim.psd b/src/main/resources/static/dijit/themes/tundra/images/dijitProgressBarAnim.psd
new file mode 100644
index 0000000000000000000000000000000000000000..0a7bf23a4bf663e3d893c270890452dcc628949f
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/dijitProgressBarAnim.psd differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/dndCopy.png b/src/main/resources/static/dijit/themes/tundra/images/dndCopy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a8b998f62899a642f6be3f4132132d1c12e237c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/dndCopy.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/dndMove.png b/src/main/resources/static/dijit/themes/tundra/images/dndMove.png
new file mode 100644
index 0000000000000000000000000000000000000000..8443d30342f0494cae909eeecdc9b6ad149f5e5a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/dndMove.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/dndNoCopy.png b/src/main/resources/static/dijit/themes/tundra/images/dndNoCopy.png
new file mode 100644
index 0000000000000000000000000000000000000000..64bf88b26a3ddeadf97755bc05ed83c47ecfe683
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/dndNoCopy.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/dndNoMove.png b/src/main/resources/static/dijit/themes/tundra/images/dndNoMove.png
new file mode 100644
index 0000000000000000000000000000000000000000..682ea1025b914e20e041ddff88a5ef651a7fbb91
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/dndNoMove.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/dojoTundraGradientBg.gif b/src/main/resources/static/dijit/themes/tundra/images/dojoTundraGradientBg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0da12393b3b94174a900fc06715629bdf5ec502d
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/dojoTundraGradientBg.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/dojoTundraGradientBg.png b/src/main/resources/static/dijit/themes/tundra/images/dojoTundraGradientBg.png
new file mode 100644
index 0000000000000000000000000000000000000000..577ca8ad29d4b67d4ff0716972bf8ac66e88eba4
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/dojoTundraGradientBg.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/doubleArrowDown.png b/src/main/resources/static/dijit/themes/tundra/images/doubleArrowDown.png
new file mode 100644
index 0000000000000000000000000000000000000000..c50d096d274b66ac46c97332ad41e736d65ae7de
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/doubleArrowDown.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/doubleArrowUp.png b/src/main/resources/static/dijit/themes/tundra/images/doubleArrowUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b33768f5df43370beb4052c0fc1bfa8239bf5a4c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/doubleArrowUp.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/folderClosed.gif b/src/main/resources/static/dijit/themes/tundra/images/folderClosed.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9d5fcbc6d6cfe07fcb7b310feb9753741b537b56
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/folderClosed.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/folderOpened.gif b/src/main/resources/static/dijit/themes/tundra/images/folderOpened.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a514c7bf11cebdd290bccfe459c402386ef524fa
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/folderOpened.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/i.gif b/src/main/resources/static/dijit/themes/tundra/images/i.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ebd95a7aa9075cb7b9902aa4b5a6981f6bafaa8a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/i.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/i_half.gif b/src/main/resources/static/dijit/themes/tundra/images/i_half.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2947c4fa17501eaa1b477e6010d122d1e358c3ee
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/i_half.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/i_half_rtl.gif b/src/main/resources/static/dijit/themes/tundra/images/i_half_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4f60ec444d7d5b84976d54505f3e3de038aeb300
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/i_half_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/i_rtl.gif b/src/main/resources/static/dijit/themes/tundra/images/i_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7dafaadefc7ac7281911c6c36cacebc5bb718923
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/i_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/leaf.gif b/src/main/resources/static/dijit/themes/tundra/images/leaf.gif
new file mode 100644
index 0000000000000000000000000000000000000000..85b017810f2927d14f63bbed423f34874083456c
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/leaf.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/loading.gif b/src/main/resources/static/dijit/themes/tundra/images/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a42980f291d3a248263a93ad2ae94756219d957f
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/loading.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/menu.png b/src/main/resources/static/dijit/themes/tundra/images/menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a6e08b7b8178ed4b869d4b9dd618d5720ef5dbb
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/menu.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/minusButton.gif b/src/main/resources/static/dijit/themes/tundra/images/minusButton.gif
new file mode 100644
index 0000000000000000000000000000000000000000..48d5172470f250383e7696c7b61c727b9df06eb0
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/minusButton.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/no.gif b/src/main/resources/static/dijit/themes/tundra/images/no.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9021a14e210b1107b48bcd16a637aed335ddb3d2
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/no.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/noX.gif b/src/main/resources/static/dijit/themes/tundra/images/noX.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a16dc7957f4d6e7f0d6f222995a28149c549a45
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/noX.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/plusButton.gif b/src/main/resources/static/dijit/themes/tundra/images/plusButton.gif
new file mode 100644
index 0000000000000000000000000000000000000000..103c021daa0668c5b0ba53ac0bace43eb1f1f7ee
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/plusButton.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/popupMenuBg.gif b/src/main/resources/static/dijit/themes/tundra/images/popupMenuBg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..15f4f1b8cbe5e43760e98033b66e57d56cc6fbb6
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/popupMenuBg.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumb.gif b/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..15d4879cb706ec4d466150ea2710a0cfea8ddb50
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumb.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumb.png b/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..94b7fea1629f24f4fad51f045b9ea406f65714f4
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumb.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumbFocus.gif b/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumbFocus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b44611c7c75004e3144140e51337239b1734cd72
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumbFocus.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumbFocus.png b/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumbFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5d24aecfbd8d81d0827a41d874abbba54c1a646
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/preciseSliderThumbFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-1.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0a637414ba6e7cdcd594d08e2c47a5017cb2a3a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-1.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-2.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b57a54e04e8544e28a4d13eb194a5570f441f39
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-2.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-3.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea034dcc05d342b32acb922d7c8407b001f43401
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-3.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-4.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..f151405c38a1bc2ef01d729ddaa8867c27a3f3ed
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-4.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-5.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..49c2851cae4bda948f575035c149873ce5ecb1f3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-5.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-6.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee20a821ae03f127d59e931ab2a8dbfd18ec1076
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-6.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-7.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..0092fc3dbb4b611f4e63c4807279641aa825016f
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-7.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-8.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..e971938334e62dea1be6426e550d6932060d5f34
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-8.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-9.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-9.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e60dc8f4b42e35ab59cd0c71098c6d4d6f192c9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim-9.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim.gif b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d3df139dcec6d74a38d67a78ace35f274e0e7b0e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim.psd b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim.psd
new file mode 100644
index 0000000000000000000000000000000000000000..0a7bf23a4bf663e3d893c270890452dcc628949f
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarAnim.psd differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarEmpty.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarEmpty.png
new file mode 100644
index 0000000000000000000000000000000000000000..690c74d258c5860bea58e6a51cb9d48e1144b83e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarEmpty.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/progressBarFull.png b/src/main/resources/static/dijit/themes/tundra/images/progressBarFull.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a30708a9a4429fede2918d6f5ea5b3821d28e79
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/progressBarFull.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/radioButtonActive.png b/src/main/resources/static/dijit/themes/tundra/images/radioButtonActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..4090fb84dd811f63788f4210bd5cdba1776e2d20
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/radioButtonActive.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/radioButtonActiveDisabled.png b/src/main/resources/static/dijit/themes/tundra/images/radioButtonActiveDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..981ffb0ec66b5387d7522c61197d35c112ae5788
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/radioButtonActiveDisabled.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/radioButtonActiveHover.png b/src/main/resources/static/dijit/themes/tundra/images/radioButtonActiveHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..387c4960409608d5813e73cde3e72d1fd64913f2
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/radioButtonActiveHover.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/radioButtonDisabled.png b/src/main/resources/static/dijit/themes/tundra/images/radioButtonDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4d2b48e55f677e74cd461dbc4e870f9689010b0
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/radioButtonDisabled.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/radioButtonEnabled.png b/src/main/resources/static/dijit/themes/tundra/images/radioButtonEnabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd5acdebd5ef8dffd80097fbaf47eb3199faf12f
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/radioButtonEnabled.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/radioButtonHover.png b/src/main/resources/static/dijit/themes/tundra/images/radioButtonHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..9160aed2175a183f1549bf77a5ea0036a7beee4b
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/radioButtonHover.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/sliderEmpty.png b/src/main/resources/static/dijit/themes/tundra/images/sliderEmpty.png
new file mode 100644
index 0000000000000000000000000000000000000000..01871229e309d664552fab18770a3935137cb6f3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/sliderEmpty.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/sliderEmptyVertical.png b/src/main/resources/static/dijit/themes/tundra/images/sliderEmptyVertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..98e5cd74005e3b501c404e9422f884b4f7b570e3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/sliderEmptyVertical.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/sliderFull.png b/src/main/resources/static/dijit/themes/tundra/images/sliderFull.png
new file mode 100644
index 0000000000000000000000000000000000000000..032dba68f88ba5a4ab63f8f460714b0968bec0b5
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/sliderFull.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/sliderFullFocus.png b/src/main/resources/static/dijit/themes/tundra/images/sliderFullFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..018590df413a96229c34b7551ccd556a184bf52a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/sliderFullFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/sliderFullVertical.png b/src/main/resources/static/dijit/themes/tundra/images/sliderFullVertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..63edc758733f0019b67fafec67e7b2560da110ca
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/sliderFullVertical.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/sliderFullVerticalFocus.png b/src/main/resources/static/dijit/themes/tundra/images/sliderFullVerticalFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..806399cc13ab5a11442d3b60a6e4ffe180a10d1e
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/sliderFullVerticalFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/sliderThumb.png b/src/main/resources/static/dijit/themes/tundra/images/sliderThumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..b790c44c01d0dbd3e4b2cb02c42dc0a1de41d0c1
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/sliderThumb.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/sliderThumbFocus.gif b/src/main/resources/static/dijit/themes/tundra/images/sliderThumbFocus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..15dd3d9d6d436e5dd34abaee247fc9ee99fef804
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/sliderThumbFocus.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/sliderThumbFocus.png b/src/main/resources/static/dijit/themes/tundra/images/sliderThumbFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a253b09c5bf9a58416f2841fc459d9b30d8c26cd
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/sliderThumbFocus.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/smallArrowDown.png b/src/main/resources/static/dijit/themes/tundra/images/smallArrowDown.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b92a81cc28dec363ca79bf437dfebbbed7f5d84
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/smallArrowDown.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/smallArrowUp.png b/src/main/resources/static/dijit/themes/tundra/images/smallArrowUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4412e7ca9380c5e2984a2db0e97241f1f9ebb9d0
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/smallArrowUp.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerH-thumb.png b/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerH-thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b1fff80ec5cfec7d4eaea761792b173df2cc971
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerH-thumb.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerH.png b/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerH.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1d05ea1bee244747ab8c663d026e6e6806ca87f
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerH.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerV-thumb.png b/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerV-thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..75676d5daeef49084a5d5997d4799d894cd7eb92
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerV-thumb.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerV.png b/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerV.png
new file mode 100644
index 0000000000000000000000000000000000000000..c03ac3748c977fbbd6f7187f00615b01d29f0e04
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/splitContainerSizerV.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/spriteArrows.gif b/src/main/resources/static/dijit/themes/tundra/images/spriteArrows.gif
new file mode 100644
index 0000000000000000000000000000000000000000..56a37f43b68b62aa112bf4259dd545218010dc55
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/spriteArrows.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/spriteArrows.png b/src/main/resources/static/dijit/themes/tundra/images/spriteArrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ad349845fc4ff4d926e594a1137a9b03a0c0aa0
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/spriteArrows.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/spriteRoundedIconsSmall.gif b/src/main/resources/static/dijit/themes/tundra/images/spriteRoundedIconsSmall.gif
new file mode 100644
index 0000000000000000000000000000000000000000..251389a285e06380d4e8eda1ff98e6679c817fbd
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/spriteRoundedIconsSmall.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/spriteRoundedIconsSmall.png b/src/main/resources/static/dijit/themes/tundra/images/spriteRoundedIconsSmall.png
new file mode 100644
index 0000000000000000000000000000000000000000..baea73d2843a8267eb6144e63bde5b334cb5b9b2
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/spriteRoundedIconsSmall.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tabActive.png b/src/main/resources/static/dijit/themes/tundra/images/tabActive.png
new file mode 100644
index 0000000000000000000000000000000000000000..935db38f4fe198eb1481eab0a77f366c13264bce
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tabActive.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tabClose.gif b/src/main/resources/static/dijit/themes/tundra/images/tabClose.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2cb0ee1fa95af8fa6b9514effea35c4acd040137
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tabClose.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tabClose.png b/src/main/resources/static/dijit/themes/tundra/images/tabClose.png
new file mode 100644
index 0000000000000000000000000000000000000000..56578b86821f181dd0ca092d431fa859cfced0d2
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tabClose.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tabCloseHover.gif b/src/main/resources/static/dijit/themes/tundra/images/tabCloseHover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f59471e6e5c172e25bc2787fa2bf857713eed9a9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tabCloseHover.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tabCloseHover.png b/src/main/resources/static/dijit/themes/tundra/images/tabCloseHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..b034608646f239a1c6fbba969a5610b3d9d10b63
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tabCloseHover.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tabDisabled.png b/src/main/resources/static/dijit/themes/tundra/images/tabDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ba3bf56c2cf06f28344fc138a9563fb9421abd9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tabDisabled.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tabEnabled.png b/src/main/resources/static/dijit/themes/tundra/images/tabEnabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac44db072f0fb8b473308c521e4f905c67cefe25
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tabEnabled.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tabHover.gif b/src/main/resources/static/dijit/themes/tundra/images/tabHover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..471e0eee2fac9c182ac1a7bb89b23da88ebcd002
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tabHover.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tabHover.png b/src/main/resources/static/dijit/themes/tundra/images/tabHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a38f5d7d4c4c007661f1ccbd23b83e30bccd6a7
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tabHover.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/titleBar.png b/src/main/resources/static/dijit/themes/tundra/images/titleBar.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4de748d449266b9b5819f5bf2b3b1703c99d3b3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/titleBar.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/titleBarBg.gif b/src/main/resources/static/dijit/themes/tundra/images/titleBarBg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1cd57cf5a31eab4b72317876fdb2ffa1962600fc
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/titleBarBg.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorDown.gif b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorDown.gif
new file mode 100644
index 0000000000000000000000000000000000000000..18b27951a621432e00f27efc7da9255b450df227
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorDown.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorDown.png b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorDown.png
new file mode 100644
index 0000000000000000000000000000000000000000..074b0317fbbc826a80e4e9891d9b51624addb830
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorDown.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorLeft.gif b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorLeft.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3d9cbc5428b5cd1bf2237ca5f355d524b622991a
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorLeft.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorLeft.png b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorLeft.png
new file mode 100644
index 0000000000000000000000000000000000000000..abd7ff66266f3d4f7977a6c9d569124594641458
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorLeft.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorRight.gif b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorRight.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b887f790414a5e3e0c59ea936e195c22acaa7ed
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorRight.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorRight.png b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorRight.png
new file mode 100644
index 0000000000000000000000000000000000000000..9015f6b838b7e3c4799bd12e675e22cbad32a5df
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorRight.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorUp.gif b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorUp.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d0cad8a2c694781f7780013125dc5431e83ad196
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorUp.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorUp.png b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b54760fd1372ec99df1c66a4fe91a2a41664b369
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/tooltipConnectorUp.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/treeExpand_leaf.gif b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_leaf.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4b1c6c1560194b74d2d2707f527782478cacac89
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_leaf.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b563d7c6c0f906680c0b2abace4d0c57e6c2edfa
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/treeExpand_loading.gif b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4254ecf6bb5c56012027fb118a9fefedc9fa45bd
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_loading.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/treeExpand_minus.gif b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_minus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5977782378ff197130fda60586c23fb92fe6d322
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_minus.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/treeExpand_minus_rtl.gif b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_minus_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cf50054b6f6ac005e5a3e6f65cab6a9b89f7eb38
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_minus_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/treeExpand_mius.gif b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_mius.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5977782378ff197130fda60586c23fb92fe6d322
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_mius.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/treeExpand_plus.gif b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_plus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b96a555275b95cedd35c2997dd205ce69499972
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_plus.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/treeExpand_plus_rtl.gif b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_plus_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..11f9916748ec622755203971e2ee90e502d08c62
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/treeExpand_plus_rtl.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/treeHover.png b/src/main/resources/static/dijit/themes/tundra/images/treeHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4d5d5700750c9c33171b5bbc8998e4c182b1cfc
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/treeHover.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/validationInputBg.gif b/src/main/resources/static/dijit/themes/tundra/images/validationInputBg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5a9916a66e3ca1e403742442f25f2712ccc8dca3
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/validationInputBg.gif differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/validationInputBg.png b/src/main/resources/static/dijit/themes/tundra/images/validationInputBg.png
new file mode 100644
index 0000000000000000000000000000000000000000..47b236f9b1a02d5836bb86a93ac25930b56b8bc1
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/validationInputBg.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/images/warning.png b/src/main/resources/static/dijit/themes/tundra/images/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..07cabeae1065d71cf6724e9e14fd268c7b1672f9
Binary files /dev/null and b/src/main/resources/static/dijit/themes/tundra/images/warning.png differ
diff --git a/src/main/resources/static/dijit/themes/tundra/layout/AccordionContainer.css b/src/main/resources/static/dijit/themes/tundra/layout/AccordionContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..c5621efab25a40f0e6e832734da24b283a1e1528
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/layout/AccordionContainer.css
@@ -0,0 +1,26 @@
+/* Accordion */
+
+.tundra .dijitAccordionContainer {
+	border-color: #ccc;
+	background-color: #fff;
+}
+
+/* common */
+
+.tundra .dijitAccordionTitle {
+	background:#fafafa url("../images/titleBar.png") repeat-x bottom left;
+	border-top: 1px solid #bfbfbf;
+	padding: 4px 4px 4px 8px;
+}
+
+.tundra .dijitAccordionTitleHover  {
+	background: #f8fafd url("../images/accordionItemHover.gif") bottom repeat-x;
+}
+
+.tundra .dijitAccordionTitleSelected  {
+	background: #f9f9f9 url("../images/accordionItemActive.gif") bottom repeat-x;
+	font-weight: bold;
+	border-top: 1px solid #aaaaaa;
+	border-bottom: 1px solid #bfbfbf;
+	padding: 4px 4px 4px 8px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/tundra/layout/BorderContainer.css b/src/main/resources/static/dijit/themes/tundra/layout/BorderContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..0dd1b1b5131cc0732cedb04aaf75a6d0b6995c41
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/layout/BorderContainer.css
@@ -0,0 +1,69 @@
+/* BorderContainer */
+
+.tundra .dijitBorderContainer {
+	background-color: #fcfcfc;
+	padding: 5px;
+}
+
+.tundra .dijitSplitContainer-child,
+.tundra .dijitBorderContainer-child {
+	/* By default put borders on all children of BorderContainer,
+	 *  to give illusion of borders on the splitters themselves.
+	 */
+	border: 1px #ccc solid;
+}
+
+.tundra .dijitBorderContainer-dijitTabContainerTop,
+.tundra .dijitBorderContainer-dijitTabContainerBottom,
+.tundra .dijitBorderContainer-dijitTabContainerLeft,
+.tundra .dijitBorderContainer-dijitTabContainerRight {
+	/* except that TabContainer defines borders on it's sub-nodes (tablist and dijitTabPaneWrapper),
+	 * so override rule setting border on domNode
+	 */
+	 border: none;
+}
+
+.tundra .dijitBorderContainer-dijitBorderContainer {
+	/* also, make nested BorderContainers look like a single big widget with lots of splitters */
+	border: none;
+	padding: 0;
+}
+
+.tundra .dijitSplitterH,
+.tundra .dijitGutterH {
+	background:#fcfcfc;
+	border:0;
+	height:5px;
+}
+
+.tundra .dijitSplitterH .dijitSplitterThumb {
+	background:#B0B0B0 none;
+	height:1px;
+	top:2px;
+	width:19px;
+}
+
+.tundra .dijitSplitterV,
+.tundra .dijitGutterV {
+	background:#fcfcfc;
+	border:0;
+	width:5px;
+}
+
+.tundra .dijitSplitterV .dijitSplitterThumb {
+	background:#B0B0B0 none;
+	height:19px;
+	left:2px;
+	width:1px;
+}
+
+/* active splitter */
+.tundra .dijitSplitterActive {
+	font-size: 1px;
+	background-image: none;
+	background-color: #aaa;
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+	filter: Alpha(Opacity=60);
+	margin: 0;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/layout/ContentPane.css b/src/main/resources/static/dijit/themes/tundra/layout/ContentPane.css
new file mode 100644
index 0000000000000000000000000000000000000000..21d25d524814b0eaf63dd0ff41aae51513e17206
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/layout/ContentPane.css
@@ -0,0 +1,21 @@
+/* ContentPane */
+
+.tundra .dijitContentPane {
+	padding: 0;
+}
+
+/* nested layouts */
+.tundra .dijitTabContainerTop-dijitContentPane,
+.tundra .dijitTabContainerLeft-dijitContentPane,
+.tundra .dijitTabContainerBottom-dijitContentPane,
+.tundra .dijitTabContainerRight-dijitContentPane,
+.tundra .dijitAccordionContainer-dijitContentPane {
+	background-color: #fff;
+	padding: 5px;
+}
+
+.tundra .dijitSplitContainer-dijitContentPane,
+.tundra .dijitBorderContainer-dijitContentPane {
+	background-color: #fff;		/* override background-color setting on parent .dijitBorderContainer */
+	padding: 5px;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/themes/tundra/layout/SplitContainer.css b/src/main/resources/static/dijit/themes/tundra/layout/SplitContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..5a3eed6c98f7a3eb5930cf7b352d8d92464b37ed
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/layout/SplitContainer.css
@@ -0,0 +1,31 @@
+.tundra .dijitSplitContainerSizerH {
+	background:url("../images/splitContainerSizerV.png") repeat-y #fff;
+	border:0;
+	border-left:1px solid #bfbfbf;
+	border-right:1px solid #bfbfbf;
+	width:7px;
+}
+
+.tundra .dijitSplitContainerSizerH .thumb {
+	background:url("../images/splitContainerSizerV-thumb.png") no-repeat #ccc;
+	left:1px;
+	width:3px;
+	height:19px;
+	overflow: hidden;
+}
+
+.tundra .dijitSplitContainerSizerV {
+	background:url("../images/splitContainerSizerH.png") repeat-x #fff;
+	border:0;
+	border-top:1px solid #bfbfbf;
+	border-bottom:1px solid #bfbfbf;
+	height:7px;
+}
+
+.tundra .dijitSplitContainerSizerV .thumb {
+	background:url("../images/splitContainerSizerH-thumb.png") no-repeat #ccc;
+	top:1px;
+	width:19px;
+	height:3px;
+	overflow: hidden;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/layout/TabContainer.css b/src/main/resources/static/dijit/themes/tundra/layout/TabContainer.css
new file mode 100644
index 0000000000000000000000000000000000000000..a6676c67323517eacf89cbd695c63be4ea79ca7b
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/layout/TabContainer.css
@@ -0,0 +1,319 @@
+/* Tabs, shared classes */
+.tundra .dijitTabPaneWrapper {
+	background:#fff;
+	border:1px solid #ccc;
+	margin: 0;
+	padding: 0;
+}
+
+.tundra .dijitTab {
+	line-height:normal;
+	margin-right:4px;	/* space between one tab and the next in top/bottom mode */
+    padding:2px 8px 2px 9px;
+	border:1px solid #ccc;
+	background:#e2e2e2 url("../images/tabEnabled.png") repeat-x;
+}
+
+.tundra .dijitTabSpacer {
+	display: none;
+}
+
+.tundra .dijitTabContainer .tabStripRBtn {
+	margin-right: 20px;
+}
+.tundra .dijitTabContainer .tabStripLBtn {
+	margin-left: 20px;
+}
+
+.tundra .nowrapTabStrip .dijitTab {
+	top: 2px;
+}
+.tundra .dijitTabContainerBottom .nowrapTabStrip .dijitTab {
+	top: 0;
+	bottom: 2px;
+}
+
+/* selected tab */
+.tundra .dijitTabChecked {
+	/* the selected tab (with or without hover) */
+	background-color:#fff;
+	border-color: #ccc;
+	background-image:none;
+}
+
+/* hovered tab */
+.tundra .dijitTabHover {
+	color: #243C5F;
+	border-top-color:#92a0b3;
+	border-left-color:#92a0b3;
+	border-right-color:#92a0b3;
+	border-bottom-color:#92a0b3;
+	background:#e2e2e2 url("../images/tabHover.gif") repeat-x;
+}
+
+.tundra .dijitTabContainerTop .dijitTabHover {
+	border-bottom-color:#ccc;
+}
+
+.tundra .dijitTabContainerBottom .dijitTabHover {
+	border-top-color:#ccc;
+}
+
+.tundra .dijitTabContainerLeft .dijitTabHover {
+	border-right-color:#ccc;
+}
+
+.tundra .dijitTabContainerRight .dijitTabHover {
+	border-left-color:#ccc;
+}
+
+.tundra .dijitTabContainer .dijitTabCheckedHover {
+	color: inherit;
+	border:1px solid #ccc;
+	background:#fff;
+}
+
+.tundra .dijitTab .tabLabel {
+	/* make sure tabs w/close button and w/out close button are same height, even w/small (<12px) font */
+	min-height: 12px;
+	display: inline-block;
+}
+
+/* Nested Tabs */
+
+.tundra .dijitTabContainerNested .dijitTabListWrapper {
+	height: auto;
+}
+
+.tundra .dijitTabContainerNested .dijitTabContainerTop-tabs {
+	border-bottom: 1px solid #CCC;
+}
+
+.tundra .dijitTabContainerTabListNested .dijitTab {
+	background: none;
+	border: none;
+	top: 0;		/* to override top: 1px/-1px for normal tabs */
+}
+
+.tundra .dijitTabContainerTabListNested .dijitTabHover .tabLabel {
+	text-decoration: underline;
+}
+.tundra .dijitTabContainerTabListNested .dijitTabChecked .tabLabel {
+	text-decoration: underline;
+	font-weight: bold;
+	/*background:#f3f3f3;*/
+}
+.tundra .dijitTabContainer .dijitTabPaneWrapperNested {
+	border: none;	/* prevent double border */
+}
+
+/* Close button */
+
+.tundra .dijitTabCloseButton {
+	background: url("../images/tabClose.png") no-repeat right top;
+	width: 12px;
+	height: 12px;
+}
+.dj_ie6 .tundra .dijitTabCloseButton {
+	background-image : url("../images/tabClose.gif");
+}
+
+.tundra .dijitTabCloseButtonHover {
+	background-image : url("../images/tabCloseHover.png");
+}
+.dj_ie6 .tundra .dijitTabCloseButtonHover {
+	background-image : url("../images/tabCloseHover.gif");
+}
+
+/* ================================ */
+/* top tabs */
+
+.tundra .dijitTabContainerTop-tabs {
+	margin-bottom: 0;
+	border-color: #cccccc;
+	padding-left: 3px;
+	background-position: bottom;
+}
+.tundra .dijitTabContainerTop-tabs .dijitTab {
+	top: 0;
+	margin-bottom: -1px;
+}
+
+/* top container */
+.tundra .dijitTabContainerTop-container {
+	border-top: none;
+}
+
+/* selected tab */
+.tundra .dijitTabContainerTop-tabs .dijitTabChecked {
+	border-bottom-color:white;
+}
+
+.tundra .dijitTabContainerTop-tabs,
+.tundra .dijitTabContainerBottom-tabs {
+	padding-left: 3px;
+	padding-right: 3px;
+}
+
+/* strip */
+.tundra .dijitTabContainerTopStrip {
+	border-top: 1px solid #CCC;
+	border-right: 1px solid #CCC;
+	border-left: 1px solid #CCC;
+	padding-top: 2px;
+	background: #f2f2f2;
+}
+
+.tundra .dijitTabContainerTopNone {
+	padding-top: 0;
+}
+
+
+/* ================================ */
+/* bottom tabs */
+.tundra .dijitTabContainerBottom-tabs {
+	margin-top: 0;
+	border-color: #cccccc;
+	background-position: top;
+	padding-left: 3px;
+}
+.tundra .dijitTabContainerBottom-tabs .dijitTab {
+	bottom: 0;
+	margin-top: -1px;
+}
+
+/* bottom container */
+.tundra .dijitTabContainerBottom-container {
+	border-bottom: none;
+}
+
+/* selected tab */
+.tundra .dijitTabContainerBottom-tabs .dijitTabChecked {
+	border-top-color:white;
+}
+
+/* strip */
+.tundra .dijitTabContainerBottomStrip {
+	padding-bottom: 2px;
+	border: 1px solid #ccc;
+	background: #f2f2f2;
+	border-top: none;
+}
+
+/* ================================ */
+/* right tabs */
+.tundra .dijitTabContainerRight-tabs {
+	border-color: #ccc;
+	height: 100%;
+	padding-top: 3px;
+}
+
+.tundra .dijitTabContainerRightStrip {
+	margin-left: -1px;
+}
+
+/* right container */
+.tundra .dijitTabContainerRight-container {
+	border-right: none;
+}
+
+/* selected tab */
+.tundra .dijitTabContainerRight-tabs .dijitTabChecked {
+	border-left-color:white;
+}
+
+/* strip */
+.tundra .dijitTabContainerRightStrip {
+	padding-right: 2px;
+	border: 1px solid #ccc;
+}
+
+.tundra .dijitTabContainerRightStrip {
+	background: #f2f2f2;
+}
+
+/* ================================ */
+/* left tabs */
+.tundra .dijitTabContainerLeft-tabs {
+	border-color: #ccc;
+	padding-top: 3px;
+	height: 100%;
+}
+
+/* left container */
+.tundra .dijitTabContainerLeft-container {
+	border-left: none;
+}
+
+/* selected tab */
+.tundra .dijitTabContainerLeft-tabs .dijitTabChecked {
+	border-right-color:white;
+}
+
+/* strip */
+.tundra .dijitTabContainerLeftStrip {
+	padding-left: 2px;
+	border: 1px solid #ccc;
+	background: #f2f2f2;
+	border-right: none;
+}
+
+/* ================================ */
+/* left/right tabs */
+.tundra .dijitTabContainerLeft-tabs .dijitTab,
+.tundra .dijitTabContainerRight-tabs .dijitTab {
+	margin-right:0;
+	margin-bottom:4px;	/* space between one tab and the next in left/right mode */
+}
+
+/* ================================ */
+
+/* this resets the tabcontainer stripe when within a contentpane */
+.tundra .dijitTabContainerTop-dijitContentPane .dijitTabContainerTop-tabs {
+	border-left: 0 solid #ccc;
+	border-top: 0 solid #ccc;
+	border-right: 0 solid #ccc;
+	padding-top: 0;
+	padding-left: 0;
+}
+
+/* ================================ */
+
+/* Menu and slider control styles */
+.tundra .dijitTabContainer .tabStripButton {
+	margin-right: 0;
+	padding-top: 2px;
+	z-index: 12;
+}
+
+.tundra .dijitTabContainerBottom .tabStripButton {
+	padding-top: 3px;
+}
+
+.tundra .tabStrip-disabled .tabStripButton {
+	padding-bottom: 3px;
+	padding-top: 1px;
+}
+
+.tundra .tabStripButton {
+	padding: 3px 2px 4px 2px;
+}
+
+.tundra .dijitTabStripIcon {
+	height: 14px;
+	width: 14px;
+	background: url(../images/spriteRoundedIconsSmall.png) no-repeat left top ;
+}
+
+.dj_ie6 .tundra .dijitTabStripIcon {
+	background-image: url(../images/spriteRoundedIconsSmall.gif);
+}
+
+.tundra .dijitTabStripSlideRightIcon {
+	background-position: -30px top;
+}
+
+.tundra .dijitTabStripMenuIcon {
+	background-position: -15px top;
+}
+
diff --git a/src/main/resources/static/dijit/themes/tundra/layout/TabContainer_rtl.css b/src/main/resources/static/dijit/themes/tundra/layout/TabContainer_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..6e5ba7580903aef4eab9da213aad065f49b75c88
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/layout/TabContainer_rtl.css
@@ -0,0 +1,3 @@
+.tundra .dijitTabRtl {
+	padding:2px 9px 2px 8px;
+}
diff --git a/src/main/resources/static/dijit/themes/tundra/tundra.css b/src/main/resources/static/dijit/themes/tundra/tundra.css
new file mode 100644
index 0000000000000000000000000000000000000000..f1d239c88078a51d137a1713620e312a1ec34625
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/tundra.css
@@ -0,0 +1,41 @@
+/*
+	Adds cosmetic styling to Dijit.  Users may swap with a custom theme CSS file.
+
+	NOTES:
+	---
+	Dialog.css contains css classes for both Dialog and Tooltip!
+	This because currently a dijit.TooltipDialog exist. Until this is resolved
+	you need to include Dialog.css for both dijits
+	---
+	Toolbar.css contains classes also used in Editor. Until this is resolved
+	you need to include Toolbar.css for both Toolbar and Editor
+	---
+	Button.css contains classes for combobox,
+
+*/
+@import url("../dijit.css");
+@import url("../../icons/commonIcons.css");/*sprite containing common icons to be used by all themes*/
+@import url("Common.css");
+@import url("layout/ContentPane.css");
+@import url("layout/TabContainer.css");
+@import url("layout/AccordionContainer.css");
+@import url("layout/SplitContainer.css");
+@import url("layout/BorderContainer.css");
+@import url("form/Common.css");
+@import url("form/Button.css");
+@import url("form/Checkbox.css");
+@import url("form/RadioButton.css");
+@import url("form/Slider.css");
+@import url("form/Select.css");
+@import url("Tree.css");
+@import url("ProgressBar.css");
+@import url("TitlePane.css");
+@import url("Calendar.css");
+@import url("TimePicker.css");
+@import url("Toolbar.css");
+@import url("Dialog.css");
+@import url("Menu.css");
+@import url("Editor.css");
+@import url("../../icons/editorIcons.css"); /* sprite for editor icons to be used by all themes */
+@import url("ColorPalette.css");
+@import url("tundra_rtl.css");
diff --git a/src/main/resources/static/dijit/themes/tundra/tundra_rtl.css b/src/main/resources/static/dijit/themes/tundra/tundra_rtl.css
new file mode 100644
index 0000000000000000000000000000000000000000..04372e3431d3fb7af9dee47a6c23e9ae497dd570
--- /dev/null
+++ b/src/main/resources/static/dijit/themes/tundra/tundra_rtl.css
@@ -0,0 +1,28 @@
+/*
+	Adds cosmetic styling to Dijit.  Users may swap with a custom theme CSS file.
+
+	NOTES:
+	---
+	Dialog.css contains css classes for both Dialog and Tooltip!
+	This because currently a dijit.TooltipDialog exist. Until this is resolved
+	you need to include Dialog.css for both dijits
+	---
+	Toolbar.css contains classes also used in Editor. Until this is resolved
+	you need to include Toolbar.css for both Toolbar and Editor
+	---
+	Button.css contains classes for combobox,
+
+*/
+/* RTL files */
+@import url("../dijit_rtl.css");
+@import url("Calendar_rtl.css");
+@import url("TimePicker_rtl.css");
+@import url("Dialog_rtl.css");
+@import url("Editor_rtl.css");
+@import url("../../icons/editorIcons_rtl.css");/* RTL sprite for editor icons to be used by all themes*/
+@import url("Menu_rtl.css");
+@import url("Tree_rtl.css");
+@import url("ProgressBar_rtl.css");
+@import url("TitlePane_rtl.css");
+@import url("layout/TabContainer_rtl.css");
+@import url("form/Slider_rtl.css");
diff --git a/src/main/resources/static/dijit/tree/ForestStoreModel.js b/src/main/resources/static/dijit/tree/ForestStoreModel.js
new file mode 100644
index 0000000000000000000000000000000000000000..0096ce4f652723470a10366128974dae6ffcad66
--- /dev/null
+++ b/src/main/resources/static/dijit/tree/ForestStoreModel.js
@@ -0,0 +1,279 @@
+define([
+	"dojo/_base/array", // array.indexOf array.some
+	"dojo/_base/declare", // declare
+	"dojo/_base/kernel", // global
+	"dojo/_base/lang", // lang.hitch
+	"./TreeStoreModel"
+], function(array, declare, kernel, lang, TreeStoreModel){
+
+// module:
+//		dijit/tree/ForestStoreModel
+
+return declare("dijit.tree.ForestStoreModel", TreeStoreModel, {
+	// summary:
+	//		Interface between a dijit.Tree and a dojo.data store that doesn't have a root item,
+	//		a.k.a. a store that has multiple "top level" items.
+	//
+	// description:
+	//		Use this class to wrap a dojo.data store, making all the items matching the specified query
+	//		appear as children of a fabricated "root item".  If no query is specified then all the
+	//		items returned by fetch() on the underlying store become children of the root item.
+	//		This class allows dijit.Tree to assume a single root item, even if the store doesn't have one.
+	//
+	//		When using this class the developer must override a number of methods according to their app and
+	//		data, including:
+	//
+	//		- onNewRootItem
+	//		- onAddToRoot
+	//		- onLeaveRoot
+	//		- onNewItem
+	//		- onSetItem
+
+	// Parameters to constructor
+
+	// rootId: String
+	//		ID of fabricated root item
+	rootId: "$root$",
+
+	// rootLabel: String
+	//		Label of fabricated root item
+	rootLabel: "ROOT",
+
+	// query: String
+	//		Specifies the set of children of the root item.
+	// example:
+	//	|	{type:'continent'}
+	query: null,
+
+	// End of parameters to constructor
+
+	constructor: function(params){
+		// summary:
+		//		Sets up variables, etc.
+		// tags:
+		//		private
+
+		// Make dummy root item
+		this.root = {
+			store: this,
+			root: true,
+			id: params.rootId,
+			label: params.rootLabel,
+			children: params.rootChildren	// optional param
+		};
+	},
+
+	// =======================================================================
+	// Methods for traversing hierarchy
+
+	mayHaveChildren: function(/*dojo/data/Item*/ item){
+		// summary:
+		//		Tells if an item has or may have children.  Implementing logic here
+		//		avoids showing +/- expando icon for nodes that we know don't have children.
+		//		(For efficiency reasons we may not want to check if an element actually
+		//		has children until user clicks the expando node)
+		// tags:
+		//		extension
+		return item === this.root || this.inherited(arguments);
+	},
+
+	getChildren: function(/*dojo/data/Item*/ parentItem, /*function(items)*/ callback, /*function*/ onError){
+		// summary:
+		//		Calls onComplete() with array of child items of given parent item, all loaded.
+		if(parentItem === this.root){
+			if(this.root.children){
+				// already loaded, just return
+				callback(this.root.children);
+			}else{
+				this.store.fetch({
+					query: this.query,
+					onComplete: lang.hitch(this, function(items){
+						this.root.children = items;
+						callback(items);
+					}),
+					onError: onError
+				});
+			}
+		}else{
+			this.inherited(arguments);
+		}
+	},
+
+	// =======================================================================
+	// Inspecting items
+
+	isItem: function(/* anything */ something){
+		return (something === this.root) ? true : this.inherited(arguments);
+	},
+
+	fetchItemByIdentity: function(/* object */ keywordArgs){
+		if(keywordArgs.identity == this.root.id){
+			var scope = keywordArgs.scope || kernel.global;
+			if(keywordArgs.onItem){
+				keywordArgs.onItem.call(scope, this.root);
+			}
+		}else{
+			this.inherited(arguments);
+		}
+	},
+
+	getIdentity: function(/* item */ item){
+		return (item === this.root) ? this.root.id : this.inherited(arguments);
+	},
+
+	getLabel: function(/* item */ item){
+		return	(item === this.root) ? this.root.label : this.inherited(arguments);
+	},
+
+	// =======================================================================
+	// Write interface
+
+	newItem: function(/* dijit/tree/dndSource.__Item */ args, /*Item*/ parent, /*int?*/ insertIndex){
+		// summary:
+		//		Creates a new item.   See dojo/data/api/Write for details on args.
+		//		Used in drag & drop when item from external source dropped onto tree.
+		if(parent === this.root){
+			this.onNewRootItem(args);
+			return this.store.newItem(args);
+		}else{
+			return this.inherited(arguments);
+		}
+	},
+
+	onNewRootItem: function(/* dijit/tree/dndSource.__Item */ /*===== args =====*/){
+		// summary:
+		//		User can override this method to modify a new element that's being
+		//		added to the root of the tree, for example to add a flag like root=true
+	},
+
+	pasteItem: function(/*Item*/ childItem, /*Item*/ oldParentItem, /*Item*/ newParentItem, /*Boolean*/ bCopy, /*int?*/ insertIndex){
+		// summary:
+		//		Move or copy an item from one parent item to another.
+		//		Used in drag & drop
+		if(oldParentItem === this.root){
+			if(!bCopy){
+				// It's onLeaveRoot()'s responsibility to modify the item so it no longer matches
+				// this.query... thus triggering an onChildrenChange() event to notify the Tree
+				// that this element is no longer a child of the root node
+				this.onLeaveRoot(childItem);
+			}
+		}
+		this.inherited(arguments, [childItem,
+			oldParentItem === this.root ? null : oldParentItem,
+			newParentItem === this.root ? null : newParentItem,
+			bCopy,
+			insertIndex
+		]);
+		if(newParentItem === this.root){
+			// It's onAddToRoot()'s responsibility to modify the item so it matches
+			// this.query... thus triggering an onChildrenChange() event to notify the Tree
+			// that this element is now a child of the root node
+			this.onAddToRoot(childItem);
+		}
+	},
+
+	// =======================================================================
+	// Handling for top level children
+
+	onAddToRoot: function(/* item */ item){
+		// summary:
+		//		Called when item added to root of tree; user must override this method
+		//		to modify the item so that it matches the query for top level items
+		// example:
+		//	|	store.setValue(item, "root", true);
+		// tags:
+		//		extension
+		console.log(this, ": item ", item, " added to root");
+	},
+
+	onLeaveRoot: function(/* item */ item){
+		// summary:
+		//		Called when item removed from root of tree; user must override this method
+		//		to modify the item so it doesn't match the query for top level items
+		// example:
+		//	|	store.unsetAttribute(item, "root");
+		// tags:
+		//		extension
+		console.log(this, ": item ", item, " removed from root");
+	},
+
+	// =======================================================================
+	// Events from data store
+
+	_requeryTop: function(){
+		// reruns the query for the children of the root node,
+		// sending out an onSet notification if those children have changed
+		var oldChildren = this.root.children || [];
+		this.store.fetch({
+			query: this.query,
+			onComplete: lang.hitch(this, function(newChildren){
+				this.root.children = newChildren;
+
+				// If the list of children or the order of children has changed...
+				if(oldChildren.length != newChildren.length ||
+					array.some(oldChildren, function(item, idx){ return newChildren[idx] != item;})){
+					this.onChildrenChange(this.root, newChildren);
+				}
+			})
+		});
+	},
+
+	onNewItem: function(/* dojo/data/api/Item */ item, /* Object */ parentInfo){
+		// summary:
+		//		Handler for when new items appear in the store.  Developers should override this
+		//		method to be more efficient based on their app/data.
+		// description:
+		//		Note that the default implementation requeries the top level items every time
+		//		a new item is created, since any new item could be a top level item (even in
+		//		addition to being a child of another item, since items can have multiple parents).
+		//
+		//		If developers can detect which items are possible top level items (based on the item and the
+		//		parentInfo parameters), they should override this method to only call _requeryTop() for top
+		//		level items.  Often all top level items have parentInfo==null, but
+		//		that will depend on which store you use and what your data is like.
+		// tags:
+		//		extension
+		this._requeryTop();
+
+		this.inherited(arguments);
+	},
+
+	onDeleteItem: function(/*Object*/ item){
+		// summary:
+		//		Handler for delete notifications from underlying store
+
+		// check if this was a child of root, and if so send notification that root's children
+		// have changed
+		if(array.indexOf(this.root.children, item) != -1){
+			this._requeryTop();
+		}
+
+		this.inherited(arguments);
+	},
+
+	onSetItem: function(/* item */ item,
+					/* attribute-name-string */ attribute,
+					/* Object|Array */ oldValue,
+					/* Object|Array */ newValue){
+		// summary:
+		//		Updates the tree view according to changes to an item in the data store.
+		//		Developers should override this method to be more efficient based on their app/data.
+		// description:
+		//		Handles updates to an item's children by calling onChildrenChange(), and
+		//		other updates to an item by calling onChange().
+		//
+		//		Also, any change to any item re-executes the query for the tree's top-level items,
+		//		since this modified item may have started/stopped matching the query for top level items.
+		//
+		//		If possible, developers should override this function to only call _requeryTop() when
+		//		the change to the item has caused it to stop/start being a top level item in the tree.
+		// tags:
+		//		extension
+
+		this._requeryTop();
+		this.inherited(arguments);
+	}
+
+});
+
+});
diff --git a/src/main/resources/static/dijit/tree/ObjectStoreModel.js b/src/main/resources/static/dijit/tree/ObjectStoreModel.js
new file mode 100644
index 0000000000000000000000000000000000000000..9123e065bcaac6a9bc5d3339173206becb5b49b0
--- /dev/null
+++ b/src/main/resources/static/dijit/tree/ObjectStoreModel.js
@@ -0,0 +1,296 @@
+define([
+	"dojo/_base/array", // array.filter array.forEach array.indexOf array.some
+	"dojo/aspect", // aspect.before, aspect.after
+	"dojo/_base/declare", // declare
+	"dojo/Deferred",
+	"dojo/_base/lang", // lang.hitch
+	"dojo/when",
+	"../Destroyable"
+], function(array, aspect, declare, Deferred, lang, when, Destroyable){
+
+	// module:
+	//		dijit/tree/ObjectStoreModel
+
+	return declare("dijit.tree.ObjectStoreModel", Destroyable, {
+		// summary:
+		//		Implements dijit/tree/model connecting dijit/Tree to a dojo/store/api/Store that implements
+		//		getChildren().
+		//
+		//		If getChildren() returns an array with an observe() method, then it will be leveraged to reflect
+		//		store updates to the tree.   So, this class will work best when:
+		//
+		//			1. the store implements dojo/store/Observable
+		//			2. getChildren() is implemented as a query to the server (i.e. it calls store.query())
+		//
+		//		Drag and Drop: To support drag and drop, besides implementing getChildren()
+		//		and dojo/store/Observable, the store must support the parent option to put().
+		//		And in order to have child elements ordered according to how the user dropped them,
+		//		put() must support the before option.
+
+		// store: dojo/store/api/Store
+		//		Underlying store
+		store: null,
+
+		// labelAttr: String
+		//		Get label for tree node from this attribute
+		labelAttr: "name",
+
+		// labelType: [const] String
+		//		Specifies how to interpret the labelAttr in the data store items.
+		//		Can be "html" or "text".
+		labelType: "text",
+
+		// root: [readonly] Object
+		//		Pointer to the root item from the dojo/store/api/Store (read only, not a parameter)
+		root: null,
+
+		// query: anything
+		//		Specifies datastore query to return the root item for the tree.
+		//		Must only return a single item.   Alternately can just pass in pointer
+		//		to root item.
+		// example:
+		//	|	{id:'ROOT'}
+		query: null,
+
+		constructor: function(/* Object */ args){
+			// summary:
+			//		Passed the arguments listed above (store, etc)
+			// tags:
+			//		private
+
+			lang.mixin(this, args);
+
+			// Map from id of each parent node to array of its children, or to Promise for that array of children.
+			this.childrenCache = {};
+		},
+
+		// =======================================================================
+		// Methods for traversing hierarchy
+
+		getRoot: function(onItem, onError){
+			// summary:
+			//		Calls onItem with the root item for the tree, possibly a fabricated item.
+			//		Calls onError on error.
+			if(this.root){
+				onItem(this.root);
+			}else{
+				var res = this.store.query(this.query);
+				if(res.then){
+					this.own(res);	// in case app calls destroy() before query completes
+				}
+
+				when(res,
+					lang.hitch(this, function(items){
+						//console.log("queried root: ", res);
+						if(items.length != 1){
+							throw new Error("dijit.tree.ObjectStoreModel: root query returned " + items.length +
+								" items, but must return exactly one");
+						}
+						this.root = items[0];
+						onItem(this.root);
+
+						// Setup listener to detect if root item changes
+						if(res.observe){
+							res.observe(lang.hitch(this, function(obj){
+								// Presumably removedFrom == insertedInto == 1, and this call indicates item has changed.
+								//console.log("root changed: ", obj);
+								this.onChange(obj);
+							}), true);	// true to listen for updates to obj
+						}
+					}),
+					onError
+				);
+			}
+		},
+
+		mayHaveChildren: function(/*===== item =====*/){
+			// summary:
+			//		Tells if an item has or might have children.  Implementing logic here
+			//		avoids showing +/- expando icon for nodes that we know won't have children.
+			//		(For efficiency reasons we may not want to check if an element actually
+			//		has children until user clicks the expando node).
+			//
+			//		Application code should override this method based on the data, for example
+			//		it could be `return item.leaf == true;`.
+			//
+			//		Note that mayHaveChildren() must return true for an item if it could possibly
+			//		have children in the future, due to drag-an-drop or some other data store update.
+			//		Also note that it may return true if it's just too expensive to check during tree
+			//		creation whether or not the item has children.
+			// item: Object
+			//		Item from the dojo/store
+			return true;
+		},
+
+		getChildren: function(/*Object*/ parentItem, /*function(items)*/ onComplete, /*function*/ onError){
+			// summary:
+			//		Calls onComplete() with array of child items of given parent item.
+			// parentItem:
+			//		Item from the dojo/store
+
+			// TODO:
+			// For 2.0, change getChildren(), getRoot(), etc. to return a cancelable promise, rather than taking
+			// onComplete() and onError() callbacks.   Also, probably get rid of the caching.
+			//
+			// But be careful if we continue to maintain ObjectStoreModel as a separate class
+			// from Tree, because in that case ObjectStoreModel can be shared by two trees, and destroying one tree
+			// should not interfere with an in-progress getChildren() call from another tree.  Also, need to make
+			// sure that multiple calls to getChildren() for the same parentItem don't trigger duplicate calls
+			// to onChildrenChange() and onChange().
+			//
+			// I think for 2.0 though that ObjectStoreModel should be rolled into Tree itself.
+
+			var id = this.store.getIdentity(parentItem);
+
+			if(this.childrenCache[id]){
+				// If this.childrenCache[id] is defined, then it always has the latest list of children
+				// (like a live collection), so just return it.
+				when(this.childrenCache[id], onComplete, onError);
+				return;
+			}
+
+			// Query the store.
+			// Cache result so that we can close the query on destroy(), and to avoid setting up multiple observers
+			// when getChildren() is called multiple times for the same parent.
+			// The only problem is that getChildren() on non-Observable stores may return a stale value.
+			var res = this.childrenCache[id] = this.store.getChildren(parentItem);
+			if(res.then){
+				this.own(res);	// in case app calls destroy() before query completes
+			}
+
+			// Setup observer in case children list changes, or the item(s) in the children list are updated.
+			if(res.observe){
+				this.own(res.observe(lang.hitch(this, function(obj, removedFrom, insertedInto){
+					//console.log("observe on children of ", id, ": ", obj, removedFrom, insertedInto);
+
+					// If removedFrom == insertedInto, this call indicates that the item has changed.
+					// Even if removedFrom != insertedInto, the item may have changed.
+					this.onChange(obj);
+
+					if(removedFrom != insertedInto){
+						// Indicates an item was added, removed, or re-parented.  The children[] array (returned from
+						// res.then(...)) has already been updated (like a live collection), so just use it.
+						when(res, lang.hitch(this, "onChildrenChange", parentItem));
+					}
+				}), true));	// true means to notify on item changes
+			}
+
+			// User callback
+			when(res, onComplete, onError);
+		},
+
+		// =======================================================================
+		// Inspecting items
+
+		isItem: function(/*===== something =====*/){
+			return true;	// Boolean
+		},
+
+		getIdentity: function(/* item */ item){
+			return this.store.getIdentity(item);	// Object
+		},
+
+		getLabel: function(/*dojo/data/Item*/ item){
+			// summary:
+			//		Get the label for an item
+			return item[this.labelAttr];	// String
+		},
+
+		// =======================================================================
+		// Write interface, for DnD
+
+		newItem: function(/* dijit/tree/dndSource.__Item */ args, /*Item*/ parent, /*int?*/ insertIndex, /*Item*/ before){
+			// summary:
+			//		Creates a new item.   See `dojo/data/api/Write` for details on args.
+			//		Used in drag & drop when item from external source dropped onto tree.
+
+			return this.store.put(args, {
+				parent: parent,
+				before: before
+			});
+		},
+
+		pasteItem: function(/*Item*/ childItem, /*Item*/ oldParentItem, /*Item*/ newParentItem,
+					/*Boolean*/ bCopy, /*int?*/ insertIndex, /*Item*/ before){
+			// summary:
+			//		Move or copy an item from one parent item to another.
+			//		Used in drag & drop.
+
+			var d = new Deferred();
+
+			if(oldParentItem === newParentItem && !bCopy && !before){
+				// Avoid problem when items visually disappear when dropped onto their parent.
+				// Happens because the (no-op) store.put() call doesn't generate any notification
+				// that the childItem was added/moved.
+				d.resolve(true);
+				return d;
+			}
+
+			if(oldParentItem && !bCopy){
+				// In order for DnD moves to work correctly, childItem needs to be orphaned from oldParentItem
+				// before being adopted by newParentItem.   That way, the TreeNode is moved rather than
+				// an additional TreeNode being created, and the old TreeNode subsequently being deleted.
+				// The latter loses information such as selection and opened/closed children TreeNodes.
+				// Unfortunately simply calling this.store.put() will send notifications in a random order, based
+				// on when the TreeNodes in question originally appeared, and not based on the drag-from
+				// TreeNode vs. the drop-onto TreeNode.
+
+				this.getChildren(oldParentItem, lang.hitch(this, function(oldParentChildren){
+					oldParentChildren = [].concat(oldParentChildren); // concat to make copy
+					var index = array.indexOf(oldParentChildren, childItem);
+					oldParentChildren.splice(index, 1);
+					this.onChildrenChange(oldParentItem, oldParentChildren);
+
+					d.resolve(this.store.put(childItem, {
+						overwrite: true,
+						parent: newParentItem,
+						oldParent: oldParentItem,
+						before: before
+					}));
+				}));
+			}else{
+				d.resolve(this.store.put(childItem, {
+					overwrite: true,
+					parent: newParentItem,
+					oldParent: oldParentItem,
+					before: before
+				}));
+			}
+
+			return d;
+		},
+
+		// =======================================================================
+		// Callbacks
+
+		onChange: function(/*dojo/data/Item*/ /*===== item =====*/){
+			// summary:
+			//		Callback whenever an item has changed, so that Tree
+			//		can update the label, icon, etc.   Note that changes
+			//		to an item's children or parent(s) will trigger an
+			//		onChildrenChange() so you can ignore those changes here.
+			// tags:
+			//		callback
+		},
+
+		onChildrenChange: function(/*===== parent, newChildrenList =====*/){
+			// summary:
+			//		Callback to do notifications about new, updated, or deleted items.
+			// parent: dojo/data/Item
+			// newChildrenList: Object[]
+			//		Items from the store
+			// tags:
+			//		callback
+		},
+
+		onDelete: function(/*dojo/data/Item*/ /*===== item =====*/){
+			// summary:
+			//		Callback when an item has been deleted.
+			//		Actually we have no way of knowing this with the new dojo.store API,
+			//		so this method is never called (but it's left here since Tree connects
+			//		to it).
+			// tags:
+			//		callback
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/tree/TreeStoreModel.js b/src/main/resources/static/dijit/tree/TreeStoreModel.js
new file mode 100644
index 0000000000000000000000000000000000000000..36556ddc714e4f691ae94b3f665493d54af3ace9
--- /dev/null
+++ b/src/main/resources/static/dijit/tree/TreeStoreModel.js
@@ -0,0 +1,387 @@
+define([
+	"dojo/_base/array", // array.filter array.forEach array.indexOf array.some
+	"dojo/aspect", // aspect.after
+	"dojo/_base/declare", // declare
+	"dojo/_base/lang" // lang.hitch
+], function(array, aspect, declare, lang){
+
+	// module:
+	//		dijit/tree/TreeStoreModel
+
+	return declare("dijit.tree.TreeStoreModel", null, {
+		// summary:
+		//		Implements dijit/Tree/model connecting to a dojo.data store with a single
+		//		root item.  Any methods passed into the constructor will override
+		//		the ones defined here.
+
+		// store: dojo/data/api/Read
+		//		Underlying store
+		store: null,
+
+		// childrenAttrs: String[]
+		//		One or more attribute names (attributes in the dojo.data item) that specify that item's children
+		childrenAttrs: ["children"],
+
+		// newItemIdAttr: String
+		//		Name of attribute in the Object passed to newItem() that specifies the id.
+		//
+		//		If newItemIdAttr is set then it's used when newItem() is called to see if an
+		//		item with the same id already exists, and if so just links to the old item
+		//		(so that the old item ends up with two parents).
+		//
+		//		Setting this to null or "" will make every drop create a new item.
+		newItemIdAttr: "id",
+
+		// labelAttr: String
+		//		If specified, get label for tree node from this attribute, rather
+		//		than by calling store.getLabel()
+		labelAttr: "",
+
+		// root: [readonly] dojo/data/Item
+		//		Pointer to the root item (read only, not a parameter)
+		root: null,
+
+		// query: anything
+		//		Specifies datastore query to return the root item for the tree.
+		//		Must only return a single item.   Alternately can just pass in pointer
+		//		to root item.
+		// example:
+		//	|	{id:'ROOT'}
+		query: null,
+
+		// deferItemLoadingUntilExpand: Boolean
+		//		Setting this to true will cause the TreeStoreModel to defer calling loadItem on nodes
+		//		until they are expanded. This allows for lazying loading where only one
+		//		loadItem (and generally one network call, consequently) per expansion
+		//		(rather than one for each child).
+		//		This relies on partial loading of the children items; each children item of a
+		//		fully loaded item should contain the label and info about having children.
+		deferItemLoadingUntilExpand: false,
+
+		constructor: function(/* Object */ args){
+			// summary:
+			//		Passed the arguments listed above (store, etc)
+			// tags:
+			//		private
+
+			lang.mixin(this, args);
+
+			this.connects = [];
+
+			var store = this.store;
+			if(!store.getFeatures()['dojo.data.api.Identity']){
+				throw new Error("dijit.tree.TreeStoreModel: store must support dojo.data.Identity");
+			}
+
+			// if the store supports Notification, subscribe to the notification events
+			if(store.getFeatures()['dojo.data.api.Notification']){
+				this.connects = this.connects.concat([
+					aspect.after(store, "onNew", lang.hitch(this, "onNewItem"), true),
+					aspect.after(store, "onDelete", lang.hitch(this, "onDeleteItem"), true),
+					aspect.after(store, "onSet", lang.hitch(this, "onSetItem"), true)
+				]);
+			}
+		},
+
+		destroy: function(){
+			var h;
+			while(h = this.connects.pop()){ h.remove(); }
+			// TODO: should cancel any in-progress processing of getRoot(), getChildren()
+		},
+
+		// =======================================================================
+		// Methods for traversing hierarchy
+
+		getRoot: function(onItem, onError){
+			// summary:
+			//		Calls onItem with the root item for the tree, possibly a fabricated item.
+			//		Calls onError on error.
+			if(this.root){
+				onItem(this.root);
+			}else{
+				this.store.fetch({
+					query: this.query,
+					onComplete: lang.hitch(this, function(items){
+						if(items.length != 1){
+							throw new Error("dijit.tree.TreeStoreModel: root query returned " + items.length +
+								" items, but must return exactly one");
+						}
+						this.root = items[0];
+						onItem(this.root);
+					}),
+					onError: onError
+				});
+			}
+		},
+
+		mayHaveChildren: function(/*dojo/data/Item*/ item){
+			// summary:
+			//		Tells if an item has or may have children.  Implementing logic here
+			//		avoids showing +/- expando icon for nodes that we know don't have children.
+			//		(For efficiency reasons we may not want to check if an element actually
+			//		has children until user clicks the expando node)
+			return array.some(this.childrenAttrs, function(attr){
+				return this.store.hasAttribute(item, attr);
+			}, this);
+		},
+
+		getChildren: function(/*dojo/data/Item*/ parentItem, /*function(items)*/ onComplete, /*function*/ onError){
+			// summary:
+			//		Calls onComplete() with array of child items of given parent item, all loaded.
+
+			var store = this.store;
+			if(!store.isItemLoaded(parentItem)){
+				// The parent is not loaded yet, we must be in deferItemLoadingUntilExpand
+				// mode, so we will load it and just return the children (without loading each
+				// child item)
+				var getChildren = lang.hitch(this, arguments.callee);
+				store.loadItem({
+					item: parentItem,
+					onItem: function(parentItem){
+						getChildren(parentItem, onComplete, onError);
+					},
+					onError: onError
+				});
+				return;
+			}
+			// get children of specified item
+			var childItems = [];
+			for(var i=0; i<this.childrenAttrs.length; i++){
+				var vals = store.getValues(parentItem, this.childrenAttrs[i]);
+				childItems = childItems.concat(vals);
+			}
+
+			// count how many items need to be loaded
+			var _waitCount = 0;
+			if(!this.deferItemLoadingUntilExpand){
+				array.forEach(childItems, function(item){ if(!store.isItemLoaded(item)){ _waitCount++; } });
+			}
+
+			if(_waitCount == 0){
+				// all items are already loaded (or we aren't loading them).  proceed...
+				onComplete(childItems);
+			}else{
+				// still waiting for some or all of the items to load
+				array.forEach(childItems, function(item, idx){
+					if(!store.isItemLoaded(item)){
+						store.loadItem({
+							item: item,
+							onItem: function(item){
+								childItems[idx] = item;
+								if(--_waitCount == 0){
+									// all nodes have been loaded, send them to the tree
+									onComplete(childItems);
+								}
+							},
+							onError: onError
+						});
+					}
+				});
+			}
+		},
+
+		// =======================================================================
+		// Inspecting items
+
+		isItem: function(/* anything */ something){
+			return this.store.isItem(something);	// Boolean
+		},
+
+		fetchItemByIdentity: function(/* object */ keywordArgs){
+			// summary:
+			//		Given the identity of an item, this method returns the item that has
+			//		that identity through the onItem callback.  Conforming implementations
+			//		should return null if there is no item with the given identity.
+			//		Implementations of fetchItemByIdentity() may sometimes return an item
+			//		from a local cache and may sometimes fetch an item from a remote server.
+			// tags:
+			//		extension
+			this.store.fetchItemByIdentity(keywordArgs);
+		},
+
+		getIdentity: function(/* item */ item){
+			return this.store.getIdentity(item);	// Object
+		},
+
+		getLabel: function(/*dojo/data/Item*/ item){
+			// summary:
+			//		Get the label for an item
+			if(this.labelAttr){
+				return this.store.getValue(item,this.labelAttr);	// String
+			}else{
+				return this.store.getLabel(item);	// String
+			}
+		},
+
+		// =======================================================================
+		// Write interface
+
+		newItem: function(/* dijit/tree/dndSource.__Item */ args, /*dojo/data/api/Item*/ parent, /*int?*/ insertIndex){
+			// summary:
+			//		Creates a new item.   See `dojo/data/api/Write` for details on args.
+			//		Used in drag & drop when item from external source dropped onto tree.
+			// description:
+			//		Developers will need to override this method if new items get added
+			//		to parents with multiple children attributes, in order to define which
+			//		children attribute points to the new item.
+
+			var pInfo = {parent: parent, attribute: this.childrenAttrs[0]}, LnewItem;
+
+			if(this.newItemIdAttr && args[this.newItemIdAttr]){
+				// Maybe there's already a corresponding item in the store; if so, reuse it.
+				this.fetchItemByIdentity({identity: args[this.newItemIdAttr], scope: this, onItem: function(item){
+					if(item){
+						// There's already a matching item in store, use it
+						this.pasteItem(item, null, parent, true, insertIndex);
+					}else{
+						// Create new item in the tree, based on the drag source.
+						LnewItem=this.store.newItem(args, pInfo);
+						if(LnewItem && (insertIndex!=undefined)){
+							// Move new item to desired position
+							this.pasteItem(LnewItem, parent, parent, false, insertIndex);
+						}
+					}
+				}});
+			}else{
+				// [as far as we know] there is no id so we must assume this is a new item
+				LnewItem=this.store.newItem(args, pInfo);
+				if(LnewItem && (insertIndex!=undefined)){
+					// Move new item to desired position
+					this.pasteItem(LnewItem, parent, parent, false, insertIndex);
+				}
+			}
+		},
+
+		pasteItem: function(/*Item*/ childItem, /*Item*/ oldParentItem, /*Item*/ newParentItem, /*Boolean*/ bCopy, /*int?*/ insertIndex){
+			// summary:
+			//		Move or copy an item from one parent item to another.
+			//		Used in drag & drop
+			var store = this.store,
+				parentAttr = this.childrenAttrs[0];	// name of "children" attr in parent item
+
+			// remove child from source item, and record the attribute that child occurred in
+			if(oldParentItem){
+				array.forEach(this.childrenAttrs, function(attr){
+					if(store.containsValue(oldParentItem, attr, childItem)){
+						if(!bCopy){
+							var values = array.filter(store.getValues(oldParentItem, attr), function(x){
+								return x != childItem;
+							});
+							store.setValues(oldParentItem, attr, values);
+						}
+						parentAttr = attr;
+					}
+				});
+			}
+
+			// modify target item's children attribute to include this item
+			if(newParentItem){
+				if(typeof insertIndex == "number"){
+					// call slice() to avoid modifying the original array, confusing the data store
+					var childItems = store.getValues(newParentItem, parentAttr).slice();
+					childItems.splice(insertIndex, 0, childItem);
+					store.setValues(newParentItem, parentAttr, childItems);
+				}else{
+					store.setValues(newParentItem, parentAttr,
+						store.getValues(newParentItem, parentAttr).concat(childItem));
+				}
+			}
+		},
+
+		// =======================================================================
+		// Callbacks
+
+		onChange: function(/*dojo/data/Item*/ /*===== item =====*/){
+			// summary:
+			//		Callback whenever an item has changed, so that Tree
+			//		can update the label, icon, etc.   Note that changes
+			//		to an item's children or parent(s) will trigger an
+			//		onChildrenChange() so you can ignore those changes here.
+			// tags:
+			//		callback
+		},
+
+		onChildrenChange: function(/*===== parent, newChildrenList =====*/){
+			// summary:
+			//		Callback to do notifications about new, updated, or deleted items.
+			// parent: dojo/data/Item
+			// newChildrenList: dojo/data/Item[]
+			// tags:
+			//		callback
+		},
+
+		onDelete: function(/*dojo/data/Item*/ /*===== item =====*/){
+			// summary:
+			//		Callback when an item has been deleted.
+			// description:
+			//		Note that there will also be an onChildrenChange() callback for the parent
+			//		of this item.
+			// tags:
+			//		callback
+		},
+
+		// =======================================================================
+		// Events from data store
+
+		onNewItem: function(/* dojo/data/Item */ item, /* Object */ parentInfo){
+			// summary:
+			//		Handler for when new items appear in the store, either from a drop operation
+			//		or some other way.   Updates the tree view (if necessary).
+			// description:
+			//		If the new item is a child of an existing item,
+			//		calls onChildrenChange() with the new list of children
+			//		for that existing item.
+			//
+			// tags:
+			//		extension
+
+			// We only care about the new item if it has a parent that corresponds to a TreeNode
+			// we are currently displaying
+			if(!parentInfo){
+				return;
+			}
+
+			// Call onChildrenChange() on parent (ie, existing) item with new list of children
+			// In the common case, the new list of children is simply parentInfo.newValue or
+			// [ parentInfo.newValue ], although if items in the store has multiple
+			// child attributes (see `childrenAttr`), then it's a superset of parentInfo.newValue,
+			// so call getChildren() to be sure to get right answer.
+			this.getChildren(parentInfo.item, lang.hitch(this, function(children){
+				this.onChildrenChange(parentInfo.item, children);
+			}));
+		},
+
+		onDeleteItem: function(/*Object*/ item){
+			// summary:
+			//		Handler for delete notifications from underlying store
+			this.onDelete(item);
+		},
+
+		onSetItem: function(item, attribute /*===== , oldValue, newValue =====*/){
+			// summary:
+			//		Updates the tree view according to changes in the data store.
+			// description:
+			//		Handles updates to an item's children by calling onChildrenChange(), and
+			//		other updates to an item by calling onChange().
+			//
+			//		See `onNewItem` for more details on handling updates to an item's children.
+			// item: Item
+			// attribute: attribute-name-string
+			// oldValue: Object|Array
+			// newValue: Object|Array
+			// tags:
+			//		extension
+
+			if(array.indexOf(this.childrenAttrs, attribute) != -1){
+				// item's children list changed
+				this.getChildren(item, lang.hitch(this, function(children){
+					// See comments in onNewItem() about calling getChildren()
+					this.onChildrenChange(item, children);
+				}));
+			}else{
+				// item's label/icon/etc. changed.
+				this.onChange(item);
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/tree/_dndContainer.js b/src/main/resources/static/dijit/tree/_dndContainer.js
new file mode 100644
index 0000000000000000000000000000000000000000..4492074fe7f9ef291f48f8bffc10e1e33f1da073
--- /dev/null
+++ b/src/main/resources/static/dijit/tree/_dndContainer.js
@@ -0,0 +1,163 @@
+define([
+	"dojo/aspect", // aspect.after
+	"dojo/_base/declare", // declare
+	"dojo/dom-class", // domClass.add domClass.remove domClass.replace
+	"dojo/_base/lang", // lang.mixin lang.hitch
+	"dojo/on",
+	"dojo/touch"
+], function(aspect, declare, domClass, lang, on, touch){
+
+	// module:
+	//		dijit/tree/_dndContainer
+
+	/*=====
+	 var __Args = {
+	 // summary:
+	 //		A dict of parameters for Tree source configuration.
+	 // isSource: Boolean?
+	 //		Can be used as a DnD source. Defaults to true.
+	 // accept: String[]
+	 //		List of accepted types (text strings) for a target; defaults to
+	 //		["text", "treeNode"]
+	 // copyOnly: Boolean?
+	 //		Copy items, if true, use a state of Ctrl key otherwise,
+	 // dragThreshold: Number
+	 //		The move delay in pixels before detecting a drag; 0 by default
+	 // betweenThreshold: Integer
+	 //		Distance from upper/lower edge of node to allow drop to reorder nodes
+	 };
+	 =====*/
+
+	return declare("dijit.tree._dndContainer", null, {
+
+		// summary:
+		//		This is a base class for `dijit/tree/_dndSelector`, and isn't meant to be used directly.
+		//		It's modeled after `dojo/dnd/Container`.
+		// tags:
+		//		protected
+
+		/*=====
+		 // current: TreeNode
+		 //		The currently hovered TreeNode.  Not set to anything for keyboard operation.  (TODO: change?)
+		 current: null,
+		 =====*/
+
+		constructor: function(tree, params){
+			// summary:
+			//		A constructor of the Container
+			// tree: Node
+			//		Node or node's id to build the container on
+			// params: __Args
+			//		A dict of parameters, which gets mixed into the object
+			// tags:
+			//		private
+			this.tree = tree;
+			this.node = tree.domNode;	// TODO: rename; it's not a TreeNode but the whole Tree
+			lang.mixin(this, params);
+
+			// states
+			this.containerState = "";
+			domClass.add(this.node, "dojoDndContainer");
+
+			// set up events
+			this.events = [
+				// Mouse (or touch) enter/leave on Tree itself
+				on(this.node, touch.enter, lang.hitch(this, "onOverEvent")),
+				on(this.node, touch.leave, lang.hitch(this, "onOutEvent")),
+
+				// switching between TreeNodes
+				aspect.after(this.tree, "_onNodeMouseEnter", lang.hitch(this, "onMouseOver"), true),
+				aspect.after(this.tree, "_onNodeMouseLeave", lang.hitch(this, "onMouseOut"), true),
+
+				// cancel text selection and text dragging
+				on(this.node, "dragstart, selectstart", function(evt){
+					evt.preventDefault();
+				})
+			];
+		},
+
+		destroy: function(){
+			// summary:
+			//		Prepares this object to be garbage-collected
+
+			var h;
+			while(h = this.events.pop()){
+				h.remove();
+			}
+
+			// this.clearItems();
+			this.node = this.parent = null;
+		},
+
+		// mouse events
+		onMouseOver: function(widget /*===== , evt =====*/){
+			// summary:
+			//		Called when mouse is moved over a TreeNode
+			// widget: TreeNode
+			// evt: Event
+			// tags:
+			//		protected
+			this.current = widget;
+		},
+
+		onMouseOut: function(/*===== widget, evt =====*/){
+			// summary:
+			//		Called when mouse is moved away from a TreeNode
+			// widget: TreeNode
+			// evt: Event
+			// tags:
+			//		protected
+			this.current = null;
+		},
+
+		_changeState: function(type, newState){
+			// summary:
+			//		Changes a named state to new state value
+			// type: String
+			//		A name of the state to change
+			// newState: String
+			//		new state
+			var prefix = "dojoDnd" + type;
+			var state = type.toLowerCase() + "State";
+			//domClass.replace(this.node, prefix + newState, prefix + this[state]);
+			domClass.replace(this.node, prefix + newState, prefix + this[state]);
+			this[state] = newState;
+		},
+
+		_addItemClass: function(node, type){
+			// summary:
+			//		Adds a class with prefix "dojoDndItem"
+			// node: Node
+			//		A node
+			// type: String
+			//		A variable suffix for a class name
+			domClass.add(node, "dojoDndItem" + type);
+		},
+
+		_removeItemClass: function(node, type){
+			// summary:
+			//		Removes a class with prefix "dojoDndItem"
+			// node: Node
+			//		A node
+			// type: String
+			//		A variable suffix for a class name
+			domClass.remove(node, "dojoDndItem" + type);
+		},
+
+		onOverEvent: function(){
+			// summary:
+			//		This function is called once, when mouse is over our container
+			// tags:
+			//		protected
+			this._changeState("Container", "Over");
+		},
+
+		onOutEvent: function(){
+			// summary:
+			//		This function is called once, when mouse is out of our container
+			// tags:
+			//		protected
+			this._changeState("Container", "");
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/tree/_dndSelector.js b/src/main/resources/static/dijit/tree/_dndSelector.js
new file mode 100644
index 0000000000000000000000000000000000000000..7bbb1f843ee55103404d43f63fe1d124c1ac931f
--- /dev/null
+++ b/src/main/resources/static/dijit/tree/_dndSelector.js
@@ -0,0 +1,364 @@
+define([
+	"dojo/_base/array", // array.filter array.forEach array.map
+	"dojo/_base/declare", // declare
+	"dojo/_base/kernel",	// global
+	"dojo/_base/lang", // lang.hitch
+	"dojo/dnd/common",
+	"dojo/dom", // isDescendant
+	"dojo/mouse", // mouse.isLeft
+	"dojo/on",
+	"dojo/touch",
+	"../a11yclick",
+	"./_dndContainer"
+], function(array, declare, kernel, lang, dndCommon, dom, mouse, on, touch, a11yclick, _dndContainer){
+
+	// module:
+	//		dijit/tree/_dndSelector
+
+	return declare("dijit.tree._dndSelector", _dndContainer, {
+		// summary:
+		//		This is a base class for `dijit/tree/dndSource`, and isn't meant to be used directly.
+		//		It's based on `dojo/dnd/Selector`.
+		// tags:
+		//		protected
+
+		/*=====
+		// selection: Object
+		//		(id to DomNode) map for every TreeNode that's currently selected.
+		//		The DOMNode is the TreeNode.rowNode.
+		selection: {},
+		=====*/
+
+		constructor: function(){
+			// summary:
+			//		Initialization
+			// tags:
+			//		private
+
+			this.selection={};
+			this.anchor = null;
+
+			this.events.push(
+				// listeners setup here but no longer used (left for backwards compatibility
+				on(this.tree.domNode, touch.press, lang.hitch(this,"onMouseDown")),
+				on(this.tree.domNode, touch.release, lang.hitch(this,"onMouseUp")),
+
+				// listeners used in this module
+				on(this.tree.domNode, touch.move, lang.hitch(this,"onMouseMove")),
+				on(this.tree.domNode, a11yclick.press, lang.hitch(this,"onClickPress")),
+				on(this.tree.domNode, a11yclick.release, lang.hitch(this,"onClickRelease"))
+			);
+		},
+
+		// singular: Boolean
+		//		Allows selection of only one element, if true.
+		//		Tree hasn't been tested in singular=true mode, unclear if it works.
+		singular: false,
+
+		// methods
+		getSelectedTreeNodes: function(){
+			// summary:
+			//		Returns a list of selected node(s).
+			//		Used by dndSource on the start of a drag.
+			// tags:
+			//		protected
+			var nodes=[], sel = this.selection;
+			for(var i in sel){
+				nodes.push(sel[i]);
+			}
+			return nodes;
+		},
+
+		selectNone: function(){
+			// summary:
+			//		Unselects all items
+			// tags:
+			//		private
+
+			this.setSelection([]);
+			return this;	// self
+		},
+
+		destroy: function(){
+			// summary:
+			//		Prepares the object to be garbage-collected
+			this.inherited(arguments);
+			this.selection = this.anchor = null;
+		},
+		addTreeNode: function(/*dijit/Tree._TreeNode*/ node, /*Boolean?*/isAnchor){
+			// summary:
+			//		add node to current selection
+			// node: Node
+			//		node to add
+			// isAnchor: Boolean
+			//		Whether the node should become anchor.
+
+			this.setSelection(this.getSelectedTreeNodes().concat( [node] ));
+			if(isAnchor){ this.anchor = node; }
+			return node;
+		},
+		removeTreeNode: function(/*dijit/Tree._TreeNode*/ node){
+			// summary:
+			//		remove node and it's descendants from current selection
+			// node: Node
+			//		node to remove
+			var newSelection = array.filter(this.getSelectedTreeNodes(), function(selectedNode){
+				return !dom.isDescendant(selectedNode.domNode, node.domNode); // also matches when selectedNode == node
+			});
+			this.setSelection(newSelection);
+			return node;
+		},
+		isTreeNodeSelected: function(/*dijit/Tree._TreeNode*/ node){
+			// summary:
+			//		return true if node is currently selected
+			// node: Node
+			//		the node to check whether it's in the current selection
+
+			return node.id && !!this.selection[node.id];
+		},
+		setSelection: function(/*dijit/Tree._TreeNode[]*/ newSelection){
+			// summary:
+			//		set the list of selected nodes to be exactly newSelection. All changes to the
+			//		selection should be passed through this function, which ensures that derived
+			//		attributes are kept up to date. Anchor will be deleted if it has been removed
+			//		from the selection, but no new anchor will be added by this function.
+			// newSelection: Node[]
+			//		list of tree nodes to make selected
+			var oldSelection = this.getSelectedTreeNodes();
+			array.forEach(this._setDifference(oldSelection, newSelection), lang.hitch(this, function(node){
+				node.setSelected(false);
+				if(this.anchor == node){
+					delete this.anchor;
+				}
+				delete this.selection[node.id];
+			}));
+			array.forEach(this._setDifference(newSelection, oldSelection), lang.hitch(this, function(node){
+				node.setSelected(true);
+				this.selection[node.id] = node;
+			}));
+			this._updateSelectionProperties();
+		},
+		_setDifference: function(xs,ys){
+			// summary:
+			//		Returns a copy of xs which lacks any objects
+			//		occurring in ys. Checks for membership by
+			//		modifying and then reading the object, so it will
+			//		not properly handle sets of numbers or strings.
+
+			array.forEach(ys, function(y){ y.__exclude__ = true; });
+			var ret = array.filter(xs, function(x){ return !x.__exclude__; });
+
+			// clean up after ourselves.
+			array.forEach(ys, function(y){ delete y['__exclude__'] });
+			return ret;
+		},
+		_updateSelectionProperties: function(){
+			// summary:
+			//		Update the following tree properties from the current selection:
+			//		path[s], selectedItem[s], selectedNode[s]
+
+			var selected = this.getSelectedTreeNodes();
+			var paths = [], nodes = [];
+			array.forEach(selected, function(node){
+				var ary = node.getTreePath();
+				nodes.push(node);
+				paths.push(ary);
+			}, this);
+			var items = array.map(nodes,function(node){ return node.item; });
+			this.tree._set("paths", paths);
+			this.tree._set("path", paths[0] || []);
+			this.tree._set("selectedNodes", nodes);
+			this.tree._set("selectedNode", nodes[0] || null);
+			this.tree._set("selectedItems", items);
+			this.tree._set("selectedItem", items[0] || null);
+		},
+
+		// selection related events
+		onClickPress: function(e){
+			// summary:
+			//		Event processor for onmousedown/ontouchstart/onkeydown corresponding to a click event
+			// e: Event
+			//		onmousedown/ontouchstart/onkeydown event
+			// tags:
+			//		protected
+
+			// ignore mouse or touch on expando node
+			if(this.current && this.current.isExpandable && this.tree.isExpandoNode(e.target, this.current)){ return; }
+
+			if(e.type == "mousedown" && mouse.isLeft(e)){
+				// Prevent text selection while dragging on desktop, see #16328.   But don't call preventDefault()
+				// for mobile because it will break things completely, see #15838.  Also, don't preventDefault() on
+				// MSPointerDown or pointerdown events, because that stops the mousedown event from being generated,
+				// see #17709.
+				// TODO: remove this completely in 2.0.  It shouldn't be needed since dojo/dnd/Manager already
+				// calls preventDefault() for the "selectstart" event.  It can also be achieved via CSS:
+				// http://stackoverflow.com/questions/826782/css-rule-to-disable-text-selection-highlighting
+				e.preventDefault();
+			}
+
+			var treeNode = e.type == "keydown" ? this.tree.focusedChild : this.current;
+
+			if(!treeNode){
+				// Click must be on the Tree but not on a TreeNode, happens especially when Tree is stretched to fill
+				// a pane of a BorderContainer, etc.
+				return;
+			}
+
+			var copy = dndCommon.getCopyKeyState(e), id = treeNode.id;
+
+			// if shift key is not pressed, and the node is already in the selection,
+			// delay deselection until onmouseup so in the case of DND, deselection
+			// will be canceled by onmousemove.
+			if(!this.singular && !e.shiftKey && this.selection[id]){
+				this._doDeselect = true;
+				return;
+			}else{
+				this._doDeselect = false;
+			}
+			this.userSelect(treeNode, copy, e.shiftKey);
+		},
+
+		onClickRelease: function(e){
+			// summary:
+			//		Event processor for onmouseup/ontouchend/onkeyup corresponding to a click event
+			// e: Event
+			//		onmouseup/ontouchend/onkeyup event
+			// tags:
+			//		protected
+
+			// _doDeselect is the flag to indicate that the user wants to either ctrl+click on
+			// an already selected item (to deselect the item), or click on a not-yet selected item
+			// (which should remove all current selection, and add the clicked item). This can not
+			// be done in onMouseDown, because the user may start a drag after mousedown. By moving
+			// the deselection logic here, the user can drag an already selected item.
+			if(!this._doDeselect){ return; }
+			this._doDeselect = false;
+			this.userSelect(e.type == "keyup" ? this.tree.focusedChild : this.current, dndCommon.getCopyKeyState(e), e.shiftKey);
+		},
+		onMouseMove: function(/*===== e =====*/){
+			// summary:
+			//		event processor for onmousemove/ontouchmove
+			// e: Event
+			//		onmousemove/ontouchmove event
+			this._doDeselect = false;
+		},
+
+		// mouse/touch events that are no longer used
+		onMouseDown: function(){
+			// summary:
+			//		Event processor for onmousedown/ontouchstart
+			// e: Event
+			//		onmousedown/ontouchstart event
+			// tags:
+			//		protected
+		},
+		onMouseUp: function(){
+			// summary:
+			//		Event processor for onmouseup/ontouchend
+			// e: Event
+			//		onmouseup/ontouchend event
+			// tags:
+			//		protected
+		},
+
+		_compareNodes: function(n1, n2){
+			if(n1 === n2){
+				return 0;
+			}
+
+			if('sourceIndex' in document.documentElement){ //IE
+				//TODO: does not yet work if n1 and/or n2 is a text node
+				return n1.sourceIndex - n2.sourceIndex;
+			}else if('compareDocumentPosition' in document.documentElement){ //FF, Opera
+				return n1.compareDocumentPosition(n2) & 2 ? 1: -1;
+			}else if(document.createRange){ //Webkit
+				var r1 = doc.createRange();
+				r1.setStartBefore(n1);
+
+				var r2 = doc.createRange();
+				r2.setStartBefore(n2);
+
+				return r1.compareBoundaryPoints(r1.END_TO_END, r2);
+			}else{
+				throw Error("dijit.tree._compareNodes don't know how to compare two different nodes in this browser");
+			}
+		},
+
+		userSelect: function(node, multi, range){
+			// summary:
+			//		Add or remove the given node from selection, responding
+			//		to a user action such as a click or keypress.
+			// multi: Boolean
+			//		Indicates whether this is meant to be a multi-select action (e.g. ctrl-click)
+			// range: Boolean
+			//		Indicates whether this is meant to be a ranged action (e.g. shift-click)
+			// tags:
+			//		protected
+
+			if(this.singular){
+				if(this.anchor == node && multi){
+					this.selectNone();
+				}else{
+					this.setSelection([node]);
+					this.anchor = node;
+				}
+			}else{
+				if(range && this.anchor){
+					var cr = this._compareNodes(this.anchor.rowNode, node.rowNode),
+					begin, end, anchor = this.anchor;
+
+					if(cr < 0){ //current is after anchor
+						begin = anchor;
+						end = node;
+					}else{ //current is before anchor
+						begin = node;
+						end = anchor;
+					}
+					var nodes = [];
+					//add everything betweeen begin and end inclusively
+					while(begin != end){
+						nodes.push(begin);
+						begin = this.tree._getNext(begin);
+					}
+					nodes.push(end);
+
+					this.setSelection(nodes);
+				}else{
+					if( this.selection[ node.id ] && multi ){
+						this.removeTreeNode( node );
+					}else if(multi){
+						this.addTreeNode(node, true);
+					}else{
+						this.setSelection([node]);
+						this.anchor = node;
+					}
+				}
+			}
+		},
+
+		getItem: function(/*String*/ key){
+			// summary:
+			//		Returns the dojo/dnd/Container._Item (representing a dragged node) by it's key (id).
+			//		Called by dojo/dnd/Source.checkAcceptance().
+			// tags:
+			//		protected
+
+			var widget = this.selection[key];
+			return {
+				data: widget,
+				type: ["treeNode"]
+			}; // dojo/dnd/Container._Item
+		},
+
+		forInSelectedItems: function(/*Function*/ f, /*Object?*/ o){
+			// summary:
+			//		Iterates over selected items;
+			//		see `dojo/dnd/Container.forInItems()` for details
+			o = o || kernel.global;
+			for(var id in this.selection){
+				// console.log("selected item id: " + id);
+				f.call(o, this.getItem(id), id, this);
+			}
+		}
+	});
+});
diff --git a/src/main/resources/static/dijit/tree/dndSource.js b/src/main/resources/static/dijit/tree/dndSource.js
new file mode 100644
index 0000000000000000000000000000000000000000..5fee69d4e0e4d95bcacb164c267d7a7f456cb7b4
--- /dev/null
+++ b/src/main/resources/static/dijit/tree/dndSource.js
@@ -0,0 +1,584 @@
+define([
+	"dojo/_base/array", // array.forEach array.indexOf array.map
+	"dojo/_base/declare", // declare
+	"dojo/dnd/common",
+	"dojo/dom-class", // domClass.add
+	"dojo/dom-geometry", // domGeometry.position
+	"dojo/_base/lang", // lang.mixin lang.hitch
+	"dojo/mouse",
+	"dojo/on", // subscribe
+	"dojo/touch",
+	"dojo/topic",
+	"dojo/dnd/Manager", // DNDManager.manager
+	"./_dndSelector"
+], function(array, declare, dndCommon, domClass, domGeometry, lang, mouse, on, touch, topic, DNDManager, _dndSelector){
+
+	// module:
+	//		dijit/tree/dndSource
+
+	/*=====
+	var __Item = {
+		// summary:
+		//		New item to be added to the Tree, like:
+		// id: Anything
+		id: "",
+		// name: String
+		name: ""
+	};
+	=====*/
+
+	var dndSource = declare("dijit.tree.dndSource", _dndSelector, {
+		// summary:
+		//		Handles drag and drop operations (as a source or a target) for `dijit.Tree`
+
+		// isSource: Boolean
+		//		Can be used as a DnD source.
+		isSource: true,
+
+		// accept: String[]
+		//		List of accepted types (text strings) for the Tree; defaults to
+		//		["text"]
+		accept: ["text", "treeNode"],
+
+		// copyOnly: [private] Boolean
+		//		Copy items, if true, use a state of Ctrl key otherwise
+		copyOnly: false,
+
+		// dragThreshold: Number
+		//		The move delay in pixels before detecting a drag; 5 by default
+		dragThreshold: 5,
+
+		// betweenThreshold: Integer
+		//		Distance from upper/lower edge of node to allow drop to reorder nodes
+		betweenThreshold: 0,
+
+		// Flag used by Avatar.js to signal to generate text node when dragging
+		generateText: true,
+
+		constructor: function(/*dijit/Tree*/ tree, /*dijit/tree/dndSource*/ params){
+			// summary:
+			//		a constructor of the Tree DnD Source
+			// tags:
+			//		private
+			if(!params){
+				params = {};
+			}
+			lang.mixin(this, params);
+			var type = params.accept instanceof Array ? params.accept : ["text", "treeNode"];
+			this.accept = null;
+			if(type.length){
+				this.accept = {};
+				for(var i = 0; i < type.length; ++i){
+					this.accept[type[i]] = 1;
+				}
+			}
+
+			// class-specific variables
+			this.isDragging = false;
+			this.mouseDown = false;
+			this.targetAnchor = null;	// DOMNode corresponding to the currently moused over TreeNode
+			this.targetBox = null;	// coordinates of this.targetAnchor
+			this.dropPosition = "";	// whether mouse is over/after/before this.targetAnchor
+			this._lastX = 0;
+			this._lastY = 0;
+
+			// states
+			this.sourceState = "";
+			if(this.isSource){
+				domClass.add(this.node, "dojoDndSource");
+			}
+			this.targetState = "";
+			if(this.accept){
+				domClass.add(this.node, "dojoDndTarget");
+			}
+
+			// set up events
+			this.topics = [
+				topic.subscribe("/dnd/source/over", lang.hitch(this, "onDndSourceOver")),
+				topic.subscribe("/dnd/start", lang.hitch(this, "onDndStart")),
+				topic.subscribe("/dnd/drop", lang.hitch(this, "onDndDrop")),
+				topic.subscribe("/dnd/cancel", lang.hitch(this, "onDndCancel"))
+			];
+		},
+
+		// methods
+		checkAcceptance: function(/*===== source, nodes =====*/){
+			// summary:
+			//		Checks if the target can accept nodes from this source
+			// source: dijit/tree/dndSource
+			//		The source which provides items
+			// nodes: DOMNode[]
+			//		Array of DOM nodes corresponding to nodes being dropped, dijitTreeRow nodes if
+			//		source is a dijit/Tree.
+			// tags:
+			//		extension
+			return true;	// Boolean
+		},
+
+		copyState: function(keyPressed){
+			// summary:
+			//		Returns true, if we need to copy items, false to move.
+			//		It is separated to be overwritten dynamically, if needed.
+			// keyPressed: Boolean
+			//		The "copy" control key was pressed
+			// tags:
+			//		protected
+			return this.copyOnly || keyPressed;	// Boolean
+		},
+		destroy: function(){
+			// summary:
+			//		Prepares the object to be garbage-collected.
+			this.inherited(arguments);
+			var h;
+			while(h = this.topics.pop()){
+				h.remove();
+			}
+			this.targetAnchor = null;
+		},
+
+		_onDragMouse: function(e, firstTime){
+			// summary:
+			//		Helper method for processing onmousemove/onmouseover events while drag is in progress.
+			//		Keeps track of current drop target.
+			// e: Event
+			//		The mousemove event.
+			// firstTime: Boolean?
+			//		If this flag is set, this is the first mouse move event of the drag, so call m.canDrop() etc.
+			//		even if newTarget == null because the user quickly dragged a node in the Tree to a position
+			//		over Tree.containerNode but not over any TreeNode (#7971)
+
+			var m = DNDManager.manager(),
+				oldTarget = this.targetAnchor, // the TreeNode corresponding to TreeNode mouse was previously over
+				newTarget = this.current, // TreeNode corresponding to TreeNode mouse is currently over
+				oldDropPosition = this.dropPosition;	// the previous drop position (over/before/after)
+
+			// calculate if user is indicating to drop the dragged node before, after, or over
+			// (i.e., to become a child of) the target node
+			var newDropPosition = "Over";
+			if(newTarget && this.betweenThreshold > 0){
+				// If mouse is over a new TreeNode, then get new TreeNode's position and size
+				if(!this.targetBox || oldTarget != newTarget){
+					this.targetBox = domGeometry.position(newTarget.rowNode, true);
+				}
+				if((e.pageY - this.targetBox.y) <= this.betweenThreshold){
+					newDropPosition = "Before";
+				}else if((e.pageY - this.targetBox.y) >= (this.targetBox.h - this.betweenThreshold)){
+					newDropPosition = "After";
+				}
+			}
+
+			if(firstTime || newTarget != oldTarget || newDropPosition != oldDropPosition){
+				if(oldTarget){
+					this._removeItemClass(oldTarget.rowNode, oldDropPosition);
+				}
+				if(newTarget){
+					this._addItemClass(newTarget.rowNode, newDropPosition);
+				}
+
+				// Check if it's ok to drop the dragged node on/before/after the target node.
+				if(!newTarget){
+					m.canDrop(false);
+				}else if(newTarget == this.tree.rootNode && newDropPosition != "Over"){
+					// Can't drop before or after tree's root node; the dropped node would just disappear (at least visually)
+					m.canDrop(false);
+				}else{
+					// Guard against dropping onto yourself or your parent.
+					// But when dragging multiple objects, it's OK if some of them are being dropped onto own parent.
+					var dropOntoSelf = false,
+						dropOntoParent = false;
+					if(m.source == this){
+						dropOntoParent = (newDropPosition === "Over");
+						for(var dragId in this.selection){
+							var dragNode = this.selection[dragId];
+							if(dragNode.item === newTarget.item){
+								dropOntoSelf = true;
+								break;
+							}
+							if(dragNode.getParent().id !== newTarget.id){
+								dropOntoParent = false;
+							}
+						}
+					}
+					m.canDrop(
+						!dropOntoSelf && !dropOntoParent &&
+						!this._isParentChildDrop(m.source, newTarget.rowNode) &&
+						this.checkItemAcceptance(newTarget.rowNode, m.source, newDropPosition.toLowerCase())
+					);
+				}
+
+				this.targetAnchor = newTarget;
+				this.dropPosition = newDropPosition;
+			}
+		},
+
+		onMouseMove: function(e){
+			// summary:
+			//		Called for any onmousemove/ontouchmove events over the Tree
+			// e: Event
+			//		onmousemouse/ontouchmove event
+			// tags:
+			//		private
+			if(this.isDragging && this.targetState == "Disabled"){
+				return;
+			}
+			this.inherited(arguments);
+			var m = DNDManager.manager();
+			if(this.isDragging){
+				this._onDragMouse(e);
+			}else{
+				if(this.mouseDown && this.isSource &&
+					(Math.abs(e.pageX - this._lastX) >= this.dragThreshold || Math.abs(e.pageY - this._lastY) >= this.dragThreshold)){
+					var nodes = this.getSelectedTreeNodes();
+					if(nodes.length){
+						if(nodes.length > 1){
+							//filter out all selected items which has one of their ancestor selected as well
+							var seen = this.selection, i = 0, r = [], n, p;
+							nextitem: while((n = nodes[i++])){
+								for(p = n.getParent(); p && p !== this.tree; p = p.getParent()){
+									if(seen[p.id]){ //parent is already selected, skip this node
+										continue nextitem;
+									}
+								}
+								//this node does not have any ancestors selected, add it
+								r.push(n);
+							}
+							nodes = r;
+						}
+						nodes = array.map(nodes, function(n){
+							return n.domNode
+						});
+						m.startDrag(this, nodes, this.copyState(dndCommon.getCopyKeyState(e)));
+						this._onDragMouse(e, true);	// because this may be the only mousemove event we get before the drop
+					}
+				}
+			}
+		},
+
+		onMouseDown: function(e){
+			// summary:
+			//		Event processor for onmousedown/ontouchstart
+			// e: Event
+			//		onmousedown/ontouchend event
+			// tags:
+			//		private
+
+			if(e.type == "touchstart" || mouse.isLeft(e)){	// ignore right click
+				this.mouseDown = true;
+				this.mouseButton = e.button;
+				this._lastX = e.pageX;
+				this._lastY = e.pageY;
+			}
+
+			this.inherited(arguments);
+		},
+
+		onMouseUp: function(e){
+			// summary:
+			//		Event processor for onmouseup/ontouchend
+			// e: Event
+			//		onmouseup/ontouchend event
+			// tags:
+			//		private
+			if(this.mouseDown){
+				this.mouseDown = false;
+				this.inherited(arguments);
+			}
+		},
+
+		onMouseOut: function(){
+			// summary:
+			//		Event processor for when mouse is moved away from a TreeNode
+			// tags:
+			//		private
+			this.inherited(arguments);
+			this._unmarkTargetAnchor();
+		},
+
+		checkItemAcceptance: function(/*===== target, source, position =====*/){
+			// summary:
+			//		Stub function to be overridden if one wants to check for the ability to drop at the node/item level
+			// description:
+			//		In the base case, this is called to check if target can become a child of source.
+			//		When betweenThreshold is set, position="before" or "after" means that we
+			//		are asking if the source node can be dropped before/after the target node.
+			// target: DOMNode
+			//		The dijitTreeRoot DOM node inside of the TreeNode that we are dropping on to
+			//		Use dijit.getEnclosingWidget(target) to get the TreeNode.
+			// source: dijit/tree/dndSource
+			//		The (set of) nodes we are dropping
+			// position: String
+			//		"over", "before", or "after"
+			// tags:
+			//		extension
+			return true;
+		},
+
+		// topic event processors
+		onDndSourceOver: function(source){
+			// summary:
+			//		Topic event processor for /dnd/source/over, called when detected a current source.
+			// source: Object
+			//		The dijit/tree/dndSource / dojo/dnd/Source which has the mouse over it
+			// tags:
+			//		private
+			if(this != source){
+				this.mouseDown = false;
+				this._unmarkTargetAnchor();
+			}else if(this.isDragging){
+				var m = DNDManager.manager();
+				m.canDrop(false);
+			}
+		},
+		onDndStart: function(source, nodes, copy){
+			// summary:
+			//		Topic event processor for /dnd/start, called to initiate the DnD operation
+			// source: Object
+			//		The dijit/tree/dndSource / dojo/dnd/Source which is providing the items
+			// nodes: DomNode[]
+			//		The list of transferred items, dndTreeNode nodes if dragging from a Tree
+			// copy: Boolean
+			//		Copy items, if true, move items otherwise
+			// tags:
+			//		private
+
+			if(this.isSource){
+				this._changeState("Source", this == source ? (copy ? "Copied" : "Moved") : "");
+			}
+			var accepted = this.checkAcceptance(source, nodes);
+
+			this._changeState("Target", accepted ? "" : "Disabled");
+
+			if(this == source){
+				DNDManager.manager().overSource(this);
+			}
+
+			this.isDragging = true;
+		},
+
+		itemCreator: function(nodes /*===== , target, source =====*/){
+			// summary:
+			//		Returns objects passed to `Tree.model.newItem()` based on DnD nodes
+			//		dropped onto the tree.   Developer must override this method to enable
+			//		dropping from external sources onto this Tree, unless the Tree.model's items
+			//		happen to look like {id: 123, name: "Apple" } with no other attributes.
+			// description:
+			//		For each node in nodes[], which came from source, create a hash of name/value
+			//		pairs to be passed to Tree.model.newItem().  Returns array of those hashes.
+			// nodes: DomNode[]
+			// target: DomNode
+			// source: dojo/dnd/Source
+			// returns: __Item[]
+			//		Array of name/value hashes for each new item to be added to the Tree
+			// tags:
+			//		extension
+
+			// TODO: for 2.0 refactor so itemCreator() is called once per drag node, and
+			// make signature itemCreator(sourceItem, node, target) (or similar).
+
+			return array.map(nodes, function(node){
+				return {
+					"id": node.id,
+					"name": node.textContent || node.innerText || ""
+				};
+			}); // Object[]
+		},
+
+		onDndDrop: function(source, nodes, copy){
+			// summary:
+			//		Topic event processor for /dnd/drop, called to finish the DnD operation.
+			// description:
+			//		Updates data store items according to where node was dragged from and dropped
+			//		to.   The tree will then respond to those data store updates and redraw itself.
+			// source: Object
+			//		The dijit/tree/dndSource / dojo/dnd/Source which is providing the items
+			// nodes: DomNode[]
+			//		The list of transferred items, dndTreeNode nodes if dragging from a Tree
+			// copy: Boolean
+			//		Copy items, if true, move items otherwise
+			// tags:
+			//		protected
+			if(this.containerState == "Over"){
+				var tree = this.tree,
+					model = tree.model,
+					target = this.targetAnchor,
+					doExpand = false; // this is so we don't expand the sibling above
+
+				this.isDragging = false;
+
+				// Compute the new parent item
+				var newParentItem;
+				var insertIndex;
+				var before;		// drop source before (aka previous sibling) of target
+				newParentItem = (target && target.item) || tree.item;
+				if(this.dropPosition == "Before" || this.dropPosition == "After"){
+					// TODO: if there is no parent item then disallow the drop.
+					// Actually this should be checked during onMouseMove too, to make the drag icon red.
+					newParentItem = (target.getParent() && target.getParent().item) || tree.item;
+					// Compute the insert index for reordering
+					insertIndex = target.getIndexInParent();
+					if(this.dropPosition == "After"){
+						insertIndex = target.getIndexInParent() + 1;
+						before = target.getNextSibling() && target.getNextSibling().item;
+					}else{
+						before = target.item;
+					}
+				}else{
+					newParentItem = (target && target.item) || tree.item;
+					doExpand = true;
+				}
+
+				// If necessary, use this variable to hold array of hashes to pass to model.newItem()
+				// (one entry in the array for each dragged node).
+				var newItemsParams;
+
+				array.forEach(nodes, function(node, idx){
+					// dojo/dnd/Item representing the thing being dropped.
+					// Don't confuse the use of item here (meaning a DnD item) with the
+					// uses below where item means dojo.data item.
+					var sourceItem = source.getItem(node.id);
+
+					// Information that's available if the source is another Tree
+					// (possibly but not necessarily this tree, possibly but not
+					// necessarily the same model as this Tree)
+					if(array.indexOf(sourceItem.type, "treeNode") != -1){
+						var childTreeNode = sourceItem.data,
+							childItem = childTreeNode.item,
+							oldParentItem = childTreeNode.getParent().item;
+					}
+
+					if(source == this){
+						// This is a node from my own tree, and we are moving it, not copying.
+						// Remove item from old parent's children attribute.
+						// TODO: dijit/tree/dndSelector should implement deleteSelectedNodes()
+						// and this code should go there.
+
+						if(typeof insertIndex == "number"){
+							if(newParentItem == oldParentItem && childTreeNode.getIndexInParent() < insertIndex){
+								insertIndex -= 1;
+							}
+						}
+						model.pasteItem(childItem, oldParentItem, newParentItem, copy, insertIndex, before);
+					}else if(model.isItem(childItem)){
+						// Item from same model
+						// (maybe we should only do this branch if the source is a tree?)
+						model.pasteItem(childItem, oldParentItem, newParentItem, copy, insertIndex, before);
+					}else{
+						// Get the hash to pass to model.newItem().  A single call to
+						// itemCreator() returns an array of hashes, one for each drag source node.
+						if(!newItemsParams){
+							newItemsParams = this.itemCreator(nodes, target.rowNode, source);
+						}
+
+						// Create new item in the tree, based on the drag source.
+						model.newItem(newItemsParams[idx], newParentItem, insertIndex, before);
+					}
+				}, this);
+
+				// Expand the target node (if it's currently collapsed) so the user can see
+				// where their node was dropped.   In particular since that node is still selected.
+				if(doExpand) {
+					this.tree._expandNode(target);
+				}
+			}
+			this.onDndCancel();
+		},
+
+		onDndCancel: function(){
+			// summary:
+			//		Topic event processor for /dnd/cancel, called to cancel the DnD operation
+			// tags:
+			//		private
+			this._unmarkTargetAnchor();
+			this.isDragging = false;
+			this.mouseDown = false;
+			delete this.mouseButton;
+			this._changeState("Source", "");
+			this._changeState("Target", "");
+		},
+
+		// When focus moves in/out of the entire Tree
+		onOverEvent: function(){
+			// summary:
+			//		This method is called when mouse is moved over our container (like onmouseenter)
+			// tags:
+			//		private
+			this.inherited(arguments);
+			DNDManager.manager().overSource(this);
+		},
+		onOutEvent: function(){
+			// summary:
+			//		This method is called when mouse is moved out of our container (like onmouseleave)
+			// tags:
+			//		private
+			this._unmarkTargetAnchor();
+			var m = DNDManager.manager();
+			if(this.isDragging){
+				m.canDrop(false);
+			}
+			m.outSource(this);
+
+			this.inherited(arguments);
+		},
+
+		_isParentChildDrop: function(source, targetRow){
+			// summary:
+			//		Checks whether the dragged items are parent rows in the tree which are being
+			//		dragged into their own children.
+			//
+			// source:
+			//		The DragSource object.
+			//
+			// targetRow:
+			//		The tree row onto which the dragged nodes are being dropped.
+			//
+			// tags:
+			//		private
+
+			// If the dragged object is not coming from the tree this widget belongs to,
+			// it cannot be invalid.
+			if(!source.tree || source.tree != this.tree){
+				return false;
+			}
+
+
+			var root = source.tree.domNode;
+			var ids = source.selection;
+
+			var node = targetRow.parentNode;
+
+			// Iterate up the DOM hierarchy from the target drop row,
+			// checking of any of the dragged nodes have the same ID.
+			while(node != root && !ids[node.id]){
+				node = node.parentNode;
+			}
+
+			return node.id && ids[node.id];
+		},
+
+		_unmarkTargetAnchor: function(){
+			// summary:
+			//		Removes hover class of the current target anchor
+			// tags:
+			//		private
+			if(!this.targetAnchor){
+				return;
+			}
+			this._removeItemClass(this.targetAnchor.rowNode, this.dropPosition);
+			this.targetAnchor = null;
+			this.targetBox = null;
+			this.dropPosition = null;
+		},
+
+		_markDndStatus: function(copy){
+			// summary:
+			//		Changes source's state based on "copy" status
+			this._changeState("Source", copy ? "Copied" : "Moved");
+		}
+	});
+
+	/*=====
+	dndSource.__Item = __Item;
+	=====*/
+
+	return dndSource;
+});
diff --git a/src/main/resources/static/dijit/tree/model.js b/src/main/resources/static/dijit/tree/model.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac488fbb3e6b00085bbb9876182c78f4f1eb4f2a
--- /dev/null
+++ b/src/main/resources/static/dijit/tree/model.js
@@ -0,0 +1,135 @@
+define(["dojo/_base/declare"], function(declare){
+
+	return declare("dijit.tree.model", null, {
+		// summary:
+		//		Contract for any data provider object for the tree.
+		// description:
+		//		Tree passes in values to the constructor to specify the callbacks.
+		//		"item" is typically a dojo/data/Item but it's just a black box so
+		//		it could be anything.
+		//
+		//		This (like `dojo/data/api/Read`) is just documentation, and not meant to be used.
+
+		destroy: function(){
+			// summary:
+			//		Destroys this object, releasing connections to the store
+			// tags:
+			//		extension
+		},
+
+		// =======================================================================
+		// Methods for traversing hierarchy
+
+		getRoot: function(onItem){
+			// summary:
+			//		Calls onItem with the root item for the tree, possibly a fabricated item.
+			//		Throws exception on error.
+			// tags:
+			//		extension
+		},
+
+		mayHaveChildren: function(item){
+			// summary:
+			//		Tells if an item has or may have children.  Implementing logic here
+			//		avoids showing +/- expando icon for nodes that we know don't have children.
+			//		(For efficiency reasons we may not want to check if an element actually
+			//		has children until user clicks the expando node)
+			// item: dojo/data/Item
+			// tags:
+			//		extension
+		},
+
+		getChildren: function(parentItem, onComplete){
+			// summary:
+			//		Calls onComplete() with array of child items of given parent item, all loaded.
+			//		Throws exception on error.
+			// parentItem: dojo/data/Item
+			// onComplete: function(items)
+			// tags:
+			//		extension
+		},
+
+		// =======================================================================
+		// Inspecting items
+
+		isItem: function(something){
+			// summary:
+			//		Returns true if *something* is an item and came from this model instance.
+			//		Returns false if *something* is a literal, an item from another model instance,
+			//		or is any object other than an item.
+			// tags:
+			//		extension
+		},
+
+		getIdentity: function(item){
+			// summary:
+			//		Returns identity for an item
+			// tags:
+			//		extension
+		},
+
+		getLabel: function(item){
+			// summary:
+			//		Get the label for an item
+			// tags:
+			//		extension
+		},
+
+		// =======================================================================
+		// Write interface
+
+		newItem: function(args, parent, insertIndex, before){
+			// summary:
+			//		Creates a new item.   See `dojo/data/api/Write` for details on args.
+			// args: dijit/tree/dndSource.__Item
+			// parent: Item
+			// insertIndex: int?
+			//		Allows to insert the new item as the n'th child of `parent`.
+			// before: Item?
+			//		Insert the new item as the previous sibling of this item.  `before` must be a child of `parent`.
+			// tags:
+			//		extension
+		},
+
+		pasteItem: function(childItem, oldParentItem, newParentItem, bCopy, insertIndex, before){
+			// summary:
+			//		Move or copy an item from one parent item to another.
+			//		Used in drag & drop.
+			//		If oldParentItem is specified and bCopy is false, childItem is removed from oldParentItem.
+			//		If newParentItem is specified, childItem is attached to newParentItem.
+			// childItem: Item
+			// oldParentItem: Item
+			// newParentItem: Item
+			// bCopy: Boolean
+			// insertIndex: int?
+			//		Allows to insert the new item as the n'th child of `parent`.
+			// before: Item?
+			//		Insert the new item as the previous sibling of this item.  `before` must be a child of `parent`.
+			// tags:
+			//		extension
+		},
+
+		// =======================================================================
+		// Callbacks
+
+		onChange: function(item){
+			// summary:
+			//		Callback whenever an item has changed, so that Tree
+			//		can update the label, icon, etc.   Note that changes
+			//		to an item's children or parent(s) will trigger an
+			//		onChildrenChange() so you can ignore those changes here.
+			// item: dojo/data/Item
+			// tags:
+			//		callback
+		},
+
+		onChildrenChange: function(parent, newChildrenList){
+			// summary:
+			//		Callback to do notifications about new, updated, or deleted items.
+			// parent: dojo/data/Item
+			// newChildrenList: dojo/data/Item[]
+			// tags:
+			//		callback
+		}
+	});
+});
\ No newline at end of file
diff --git a/src/main/resources/static/dijit/typematic.js b/src/main/resources/static/dijit/typematic.js
new file mode 100644
index 0000000000000000000000000000000000000000..09a159ac475f79c99995787c29fd9e2557c59b73
--- /dev/null
+++ b/src/main/resources/static/dijit/typematic.js
@@ -0,0 +1,211 @@
+define([
+	"dojo/_base/array", // array.forEach
+	"dojo/_base/connect", // connect._keyPress
+	"dojo/_base/lang", // lang.mixin, lang.hitch
+	"dojo/on",
+	"dojo/sniff", // has("ie")
+	"./main"        // setting dijit.typematic global
+], function(array, connect, lang, on, has, dijit){
+
+	// module:
+	//		dijit/typematic
+
+	var typematic = (dijit.typematic = {
+		// summary:
+		//		These functions are used to repetitively call a user specified callback
+		//		method when a specific key or mouse click over a specific DOM node is
+		//		held down for a specific amount of time.
+		//		Only 1 such event is allowed to occur on the browser page at 1 time.
+
+		_fireEventAndReload: function(){
+			this._timer = null;
+			this._callback(++this._count, this._node, this._evt);
+
+			// Schedule next event, timer is at most minDelay (default 10ms) to avoid
+			// browser overload (particularly avoiding starving DOH robot so it never gets to send a mouseup)
+			this._currentTimeout = Math.max(
+				this._currentTimeout < 0 ? this._initialDelay :
+					(this._subsequentDelay > 1 ? this._subsequentDelay : Math.round(this._currentTimeout * this._subsequentDelay)),
+				this._minDelay);
+			this._timer = setTimeout(lang.hitch(this, "_fireEventAndReload"), this._currentTimeout);
+		},
+
+		trigger: function(/*Event*/ evt, /*Object*/ _this, /*DOMNode*/ node, /*Function*/ callback, /*Object*/ obj, /*Number?*/ subsequentDelay, /*Number?*/ initialDelay, /*Number?*/ minDelay){
+			// summary:
+			//		Start a timed, repeating callback sequence.
+			//		If already started, the function call is ignored.
+			//		This method is not normally called by the user but can be
+			//		when the normal listener code is insufficient.
+			// evt:
+			//		key or mouse event object to pass to the user callback
+			// _this:
+			//		pointer to the user's widget space.
+			// node:
+			//		the DOM node object to pass the the callback function
+			// callback:
+			//		function to call until the sequence is stopped called with 3 parameters:
+			// count:
+			//		integer representing number of repeated calls (0..n) with -1 indicating the iteration has stopped
+			// node:
+			//		the DOM node object passed in
+			// evt:
+			//		key or mouse event object
+			// obj:
+			//		user space object used to uniquely identify each typematic sequence
+			// subsequentDelay:
+			//		if > 1, the number of milliseconds until the 3->n events occur
+			//		or else the fractional time multiplier for the next event's delay, default=0.9
+			// initialDelay:
+			//		the number of milliseconds until the 2nd event occurs, default=500ms
+			// minDelay:
+			//		the maximum delay in milliseconds for event to fire, default=10ms
+			if(obj != this._obj){
+				this.stop();
+				this._initialDelay = initialDelay || 500;
+				this._subsequentDelay = subsequentDelay || 0.90;
+				this._minDelay = minDelay || 10;
+				this._obj = obj;
+				this._node = node;
+				this._currentTimeout = -1;
+				this._count = -1;
+				this._callback = lang.hitch(_this, callback);
+				this._evt = { faux: true };
+				for(var attr in evt){
+					if(attr != "layerX" && attr != "layerY"){ // prevent WebKit warnings
+						var v = evt[attr];
+						if(typeof v != "function" && typeof v != "undefined"){
+							this._evt[attr] = v
+						}
+					}
+				}
+				this._fireEventAndReload();
+			}
+		},
+
+		stop: function(){
+			// summary:
+			//		Stop an ongoing timed, repeating callback sequence.
+			if(this._timer){
+				clearTimeout(this._timer);
+				this._timer = null;
+			}
+			if(this._obj){
+				this._callback(-1, this._node, this._evt);
+				this._obj = null;
+			}
+		},
+
+		addKeyListener: function(/*DOMNode*/ node, /*Object*/ keyObject, /*Object*/ _this, /*Function*/ callback, /*Number*/ subsequentDelay, /*Number*/ initialDelay, /*Number?*/ minDelay){
+			// summary:
+			//		Start listening for a specific typematic key.
+			//		See also the trigger method for other parameters.
+			// keyObject:
+			//		an object defining the key to listen for:
+			//
+			//		- keyCode: the keyCode (number) to listen for, used for non-printable keys
+			//		- charCode: the charCode (number) to listen for, used for printable keys
+			//		- charOrCode: deprecated, use keyCode or charCode
+			//		- ctrlKey: desired ctrl key state to initiate the callback sequence:
+			//			- pressed (true)
+			//			- released (false)
+			//			- either (unspecified)
+			//		- altKey: same as ctrlKey but for the alt key
+			//		- shiftKey: same as ctrlKey but for the shift key
+			// returns:
+			//		a connection handle
+
+			// Setup keydown or keypress listener depending on whether keyCode or charCode was specified.
+			// If charOrCode is specified use deprecated connect._keypress synthetic event (remove for 2.0)
+			var type = "keyCode" in keyObject ? "keydown" : "charCode" in keyObject ? "keypress" : connect._keypress,
+				attr = "keyCode" in keyObject ? "keyCode" : "charCode" in keyObject ? "charCode" : "charOrCode";
+
+			var handles = [
+				on(node, type, lang.hitch(this, function(evt){
+					if(evt[attr] == keyObject[attr] &&
+						(keyObject.ctrlKey === undefined || keyObject.ctrlKey == evt.ctrlKey) &&
+						(keyObject.altKey === undefined || keyObject.altKey == evt.altKey) &&
+						(keyObject.metaKey === undefined || keyObject.metaKey == (evt.metaKey || false)) && // IE doesn't even set metaKey
+						(keyObject.shiftKey === undefined || keyObject.shiftKey == evt.shiftKey)){
+						evt.stopPropagation();
+						evt.preventDefault();
+						typematic.trigger(evt, _this, node, callback, keyObject, subsequentDelay, initialDelay, minDelay);
+					}else if(typematic._obj == keyObject){
+						typematic.stop();
+					}
+				})),
+				on(node, "keyup", lang.hitch(this, function(){
+					if(typematic._obj == keyObject){
+						typematic.stop();
+					}
+				}))
+			];
+			return { remove: function(){
+				array.forEach(handles, function(h){
+					h.remove();
+				});
+			} };
+		},
+
+		addMouseListener: function(/*DOMNode*/ node, /*Object*/ _this, /*Function*/ callback, /*Number*/ subsequentDelay, /*Number*/ initialDelay, /*Number?*/ minDelay){
+			// summary:
+			//		Start listening for a typematic mouse click.
+			//		See the trigger method for other parameters.
+			// returns:
+			//		a connection handle
+			var handles = [
+				on(node, "mousedown", lang.hitch(this, function(evt){
+					evt.preventDefault();
+					typematic.trigger(evt, _this, node, callback, node, subsequentDelay, initialDelay, minDelay);
+				})),
+				on(node, "mouseup", lang.hitch(this, function(evt){
+					if(this._obj){
+						evt.preventDefault();
+					}
+					typematic.stop();
+				})),
+				on(node, "mouseout", lang.hitch(this, function(evt){
+					if(this._obj){
+						evt.preventDefault();
+					}
+					typematic.stop();
+				})),
+				on(node, "dblclick", lang.hitch(this, function(evt){
+					evt.preventDefault();
+					if(has("ie") < 9){
+						typematic.trigger(evt, _this, node, callback, node, subsequentDelay, initialDelay, minDelay);
+						setTimeout(lang.hitch(this, typematic.stop), 50);
+					}
+				}))
+			];
+			return { remove: function(){
+				array.forEach(handles, function(h){
+					h.remove();
+				});
+			} };
+		},
+
+		addListener: function(/*Node*/ mouseNode, /*Node*/ keyNode, /*Object*/ keyObject, /*Object*/ _this, /*Function*/ callback, /*Number*/ subsequentDelay, /*Number*/ initialDelay, /*Number?*/ minDelay){
+			// summary:
+			//		Start listening for a specific typematic key and mouseclick.
+			//		This is a thin wrapper to addKeyListener and addMouseListener.
+			//		See the addMouseListener and addKeyListener methods for other parameters.
+			// mouseNode:
+			//		the DOM node object to listen on for mouse events.
+			// keyNode:
+			//		the DOM node object to listen on for key events.
+			// returns:
+			//		a connection handle
+			var handles = [
+				this.addKeyListener(keyNode, keyObject, _this, callback, subsequentDelay, initialDelay, minDelay),
+				this.addMouseListener(mouseNode, _this, callback, subsequentDelay, initialDelay, minDelay)
+			];
+			return { remove: function(){
+				array.forEach(handles, function(h){
+					h.remove();
+				});
+			} };
+		}
+	});
+
+	return typematic;
+});
diff --git a/src/main/resources/static/sockjs/COPYING b/src/main/resources/static/sockjs/COPYING
new file mode 100644
index 0000000000000000000000000000000000000000..7fa858084f4604e81407d6a03f9e40df26913842
--- /dev/null
+++ b/src/main/resources/static/sockjs/COPYING
@@ -0,0 +1,9 @@
+Parts of the code are derived from various open source projects.
+
+For code derived from Socket.IO by Guillermo Rauch see
+https://github.com/LearnBoost/socket.io/tree/0.6.17#readme.
+
+Snippets derived from jQuery-JSONP by Julian Aubourg, generic MIT
+license.
+
+All other code is released on MIT license, see LICENSE.
diff --git a/src/main/resources/static/sockjs/Changelog.md b/src/main/resources/static/sockjs/Changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..ba104b279ced8e0a26b38657547df64253bdb1d1
--- /dev/null
+++ b/src/main/resources/static/sockjs/Changelog.md
@@ -0,0 +1,268 @@
+1.1.1
+==
+
+ * Do not pass `protocols` or `options` arguments to browser WebSocket constructor - #309
+
+1.1.0
+==
+
+ * Fix IE7/8 usage of `console.log` which does not have `apply` - #279
+ * Remove `dbg` global variable - #282
+ * Bump `faye-websocket` version to `0.11.0` - #267
+ * Optimize `arguments` usage - #263
+ * Add sourcemap file to dist folder - #237
+ * Add way to transparently pass transport-specific options - #272
+
+1.0.3
+==
+
+ * Use `https` module for xhr requests in node when url uses https - #254
+
+1.0.2
+==
+
+ * Fix iframe info receiver url
+ * Move iframe.contentWindow check inside setTimeout - #246
+
+1.0.1
+==
+
+ * Use proper base url for iframe-based info receiver - #249
+ * Don't register unload event in chrome packaged app - #223
+ * Allow custom session ids - #250
+ * Remove version property from bower.json - #247
+ * Update example CDN url - #244
+
+1.0.0
+===
+
+ * Simplify url handling by delegating to `url-parse` - #242
+ * Upgrade to `url-parse` 1.0.1 to fix colon issue if auth has no password
+
+1.0.0-beta.13
+===
+
+ * Transport timeout on connection should fallback - #238
+
+1.0.0-beta.12
+====
+
+ * Upgrade `url-parse` to 1.0.0 to fix #218 again
+
+1.0.0-beta.10
+====
+
+ * Upgrade `url-parse` to 0.2.3 to fix #222
+
+1.0.0-beta.9
+====
+
+ * Upgrade `url-parse` to 0.2.1 to fix 'too much recursion' errors
+
+1.0.0-beta.8
+====
+
+ * Upgrade `url-parse` to 0.2.0 to fix inheritance issues
+
+1.0.0-beta.7
+====
+
+ * Upgrade `url-parse` to 0.1.5 to fix #218
+ * Don't strip basic auth from url - #219
+
+1.0.0-beta.6
+====
+
+ * Upgrade `url-parse` to 0.1.3 to avoid CSP issues
+
+1.0.0-beta.5
+=====
+
+ * Upgrade `url-parse` to 0.1.1 to fix #214
+
+1.0.0-beta.4
+=====
+
+ * Upgrade `url-parse` to 0.1.0 and `sockjs` to 0.3.11
+ * Update .npmignore
+
+1.0.0-beta.3
+=====
+
+ * Move `debug` from devDependencies to dependencies
+
+1.0.0-beta.2
+=====
+
+ * Relax requirements when using same origin XHR - #80
+ * Upgrade to JSON3 from JSON2 - #123
+ * Package library with browserify supporting the UMD pattern - #184
+ * Move tests to JavaScript
+ * Add Gulp.js build script
+ * Fix getOrigin for file:/// urls and standard ports - #173
+ * Add onerror event handlers to Websockets - #169
+ * Increase RTO lower bound to prevent spurious timeouts on IE8/9 - #161
+ * Use window.crypto for random values when available - #128
+ * Fix handling of listeners added and removed mid-dispatch - #127
+ * Fix XHR Streaming for IE8 - #83
+ * Remove explicit AMD name - #107
+ * Check for an empty response from /info request - #143
+ * Add Content-Type to XHR requests to fix issue over HTTPS on Galaxy S4 - #164
+ * Fix iframe fallback when message is sent from a popup in IE7/8 - #166
+ * Add support for query strings on the url - #72
+ * Now works inside of Web Workers - #181
+ * Support EventSource / Server Sent Events outside of iframes - #201
+ * Rename protocols to transports - #65
+ * Allow transports which need the body to trigger on 'interactive' readyState - #175
+ * try/catch access to document.domain - #187
+ * Use `window.location` instead of `document.location` - #195
+ * Allow usage from node.js with same API
+
+0.3.4
+=====
+
+ * Mentioned njoyce's fork of sockjs-gevent.
+ * #90 - Don't catch onbeforeunload event - it breaks javascript://
+   links in IE.
+ * IE mangles 204 response code for 1223 on ajax, see:
+   http://bugs.jquery.com/ticket/1450
+ * Make `new` optional for SockJS constructor (via substack).
+ * It is impossible to cancel JSONP polling request - compensate for that.
+ * Refactored EventEmitter prototype (used only internally)
+ * #66 - Failure to post data to /xhr_send should kill the session
+
+
+0.3.2
+=====
+
+ * #77 - Getting /info on modern browsers when html is served from
+         file:// urls was broken.
+
+0.3.1
+=====
+
+ * #61 - Meteor guys found that we unintentionally catch "onopen" errors.
+ * #63 - Meteorjs guys found that xhr-streaming on Safari sometimes
+   left busy cursor running.
+ * Increased allowed time for websocket transport (from 1 rtt to 2),
+   this should make ws transport more reliable over SSL, at the cost
+   of slightly longer connection time for users with blocked ws.
+ * #57 - previous fix didn't really work, sockjs-client still left
+   a mess in browsers history when using iframe transports. This
+   is fixed now.
+ * #60 - Opera 12 (next) claims to do AJAX2 / CORS, but can't
+   do xhr-streaming.
+ * #58 - onunload test sometimes failed on Safari on windows
+ * Updated readme WRT websocket protocols
+ * Updated readme WRT deployments on heroku
+ * Add minimalistic license block to every source file.
+
+
+0.3.0
+=====
+
+ * Temporarily disabled iframe tests - they are failing unpredictably.
+ * #57 - pointing an iframe to "about:blank" during cleanup caused
+   Opera to messup history.
+ * #55 - Improved iframe abstraction (reduced a possible mem leak)
+ * Refactored AJAX abstractions, for better CORS handing - again.
+ * Add additional parent origin security check to an iframe.
+ * Urls with hashes or query strings can't be passed to SockJS.
+ * #18 - Mention workaround for Firefox ESC key issue
+ * #53 - AMD compliance
+ * sockjs/sockjs-protocol#28 - always use square brackets for
+   websocket frames
+ * #51 - initial support for IE10 - try XHR before XDR
+ * #28 - handle onunload / onbeforeunload in a more robust fashion
+ * #49 - support SockJS-client being used from files served from
+   file:// urls.
+
+
+0.2.1
+=====
+
+ * "smoke-latency.html" test was unnecesairly sending too much data.
+ * Bumped core dependencies (coffee-script and uglify-js)
+ * Minor updates to the README, few cosmetic changes in the code.
+
+
+0.2.0
+=====
+
+ * The API had changed - use `protocols_whitelist` option instead of
+   passing  an array of protocols as a second argument to SockJS constructor.
+ * Dropped 'chunking-test' functionality and replace it with 'info'.
+ * Rewritten protocol-choosing alogirthm, see "utils.detectProtocols" method.
+ * Use dynamic protocol timeouts based on RTT, not hardcoded 5 seconds
+ * #34 - Don't ever reuse `session_id`, especially when trying
+   fallback protocols.
+ * The test server got moved from SockJS-client to SockJS-node.
+ * Don't test unicode surrogates - it can't work in some environments.
+ * XHR/XDR helpers were rewritten, ajax transports were simplified.
+ * Added a domain check in the iframe to improve security.
+ * SockJS will now trigger 1002 error if there is a problem during handshake
+   instead of 2000 error.
+ * Smoke-throughput test is renamed to smoke-latency.
+
+0.1.2
+=====
+
+ * #29 - Allow all unicode characters to be send over SockJS.
+ * #15 - SockJS should now work fine even if the connection is started
+   in HEAD, before BODY is loaded.
+ * #28 - In rare circumstances WebSocket connection can be left intact
+   after the page is unloaded in FireFox.
+ * Updated scripts to work with Node 0.6.
+ * Initial work to do better QUnit testing.
+ * Updated the minifying script (always escape unicode chars, remove
+   trailing comment).
+ * Use string instead of array of chars (utils.js:random_number_string).
+
+
+0.1.1
+=====
+
+ * #21 Get JsonP transport working on IE9 (Vladimir Dronnikov).
+ * #26 Emit heartbeat event.
+ * #27 Include license inline.
+
+
+0.1.0
+=====
+
+ * SockJS-client can only send UTF-8 encodable strings.  Previously we
+   took advantage of rich data structures and automatically
+   json-encoded them, but this got removed.  Now, all data passed to
+   `send` will be converted to string. This is also how native
+ * `status` property on `EventClose` is renamed to `code`
+   as per Websocket API
+   WebSockets behave.
+ * The test server was updated to new `sockjs-node` API
+ * Fixed problem with Jsonp-polling transport on IE9
+ * Repository was moved - updated links.
+
+
+0.0.4
+=====
+
+ * All transports were refactored, some transports were introduced:
+   htmlfile and separate xhr-streaming.
+ * Added logic to detect support for http chunking, and thus a
+   possibility to rule out streaming transports before running them.
+ * Added 'cookie' option, useful for cookie-based load balancing
+   (currently, it make a difference only for IE).
+ * Added hack to prevent EventSource from crashing Safari and Chrome.
+ * Loads and loads of other small and medium changes.
+
+
+0.0.2
+=====
+
+ * Initial support for JSESSIONID based load balancing. Currently
+   doesn't play nicely with IE XDomainRequest transport.
+
+
+0.0.1
+=====
+
+ * Initial release.
diff --git a/src/main/resources/static/sockjs/LICENSE b/src/main/resources/static/sockjs/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..42b1fe94624a4cca415b38184b438dc8491ce34d
--- /dev/null
+++ b/src/main/resources/static/sockjs/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2011-2012 VMware, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/main/resources/static/sockjs/Makefile b/src/main/resources/static/sockjs/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..6f772501514cccc560af6a2b789429ad048bf324
--- /dev/null
+++ b/src/main/resources/static/sockjs/Makefile
@@ -0,0 +1,29 @@
+
+testbundle:
+	@./node_modules/.bin/gulp testbundle
+
+test:
+	@if [ "x$(BROWSER_NAME)" = "x" ]; then make test-node; else make test-zuul; fi
+
+test-node:
+	@./node_modules/.bin/mocha \
+		tests/node.js
+
+test-zuul: testbundle
+	@if [ "x$(BROWSER_PLATFORM)" = "x" ]; then \
+		./node_modules/.bin/zuul \
+		--browser-name $(BROWSER_NAME) \
+		--browser-version $(BROWSER_VERSION) \
+		tests/browser.js; \
+		else \
+		./node_modules/.bin/zuul \
+		--browser-name $(BROWSER_NAME) \
+		--browser-version $(BROWSER_VERSION) \
+		--browser-platform "$(BROWSER_PLATFORM)" \
+		tests/browser.js; \
+	fi
+
+test-local: testbundle
+	@./node_modules/.bin/zuul --local 9090 -- tests/browser.js
+
+.PHONY: test test-node test-zuul test-local testbundle
diff --git a/src/main/resources/static/sockjs/README.md b/src/main/resources/static/sockjs/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..31a620e1af83fc9a466fd4b02df66282a4f21098
--- /dev/null
+++ b/src/main/resources/static/sockjs/README.md
@@ -0,0 +1,336 @@
+
+# SockJS-client
+
+[![npm version](https://img.shields.io/npm/v/sockjs-client.svg?style=flat-square)](https://www.npmjs.com/package/sockjs-client)[![Build Status](https://img.shields.io/travis/sockjs/sockjs-client/master.svg?style=flat-square)](https://travis-ci.org/sockjs/sockjs-client)[![Dependencies](https://img.shields.io/david/sockjs/sockjs-client.svg?style=flat-square)](https://david-dm.org/sockjs/sockjs-client)[![Chat](https://img.shields.io/badge/Chat-gitter.im-blue.svg?style=flat-square)](https://gitter.im/sockjs/sockjs-client)
+[![Sauce Test Status](https://saucelabs.com/buildstatus/brycekahle)](https://saucelabs.com/u/brycekahle)
+
+SockJS is a browser JavaScript library that provides a WebSocket-like
+object. SockJS gives you a coherent, cross-browser, Javascript API
+which creates a low latency, full duplex, cross-domain communication
+channel between the browser and the web server.
+
+Under the hood SockJS tries to use native WebSockets first. If that
+fails it can use a variety of browser-specific transport protocols and
+presents them through WebSocket-like abstractions.
+
+SockJS is intended to work for all modern browsers and in environments
+which don't support the WebSocket protocol -- for example, behind restrictive
+corporate proxies.
+
+SockJS-client does require a server counterpart:
+
+ * [SockJS-node](https://github.com/sockjs/sockjs-node) is a SockJS
+   server for Node.js.
+
+
+Philosophy:
+
+ * The API should follow
+   [HTML5 Websockets API](http://dev.w3.org/html5/websockets/) as
+   closely as possible.
+ * All the transports must support cross domain connections out of the
+   box. It's possible and recommended to host a SockJS server on a
+   different server than your main web site.
+ * There is support for at least one streaming protocol for every
+   major browser.
+ * Streaming transports should work cross-domain and
+   should support cookies (for cookie-based sticky sessions).
+ * Polling transports are used as a fallback for old browsers and
+   hosts behind restrictive proxies.
+ * Connection establishment should be fast and lightweight.
+ * No Flash inside (no need to open port 843 - which doesn't work
+   through proxies, no need to host 'crossdomain.xml', no need
+   [to wait for 3 seconds](https://github.com/gimite/web-socket-js/issues/49)
+   in order to detect problems)
+
+
+Subscribe to
+[SockJS mailing list](https://groups.google.com/forum/#!forum/sockjs) for
+discussions and support.
+
+SockJS family:
+
+  * [SockJS-client](https://github.com/sockjs/sockjs-client) JavaScript client library
+  * [SockJS-node](https://github.com/sockjs/sockjs-node) Node.js server
+  * [SockJS-erlang](https://github.com/sockjs/sockjs-erlang) Erlang server
+  * [SockJS-cyclone](https://github.com/flaviogrossi/sockjs-cyclone) Python/Cyclone/Twisted server
+  * [SockJS-tornado](https://github.com/MrJoes/sockjs-tornado) Python/Tornado server
+  * [SockJS-twisted](https://github.com/DesertBus/sockjs-twisted/) Python/Twisted server
+  * [Spring Framework](http://projects.spring.io/spring-framework) Java [client](http://docs.spring.io/spring-framework/docs/current/spring-framework-reference/html/websocket.html#websocket-fallback-sockjs-client) & server
+  * [vert.x](https://github.com/vert-x/vert.x) Java/vert.x server
+  * [Xitrum](http://xitrum-framework.github.io/) Scala server
+  * [Atmosphere Framework](http://github.com/Atmosphere/atmosphere) JavaEE Server, Play Framework, Netty, Vert.x
+
+Work in progress:
+
+  * [SockJS-ruby](https://github.com/nyarly/sockjs-ruby)
+  * [SockJS-netty](https://github.com/cgbystrom/sockjs-netty)
+  * [SockJS-gevent](https://github.com/ksava/sockjs-gevent) ([SockJS-gevent fork](https://github.com/njoyce/sockjs-gevent))
+  * [pyramid-SockJS](https://github.com/fafhrd91/pyramid_sockjs)
+  * [wildcloud-websockets](https://github.com/wildcloud/wildcloud-websockets)
+  * [wai-SockJS](https://github.com/Palmik/wai-sockjs)
+  * [SockJS-perl](https://github.com/vti/sockjs-perl)
+  * [SockJS-go](https://github.com/igm/sockjs-go/)
+
+Getting Started
+-------
+
+SockJS mimics the [WebSockets API](http://dev.w3.org/html5/websockets/),
+but instead of `WebSocket` there is a `SockJS` Javascript object.
+
+First, you need to load the SockJS JavaScript library. For example, you can
+put that in your HTML head:
+
+```html
+<script src="//cdn.jsdelivr.net/sockjs/1/sockjs.min.js"></script>
+```
+
+After the script is loaded you can establish a connection with the
+SockJS server. Here's a simple example:
+
+```javascript
+ var sock = new SockJS('http://mydomain.com/my_prefix');
+ sock.onopen = function() {
+     console.log('open');
+ };
+ sock.onmessage = function(e) {
+     console.log('message', e.data);
+ };
+ sock.onclose = function() {
+     console.log('close');
+ };
+
+ sock.send('test');
+ sock.close();
+```
+
+SockJS-client API
+-----------------
+
+### SockJS class
+
+Similar to the 'WebSocket' API, the 'SockJS' constructor takes one, or more arguments:
+
+```javascript
+var sockjs = new SockJS(url, _reserved, options);
+```
+
+`url` may contain a query string, if one is desired.
+
+Where `options` is a hash which can contain:
+
+ *  **server (string)**
+
+    String to append to url for actual data connection. Defaults to a random 4 digit number.
+
+ *  **transports (string OR array of strings)**
+
+    Sometimes it is useful to disable some fallback transports. This
+    option allows you to supply a list transports that may be used by
+    SockJS. By default all available transports will be used.
+
+ *  **sessionId (number OR function)**
+
+    Both client and server use session identifiers to distinguish connections.
+    If you specify this option as a number, SockJS will use its random string
+    generator function to generate session ids that are N-character long
+    (where N corresponds to the number specified by **sessionId**).
+    When you specify this option as a function, the function must return a
+    randomly generated string. Every time SockJS needs to generate a session
+    id it will call this function and use the returned string directly.
+    If you don't specify this option, the default is to use the default random
+    string generator to generate 8-character long session ids.
+
+Although the 'SockJS' object tries to emulate the 'WebSocket'
+behaviour, it's impossible to support all of its features. An
+important SockJS limitation is the fact that you're not allowed to
+open more than one SockJS connection to a single domain at a time.
+This limitation is caused by an in-browser limit of outgoing
+connections - usually [browsers don't allow opening more than two
+outgoing connections to a single domain](http://stackoverflow.com/questions/985431/max-parallel-http-connections-in-a-browser). A single SockJS session
+requires those two connections - one for downloading data, the other for
+sending messages.  Opening a second SockJS session at the same time
+would most likely block, and can result in both sessions timing out.
+
+Opening more than one SockJS connection at a time is generally a
+bad practice. If you absolutely must do it, you can use
+multiple subdomains, using a different subdomain for every
+SockJS connection.
+
+Supported transports, by browser (html served from http:// or https://)
+-----------------------------------------------------------------------
+
+_Browser_       | _Websockets_     | _Streaming_ | _Polling_
+----------------|------------------|-------------|-------------------
+IE 6, 7         | no               | no          | jsonp-polling
+IE 8, 9 (cookies=no) |    no       | xdr-streaming &dagger; | xdr-polling &dagger;
+IE 8, 9 (cookies=yes)|    no       | iframe-htmlfile | iframe-xhr-polling
+IE 10           | rfc6455          | xhr-streaming   | xhr-polling
+Chrome 6-13     | hixie-76         | xhr-streaming   | xhr-polling
+Chrome 14+      | hybi-10 / rfc6455| xhr-streaming   | xhr-polling
+Firefox <10     | no &Dagger;      | xhr-streaming   | xhr-polling
+Firefox 10+     | hybi-10 / rfc6455| xhr-streaming   | xhr-polling
+Safari 5.x      | hixie-76         | xhr-streaming   | xhr-polling
+Safari 6+       | rfc6455          | xhr-streaming   | xhr-polling
+Opera 10.70+    | no &Dagger;      | iframe-eventsource | iframe-xhr-polling
+Opera 12.10+    | rfc6455          | xhr-streaming | xhr-polling
+Konqueror       | no               | no          | jsonp-polling
+
+
+ * **&dagger;**: IE 8+ supports [XDomainRequest][^9], which is
+    essentially a modified AJAX/XHR that can do requests across
+    domains. But unfortunately it doesn't send any cookies, which
+    makes it inappropriate for deployments when the load balancer uses
+    JSESSIONID cookie to do sticky sessions.
+
+ * **&Dagger;**: Firefox 4.0 and Opera 11.00 and shipped with disabled
+     Websockets "hixie-76". They can still be enabled by manually
+     changing a browser setting.
+
+Supported transports, by browser (html served from file://)
+-----------------------------------------------------------
+
+Sometimes you may want to serve your html from "file://" address - for
+development or if you're using PhoneGap or similar technologies. But
+due to the Cross Origin Policy files served from "file://" have no
+Origin, and that means some of SockJS transports won't work. For this
+reason the SockJS transport table is different than usually, major
+differences are:
+
+_Browser_       | _Websockets_  | _Streaming_        | _Polling_
+----------------|---------------|--------------------|-------------------
+IE 8, 9         | same as above | iframe-htmlfile    | iframe-xhr-polling
+Other           | same as above | iframe-eventsource | iframe-xhr-polling
+
+Supported transports, by name
+-----------------------------
+
+_Transport_          | _References_
+---------------------|---------------
+websocket (rfc6455)  | [rfc 6455][^10]
+websocket (hixie-76) | [draft-hixie-thewebsocketprotocol-76][^1]
+websocket (hybi-10)  | [draft-ietf-hybi-thewebsocketprotocol-10][^2]
+xhr-streaming        | Transport using [Cross domain XHR][^5] [streaming][^7] capability (readyState=3).
+xdr-streaming        | Transport using [XDomainRequest][^9] [streaming][^7] capability (readyState=3).
+eventsource          | [EventSource/Server-sent events][^4].
+iframe-eventsource   | [EventSource/Server-sent events][^4] used from an [iframe via postMessage][^3].
+htmlfile             | [HtmlFile][^8].
+iframe-htmlfile      | [HtmlFile][^8] used from an [iframe via postMessage][^3].
+xhr-polling          | Long-polling using [cross domain XHR][^5].
+xdr-polling          | Long-polling using [XDomainRequest][^9].
+iframe-xhr-polling   | Long-polling using normal AJAX from an [iframe via postMessage][^3].
+jsonp-polling        | Slow and old fashioned [JSONP polling][^6]. This transport will show "busy indicator" (aka: "spinning wheel") when sending data.
+
+
+[^1]: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
+[^2]: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
+[^3]: https://developer.mozilla.org/en/DOM/window.postMessage
+[^4]: https://html.spec.whatwg.org/multipage/comms.html#server-sent-events
+[^5]: https://secure.wikimedia.org/wikipedia/en/wiki/XMLHttpRequest#Cross-domain_requests
+[^6]: https://secure.wikimedia.org/wikipedia/en/wiki/JSONP
+[^7]: http://www.debugtheweb.com/test/teststreaming.aspx
+[^8]: http://cometdaily.com/2007/11/18/ie-activexhtmlfile-transport-part-ii/
+[^9]: http://blogs.msdn.com/b/ieinternals/archive/2010/05/13/xdomainrequest-restrictions-limitations-and-workarounds.aspx
+[^10]: http://www.rfc-editor.org/rfc/rfc6455.txt
+
+
+Connecting to SockJS without the client
+---------------------------------------
+
+Although the main point of SockJS is to enable browser-to-server
+connectivity, it is possible to connect to SockJS from an external
+application. Any SockJS server complying with 0.3 protocol does
+support a raw WebSocket url. The raw WebSocket url for the test server
+looks like:
+
+ * ws://localhost:8081/echo/websocket
+
+You can connect any WebSocket RFC 6455 compliant WebSocket client to
+this url. This can be a command line client, external application,
+third party code or even a browser (though I don't know why you would
+want to do so).
+
+
+Deployment
+----------
+
+You should use a version of sockjs-client
+that supports the protocol used by your server. For example:
+
+```html
+<script src="//cdn.jsdelivr.net/sockjs/1/sockjs.min.js"></script>
+```
+
+
+For server-side deployment tricks, especially about load balancing and
+session stickiness, take a look at the
+[SockJS-node readme](https://github.com/sockjs/sockjs-node#readme).
+
+
+Development and testing
+-----------------------
+
+SockJS-client needs [node.js](http://nodejs.org/) for running a test
+server and JavaScript minification. If you want to work on
+SockJS-client source code, checkout the git repo and follow these
+steps:
+
+    cd sockjs-client
+    npm install
+
+To generate JavaScript, run:
+
+    gulp browserify
+
+To generate minified JavaScript, run:
+
+    gulp browserify:min
+
+Both commands output into the `build` directory.
+
+### Testing
+
+Once you've compiled the SockJS-client you may want to check if your changes
+pass all the tests.
+
+    make test-local
+
+This will start [zuul](https://github.com/defunctzombie/zuul) and a test support server. Open the browser to [http://localhost:9090/_zuul](http://localhost:9090/_zuul) and watch the tests run.
+
+Browser Quirks
+--------------
+
+There are various browser quirks which we don't intend to address:
+
+ * Pressing ESC in Firefox, before Firefox 20, closes the SockJS connection. For a workaround
+   and discussion see [#18](https://github.com/sockjs/sockjs-client/issues/18).
+ * `jsonp-polling` transport will show a "spinning wheel" (aka. "busy indicator")
+   when sending data.
+ * You can't open more than one SockJS connection to one domain at the
+   same time due to [the browser's limit of concurrent connections](http://stackoverflow.com/questions/985431/max-parallel-http-connections-in-a-browser)
+   (this limit is not counting native WebSocket connections).
+ * Although SockJS is trying to escape any strange Unicode characters
+   (even invalid ones - [like surrogates \xD800-\xDBFF](http://en.wikipedia.org/wiki/Mapping_of_Unicode_characters#Surrogates) or [\xFFFE and \xFFFF](https://en.wikipedia.org/wiki/Unicode#Character_General_Category))
+   it's advisable to use only valid characters. Using invalid
+   characters is a bit slower, and may not work with SockJS servers
+   that have proper Unicode support.
+ * Having a global function called `onmessage` or such is probably a
+   bad idea, as it could be called by the built-in `postMessage` API.
+ * From SockJS' point of view there is nothing special about
+   SSL/HTTPS. Connecting between unencrypted and encrypted sites
+   should work just fine.
+ * Although SockJS does its best to support both prefix and cookie based
+   sticky sessions, the latter may not work well cross-domain with
+   browsers that don't accept third-party cookies by default (Safari).
+   In order to get around this make sure you're connecting to SockJS
+   from the same parent domain as the main site. For example
+   'sockjs.a.com' is able to set cookies if you're connecting from
+   'www.a.com' or 'a.com'.
+ * Trying to connect from secure "https://" to insecure "http://" is
+   not a good idea. The other way around should be fine.
+ * Long polling is known to cause problems on Heroku, but a
+   [workaround for SockJS is available](https://github.com/sockjs/sockjs-node/issues/57#issuecomment-5242187).
+ * SockJS [websocket transport is more stable over SSL](https://github.com/sockjs/sockjs-client/issues/94). If
+   you're a serious SockJS user then consider using SSL
+   ([more info](http://www.ietf.org/mail-archive/web/hybi/current/msg01605.html)).
+
diff --git a/src/main/resources/static/sockjs/bower.json b/src/main/resources/static/sockjs/bower.json
new file mode 100644
index 0000000000000000000000000000000000000000..612025dc98c9e5d6caf6c432bfd331fee38d4dbc
--- /dev/null
+++ b/src/main/resources/static/sockjs/bower.json
@@ -0,0 +1,28 @@
+{
+  "name": "sockjs-client",
+  "homepage": "http://sockjs.org",
+  "authors": [
+    "Bryce Kahle <bkahle@gmail.com>"
+  ],
+  "description": "Realtime library that provides a cross-browser, low latency, full duplex, cross-domain communication channel that behaves like a native WebSocket object.",
+  "main": "dist/sockjs.js",
+  "keywords": [
+    "realtime",
+    "websockets",
+    "sockjs"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/sockjs/sockjs-client.git"
+  },
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "bin",
+    "lib",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}
diff --git a/src/main/resources/static/sockjs/dist/sockjs-0.3.4.js b/src/main/resources/static/sockjs/dist/sockjs-0.3.4.js
new file mode 100644
index 0000000000000000000000000000000000000000..585215cb5e9780e9cb84e88d90213f6ff1667b48
--- /dev/null
+++ b/src/main/resources/static/sockjs/dist/sockjs-0.3.4.js
@@ -0,0 +1,2379 @@
+/* SockJS client, version 0.3.4, http://sockjs.org, MIT License
+
+Copyright (c) 2011-2012 VMware, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+// JSON2 by Douglas Crockford (minified).
+var JSON;JSON||(JSON={}),function(){function str(a,b){var c,d,e,f,g=gap,h,i=b[a];i&&typeof i=="object"&&typeof i.toJSON=="function"&&(i=i.toJSON(a)),typeof rep=="function"&&(i=rep.call(b,a,i));switch(typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i)return"null";gap+=indent,h=[];if(Object.prototype.toString.apply(i)==="[object Array]"){f=i.length;for(c=0;c<f;c+=1)h[c]=str(c,i)||"null";e=h.length===0?"[]":gap?"[\n"+gap+h.join(",\n"+gap)+"\n"+g+"]":"["+h.join(",")+"]",gap=g;return e}if(rep&&typeof rep=="object"){f=rep.length;for(c=0;c<f;c+=1)typeof rep[c]=="string"&&(d=rep[c],e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e))}else for(d in i)Object.prototype.hasOwnProperty.call(i,d)&&(e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e));e=h.length===0?"{}":gap?"{\n"+gap+h.join(",\n"+gap)+"\n"+g+"}":"{"+h.join(",")+"}",gap=g;return e}}function quote(a){escapable.lastIndex=0;return escapable.test(a)?'"'+a.replace(escapable,function(a){var b=meta[a];return typeof b=="string"?b:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function f(a){return a<10?"0"+a:a}"use strict",typeof Date.prototype.toJSON!="function"&&(Date.prototype.toJSON=function(a){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(a){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={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;typeof JSON.stringify!="function"&&(JSON.stringify=function(a,b,c){var d;gap="",indent="";if(typeof c=="number")for(d=0;d<c;d+=1)indent+=" ";else typeof c=="string"&&(indent=c);rep=b;if(!b||typeof b=="function"||typeof b=="object"&&typeof b.length=="number")return str("",{"":a});throw new Error("JSON.stringify")}),typeof JSON.parse!="function"&&(JSON.parse=function(text,reviver){function walk(a,b){var c,d,e=a[b];if(e&&typeof e=="object")for(c in e)Object.prototype.hasOwnProperty.call(e,c)&&(d=walk(e,c),d!==undefined?e[c]=d:delete e[c]);return reviver.call(a,b,e)}var j;text=String(text),cx.lastIndex=0,cx.test(text)&&(text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));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,""))){j=eval("("+text+")");return typeof reviver=="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")})}()
+
+
+//     [*] Including lib/index.js
+// Public object
+SockJS = (function(){
+              var _document = document;
+              var _window = window;
+              var utils = {};
+
+
+//         [*] Including lib/reventtarget.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+/* Simplified implementation of DOM2 EventTarget.
+ *   http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventTarget
+ */
+var REventTarget = function() {};
+REventTarget.prototype.addEventListener = function (eventType, listener) {
+    if(!this._listeners) {
+         this._listeners = {};
+    }
+    if(!(eventType in this._listeners)) {
+        this._listeners[eventType] = [];
+    }
+    var arr = this._listeners[eventType];
+    if(utils.arrIndexOf(arr, listener) === -1) {
+        arr.push(listener);
+    }
+    return;
+};
+
+REventTarget.prototype.removeEventListener = function (eventType, listener) {
+    if(!(this._listeners && (eventType in this._listeners))) {
+        return;
+    }
+    var arr = this._listeners[eventType];
+    var idx = utils.arrIndexOf(arr, listener);
+    if (idx !== -1) {
+        if(arr.length > 1) {
+            this._listeners[eventType] = arr.slice(0, idx).concat( arr.slice(idx+1) );
+        } else {
+            delete this._listeners[eventType];
+        }
+        return;
+    }
+    return;
+};
+
+REventTarget.prototype.dispatchEvent = function (event) {
+    var t = event.type;
+    var args = Array.prototype.slice.call(arguments, 0);
+    if (this['on'+t]) {
+        this['on'+t].apply(this, args);
+    }
+    if (this._listeners && t in this._listeners) {
+        for(var i=0; i < this._listeners[t].length; i++) {
+            this._listeners[t][i].apply(this, args);
+        }
+    }
+};
+//         [*] End of lib/reventtarget.js
+
+
+//         [*] Including lib/simpleevent.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var SimpleEvent = function(type, obj) {
+    this.type = type;
+    if (typeof obj !== 'undefined') {
+        for(var k in obj) {
+            if (!obj.hasOwnProperty(k)) continue;
+            this[k] = obj[k];
+        }
+    }
+};
+
+SimpleEvent.prototype.toString = function() {
+    var r = [];
+    for(var k in this) {
+        if (!this.hasOwnProperty(k)) continue;
+        var v = this[k];
+        if (typeof v === 'function') v = '[function]';
+        r.push(k + '=' + v);
+    }
+    return 'SimpleEvent(' + r.join(', ') + ')';
+};
+//         [*] End of lib/simpleevent.js
+
+
+//         [*] Including lib/eventemitter.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var EventEmitter = function(events) {
+    var that = this;
+    that._events = events || [];
+    that._listeners = {};
+};
+EventEmitter.prototype.emit = function(type) {
+    var that = this;
+    that._verifyType(type);
+    if (that._nuked) return;
+
+    var args = Array.prototype.slice.call(arguments, 1);
+    if (that['on'+type]) {
+        that['on'+type].apply(that, args);
+    }
+    if (type in that._listeners) {
+        for(var i = 0; i < that._listeners[type].length; i++) {
+            that._listeners[type][i].apply(that, args);
+        }
+    }
+};
+
+EventEmitter.prototype.on = function(type, callback) {
+    var that = this;
+    that._verifyType(type);
+    if (that._nuked) return;
+
+    if (!(type in that._listeners)) {
+        that._listeners[type] = [];
+    }
+    that._listeners[type].push(callback);
+};
+
+EventEmitter.prototype._verifyType = function(type) {
+    var that = this;
+    if (utils.arrIndexOf(that._events, type) === -1) {
+        utils.log('Event ' + JSON.stringify(type) +
+                  ' not listed ' + JSON.stringify(that._events) +
+                  ' in ' + that);
+    }
+};
+
+EventEmitter.prototype.nuke = function() {
+    var that = this;
+    that._nuked = true;
+    for(var i=0; i<that._events.length; i++) {
+        delete that[that._events[i]];
+    }
+    that._listeners = {};
+};
+//         [*] End of lib/eventemitter.js
+
+
+//         [*] Including lib/utils.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var random_string_chars = 'abcdefghijklmnopqrstuvwxyz0123456789_';
+utils.random_string = function(length, max) {
+    max = max || random_string_chars.length;
+    var i, ret = [];
+    for(i=0; i < length; i++) {
+        ret.push( random_string_chars.substr(Math.floor(Math.random() * max),1) );
+    }
+    return ret.join('');
+};
+utils.random_number = function(max) {
+    return Math.floor(Math.random() * max);
+};
+utils.random_number_string = function(max) {
+    var t = (''+(max - 1)).length;
+    var p = Array(t+1).join('0');
+    return (p + utils.random_number(max)).slice(-t);
+};
+
+// Assuming that url looks like: http://asdasd:111/asd
+utils.getOrigin = function(url) {
+    url += '/';
+    var parts = url.split('/').slice(0, 3);
+    return parts.join('/');
+};
+
+utils.isSameOriginUrl = function(url_a, url_b) {
+    // location.origin would do, but it's not always available.
+    if (!url_b) url_b = _window.location.href;
+
+    return (url_a.split('/').slice(0,3).join('/')
+                ===
+            url_b.split('/').slice(0,3).join('/'));
+};
+
+utils.getParentDomain = function(url) {
+    // ipv4 ip address
+    if (/^[0-9.]*$/.test(url)) return url;
+    // ipv6 ip address
+    if (/^\[/.test(url)) return url;
+    // no dots
+    if (!(/[.]/.test(url))) return url;
+
+    var parts = url.split('.').slice(1);
+    return parts.join('.');
+};
+
+utils.objectExtend = function(dst, src) {
+    for(var k in src) {
+        if (src.hasOwnProperty(k)) {
+            dst[k] = src[k];
+        }
+    }
+    return dst;
+};
+
+var WPrefix = '_jp';
+
+utils.polluteGlobalNamespace = function() {
+    if (!(WPrefix in _window)) {
+        _window[WPrefix] = {};
+    }
+};
+
+utils.closeFrame = function (code, reason) {
+    return 'c'+JSON.stringify([code, reason]);
+};
+
+utils.userSetCode = function (code) {
+    return code === 1000 || (code >= 3000 && code <= 4999);
+};
+
+// See: http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/
+// and RFC 2988.
+utils.countRTO = function (rtt) {
+    var rto;
+    if (rtt > 100) {
+        rto = 3 * rtt; // rto > 300msec
+    } else {
+        rto = rtt + 200; // 200msec < rto <= 300msec
+    }
+    return rto;
+}
+
+utils.log = function() {
+    if (_window.console && console.log && console.log.apply) {
+        console.log.apply(console, arguments);
+    }
+};
+
+utils.bind = function(fun, that) {
+    if (fun.bind) {
+        return fun.bind(that);
+    } else {
+        return function() {
+            return fun.apply(that, arguments);
+        };
+    }
+};
+
+utils.flatUrl = function(url) {
+    return url.indexOf('?') === -1 && url.indexOf('#') === -1;
+};
+
+utils.amendUrl = function(url) {
+    var dl = _document.location;
+    if (!url) {
+        throw new Error('Wrong url for SockJS');
+    }
+    if (!utils.flatUrl(url)) {
+        throw new Error('Only basic urls are supported in SockJS');
+    }
+
+    //  '//abc' --> 'http://abc'
+    if (url.indexOf('//') === 0) {
+        url = dl.protocol + url;
+    }
+    // '/abc' --> 'http://localhost:80/abc'
+    if (url.indexOf('/') === 0) {
+        url = dl.protocol + '//' + dl.host + url;
+    }
+    // strip trailing slashes
+    url = url.replace(/[/]+$/,'');
+    return url;
+};
+
+// IE doesn't support [].indexOf.
+utils.arrIndexOf = function(arr, obj){
+    for(var i=0; i < arr.length; i++){
+        if(arr[i] === obj){
+            return i;
+        }
+    }
+    return -1;
+};
+
+utils.arrSkip = function(arr, obj) {
+    var idx = utils.arrIndexOf(arr, obj);
+    if (idx === -1) {
+        return arr.slice();
+    } else {
+        var dst = arr.slice(0, idx);
+        return dst.concat(arr.slice(idx+1));
+    }
+};
+
+// Via: https://gist.github.com/1133122/2121c601c5549155483f50be3da5305e83b8c5df
+utils.isArray = Array.isArray || function(value) {
+    return {}.toString.call(value).indexOf('Array') >= 0
+};
+
+utils.delay = function(t, fun) {
+    if(typeof t === 'function') {
+        fun = t;
+        t = 0;
+    }
+    return setTimeout(fun, t);
+};
+
+
+// Chars worth escaping, as defined by Douglas Crockford:
+//   https://github.com/douglascrockford/JSON-js/blob/47a9882cddeb1e8529e07af9736218075372b8ac/json2.js#L196
+var json_escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+    json_lookup = {
+"\u0000":"\\u0000","\u0001":"\\u0001","\u0002":"\\u0002","\u0003":"\\u0003",
+"\u0004":"\\u0004","\u0005":"\\u0005","\u0006":"\\u0006","\u0007":"\\u0007",
+"\b":"\\b","\t":"\\t","\n":"\\n","\u000b":"\\u000b","\f":"\\f","\r":"\\r",
+"\u000e":"\\u000e","\u000f":"\\u000f","\u0010":"\\u0010","\u0011":"\\u0011",
+"\u0012":"\\u0012","\u0013":"\\u0013","\u0014":"\\u0014","\u0015":"\\u0015",
+"\u0016":"\\u0016","\u0017":"\\u0017","\u0018":"\\u0018","\u0019":"\\u0019",
+"\u001a":"\\u001a","\u001b":"\\u001b","\u001c":"\\u001c","\u001d":"\\u001d",
+"\u001e":"\\u001e","\u001f":"\\u001f","\"":"\\\"","\\":"\\\\",
+"\u007f":"\\u007f","\u0080":"\\u0080","\u0081":"\\u0081","\u0082":"\\u0082",
+"\u0083":"\\u0083","\u0084":"\\u0084","\u0085":"\\u0085","\u0086":"\\u0086",
+"\u0087":"\\u0087","\u0088":"\\u0088","\u0089":"\\u0089","\u008a":"\\u008a",
+"\u008b":"\\u008b","\u008c":"\\u008c","\u008d":"\\u008d","\u008e":"\\u008e",
+"\u008f":"\\u008f","\u0090":"\\u0090","\u0091":"\\u0091","\u0092":"\\u0092",
+"\u0093":"\\u0093","\u0094":"\\u0094","\u0095":"\\u0095","\u0096":"\\u0096",
+"\u0097":"\\u0097","\u0098":"\\u0098","\u0099":"\\u0099","\u009a":"\\u009a",
+"\u009b":"\\u009b","\u009c":"\\u009c","\u009d":"\\u009d","\u009e":"\\u009e",
+"\u009f":"\\u009f","\u00ad":"\\u00ad","\u0600":"\\u0600","\u0601":"\\u0601",
+"\u0602":"\\u0602","\u0603":"\\u0603","\u0604":"\\u0604","\u070f":"\\u070f",
+"\u17b4":"\\u17b4","\u17b5":"\\u17b5","\u200c":"\\u200c","\u200d":"\\u200d",
+"\u200e":"\\u200e","\u200f":"\\u200f","\u2028":"\\u2028","\u2029":"\\u2029",
+"\u202a":"\\u202a","\u202b":"\\u202b","\u202c":"\\u202c","\u202d":"\\u202d",
+"\u202e":"\\u202e","\u202f":"\\u202f","\u2060":"\\u2060","\u2061":"\\u2061",
+"\u2062":"\\u2062","\u2063":"\\u2063","\u2064":"\\u2064","\u2065":"\\u2065",
+"\u2066":"\\u2066","\u2067":"\\u2067","\u2068":"\\u2068","\u2069":"\\u2069",
+"\u206a":"\\u206a","\u206b":"\\u206b","\u206c":"\\u206c","\u206d":"\\u206d",
+"\u206e":"\\u206e","\u206f":"\\u206f","\ufeff":"\\ufeff","\ufff0":"\\ufff0",
+"\ufff1":"\\ufff1","\ufff2":"\\ufff2","\ufff3":"\\ufff3","\ufff4":"\\ufff4",
+"\ufff5":"\\ufff5","\ufff6":"\\ufff6","\ufff7":"\\ufff7","\ufff8":"\\ufff8",
+"\ufff9":"\\ufff9","\ufffa":"\\ufffa","\ufffb":"\\ufffb","\ufffc":"\\ufffc",
+"\ufffd":"\\ufffd","\ufffe":"\\ufffe","\uffff":"\\uffff"};
+
+// Some extra characters that Chrome gets wrong, and substitutes with
+// something else on the wire.
+var extra_escapable = /[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g,
+    extra_lookup;
+
+// JSON Quote string. Use native implementation when possible.
+var JSONQuote = (JSON && JSON.stringify) || function(string) {
+    json_escapable.lastIndex = 0;
+    if (json_escapable.test(string)) {
+        string = string.replace(json_escapable, function(a) {
+            return json_lookup[a];
+        });
+    }
+    return '"' + string + '"';
+};
+
+// This may be quite slow, so let's delay until user actually uses bad
+// characters.
+var unroll_lookup = function(escapable) {
+    var i;
+    var unrolled = {}
+    var c = []
+    for(i=0; i<65536; i++) {
+        c.push( String.fromCharCode(i) );
+    }
+    escapable.lastIndex = 0;
+    c.join('').replace(escapable, function (a) {
+        unrolled[ a ] = '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        return '';
+    });
+    escapable.lastIndex = 0;
+    return unrolled;
+};
+
+// Quote string, also taking care of unicode characters that browsers
+// often break. Especially, take care of unicode surrogates:
+//    http://en.wikipedia.org/wiki/Mapping_of_Unicode_characters#Surrogates
+utils.quote = function(string) {
+    var quoted = JSONQuote(string);
+
+    // In most cases this should be very fast and good enough.
+    extra_escapable.lastIndex = 0;
+    if(!extra_escapable.test(quoted)) {
+        return quoted;
+    }
+
+    if(!extra_lookup) extra_lookup = unroll_lookup(extra_escapable);
+
+    return quoted.replace(extra_escapable, function(a) {
+        return extra_lookup[a];
+    });
+}
+
+var _all_protocols = ['websocket',
+                      'xdr-streaming',
+                      'xhr-streaming',
+                      'iframe-eventsource',
+                      'iframe-htmlfile',
+                      'xdr-polling',
+                      'xhr-polling',
+                      'iframe-xhr-polling',
+                      'jsonp-polling'];
+
+utils.probeProtocols = function() {
+    var probed = {};
+    for(var i=0; i<_all_protocols.length; i++) {
+        var protocol = _all_protocols[i];
+        // User can have a typo in protocol name.
+        probed[protocol] = SockJS[protocol] &&
+                           SockJS[protocol].enabled();
+    }
+    return probed;
+};
+
+utils.detectProtocols = function(probed, protocols_whitelist, info) {
+    var pe = {},
+        protocols = [];
+    if (!protocols_whitelist) protocols_whitelist = _all_protocols;
+    for(var i=0; i<protocols_whitelist.length; i++) {
+        var protocol = protocols_whitelist[i];
+        pe[protocol] = probed[protocol];
+    }
+    var maybe_push = function(protos) {
+        var proto = protos.shift();
+        if (pe[proto]) {
+            protocols.push(proto);
+        } else {
+            if (protos.length > 0) {
+                maybe_push(protos);
+            }
+        }
+    }
+
+    // 1. Websocket
+    if (info.websocket !== false) {
+        maybe_push(['websocket']);
+    }
+
+    // 2. Streaming
+    if (pe['xhr-streaming'] && !info.null_origin) {
+        protocols.push('xhr-streaming');
+    } else {
+        if (pe['xdr-streaming'] && !info.cookie_needed && !info.null_origin) {
+            protocols.push('xdr-streaming');
+        } else {
+            maybe_push(['iframe-eventsource',
+                        'iframe-htmlfile']);
+        }
+    }
+
+    // 3. Polling
+    if (pe['xhr-polling'] && !info.null_origin) {
+        protocols.push('xhr-polling');
+    } else {
+        if (pe['xdr-polling'] && !info.cookie_needed && !info.null_origin) {
+            protocols.push('xdr-polling');
+        } else {
+            maybe_push(['iframe-xhr-polling',
+                        'jsonp-polling']);
+        }
+    }
+    return protocols;
+}
+//         [*] End of lib/utils.js
+
+
+//         [*] Including lib/dom.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+// May be used by htmlfile jsonp and transports.
+var MPrefix = '_sockjs_global';
+utils.createHook = function() {
+    var window_id = 'a' + utils.random_string(8);
+    if (!(MPrefix in _window)) {
+        var map = {};
+        _window[MPrefix] = function(window_id) {
+            if (!(window_id in map)) {
+                map[window_id] = {
+                    id: window_id,
+                    del: function() {delete map[window_id];}
+                };
+            }
+            return map[window_id];
+        }
+    }
+    return _window[MPrefix](window_id);
+};
+
+
+
+utils.attachMessage = function(listener) {
+    utils.attachEvent('message', listener);
+};
+utils.attachEvent = function(event, listener) {
+    if (typeof _window.addEventListener !== 'undefined') {
+        _window.addEventListener(event, listener, false);
+    } else {
+        // IE quirks.
+        // According to: http://stevesouders.com/misc/test-postmessage.php
+        // the message gets delivered only to 'document', not 'window'.
+        _document.attachEvent("on" + event, listener);
+        // I get 'window' for ie8.
+        _window.attachEvent("on" + event, listener);
+    }
+};
+
+utils.detachMessage = function(listener) {
+    utils.detachEvent('message', listener);
+};
+utils.detachEvent = function(event, listener) {
+    if (typeof _window.addEventListener !== 'undefined') {
+        _window.removeEventListener(event, listener, false);
+    } else {
+        _document.detachEvent("on" + event, listener);
+        _window.detachEvent("on" + event, listener);
+    }
+};
+
+
+var on_unload = {};
+// Things registered after beforeunload are to be called immediately.
+var after_unload = false;
+
+var trigger_unload_callbacks = function() {
+    for(var ref in on_unload) {
+        on_unload[ref]();
+        delete on_unload[ref];
+    };
+};
+
+var unload_triggered = function() {
+    if(after_unload) return;
+    after_unload = true;
+    trigger_unload_callbacks();
+};
+
+// 'unload' alone is not reliable in opera within an iframe, but we
+// can't use `beforeunload` as IE fires it on javascript: links.
+utils.attachEvent('unload', unload_triggered);
+
+utils.unload_add = function(listener) {
+    var ref = utils.random_string(8);
+    on_unload[ref] = listener;
+    if (after_unload) {
+        utils.delay(trigger_unload_callbacks);
+    }
+    return ref;
+};
+utils.unload_del = function(ref) {
+    if (ref in on_unload)
+        delete on_unload[ref];
+};
+
+
+utils.createIframe = function (iframe_url, error_callback) {
+    var iframe = _document.createElement('iframe');
+    var tref, unload_ref;
+    var unattach = function() {
+        clearTimeout(tref);
+        // Explorer had problems with that.
+        try {iframe.onload = null;} catch (x) {}
+        iframe.onerror = null;
+    };
+    var cleanup = function() {
+        if (iframe) {
+            unattach();
+            // This timeout makes chrome fire onbeforeunload event
+            // within iframe. Without the timeout it goes straight to
+            // onunload.
+            setTimeout(function() {
+                if(iframe) {
+                    iframe.parentNode.removeChild(iframe);
+                }
+                iframe = null;
+            }, 0);
+            utils.unload_del(unload_ref);
+        }
+    };
+    var onerror = function(r) {
+        if (iframe) {
+            cleanup();
+            error_callback(r);
+        }
+    };
+    var post = function(msg, origin) {
+        try {
+            // When the iframe is not loaded, IE raises an exception
+            // on 'contentWindow'.
+            if (iframe && iframe.contentWindow) {
+                iframe.contentWindow.postMessage(msg, origin);
+            }
+        } catch (x) {};
+    };
+
+    iframe.src = iframe_url;
+    iframe.style.display = 'none';
+    iframe.style.position = 'absolute';
+    iframe.onerror = function(){onerror('onerror');};
+    iframe.onload = function() {
+        // `onload` is triggered before scripts on the iframe are
+        // executed. Give it few seconds to actually load stuff.
+        clearTimeout(tref);
+        tref = setTimeout(function(){onerror('onload timeout');}, 2000);
+    };
+    _document.body.appendChild(iframe);
+    tref = setTimeout(function(){onerror('timeout');}, 15000);
+    unload_ref = utils.unload_add(cleanup);
+    return {
+        post: post,
+        cleanup: cleanup,
+        loaded: unattach
+    };
+};
+
+utils.createHtmlfile = function (iframe_url, error_callback) {
+    var doc = new ActiveXObject('htmlfile');
+    var tref, unload_ref;
+    var iframe;
+    var unattach = function() {
+        clearTimeout(tref);
+    };
+    var cleanup = function() {
+        if (doc) {
+            unattach();
+            utils.unload_del(unload_ref);
+            iframe.parentNode.removeChild(iframe);
+            iframe = doc = null;
+            CollectGarbage();
+        }
+    };
+    var onerror = function(r)  {
+        if (doc) {
+            cleanup();
+            error_callback(r);
+        }
+    };
+    var post = function(msg, origin) {
+        try {
+            // When the iframe is not loaded, IE raises an exception
+            // on 'contentWindow'.
+            if (iframe && iframe.contentWindow) {
+                iframe.contentWindow.postMessage(msg, origin);
+            }
+        } catch (x) {};
+    };
+
+    doc.open();
+    doc.write('<html><s' + 'cript>' +
+              'document.domain="' + document.domain + '";' +
+              '</s' + 'cript></html>');
+    doc.close();
+    doc.parentWindow[WPrefix] = _window[WPrefix];
+    var c = doc.createElement('div');
+    doc.body.appendChild(c);
+    iframe = doc.createElement('iframe');
+    c.appendChild(iframe);
+    iframe.src = iframe_url;
+    tref = setTimeout(function(){onerror('timeout');}, 15000);
+    unload_ref = utils.unload_add(cleanup);
+    return {
+        post: post,
+        cleanup: cleanup,
+        loaded: unattach
+    };
+};
+//         [*] End of lib/dom.js
+
+
+//         [*] Including lib/dom2.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var AbstractXHRObject = function(){};
+AbstractXHRObject.prototype = new EventEmitter(['chunk', 'finish']);
+
+AbstractXHRObject.prototype._start = function(method, url, payload, opts) {
+    var that = this;
+
+    try {
+        that.xhr = new XMLHttpRequest();
+    } catch(x) {};
+
+    if (!that.xhr) {
+        try {
+            that.xhr = new _window.ActiveXObject('Microsoft.XMLHTTP');
+        } catch(x) {};
+    }
+    if (_window.ActiveXObject || _window.XDomainRequest) {
+        // IE8 caches even POSTs
+        url += ((url.indexOf('?') === -1) ? '?' : '&') + 't='+(+new Date);
+    }
+
+    // Explorer tends to keep connection open, even after the
+    // tab gets closed: http://bugs.jquery.com/ticket/5280
+    that.unload_ref = utils.unload_add(function(){that._cleanup(true);});
+    try {
+        that.xhr.open(method, url, true);
+    } catch(e) {
+        // IE raises an exception on wrong port.
+        that.emit('finish', 0, '');
+        that._cleanup();
+        return;
+    };
+
+    if (!opts || !opts.no_credentials) {
+        // Mozilla docs says https://developer.mozilla.org/en/XMLHttpRequest :
+        // "This never affects same-site requests."
+        that.xhr.withCredentials = 'true';
+    }
+    if (opts && opts.headers) {
+        for(var key in opts.headers) {
+            that.xhr.setRequestHeader(key, opts.headers[key]);
+        }
+    }
+
+    that.xhr.onreadystatechange = function() {
+        if (that.xhr) {
+            var x = that.xhr;
+            switch (x.readyState) {
+            case 3:
+                // IE doesn't like peeking into responseText or status
+                // on Microsoft.XMLHTTP and readystate=3
+                try {
+                    var status = x.status;
+                    var text = x.responseText;
+                } catch (x) {};
+                // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450
+                if (status === 1223) status = 204;
+
+                // IE does return readystate == 3 for 404 answers.
+                if (text && text.length > 0) {
+                    that.emit('chunk', status, text);
+                }
+                break;
+            case 4:
+                var status = x.status;
+                // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450
+                if (status === 1223) status = 204;
+
+                that.emit('finish', status, x.responseText);
+                that._cleanup(false);
+                break;
+            }
+        }
+    };
+    that.xhr.send(payload);
+};
+
+AbstractXHRObject.prototype._cleanup = function(abort) {
+    var that = this;
+    if (!that.xhr) return;
+    utils.unload_del(that.unload_ref);
+
+    // IE needs this field to be a function
+    that.xhr.onreadystatechange = function(){};
+
+    if (abort) {
+        try {
+            that.xhr.abort();
+        } catch(x) {};
+    }
+    that.unload_ref = that.xhr = null;
+};
+
+AbstractXHRObject.prototype.close = function() {
+    var that = this;
+    that.nuke();
+    that._cleanup(true);
+};
+
+var XHRCorsObject = utils.XHRCorsObject = function() {
+    var that = this, args = arguments;
+    utils.delay(function(){that._start.apply(that, args);});
+};
+XHRCorsObject.prototype = new AbstractXHRObject();
+
+var XHRLocalObject = utils.XHRLocalObject = function(method, url, payload) {
+    var that = this;
+    utils.delay(function(){
+        that._start(method, url, payload, {
+            no_credentials: true
+        });
+    });
+};
+XHRLocalObject.prototype = new AbstractXHRObject();
+
+
+
+// References:
+//   http://ajaxian.com/archives/100-line-ajax-wrapper
+//   http://msdn.microsoft.com/en-us/library/cc288060(v=VS.85).aspx
+var XDRObject = utils.XDRObject = function(method, url, payload) {
+    var that = this;
+    utils.delay(function(){that._start(method, url, payload);});
+};
+XDRObject.prototype = new EventEmitter(['chunk', 'finish']);
+XDRObject.prototype._start = function(method, url, payload) {
+    var that = this;
+    var xdr = new XDomainRequest();
+    // IE caches even POSTs
+    url += ((url.indexOf('?') === -1) ? '?' : '&') + 't='+(+new Date);
+
+    var onerror = xdr.ontimeout = xdr.onerror = function() {
+        that.emit('finish', 0, '');
+        that._cleanup(false);
+    };
+    xdr.onprogress = function() {
+        that.emit('chunk', 200, xdr.responseText);
+    };
+    xdr.onload = function() {
+        that.emit('finish', 200, xdr.responseText);
+        that._cleanup(false);
+    };
+    that.xdr = xdr;
+    that.unload_ref = utils.unload_add(function(){that._cleanup(true);});
+    try {
+        // Fails with AccessDenied if port number is bogus
+        that.xdr.open(method, url);
+        that.xdr.send(payload);
+    } catch(x) {
+        onerror();
+    }
+};
+
+XDRObject.prototype._cleanup = function(abort) {
+    var that = this;
+    if (!that.xdr) return;
+    utils.unload_del(that.unload_ref);
+
+    that.xdr.ontimeout = that.xdr.onerror = that.xdr.onprogress =
+        that.xdr.onload = null;
+    if (abort) {
+        try {
+            that.xdr.abort();
+        } catch(x) {};
+    }
+    that.unload_ref = that.xdr = null;
+};
+
+XDRObject.prototype.close = function() {
+    var that = this;
+    that.nuke();
+    that._cleanup(true);
+};
+
+// 1. Is natively via XHR
+// 2. Is natively via XDR
+// 3. Nope, but postMessage is there so it should work via the Iframe.
+// 4. Nope, sorry.
+utils.isXHRCorsCapable = function() {
+    if (_window.XMLHttpRequest && 'withCredentials' in new XMLHttpRequest()) {
+        return 1;
+    }
+    // XDomainRequest doesn't work if page is served from file://
+    if (_window.XDomainRequest && _document.domain) {
+        return 2;
+    }
+    if (IframeTransport.enabled()) {
+        return 3;
+    }
+    return 4;
+};
+//         [*] End of lib/dom2.js
+
+
+//         [*] Including lib/sockjs.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var SockJS = function(url, dep_protocols_whitelist, options) {
+    if (this === _window) {
+        // makes `new` optional
+        return new SockJS(url, dep_protocols_whitelist, options);
+    }
+    
+    var that = this, protocols_whitelist;
+    that._options = {devel: false, debug: false, protocols_whitelist: [],
+                     info: undefined, rtt: undefined};
+    if (options) {
+        utils.objectExtend(that._options, options);
+    }
+    that._base_url = utils.amendUrl(url);
+    that._server = that._options.server || utils.random_number_string(1000);
+    if (that._options.protocols_whitelist &&
+        that._options.protocols_whitelist.length) {
+        protocols_whitelist = that._options.protocols_whitelist;
+    } else {
+        // Deprecated API
+        if (typeof dep_protocols_whitelist === 'string' &&
+            dep_protocols_whitelist.length > 0) {
+            protocols_whitelist = [dep_protocols_whitelist];
+        } else if (utils.isArray(dep_protocols_whitelist)) {
+            protocols_whitelist = dep_protocols_whitelist
+        } else {
+            protocols_whitelist = null;
+        }
+        if (protocols_whitelist) {
+            that._debug('Deprecated API: Use "protocols_whitelist" option ' +
+                        'instead of supplying protocol list as a second ' +
+                        'parameter to SockJS constructor.');
+        }
+    }
+    that._protocols = [];
+    that.protocol = null;
+    that.readyState = SockJS.CONNECTING;
+    that._ir = createInfoReceiver(that._base_url);
+    that._ir.onfinish = function(info, rtt) {
+        that._ir = null;
+        if (info) {
+            if (that._options.info) {
+                // Override if user supplies the option
+                info = utils.objectExtend(info, that._options.info);
+            }
+            if (that._options.rtt) {
+                rtt = that._options.rtt;
+            }
+            that._applyInfo(info, rtt, protocols_whitelist);
+            that._didClose();
+        } else {
+            that._didClose(1002, 'Can\'t connect to server', true);
+        }
+    };
+};
+// Inheritance
+SockJS.prototype = new REventTarget();
+
+SockJS.version = "0.3.4";
+
+SockJS.CONNECTING = 0;
+SockJS.OPEN = 1;
+SockJS.CLOSING = 2;
+SockJS.CLOSED = 3;
+
+SockJS.prototype._debug = function() {
+    if (this._options.debug)
+        utils.log.apply(utils, arguments);
+};
+
+SockJS.prototype._dispatchOpen = function() {
+    var that = this;
+    if (that.readyState === SockJS.CONNECTING) {
+        if (that._transport_tref) {
+            clearTimeout(that._transport_tref);
+            that._transport_tref = null;
+        }
+        that.readyState = SockJS.OPEN;
+        that.dispatchEvent(new SimpleEvent("open"));
+    } else {
+        // The server might have been restarted, and lost track of our
+        // connection.
+        that._didClose(1006, "Server lost session");
+    }
+};
+
+SockJS.prototype._dispatchMessage = function(data) {
+    var that = this;
+    if (that.readyState !== SockJS.OPEN)
+            return;
+    that.dispatchEvent(new SimpleEvent("message", {data: data}));
+};
+
+SockJS.prototype._dispatchHeartbeat = function(data) {
+    var that = this;
+    if (that.readyState !== SockJS.OPEN)
+        return;
+    that.dispatchEvent(new SimpleEvent('heartbeat', {}));
+};
+
+SockJS.prototype._didClose = function(code, reason, force) {
+    var that = this;
+    if (that.readyState !== SockJS.CONNECTING &&
+        that.readyState !== SockJS.OPEN &&
+        that.readyState !== SockJS.CLOSING)
+            throw new Error('INVALID_STATE_ERR');
+    if (that._ir) {
+        that._ir.nuke();
+        that._ir = null;
+    }
+
+    if (that._transport) {
+        that._transport.doCleanup();
+        that._transport = null;
+    }
+
+    var close_event = new SimpleEvent("close", {
+        code: code,
+        reason: reason,
+        wasClean: utils.userSetCode(code)});
+
+    if (!utils.userSetCode(code) &&
+        that.readyState === SockJS.CONNECTING && !force) {
+        if (that._try_next_protocol(close_event)) {
+            return;
+        }
+        close_event = new SimpleEvent("close", {code: 2000,
+                                                reason: "All transports failed",
+                                                wasClean: false,
+                                                last_event: close_event});
+    }
+    that.readyState = SockJS.CLOSED;
+
+    utils.delay(function() {
+                   that.dispatchEvent(close_event);
+                });
+};
+
+SockJS.prototype._didMessage = function(data) {
+    var that = this;
+    var type = data.slice(0, 1);
+    switch(type) {
+    case 'o':
+        that._dispatchOpen();
+        break;
+    case 'a':
+        var payload = JSON.parse(data.slice(1) || '[]');
+        for(var i=0; i < payload.length; i++){
+            that._dispatchMessage(payload[i]);
+        }
+        break;
+    case 'm':
+        var payload = JSON.parse(data.slice(1) || 'null');
+        that._dispatchMessage(payload);
+        break;
+    case 'c':
+        var payload = JSON.parse(data.slice(1) || '[]');
+        that._didClose(payload[0], payload[1]);
+        break;
+    case 'h':
+        that._dispatchHeartbeat();
+        break;
+    }
+};
+
+SockJS.prototype._try_next_protocol = function(close_event) {
+    var that = this;
+    if (that.protocol) {
+        that._debug('Closed transport:', that.protocol, ''+close_event);
+        that.protocol = null;
+    }
+    if (that._transport_tref) {
+        clearTimeout(that._transport_tref);
+        that._transport_tref = null;
+    }
+
+    while(1) {
+        var protocol = that.protocol = that._protocols.shift();
+        if (!protocol) {
+            return false;
+        }
+        // Some protocols require access to `body`, what if were in
+        // the `head`?
+        if (SockJS[protocol] &&
+            SockJS[protocol].need_body === true &&
+            (!_document.body ||
+             (typeof _document.readyState !== 'undefined'
+              && _document.readyState !== 'complete'))) {
+            that._protocols.unshift(protocol);
+            that.protocol = 'waiting-for-load';
+            utils.attachEvent('load', function(){
+                that._try_next_protocol();
+            });
+            return true;
+        }
+
+        if (!SockJS[protocol] ||
+              !SockJS[protocol].enabled(that._options)) {
+            that._debug('Skipping transport:', protocol);
+        } else {
+            var roundTrips = SockJS[protocol].roundTrips || 1;
+            var to = ((that._options.rto || 0) * roundTrips) || 5000;
+            that._transport_tref = utils.delay(to, function() {
+                if (that.readyState === SockJS.CONNECTING) {
+                    // I can't understand how it is possible to run
+                    // this timer, when the state is CLOSED, but
+                    // apparently in IE everythin is possible.
+                    that._didClose(2007, "Transport timeouted");
+                }
+            });
+
+            var connid = utils.random_string(8);
+            var trans_url = that._base_url + '/' + that._server + '/' + connid;
+            that._debug('Opening transport:', protocol, ' url:'+trans_url,
+                        ' RTO:'+that._options.rto);
+            that._transport = new SockJS[protocol](that, trans_url,
+                                                   that._base_url);
+            return true;
+        }
+    }
+};
+
+SockJS.prototype.close = function(code, reason) {
+    var that = this;
+    if (code && !utils.userSetCode(code))
+        throw new Error("INVALID_ACCESS_ERR");
+    if(that.readyState !== SockJS.CONNECTING &&
+       that.readyState !== SockJS.OPEN) {
+        return false;
+    }
+    that.readyState = SockJS.CLOSING;
+    that._didClose(code || 1000, reason || "Normal closure");
+    return true;
+};
+
+SockJS.prototype.send = function(data) {
+    var that = this;
+    if (that.readyState === SockJS.CONNECTING)
+        throw new Error('INVALID_STATE_ERR');
+    if (that.readyState === SockJS.OPEN) {
+        that._transport.doSend(utils.quote('' + data));
+    }
+    return true;
+};
+
+SockJS.prototype._applyInfo = function(info, rtt, protocols_whitelist) {
+    var that = this;
+    that._options.info = info;
+    that._options.rtt = rtt;
+    that._options.rto = utils.countRTO(rtt);
+    that._options.info.null_origin = !_document.domain;
+    var probed = utils.probeProtocols();
+    that._protocols = utils.detectProtocols(probed, protocols_whitelist, info);
+};
+//         [*] End of lib/sockjs.js
+
+
+//         [*] Including lib/trans-websocket.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var WebSocketTransport = SockJS.websocket = function(ri, trans_url) {
+    var that = this;
+    var url = trans_url + '/websocket';
+    if (url.slice(0, 5) === 'https') {
+        url = 'wss' + url.slice(5);
+    } else {
+        url = 'ws' + url.slice(4);
+    }
+    that.ri = ri;
+    that.url = url;
+    var Constructor = _window.WebSocket || _window.MozWebSocket;
+
+    that.ws = new Constructor(that.url);
+    that.ws.onmessage = function(e) {
+        that.ri._didMessage(e.data);
+    };
+    // Firefox has an interesting bug. If a websocket connection is
+    // created after onunload, it stays alive even when user
+    // navigates away from the page. In such situation let's lie -
+    // let's not open the ws connection at all. See:
+    // https://github.com/sockjs/sockjs-client/issues/28
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=696085
+    that.unload_ref = utils.unload_add(function(){that.ws.close()});
+    that.ws.onclose = function() {
+        that.ri._didMessage(utils.closeFrame(1006, "WebSocket connection broken"));
+    };
+};
+
+WebSocketTransport.prototype.doSend = function(data) {
+    this.ws.send('[' + data + ']');
+};
+
+WebSocketTransport.prototype.doCleanup = function() {
+    var that = this;
+    var ws = that.ws;
+    if (ws) {
+        ws.onmessage = ws.onclose = null;
+        ws.close();
+        utils.unload_del(that.unload_ref);
+        that.unload_ref = that.ri = that.ws = null;
+    }
+};
+
+WebSocketTransport.enabled = function() {
+    return !!(_window.WebSocket || _window.MozWebSocket);
+};
+
+// In theory, ws should require 1 round trip. But in chrome, this is
+// not very stable over SSL. Most likely a ws connection requires a
+// separate SSL connection, in which case 2 round trips are an
+// absolute minumum.
+WebSocketTransport.roundTrips = 2;
+//         [*] End of lib/trans-websocket.js
+
+
+//         [*] Including lib/trans-sender.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var BufferedSender = function() {};
+BufferedSender.prototype.send_constructor = function(sender) {
+    var that = this;
+    that.send_buffer = [];
+    that.sender = sender;
+};
+BufferedSender.prototype.doSend = function(message) {
+    var that = this;
+    that.send_buffer.push(message);
+    if (!that.send_stop) {
+        that.send_schedule();
+    }
+};
+
+// For polling transports in a situation when in the message callback,
+// new message is being send. If the sending connection was started
+// before receiving one, it is possible to saturate the network and
+// timeout due to the lack of receiving socket. To avoid that we delay
+// sending messages by some small time, in order to let receiving
+// connection be started beforehand. This is only a halfmeasure and
+// does not fix the big problem, but it does make the tests go more
+// stable on slow networks.
+BufferedSender.prototype.send_schedule_wait = function() {
+    var that = this;
+    var tref;
+    that.send_stop = function() {
+        that.send_stop = null;
+        clearTimeout(tref);
+    };
+    tref = utils.delay(25, function() {
+        that.send_stop = null;
+        that.send_schedule();
+    });
+};
+
+BufferedSender.prototype.send_schedule = function() {
+    var that = this;
+    if (that.send_buffer.length > 0) {
+        var payload = '[' + that.send_buffer.join(',') + ']';
+        that.send_stop = that.sender(that.trans_url, payload, function(success, abort_reason) {
+            that.send_stop = null;
+            if (success === false) {
+                that.ri._didClose(1006, 'Sending error ' + abort_reason);
+            } else {
+                that.send_schedule_wait();
+            }
+        });
+        that.send_buffer = [];
+    }
+};
+
+BufferedSender.prototype.send_destructor = function() {
+    var that = this;
+    if (that._send_stop) {
+        that._send_stop();
+    }
+    that._send_stop = null;
+};
+
+var jsonPGenericSender = function(url, payload, callback) {
+    var that = this;
+
+    if (!('_send_form' in that)) {
+        var form = that._send_form = _document.createElement('form');
+        var area = that._send_area = _document.createElement('textarea');
+        area.name = 'd';
+        form.style.display = 'none';
+        form.style.position = 'absolute';
+        form.method = 'POST';
+        form.enctype = 'application/x-www-form-urlencoded';
+        form.acceptCharset = "UTF-8";
+        form.appendChild(area);
+        _document.body.appendChild(form);
+    }
+    var form = that._send_form;
+    var area = that._send_area;
+    var id = 'a' + utils.random_string(8);
+    form.target = id;
+    form.action = url + '/jsonp_send?i=' + id;
+
+    var iframe;
+    try {
+        // ie6 dynamic iframes with target="" support (thanks Chris Lambacher)
+        iframe = _document.createElement('<iframe name="'+ id +'">');
+    } catch(x) {
+        iframe = _document.createElement('iframe');
+        iframe.name = id;
+    }
+    iframe.id = id;
+    form.appendChild(iframe);
+    iframe.style.display = 'none';
+
+    try {
+        area.value = payload;
+    } catch(e) {
+        utils.log('Your browser is seriously broken. Go home! ' + e.message);
+    }
+    form.submit();
+
+    var completed = function(e) {
+        if (!iframe.onerror) return;
+        iframe.onreadystatechange = iframe.onerror = iframe.onload = null;
+        // Opera mini doesn't like if we GC iframe
+        // immediately, thus this timeout.
+        utils.delay(500, function() {
+                       iframe.parentNode.removeChild(iframe);
+                       iframe = null;
+                   });
+        area.value = '';
+        // It is not possible to detect if the iframe succeeded or
+        // failed to submit our form.
+        callback(true);
+    };
+    iframe.onerror = iframe.onload = completed;
+    iframe.onreadystatechange = function(e) {
+        if (iframe.readyState == 'complete') completed();
+    };
+    return completed;
+};
+
+var createAjaxSender = function(AjaxObject) {
+    return function(url, payload, callback) {
+        var xo = new AjaxObject('POST', url + '/xhr_send', payload);
+        xo.onfinish = function(status, text) {
+            callback(status === 200 || status === 204,
+                     'http status ' + status);
+        };
+        return function(abort_reason) {
+            callback(false, abort_reason);
+        };
+    };
+};
+//         [*] End of lib/trans-sender.js
+
+
+//         [*] Including lib/trans-jsonp-receiver.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+// Parts derived from Socket.io:
+//    https://github.com/LearnBoost/socket.io/blob/0.6.17/lib/socket.io/transports/jsonp-polling.js
+// and jQuery-JSONP:
+//    https://code.google.com/p/jquery-jsonp/source/browse/trunk/core/jquery.jsonp.js
+var jsonPGenericReceiver = function(url, callback) {
+    var tref;
+    var script = _document.createElement('script');
+    var script2;  // Opera synchronous load trick.
+    var close_script = function(frame) {
+        if (script2) {
+            script2.parentNode.removeChild(script2);
+            script2 = null;
+        }
+        if (script) {
+            clearTimeout(tref);
+            // Unfortunately, you can't really abort script loading of
+            // the script.
+            script.parentNode.removeChild(script);
+            script.onreadystatechange = script.onerror =
+                script.onload = script.onclick = null;
+            script = null;
+            callback(frame);
+            callback = null;
+        }
+    };
+
+    // IE9 fires 'error' event after orsc or before, in random order.
+    var loaded_okay = false;
+    var error_timer = null;
+
+    script.id = 'a' + utils.random_string(8);
+    script.src = url;
+    script.type = 'text/javascript';
+    script.charset = 'UTF-8';
+    script.onerror = function(e) {
+        if (!error_timer) {
+            // Delay firing close_script.
+            error_timer = setTimeout(function() {
+                if (!loaded_okay) {
+                    close_script(utils.closeFrame(
+                        1006,
+                        "JSONP script loaded abnormally (onerror)"));
+                }
+            }, 1000);
+        }
+    };
+    script.onload = function(e) {
+        close_script(utils.closeFrame(1006, "JSONP script loaded abnormally (onload)"));
+    };
+
+    script.onreadystatechange = function(e) {
+        if (/loaded|closed/.test(script.readyState)) {
+            if (script && script.htmlFor && script.onclick) {
+                loaded_okay = true;
+                try {
+                    // In IE, actually execute the script.
+                    script.onclick();
+                } catch (x) {}
+            }
+            if (script) {
+                close_script(utils.closeFrame(1006, "JSONP script loaded abnormally (onreadystatechange)"));
+            }
+        }
+    };
+    // IE: event/htmlFor/onclick trick.
+    // One can't rely on proper order for onreadystatechange. In order to
+    // make sure, set a 'htmlFor' and 'event' properties, so that
+    // script code will be installed as 'onclick' handler for the
+    // script object. Later, onreadystatechange, manually execute this
+    // code. FF and Chrome doesn't work with 'event' and 'htmlFor'
+    // set. For reference see:
+    //   http://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html
+    // Also, read on that about script ordering:
+    //   http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order
+    if (typeof script.async === 'undefined' && _document.attachEvent) {
+        // According to mozilla docs, in recent browsers script.async defaults
+        // to 'true', so we may use it to detect a good browser:
+        // https://developer.mozilla.org/en/HTML/Element/script
+        if (!/opera/i.test(navigator.userAgent)) {
+            // Naively assume we're in IE
+            try {
+                script.htmlFor = script.id;
+                script.event = "onclick";
+            } catch (x) {}
+            script.async = true;
+        } else {
+            // Opera, second sync script hack
+            script2 = _document.createElement('script');
+            script2.text = "try{var a = document.getElementById('"+script.id+"'); if(a)a.onerror();}catch(x){};";
+            script.async = script2.async = false;
+        }
+    }
+    if (typeof script.async !== 'undefined') {
+        script.async = true;
+    }
+
+    // Fallback mostly for Konqueror - stupid timer, 35 seconds shall be plenty.
+    tref = setTimeout(function() {
+                          close_script(utils.closeFrame(1006, "JSONP script loaded abnormally (timeout)"));
+                      }, 35000);
+
+    var head = _document.getElementsByTagName('head')[0];
+    head.insertBefore(script, head.firstChild);
+    if (script2) {
+        head.insertBefore(script2, head.firstChild);
+    }
+    return close_script;
+};
+//         [*] End of lib/trans-jsonp-receiver.js
+
+
+//         [*] Including lib/trans-jsonp-polling.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+// The simplest and most robust transport, using the well-know cross
+// domain hack - JSONP. This transport is quite inefficient - one
+// mssage could use up to one http request. But at least it works almost
+// everywhere.
+// Known limitations:
+//   o you will get a spinning cursor
+//   o for Konqueror a dumb timer is needed to detect errors
+
+
+var JsonPTransport = SockJS['jsonp-polling'] = function(ri, trans_url) {
+    utils.polluteGlobalNamespace();
+    var that = this;
+    that.ri = ri;
+    that.trans_url = trans_url;
+    that.send_constructor(jsonPGenericSender);
+    that._schedule_recv();
+};
+
+// Inheritnace
+JsonPTransport.prototype = new BufferedSender();
+
+JsonPTransport.prototype._schedule_recv = function() {
+    var that = this;
+    var callback = function(data) {
+        that._recv_stop = null;
+        if (data) {
+            // no data - heartbeat;
+            if (!that._is_closing) {
+                that.ri._didMessage(data);
+            }
+        }
+        // The message can be a close message, and change is_closing state.
+        if (!that._is_closing) {
+            that._schedule_recv();
+        }
+    };
+    that._recv_stop = jsonPReceiverWrapper(that.trans_url + '/jsonp',
+                                           jsonPGenericReceiver, callback);
+};
+
+JsonPTransport.enabled = function() {
+    return true;
+};
+
+JsonPTransport.need_body = true;
+
+
+JsonPTransport.prototype.doCleanup = function() {
+    var that = this;
+    that._is_closing = true;
+    if (that._recv_stop) {
+        that._recv_stop();
+    }
+    that.ri = that._recv_stop = null;
+    that.send_destructor();
+};
+
+
+// Abstract away code that handles global namespace pollution.
+var jsonPReceiverWrapper = function(url, constructReceiver, user_callback) {
+    var id = 'a' + utils.random_string(6);
+    var url_id = url + '?c=' + escape(WPrefix + '.' + id);
+
+    // Unfortunately it is not possible to abort loading of the
+    // script. We need to keep track of frake close frames.
+    var aborting = 0;
+
+    // Callback will be called exactly once.
+    var callback = function(frame) {
+        switch(aborting) {
+        case 0:
+            // Normal behaviour - delete hook _and_ emit message.
+            delete _window[WPrefix][id];
+            user_callback(frame);
+            break;
+        case 1:
+            // Fake close frame - emit but don't delete hook.
+            user_callback(frame);
+            aborting = 2;
+            break;
+        case 2:
+            // Got frame after connection was closed, delete hook, don't emit.
+            delete _window[WPrefix][id];
+            break;
+        }
+    };
+
+    var close_script = constructReceiver(url_id, callback);
+    _window[WPrefix][id] = close_script;
+    var stop = function() {
+        if (_window[WPrefix][id]) {
+            aborting = 1;
+            _window[WPrefix][id](utils.closeFrame(1000, "JSONP user aborted read"));
+        }
+    };
+    return stop;
+};
+//         [*] End of lib/trans-jsonp-polling.js
+
+
+//         [*] Including lib/trans-xhr.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var AjaxBasedTransport = function() {};
+AjaxBasedTransport.prototype = new BufferedSender();
+
+AjaxBasedTransport.prototype.run = function(ri, trans_url,
+                                            url_suffix, Receiver, AjaxObject) {
+    var that = this;
+    that.ri = ri;
+    that.trans_url = trans_url;
+    that.send_constructor(createAjaxSender(AjaxObject));
+    that.poll = new Polling(ri, Receiver,
+                            trans_url + url_suffix, AjaxObject);
+};
+
+AjaxBasedTransport.prototype.doCleanup = function() {
+    var that = this;
+    if (that.poll) {
+        that.poll.abort();
+        that.poll = null;
+    }
+};
+
+// xhr-streaming
+var XhrStreamingTransport = SockJS['xhr-streaming'] = function(ri, trans_url) {
+    this.run(ri, trans_url, '/xhr_streaming', XhrReceiver, utils.XHRCorsObject);
+};
+
+XhrStreamingTransport.prototype = new AjaxBasedTransport();
+
+XhrStreamingTransport.enabled = function() {
+    // Support for CORS Ajax aka Ajax2? Opera 12 claims CORS but
+    // doesn't do streaming.
+    return (_window.XMLHttpRequest &&
+            'withCredentials' in new XMLHttpRequest() &&
+            (!/opera/i.test(navigator.userAgent)));
+};
+XhrStreamingTransport.roundTrips = 2; // preflight, ajax
+
+// Safari gets confused when a streaming ajax request is started
+// before onload. This causes the load indicator to spin indefinetely.
+XhrStreamingTransport.need_body = true;
+
+
+// According to:
+//   http://stackoverflow.com/questions/1641507/detect-browser-support-for-cross-domain-xmlhttprequests
+//   http://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/
+
+
+// xdr-streaming
+var XdrStreamingTransport = SockJS['xdr-streaming'] = function(ri, trans_url) {
+    this.run(ri, trans_url, '/xhr_streaming', XhrReceiver, utils.XDRObject);
+};
+
+XdrStreamingTransport.prototype = new AjaxBasedTransport();
+
+XdrStreamingTransport.enabled = function() {
+    return !!_window.XDomainRequest;
+};
+XdrStreamingTransport.roundTrips = 2; // preflight, ajax
+
+
+
+// xhr-polling
+var XhrPollingTransport = SockJS['xhr-polling'] = function(ri, trans_url) {
+    this.run(ri, trans_url, '/xhr', XhrReceiver, utils.XHRCorsObject);
+};
+
+XhrPollingTransport.prototype = new AjaxBasedTransport();
+
+XhrPollingTransport.enabled = XhrStreamingTransport.enabled;
+XhrPollingTransport.roundTrips = 2; // preflight, ajax
+
+
+// xdr-polling
+var XdrPollingTransport = SockJS['xdr-polling'] = function(ri, trans_url) {
+    this.run(ri, trans_url, '/xhr', XhrReceiver, utils.XDRObject);
+};
+
+XdrPollingTransport.prototype = new AjaxBasedTransport();
+
+XdrPollingTransport.enabled = XdrStreamingTransport.enabled;
+XdrPollingTransport.roundTrips = 2; // preflight, ajax
+//         [*] End of lib/trans-xhr.js
+
+
+//         [*] Including lib/trans-iframe.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+// Few cool transports do work only for same-origin. In order to make
+// them working cross-domain we shall use iframe, served form the
+// remote domain. New browsers, have capabilities to communicate with
+// cross domain iframe, using postMessage(). In IE it was implemented
+// from IE 8+, but of course, IE got some details wrong:
+//    http://msdn.microsoft.com/en-us/library/cc197015(v=VS.85).aspx
+//    http://stevesouders.com/misc/test-postmessage.php
+
+var IframeTransport = function() {};
+
+IframeTransport.prototype.i_constructor = function(ri, trans_url, base_url) {
+    var that = this;
+    that.ri = ri;
+    that.origin = utils.getOrigin(base_url);
+    that.base_url = base_url;
+    that.trans_url = trans_url;
+
+    var iframe_url = base_url + '/iframe.html';
+    if (that.ri._options.devel) {
+        iframe_url += '?t=' + (+new Date);
+    }
+    that.window_id = utils.random_string(8);
+    iframe_url += '#' + that.window_id;
+
+    that.iframeObj = utils.createIframe(iframe_url, function(r) {
+                                            that.ri._didClose(1006, "Unable to load an iframe (" + r + ")");
+                                        });
+
+    that.onmessage_cb = utils.bind(that.onmessage, that);
+    utils.attachMessage(that.onmessage_cb);
+};
+
+IframeTransport.prototype.doCleanup = function() {
+    var that = this;
+    if (that.iframeObj) {
+        utils.detachMessage(that.onmessage_cb);
+        try {
+            // When the iframe is not loaded, IE raises an exception
+            // on 'contentWindow'.
+            if (that.iframeObj.iframe.contentWindow) {
+                that.postMessage('c');
+            }
+        } catch (x) {}
+        that.iframeObj.cleanup();
+        that.iframeObj = null;
+        that.onmessage_cb = that.iframeObj = null;
+    }
+};
+
+IframeTransport.prototype.onmessage = function(e) {
+    var that = this;
+    if (e.origin !== that.origin) return;
+    var window_id = e.data.slice(0, 8);
+    var type = e.data.slice(8, 9);
+    var data = e.data.slice(9);
+
+    if (window_id !== that.window_id) return;
+
+    switch(type) {
+    case 's':
+        that.iframeObj.loaded();
+        that.postMessage('s', JSON.stringify([SockJS.version, that.protocol, that.trans_url, that.base_url]));
+        break;
+    case 't':
+        that.ri._didMessage(data);
+        break;
+    }
+};
+
+IframeTransport.prototype.postMessage = function(type, data) {
+    var that = this;
+    that.iframeObj.post(that.window_id + type + (data || ''), that.origin);
+};
+
+IframeTransport.prototype.doSend = function (message) {
+    this.postMessage('m', message);
+};
+
+IframeTransport.enabled = function() {
+    // postMessage misbehaves in konqueror 4.6.5 - the messages are delivered with
+    // huge delay, or not at all.
+    var konqueror = navigator && navigator.userAgent && navigator.userAgent.indexOf('Konqueror') !== -1;
+    return ((typeof _window.postMessage === 'function' ||
+            typeof _window.postMessage === 'object') && (!konqueror));
+};
+//         [*] End of lib/trans-iframe.js
+
+
+//         [*] Including lib/trans-iframe-within.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var curr_window_id;
+
+var postMessage = function (type, data) {
+    if(parent !== _window) {
+        parent.postMessage(curr_window_id + type + (data || ''), '*');
+    } else {
+        utils.log("Can't postMessage, no parent window.", type, data);
+    }
+};
+
+var FacadeJS = function() {};
+FacadeJS.prototype._didClose = function (code, reason) {
+    postMessage('t', utils.closeFrame(code, reason));
+};
+FacadeJS.prototype._didMessage = function (frame) {
+    postMessage('t', frame);
+};
+FacadeJS.prototype._doSend = function (data) {
+    this._transport.doSend(data);
+};
+FacadeJS.prototype._doCleanup = function () {
+    this._transport.doCleanup();
+};
+
+utils.parent_origin = undefined;
+
+SockJS.bootstrap_iframe = function() {
+    var facade;
+    curr_window_id = _document.location.hash.slice(1);
+    var onMessage = function(e) {
+        if(e.source !== parent) return;
+        if(typeof utils.parent_origin === 'undefined')
+            utils.parent_origin = e.origin;
+        if (e.origin !== utils.parent_origin) return;
+
+        var window_id = e.data.slice(0, 8);
+        var type = e.data.slice(8, 9);
+        var data = e.data.slice(9);
+        if (window_id !== curr_window_id) return;
+        switch(type) {
+        case 's':
+            var p = JSON.parse(data);
+            var version = p[0];
+            var protocol = p[1];
+            var trans_url = p[2];
+            var base_url = p[3];
+            if (version !== SockJS.version) {
+                utils.log("Incompatibile SockJS! Main site uses:" +
+                          " \"" + version + "\", the iframe:" +
+                          " \"" + SockJS.version + "\".");
+            }
+            if (!utils.flatUrl(trans_url) || !utils.flatUrl(base_url)) {
+                utils.log("Only basic urls are supported in SockJS");
+                return;
+            }
+
+            if (!utils.isSameOriginUrl(trans_url) ||
+                !utils.isSameOriginUrl(base_url)) {
+                utils.log("Can't connect to different domain from within an " +
+                          "iframe. (" + JSON.stringify([_window.location.href, trans_url, base_url]) +
+                          ")");
+                return;
+            }
+            facade = new FacadeJS();
+            facade._transport = new FacadeJS[protocol](facade, trans_url, base_url);
+            break;
+        case 'm':
+            facade._doSend(data);
+            break;
+        case 'c':
+            if (facade)
+                facade._doCleanup();
+            facade = null;
+            break;
+        }
+    };
+
+    // alert('test ticker');
+    // facade = new FacadeJS();
+    // facade._transport = new FacadeJS['w-iframe-xhr-polling'](facade, 'http://host.com:9999/ticker/12/basd');
+
+    utils.attachMessage(onMessage);
+
+    // Start
+    postMessage('s');
+};
+//         [*] End of lib/trans-iframe-within.js
+
+
+//         [*] Including lib/info.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var InfoReceiver = function(base_url, AjaxObject) {
+    var that = this;
+    utils.delay(function(){that.doXhr(base_url, AjaxObject);});
+};
+
+InfoReceiver.prototype = new EventEmitter(['finish']);
+
+InfoReceiver.prototype.doXhr = function(base_url, AjaxObject) {
+    var that = this;
+    var t0 = (new Date()).getTime();
+    var xo = new AjaxObject('GET', base_url + '/info');
+
+    var tref = utils.delay(8000,
+                           function(){xo.ontimeout();});
+
+    xo.onfinish = function(status, text) {
+        clearTimeout(tref);
+        tref = null;
+        if (status === 200) {
+            var rtt = (new Date()).getTime() - t0;
+            var info = JSON.parse(text);
+            if (typeof info !== 'object') info = {};
+            that.emit('finish', info, rtt);
+        } else {
+            that.emit('finish');
+        }
+    };
+    xo.ontimeout = function() {
+        xo.close();
+        that.emit('finish');
+    };
+};
+
+var InfoReceiverIframe = function(base_url) {
+    var that = this;
+    var go = function() {
+        var ifr = new IframeTransport();
+        ifr.protocol = 'w-iframe-info-receiver';
+        var fun = function(r) {
+            if (typeof r === 'string' && r.substr(0,1) === 'm') {
+                var d = JSON.parse(r.substr(1));
+                var info = d[0], rtt = d[1];
+                that.emit('finish', info, rtt);
+            } else {
+                that.emit('finish');
+            }
+            ifr.doCleanup();
+            ifr = null;
+        };
+        var mock_ri = {
+            _options: {},
+            _didClose: fun,
+            _didMessage: fun
+        };
+        ifr.i_constructor(mock_ri, base_url, base_url);
+    }
+    if(!_document.body) {
+        utils.attachEvent('load', go);
+    } else {
+        go();
+    }
+};
+InfoReceiverIframe.prototype = new EventEmitter(['finish']);
+
+
+var InfoReceiverFake = function() {
+    // It may not be possible to do cross domain AJAX to get the info
+    // data, for example for IE7. But we want to run JSONP, so let's
+    // fake the response, with rtt=2s (rto=6s).
+    var that = this;
+    utils.delay(function() {
+        that.emit('finish', {}, 2000);
+    });
+};
+InfoReceiverFake.prototype = new EventEmitter(['finish']);
+
+var createInfoReceiver = function(base_url) {
+    if (utils.isSameOriginUrl(base_url)) {
+        // If, for some reason, we have SockJS locally - there's no
+        // need to start up the complex machinery. Just use ajax.
+        return new InfoReceiver(base_url, utils.XHRLocalObject);
+    }
+    switch (utils.isXHRCorsCapable()) {
+    case 1:
+        // XHRLocalObject -> no_credentials=true
+        return new InfoReceiver(base_url, utils.XHRLocalObject);
+    case 2:
+        return new InfoReceiver(base_url, utils.XDRObject);
+    case 3:
+        // Opera
+        return new InfoReceiverIframe(base_url);
+    default:
+        // IE 7
+        return new InfoReceiverFake();
+    };
+};
+
+
+var WInfoReceiverIframe = FacadeJS['w-iframe-info-receiver'] = function(ri, _trans_url, base_url) {
+    var ir = new InfoReceiver(base_url, utils.XHRLocalObject);
+    ir.onfinish = function(info, rtt) {
+        ri._didMessage('m'+JSON.stringify([info, rtt]));
+        ri._didClose();
+    }
+};
+WInfoReceiverIframe.prototype.doCleanup = function() {};
+//         [*] End of lib/info.js
+
+
+//         [*] Including lib/trans-iframe-eventsource.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var EventSourceIframeTransport = SockJS['iframe-eventsource'] = function () {
+    var that = this;
+    that.protocol = 'w-iframe-eventsource';
+    that.i_constructor.apply(that, arguments);
+};
+
+EventSourceIframeTransport.prototype = new IframeTransport();
+
+EventSourceIframeTransport.enabled = function () {
+    return ('EventSource' in _window) && IframeTransport.enabled();
+};
+
+EventSourceIframeTransport.need_body = true;
+EventSourceIframeTransport.roundTrips = 3; // html, javascript, eventsource
+
+
+// w-iframe-eventsource
+var EventSourceTransport = FacadeJS['w-iframe-eventsource'] = function(ri, trans_url) {
+    this.run(ri, trans_url, '/eventsource', EventSourceReceiver, utils.XHRLocalObject);
+}
+EventSourceTransport.prototype = new AjaxBasedTransport();
+//         [*] End of lib/trans-iframe-eventsource.js
+
+
+//         [*] Including lib/trans-iframe-xhr-polling.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var XhrPollingIframeTransport = SockJS['iframe-xhr-polling'] = function () {
+    var that = this;
+    that.protocol = 'w-iframe-xhr-polling';
+    that.i_constructor.apply(that, arguments);
+};
+
+XhrPollingIframeTransport.prototype = new IframeTransport();
+
+XhrPollingIframeTransport.enabled = function () {
+    return _window.XMLHttpRequest && IframeTransport.enabled();
+};
+
+XhrPollingIframeTransport.need_body = true;
+XhrPollingIframeTransport.roundTrips = 3; // html, javascript, xhr
+
+
+// w-iframe-xhr-polling
+var XhrPollingITransport = FacadeJS['w-iframe-xhr-polling'] = function(ri, trans_url) {
+    this.run(ri, trans_url, '/xhr', XhrReceiver, utils.XHRLocalObject);
+};
+
+XhrPollingITransport.prototype = new AjaxBasedTransport();
+//         [*] End of lib/trans-iframe-xhr-polling.js
+
+
+//         [*] Including lib/trans-iframe-htmlfile.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+// This transport generally works in any browser, but will cause a
+// spinning cursor to appear in any browser other than IE.
+// We may test this transport in all browsers - why not, but in
+// production it should be only run in IE.
+
+var HtmlFileIframeTransport = SockJS['iframe-htmlfile'] = function () {
+    var that = this;
+    that.protocol = 'w-iframe-htmlfile';
+    that.i_constructor.apply(that, arguments);
+};
+
+// Inheritance.
+HtmlFileIframeTransport.prototype = new IframeTransport();
+
+HtmlFileIframeTransport.enabled = function() {
+    return IframeTransport.enabled();
+};
+
+HtmlFileIframeTransport.need_body = true;
+HtmlFileIframeTransport.roundTrips = 3; // html, javascript, htmlfile
+
+
+// w-iframe-htmlfile
+var HtmlFileTransport = FacadeJS['w-iframe-htmlfile'] = function(ri, trans_url) {
+    this.run(ri, trans_url, '/htmlfile', HtmlfileReceiver, utils.XHRLocalObject);
+};
+HtmlFileTransport.prototype = new AjaxBasedTransport();
+//         [*] End of lib/trans-iframe-htmlfile.js
+
+
+//         [*] Including lib/trans-polling.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var Polling = function(ri, Receiver, recv_url, AjaxObject) {
+    var that = this;
+    that.ri = ri;
+    that.Receiver = Receiver;
+    that.recv_url = recv_url;
+    that.AjaxObject = AjaxObject;
+    that._scheduleRecv();
+};
+
+Polling.prototype._scheduleRecv = function() {
+    var that = this;
+    var poll = that.poll = new that.Receiver(that.recv_url, that.AjaxObject);
+    var msg_counter = 0;
+    poll.onmessage = function(e) {
+        msg_counter += 1;
+        that.ri._didMessage(e.data);
+    };
+    poll.onclose = function(e) {
+        that.poll = poll = poll.onmessage = poll.onclose = null;
+        if (!that.poll_is_closing) {
+            if (e.reason === 'permanent') {
+                that.ri._didClose(1006, 'Polling error (' + e.reason + ')');
+            } else {
+                that._scheduleRecv();
+            }
+        }
+    };
+};
+
+Polling.prototype.abort = function() {
+    var that = this;
+    that.poll_is_closing = true;
+    if (that.poll) {
+        that.poll.abort();
+    }
+};
+//         [*] End of lib/trans-polling.js
+
+
+//         [*] Including lib/trans-receiver-eventsource.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var EventSourceReceiver = function(url) {
+    var that = this;
+    var es = new EventSource(url);
+    es.onmessage = function(e) {
+        that.dispatchEvent(new SimpleEvent('message',
+                                           {'data': unescape(e.data)}));
+    };
+    that.es_close = es.onerror = function(e, abort_reason) {
+        // ES on reconnection has readyState = 0 or 1.
+        // on network error it's CLOSED = 2
+        var reason = abort_reason ? 'user' :
+            (es.readyState !== 2 ? 'network' : 'permanent');
+        that.es_close = es.onmessage = es.onerror = null;
+        // EventSource reconnects automatically.
+        es.close();
+        es = null;
+        // Safari and chrome < 15 crash if we close window before
+        // waiting for ES cleanup. See:
+        //   https://code.google.com/p/chromium/issues/detail?id=89155
+        utils.delay(200, function() {
+                        that.dispatchEvent(new SimpleEvent('close', {reason: reason}));
+                    });
+    };
+};
+
+EventSourceReceiver.prototype = new REventTarget();
+
+EventSourceReceiver.prototype.abort = function() {
+    var that = this;
+    if (that.es_close) {
+        that.es_close({}, true);
+    }
+};
+//         [*] End of lib/trans-receiver-eventsource.js
+
+
+//         [*] Including lib/trans-receiver-htmlfile.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var _is_ie_htmlfile_capable;
+var isIeHtmlfileCapable = function() {
+    if (_is_ie_htmlfile_capable === undefined) {
+        if ('ActiveXObject' in _window) {
+            try {
+                _is_ie_htmlfile_capable = !!new ActiveXObject('htmlfile');
+            } catch (x) {}
+        } else {
+            _is_ie_htmlfile_capable = false;
+        }
+    }
+    return _is_ie_htmlfile_capable;
+};
+
+
+var HtmlfileReceiver = function(url) {
+    var that = this;
+    utils.polluteGlobalNamespace();
+
+    that.id = 'a' + utils.random_string(6, 26);
+    url += ((url.indexOf('?') === -1) ? '?' : '&') +
+        'c=' + escape(WPrefix + '.' + that.id);
+
+    var constructor = isIeHtmlfileCapable() ?
+        utils.createHtmlfile : utils.createIframe;
+
+    var iframeObj;
+    _window[WPrefix][that.id] = {
+        start: function () {
+            iframeObj.loaded();
+        },
+        message: function (data) {
+            that.dispatchEvent(new SimpleEvent('message', {'data': data}));
+        },
+        stop: function () {
+            that.iframe_close({}, 'network');
+        }
+    };
+    that.iframe_close = function(e, abort_reason) {
+        iframeObj.cleanup();
+        that.iframe_close = iframeObj = null;
+        delete _window[WPrefix][that.id];
+        that.dispatchEvent(new SimpleEvent('close', {reason: abort_reason}));
+    };
+    iframeObj = constructor(url, function(e) {
+                                that.iframe_close({}, 'permanent');
+                            });
+};
+
+HtmlfileReceiver.prototype = new REventTarget();
+
+HtmlfileReceiver.prototype.abort = function() {
+    var that = this;
+    if (that.iframe_close) {
+        that.iframe_close({}, 'user');
+    }
+};
+//         [*] End of lib/trans-receiver-htmlfile.js
+
+
+//         [*] Including lib/trans-receiver-xhr.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+var XhrReceiver = function(url, AjaxObject) {
+    var that = this;
+    var buf_pos = 0;
+
+    that.xo = new AjaxObject('POST', url, null);
+    that.xo.onchunk = function(status, text) {
+        if (status !== 200) return;
+        while (1) {
+            var buf = text.slice(buf_pos);
+            var p = buf.indexOf('\n');
+            if (p === -1) break;
+            buf_pos += p+1;
+            var msg = buf.slice(0, p);
+            that.dispatchEvent(new SimpleEvent('message', {data: msg}));
+        }
+    };
+    that.xo.onfinish = function(status, text) {
+        that.xo.onchunk(status, text);
+        that.xo = null;
+        var reason = status === 200 ? 'network' : 'permanent';
+        that.dispatchEvent(new SimpleEvent('close', {reason: reason}));
+    }
+};
+
+XhrReceiver.prototype = new REventTarget();
+
+XhrReceiver.prototype.abort = function() {
+    var that = this;
+    if (that.xo) {
+        that.xo.close();
+        that.dispatchEvent(new SimpleEvent('close', {reason: 'user'}));
+        that.xo = null;
+    }
+};
+//         [*] End of lib/trans-receiver-xhr.js
+
+
+//         [*] Including lib/test-hooks.js
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2011-2012 VMware, Inc.
+ *
+ * For the license see COPYING.
+ * ***** END LICENSE BLOCK *****
+ */
+
+// For testing
+SockJS.getUtils = function(){
+    return utils;
+};
+
+SockJS.getIframeTransport = function(){
+    return IframeTransport;
+};
+//         [*] End of lib/test-hooks.js
+
+                  return SockJS;
+          })();
+if ('_sockjs_onload' in window) setTimeout(_sockjs_onload, 1);
+
+// AMD compliance
+if (typeof define === 'function' && define.amd) {
+    define('sockjs', [], function(){return SockJS;});
+}
+//     [*] End of lib/index.js
+
+// [*] End of lib/all.js
+
diff --git a/src/main/resources/static/sockjs/dist/sockjs-0.3.4.min.js b/src/main/resources/static/sockjs/dist/sockjs-0.3.4.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..baae37641777fac1e95dfa3c75a4b9308bcf8288
--- /dev/null
+++ b/src/main/resources/static/sockjs/dist/sockjs-0.3.4.min.js
@@ -0,0 +1,27 @@
+/* SockJS client, version 0.3.4, http://sockjs.org, MIT License
+
+Copyright (c) 2011-2012 VMware, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+// JSON2 by Douglas Crockford (minified).
+var JSON;JSON||(JSON={}),function(){function str(a,b){var c,d,e,f,g=gap,h,i=b[a];i&&typeof i=="object"&&typeof i.toJSON=="function"&&(i=i.toJSON(a)),typeof rep=="function"&&(i=rep.call(b,a,i));switch(typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i)return"null";gap+=indent,h=[];if(Object.prototype.toString.apply(i)==="[object Array]"){f=i.length;for(c=0;c<f;c+=1)h[c]=str(c,i)||"null";e=h.length===0?"[]":gap?"[\n"+gap+h.join(",\n"+gap)+"\n"+g+"]":"["+h.join(",")+"]",gap=g;return e}if(rep&&typeof rep=="object"){f=rep.length;for(c=0;c<f;c+=1)typeof rep[c]=="string"&&(d=rep[c],e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e))}else for(d in i)Object.prototype.hasOwnProperty.call(i,d)&&(e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e));e=h.length===0?"{}":gap?"{\n"+gap+h.join(",\n"+gap)+"\n"+g+"}":"{"+h.join(",")+"}",gap=g;return e}}function quote(a){escapable.lastIndex=0;return escapable.test(a)?'"'+a.replace(escapable,function(a){var b=meta[a];return typeof b=="string"?b:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function f(a){return a<10?"0"+a:a}"use strict",typeof Date.prototype.toJSON!="function"&&(Date.prototype.toJSON=function(a){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(a){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={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;typeof JSON.stringify!="function"&&(JSON.stringify=function(a,b,c){var d;gap="",indent="";if(typeof c=="number")for(d=0;d<c;d+=1)indent+=" ";else typeof c=="string"&&(indent=c);rep=b;if(!b||typeof b=="function"||typeof b=="object"&&typeof b.length=="number")return str("",{"":a});throw new Error("JSON.stringify")}),typeof JSON.parse!="function"&&(JSON.parse=function(text,reviver){function walk(a,b){var c,d,e=a[b];if(e&&typeof e=="object")for(c in e)Object.prototype.hasOwnProperty.call(e,c)&&(d=walk(e,c),d!==undefined?e[c]=d:delete e[c]);return reviver.call(a,b,e)}var j;text=String(text),cx.lastIndex=0,cx.test(text)&&(text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));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,""))){j=eval("("+text+")");return typeof reviver=="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")})}()
+
+SockJS=function(){var a=document,b=window,c={},d=function(){};d.prototype.addEventListener=function(a,b){this._listeners||(this._listeners={}),a in this._listeners||(this._listeners[a]=[]);var d=this._listeners[a];c.arrIndexOf(d,b)===-1&&d.push(b);return},d.prototype.removeEventListener=function(a,b){if(!(this._listeners&&a in this._listeners))return;var d=this._listeners[a],e=c.arrIndexOf(d,b);if(e!==-1){d.length>1?this._listeners[a]=d.slice(0,e).concat(d.slice(e+1)):delete this._listeners[a];return}return},d.prototype.dispatchEvent=function(a){var b=a.type,c=Array.prototype.slice.call(arguments,0);this["on"+b]&&this["on"+b].apply(this,c);if(this._listeners&&b in this._listeners)for(var d=0;d<this._listeners[b].length;d++)this._listeners[b][d].apply(this,c)};var e=function(a,b){this.type=a;if(typeof b!="undefined")for(var c in b){if(!b.hasOwnProperty(c))continue;this[c]=b[c]}};e.prototype.toString=function(){var a=[];for(var b in this){if(!this.hasOwnProperty(b))continue;var c=this[b];typeof c=="function"&&(c="[function]"),a.push(b+"="+c)}return"SimpleEvent("+a.join(", ")+")"};var f=function(a){var b=this;b._events=a||[],b._listeners={}};f.prototype.emit=function(a){var b=this;b._verifyType(a);if(b._nuked)return;var c=Array.prototype.slice.call(arguments,1);b["on"+a]&&b["on"+a].apply(b,c);if(a in b._listeners)for(var d=0;d<b._listeners[a].length;d++)b._listeners[a][d].apply(b,c)},f.prototype.on=function(a,b){var c=this;c._verifyType(a);if(c._nuked)return;a in c._listeners||(c._listeners[a]=[]),c._listeners[a].push(b)},f.prototype._verifyType=function(a){var b=this;c.arrIndexOf(b._events,a)===-1&&c.log("Event "+JSON.stringify(a)+" not listed "+JSON.stringify(b._events)+" in "+b)},f.prototype.nuke=function(){var a=this;a._nuked=!0;for(var b=0;b<a._events.length;b++)delete a[a._events[b]];a._listeners={}};var g="abcdefghijklmnopqrstuvwxyz0123456789_";c.random_string=function(a,b){b=b||g.length;var c,d=[];for(c=0;c<a;c++)d.push(g.substr(Math.floor(Math.random()*b),1));return d.join("")},c.random_number=function(a){return Math.floor(Math.random()*a)},c.random_number_string=function(a){var b=(""+(a-1)).length,d=Array(b+1).join("0");return(d+c.random_number(a)).slice(-b)},c.getOrigin=function(a){a+="/";var b=a.split("/").slice(0,3);return b.join("/")},c.isSameOriginUrl=function(a,c){return c||(c=b.location.href),a.split("/").slice(0,3).join("/")===c.split("/").slice(0,3).join("/")},c.getParentDomain=function(a){if(/^[0-9.]*$/.test(a))return a;if(/^\[/.test(a))return a;if(!/[.]/.test(a))return a;var b=a.split(".").slice(1);return b.join(".")},c.objectExtend=function(a,b){for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return a};var h="_jp";c.polluteGlobalNamespace=function(){h in b||(b[h]={})},c.closeFrame=function(a,b){return"c"+JSON.stringify([a,b])},c.userSetCode=function(a){return a===1e3||a>=3e3&&a<=4999},c.countRTO=function(a){var b;return a>100?b=3*a:b=a+200,b},c.log=function(){b.console&&console.log&&console.log.apply&&console.log.apply(console,arguments)},c.bind=function(a,b){return a.bind?a.bind(b):function(){return a.apply(b,arguments)}},c.flatUrl=function(a){return a.indexOf("?")===-1&&a.indexOf("#")===-1},c.amendUrl=function(b){var d=a.location;if(!b)throw new Error("Wrong url for SockJS");if(!c.flatUrl(b))throw new Error("Only basic urls are supported in SockJS");return b.indexOf("//")===0&&(b=d.protocol+b),b.indexOf("/")===0&&(b=d.protocol+"//"+d.host+b),b=b.replace(/[/]+$/,""),b},c.arrIndexOf=function(a,b){for(var c=0;c<a.length;c++)if(a[c]===b)return c;return-1},c.arrSkip=function(a,b){var d=c.arrIndexOf(a,b);if(d===-1)return a.slice();var e=a.slice(0,d);return e.concat(a.slice(d+1))},c.isArray=Array.isArray||function(a){return{}.toString.call(a).indexOf("Array")>=0},c.delay=function(a,b){return typeof a=="function"&&(b=a,a=0),setTimeout(b,a)};var i=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,j={"\0":"\\u0000","\x01":"\\u0001","\x02":"\\u0002","\x03":"\\u0003","\x04":"\\u0004","\x05":"\\u0005","\x06":"\\u0006","\x07":"\\u0007","\b":"\\b","\t":"\\t","\n":"\\n","\x0b":"\\u000b","\f":"\\f","\r":"\\r","\x0e":"\\u000e","\x0f":"\\u000f","\x10":"\\u0010","\x11":"\\u0011","\x12":"\\u0012","\x13":"\\u0013","\x14":"\\u0014","\x15":"\\u0015","\x16":"\\u0016","\x17":"\\u0017","\x18":"\\u0018","\x19":"\\u0019","\x1a":"\\u001a","\x1b":"\\u001b","\x1c":"\\u001c","\x1d":"\\u001d","\x1e":"\\u001e","\x1f":"\\u001f",'"':'\\"',"\\":"\\\\","\x7f":"\\u007f","\x80":"\\u0080","\x81":"\\u0081","\x82":"\\u0082","\x83":"\\u0083","\x84":"\\u0084","\x85":"\\u0085","\x86":"\\u0086","\x87":"\\u0087","\x88":"\\u0088","\x89":"\\u0089","\x8a":"\\u008a","\x8b":"\\u008b","\x8c":"\\u008c","\x8d":"\\u008d","\x8e":"\\u008e","\x8f":"\\u008f","\x90":"\\u0090","\x91":"\\u0091","\x92":"\\u0092","\x93":"\\u0093","\x94":"\\u0094","\x95":"\\u0095","\x96":"\\u0096","\x97":"\\u0097","\x98":"\\u0098","\x99":"\\u0099","\x9a":"\\u009a","\x9b":"\\u009b","\x9c":"\\u009c","\x9d":"\\u009d","\x9e":"\\u009e","\x9f":"\\u009f","\xad":"\\u00ad","\u0600":"\\u0600","\u0601":"\\u0601","\u0602":"\\u0602","\u0603":"\\u0603","\u0604":"\\u0604","\u070f":"\\u070f","\u17b4":"\\u17b4","\u17b5":"\\u17b5","\u200c":"\\u200c","\u200d":"\\u200d","\u200e":"\\u200e","\u200f":"\\u200f","\u2028":"\\u2028","\u2029":"\\u2029","\u202a":"\\u202a","\u202b":"\\u202b","\u202c":"\\u202c","\u202d":"\\u202d","\u202e":"\\u202e","\u202f":"\\u202f","\u2060":"\\u2060","\u2061":"\\u2061","\u2062":"\\u2062","\u2063":"\\u2063","\u2064":"\\u2064","\u2065":"\\u2065","\u2066":"\\u2066","\u2067":"\\u2067","\u2068":"\\u2068","\u2069":"\\u2069","\u206a":"\\u206a","\u206b":"\\u206b","\u206c":"\\u206c","\u206d":"\\u206d","\u206e":"\\u206e","\u206f":"\\u206f","\ufeff":"\\ufeff","\ufff0":"\\ufff0","\ufff1":"\\ufff1","\ufff2":"\\ufff2","\ufff3":"\\ufff3","\ufff4":"\\ufff4","\ufff5":"\\ufff5","\ufff6":"\\ufff6","\ufff7":"\\ufff7","\ufff8":"\\ufff8","\ufff9":"\\ufff9","\ufffa":"\\ufffa","\ufffb":"\\ufffb","\ufffc":"\\ufffc","\ufffd":"\\ufffd","\ufffe":"\\ufffe","\uffff":"\\uffff"},k=/[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g,l,m=JSON&&JSON.stringify||function(a){return i.lastIndex=0,i.test(a)&&(a=a.replace(i,function(a){return j[a]})),'"'+a+'"'},n=function(a){var b,c={},d=[];for(b=0;b<65536;b++)d.push(String.fromCharCode(b));return a.lastIndex=0,d.join("").replace(a,function(a){return c[a]="\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4),""}),a.lastIndex=0,c};c.quote=function(a){var b=m(a);return k.lastIndex=0,k.test(b)?(l||(l=n(k)),b.replace(k,function(a){return l[a]})):b};var o=["websocket","xdr-streaming","xhr-streaming","iframe-eventsource","iframe-htmlfile","xdr-polling","xhr-polling","iframe-xhr-polling","jsonp-polling"];c.probeProtocols=function(){var a={};for(var b=0;b<o.length;b++){var c=o[b];a[c]=y[c]&&y[c].enabled()}return a},c.detectProtocols=function(a,b,c){var d={},e=[];b||(b=o);for(var f=0;f<b.length;f++){var g=b[f];d[g]=a[g]}var h=function(a){var b=a.shift();d[b]?e.push(b):a.length>0&&h(a)};return c.websocket!==!1&&h(["websocket"]),d["xhr-streaming"]&&!c.null_origin?e.push("xhr-streaming"):d["xdr-streaming"]&&!c.cookie_needed&&!c.null_origin?e.push("xdr-streaming"):h(["iframe-eventsource","iframe-htmlfile"]),d["xhr-polling"]&&!c.null_origin?e.push("xhr-polling"):d["xdr-polling"]&&!c.cookie_needed&&!c.null_origin?e.push("xdr-polling"):h(["iframe-xhr-polling","jsonp-polling"]),e};var p="_sockjs_global";c.createHook=function(){var a="a"+c.random_string(8);if(!(p in b)){var d={};b[p]=function(a){return a in d||(d[a]={id:a,del:function(){delete d[a]}}),d[a]}}return b[p](a)},c.attachMessage=function(a){c.attachEvent("message",a)},c.attachEvent=function(c,d){typeof b.addEventListener!="undefined"?b.addEventListener(c,d,!1):(a.attachEvent("on"+c,d),b.attachEvent("on"+c,d))},c.detachMessage=function(a){c.detachEvent("message",a)},c.detachEvent=function(c,d){typeof b.addEventListener!="undefined"?b.removeEventListener(c,d,!1):(a.detachEvent("on"+c,d),b.detachEvent("on"+c,d))};var q={},r=!1,s=function(){for(var a in q)q[a](),delete q[a]},t=function(){if(r)return;r=!0,s()};c.attachEvent("unload",t),c.unload_add=function(a){var b=c.random_string(8);return q[b]=a,r&&c.delay(s),b},c.unload_del=function(a){a in q&&delete q[a]},c.createIframe=function(b,d){var e=a.createElement("iframe"),f,g,h=function(){clearTimeout(f);try{e.onload=null}catch(a){}e.onerror=null},i=function(){e&&(h(),setTimeout(function(){e&&e.parentNode.removeChild(e),e=null},0),c.unload_del(g))},j=function(a){e&&(i(),d(a))},k=function(a,b){try{e&&e.contentWindow&&e.contentWindow.postMessage(a,b)}catch(c){}};return e.src=b,e.style.display="none",e.style.position="absolute",e.onerror=function(){j("onerror")},e.onload=function(){clearTimeout(f),f=setTimeout(function(){j("onload timeout")},2e3)},a.body.appendChild(e),f=setTimeout(function(){j("timeout")},15e3),g=c.unload_add(i),{post:k,cleanup:i,loaded:h}},c.createHtmlfile=function(a,d){var e=new ActiveXObject("htmlfile"),f,g,i,j=function(){clearTimeout(f)},k=function(){e&&(j(),c.unload_del(g),i.parentNode.removeChild(i),i=e=null,CollectGarbage())},l=function(a){e&&(k(),d(a))},m=function(a,b){try{i&&i.contentWindow&&i.contentWindow.postMessage(a,b)}catch(c){}};e.open(),e.write('<html><script>document.domain="'+document.domain+'";'+"</s"+"cript></html>"),e.close(),e.parentWindow[h]=b[h];var n=e.createElement("div");return e.body.appendChild(n),i=e.createElement("iframe"),n.appendChild(i),i.src=a,f=setTimeout(function(){l("timeout")},15e3),g=c.unload_add(k),{post:m,cleanup:k,loaded:j}};var u=function(){};u.prototype=new f(["chunk","finish"]),u.prototype._start=function(a,d,e,f){var g=this;try{g.xhr=new XMLHttpRequest}catch(h){}if(!g.xhr)try{g.xhr=new b.ActiveXObject("Microsoft.XMLHTTP")}catch(h){}if(b.ActiveXObject||b.XDomainRequest)d+=(d.indexOf("?")===-1?"?":"&")+"t="+ +(new Date);g.unload_ref=c.unload_add(function(){g._cleanup(!0)});try{g.xhr.open(a,d,!0)}catch(i){g.emit("finish",0,""),g._cleanup();return}if(!f||!f.no_credentials)g.xhr.withCredentials="true";if(f&&f.headers)for(var j in f.headers)g.xhr.setRequestHeader(j,f.headers[j]);g.xhr.onreadystatechange=function(){if(g.xhr){var a=g.xhr;switch(a.readyState){case 3:try{var b=a.status,c=a.responseText}catch(a){}b===1223&&(b=204),c&&c.length>0&&g.emit("chunk",b,c);break;case 4:var b=a.status;b===1223&&(b=204),g.emit("finish",b,a.responseText),g._cleanup(!1)}}},g.xhr.send(e)},u.prototype._cleanup=function(a){var b=this;if(!b.xhr)return;c.unload_del(b.unload_ref),b.xhr.onreadystatechange=function(){};if(a)try{b.xhr.abort()}catch(d){}b.unload_ref=b.xhr=null},u.prototype.close=function(){var a=this;a.nuke(),a._cleanup(!0)};var v=c.XHRCorsObject=function(){var a=this,b=arguments;c.delay(function(){a._start.apply(a,b)})};v.prototype=new u;var w=c.XHRLocalObject=function(a,b,d){var e=this;c.delay(function(){e._start(a,b,d,{no_credentials:!0})})};w.prototype=new u;var x=c.XDRObject=function(a,b,d){var e=this;c.delay(function(){e._start(a,b,d)})};x.prototype=new f(["chunk","finish"]),x.prototype._start=function(a,b,d){var e=this,f=new XDomainRequest;b+=(b.indexOf("?")===-1?"?":"&")+"t="+ +(new Date);var g=f.ontimeout=f.onerror=function(){e.emit("finish",0,""),e._cleanup(!1)};f.onprogress=function(){e.emit("chunk",200,f.responseText)},f.onload=function(){e.emit("finish",200,f.responseText),e._cleanup(!1)},e.xdr=f,e.unload_ref=c.unload_add(function(){e._cleanup(!0)});try{e.xdr.open(a,b),e.xdr.send(d)}catch(h){g()}},x.prototype._cleanup=function(a){var b=this;if(!b.xdr)return;c.unload_del(b.unload_ref),b.xdr.ontimeout=b.xdr.onerror=b.xdr.onprogress=b.xdr.onload=null;if(a)try{b.xdr.abort()}catch(d){}b.unload_ref=b.xdr=null},x.prototype.close=function(){var a=this;a.nuke(),a._cleanup(!0)},c.isXHRCorsCapable=function(){return b.XMLHttpRequest&&"withCredentials"in new XMLHttpRequest?1:b.XDomainRequest&&a.domain?2:L.enabled()?3:4};var y=function(a,d,e){if(this===b)return new y(a,d,e);var f=this,g;f._options={devel:!1,debug:!1,protocols_whitelist:[],info:undefined,rtt:undefined},e&&c.objectExtend(f._options,e),f._base_url=c.amendUrl(a),f._server=f._options.server||c.random_number_string(1e3),f._options.protocols_whitelist&&f._options.protocols_whitelist.length?g=f._options.protocols_whitelist:(typeof d=="string"&&d.length>0?g=[d]:c.isArray(d)?g=d:g=null,g&&f._debug('Deprecated API: Use "protocols_whitelist" option instead of supplying protocol list as a second parameter to SockJS constructor.')),f._protocols=[],f.protocol=null,f.readyState=y.CONNECTING,f._ir=S(f._base_url),f._ir.onfinish=function(a,b){f._ir=null,a?(f._options.info&&(a=c.objectExtend(a,f._options.info)),f._options.rtt&&(b=f._options.rtt),f._applyInfo(a,b,g),f._didClose()):f._didClose(1002,"Can't connect to server",!0)}};y.prototype=new d,y.version="0.3.4",y.CONNECTING=0,y.OPEN=1,y.CLOSING=2,y.CLOSED=3,y.prototype._debug=function(){this._options.debug&&c.log.apply(c,arguments)},y.prototype._dispatchOpen=function(){var a=this;a.readyState===y.CONNECTING?(a._transport_tref&&(clearTimeout(a._transport_tref),a._transport_tref=null),a.readyState=y.OPEN,a.dispatchEvent(new e("open"))):a._didClose(1006,"Server lost session")},y.prototype._dispatchMessage=function(a){var b=this;if(b.readyState!==y.OPEN)return;b.dispatchEvent(new e("message",{data:a}))},y.prototype._dispatchHeartbeat=function(a){var b=this;if(b.readyState!==y.OPEN)return;b.dispatchEvent(new e("heartbeat",{}))},y.prototype._didClose=function(a,b,d){var f=this;if(f.readyState!==y.CONNECTING&&f.readyState!==y.OPEN&&f.readyState!==y.CLOSING)throw new Error("INVALID_STATE_ERR");f._ir&&(f._ir.nuke(),f._ir=null),f._transport&&(f._transport.doCleanup(),f._transport=null);var g=new e("close",{code:a,reason:b,wasClean:c.userSetCode(a)});if(!c.userSetCode(a)&&f.readyState===y.CONNECTING&&!d){if(f._try_next_protocol(g))return;g=new e("close",{code:2e3,reason:"All transports failed",wasClean:!1,last_event:g})}f.readyState=y.CLOSED,c.delay(function(){f.dispatchEvent(g)})},y.prototype._didMessage=function(a){var b=this,c=a.slice(0,1);switch(c){case"o":b._dispatchOpen();break;case"a":var d=JSON.parse(a.slice(1)||"[]");for(var e=0;e<d.length;e++)b._dispatchMessage(d[e]);break;case"m":var d=JSON.parse(a.slice(1)||"null");b._dispatchMessage(d);break;case"c":var d=JSON.parse(a.slice(1)||"[]");b._didClose(d[0],d[1]);break;case"h":b._dispatchHeartbeat()}},y.prototype._try_next_protocol=function(b){var d=this;d.protocol&&(d._debug("Closed transport:",d.protocol,""+b),d.protocol=null),d._transport_tref&&(clearTimeout(d._transport_tref),d._transport_tref=null);for(;;){var e=d.protocol=d._protocols.shift();if(!e)return!1;if(y[e]&&y[e].need_body===!0&&(!a.body||typeof a.readyState!="undefined"&&a.readyState!=="complete"))return d._protocols.unshift(e),d.protocol="waiting-for-load",c.attachEvent("load",function(){d._try_next_protocol()}),!0;if(!!y[e]&&!!y[e].enabled(d._options)){var f=y[e].roundTrips||1,g=(d._options.rto||0)*f||5e3;d._transport_tref=c.delay(g,function(){d.readyState===y.CONNECTING&&d._didClose(2007,"Transport timeouted")});var h=c.random_string(8),i=d._base_url+"/"+d._server+"/"+h;return d._debug("Opening transport:",e," url:"+i," RTO:"+d._options.rto),d._transport=new y[e](d,i,d._base_url),!0}d._debug("Skipping transport:",e)}},y.prototype.close=function(a,b){var d=this;if(a&&!c.userSetCode(a))throw new Error("INVALID_ACCESS_ERR");return d.readyState!==y.CONNECTING&&d.readyState!==y.OPEN?!1:(d.readyState=y.CLOSING,d._didClose(a||1e3,b||"Normal closure"),!0)},y.prototype.send=function(a){var b=this;if(b.readyState===y.CONNECTING)throw new Error("INVALID_STATE_ERR");return b.readyState===y.OPEN&&b._transport.doSend(c.quote(""+a)),!0},y.prototype._applyInfo=function(b,d,e){var f=this;f._options.info=b,f._options.rtt=d,f._options.rto=c.countRTO(d),f._options.info.null_origin=!a.domain;var g=c.probeProtocols();f._protocols=c.detectProtocols(g,e,b)};var z=y.websocket=function(a,d){var e=this,f=d+"/websocket";f.slice(0,5)==="https"?f="wss"+f.slice(5):f="ws"+f.slice(4),e.ri=a,e.url=f;var g=b.WebSocket||b.MozWebSocket;e.ws=new g(e.url),e.ws.onmessage=function(a){e.ri._didMessage(a.data)},e.unload_ref=c.unload_add(function(){e.ws.close()}),e.ws.onclose=function(){e.ri._didMessage(c.closeFrame(1006,"WebSocket connection broken"))}};z.prototype.doSend=function(a){this.ws.send("["+a+"]")},z.prototype.doCleanup=function(){var a=this,b=a.ws;b&&(b.onmessage=b.onclose=null,b.close(),c.unload_del(a.unload_ref),a.unload_ref=a.ri=a.ws=null)},z.enabled=function(){return!!b.WebSocket||!!b.MozWebSocket},z.roundTrips=2;var A=function(){};A.prototype.send_constructor=function(a){var b=this;b.send_buffer=[],b.sender=a},A.prototype.doSend=function(a){var b=this;b.send_buffer.push(a),b.send_stop||b.send_schedule()},A.prototype.send_schedule_wait=function(){var a=this,b;a.send_stop=function(){a.send_stop=null,clearTimeout(b)},b=c.delay(25,function(){a.send_stop=null,a.send_schedule()})},A.prototype.send_schedule=function(){var a=this;if(a.send_buffer.length>0){var b="["+a.send_buffer.join(",")+"]";a.send_stop=a.sender(a.trans_url,b,function(b,c){a.send_stop=null,b===!1?a.ri._didClose(1006,"Sending error "+c):a.send_schedule_wait()}),a.send_buffer=[]}},A.prototype.send_destructor=function(){var a=this;a._send_stop&&a._send_stop(),a._send_stop=null};var B=function(b,d,e){var f=this;if(!("_send_form"in f)){var g=f._send_form=a.createElement("form"),h=f._send_area=a.createElement("textarea");h.name="d",g.style.display="none",g.style.position="absolute",g.method="POST",g.enctype="application/x-www-form-urlencoded",g.acceptCharset="UTF-8",g.appendChild(h),a.body.appendChild(g)}var g=f._send_form,h=f._send_area,i="a"+c.random_string(8);g.target=i,g.action=b+"/jsonp_send?i="+i;var j;try{j=a.createElement('<iframe name="'+i+'">')}catch(k){j=a.createElement("iframe"),j.name=i}j.id=i,g.appendChild(j),j.style.display="none";try{h.value=d}catch(l){c.log("Your browser is seriously broken. Go home! "+l.message)}g.submit();var m=function(a){if(!j.onerror)return;j.onreadystatechange=j.onerror=j.onload=null,c.delay(500,function(){j.parentNode.removeChild(j),j=null}),h.value="",e(!0)};return j.onerror=j.onload=m,j.onreadystatechange=function(a){j.readyState=="complete"&&m()},m},C=function(a){return function(b,c,d){var e=new a("POST",b+"/xhr_send",c);return e.onfinish=function(a,b){d(a===200||a===204,"http status "+a)},function(a){d(!1,a)}}},D=function(b,d){var e,f=a.createElement("script"),g,h=function(a){g&&(g.parentNode.removeChild(g),g=null),f&&(clearTimeout(e),f.parentNode.removeChild(f),f.onreadystatechange=f.onerror=f.onload=f.onclick=null,f=null,d(a),d=null)},i=!1,j=null;f.id="a"+c.random_string(8),f.src=b,f.type="text/javascript",f.charset="UTF-8",f.onerror=function(a){j||(j=setTimeout(function(){i||h(c.closeFrame(1006,"JSONP script loaded abnormally (onerror)"))},1e3))},f.onload=function(a){h(c.closeFrame(1006,"JSONP script loaded abnormally (onload)"))},f.onreadystatechange=function(a){if(/loaded|closed/.test(f.readyState)){if(f&&f.htmlFor&&f.onclick){i=!0;try{f.onclick()}catch(b){}}f&&h(c.closeFrame(1006,"JSONP script loaded abnormally (onreadystatechange)"))}};if(typeof f.async=="undefined"&&a.attachEvent)if(!/opera/i.test(navigator.userAgent)){try{f.htmlFor=f.id,f.event="onclick"}catch(k){}f.async=!0}else g=a.createElement("script"),g.text="try{var a = document.getElementById('"+f.id+"'); if(a)a.onerror();}catch(x){};",f.async=g.async=!1;typeof f.async!="undefined"&&(f.async=!0),e=setTimeout(function(){h(c.closeFrame(1006,"JSONP script loaded abnormally (timeout)"))},35e3);var l=a.getElementsByTagName("head")[0];return l.insertBefore(f,l.firstChild),g&&l.insertBefore(g,l.firstChild),h},E=y["jsonp-polling"]=function(a,b){c.polluteGlobalNamespace();var d=this;d.ri=a,d.trans_url=b,d.send_constructor(B),d._schedule_recv()};E.prototype=new A,E.prototype._schedule_recv=function(){var a=this,b=function(b){a._recv_stop=null,b&&(a._is_closing||a.ri._didMessage(b)),a._is_closing||a._schedule_recv()};a._recv_stop=F(a.trans_url+"/jsonp",D,b)},E.enabled=function(){return!0},E.need_body=!0,E.prototype.doCleanup=function(){var a=this;a._is_closing=!0,a._recv_stop&&a._recv_stop(),a.ri=a._recv_stop=null,a.send_destructor()};var F=function(a,d,e){var f="a"+c.random_string(6),g=a+"?c="+escape(h+"."+f),i=0,j=function(a){switch(i){case 0:delete b[h][f],e(a);break;case 1:e(a),i=2;break;case 2:delete b[h][f]}},k=d(g,j);b[h][f]=k;var l=function(){b[h][f]&&(i=1,b[h][f](c.closeFrame(1e3,"JSONP user aborted read")))};return l},G=function(){};G.prototype=new A,G.prototype.run=function(a,b,c,d,e){var f=this;f.ri=a,f.trans_url=b,f.send_constructor(C(e)),f.poll=new $(a,d,b+c,e)},G.prototype.doCleanup=function(){var a=this;a.poll&&(a.poll.abort(),a.poll=null)};var H=y["xhr-streaming"]=function(a,b){this.run(a,b,"/xhr_streaming",bd,c.XHRCorsObject)};H.prototype=new G,H.enabled=function(){return b.XMLHttpRequest&&"withCredentials"in new XMLHttpRequest&&!/opera/i.test(navigator.userAgent)},H.roundTrips=2,H.need_body=!0;var I=y["xdr-streaming"]=function(a,b){this.run(a,b,"/xhr_streaming",bd,c.XDRObject)};I.prototype=new G,I.enabled=function(){return!!b.XDomainRequest},I.roundTrips=2;var J=y["xhr-polling"]=function(a,b){this.run(a,b,"/xhr",bd,c.XHRCorsObject)};J.prototype=new G,J.enabled=H.enabled,J.roundTrips=2;var K=y["xdr-polling"]=function(a,b){this.run(a,b,"/xhr",bd,c.XDRObject)};K.prototype=new G,K.enabled=I.enabled,K.roundTrips=2;var L=function(){};L.prototype.i_constructor=function(a,b,d){var e=this;e.ri=a,e.origin=c.getOrigin(d),e.base_url=d,e.trans_url=b;var f=d+"/iframe.html";e.ri._options.devel&&(f+="?t="+ +(new Date)),e.window_id=c.random_string(8),f+="#"+e.window_id,e.iframeObj=c.createIframe(f,function(a){e.ri._didClose(1006,"Unable to load an iframe ("+a+")")}),e.onmessage_cb=c.bind(e.onmessage,e),c.attachMessage(e.onmessage_cb)},L.prototype.doCleanup=function(){var a=this;if(a.iframeObj){c.detachMessage(a.onmessage_cb);try{a.iframeObj.iframe.contentWindow&&a.postMessage("c")}catch(b){}a.iframeObj.cleanup(),a.iframeObj=null,a.onmessage_cb=a.iframeObj=null}},L.prototype.onmessage=function(a){var b=this;if(a.origin!==b.origin)return;var c=a.data.slice(0,8),d=a.data.slice(8,9),e=a.data.slice(9);if(c!==b.window_id)return;switch(d){case"s":b.iframeObj.loaded(),b.postMessage("s",JSON.stringify([y.version,b.protocol,b.trans_url,b.base_url]));break;case"t":b.ri._didMessage(e)}},L.prototype.postMessage=function(a,b){var c=this;c.iframeObj.post(c.window_id+a+(b||""),c.origin)},L.prototype.doSend=function(a){this.postMessage("m",a)},L.enabled=function(){var a=navigator&&navigator.userAgent&&navigator.userAgent.indexOf("Konqueror")!==-1;return(typeof b.postMessage=="function"||typeof b.postMessage=="object")&&!a};var M,N=function(a,d){parent!==b?parent.postMessage(M+a+(d||""),"*"):c.log("Can't postMessage, no parent window.",a,d)},O=function(){};O.prototype._didClose=function(a,b){N("t",c.closeFrame(a,b))},O.prototype._didMessage=function(a){N("t",a)},O.prototype._doSend=function(a){this._transport.doSend(a)},O.prototype._doCleanup=function(){this._transport.doCleanup()},c.parent_origin=undefined,y.bootstrap_iframe=function(){var d;M=a.location.hash.slice(1);var e=function(a){if(a.source!==parent)return;typeof c.parent_origin=="undefined"&&(c.parent_origin=a.origin);if(a.origin!==c.parent_origin)return;var e=a.data.slice(0,8),f=a.data.slice(8,9),g=a.data.slice(9);if(e!==M)return;switch(f){case"s":var h=JSON.parse(g),i=h[0],j=h[1],k=h[2],l=h[3];i!==y.version&&c.log('Incompatibile SockJS! Main site uses: "'+i+'", the iframe:'+' "'+y.version+'".');if(!c.flatUrl(k)||!c.flatUrl(l)){c.log("Only basic urls are supported in SockJS");return}if(!c.isSameOriginUrl(k)||!c.isSameOriginUrl(l)){c.log("Can't connect to different domain from within an iframe. ("+JSON.stringify([b.location.href,k,l])+")");return}d=new O,d._transport=new O[j](d,k,l);break;case"m":d._doSend(g);break;case"c":d&&d._doCleanup(),d=null}};c.attachMessage(e),N("s")};var P=function(a,b){var d=this;c.delay(function(){d.doXhr(a,b)})};P.prototype=new f(["finish"]),P.prototype.doXhr=function(a,b){var d=this,e=(new Date).getTime(),f=new b("GET",a+"/info"),g=c.delay(8e3,function(){f.ontimeout()});f.onfinish=function(a,b){clearTimeout(g),g=null;if(a===200){var c=(new Date).getTime()-e,f=JSON.parse(b);typeof f!="object"&&(f={}),d.emit("finish",f,c)}else d.emit("finish")},f.ontimeout=function(){f.close(),d.emit("finish")}};var Q=function(b){var d=this,e=function(){var a=new L;a.protocol="w-iframe-info-receiver";var c=function(b){if(typeof b=="string"&&b.substr(0,1)==="m"){var c=JSON.parse(b.substr(1)),e=c[0],f=c[1];d.emit("finish",e,f)}else d.emit("finish");a.doCleanup(),a=null},e={_options:{},_didClose:c,_didMessage:c};a.i_constructor(e,b,b)};a.body?e():c.attachEvent("load",e)};Q.prototype=new f(["finish"]);var R=function(){var a=this;c.delay(function(){a.emit("finish",{},2e3)})};R.prototype=new f(["finish"]);var S=function(a){if(c.isSameOriginUrl(a))return new P(a,c.XHRLocalObject);switch(c.isXHRCorsCapable()){case 1:return new P(a,c.XHRLocalObject);case 2:return new P(a,c.XDRObject);case 3:return new Q(a);default:return new R}},T=O["w-iframe-info-receiver"]=function(a,b,d){var e=new P(d,c.XHRLocalObject);e.onfinish=function(b,c){a._didMessage("m"+JSON.stringify([b,c])),a._didClose()}};T.prototype.doCleanup=function(){};var U=y["iframe-eventsource"]=function(){var a=this;a.protocol="w-iframe-eventsource",a.i_constructor.apply(a,arguments)};U.prototype=new L,U.enabled=function(){return"EventSource"in b&&L.enabled()},U.need_body=!0,U.roundTrips=3;var V=O["w-iframe-eventsource"]=function(a,b){this.run(a,b,"/eventsource",_,c.XHRLocalObject)};V.prototype=new G;var W=y["iframe-xhr-polling"]=function(){var a=this;a.protocol="w-iframe-xhr-polling",a.i_constructor.apply(a,arguments)};W.prototype=new L,W.enabled=function(){return b.XMLHttpRequest&&L.enabled()},W.need_body=!0,W.roundTrips=3;var X=O["w-iframe-xhr-polling"]=function(a,b){this.run(a,b,"/xhr",bd,c.XHRLocalObject)};X.prototype=new G;var Y=y["iframe-htmlfile"]=function(){var a=this;a.protocol="w-iframe-htmlfile",a.i_constructor.apply(a,arguments)};Y.prototype=new L,Y.enabled=function(){return L.enabled()},Y.need_body=!0,Y.roundTrips=3;var Z=O["w-iframe-htmlfile"]=function(a,b){this.run(a,b,"/htmlfile",bc,c.XHRLocalObject)};Z.prototype=new G;var $=function(a,b,c,d){var e=this;e.ri=a,e.Receiver=b,e.recv_url=c,e.AjaxObject=d,e._scheduleRecv()};$.prototype._scheduleRecv=function(){var a=this,b=a.poll=new a.Receiver(a.recv_url,a.AjaxObject),c=0;b.onmessage=function(b){c+=1,a.ri._didMessage(b.data)},b.onclose=function(c){a.poll=b=b.onmessage=b.onclose=null,a.poll_is_closing||(c.reason==="permanent"?a.ri._didClose(1006,"Polling error ("+c.reason+")"):a._scheduleRecv())}},$.prototype.abort=function(){var a=this;a.poll_is_closing=!0,a.poll&&a.poll.abort()};var _=function(a){var b=this,d=new EventSource(a);d.onmessage=function(a){b.dispatchEvent(new e("message",{data:unescape(a.data)}))},b.es_close=d.onerror=function(a,f){var g=f?"user":d.readyState!==2?"network":"permanent";b.es_close=d.onmessage=d.onerror=null,d.close(),d=null,c.delay(200,function(){b.dispatchEvent(new e("close",{reason:g}))})}};_.prototype=new d,_.prototype.abort=function(){var a=this;a.es_close&&a.es_close({},!0)};var ba,bb=function(){if(ba===undefined)if("ActiveXObject"in b)try{ba=!!(new ActiveXObject("htmlfile"))}catch(a){}else ba=!1;return ba},bc=function(a){var d=this;c.polluteGlobalNamespace(),d.id="a"+c.random_string(6,26),a+=(a.indexOf("?")===-1?"?":"&")+"c="+escape(h+"."+d.id);var f=bb()?c.createHtmlfile:c.createIframe,g;b[h][d.id]={start:function(){g.loaded()},message:function(a){d.dispatchEvent(new e("message",{data:a}))},stop:function(){d.iframe_close({},"network")}},d.iframe_close=function(a,c){g.cleanup(),d.iframe_close=g=null,delete b[h][d.id],d.dispatchEvent(new e("close",{reason:c}))},g=f(a,function(a){d.iframe_close({},"permanent")})};bc.prototype=new d,bc.prototype.abort=function(){var a=this;a.iframe_close&&a.iframe_close({},"user")};var bd=function(a,b){var c=this,d=0;c.xo=new b("POST",a,null),c.xo.onchunk=function(a,b){if(a!==200)return;for(;;){var f=b.slice(d),g=f.indexOf("\n");if(g===-1)break;d+=g+1;var h=f.slice(0,g);c.dispatchEvent(new e("message",{data:h}))}},c.xo.onfinish=function(a,b){c.xo.onchunk(a,b),c.xo=null;var d=a===200?"network":"permanent";c.dispatchEvent(new e("close",{reason:d}))}};return bd.prototype=new d,bd.prototype.abort=function(){var a=this;a.xo&&(a.xo.close(),a.dispatchEvent(new e("close",{reason:"user"})),a.xo=null)},y.getUtils=function(){return c},y.getIframeTransport=function(){return L},y}(),"_sockjs_onload"in window&&setTimeout(_sockjs_onload,1),typeof define=="function"&&define.amd&&define("sockjs",[],function(){return SockJS})
diff --git a/src/main/resources/static/sockjs/dist/sockjs-1.1.1.js b/src/main/resources/static/sockjs/dist/sockjs-1.1.1.js
new file mode 100644
index 0000000000000000000000000000000000000000..0df18ae41fb74dbc2013fa156d5d91e527d6c551
--- /dev/null
+++ b/src/main/resources/static/sockjs/dist/sockjs-1.1.1.js
@@ -0,0 +1,5612 @@
+/* sockjs-client v1.1.1 | http://sockjs.org | MIT license */
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.SockJS=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var transportList = require('./transport-list');
+
+module.exports = require('./main')(transportList);
+
+// TODO can't get rid of this until all servers do
+if ('_sockjs_onload' in global) {
+  setTimeout(global._sockjs_onload, 1);
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9lbnRyeS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgdHJhbnNwb3J0TGlzdCA9IHJlcXVpcmUoJy4vdHJhbnNwb3J0LWxpc3QnKTtcblxubW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKCcuL21haW4nKSh0cmFuc3BvcnRMaXN0KTtcblxuLy8gVE9ETyBjYW4ndCBnZXQgcmlkIG9mIHRoaXMgdW50aWwgYWxsIHNlcnZlcnMgZG9cbmlmICgnX3NvY2tqc19vbmxvYWQnIGluIGdsb2JhbCkge1xuICBzZXRUaW1lb3V0KGdsb2JhbC5fc29ja2pzX29ubG9hZCwgMSk7XG59XG4iXX0=
+},{"./main":14,"./transport-list":16}],2:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , Event = require('./event')
+  ;
+
+function CloseEvent() {
+  Event.call(this);
+  this.initEvent('close', false, false);
+  this.wasClean = false;
+  this.code = 0;
+  this.reason = '';
+}
+
+inherits(CloseEvent, Event);
+
+module.exports = CloseEvent;
+
+},{"./event":4,"inherits":57}],3:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , EventTarget = require('./eventtarget')
+  ;
+
+function EventEmitter() {
+  EventTarget.call(this);
+}
+
+inherits(EventEmitter, EventTarget);
+
+EventEmitter.prototype.removeAllListeners = function(type) {
+  if (type) {
+    delete this._listeners[type];
+  } else {
+    this._listeners = {};
+  }
+};
+
+EventEmitter.prototype.once = function(type, listener) {
+  var self = this
+    , fired = false;
+
+  function g() {
+    self.removeListener(type, g);
+
+    if (!fired) {
+      fired = true;
+      listener.apply(this, arguments);
+    }
+  }
+
+  this.on(type, g);
+};
+
+EventEmitter.prototype.emit = function() {
+  var type = arguments[0];
+  var listeners = this._listeners[type];
+  if (!listeners) {
+    return;
+  }
+  // equivalent of Array.prototype.slice.call(arguments, 1);
+  var l = arguments.length;
+  var args = new Array(l - 1);
+  for (var ai = 1; ai < l; ai++) {
+    args[ai - 1] = arguments[ai];
+  }
+  for (var i = 0; i < listeners.length; i++) {
+    listeners[i].apply(this, args);
+  }
+};
+
+EventEmitter.prototype.on = EventEmitter.prototype.addListener = EventTarget.prototype.addEventListener;
+EventEmitter.prototype.removeListener = EventTarget.prototype.removeEventListener;
+
+module.exports.EventEmitter = EventEmitter;
+
+},{"./eventtarget":5,"inherits":57}],4:[function(require,module,exports){
+'use strict';
+
+function Event(eventType) {
+  this.type = eventType;
+}
+
+Event.prototype.initEvent = function(eventType, canBubble, cancelable) {
+  this.type = eventType;
+  this.bubbles = canBubble;
+  this.cancelable = cancelable;
+  this.timeStamp = +new Date();
+  return this;
+};
+
+Event.prototype.stopPropagation = function() {};
+Event.prototype.preventDefault = function() {};
+
+Event.CAPTURING_PHASE = 1;
+Event.AT_TARGET = 2;
+Event.BUBBLING_PHASE = 3;
+
+module.exports = Event;
+
+},{}],5:[function(require,module,exports){
+'use strict';
+
+/* Simplified implementation of DOM2 EventTarget.
+ *   http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventTarget
+ */
+
+function EventTarget() {
+  this._listeners = {};
+}
+
+EventTarget.prototype.addEventListener = function(eventType, listener) {
+  if (!(eventType in this._listeners)) {
+    this._listeners[eventType] = [];
+  }
+  var arr = this._listeners[eventType];
+  // #4
+  if (arr.indexOf(listener) === -1) {
+    // Make a copy so as not to interfere with a current dispatchEvent.
+    arr = arr.concat([listener]);
+  }
+  this._listeners[eventType] = arr;
+};
+
+EventTarget.prototype.removeEventListener = function(eventType, listener) {
+  var arr = this._listeners[eventType];
+  if (!arr) {
+    return;
+  }
+  var idx = arr.indexOf(listener);
+  if (idx !== -1) {
+    if (arr.length > 1) {
+      // Make a copy so as not to interfere with a current dispatchEvent.
+      this._listeners[eventType] = arr.slice(0, idx).concat(arr.slice(idx + 1));
+    } else {
+      delete this._listeners[eventType];
+    }
+    return;
+  }
+};
+
+EventTarget.prototype.dispatchEvent = function() {
+  var event = arguments[0];
+  var t = event.type;
+  // equivalent of Array.prototype.slice.call(arguments, 0);
+  var args = arguments.length === 1 ? [event] : Array.apply(null, arguments);
+  // TODO: This doesn't match the real behavior; per spec, onfoo get
+  // their place in line from the /first/ time they're set from
+  // non-null. Although WebKit bumps it to the end every time it's
+  // set.
+  if (this['on' + t]) {
+    this['on' + t].apply(this, args);
+  }
+  if (t in this._listeners) {
+    // Grab a reference to the listeners list. removeEventListener may alter the list.
+    var listeners = this._listeners[t];
+    for (var i = 0; i < listeners.length; i++) {
+      listeners[i].apply(this, args);
+    }
+  }
+};
+
+module.exports = EventTarget;
+
+},{}],6:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , Event = require('./event')
+  ;
+
+function TransportMessageEvent(data) {
+  Event.call(this);
+  this.initEvent('message', false, false);
+  this.data = data;
+}
+
+inherits(TransportMessageEvent, Event);
+
+module.exports = TransportMessageEvent;
+
+},{"./event":4,"inherits":57}],7:[function(require,module,exports){
+'use strict';
+
+var JSON3 = require('json3')
+  , iframeUtils = require('./utils/iframe')
+  ;
+
+function FacadeJS(transport) {
+  this._transport = transport;
+  transport.on('message', this._transportMessage.bind(this));
+  transport.on('close', this._transportClose.bind(this));
+}
+
+FacadeJS.prototype._transportClose = function(code, reason) {
+  iframeUtils.postMessage('c', JSON3.stringify([code, reason]));
+};
+FacadeJS.prototype._transportMessage = function(frame) {
+  iframeUtils.postMessage('t', frame);
+};
+FacadeJS.prototype._send = function(data) {
+  this._transport.send(data);
+};
+FacadeJS.prototype._close = function() {
+  this._transport.close();
+  this._transport.removeAllListeners();
+};
+
+module.exports = FacadeJS;
+
+},{"./utils/iframe":47,"json3":58}],8:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var urlUtils = require('./utils/url')
+  , eventUtils = require('./utils/event')
+  , JSON3 = require('json3')
+  , FacadeJS = require('./facade')
+  , InfoIframeReceiver = require('./info-iframe-receiver')
+  , iframeUtils = require('./utils/iframe')
+  , loc = require('./location')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:iframe-bootstrap');
+}
+
+module.exports = function(SockJS, availableTransports) {
+  var transportMap = {};
+  availableTransports.forEach(function(at) {
+    if (at.facadeTransport) {
+      transportMap[at.facadeTransport.transportName] = at.facadeTransport;
+    }
+  });
+
+  // hard-coded for the info iframe
+  // TODO see if we can make this more dynamic
+  transportMap[InfoIframeReceiver.transportName] = InfoIframeReceiver;
+  var parentOrigin;
+
+  /* eslint-disable camelcase */
+  SockJS.bootstrap_iframe = function() {
+    /* eslint-enable camelcase */
+    var facade;
+    iframeUtils.currentWindowId = loc.hash.slice(1);
+    var onMessage = function(e) {
+      if (e.source !== parent) {
+        return;
+      }
+      if (typeof parentOrigin === 'undefined') {
+        parentOrigin = e.origin;
+      }
+      if (e.origin !== parentOrigin) {
+        return;
+      }
+
+      var iframeMessage;
+      try {
+        iframeMessage = JSON3.parse(e.data);
+      } catch (ignored) {
+        debug('bad json', e.data);
+        return;
+      }
+
+      if (iframeMessage.windowId !== iframeUtils.currentWindowId) {
+        return;
+      }
+      switch (iframeMessage.type) {
+      case 's':
+        var p;
+        try {
+          p = JSON3.parse(iframeMessage.data);
+        } catch (ignored) {
+          debug('bad json', iframeMessage.data);
+          break;
+        }
+        var version = p[0];
+        var transport = p[1];
+        var transUrl = p[2];
+        var baseUrl = p[3];
+        debug(version, transport, transUrl, baseUrl);
+        // change this to semver logic
+        if (version !== SockJS.version) {
+          throw new Error('Incompatible SockJS! Main site uses:' +
+                    ' "' + version + '", the iframe:' +
+                    ' "' + SockJS.version + '".');
+        }
+
+        if (!urlUtils.isOriginEqual(transUrl, loc.href) ||
+            !urlUtils.isOriginEqual(baseUrl, loc.href)) {
+          throw new Error('Can\'t connect to different domain from within an ' +
+                    'iframe. (' + loc.href + ', ' + transUrl + ', ' + baseUrl + ')');
+        }
+        facade = new FacadeJS(new transportMap[transport](transUrl, baseUrl));
+        break;
+      case 'm':
+        facade._send(iframeMessage.data);
+        break;
+      case 'c':
+        if (facade) {
+          facade._close();
+        }
+        facade = null;
+        break;
+      }
+    };
+
+    eventUtils.attachEvent('message', onMessage);
+
+    // Start
+    iframeUtils.postMessage('s');
+  };
+};
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pZnJhbWUtYm9vdHN0cmFwLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgdXJsVXRpbHMgPSByZXF1aXJlKCcuL3V0aWxzL3VybCcpXG4gICwgZXZlbnRVdGlscyA9IHJlcXVpcmUoJy4vdXRpbHMvZXZlbnQnKVxuICAsIEpTT04zID0gcmVxdWlyZSgnanNvbjMnKVxuICAsIEZhY2FkZUpTID0gcmVxdWlyZSgnLi9mYWNhZGUnKVxuICAsIEluZm9JZnJhbWVSZWNlaXZlciA9IHJlcXVpcmUoJy4vaW5mby1pZnJhbWUtcmVjZWl2ZXInKVxuICAsIGlmcmFtZVV0aWxzID0gcmVxdWlyZSgnLi91dGlscy9pZnJhbWUnKVxuICAsIGxvYyA9IHJlcXVpcmUoJy4vbG9jYXRpb24nKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6aWZyYW1lLWJvb3RzdHJhcCcpO1xufVxuXG5tb2R1bGUuZXhwb3J0cyA9IGZ1bmN0aW9uKFNvY2tKUywgYXZhaWxhYmxlVHJhbnNwb3J0cykge1xuICB2YXIgdHJhbnNwb3J0TWFwID0ge307XG4gIGF2YWlsYWJsZVRyYW5zcG9ydHMuZm9yRWFjaChmdW5jdGlvbihhdCkge1xuICAgIGlmIChhdC5mYWNhZGVUcmFuc3BvcnQpIHtcbiAgICAgIHRyYW5zcG9ydE1hcFthdC5mYWNhZGVUcmFuc3BvcnQudHJhbnNwb3J0TmFtZV0gPSBhdC5mYWNhZGVUcmFuc3BvcnQ7XG4gICAgfVxuICB9KTtcblxuICAvLyBoYXJkLWNvZGVkIGZvciB0aGUgaW5mbyBpZnJhbWVcbiAgLy8gVE9ETyBzZWUgaWYgd2UgY2FuIG1ha2UgdGhpcyBtb3JlIGR5bmFtaWNcbiAgdHJhbnNwb3J0TWFwW0luZm9JZnJhbWVSZWNlaXZlci50cmFuc3BvcnROYW1lXSA9IEluZm9JZnJhbWVSZWNlaXZlcjtcbiAgdmFyIHBhcmVudE9yaWdpbjtcblxuICAvKiBlc2xpbnQtZGlzYWJsZSBjYW1lbGNhc2UgKi9cbiAgU29ja0pTLmJvb3RzdHJhcF9pZnJhbWUgPSBmdW5jdGlvbigpIHtcbiAgICAvKiBlc2xpbnQtZW5hYmxlIGNhbWVsY2FzZSAqL1xuICAgIHZhciBmYWNhZGU7XG4gICAgaWZyYW1lVXRpbHMuY3VycmVudFdpbmRvd0lkID0gbG9jLmhhc2guc2xpY2UoMSk7XG4gICAgdmFyIG9uTWVzc2FnZSA9IGZ1bmN0aW9uKGUpIHtcbiAgICAgIGlmIChlLnNvdXJjZSAhPT0gcGFyZW50KSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cbiAgICAgIGlmICh0eXBlb2YgcGFyZW50T3JpZ2luID09PSAndW5kZWZpbmVkJykge1xuICAgICAgICBwYXJlbnRPcmlnaW4gPSBlLm9yaWdpbjtcbiAgICAgIH1cbiAgICAgIGlmIChlLm9yaWdpbiAhPT0gcGFyZW50T3JpZ2luKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cblxuICAgICAgdmFyIGlmcmFtZU1lc3NhZ2U7XG4gICAgICB0cnkge1xuICAgICAgICBpZnJhbWVNZXNzYWdlID0gSlNPTjMucGFyc2UoZS5kYXRhKTtcbiAgICAgIH0gY2F0Y2ggKGlnbm9yZWQpIHtcbiAgICAgICAgZGVidWcoJ2JhZCBqc29uJywgZS5kYXRhKTtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuXG4gICAgICBpZiAoaWZyYW1lTWVzc2FnZS53aW5kb3dJZCAhPT0gaWZyYW1lVXRpbHMuY3VycmVudFdpbmRvd0lkKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cbiAgICAgIHN3aXRjaCAoaWZyYW1lTWVzc2FnZS50eXBlKSB7XG4gICAgICBjYXNlICdzJzpcbiAgICAgICAgdmFyIHA7XG4gICAgICAgIHRyeSB7XG4gICAgICAgICAgcCA9IEpTT04zLnBhcnNlKGlmcmFtZU1lc3NhZ2UuZGF0YSk7XG4gICAgICAgIH0gY2F0Y2ggKGlnbm9yZWQpIHtcbiAgICAgICAgICBkZWJ1ZygnYmFkIGpzb24nLCBpZnJhbWVNZXNzYWdlLmRhdGEpO1xuICAgICAgICAgIGJyZWFrO1xuICAgICAgICB9XG4gICAgICAgIHZhciB2ZXJzaW9uID0gcFswXTtcbiAgICAgICAgdmFyIHRyYW5zcG9ydCA9IHBbMV07XG4gICAgICAgIHZhciB0cmFuc1VybCA9IHBbMl07XG4gICAgICAgIHZhciBiYXNlVXJsID0gcFszXTtcbiAgICAgICAgZGVidWcodmVyc2lvbiwgdHJhbnNwb3J0LCB0cmFuc1VybCwgYmFzZVVybCk7XG4gICAgICAgIC8vIGNoYW5nZSB0aGlzIHRvIHNlbXZlciBsb2dpY1xuICAgICAgICBpZiAodmVyc2lvbiAhPT0gU29ja0pTLnZlcnNpb24pIHtcbiAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ0luY29tcGF0aWJsZSBTb2NrSlMhIE1haW4gc2l0ZSB1c2VzOicgK1xuICAgICAgICAgICAgICAgICAgICAnIFwiJyArIHZlcnNpb24gKyAnXCIsIHRoZSBpZnJhbWU6JyArXG4gICAgICAgICAgICAgICAgICAgICcgXCInICsgU29ja0pTLnZlcnNpb24gKyAnXCIuJyk7XG4gICAgICAgIH1cblxuICAgICAgICBpZiAoIXVybFV0aWxzLmlzT3JpZ2luRXF1YWwodHJhbnNVcmwsIGxvYy5ocmVmKSB8fFxuICAgICAgICAgICAgIXVybFV0aWxzLmlzT3JpZ2luRXF1YWwoYmFzZVVybCwgbG9jLmhyZWYpKSB7XG4gICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCdDYW5cXCd0IGNvbm5lY3QgdG8gZGlmZmVyZW50IGRvbWFpbiBmcm9tIHdpdGhpbiBhbiAnICtcbiAgICAgICAgICAgICAgICAgICAgJ2lmcmFtZS4gKCcgKyBsb2MuaHJlZiArICcsICcgKyB0cmFuc1VybCArICcsICcgKyBiYXNlVXJsICsgJyknKTtcbiAgICAgICAgfVxuICAgICAgICBmYWNhZGUgPSBuZXcgRmFjYWRlSlMobmV3IHRyYW5zcG9ydE1hcFt0cmFuc3BvcnRdKHRyYW5zVXJsLCBiYXNlVXJsKSk7XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSAnbSc6XG4gICAgICAgIGZhY2FkZS5fc2VuZChpZnJhbWVNZXNzYWdlLmRhdGEpO1xuICAgICAgICBicmVhaztcbiAgICAgIGNhc2UgJ2MnOlxuICAgICAgICBpZiAoZmFjYWRlKSB7XG4gICAgICAgICAgZmFjYWRlLl9jbG9zZSgpO1xuICAgICAgICB9XG4gICAgICAgIGZhY2FkZSA9IG51bGw7XG4gICAgICAgIGJyZWFrO1xuICAgICAgfVxuICAgIH07XG5cbiAgICBldmVudFV0aWxzLmF0dGFjaEV2ZW50KCdtZXNzYWdlJywgb25NZXNzYWdlKTtcblxuICAgIC8vIFN0YXJ0XG4gICAgaWZyYW1lVXRpbHMucG9zdE1lc3NhZ2UoJ3MnKTtcbiAgfTtcbn07XG4iXX0=
+},{"./facade":7,"./info-iframe-receiver":10,"./location":13,"./utils/event":46,"./utils/iframe":47,"./utils/url":52,"debug":54,"json3":58}],9:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , JSON3 = require('json3')
+  , objectUtils = require('./utils/object')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:info-ajax');
+}
+
+function InfoAjax(url, AjaxObject) {
+  EventEmitter.call(this);
+
+  var self = this;
+  var t0 = +new Date();
+  this.xo = new AjaxObject('GET', url);
+
+  this.xo.once('finish', function(status, text) {
+    var info, rtt;
+    if (status === 200) {
+      rtt = (+new Date()) - t0;
+      if (text) {
+        try {
+          info = JSON3.parse(text);
+        } catch (e) {
+          debug('bad json', text);
+        }
+      }
+
+      if (!objectUtils.isObject(info)) {
+        info = {};
+      }
+    }
+    self.emit('finish', info, rtt);
+    self.removeAllListeners();
+  });
+}
+
+inherits(InfoAjax, EventEmitter);
+
+InfoAjax.prototype.close = function() {
+  this.removeAllListeners();
+  this.xo.close();
+};
+
+module.exports = InfoAjax;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pbmZvLWFqYXguanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIEpTT04zID0gcmVxdWlyZSgnanNvbjMnKVxuICAsIG9iamVjdFV0aWxzID0gcmVxdWlyZSgnLi91dGlscy9vYmplY3QnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6aW5mby1hamF4Jyk7XG59XG5cbmZ1bmN0aW9uIEluZm9BamF4KHVybCwgQWpheE9iamVjdCkge1xuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcblxuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB0MCA9ICtuZXcgRGF0ZSgpO1xuICB0aGlzLnhvID0gbmV3IEFqYXhPYmplY3QoJ0dFVCcsIHVybCk7XG5cbiAgdGhpcy54by5vbmNlKCdmaW5pc2gnLCBmdW5jdGlvbihzdGF0dXMsIHRleHQpIHtcbiAgICB2YXIgaW5mbywgcnR0O1xuICAgIGlmIChzdGF0dXMgPT09IDIwMCkge1xuICAgICAgcnR0ID0gKCtuZXcgRGF0ZSgpKSAtIHQwO1xuICAgICAgaWYgKHRleHQpIHtcbiAgICAgICAgdHJ5IHtcbiAgICAgICAgICBpbmZvID0gSlNPTjMucGFyc2UodGV4dCk7XG4gICAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgICBkZWJ1ZygnYmFkIGpzb24nLCB0ZXh0KTtcbiAgICAgICAgfVxuICAgICAgfVxuXG4gICAgICBpZiAoIW9iamVjdFV0aWxzLmlzT2JqZWN0KGluZm8pKSB7XG4gICAgICAgIGluZm8gPSB7fTtcbiAgICAgIH1cbiAgICB9XG4gICAgc2VsZi5lbWl0KCdmaW5pc2gnLCBpbmZvLCBydHQpO1xuICAgIHNlbGYucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIH0pO1xufVxuXG5pbmhlcml0cyhJbmZvQWpheCwgRXZlbnRFbWl0dGVyKTtcblxuSW5mb0FqYXgucHJvdG90eXBlLmNsb3NlID0gZnVuY3Rpb24oKSB7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIHRoaXMueG8uY2xvc2UoKTtcbn07XG5cbm1vZHVsZS5leHBvcnRzID0gSW5mb0FqYXg7XG4iXX0=
+},{"./utils/object":49,"debug":54,"events":3,"inherits":57,"json3":58}],10:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  , JSON3 = require('json3')
+  , XHRLocalObject = require('./transport/sender/xhr-local')
+  , InfoAjax = require('./info-ajax')
+  ;
+
+function InfoReceiverIframe(transUrl) {
+  var self = this;
+  EventEmitter.call(this);
+
+  this.ir = new InfoAjax(transUrl, XHRLocalObject);
+  this.ir.once('finish', function(info, rtt) {
+    self.ir = null;
+    self.emit('message', JSON3.stringify([info, rtt]));
+  });
+}
+
+inherits(InfoReceiverIframe, EventEmitter);
+
+InfoReceiverIframe.transportName = 'iframe-info-receiver';
+
+InfoReceiverIframe.prototype.close = function() {
+  if (this.ir) {
+    this.ir.close();
+    this.ir = null;
+  }
+  this.removeAllListeners();
+};
+
+module.exports = InfoReceiverIframe;
+
+},{"./info-ajax":9,"./transport/sender/xhr-local":37,"events":3,"inherits":57,"json3":58}],11:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , JSON3 = require('json3')
+  , utils = require('./utils/event')
+  , IframeTransport = require('./transport/iframe')
+  , InfoReceiverIframe = require('./info-iframe-receiver')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:info-iframe');
+}
+
+function InfoIframe(baseUrl, url) {
+  var self = this;
+  EventEmitter.call(this);
+
+  var go = function() {
+    var ifr = self.ifr = new IframeTransport(InfoReceiverIframe.transportName, url, baseUrl);
+
+    ifr.once('message', function(msg) {
+      if (msg) {
+        var d;
+        try {
+          d = JSON3.parse(msg);
+        } catch (e) {
+          debug('bad json', msg);
+          self.emit('finish');
+          self.close();
+          return;
+        }
+
+        var info = d[0], rtt = d[1];
+        self.emit('finish', info, rtt);
+      }
+      self.close();
+    });
+
+    ifr.once('close', function() {
+      self.emit('finish');
+      self.close();
+    });
+  };
+
+  // TODO this seems the same as the 'needBody' from transports
+  if (!global.document.body) {
+    utils.attachEvent('load', go);
+  } else {
+    go();
+  }
+}
+
+inherits(InfoIframe, EventEmitter);
+
+InfoIframe.enabled = function() {
+  return IframeTransport.enabled();
+};
+
+InfoIframe.prototype.close = function() {
+  if (this.ifr) {
+    this.ifr.close();
+  }
+  this.removeAllListeners();
+  this.ifr = null;
+};
+
+module.exports = InfoIframe;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pbmZvLWlmcmFtZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIEpTT04zID0gcmVxdWlyZSgnanNvbjMnKVxuICAsIHV0aWxzID0gcmVxdWlyZSgnLi91dGlscy9ldmVudCcpXG4gICwgSWZyYW1lVHJhbnNwb3J0ID0gcmVxdWlyZSgnLi90cmFuc3BvcnQvaWZyYW1lJylcbiAgLCBJbmZvUmVjZWl2ZXJJZnJhbWUgPSByZXF1aXJlKCcuL2luZm8taWZyYW1lLXJlY2VpdmVyJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OmluZm8taWZyYW1lJyk7XG59XG5cbmZ1bmN0aW9uIEluZm9JZnJhbWUoYmFzZVVybCwgdXJsKSB7XG4gIHZhciBzZWxmID0gdGhpcztcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG5cbiAgdmFyIGdvID0gZnVuY3Rpb24oKSB7XG4gICAgdmFyIGlmciA9IHNlbGYuaWZyID0gbmV3IElmcmFtZVRyYW5zcG9ydChJbmZvUmVjZWl2ZXJJZnJhbWUudHJhbnNwb3J0TmFtZSwgdXJsLCBiYXNlVXJsKTtcblxuICAgIGlmci5vbmNlKCdtZXNzYWdlJywgZnVuY3Rpb24obXNnKSB7XG4gICAgICBpZiAobXNnKSB7XG4gICAgICAgIHZhciBkO1xuICAgICAgICB0cnkge1xuICAgICAgICAgIGQgPSBKU09OMy5wYXJzZShtc2cpO1xuICAgICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgICAgZGVidWcoJ2JhZCBqc29uJywgbXNnKTtcbiAgICAgICAgICBzZWxmLmVtaXQoJ2ZpbmlzaCcpO1xuICAgICAgICAgIHNlbGYuY2xvc2UoKTtcbiAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICB2YXIgaW5mbyA9IGRbMF0sIHJ0dCA9IGRbMV07XG4gICAgICAgIHNlbGYuZW1pdCgnZmluaXNoJywgaW5mbywgcnR0KTtcbiAgICAgIH1cbiAgICAgIHNlbGYuY2xvc2UoKTtcbiAgICB9KTtcblxuICAgIGlmci5vbmNlKCdjbG9zZScsIGZ1bmN0aW9uKCkge1xuICAgICAgc2VsZi5lbWl0KCdmaW5pc2gnKTtcbiAgICAgIHNlbGYuY2xvc2UoKTtcbiAgICB9KTtcbiAgfTtcblxuICAvLyBUT0RPIHRoaXMgc2VlbXMgdGhlIHNhbWUgYXMgdGhlICduZWVkQm9keScgZnJvbSB0cmFuc3BvcnRzXG4gIGlmICghZ2xvYmFsLmRvY3VtZW50LmJvZHkpIHtcbiAgICB1dGlscy5hdHRhY2hFdmVudCgnbG9hZCcsIGdvKTtcbiAgfSBlbHNlIHtcbiAgICBnbygpO1xuICB9XG59XG5cbmluaGVyaXRzKEluZm9JZnJhbWUsIEV2ZW50RW1pdHRlcik7XG5cbkluZm9JZnJhbWUuZW5hYmxlZCA9IGZ1bmN0aW9uKCkge1xuICByZXR1cm4gSWZyYW1lVHJhbnNwb3J0LmVuYWJsZWQoKTtcbn07XG5cbkluZm9JZnJhbWUucHJvdG90eXBlLmNsb3NlID0gZnVuY3Rpb24oKSB7XG4gIGlmICh0aGlzLmlmcikge1xuICAgIHRoaXMuaWZyLmNsb3NlKCk7XG4gIH1cbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbiAgdGhpcy5pZnIgPSBudWxsO1xufTtcblxubW9kdWxlLmV4cG9ydHMgPSBJbmZvSWZyYW1lO1xuIl19
+},{"./info-iframe-receiver":10,"./transport/iframe":22,"./utils/event":46,"debug":54,"events":3,"inherits":57,"json3":58}],12:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , urlUtils = require('./utils/url')
+  , XDR = require('./transport/sender/xdr')
+  , XHRCors = require('./transport/sender/xhr-cors')
+  , XHRLocal = require('./transport/sender/xhr-local')
+  , XHRFake = require('./transport/sender/xhr-fake')
+  , InfoIframe = require('./info-iframe')
+  , InfoAjax = require('./info-ajax')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:info-receiver');
+}
+
+function InfoReceiver(baseUrl, urlInfo) {
+  debug(baseUrl);
+  var self = this;
+  EventEmitter.call(this);
+
+  setTimeout(function() {
+    self.doXhr(baseUrl, urlInfo);
+  }, 0);
+}
+
+inherits(InfoReceiver, EventEmitter);
+
+// TODO this is currently ignoring the list of available transports and the whitelist
+
+InfoReceiver._getReceiver = function(baseUrl, url, urlInfo) {
+  // determine method of CORS support (if needed)
+  if (urlInfo.sameOrigin) {
+    return new InfoAjax(url, XHRLocal);
+  }
+  if (XHRCors.enabled) {
+    return new InfoAjax(url, XHRCors);
+  }
+  if (XDR.enabled && urlInfo.sameScheme) {
+    return new InfoAjax(url, XDR);
+  }
+  if (InfoIframe.enabled()) {
+    return new InfoIframe(baseUrl, url);
+  }
+  return new InfoAjax(url, XHRFake);
+};
+
+InfoReceiver.prototype.doXhr = function(baseUrl, urlInfo) {
+  var self = this
+    , url = urlUtils.addPath(baseUrl, '/info')
+    ;
+  debug('doXhr', url);
+
+  this.xo = InfoReceiver._getReceiver(baseUrl, url, urlInfo);
+
+  this.timeoutRef = setTimeout(function() {
+    debug('timeout');
+    self._cleanup(false);
+    self.emit('finish');
+  }, InfoReceiver.timeout);
+
+  this.xo.once('finish', function(info, rtt) {
+    debug('finish', info, rtt);
+    self._cleanup(true);
+    self.emit('finish', info, rtt);
+  });
+};
+
+InfoReceiver.prototype._cleanup = function(wasClean) {
+  debug('_cleanup');
+  clearTimeout(this.timeoutRef);
+  this.timeoutRef = null;
+  if (!wasClean && this.xo) {
+    this.xo.close();
+  }
+  this.xo = null;
+};
+
+InfoReceiver.prototype.close = function() {
+  debug('close');
+  this.removeAllListeners();
+  this._cleanup(false);
+};
+
+InfoReceiver.timeout = 8000;
+
+module.exports = InfoReceiver;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pbmZvLXJlY2VpdmVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi91dGlscy91cmwnKVxuICAsIFhEUiA9IHJlcXVpcmUoJy4vdHJhbnNwb3J0L3NlbmRlci94ZHInKVxuICAsIFhIUkNvcnMgPSByZXF1aXJlKCcuL3RyYW5zcG9ydC9zZW5kZXIveGhyLWNvcnMnKVxuICAsIFhIUkxvY2FsID0gcmVxdWlyZSgnLi90cmFuc3BvcnQvc2VuZGVyL3hoci1sb2NhbCcpXG4gICwgWEhSRmFrZSA9IHJlcXVpcmUoJy4vdHJhbnNwb3J0L3NlbmRlci94aHItZmFrZScpXG4gICwgSW5mb0lmcmFtZSA9IHJlcXVpcmUoJy4vaW5mby1pZnJhbWUnKVxuICAsIEluZm9BamF4ID0gcmVxdWlyZSgnLi9pbmZvLWFqYXgnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6aW5mby1yZWNlaXZlcicpO1xufVxuXG5mdW5jdGlvbiBJbmZvUmVjZWl2ZXIoYmFzZVVybCwgdXJsSW5mbykge1xuICBkZWJ1ZyhiYXNlVXJsKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcblxuICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkge1xuICAgIHNlbGYuZG9YaHIoYmFzZVVybCwgdXJsSW5mbyk7XG4gIH0sIDApO1xufVxuXG5pbmhlcml0cyhJbmZvUmVjZWl2ZXIsIEV2ZW50RW1pdHRlcik7XG5cbi8vIFRPRE8gdGhpcyBpcyBjdXJyZW50bHkgaWdub3JpbmcgdGhlIGxpc3Qgb2YgYXZhaWxhYmxlIHRyYW5zcG9ydHMgYW5kIHRoZSB3aGl0ZWxpc3RcblxuSW5mb1JlY2VpdmVyLl9nZXRSZWNlaXZlciA9IGZ1bmN0aW9uKGJhc2VVcmwsIHVybCwgdXJsSW5mbykge1xuICAvLyBkZXRlcm1pbmUgbWV0aG9kIG9mIENPUlMgc3VwcG9ydCAoaWYgbmVlZGVkKVxuICBpZiAodXJsSW5mby5zYW1lT3JpZ2luKSB7XG4gICAgcmV0dXJuIG5ldyBJbmZvQWpheCh1cmwsIFhIUkxvY2FsKTtcbiAgfVxuICBpZiAoWEhSQ29ycy5lbmFibGVkKSB7XG4gICAgcmV0dXJuIG5ldyBJbmZvQWpheCh1cmwsIFhIUkNvcnMpO1xuICB9XG4gIGlmIChYRFIuZW5hYmxlZCAmJiB1cmxJbmZvLnNhbWVTY2hlbWUpIHtcbiAgICByZXR1cm4gbmV3IEluZm9BamF4KHVybCwgWERSKTtcbiAgfVxuICBpZiAoSW5mb0lmcmFtZS5lbmFibGVkKCkpIHtcbiAgICByZXR1cm4gbmV3IEluZm9JZnJhbWUoYmFzZVVybCwgdXJsKTtcbiAgfVxuICByZXR1cm4gbmV3IEluZm9BamF4KHVybCwgWEhSRmFrZSk7XG59O1xuXG5JbmZvUmVjZWl2ZXIucHJvdG90eXBlLmRvWGhyID0gZnVuY3Rpb24oYmFzZVVybCwgdXJsSW5mbykge1xuICB2YXIgc2VsZiA9IHRoaXNcbiAgICAsIHVybCA9IHVybFV0aWxzLmFkZFBhdGgoYmFzZVVybCwgJy9pbmZvJylcbiAgICA7XG4gIGRlYnVnKCdkb1hocicsIHVybCk7XG5cbiAgdGhpcy54byA9IEluZm9SZWNlaXZlci5fZ2V0UmVjZWl2ZXIoYmFzZVVybCwgdXJsLCB1cmxJbmZvKTtcblxuICB0aGlzLnRpbWVvdXRSZWYgPSBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkge1xuICAgIGRlYnVnKCd0aW1lb3V0Jyk7XG4gICAgc2VsZi5fY2xlYW51cChmYWxzZSk7XG4gICAgc2VsZi5lbWl0KCdmaW5pc2gnKTtcbiAgfSwgSW5mb1JlY2VpdmVyLnRpbWVvdXQpO1xuXG4gIHRoaXMueG8ub25jZSgnZmluaXNoJywgZnVuY3Rpb24oaW5mbywgcnR0KSB7XG4gICAgZGVidWcoJ2ZpbmlzaCcsIGluZm8sIHJ0dCk7XG4gICAgc2VsZi5fY2xlYW51cCh0cnVlKTtcbiAgICBzZWxmLmVtaXQoJ2ZpbmlzaCcsIGluZm8sIHJ0dCk7XG4gIH0pO1xufTtcblxuSW5mb1JlY2VpdmVyLnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKHdhc0NsZWFuKSB7XG4gIGRlYnVnKCdfY2xlYW51cCcpO1xuICBjbGVhclRpbWVvdXQodGhpcy50aW1lb3V0UmVmKTtcbiAgdGhpcy50aW1lb3V0UmVmID0gbnVsbDtcbiAgaWYgKCF3YXNDbGVhbiAmJiB0aGlzLnhvKSB7XG4gICAgdGhpcy54by5jbG9zZSgpO1xuICB9XG4gIHRoaXMueG8gPSBudWxsO1xufTtcblxuSW5mb1JlY2VpdmVyLnByb3RvdHlwZS5jbG9zZSA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xvc2UnKTtcbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbiAgdGhpcy5fY2xlYW51cChmYWxzZSk7XG59O1xuXG5JbmZvUmVjZWl2ZXIudGltZW91dCA9IDgwMDA7XG5cbm1vZHVsZS5leHBvcnRzID0gSW5mb1JlY2VpdmVyO1xuIl19
+},{"./info-ajax":9,"./info-iframe":11,"./transport/sender/xdr":34,"./transport/sender/xhr-cors":35,"./transport/sender/xhr-fake":36,"./transport/sender/xhr-local":37,"./utils/url":52,"debug":54,"events":3,"inherits":57}],13:[function(require,module,exports){
+(function (global){
+'use strict';
+
+module.exports = global.location || {
+  origin: 'http://localhost:80'
+, protocol: 'http'
+, host: 'localhost'
+, port: 80
+, href: 'http://localhost/'
+, hash: ''
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9sb2NhdGlvbi5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG5tb2R1bGUuZXhwb3J0cyA9IGdsb2JhbC5sb2NhdGlvbiB8fCB7XG4gIG9yaWdpbjogJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAnXG4sIHByb3RvY29sOiAnaHR0cCdcbiwgaG9zdDogJ2xvY2FsaG9zdCdcbiwgcG9ydDogODBcbiwgaHJlZjogJ2h0dHA6Ly9sb2NhbGhvc3QvJ1xuLCBoYXNoOiAnJ1xufTtcbiJdfQ==
+},{}],14:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+require('./shims');
+
+var URL = require('url-parse')
+  , inherits = require('inherits')
+  , JSON3 = require('json3')
+  , random = require('./utils/random')
+  , escape = require('./utils/escape')
+  , urlUtils = require('./utils/url')
+  , eventUtils = require('./utils/event')
+  , transport = require('./utils/transport')
+  , objectUtils = require('./utils/object')
+  , browser = require('./utils/browser')
+  , log = require('./utils/log')
+  , Event = require('./event/event')
+  , EventTarget = require('./event/eventtarget')
+  , loc = require('./location')
+  , CloseEvent = require('./event/close')
+  , TransportMessageEvent = require('./event/trans-message')
+  , InfoReceiver = require('./info-receiver')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:main');
+}
+
+var transports;
+
+// follow constructor steps defined at http://dev.w3.org/html5/websockets/#the-websocket-interface
+function SockJS(url, protocols, options) {
+  if (!(this instanceof SockJS)) {
+    return new SockJS(url, protocols, options);
+  }
+  if (arguments.length < 1) {
+    throw new TypeError("Failed to construct 'SockJS: 1 argument required, but only 0 present");
+  }
+  EventTarget.call(this);
+
+  this.readyState = SockJS.CONNECTING;
+  this.extensions = '';
+  this.protocol = '';
+
+  // non-standard extension
+  options = options || {};
+  if (options.protocols_whitelist) {
+    log.warn("'protocols_whitelist' is DEPRECATED. Use 'transports' instead.");
+  }
+  this._transportsWhitelist = options.transports;
+  this._transportOptions = options.transportOptions || {};
+
+  var sessionId = options.sessionId || 8;
+  if (typeof sessionId === 'function') {
+    this._generateSessionId = sessionId;
+  } else if (typeof sessionId === 'number') {
+    this._generateSessionId = function() {
+      return random.string(sessionId);
+    };
+  } else {
+    throw new TypeError('If sessionId is used in the options, it needs to be a number or a function.');
+  }
+
+  this._server = options.server || random.numberString(1000);
+
+  // Step 1 of WS spec - parse and validate the url. Issue #8
+  var parsedUrl = new URL(url);
+  if (!parsedUrl.host || !parsedUrl.protocol) {
+    throw new SyntaxError("The URL '" + url + "' is invalid");
+  } else if (parsedUrl.hash) {
+    throw new SyntaxError('The URL must not contain a fragment');
+  } else if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
+    throw new SyntaxError("The URL's scheme must be either 'http:' or 'https:'. '" + parsedUrl.protocol + "' is not allowed.");
+  }
+
+  var secure = parsedUrl.protocol === 'https:';
+  // Step 2 - don't allow secure origin with an insecure protocol
+  if (loc.protocol === 'https' && !secure) {
+    throw new Error('SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS');
+  }
+
+  // Step 3 - check port access - no need here
+  // Step 4 - parse protocols argument
+  if (!protocols) {
+    protocols = [];
+  } else if (!Array.isArray(protocols)) {
+    protocols = [protocols];
+  }
+
+  // Step 5 - check protocols argument
+  var sortedProtocols = protocols.sort();
+  sortedProtocols.forEach(function(proto, i) {
+    if (!proto) {
+      throw new SyntaxError("The protocols entry '" + proto + "' is invalid.");
+    }
+    if (i < (sortedProtocols.length - 1) && proto === sortedProtocols[i + 1]) {
+      throw new SyntaxError("The protocols entry '" + proto + "' is duplicated.");
+    }
+  });
+
+  // Step 6 - convert origin
+  var o = urlUtils.getOrigin(loc.href);
+  this._origin = o ? o.toLowerCase() : null;
+
+  // remove the trailing slash
+  parsedUrl.set('pathname', parsedUrl.pathname.replace(/\/+$/, ''));
+
+  // store the sanitized url
+  this.url = parsedUrl.href;
+  debug('using url', this.url);
+
+  // Step 7 - start connection in background
+  // obtain server info
+  // http://sockjs.github.io/sockjs-protocol/sockjs-protocol-0.3.3.html#section-26
+  this._urlInfo = {
+    nullOrigin: !browser.hasDomain()
+  , sameOrigin: urlUtils.isOriginEqual(this.url, loc.href)
+  , sameScheme: urlUtils.isSchemeEqual(this.url, loc.href)
+  };
+
+  this._ir = new InfoReceiver(this.url, this._urlInfo);
+  this._ir.once('finish', this._receiveInfo.bind(this));
+}
+
+inherits(SockJS, EventTarget);
+
+function userSetCode(code) {
+  return code === 1000 || (code >= 3000 && code <= 4999);
+}
+
+SockJS.prototype.close = function(code, reason) {
+  // Step 1
+  if (code && !userSetCode(code)) {
+    throw new Error('InvalidAccessError: Invalid code');
+  }
+  // Step 2.4 states the max is 123 bytes, but we are just checking length
+  if (reason && reason.length > 123) {
+    throw new SyntaxError('reason argument has an invalid length');
+  }
+
+  // Step 3.1
+  if (this.readyState === SockJS.CLOSING || this.readyState === SockJS.CLOSED) {
+    return;
+  }
+
+  // TODO look at docs to determine how to set this
+  var wasClean = true;
+  this._close(code || 1000, reason || 'Normal closure', wasClean);
+};
+
+SockJS.prototype.send = function(data) {
+  // #13 - convert anything non-string to string
+  // TODO this currently turns objects into [object Object]
+  if (typeof data !== 'string') {
+    data = '' + data;
+  }
+  if (this.readyState === SockJS.CONNECTING) {
+    throw new Error('InvalidStateError: The connection has not been established yet');
+  }
+  if (this.readyState !== SockJS.OPEN) {
+    return;
+  }
+  this._transport.send(escape.quote(data));
+};
+
+SockJS.version = require('./version');
+
+SockJS.CONNECTING = 0;
+SockJS.OPEN = 1;
+SockJS.CLOSING = 2;
+SockJS.CLOSED = 3;
+
+SockJS.prototype._receiveInfo = function(info, rtt) {
+  debug('_receiveInfo', rtt);
+  this._ir = null;
+  if (!info) {
+    this._close(1002, 'Cannot connect to server');
+    return;
+  }
+
+  // establish a round-trip timeout (RTO) based on the
+  // round-trip time (RTT)
+  this._rto = this.countRTO(rtt);
+  // allow server to override url used for the actual transport
+  this._transUrl = info.base_url ? info.base_url : this.url;
+  info = objectUtils.extend(info, this._urlInfo);
+  debug('info', info);
+  // determine list of desired and supported transports
+  var enabledTransports = transports.filterToEnabled(this._transportsWhitelist, info);
+  this._transports = enabledTransports.main;
+  debug(this._transports.length + ' enabled transports');
+
+  this._connect();
+};
+
+SockJS.prototype._connect = function() {
+  for (var Transport = this._transports.shift(); Transport; Transport = this._transports.shift()) {
+    debug('attempt', Transport.transportName);
+    if (Transport.needBody) {
+      if (!global.document.body ||
+          (typeof global.document.readyState !== 'undefined' &&
+            global.document.readyState !== 'complete' &&
+            global.document.readyState !== 'interactive')) {
+        debug('waiting for body');
+        this._transports.unshift(Transport);
+        eventUtils.attachEvent('load', this._connect.bind(this));
+        return;
+      }
+    }
+
+    // calculate timeout based on RTO and round trips. Default to 5s
+    var timeoutMs = (this._rto * Transport.roundTrips) || 5000;
+    this._transportTimeoutId = setTimeout(this._transportTimeout.bind(this), timeoutMs);
+    debug('using timeout', timeoutMs);
+
+    var transportUrl = urlUtils.addPath(this._transUrl, '/' + this._server + '/' + this._generateSessionId());
+    var options = this._transportOptions[Transport.transportName];
+    debug('transport url', transportUrl);
+    var transportObj = new Transport(transportUrl, this._transUrl, options);
+    transportObj.on('message', this._transportMessage.bind(this));
+    transportObj.once('close', this._transportClose.bind(this));
+    transportObj.transportName = Transport.transportName;
+    this._transport = transportObj;
+
+    return;
+  }
+  this._close(2000, 'All transports failed', false);
+};
+
+SockJS.prototype._transportTimeout = function() {
+  debug('_transportTimeout');
+  if (this.readyState === SockJS.CONNECTING) {
+    this._transportClose(2007, 'Transport timed out');
+  }
+};
+
+SockJS.prototype._transportMessage = function(msg) {
+  debug('_transportMessage', msg);
+  var self = this
+    , type = msg.slice(0, 1)
+    , content = msg.slice(1)
+    , payload
+    ;
+
+  // first check for messages that don't need a payload
+  switch (type) {
+    case 'o':
+      this._open();
+      return;
+    case 'h':
+      this.dispatchEvent(new Event('heartbeat'));
+      debug('heartbeat', this.transport);
+      return;
+  }
+
+  if (content) {
+    try {
+      payload = JSON3.parse(content);
+    } catch (e) {
+      debug('bad json', content);
+    }
+  }
+
+  if (typeof payload === 'undefined') {
+    debug('empty payload', content);
+    return;
+  }
+
+  switch (type) {
+    case 'a':
+      if (Array.isArray(payload)) {
+        payload.forEach(function(p) {
+          debug('message', self.transport, p);
+          self.dispatchEvent(new TransportMessageEvent(p));
+        });
+      }
+      break;
+    case 'm':
+      debug('message', this.transport, payload);
+      this.dispatchEvent(new TransportMessageEvent(payload));
+      break;
+    case 'c':
+      if (Array.isArray(payload) && payload.length === 2) {
+        this._close(payload[0], payload[1], true);
+      }
+      break;
+  }
+};
+
+SockJS.prototype._transportClose = function(code, reason) {
+  debug('_transportClose', this.transport, code, reason);
+  if (this._transport) {
+    this._transport.removeAllListeners();
+    this._transport = null;
+    this.transport = null;
+  }
+
+  if (!userSetCode(code) && code !== 2000 && this.readyState === SockJS.CONNECTING) {
+    this._connect();
+    return;
+  }
+
+  this._close(code, reason);
+};
+
+SockJS.prototype._open = function() {
+  debug('_open', this._transport.transportName, this.readyState);
+  if (this.readyState === SockJS.CONNECTING) {
+    if (this._transportTimeoutId) {
+      clearTimeout(this._transportTimeoutId);
+      this._transportTimeoutId = null;
+    }
+    this.readyState = SockJS.OPEN;
+    this.transport = this._transport.transportName;
+    this.dispatchEvent(new Event('open'));
+    debug('connected', this.transport);
+  } else {
+    // The server might have been restarted, and lost track of our
+    // connection.
+    this._close(1006, 'Server lost session');
+  }
+};
+
+SockJS.prototype._close = function(code, reason, wasClean) {
+  debug('_close', this.transport, code, reason, wasClean, this.readyState);
+  var forceFail = false;
+
+  if (this._ir) {
+    forceFail = true;
+    this._ir.close();
+    this._ir = null;
+  }
+  if (this._transport) {
+    this._transport.close();
+    this._transport = null;
+    this.transport = null;
+  }
+
+  if (this.readyState === SockJS.CLOSED) {
+    throw new Error('InvalidStateError: SockJS has already been closed');
+  }
+
+  this.readyState = SockJS.CLOSING;
+  setTimeout(function() {
+    this.readyState = SockJS.CLOSED;
+
+    if (forceFail) {
+      this.dispatchEvent(new Event('error'));
+    }
+
+    var e = new CloseEvent('close');
+    e.wasClean = wasClean || false;
+    e.code = code || 1000;
+    e.reason = reason;
+
+    this.dispatchEvent(e);
+    this.onmessage = this.onclose = this.onerror = null;
+    debug('disconnected');
+  }.bind(this), 0);
+};
+
+// See: http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/
+// and RFC 2988.
+SockJS.prototype.countRTO = function(rtt) {
+  // In a local environment, when using IE8/9 and the `jsonp-polling`
+  // transport the time needed to establish a connection (the time that pass
+  // from the opening of the transport to the call of `_dispatchOpen`) is
+  // around 200msec (the lower bound used in the article above) and this
+  // causes spurious timeouts. For this reason we calculate a value slightly
+  // larger than that used in the article.
+  if (rtt > 100) {
+    return 4 * rtt; // rto > 400msec
+  }
+  return 300 + rtt; // 300msec < rto <= 400msec
+};
+
+module.exports = function(availableTransports) {
+  transports = transport(availableTransports);
+  require('./iframe-bootstrap')(SockJS, availableTransports);
+  return SockJS;
+};
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/main.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nrequire('./shims');\n\nvar URL = require('url-parse')\n  , inherits = require('inherits')\n  , JSON3 = require('json3')\n  , random = require('./utils/random')\n  , escape = require('./utils/escape')\n  , urlUtils = require('./utils/url')\n  , eventUtils = require('./utils/event')\n  , transport = require('./utils/transport')\n  , objectUtils = require('./utils/object')\n  , browser = require('./utils/browser')\n  , log = require('./utils/log')\n  , Event = require('./event/event')\n  , EventTarget = require('./event/eventtarget')\n  , loc = require('./location')\n  , CloseEvent = require('./event/close')\n  , TransportMessageEvent = require('./event/trans-message')\n  , InfoReceiver = require('./info-receiver')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:main');\n}\n\nvar transports;\n\n// follow constructor steps defined at http://dev.w3.org/html5/websockets/#the-websocket-interface\nfunction SockJS(url, protocols, options) {\n  if (!(this instanceof SockJS)) {\n    return new SockJS(url, protocols, options);\n  }\n  if (arguments.length < 1) {\n    throw new TypeError(\"Failed to construct 'SockJS: 1 argument required, but only 0 present\");\n  }\n  EventTarget.call(this);\n\n  this.readyState = SockJS.CONNECTING;\n  this.extensions = '';\n  this.protocol = '';\n\n  // non-standard extension\n  options = options || {};\n  if (options.protocols_whitelist) {\n    log.warn(\"'protocols_whitelist' is DEPRECATED. Use 'transports' instead.\");\n  }\n  this._transportsWhitelist = options.transports;\n  this._transportOptions = options.transportOptions || {};\n\n  var sessionId = options.sessionId || 8;\n  if (typeof sessionId === 'function') {\n    this._generateSessionId = sessionId;\n  } else if (typeof sessionId === 'number') {\n    this._generateSessionId = function() {\n      return random.string(sessionId);\n    };\n  } else {\n    throw new TypeError('If sessionId is used in the options, it needs to be a number or a function.');\n  }\n\n  this._server = options.server || random.numberString(1000);\n\n  // Step 1 of WS spec - parse and validate the url. Issue #8\n  var parsedUrl = new URL(url);\n  if (!parsedUrl.host || !parsedUrl.protocol) {\n    throw new SyntaxError(\"The URL '\" + url + \"' is invalid\");\n  } else if (parsedUrl.hash) {\n    throw new SyntaxError('The URL must not contain a fragment');\n  } else if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {\n    throw new SyntaxError(\"The URL's scheme must be either 'http:' or 'https:'. '\" + parsedUrl.protocol + \"' is not allowed.\");\n  }\n\n  var secure = parsedUrl.protocol === 'https:';\n  // Step 2 - don't allow secure origin with an insecure protocol\n  if (loc.protocol === 'https' && !secure) {\n    throw new Error('SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS');\n  }\n\n  // Step 3 - check port access - no need here\n  // Step 4 - parse protocols argument\n  if (!protocols) {\n    protocols = [];\n  } else if (!Array.isArray(protocols)) {\n    protocols = [protocols];\n  }\n\n  // Step 5 - check protocols argument\n  var sortedProtocols = protocols.sort();\n  sortedProtocols.forEach(function(proto, i) {\n    if (!proto) {\n      throw new SyntaxError(\"The protocols entry '\" + proto + \"' is invalid.\");\n    }\n    if (i < (sortedProtocols.length - 1) && proto === sortedProtocols[i + 1]) {\n      throw new SyntaxError(\"The protocols entry '\" + proto + \"' is duplicated.\");\n    }\n  });\n\n  // Step 6 - convert origin\n  var o = urlUtils.getOrigin(loc.href);\n  this._origin = o ? o.toLowerCase() : null;\n\n  // remove the trailing slash\n  parsedUrl.set('pathname', parsedUrl.pathname.replace(/\\/+$/, ''));\n\n  // store the sanitized url\n  this.url = parsedUrl.href;\n  debug('using url', this.url);\n\n  // Step 7 - start connection in background\n  // obtain server info\n  // http://sockjs.github.io/sockjs-protocol/sockjs-protocol-0.3.3.html#section-26\n  this._urlInfo = {\n    nullOrigin: !browser.hasDomain()\n  , sameOrigin: urlUtils.isOriginEqual(this.url, loc.href)\n  , sameScheme: urlUtils.isSchemeEqual(this.url, loc.href)\n  };\n\n  this._ir = new InfoReceiver(this.url, this._urlInfo);\n  this._ir.once('finish', this._receiveInfo.bind(this));\n}\n\ninherits(SockJS, EventTarget);\n\nfunction userSetCode(code) {\n  return code === 1000 || (code >= 3000 && code <= 4999);\n}\n\nSockJS.prototype.close = function(code, reason) {\n  // Step 1\n  if (code && !userSetCode(code)) {\n    throw new Error('InvalidAccessError: Invalid code');\n  }\n  // Step 2.4 states the max is 123 bytes, but we are just checking length\n  if (reason && reason.length > 123) {\n    throw new SyntaxError('reason argument has an invalid length');\n  }\n\n  // Step 3.1\n  if (this.readyState === SockJS.CLOSING || this.readyState === SockJS.CLOSED) {\n    return;\n  }\n\n  // TODO look at docs to determine how to set this\n  var wasClean = true;\n  this._close(code || 1000, reason || 'Normal closure', wasClean);\n};\n\nSockJS.prototype.send = function(data) {\n  // #13 - convert anything non-string to string\n  // TODO this currently turns objects into [object Object]\n  if (typeof data !== 'string') {\n    data = '' + data;\n  }\n  if (this.readyState === SockJS.CONNECTING) {\n    throw new Error('InvalidStateError: The connection has not been established yet');\n  }\n  if (this.readyState !== SockJS.OPEN) {\n    return;\n  }\n  this._transport.send(escape.quote(data));\n};\n\nSockJS.version = require('./version');\n\nSockJS.CONNECTING = 0;\nSockJS.OPEN = 1;\nSockJS.CLOSING = 2;\nSockJS.CLOSED = 3;\n\nSockJS.prototype._receiveInfo = function(info, rtt) {\n  debug('_receiveInfo', rtt);\n  this._ir = null;\n  if (!info) {\n    this._close(1002, 'Cannot connect to server');\n    return;\n  }\n\n  // establish a round-trip timeout (RTO) based on the\n  // round-trip time (RTT)\n  this._rto = this.countRTO(rtt);\n  // allow server to override url used for the actual transport\n  this._transUrl = info.base_url ? info.base_url : this.url;\n  info = objectUtils.extend(info, this._urlInfo);\n  debug('info', info);\n  // determine list of desired and supported transports\n  var enabledTransports = transports.filterToEnabled(this._transportsWhitelist, info);\n  this._transports = enabledTransports.main;\n  debug(this._transports.length + ' enabled transports');\n\n  this._connect();\n};\n\nSockJS.prototype._connect = function() {\n  for (var Transport = this._transports.shift(); Transport; Transport = this._transports.shift()) {\n    debug('attempt', Transport.transportName);\n    if (Transport.needBody) {\n      if (!global.document.body ||\n          (typeof global.document.readyState !== 'undefined' &&\n            global.document.readyState !== 'complete' &&\n            global.document.readyState !== 'interactive')) {\n        debug('waiting for body');\n        this._transports.unshift(Transport);\n        eventUtils.attachEvent('load', this._connect.bind(this));\n        return;\n      }\n    }\n\n    // calculate timeout based on RTO and round trips. Default to 5s\n    var timeoutMs = (this._rto * Transport.roundTrips) || 5000;\n    this._transportTimeoutId = setTimeout(this._transportTimeout.bind(this), timeoutMs);\n    debug('using timeout', timeoutMs);\n\n    var transportUrl = urlUtils.addPath(this._transUrl, '/' + this._server + '/' + this._generateSessionId());\n    var options = this._transportOptions[Transport.transportName];\n    debug('transport url', transportUrl);\n    var transportObj = new Transport(transportUrl, this._transUrl, options);\n    transportObj.on('message', this._transportMessage.bind(this));\n    transportObj.once('close', this._transportClose.bind(this));\n    transportObj.transportName = Transport.transportName;\n    this._transport = transportObj;\n\n    return;\n  }\n  this._close(2000, 'All transports failed', false);\n};\n\nSockJS.prototype._transportTimeout = function() {\n  debug('_transportTimeout');\n  if (this.readyState === SockJS.CONNECTING) {\n    this._transportClose(2007, 'Transport timed out');\n  }\n};\n\nSockJS.prototype._transportMessage = function(msg) {\n  debug('_transportMessage', msg);\n  var self = this\n    , type = msg.slice(0, 1)\n    , content = msg.slice(1)\n    , payload\n    ;\n\n  // first check for messages that don't need a payload\n  switch (type) {\n    case 'o':\n      this._open();\n      return;\n    case 'h':\n      this.dispatchEvent(new Event('heartbeat'));\n      debug('heartbeat', this.transport);\n      return;\n  }\n\n  if (content) {\n    try {\n      payload = JSON3.parse(content);\n    } catch (e) {\n      debug('bad json', content);\n    }\n  }\n\n  if (typeof payload === 'undefined') {\n    debug('empty payload', content);\n    return;\n  }\n\n  switch (type) {\n    case 'a':\n      if (Array.isArray(payload)) {\n        payload.forEach(function(p) {\n          debug('message', self.transport, p);\n          self.dispatchEvent(new TransportMessageEvent(p));\n        });\n      }\n      break;\n    case 'm':\n      debug('message', this.transport, payload);\n      this.dispatchEvent(new TransportMessageEvent(payload));\n      break;\n    case 'c':\n      if (Array.isArray(payload) && payload.length === 2) {\n        this._close(payload[0], payload[1], true);\n      }\n      break;\n  }\n};\n\nSockJS.prototype._transportClose = function(code, reason) {\n  debug('_transportClose', this.transport, code, reason);\n  if (this._transport) {\n    this._transport.removeAllListeners();\n    this._transport = null;\n    this.transport = null;\n  }\n\n  if (!userSetCode(code) && code !== 2000 && this.readyState === SockJS.CONNECTING) {\n    this._connect();\n    return;\n  }\n\n  this._close(code, reason);\n};\n\nSockJS.prototype._open = function() {\n  debug('_open', this._transport.transportName, this.readyState);\n  if (this.readyState === SockJS.CONNECTING) {\n    if (this._transportTimeoutId) {\n      clearTimeout(this._transportTimeoutId);\n      this._transportTimeoutId = null;\n    }\n    this.readyState = SockJS.OPEN;\n    this.transport = this._transport.transportName;\n    this.dispatchEvent(new Event('open'));\n    debug('connected', this.transport);\n  } else {\n    // The server might have been restarted, and lost track of our\n    // connection.\n    this._close(1006, 'Server lost session');\n  }\n};\n\nSockJS.prototype._close = function(code, reason, wasClean) {\n  debug('_close', this.transport, code, reason, wasClean, this.readyState);\n  var forceFail = false;\n\n  if (this._ir) {\n    forceFail = true;\n    this._ir.close();\n    this._ir = null;\n  }\n  if (this._transport) {\n    this._transport.close();\n    this._transport = null;\n    this.transport = null;\n  }\n\n  if (this.readyState === SockJS.CLOSED) {\n    throw new Error('InvalidStateError: SockJS has already been closed');\n  }\n\n  this.readyState = SockJS.CLOSING;\n  setTimeout(function() {\n    this.readyState = SockJS.CLOSED;\n\n    if (forceFail) {\n      this.dispatchEvent(new Event('error'));\n    }\n\n    var e = new CloseEvent('close');\n    e.wasClean = wasClean || false;\n    e.code = code || 1000;\n    e.reason = reason;\n\n    this.dispatchEvent(e);\n    this.onmessage = this.onclose = this.onerror = null;\n    debug('disconnected');\n  }.bind(this), 0);\n};\n\n// See: http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/\n// and RFC 2988.\nSockJS.prototype.countRTO = function(rtt) {\n  // In a local environment, when using IE8/9 and the `jsonp-polling`\n  // transport the time needed to establish a connection (the time that pass\n  // from the opening of the transport to the call of `_dispatchOpen`) is\n  // around 200msec (the lower bound used in the article above) and this\n  // causes spurious timeouts. For this reason we calculate a value slightly\n  // larger than that used in the article.\n  if (rtt > 100) {\n    return 4 * rtt; // rto > 400msec\n  }\n  return 300 + rtt; // 300msec < rto <= 400msec\n};\n\nmodule.exports = function(availableTransports) {\n  transports = transport(availableTransports);\n  require('./iframe-bootstrap')(SockJS, availableTransports);\n  return SockJS;\n};\n"]}
+},{"./event/close":2,"./event/event":4,"./event/eventtarget":5,"./event/trans-message":6,"./iframe-bootstrap":8,"./info-receiver":12,"./location":13,"./shims":15,"./utils/browser":44,"./utils/escape":45,"./utils/event":46,"./utils/log":48,"./utils/object":49,"./utils/random":50,"./utils/transport":51,"./utils/url":52,"./version":53,"debug":54,"inherits":57,"json3":58,"url-parse":59}],15:[function(require,module,exports){
+/* eslint-disable */
+/* jscs: disable */
+'use strict';
+
+// pulled specific shims from https://github.com/es-shims/es5-shim
+
+var ArrayPrototype = Array.prototype;
+var ObjectPrototype = Object.prototype;
+var FunctionPrototype = Function.prototype;
+var StringPrototype = String.prototype;
+var array_slice = ArrayPrototype.slice;
+
+var _toString = ObjectPrototype.toString;
+var isFunction = function (val) {
+    return ObjectPrototype.toString.call(val) === '[object Function]';
+};
+var isArray = function isArray(obj) {
+    return _toString.call(obj) === '[object Array]';
+};
+var isString = function isString(obj) {
+    return _toString.call(obj) === '[object String]';
+};
+
+var supportsDescriptors = Object.defineProperty && (function () {
+    try {
+        Object.defineProperty({}, 'x', {});
+        return true;
+    } catch (e) { /* this is ES3 */
+        return false;
+    }
+}());
+
+// Define configurable, writable and non-enumerable props
+// if they don't exist.
+var defineProperty;
+if (supportsDescriptors) {
+    defineProperty = function (object, name, method, forceAssign) {
+        if (!forceAssign && (name in object)) { return; }
+        Object.defineProperty(object, name, {
+            configurable: true,
+            enumerable: false,
+            writable: true,
+            value: method
+        });
+    };
+} else {
+    defineProperty = function (object, name, method, forceAssign) {
+        if (!forceAssign && (name in object)) { return; }
+        object[name] = method;
+    };
+}
+var defineProperties = function (object, map, forceAssign) {
+    for (var name in map) {
+        if (ObjectPrototype.hasOwnProperty.call(map, name)) {
+          defineProperty(object, name, map[name], forceAssign);
+        }
+    }
+};
+
+var toObject = function (o) {
+    if (o == null) { // this matches both null and undefined
+        throw new TypeError("can't convert " + o + ' to object');
+    }
+    return Object(o);
+};
+
+//
+// Util
+// ======
+//
+
+// ES5 9.4
+// http://es5.github.com/#x9.4
+// http://jsperf.com/to-integer
+
+function toInteger(num) {
+    var n = +num;
+    if (n !== n) { // isNaN
+        n = 0;
+    } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
+        n = (n > 0 || -1) * Math.floor(Math.abs(n));
+    }
+    return n;
+}
+
+function ToUint32(x) {
+    return x >>> 0;
+}
+
+//
+// Function
+// ========
+//
+
+// ES-5 15.3.4.5
+// http://es5.github.com/#x15.3.4.5
+
+function Empty() {}
+
+defineProperties(FunctionPrototype, {
+    bind: function bind(that) { // .length is 1
+        // 1. Let Target be the this value.
+        var target = this;
+        // 2. If IsCallable(Target) is false, throw a TypeError exception.
+        if (!isFunction(target)) {
+            throw new TypeError('Function.prototype.bind called on incompatible ' + target);
+        }
+        // 3. Let A be a new (possibly empty) internal list of all of the
+        //   argument values provided after thisArg (arg1, arg2 etc), in order.
+        // XXX slicedArgs will stand in for "A" if used
+        var args = array_slice.call(arguments, 1); // for normal call
+        // 4. Let F be a new native ECMAScript object.
+        // 11. Set the [[Prototype]] internal property of F to the standard
+        //   built-in Function prototype object as specified in 15.3.3.1.
+        // 12. Set the [[Call]] internal property of F as described in
+        //   15.3.4.5.1.
+        // 13. Set the [[Construct]] internal property of F as described in
+        //   15.3.4.5.2.
+        // 14. Set the [[HasInstance]] internal property of F as described in
+        //   15.3.4.5.3.
+        var binder = function () {
+
+            if (this instanceof bound) {
+                // 15.3.4.5.2 [[Construct]]
+                // When the [[Construct]] internal method of a function object,
+                // F that was created using the bind function is called with a
+                // list of arguments ExtraArgs, the following steps are taken:
+                // 1. Let target be the value of F's [[TargetFunction]]
+                //   internal property.
+                // 2. If target has no [[Construct]] internal method, a
+                //   TypeError exception is thrown.
+                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the
+                //   list boundArgs in the same order followed by the same
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Construct]] internal
+                //   method of target providing args as the arguments.
+
+                var result = target.apply(
+                    this,
+                    args.concat(array_slice.call(arguments))
+                );
+                if (Object(result) === result) {
+                    return result;
+                }
+                return this;
+
+            } else {
+                // 15.3.4.5.1 [[Call]]
+                // When the [[Call]] internal method of a function object, F,
+                // which was created using the bind function is called with a
+                // this value and a list of arguments ExtraArgs, the following
+                // steps are taken:
+                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 2. Let boundThis be the value of F's [[BoundThis]] internal
+                //   property.
+                // 3. Let target be the value of F's [[TargetFunction]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the
+                //   list boundArgs in the same order followed by the same
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Call]] internal method
+                //   of target providing boundThis as the this value and
+                //   providing args as the arguments.
+
+                // equiv: target.call(this, ...boundArgs, ...args)
+                return target.apply(
+                    that,
+                    args.concat(array_slice.call(arguments))
+                );
+
+            }
+
+        };
+
+        // 15. If the [[Class]] internal property of Target is "Function", then
+        //     a. Let L be the length property of Target minus the length of A.
+        //     b. Set the length own property of F to either 0 or L, whichever is
+        //       larger.
+        // 16. Else set the length own property of F to 0.
+
+        var boundLength = Math.max(0, target.length - args.length);
+
+        // 17. Set the attributes of the length own property of F to the values
+        //   specified in 15.3.5.1.
+        var boundArgs = [];
+        for (var i = 0; i < boundLength; i++) {
+            boundArgs.push('$' + i);
+        }
+
+        // XXX Build a dynamic function with desired amount of arguments is the only
+        // way to set the length property of a function.
+        // In environments where Content Security Policies enabled (Chrome extensions,
+        // for ex.) all use of eval or Function costructor throws an exception.
+        // However in all of these environments Function.prototype.bind exists
+        // and so this code will never be executed.
+        var bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this, arguments); }')(binder);
+
+        if (target.prototype) {
+            Empty.prototype = target.prototype;
+            bound.prototype = new Empty();
+            // Clean up dangling references.
+            Empty.prototype = null;
+        }
+
+        // TODO
+        // 18. Set the [[Extensible]] internal property of F to true.
+
+        // TODO
+        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
+        // 20. Call the [[DefineOwnProperty]] internal method of F with
+        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
+        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and
+        //   false.
+        // 21. Call the [[DefineOwnProperty]] internal method of F with
+        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower,
+        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
+        //   and false.
+
+        // TODO
+        // NOTE Function objects created using Function.prototype.bind do not
+        // have a prototype property or the [[Code]], [[FormalParameters]], and
+        // [[Scope]] internal properties.
+        // XXX can't delete prototype in pure-js.
+
+        // 22. Return F.
+        return bound;
+    }
+});
+
+//
+// Array
+// =====
+//
+
+// ES5 15.4.3.2
+// http://es5.github.com/#x15.4.3.2
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
+defineProperties(Array, { isArray: isArray });
+
+
+var boxedString = Object('a');
+var splitString = boxedString[0] !== 'a' || !(0 in boxedString);
+
+var properlyBoxesContext = function properlyBoxed(method) {
+    // Check node 0.6.21 bug where third parameter is not boxed
+    var properlyBoxesNonStrict = true;
+    var properlyBoxesStrict = true;
+    if (method) {
+        method.call('foo', function (_, __, context) {
+            if (typeof context !== 'object') { properlyBoxesNonStrict = false; }
+        });
+
+        method.call([1], function () {
+            'use strict';
+            properlyBoxesStrict = typeof this === 'string';
+        }, 'x');
+    }
+    return !!method && properlyBoxesNonStrict && properlyBoxesStrict;
+};
+
+defineProperties(ArrayPrototype, {
+    forEach: function forEach(fun /*, thisp*/) {
+        var object = toObject(this),
+            self = splitString && isString(this) ? this.split('') : object,
+            thisp = arguments[1],
+            i = -1,
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (!isFunction(fun)) {
+            throw new TypeError(); // TODO message
+        }
+
+        while (++i < length) {
+            if (i in self) {
+                // Invoke the callback function with call, passing arguments:
+                // context, property value, property key, thisArg object
+                // context
+                fun.call(thisp, self[i], i, object);
+            }
+        }
+    }
+}, !properlyBoxesContext(ArrayPrototype.forEach));
+
+// ES5 15.4.4.14
+// http://es5.github.com/#x15.4.4.14
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
+var hasFirefox2IndexOfBug = Array.prototype.indexOf && [0, 1].indexOf(1, 2) !== -1;
+defineProperties(ArrayPrototype, {
+    indexOf: function indexOf(sought /*, fromIndex */ ) {
+        var self = splitString && isString(this) ? this.split('') : toObject(this),
+            length = self.length >>> 0;
+
+        if (!length) {
+            return -1;
+        }
+
+        var i = 0;
+        if (arguments.length > 1) {
+            i = toInteger(arguments[1]);
+        }
+
+        // handle negative indices
+        i = i >= 0 ? i : Math.max(0, length + i);
+        for (; i < length; i++) {
+            if (i in self && self[i] === sought) {
+                return i;
+            }
+        }
+        return -1;
+    }
+}, hasFirefox2IndexOfBug);
+
+//
+// String
+// ======
+//
+
+// ES5 15.5.4.14
+// http://es5.github.com/#x15.5.4.14
+
+// [bugfix, IE lt 9, firefox 4, Konqueror, Opera, obscure browsers]
+// Many browsers do not split properly with regular expressions or they
+// do not perform the split correctly under obscure conditions.
+// See http://blog.stevenlevithan.com/archives/cross-browser-split
+// I've tested in many browsers and this seems to cover the deviant ones:
+//    'ab'.split(/(?:ab)*/) should be ["", ""], not [""]
+//    '.'.split(/(.?)(.?)/) should be ["", ".", "", ""], not ["", ""]
+//    'tesst'.split(/(s)*/) should be ["t", undefined, "e", "s", "t"], not
+//       [undefined, "t", undefined, "e", ...]
+//    ''.split(/.?/) should be [], not [""]
+//    '.'.split(/()()/) should be ["."], not ["", "", "."]
+
+var string_split = StringPrototype.split;
+if (
+    'ab'.split(/(?:ab)*/).length !== 2 ||
+    '.'.split(/(.?)(.?)/).length !== 4 ||
+    'tesst'.split(/(s)*/)[1] === 't' ||
+    'test'.split(/(?:)/, -1).length !== 4 ||
+    ''.split(/.?/).length ||
+    '.'.split(/()()/).length > 1
+) {
+    (function () {
+        var compliantExecNpcg = /()??/.exec('')[1] === void 0; // NPCG: nonparticipating capturing group
+
+        StringPrototype.split = function (separator, limit) {
+            var string = this;
+            if (separator === void 0 && limit === 0) {
+                return [];
+            }
+
+            // If `separator` is not a regex, use native split
+            if (_toString.call(separator) !== '[object RegExp]') {
+                return string_split.call(this, separator, limit);
+            }
+
+            var output = [],
+                flags = (separator.ignoreCase ? 'i' : '') +
+                        (separator.multiline  ? 'm' : '') +
+                        (separator.extended   ? 'x' : '') + // Proposed for ES6
+                        (separator.sticky     ? 'y' : ''), // Firefox 3+
+                lastLastIndex = 0,
+                // Make `global` and avoid `lastIndex` issues by working with a copy
+                separator2, match, lastIndex, lastLength;
+            separator = new RegExp(separator.source, flags + 'g');
+            string += ''; // Type-convert
+            if (!compliantExecNpcg) {
+                // Doesn't need flags gy, but they don't hurt
+                separator2 = new RegExp('^' + separator.source + '$(?!\\s)', flags);
+            }
+            /* Values for `limit`, per the spec:
+             * If undefined: 4294967295 // Math.pow(2, 32) - 1
+             * If 0, Infinity, or NaN: 0
+             * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
+             * If negative number: 4294967296 - Math.floor(Math.abs(limit))
+             * If other: Type-convert, then use the above rules
+             */
+            limit = limit === void 0 ?
+                -1 >>> 0 : // Math.pow(2, 32) - 1
+                ToUint32(limit);
+            while (match = separator.exec(string)) {
+                // `separator.lastIndex` is not reliable cross-browser
+                lastIndex = match.index + match[0].length;
+                if (lastIndex > lastLastIndex) {
+                    output.push(string.slice(lastLastIndex, match.index));
+                    // Fix browsers whose `exec` methods don't consistently return `undefined` for
+                    // nonparticipating capturing groups
+                    if (!compliantExecNpcg && match.length > 1) {
+                        match[0].replace(separator2, function () {
+                            for (var i = 1; i < arguments.length - 2; i++) {
+                                if (arguments[i] === void 0) {
+                                    match[i] = void 0;
+                                }
+                            }
+                        });
+                    }
+                    if (match.length > 1 && match.index < string.length) {
+                        ArrayPrototype.push.apply(output, match.slice(1));
+                    }
+                    lastLength = match[0].length;
+                    lastLastIndex = lastIndex;
+                    if (output.length >= limit) {
+                        break;
+                    }
+                }
+                if (separator.lastIndex === match.index) {
+                    separator.lastIndex++; // Avoid an infinite loop
+                }
+            }
+            if (lastLastIndex === string.length) {
+                if (lastLength || !separator.test('')) {
+                    output.push('');
+                }
+            } else {
+                output.push(string.slice(lastLastIndex));
+            }
+            return output.length > limit ? output.slice(0, limit) : output;
+        };
+    }());
+
+// [bugfix, chrome]
+// If separator is undefined, then the result array contains just one String,
+// which is the this value (converted to a String). If limit is not undefined,
+// then the output array is truncated so that it contains no more than limit
+// elements.
+// "0".split(undefined, 0) -> []
+} else if ('0'.split(void 0, 0).length) {
+    StringPrototype.split = function split(separator, limit) {
+        if (separator === void 0 && limit === 0) { return []; }
+        return string_split.call(this, separator, limit);
+    };
+}
+
+// ES5 15.5.4.20
+// whitespace from: http://es5.github.io/#x15.5.4.20
+var ws = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003' +
+    '\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028' +
+    '\u2029\uFEFF';
+var zeroWidth = '\u200b';
+var wsRegexChars = '[' + ws + ']';
+var trimBeginRegexp = new RegExp('^' + wsRegexChars + wsRegexChars + '*');
+var trimEndRegexp = new RegExp(wsRegexChars + wsRegexChars + '*$');
+var hasTrimWhitespaceBug = StringPrototype.trim && (ws.trim() || !zeroWidth.trim());
+defineProperties(StringPrototype, {
+    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
+    // http://perfectionkills.com/whitespace-deviations/
+    trim: function trim() {
+        if (this === void 0 || this === null) {
+            throw new TypeError("can't convert " + this + ' to object');
+        }
+        return String(this).replace(trimBeginRegexp, '').replace(trimEndRegexp, '');
+    }
+}, hasTrimWhitespaceBug);
+
+// ECMA-262, 3rd B.2.3
+// Not an ECMAScript standard, although ECMAScript 3rd Edition has a
+// non-normative section suggesting uniform semantics and it should be
+// normalized across all browsers
+// [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE
+var string_substr = StringPrototype.substr;
+var hasNegativeSubstrBug = ''.substr && '0b'.substr(-1) !== 'b';
+defineProperties(StringPrototype, {
+    substr: function substr(start, length) {
+        return string_substr.call(
+            this,
+            start < 0 ? ((start = this.length + start) < 0 ? 0 : start) : start,
+            length
+        );
+    }
+}, hasNegativeSubstrBug);
+
+},{}],16:[function(require,module,exports){
+'use strict';
+
+module.exports = [
+  // streaming transports
+  require('./transport/websocket')
+, require('./transport/xhr-streaming')
+, require('./transport/xdr-streaming')
+, require('./transport/eventsource')
+, require('./transport/lib/iframe-wrap')(require('./transport/eventsource'))
+
+  // polling transports
+, require('./transport/htmlfile')
+, require('./transport/lib/iframe-wrap')(require('./transport/htmlfile'))
+, require('./transport/xhr-polling')
+, require('./transport/xdr-polling')
+, require('./transport/lib/iframe-wrap')(require('./transport/xhr-polling'))
+, require('./transport/jsonp-polling')
+];
+
+},{"./transport/eventsource":20,"./transport/htmlfile":21,"./transport/jsonp-polling":23,"./transport/lib/iframe-wrap":26,"./transport/websocket":38,"./transport/xdr-polling":39,"./transport/xdr-streaming":40,"./transport/xhr-polling":41,"./transport/xhr-streaming":42}],17:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , utils = require('../../utils/event')
+  , urlUtils = require('../../utils/url')
+  , XHR = global.XMLHttpRequest
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:browser:xhr');
+}
+
+function AbstractXHRObject(method, url, payload, opts) {
+  debug(method, url);
+  var self = this;
+  EventEmitter.call(this);
+
+  setTimeout(function () {
+    self._start(method, url, payload, opts);
+  }, 0);
+}
+
+inherits(AbstractXHRObject, EventEmitter);
+
+AbstractXHRObject.prototype._start = function(method, url, payload, opts) {
+  var self = this;
+
+  try {
+    this.xhr = new XHR();
+  } catch (x) {
+    // intentionally empty
+  }
+
+  if (!this.xhr) {
+    debug('no xhr');
+    this.emit('finish', 0, 'no xhr support');
+    this._cleanup();
+    return;
+  }
+
+  // several browsers cache POSTs
+  url = urlUtils.addQuery(url, 't=' + (+new Date()));
+
+  // Explorer tends to keep connection open, even after the
+  // tab gets closed: http://bugs.jquery.com/ticket/5280
+  this.unloadRef = utils.unloadAdd(function() {
+    debug('unload cleanup');
+    self._cleanup(true);
+  });
+  try {
+    this.xhr.open(method, url, true);
+    if (this.timeout && 'timeout' in this.xhr) {
+      this.xhr.timeout = this.timeout;
+      this.xhr.ontimeout = function() {
+        debug('xhr timeout');
+        self.emit('finish', 0, '');
+        self._cleanup(false);
+      };
+    }
+  } catch (e) {
+    debug('exception', e);
+    // IE raises an exception on wrong port.
+    this.emit('finish', 0, '');
+    this._cleanup(false);
+    return;
+  }
+
+  if ((!opts || !opts.noCredentials) && AbstractXHRObject.supportsCORS) {
+    debug('withCredentials');
+    // Mozilla docs says https://developer.mozilla.org/en/XMLHttpRequest :
+    // "This never affects same-site requests."
+
+    this.xhr.withCredentials = 'true';
+  }
+  if (opts && opts.headers) {
+    for (var key in opts.headers) {
+      this.xhr.setRequestHeader(key, opts.headers[key]);
+    }
+  }
+
+  this.xhr.onreadystatechange = function() {
+    if (self.xhr) {
+      var x = self.xhr;
+      var text, status;
+      debug('readyState', x.readyState);
+      switch (x.readyState) {
+      case 3:
+        // IE doesn't like peeking into responseText or status
+        // on Microsoft.XMLHTTP and readystate=3
+        try {
+          status = x.status;
+          text = x.responseText;
+        } catch (e) {
+          // intentionally empty
+        }
+        debug('status', status);
+        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450
+        if (status === 1223) {
+          status = 204;
+        }
+
+        // IE does return readystate == 3 for 404 answers.
+        if (status === 200 && text && text.length > 0) {
+          debug('chunk');
+          self.emit('chunk', status, text);
+        }
+        break;
+      case 4:
+        status = x.status;
+        debug('status', status);
+        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450
+        if (status === 1223) {
+          status = 204;
+        }
+        // IE returns this for a bad port
+        // http://msdn.microsoft.com/en-us/library/windows/desktop/aa383770(v=vs.85).aspx
+        if (status === 12005 || status === 12029) {
+          status = 0;
+        }
+
+        debug('finish', status, x.responseText);
+        self.emit('finish', status, x.responseText);
+        self._cleanup(false);
+        break;
+      }
+    }
+  };
+
+  try {
+    self.xhr.send(payload);
+  } catch (e) {
+    self.emit('finish', 0, '');
+    self._cleanup(false);
+  }
+};
+
+AbstractXHRObject.prototype._cleanup = function(abort) {
+  debug('cleanup');
+  if (!this.xhr) {
+    return;
+  }
+  this.removeAllListeners();
+  utils.unloadDel(this.unloadRef);
+
+  // IE needs this field to be a function
+  this.xhr.onreadystatechange = function() {};
+  if (this.xhr.ontimeout) {
+    this.xhr.ontimeout = null;
+  }
+
+  if (abort) {
+    try {
+      this.xhr.abort();
+    } catch (x) {
+      // intentionally empty
+    }
+  }
+  this.unloadRef = this.xhr = null;
+};
+
+AbstractXHRObject.prototype.close = function() {
+  debug('close');
+  this._cleanup(true);
+};
+
+AbstractXHRObject.enabled = !!XHR;
+// override XMLHttpRequest for IE6/7
+// obfuscate to avoid firewalls
+var axo = ['Active'].concat('Object').join('X');
+if (!AbstractXHRObject.enabled && (axo in global)) {
+  debug('overriding xmlhttprequest');
+  XHR = function() {
+    try {
+      return new global[axo]('Microsoft.XMLHTTP');
+    } catch (e) {
+      return null;
+    }
+  };
+  AbstractXHRObject.enabled = !!new XHR();
+}
+
+var cors = false;
+try {
+  cors = 'withCredentials' in new XHR();
+} catch (ignored) {
+  // intentionally empty
+}
+
+AbstractXHRObject.supportsCORS = cors;
+
+module.exports = AbstractXHRObject;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/transport/browser/abstract-xhr.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar EventEmitter = require('events').EventEmitter\n  , inherits = require('inherits')\n  , utils = require('../../utils/event')\n  , urlUtils = require('../../utils/url')\n  , XHR = global.XMLHttpRequest\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:browser:xhr');\n}\n\nfunction AbstractXHRObject(method, url, payload, opts) {\n  debug(method, url);\n  var self = this;\n  EventEmitter.call(this);\n\n  setTimeout(function () {\n    self._start(method, url, payload, opts);\n  }, 0);\n}\n\ninherits(AbstractXHRObject, EventEmitter);\n\nAbstractXHRObject.prototype._start = function(method, url, payload, opts) {\n  var self = this;\n\n  try {\n    this.xhr = new XHR();\n  } catch (x) {\n    // intentionally empty\n  }\n\n  if (!this.xhr) {\n    debug('no xhr');\n    this.emit('finish', 0, 'no xhr support');\n    this._cleanup();\n    return;\n  }\n\n  // several browsers cache POSTs\n  url = urlUtils.addQuery(url, 't=' + (+new Date()));\n\n  // Explorer tends to keep connection open, even after the\n  // tab gets closed: http://bugs.jquery.com/ticket/5280\n  this.unloadRef = utils.unloadAdd(function() {\n    debug('unload cleanup');\n    self._cleanup(true);\n  });\n  try {\n    this.xhr.open(method, url, true);\n    if (this.timeout && 'timeout' in this.xhr) {\n      this.xhr.timeout = this.timeout;\n      this.xhr.ontimeout = function() {\n        debug('xhr timeout');\n        self.emit('finish', 0, '');\n        self._cleanup(false);\n      };\n    }\n  } catch (e) {\n    debug('exception', e);\n    // IE raises an exception on wrong port.\n    this.emit('finish', 0, '');\n    this._cleanup(false);\n    return;\n  }\n\n  if ((!opts || !opts.noCredentials) && AbstractXHRObject.supportsCORS) {\n    debug('withCredentials');\n    // Mozilla docs says https://developer.mozilla.org/en/XMLHttpRequest :\n    // \"This never affects same-site requests.\"\n\n    this.xhr.withCredentials = 'true';\n  }\n  if (opts && opts.headers) {\n    for (var key in opts.headers) {\n      this.xhr.setRequestHeader(key, opts.headers[key]);\n    }\n  }\n\n  this.xhr.onreadystatechange = function() {\n    if (self.xhr) {\n      var x = self.xhr;\n      var text, status;\n      debug('readyState', x.readyState);\n      switch (x.readyState) {\n      case 3:\n        // IE doesn't like peeking into responseText or status\n        // on Microsoft.XMLHTTP and readystate=3\n        try {\n          status = x.status;\n          text = x.responseText;\n        } catch (e) {\n          // intentionally empty\n        }\n        debug('status', status);\n        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450\n        if (status === 1223) {\n          status = 204;\n        }\n\n        // IE does return readystate == 3 for 404 answers.\n        if (status === 200 && text && text.length > 0) {\n          debug('chunk');\n          self.emit('chunk', status, text);\n        }\n        break;\n      case 4:\n        status = x.status;\n        debug('status', status);\n        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450\n        if (status === 1223) {\n          status = 204;\n        }\n        // IE returns this for a bad port\n        // http://msdn.microsoft.com/en-us/library/windows/desktop/aa383770(v=vs.85).aspx\n        if (status === 12005 || status === 12029) {\n          status = 0;\n        }\n\n        debug('finish', status, x.responseText);\n        self.emit('finish', status, x.responseText);\n        self._cleanup(false);\n        break;\n      }\n    }\n  };\n\n  try {\n    self.xhr.send(payload);\n  } catch (e) {\n    self.emit('finish', 0, '');\n    self._cleanup(false);\n  }\n};\n\nAbstractXHRObject.prototype._cleanup = function(abort) {\n  debug('cleanup');\n  if (!this.xhr) {\n    return;\n  }\n  this.removeAllListeners();\n  utils.unloadDel(this.unloadRef);\n\n  // IE needs this field to be a function\n  this.xhr.onreadystatechange = function() {};\n  if (this.xhr.ontimeout) {\n    this.xhr.ontimeout = null;\n  }\n\n  if (abort) {\n    try {\n      this.xhr.abort();\n    } catch (x) {\n      // intentionally empty\n    }\n  }\n  this.unloadRef = this.xhr = null;\n};\n\nAbstractXHRObject.prototype.close = function() {\n  debug('close');\n  this._cleanup(true);\n};\n\nAbstractXHRObject.enabled = !!XHR;\n// override XMLHttpRequest for IE6/7\n// obfuscate to avoid firewalls\nvar axo = ['Active'].concat('Object').join('X');\nif (!AbstractXHRObject.enabled && (axo in global)) {\n  debug('overriding xmlhttprequest');\n  XHR = function() {\n    try {\n      return new global[axo]('Microsoft.XMLHTTP');\n    } catch (e) {\n      return null;\n    }\n  };\n  AbstractXHRObject.enabled = !!new XHR();\n}\n\nvar cors = false;\ntry {\n  cors = 'withCredentials' in new XHR();\n} catch (ignored) {\n  // intentionally empty\n}\n\nAbstractXHRObject.supportsCORS = cors;\n\nmodule.exports = AbstractXHRObject;\n"]}
+},{"../../utils/event":46,"../../utils/url":52,"debug":54,"events":3,"inherits":57}],18:[function(require,module,exports){
+(function (global){
+module.exports = global.EventSource;
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvYnJvd3Nlci9ldmVudHNvdXJjZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsibW9kdWxlLmV4cG9ydHMgPSBnbG9iYWwuRXZlbnRTb3VyY2U7XG4iXX0=
+},{}],19:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var Driver = global.WebSocket || global.MozWebSocket;
+if (Driver) {
+	module.exports = function WebSocketBrowserDriver(url) {
+		return new Driver(url);
+	};
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvYnJvd3Nlci93ZWJzb2NrZXQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgRHJpdmVyID0gZ2xvYmFsLldlYlNvY2tldCB8fCBnbG9iYWwuTW96V2ViU29ja2V0O1xuaWYgKERyaXZlcikge1xuXHRtb2R1bGUuZXhwb3J0cyA9IGZ1bmN0aW9uIFdlYlNvY2tldEJyb3dzZXJEcml2ZXIodXJsKSB7XG5cdFx0cmV0dXJuIG5ldyBEcml2ZXIodXJsKTtcblx0fTtcbn1cbiJdfQ==
+},{}],20:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , EventSourceReceiver = require('./receiver/eventsource')
+  , XHRCorsObject = require('./sender/xhr-cors')
+  , EventSourceDriver = require('eventsource')
+  ;
+
+function EventSourceTransport(transUrl) {
+  if (!EventSourceTransport.enabled()) {
+    throw new Error('Transport created when disabled');
+  }
+
+  AjaxBasedTransport.call(this, transUrl, '/eventsource', EventSourceReceiver, XHRCorsObject);
+}
+
+inherits(EventSourceTransport, AjaxBasedTransport);
+
+EventSourceTransport.enabled = function() {
+  return !!EventSourceDriver;
+};
+
+EventSourceTransport.transportName = 'eventsource';
+EventSourceTransport.roundTrips = 2;
+
+module.exports = EventSourceTransport;
+
+},{"./lib/ajax-based":24,"./receiver/eventsource":29,"./sender/xhr-cors":35,"eventsource":18,"inherits":57}],21:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , HtmlfileReceiver = require('./receiver/htmlfile')
+  , XHRLocalObject = require('./sender/xhr-local')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  ;
+
+function HtmlFileTransport(transUrl) {
+  if (!HtmlfileReceiver.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/htmlfile', HtmlfileReceiver, XHRLocalObject);
+}
+
+inherits(HtmlFileTransport, AjaxBasedTransport);
+
+HtmlFileTransport.enabled = function(info) {
+  return HtmlfileReceiver.enabled && info.sameOrigin;
+};
+
+HtmlFileTransport.transportName = 'htmlfile';
+HtmlFileTransport.roundTrips = 2;
+
+module.exports = HtmlFileTransport;
+
+},{"./lib/ajax-based":24,"./receiver/htmlfile":30,"./sender/xhr-local":37,"inherits":57}],22:[function(require,module,exports){
+(function (process){
+'use strict';
+
+// Few cool transports do work only for same-origin. In order to make
+// them work cross-domain we shall use iframe, served from the
+// remote domain. New browsers have capabilities to communicate with
+// cross domain iframe using postMessage(). In IE it was implemented
+// from IE 8+, but of course, IE got some details wrong:
+//    http://msdn.microsoft.com/en-us/library/cc197015(v=VS.85).aspx
+//    http://stevesouders.com/misc/test-postmessage.php
+
+var inherits = require('inherits')
+  , JSON3 = require('json3')
+  , EventEmitter = require('events').EventEmitter
+  , version = require('../version')
+  , urlUtils = require('../utils/url')
+  , iframeUtils = require('../utils/iframe')
+  , eventUtils = require('../utils/event')
+  , random = require('../utils/random')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:transport:iframe');
+}
+
+function IframeTransport(transport, transUrl, baseUrl) {
+  if (!IframeTransport.enabled()) {
+    throw new Error('Transport created when disabled');
+  }
+  EventEmitter.call(this);
+
+  var self = this;
+  this.origin = urlUtils.getOrigin(baseUrl);
+  this.baseUrl = baseUrl;
+  this.transUrl = transUrl;
+  this.transport = transport;
+  this.windowId = random.string(8);
+
+  var iframeUrl = urlUtils.addPath(baseUrl, '/iframe.html') + '#' + this.windowId;
+  debug(transport, transUrl, iframeUrl);
+
+  this.iframeObj = iframeUtils.createIframe(iframeUrl, function(r) {
+    debug('err callback');
+    self.emit('close', 1006, 'Unable to load an iframe (' + r + ')');
+    self.close();
+  });
+
+  this.onmessageCallback = this._message.bind(this);
+  eventUtils.attachEvent('message', this.onmessageCallback);
+}
+
+inherits(IframeTransport, EventEmitter);
+
+IframeTransport.prototype.close = function() {
+  debug('close');
+  this.removeAllListeners();
+  if (this.iframeObj) {
+    eventUtils.detachEvent('message', this.onmessageCallback);
+    try {
+      // When the iframe is not loaded, IE raises an exception
+      // on 'contentWindow'.
+      this.postMessage('c');
+    } catch (x) {
+      // intentionally empty
+    }
+    this.iframeObj.cleanup();
+    this.iframeObj = null;
+    this.onmessageCallback = this.iframeObj = null;
+  }
+};
+
+IframeTransport.prototype._message = function(e) {
+  debug('message', e.data);
+  if (!urlUtils.isOriginEqual(e.origin, this.origin)) {
+    debug('not same origin', e.origin, this.origin);
+    return;
+  }
+
+  var iframeMessage;
+  try {
+    iframeMessage = JSON3.parse(e.data);
+  } catch (ignored) {
+    debug('bad json', e.data);
+    return;
+  }
+
+  if (iframeMessage.windowId !== this.windowId) {
+    debug('mismatched window id', iframeMessage.windowId, this.windowId);
+    return;
+  }
+
+  switch (iframeMessage.type) {
+  case 's':
+    this.iframeObj.loaded();
+    // window global dependency
+    this.postMessage('s', JSON3.stringify([
+      version
+    , this.transport
+    , this.transUrl
+    , this.baseUrl
+    ]));
+    break;
+  case 't':
+    this.emit('message', iframeMessage.data);
+    break;
+  case 'c':
+    var cdata;
+    try {
+      cdata = JSON3.parse(iframeMessage.data);
+    } catch (ignored) {
+      debug('bad json', iframeMessage.data);
+      return;
+    }
+    this.emit('close', cdata[0], cdata[1]);
+    this.close();
+    break;
+  }
+};
+
+IframeTransport.prototype.postMessage = function(type, data) {
+  debug('postMessage', type, data);
+  this.iframeObj.post(JSON3.stringify({
+    windowId: this.windowId
+  , type: type
+  , data: data || ''
+  }), this.origin);
+};
+
+IframeTransport.prototype.send = function(message) {
+  debug('send', message);
+  this.postMessage('m', message);
+};
+
+IframeTransport.enabled = function() {
+  return iframeUtils.iframeEnabled;
+};
+
+IframeTransport.transportName = 'iframe';
+IframeTransport.roundTrips = 2;
+
+module.exports = IframeTransport;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvaWZyYW1lLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG4vLyBGZXcgY29vbCB0cmFuc3BvcnRzIGRvIHdvcmsgb25seSBmb3Igc2FtZS1vcmlnaW4uIEluIG9yZGVyIHRvIG1ha2Vcbi8vIHRoZW0gd29yayBjcm9zcy1kb21haW4gd2Ugc2hhbGwgdXNlIGlmcmFtZSwgc2VydmVkIGZyb20gdGhlXG4vLyByZW1vdGUgZG9tYWluLiBOZXcgYnJvd3NlcnMgaGF2ZSBjYXBhYmlsaXRpZXMgdG8gY29tbXVuaWNhdGUgd2l0aFxuLy8gY3Jvc3MgZG9tYWluIGlmcmFtZSB1c2luZyBwb3N0TWVzc2FnZSgpLiBJbiBJRSBpdCB3YXMgaW1wbGVtZW50ZWRcbi8vIGZyb20gSUUgOCssIGJ1dCBvZiBjb3Vyc2UsIElFIGdvdCBzb21lIGRldGFpbHMgd3Jvbmc6XG4vLyAgICBodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tL2VuLXVzL2xpYnJhcnkvY2MxOTcwMTUodj1WUy44NSkuYXNweFxuLy8gICAgaHR0cDovL3N0ZXZlc291ZGVycy5jb20vbWlzYy90ZXN0LXBvc3RtZXNzYWdlLnBocFxuXG52YXIgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgSlNPTjMgPSByZXF1aXJlKCdqc29uMycpXG4gICwgRXZlbnRFbWl0dGVyID0gcmVxdWlyZSgnZXZlbnRzJykuRXZlbnRFbWl0dGVyXG4gICwgdmVyc2lvbiA9IHJlcXVpcmUoJy4uL3ZlcnNpb24nKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vdXRpbHMvdXJsJylcbiAgLCBpZnJhbWVVdGlscyA9IHJlcXVpcmUoJy4uL3V0aWxzL2lmcmFtZScpXG4gICwgZXZlbnRVdGlscyA9IHJlcXVpcmUoJy4uL3V0aWxzL2V2ZW50JylcbiAgLCByYW5kb20gPSByZXF1aXJlKCcuLi91dGlscy9yYW5kb20nKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6dHJhbnNwb3J0OmlmcmFtZScpO1xufVxuXG5mdW5jdGlvbiBJZnJhbWVUcmFuc3BvcnQodHJhbnNwb3J0LCB0cmFuc1VybCwgYmFzZVVybCkge1xuICBpZiAoIUlmcmFtZVRyYW5zcG9ydC5lbmFibGVkKCkpIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoJ1RyYW5zcG9ydCBjcmVhdGVkIHdoZW4gZGlzYWJsZWQnKTtcbiAgfVxuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcblxuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHRoaXMub3JpZ2luID0gdXJsVXRpbHMuZ2V0T3JpZ2luKGJhc2VVcmwpO1xuICB0aGlzLmJhc2VVcmwgPSBiYXNlVXJsO1xuICB0aGlzLnRyYW5zVXJsID0gdHJhbnNVcmw7XG4gIHRoaXMudHJhbnNwb3J0ID0gdHJhbnNwb3J0O1xuICB0aGlzLndpbmRvd0lkID0gcmFuZG9tLnN0cmluZyg4KTtcblxuICB2YXIgaWZyYW1lVXJsID0gdXJsVXRpbHMuYWRkUGF0aChiYXNlVXJsLCAnL2lmcmFtZS5odG1sJykgKyAnIycgKyB0aGlzLndpbmRvd0lkO1xuICBkZWJ1Zyh0cmFuc3BvcnQsIHRyYW5zVXJsLCBpZnJhbWVVcmwpO1xuXG4gIHRoaXMuaWZyYW1lT2JqID0gaWZyYW1lVXRpbHMuY3JlYXRlSWZyYW1lKGlmcmFtZVVybCwgZnVuY3Rpb24ocikge1xuICAgIGRlYnVnKCdlcnIgY2FsbGJhY2snKTtcbiAgICBzZWxmLmVtaXQoJ2Nsb3NlJywgMTAwNiwgJ1VuYWJsZSB0byBsb2FkIGFuIGlmcmFtZSAoJyArIHIgKyAnKScpO1xuICAgIHNlbGYuY2xvc2UoKTtcbiAgfSk7XG5cbiAgdGhpcy5vbm1lc3NhZ2VDYWxsYmFjayA9IHRoaXMuX21lc3NhZ2UuYmluZCh0aGlzKTtcbiAgZXZlbnRVdGlscy5hdHRhY2hFdmVudCgnbWVzc2FnZScsIHRoaXMub25tZXNzYWdlQ2FsbGJhY2spO1xufVxuXG5pbmhlcml0cyhJZnJhbWVUcmFuc3BvcnQsIEV2ZW50RW1pdHRlcik7XG5cbklmcmFtZVRyYW5zcG9ydC5wcm90b3R5cGUuY2xvc2UgPSBmdW5jdGlvbigpIHtcbiAgZGVidWcoJ2Nsb3NlJyk7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIGlmICh0aGlzLmlmcmFtZU9iaikge1xuICAgIGV2ZW50VXRpbHMuZGV0YWNoRXZlbnQoJ21lc3NhZ2UnLCB0aGlzLm9ubWVzc2FnZUNhbGxiYWNrKTtcbiAgICB0cnkge1xuICAgICAgLy8gV2hlbiB0aGUgaWZyYW1lIGlzIG5vdCBsb2FkZWQsIElFIHJhaXNlcyBhbiBleGNlcHRpb25cbiAgICAgIC8vIG9uICdjb250ZW50V2luZG93Jy5cbiAgICAgIHRoaXMucG9zdE1lc3NhZ2UoJ2MnKTtcbiAgICB9IGNhdGNoICh4KSB7XG4gICAgICAvLyBpbnRlbnRpb25hbGx5IGVtcHR5XG4gICAgfVxuICAgIHRoaXMuaWZyYW1lT2JqLmNsZWFudXAoKTtcbiAgICB0aGlzLmlmcmFtZU9iaiA9IG51bGw7XG4gICAgdGhpcy5vbm1lc3NhZ2VDYWxsYmFjayA9IHRoaXMuaWZyYW1lT2JqID0gbnVsbDtcbiAgfVxufTtcblxuSWZyYW1lVHJhbnNwb3J0LnByb3RvdHlwZS5fbWVzc2FnZSA9IGZ1bmN0aW9uKGUpIHtcbiAgZGVidWcoJ21lc3NhZ2UnLCBlLmRhdGEpO1xuICBpZiAoIXVybFV0aWxzLmlzT3JpZ2luRXF1YWwoZS5vcmlnaW4sIHRoaXMub3JpZ2luKSkge1xuICAgIGRlYnVnKCdub3Qgc2FtZSBvcmlnaW4nLCBlLm9yaWdpbiwgdGhpcy5vcmlnaW4pO1xuICAgIHJldHVybjtcbiAgfVxuXG4gIHZhciBpZnJhbWVNZXNzYWdlO1xuICB0cnkge1xuICAgIGlmcmFtZU1lc3NhZ2UgPSBKU09OMy5wYXJzZShlLmRhdGEpO1xuICB9IGNhdGNoIChpZ25vcmVkKSB7XG4gICAgZGVidWcoJ2JhZCBqc29uJywgZS5kYXRhKTtcbiAgICByZXR1cm47XG4gIH1cblxuICBpZiAoaWZyYW1lTWVzc2FnZS53aW5kb3dJZCAhPT0gdGhpcy53aW5kb3dJZCkge1xuICAgIGRlYnVnKCdtaXNtYXRjaGVkIHdpbmRvdyBpZCcsIGlmcmFtZU1lc3NhZ2Uud2luZG93SWQsIHRoaXMud2luZG93SWQpO1xuICAgIHJldHVybjtcbiAgfVxuXG4gIHN3aXRjaCAoaWZyYW1lTWVzc2FnZS50eXBlKSB7XG4gIGNhc2UgJ3MnOlxuICAgIHRoaXMuaWZyYW1lT2JqLmxvYWRlZCgpO1xuICAgIC8vIHdpbmRvdyBnbG9iYWwgZGVwZW5kZW5jeVxuICAgIHRoaXMucG9zdE1lc3NhZ2UoJ3MnLCBKU09OMy5zdHJpbmdpZnkoW1xuICAgICAgdmVyc2lvblxuICAgICwgdGhpcy50cmFuc3BvcnRcbiAgICAsIHRoaXMudHJhbnNVcmxcbiAgICAsIHRoaXMuYmFzZVVybFxuICAgIF0pKTtcbiAgICBicmVhaztcbiAgY2FzZSAndCc6XG4gICAgdGhpcy5lbWl0KCdtZXNzYWdlJywgaWZyYW1lTWVzc2FnZS5kYXRhKTtcbiAgICBicmVhaztcbiAgY2FzZSAnYyc6XG4gICAgdmFyIGNkYXRhO1xuICAgIHRyeSB7XG4gICAgICBjZGF0YSA9IEpTT04zLnBhcnNlKGlmcmFtZU1lc3NhZ2UuZGF0YSk7XG4gICAgfSBjYXRjaCAoaWdub3JlZCkge1xuICAgICAgZGVidWcoJ2JhZCBqc29uJywgaWZyYW1lTWVzc2FnZS5kYXRhKTtcbiAgICAgIHJldHVybjtcbiAgICB9XG4gICAgdGhpcy5lbWl0KCdjbG9zZScsIGNkYXRhWzBdLCBjZGF0YVsxXSk7XG4gICAgdGhpcy5jbG9zZSgpO1xuICAgIGJyZWFrO1xuICB9XG59O1xuXG5JZnJhbWVUcmFuc3BvcnQucHJvdG90eXBlLnBvc3RNZXNzYWdlID0gZnVuY3Rpb24odHlwZSwgZGF0YSkge1xuICBkZWJ1ZygncG9zdE1lc3NhZ2UnLCB0eXBlLCBkYXRhKTtcbiAgdGhpcy5pZnJhbWVPYmoucG9zdChKU09OMy5zdHJpbmdpZnkoe1xuICAgIHdpbmRvd0lkOiB0aGlzLndpbmRvd0lkXG4gICwgdHlwZTogdHlwZVxuICAsIGRhdGE6IGRhdGEgfHwgJydcbiAgfSksIHRoaXMub3JpZ2luKTtcbn07XG5cbklmcmFtZVRyYW5zcG9ydC5wcm90b3R5cGUuc2VuZCA9IGZ1bmN0aW9uKG1lc3NhZ2UpIHtcbiAgZGVidWcoJ3NlbmQnLCBtZXNzYWdlKTtcbiAgdGhpcy5wb3N0TWVzc2FnZSgnbScsIG1lc3NhZ2UpO1xufTtcblxuSWZyYW1lVHJhbnNwb3J0LmVuYWJsZWQgPSBmdW5jdGlvbigpIHtcbiAgcmV0dXJuIGlmcmFtZVV0aWxzLmlmcmFtZUVuYWJsZWQ7XG59O1xuXG5JZnJhbWVUcmFuc3BvcnQudHJhbnNwb3J0TmFtZSA9ICdpZnJhbWUnO1xuSWZyYW1lVHJhbnNwb3J0LnJvdW5kVHJpcHMgPSAyO1xuXG5tb2R1bGUuZXhwb3J0cyA9IElmcmFtZVRyYW5zcG9ydDtcbiJdfQ==
+},{"../utils/event":46,"../utils/iframe":47,"../utils/random":50,"../utils/url":52,"../version":53,"debug":54,"events":3,"inherits":57,"json3":58}],23:[function(require,module,exports){
+(function (global){
+'use strict';
+
+// The simplest and most robust transport, using the well-know cross
+// domain hack - JSONP. This transport is quite inefficient - one
+// message could use up to one http request. But at least it works almost
+// everywhere.
+// Known limitations:
+//   o you will get a spinning cursor
+//   o for Konqueror a dumb timer is needed to detect errors
+
+var inherits = require('inherits')
+  , SenderReceiver = require('./lib/sender-receiver')
+  , JsonpReceiver = require('./receiver/jsonp')
+  , jsonpSender = require('./sender/jsonp')
+  ;
+
+function JsonPTransport(transUrl) {
+  if (!JsonPTransport.enabled()) {
+    throw new Error('Transport created when disabled');
+  }
+  SenderReceiver.call(this, transUrl, '/jsonp', jsonpSender, JsonpReceiver);
+}
+
+inherits(JsonPTransport, SenderReceiver);
+
+JsonPTransport.enabled = function() {
+  return !!global.document;
+};
+
+JsonPTransport.transportName = 'jsonp-polling';
+JsonPTransport.roundTrips = 1;
+JsonPTransport.needBody = true;
+
+module.exports = JsonPTransport;
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvanNvbnAtcG9sbGluZy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG4vLyBUaGUgc2ltcGxlc3QgYW5kIG1vc3Qgcm9idXN0IHRyYW5zcG9ydCwgdXNpbmcgdGhlIHdlbGwta25vdyBjcm9zc1xuLy8gZG9tYWluIGhhY2sgLSBKU09OUC4gVGhpcyB0cmFuc3BvcnQgaXMgcXVpdGUgaW5lZmZpY2llbnQgLSBvbmVcbi8vIG1lc3NhZ2UgY291bGQgdXNlIHVwIHRvIG9uZSBodHRwIHJlcXVlc3QuIEJ1dCBhdCBsZWFzdCBpdCB3b3JrcyBhbG1vc3Rcbi8vIGV2ZXJ5d2hlcmUuXG4vLyBLbm93biBsaW1pdGF0aW9uczpcbi8vICAgbyB5b3Ugd2lsbCBnZXQgYSBzcGlubmluZyBjdXJzb3Jcbi8vICAgbyBmb3IgS29ucXVlcm9yIGEgZHVtYiB0aW1lciBpcyBuZWVkZWQgdG8gZGV0ZWN0IGVycm9yc1xuXG52YXIgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgU2VuZGVyUmVjZWl2ZXIgPSByZXF1aXJlKCcuL2xpYi9zZW5kZXItcmVjZWl2ZXInKVxuICAsIEpzb25wUmVjZWl2ZXIgPSByZXF1aXJlKCcuL3JlY2VpdmVyL2pzb25wJylcbiAgLCBqc29ucFNlbmRlciA9IHJlcXVpcmUoJy4vc2VuZGVyL2pzb25wJylcbiAgO1xuXG5mdW5jdGlvbiBKc29uUFRyYW5zcG9ydCh0cmFuc1VybCkge1xuICBpZiAoIUpzb25QVHJhbnNwb3J0LmVuYWJsZWQoKSkge1xuICAgIHRocm93IG5ldyBFcnJvcignVHJhbnNwb3J0IGNyZWF0ZWQgd2hlbiBkaXNhYmxlZCcpO1xuICB9XG4gIFNlbmRlclJlY2VpdmVyLmNhbGwodGhpcywgdHJhbnNVcmwsICcvanNvbnAnLCBqc29ucFNlbmRlciwgSnNvbnBSZWNlaXZlcik7XG59XG5cbmluaGVyaXRzKEpzb25QVHJhbnNwb3J0LCBTZW5kZXJSZWNlaXZlcik7XG5cbkpzb25QVHJhbnNwb3J0LmVuYWJsZWQgPSBmdW5jdGlvbigpIHtcbiAgcmV0dXJuICEhZ2xvYmFsLmRvY3VtZW50O1xufTtcblxuSnNvblBUcmFuc3BvcnQudHJhbnNwb3J0TmFtZSA9ICdqc29ucC1wb2xsaW5nJztcbkpzb25QVHJhbnNwb3J0LnJvdW5kVHJpcHMgPSAxO1xuSnNvblBUcmFuc3BvcnQubmVlZEJvZHkgPSB0cnVlO1xuXG5tb2R1bGUuZXhwb3J0cyA9IEpzb25QVHJhbnNwb3J0O1xuIl19
+},{"./lib/sender-receiver":28,"./receiver/jsonp":31,"./sender/jsonp":33,"inherits":57}],24:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , urlUtils = require('../../utils/url')
+  , SenderReceiver = require('./sender-receiver')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:ajax-based');
+}
+
+function createAjaxSender(AjaxObject) {
+  return function(url, payload, callback) {
+    debug('create ajax sender', url, payload);
+    var opt = {};
+    if (typeof payload === 'string') {
+      opt.headers = {'Content-type': 'text/plain'};
+    }
+    var ajaxUrl = urlUtils.addPath(url, '/xhr_send');
+    var xo = new AjaxObject('POST', ajaxUrl, payload, opt);
+    xo.once('finish', function(status) {
+      debug('finish', status);
+      xo = null;
+
+      if (status !== 200 && status !== 204) {
+        return callback(new Error('http status ' + status));
+      }
+      callback();
+    });
+    return function() {
+      debug('abort');
+      xo.close();
+      xo = null;
+
+      var err = new Error('Aborted');
+      err.code = 1000;
+      callback(err);
+    };
+  };
+}
+
+function AjaxBasedTransport(transUrl, urlSuffix, Receiver, AjaxObject) {
+  SenderReceiver.call(this, transUrl, urlSuffix, createAjaxSender(AjaxObject), Receiver, AjaxObject);
+}
+
+inherits(AjaxBasedTransport, SenderReceiver);
+
+module.exports = AjaxBasedTransport;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL2FqYXgtYmFzZWQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvdXJsJylcbiAgLCBTZW5kZXJSZWNlaXZlciA9IHJlcXVpcmUoJy4vc2VuZGVyLXJlY2VpdmVyJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OmFqYXgtYmFzZWQnKTtcbn1cblxuZnVuY3Rpb24gY3JlYXRlQWpheFNlbmRlcihBamF4T2JqZWN0KSB7XG4gIHJldHVybiBmdW5jdGlvbih1cmwsIHBheWxvYWQsIGNhbGxiYWNrKSB7XG4gICAgZGVidWcoJ2NyZWF0ZSBhamF4IHNlbmRlcicsIHVybCwgcGF5bG9hZCk7XG4gICAgdmFyIG9wdCA9IHt9O1xuICAgIGlmICh0eXBlb2YgcGF5bG9hZCA9PT0gJ3N0cmluZycpIHtcbiAgICAgIG9wdC5oZWFkZXJzID0geydDb250ZW50LXR5cGUnOiAndGV4dC9wbGFpbid9O1xuICAgIH1cbiAgICB2YXIgYWpheFVybCA9IHVybFV0aWxzLmFkZFBhdGgodXJsLCAnL3hocl9zZW5kJyk7XG4gICAgdmFyIHhvID0gbmV3IEFqYXhPYmplY3QoJ1BPU1QnLCBhamF4VXJsLCBwYXlsb2FkLCBvcHQpO1xuICAgIHhvLm9uY2UoJ2ZpbmlzaCcsIGZ1bmN0aW9uKHN0YXR1cykge1xuICAgICAgZGVidWcoJ2ZpbmlzaCcsIHN0YXR1cyk7XG4gICAgICB4byA9IG51bGw7XG5cbiAgICAgIGlmIChzdGF0dXMgIT09IDIwMCAmJiBzdGF0dXMgIT09IDIwNCkge1xuICAgICAgICByZXR1cm4gY2FsbGJhY2sobmV3IEVycm9yKCdodHRwIHN0YXR1cyAnICsgc3RhdHVzKSk7XG4gICAgICB9XG4gICAgICBjYWxsYmFjaygpO1xuICAgIH0pO1xuICAgIHJldHVybiBmdW5jdGlvbigpIHtcbiAgICAgIGRlYnVnKCdhYm9ydCcpO1xuICAgICAgeG8uY2xvc2UoKTtcbiAgICAgIHhvID0gbnVsbDtcblxuICAgICAgdmFyIGVyciA9IG5ldyBFcnJvcignQWJvcnRlZCcpO1xuICAgICAgZXJyLmNvZGUgPSAxMDAwO1xuICAgICAgY2FsbGJhY2soZXJyKTtcbiAgICB9O1xuICB9O1xufVxuXG5mdW5jdGlvbiBBamF4QmFzZWRUcmFuc3BvcnQodHJhbnNVcmwsIHVybFN1ZmZpeCwgUmVjZWl2ZXIsIEFqYXhPYmplY3QpIHtcbiAgU2VuZGVyUmVjZWl2ZXIuY2FsbCh0aGlzLCB0cmFuc1VybCwgdXJsU3VmZml4LCBjcmVhdGVBamF4U2VuZGVyKEFqYXhPYmplY3QpLCBSZWNlaXZlciwgQWpheE9iamVjdCk7XG59XG5cbmluaGVyaXRzKEFqYXhCYXNlZFRyYW5zcG9ydCwgU2VuZGVyUmVjZWl2ZXIpO1xuXG5tb2R1bGUuZXhwb3J0cyA9IEFqYXhCYXNlZFRyYW5zcG9ydDtcbiJdfQ==
+},{"../../utils/url":52,"./sender-receiver":28,"debug":54,"inherits":57}],25:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:buffered-sender');
+}
+
+function BufferedSender(url, sender) {
+  debug(url);
+  EventEmitter.call(this);
+  this.sendBuffer = [];
+  this.sender = sender;
+  this.url = url;
+}
+
+inherits(BufferedSender, EventEmitter);
+
+BufferedSender.prototype.send = function(message) {
+  debug('send', message);
+  this.sendBuffer.push(message);
+  if (!this.sendStop) {
+    this.sendSchedule();
+  }
+};
+
+// For polling transports in a situation when in the message callback,
+// new message is being send. If the sending connection was started
+// before receiving one, it is possible to saturate the network and
+// timeout due to the lack of receiving socket. To avoid that we delay
+// sending messages by some small time, in order to let receiving
+// connection be started beforehand. This is only a halfmeasure and
+// does not fix the big problem, but it does make the tests go more
+// stable on slow networks.
+BufferedSender.prototype.sendScheduleWait = function() {
+  debug('sendScheduleWait');
+  var self = this;
+  var tref;
+  this.sendStop = function() {
+    debug('sendStop');
+    self.sendStop = null;
+    clearTimeout(tref);
+  };
+  tref = setTimeout(function() {
+    debug('timeout');
+    self.sendStop = null;
+    self.sendSchedule();
+  }, 25);
+};
+
+BufferedSender.prototype.sendSchedule = function() {
+  debug('sendSchedule', this.sendBuffer.length);
+  var self = this;
+  if (this.sendBuffer.length > 0) {
+    var payload = '[' + this.sendBuffer.join(',') + ']';
+    this.sendStop = this.sender(this.url, payload, function(err) {
+      self.sendStop = null;
+      if (err) {
+        debug('error', err);
+        self.emit('close', err.code || 1006, 'Sending error: ' + err);
+        self._cleanup();
+      } else {
+        self.sendScheduleWait();
+      }
+    });
+    this.sendBuffer = [];
+  }
+};
+
+BufferedSender.prototype._cleanup = function() {
+  debug('_cleanup');
+  this.removeAllListeners();
+};
+
+BufferedSender.prototype.stop = function() {
+  debug('stop');
+  this._cleanup();
+  if (this.sendStop) {
+    this.sendStop();
+    this.sendStop = null;
+  }
+};
+
+module.exports = BufferedSender;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL2J1ZmZlcmVkLXNlbmRlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6YnVmZmVyZWQtc2VuZGVyJyk7XG59XG5cbmZ1bmN0aW9uIEJ1ZmZlcmVkU2VuZGVyKHVybCwgc2VuZGVyKSB7XG4gIGRlYnVnKHVybCk7XG4gIEV2ZW50RW1pdHRlci5jYWxsKHRoaXMpO1xuICB0aGlzLnNlbmRCdWZmZXIgPSBbXTtcbiAgdGhpcy5zZW5kZXIgPSBzZW5kZXI7XG4gIHRoaXMudXJsID0gdXJsO1xufVxuXG5pbmhlcml0cyhCdWZmZXJlZFNlbmRlciwgRXZlbnRFbWl0dGVyKTtcblxuQnVmZmVyZWRTZW5kZXIucHJvdG90eXBlLnNlbmQgPSBmdW5jdGlvbihtZXNzYWdlKSB7XG4gIGRlYnVnKCdzZW5kJywgbWVzc2FnZSk7XG4gIHRoaXMuc2VuZEJ1ZmZlci5wdXNoKG1lc3NhZ2UpO1xuICBpZiAoIXRoaXMuc2VuZFN0b3ApIHtcbiAgICB0aGlzLnNlbmRTY2hlZHVsZSgpO1xuICB9XG59O1xuXG4vLyBGb3IgcG9sbGluZyB0cmFuc3BvcnRzIGluIGEgc2l0dWF0aW9uIHdoZW4gaW4gdGhlIG1lc3NhZ2UgY2FsbGJhY2ssXG4vLyBuZXcgbWVzc2FnZSBpcyBiZWluZyBzZW5kLiBJZiB0aGUgc2VuZGluZyBjb25uZWN0aW9uIHdhcyBzdGFydGVkXG4vLyBiZWZvcmUgcmVjZWl2aW5nIG9uZSwgaXQgaXMgcG9zc2libGUgdG8gc2F0dXJhdGUgdGhlIG5ldHdvcmsgYW5kXG4vLyB0aW1lb3V0IGR1ZSB0byB0aGUgbGFjayBvZiByZWNlaXZpbmcgc29ja2V0LiBUbyBhdm9pZCB0aGF0IHdlIGRlbGF5XG4vLyBzZW5kaW5nIG1lc3NhZ2VzIGJ5IHNvbWUgc21hbGwgdGltZSwgaW4gb3JkZXIgdG8gbGV0IHJlY2VpdmluZ1xuLy8gY29ubmVjdGlvbiBiZSBzdGFydGVkIGJlZm9yZWhhbmQuIFRoaXMgaXMgb25seSBhIGhhbGZtZWFzdXJlIGFuZFxuLy8gZG9lcyBub3QgZml4IHRoZSBiaWcgcHJvYmxlbSwgYnV0IGl0IGRvZXMgbWFrZSB0aGUgdGVzdHMgZ28gbW9yZVxuLy8gc3RhYmxlIG9uIHNsb3cgbmV0d29ya3MuXG5CdWZmZXJlZFNlbmRlci5wcm90b3R5cGUuc2VuZFNjaGVkdWxlV2FpdCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1Zygnc2VuZFNjaGVkdWxlV2FpdCcpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB0cmVmO1xuICB0aGlzLnNlbmRTdG9wID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ3NlbmRTdG9wJyk7XG4gICAgc2VsZi5zZW5kU3RvcCA9IG51bGw7XG4gICAgY2xlYXJUaW1lb3V0KHRyZWYpO1xuICB9O1xuICB0cmVmID0gc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICBkZWJ1ZygndGltZW91dCcpO1xuICAgIHNlbGYuc2VuZFN0b3AgPSBudWxsO1xuICAgIHNlbGYuc2VuZFNjaGVkdWxlKCk7XG4gIH0sIDI1KTtcbn07XG5cbkJ1ZmZlcmVkU2VuZGVyLnByb3RvdHlwZS5zZW5kU2NoZWR1bGUgPSBmdW5jdGlvbigpIHtcbiAgZGVidWcoJ3NlbmRTY2hlZHVsZScsIHRoaXMuc2VuZEJ1ZmZlci5sZW5ndGgpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIGlmICh0aGlzLnNlbmRCdWZmZXIubGVuZ3RoID4gMCkge1xuICAgIHZhciBwYXlsb2FkID0gJ1snICsgdGhpcy5zZW5kQnVmZmVyLmpvaW4oJywnKSArICddJztcbiAgICB0aGlzLnNlbmRTdG9wID0gdGhpcy5zZW5kZXIodGhpcy51cmwsIHBheWxvYWQsIGZ1bmN0aW9uKGVycikge1xuICAgICAgc2VsZi5zZW5kU3RvcCA9IG51bGw7XG4gICAgICBpZiAoZXJyKSB7XG4gICAgICAgIGRlYnVnKCdlcnJvcicsIGVycik7XG4gICAgICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBlcnIuY29kZSB8fCAxMDA2LCAnU2VuZGluZyBlcnJvcjogJyArIGVycik7XG4gICAgICAgIHNlbGYuX2NsZWFudXAoKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHNlbGYuc2VuZFNjaGVkdWxlV2FpdCgpO1xuICAgICAgfVxuICAgIH0pO1xuICAgIHRoaXMuc2VuZEJ1ZmZlciA9IFtdO1xuICB9XG59O1xuXG5CdWZmZXJlZFNlbmRlci5wcm90b3R5cGUuX2NsZWFudXAgPSBmdW5jdGlvbigpIHtcbiAgZGVidWcoJ19jbGVhbnVwJyk7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG59O1xuXG5CdWZmZXJlZFNlbmRlci5wcm90b3R5cGUuc3RvcCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1Zygnc3RvcCcpO1xuICB0aGlzLl9jbGVhbnVwKCk7XG4gIGlmICh0aGlzLnNlbmRTdG9wKSB7XG4gICAgdGhpcy5zZW5kU3RvcCgpO1xuICAgIHRoaXMuc2VuZFN0b3AgPSBudWxsO1xuICB9XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IEJ1ZmZlcmVkU2VuZGVyO1xuIl19
+},{"debug":54,"events":3,"inherits":57}],26:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var inherits = require('inherits')
+  , IframeTransport = require('../iframe')
+  , objectUtils = require('../../utils/object')
+  ;
+
+module.exports = function(transport) {
+
+  function IframeWrapTransport(transUrl, baseUrl) {
+    IframeTransport.call(this, transport.transportName, transUrl, baseUrl);
+  }
+
+  inherits(IframeWrapTransport, IframeTransport);
+
+  IframeWrapTransport.enabled = function(url, info) {
+    if (!global.document) {
+      return false;
+    }
+
+    var iframeInfo = objectUtils.extend({}, info);
+    iframeInfo.sameOrigin = true;
+    return transport.enabled(iframeInfo) && IframeTransport.enabled();
+  };
+
+  IframeWrapTransport.transportName = 'iframe-' + transport.transportName;
+  IframeWrapTransport.needBody = true;
+  IframeWrapTransport.roundTrips = IframeTransport.roundTrips + transport.roundTrips - 1; // html, javascript (2) + transport - no CORS (1)
+
+  IframeWrapTransport.facadeTransport = transport;
+
+  return IframeWrapTransport;
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL2lmcmFtZS13cmFwLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgSWZyYW1lVHJhbnNwb3J0ID0gcmVxdWlyZSgnLi4vaWZyYW1lJylcbiAgLCBvYmplY3RVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL29iamVjdCcpXG4gIDtcblxubW9kdWxlLmV4cG9ydHMgPSBmdW5jdGlvbih0cmFuc3BvcnQpIHtcblxuICBmdW5jdGlvbiBJZnJhbWVXcmFwVHJhbnNwb3J0KHRyYW5zVXJsLCBiYXNlVXJsKSB7XG4gICAgSWZyYW1lVHJhbnNwb3J0LmNhbGwodGhpcywgdHJhbnNwb3J0LnRyYW5zcG9ydE5hbWUsIHRyYW5zVXJsLCBiYXNlVXJsKTtcbiAgfVxuXG4gIGluaGVyaXRzKElmcmFtZVdyYXBUcmFuc3BvcnQsIElmcmFtZVRyYW5zcG9ydCk7XG5cbiAgSWZyYW1lV3JhcFRyYW5zcG9ydC5lbmFibGVkID0gZnVuY3Rpb24odXJsLCBpbmZvKSB7XG4gICAgaWYgKCFnbG9iYWwuZG9jdW1lbnQpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG5cbiAgICB2YXIgaWZyYW1lSW5mbyA9IG9iamVjdFV0aWxzLmV4dGVuZCh7fSwgaW5mbyk7XG4gICAgaWZyYW1lSW5mby5zYW1lT3JpZ2luID0gdHJ1ZTtcbiAgICByZXR1cm4gdHJhbnNwb3J0LmVuYWJsZWQoaWZyYW1lSW5mbykgJiYgSWZyYW1lVHJhbnNwb3J0LmVuYWJsZWQoKTtcbiAgfTtcblxuICBJZnJhbWVXcmFwVHJhbnNwb3J0LnRyYW5zcG9ydE5hbWUgPSAnaWZyYW1lLScgKyB0cmFuc3BvcnQudHJhbnNwb3J0TmFtZTtcbiAgSWZyYW1lV3JhcFRyYW5zcG9ydC5uZWVkQm9keSA9IHRydWU7XG4gIElmcmFtZVdyYXBUcmFuc3BvcnQucm91bmRUcmlwcyA9IElmcmFtZVRyYW5zcG9ydC5yb3VuZFRyaXBzICsgdHJhbnNwb3J0LnJvdW5kVHJpcHMgLSAxOyAvLyBodG1sLCBqYXZhc2NyaXB0ICgyKSArIHRyYW5zcG9ydCAtIG5vIENPUlMgKDEpXG5cbiAgSWZyYW1lV3JhcFRyYW5zcG9ydC5mYWNhZGVUcmFuc3BvcnQgPSB0cmFuc3BvcnQ7XG5cbiAgcmV0dXJuIElmcmFtZVdyYXBUcmFuc3BvcnQ7XG59O1xuIl19
+},{"../../utils/object":49,"../iframe":22,"inherits":57}],27:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:polling');
+}
+
+function Polling(Receiver, receiveUrl, AjaxObject) {
+  debug(receiveUrl);
+  EventEmitter.call(this);
+  this.Receiver = Receiver;
+  this.receiveUrl = receiveUrl;
+  this.AjaxObject = AjaxObject;
+  this._scheduleReceiver();
+}
+
+inherits(Polling, EventEmitter);
+
+Polling.prototype._scheduleReceiver = function() {
+  debug('_scheduleReceiver');
+  var self = this;
+  var poll = this.poll = new this.Receiver(this.receiveUrl, this.AjaxObject);
+
+  poll.on('message', function(msg) {
+    debug('message', msg);
+    self.emit('message', msg);
+  });
+
+  poll.once('close', function(code, reason) {
+    debug('close', code, reason, self.pollIsClosing);
+    self.poll = poll = null;
+
+    if (!self.pollIsClosing) {
+      if (reason === 'network') {
+        self._scheduleReceiver();
+      } else {
+        self.emit('close', code || 1006, reason);
+        self.removeAllListeners();
+      }
+    }
+  });
+};
+
+Polling.prototype.abort = function() {
+  debug('abort');
+  this.removeAllListeners();
+  this.pollIsClosing = true;
+  if (this.poll) {
+    this.poll.abort();
+  }
+};
+
+module.exports = Polling;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL3BvbGxpbmcuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnBvbGxpbmcnKTtcbn1cblxuZnVuY3Rpb24gUG9sbGluZyhSZWNlaXZlciwgcmVjZWl2ZVVybCwgQWpheE9iamVjdCkge1xuICBkZWJ1ZyhyZWNlaXZlVXJsKTtcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG4gIHRoaXMuUmVjZWl2ZXIgPSBSZWNlaXZlcjtcbiAgdGhpcy5yZWNlaXZlVXJsID0gcmVjZWl2ZVVybDtcbiAgdGhpcy5BamF4T2JqZWN0ID0gQWpheE9iamVjdDtcbiAgdGhpcy5fc2NoZWR1bGVSZWNlaXZlcigpO1xufVxuXG5pbmhlcml0cyhQb2xsaW5nLCBFdmVudEVtaXR0ZXIpO1xuXG5Qb2xsaW5nLnByb3RvdHlwZS5fc2NoZWR1bGVSZWNlaXZlciA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnX3NjaGVkdWxlUmVjZWl2ZXInKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICB2YXIgcG9sbCA9IHRoaXMucG9sbCA9IG5ldyB0aGlzLlJlY2VpdmVyKHRoaXMucmVjZWl2ZVVybCwgdGhpcy5BamF4T2JqZWN0KTtcblxuICBwb2xsLm9uKCdtZXNzYWdlJywgZnVuY3Rpb24obXNnKSB7XG4gICAgZGVidWcoJ21lc3NhZ2UnLCBtc2cpO1xuICAgIHNlbGYuZW1pdCgnbWVzc2FnZScsIG1zZyk7XG4gIH0pO1xuXG4gIHBvbGwub25jZSgnY2xvc2UnLCBmdW5jdGlvbihjb2RlLCByZWFzb24pIHtcbiAgICBkZWJ1ZygnY2xvc2UnLCBjb2RlLCByZWFzb24sIHNlbGYucG9sbElzQ2xvc2luZyk7XG4gICAgc2VsZi5wb2xsID0gcG9sbCA9IG51bGw7XG5cbiAgICBpZiAoIXNlbGYucG9sbElzQ2xvc2luZykge1xuICAgICAgaWYgKHJlYXNvbiA9PT0gJ25ldHdvcmsnKSB7XG4gICAgICAgIHNlbGYuX3NjaGVkdWxlUmVjZWl2ZXIoKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBjb2RlIHx8IDEwMDYsIHJlYXNvbik7XG4gICAgICAgIHNlbGYucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gICAgICB9XG4gICAgfVxuICB9KTtcbn07XG5cblBvbGxpbmcucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICB0aGlzLnJlbW92ZUFsbExpc3RlbmVycygpO1xuICB0aGlzLnBvbGxJc0Nsb3NpbmcgPSB0cnVlO1xuICBpZiAodGhpcy5wb2xsKSB7XG4gICAgdGhpcy5wb2xsLmFib3J0KCk7XG4gIH1cbn07XG5cbm1vZHVsZS5leHBvcnRzID0gUG9sbGluZztcbiJdfQ==
+},{"debug":54,"events":3,"inherits":57}],28:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , urlUtils = require('../../utils/url')
+  , BufferedSender = require('./buffered-sender')
+  , Polling = require('./polling')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:sender-receiver');
+}
+
+function SenderReceiver(transUrl, urlSuffix, senderFunc, Receiver, AjaxObject) {
+  var pollUrl = urlUtils.addPath(transUrl, urlSuffix);
+  debug(pollUrl);
+  var self = this;
+  BufferedSender.call(this, transUrl, senderFunc);
+
+  this.poll = new Polling(Receiver, pollUrl, AjaxObject);
+  this.poll.on('message', function(msg) {
+    debug('poll message', msg);
+    self.emit('message', msg);
+  });
+  this.poll.once('close', function(code, reason) {
+    debug('poll close', code, reason);
+    self.poll = null;
+    self.emit('close', code, reason);
+    self.close();
+  });
+}
+
+inherits(SenderReceiver, BufferedSender);
+
+SenderReceiver.prototype.close = function() {
+  debug('close');
+  this.removeAllListeners();
+  if (this.poll) {
+    this.poll.abort();
+    this.poll = null;
+  }
+  this.stop();
+};
+
+module.exports = SenderReceiver;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL3NlbmRlci1yZWNlaXZlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvdXJsJylcbiAgLCBCdWZmZXJlZFNlbmRlciA9IHJlcXVpcmUoJy4vYnVmZmVyZWQtc2VuZGVyJylcbiAgLCBQb2xsaW5nID0gcmVxdWlyZSgnLi9wb2xsaW5nJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnNlbmRlci1yZWNlaXZlcicpO1xufVxuXG5mdW5jdGlvbiBTZW5kZXJSZWNlaXZlcih0cmFuc1VybCwgdXJsU3VmZml4LCBzZW5kZXJGdW5jLCBSZWNlaXZlciwgQWpheE9iamVjdCkge1xuICB2YXIgcG9sbFVybCA9IHVybFV0aWxzLmFkZFBhdGgodHJhbnNVcmwsIHVybFN1ZmZpeCk7XG4gIGRlYnVnKHBvbGxVcmwpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIEJ1ZmZlcmVkU2VuZGVyLmNhbGwodGhpcywgdHJhbnNVcmwsIHNlbmRlckZ1bmMpO1xuXG4gIHRoaXMucG9sbCA9IG5ldyBQb2xsaW5nKFJlY2VpdmVyLCBwb2xsVXJsLCBBamF4T2JqZWN0KTtcbiAgdGhpcy5wb2xsLm9uKCdtZXNzYWdlJywgZnVuY3Rpb24obXNnKSB7XG4gICAgZGVidWcoJ3BvbGwgbWVzc2FnZScsIG1zZyk7XG4gICAgc2VsZi5lbWl0KCdtZXNzYWdlJywgbXNnKTtcbiAgfSk7XG4gIHRoaXMucG9sbC5vbmNlKCdjbG9zZScsIGZ1bmN0aW9uKGNvZGUsIHJlYXNvbikge1xuICAgIGRlYnVnKCdwb2xsIGNsb3NlJywgY29kZSwgcmVhc29uKTtcbiAgICBzZWxmLnBvbGwgPSBudWxsO1xuICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBjb2RlLCByZWFzb24pO1xuICAgIHNlbGYuY2xvc2UoKTtcbiAgfSk7XG59XG5cbmluaGVyaXRzKFNlbmRlclJlY2VpdmVyLCBCdWZmZXJlZFNlbmRlcik7XG5cblNlbmRlclJlY2VpdmVyLnByb3RvdHlwZS5jbG9zZSA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xvc2UnKTtcbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbiAgaWYgKHRoaXMucG9sbCkge1xuICAgIHRoaXMucG9sbC5hYm9ydCgpO1xuICAgIHRoaXMucG9sbCA9IG51bGw7XG4gIH1cbiAgdGhpcy5zdG9wKCk7XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IFNlbmRlclJlY2VpdmVyO1xuIl19
+},{"../../utils/url":52,"./buffered-sender":25,"./polling":27,"debug":54,"inherits":57}],29:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  , EventSourceDriver = require('eventsource')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:receiver:eventsource');
+}
+
+function EventSourceReceiver(url) {
+  debug(url);
+  EventEmitter.call(this);
+
+  var self = this;
+  var es = this.es = new EventSourceDriver(url);
+  es.onmessage = function(e) {
+    debug('message', e.data);
+    self.emit('message', decodeURI(e.data));
+  };
+  es.onerror = function(e) {
+    debug('error', es.readyState, e);
+    // ES on reconnection has readyState = 0 or 1.
+    // on network error it's CLOSED = 2
+    var reason = (es.readyState !== 2 ? 'network' : 'permanent');
+    self._cleanup();
+    self._close(reason);
+  };
+}
+
+inherits(EventSourceReceiver, EventEmitter);
+
+EventSourceReceiver.prototype.abort = function() {
+  debug('abort');
+  this._cleanup();
+  this._close('user');
+};
+
+EventSourceReceiver.prototype._cleanup = function() {
+  debug('cleanup');
+  var es = this.es;
+  if (es) {
+    es.onmessage = es.onerror = null;
+    es.close();
+    this.es = null;
+  }
+};
+
+EventSourceReceiver.prototype._close = function(reason) {
+  debug('close', reason);
+  var self = this;
+  // Safari and chrome < 15 crash if we close window before
+  // waiting for ES cleanup. See:
+  // https://code.google.com/p/chromium/issues/detail?id=89155
+  setTimeout(function() {
+    self.emit('close', null, reason);
+    self.removeAllListeners();
+  }, 200);
+};
+
+module.exports = EventSourceReceiver;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvcmVjZWl2ZXIvZXZlbnRzb3VyY2UuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgLCBFdmVudFNvdXJjZURyaXZlciA9IHJlcXVpcmUoJ2V2ZW50c291cmNlJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnJlY2VpdmVyOmV2ZW50c291cmNlJyk7XG59XG5cbmZ1bmN0aW9uIEV2ZW50U291cmNlUmVjZWl2ZXIodXJsKSB7XG4gIGRlYnVnKHVybCk7XG4gIEV2ZW50RW1pdHRlci5jYWxsKHRoaXMpO1xuXG4gIHZhciBzZWxmID0gdGhpcztcbiAgdmFyIGVzID0gdGhpcy5lcyA9IG5ldyBFdmVudFNvdXJjZURyaXZlcih1cmwpO1xuICBlcy5vbm1lc3NhZ2UgPSBmdW5jdGlvbihlKSB7XG4gICAgZGVidWcoJ21lc3NhZ2UnLCBlLmRhdGEpO1xuICAgIHNlbGYuZW1pdCgnbWVzc2FnZScsIGRlY29kZVVSSShlLmRhdGEpKTtcbiAgfTtcbiAgZXMub25lcnJvciA9IGZ1bmN0aW9uKGUpIHtcbiAgICBkZWJ1ZygnZXJyb3InLCBlcy5yZWFkeVN0YXRlLCBlKTtcbiAgICAvLyBFUyBvbiByZWNvbm5lY3Rpb24gaGFzIHJlYWR5U3RhdGUgPSAwIG9yIDEuXG4gICAgLy8gb24gbmV0d29yayBlcnJvciBpdCdzIENMT1NFRCA9IDJcbiAgICB2YXIgcmVhc29uID0gKGVzLnJlYWR5U3RhdGUgIT09IDIgPyAnbmV0d29yaycgOiAncGVybWFuZW50Jyk7XG4gICAgc2VsZi5fY2xlYW51cCgpO1xuICAgIHNlbGYuX2Nsb3NlKHJlYXNvbik7XG4gIH07XG59XG5cbmluaGVyaXRzKEV2ZW50U291cmNlUmVjZWl2ZXIsIEV2ZW50RW1pdHRlcik7XG5cbkV2ZW50U291cmNlUmVjZWl2ZXIucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICB0aGlzLl9jbGVhbnVwKCk7XG4gIHRoaXMuX2Nsb3NlKCd1c2VyJyk7XG59O1xuXG5FdmVudFNvdXJjZVJlY2VpdmVyLnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xlYW51cCcpO1xuICB2YXIgZXMgPSB0aGlzLmVzO1xuICBpZiAoZXMpIHtcbiAgICBlcy5vbm1lc3NhZ2UgPSBlcy5vbmVycm9yID0gbnVsbDtcbiAgICBlcy5jbG9zZSgpO1xuICAgIHRoaXMuZXMgPSBudWxsO1xuICB9XG59O1xuXG5FdmVudFNvdXJjZVJlY2VpdmVyLnByb3RvdHlwZS5fY2xvc2UgPSBmdW5jdGlvbihyZWFzb24pIHtcbiAgZGVidWcoJ2Nsb3NlJywgcmVhc29uKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICAvLyBTYWZhcmkgYW5kIGNocm9tZSA8IDE1IGNyYXNoIGlmIHdlIGNsb3NlIHdpbmRvdyBiZWZvcmVcbiAgLy8gd2FpdGluZyBmb3IgRVMgY2xlYW51cC4gU2VlOlxuICAvLyBodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9ODkxNTVcbiAgc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICBzZWxmLmVtaXQoJ2Nsb3NlJywgbnVsbCwgcmVhc29uKTtcbiAgICBzZWxmLnJlbW92ZUFsbExpc3RlbmVycygpO1xuICB9LCAyMDApO1xufTtcblxubW9kdWxlLmV4cG9ydHMgPSBFdmVudFNvdXJjZVJlY2VpdmVyO1xuIl19
+},{"debug":54,"events":3,"eventsource":18,"inherits":57}],30:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var inherits = require('inherits')
+  , iframeUtils = require('../../utils/iframe')
+  , urlUtils = require('../../utils/url')
+  , EventEmitter = require('events').EventEmitter
+  , random = require('../../utils/random')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:receiver:htmlfile');
+}
+
+function HtmlfileReceiver(url) {
+  debug(url);
+  EventEmitter.call(this);
+  var self = this;
+  iframeUtils.polluteGlobalNamespace();
+
+  this.id = 'a' + random.string(6);
+  url = urlUtils.addQuery(url, 'c=' + decodeURIComponent(iframeUtils.WPrefix + '.' + this.id));
+
+  debug('using htmlfile', HtmlfileReceiver.htmlfileEnabled);
+  var constructFunc = HtmlfileReceiver.htmlfileEnabled ?
+      iframeUtils.createHtmlfile : iframeUtils.createIframe;
+
+  global[iframeUtils.WPrefix][this.id] = {
+    start: function() {
+      debug('start');
+      self.iframeObj.loaded();
+    }
+  , message: function(data) {
+      debug('message', data);
+      self.emit('message', data);
+    }
+  , stop: function() {
+      debug('stop');
+      self._cleanup();
+      self._close('network');
+    }
+  };
+  this.iframeObj = constructFunc(url, function() {
+    debug('callback');
+    self._cleanup();
+    self._close('permanent');
+  });
+}
+
+inherits(HtmlfileReceiver, EventEmitter);
+
+HtmlfileReceiver.prototype.abort = function() {
+  debug('abort');
+  this._cleanup();
+  this._close('user');
+};
+
+HtmlfileReceiver.prototype._cleanup = function() {
+  debug('_cleanup');
+  if (this.iframeObj) {
+    this.iframeObj.cleanup();
+    this.iframeObj = null;
+  }
+  delete global[iframeUtils.WPrefix][this.id];
+};
+
+HtmlfileReceiver.prototype._close = function(reason) {
+  debug('_close', reason);
+  this.emit('close', null, reason);
+  this.removeAllListeners();
+};
+
+HtmlfileReceiver.htmlfileEnabled = false;
+
+// obfuscate to avoid firewalls
+var axo = ['Active'].concat('Object').join('X');
+if (axo in global) {
+  try {
+    HtmlfileReceiver.htmlfileEnabled = !!new global[axo]('htmlfile');
+  } catch (x) {
+    // intentionally empty
+  }
+}
+
+HtmlfileReceiver.enabled = HtmlfileReceiver.htmlfileEnabled || iframeUtils.iframeEnabled;
+
+module.exports = HtmlfileReceiver;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvcmVjZWl2ZXIvaHRtbGZpbGUuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBpZnJhbWVVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL2lmcmFtZScpXG4gICwgdXJsVXRpbHMgPSByZXF1aXJlKCcuLi8uLi91dGlscy91cmwnKVxuICAsIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIHJhbmRvbSA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL3JhbmRvbScpXG4gIDtcblxudmFyIGRlYnVnID0gZnVuY3Rpb24oKSB7fTtcbmlmIChwcm9jZXNzLmVudi5OT0RFX0VOViAhPT0gJ3Byb2R1Y3Rpb24nKSB7XG4gIGRlYnVnID0gcmVxdWlyZSgnZGVidWcnKSgnc29ja2pzLWNsaWVudDpyZWNlaXZlcjpodG1sZmlsZScpO1xufVxuXG5mdW5jdGlvbiBIdG1sZmlsZVJlY2VpdmVyKHVybCkge1xuICBkZWJ1Zyh1cmwpO1xuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICBpZnJhbWVVdGlscy5wb2xsdXRlR2xvYmFsTmFtZXNwYWNlKCk7XG5cbiAgdGhpcy5pZCA9ICdhJyArIHJhbmRvbS5zdHJpbmcoNik7XG4gIHVybCA9IHVybFV0aWxzLmFkZFF1ZXJ5KHVybCwgJ2M9JyArIGRlY29kZVVSSUNvbXBvbmVudChpZnJhbWVVdGlscy5XUHJlZml4ICsgJy4nICsgdGhpcy5pZCkpO1xuXG4gIGRlYnVnKCd1c2luZyBodG1sZmlsZScsIEh0bWxmaWxlUmVjZWl2ZXIuaHRtbGZpbGVFbmFibGVkKTtcbiAgdmFyIGNvbnN0cnVjdEZ1bmMgPSBIdG1sZmlsZVJlY2VpdmVyLmh0bWxmaWxlRW5hYmxlZCA/XG4gICAgICBpZnJhbWVVdGlscy5jcmVhdGVIdG1sZmlsZSA6IGlmcmFtZVV0aWxzLmNyZWF0ZUlmcmFtZTtcblxuICBnbG9iYWxbaWZyYW1lVXRpbHMuV1ByZWZpeF1bdGhpcy5pZF0gPSB7XG4gICAgc3RhcnQ6IGZ1bmN0aW9uKCkge1xuICAgICAgZGVidWcoJ3N0YXJ0Jyk7XG4gICAgICBzZWxmLmlmcmFtZU9iai5sb2FkZWQoKTtcbiAgICB9XG4gICwgbWVzc2FnZTogZnVuY3Rpb24oZGF0YSkge1xuICAgICAgZGVidWcoJ21lc3NhZ2UnLCBkYXRhKTtcbiAgICAgIHNlbGYuZW1pdCgnbWVzc2FnZScsIGRhdGEpO1xuICAgIH1cbiAgLCBzdG9wOiBmdW5jdGlvbigpIHtcbiAgICAgIGRlYnVnKCdzdG9wJyk7XG4gICAgICBzZWxmLl9jbGVhbnVwKCk7XG4gICAgICBzZWxmLl9jbG9zZSgnbmV0d29yaycpO1xuICAgIH1cbiAgfTtcbiAgdGhpcy5pZnJhbWVPYmogPSBjb25zdHJ1Y3RGdW5jKHVybCwgZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ2NhbGxiYWNrJyk7XG4gICAgc2VsZi5fY2xlYW51cCgpO1xuICAgIHNlbGYuX2Nsb3NlKCdwZXJtYW5lbnQnKTtcbiAgfSk7XG59XG5cbmluaGVyaXRzKEh0bWxmaWxlUmVjZWl2ZXIsIEV2ZW50RW1pdHRlcik7XG5cbkh0bWxmaWxlUmVjZWl2ZXIucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICB0aGlzLl9jbGVhbnVwKCk7XG4gIHRoaXMuX2Nsb3NlKCd1c2VyJyk7XG59O1xuXG5IdG1sZmlsZVJlY2VpdmVyLnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnX2NsZWFudXAnKTtcbiAgaWYgKHRoaXMuaWZyYW1lT2JqKSB7XG4gICAgdGhpcy5pZnJhbWVPYmouY2xlYW51cCgpO1xuICAgIHRoaXMuaWZyYW1lT2JqID0gbnVsbDtcbiAgfVxuICBkZWxldGUgZ2xvYmFsW2lmcmFtZVV0aWxzLldQcmVmaXhdW3RoaXMuaWRdO1xufTtcblxuSHRtbGZpbGVSZWNlaXZlci5wcm90b3R5cGUuX2Nsb3NlID0gZnVuY3Rpb24ocmVhc29uKSB7XG4gIGRlYnVnKCdfY2xvc2UnLCByZWFzb24pO1xuICB0aGlzLmVtaXQoJ2Nsb3NlJywgbnVsbCwgcmVhc29uKTtcbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbn07XG5cbkh0bWxmaWxlUmVjZWl2ZXIuaHRtbGZpbGVFbmFibGVkID0gZmFsc2U7XG5cbi8vIG9iZnVzY2F0ZSB0byBhdm9pZCBmaXJld2FsbHNcbnZhciBheG8gPSBbJ0FjdGl2ZSddLmNvbmNhdCgnT2JqZWN0Jykuam9pbignWCcpO1xuaWYgKGF4byBpbiBnbG9iYWwpIHtcbiAgdHJ5IHtcbiAgICBIdG1sZmlsZVJlY2VpdmVyLmh0bWxmaWxlRW5hYmxlZCA9ICEhbmV3IGdsb2JhbFtheG9dKCdodG1sZmlsZScpO1xuICB9IGNhdGNoICh4KSB7XG4gICAgLy8gaW50ZW50aW9uYWxseSBlbXB0eVxuICB9XG59XG5cbkh0bWxmaWxlUmVjZWl2ZXIuZW5hYmxlZCA9IEh0bWxmaWxlUmVjZWl2ZXIuaHRtbGZpbGVFbmFibGVkIHx8IGlmcmFtZVV0aWxzLmlmcmFtZUVuYWJsZWQ7XG5cbm1vZHVsZS5leHBvcnRzID0gSHRtbGZpbGVSZWNlaXZlcjtcbiJdfQ==
+},{"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,"debug":54,"events":3,"inherits":57}],31:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var utils = require('../../utils/iframe')
+  , random = require('../../utils/random')
+  , browser = require('../../utils/browser')
+  , urlUtils = require('../../utils/url')
+  , inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:receiver:jsonp');
+}
+
+function JsonpReceiver(url) {
+  debug(url);
+  var self = this;
+  EventEmitter.call(this);
+
+  utils.polluteGlobalNamespace();
+
+  this.id = 'a' + random.string(6);
+  var urlWithId = urlUtils.addQuery(url, 'c=' + encodeURIComponent(utils.WPrefix + '.' + this.id));
+
+  global[utils.WPrefix][this.id] = this._callback.bind(this);
+  this._createScript(urlWithId);
+
+  // Fallback mostly for Konqueror - stupid timer, 35 seconds shall be plenty.
+  this.timeoutId = setTimeout(function() {
+    debug('timeout');
+    self._abort(new Error('JSONP script loaded abnormally (timeout)'));
+  }, JsonpReceiver.timeout);
+}
+
+inherits(JsonpReceiver, EventEmitter);
+
+JsonpReceiver.prototype.abort = function() {
+  debug('abort');
+  if (global[utils.WPrefix][this.id]) {
+    var err = new Error('JSONP user aborted read');
+    err.code = 1000;
+    this._abort(err);
+  }
+};
+
+JsonpReceiver.timeout = 35000;
+JsonpReceiver.scriptErrorTimeout = 1000;
+
+JsonpReceiver.prototype._callback = function(data) {
+  debug('_callback', data);
+  this._cleanup();
+
+  if (this.aborting) {
+    return;
+  }
+
+  if (data) {
+    debug('message', data);
+    this.emit('message', data);
+  }
+  this.emit('close', null, 'network');
+  this.removeAllListeners();
+};
+
+JsonpReceiver.prototype._abort = function(err) {
+  debug('_abort', err);
+  this._cleanup();
+  this.aborting = true;
+  this.emit('close', err.code, err.message);
+  this.removeAllListeners();
+};
+
+JsonpReceiver.prototype._cleanup = function() {
+  debug('_cleanup');
+  clearTimeout(this.timeoutId);
+  if (this.script2) {
+    this.script2.parentNode.removeChild(this.script2);
+    this.script2 = null;
+  }
+  if (this.script) {
+    var script = this.script;
+    // Unfortunately, you can't really abort script loading of
+    // the script.
+    script.parentNode.removeChild(script);
+    script.onreadystatechange = script.onerror =
+        script.onload = script.onclick = null;
+    this.script = null;
+  }
+  delete global[utils.WPrefix][this.id];
+};
+
+JsonpReceiver.prototype._scriptError = function() {
+  debug('_scriptError');
+  var self = this;
+  if (this.errorTimer) {
+    return;
+  }
+
+  this.errorTimer = setTimeout(function() {
+    if (!self.loadedOkay) {
+      self._abort(new Error('JSONP script loaded abnormally (onerror)'));
+    }
+  }, JsonpReceiver.scriptErrorTimeout);
+};
+
+JsonpReceiver.prototype._createScript = function(url) {
+  debug('_createScript', url);
+  var self = this;
+  var script = this.script = global.document.createElement('script');
+  var script2;  // Opera synchronous load trick.
+
+  script.id = 'a' + random.string(8);
+  script.src = url;
+  script.type = 'text/javascript';
+  script.charset = 'UTF-8';
+  script.onerror = this._scriptError.bind(this);
+  script.onload = function() {
+    debug('onload');
+    self._abort(new Error('JSONP script loaded abnormally (onload)'));
+  };
+
+  // IE9 fires 'error' event after onreadystatechange or before, in random order.
+  // Use loadedOkay to determine if actually errored
+  script.onreadystatechange = function() {
+    debug('onreadystatechange', script.readyState);
+    if (/loaded|closed/.test(script.readyState)) {
+      if (script && script.htmlFor && script.onclick) {
+        self.loadedOkay = true;
+        try {
+          // In IE, actually execute the script.
+          script.onclick();
+        } catch (x) {
+          // intentionally empty
+        }
+      }
+      if (script) {
+        self._abort(new Error('JSONP script loaded abnormally (onreadystatechange)'));
+      }
+    }
+  };
+  // IE: event/htmlFor/onclick trick.
+  // One can't rely on proper order for onreadystatechange. In order to
+  // make sure, set a 'htmlFor' and 'event' properties, so that
+  // script code will be installed as 'onclick' handler for the
+  // script object. Later, onreadystatechange, manually execute this
+  // code. FF and Chrome doesn't work with 'event' and 'htmlFor'
+  // set. For reference see:
+  //   http://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html
+  // Also, read on that about script ordering:
+  //   http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order
+  if (typeof script.async === 'undefined' && global.document.attachEvent) {
+    // According to mozilla docs, in recent browsers script.async defaults
+    // to 'true', so we may use it to detect a good browser:
+    // https://developer.mozilla.org/en/HTML/Element/script
+    if (!browser.isOpera()) {
+      // Naively assume we're in IE
+      try {
+        script.htmlFor = script.id;
+        script.event = 'onclick';
+      } catch (x) {
+        // intentionally empty
+      }
+      script.async = true;
+    } else {
+      // Opera, second sync script hack
+      script2 = this.script2 = global.document.createElement('script');
+      script2.text = "try{var a = document.getElementById('" + script.id + "'); if(a)a.onerror();}catch(x){};";
+      script.async = script2.async = false;
+    }
+  }
+  if (typeof script.async !== 'undefined') {
+    script.async = true;
+  }
+
+  var head = global.document.getElementsByTagName('head')[0];
+  head.insertBefore(script, head.firstChild);
+  if (script2) {
+    head.insertBefore(script2, head.firstChild);
+  }
+};
+
+module.exports = JsonpReceiver;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/transport/receiver/jsonp.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar utils = require('../../utils/iframe')\n  , random = require('../../utils/random')\n  , browser = require('../../utils/browser')\n  , urlUtils = require('../../utils/url')\n  , inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:receiver:jsonp');\n}\n\nfunction JsonpReceiver(url) {\n  debug(url);\n  var self = this;\n  EventEmitter.call(this);\n\n  utils.polluteGlobalNamespace();\n\n  this.id = 'a' + random.string(6);\n  var urlWithId = urlUtils.addQuery(url, 'c=' + encodeURIComponent(utils.WPrefix + '.' + this.id));\n\n  global[utils.WPrefix][this.id] = this._callback.bind(this);\n  this._createScript(urlWithId);\n\n  // Fallback mostly for Konqueror - stupid timer, 35 seconds shall be plenty.\n  this.timeoutId = setTimeout(function() {\n    debug('timeout');\n    self._abort(new Error('JSONP script loaded abnormally (timeout)'));\n  }, JsonpReceiver.timeout);\n}\n\ninherits(JsonpReceiver, EventEmitter);\n\nJsonpReceiver.prototype.abort = function() {\n  debug('abort');\n  if (global[utils.WPrefix][this.id]) {\n    var err = new Error('JSONP user aborted read');\n    err.code = 1000;\n    this._abort(err);\n  }\n};\n\nJsonpReceiver.timeout = 35000;\nJsonpReceiver.scriptErrorTimeout = 1000;\n\nJsonpReceiver.prototype._callback = function(data) {\n  debug('_callback', data);\n  this._cleanup();\n\n  if (this.aborting) {\n    return;\n  }\n\n  if (data) {\n    debug('message', data);\n    this.emit('message', data);\n  }\n  this.emit('close', null, 'network');\n  this.removeAllListeners();\n};\n\nJsonpReceiver.prototype._abort = function(err) {\n  debug('_abort', err);\n  this._cleanup();\n  this.aborting = true;\n  this.emit('close', err.code, err.message);\n  this.removeAllListeners();\n};\n\nJsonpReceiver.prototype._cleanup = function() {\n  debug('_cleanup');\n  clearTimeout(this.timeoutId);\n  if (this.script2) {\n    this.script2.parentNode.removeChild(this.script2);\n    this.script2 = null;\n  }\n  if (this.script) {\n    var script = this.script;\n    // Unfortunately, you can't really abort script loading of\n    // the script.\n    script.parentNode.removeChild(script);\n    script.onreadystatechange = script.onerror =\n        script.onload = script.onclick = null;\n    this.script = null;\n  }\n  delete global[utils.WPrefix][this.id];\n};\n\nJsonpReceiver.prototype._scriptError = function() {\n  debug('_scriptError');\n  var self = this;\n  if (this.errorTimer) {\n    return;\n  }\n\n  this.errorTimer = setTimeout(function() {\n    if (!self.loadedOkay) {\n      self._abort(new Error('JSONP script loaded abnormally (onerror)'));\n    }\n  }, JsonpReceiver.scriptErrorTimeout);\n};\n\nJsonpReceiver.prototype._createScript = function(url) {\n  debug('_createScript', url);\n  var self = this;\n  var script = this.script = global.document.createElement('script');\n  var script2;  // Opera synchronous load trick.\n\n  script.id = 'a' + random.string(8);\n  script.src = url;\n  script.type = 'text/javascript';\n  script.charset = 'UTF-8';\n  script.onerror = this._scriptError.bind(this);\n  script.onload = function() {\n    debug('onload');\n    self._abort(new Error('JSONP script loaded abnormally (onload)'));\n  };\n\n  // IE9 fires 'error' event after onreadystatechange or before, in random order.\n  // Use loadedOkay to determine if actually errored\n  script.onreadystatechange = function() {\n    debug('onreadystatechange', script.readyState);\n    if (/loaded|closed/.test(script.readyState)) {\n      if (script && script.htmlFor && script.onclick) {\n        self.loadedOkay = true;\n        try {\n          // In IE, actually execute the script.\n          script.onclick();\n        } catch (x) {\n          // intentionally empty\n        }\n      }\n      if (script) {\n        self._abort(new Error('JSONP script loaded abnormally (onreadystatechange)'));\n      }\n    }\n  };\n  // IE: event/htmlFor/onclick trick.\n  // One can't rely on proper order for onreadystatechange. In order to\n  // make sure, set a 'htmlFor' and 'event' properties, so that\n  // script code will be installed as 'onclick' handler for the\n  // script object. Later, onreadystatechange, manually execute this\n  // code. FF and Chrome doesn't work with 'event' and 'htmlFor'\n  // set. For reference see:\n  //   http://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html\n  // Also, read on that about script ordering:\n  //   http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order\n  if (typeof script.async === 'undefined' && global.document.attachEvent) {\n    // According to mozilla docs, in recent browsers script.async defaults\n    // to 'true', so we may use it to detect a good browser:\n    // https://developer.mozilla.org/en/HTML/Element/script\n    if (!browser.isOpera()) {\n      // Naively assume we're in IE\n      try {\n        script.htmlFor = script.id;\n        script.event = 'onclick';\n      } catch (x) {\n        // intentionally empty\n      }\n      script.async = true;\n    } else {\n      // Opera, second sync script hack\n      script2 = this.script2 = global.document.createElement('script');\n      script2.text = \"try{var a = document.getElementById('\" + script.id + \"'); if(a)a.onerror();}catch(x){};\";\n      script.async = script2.async = false;\n    }\n  }\n  if (typeof script.async !== 'undefined') {\n    script.async = true;\n  }\n\n  var head = global.document.getElementsByTagName('head')[0];\n  head.insertBefore(script, head.firstChild);\n  if (script2) {\n    head.insertBefore(script2, head.firstChild);\n  }\n};\n\nmodule.exports = JsonpReceiver;\n"]}
+},{"../../utils/browser":44,"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,"debug":54,"events":3,"inherits":57}],32:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:receiver:xhr');
+}
+
+function XhrReceiver(url, AjaxObject) {
+  debug(url);
+  EventEmitter.call(this);
+  var self = this;
+
+  this.bufferPosition = 0;
+
+  this.xo = new AjaxObject('POST', url, null);
+  this.xo.on('chunk', this._chunkHandler.bind(this));
+  this.xo.once('finish', function(status, text) {
+    debug('finish', status, text);
+    self._chunkHandler(status, text);
+    self.xo = null;
+    var reason = status === 200 ? 'network' : 'permanent';
+    debug('close', reason);
+    self.emit('close', null, reason);
+    self._cleanup();
+  });
+}
+
+inherits(XhrReceiver, EventEmitter);
+
+XhrReceiver.prototype._chunkHandler = function(status, text) {
+  debug('_chunkHandler', status);
+  if (status !== 200 || !text) {
+    return;
+  }
+
+  for (var idx = -1; ; this.bufferPosition += idx + 1) {
+    var buf = text.slice(this.bufferPosition);
+    idx = buf.indexOf('\n');
+    if (idx === -1) {
+      break;
+    }
+    var msg = buf.slice(0, idx);
+    if (msg) {
+      debug('message', msg);
+      this.emit('message', msg);
+    }
+  }
+};
+
+XhrReceiver.prototype._cleanup = function() {
+  debug('_cleanup');
+  this.removeAllListeners();
+};
+
+XhrReceiver.prototype.abort = function() {
+  debug('abort');
+  if (this.xo) {
+    this.xo.close();
+    debug('close');
+    this.emit('close', null, 'user');
+    this.xo = null;
+  }
+  this._cleanup();
+};
+
+module.exports = XhrReceiver;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvcmVjZWl2ZXIveGhyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnJlY2VpdmVyOnhocicpO1xufVxuXG5mdW5jdGlvbiBYaHJSZWNlaXZlcih1cmwsIEFqYXhPYmplY3QpIHtcbiAgZGVidWcodXJsKTtcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG4gIHZhciBzZWxmID0gdGhpcztcblxuICB0aGlzLmJ1ZmZlclBvc2l0aW9uID0gMDtcblxuICB0aGlzLnhvID0gbmV3IEFqYXhPYmplY3QoJ1BPU1QnLCB1cmwsIG51bGwpO1xuICB0aGlzLnhvLm9uKCdjaHVuaycsIHRoaXMuX2NodW5rSGFuZGxlci5iaW5kKHRoaXMpKTtcbiAgdGhpcy54by5vbmNlKCdmaW5pc2gnLCBmdW5jdGlvbihzdGF0dXMsIHRleHQpIHtcbiAgICBkZWJ1ZygnZmluaXNoJywgc3RhdHVzLCB0ZXh0KTtcbiAgICBzZWxmLl9jaHVua0hhbmRsZXIoc3RhdHVzLCB0ZXh0KTtcbiAgICBzZWxmLnhvID0gbnVsbDtcbiAgICB2YXIgcmVhc29uID0gc3RhdHVzID09PSAyMDAgPyAnbmV0d29yaycgOiAncGVybWFuZW50JztcbiAgICBkZWJ1ZygnY2xvc2UnLCByZWFzb24pO1xuICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBudWxsLCByZWFzb24pO1xuICAgIHNlbGYuX2NsZWFudXAoKTtcbiAgfSk7XG59XG5cbmluaGVyaXRzKFhoclJlY2VpdmVyLCBFdmVudEVtaXR0ZXIpO1xuXG5YaHJSZWNlaXZlci5wcm90b3R5cGUuX2NodW5rSGFuZGxlciA9IGZ1bmN0aW9uKHN0YXR1cywgdGV4dCkge1xuICBkZWJ1ZygnX2NodW5rSGFuZGxlcicsIHN0YXR1cyk7XG4gIGlmIChzdGF0dXMgIT09IDIwMCB8fCAhdGV4dCkge1xuICAgIHJldHVybjtcbiAgfVxuXG4gIGZvciAodmFyIGlkeCA9IC0xOyA7IHRoaXMuYnVmZmVyUG9zaXRpb24gKz0gaWR4ICsgMSkge1xuICAgIHZhciBidWYgPSB0ZXh0LnNsaWNlKHRoaXMuYnVmZmVyUG9zaXRpb24pO1xuICAgIGlkeCA9IGJ1Zi5pbmRleE9mKCdcXG4nKTtcbiAgICBpZiAoaWR4ID09PSAtMSkge1xuICAgICAgYnJlYWs7XG4gICAgfVxuICAgIHZhciBtc2cgPSBidWYuc2xpY2UoMCwgaWR4KTtcbiAgICBpZiAobXNnKSB7XG4gICAgICBkZWJ1ZygnbWVzc2FnZScsIG1zZyk7XG4gICAgICB0aGlzLmVtaXQoJ21lc3NhZ2UnLCBtc2cpO1xuICAgIH1cbiAgfVxufTtcblxuWGhyUmVjZWl2ZXIucHJvdG90eXBlLl9jbGVhbnVwID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdfY2xlYW51cCcpO1xuICB0aGlzLnJlbW92ZUFsbExpc3RlbmVycygpO1xufTtcblxuWGhyUmVjZWl2ZXIucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICBpZiAodGhpcy54bykge1xuICAgIHRoaXMueG8uY2xvc2UoKTtcbiAgICBkZWJ1ZygnY2xvc2UnKTtcbiAgICB0aGlzLmVtaXQoJ2Nsb3NlJywgbnVsbCwgJ3VzZXInKTtcbiAgICB0aGlzLnhvID0gbnVsbDtcbiAgfVxuICB0aGlzLl9jbGVhbnVwKCk7XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IFhoclJlY2VpdmVyO1xuIl19
+},{"debug":54,"events":3,"inherits":57}],33:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var random = require('../../utils/random')
+  , urlUtils = require('../../utils/url')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:sender:jsonp');
+}
+
+var form, area;
+
+function createIframe(id) {
+  debug('createIframe', id);
+  try {
+    // ie6 dynamic iframes with target="" support (thanks Chris Lambacher)
+    return global.document.createElement('<iframe name="' + id + '">');
+  } catch (x) {
+    var iframe = global.document.createElement('iframe');
+    iframe.name = id;
+    return iframe;
+  }
+}
+
+function createForm() {
+  debug('createForm');
+  form = global.document.createElement('form');
+  form.style.display = 'none';
+  form.style.position = 'absolute';
+  form.method = 'POST';
+  form.enctype = 'application/x-www-form-urlencoded';
+  form.acceptCharset = 'UTF-8';
+
+  area = global.document.createElement('textarea');
+  area.name = 'd';
+  form.appendChild(area);
+
+  global.document.body.appendChild(form);
+}
+
+module.exports = function(url, payload, callback) {
+  debug(url, payload);
+  if (!form) {
+    createForm();
+  }
+  var id = 'a' + random.string(8);
+  form.target = id;
+  form.action = urlUtils.addQuery(urlUtils.addPath(url, '/jsonp_send'), 'i=' + id);
+
+  var iframe = createIframe(id);
+  iframe.id = id;
+  iframe.style.display = 'none';
+  form.appendChild(iframe);
+
+  try {
+    area.value = payload;
+  } catch (e) {
+    // seriously broken browsers get here
+  }
+  form.submit();
+
+  var completed = function(err) {
+    debug('completed', id, err);
+    if (!iframe.onerror) {
+      return;
+    }
+    iframe.onreadystatechange = iframe.onerror = iframe.onload = null;
+    // Opera mini doesn't like if we GC iframe
+    // immediately, thus this timeout.
+    setTimeout(function() {
+      debug('cleaning up', id);
+      iframe.parentNode.removeChild(iframe);
+      iframe = null;
+    }, 500);
+    area.value = '';
+    // It is not possible to detect if the iframe succeeded or
+    // failed to submit our form.
+    callback(err);
+  };
+  iframe.onerror = function() {
+    debug('onerror', id);
+    completed();
+  };
+  iframe.onload = function() {
+    debug('onload', id);
+    completed();
+  };
+  iframe.onreadystatechange = function(e) {
+    debug('onreadystatechange', id, iframe.readyState, e);
+    if (iframe.readyState === 'complete') {
+      completed();
+    }
+  };
+  return function() {
+    debug('aborted', id);
+    completed(new Error('Aborted'));
+  };
+};
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvc2VuZGVyL2pzb25wLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgcmFuZG9tID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvcmFuZG9tJylcbiAgLCB1cmxVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL3VybCcpXG4gIDtcblxudmFyIGRlYnVnID0gZnVuY3Rpb24oKSB7fTtcbmlmIChwcm9jZXNzLmVudi5OT0RFX0VOViAhPT0gJ3Byb2R1Y3Rpb24nKSB7XG4gIGRlYnVnID0gcmVxdWlyZSgnZGVidWcnKSgnc29ja2pzLWNsaWVudDpzZW5kZXI6anNvbnAnKTtcbn1cblxudmFyIGZvcm0sIGFyZWE7XG5cbmZ1bmN0aW9uIGNyZWF0ZUlmcmFtZShpZCkge1xuICBkZWJ1ZygnY3JlYXRlSWZyYW1lJywgaWQpO1xuICB0cnkge1xuICAgIC8vIGllNiBkeW5hbWljIGlmcmFtZXMgd2l0aCB0YXJnZXQ9XCJcIiBzdXBwb3J0ICh0aGFua3MgQ2hyaXMgTGFtYmFjaGVyKVxuICAgIHJldHVybiBnbG9iYWwuZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnPGlmcmFtZSBuYW1lPVwiJyArIGlkICsgJ1wiPicpO1xuICB9IGNhdGNoICh4KSB7XG4gICAgdmFyIGlmcmFtZSA9IGdsb2JhbC5kb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJhbWUnKTtcbiAgICBpZnJhbWUubmFtZSA9IGlkO1xuICAgIHJldHVybiBpZnJhbWU7XG4gIH1cbn1cblxuZnVuY3Rpb24gY3JlYXRlRm9ybSgpIHtcbiAgZGVidWcoJ2NyZWF0ZUZvcm0nKTtcbiAgZm9ybSA9IGdsb2JhbC5kb2N1bWVudC5jcmVhdGVFbGVtZW50KCdmb3JtJyk7XG4gIGZvcm0uc3R5bGUuZGlzcGxheSA9ICdub25lJztcbiAgZm9ybS5zdHlsZS5wb3NpdGlvbiA9ICdhYnNvbHV0ZSc7XG4gIGZvcm0ubWV0aG9kID0gJ1BPU1QnO1xuICBmb3JtLmVuY3R5cGUgPSAnYXBwbGljYXRpb24veC13d3ctZm9ybS11cmxlbmNvZGVkJztcbiAgZm9ybS5hY2NlcHRDaGFyc2V0ID0gJ1VURi04JztcblxuICBhcmVhID0gZ2xvYmFsLmRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3RleHRhcmVhJyk7XG4gIGFyZWEubmFtZSA9ICdkJztcbiAgZm9ybS5hcHBlbmRDaGlsZChhcmVhKTtcblxuICBnbG9iYWwuZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChmb3JtKTtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBmdW5jdGlvbih1cmwsIHBheWxvYWQsIGNhbGxiYWNrKSB7XG4gIGRlYnVnKHVybCwgcGF5bG9hZCk7XG4gIGlmICghZm9ybSkge1xuICAgIGNyZWF0ZUZvcm0oKTtcbiAgfVxuICB2YXIgaWQgPSAnYScgKyByYW5kb20uc3RyaW5nKDgpO1xuICBmb3JtLnRhcmdldCA9IGlkO1xuICBmb3JtLmFjdGlvbiA9IHVybFV0aWxzLmFkZFF1ZXJ5KHVybFV0aWxzLmFkZFBhdGgodXJsLCAnL2pzb25wX3NlbmQnKSwgJ2k9JyArIGlkKTtcblxuICB2YXIgaWZyYW1lID0gY3JlYXRlSWZyYW1lKGlkKTtcbiAgaWZyYW1lLmlkID0gaWQ7XG4gIGlmcmFtZS5zdHlsZS5kaXNwbGF5ID0gJ25vbmUnO1xuICBmb3JtLmFwcGVuZENoaWxkKGlmcmFtZSk7XG5cbiAgdHJ5IHtcbiAgICBhcmVhLnZhbHVlID0gcGF5bG9hZDtcbiAgfSBjYXRjaCAoZSkge1xuICAgIC8vIHNlcmlvdXNseSBicm9rZW4gYnJvd3NlcnMgZ2V0IGhlcmVcbiAgfVxuICBmb3JtLnN1Ym1pdCgpO1xuXG4gIHZhciBjb21wbGV0ZWQgPSBmdW5jdGlvbihlcnIpIHtcbiAgICBkZWJ1ZygnY29tcGxldGVkJywgaWQsIGVycik7XG4gICAgaWYgKCFpZnJhbWUub25lcnJvcikge1xuICAgICAgcmV0dXJuO1xuICAgIH1cbiAgICBpZnJhbWUub25yZWFkeXN0YXRlY2hhbmdlID0gaWZyYW1lLm9uZXJyb3IgPSBpZnJhbWUub25sb2FkID0gbnVsbDtcbiAgICAvLyBPcGVyYSBtaW5pIGRvZXNuJ3QgbGlrZSBpZiB3ZSBHQyBpZnJhbWVcbiAgICAvLyBpbW1lZGlhdGVseSwgdGh1cyB0aGlzIHRpbWVvdXQuXG4gICAgc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICAgIGRlYnVnKCdjbGVhbmluZyB1cCcsIGlkKTtcbiAgICAgIGlmcmFtZS5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKGlmcmFtZSk7XG4gICAgICBpZnJhbWUgPSBudWxsO1xuICAgIH0sIDUwMCk7XG4gICAgYXJlYS52YWx1ZSA9ICcnO1xuICAgIC8vIEl0IGlzIG5vdCBwb3NzaWJsZSB0byBkZXRlY3QgaWYgdGhlIGlmcmFtZSBzdWNjZWVkZWQgb3JcbiAgICAvLyBmYWlsZWQgdG8gc3VibWl0IG91ciBmb3JtLlxuICAgIGNhbGxiYWNrKGVycik7XG4gIH07XG4gIGlmcmFtZS5vbmVycm9yID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ29uZXJyb3InLCBpZCk7XG4gICAgY29tcGxldGVkKCk7XG4gIH07XG4gIGlmcmFtZS5vbmxvYWQgPSBmdW5jdGlvbigpIHtcbiAgICBkZWJ1Zygnb25sb2FkJywgaWQpO1xuICAgIGNvbXBsZXRlZCgpO1xuICB9O1xuICBpZnJhbWUub25yZWFkeXN0YXRlY2hhbmdlID0gZnVuY3Rpb24oZSkge1xuICAgIGRlYnVnKCdvbnJlYWR5c3RhdGVjaGFuZ2UnLCBpZCwgaWZyYW1lLnJlYWR5U3RhdGUsIGUpO1xuICAgIGlmIChpZnJhbWUucmVhZHlTdGF0ZSA9PT0gJ2NvbXBsZXRlJykge1xuICAgICAgY29tcGxldGVkKCk7XG4gICAgfVxuICB9O1xuICByZXR1cm4gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ2Fib3J0ZWQnLCBpZCk7XG4gICAgY29tcGxldGVkKG5ldyBFcnJvcignQWJvcnRlZCcpKTtcbiAgfTtcbn07XG4iXX0=
+},{"../../utils/random":50,"../../utils/url":52,"debug":54}],34:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , eventUtils = require('../../utils/event')
+  , browser = require('../../utils/browser')
+  , urlUtils = require('../../utils/url')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:sender:xdr');
+}
+
+// References:
+//   http://ajaxian.com/archives/100-line-ajax-wrapper
+//   http://msdn.microsoft.com/en-us/library/cc288060(v=VS.85).aspx
+
+function XDRObject(method, url, payload) {
+  debug(method, url);
+  var self = this;
+  EventEmitter.call(this);
+
+  setTimeout(function() {
+    self._start(method, url, payload);
+  }, 0);
+}
+
+inherits(XDRObject, EventEmitter);
+
+XDRObject.prototype._start = function(method, url, payload) {
+  debug('_start');
+  var self = this;
+  var xdr = new global.XDomainRequest();
+  // IE caches even POSTs
+  url = urlUtils.addQuery(url, 't=' + (+new Date()));
+
+  xdr.onerror = function() {
+    debug('onerror');
+    self._error();
+  };
+  xdr.ontimeout = function() {
+    debug('ontimeout');
+    self._error();
+  };
+  xdr.onprogress = function() {
+    debug('progress', xdr.responseText);
+    self.emit('chunk', 200, xdr.responseText);
+  };
+  xdr.onload = function() {
+    debug('load');
+    self.emit('finish', 200, xdr.responseText);
+    self._cleanup(false);
+  };
+  this.xdr = xdr;
+  this.unloadRef = eventUtils.unloadAdd(function() {
+    self._cleanup(true);
+  });
+  try {
+    // Fails with AccessDenied if port number is bogus
+    this.xdr.open(method, url);
+    if (this.timeout) {
+      this.xdr.timeout = this.timeout;
+    }
+    this.xdr.send(payload);
+  } catch (x) {
+    this._error();
+  }
+};
+
+XDRObject.prototype._error = function() {
+  this.emit('finish', 0, '');
+  this._cleanup(false);
+};
+
+XDRObject.prototype._cleanup = function(abort) {
+  debug('cleanup', abort);
+  if (!this.xdr) {
+    return;
+  }
+  this.removeAllListeners();
+  eventUtils.unloadDel(this.unloadRef);
+
+  this.xdr.ontimeout = this.xdr.onerror = this.xdr.onprogress = this.xdr.onload = null;
+  if (abort) {
+    try {
+      this.xdr.abort();
+    } catch (x) {
+      // intentionally empty
+    }
+  }
+  this.unloadRef = this.xdr = null;
+};
+
+XDRObject.prototype.close = function() {
+  debug('close');
+  this._cleanup(true);
+};
+
+// IE 8/9 if the request target uses the same scheme - #79
+XDRObject.enabled = !!(global.XDomainRequest && browser.hasDomain());
+
+module.exports = XDRObject;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvc2VuZGVyL3hkci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgRXZlbnRFbWl0dGVyID0gcmVxdWlyZSgnZXZlbnRzJykuRXZlbnRFbWl0dGVyXG4gICwgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgZXZlbnRVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL2V2ZW50JylcbiAgLCBicm93c2VyID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvYnJvd3NlcicpXG4gICwgdXJsVXRpbHMgPSByZXF1aXJlKCcuLi8uLi91dGlscy91cmwnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6c2VuZGVyOnhkcicpO1xufVxuXG4vLyBSZWZlcmVuY2VzOlxuLy8gICBodHRwOi8vYWpheGlhbi5jb20vYXJjaGl2ZXMvMTAwLWxpbmUtYWpheC13cmFwcGVyXG4vLyAgIGh0dHA6Ly9tc2RuLm1pY3Jvc29mdC5jb20vZW4tdXMvbGlicmFyeS9jYzI4ODA2MCh2PVZTLjg1KS5hc3B4XG5cbmZ1bmN0aW9uIFhEUk9iamVjdChtZXRob2QsIHVybCwgcGF5bG9hZCkge1xuICBkZWJ1ZyhtZXRob2QsIHVybCk7XG4gIHZhciBzZWxmID0gdGhpcztcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG5cbiAgc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICBzZWxmLl9zdGFydChtZXRob2QsIHVybCwgcGF5bG9hZCk7XG4gIH0sIDApO1xufVxuXG5pbmhlcml0cyhYRFJPYmplY3QsIEV2ZW50RW1pdHRlcik7XG5cblhEUk9iamVjdC5wcm90b3R5cGUuX3N0YXJ0ID0gZnVuY3Rpb24obWV0aG9kLCB1cmwsIHBheWxvYWQpIHtcbiAgZGVidWcoJ19zdGFydCcpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB4ZHIgPSBuZXcgZ2xvYmFsLlhEb21haW5SZXF1ZXN0KCk7XG4gIC8vIElFIGNhY2hlcyBldmVuIFBPU1RzXG4gIHVybCA9IHVybFV0aWxzLmFkZFF1ZXJ5KHVybCwgJ3Q9JyArICgrbmV3IERhdGUoKSkpO1xuXG4gIHhkci5vbmVycm9yID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ29uZXJyb3InKTtcbiAgICBzZWxmLl9lcnJvcigpO1xuICB9O1xuICB4ZHIub250aW1lb3V0ID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ29udGltZW91dCcpO1xuICAgIHNlbGYuX2Vycm9yKCk7XG4gIH07XG4gIHhkci5vbnByb2dyZXNzID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ3Byb2dyZXNzJywgeGRyLnJlc3BvbnNlVGV4dCk7XG4gICAgc2VsZi5lbWl0KCdjaHVuaycsIDIwMCwgeGRyLnJlc3BvbnNlVGV4dCk7XG4gIH07XG4gIHhkci5vbmxvYWQgPSBmdW5jdGlvbigpIHtcbiAgICBkZWJ1ZygnbG9hZCcpO1xuICAgIHNlbGYuZW1pdCgnZmluaXNoJywgMjAwLCB4ZHIucmVzcG9uc2VUZXh0KTtcbiAgICBzZWxmLl9jbGVhbnVwKGZhbHNlKTtcbiAgfTtcbiAgdGhpcy54ZHIgPSB4ZHI7XG4gIHRoaXMudW5sb2FkUmVmID0gZXZlbnRVdGlscy51bmxvYWRBZGQoZnVuY3Rpb24oKSB7XG4gICAgc2VsZi5fY2xlYW51cCh0cnVlKTtcbiAgfSk7XG4gIHRyeSB7XG4gICAgLy8gRmFpbHMgd2l0aCBBY2Nlc3NEZW5pZWQgaWYgcG9ydCBudW1iZXIgaXMgYm9ndXNcbiAgICB0aGlzLnhkci5vcGVuKG1ldGhvZCwgdXJsKTtcbiAgICBpZiAodGhpcy50aW1lb3V0KSB7XG4gICAgICB0aGlzLnhkci50aW1lb3V0ID0gdGhpcy50aW1lb3V0O1xuICAgIH1cbiAgICB0aGlzLnhkci5zZW5kKHBheWxvYWQpO1xuICB9IGNhdGNoICh4KSB7XG4gICAgdGhpcy5fZXJyb3IoKTtcbiAgfVxufTtcblxuWERST2JqZWN0LnByb3RvdHlwZS5fZXJyb3IgPSBmdW5jdGlvbigpIHtcbiAgdGhpcy5lbWl0KCdmaW5pc2gnLCAwLCAnJyk7XG4gIHRoaXMuX2NsZWFudXAoZmFsc2UpO1xufTtcblxuWERST2JqZWN0LnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKGFib3J0KSB7XG4gIGRlYnVnKCdjbGVhbnVwJywgYWJvcnQpO1xuICBpZiAoIXRoaXMueGRyKSB7XG4gICAgcmV0dXJuO1xuICB9XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIGV2ZW50VXRpbHMudW5sb2FkRGVsKHRoaXMudW5sb2FkUmVmKTtcblxuICB0aGlzLnhkci5vbnRpbWVvdXQgPSB0aGlzLnhkci5vbmVycm9yID0gdGhpcy54ZHIub25wcm9ncmVzcyA9IHRoaXMueGRyLm9ubG9hZCA9IG51bGw7XG4gIGlmIChhYm9ydCkge1xuICAgIHRyeSB7XG4gICAgICB0aGlzLnhkci5hYm9ydCgpO1xuICAgIH0gY2F0Y2ggKHgpIHtcbiAgICAgIC8vIGludGVudGlvbmFsbHkgZW1wdHlcbiAgICB9XG4gIH1cbiAgdGhpcy51bmxvYWRSZWYgPSB0aGlzLnhkciA9IG51bGw7XG59O1xuXG5YRFJPYmplY3QucHJvdG90eXBlLmNsb3NlID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdjbG9zZScpO1xuICB0aGlzLl9jbGVhbnVwKHRydWUpO1xufTtcblxuLy8gSUUgOC85IGlmIHRoZSByZXF1ZXN0IHRhcmdldCB1c2VzIHRoZSBzYW1lIHNjaGVtZSAtICM3OVxuWERST2JqZWN0LmVuYWJsZWQgPSAhIShnbG9iYWwuWERvbWFpblJlcXVlc3QgJiYgYnJvd3Nlci5oYXNEb21haW4oKSk7XG5cbm1vZHVsZS5leHBvcnRzID0gWERST2JqZWN0O1xuIl19
+},{"../../utils/browser":44,"../../utils/event":46,"../../utils/url":52,"debug":54,"events":3,"inherits":57}],35:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , XhrDriver = require('../driver/xhr')
+  ;
+
+function XHRCorsObject(method, url, payload, opts) {
+  XhrDriver.call(this, method, url, payload, opts);
+}
+
+inherits(XHRCorsObject, XhrDriver);
+
+XHRCorsObject.enabled = XhrDriver.enabled && XhrDriver.supportsCORS;
+
+module.exports = XHRCorsObject;
+
+},{"../driver/xhr":17,"inherits":57}],36:[function(require,module,exports){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  ;
+
+function XHRFake(/* method, url, payload, opts */) {
+  var self = this;
+  EventEmitter.call(this);
+
+  this.to = setTimeout(function() {
+    self.emit('finish', 200, '{}');
+  }, XHRFake.timeout);
+}
+
+inherits(XHRFake, EventEmitter);
+
+XHRFake.prototype.close = function() {
+  clearTimeout(this.to);
+};
+
+XHRFake.timeout = 2000;
+
+module.exports = XHRFake;
+
+},{"events":3,"inherits":57}],37:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , XhrDriver = require('../driver/xhr')
+  ;
+
+function XHRLocalObject(method, url, payload /*, opts */) {
+  XhrDriver.call(this, method, url, payload, {
+    noCredentials: true
+  });
+}
+
+inherits(XHRLocalObject, XhrDriver);
+
+XHRLocalObject.enabled = XhrDriver.enabled;
+
+module.exports = XHRLocalObject;
+
+},{"../driver/xhr":17,"inherits":57}],38:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var utils = require('../utils/event')
+  , urlUtils = require('../utils/url')
+  , inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  , WebsocketDriver = require('./driver/websocket')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:websocket');
+}
+
+function WebSocketTransport(transUrl, ignore, options) {
+  if (!WebSocketTransport.enabled()) {
+    throw new Error('Transport created when disabled');
+  }
+
+  EventEmitter.call(this);
+  debug('constructor', transUrl);
+
+  var self = this;
+  var url = urlUtils.addPath(transUrl, '/websocket');
+  if (url.slice(0, 5) === 'https') {
+    url = 'wss' + url.slice(5);
+  } else {
+    url = 'ws' + url.slice(4);
+  }
+  this.url = url;
+
+  this.ws = new WebsocketDriver(this.url, [], options);
+  this.ws.onmessage = function(e) {
+    debug('message event', e.data);
+    self.emit('message', e.data);
+  };
+  // Firefox has an interesting bug. If a websocket connection is
+  // created after onunload, it stays alive even when user
+  // navigates away from the page. In such situation let's lie -
+  // let's not open the ws connection at all. See:
+  // https://github.com/sockjs/sockjs-client/issues/28
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=696085
+  this.unloadRef = utils.unloadAdd(function() {
+    debug('unload');
+    self.ws.close();
+  });
+  this.ws.onclose = function(e) {
+    debug('close event', e.code, e.reason);
+    self.emit('close', e.code, e.reason);
+    self._cleanup();
+  };
+  this.ws.onerror = function(e) {
+    debug('error event', e);
+    self.emit('close', 1006, 'WebSocket connection broken');
+    self._cleanup();
+  };
+}
+
+inherits(WebSocketTransport, EventEmitter);
+
+WebSocketTransport.prototype.send = function(data) {
+  var msg = '[' + data + ']';
+  debug('send', msg);
+  this.ws.send(msg);
+};
+
+WebSocketTransport.prototype.close = function() {
+  debug('close');
+  if (this.ws) {
+    this.ws.close();
+  }
+  this._cleanup();
+};
+
+WebSocketTransport.prototype._cleanup = function() {
+  debug('_cleanup');
+  var ws = this.ws;
+  if (ws) {
+    ws.onmessage = ws.onclose = ws.onerror = null;
+  }
+  utils.unloadDel(this.unloadRef);
+  this.unloadRef = this.ws = null;
+  this.removeAllListeners();
+};
+
+WebSocketTransport.enabled = function() {
+  debug('enabled');
+  return !!WebsocketDriver;
+};
+WebSocketTransport.transportName = 'websocket';
+
+// In theory, ws should require 1 round trip. But in chrome, this is
+// not very stable over SSL. Most likely a ws connection requires a
+// separate SSL connection, in which case 2 round trips are an
+// absolute minumum.
+WebSocketTransport.roundTrips = 2;
+
+module.exports = WebSocketTransport;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvd2Vic29ja2V0LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIHV0aWxzID0gcmVxdWlyZSgnLi4vdXRpbHMvZXZlbnQnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vdXRpbHMvdXJsJylcbiAgLCBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgLCBXZWJzb2NrZXREcml2ZXIgPSByZXF1aXJlKCcuL2RyaXZlci93ZWJzb2NrZXQnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6d2Vic29ja2V0Jyk7XG59XG5cbmZ1bmN0aW9uIFdlYlNvY2tldFRyYW5zcG9ydCh0cmFuc1VybCwgaWdub3JlLCBvcHRpb25zKSB7XG4gIGlmICghV2ViU29ja2V0VHJhbnNwb3J0LmVuYWJsZWQoKSkge1xuICAgIHRocm93IG5ldyBFcnJvcignVHJhbnNwb3J0IGNyZWF0ZWQgd2hlbiBkaXNhYmxlZCcpO1xuICB9XG5cbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG4gIGRlYnVnKCdjb25zdHJ1Y3RvcicsIHRyYW5zVXJsKTtcblxuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB1cmwgPSB1cmxVdGlscy5hZGRQYXRoKHRyYW5zVXJsLCAnL3dlYnNvY2tldCcpO1xuICBpZiAodXJsLnNsaWNlKDAsIDUpID09PSAnaHR0cHMnKSB7XG4gICAgdXJsID0gJ3dzcycgKyB1cmwuc2xpY2UoNSk7XG4gIH0gZWxzZSB7XG4gICAgdXJsID0gJ3dzJyArIHVybC5zbGljZSg0KTtcbiAgfVxuICB0aGlzLnVybCA9IHVybDtcblxuICB0aGlzLndzID0gbmV3IFdlYnNvY2tldERyaXZlcih0aGlzLnVybCwgW10sIG9wdGlvbnMpO1xuICB0aGlzLndzLm9ubWVzc2FnZSA9IGZ1bmN0aW9uKGUpIHtcbiAgICBkZWJ1ZygnbWVzc2FnZSBldmVudCcsIGUuZGF0YSk7XG4gICAgc2VsZi5lbWl0KCdtZXNzYWdlJywgZS5kYXRhKTtcbiAgfTtcbiAgLy8gRmlyZWZveCBoYXMgYW4gaW50ZXJlc3RpbmcgYnVnLiBJZiBhIHdlYnNvY2tldCBjb25uZWN0aW9uIGlzXG4gIC8vIGNyZWF0ZWQgYWZ0ZXIgb251bmxvYWQsIGl0IHN0YXlzIGFsaXZlIGV2ZW4gd2hlbiB1c2VyXG4gIC8vIG5hdmlnYXRlcyBhd2F5IGZyb20gdGhlIHBhZ2UuIEluIHN1Y2ggc2l0dWF0aW9uIGxldCdzIGxpZSAtXG4gIC8vIGxldCdzIG5vdCBvcGVuIHRoZSB3cyBjb25uZWN0aW9uIGF0IGFsbC4gU2VlOlxuICAvLyBodHRwczovL2dpdGh1Yi5jb20vc29ja2pzL3NvY2tqcy1jbGllbnQvaXNzdWVzLzI4XG4gIC8vIGh0dHBzOi8vYnVnemlsbGEubW96aWxsYS5vcmcvc2hvd19idWcuY2dpP2lkPTY5NjA4NVxuICB0aGlzLnVubG9hZFJlZiA9IHV0aWxzLnVubG9hZEFkZChmdW5jdGlvbigpIHtcbiAgICBkZWJ1ZygndW5sb2FkJyk7XG4gICAgc2VsZi53cy5jbG9zZSgpO1xuICB9KTtcbiAgdGhpcy53cy5vbmNsb3NlID0gZnVuY3Rpb24oZSkge1xuICAgIGRlYnVnKCdjbG9zZSBldmVudCcsIGUuY29kZSwgZS5yZWFzb24pO1xuICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBlLmNvZGUsIGUucmVhc29uKTtcbiAgICBzZWxmLl9jbGVhbnVwKCk7XG4gIH07XG4gIHRoaXMud3Mub25lcnJvciA9IGZ1bmN0aW9uKGUpIHtcbiAgICBkZWJ1ZygnZXJyb3IgZXZlbnQnLCBlKTtcbiAgICBzZWxmLmVtaXQoJ2Nsb3NlJywgMTAwNiwgJ1dlYlNvY2tldCBjb25uZWN0aW9uIGJyb2tlbicpO1xuICAgIHNlbGYuX2NsZWFudXAoKTtcbiAgfTtcbn1cblxuaW5oZXJpdHMoV2ViU29ja2V0VHJhbnNwb3J0LCBFdmVudEVtaXR0ZXIpO1xuXG5XZWJTb2NrZXRUcmFuc3BvcnQucHJvdG90eXBlLnNlbmQgPSBmdW5jdGlvbihkYXRhKSB7XG4gIHZhciBtc2cgPSAnWycgKyBkYXRhICsgJ10nO1xuICBkZWJ1Zygnc2VuZCcsIG1zZyk7XG4gIHRoaXMud3Muc2VuZChtc2cpO1xufTtcblxuV2ViU29ja2V0VHJhbnNwb3J0LnByb3RvdHlwZS5jbG9zZSA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xvc2UnKTtcbiAgaWYgKHRoaXMud3MpIHtcbiAgICB0aGlzLndzLmNsb3NlKCk7XG4gIH1cbiAgdGhpcy5fY2xlYW51cCgpO1xufTtcblxuV2ViU29ja2V0VHJhbnNwb3J0LnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnX2NsZWFudXAnKTtcbiAgdmFyIHdzID0gdGhpcy53cztcbiAgaWYgKHdzKSB7XG4gICAgd3Mub25tZXNzYWdlID0gd3Mub25jbG9zZSA9IHdzLm9uZXJyb3IgPSBudWxsO1xuICB9XG4gIHV0aWxzLnVubG9hZERlbCh0aGlzLnVubG9hZFJlZik7XG4gIHRoaXMudW5sb2FkUmVmID0gdGhpcy53cyA9IG51bGw7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG59O1xuXG5XZWJTb2NrZXRUcmFuc3BvcnQuZW5hYmxlZCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnZW5hYmxlZCcpO1xuICByZXR1cm4gISFXZWJzb2NrZXREcml2ZXI7XG59O1xuV2ViU29ja2V0VHJhbnNwb3J0LnRyYW5zcG9ydE5hbWUgPSAnd2Vic29ja2V0JztcblxuLy8gSW4gdGhlb3J5LCB3cyBzaG91bGQgcmVxdWlyZSAxIHJvdW5kIHRyaXAuIEJ1dCBpbiBjaHJvbWUsIHRoaXMgaXNcbi8vIG5vdCB2ZXJ5IHN0YWJsZSBvdmVyIFNTTC4gTW9zdCBsaWtlbHkgYSB3cyBjb25uZWN0aW9uIHJlcXVpcmVzIGFcbi8vIHNlcGFyYXRlIFNTTCBjb25uZWN0aW9uLCBpbiB3aGljaCBjYXNlIDIgcm91bmQgdHJpcHMgYXJlIGFuXG4vLyBhYnNvbHV0ZSBtaW51bXVtLlxuV2ViU29ja2V0VHJhbnNwb3J0LnJvdW5kVHJpcHMgPSAyO1xuXG5tb2R1bGUuZXhwb3J0cyA9IFdlYlNvY2tldFRyYW5zcG9ydDtcbiJdfQ==
+},{"../utils/event":46,"../utils/url":52,"./driver/websocket":19,"debug":54,"events":3,"inherits":57}],39:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , XdrStreamingTransport = require('./xdr-streaming')
+  , XhrReceiver = require('./receiver/xhr')
+  , XDRObject = require('./sender/xdr')
+  ;
+
+function XdrPollingTransport(transUrl) {
+  if (!XDRObject.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/xhr', XhrReceiver, XDRObject);
+}
+
+inherits(XdrPollingTransport, AjaxBasedTransport);
+
+XdrPollingTransport.enabled = XdrStreamingTransport.enabled;
+XdrPollingTransport.transportName = 'xdr-polling';
+XdrPollingTransport.roundTrips = 2; // preflight, ajax
+
+module.exports = XdrPollingTransport;
+
+},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,"./xdr-streaming":40,"inherits":57}],40:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , XhrReceiver = require('./receiver/xhr')
+  , XDRObject = require('./sender/xdr')
+  ;
+
+// According to:
+//   http://stackoverflow.com/questions/1641507/detect-browser-support-for-cross-domain-xmlhttprequests
+//   http://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/
+
+function XdrStreamingTransport(transUrl) {
+  if (!XDRObject.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/xhr_streaming', XhrReceiver, XDRObject);
+}
+
+inherits(XdrStreamingTransport, AjaxBasedTransport);
+
+XdrStreamingTransport.enabled = function(info) {
+  if (info.cookie_needed || info.nullOrigin) {
+    return false;
+  }
+  return XDRObject.enabled && info.sameScheme;
+};
+
+XdrStreamingTransport.transportName = 'xdr-streaming';
+XdrStreamingTransport.roundTrips = 2; // preflight, ajax
+
+module.exports = XdrStreamingTransport;
+
+},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,"inherits":57}],41:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , XhrReceiver = require('./receiver/xhr')
+  , XHRCorsObject = require('./sender/xhr-cors')
+  , XHRLocalObject = require('./sender/xhr-local')
+  ;
+
+function XhrPollingTransport(transUrl) {
+  if (!XHRLocalObject.enabled && !XHRCorsObject.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/xhr', XhrReceiver, XHRCorsObject);
+}
+
+inherits(XhrPollingTransport, AjaxBasedTransport);
+
+XhrPollingTransport.enabled = function(info) {
+  if (info.nullOrigin) {
+    return false;
+  }
+
+  if (XHRLocalObject.enabled && info.sameOrigin) {
+    return true;
+  }
+  return XHRCorsObject.enabled;
+};
+
+XhrPollingTransport.transportName = 'xhr-polling';
+XhrPollingTransport.roundTrips = 2; // preflight, ajax
+
+module.exports = XhrPollingTransport;
+
+},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,"inherits":57}],42:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , XhrReceiver = require('./receiver/xhr')
+  , XHRCorsObject = require('./sender/xhr-cors')
+  , XHRLocalObject = require('./sender/xhr-local')
+  , browser = require('../utils/browser')
+  ;
+
+function XhrStreamingTransport(transUrl) {
+  if (!XHRLocalObject.enabled && !XHRCorsObject.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/xhr_streaming', XhrReceiver, XHRCorsObject);
+}
+
+inherits(XhrStreamingTransport, AjaxBasedTransport);
+
+XhrStreamingTransport.enabled = function(info) {
+  if (info.nullOrigin) {
+    return false;
+  }
+  // Opera doesn't support xhr-streaming #60
+  // But it might be able to #92
+  if (browser.isOpera()) {
+    return false;
+  }
+
+  return XHRCorsObject.enabled;
+};
+
+XhrStreamingTransport.transportName = 'xhr-streaming';
+XhrStreamingTransport.roundTrips = 2; // preflight, ajax
+
+// Safari gets confused when a streaming ajax request is started
+// before onload. This causes the load indicator to spin indefinetely.
+// Only require body when used in a browser
+XhrStreamingTransport.needBody = !!global.document;
+
+module.exports = XhrStreamingTransport;
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQveGhyLXN0cmVhbWluZy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBBamF4QmFzZWRUcmFuc3BvcnQgPSByZXF1aXJlKCcuL2xpYi9hamF4LWJhc2VkJylcbiAgLCBYaHJSZWNlaXZlciA9IHJlcXVpcmUoJy4vcmVjZWl2ZXIveGhyJylcbiAgLCBYSFJDb3JzT2JqZWN0ID0gcmVxdWlyZSgnLi9zZW5kZXIveGhyLWNvcnMnKVxuICAsIFhIUkxvY2FsT2JqZWN0ID0gcmVxdWlyZSgnLi9zZW5kZXIveGhyLWxvY2FsJylcbiAgLCBicm93c2VyID0gcmVxdWlyZSgnLi4vdXRpbHMvYnJvd3NlcicpXG4gIDtcblxuZnVuY3Rpb24gWGhyU3RyZWFtaW5nVHJhbnNwb3J0KHRyYW5zVXJsKSB7XG4gIGlmICghWEhSTG9jYWxPYmplY3QuZW5hYmxlZCAmJiAhWEhSQ29yc09iamVjdC5lbmFibGVkKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdUcmFuc3BvcnQgY3JlYXRlZCB3aGVuIGRpc2FibGVkJyk7XG4gIH1cbiAgQWpheEJhc2VkVHJhbnNwb3J0LmNhbGwodGhpcywgdHJhbnNVcmwsICcveGhyX3N0cmVhbWluZycsIFhoclJlY2VpdmVyLCBYSFJDb3JzT2JqZWN0KTtcbn1cblxuaW5oZXJpdHMoWGhyU3RyZWFtaW5nVHJhbnNwb3J0LCBBamF4QmFzZWRUcmFuc3BvcnQpO1xuXG5YaHJTdHJlYW1pbmdUcmFuc3BvcnQuZW5hYmxlZCA9IGZ1bmN0aW9uKGluZm8pIHtcbiAgaWYgKGluZm8ubnVsbE9yaWdpbikge1xuICAgIHJldHVybiBmYWxzZTtcbiAgfVxuICAvLyBPcGVyYSBkb2Vzbid0IHN1cHBvcnQgeGhyLXN0cmVhbWluZyAjNjBcbiAgLy8gQnV0IGl0IG1pZ2h0IGJlIGFibGUgdG8gIzkyXG4gIGlmIChicm93c2VyLmlzT3BlcmEoKSkge1xuICAgIHJldHVybiBmYWxzZTtcbiAgfVxuXG4gIHJldHVybiBYSFJDb3JzT2JqZWN0LmVuYWJsZWQ7XG59O1xuXG5YaHJTdHJlYW1pbmdUcmFuc3BvcnQudHJhbnNwb3J0TmFtZSA9ICd4aHItc3RyZWFtaW5nJztcblhoclN0cmVhbWluZ1RyYW5zcG9ydC5yb3VuZFRyaXBzID0gMjsgLy8gcHJlZmxpZ2h0LCBhamF4XG5cbi8vIFNhZmFyaSBnZXRzIGNvbmZ1c2VkIHdoZW4gYSBzdHJlYW1pbmcgYWpheCByZXF1ZXN0IGlzIHN0YXJ0ZWRcbi8vIGJlZm9yZSBvbmxvYWQuIFRoaXMgY2F1c2VzIHRoZSBsb2FkIGluZGljYXRvciB0byBzcGluIGluZGVmaW5ldGVseS5cbi8vIE9ubHkgcmVxdWlyZSBib2R5IHdoZW4gdXNlZCBpbiBhIGJyb3dzZXJcblhoclN0cmVhbWluZ1RyYW5zcG9ydC5uZWVkQm9keSA9ICEhZ2xvYmFsLmRvY3VtZW50O1xuXG5tb2R1bGUuZXhwb3J0cyA9IFhoclN0cmVhbWluZ1RyYW5zcG9ydDtcbiJdfQ==
+},{"../utils/browser":44,"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,"inherits":57}],43:[function(require,module,exports){
+(function (global){
+'use strict';
+
+if (global.crypto && global.crypto.getRandomValues) {
+  module.exports.randomBytes = function(length) {
+    var bytes = new Uint8Array(length);
+    global.crypto.getRandomValues(bytes);
+    return bytes;
+  };
+} else {
+  module.exports.randomBytes = function(length) {
+    var bytes = new Array(length);
+    for (var i = 0; i < length; i++) {
+      bytes[i] = Math.floor(Math.random() * 256);
+    }
+    return bytes;
+  };
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9icm93c2VyLWNyeXB0by5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbmlmIChnbG9iYWwuY3J5cHRvICYmIGdsb2JhbC5jcnlwdG8uZ2V0UmFuZG9tVmFsdWVzKSB7XG4gIG1vZHVsZS5leHBvcnRzLnJhbmRvbUJ5dGVzID0gZnVuY3Rpb24obGVuZ3RoKSB7XG4gICAgdmFyIGJ5dGVzID0gbmV3IFVpbnQ4QXJyYXkobGVuZ3RoKTtcbiAgICBnbG9iYWwuY3J5cHRvLmdldFJhbmRvbVZhbHVlcyhieXRlcyk7XG4gICAgcmV0dXJuIGJ5dGVzO1xuICB9O1xufSBlbHNlIHtcbiAgbW9kdWxlLmV4cG9ydHMucmFuZG9tQnl0ZXMgPSBmdW5jdGlvbihsZW5ndGgpIHtcbiAgICB2YXIgYnl0ZXMgPSBuZXcgQXJyYXkobGVuZ3RoKTtcbiAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7XG4gICAgICBieXRlc1tpXSA9IE1hdGguZmxvb3IoTWF0aC5yYW5kb20oKSAqIDI1Nik7XG4gICAgfVxuICAgIHJldHVybiBieXRlcztcbiAgfTtcbn1cbiJdfQ==
+},{}],44:[function(require,module,exports){
+(function (global){
+'use strict';
+
+module.exports = {
+  isOpera: function() {
+    return global.navigator &&
+      /opera/i.test(global.navigator.userAgent);
+  }
+
+, isKonqueror: function() {
+    return global.navigator &&
+      /konqueror/i.test(global.navigator.userAgent);
+  }
+
+  // #187 wrap document.domain in try/catch because of WP8 from file:///
+, hasDomain: function () {
+    // non-browser client always has a domain
+    if (!global.document) {
+      return true;
+    }
+
+    try {
+      return !!global.document.domain;
+    } catch (e) {
+      return false;
+    }
+  }
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9icm93c2VyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG5tb2R1bGUuZXhwb3J0cyA9IHtcbiAgaXNPcGVyYTogZnVuY3Rpb24oKSB7XG4gICAgcmV0dXJuIGdsb2JhbC5uYXZpZ2F0b3IgJiZcbiAgICAgIC9vcGVyYS9pLnRlc3QoZ2xvYmFsLm5hdmlnYXRvci51c2VyQWdlbnQpO1xuICB9XG5cbiwgaXNLb25xdWVyb3I6IGZ1bmN0aW9uKCkge1xuICAgIHJldHVybiBnbG9iYWwubmF2aWdhdG9yICYmXG4gICAgICAva29ucXVlcm9yL2kudGVzdChnbG9iYWwubmF2aWdhdG9yLnVzZXJBZ2VudCk7XG4gIH1cblxuICAvLyAjMTg3IHdyYXAgZG9jdW1lbnQuZG9tYWluIGluIHRyeS9jYXRjaCBiZWNhdXNlIG9mIFdQOCBmcm9tIGZpbGU6Ly8vXG4sIGhhc0RvbWFpbjogZnVuY3Rpb24gKCkge1xuICAgIC8vIG5vbi1icm93c2VyIGNsaWVudCBhbHdheXMgaGFzIGEgZG9tYWluXG4gICAgaWYgKCFnbG9iYWwuZG9jdW1lbnQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cblxuICAgIHRyeSB7XG4gICAgICByZXR1cm4gISFnbG9iYWwuZG9jdW1lbnQuZG9tYWluO1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gIH1cbn07XG4iXX0=
+},{}],45:[function(require,module,exports){
+'use strict';
+
+var JSON3 = require('json3');
+
+// Some extra characters that Chrome gets wrong, and substitutes with
+// something else on the wire.
+var extraEscapable = /[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g
+  , extraLookup;
+
+// This may be quite slow, so let's delay until user actually uses bad
+// characters.
+var unrollLookup = function(escapable) {
+  var i;
+  var unrolled = {};
+  var c = [];
+  for (i = 0; i < 65536; i++) {
+    c.push( String.fromCharCode(i) );
+  }
+  escapable.lastIndex = 0;
+  c.join('').replace(escapable, function(a) {
+    unrolled[ a ] = '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+    return '';
+  });
+  escapable.lastIndex = 0;
+  return unrolled;
+};
+
+// Quote string, also taking care of unicode characters that browsers
+// often break. Especially, take care of unicode surrogates:
+// http://en.wikipedia.org/wiki/Mapping_of_Unicode_characters#Surrogates
+module.exports = {
+  quote: function(string) {
+    var quoted = JSON3.stringify(string);
+
+    // In most cases this should be very fast and good enough.
+    extraEscapable.lastIndex = 0;
+    if (!extraEscapable.test(quoted)) {
+      return quoted;
+    }
+
+    if (!extraLookup) {
+      extraLookup = unrollLookup(extraEscapable);
+    }
+
+    return quoted.replace(extraEscapable, function(a) {
+      return extraLookup[a];
+    });
+  }
+};
+
+},{"json3":58}],46:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var random = require('./random');
+
+var onUnload = {}
+  , afterUnload = false
+    // detect google chrome packaged apps because they don't allow the 'unload' event
+  , isChromePackagedApp = global.chrome && global.chrome.app && global.chrome.app.runtime
+  ;
+
+module.exports = {
+  attachEvent: function(event, listener) {
+    if (typeof global.addEventListener !== 'undefined') {
+      global.addEventListener(event, listener, false);
+    } else if (global.document && global.attachEvent) {
+      // IE quirks.
+      // According to: http://stevesouders.com/misc/test-postmessage.php
+      // the message gets delivered only to 'document', not 'window'.
+      global.document.attachEvent('on' + event, listener);
+      // I get 'window' for ie8.
+      global.attachEvent('on' + event, listener);
+    }
+  }
+
+, detachEvent: function(event, listener) {
+    if (typeof global.addEventListener !== 'undefined') {
+      global.removeEventListener(event, listener, false);
+    } else if (global.document && global.detachEvent) {
+      global.document.detachEvent('on' + event, listener);
+      global.detachEvent('on' + event, listener);
+    }
+  }
+
+, unloadAdd: function(listener) {
+    if (isChromePackagedApp) {
+      return null;
+    }
+
+    var ref = random.string(8);
+    onUnload[ref] = listener;
+    if (afterUnload) {
+      setTimeout(this.triggerUnloadCallbacks, 0);
+    }
+    return ref;
+  }
+
+, unloadDel: function(ref) {
+    if (ref in onUnload) {
+      delete onUnload[ref];
+    }
+  }
+
+, triggerUnloadCallbacks: function() {
+    for (var ref in onUnload) {
+      onUnload[ref]();
+      delete onUnload[ref];
+    }
+  }
+};
+
+var unloadTriggered = function() {
+  if (afterUnload) {
+    return;
+  }
+  afterUnload = true;
+  module.exports.triggerUnloadCallbacks();
+};
+
+// 'unload' alone is not reliable in opera within an iframe, but we
+// can't use `beforeunload` as IE fires it on javascript: links.
+if (!isChromePackagedApp) {
+  module.exports.attachEvent('unload', unloadTriggered);
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9ldmVudC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgcmFuZG9tID0gcmVxdWlyZSgnLi9yYW5kb20nKTtcblxudmFyIG9uVW5sb2FkID0ge31cbiAgLCBhZnRlclVubG9hZCA9IGZhbHNlXG4gICAgLy8gZGV0ZWN0IGdvb2dsZSBjaHJvbWUgcGFja2FnZWQgYXBwcyBiZWNhdXNlIHRoZXkgZG9uJ3QgYWxsb3cgdGhlICd1bmxvYWQnIGV2ZW50XG4gICwgaXNDaHJvbWVQYWNrYWdlZEFwcCA9IGdsb2JhbC5jaHJvbWUgJiYgZ2xvYmFsLmNocm9tZS5hcHAgJiYgZ2xvYmFsLmNocm9tZS5hcHAucnVudGltZVxuICA7XG5cbm1vZHVsZS5leHBvcnRzID0ge1xuICBhdHRhY2hFdmVudDogZnVuY3Rpb24oZXZlbnQsIGxpc3RlbmVyKSB7XG4gICAgaWYgKHR5cGVvZiBnbG9iYWwuYWRkRXZlbnRMaXN0ZW5lciAhPT0gJ3VuZGVmaW5lZCcpIHtcbiAgICAgIGdsb2JhbC5hZGRFdmVudExpc3RlbmVyKGV2ZW50LCBsaXN0ZW5lciwgZmFsc2UpO1xuICAgIH0gZWxzZSBpZiAoZ2xvYmFsLmRvY3VtZW50ICYmIGdsb2JhbC5hdHRhY2hFdmVudCkge1xuICAgICAgLy8gSUUgcXVpcmtzLlxuICAgICAgLy8gQWNjb3JkaW5nIHRvOiBodHRwOi8vc3RldmVzb3VkZXJzLmNvbS9taXNjL3Rlc3QtcG9zdG1lc3NhZ2UucGhwXG4gICAgICAvLyB0aGUgbWVzc2FnZSBnZXRzIGRlbGl2ZXJlZCBvbmx5IHRvICdkb2N1bWVudCcsIG5vdCAnd2luZG93Jy5cbiAgICAgIGdsb2JhbC5kb2N1bWVudC5hdHRhY2hFdmVudCgnb24nICsgZXZlbnQsIGxpc3RlbmVyKTtcbiAgICAgIC8vIEkgZ2V0ICd3aW5kb3cnIGZvciBpZTguXG4gICAgICBnbG9iYWwuYXR0YWNoRXZlbnQoJ29uJyArIGV2ZW50LCBsaXN0ZW5lcik7XG4gICAgfVxuICB9XG5cbiwgZGV0YWNoRXZlbnQ6IGZ1bmN0aW9uKGV2ZW50LCBsaXN0ZW5lcikge1xuICAgIGlmICh0eXBlb2YgZ2xvYmFsLmFkZEV2ZW50TGlzdGVuZXIgIT09ICd1bmRlZmluZWQnKSB7XG4gICAgICBnbG9iYWwucmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudCwgbGlzdGVuZXIsIGZhbHNlKTtcbiAgICB9IGVsc2UgaWYgKGdsb2JhbC5kb2N1bWVudCAmJiBnbG9iYWwuZGV0YWNoRXZlbnQpIHtcbiAgICAgIGdsb2JhbC5kb2N1bWVudC5kZXRhY2hFdmVudCgnb24nICsgZXZlbnQsIGxpc3RlbmVyKTtcbiAgICAgIGdsb2JhbC5kZXRhY2hFdmVudCgnb24nICsgZXZlbnQsIGxpc3RlbmVyKTtcbiAgICB9XG4gIH1cblxuLCB1bmxvYWRBZGQ6IGZ1bmN0aW9uKGxpc3RlbmVyKSB7XG4gICAgaWYgKGlzQ2hyb21lUGFja2FnZWRBcHApIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cblxuICAgIHZhciByZWYgPSByYW5kb20uc3RyaW5nKDgpO1xuICAgIG9uVW5sb2FkW3JlZl0gPSBsaXN0ZW5lcjtcbiAgICBpZiAoYWZ0ZXJVbmxvYWQpIHtcbiAgICAgIHNldFRpbWVvdXQodGhpcy50cmlnZ2VyVW5sb2FkQ2FsbGJhY2tzLCAwKTtcbiAgICB9XG4gICAgcmV0dXJuIHJlZjtcbiAgfVxuXG4sIHVubG9hZERlbDogZnVuY3Rpb24ocmVmKSB7XG4gICAgaWYgKHJlZiBpbiBvblVubG9hZCkge1xuICAgICAgZGVsZXRlIG9uVW5sb2FkW3JlZl07XG4gICAgfVxuICB9XG5cbiwgdHJpZ2dlclVubG9hZENhbGxiYWNrczogZnVuY3Rpb24oKSB7XG4gICAgZm9yICh2YXIgcmVmIGluIG9uVW5sb2FkKSB7XG4gICAgICBvblVubG9hZFtyZWZdKCk7XG4gICAgICBkZWxldGUgb25VbmxvYWRbcmVmXTtcbiAgICB9XG4gIH1cbn07XG5cbnZhciB1bmxvYWRUcmlnZ2VyZWQgPSBmdW5jdGlvbigpIHtcbiAgaWYgKGFmdGVyVW5sb2FkKSB7XG4gICAgcmV0dXJuO1xuICB9XG4gIGFmdGVyVW5sb2FkID0gdHJ1ZTtcbiAgbW9kdWxlLmV4cG9ydHMudHJpZ2dlclVubG9hZENhbGxiYWNrcygpO1xufTtcblxuLy8gJ3VubG9hZCcgYWxvbmUgaXMgbm90IHJlbGlhYmxlIGluIG9wZXJhIHdpdGhpbiBhbiBpZnJhbWUsIGJ1dCB3ZVxuLy8gY2FuJ3QgdXNlIGBiZWZvcmV1bmxvYWRgIGFzIElFIGZpcmVzIGl0IG9uIGphdmFzY3JpcHQ6IGxpbmtzLlxuaWYgKCFpc0Nocm9tZVBhY2thZ2VkQXBwKSB7XG4gIG1vZHVsZS5leHBvcnRzLmF0dGFjaEV2ZW50KCd1bmxvYWQnLCB1bmxvYWRUcmlnZ2VyZWQpO1xufVxuIl19
+},{"./random":50}],47:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var eventUtils = require('./event')
+  , JSON3 = require('json3')
+  , browser = require('./browser')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:utils:iframe');
+}
+
+module.exports = {
+  WPrefix: '_jp'
+, currentWindowId: null
+
+, polluteGlobalNamespace: function() {
+    if (!(module.exports.WPrefix in global)) {
+      global[module.exports.WPrefix] = {};
+    }
+  }
+
+, postMessage: function(type, data) {
+    if (global.parent !== global) {
+      global.parent.postMessage(JSON3.stringify({
+        windowId: module.exports.currentWindowId
+      , type: type
+      , data: data || ''
+      }), '*');
+    } else {
+      debug('Cannot postMessage, no parent window.', type, data);
+    }
+  }
+
+, createIframe: function(iframeUrl, errorCallback) {
+    var iframe = global.document.createElement('iframe');
+    var tref, unloadRef;
+    var unattach = function() {
+      debug('unattach');
+      clearTimeout(tref);
+      // Explorer had problems with that.
+      try {
+        iframe.onload = null;
+      } catch (x) {
+        // intentionally empty
+      }
+      iframe.onerror = null;
+    };
+    var cleanup = function() {
+      debug('cleanup');
+      if (iframe) {
+        unattach();
+        // This timeout makes chrome fire onbeforeunload event
+        // within iframe. Without the timeout it goes straight to
+        // onunload.
+        setTimeout(function() {
+          if (iframe) {
+            iframe.parentNode.removeChild(iframe);
+          }
+          iframe = null;
+        }, 0);
+        eventUtils.unloadDel(unloadRef);
+      }
+    };
+    var onerror = function(err) {
+      debug('onerror', err);
+      if (iframe) {
+        cleanup();
+        errorCallback(err);
+      }
+    };
+    var post = function(msg, origin) {
+      debug('post', msg, origin);
+      try {
+        // When the iframe is not loaded, IE raises an exception
+        // on 'contentWindow'.
+        setTimeout(function() {
+          if (iframe && iframe.contentWindow) {
+            iframe.contentWindow.postMessage(msg, origin);
+          }
+        }, 0);
+      } catch (x) {
+        // intentionally empty
+      }
+    };
+
+    iframe.src = iframeUrl;
+    iframe.style.display = 'none';
+    iframe.style.position = 'absolute';
+    iframe.onerror = function() {
+      onerror('onerror');
+    };
+    iframe.onload = function() {
+      debug('onload');
+      // `onload` is triggered before scripts on the iframe are
+      // executed. Give it few seconds to actually load stuff.
+      clearTimeout(tref);
+      tref = setTimeout(function() {
+        onerror('onload timeout');
+      }, 2000);
+    };
+    global.document.body.appendChild(iframe);
+    tref = setTimeout(function() {
+      onerror('timeout');
+    }, 15000);
+    unloadRef = eventUtils.unloadAdd(cleanup);
+    return {
+      post: post
+    , cleanup: cleanup
+    , loaded: unattach
+    };
+  }
+
+/* jshint undef: false, newcap: false */
+/* eslint no-undef: 0, new-cap: 0 */
+, createHtmlfile: function(iframeUrl, errorCallback) {
+    var axo = ['Active'].concat('Object').join('X');
+    var doc = new global[axo]('htmlfile');
+    var tref, unloadRef;
+    var iframe;
+    var unattach = function() {
+      clearTimeout(tref);
+      iframe.onerror = null;
+    };
+    var cleanup = function() {
+      if (doc) {
+        unattach();
+        eventUtils.unloadDel(unloadRef);
+        iframe.parentNode.removeChild(iframe);
+        iframe = doc = null;
+        CollectGarbage();
+      }
+    };
+    var onerror = function(r) {
+      debug('onerror', r);
+      if (doc) {
+        cleanup();
+        errorCallback(r);
+      }
+    };
+    var post = function(msg, origin) {
+      try {
+        // When the iframe is not loaded, IE raises an exception
+        // on 'contentWindow'.
+        setTimeout(function() {
+          if (iframe && iframe.contentWindow) {
+              iframe.contentWindow.postMessage(msg, origin);
+          }
+        }, 0);
+      } catch (x) {
+        // intentionally empty
+      }
+    };
+
+    doc.open();
+    doc.write('<html><s' + 'cript>' +
+              'document.domain="' + global.document.domain + '";' +
+              '</s' + 'cript></html>');
+    doc.close();
+    doc.parentWindow[module.exports.WPrefix] = global[module.exports.WPrefix];
+    var c = doc.createElement('div');
+    doc.body.appendChild(c);
+    iframe = doc.createElement('iframe');
+    c.appendChild(iframe);
+    iframe.src = iframeUrl;
+    iframe.onerror = function() {
+      onerror('onerror');
+    };
+    tref = setTimeout(function() {
+      onerror('timeout');
+    }, 15000);
+    unloadRef = eventUtils.unloadAdd(cleanup);
+    return {
+      post: post
+    , cleanup: cleanup
+    , loaded: unattach
+    };
+  }
+};
+
+module.exports.iframeEnabled = false;
+if (global.document) {
+  // postMessage misbehaves in konqueror 4.6.5 - the messages are delivered with
+  // huge delay, or not at all.
+  module.exports.iframeEnabled = (typeof global.postMessage === 'function' ||
+    typeof global.postMessage === 'object') && (!browser.isKonqueror());
+}
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/utils/iframe.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar eventUtils = require('./event')\n  , JSON3 = require('json3')\n  , browser = require('./browser')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:utils:iframe');\n}\n\nmodule.exports = {\n  WPrefix: '_jp'\n, currentWindowId: null\n\n, polluteGlobalNamespace: function() {\n    if (!(module.exports.WPrefix in global)) {\n      global[module.exports.WPrefix] = {};\n    }\n  }\n\n, postMessage: function(type, data) {\n    if (global.parent !== global) {\n      global.parent.postMessage(JSON3.stringify({\n        windowId: module.exports.currentWindowId\n      , type: type\n      , data: data || ''\n      }), '*');\n    } else {\n      debug('Cannot postMessage, no parent window.', type, data);\n    }\n  }\n\n, createIframe: function(iframeUrl, errorCallback) {\n    var iframe = global.document.createElement('iframe');\n    var tref, unloadRef;\n    var unattach = function() {\n      debug('unattach');\n      clearTimeout(tref);\n      // Explorer had problems with that.\n      try {\n        iframe.onload = null;\n      } catch (x) {\n        // intentionally empty\n      }\n      iframe.onerror = null;\n    };\n    var cleanup = function() {\n      debug('cleanup');\n      if (iframe) {\n        unattach();\n        // This timeout makes chrome fire onbeforeunload event\n        // within iframe. Without the timeout it goes straight to\n        // onunload.\n        setTimeout(function() {\n          if (iframe) {\n            iframe.parentNode.removeChild(iframe);\n          }\n          iframe = null;\n        }, 0);\n        eventUtils.unloadDel(unloadRef);\n      }\n    };\n    var onerror = function(err) {\n      debug('onerror', err);\n      if (iframe) {\n        cleanup();\n        errorCallback(err);\n      }\n    };\n    var post = function(msg, origin) {\n      debug('post', msg, origin);\n      try {\n        // When the iframe is not loaded, IE raises an exception\n        // on 'contentWindow'.\n        setTimeout(function() {\n          if (iframe && iframe.contentWindow) {\n            iframe.contentWindow.postMessage(msg, origin);\n          }\n        }, 0);\n      } catch (x) {\n        // intentionally empty\n      }\n    };\n\n    iframe.src = iframeUrl;\n    iframe.style.display = 'none';\n    iframe.style.position = 'absolute';\n    iframe.onerror = function() {\n      onerror('onerror');\n    };\n    iframe.onload = function() {\n      debug('onload');\n      // `onload` is triggered before scripts on the iframe are\n      // executed. Give it few seconds to actually load stuff.\n      clearTimeout(tref);\n      tref = setTimeout(function() {\n        onerror('onload timeout');\n      }, 2000);\n    };\n    global.document.body.appendChild(iframe);\n    tref = setTimeout(function() {\n      onerror('timeout');\n    }, 15000);\n    unloadRef = eventUtils.unloadAdd(cleanup);\n    return {\n      post: post\n    , cleanup: cleanup\n    , loaded: unattach\n    };\n  }\n\n/* jshint undef: false, newcap: false */\n/* eslint no-undef: 0, new-cap: 0 */\n, createHtmlfile: function(iframeUrl, errorCallback) {\n    var axo = ['Active'].concat('Object').join('X');\n    var doc = new global[axo]('htmlfile');\n    var tref, unloadRef;\n    var iframe;\n    var unattach = function() {\n      clearTimeout(tref);\n      iframe.onerror = null;\n    };\n    var cleanup = function() {\n      if (doc) {\n        unattach();\n        eventUtils.unloadDel(unloadRef);\n        iframe.parentNode.removeChild(iframe);\n        iframe = doc = null;\n        CollectGarbage();\n      }\n    };\n    var onerror = function(r) {\n      debug('onerror', r);\n      if (doc) {\n        cleanup();\n        errorCallback(r);\n      }\n    };\n    var post = function(msg, origin) {\n      try {\n        // When the iframe is not loaded, IE raises an exception\n        // on 'contentWindow'.\n        setTimeout(function() {\n          if (iframe && iframe.contentWindow) {\n              iframe.contentWindow.postMessage(msg, origin);\n          }\n        }, 0);\n      } catch (x) {\n        // intentionally empty\n      }\n    };\n\n    doc.open();\n    doc.write('<html><s' + 'cript>' +\n              'document.domain=\"' + global.document.domain + '\";' +\n              '</s' + 'cript></html>');\n    doc.close();\n    doc.parentWindow[module.exports.WPrefix] = global[module.exports.WPrefix];\n    var c = doc.createElement('div');\n    doc.body.appendChild(c);\n    iframe = doc.createElement('iframe');\n    c.appendChild(iframe);\n    iframe.src = iframeUrl;\n    iframe.onerror = function() {\n      onerror('onerror');\n    };\n    tref = setTimeout(function() {\n      onerror('timeout');\n    }, 15000);\n    unloadRef = eventUtils.unloadAdd(cleanup);\n    return {\n      post: post\n    , cleanup: cleanup\n    , loaded: unattach\n    };\n  }\n};\n\nmodule.exports.iframeEnabled = false;\nif (global.document) {\n  // postMessage misbehaves in konqueror 4.6.5 - the messages are delivered with\n  // huge delay, or not at all.\n  module.exports.iframeEnabled = (typeof global.postMessage === 'function' ||\n    typeof global.postMessage === 'object') && (!browser.isKonqueror());\n}\n"]}
+},{"./browser":44,"./event":46,"debug":54,"json3":58}],48:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var logObject = {};
+['log', 'debug', 'warn'].forEach(function (level) {
+  var levelExists;
+
+  try {
+    levelExists = global.console && global.console[level] && global.console[level].apply;
+  } catch(e) {
+    // do nothing
+  }
+
+  logObject[level] = levelExists ? function () {
+    return global.console[level].apply(global.console, arguments);
+  } : (level === 'log' ? function () {} : logObject.log);
+});
+
+module.exports = logObject;
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9sb2cuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBsb2dPYmplY3QgPSB7fTtcblsnbG9nJywgJ2RlYnVnJywgJ3dhcm4nXS5mb3JFYWNoKGZ1bmN0aW9uIChsZXZlbCkge1xuICB2YXIgbGV2ZWxFeGlzdHM7XG5cbiAgdHJ5IHtcbiAgICBsZXZlbEV4aXN0cyA9IGdsb2JhbC5jb25zb2xlICYmIGdsb2JhbC5jb25zb2xlW2xldmVsXSAmJiBnbG9iYWwuY29uc29sZVtsZXZlbF0uYXBwbHk7XG4gIH0gY2F0Y2goZSkge1xuICAgIC8vIGRvIG5vdGhpbmdcbiAgfVxuXG4gIGxvZ09iamVjdFtsZXZlbF0gPSBsZXZlbEV4aXN0cyA/IGZ1bmN0aW9uICgpIHtcbiAgICByZXR1cm4gZ2xvYmFsLmNvbnNvbGVbbGV2ZWxdLmFwcGx5KGdsb2JhbC5jb25zb2xlLCBhcmd1bWVudHMpO1xuICB9IDogKGxldmVsID09PSAnbG9nJyA/IGZ1bmN0aW9uICgpIHt9IDogbG9nT2JqZWN0LmxvZyk7XG59KTtcblxubW9kdWxlLmV4cG9ydHMgPSBsb2dPYmplY3Q7XG4iXX0=
+},{}],49:[function(require,module,exports){
+'use strict';
+
+module.exports = {
+  isObject: function(obj) {
+    var type = typeof obj;
+    return type === 'function' || type === 'object' && !!obj;
+  }
+
+, extend: function(obj) {
+    if (!this.isObject(obj)) {
+      return obj;
+    }
+    var source, prop;
+    for (var i = 1, length = arguments.length; i < length; i++) {
+      source = arguments[i];
+      for (prop in source) {
+        if (Object.prototype.hasOwnProperty.call(source, prop)) {
+          obj[prop] = source[prop];
+        }
+      }
+    }
+    return obj;
+  }
+};
+
+},{}],50:[function(require,module,exports){
+'use strict';
+
+/* global crypto:true */
+var crypto = require('crypto');
+
+// This string has length 32, a power of 2, so the modulus doesn't introduce a
+// bias.
+var _randomStringChars = 'abcdefghijklmnopqrstuvwxyz012345';
+module.exports = {
+  string: function(length) {
+    var max = _randomStringChars.length;
+    var bytes = crypto.randomBytes(length);
+    var ret = [];
+    for (var i = 0; i < length; i++) {
+      ret.push(_randomStringChars.substr(bytes[i] % max, 1));
+    }
+    return ret.join('');
+  }
+
+, number: function(max) {
+    return Math.floor(Math.random() * max);
+  }
+
+, numberString: function(max) {
+    var t = ('' + (max - 1)).length;
+    var p = new Array(t + 1).join('0');
+    return (p + this.number(max)).slice(-t);
+  }
+};
+
+},{"crypto":43}],51:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:utils:transport');
+}
+
+module.exports = function(availableTransports) {
+  return {
+    filterToEnabled: function(transportsWhitelist, info) {
+      var transports = {
+        main: []
+      , facade: []
+      };
+      if (!transportsWhitelist) {
+        transportsWhitelist = [];
+      } else if (typeof transportsWhitelist === 'string') {
+        transportsWhitelist = [transportsWhitelist];
+      }
+
+      availableTransports.forEach(function(trans) {
+        if (!trans) {
+          return;
+        }
+
+        if (trans.transportName === 'websocket' && info.websocket === false) {
+          debug('disabled from server', 'websocket');
+          return;
+        }
+
+        if (transportsWhitelist.length &&
+            transportsWhitelist.indexOf(trans.transportName) === -1) {
+          debug('not in whitelist', trans.transportName);
+          return;
+        }
+
+        if (trans.enabled(info)) {
+          debug('enabled', trans.transportName);
+          transports.main.push(trans);
+          if (trans.facadeTransport) {
+            transports.facade.push(trans.facadeTransport);
+          }
+        } else {
+          debug('disabled', trans.transportName);
+        }
+      });
+      return transports;
+    }
+  };
+};
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy90cmFuc3BvcnQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnV0aWxzOnRyYW5zcG9ydCcpO1xufVxuXG5tb2R1bGUuZXhwb3J0cyA9IGZ1bmN0aW9uKGF2YWlsYWJsZVRyYW5zcG9ydHMpIHtcbiAgcmV0dXJuIHtcbiAgICBmaWx0ZXJUb0VuYWJsZWQ6IGZ1bmN0aW9uKHRyYW5zcG9ydHNXaGl0ZWxpc3QsIGluZm8pIHtcbiAgICAgIHZhciB0cmFuc3BvcnRzID0ge1xuICAgICAgICBtYWluOiBbXVxuICAgICAgLCBmYWNhZGU6IFtdXG4gICAgICB9O1xuICAgICAgaWYgKCF0cmFuc3BvcnRzV2hpdGVsaXN0KSB7XG4gICAgICAgIHRyYW5zcG9ydHNXaGl0ZWxpc3QgPSBbXTtcbiAgICAgIH0gZWxzZSBpZiAodHlwZW9mIHRyYW5zcG9ydHNXaGl0ZWxpc3QgPT09ICdzdHJpbmcnKSB7XG4gICAgICAgIHRyYW5zcG9ydHNXaGl0ZWxpc3QgPSBbdHJhbnNwb3J0c1doaXRlbGlzdF07XG4gICAgICB9XG5cbiAgICAgIGF2YWlsYWJsZVRyYW5zcG9ydHMuZm9yRWFjaChmdW5jdGlvbih0cmFucykge1xuICAgICAgICBpZiAoIXRyYW5zKSB7XG4gICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKHRyYW5zLnRyYW5zcG9ydE5hbWUgPT09ICd3ZWJzb2NrZXQnICYmIGluZm8ud2Vic29ja2V0ID09PSBmYWxzZSkge1xuICAgICAgICAgIGRlYnVnKCdkaXNhYmxlZCBmcm9tIHNlcnZlcicsICd3ZWJzb2NrZXQnKTtcbiAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICBpZiAodHJhbnNwb3J0c1doaXRlbGlzdC5sZW5ndGggJiZcbiAgICAgICAgICAgIHRyYW5zcG9ydHNXaGl0ZWxpc3QuaW5kZXhPZih0cmFucy50cmFuc3BvcnROYW1lKSA9PT0gLTEpIHtcbiAgICAgICAgICBkZWJ1Zygnbm90IGluIHdoaXRlbGlzdCcsIHRyYW5zLnRyYW5zcG9ydE5hbWUpO1xuICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuXG4gICAgICAgIGlmICh0cmFucy5lbmFibGVkKGluZm8pKSB7XG4gICAgICAgICAgZGVidWcoJ2VuYWJsZWQnLCB0cmFucy50cmFuc3BvcnROYW1lKTtcbiAgICAgICAgICB0cmFuc3BvcnRzLm1haW4ucHVzaCh0cmFucyk7XG4gICAgICAgICAgaWYgKHRyYW5zLmZhY2FkZVRyYW5zcG9ydCkge1xuICAgICAgICAgICAgdHJhbnNwb3J0cy5mYWNhZGUucHVzaCh0cmFucy5mYWNhZGVUcmFuc3BvcnQpO1xuICAgICAgICAgIH1cbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICBkZWJ1ZygnZGlzYWJsZWQnLCB0cmFucy50cmFuc3BvcnROYW1lKTtcbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgICByZXR1cm4gdHJhbnNwb3J0cztcbiAgICB9XG4gIH07XG59O1xuIl19
+},{"debug":54}],52:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var URL = require('url-parse');
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:utils:url');
+}
+
+module.exports = {
+  getOrigin: function(url) {
+    if (!url) {
+      return null;
+    }
+
+    var p = new URL(url);
+    if (p.protocol === 'file:') {
+      return null;
+    }
+
+    var port = p.port;
+    if (!port) {
+      port = (p.protocol === 'https:') ? '443' : '80';
+    }
+
+    return p.protocol + '//' + p.hostname + ':' + port;
+  }
+
+, isOriginEqual: function(a, b) {
+    var res = this.getOrigin(a) === this.getOrigin(b);
+    debug('same', a, b, res);
+    return res;
+  }
+
+, isSchemeEqual: function(a, b) {
+    return (a.split(':')[0] === b.split(':')[0]);
+  }
+
+, addPath: function (url, path) {
+    var qs = url.split('?');
+    return qs[0] + path + (qs[1] ? '?' + qs[1] : '');
+  }
+
+, addQuery: function (url, q) {
+    return url + (url.indexOf('?') === -1 ? ('?' + q) : ('&' + q));
+  }
+};
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy91cmwuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgVVJMID0gcmVxdWlyZSgndXJsLXBhcnNlJyk7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6dXRpbHM6dXJsJyk7XG59XG5cbm1vZHVsZS5leHBvcnRzID0ge1xuICBnZXRPcmlnaW46IGZ1bmN0aW9uKHVybCkge1xuICAgIGlmICghdXJsKSB7XG4gICAgICByZXR1cm4gbnVsbDtcbiAgICB9XG5cbiAgICB2YXIgcCA9IG5ldyBVUkwodXJsKTtcbiAgICBpZiAocC5wcm90b2NvbCA9PT0gJ2ZpbGU6Jykge1xuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfVxuXG4gICAgdmFyIHBvcnQgPSBwLnBvcnQ7XG4gICAgaWYgKCFwb3J0KSB7XG4gICAgICBwb3J0ID0gKHAucHJvdG9jb2wgPT09ICdodHRwczonKSA/ICc0NDMnIDogJzgwJztcbiAgICB9XG5cbiAgICByZXR1cm4gcC5wcm90b2NvbCArICcvLycgKyBwLmhvc3RuYW1lICsgJzonICsgcG9ydDtcbiAgfVxuXG4sIGlzT3JpZ2luRXF1YWw6IGZ1bmN0aW9uKGEsIGIpIHtcbiAgICB2YXIgcmVzID0gdGhpcy5nZXRPcmlnaW4oYSkgPT09IHRoaXMuZ2V0T3JpZ2luKGIpO1xuICAgIGRlYnVnKCdzYW1lJywgYSwgYiwgcmVzKTtcbiAgICByZXR1cm4gcmVzO1xuICB9XG5cbiwgaXNTY2hlbWVFcXVhbDogZnVuY3Rpb24oYSwgYikge1xuICAgIHJldHVybiAoYS5zcGxpdCgnOicpWzBdID09PSBiLnNwbGl0KCc6JylbMF0pO1xuICB9XG5cbiwgYWRkUGF0aDogZnVuY3Rpb24gKHVybCwgcGF0aCkge1xuICAgIHZhciBxcyA9IHVybC5zcGxpdCgnPycpO1xuICAgIHJldHVybiBxc1swXSArIHBhdGggKyAocXNbMV0gPyAnPycgKyBxc1sxXSA6ICcnKTtcbiAgfVxuXG4sIGFkZFF1ZXJ5OiBmdW5jdGlvbiAodXJsLCBxKSB7XG4gICAgcmV0dXJuIHVybCArICh1cmwuaW5kZXhPZignPycpID09PSAtMSA/ICgnPycgKyBxKSA6ICgnJicgKyBxKSk7XG4gIH1cbn07XG4iXX0=
+},{"debug":54,"url-parse":59}],53:[function(require,module,exports){
+module.exports = '1.1.1';
+
+},{}],54:[function(require,module,exports){
+
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = require('./debug');
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+exports.storage = 'undefined' != typeof chrome
+               && 'undefined' != typeof chrome.storage
+                  ? chrome.storage.local
+                  : localstorage();
+
+/**
+ * Colors.
+ */
+
+exports.colors = [
+  'lightseagreen',
+  'forestgreen',
+  'goldenrod',
+  'dodgerblue',
+  'darkorchid',
+  'crimson'
+];
+
+/**
+ * Currently only WebKit-based Web Inspectors, Firefox >= v31,
+ * and the Firebug extension (any Firefox version) are known
+ * to support "%c" CSS customizations.
+ *
+ * TODO: add a `localStorage` variable to explicitly enable/disable colors
+ */
+
+function useColors() {
+  // is webkit? http://stackoverflow.com/a/16459606/376773
+  return ('WebkitAppearance' in document.documentElement.style) ||
+    // is firebug? http://stackoverflow.com/a/398120/376773
+    (window.console && (console.firebug || (console.exception && console.table))) ||
+    // is firefox >= v31?
+    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
+    (navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31);
+}
+
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
+
+exports.formatters.j = function(v) {
+  return JSON.stringify(v);
+};
+
+
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs() {
+  var args = arguments;
+  var useColors = this.useColors;
+
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
+
+  if (!useColors) return args;
+
+  var c = 'color: ' + this.color;
+  args = [args[0], c, 'color: inherit'].concat(Array.prototype.slice.call(args, 1));
+
+  // the final "%c" is somewhat tricky, because there could be other
+  // arguments passed either before or after the %c, so we need to
+  // figure out the correct index to insert the CSS into
+  var index = 0;
+  var lastC = 0;
+  args[0].replace(/%[a-z%]/g, function(match) {
+    if ('%%' === match) return;
+    index++;
+    if ('%c' === match) {
+      // we only are interested in the *last* %c
+      // (the user may have provided their own)
+      lastC = index;
+    }
+  });
+
+  args.splice(lastC, 0, c);
+  return args;
+}
+
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
+
+function log() {
+  // this hackery is required for IE8/9, where
+  // the `console.log` function doesn't have 'apply'
+  return 'object' === typeof console
+    && console.log
+    && Function.prototype.apply.call(console.log, console, arguments);
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
+  return r;
+}
+
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
+
+exports.enable(load());
+
+/**
+ * Localstorage attempts to return the localstorage.
+ *
+ * This is necessary because safari throws
+ * when a user disables cookies/localstorage
+ * and you attempt to access it.
+ *
+ * @return {LocalStorage}
+ * @api private
+ */
+
+function localstorage(){
+  try {
+    return window.localStorage;
+  } catch (e) {}
+}
+
+},{"./debug":55}],55:[function(require,module,exports){
+
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = debug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = require('ms');
+
+/**
+ * The currently active debug mode names, and names to skip.
+ */
+
+exports.names = [];
+exports.skips = [];
+
+/**
+ * Map of special "%n" handling functions, for the debug "format" argument.
+ *
+ * Valid key names are a single, lowercased letter, i.e. "n".
+ */
+
+exports.formatters = {};
+
+/**
+ * Previously assigned color.
+ */
+
+var prevColor = 0;
+
+/**
+ * Previous log timestamp.
+ */
+
+var prevTime;
+
+/**
+ * Select a color.
+ *
+ * @return {Number}
+ * @api private
+ */
+
+function selectColor() {
+  return exports.colors[prevColor++ % exports.colors.length];
+}
+
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
+
+function debug(namespace) {
+
+  // define the `disabled` version
+  function disabled() {
+  }
+  disabled.enabled = false;
+
+  // define the `enabled` version
+  function enabled() {
+
+    var self = enabled;
+
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
+
+    // add the `color` if not set
+    if (null == self.useColors) self.useColors = exports.useColors();
+    if (null == self.color && self.useColors) self.color = selectColor();
+
+    var args = Array.prototype.slice.call(arguments);
+
+    args[0] = exports.coerce(args[0]);
+
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %o
+      args = ['%o'].concat(args);
+    }
+
+    // apply any `formatters` transformations
+    var index = 0;
+    args[0] = args[0].replace(/%([a-z%])/g, function(match, format) {
+      // if we encounter an escaped % then don't increase the array index
+      if (match === '%%') return match;
+      index++;
+      var formatter = exports.formatters[format];
+      if ('function' === typeof formatter) {
+        var val = args[index];
+        match = formatter.call(self, val);
+
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
+
+    if ('function' === typeof exports.formatArgs) {
+      args = exports.formatArgs.apply(self, args);
+    }
+    var logFn = enabled.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
+  enabled.enabled = true;
+
+  var fn = exports.enabled(namespace) ? enabled : disabled;
+
+  fn.namespace = namespace;
+
+  return fn;
+}
+
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
+
+function enable(namespaces) {
+  exports.save(namespaces);
+
+  var split = (namespaces || '').split(/[\s,]+/);
+  var len = split.length;
+
+  for (var i = 0; i < len; i++) {
+    if (!split[i]) continue; // ignore empty strings
+    namespaces = split[i].replace(/\*/g, '.*?');
+    if (namespaces[0] === '-') {
+      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+    } else {
+      exports.names.push(new RegExp('^' + namespaces + '$'));
+    }
+  }
+}
+
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
+
+function disable() {
+  exports.enable('');
+}
+
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
+
+function enabled(name) {
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
+    }
+  }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
+
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
+
+},{"ms":56}],56:[function(require,module,exports){
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} options
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options){
+  options = options || {};
+  if ('string' == typeof val) return parse(val);
+  return options.long
+    ? long(val)
+    : short(val);
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  str = '' + str;
+  if (str.length > 10000) return;
+  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(str);
+  if (!match) return;
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'yrs':
+    case 'yr':
+    case 'y':
+      return n * y;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'hrs':
+    case 'hr':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'mins':
+    case 'min':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 'secs':
+    case 'sec':
+    case 's':
+      return n * s;
+    case 'milliseconds':
+    case 'millisecond':
+    case 'msecs':
+    case 'msec':
+    case 'ms':
+      return n;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function short(ms) {
+  if (ms >= d) return Math.round(ms / d) + 'd';
+  if (ms >= h) return Math.round(ms / h) + 'h';
+  if (ms >= m) return Math.round(ms / m) + 'm';
+  if (ms >= s) return Math.round(ms / s) + 's';
+  return ms + 'ms';
+}
+
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function long(ms) {
+  return plural(ms, d, 'day')
+    || plural(ms, h, 'hour')
+    || plural(ms, m, 'minute')
+    || plural(ms, s, 'second')
+    || ms + ' ms';
+}
+
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, n, name) {
+  if (ms < n) return;
+  if (ms < n * 1.5) return Math.floor(ms / n) + ' ' + name;
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
+
+},{}],57:[function(require,module,exports){
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
+} else {
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
+}
+
+},{}],58:[function(require,module,exports){
+(function (global){
+/*! JSON v3.3.2 | http://bestiejs.github.io/json3 | Copyright 2012-2014, Kit Cambridge | http://kit.mit-license.org */
+;(function () {
+  // Detect the `define` function exposed by asynchronous module loaders. The
+  // strict `define` check is necessary for compatibility with `r.js`.
+  var isLoader = typeof define === "function" && define.amd;
+
+  // A set of types used to distinguish objects from primitives.
+  var objectTypes = {
+    "function": true,
+    "object": true
+  };
+
+  // Detect the `exports` object exposed by CommonJS implementations.
+  var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;
+
+  // Use the `global` object exposed by Node (including Browserify via
+  // `insert-module-globals`), Narwhal, and Ringo as the default context,
+  // and the `window` object in browsers. Rhino exports a `global` function
+  // instead.
+  var root = objectTypes[typeof window] && window || this,
+      freeGlobal = freeExports && objectTypes[typeof module] && module && !module.nodeType && typeof global == "object" && global;
+
+  if (freeGlobal && (freeGlobal["global"] === freeGlobal || freeGlobal["window"] === freeGlobal || freeGlobal["self"] === freeGlobal)) {
+    root = freeGlobal;
+  }
+
+  // Public: Initializes JSON 3 using the given `context` object, attaching the
+  // `stringify` and `parse` functions to the specified `exports` object.
+  function runInContext(context, exports) {
+    context || (context = root["Object"]());
+    exports || (exports = root["Object"]());
+
+    // Native constructor aliases.
+    var Number = context["Number"] || root["Number"],
+        String = context["String"] || root["String"],
+        Object = context["Object"] || root["Object"],
+        Date = context["Date"] || root["Date"],
+        SyntaxError = context["SyntaxError"] || root["SyntaxError"],
+        TypeError = context["TypeError"] || root["TypeError"],
+        Math = context["Math"] || root["Math"],
+        nativeJSON = context["JSON"] || root["JSON"];
+
+    // Delegate to the native `stringify` and `parse` implementations.
+    if (typeof nativeJSON == "object" && nativeJSON) {
+      exports.stringify = nativeJSON.stringify;
+      exports.parse = nativeJSON.parse;
+    }
+
+    // Convenience aliases.
+    var objectProto = Object.prototype,
+        getClass = objectProto.toString,
+        isProperty, forEach, undef;
+
+    // Test the `Date#getUTC*` methods. Based on work by @Yaffle.
+    var isExtended = new Date(-3509827334573292);
+    try {
+      // The `getUTCFullYear`, `Month`, and `Date` methods return nonsensical
+      // results for certain dates in Opera >= 10.53.
+      isExtended = isExtended.getUTCFullYear() == -109252 && isExtended.getUTCMonth() === 0 && isExtended.getUTCDate() === 1 &&
+        // Safari < 2.0.2 stores the internal millisecond time value correctly,
+        // but clips the values returned by the date methods to the range of
+        // signed 32-bit integers ([-2 ** 31, 2 ** 31 - 1]).
+        isExtended.getUTCHours() == 10 && isExtended.getUTCMinutes() == 37 && isExtended.getUTCSeconds() == 6 && isExtended.getUTCMilliseconds() == 708;
+    } catch (exception) {}
+
+    // Internal: Determines whether the native `JSON.stringify` and `parse`
+    // implementations are spec-compliant. Based on work by Ken Snyder.
+    function has(name) {
+      if (has[name] !== undef) {
+        // Return cached feature test result.
+        return has[name];
+      }
+      var isSupported;
+      if (name == "bug-string-char-index") {
+        // IE <= 7 doesn't support accessing string characters using square
+        // bracket notation. IE 8 only supports this for primitives.
+        isSupported = "a"[0] != "a";
+      } else if (name == "json") {
+        // Indicates whether both `JSON.stringify` and `JSON.parse` are
+        // supported.
+        isSupported = has("json-stringify") && has("json-parse");
+      } else {
+        var value, serialized = '{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';
+        // Test `JSON.stringify`.
+        if (name == "json-stringify") {
+          var stringify = exports.stringify, stringifySupported = typeof stringify == "function" && isExtended;
+          if (stringifySupported) {
+            // A test function object with a custom `toJSON` method.
+            (value = function () {
+              return 1;
+            }).toJSON = value;
+            try {
+              stringifySupported =
+                // Firefox 3.1b1 and b2 serialize string, number, and boolean
+                // primitives as object literals.
+                stringify(0) === "0" &&
+                // FF 3.1b1, b2, and JSON 2 serialize wrapped primitives as object
+                // literals.
+                stringify(new Number()) === "0" &&
+                stringify(new String()) == '""' &&
+                // FF 3.1b1, 2 throw an error if the value is `null`, `undefined`, or
+                // does not define a canonical JSON representation (this applies to
+                // objects with `toJSON` properties as well, *unless* they are nested
+                // within an object or array).
+                stringify(getClass) === undef &&
+                // IE 8 serializes `undefined` as `"undefined"`. Safari <= 5.1.7 and
+                // FF 3.1b3 pass this test.
+                stringify(undef) === undef &&
+                // Safari <= 5.1.7 and FF 3.1b3 throw `Error`s and `TypeError`s,
+                // respectively, if the value is omitted entirely.
+                stringify() === undef &&
+                // FF 3.1b1, 2 throw an error if the given value is not a number,
+                // string, array, object, Boolean, or `null` literal. This applies to
+                // objects with custom `toJSON` methods as well, unless they are nested
+                // inside object or array literals. YUI 3.0.0b1 ignores custom `toJSON`
+                // methods entirely.
+                stringify(value) === "1" &&
+                stringify([value]) == "[1]" &&
+                // Prototype <= 1.6.1 serializes `[undefined]` as `"[]"` instead of
+                // `"[null]"`.
+                stringify([undef]) == "[null]" &&
+                // YUI 3.0.0b1 fails to serialize `null` literals.
+                stringify(null) == "null" &&
+                // FF 3.1b1, 2 halts serialization if an array contains a function:
+                // `[1, true, getClass, 1]` serializes as "[1,true,],". FF 3.1b3
+                // elides non-JSON values from objects and arrays, unless they
+                // define custom `toJSON` methods.
+                stringify([undef, getClass, null]) == "[null,null,null]" &&
+                // Simple serialization test. FF 3.1b1 uses Unicode escape sequences
+                // where character escape codes are expected (e.g., `\b` => `\u0008`).
+                stringify({ "a": [value, true, false, null, "\x00\b\n\f\r\t"] }) == serialized &&
+                // FF 3.1b1 and b2 ignore the `filter` and `width` arguments.
+                stringify(null, value) === "1" &&
+                stringify([1, 2], null, 1) == "[\n 1,\n 2\n]" &&
+                // JSON 2, Prototype <= 1.7, and older WebKit builds incorrectly
+                // serialize extended years.
+                stringify(new Date(-8.64e15)) == '"-271821-04-20T00:00:00.000Z"' &&
+                // The milliseconds are optional in ES 5, but required in 5.1.
+                stringify(new Date(8.64e15)) == '"+275760-09-13T00:00:00.000Z"' &&
+                // Firefox <= 11.0 incorrectly serializes years prior to 0 as negative
+                // four-digit years instead of six-digit years. Credits: @Yaffle.
+                stringify(new Date(-621987552e5)) == '"-000001-01-01T00:00:00.000Z"' &&
+                // Safari <= 5.1.5 and Opera >= 10.53 incorrectly serialize millisecond
+                // values less than 1000. Credits: @Yaffle.
+                stringify(new Date(-1)) == '"1969-12-31T23:59:59.999Z"';
+            } catch (exception) {
+              stringifySupported = false;
+            }
+          }
+          isSupported = stringifySupported;
+        }
+        // Test `JSON.parse`.
+        if (name == "json-parse") {
+          var parse = exports.parse;
+          if (typeof parse == "function") {
+            try {
+              // FF 3.1b1, b2 will throw an exception if a bare literal is provided.
+              // Conforming implementations should also coerce the initial argument to
+              // a string prior to parsing.
+              if (parse("0") === 0 && !parse(false)) {
+                // Simple parsing test.
+                value = parse(serialized);
+                var parseSupported = value["a"].length == 5 && value["a"][0] === 1;
+                if (parseSupported) {
+                  try {
+                    // Safari <= 5.1.2 and FF 3.1b1 allow unescaped tabs in strings.
+                    parseSupported = !parse('"\t"');
+                  } catch (exception) {}
+                  if (parseSupported) {
+                    try {
+                      // FF 4.0 and 4.0.1 allow leading `+` signs and leading
+                      // decimal points. FF 4.0, 4.0.1, and IE 9-10 also allow
+                      // certain octal literals.
+                      parseSupported = parse("01") !== 1;
+                    } catch (exception) {}
+                  }
+                  if (parseSupported) {
+                    try {
+                      // FF 4.0, 4.0.1, and Rhino 1.7R3-R4 allow trailing decimal
+                      // points. These environments, along with FF 3.1b1 and 2,
+                      // also allow trailing commas in JSON objects and arrays.
+                      parseSupported = parse("1.") !== 1;
+                    } catch (exception) {}
+                  }
+                }
+              }
+            } catch (exception) {
+              parseSupported = false;
+            }
+          }
+          isSupported = parseSupported;
+        }
+      }
+      return has[name] = !!isSupported;
+    }
+
+    if (!has("json")) {
+      // Common `[[Class]]` name aliases.
+      var functionClass = "[object Function]",
+          dateClass = "[object Date]",
+          numberClass = "[object Number]",
+          stringClass = "[object String]",
+          arrayClass = "[object Array]",
+          booleanClass = "[object Boolean]";
+
+      // Detect incomplete support for accessing string characters by index.
+      var charIndexBuggy = has("bug-string-char-index");
+
+      // Define additional utility methods if the `Date` methods are buggy.
+      if (!isExtended) {
+        var floor = Math.floor;
+        // A mapping between the months of the year and the number of days between
+        // January 1st and the first of the respective month.
+        var Months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334];
+        // Internal: Calculates the number of days between the Unix epoch and the
+        // first day of the given month.
+        var getDay = function (year, month) {
+          return Months[month] + 365 * (year - 1970) + floor((year - 1969 + (month = +(month > 1))) / 4) - floor((year - 1901 + month) / 100) + floor((year - 1601 + month) / 400);
+        };
+      }
+
+      // Internal: Determines if a property is a direct property of the given
+      // object. Delegates to the native `Object#hasOwnProperty` method.
+      if (!(isProperty = objectProto.hasOwnProperty)) {
+        isProperty = function (property) {
+          var members = {}, constructor;
+          if ((members.__proto__ = null, members.__proto__ = {
+            // The *proto* property cannot be set multiple times in recent
+            // versions of Firefox and SeaMonkey.
+            "toString": 1
+          }, members).toString != getClass) {
+            // Safari <= 2.0.3 doesn't implement `Object#hasOwnProperty`, but
+            // supports the mutable *proto* property.
+            isProperty = function (property) {
+              // Capture and break the object's prototype chain (see section 8.6.2
+              // of the ES 5.1 spec). The parenthesized expression prevents an
+              // unsafe transformation by the Closure Compiler.
+              var original = this.__proto__, result = property in (this.__proto__ = null, this);
+              // Restore the original prototype chain.
+              this.__proto__ = original;
+              return result;
+            };
+          } else {
+            // Capture a reference to the top-level `Object` constructor.
+            constructor = members.constructor;
+            // Use the `constructor` property to simulate `Object#hasOwnProperty` in
+            // other environments.
+            isProperty = function (property) {
+              var parent = (this.constructor || constructor).prototype;
+              return property in this && !(property in parent && this[property] === parent[property]);
+            };
+          }
+          members = null;
+          return isProperty.call(this, property);
+        };
+      }
+
+      // Internal: Normalizes the `for...in` iteration algorithm across
+      // environments. Each enumerated key is yielded to a `callback` function.
+      forEach = function (object, callback) {
+        var size = 0, Properties, members, property;
+
+        // Tests for bugs in the current environment's `for...in` algorithm. The
+        // `valueOf` property inherits the non-enumerable flag from
+        // `Object.prototype` in older versions of IE, Netscape, and Mozilla.
+        (Properties = function () {
+          this.valueOf = 0;
+        }).prototype.valueOf = 0;
+
+        // Iterate over a new instance of the `Properties` class.
+        members = new Properties();
+        for (property in members) {
+          // Ignore all properties inherited from `Object.prototype`.
+          if (isProperty.call(members, property)) {
+            size++;
+          }
+        }
+        Properties = members = null;
+
+        // Normalize the iteration algorithm.
+        if (!size) {
+          // A list of non-enumerable properties inherited from `Object.prototype`.
+          members = ["valueOf", "toString", "toLocaleString", "propertyIsEnumerable", "isPrototypeOf", "hasOwnProperty", "constructor"];
+          // IE <= 8, Mozilla 1.0, and Netscape 6.2 ignore shadowed non-enumerable
+          // properties.
+          forEach = function (object, callback) {
+            var isFunction = getClass.call(object) == functionClass, property, length;
+            var hasProperty = !isFunction && typeof object.constructor != "function" && objectTypes[typeof object.hasOwnProperty] && object.hasOwnProperty || isProperty;
+            for (property in object) {
+              // Gecko <= 1.0 enumerates the `prototype` property of functions under
+              // certain conditions; IE does not.
+              if (!(isFunction && property == "prototype") && hasProperty.call(object, property)) {
+                callback(property);
+              }
+            }
+            // Manually invoke the callback for each non-enumerable property.
+            for (length = members.length; property = members[--length]; hasProperty.call(object, property) && callback(property));
+          };
+        } else if (size == 2) {
+          // Safari <= 2.0.4 enumerates shadowed properties twice.
+          forEach = function (object, callback) {
+            // Create a set of iterated properties.
+            var members = {}, isFunction = getClass.call(object) == functionClass, property;
+            for (property in object) {
+              // Store each property name to prevent double enumeration. The
+              // `prototype` property of functions is not enumerated due to cross-
+              // environment inconsistencies.
+              if (!(isFunction && property == "prototype") && !isProperty.call(members, property) && (members[property] = 1) && isProperty.call(object, property)) {
+                callback(property);
+              }
+            }
+          };
+        } else {
+          // No bugs detected; use the standard `for...in` algorithm.
+          forEach = function (object, callback) {
+            var isFunction = getClass.call(object) == functionClass, property, isConstructor;
+            for (property in object) {
+              if (!(isFunction && property == "prototype") && isProperty.call(object, property) && !(isConstructor = property === "constructor")) {
+                callback(property);
+              }
+            }
+            // Manually invoke the callback for the `constructor` property due to
+            // cross-environment inconsistencies.
+            if (isConstructor || isProperty.call(object, (property = "constructor"))) {
+              callback(property);
+            }
+          };
+        }
+        return forEach(object, callback);
+      };
+
+      // Public: Serializes a JavaScript `value` as a JSON string. The optional
+      // `filter` argument may specify either a function that alters how object and
+      // array members are serialized, or an array of strings and numbers that
+      // indicates which properties should be serialized. The optional `width`
+      // argument may be either a string or number that specifies the indentation
+      // level of the output.
+      if (!has("json-stringify")) {
+        // Internal: A map of control characters and their escaped equivalents.
+        var Escapes = {
+          92: "\\\\",
+          34: '\\"',
+          8: "\\b",
+          12: "\\f",
+          10: "\\n",
+          13: "\\r",
+          9: "\\t"
+        };
+
+        // Internal: Converts `value` into a zero-padded string such that its
+        // length is at least equal to `width`. The `width` must be <= 6.
+        var leadingZeroes = "000000";
+        var toPaddedString = function (width, value) {
+          // The `|| 0` expression is necessary to work around a bug in
+          // Opera <= 7.54u2 where `0 == -0`, but `String(-0) !== "0"`.
+          return (leadingZeroes + (value || 0)).slice(-width);
+        };
+
+        // Internal: Double-quotes a string `value`, replacing all ASCII control
+        // characters (characters with code unit values between 0 and 31) with
+        // their escaped equivalents. This is an implementation of the
+        // `Quote(value)` operation defined in ES 5.1 section 15.12.3.
+        var unicodePrefix = "\\u00";
+        var quote = function (value) {
+          var result = '"', index = 0, length = value.length, useCharIndex = !charIndexBuggy || length > 10;
+          var symbols = useCharIndex && (charIndexBuggy ? value.split("") : value);
+          for (; index < length; index++) {
+            var charCode = value.charCodeAt(index);
+            // If the character is a control character, append its Unicode or
+            // shorthand escape sequence; otherwise, append the character as-is.
+            switch (charCode) {
+              case 8: case 9: case 10: case 12: case 13: case 34: case 92:
+                result += Escapes[charCode];
+                break;
+              default:
+                if (charCode < 32) {
+                  result += unicodePrefix + toPaddedString(2, charCode.toString(16));
+                  break;
+                }
+                result += useCharIndex ? symbols[index] : value.charAt(index);
+            }
+          }
+          return result + '"';
+        };
+
+        // Internal: Recursively serializes an object. Implements the
+        // `Str(key, holder)`, `JO(value)`, and `JA(value)` operations.
+        var serialize = function (property, object, callback, properties, whitespace, indentation, stack) {
+          var value, className, year, month, date, time, hours, minutes, seconds, milliseconds, results, element, index, length, prefix, result;
+          try {
+            // Necessary for host object support.
+            value = object[property];
+          } catch (exception) {}
+          if (typeof value == "object" && value) {
+            className = getClass.call(value);
+            if (className == dateClass && !isProperty.call(value, "toJSON")) {
+              if (value > -1 / 0 && value < 1 / 0) {
+                // Dates are serialized according to the `Date#toJSON` method
+                // specified in ES 5.1 section 15.9.5.44. See section 15.9.1.15
+                // for the ISO 8601 date time string format.
+                if (getDay) {
+                  // Manually compute the year, month, date, hours, minutes,
+                  // seconds, and milliseconds if the `getUTC*` methods are
+                  // buggy. Adapted from @Yaffle's `date-shim` project.
+                  date = floor(value / 864e5);
+                  for (year = floor(date / 365.2425) + 1970 - 1; getDay(year + 1, 0) <= date; year++);
+                  for (month = floor((date - getDay(year, 0)) / 30.42); getDay(year, month + 1) <= date; month++);
+                  date = 1 + date - getDay(year, month);
+                  // The `time` value specifies the time within the day (see ES
+                  // 5.1 section 15.9.1.2). The formula `(A % B + B) % B` is used
+                  // to compute `A modulo B`, as the `%` operator does not
+                  // correspond to the `modulo` operation for negative numbers.
+                  time = (value % 864e5 + 864e5) % 864e5;
+                  // The hours, minutes, seconds, and milliseconds are obtained by
+                  // decomposing the time within the day. See section 15.9.1.10.
+                  hours = floor(time / 36e5) % 24;
+                  minutes = floor(time / 6e4) % 60;
+                  seconds = floor(time / 1e3) % 60;
+                  milliseconds = time % 1e3;
+                } else {
+                  year = value.getUTCFullYear();
+                  month = value.getUTCMonth();
+                  date = value.getUTCDate();
+                  hours = value.getUTCHours();
+                  minutes = value.getUTCMinutes();
+                  seconds = value.getUTCSeconds();
+                  milliseconds = value.getUTCMilliseconds();
+                }
+                // Serialize extended years correctly.
+                value = (year <= 0 || year >= 1e4 ? (year < 0 ? "-" : "+") + toPaddedString(6, year < 0 ? -year : year) : toPaddedString(4, year)) +
+                  "-" + toPaddedString(2, month + 1) + "-" + toPaddedString(2, date) +
+                  // Months, dates, hours, minutes, and seconds should have two
+                  // digits; milliseconds should have three.
+                  "T" + toPaddedString(2, hours) + ":" + toPaddedString(2, minutes) + ":" + toPaddedString(2, seconds) +
+                  // Milliseconds are optional in ES 5.0, but required in 5.1.
+                  "." + toPaddedString(3, milliseconds) + "Z";
+              } else {
+                value = null;
+              }
+            } else if (typeof value.toJSON == "function" && ((className != numberClass && className != stringClass && className != arrayClass) || isProperty.call(value, "toJSON"))) {
+              // Prototype <= 1.6.1 adds non-standard `toJSON` methods to the
+              // `Number`, `String`, `Date`, and `Array` prototypes. JSON 3
+              // ignores all `toJSON` methods on these objects unless they are
+              // defined directly on an instance.
+              value = value.toJSON(property);
+            }
+          }
+          if (callback) {
+            // If a replacement function was provided, call it to obtain the value
+            // for serialization.
+            value = callback.call(object, property, value);
+          }
+          if (value === null) {
+            return "null";
+          }
+          className = getClass.call(value);
+          if (className == booleanClass) {
+            // Booleans are represented literally.
+            return "" + value;
+          } else if (className == numberClass) {
+            // JSON numbers must be finite. `Infinity` and `NaN` are serialized as
+            // `"null"`.
+            return value > -1 / 0 && value < 1 / 0 ? "" + value : "null";
+          } else if (className == stringClass) {
+            // Strings are double-quoted and escaped.
+            return quote("" + value);
+          }
+          // Recursively serialize objects and arrays.
+          if (typeof value == "object") {
+            // Check for cyclic structures. This is a linear search; performance
+            // is inversely proportional to the number of unique nested objects.
+            for (length = stack.length; length--;) {
+              if (stack[length] === value) {
+                // Cyclic structures cannot be serialized by `JSON.stringify`.
+                throw TypeError();
+              }
+            }
+            // Add the object to the stack of traversed objects.
+            stack.push(value);
+            results = [];
+            // Save the current indentation level and indent one additional level.
+            prefix = indentation;
+            indentation += whitespace;
+            if (className == arrayClass) {
+              // Recursively serialize array elements.
+              for (index = 0, length = value.length; index < length; index++) {
+                element = serialize(index, value, callback, properties, whitespace, indentation, stack);
+                results.push(element === undef ? "null" : element);
+              }
+              result = results.length ? (whitespace ? "[\n" + indentation + results.join(",\n" + indentation) + "\n" + prefix + "]" : ("[" + results.join(",") + "]")) : "[]";
+            } else {
+              // Recursively serialize object members. Members are selected from
+              // either a user-specified list of property names, or the object
+              // itself.
+              forEach(properties || value, function (property) {
+                var element = serialize(property, value, callback, properties, whitespace, indentation, stack);
+                if (element !== undef) {
+                  // According to ES 5.1 section 15.12.3: "If `gap` {whitespace}
+                  // is not the empty string, let `member` {quote(property) + ":"}
+                  // be the concatenation of `member` and the `space` character."
+                  // The "`space` character" refers to the literal space
+                  // character, not the `space` {width} argument provided to
+                  // `JSON.stringify`.
+                  results.push(quote(property) + ":" + (whitespace ? " " : "") + element);
+                }
+              });
+              result = results.length ? (whitespace ? "{\n" + indentation + results.join(",\n" + indentation) + "\n" + prefix + "}" : ("{" + results.join(",") + "}")) : "{}";
+            }
+            // Remove the object from the traversed object stack.
+            stack.pop();
+            return result;
+          }
+        };
+
+        // Public: `JSON.stringify`. See ES 5.1 section 15.12.3.
+        exports.stringify = function (source, filter, width) {
+          var whitespace, callback, properties, className;
+          if (objectTypes[typeof filter] && filter) {
+            if ((className = getClass.call(filter)) == functionClass) {
+              callback = filter;
+            } else if (className == arrayClass) {
+              // Convert the property names array into a makeshift set.
+              properties = {};
+              for (var index = 0, length = filter.length, value; index < length; value = filter[index++], ((className = getClass.call(value)), className == stringClass || className == numberClass) && (properties[value] = 1));
+            }
+          }
+          if (width) {
+            if ((className = getClass.call(width)) == numberClass) {
+              // Convert the `width` to an integer and create a string containing
+              // `width` number of space characters.
+              if ((width -= width % 1) > 0) {
+                for (whitespace = "", width > 10 && (width = 10); whitespace.length < width; whitespace += " ");
+              }
+            } else if (className == stringClass) {
+              whitespace = width.length <= 10 ? width : width.slice(0, 10);
+            }
+          }
+          // Opera <= 7.54u2 discards the values associated with empty string keys
+          // (`""`) only if they are used directly within an object member list
+          // (e.g., `!("" in { "": 1})`).
+          return serialize("", (value = {}, value[""] = source, value), callback, properties, whitespace, "", []);
+        };
+      }
+
+      // Public: Parses a JSON source string.
+      if (!has("json-parse")) {
+        var fromCharCode = String.fromCharCode;
+
+        // Internal: A map of escaped control characters and their unescaped
+        // equivalents.
+        var Unescapes = {
+          92: "\\",
+          34: '"',
+          47: "/",
+          98: "\b",
+          116: "\t",
+          110: "\n",
+          102: "\f",
+          114: "\r"
+        };
+
+        // Internal: Stores the parser state.
+        var Index, Source;
+
+        // Internal: Resets the parser state and throws a `SyntaxError`.
+        var abort = function () {
+          Index = Source = null;
+          throw SyntaxError();
+        };
+
+        // Internal: Returns the next token, or `"$"` if the parser has reached
+        // the end of the source string. A token may be a string, number, `null`
+        // literal, or Boolean literal.
+        var lex = function () {
+          var source = Source, length = source.length, value, begin, position, isSigned, charCode;
+          while (Index < length) {
+            charCode = source.charCodeAt(Index);
+            switch (charCode) {
+              case 9: case 10: case 13: case 32:
+                // Skip whitespace tokens, including tabs, carriage returns, line
+                // feeds, and space characters.
+                Index++;
+                break;
+              case 123: case 125: case 91: case 93: case 58: case 44:
+                // Parse a punctuator token (`{`, `}`, `[`, `]`, `:`, or `,`) at
+                // the current position.
+                value = charIndexBuggy ? source.charAt(Index) : source[Index];
+                Index++;
+                return value;
+              case 34:
+                // `"` delimits a JSON string; advance to the next character and
+                // begin parsing the string. String tokens are prefixed with the
+                // sentinel `@` character to distinguish them from punctuators and
+                // end-of-string tokens.
+                for (value = "@", Index++; Index < length;) {
+                  charCode = source.charCodeAt(Index);
+                  if (charCode < 32) {
+                    // Unescaped ASCII control characters (those with a code unit
+                    // less than the space character) are not permitted.
+                    abort();
+                  } else if (charCode == 92) {
+                    // A reverse solidus (`\`) marks the beginning of an escaped
+                    // control character (including `"`, `\`, and `/`) or Unicode
+                    // escape sequence.
+                    charCode = source.charCodeAt(++Index);
+                    switch (charCode) {
+                      case 92: case 34: case 47: case 98: case 116: case 110: case 102: case 114:
+                        // Revive escaped control characters.
+                        value += Unescapes[charCode];
+                        Index++;
+                        break;
+                      case 117:
+                        // `\u` marks the beginning of a Unicode escape sequence.
+                        // Advance to the first character and validate the
+                        // four-digit code point.
+                        begin = ++Index;
+                        for (position = Index + 4; Index < position; Index++) {
+                          charCode = source.charCodeAt(Index);
+                          // A valid sequence comprises four hexdigits (case-
+                          // insensitive) that form a single hexadecimal value.
+                          if (!(charCode >= 48 && charCode <= 57 || charCode >= 97 && charCode <= 102 || charCode >= 65 && charCode <= 70)) {
+                            // Invalid Unicode escape sequence.
+                            abort();
+                          }
+                        }
+                        // Revive the escaped character.
+                        value += fromCharCode("0x" + source.slice(begin, Index));
+                        break;
+                      default:
+                        // Invalid escape sequence.
+                        abort();
+                    }
+                  } else {
+                    if (charCode == 34) {
+                      // An unescaped double-quote character marks the end of the
+                      // string.
+                      break;
+                    }
+                    charCode = source.charCodeAt(Index);
+                    begin = Index;
+                    // Optimize for the common case where a string is valid.
+                    while (charCode >= 32 && charCode != 92 && charCode != 34) {
+                      charCode = source.charCodeAt(++Index);
+                    }
+                    // Append the string as-is.
+                    value += source.slice(begin, Index);
+                  }
+                }
+                if (source.charCodeAt(Index) == 34) {
+                  // Advance to the next character and return the revived string.
+                  Index++;
+                  return value;
+                }
+                // Unterminated string.
+                abort();
+              default:
+                // Parse numbers and literals.
+                begin = Index;
+                // Advance past the negative sign, if one is specified.
+                if (charCode == 45) {
+                  isSigned = true;
+                  charCode = source.charCodeAt(++Index);
+                }
+                // Parse an integer or floating-point value.
+                if (charCode >= 48 && charCode <= 57) {
+                  // Leading zeroes are interpreted as octal literals.
+                  if (charCode == 48 && ((charCode = source.charCodeAt(Index + 1)), charCode >= 48 && charCode <= 57)) {
+                    // Illegal octal literal.
+                    abort();
+                  }
+                  isSigned = false;
+                  // Parse the integer component.
+                  for (; Index < length && ((charCode = source.charCodeAt(Index)), charCode >= 48 && charCode <= 57); Index++);
+                  // Floats cannot contain a leading decimal point; however, this
+                  // case is already accounted for by the parser.
+                  if (source.charCodeAt(Index) == 46) {
+                    position = ++Index;
+                    // Parse the decimal component.
+                    for (; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);
+                    if (position == Index) {
+                      // Illegal trailing decimal.
+                      abort();
+                    }
+                    Index = position;
+                  }
+                  // Parse exponents. The `e` denoting the exponent is
+                  // case-insensitive.
+                  charCode = source.charCodeAt(Index);
+                  if (charCode == 101 || charCode == 69) {
+                    charCode = source.charCodeAt(++Index);
+                    // Skip past the sign following the exponent, if one is
+                    // specified.
+                    if (charCode == 43 || charCode == 45) {
+                      Index++;
+                    }
+                    // Parse the exponential component.
+                    for (position = Index; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);
+                    if (position == Index) {
+                      // Illegal empty exponent.
+                      abort();
+                    }
+                    Index = position;
+                  }
+                  // Coerce the parsed value to a JavaScript number.
+                  return +source.slice(begin, Index);
+                }
+                // A negative sign may only precede numbers.
+                if (isSigned) {
+                  abort();
+                }
+                // `true`, `false`, and `null` literals.
+                if (source.slice(Index, Index + 4) == "true") {
+                  Index += 4;
+                  return true;
+                } else if (source.slice(Index, Index + 5) == "false") {
+                  Index += 5;
+                  return false;
+                } else if (source.slice(Index, Index + 4) == "null") {
+                  Index += 4;
+                  return null;
+                }
+                // Unrecognized token.
+                abort();
+            }
+          }
+          // Return the sentinel `$` character if the parser has reached the end
+          // of the source string.
+          return "$";
+        };
+
+        // Internal: Parses a JSON `value` token.
+        var get = function (value) {
+          var results, hasMembers;
+          if (value == "$") {
+            // Unexpected end of input.
+            abort();
+          }
+          if (typeof value == "string") {
+            if ((charIndexBuggy ? value.charAt(0) : value[0]) == "@") {
+              // Remove the sentinel `@` character.
+              return value.slice(1);
+            }
+            // Parse object and array literals.
+            if (value == "[") {
+              // Parses a JSON array, returning a new JavaScript array.
+              results = [];
+              for (;; hasMembers || (hasMembers = true)) {
+                value = lex();
+                // A closing square bracket marks the end of the array literal.
+                if (value == "]") {
+                  break;
+                }
+                // If the array literal contains elements, the current token
+                // should be a comma separating the previous element from the
+                // next.
+                if (hasMembers) {
+                  if (value == ",") {
+                    value = lex();
+                    if (value == "]") {
+                      // Unexpected trailing `,` in array literal.
+                      abort();
+                    }
+                  } else {
+                    // A `,` must separate each array element.
+                    abort();
+                  }
+                }
+                // Elisions and leading commas are not permitted.
+                if (value == ",") {
+                  abort();
+                }
+                results.push(get(value));
+              }
+              return results;
+            } else if (value == "{") {
+              // Parses a JSON object, returning a new JavaScript object.
+              results = {};
+              for (;; hasMembers || (hasMembers = true)) {
+                value = lex();
+                // A closing curly brace marks the end of the object literal.
+                if (value == "}") {
+                  break;
+                }
+                // If the object literal contains members, the current token
+                // should be a comma separator.
+                if (hasMembers) {
+                  if (value == ",") {
+                    value = lex();
+                    if (value == "}") {
+                      // Unexpected trailing `,` in object literal.
+                      abort();
+                    }
+                  } else {
+                    // A `,` must separate each object member.
+                    abort();
+                  }
+                }
+                // Leading commas are not permitted, object property names must be
+                // double-quoted strings, and a `:` must separate each property
+                // name and value.
+                if (value == "," || typeof value != "string" || (charIndexBuggy ? value.charAt(0) : value[0]) != "@" || lex() != ":") {
+                  abort();
+                }
+                results[value.slice(1)] = get(lex());
+              }
+              return results;
+            }
+            // Unexpected token encountered.
+            abort();
+          }
+          return value;
+        };
+
+        // Internal: Updates a traversed object member.
+        var update = function (source, property, callback) {
+          var element = walk(source, property, callback);
+          if (element === undef) {
+            delete source[property];
+          } else {
+            source[property] = element;
+          }
+        };
+
+        // Internal: Recursively traverses a parsed JSON object, invoking the
+        // `callback` function for each value. This is an implementation of the
+        // `Walk(holder, name)` operation defined in ES 5.1 section 15.12.2.
+        var walk = function (source, property, callback) {
+          var value = source[property], length;
+          if (typeof value == "object" && value) {
+            // `forEach` can't be used to traverse an array in Opera <= 8.54
+            // because its `Object#hasOwnProperty` implementation returns `false`
+            // for array indices (e.g., `![1, 2, 3].hasOwnProperty("0")`).
+            if (getClass.call(value) == arrayClass) {
+              for (length = value.length; length--;) {
+                update(value, length, callback);
+              }
+            } else {
+              forEach(value, function (property) {
+                update(value, property, callback);
+              });
+            }
+          }
+          return callback.call(source, property, value);
+        };
+
+        // Public: `JSON.parse`. See ES 5.1 section 15.12.2.
+        exports.parse = function (source, callback) {
+          var result, value;
+          Index = 0;
+          Source = "" + source;
+          result = get(lex());
+          // If a JSON string contains multiple tokens, it is invalid.
+          if (lex() != "$") {
+            abort();
+          }
+          // Reset the parser state.
+          Index = Source = null;
+          return callback && getClass.call(callback) == functionClass ? walk((value = {}, value[""] = result, value), "", callback) : result;
+        };
+      }
+    }
+
+    exports["runInContext"] = runInContext;
+    return exports;
+  }
+
+  if (freeExports && !isLoader) {
+    // Export for CommonJS environments.
+    runInContext(root, freeExports);
+  } else {
+    // Export for web browsers and JavaScript engines.
+    var nativeJSON = root.JSON,
+        previousJSON = root["JSON3"],
+        isRestored = false;
+
+    var JSON3 = runInContext(root, (root["JSON3"] = {
+      // Public: Restores the original value of the global `JSON` object and
+      // returns a reference to the `JSON3` object.
+      "noConflict": function () {
+        if (!isRestored) {
+          isRestored = true;
+          root.JSON = nativeJSON;
+          root["JSON3"] = previousJSON;
+          nativeJSON = previousJSON = null;
+        }
+        return JSON3;
+      }
+    }));
+
+    root.JSON = {
+      "parse": JSON3.parse,
+      "stringify": JSON3.stringify
+    };
+  }
+
+  // Export for asynchronous module loaders.
+  if (isLoader) {
+    define(function () {
+      return JSON3;
+    });
+  }
+}).call(this);
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["node_modules/json3/lib/json3.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["/*! JSON v3.3.2 | http://bestiejs.github.io/json3 | Copyright 2012-2014, Kit Cambridge | http://kit.mit-license.org */\n;(function () {\n  // Detect the `define` function exposed by asynchronous module loaders. The\n  // strict `define` check is necessary for compatibility with `r.js`.\n  var isLoader = typeof define === \"function\" && define.amd;\n\n  // A set of types used to distinguish objects from primitives.\n  var objectTypes = {\n    \"function\": true,\n    \"object\": true\n  };\n\n  // Detect the `exports` object exposed by CommonJS implementations.\n  var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;\n\n  // Use the `global` object exposed by Node (including Browserify via\n  // `insert-module-globals`), Narwhal, and Ringo as the default context,\n  // and the `window` object in browsers. Rhino exports a `global` function\n  // instead.\n  var root = objectTypes[typeof window] && window || this,\n      freeGlobal = freeExports && objectTypes[typeof module] && module && !module.nodeType && typeof global == \"object\" && global;\n\n  if (freeGlobal && (freeGlobal[\"global\"] === freeGlobal || freeGlobal[\"window\"] === freeGlobal || freeGlobal[\"self\"] === freeGlobal)) {\n    root = freeGlobal;\n  }\n\n  // Public: Initializes JSON 3 using the given `context` object, attaching the\n  // `stringify` and `parse` functions to the specified `exports` object.\n  function runInContext(context, exports) {\n    context || (context = root[\"Object\"]());\n    exports || (exports = root[\"Object\"]());\n\n    // Native constructor aliases.\n    var Number = context[\"Number\"] || root[\"Number\"],\n        String = context[\"String\"] || root[\"String\"],\n        Object = context[\"Object\"] || root[\"Object\"],\n        Date = context[\"Date\"] || root[\"Date\"],\n        SyntaxError = context[\"SyntaxError\"] || root[\"SyntaxError\"],\n        TypeError = context[\"TypeError\"] || root[\"TypeError\"],\n        Math = context[\"Math\"] || root[\"Math\"],\n        nativeJSON = context[\"JSON\"] || root[\"JSON\"];\n\n    // Delegate to the native `stringify` and `parse` implementations.\n    if (typeof nativeJSON == \"object\" && nativeJSON) {\n      exports.stringify = nativeJSON.stringify;\n      exports.parse = nativeJSON.parse;\n    }\n\n    // Convenience aliases.\n    var objectProto = Object.prototype,\n        getClass = objectProto.toString,\n        isProperty, forEach, undef;\n\n    // Test the `Date#getUTC*` methods. Based on work by @Yaffle.\n    var isExtended = new Date(-3509827334573292);\n    try {\n      // The `getUTCFullYear`, `Month`, and `Date` methods return nonsensical\n      // results for certain dates in Opera >= 10.53.\n      isExtended = isExtended.getUTCFullYear() == -109252 && isExtended.getUTCMonth() === 0 && isExtended.getUTCDate() === 1 &&\n        // Safari < 2.0.2 stores the internal millisecond time value correctly,\n        // but clips the values returned by the date methods to the range of\n        // signed 32-bit integers ([-2 ** 31, 2 ** 31 - 1]).\n        isExtended.getUTCHours() == 10 && isExtended.getUTCMinutes() == 37 && isExtended.getUTCSeconds() == 6 && isExtended.getUTCMilliseconds() == 708;\n    } catch (exception) {}\n\n    // Internal: Determines whether the native `JSON.stringify` and `parse`\n    // implementations are spec-compliant. Based on work by Ken Snyder.\n    function has(name) {\n      if (has[name] !== undef) {\n        // Return cached feature test result.\n        return has[name];\n      }\n      var isSupported;\n      if (name == \"bug-string-char-index\") {\n        // IE <= 7 doesn't support accessing string characters using square\n        // bracket notation. IE 8 only supports this for primitives.\n        isSupported = \"a\"[0] != \"a\";\n      } else if (name == \"json\") {\n        // Indicates whether both `JSON.stringify` and `JSON.parse` are\n        // supported.\n        isSupported = has(\"json-stringify\") && has(\"json-parse\");\n      } else {\n        var value, serialized = '{\"a\":[1,true,false,null,\"\\\\u0000\\\\b\\\\n\\\\f\\\\r\\\\t\"]}';\n        // Test `JSON.stringify`.\n        if (name == \"json-stringify\") {\n          var stringify = exports.stringify, stringifySupported = typeof stringify == \"function\" && isExtended;\n          if (stringifySupported) {\n            // A test function object with a custom `toJSON` method.\n            (value = function () {\n              return 1;\n            }).toJSON = value;\n            try {\n              stringifySupported =\n                // Firefox 3.1b1 and b2 serialize string, number, and boolean\n                // primitives as object literals.\n                stringify(0) === \"0\" &&\n                // FF 3.1b1, b2, and JSON 2 serialize wrapped primitives as object\n                // literals.\n                stringify(new Number()) === \"0\" &&\n                stringify(new String()) == '\"\"' &&\n                // FF 3.1b1, 2 throw an error if the value is `null`, `undefined`, or\n                // does not define a canonical JSON representation (this applies to\n                // objects with `toJSON` properties as well, *unless* they are nested\n                // within an object or array).\n                stringify(getClass) === undef &&\n                // IE 8 serializes `undefined` as `\"undefined\"`. Safari <= 5.1.7 and\n                // FF 3.1b3 pass this test.\n                stringify(undef) === undef &&\n                // Safari <= 5.1.7 and FF 3.1b3 throw `Error`s and `TypeError`s,\n                // respectively, if the value is omitted entirely.\n                stringify() === undef &&\n                // FF 3.1b1, 2 throw an error if the given value is not a number,\n                // string, array, object, Boolean, or `null` literal. This applies to\n                // objects with custom `toJSON` methods as well, unless they are nested\n                // inside object or array literals. YUI 3.0.0b1 ignores custom `toJSON`\n                // methods entirely.\n                stringify(value) === \"1\" &&\n                stringify([value]) == \"[1]\" &&\n                // Prototype <= 1.6.1 serializes `[undefined]` as `\"[]\"` instead of\n                // `\"[null]\"`.\n                stringify([undef]) == \"[null]\" &&\n                // YUI 3.0.0b1 fails to serialize `null` literals.\n                stringify(null) == \"null\" &&\n                // FF 3.1b1, 2 halts serialization if an array contains a function:\n                // `[1, true, getClass, 1]` serializes as \"[1,true,],\". FF 3.1b3\n                // elides non-JSON values from objects and arrays, unless they\n                // define custom `toJSON` methods.\n                stringify([undef, getClass, null]) == \"[null,null,null]\" &&\n                // Simple serialization test. FF 3.1b1 uses Unicode escape sequences\n                // where character escape codes are expected (e.g., `\\b` => `\\u0008`).\n                stringify({ \"a\": [value, true, false, null, \"\\x00\\b\\n\\f\\r\\t\"] }) == serialized &&\n                // FF 3.1b1 and b2 ignore the `filter` and `width` arguments.\n                stringify(null, value) === \"1\" &&\n                stringify([1, 2], null, 1) == \"[\\n 1,\\n 2\\n]\" &&\n                // JSON 2, Prototype <= 1.7, and older WebKit builds incorrectly\n                // serialize extended years.\n                stringify(new Date(-8.64e15)) == '\"-271821-04-20T00:00:00.000Z\"' &&\n                // The milliseconds are optional in ES 5, but required in 5.1.\n                stringify(new Date(8.64e15)) == '\"+275760-09-13T00:00:00.000Z\"' &&\n                // Firefox <= 11.0 incorrectly serializes years prior to 0 as negative\n                // four-digit years instead of six-digit years. Credits: @Yaffle.\n                stringify(new Date(-621987552e5)) == '\"-000001-01-01T00:00:00.000Z\"' &&\n                // Safari <= 5.1.5 and Opera >= 10.53 incorrectly serialize millisecond\n                // values less than 1000. Credits: @Yaffle.\n                stringify(new Date(-1)) == '\"1969-12-31T23:59:59.999Z\"';\n            } catch (exception) {\n              stringifySupported = false;\n            }\n          }\n          isSupported = stringifySupported;\n        }\n        // Test `JSON.parse`.\n        if (name == \"json-parse\") {\n          var parse = exports.parse;\n          if (typeof parse == \"function\") {\n            try {\n              // FF 3.1b1, b2 will throw an exception if a bare literal is provided.\n              // Conforming implementations should also coerce the initial argument to\n              // a string prior to parsing.\n              if (parse(\"0\") === 0 && !parse(false)) {\n                // Simple parsing test.\n                value = parse(serialized);\n                var parseSupported = value[\"a\"].length == 5 && value[\"a\"][0] === 1;\n                if (parseSupported) {\n                  try {\n                    // Safari <= 5.1.2 and FF 3.1b1 allow unescaped tabs in strings.\n                    parseSupported = !parse('\"\\t\"');\n                  } catch (exception) {}\n                  if (parseSupported) {\n                    try {\n                      // FF 4.0 and 4.0.1 allow leading `+` signs and leading\n                      // decimal points. FF 4.0, 4.0.1, and IE 9-10 also allow\n                      // certain octal literals.\n                      parseSupported = parse(\"01\") !== 1;\n                    } catch (exception) {}\n                  }\n                  if (parseSupported) {\n                    try {\n                      // FF 4.0, 4.0.1, and Rhino 1.7R3-R4 allow trailing decimal\n                      // points. These environments, along with FF 3.1b1 and 2,\n                      // also allow trailing commas in JSON objects and arrays.\n                      parseSupported = parse(\"1.\") !== 1;\n                    } catch (exception) {}\n                  }\n                }\n              }\n            } catch (exception) {\n              parseSupported = false;\n            }\n          }\n          isSupported = parseSupported;\n        }\n      }\n      return has[name] = !!isSupported;\n    }\n\n    if (!has(\"json\")) {\n      // Common `[[Class]]` name aliases.\n      var functionClass = \"[object Function]\",\n          dateClass = \"[object Date]\",\n          numberClass = \"[object Number]\",\n          stringClass = \"[object String]\",\n          arrayClass = \"[object Array]\",\n          booleanClass = \"[object Boolean]\";\n\n      // Detect incomplete support for accessing string characters by index.\n      var charIndexBuggy = has(\"bug-string-char-index\");\n\n      // Define additional utility methods if the `Date` methods are buggy.\n      if (!isExtended) {\n        var floor = Math.floor;\n        // A mapping between the months of the year and the number of days between\n        // January 1st and the first of the respective month.\n        var Months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334];\n        // Internal: Calculates the number of days between the Unix epoch and the\n        // first day of the given month.\n        var getDay = function (year, month) {\n          return Months[month] + 365 * (year - 1970) + floor((year - 1969 + (month = +(month > 1))) / 4) - floor((year - 1901 + month) / 100) + floor((year - 1601 + month) / 400);\n        };\n      }\n\n      // Internal: Determines if a property is a direct property of the given\n      // object. Delegates to the native `Object#hasOwnProperty` method.\n      if (!(isProperty = objectProto.hasOwnProperty)) {\n        isProperty = function (property) {\n          var members = {}, constructor;\n          if ((members.__proto__ = null, members.__proto__ = {\n            // The *proto* property cannot be set multiple times in recent\n            // versions of Firefox and SeaMonkey.\n            \"toString\": 1\n          }, members).toString != getClass) {\n            // Safari <= 2.0.3 doesn't implement `Object#hasOwnProperty`, but\n            // supports the mutable *proto* property.\n            isProperty = function (property) {\n              // Capture and break the object's prototype chain (see section 8.6.2\n              // of the ES 5.1 spec). The parenthesized expression prevents an\n              // unsafe transformation by the Closure Compiler.\n              var original = this.__proto__, result = property in (this.__proto__ = null, this);\n              // Restore the original prototype chain.\n              this.__proto__ = original;\n              return result;\n            };\n          } else {\n            // Capture a reference to the top-level `Object` constructor.\n            constructor = members.constructor;\n            // Use the `constructor` property to simulate `Object#hasOwnProperty` in\n            // other environments.\n            isProperty = function (property) {\n              var parent = (this.constructor || constructor).prototype;\n              return property in this && !(property in parent && this[property] === parent[property]);\n            };\n          }\n          members = null;\n          return isProperty.call(this, property);\n        };\n      }\n\n      // Internal: Normalizes the `for...in` iteration algorithm across\n      // environments. Each enumerated key is yielded to a `callback` function.\n      forEach = function (object, callback) {\n        var size = 0, Properties, members, property;\n\n        // Tests for bugs in the current environment's `for...in` algorithm. The\n        // `valueOf` property inherits the non-enumerable flag from\n        // `Object.prototype` in older versions of IE, Netscape, and Mozilla.\n        (Properties = function () {\n          this.valueOf = 0;\n        }).prototype.valueOf = 0;\n\n        // Iterate over a new instance of the `Properties` class.\n        members = new Properties();\n        for (property in members) {\n          // Ignore all properties inherited from `Object.prototype`.\n          if (isProperty.call(members, property)) {\n            size++;\n          }\n        }\n        Properties = members = null;\n\n        // Normalize the iteration algorithm.\n        if (!size) {\n          // A list of non-enumerable properties inherited from `Object.prototype`.\n          members = [\"valueOf\", \"toString\", \"toLocaleString\", \"propertyIsEnumerable\", \"isPrototypeOf\", \"hasOwnProperty\", \"constructor\"];\n          // IE <= 8, Mozilla 1.0, and Netscape 6.2 ignore shadowed non-enumerable\n          // properties.\n          forEach = function (object, callback) {\n            var isFunction = getClass.call(object) == functionClass, property, length;\n            var hasProperty = !isFunction && typeof object.constructor != \"function\" && objectTypes[typeof object.hasOwnProperty] && object.hasOwnProperty || isProperty;\n            for (property in object) {\n              // Gecko <= 1.0 enumerates the `prototype` property of functions under\n              // certain conditions; IE does not.\n              if (!(isFunction && property == \"prototype\") && hasProperty.call(object, property)) {\n                callback(property);\n              }\n            }\n            // Manually invoke the callback for each non-enumerable property.\n            for (length = members.length; property = members[--length]; hasProperty.call(object, property) && callback(property));\n          };\n        } else if (size == 2) {\n          // Safari <= 2.0.4 enumerates shadowed properties twice.\n          forEach = function (object, callback) {\n            // Create a set of iterated properties.\n            var members = {}, isFunction = getClass.call(object) == functionClass, property;\n            for (property in object) {\n              // Store each property name to prevent double enumeration. The\n              // `prototype` property of functions is not enumerated due to cross-\n              // environment inconsistencies.\n              if (!(isFunction && property == \"prototype\") && !isProperty.call(members, property) && (members[property] = 1) && isProperty.call(object, property)) {\n                callback(property);\n              }\n            }\n          };\n        } else {\n          // No bugs detected; use the standard `for...in` algorithm.\n          forEach = function (object, callback) {\n            var isFunction = getClass.call(object) == functionClass, property, isConstructor;\n            for (property in object) {\n              if (!(isFunction && property == \"prototype\") && isProperty.call(object, property) && !(isConstructor = property === \"constructor\")) {\n                callback(property);\n              }\n            }\n            // Manually invoke the callback for the `constructor` property due to\n            // cross-environment inconsistencies.\n            if (isConstructor || isProperty.call(object, (property = \"constructor\"))) {\n              callback(property);\n            }\n          };\n        }\n        return forEach(object, callback);\n      };\n\n      // Public: Serializes a JavaScript `value` as a JSON string. The optional\n      // `filter` argument may specify either a function that alters how object and\n      // array members are serialized, or an array of strings and numbers that\n      // indicates which properties should be serialized. The optional `width`\n      // argument may be either a string or number that specifies the indentation\n      // level of the output.\n      if (!has(\"json-stringify\")) {\n        // Internal: A map of control characters and their escaped equivalents.\n        var Escapes = {\n          92: \"\\\\\\\\\",\n          34: '\\\\\"',\n          8: \"\\\\b\",\n          12: \"\\\\f\",\n          10: \"\\\\n\",\n          13: \"\\\\r\",\n          9: \"\\\\t\"\n        };\n\n        // Internal: Converts `value` into a zero-padded string such that its\n        // length is at least equal to `width`. The `width` must be <= 6.\n        var leadingZeroes = \"000000\";\n        var toPaddedString = function (width, value) {\n          // The `|| 0` expression is necessary to work around a bug in\n          // Opera <= 7.54u2 where `0 == -0`, but `String(-0) !== \"0\"`.\n          return (leadingZeroes + (value || 0)).slice(-width);\n        };\n\n        // Internal: Double-quotes a string `value`, replacing all ASCII control\n        // characters (characters with code unit values between 0 and 31) with\n        // their escaped equivalents. This is an implementation of the\n        // `Quote(value)` operation defined in ES 5.1 section 15.12.3.\n        var unicodePrefix = \"\\\\u00\";\n        var quote = function (value) {\n          var result = '\"', index = 0, length = value.length, useCharIndex = !charIndexBuggy || length > 10;\n          var symbols = useCharIndex && (charIndexBuggy ? value.split(\"\") : value);\n          for (; index < length; index++) {\n            var charCode = value.charCodeAt(index);\n            // If the character is a control character, append its Unicode or\n            // shorthand escape sequence; otherwise, append the character as-is.\n            switch (charCode) {\n              case 8: case 9: case 10: case 12: case 13: case 34: case 92:\n                result += Escapes[charCode];\n                break;\n              default:\n                if (charCode < 32) {\n                  result += unicodePrefix + toPaddedString(2, charCode.toString(16));\n                  break;\n                }\n                result += useCharIndex ? symbols[index] : value.charAt(index);\n            }\n          }\n          return result + '\"';\n        };\n\n        // Internal: Recursively serializes an object. Implements the\n        // `Str(key, holder)`, `JO(value)`, and `JA(value)` operations.\n        var serialize = function (property, object, callback, properties, whitespace, indentation, stack) {\n          var value, className, year, month, date, time, hours, minutes, seconds, milliseconds, results, element, index, length, prefix, result;\n          try {\n            // Necessary for host object support.\n            value = object[property];\n          } catch (exception) {}\n          if (typeof value == \"object\" && value) {\n            className = getClass.call(value);\n            if (className == dateClass && !isProperty.call(value, \"toJSON\")) {\n              if (value > -1 / 0 && value < 1 / 0) {\n                // Dates are serialized according to the `Date#toJSON` method\n                // specified in ES 5.1 section 15.9.5.44. See section 15.9.1.15\n                // for the ISO 8601 date time string format.\n                if (getDay) {\n                  // Manually compute the year, month, date, hours, minutes,\n                  // seconds, and milliseconds if the `getUTC*` methods are\n                  // buggy. Adapted from @Yaffle's `date-shim` project.\n                  date = floor(value / 864e5);\n                  for (year = floor(date / 365.2425) + 1970 - 1; getDay(year + 1, 0) <= date; year++);\n                  for (month = floor((date - getDay(year, 0)) / 30.42); getDay(year, month + 1) <= date; month++);\n                  date = 1 + date - getDay(year, month);\n                  // The `time` value specifies the time within the day (see ES\n                  // 5.1 section 15.9.1.2). The formula `(A % B + B) % B` is used\n                  // to compute `A modulo B`, as the `%` operator does not\n                  // correspond to the `modulo` operation for negative numbers.\n                  time = (value % 864e5 + 864e5) % 864e5;\n                  // The hours, minutes, seconds, and milliseconds are obtained by\n                  // decomposing the time within the day. See section 15.9.1.10.\n                  hours = floor(time / 36e5) % 24;\n                  minutes = floor(time / 6e4) % 60;\n                  seconds = floor(time / 1e3) % 60;\n                  milliseconds = time % 1e3;\n                } else {\n                  year = value.getUTCFullYear();\n                  month = value.getUTCMonth();\n                  date = value.getUTCDate();\n                  hours = value.getUTCHours();\n                  minutes = value.getUTCMinutes();\n                  seconds = value.getUTCSeconds();\n                  milliseconds = value.getUTCMilliseconds();\n                }\n                // Serialize extended years correctly.\n                value = (year <= 0 || year >= 1e4 ? (year < 0 ? \"-\" : \"+\") + toPaddedString(6, year < 0 ? -year : year) : toPaddedString(4, year)) +\n                  \"-\" + toPaddedString(2, month + 1) + \"-\" + toPaddedString(2, date) +\n                  // Months, dates, hours, minutes, and seconds should have two\n                  // digits; milliseconds should have three.\n                  \"T\" + toPaddedString(2, hours) + \":\" + toPaddedString(2, minutes) + \":\" + toPaddedString(2, seconds) +\n                  // Milliseconds are optional in ES 5.0, but required in 5.1.\n                  \".\" + toPaddedString(3, milliseconds) + \"Z\";\n              } else {\n                value = null;\n              }\n            } else if (typeof value.toJSON == \"function\" && ((className != numberClass && className != stringClass && className != arrayClass) || isProperty.call(value, \"toJSON\"))) {\n              // Prototype <= 1.6.1 adds non-standard `toJSON` methods to the\n              // `Number`, `String`, `Date`, and `Array` prototypes. JSON 3\n              // ignores all `toJSON` methods on these objects unless they are\n              // defined directly on an instance.\n              value = value.toJSON(property);\n            }\n          }\n          if (callback) {\n            // If a replacement function was provided, call it to obtain the value\n            // for serialization.\n            value = callback.call(object, property, value);\n          }\n          if (value === null) {\n            return \"null\";\n          }\n          className = getClass.call(value);\n          if (className == booleanClass) {\n            // Booleans are represented literally.\n            return \"\" + value;\n          } else if (className == numberClass) {\n            // JSON numbers must be finite. `Infinity` and `NaN` are serialized as\n            // `\"null\"`.\n            return value > -1 / 0 && value < 1 / 0 ? \"\" + value : \"null\";\n          } else if (className == stringClass) {\n            // Strings are double-quoted and escaped.\n            return quote(\"\" + value);\n          }\n          // Recursively serialize objects and arrays.\n          if (typeof value == \"object\") {\n            // Check for cyclic structures. This is a linear search; performance\n            // is inversely proportional to the number of unique nested objects.\n            for (length = stack.length; length--;) {\n              if (stack[length] === value) {\n                // Cyclic structures cannot be serialized by `JSON.stringify`.\n                throw TypeError();\n              }\n            }\n            // Add the object to the stack of traversed objects.\n            stack.push(value);\n            results = [];\n            // Save the current indentation level and indent one additional level.\n            prefix = indentation;\n            indentation += whitespace;\n            if (className == arrayClass) {\n              // Recursively serialize array elements.\n              for (index = 0, length = value.length; index < length; index++) {\n                element = serialize(index, value, callback, properties, whitespace, indentation, stack);\n                results.push(element === undef ? \"null\" : element);\n              }\n              result = results.length ? (whitespace ? \"[\\n\" + indentation + results.join(\",\\n\" + indentation) + \"\\n\" + prefix + \"]\" : (\"[\" + results.join(\",\") + \"]\")) : \"[]\";\n            } else {\n              // Recursively serialize object members. Members are selected from\n              // either a user-specified list of property names, or the object\n              // itself.\n              forEach(properties || value, function (property) {\n                var element = serialize(property, value, callback, properties, whitespace, indentation, stack);\n                if (element !== undef) {\n                  // According to ES 5.1 section 15.12.3: \"If `gap` {whitespace}\n                  // is not the empty string, let `member` {quote(property) + \":\"}\n                  // be the concatenation of `member` and the `space` character.\"\n                  // The \"`space` character\" refers to the literal space\n                  // character, not the `space` {width} argument provided to\n                  // `JSON.stringify`.\n                  results.push(quote(property) + \":\" + (whitespace ? \" \" : \"\") + element);\n                }\n              });\n              result = results.length ? (whitespace ? \"{\\n\" + indentation + results.join(\",\\n\" + indentation) + \"\\n\" + prefix + \"}\" : (\"{\" + results.join(\",\") + \"}\")) : \"{}\";\n            }\n            // Remove the object from the traversed object stack.\n            stack.pop();\n            return result;\n          }\n        };\n\n        // Public: `JSON.stringify`. See ES 5.1 section 15.12.3.\n        exports.stringify = function (source, filter, width) {\n          var whitespace, callback, properties, className;\n          if (objectTypes[typeof filter] && filter) {\n            if ((className = getClass.call(filter)) == functionClass) {\n              callback = filter;\n            } else if (className == arrayClass) {\n              // Convert the property names array into a makeshift set.\n              properties = {};\n              for (var index = 0, length = filter.length, value; index < length; value = filter[index++], ((className = getClass.call(value)), className == stringClass || className == numberClass) && (properties[value] = 1));\n            }\n          }\n          if (width) {\n            if ((className = getClass.call(width)) == numberClass) {\n              // Convert the `width` to an integer and create a string containing\n              // `width` number of space characters.\n              if ((width -= width % 1) > 0) {\n                for (whitespace = \"\", width > 10 && (width = 10); whitespace.length < width; whitespace += \" \");\n              }\n            } else if (className == stringClass) {\n              whitespace = width.length <= 10 ? width : width.slice(0, 10);\n            }\n          }\n          // Opera <= 7.54u2 discards the values associated with empty string keys\n          // (`\"\"`) only if they are used directly within an object member list\n          // (e.g., `!(\"\" in { \"\": 1})`).\n          return serialize(\"\", (value = {}, value[\"\"] = source, value), callback, properties, whitespace, \"\", []);\n        };\n      }\n\n      // Public: Parses a JSON source string.\n      if (!has(\"json-parse\")) {\n        var fromCharCode = String.fromCharCode;\n\n        // Internal: A map of escaped control characters and their unescaped\n        // equivalents.\n        var Unescapes = {\n          92: \"\\\\\",\n          34: '\"',\n          47: \"/\",\n          98: \"\\b\",\n          116: \"\\t\",\n          110: \"\\n\",\n          102: \"\\f\",\n          114: \"\\r\"\n        };\n\n        // Internal: Stores the parser state.\n        var Index, Source;\n\n        // Internal: Resets the parser state and throws a `SyntaxError`.\n        var abort = function () {\n          Index = Source = null;\n          throw SyntaxError();\n        };\n\n        // Internal: Returns the next token, or `\"$\"` if the parser has reached\n        // the end of the source string. A token may be a string, number, `null`\n        // literal, or Boolean literal.\n        var lex = function () {\n          var source = Source, length = source.length, value, begin, position, isSigned, charCode;\n          while (Index < length) {\n            charCode = source.charCodeAt(Index);\n            switch (charCode) {\n              case 9: case 10: case 13: case 32:\n                // Skip whitespace tokens, including tabs, carriage returns, line\n                // feeds, and space characters.\n                Index++;\n                break;\n              case 123: case 125: case 91: case 93: case 58: case 44:\n                // Parse a punctuator token (`{`, `}`, `[`, `]`, `:`, or `,`) at\n                // the current position.\n                value = charIndexBuggy ? source.charAt(Index) : source[Index];\n                Index++;\n                return value;\n              case 34:\n                // `\"` delimits a JSON string; advance to the next character and\n                // begin parsing the string. String tokens are prefixed with the\n                // sentinel `@` character to distinguish them from punctuators and\n                // end-of-string tokens.\n                for (value = \"@\", Index++; Index < length;) {\n                  charCode = source.charCodeAt(Index);\n                  if (charCode < 32) {\n                    // Unescaped ASCII control characters (those with a code unit\n                    // less than the space character) are not permitted.\n                    abort();\n                  } else if (charCode == 92) {\n                    // A reverse solidus (`\\`) marks the beginning of an escaped\n                    // control character (including `\"`, `\\`, and `/`) or Unicode\n                    // escape sequence.\n                    charCode = source.charCodeAt(++Index);\n                    switch (charCode) {\n                      case 92: case 34: case 47: case 98: case 116: case 110: case 102: case 114:\n                        // Revive escaped control characters.\n                        value += Unescapes[charCode];\n                        Index++;\n                        break;\n                      case 117:\n                        // `\\u` marks the beginning of a Unicode escape sequence.\n                        // Advance to the first character and validate the\n                        // four-digit code point.\n                        begin = ++Index;\n                        for (position = Index + 4; Index < position; Index++) {\n                          charCode = source.charCodeAt(Index);\n                          // A valid sequence comprises four hexdigits (case-\n                          // insensitive) that form a single hexadecimal value.\n                          if (!(charCode >= 48 && charCode <= 57 || charCode >= 97 && charCode <= 102 || charCode >= 65 && charCode <= 70)) {\n                            // Invalid Unicode escape sequence.\n                            abort();\n                          }\n                        }\n                        // Revive the escaped character.\n                        value += fromCharCode(\"0x\" + source.slice(begin, Index));\n                        break;\n                      default:\n                        // Invalid escape sequence.\n                        abort();\n                    }\n                  } else {\n                    if (charCode == 34) {\n                      // An unescaped double-quote character marks the end of the\n                      // string.\n                      break;\n                    }\n                    charCode = source.charCodeAt(Index);\n                    begin = Index;\n                    // Optimize for the common case where a string is valid.\n                    while (charCode >= 32 && charCode != 92 && charCode != 34) {\n                      charCode = source.charCodeAt(++Index);\n                    }\n                    // Append the string as-is.\n                    value += source.slice(begin, Index);\n                  }\n                }\n                if (source.charCodeAt(Index) == 34) {\n                  // Advance to the next character and return the revived string.\n                  Index++;\n                  return value;\n                }\n                // Unterminated string.\n                abort();\n              default:\n                // Parse numbers and literals.\n                begin = Index;\n                // Advance past the negative sign, if one is specified.\n                if (charCode == 45) {\n                  isSigned = true;\n                  charCode = source.charCodeAt(++Index);\n                }\n                // Parse an integer or floating-point value.\n                if (charCode >= 48 && charCode <= 57) {\n                  // Leading zeroes are interpreted as octal literals.\n                  if (charCode == 48 && ((charCode = source.charCodeAt(Index + 1)), charCode >= 48 && charCode <= 57)) {\n                    // Illegal octal literal.\n                    abort();\n                  }\n                  isSigned = false;\n                  // Parse the integer component.\n                  for (; Index < length && ((charCode = source.charCodeAt(Index)), charCode >= 48 && charCode <= 57); Index++);\n                  // Floats cannot contain a leading decimal point; however, this\n                  // case is already accounted for by the parser.\n                  if (source.charCodeAt(Index) == 46) {\n                    position = ++Index;\n                    // Parse the decimal component.\n                    for (; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);\n                    if (position == Index) {\n                      // Illegal trailing decimal.\n                      abort();\n                    }\n                    Index = position;\n                  }\n                  // Parse exponents. The `e` denoting the exponent is\n                  // case-insensitive.\n                  charCode = source.charCodeAt(Index);\n                  if (charCode == 101 || charCode == 69) {\n                    charCode = source.charCodeAt(++Index);\n                    // Skip past the sign following the exponent, if one is\n                    // specified.\n                    if (charCode == 43 || charCode == 45) {\n                      Index++;\n                    }\n                    // Parse the exponential component.\n                    for (position = Index; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);\n                    if (position == Index) {\n                      // Illegal empty exponent.\n                      abort();\n                    }\n                    Index = position;\n                  }\n                  // Coerce the parsed value to a JavaScript number.\n                  return +source.slice(begin, Index);\n                }\n                // A negative sign may only precede numbers.\n                if (isSigned) {\n                  abort();\n                }\n                // `true`, `false`, and `null` literals.\n                if (source.slice(Index, Index + 4) == \"true\") {\n                  Index += 4;\n                  return true;\n                } else if (source.slice(Index, Index + 5) == \"false\") {\n                  Index += 5;\n                  return false;\n                } else if (source.slice(Index, Index + 4) == \"null\") {\n                  Index += 4;\n                  return null;\n                }\n                // Unrecognized token.\n                abort();\n            }\n          }\n          // Return the sentinel `$` character if the parser has reached the end\n          // of the source string.\n          return \"$\";\n        };\n\n        // Internal: Parses a JSON `value` token.\n        var get = function (value) {\n          var results, hasMembers;\n          if (value == \"$\") {\n            // Unexpected end of input.\n            abort();\n          }\n          if (typeof value == \"string\") {\n            if ((charIndexBuggy ? value.charAt(0) : value[0]) == \"@\") {\n              // Remove the sentinel `@` character.\n              return value.slice(1);\n            }\n            // Parse object and array literals.\n            if (value == \"[\") {\n              // Parses a JSON array, returning a new JavaScript array.\n              results = [];\n              for (;; hasMembers || (hasMembers = true)) {\n                value = lex();\n                // A closing square bracket marks the end of the array literal.\n                if (value == \"]\") {\n                  break;\n                }\n                // If the array literal contains elements, the current token\n                // should be a comma separating the previous element from the\n                // next.\n                if (hasMembers) {\n                  if (value == \",\") {\n                    value = lex();\n                    if (value == \"]\") {\n                      // Unexpected trailing `,` in array literal.\n                      abort();\n                    }\n                  } else {\n                    // A `,` must separate each array element.\n                    abort();\n                  }\n                }\n                // Elisions and leading commas are not permitted.\n                if (value == \",\") {\n                  abort();\n                }\n                results.push(get(value));\n              }\n              return results;\n            } else if (value == \"{\") {\n              // Parses a JSON object, returning a new JavaScript object.\n              results = {};\n              for (;; hasMembers || (hasMembers = true)) {\n                value = lex();\n                // A closing curly brace marks the end of the object literal.\n                if (value == \"}\") {\n                  break;\n                }\n                // If the object literal contains members, the current token\n                // should be a comma separator.\n                if (hasMembers) {\n                  if (value == \",\") {\n                    value = lex();\n                    if (value == \"}\") {\n                      // Unexpected trailing `,` in object literal.\n                      abort();\n                    }\n                  } else {\n                    // A `,` must separate each object member.\n                    abort();\n                  }\n                }\n                // Leading commas are not permitted, object property names must be\n                // double-quoted strings, and a `:` must separate each property\n                // name and value.\n                if (value == \",\" || typeof value != \"string\" || (charIndexBuggy ? value.charAt(0) : value[0]) != \"@\" || lex() != \":\") {\n                  abort();\n                }\n                results[value.slice(1)] = get(lex());\n              }\n              return results;\n            }\n            // Unexpected token encountered.\n            abort();\n          }\n          return value;\n        };\n\n        // Internal: Updates a traversed object member.\n        var update = function (source, property, callback) {\n          var element = walk(source, property, callback);\n          if (element === undef) {\n            delete source[property];\n          } else {\n            source[property] = element;\n          }\n        };\n\n        // Internal: Recursively traverses a parsed JSON object, invoking the\n        // `callback` function for each value. This is an implementation of the\n        // `Walk(holder, name)` operation defined in ES 5.1 section 15.12.2.\n        var walk = function (source, property, callback) {\n          var value = source[property], length;\n          if (typeof value == \"object\" && value) {\n            // `forEach` can't be used to traverse an array in Opera <= 8.54\n            // because its `Object#hasOwnProperty` implementation returns `false`\n            // for array indices (e.g., `![1, 2, 3].hasOwnProperty(\"0\")`).\n            if (getClass.call(value) == arrayClass) {\n              for (length = value.length; length--;) {\n                update(value, length, callback);\n              }\n            } else {\n              forEach(value, function (property) {\n                update(value, property, callback);\n              });\n            }\n          }\n          return callback.call(source, property, value);\n        };\n\n        // Public: `JSON.parse`. See ES 5.1 section 15.12.2.\n        exports.parse = function (source, callback) {\n          var result, value;\n          Index = 0;\n          Source = \"\" + source;\n          result = get(lex());\n          // If a JSON string contains multiple tokens, it is invalid.\n          if (lex() != \"$\") {\n            abort();\n          }\n          // Reset the parser state.\n          Index = Source = null;\n          return callback && getClass.call(callback) == functionClass ? walk((value = {}, value[\"\"] = result, value), \"\", callback) : result;\n        };\n      }\n    }\n\n    exports[\"runInContext\"] = runInContext;\n    return exports;\n  }\n\n  if (freeExports && !isLoader) {\n    // Export for CommonJS environments.\n    runInContext(root, freeExports);\n  } else {\n    // Export for web browsers and JavaScript engines.\n    var nativeJSON = root.JSON,\n        previousJSON = root[\"JSON3\"],\n        isRestored = false;\n\n    var JSON3 = runInContext(root, (root[\"JSON3\"] = {\n      // Public: Restores the original value of the global `JSON` object and\n      // returns a reference to the `JSON3` object.\n      \"noConflict\": function () {\n        if (!isRestored) {\n          isRestored = true;\n          root.JSON = nativeJSON;\n          root[\"JSON3\"] = previousJSON;\n          nativeJSON = previousJSON = null;\n        }\n        return JSON3;\n      }\n    }));\n\n    root.JSON = {\n      \"parse\": JSON3.parse,\n      \"stringify\": JSON3.stringify\n    };\n  }\n\n  // Export for asynchronous module loaders.\n  if (isLoader) {\n    define(function () {\n      return JSON3;\n    });\n  }\n}).call(this);\n"]}
+},{}],59:[function(require,module,exports){
+'use strict';
+
+var required = require('requires-port')
+  , lolcation = require('./lolcation')
+  , qs = require('querystringify')
+  , relativere = /^\/(?!\/)/
+  , protocolre = /^([a-z0-9.+-]+:)?(\/\/)?(.*)$/i; // actual protocol is first match
+
+/**
+ * These are the parse instructions for the URL parsers, it informs the parser
+ * about:
+ *
+ * 0. The char it Needs to parse, if it's a string it should be done using
+ *    indexOf, RegExp using exec and NaN means set as current value.
+ * 1. The property we should set when parsing this value.
+ * 2. Indication if it's backwards or forward parsing, when set as number it's
+ *    the value of extra chars that should be split off.
+ * 3. Inherit from location if non existing in the parser.
+ * 4. `toLowerCase` the resulting value.
+ */
+var instructions = [
+  ['#', 'hash'],                        // Extract from the back.
+  ['?', 'query'],                       // Extract from the back.
+  ['/', 'pathname'],                    // Extract from the back.
+  ['@', 'auth', 1],                     // Extract from the front.
+  [NaN, 'host', undefined, 1, 1],       // Set left over value.
+  [/\:(\d+)$/, 'port'],                 // RegExp the back.
+  [NaN, 'hostname', undefined, 1, 1]    // Set left over.
+];
+
+ /**
+ * @typedef ProtocolExtract
+ * @type Object
+ * @property {String} protocol Protocol matched in the URL, in lowercase
+ * @property {Boolean} slashes Indicates whether the protocol is followed by double slash ("//")
+ * @property {String} rest     Rest of the URL that is not part of the protocol
+ */
+
+ /**
+  * Extract protocol information from a URL with/without double slash ("//")
+  *
+  * @param  {String} address   URL we want to extract from.
+  * @return {ProtocolExtract}  Extracted information
+  * @private
+  */
+function extractProtocol(address) {
+  var match = protocolre.exec(address);
+  return {
+    protocol: match[1] ? match[1].toLowerCase() : '',
+    slashes: !!match[2],
+    rest: match[3] ? match[3] : ''
+  };
+}
+
+/**
+ * The actual URL instance. Instead of returning an object we've opted-in to
+ * create an actual constructor as it's much more memory efficient and
+ * faster and it pleases my CDO.
+ *
+ * @constructor
+ * @param {String} address URL we want to parse.
+ * @param {Object|String} location Location defaults for relative paths.
+ * @param {Boolean|Function} parser Parser for the query string.
+ * @api public
+ */
+function URL(address, location, parser) {
+  if (!(this instanceof URL)) {
+    return new URL(address, location, parser);
+  }
+
+  var relative = relativere.test(address)
+    , parse, instruction, index, key
+    , type = typeof location
+    , url = this
+    , i = 0;
+
+  //
+  // The following if statements allows this module two have compatibility with
+  // 2 different API:
+  //
+  // 1. Node.js's `url.parse` api which accepts a URL, boolean as arguments
+  //    where the boolean indicates that the query string should also be parsed.
+  //
+  // 2. The `URL` interface of the browser which accepts a URL, object as
+  //    arguments. The supplied object will be used as default values / fall-back
+  //    for relative paths.
+  //
+  if ('object' !== type && 'string' !== type) {
+    parser = location;
+    location = null;
+  }
+
+  if (parser && 'function' !== typeof parser) {
+    parser = qs.parse;
+  }
+
+  location = lolcation(location);
+
+  // extract protocol information before running the instructions
+  var extracted = extractProtocol(address);
+  url.protocol = extracted.protocol || location.protocol || '';
+  url.slashes = extracted.slashes || location.slashes;
+  address = extracted.rest;
+
+  for (; i < instructions.length; i++) {
+    instruction = instructions[i];
+    parse = instruction[0];
+    key = instruction[1];
+
+    if (parse !== parse) {
+      url[key] = address;
+    } else if ('string' === typeof parse) {
+      if (~(index = address.indexOf(parse))) {
+        if ('number' === typeof instruction[2]) {
+          url[key] = address.slice(0, index);
+          address = address.slice(index + instruction[2]);
+        } else {
+          url[key] = address.slice(index);
+          address = address.slice(0, index);
+        }
+      }
+    } else if (index = parse.exec(address)) {
+      url[key] = index[1];
+      address = address.slice(0, address.length - index[0].length);
+    }
+
+    url[key] = url[key] || (instruction[3] || ('port' === key && relative) ? location[key] || '' : '');
+
+    //
+    // Hostname, host and protocol should be lowercased so they can be used to
+    // create a proper `origin`.
+    //
+    if (instruction[4]) {
+      url[key] = url[key].toLowerCase();
+    }
+  }
+
+  //
+  // Also parse the supplied query string in to an object. If we're supplied
+  // with a custom parser as function use that instead of the default build-in
+  // parser.
+  //
+  if (parser) url.query = parser(url.query);
+
+  //
+  // We should not add port numbers if they are already the default port number
+  // for a given protocol. As the host also contains the port number we're going
+  // override it with the hostname which contains no port number.
+  //
+  if (!required(url.port, url.protocol)) {
+    url.host = url.hostname;
+    url.port = '';
+  }
+
+  //
+  // Parse down the `auth` for the username and password.
+  //
+  url.username = url.password = '';
+  if (url.auth) {
+    instruction = url.auth.split(':');
+    url.username = instruction[0] || '';
+    url.password = instruction[1] || '';
+  }
+
+  //
+  // The href is just the compiled result.
+  //
+  url.href = url.toString();
+}
+
+/**
+ * This is convenience method for changing properties in the URL instance to
+ * insure that they all propagate correctly.
+ *
+ * @param {String} prop          Property we need to adjust.
+ * @param {Mixed} value          The newly assigned value.
+ * @param {Boolean|Function} fn  When setting the query, it will be the function used to parse
+ *                               the query.
+ *                               When setting the protocol, double slash will be removed from
+ *                               the final url if it is true.
+ * @returns {URL}
+ * @api public
+ */
+URL.prototype.set = function set(part, value, fn) {
+  var url = this;
+
+  if ('query' === part) {
+    if ('string' === typeof value && value.length) {
+      value = (fn || qs.parse)(value);
+    }
+
+    url[part] = value;
+  } else if ('port' === part) {
+    url[part] = value;
+
+    if (!required(value, url.protocol)) {
+      url.host = url.hostname;
+      url[part] = '';
+    } else if (value) {
+      url.host = url.hostname +':'+ value;
+    }
+  } else if ('hostname' === part) {
+    url[part] = value;
+
+    if (url.port) value += ':'+ url.port;
+    url.host = value;
+  } else if ('host' === part) {
+    url[part] = value;
+
+    if (/\:\d+/.test(value)) {
+      value = value.split(':');
+      url.hostname = value[0];
+      url.port = value[1];
+    }
+  } else if ('protocol' === part) {
+    url.protocol = value;
+    url.slashes = !fn;
+  } else {
+    url[part] = value;
+  }
+
+  url.href = url.toString();
+  return url;
+};
+
+/**
+ * Transform the properties back in to a valid and full URL string.
+ *
+ * @param {Function} stringify Optional query stringify function.
+ * @returns {String}
+ * @api public
+ */
+URL.prototype.toString = function toString(stringify) {
+  if (!stringify || 'function' !== typeof stringify) stringify = qs.stringify;
+
+  var query
+    , url = this
+    , protocol = url.protocol;
+
+  if (protocol && protocol.charAt(protocol.length - 1) !== ':') protocol += ':';
+
+  var result = protocol + (url.slashes ? '//' : '');
+
+  if (url.username) {
+    result += url.username;
+    if (url.password) result += ':'+ url.password;
+    result += '@';
+  }
+
+  result += url.hostname;
+  if (url.port) result += ':'+ url.port;
+
+  result += url.pathname;
+
+  query = 'object' === typeof url.query ? stringify(url.query) : url.query;
+  if (query) result += '?' !== query.charAt(0) ? '?'+ query : query;
+
+  if (url.hash) result += url.hash;
+
+  return result;
+};
+
+//
+// Expose the URL parser and some additional properties that might be useful for
+// others.
+//
+URL.qs = qs;
+URL.location = lolcation;
+module.exports = URL;
+
+},{"./lolcation":60,"querystringify":61,"requires-port":62}],60:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var slashes = /^[A-Za-z][A-Za-z0-9+-.]*:\/\//;
+
+/**
+ * These properties should not be copied or inherited from. This is only needed
+ * for all non blob URL's as a blob URL does not include a hash, only the
+ * origin.
+ *
+ * @type {Object}
+ * @private
+ */
+var ignore = { hash: 1, query: 1 }
+  , URL;
+
+/**
+ * The location object differs when your code is loaded through a normal page,
+ * Worker or through a worker using a blob. And with the blobble begins the
+ * trouble as the location object will contain the URL of the blob, not the
+ * location of the page where our code is loaded in. The actual origin is
+ * encoded in the `pathname` so we can thankfully generate a good "default"
+ * location from it so we can generate proper relative URL's again.
+ *
+ * @param {Object|String} loc Optional default location object.
+ * @returns {Object} lolcation object.
+ * @api public
+ */
+module.exports = function lolcation(loc) {
+  loc = loc || global.location || {};
+  URL = URL || require('./');
+
+  var finaldestination = {}
+    , type = typeof loc
+    , key;
+
+  if ('blob:' === loc.protocol) {
+    finaldestination = new URL(unescape(loc.pathname), {});
+  } else if ('string' === type) {
+    finaldestination = new URL(loc, {});
+    for (key in ignore) delete finaldestination[key];
+  } else if ('object' === type) {
+    for (key in loc) {
+      if (key in ignore) continue;
+      finaldestination[key] = loc[key];
+    }
+
+    if (finaldestination.slashes === undefined) {
+      finaldestination.slashes = slashes.test(loc.href);
+    }
+  }
+
+  return finaldestination;
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy91cmwtcGFyc2UvbG9sY2F0aW9uLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIHNsYXNoZXMgPSAvXltBLVphLXpdW0EtWmEtejAtOSstLl0qOlxcL1xcLy87XG5cbi8qKlxuICogVGhlc2UgcHJvcGVydGllcyBzaG91bGQgbm90IGJlIGNvcGllZCBvciBpbmhlcml0ZWQgZnJvbS4gVGhpcyBpcyBvbmx5IG5lZWRlZFxuICogZm9yIGFsbCBub24gYmxvYiBVUkwncyBhcyBhIGJsb2IgVVJMIGRvZXMgbm90IGluY2x1ZGUgYSBoYXNoLCBvbmx5IHRoZVxuICogb3JpZ2luLlxuICpcbiAqIEB0eXBlIHtPYmplY3R9XG4gKiBAcHJpdmF0ZVxuICovXG52YXIgaWdub3JlID0geyBoYXNoOiAxLCBxdWVyeTogMSB9XG4gICwgVVJMO1xuXG4vKipcbiAqIFRoZSBsb2NhdGlvbiBvYmplY3QgZGlmZmVycyB3aGVuIHlvdXIgY29kZSBpcyBsb2FkZWQgdGhyb3VnaCBhIG5vcm1hbCBwYWdlLFxuICogV29ya2VyIG9yIHRocm91Z2ggYSB3b3JrZXIgdXNpbmcgYSBibG9iLiBBbmQgd2l0aCB0aGUgYmxvYmJsZSBiZWdpbnMgdGhlXG4gKiB0cm91YmxlIGFzIHRoZSBsb2NhdGlvbiBvYmplY3Qgd2lsbCBjb250YWluIHRoZSBVUkwgb2YgdGhlIGJsb2IsIG5vdCB0aGVcbiAqIGxvY2F0aW9uIG9mIHRoZSBwYWdlIHdoZXJlIG91ciBjb2RlIGlzIGxvYWRlZCBpbi4gVGhlIGFjdHVhbCBvcmlnaW4gaXNcbiAqIGVuY29kZWQgaW4gdGhlIGBwYXRobmFtZWAgc28gd2UgY2FuIHRoYW5rZnVsbHkgZ2VuZXJhdGUgYSBnb29kIFwiZGVmYXVsdFwiXG4gKiBsb2NhdGlvbiBmcm9tIGl0IHNvIHdlIGNhbiBnZW5lcmF0ZSBwcm9wZXIgcmVsYXRpdmUgVVJMJ3MgYWdhaW4uXG4gKlxuICogQHBhcmFtIHtPYmplY3R8U3RyaW5nfSBsb2MgT3B0aW9uYWwgZGVmYXVsdCBsb2NhdGlvbiBvYmplY3QuXG4gKiBAcmV0dXJucyB7T2JqZWN0fSBsb2xjYXRpb24gb2JqZWN0LlxuICogQGFwaSBwdWJsaWNcbiAqL1xubW9kdWxlLmV4cG9ydHMgPSBmdW5jdGlvbiBsb2xjYXRpb24obG9jKSB7XG4gIGxvYyA9IGxvYyB8fCBnbG9iYWwubG9jYXRpb24gfHwge307XG4gIFVSTCA9IFVSTCB8fCByZXF1aXJlKCcuLycpO1xuXG4gIHZhciBmaW5hbGRlc3RpbmF0aW9uID0ge31cbiAgICAsIHR5cGUgPSB0eXBlb2YgbG9jXG4gICAgLCBrZXk7XG5cbiAgaWYgKCdibG9iOicgPT09IGxvYy5wcm90b2NvbCkge1xuICAgIGZpbmFsZGVzdGluYXRpb24gPSBuZXcgVVJMKHVuZXNjYXBlKGxvYy5wYXRobmFtZSksIHt9KTtcbiAgfSBlbHNlIGlmICgnc3RyaW5nJyA9PT0gdHlwZSkge1xuICAgIGZpbmFsZGVzdGluYXRpb24gPSBuZXcgVVJMKGxvYywge30pO1xuICAgIGZvciAoa2V5IGluIGlnbm9yZSkgZGVsZXRlIGZpbmFsZGVzdGluYXRpb25ba2V5XTtcbiAgfSBlbHNlIGlmICgnb2JqZWN0JyA9PT0gdHlwZSkge1xuICAgIGZvciAoa2V5IGluIGxvYykge1xuICAgICAgaWYgKGtleSBpbiBpZ25vcmUpIGNvbnRpbnVlO1xuICAgICAgZmluYWxkZXN0aW5hdGlvbltrZXldID0gbG9jW2tleV07XG4gICAgfVxuXG4gICAgaWYgKGZpbmFsZGVzdGluYXRpb24uc2xhc2hlcyA9PT0gdW5kZWZpbmVkKSB7XG4gICAgICBmaW5hbGRlc3RpbmF0aW9uLnNsYXNoZXMgPSBzbGFzaGVzLnRlc3QobG9jLmhyZWYpO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBmaW5hbGRlc3RpbmF0aW9uO1xufTtcbiJdfQ==
+},{"./":59}],61:[function(require,module,exports){
+'use strict';
+
+var has = Object.prototype.hasOwnProperty;
+
+/**
+ * Simple query string parser.
+ *
+ * @param {String} query The query string that needs to be parsed.
+ * @returns {Object}
+ * @api public
+ */
+function querystring(query) {
+  var parser = /([^=?&]+)=([^&]*)/g
+    , result = {}
+    , part;
+
+  //
+  // Little nifty parsing hack, leverage the fact that RegExp.exec increments
+  // the lastIndex property so we can continue executing this loop until we've
+  // parsed all results.
+  //
+  for (;
+    part = parser.exec(query);
+    result[decodeURIComponent(part[1])] = decodeURIComponent(part[2])
+  );
+
+  return result;
+}
+
+/**
+ * Transform a query string to an object.
+ *
+ * @param {Object} obj Object that should be transformed.
+ * @param {String} prefix Optional prefix.
+ * @returns {String}
+ * @api public
+ */
+function querystringify(obj, prefix) {
+  prefix = prefix || '';
+
+  var pairs = [];
+
+  //
+  // Optionally prefix with a '?' if needed
+  //
+  if ('string' !== typeof prefix) prefix = '?';
+
+  for (var key in obj) {
+    if (has.call(obj, key)) {
+      pairs.push(encodeURIComponent(key) +'='+ encodeURIComponent(obj[key]));
+    }
+  }
+
+  return pairs.length ? prefix + pairs.join('&') : '';
+}
+
+//
+// Expose the module.
+//
+exports.stringify = querystringify;
+exports.parse = querystring;
+
+},{}],62:[function(require,module,exports){
+'use strict';
+
+/**
+ * Check if we're required to add a port number.
+ *
+ * @see https://url.spec.whatwg.org/#default-port
+ * @param {Number|String} port Port number we need to check
+ * @param {String} protocol Protocol we need to check against.
+ * @returns {Boolean} Is it a default port for the given protocol
+ * @api private
+ */
+module.exports = function required(port, protocol) {
+  protocol = protocol.split(':')[0];
+  port = +port;
+
+  if (!port) return false;
+
+  switch (protocol) {
+    case 'http':
+    case 'ws':
+    return port !== 80;
+
+    case 'https':
+    case 'wss':
+    return port !== 443;
+
+    case 'ftp':
+    return port !== 21;
+
+    case 'gopher':
+    return port !== 70;
+
+    case 'file':
+    return false;
+  }
+
+  return port !== 0;
+};
+
+},{}]},{},[1])(1)
+});
+
+
+//# sourceMappingURL=sockjs.js.map
\ No newline at end of file
diff --git a/src/main/resources/static/sockjs/dist/sockjs-1.1.1.min.js b/src/main/resources/static/sockjs/dist/sockjs-1.1.1.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..e26188127c2fcfb8aff2baba6e71c15a531edfb5
--- /dev/null
+++ b/src/main/resources/static/sockjs/dist/sockjs-1.1.1.min.js
@@ -0,0 +1,3 @@
+/* sockjs-client v1.1.1 | http://sockjs.org | MIT license */
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;"undefined"!=typeof window?e=window:"undefined"!=typeof global?e=global:"undefined"!=typeof self&&(e=self),e.SockJS=t()}}(function(){var t;return function e(t,n,r){function i(s,a){if(!n[s]){if(!t[s]){var u="function"==typeof require&&require;if(!a&&u)return u(s,!0);if(o)return o(s,!0);var l=new Error("Cannot find module '"+s+"'");throw l.code="MODULE_NOT_FOUND",l}var c=n[s]={exports:{}};t[s][0].call(c.exports,function(e){var n=t[s][1][e];return i(n?n:e)},c,c.exports,e,t,n,r)}return n[s].exports}for(var o="function"==typeof require&&require,s=0;s<r.length;s++)i(r[s]);return i}({1:[function(t,e){(function(n){"use strict";var r=t("./transport-list");e.exports=t("./main")(r),"_sockjs_onload"in n&&setTimeout(n._sockjs_onload,1)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./main":14,"./transport-list":16}],2:[function(t,e){"use strict";function n(){i.call(this),this.initEvent("close",!1,!1),this.wasClean=!1,this.code=0,this.reason=""}var r=t("inherits"),i=t("./event");r(n,i),e.exports=n},{"./event":4,inherits:54}],3:[function(t,e){"use strict";function n(){i.call(this)}var r=t("inherits"),i=t("./eventtarget");r(n,i),n.prototype.removeAllListeners=function(t){t?delete this._listeners[t]:this._listeners={}},n.prototype.once=function(t,e){function n(){r.removeListener(t,n),i||(i=!0,e.apply(this,arguments))}var r=this,i=!1;this.on(t,n)},n.prototype.emit=function(){var t=arguments[0],e=this._listeners[t];if(e){for(var n=arguments.length,r=new Array(n-1),i=1;n>i;i++)r[i-1]=arguments[i];for(var o=0;o<e.length;o++)e[o].apply(this,r)}},n.prototype.on=n.prototype.addListener=i.prototype.addEventListener,n.prototype.removeListener=i.prototype.removeEventListener,e.exports.EventEmitter=n},{"./eventtarget":5,inherits:54}],4:[function(t,e){"use strict";function n(t){this.type=t}n.prototype.initEvent=function(t,e,n){return this.type=t,this.bubbles=e,this.cancelable=n,this.timeStamp=+new Date,this},n.prototype.stopPropagation=function(){},n.prototype.preventDefault=function(){},n.CAPTURING_PHASE=1,n.AT_TARGET=2,n.BUBBLING_PHASE=3,e.exports=n},{}],5:[function(t,e){"use strict";function n(){this._listeners={}}n.prototype.addEventListener=function(t,e){t in this._listeners||(this._listeners[t]=[]);var n=this._listeners[t];-1===n.indexOf(e)&&(n=n.concat([e])),this._listeners[t]=n},n.prototype.removeEventListener=function(t,e){var n=this._listeners[t];if(n){var r=n.indexOf(e);return-1!==r?void(n.length>1?this._listeners[t]=n.slice(0,r).concat(n.slice(r+1)):delete this._listeners[t]):void 0}},n.prototype.dispatchEvent=function(){var t=arguments[0],e=t.type,n=1===arguments.length?[t]:Array.apply(null,arguments);if(this["on"+e]&&this["on"+e].apply(this,n),e in this._listeners)for(var r=this._listeners[e],i=0;i<r.length;i++)r[i].apply(this,n)},e.exports=n},{}],6:[function(t,e){"use strict";function n(t){i.call(this),this.initEvent("message",!1,!1),this.data=t}var r=t("inherits"),i=t("./event");r(n,i),e.exports=n},{"./event":4,inherits:54}],7:[function(t,e){"use strict";function n(t){this._transport=t,t.on("message",this._transportMessage.bind(this)),t.on("close",this._transportClose.bind(this))}var r=t("json3"),i=t("./utils/iframe");n.prototype._transportClose=function(t,e){i.postMessage("c",r.stringify([t,e]))},n.prototype._transportMessage=function(t){i.postMessage("t",t)},n.prototype._send=function(t){this._transport.send(t)},n.prototype._close=function(){this._transport.close(),this._transport.removeAllListeners()},e.exports=n},{"./utils/iframe":47,json3:55}],8:[function(t,e){"use strict";var n=t("./utils/url"),r=t("./utils/event"),i=t("json3"),o=t("./facade"),s=t("./info-iframe-receiver"),a=t("./utils/iframe"),u=t("./location");e.exports=function(t,e){var l={};e.forEach(function(t){t.facadeTransport&&(l[t.facadeTransport.transportName]=t.facadeTransport)}),l[s.transportName]=s;var c;t.bootstrap_iframe=function(){var e;a.currentWindowId=u.hash.slice(1);var s=function(r){if(r.source===parent&&("undefined"==typeof c&&(c=r.origin),r.origin===c)){var s;try{s=i.parse(r.data)}catch(f){return}if(s.windowId===a.currentWindowId)switch(s.type){case"s":var h;try{h=i.parse(s.data)}catch(f){break}var d=h[0],p=h[1],v=h[2],m=h[3];if(d!==t.version)throw new Error('Incompatible SockJS! Main site uses: "'+d+'", the iframe: "'+t.version+'".');if(!n.isOriginEqual(v,u.href)||!n.isOriginEqual(m,u.href))throw new Error("Can't connect to different domain from within an iframe. ("+u.href+", "+v+", "+m+")");e=new o(new l[p](v,m));break;case"m":e._send(s.data);break;case"c":e&&e._close(),e=null}}};r.attachEvent("message",s),a.postMessage("s")}}},{"./facade":7,"./info-iframe-receiver":10,"./location":13,"./utils/event":46,"./utils/iframe":47,"./utils/url":52,debug:void 0,json3:55}],9:[function(t,e){"use strict";function n(t,e){r.call(this);var n=this,i=+new Date;this.xo=new e("GET",t),this.xo.once("finish",function(t,e){var r,a;if(200===t){if(a=+new Date-i,e)try{r=o.parse(e)}catch(u){}s.isObject(r)||(r={})}n.emit("finish",r,a),n.removeAllListeners()})}var r=t("events").EventEmitter,i=t("inherits"),o=t("json3"),s=t("./utils/object");i(n,r),n.prototype.close=function(){this.removeAllListeners(),this.xo.close()},e.exports=n},{"./utils/object":49,debug:void 0,events:3,inherits:54,json3:55}],10:[function(t,e){"use strict";function n(t){var e=this;i.call(this),this.ir=new a(t,s),this.ir.once("finish",function(t,n){e.ir=null,e.emit("message",o.stringify([t,n]))})}var r=t("inherits"),i=t("events").EventEmitter,o=t("json3"),s=t("./transport/sender/xhr-local"),a=t("./info-ajax");r(n,i),n.transportName="iframe-info-receiver",n.prototype.close=function(){this.ir&&(this.ir.close(),this.ir=null),this.removeAllListeners()},e.exports=n},{"./info-ajax":9,"./transport/sender/xhr-local":37,events:3,inherits:54,json3:55}],11:[function(t,e){(function(n){"use strict";function r(t,e){var r=this;i.call(this);var o=function(){var n=r.ifr=new u(l.transportName,e,t);n.once("message",function(t){if(t){var e;try{e=s.parse(t)}catch(n){return r.emit("finish"),void r.close()}var i=e[0],o=e[1];r.emit("finish",i,o)}r.close()}),n.once("close",function(){r.emit("finish"),r.close()})};n.document.body?o():a.attachEvent("load",o)}var i=t("events").EventEmitter,o=t("inherits"),s=t("json3"),a=t("./utils/event"),u=t("./transport/iframe"),l=t("./info-iframe-receiver");o(r,i),r.enabled=function(){return u.enabled()},r.prototype.close=function(){this.ifr&&this.ifr.close(),this.removeAllListeners(),this.ifr=null},e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./info-iframe-receiver":10,"./transport/iframe":22,"./utils/event":46,debug:void 0,events:3,inherits:54,json3:55}],12:[function(t,e){"use strict";function n(t,e){var n=this;r.call(this),setTimeout(function(){n.doXhr(t,e)},0)}var r=t("events").EventEmitter,i=t("inherits"),o=t("./utils/url"),s=t("./transport/sender/xdr"),a=t("./transport/sender/xhr-cors"),u=t("./transport/sender/xhr-local"),l=t("./transport/sender/xhr-fake"),c=t("./info-iframe"),f=t("./info-ajax");i(n,r),n._getReceiver=function(t,e,n){return n.sameOrigin?new f(e,u):a.enabled?new f(e,a):s.enabled&&n.sameScheme?new f(e,s):c.enabled()?new c(t,e):new f(e,l)},n.prototype.doXhr=function(t,e){var r=this,i=o.addPath(t,"/info");this.xo=n._getReceiver(t,i,e),this.timeoutRef=setTimeout(function(){r._cleanup(!1),r.emit("finish")},n.timeout),this.xo.once("finish",function(t,e){r._cleanup(!0),r.emit("finish",t,e)})},n.prototype._cleanup=function(t){clearTimeout(this.timeoutRef),this.timeoutRef=null,!t&&this.xo&&this.xo.close(),this.xo=null},n.prototype.close=function(){this.removeAllListeners(),this._cleanup(!1)},n.timeout=8e3,e.exports=n},{"./info-ajax":9,"./info-iframe":11,"./transport/sender/xdr":34,"./transport/sender/xhr-cors":35,"./transport/sender/xhr-fake":36,"./transport/sender/xhr-local":37,"./utils/url":52,debug:void 0,events:3,inherits:54}],13:[function(t,e){(function(t){"use strict";e.exports=t.location||{origin:"http://localhost:80",protocol:"http",host:"localhost",port:80,href:"http://localhost/",hash:""}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],14:[function(t,e){(function(n){"use strict";function r(t,e,n){if(!(this instanceof r))return new r(t,e,n);if(arguments.length<1)throw new TypeError("Failed to construct 'SockJS: 1 argument required, but only 0 present");b.call(this),this.readyState=r.CONNECTING,this.extensions="",this.protocol="",n=n||{},n.protocols_whitelist&&m.warn("'protocols_whitelist' is DEPRECATED. Use 'transports' instead."),this._transportsWhitelist=n.transports,this._transportOptions=n.transportOptions||{};var i=n.sessionId||8;if("function"==typeof i)this._generateSessionId=i;else{if("number"!=typeof i)throw new TypeError("If sessionId is used in the options, it needs to be a number or a function.");this._generateSessionId=function(){return l.string(i)}}this._server=n.server||l.numberString(1e3);var o=new s(t);if(!o.host||!o.protocol)throw new SyntaxError("The URL '"+t+"' is invalid");if(o.hash)throw new SyntaxError("The URL must not contain a fragment");if("http:"!==o.protocol&&"https:"!==o.protocol)throw new SyntaxError("The URL's scheme must be either 'http:' or 'https:'. '"+o.protocol+"' is not allowed.");var a="https:"===o.protocol;if("https"===g.protocol&&!a)throw new Error("SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS");e?Array.isArray(e)||(e=[e]):e=[];var u=e.sort();u.forEach(function(t,e){if(!t)throw new SyntaxError("The protocols entry '"+t+"' is invalid.");if(e<u.length-1&&t===u[e+1])throw new SyntaxError("The protocols entry '"+t+"' is duplicated.")});var c=f.getOrigin(g.href);this._origin=c?c.toLowerCase():null,o.set("pathname",o.pathname.replace(/\/+$/,"")),this.url=o.href,this._urlInfo={nullOrigin:!v.hasDomain(),sameOrigin:f.isOriginEqual(this.url,g.href),sameScheme:f.isSchemeEqual(this.url,g.href)},this._ir=new _(this.url,this._urlInfo),this._ir.once("finish",this._receiveInfo.bind(this))}function i(t){return 1e3===t||t>=3e3&&4999>=t}t("./shims");var o,s=t("url-parse"),a=t("inherits"),u=t("json3"),l=t("./utils/random"),c=t("./utils/escape"),f=t("./utils/url"),h=t("./utils/event"),d=t("./utils/transport"),p=t("./utils/object"),v=t("./utils/browser"),m=t("./utils/log"),y=t("./event/event"),b=t("./event/eventtarget"),g=t("./location"),w=t("./event/close"),x=t("./event/trans-message"),_=t("./info-receiver");a(r,b),r.prototype.close=function(t,e){if(t&&!i(t))throw new Error("InvalidAccessError: Invalid code");if(e&&e.length>123)throw new SyntaxError("reason argument has an invalid length");if(this.readyState!==r.CLOSING&&this.readyState!==r.CLOSED){var n=!0;this._close(t||1e3,e||"Normal closure",n)}},r.prototype.send=function(t){if("string"!=typeof t&&(t=""+t),this.readyState===r.CONNECTING)throw new Error("InvalidStateError: The connection has not been established yet");this.readyState===r.OPEN&&this._transport.send(c.quote(t))},r.version=t("./version"),r.CONNECTING=0,r.OPEN=1,r.CLOSING=2,r.CLOSED=3,r.prototype._receiveInfo=function(t,e){if(this._ir=null,!t)return void this._close(1002,"Cannot connect to server");this._rto=this.countRTO(e),this._transUrl=t.base_url?t.base_url:this.url,t=p.extend(t,this._urlInfo);var n=o.filterToEnabled(this._transportsWhitelist,t);this._transports=n.main,this._connect()},r.prototype._connect=function(){for(var t=this._transports.shift();t;t=this._transports.shift()){if(t.needBody&&(!n.document.body||"undefined"!=typeof n.document.readyState&&"complete"!==n.document.readyState&&"interactive"!==n.document.readyState))return this._transports.unshift(t),void h.attachEvent("load",this._connect.bind(this));var e=this._rto*t.roundTrips||5e3;this._transportTimeoutId=setTimeout(this._transportTimeout.bind(this),e);var r=f.addPath(this._transUrl,"/"+this._server+"/"+this._generateSessionId()),i=this._transportOptions[t.transportName],o=new t(r,this._transUrl,i);return o.on("message",this._transportMessage.bind(this)),o.once("close",this._transportClose.bind(this)),o.transportName=t.transportName,void(this._transport=o)}this._close(2e3,"All transports failed",!1)},r.prototype._transportTimeout=function(){this.readyState===r.CONNECTING&&this._transportClose(2007,"Transport timed out")},r.prototype._transportMessage=function(t){var e,n=this,r=t.slice(0,1),i=t.slice(1);switch(r){case"o":return void this._open();case"h":return void this.dispatchEvent(new y("heartbeat"))}if(i)try{e=u.parse(i)}catch(o){}if("undefined"!=typeof e)switch(r){case"a":Array.isArray(e)&&e.forEach(function(t){n.dispatchEvent(new x(t))});break;case"m":this.dispatchEvent(new x(e));break;case"c":Array.isArray(e)&&2===e.length&&this._close(e[0],e[1],!0)}},r.prototype._transportClose=function(t,e){return this._transport&&(this._transport.removeAllListeners(),this._transport=null,this.transport=null),i(t)||2e3===t||this.readyState!==r.CONNECTING?void this._close(t,e):void this._connect()},r.prototype._open=function(){this.readyState===r.CONNECTING?(this._transportTimeoutId&&(clearTimeout(this._transportTimeoutId),this._transportTimeoutId=null),this.readyState=r.OPEN,this.transport=this._transport.transportName,this.dispatchEvent(new y("open"))):this._close(1006,"Server lost session")},r.prototype._close=function(t,e,n){var i=!1;if(this._ir&&(i=!0,this._ir.close(),this._ir=null),this._transport&&(this._transport.close(),this._transport=null,this.transport=null),this.readyState===r.CLOSED)throw new Error("InvalidStateError: SockJS has already been closed");this.readyState=r.CLOSING,setTimeout(function(){this.readyState=r.CLOSED,i&&this.dispatchEvent(new y("error"));var o=new w("close");o.wasClean=n||!1,o.code=t||1e3,o.reason=e,this.dispatchEvent(o),this.onmessage=this.onclose=this.onerror=null}.bind(this),0)},r.prototype.countRTO=function(t){return t>100?4*t:300+t},e.exports=function(e){return o=d(e),t("./iframe-bootstrap")(r,e),r}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./event/close":2,"./event/event":4,"./event/eventtarget":5,"./event/trans-message":6,"./iframe-bootstrap":8,"./info-receiver":12,"./location":13,"./shims":15,"./utils/browser":44,"./utils/escape":45,"./utils/event":46,"./utils/log":48,"./utils/object":49,"./utils/random":50,"./utils/transport":51,"./utils/url":52,"./version":53,debug:void 0,inherits:54,json3:55,"url-parse":56}],15:[function(){"use strict";function t(t){var e=+t;return e!==e?e=0:0!==e&&e!==1/0&&e!==-(1/0)&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function e(t){return t>>>0}function n(){}var r,i=Array.prototype,o=Object.prototype,s=Function.prototype,a=String.prototype,u=i.slice,l=o.toString,c=function(t){return"[object Function]"===o.toString.call(t)},f=function(t){return"[object Array]"===l.call(t)},h=function(t){return"[object String]"===l.call(t)},d=Object.defineProperty&&function(){try{return Object.defineProperty({},"x",{}),!0}catch(t){return!1}}();r=d?function(t,e,n,r){!r&&e in t||Object.defineProperty(t,e,{configurable:!0,enumerable:!1,writable:!0,value:n})}:function(t,e,n,r){!r&&e in t||(t[e]=n)};var p=function(t,e,n){for(var i in e)o.hasOwnProperty.call(e,i)&&r(t,i,e[i],n)},v=function(t){if(null==t)throw new TypeError("can't convert "+t+" to object");return Object(t)};p(s,{bind:function(t){var e=this;if(!c(e))throw new TypeError("Function.prototype.bind called on incompatible "+e);for(var r=u.call(arguments,1),i=function(){if(this instanceof l){var n=e.apply(this,r.concat(u.call(arguments)));return Object(n)===n?n:this}return e.apply(t,r.concat(u.call(arguments)))},o=Math.max(0,e.length-r.length),s=[],a=0;o>a;a++)s.push("$"+a);var l=Function("binder","return function ("+s.join(",")+"){ return binder.apply(this, arguments); }")(i);return e.prototype&&(n.prototype=e.prototype,l.prototype=new n,n.prototype=null),l}}),p(Array,{isArray:f});var m=Object("a"),y="a"!==m[0]||!(0 in m),b=function(t){var e=!0,n=!0;return t&&(t.call("foo",function(t,n,r){"object"!=typeof r&&(e=!1)}),t.call([1],function(){n="string"==typeof this},"x")),!!t&&e&&n};p(i,{forEach:function(t){var e=v(this),n=y&&h(this)?this.split(""):e,r=arguments[1],i=-1,o=n.length>>>0;if(!c(t))throw new TypeError;for(;++i<o;)i in n&&t.call(r,n[i],i,e)}},!b(i.forEach));var g=Array.prototype.indexOf&&-1!==[0,1].indexOf(1,2);p(i,{indexOf:function(e){var n=y&&h(this)?this.split(""):v(this),r=n.length>>>0;if(!r)return-1;var i=0;for(arguments.length>1&&(i=t(arguments[1])),i=i>=0?i:Math.max(0,r+i);r>i;i++)if(i in n&&n[i]===e)return i;return-1}},g);var w=a.split;2!=="ab".split(/(?:ab)*/).length||4!==".".split(/(.?)(.?)/).length||"t"==="tesst".split(/(s)*/)[1]||4!=="test".split(/(?:)/,-1).length||"".split(/.?/).length||".".split(/()()/).length>1?!function(){var t=void 0===/()??/.exec("")[1];a.split=function(n,r){var o=this;if(void 0===n&&0===r)return[];if("[object RegExp]"!==l.call(n))return w.call(this,n,r);var s,a,u,c,f=[],h=(n.ignoreCase?"i":"")+(n.multiline?"m":"")+(n.extended?"x":"")+(n.sticky?"y":""),d=0;for(n=new RegExp(n.source,h+"g"),o+="",t||(s=new RegExp("^"+n.source+"$(?!\\s)",h)),r=void 0===r?-1>>>0:e(r);(a=n.exec(o))&&(u=a.index+a[0].length,!(u>d&&(f.push(o.slice(d,a.index)),!t&&a.length>1&&a[0].replace(s,function(){for(var t=1;t<arguments.length-2;t++)void 0===arguments[t]&&(a[t]=void 0)}),a.length>1&&a.index<o.length&&i.push.apply(f,a.slice(1)),c=a[0].length,d=u,f.length>=r)));)n.lastIndex===a.index&&n.lastIndex++;return d===o.length?(c||!n.test(""))&&f.push(""):f.push(o.slice(d)),f.length>r?f.slice(0,r):f}}():"0".split(void 0,0).length&&(a.split=function(t,e){return void 0===t&&0===e?[]:w.call(this,t,e)});var x="	\n\f\r   ᠎ �          �　\u2028\u2029",_="​",E="["+x+"]",j=new RegExp("^"+E+E+"*"),T=new RegExp(E+E+"*$"),S=a.trim&&(x.trim()||!_.trim());p(a,{trim:function(){if(void 0===this||null===this)throw new TypeError("can't convert "+this+" to object");return String(this).replace(j,"").replace(T,"")}},S);var O=a.substr,C="".substr&&"b"!=="0b".substr(-1);p(a,{substr:function(t,e){return O.call(this,0>t&&(t=this.length+t)<0?0:t,e)}},C)},{}],16:[function(t,e){"use strict";e.exports=[t("./transport/websocket"),t("./transport/xhr-streaming"),t("./transport/xdr-streaming"),t("./transport/eventsource"),t("./transport/lib/iframe-wrap")(t("./transport/eventsource")),t("./transport/htmlfile"),t("./transport/lib/iframe-wrap")(t("./transport/htmlfile")),t("./transport/xhr-polling"),t("./transport/xdr-polling"),t("./transport/lib/iframe-wrap")(t("./transport/xhr-polling")),t("./transport/jsonp-polling")]},{"./transport/eventsource":20,"./transport/htmlfile":21,"./transport/jsonp-polling":23,"./transport/lib/iframe-wrap":26,"./transport/websocket":38,"./transport/xdr-polling":39,"./transport/xdr-streaming":40,"./transport/xhr-polling":41,"./transport/xhr-streaming":42}],17:[function(t,e){(function(n){"use strict";function r(t,e,n,r){var o=this;i.call(this),setTimeout(function(){o._start(t,e,n,r)},0)}var i=t("events").EventEmitter,o=t("inherits"),s=t("../../utils/event"),a=t("../../utils/url"),u=n.XMLHttpRequest;o(r,i),r.prototype._start=function(t,e,n,i){var o=this;try{this.xhr=new u}catch(l){}if(!this.xhr)return this.emit("finish",0,"no xhr support"),void this._cleanup();e=a.addQuery(e,"t="+ +new Date),this.unloadRef=s.unloadAdd(function(){o._cleanup(!0)});try{this.xhr.open(t,e,!0),this.timeout&&"timeout"in this.xhr&&(this.xhr.timeout=this.timeout,this.xhr.ontimeout=function(){o.emit("finish",0,""),o._cleanup(!1)})}catch(c){return this.emit("finish",0,""),void this._cleanup(!1)}if(i&&i.noCredentials||!r.supportsCORS||(this.xhr.withCredentials="true"),i&&i.headers)for(var f in i.headers)this.xhr.setRequestHeader(f,i.headers[f]);this.xhr.onreadystatechange=function(){if(o.xhr){var t,e,n=o.xhr;switch(n.readyState){case 3:try{e=n.status,t=n.responseText}catch(r){}1223===e&&(e=204),200===e&&t&&t.length>0&&o.emit("chunk",e,t);break;case 4:e=n.status,1223===e&&(e=204),(12005===e||12029===e)&&(e=0),o.emit("finish",e,n.responseText),o._cleanup(!1)}}};try{o.xhr.send(n)}catch(c){o.emit("finish",0,""),o._cleanup(!1)}},r.prototype._cleanup=function(t){if(this.xhr){if(this.removeAllListeners(),s.unloadDel(this.unloadRef),this.xhr.onreadystatechange=function(){},this.xhr.ontimeout&&(this.xhr.ontimeout=null),t)try{this.xhr.abort()}catch(e){}this.unloadRef=this.xhr=null}},r.prototype.close=function(){this._cleanup(!0)},r.enabled=!!u;var l=["Active"].concat("Object").join("X");!r.enabled&&l in n&&(u=function(){try{return new n[l]("Microsoft.XMLHTTP")}catch(t){return null}},r.enabled=!!new u);var c=!1;try{c="withCredentials"in new u}catch(f){}r.supportsCORS=c,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/event":46,"../../utils/url":52,debug:void 0,events:3,inherits:54}],18:[function(t,e){(function(t){e.exports=t.EventSource}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],19:[function(t,e){(function(t){"use strict";var n=t.WebSocket||t.MozWebSocket;n&&(e.exports=function(t){return new n(t)})}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],20:[function(t,e){"use strict";function n(t){if(!n.enabled())throw new Error("Transport created when disabled");i.call(this,t,"/eventsource",o,s)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./receiver/eventsource"),s=t("./sender/xhr-cors"),a=t("eventsource");r(n,i),n.enabled=function(){return!!a},n.transportName="eventsource",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/eventsource":29,"./sender/xhr-cors":35,eventsource:18,inherits:54}],21:[function(t,e){"use strict";function n(t){if(!i.enabled)throw new Error("Transport created when disabled");s.call(this,t,"/htmlfile",i,o)}var r=t("inherits"),i=t("./receiver/htmlfile"),o=t("./sender/xhr-local"),s=t("./lib/ajax-based");r(n,s),n.enabled=function(t){return i.enabled&&t.sameOrigin},n.transportName="htmlfile",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/htmlfile":30,"./sender/xhr-local":37,inherits:54}],22:[function(t,e){"use strict";function n(t,e,r){if(!n.enabled())throw new Error("Transport created when disabled");o.call(this);var i=this;this.origin=a.getOrigin(r),this.baseUrl=r,this.transUrl=e,this.transport=t,this.windowId=c.string(8);var s=a.addPath(r,"/iframe.html")+"#"+this.windowId;this.iframeObj=u.createIframe(s,function(t){i.emit("close",1006,"Unable to load an iframe ("+t+")"),i.close()}),this.onmessageCallback=this._message.bind(this),l.attachEvent("message",this.onmessageCallback)}var r=t("inherits"),i=t("json3"),o=t("events").EventEmitter,s=t("../version"),a=t("../utils/url"),u=t("../utils/iframe"),l=t("../utils/event"),c=t("../utils/random");r(n,o),n.prototype.close=function(){if(this.removeAllListeners(),this.iframeObj){l.detachEvent("message",this.onmessageCallback);try{this.postMessage("c")}catch(t){}this.iframeObj.cleanup(),this.iframeObj=null,this.onmessageCallback=this.iframeObj=null}},n.prototype._message=function(t){if(a.isOriginEqual(t.origin,this.origin)){var e;try{e=i.parse(t.data)}catch(n){return}if(e.windowId===this.windowId)switch(e.type){case"s":this.iframeObj.loaded(),this.postMessage("s",i.stringify([s,this.transport,this.transUrl,this.baseUrl]));break;case"t":this.emit("message",e.data);break;case"c":var r;try{r=i.parse(e.data)}catch(n){return}this.emit("close",r[0],r[1]),this.close()}}},n.prototype.postMessage=function(t,e){this.iframeObj.post(i.stringify({windowId:this.windowId,type:t,data:e||""}),this.origin)},n.prototype.send=function(t){this.postMessage("m",t)},n.enabled=function(){return u.iframeEnabled},n.transportName="iframe",n.roundTrips=2,e.exports=n},{"../utils/event":46,"../utils/iframe":47,"../utils/random":50,"../utils/url":52,"../version":53,debug:void 0,events:3,inherits:54,json3:55}],23:[function(t,e){(function(n){"use strict";function r(t){if(!r.enabled())throw new Error("Transport created when disabled");o.call(this,t,"/jsonp",a,s)}var i=t("inherits"),o=t("./lib/sender-receiver"),s=t("./receiver/jsonp"),a=t("./sender/jsonp");i(r,o),r.enabled=function(){return!!n.document},r.transportName="jsonp-polling",r.roundTrips=1,r.needBody=!0,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./lib/sender-receiver":28,"./receiver/jsonp":31,"./sender/jsonp":33,inherits:54}],24:[function(t,e){"use strict";function n(t){return function(e,n,r){var i={};"string"==typeof n&&(i.headers={"Content-type":"text/plain"});var s=o.addPath(e,"/xhr_send"),a=new t("POST",s,n,i);return a.once("finish",function(t){return a=null,200!==t&&204!==t?r(new Error("http status "+t)):void r()}),function(){a.close(),a=null;var t=new Error("Aborted");t.code=1e3,r(t)}}}function r(t,e,r,i){s.call(this,t,e,n(i),r,i)}var i=t("inherits"),o=t("../../utils/url"),s=t("./sender-receiver");i(r,s),e.exports=r},{"../../utils/url":52,"./sender-receiver":28,debug:void 0,inherits:54}],25:[function(t,e){"use strict";function n(t,e){i.call(this),this.sendBuffer=[],this.sender=e,this.url=t}var r=t("inherits"),i=t("events").EventEmitter;r(n,i),n.prototype.send=function(t){this.sendBuffer.push(t),this.sendStop||this.sendSchedule()},n.prototype.sendScheduleWait=function(){var t,e=this;this.sendStop=function(){e.sendStop=null,clearTimeout(t)},t=setTimeout(function(){e.sendStop=null,e.sendSchedule()},25)},n.prototype.sendSchedule=function(){var t=this;if(this.sendBuffer.length>0){var e="["+this.sendBuffer.join(",")+"]";this.sendStop=this.sender(this.url,e,function(e){t.sendStop=null,e?(t.emit("close",e.code||1006,"Sending error: "+e),t._cleanup()):t.sendScheduleWait()}),this.sendBuffer=[]}},n.prototype._cleanup=function(){this.removeAllListeners()},n.prototype.stop=function(){this._cleanup(),this.sendStop&&(this.sendStop(),this.sendStop=null)},e.exports=n},{debug:void 0,events:3,inherits:54}],26:[function(t,e){(function(n){"use strict";var r=t("inherits"),i=t("../iframe"),o=t("../../utils/object");e.exports=function(t){function e(e,n){i.call(this,t.transportName,e,n)}return r(e,i),e.enabled=function(e,r){if(!n.document)return!1;var s=o.extend({},r);return s.sameOrigin=!0,t.enabled(s)&&i.enabled()},e.transportName="iframe-"+t.transportName,e.needBody=!0,e.roundTrips=i.roundTrips+t.roundTrips-1,e.facadeTransport=t,e}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/object":49,"../iframe":22,inherits:54}],27:[function(t,e){"use strict";function n(t,e,n){i.call(this),this.Receiver=t,this.receiveUrl=e,this.AjaxObject=n,this._scheduleReceiver()}var r=t("inherits"),i=t("events").EventEmitter;r(n,i),n.prototype._scheduleReceiver=function(){var t=this,e=this.poll=new this.Receiver(this.receiveUrl,this.AjaxObject);e.on("message",function(e){t.emit("message",e)}),e.once("close",function(n,r){t.poll=e=null,t.pollIsClosing||("network"===r?t._scheduleReceiver():(t.emit("close",n||1006,r),t.removeAllListeners()))})},n.prototype.abort=function(){this.removeAllListeners(),this.pollIsClosing=!0,this.poll&&this.poll.abort()},e.exports=n},{debug:void 0,events:3,inherits:54}],28:[function(t,e){"use strict";function n(t,e,n,r,a){var u=i.addPath(t,e),l=this;o.call(this,t,n),this.poll=new s(r,u,a),this.poll.on("message",function(t){l.emit("message",t)}),this.poll.once("close",function(t,e){l.poll=null,l.emit("close",t,e),l.close()})}var r=t("inherits"),i=t("../../utils/url"),o=t("./buffered-sender"),s=t("./polling");r(n,o),n.prototype.close=function(){this.removeAllListeners(),this.poll&&(this.poll.abort(),this.poll=null),this.stop()},e.exports=n},{"../../utils/url":52,"./buffered-sender":25,"./polling":27,debug:void 0,inherits:54}],29:[function(t,e){"use strict";function n(t){i.call(this);var e=this,n=this.es=new o(t);n.onmessage=function(t){e.emit("message",decodeURI(t.data))},n.onerror=function(t){var r=2!==n.readyState?"network":"permanent";e._cleanup(),e._close(r)}}var r=t("inherits"),i=t("events").EventEmitter,o=t("eventsource");r(n,i),n.prototype.abort=function(){this._cleanup(),this._close("user")},n.prototype._cleanup=function(){var t=this.es;t&&(t.onmessage=t.onerror=null,t.close(),this.es=null)},n.prototype._close=function(t){var e=this;setTimeout(function(){e.emit("close",null,t),e.removeAllListeners()},200)},e.exports=n},{debug:void 0,events:3,eventsource:18,inherits:54}],30:[function(t,e){(function(n){"use strict";function r(t){a.call(this);var e=this;o.polluteGlobalNamespace(),this.id="a"+u.string(6),t=s.addQuery(t,"c="+decodeURIComponent(o.WPrefix+"."+this.id));var i=r.htmlfileEnabled?o.createHtmlfile:o.createIframe;n[o.WPrefix][this.id]={start:function(){e.iframeObj.loaded()},message:function(t){e.emit("message",t)},stop:function(){e._cleanup(),e._close("network")}},this.iframeObj=i(t,function(){e._cleanup(),e._close("permanent")})}var i=t("inherits"),o=t("../../utils/iframe"),s=t("../../utils/url"),a=t("events").EventEmitter,u=t("../../utils/random");i(r,a),r.prototype.abort=function(){this._cleanup(),this._close("user")},r.prototype._cleanup=function(){this.iframeObj&&(this.iframeObj.cleanup(),this.iframeObj=null),delete n[o.WPrefix][this.id]},r.prototype._close=function(t){this.emit("close",null,t),this.removeAllListeners()},r.htmlfileEnabled=!1;var l=["Active"].concat("Object").join("X");if(l in n)try{r.htmlfileEnabled=!!new n[l]("htmlfile")}catch(c){}r.enabled=r.htmlfileEnabled||o.iframeEnabled,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,debug:void 0,events:3,inherits:54}],31:[function(t,e){(function(n){"use strict";function r(t){var e=this;l.call(this),i.polluteGlobalNamespace(),this.id="a"+o.string(6);var s=a.addQuery(t,"c="+encodeURIComponent(i.WPrefix+"."+this.id));n[i.WPrefix][this.id]=this._callback.bind(this),this._createScript(s),this.timeoutId=setTimeout(function(){e._abort(new Error("JSONP script loaded abnormally (timeout)"))},r.timeout)}var i=t("../../utils/iframe"),o=t("../../utils/random"),s=t("../../utils/browser"),a=t("../../utils/url"),u=t("inherits"),l=t("events").EventEmitter;u(r,l),r.prototype.abort=function(){if(n[i.WPrefix][this.id]){var t=new Error("JSONP user aborted read");t.code=1e3,this._abort(t)}},r.timeout=35e3,r.scriptErrorTimeout=1e3,r.prototype._callback=function(t){this._cleanup(),this.aborting||(t&&this.emit("message",t),this.emit("close",null,"network"),this.removeAllListeners())},r.prototype._abort=function(t){this._cleanup(),this.aborting=!0,this.emit("close",t.code,t.message),this.removeAllListeners()},r.prototype._cleanup=function(){if(clearTimeout(this.timeoutId),this.script2&&(this.script2.parentNode.removeChild(this.script2),this.script2=null),this.script){var t=this.script;t.parentNode.removeChild(t),t.onreadystatechange=t.onerror=t.onload=t.onclick=null,this.script=null}delete n[i.WPrefix][this.id]},r.prototype._scriptError=function(){var t=this;this.errorTimer||(this.errorTimer=setTimeout(function(){t.loadedOkay||t._abort(new Error("JSONP script loaded abnormally (onerror)"))},r.scriptErrorTimeout))},r.prototype._createScript=function(t){var e,r=this,i=this.script=n.document.createElement("script");if(i.id="a"+o.string(8),i.src=t,i.type="text/javascript",i.charset="UTF-8",i.onerror=this._scriptError.bind(this),i.onload=function(){r._abort(new Error("JSONP script loaded abnormally (onload)"))},i.onreadystatechange=function(){if(/loaded|closed/.test(i.readyState)){if(i&&i.htmlFor&&i.onclick){r.loadedOkay=!0;try{i.onclick()}catch(t){}}i&&r._abort(new Error("JSONP script loaded abnormally (onreadystatechange)"))
+}},"undefined"==typeof i.async&&n.document.attachEvent)if(s.isOpera())e=this.script2=n.document.createElement("script"),e.text="try{var a = document.getElementById('"+i.id+"'); if(a)a.onerror();}catch(x){};",i.async=e.async=!1;else{try{i.htmlFor=i.id,i.event="onclick"}catch(a){}i.async=!0}"undefined"!=typeof i.async&&(i.async=!0);var u=n.document.getElementsByTagName("head")[0];u.insertBefore(i,u.firstChild),e&&u.insertBefore(e,u.firstChild)},e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/browser":44,"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,debug:void 0,events:3,inherits:54}],32:[function(t,e){"use strict";function n(t,e){i.call(this);var n=this;this.bufferPosition=0,this.xo=new e("POST",t,null),this.xo.on("chunk",this._chunkHandler.bind(this)),this.xo.once("finish",function(t,e){n._chunkHandler(t,e),n.xo=null;var r=200===t?"network":"permanent";n.emit("close",null,r),n._cleanup()})}var r=t("inherits"),i=t("events").EventEmitter;r(n,i),n.prototype._chunkHandler=function(t,e){if(200===t&&e)for(var n=-1;;this.bufferPosition+=n+1){var r=e.slice(this.bufferPosition);if(n=r.indexOf("\n"),-1===n)break;var i=r.slice(0,n);i&&this.emit("message",i)}},n.prototype._cleanup=function(){this.removeAllListeners()},n.prototype.abort=function(){this.xo&&(this.xo.close(),this.emit("close",null,"user"),this.xo=null),this._cleanup()},e.exports=n},{debug:void 0,events:3,inherits:54}],33:[function(t,e){(function(n){"use strict";function r(t){try{return n.document.createElement('<iframe name="'+t+'">')}catch(e){var r=n.document.createElement("iframe");return r.name=t,r}}function i(){o=n.document.createElement("form"),o.style.display="none",o.style.position="absolute",o.method="POST",o.enctype="application/x-www-form-urlencoded",o.acceptCharset="UTF-8",s=n.document.createElement("textarea"),s.name="d",o.appendChild(s),n.document.body.appendChild(o)}var o,s,a=t("../../utils/random"),u=t("../../utils/url");e.exports=function(t,e,n){o||i();var l="a"+a.string(8);o.target=l,o.action=u.addQuery(u.addPath(t,"/jsonp_send"),"i="+l);var c=r(l);c.id=l,c.style.display="none",o.appendChild(c);try{s.value=e}catch(f){}o.submit();var h=function(t){c.onerror&&(c.onreadystatechange=c.onerror=c.onload=null,setTimeout(function(){c.parentNode.removeChild(c),c=null},500),s.value="",n(t))};return c.onerror=function(){h()},c.onload=function(){h()},c.onreadystatechange=function(t){"complete"===c.readyState&&h()},function(){h(new Error("Aborted"))}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/random":50,"../../utils/url":52,debug:void 0}],34:[function(t,e){(function(n){"use strict";function r(t,e,n){var r=this;i.call(this),setTimeout(function(){r._start(t,e,n)},0)}var i=t("events").EventEmitter,o=t("inherits"),s=t("../../utils/event"),a=t("../../utils/browser"),u=t("../../utils/url");o(r,i),r.prototype._start=function(t,e,r){var i=this,o=new n.XDomainRequest;e=u.addQuery(e,"t="+ +new Date),o.onerror=function(){i._error()},o.ontimeout=function(){i._error()},o.onprogress=function(){i.emit("chunk",200,o.responseText)},o.onload=function(){i.emit("finish",200,o.responseText),i._cleanup(!1)},this.xdr=o,this.unloadRef=s.unloadAdd(function(){i._cleanup(!0)});try{this.xdr.open(t,e),this.timeout&&(this.xdr.timeout=this.timeout),this.xdr.send(r)}catch(a){this._error()}},r.prototype._error=function(){this.emit("finish",0,""),this._cleanup(!1)},r.prototype._cleanup=function(t){if(this.xdr){if(this.removeAllListeners(),s.unloadDel(this.unloadRef),this.xdr.ontimeout=this.xdr.onerror=this.xdr.onprogress=this.xdr.onload=null,t)try{this.xdr.abort()}catch(e){}this.unloadRef=this.xdr=null}},r.prototype.close=function(){this._cleanup(!0)},r.enabled=!(!n.XDomainRequest||!a.hasDomain()),e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/browser":44,"../../utils/event":46,"../../utils/url":52,debug:void 0,events:3,inherits:54}],35:[function(t,e){"use strict";function n(t,e,n,r){i.call(this,t,e,n,r)}var r=t("inherits"),i=t("../driver/xhr");r(n,i),n.enabled=i.enabled&&i.supportsCORS,e.exports=n},{"../driver/xhr":17,inherits:54}],36:[function(t,e){"use strict";function n(){var t=this;r.call(this),this.to=setTimeout(function(){t.emit("finish",200,"{}")},n.timeout)}var r=t("events").EventEmitter,i=t("inherits");i(n,r),n.prototype.close=function(){clearTimeout(this.to)},n.timeout=2e3,e.exports=n},{events:3,inherits:54}],37:[function(t,e){"use strict";function n(t,e,n){i.call(this,t,e,n,{noCredentials:!0})}var r=t("inherits"),i=t("../driver/xhr");r(n,i),n.enabled=i.enabled,e.exports=n},{"../driver/xhr":17,inherits:54}],38:[function(t,e){"use strict";function n(t,e,o){if(!n.enabled())throw new Error("Transport created when disabled");s.call(this);var u=this,l=i.addPath(t,"/websocket");l="https"===l.slice(0,5)?"wss"+l.slice(5):"ws"+l.slice(4),this.url=l,this.ws=new a(this.url,[],o),this.ws.onmessage=function(t){u.emit("message",t.data)},this.unloadRef=r.unloadAdd(function(){u.ws.close()}),this.ws.onclose=function(t){u.emit("close",t.code,t.reason),u._cleanup()},this.ws.onerror=function(t){u.emit("close",1006,"WebSocket connection broken"),u._cleanup()}}var r=t("../utils/event"),i=t("../utils/url"),o=t("inherits"),s=t("events").EventEmitter,a=t("./driver/websocket");o(n,s),n.prototype.send=function(t){var e="["+t+"]";this.ws.send(e)},n.prototype.close=function(){this.ws&&this.ws.close(),this._cleanup()},n.prototype._cleanup=function(){var t=this.ws;t&&(t.onmessage=t.onclose=t.onerror=null),r.unloadDel(this.unloadRef),this.unloadRef=this.ws=null,this.removeAllListeners()},n.enabled=function(){return!!a},n.transportName="websocket",n.roundTrips=2,e.exports=n},{"../utils/event":46,"../utils/url":52,"./driver/websocket":19,debug:void 0,events:3,inherits:54}],39:[function(t,e){"use strict";function n(t){if(!a.enabled)throw new Error("Transport created when disabled");i.call(this,t,"/xhr",s,a)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./xdr-streaming"),s=t("./receiver/xhr"),a=t("./sender/xdr");r(n,i),n.enabled=o.enabled,n.transportName="xdr-polling",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,"./xdr-streaming":40,inherits:54}],40:[function(t,e){"use strict";function n(t){if(!s.enabled)throw new Error("Transport created when disabled");i.call(this,t,"/xhr_streaming",o,s)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./receiver/xhr"),s=t("./sender/xdr");r(n,i),n.enabled=function(t){return t.cookie_needed||t.nullOrigin?!1:s.enabled&&t.sameScheme},n.transportName="xdr-streaming",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,inherits:54}],41:[function(t,e){"use strict";function n(t){if(!a.enabled&&!s.enabled)throw new Error("Transport created when disabled");i.call(this,t,"/xhr",o,s)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./receiver/xhr"),s=t("./sender/xhr-cors"),a=t("./sender/xhr-local");r(n,i),n.enabled=function(t){return t.nullOrigin?!1:a.enabled&&t.sameOrigin?!0:s.enabled},n.transportName="xhr-polling",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,inherits:54}],42:[function(t,e){(function(n){"use strict";function r(t){if(!u.enabled&&!a.enabled)throw new Error("Transport created when disabled");o.call(this,t,"/xhr_streaming",s,a)}var i=t("inherits"),o=t("./lib/ajax-based"),s=t("./receiver/xhr"),a=t("./sender/xhr-cors"),u=t("./sender/xhr-local"),l=t("../utils/browser");i(r,o),r.enabled=function(t){return t.nullOrigin?!1:l.isOpera()?!1:a.enabled},r.transportName="xhr-streaming",r.roundTrips=2,r.needBody=!!n.document,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../utils/browser":44,"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,inherits:54}],43:[function(t,e){(function(t){"use strict";e.exports.randomBytes=t.crypto&&t.crypto.getRandomValues?function(e){var n=new Uint8Array(e);return t.crypto.getRandomValues(n),n}:function(t){for(var e=new Array(t),n=0;t>n;n++)e[n]=Math.floor(256*Math.random());return e}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],44:[function(t,e){(function(t){"use strict";e.exports={isOpera:function(){return t.navigator&&/opera/i.test(t.navigator.userAgent)},isKonqueror:function(){return t.navigator&&/konqueror/i.test(t.navigator.userAgent)},hasDomain:function(){if(!t.document)return!0;try{return!!t.document.domain}catch(e){return!1}}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],45:[function(t,e){"use strict";var n,r=t("json3"),i=/[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g,o=function(t){var e,n={},r=[];for(e=0;65536>e;e++)r.push(String.fromCharCode(e));return t.lastIndex=0,r.join("").replace(t,function(t){return n[t]="\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4),""}),t.lastIndex=0,n};e.exports={quote:function(t){var e=r.stringify(t);return i.lastIndex=0,i.test(e)?(n||(n=o(i)),e.replace(i,function(t){return n[t]})):e}}},{json3:55}],46:[function(t,e){(function(n){"use strict";var r=t("./random"),i={},o=!1,s=n.chrome&&n.chrome.app&&n.chrome.app.runtime;e.exports={attachEvent:function(t,e){"undefined"!=typeof n.addEventListener?n.addEventListener(t,e,!1):n.document&&n.attachEvent&&(n.document.attachEvent("on"+t,e),n.attachEvent("on"+t,e))},detachEvent:function(t,e){"undefined"!=typeof n.addEventListener?n.removeEventListener(t,e,!1):n.document&&n.detachEvent&&(n.document.detachEvent("on"+t,e),n.detachEvent("on"+t,e))},unloadAdd:function(t){if(s)return null;var e=r.string(8);return i[e]=t,o&&setTimeout(this.triggerUnloadCallbacks,0),e},unloadDel:function(t){t in i&&delete i[t]},triggerUnloadCallbacks:function(){for(var t in i)i[t](),delete i[t]}};var a=function(){o||(o=!0,e.exports.triggerUnloadCallbacks())};s||e.exports.attachEvent("unload",a)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./random":50}],47:[function(t,e){(function(n){"use strict";var r=t("./event"),i=t("json3"),o=t("./browser");e.exports={WPrefix:"_jp",currentWindowId:null,polluteGlobalNamespace:function(){e.exports.WPrefix in n||(n[e.exports.WPrefix]={})},postMessage:function(t,r){n.parent!==n&&n.parent.postMessage(i.stringify({windowId:e.exports.currentWindowId,type:t,data:r||""}),"*")},createIframe:function(t,e){var i,o,s=n.document.createElement("iframe"),a=function(){clearTimeout(i);try{s.onload=null}catch(t){}s.onerror=null},u=function(){s&&(a(),setTimeout(function(){s&&s.parentNode.removeChild(s),s=null},0),r.unloadDel(o))},l=function(t){s&&(u(),e(t))},c=function(t,e){try{setTimeout(function(){s&&s.contentWindow&&s.contentWindow.postMessage(t,e)},0)}catch(n){}};return s.src=t,s.style.display="none",s.style.position="absolute",s.onerror=function(){l("onerror")},s.onload=function(){clearTimeout(i),i=setTimeout(function(){l("onload timeout")},2e3)},n.document.body.appendChild(s),i=setTimeout(function(){l("timeout")},15e3),o=r.unloadAdd(u),{post:c,cleanup:u,loaded:a}},createHtmlfile:function(t,i){var o,s,a,u=["Active"].concat("Object").join("X"),l=new n[u]("htmlfile"),c=function(){clearTimeout(o),a.onerror=null},f=function(){l&&(c(),r.unloadDel(s),a.parentNode.removeChild(a),a=l=null,CollectGarbage())},h=function(t){l&&(f(),i(t))},d=function(t,e){try{setTimeout(function(){a&&a.contentWindow&&a.contentWindow.postMessage(t,e)},0)}catch(n){}};l.open(),l.write('<html><script>document.domain="'+n.document.domain+'";</script></html>'),l.close(),l.parentWindow[e.exports.WPrefix]=n[e.exports.WPrefix];var p=l.createElement("div");return l.body.appendChild(p),a=l.createElement("iframe"),p.appendChild(a),a.src=t,a.onerror=function(){h("onerror")},o=setTimeout(function(){h("timeout")},15e3),s=r.unloadAdd(f),{post:d,cleanup:f,loaded:c}}},e.exports.iframeEnabled=!1,n.document&&(e.exports.iframeEnabled=("function"==typeof n.postMessage||"object"==typeof n.postMessage)&&!o.isKonqueror())}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./browser":44,"./event":46,debug:void 0,json3:55}],48:[function(t,e){(function(t){"use strict";var n={};["log","debug","warn"].forEach(function(e){var r;try{r=t.console&&t.console[e]&&t.console[e].apply}catch(i){}n[e]=r?function(){return t.console[e].apply(t.console,arguments)}:"log"===e?function(){}:n.log}),e.exports=n}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],49:[function(t,e){"use strict";e.exports={isObject:function(t){var e=typeof t;return"function"===e||"object"===e&&!!t},extend:function(t){if(!this.isObject(t))return t;for(var e,n,r=1,i=arguments.length;i>r;r++){e=arguments[r];for(n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])}return t}}},{}],50:[function(t,e){"use strict";var n=t("crypto"),r="abcdefghijklmnopqrstuvwxyz012345";e.exports={string:function(t){for(var e=r.length,i=n.randomBytes(t),o=[],s=0;t>s;s++)o.push(r.substr(i[s]%e,1));return o.join("")},number:function(t){return Math.floor(Math.random()*t)},numberString:function(t){var e=(""+(t-1)).length,n=new Array(e+1).join("0");return(n+this.number(t)).slice(-e)}}},{crypto:43}],51:[function(t,e){"use strict";e.exports=function(t){return{filterToEnabled:function(e,n){var r={main:[],facade:[]};return e?"string"==typeof e&&(e=[e]):e=[],t.forEach(function(t){t&&("websocket"!==t.transportName||n.websocket!==!1)&&(e.length&&-1===e.indexOf(t.transportName)||t.enabled(n)&&(r.main.push(t),t.facadeTransport&&r.facade.push(t.facadeTransport)))}),r}}}},{debug:void 0}],52:[function(t,e){"use strict";var n=t("url-parse");e.exports={getOrigin:function(t){if(!t)return null;var e=new n(t);if("file:"===e.protocol)return null;var r=e.port;return r||(r="https:"===e.protocol?"443":"80"),e.protocol+"//"+e.hostname+":"+r},isOriginEqual:function(t,e){var n=this.getOrigin(t)===this.getOrigin(e);return n},isSchemeEqual:function(t,e){return t.split(":")[0]===e.split(":")[0]},addPath:function(t,e){var n=t.split("?");return n[0]+e+(n[1]?"?"+n[1]:"")},addQuery:function(t,e){return t+(-1===t.indexOf("?")?"?"+e:"&"+e)}}},{debug:void 0,"url-parse":56}],53:[function(t,e){e.exports="1.1.1"},{}],54:[function(t,e){e.exports="function"==typeof Object.create?function(t,e){t.super_=e,t.prototype=Object.create(e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}})}:function(t,e){t.super_=e;var n=function(){};n.prototype=e.prototype,t.prototype=new n,t.prototype.constructor=t}},{}],55:[function(e,n,r){(function(e){(function(){function i(t,e){function n(t){if(n[t]!==m)return n[t];var i;if("bug-string-char-index"==t)i="a"!="a"[0];else if("json"==t)i=n("json-stringify")&&n("json-parse");else{var s,a='{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';if("json-stringify"==t){var u=e.stringify,c="function"==typeof u&&g;if(c){(s=function(){return 1}).toJSON=s;try{c="0"===u(0)&&"0"===u(new r)&&'""'==u(new o)&&u(b)===m&&u(m)===m&&u()===m&&"1"===u(s)&&"[1]"==u([s])&&"[null]"==u([m])&&"null"==u(null)&&"[null,null,null]"==u([m,b,null])&&u({a:[s,!0,!1,null,"\x00\b\n\f\r	"]})==a&&"1"===u(null,s)&&"[\n 1,\n 2\n]"==u([1,2],null,1)&&'"-271821-04-20T00:00:00.000Z"'==u(new l(-864e13))&&'"+275760-09-13T00:00:00.000Z"'==u(new l(864e13))&&'"-000001-01-01T00:00:00.000Z"'==u(new l(-621987552e5))&&'"1969-12-31T23:59:59.999Z"'==u(new l(-1))}catch(f){c=!1}}i=c}if("json-parse"==t){var h=e.parse;if("function"==typeof h)try{if(0===h("0")&&!h(!1)){s=h(a);var d=5==s.a.length&&1===s.a[0];if(d){try{d=!h('"	"')}catch(f){}if(d)try{d=1!==h("01")}catch(f){}if(d)try{d=1!==h("1.")}catch(f){}}}}catch(f){d=!1}i=d}}return n[t]=!!i}t||(t=u.Object()),e||(e=u.Object());var r=t.Number||u.Number,o=t.String||u.String,a=t.Object||u.Object,l=t.Date||u.Date,c=t.SyntaxError||u.SyntaxError,f=t.TypeError||u.TypeError,h=t.Math||u.Math,d=t.JSON||u.JSON;"object"==typeof d&&d&&(e.stringify=d.stringify,e.parse=d.parse);var p,v,m,y=a.prototype,b=y.toString,g=new l(-0xc782b5b800cec);try{g=-109252==g.getUTCFullYear()&&0===g.getUTCMonth()&&1===g.getUTCDate()&&10==g.getUTCHours()&&37==g.getUTCMinutes()&&6==g.getUTCSeconds()&&708==g.getUTCMilliseconds()}catch(w){}if(!n("json")){var x="[object Function]",_="[object Date]",E="[object Number]",j="[object String]",T="[object Array]",S="[object Boolean]",O=n("bug-string-char-index");if(!g)var C=h.floor,A=[0,31,59,90,120,151,181,212,243,273,304,334],N=function(t,e){return A[e]+365*(t-1970)+C((t-1969+(e=+(e>1)))/4)-C((t-1901+e)/100)+C((t-1601+e)/400)};if((p=y.hasOwnProperty)||(p=function(t){var e,n={};return(n.__proto__=null,n.__proto__={toString:1},n).toString!=b?p=function(t){var e=this.__proto__,n=t in(this.__proto__=null,this);return this.__proto__=e,n}:(e=n.constructor,p=function(t){var n=(this.constructor||e).prototype;return t in this&&!(t in n&&this[t]===n[t])}),n=null,p.call(this,t)}),v=function(t,e){var n,r,i,o=0;(n=function(){this.valueOf=0}).prototype.valueOf=0,r=new n;for(i in r)p.call(r,i)&&o++;return n=r=null,o?v=2==o?function(t,e){var n,r={},i=b.call(t)==x;for(n in t)i&&"prototype"==n||p.call(r,n)||!(r[n]=1)||!p.call(t,n)||e(n)}:function(t,e){var n,r,i=b.call(t)==x;for(n in t)i&&"prototype"==n||!p.call(t,n)||(r="constructor"===n)||e(n);(r||p.call(t,n="constructor"))&&e(n)}:(r=["valueOf","toString","toLocaleString","propertyIsEnumerable","isPrototypeOf","hasOwnProperty","constructor"],v=function(t,e){var n,i,o=b.call(t)==x,a=!o&&"function"!=typeof t.constructor&&s[typeof t.hasOwnProperty]&&t.hasOwnProperty||p;for(n in t)o&&"prototype"==n||!a.call(t,n)||e(n);for(i=r.length;n=r[--i];a.call(t,n)&&e(n));}),v(t,e)},!n("json-stringify")){var k={92:"\\\\",34:'\\"',8:"\\b",12:"\\f",10:"\\n",13:"\\r",9:"\\t"},I="000000",P=function(t,e){return(I+(e||0)).slice(-t)},L="\\u00",R=function(t){for(var e='"',n=0,r=t.length,i=!O||r>10,o=i&&(O?t.split(""):t);r>n;n++){var s=t.charCodeAt(n);switch(s){case 8:case 9:case 10:case 12:case 13:case 34:case 92:e+=k[s];break;default:if(32>s){e+=L+P(2,s.toString(16));break}e+=i?o[n]:t.charAt(n)}}return e+'"'},U=function(t,e,n,r,i,o,s){var a,u,l,c,h,d,y,g,w,x,O,A,k,I,L,M;try{a=e[t]}catch(q){}if("object"==typeof a&&a)if(u=b.call(a),u!=_||p.call(a,"toJSON"))"function"==typeof a.toJSON&&(u!=E&&u!=j&&u!=T||p.call(a,"toJSON"))&&(a=a.toJSON(t));else if(a>-1/0&&1/0>a){if(N){for(h=C(a/864e5),l=C(h/365.2425)+1970-1;N(l+1,0)<=h;l++);for(c=C((h-N(l,0))/30.42);N(l,c+1)<=h;c++);h=1+h-N(l,c),d=(a%864e5+864e5)%864e5,y=C(d/36e5)%24,g=C(d/6e4)%60,w=C(d/1e3)%60,x=d%1e3}else l=a.getUTCFullYear(),c=a.getUTCMonth(),h=a.getUTCDate(),y=a.getUTCHours(),g=a.getUTCMinutes(),w=a.getUTCSeconds(),x=a.getUTCMilliseconds();a=(0>=l||l>=1e4?(0>l?"-":"+")+P(6,0>l?-l:l):P(4,l))+"-"+P(2,c+1)+"-"+P(2,h)+"T"+P(2,y)+":"+P(2,g)+":"+P(2,w)+"."+P(3,x)+"Z"}else a=null;if(n&&(a=n.call(e,t,a)),null===a)return"null";if(u=b.call(a),u==S)return""+a;if(u==E)return a>-1/0&&1/0>a?""+a:"null";if(u==j)return R(""+a);if("object"==typeof a){for(I=s.length;I--;)if(s[I]===a)throw f();if(s.push(a),O=[],L=o,o+=i,u==T){for(k=0,I=a.length;I>k;k++)A=U(k,a,n,r,i,o,s),O.push(A===m?"null":A);M=O.length?i?"[\n"+o+O.join(",\n"+o)+"\n"+L+"]":"["+O.join(",")+"]":"[]"}else v(r||a,function(t){var e=U(t,a,n,r,i,o,s);e!==m&&O.push(R(t)+":"+(i?" ":"")+e)}),M=O.length?i?"{\n"+o+O.join(",\n"+o)+"\n"+L+"}":"{"+O.join(",")+"}":"{}";return s.pop(),M}};e.stringify=function(t,e,n){var r,i,o,a;if(s[typeof e]&&e)if((a=b.call(e))==x)i=e;else if(a==T){o={};for(var u,l=0,c=e.length;c>l;u=e[l++],a=b.call(u),(a==j||a==E)&&(o[u]=1));}if(n)if((a=b.call(n))==E){if((n-=n%1)>0)for(r="",n>10&&(n=10);r.length<n;r+=" ");}else a==j&&(r=n.length<=10?n:n.slice(0,10));return U("",(u={},u[""]=t,u),i,o,r,"",[])}}if(!n("json-parse")){var M,q,D=o.fromCharCode,W={92:"\\",34:'"',47:"/",98:"\b",116:"	",110:"\n",102:"\f",114:"\r"},J=function(){throw M=q=null,c()},B=function(){for(var t,e,n,r,i,o=q,s=o.length;s>M;)switch(i=o.charCodeAt(M)){case 9:case 10:case 13:case 32:M++;break;case 123:case 125:case 91:case 93:case 58:case 44:return t=O?o.charAt(M):o[M],M++,t;case 34:for(t="@",M++;s>M;)if(i=o.charCodeAt(M),32>i)J();else if(92==i)switch(i=o.charCodeAt(++M)){case 92:case 34:case 47:case 98:case 116:case 110:case 102:case 114:t+=W[i],M++;break;case 117:for(e=++M,n=M+4;n>M;M++)i=o.charCodeAt(M),i>=48&&57>=i||i>=97&&102>=i||i>=65&&70>=i||J();t+=D("0x"+o.slice(e,M));break;default:J()}else{if(34==i)break;for(i=o.charCodeAt(M),e=M;i>=32&&92!=i&&34!=i;)i=o.charCodeAt(++M);t+=o.slice(e,M)}if(34==o.charCodeAt(M))return M++,t;J();default:if(e=M,45==i&&(r=!0,i=o.charCodeAt(++M)),i>=48&&57>=i){for(48==i&&(i=o.charCodeAt(M+1),i>=48&&57>=i)&&J(),r=!1;s>M&&(i=o.charCodeAt(M),i>=48&&57>=i);M++);if(46==o.charCodeAt(M)){for(n=++M;s>n&&(i=o.charCodeAt(n),i>=48&&57>=i);n++);n==M&&J(),M=n}if(i=o.charCodeAt(M),101==i||69==i){for(i=o.charCodeAt(++M),(43==i||45==i)&&M++,n=M;s>n&&(i=o.charCodeAt(n),i>=48&&57>=i);n++);n==M&&J(),M=n}return+o.slice(e,M)}if(r&&J(),"true"==o.slice(M,M+4))return M+=4,!0;if("false"==o.slice(M,M+5))return M+=5,!1;if("null"==o.slice(M,M+4))return M+=4,null;J()}return"$"},G=function(t){var e,n;if("$"==t&&J(),"string"==typeof t){if("@"==(O?t.charAt(0):t[0]))return t.slice(1);if("["==t){for(e=[];t=B(),"]"!=t;n||(n=!0))n&&(","==t?(t=B(),"]"==t&&J()):J()),","==t&&J(),e.push(G(t));return e}if("{"==t){for(e={};t=B(),"}"!=t;n||(n=!0))n&&(","==t?(t=B(),"}"==t&&J()):J()),(","==t||"string"!=typeof t||"@"!=(O?t.charAt(0):t[0])||":"!=B())&&J(),e[t.slice(1)]=G(B());return e}J()}return t},F=function(t,e,n){var r=H(t,e,n);r===m?delete t[e]:t[e]=r},H=function(t,e,n){var r,i=t[e];if("object"==typeof i&&i)if(b.call(i)==T)for(r=i.length;r--;)F(i,r,n);else v(i,function(t){F(i,t,n)});return n.call(t,e,i)};e.parse=function(t,e){var n,r;return M=0,q=""+t,n=G(B()),"$"!=B()&&J(),M=q=null,e&&b.call(e)==x?H((r={},r[""]=n,r),"",e):n}}}return e.runInContext=i,e}var o="function"==typeof t&&t.amd,s={"function":!0,object:!0},a=s[typeof r]&&r&&!r.nodeType&&r,u=s[typeof window]&&window||this,l=a&&s[typeof n]&&n&&!n.nodeType&&"object"==typeof e&&e;if(!l||l.global!==l&&l.window!==l&&l.self!==l||(u=l),a&&!o)i(u,a);else{var c=u.JSON,f=u.JSON3,h=!1,d=i(u,u.JSON3={noConflict:function(){return h||(h=!0,u.JSON=c,u.JSON3=f,c=f=null),d}});u.JSON={parse:d.parse,stringify:d.stringify}}o&&t(function(){return d})}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],56:[function(t,e){"use strict";function n(t){var e=u.exec(t);return{protocol:e[1]?e[1].toLowerCase():"",slashes:!!e[2],rest:e[3]?e[3]:""}}function r(t,e,u){if(!(this instanceof r))return new r(t,e,u);var c,f,h,d,p=a.test(t),v=typeof e,m=this,y=0;"object"!==v&&"string"!==v&&(u=e,e=null),u&&"function"!=typeof u&&(u=s.parse),e=o(e);var b=n(t);for(m.protocol=b.protocol||e.protocol||"",m.slashes=b.slashes||e.slashes,t=b.rest;y<l.length;y++)f=l[y],c=f[0],d=f[1],c!==c?m[d]=t:"string"==typeof c?~(h=t.indexOf(c))&&("number"==typeof f[2]?(m[d]=t.slice(0,h),t=t.slice(h+f[2])):(m[d]=t.slice(h),t=t.slice(0,h))):(h=c.exec(t))&&(m[d]=h[1],t=t.slice(0,t.length-h[0].length)),m[d]=m[d]||(f[3]||"port"===d&&p?e[d]||"":""),f[4]&&(m[d]=m[d].toLowerCase());u&&(m.query=u(m.query)),i(m.port,m.protocol)||(m.host=m.hostname,m.port=""),m.username=m.password="",m.auth&&(f=m.auth.split(":"),m.username=f[0]||"",m.password=f[1]||""),m.href=m.toString()}var i=t("requires-port"),o=t("./lolcation"),s=t("querystringify"),a=/^\/(?!\/)/,u=/^([a-z0-9.+-]+:)?(\/\/)?(.*)$/i,l=[["#","hash"],["?","query"],["/","pathname"],["@","auth",1],[0/0,"host",void 0,1,1],[/\:(\d+)$/,"port"],[0/0,"hostname",void 0,1,1]];r.prototype.set=function(t,e,n){var r=this;return"query"===t?("string"==typeof e&&e.length&&(e=(n||s.parse)(e)),r[t]=e):"port"===t?(r[t]=e,i(e,r.protocol)?e&&(r.host=r.hostname+":"+e):(r.host=r.hostname,r[t]="")):"hostname"===t?(r[t]=e,r.port&&(e+=":"+r.port),r.host=e):"host"===t?(r[t]=e,/\:\d+/.test(e)&&(e=e.split(":"),r.hostname=e[0],r.port=e[1])):"protocol"===t?(r.protocol=e,r.slashes=!n):r[t]=e,r.href=r.toString(),r},r.prototype.toString=function(t){t&&"function"==typeof t||(t=s.stringify);var e,n=this,r=n.protocol;r&&":"!==r.charAt(r.length-1)&&(r+=":");var i=r+(n.slashes?"//":"");return n.username&&(i+=n.username,n.password&&(i+=":"+n.password),i+="@"),i+=n.hostname,n.port&&(i+=":"+n.port),i+=n.pathname,e="object"==typeof n.query?t(n.query):n.query,e&&(i+="?"!==e.charAt(0)?"?"+e:e),n.hash&&(i+=n.hash),i},r.qs=s,r.location=o,e.exports=r},{"./lolcation":57,querystringify:58,"requires-port":59}],57:[function(t,e){(function(n){"use strict";var r,i=/^[A-Za-z][A-Za-z0-9+-.]*:\/\//,o={hash:1,query:1};e.exports=function(e){e=e||n.location||{},r=r||t("./");var s,a={},u=typeof e;if("blob:"===e.protocol)a=new r(unescape(e.pathname),{});else if("string"===u){a=new r(e,{});for(s in o)delete a[s]}else if("object"===u){for(s in e)s in o||(a[s]=e[s]);void 0===a.slashes&&(a.slashes=i.test(e.href))}return a}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./":56}],58:[function(t,e,n){"use strict";function r(t){for(var e,n=/([^=?&]+)=([^&]*)/g,r={};e=n.exec(t);r[decodeURIComponent(e[1])]=decodeURIComponent(e[2]));return r}function i(t,e){e=e||"";var n=[];"string"!=typeof e&&(e="?");for(var r in t)o.call(t,r)&&n.push(encodeURIComponent(r)+"="+encodeURIComponent(t[r]));return n.length?e+n.join("&"):""}var o=Object.prototype.hasOwnProperty;n.stringify=i,n.parse=r},{}],59:[function(t,e){"use strict";e.exports=function(t,e){if(e=e.split(":")[0],t=+t,!t)return!1;switch(e){case"http":case"ws":return 80!==t;case"https":case"wss":return 443!==t;case"ftp":return 21!==t;case"gopher":return 70!==t;case"file":return!1}return 0!==t}},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/src/main/resources/static/sockjs/dist/sockjs.js b/src/main/resources/static/sockjs/dist/sockjs.js
new file mode 100644
index 0000000000000000000000000000000000000000..0df18ae41fb74dbc2013fa156d5d91e527d6c551
--- /dev/null
+++ b/src/main/resources/static/sockjs/dist/sockjs.js
@@ -0,0 +1,5612 @@
+/* sockjs-client v1.1.1 | http://sockjs.org | MIT license */
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.SockJS=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var transportList = require('./transport-list');
+
+module.exports = require('./main')(transportList);
+
+// TODO can't get rid of this until all servers do
+if ('_sockjs_onload' in global) {
+  setTimeout(global._sockjs_onload, 1);
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9lbnRyeS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgdHJhbnNwb3J0TGlzdCA9IHJlcXVpcmUoJy4vdHJhbnNwb3J0LWxpc3QnKTtcblxubW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKCcuL21haW4nKSh0cmFuc3BvcnRMaXN0KTtcblxuLy8gVE9ETyBjYW4ndCBnZXQgcmlkIG9mIHRoaXMgdW50aWwgYWxsIHNlcnZlcnMgZG9cbmlmICgnX3NvY2tqc19vbmxvYWQnIGluIGdsb2JhbCkge1xuICBzZXRUaW1lb3V0KGdsb2JhbC5fc29ja2pzX29ubG9hZCwgMSk7XG59XG4iXX0=
+},{"./main":14,"./transport-list":16}],2:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , Event = require('./event')
+  ;
+
+function CloseEvent() {
+  Event.call(this);
+  this.initEvent('close', false, false);
+  this.wasClean = false;
+  this.code = 0;
+  this.reason = '';
+}
+
+inherits(CloseEvent, Event);
+
+module.exports = CloseEvent;
+
+},{"./event":4,"inherits":57}],3:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , EventTarget = require('./eventtarget')
+  ;
+
+function EventEmitter() {
+  EventTarget.call(this);
+}
+
+inherits(EventEmitter, EventTarget);
+
+EventEmitter.prototype.removeAllListeners = function(type) {
+  if (type) {
+    delete this._listeners[type];
+  } else {
+    this._listeners = {};
+  }
+};
+
+EventEmitter.prototype.once = function(type, listener) {
+  var self = this
+    , fired = false;
+
+  function g() {
+    self.removeListener(type, g);
+
+    if (!fired) {
+      fired = true;
+      listener.apply(this, arguments);
+    }
+  }
+
+  this.on(type, g);
+};
+
+EventEmitter.prototype.emit = function() {
+  var type = arguments[0];
+  var listeners = this._listeners[type];
+  if (!listeners) {
+    return;
+  }
+  // equivalent of Array.prototype.slice.call(arguments, 1);
+  var l = arguments.length;
+  var args = new Array(l - 1);
+  for (var ai = 1; ai < l; ai++) {
+    args[ai - 1] = arguments[ai];
+  }
+  for (var i = 0; i < listeners.length; i++) {
+    listeners[i].apply(this, args);
+  }
+};
+
+EventEmitter.prototype.on = EventEmitter.prototype.addListener = EventTarget.prototype.addEventListener;
+EventEmitter.prototype.removeListener = EventTarget.prototype.removeEventListener;
+
+module.exports.EventEmitter = EventEmitter;
+
+},{"./eventtarget":5,"inherits":57}],4:[function(require,module,exports){
+'use strict';
+
+function Event(eventType) {
+  this.type = eventType;
+}
+
+Event.prototype.initEvent = function(eventType, canBubble, cancelable) {
+  this.type = eventType;
+  this.bubbles = canBubble;
+  this.cancelable = cancelable;
+  this.timeStamp = +new Date();
+  return this;
+};
+
+Event.prototype.stopPropagation = function() {};
+Event.prototype.preventDefault = function() {};
+
+Event.CAPTURING_PHASE = 1;
+Event.AT_TARGET = 2;
+Event.BUBBLING_PHASE = 3;
+
+module.exports = Event;
+
+},{}],5:[function(require,module,exports){
+'use strict';
+
+/* Simplified implementation of DOM2 EventTarget.
+ *   http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventTarget
+ */
+
+function EventTarget() {
+  this._listeners = {};
+}
+
+EventTarget.prototype.addEventListener = function(eventType, listener) {
+  if (!(eventType in this._listeners)) {
+    this._listeners[eventType] = [];
+  }
+  var arr = this._listeners[eventType];
+  // #4
+  if (arr.indexOf(listener) === -1) {
+    // Make a copy so as not to interfere with a current dispatchEvent.
+    arr = arr.concat([listener]);
+  }
+  this._listeners[eventType] = arr;
+};
+
+EventTarget.prototype.removeEventListener = function(eventType, listener) {
+  var arr = this._listeners[eventType];
+  if (!arr) {
+    return;
+  }
+  var idx = arr.indexOf(listener);
+  if (idx !== -1) {
+    if (arr.length > 1) {
+      // Make a copy so as not to interfere with a current dispatchEvent.
+      this._listeners[eventType] = arr.slice(0, idx).concat(arr.slice(idx + 1));
+    } else {
+      delete this._listeners[eventType];
+    }
+    return;
+  }
+};
+
+EventTarget.prototype.dispatchEvent = function() {
+  var event = arguments[0];
+  var t = event.type;
+  // equivalent of Array.prototype.slice.call(arguments, 0);
+  var args = arguments.length === 1 ? [event] : Array.apply(null, arguments);
+  // TODO: This doesn't match the real behavior; per spec, onfoo get
+  // their place in line from the /first/ time they're set from
+  // non-null. Although WebKit bumps it to the end every time it's
+  // set.
+  if (this['on' + t]) {
+    this['on' + t].apply(this, args);
+  }
+  if (t in this._listeners) {
+    // Grab a reference to the listeners list. removeEventListener may alter the list.
+    var listeners = this._listeners[t];
+    for (var i = 0; i < listeners.length; i++) {
+      listeners[i].apply(this, args);
+    }
+  }
+};
+
+module.exports = EventTarget;
+
+},{}],6:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , Event = require('./event')
+  ;
+
+function TransportMessageEvent(data) {
+  Event.call(this);
+  this.initEvent('message', false, false);
+  this.data = data;
+}
+
+inherits(TransportMessageEvent, Event);
+
+module.exports = TransportMessageEvent;
+
+},{"./event":4,"inherits":57}],7:[function(require,module,exports){
+'use strict';
+
+var JSON3 = require('json3')
+  , iframeUtils = require('./utils/iframe')
+  ;
+
+function FacadeJS(transport) {
+  this._transport = transport;
+  transport.on('message', this._transportMessage.bind(this));
+  transport.on('close', this._transportClose.bind(this));
+}
+
+FacadeJS.prototype._transportClose = function(code, reason) {
+  iframeUtils.postMessage('c', JSON3.stringify([code, reason]));
+};
+FacadeJS.prototype._transportMessage = function(frame) {
+  iframeUtils.postMessage('t', frame);
+};
+FacadeJS.prototype._send = function(data) {
+  this._transport.send(data);
+};
+FacadeJS.prototype._close = function() {
+  this._transport.close();
+  this._transport.removeAllListeners();
+};
+
+module.exports = FacadeJS;
+
+},{"./utils/iframe":47,"json3":58}],8:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var urlUtils = require('./utils/url')
+  , eventUtils = require('./utils/event')
+  , JSON3 = require('json3')
+  , FacadeJS = require('./facade')
+  , InfoIframeReceiver = require('./info-iframe-receiver')
+  , iframeUtils = require('./utils/iframe')
+  , loc = require('./location')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:iframe-bootstrap');
+}
+
+module.exports = function(SockJS, availableTransports) {
+  var transportMap = {};
+  availableTransports.forEach(function(at) {
+    if (at.facadeTransport) {
+      transportMap[at.facadeTransport.transportName] = at.facadeTransport;
+    }
+  });
+
+  // hard-coded for the info iframe
+  // TODO see if we can make this more dynamic
+  transportMap[InfoIframeReceiver.transportName] = InfoIframeReceiver;
+  var parentOrigin;
+
+  /* eslint-disable camelcase */
+  SockJS.bootstrap_iframe = function() {
+    /* eslint-enable camelcase */
+    var facade;
+    iframeUtils.currentWindowId = loc.hash.slice(1);
+    var onMessage = function(e) {
+      if (e.source !== parent) {
+        return;
+      }
+      if (typeof parentOrigin === 'undefined') {
+        parentOrigin = e.origin;
+      }
+      if (e.origin !== parentOrigin) {
+        return;
+      }
+
+      var iframeMessage;
+      try {
+        iframeMessage = JSON3.parse(e.data);
+      } catch (ignored) {
+        debug('bad json', e.data);
+        return;
+      }
+
+      if (iframeMessage.windowId !== iframeUtils.currentWindowId) {
+        return;
+      }
+      switch (iframeMessage.type) {
+      case 's':
+        var p;
+        try {
+          p = JSON3.parse(iframeMessage.data);
+        } catch (ignored) {
+          debug('bad json', iframeMessage.data);
+          break;
+        }
+        var version = p[0];
+        var transport = p[1];
+        var transUrl = p[2];
+        var baseUrl = p[3];
+        debug(version, transport, transUrl, baseUrl);
+        // change this to semver logic
+        if (version !== SockJS.version) {
+          throw new Error('Incompatible SockJS! Main site uses:' +
+                    ' "' + version + '", the iframe:' +
+                    ' "' + SockJS.version + '".');
+        }
+
+        if (!urlUtils.isOriginEqual(transUrl, loc.href) ||
+            !urlUtils.isOriginEqual(baseUrl, loc.href)) {
+          throw new Error('Can\'t connect to different domain from within an ' +
+                    'iframe. (' + loc.href + ', ' + transUrl + ', ' + baseUrl + ')');
+        }
+        facade = new FacadeJS(new transportMap[transport](transUrl, baseUrl));
+        break;
+      case 'm':
+        facade._send(iframeMessage.data);
+        break;
+      case 'c':
+        if (facade) {
+          facade._close();
+        }
+        facade = null;
+        break;
+      }
+    };
+
+    eventUtils.attachEvent('message', onMessage);
+
+    // Start
+    iframeUtils.postMessage('s');
+  };
+};
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pZnJhbWUtYm9vdHN0cmFwLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgdXJsVXRpbHMgPSByZXF1aXJlKCcuL3V0aWxzL3VybCcpXG4gICwgZXZlbnRVdGlscyA9IHJlcXVpcmUoJy4vdXRpbHMvZXZlbnQnKVxuICAsIEpTT04zID0gcmVxdWlyZSgnanNvbjMnKVxuICAsIEZhY2FkZUpTID0gcmVxdWlyZSgnLi9mYWNhZGUnKVxuICAsIEluZm9JZnJhbWVSZWNlaXZlciA9IHJlcXVpcmUoJy4vaW5mby1pZnJhbWUtcmVjZWl2ZXInKVxuICAsIGlmcmFtZVV0aWxzID0gcmVxdWlyZSgnLi91dGlscy9pZnJhbWUnKVxuICAsIGxvYyA9IHJlcXVpcmUoJy4vbG9jYXRpb24nKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6aWZyYW1lLWJvb3RzdHJhcCcpO1xufVxuXG5tb2R1bGUuZXhwb3J0cyA9IGZ1bmN0aW9uKFNvY2tKUywgYXZhaWxhYmxlVHJhbnNwb3J0cykge1xuICB2YXIgdHJhbnNwb3J0TWFwID0ge307XG4gIGF2YWlsYWJsZVRyYW5zcG9ydHMuZm9yRWFjaChmdW5jdGlvbihhdCkge1xuICAgIGlmIChhdC5mYWNhZGVUcmFuc3BvcnQpIHtcbiAgICAgIHRyYW5zcG9ydE1hcFthdC5mYWNhZGVUcmFuc3BvcnQudHJhbnNwb3J0TmFtZV0gPSBhdC5mYWNhZGVUcmFuc3BvcnQ7XG4gICAgfVxuICB9KTtcblxuICAvLyBoYXJkLWNvZGVkIGZvciB0aGUgaW5mbyBpZnJhbWVcbiAgLy8gVE9ETyBzZWUgaWYgd2UgY2FuIG1ha2UgdGhpcyBtb3JlIGR5bmFtaWNcbiAgdHJhbnNwb3J0TWFwW0luZm9JZnJhbWVSZWNlaXZlci50cmFuc3BvcnROYW1lXSA9IEluZm9JZnJhbWVSZWNlaXZlcjtcbiAgdmFyIHBhcmVudE9yaWdpbjtcblxuICAvKiBlc2xpbnQtZGlzYWJsZSBjYW1lbGNhc2UgKi9cbiAgU29ja0pTLmJvb3RzdHJhcF9pZnJhbWUgPSBmdW5jdGlvbigpIHtcbiAgICAvKiBlc2xpbnQtZW5hYmxlIGNhbWVsY2FzZSAqL1xuICAgIHZhciBmYWNhZGU7XG4gICAgaWZyYW1lVXRpbHMuY3VycmVudFdpbmRvd0lkID0gbG9jLmhhc2guc2xpY2UoMSk7XG4gICAgdmFyIG9uTWVzc2FnZSA9IGZ1bmN0aW9uKGUpIHtcbiAgICAgIGlmIChlLnNvdXJjZSAhPT0gcGFyZW50KSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cbiAgICAgIGlmICh0eXBlb2YgcGFyZW50T3JpZ2luID09PSAndW5kZWZpbmVkJykge1xuICAgICAgICBwYXJlbnRPcmlnaW4gPSBlLm9yaWdpbjtcbiAgICAgIH1cbiAgICAgIGlmIChlLm9yaWdpbiAhPT0gcGFyZW50T3JpZ2luKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cblxuICAgICAgdmFyIGlmcmFtZU1lc3NhZ2U7XG4gICAgICB0cnkge1xuICAgICAgICBpZnJhbWVNZXNzYWdlID0gSlNPTjMucGFyc2UoZS5kYXRhKTtcbiAgICAgIH0gY2F0Y2ggKGlnbm9yZWQpIHtcbiAgICAgICAgZGVidWcoJ2JhZCBqc29uJywgZS5kYXRhKTtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuXG4gICAgICBpZiAoaWZyYW1lTWVzc2FnZS53aW5kb3dJZCAhPT0gaWZyYW1lVXRpbHMuY3VycmVudFdpbmRvd0lkKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cbiAgICAgIHN3aXRjaCAoaWZyYW1lTWVzc2FnZS50eXBlKSB7XG4gICAgICBjYXNlICdzJzpcbiAgICAgICAgdmFyIHA7XG4gICAgICAgIHRyeSB7XG4gICAgICAgICAgcCA9IEpTT04zLnBhcnNlKGlmcmFtZU1lc3NhZ2UuZGF0YSk7XG4gICAgICAgIH0gY2F0Y2ggKGlnbm9yZWQpIHtcbiAgICAgICAgICBkZWJ1ZygnYmFkIGpzb24nLCBpZnJhbWVNZXNzYWdlLmRhdGEpO1xuICAgICAgICAgIGJyZWFrO1xuICAgICAgICB9XG4gICAgICAgIHZhciB2ZXJzaW9uID0gcFswXTtcbiAgICAgICAgdmFyIHRyYW5zcG9ydCA9IHBbMV07XG4gICAgICAgIHZhciB0cmFuc1VybCA9IHBbMl07XG4gICAgICAgIHZhciBiYXNlVXJsID0gcFszXTtcbiAgICAgICAgZGVidWcodmVyc2lvbiwgdHJhbnNwb3J0LCB0cmFuc1VybCwgYmFzZVVybCk7XG4gICAgICAgIC8vIGNoYW5nZSB0aGlzIHRvIHNlbXZlciBsb2dpY1xuICAgICAgICBpZiAodmVyc2lvbiAhPT0gU29ja0pTLnZlcnNpb24pIHtcbiAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ0luY29tcGF0aWJsZSBTb2NrSlMhIE1haW4gc2l0ZSB1c2VzOicgK1xuICAgICAgICAgICAgICAgICAgICAnIFwiJyArIHZlcnNpb24gKyAnXCIsIHRoZSBpZnJhbWU6JyArXG4gICAgICAgICAgICAgICAgICAgICcgXCInICsgU29ja0pTLnZlcnNpb24gKyAnXCIuJyk7XG4gICAgICAgIH1cblxuICAgICAgICBpZiAoIXVybFV0aWxzLmlzT3JpZ2luRXF1YWwodHJhbnNVcmwsIGxvYy5ocmVmKSB8fFxuICAgICAgICAgICAgIXVybFV0aWxzLmlzT3JpZ2luRXF1YWwoYmFzZVVybCwgbG9jLmhyZWYpKSB7XG4gICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCdDYW5cXCd0IGNvbm5lY3QgdG8gZGlmZmVyZW50IGRvbWFpbiBmcm9tIHdpdGhpbiBhbiAnICtcbiAgICAgICAgICAgICAgICAgICAgJ2lmcmFtZS4gKCcgKyBsb2MuaHJlZiArICcsICcgKyB0cmFuc1VybCArICcsICcgKyBiYXNlVXJsICsgJyknKTtcbiAgICAgICAgfVxuICAgICAgICBmYWNhZGUgPSBuZXcgRmFjYWRlSlMobmV3IHRyYW5zcG9ydE1hcFt0cmFuc3BvcnRdKHRyYW5zVXJsLCBiYXNlVXJsKSk7XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSAnbSc6XG4gICAgICAgIGZhY2FkZS5fc2VuZChpZnJhbWVNZXNzYWdlLmRhdGEpO1xuICAgICAgICBicmVhaztcbiAgICAgIGNhc2UgJ2MnOlxuICAgICAgICBpZiAoZmFjYWRlKSB7XG4gICAgICAgICAgZmFjYWRlLl9jbG9zZSgpO1xuICAgICAgICB9XG4gICAgICAgIGZhY2FkZSA9IG51bGw7XG4gICAgICAgIGJyZWFrO1xuICAgICAgfVxuICAgIH07XG5cbiAgICBldmVudFV0aWxzLmF0dGFjaEV2ZW50KCdtZXNzYWdlJywgb25NZXNzYWdlKTtcblxuICAgIC8vIFN0YXJ0XG4gICAgaWZyYW1lVXRpbHMucG9zdE1lc3NhZ2UoJ3MnKTtcbiAgfTtcbn07XG4iXX0=
+},{"./facade":7,"./info-iframe-receiver":10,"./location":13,"./utils/event":46,"./utils/iframe":47,"./utils/url":52,"debug":54,"json3":58}],9:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , JSON3 = require('json3')
+  , objectUtils = require('./utils/object')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:info-ajax');
+}
+
+function InfoAjax(url, AjaxObject) {
+  EventEmitter.call(this);
+
+  var self = this;
+  var t0 = +new Date();
+  this.xo = new AjaxObject('GET', url);
+
+  this.xo.once('finish', function(status, text) {
+    var info, rtt;
+    if (status === 200) {
+      rtt = (+new Date()) - t0;
+      if (text) {
+        try {
+          info = JSON3.parse(text);
+        } catch (e) {
+          debug('bad json', text);
+        }
+      }
+
+      if (!objectUtils.isObject(info)) {
+        info = {};
+      }
+    }
+    self.emit('finish', info, rtt);
+    self.removeAllListeners();
+  });
+}
+
+inherits(InfoAjax, EventEmitter);
+
+InfoAjax.prototype.close = function() {
+  this.removeAllListeners();
+  this.xo.close();
+};
+
+module.exports = InfoAjax;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pbmZvLWFqYXguanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIEpTT04zID0gcmVxdWlyZSgnanNvbjMnKVxuICAsIG9iamVjdFV0aWxzID0gcmVxdWlyZSgnLi91dGlscy9vYmplY3QnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6aW5mby1hamF4Jyk7XG59XG5cbmZ1bmN0aW9uIEluZm9BamF4KHVybCwgQWpheE9iamVjdCkge1xuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcblxuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB0MCA9ICtuZXcgRGF0ZSgpO1xuICB0aGlzLnhvID0gbmV3IEFqYXhPYmplY3QoJ0dFVCcsIHVybCk7XG5cbiAgdGhpcy54by5vbmNlKCdmaW5pc2gnLCBmdW5jdGlvbihzdGF0dXMsIHRleHQpIHtcbiAgICB2YXIgaW5mbywgcnR0O1xuICAgIGlmIChzdGF0dXMgPT09IDIwMCkge1xuICAgICAgcnR0ID0gKCtuZXcgRGF0ZSgpKSAtIHQwO1xuICAgICAgaWYgKHRleHQpIHtcbiAgICAgICAgdHJ5IHtcbiAgICAgICAgICBpbmZvID0gSlNPTjMucGFyc2UodGV4dCk7XG4gICAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgICBkZWJ1ZygnYmFkIGpzb24nLCB0ZXh0KTtcbiAgICAgICAgfVxuICAgICAgfVxuXG4gICAgICBpZiAoIW9iamVjdFV0aWxzLmlzT2JqZWN0KGluZm8pKSB7XG4gICAgICAgIGluZm8gPSB7fTtcbiAgICAgIH1cbiAgICB9XG4gICAgc2VsZi5lbWl0KCdmaW5pc2gnLCBpbmZvLCBydHQpO1xuICAgIHNlbGYucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIH0pO1xufVxuXG5pbmhlcml0cyhJbmZvQWpheCwgRXZlbnRFbWl0dGVyKTtcblxuSW5mb0FqYXgucHJvdG90eXBlLmNsb3NlID0gZnVuY3Rpb24oKSB7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIHRoaXMueG8uY2xvc2UoKTtcbn07XG5cbm1vZHVsZS5leHBvcnRzID0gSW5mb0FqYXg7XG4iXX0=
+},{"./utils/object":49,"debug":54,"events":3,"inherits":57,"json3":58}],10:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  , JSON3 = require('json3')
+  , XHRLocalObject = require('./transport/sender/xhr-local')
+  , InfoAjax = require('./info-ajax')
+  ;
+
+function InfoReceiverIframe(transUrl) {
+  var self = this;
+  EventEmitter.call(this);
+
+  this.ir = new InfoAjax(transUrl, XHRLocalObject);
+  this.ir.once('finish', function(info, rtt) {
+    self.ir = null;
+    self.emit('message', JSON3.stringify([info, rtt]));
+  });
+}
+
+inherits(InfoReceiverIframe, EventEmitter);
+
+InfoReceiverIframe.transportName = 'iframe-info-receiver';
+
+InfoReceiverIframe.prototype.close = function() {
+  if (this.ir) {
+    this.ir.close();
+    this.ir = null;
+  }
+  this.removeAllListeners();
+};
+
+module.exports = InfoReceiverIframe;
+
+},{"./info-ajax":9,"./transport/sender/xhr-local":37,"events":3,"inherits":57,"json3":58}],11:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , JSON3 = require('json3')
+  , utils = require('./utils/event')
+  , IframeTransport = require('./transport/iframe')
+  , InfoReceiverIframe = require('./info-iframe-receiver')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:info-iframe');
+}
+
+function InfoIframe(baseUrl, url) {
+  var self = this;
+  EventEmitter.call(this);
+
+  var go = function() {
+    var ifr = self.ifr = new IframeTransport(InfoReceiverIframe.transportName, url, baseUrl);
+
+    ifr.once('message', function(msg) {
+      if (msg) {
+        var d;
+        try {
+          d = JSON3.parse(msg);
+        } catch (e) {
+          debug('bad json', msg);
+          self.emit('finish');
+          self.close();
+          return;
+        }
+
+        var info = d[0], rtt = d[1];
+        self.emit('finish', info, rtt);
+      }
+      self.close();
+    });
+
+    ifr.once('close', function() {
+      self.emit('finish');
+      self.close();
+    });
+  };
+
+  // TODO this seems the same as the 'needBody' from transports
+  if (!global.document.body) {
+    utils.attachEvent('load', go);
+  } else {
+    go();
+  }
+}
+
+inherits(InfoIframe, EventEmitter);
+
+InfoIframe.enabled = function() {
+  return IframeTransport.enabled();
+};
+
+InfoIframe.prototype.close = function() {
+  if (this.ifr) {
+    this.ifr.close();
+  }
+  this.removeAllListeners();
+  this.ifr = null;
+};
+
+module.exports = InfoIframe;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pbmZvLWlmcmFtZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIEpTT04zID0gcmVxdWlyZSgnanNvbjMnKVxuICAsIHV0aWxzID0gcmVxdWlyZSgnLi91dGlscy9ldmVudCcpXG4gICwgSWZyYW1lVHJhbnNwb3J0ID0gcmVxdWlyZSgnLi90cmFuc3BvcnQvaWZyYW1lJylcbiAgLCBJbmZvUmVjZWl2ZXJJZnJhbWUgPSByZXF1aXJlKCcuL2luZm8taWZyYW1lLXJlY2VpdmVyJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OmluZm8taWZyYW1lJyk7XG59XG5cbmZ1bmN0aW9uIEluZm9JZnJhbWUoYmFzZVVybCwgdXJsKSB7XG4gIHZhciBzZWxmID0gdGhpcztcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG5cbiAgdmFyIGdvID0gZnVuY3Rpb24oKSB7XG4gICAgdmFyIGlmciA9IHNlbGYuaWZyID0gbmV3IElmcmFtZVRyYW5zcG9ydChJbmZvUmVjZWl2ZXJJZnJhbWUudHJhbnNwb3J0TmFtZSwgdXJsLCBiYXNlVXJsKTtcblxuICAgIGlmci5vbmNlKCdtZXNzYWdlJywgZnVuY3Rpb24obXNnKSB7XG4gICAgICBpZiAobXNnKSB7XG4gICAgICAgIHZhciBkO1xuICAgICAgICB0cnkge1xuICAgICAgICAgIGQgPSBKU09OMy5wYXJzZShtc2cpO1xuICAgICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgICAgZGVidWcoJ2JhZCBqc29uJywgbXNnKTtcbiAgICAgICAgICBzZWxmLmVtaXQoJ2ZpbmlzaCcpO1xuICAgICAgICAgIHNlbGYuY2xvc2UoKTtcbiAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICB2YXIgaW5mbyA9IGRbMF0sIHJ0dCA9IGRbMV07XG4gICAgICAgIHNlbGYuZW1pdCgnZmluaXNoJywgaW5mbywgcnR0KTtcbiAgICAgIH1cbiAgICAgIHNlbGYuY2xvc2UoKTtcbiAgICB9KTtcblxuICAgIGlmci5vbmNlKCdjbG9zZScsIGZ1bmN0aW9uKCkge1xuICAgICAgc2VsZi5lbWl0KCdmaW5pc2gnKTtcbiAgICAgIHNlbGYuY2xvc2UoKTtcbiAgICB9KTtcbiAgfTtcblxuICAvLyBUT0RPIHRoaXMgc2VlbXMgdGhlIHNhbWUgYXMgdGhlICduZWVkQm9keScgZnJvbSB0cmFuc3BvcnRzXG4gIGlmICghZ2xvYmFsLmRvY3VtZW50LmJvZHkpIHtcbiAgICB1dGlscy5hdHRhY2hFdmVudCgnbG9hZCcsIGdvKTtcbiAgfSBlbHNlIHtcbiAgICBnbygpO1xuICB9XG59XG5cbmluaGVyaXRzKEluZm9JZnJhbWUsIEV2ZW50RW1pdHRlcik7XG5cbkluZm9JZnJhbWUuZW5hYmxlZCA9IGZ1bmN0aW9uKCkge1xuICByZXR1cm4gSWZyYW1lVHJhbnNwb3J0LmVuYWJsZWQoKTtcbn07XG5cbkluZm9JZnJhbWUucHJvdG90eXBlLmNsb3NlID0gZnVuY3Rpb24oKSB7XG4gIGlmICh0aGlzLmlmcikge1xuICAgIHRoaXMuaWZyLmNsb3NlKCk7XG4gIH1cbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbiAgdGhpcy5pZnIgPSBudWxsO1xufTtcblxubW9kdWxlLmV4cG9ydHMgPSBJbmZvSWZyYW1lO1xuIl19
+},{"./info-iframe-receiver":10,"./transport/iframe":22,"./utils/event":46,"debug":54,"events":3,"inherits":57,"json3":58}],12:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , urlUtils = require('./utils/url')
+  , XDR = require('./transport/sender/xdr')
+  , XHRCors = require('./transport/sender/xhr-cors')
+  , XHRLocal = require('./transport/sender/xhr-local')
+  , XHRFake = require('./transport/sender/xhr-fake')
+  , InfoIframe = require('./info-iframe')
+  , InfoAjax = require('./info-ajax')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:info-receiver');
+}
+
+function InfoReceiver(baseUrl, urlInfo) {
+  debug(baseUrl);
+  var self = this;
+  EventEmitter.call(this);
+
+  setTimeout(function() {
+    self.doXhr(baseUrl, urlInfo);
+  }, 0);
+}
+
+inherits(InfoReceiver, EventEmitter);
+
+// TODO this is currently ignoring the list of available transports and the whitelist
+
+InfoReceiver._getReceiver = function(baseUrl, url, urlInfo) {
+  // determine method of CORS support (if needed)
+  if (urlInfo.sameOrigin) {
+    return new InfoAjax(url, XHRLocal);
+  }
+  if (XHRCors.enabled) {
+    return new InfoAjax(url, XHRCors);
+  }
+  if (XDR.enabled && urlInfo.sameScheme) {
+    return new InfoAjax(url, XDR);
+  }
+  if (InfoIframe.enabled()) {
+    return new InfoIframe(baseUrl, url);
+  }
+  return new InfoAjax(url, XHRFake);
+};
+
+InfoReceiver.prototype.doXhr = function(baseUrl, urlInfo) {
+  var self = this
+    , url = urlUtils.addPath(baseUrl, '/info')
+    ;
+  debug('doXhr', url);
+
+  this.xo = InfoReceiver._getReceiver(baseUrl, url, urlInfo);
+
+  this.timeoutRef = setTimeout(function() {
+    debug('timeout');
+    self._cleanup(false);
+    self.emit('finish');
+  }, InfoReceiver.timeout);
+
+  this.xo.once('finish', function(info, rtt) {
+    debug('finish', info, rtt);
+    self._cleanup(true);
+    self.emit('finish', info, rtt);
+  });
+};
+
+InfoReceiver.prototype._cleanup = function(wasClean) {
+  debug('_cleanup');
+  clearTimeout(this.timeoutRef);
+  this.timeoutRef = null;
+  if (!wasClean && this.xo) {
+    this.xo.close();
+  }
+  this.xo = null;
+};
+
+InfoReceiver.prototype.close = function() {
+  debug('close');
+  this.removeAllListeners();
+  this._cleanup(false);
+};
+
+InfoReceiver.timeout = 8000;
+
+module.exports = InfoReceiver;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pbmZvLXJlY2VpdmVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi91dGlscy91cmwnKVxuICAsIFhEUiA9IHJlcXVpcmUoJy4vdHJhbnNwb3J0L3NlbmRlci94ZHInKVxuICAsIFhIUkNvcnMgPSByZXF1aXJlKCcuL3RyYW5zcG9ydC9zZW5kZXIveGhyLWNvcnMnKVxuICAsIFhIUkxvY2FsID0gcmVxdWlyZSgnLi90cmFuc3BvcnQvc2VuZGVyL3hoci1sb2NhbCcpXG4gICwgWEhSRmFrZSA9IHJlcXVpcmUoJy4vdHJhbnNwb3J0L3NlbmRlci94aHItZmFrZScpXG4gICwgSW5mb0lmcmFtZSA9IHJlcXVpcmUoJy4vaW5mby1pZnJhbWUnKVxuICAsIEluZm9BamF4ID0gcmVxdWlyZSgnLi9pbmZvLWFqYXgnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6aW5mby1yZWNlaXZlcicpO1xufVxuXG5mdW5jdGlvbiBJbmZvUmVjZWl2ZXIoYmFzZVVybCwgdXJsSW5mbykge1xuICBkZWJ1ZyhiYXNlVXJsKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcblxuICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkge1xuICAgIHNlbGYuZG9YaHIoYmFzZVVybCwgdXJsSW5mbyk7XG4gIH0sIDApO1xufVxuXG5pbmhlcml0cyhJbmZvUmVjZWl2ZXIsIEV2ZW50RW1pdHRlcik7XG5cbi8vIFRPRE8gdGhpcyBpcyBjdXJyZW50bHkgaWdub3JpbmcgdGhlIGxpc3Qgb2YgYXZhaWxhYmxlIHRyYW5zcG9ydHMgYW5kIHRoZSB3aGl0ZWxpc3RcblxuSW5mb1JlY2VpdmVyLl9nZXRSZWNlaXZlciA9IGZ1bmN0aW9uKGJhc2VVcmwsIHVybCwgdXJsSW5mbykge1xuICAvLyBkZXRlcm1pbmUgbWV0aG9kIG9mIENPUlMgc3VwcG9ydCAoaWYgbmVlZGVkKVxuICBpZiAodXJsSW5mby5zYW1lT3JpZ2luKSB7XG4gICAgcmV0dXJuIG5ldyBJbmZvQWpheCh1cmwsIFhIUkxvY2FsKTtcbiAgfVxuICBpZiAoWEhSQ29ycy5lbmFibGVkKSB7XG4gICAgcmV0dXJuIG5ldyBJbmZvQWpheCh1cmwsIFhIUkNvcnMpO1xuICB9XG4gIGlmIChYRFIuZW5hYmxlZCAmJiB1cmxJbmZvLnNhbWVTY2hlbWUpIHtcbiAgICByZXR1cm4gbmV3IEluZm9BamF4KHVybCwgWERSKTtcbiAgfVxuICBpZiAoSW5mb0lmcmFtZS5lbmFibGVkKCkpIHtcbiAgICByZXR1cm4gbmV3IEluZm9JZnJhbWUoYmFzZVVybCwgdXJsKTtcbiAgfVxuICByZXR1cm4gbmV3IEluZm9BamF4KHVybCwgWEhSRmFrZSk7XG59O1xuXG5JbmZvUmVjZWl2ZXIucHJvdG90eXBlLmRvWGhyID0gZnVuY3Rpb24oYmFzZVVybCwgdXJsSW5mbykge1xuICB2YXIgc2VsZiA9IHRoaXNcbiAgICAsIHVybCA9IHVybFV0aWxzLmFkZFBhdGgoYmFzZVVybCwgJy9pbmZvJylcbiAgICA7XG4gIGRlYnVnKCdkb1hocicsIHVybCk7XG5cbiAgdGhpcy54byA9IEluZm9SZWNlaXZlci5fZ2V0UmVjZWl2ZXIoYmFzZVVybCwgdXJsLCB1cmxJbmZvKTtcblxuICB0aGlzLnRpbWVvdXRSZWYgPSBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkge1xuICAgIGRlYnVnKCd0aW1lb3V0Jyk7XG4gICAgc2VsZi5fY2xlYW51cChmYWxzZSk7XG4gICAgc2VsZi5lbWl0KCdmaW5pc2gnKTtcbiAgfSwgSW5mb1JlY2VpdmVyLnRpbWVvdXQpO1xuXG4gIHRoaXMueG8ub25jZSgnZmluaXNoJywgZnVuY3Rpb24oaW5mbywgcnR0KSB7XG4gICAgZGVidWcoJ2ZpbmlzaCcsIGluZm8sIHJ0dCk7XG4gICAgc2VsZi5fY2xlYW51cCh0cnVlKTtcbiAgICBzZWxmLmVtaXQoJ2ZpbmlzaCcsIGluZm8sIHJ0dCk7XG4gIH0pO1xufTtcblxuSW5mb1JlY2VpdmVyLnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKHdhc0NsZWFuKSB7XG4gIGRlYnVnKCdfY2xlYW51cCcpO1xuICBjbGVhclRpbWVvdXQodGhpcy50aW1lb3V0UmVmKTtcbiAgdGhpcy50aW1lb3V0UmVmID0gbnVsbDtcbiAgaWYgKCF3YXNDbGVhbiAmJiB0aGlzLnhvKSB7XG4gICAgdGhpcy54by5jbG9zZSgpO1xuICB9XG4gIHRoaXMueG8gPSBudWxsO1xufTtcblxuSW5mb1JlY2VpdmVyLnByb3RvdHlwZS5jbG9zZSA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xvc2UnKTtcbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbiAgdGhpcy5fY2xlYW51cChmYWxzZSk7XG59O1xuXG5JbmZvUmVjZWl2ZXIudGltZW91dCA9IDgwMDA7XG5cbm1vZHVsZS5leHBvcnRzID0gSW5mb1JlY2VpdmVyO1xuIl19
+},{"./info-ajax":9,"./info-iframe":11,"./transport/sender/xdr":34,"./transport/sender/xhr-cors":35,"./transport/sender/xhr-fake":36,"./transport/sender/xhr-local":37,"./utils/url":52,"debug":54,"events":3,"inherits":57}],13:[function(require,module,exports){
+(function (global){
+'use strict';
+
+module.exports = global.location || {
+  origin: 'http://localhost:80'
+, protocol: 'http'
+, host: 'localhost'
+, port: 80
+, href: 'http://localhost/'
+, hash: ''
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9sb2NhdGlvbi5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG5tb2R1bGUuZXhwb3J0cyA9IGdsb2JhbC5sb2NhdGlvbiB8fCB7XG4gIG9yaWdpbjogJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAnXG4sIHByb3RvY29sOiAnaHR0cCdcbiwgaG9zdDogJ2xvY2FsaG9zdCdcbiwgcG9ydDogODBcbiwgaHJlZjogJ2h0dHA6Ly9sb2NhbGhvc3QvJ1xuLCBoYXNoOiAnJ1xufTtcbiJdfQ==
+},{}],14:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+require('./shims');
+
+var URL = require('url-parse')
+  , inherits = require('inherits')
+  , JSON3 = require('json3')
+  , random = require('./utils/random')
+  , escape = require('./utils/escape')
+  , urlUtils = require('./utils/url')
+  , eventUtils = require('./utils/event')
+  , transport = require('./utils/transport')
+  , objectUtils = require('./utils/object')
+  , browser = require('./utils/browser')
+  , log = require('./utils/log')
+  , Event = require('./event/event')
+  , EventTarget = require('./event/eventtarget')
+  , loc = require('./location')
+  , CloseEvent = require('./event/close')
+  , TransportMessageEvent = require('./event/trans-message')
+  , InfoReceiver = require('./info-receiver')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:main');
+}
+
+var transports;
+
+// follow constructor steps defined at http://dev.w3.org/html5/websockets/#the-websocket-interface
+function SockJS(url, protocols, options) {
+  if (!(this instanceof SockJS)) {
+    return new SockJS(url, protocols, options);
+  }
+  if (arguments.length < 1) {
+    throw new TypeError("Failed to construct 'SockJS: 1 argument required, but only 0 present");
+  }
+  EventTarget.call(this);
+
+  this.readyState = SockJS.CONNECTING;
+  this.extensions = '';
+  this.protocol = '';
+
+  // non-standard extension
+  options = options || {};
+  if (options.protocols_whitelist) {
+    log.warn("'protocols_whitelist' is DEPRECATED. Use 'transports' instead.");
+  }
+  this._transportsWhitelist = options.transports;
+  this._transportOptions = options.transportOptions || {};
+
+  var sessionId = options.sessionId || 8;
+  if (typeof sessionId === 'function') {
+    this._generateSessionId = sessionId;
+  } else if (typeof sessionId === 'number') {
+    this._generateSessionId = function() {
+      return random.string(sessionId);
+    };
+  } else {
+    throw new TypeError('If sessionId is used in the options, it needs to be a number or a function.');
+  }
+
+  this._server = options.server || random.numberString(1000);
+
+  // Step 1 of WS spec - parse and validate the url. Issue #8
+  var parsedUrl = new URL(url);
+  if (!parsedUrl.host || !parsedUrl.protocol) {
+    throw new SyntaxError("The URL '" + url + "' is invalid");
+  } else if (parsedUrl.hash) {
+    throw new SyntaxError('The URL must not contain a fragment');
+  } else if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
+    throw new SyntaxError("The URL's scheme must be either 'http:' or 'https:'. '" + parsedUrl.protocol + "' is not allowed.");
+  }
+
+  var secure = parsedUrl.protocol === 'https:';
+  // Step 2 - don't allow secure origin with an insecure protocol
+  if (loc.protocol === 'https' && !secure) {
+    throw new Error('SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS');
+  }
+
+  // Step 3 - check port access - no need here
+  // Step 4 - parse protocols argument
+  if (!protocols) {
+    protocols = [];
+  } else if (!Array.isArray(protocols)) {
+    protocols = [protocols];
+  }
+
+  // Step 5 - check protocols argument
+  var sortedProtocols = protocols.sort();
+  sortedProtocols.forEach(function(proto, i) {
+    if (!proto) {
+      throw new SyntaxError("The protocols entry '" + proto + "' is invalid.");
+    }
+    if (i < (sortedProtocols.length - 1) && proto === sortedProtocols[i + 1]) {
+      throw new SyntaxError("The protocols entry '" + proto + "' is duplicated.");
+    }
+  });
+
+  // Step 6 - convert origin
+  var o = urlUtils.getOrigin(loc.href);
+  this._origin = o ? o.toLowerCase() : null;
+
+  // remove the trailing slash
+  parsedUrl.set('pathname', parsedUrl.pathname.replace(/\/+$/, ''));
+
+  // store the sanitized url
+  this.url = parsedUrl.href;
+  debug('using url', this.url);
+
+  // Step 7 - start connection in background
+  // obtain server info
+  // http://sockjs.github.io/sockjs-protocol/sockjs-protocol-0.3.3.html#section-26
+  this._urlInfo = {
+    nullOrigin: !browser.hasDomain()
+  , sameOrigin: urlUtils.isOriginEqual(this.url, loc.href)
+  , sameScheme: urlUtils.isSchemeEqual(this.url, loc.href)
+  };
+
+  this._ir = new InfoReceiver(this.url, this._urlInfo);
+  this._ir.once('finish', this._receiveInfo.bind(this));
+}
+
+inherits(SockJS, EventTarget);
+
+function userSetCode(code) {
+  return code === 1000 || (code >= 3000 && code <= 4999);
+}
+
+SockJS.prototype.close = function(code, reason) {
+  // Step 1
+  if (code && !userSetCode(code)) {
+    throw new Error('InvalidAccessError: Invalid code');
+  }
+  // Step 2.4 states the max is 123 bytes, but we are just checking length
+  if (reason && reason.length > 123) {
+    throw new SyntaxError('reason argument has an invalid length');
+  }
+
+  // Step 3.1
+  if (this.readyState === SockJS.CLOSING || this.readyState === SockJS.CLOSED) {
+    return;
+  }
+
+  // TODO look at docs to determine how to set this
+  var wasClean = true;
+  this._close(code || 1000, reason || 'Normal closure', wasClean);
+};
+
+SockJS.prototype.send = function(data) {
+  // #13 - convert anything non-string to string
+  // TODO this currently turns objects into [object Object]
+  if (typeof data !== 'string') {
+    data = '' + data;
+  }
+  if (this.readyState === SockJS.CONNECTING) {
+    throw new Error('InvalidStateError: The connection has not been established yet');
+  }
+  if (this.readyState !== SockJS.OPEN) {
+    return;
+  }
+  this._transport.send(escape.quote(data));
+};
+
+SockJS.version = require('./version');
+
+SockJS.CONNECTING = 0;
+SockJS.OPEN = 1;
+SockJS.CLOSING = 2;
+SockJS.CLOSED = 3;
+
+SockJS.prototype._receiveInfo = function(info, rtt) {
+  debug('_receiveInfo', rtt);
+  this._ir = null;
+  if (!info) {
+    this._close(1002, 'Cannot connect to server');
+    return;
+  }
+
+  // establish a round-trip timeout (RTO) based on the
+  // round-trip time (RTT)
+  this._rto = this.countRTO(rtt);
+  // allow server to override url used for the actual transport
+  this._transUrl = info.base_url ? info.base_url : this.url;
+  info = objectUtils.extend(info, this._urlInfo);
+  debug('info', info);
+  // determine list of desired and supported transports
+  var enabledTransports = transports.filterToEnabled(this._transportsWhitelist, info);
+  this._transports = enabledTransports.main;
+  debug(this._transports.length + ' enabled transports');
+
+  this._connect();
+};
+
+SockJS.prototype._connect = function() {
+  for (var Transport = this._transports.shift(); Transport; Transport = this._transports.shift()) {
+    debug('attempt', Transport.transportName);
+    if (Transport.needBody) {
+      if (!global.document.body ||
+          (typeof global.document.readyState !== 'undefined' &&
+            global.document.readyState !== 'complete' &&
+            global.document.readyState !== 'interactive')) {
+        debug('waiting for body');
+        this._transports.unshift(Transport);
+        eventUtils.attachEvent('load', this._connect.bind(this));
+        return;
+      }
+    }
+
+    // calculate timeout based on RTO and round trips. Default to 5s
+    var timeoutMs = (this._rto * Transport.roundTrips) || 5000;
+    this._transportTimeoutId = setTimeout(this._transportTimeout.bind(this), timeoutMs);
+    debug('using timeout', timeoutMs);
+
+    var transportUrl = urlUtils.addPath(this._transUrl, '/' + this._server + '/' + this._generateSessionId());
+    var options = this._transportOptions[Transport.transportName];
+    debug('transport url', transportUrl);
+    var transportObj = new Transport(transportUrl, this._transUrl, options);
+    transportObj.on('message', this._transportMessage.bind(this));
+    transportObj.once('close', this._transportClose.bind(this));
+    transportObj.transportName = Transport.transportName;
+    this._transport = transportObj;
+
+    return;
+  }
+  this._close(2000, 'All transports failed', false);
+};
+
+SockJS.prototype._transportTimeout = function() {
+  debug('_transportTimeout');
+  if (this.readyState === SockJS.CONNECTING) {
+    this._transportClose(2007, 'Transport timed out');
+  }
+};
+
+SockJS.prototype._transportMessage = function(msg) {
+  debug('_transportMessage', msg);
+  var self = this
+    , type = msg.slice(0, 1)
+    , content = msg.slice(1)
+    , payload
+    ;
+
+  // first check for messages that don't need a payload
+  switch (type) {
+    case 'o':
+      this._open();
+      return;
+    case 'h':
+      this.dispatchEvent(new Event('heartbeat'));
+      debug('heartbeat', this.transport);
+      return;
+  }
+
+  if (content) {
+    try {
+      payload = JSON3.parse(content);
+    } catch (e) {
+      debug('bad json', content);
+    }
+  }
+
+  if (typeof payload === 'undefined') {
+    debug('empty payload', content);
+    return;
+  }
+
+  switch (type) {
+    case 'a':
+      if (Array.isArray(payload)) {
+        payload.forEach(function(p) {
+          debug('message', self.transport, p);
+          self.dispatchEvent(new TransportMessageEvent(p));
+        });
+      }
+      break;
+    case 'm':
+      debug('message', this.transport, payload);
+      this.dispatchEvent(new TransportMessageEvent(payload));
+      break;
+    case 'c':
+      if (Array.isArray(payload) && payload.length === 2) {
+        this._close(payload[0], payload[1], true);
+      }
+      break;
+  }
+};
+
+SockJS.prototype._transportClose = function(code, reason) {
+  debug('_transportClose', this.transport, code, reason);
+  if (this._transport) {
+    this._transport.removeAllListeners();
+    this._transport = null;
+    this.transport = null;
+  }
+
+  if (!userSetCode(code) && code !== 2000 && this.readyState === SockJS.CONNECTING) {
+    this._connect();
+    return;
+  }
+
+  this._close(code, reason);
+};
+
+SockJS.prototype._open = function() {
+  debug('_open', this._transport.transportName, this.readyState);
+  if (this.readyState === SockJS.CONNECTING) {
+    if (this._transportTimeoutId) {
+      clearTimeout(this._transportTimeoutId);
+      this._transportTimeoutId = null;
+    }
+    this.readyState = SockJS.OPEN;
+    this.transport = this._transport.transportName;
+    this.dispatchEvent(new Event('open'));
+    debug('connected', this.transport);
+  } else {
+    // The server might have been restarted, and lost track of our
+    // connection.
+    this._close(1006, 'Server lost session');
+  }
+};
+
+SockJS.prototype._close = function(code, reason, wasClean) {
+  debug('_close', this.transport, code, reason, wasClean, this.readyState);
+  var forceFail = false;
+
+  if (this._ir) {
+    forceFail = true;
+    this._ir.close();
+    this._ir = null;
+  }
+  if (this._transport) {
+    this._transport.close();
+    this._transport = null;
+    this.transport = null;
+  }
+
+  if (this.readyState === SockJS.CLOSED) {
+    throw new Error('InvalidStateError: SockJS has already been closed');
+  }
+
+  this.readyState = SockJS.CLOSING;
+  setTimeout(function() {
+    this.readyState = SockJS.CLOSED;
+
+    if (forceFail) {
+      this.dispatchEvent(new Event('error'));
+    }
+
+    var e = new CloseEvent('close');
+    e.wasClean = wasClean || false;
+    e.code = code || 1000;
+    e.reason = reason;
+
+    this.dispatchEvent(e);
+    this.onmessage = this.onclose = this.onerror = null;
+    debug('disconnected');
+  }.bind(this), 0);
+};
+
+// See: http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/
+// and RFC 2988.
+SockJS.prototype.countRTO = function(rtt) {
+  // In a local environment, when using IE8/9 and the `jsonp-polling`
+  // transport the time needed to establish a connection (the time that pass
+  // from the opening of the transport to the call of `_dispatchOpen`) is
+  // around 200msec (the lower bound used in the article above) and this
+  // causes spurious timeouts. For this reason we calculate a value slightly
+  // larger than that used in the article.
+  if (rtt > 100) {
+    return 4 * rtt; // rto > 400msec
+  }
+  return 300 + rtt; // 300msec < rto <= 400msec
+};
+
+module.exports = function(availableTransports) {
+  transports = transport(availableTransports);
+  require('./iframe-bootstrap')(SockJS, availableTransports);
+  return SockJS;
+};
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/main.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nrequire('./shims');\n\nvar URL = require('url-parse')\n  , inherits = require('inherits')\n  , JSON3 = require('json3')\n  , random = require('./utils/random')\n  , escape = require('./utils/escape')\n  , urlUtils = require('./utils/url')\n  , eventUtils = require('./utils/event')\n  , transport = require('./utils/transport')\n  , objectUtils = require('./utils/object')\n  , browser = require('./utils/browser')\n  , log = require('./utils/log')\n  , Event = require('./event/event')\n  , EventTarget = require('./event/eventtarget')\n  , loc = require('./location')\n  , CloseEvent = require('./event/close')\n  , TransportMessageEvent = require('./event/trans-message')\n  , InfoReceiver = require('./info-receiver')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:main');\n}\n\nvar transports;\n\n// follow constructor steps defined at http://dev.w3.org/html5/websockets/#the-websocket-interface\nfunction SockJS(url, protocols, options) {\n  if (!(this instanceof SockJS)) {\n    return new SockJS(url, protocols, options);\n  }\n  if (arguments.length < 1) {\n    throw new TypeError(\"Failed to construct 'SockJS: 1 argument required, but only 0 present\");\n  }\n  EventTarget.call(this);\n\n  this.readyState = SockJS.CONNECTING;\n  this.extensions = '';\n  this.protocol = '';\n\n  // non-standard extension\n  options = options || {};\n  if (options.protocols_whitelist) {\n    log.warn(\"'protocols_whitelist' is DEPRECATED. Use 'transports' instead.\");\n  }\n  this._transportsWhitelist = options.transports;\n  this._transportOptions = options.transportOptions || {};\n\n  var sessionId = options.sessionId || 8;\n  if (typeof sessionId === 'function') {\n    this._generateSessionId = sessionId;\n  } else if (typeof sessionId === 'number') {\n    this._generateSessionId = function() {\n      return random.string(sessionId);\n    };\n  } else {\n    throw new TypeError('If sessionId is used in the options, it needs to be a number or a function.');\n  }\n\n  this._server = options.server || random.numberString(1000);\n\n  // Step 1 of WS spec - parse and validate the url. Issue #8\n  var parsedUrl = new URL(url);\n  if (!parsedUrl.host || !parsedUrl.protocol) {\n    throw new SyntaxError(\"The URL '\" + url + \"' is invalid\");\n  } else if (parsedUrl.hash) {\n    throw new SyntaxError('The URL must not contain a fragment');\n  } else if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {\n    throw new SyntaxError(\"The URL's scheme must be either 'http:' or 'https:'. '\" + parsedUrl.protocol + \"' is not allowed.\");\n  }\n\n  var secure = parsedUrl.protocol === 'https:';\n  // Step 2 - don't allow secure origin with an insecure protocol\n  if (loc.protocol === 'https' && !secure) {\n    throw new Error('SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS');\n  }\n\n  // Step 3 - check port access - no need here\n  // Step 4 - parse protocols argument\n  if (!protocols) {\n    protocols = [];\n  } else if (!Array.isArray(protocols)) {\n    protocols = [protocols];\n  }\n\n  // Step 5 - check protocols argument\n  var sortedProtocols = protocols.sort();\n  sortedProtocols.forEach(function(proto, i) {\n    if (!proto) {\n      throw new SyntaxError(\"The protocols entry '\" + proto + \"' is invalid.\");\n    }\n    if (i < (sortedProtocols.length - 1) && proto === sortedProtocols[i + 1]) {\n      throw new SyntaxError(\"The protocols entry '\" + proto + \"' is duplicated.\");\n    }\n  });\n\n  // Step 6 - convert origin\n  var o = urlUtils.getOrigin(loc.href);\n  this._origin = o ? o.toLowerCase() : null;\n\n  // remove the trailing slash\n  parsedUrl.set('pathname', parsedUrl.pathname.replace(/\\/+$/, ''));\n\n  // store the sanitized url\n  this.url = parsedUrl.href;\n  debug('using url', this.url);\n\n  // Step 7 - start connection in background\n  // obtain server info\n  // http://sockjs.github.io/sockjs-protocol/sockjs-protocol-0.3.3.html#section-26\n  this._urlInfo = {\n    nullOrigin: !browser.hasDomain()\n  , sameOrigin: urlUtils.isOriginEqual(this.url, loc.href)\n  , sameScheme: urlUtils.isSchemeEqual(this.url, loc.href)\n  };\n\n  this._ir = new InfoReceiver(this.url, this._urlInfo);\n  this._ir.once('finish', this._receiveInfo.bind(this));\n}\n\ninherits(SockJS, EventTarget);\n\nfunction userSetCode(code) {\n  return code === 1000 || (code >= 3000 && code <= 4999);\n}\n\nSockJS.prototype.close = function(code, reason) {\n  // Step 1\n  if (code && !userSetCode(code)) {\n    throw new Error('InvalidAccessError: Invalid code');\n  }\n  // Step 2.4 states the max is 123 bytes, but we are just checking length\n  if (reason && reason.length > 123) {\n    throw new SyntaxError('reason argument has an invalid length');\n  }\n\n  // Step 3.1\n  if (this.readyState === SockJS.CLOSING || this.readyState === SockJS.CLOSED) {\n    return;\n  }\n\n  // TODO look at docs to determine how to set this\n  var wasClean = true;\n  this._close(code || 1000, reason || 'Normal closure', wasClean);\n};\n\nSockJS.prototype.send = function(data) {\n  // #13 - convert anything non-string to string\n  // TODO this currently turns objects into [object Object]\n  if (typeof data !== 'string') {\n    data = '' + data;\n  }\n  if (this.readyState === SockJS.CONNECTING) {\n    throw new Error('InvalidStateError: The connection has not been established yet');\n  }\n  if (this.readyState !== SockJS.OPEN) {\n    return;\n  }\n  this._transport.send(escape.quote(data));\n};\n\nSockJS.version = require('./version');\n\nSockJS.CONNECTING = 0;\nSockJS.OPEN = 1;\nSockJS.CLOSING = 2;\nSockJS.CLOSED = 3;\n\nSockJS.prototype._receiveInfo = function(info, rtt) {\n  debug('_receiveInfo', rtt);\n  this._ir = null;\n  if (!info) {\n    this._close(1002, 'Cannot connect to server');\n    return;\n  }\n\n  // establish a round-trip timeout (RTO) based on the\n  // round-trip time (RTT)\n  this._rto = this.countRTO(rtt);\n  // allow server to override url used for the actual transport\n  this._transUrl = info.base_url ? info.base_url : this.url;\n  info = objectUtils.extend(info, this._urlInfo);\n  debug('info', info);\n  // determine list of desired and supported transports\n  var enabledTransports = transports.filterToEnabled(this._transportsWhitelist, info);\n  this._transports = enabledTransports.main;\n  debug(this._transports.length + ' enabled transports');\n\n  this._connect();\n};\n\nSockJS.prototype._connect = function() {\n  for (var Transport = this._transports.shift(); Transport; Transport = this._transports.shift()) {\n    debug('attempt', Transport.transportName);\n    if (Transport.needBody) {\n      if (!global.document.body ||\n          (typeof global.document.readyState !== 'undefined' &&\n            global.document.readyState !== 'complete' &&\n            global.document.readyState !== 'interactive')) {\n        debug('waiting for body');\n        this._transports.unshift(Transport);\n        eventUtils.attachEvent('load', this._connect.bind(this));\n        return;\n      }\n    }\n\n    // calculate timeout based on RTO and round trips. Default to 5s\n    var timeoutMs = (this._rto * Transport.roundTrips) || 5000;\n    this._transportTimeoutId = setTimeout(this._transportTimeout.bind(this), timeoutMs);\n    debug('using timeout', timeoutMs);\n\n    var transportUrl = urlUtils.addPath(this._transUrl, '/' + this._server + '/' + this._generateSessionId());\n    var options = this._transportOptions[Transport.transportName];\n    debug('transport url', transportUrl);\n    var transportObj = new Transport(transportUrl, this._transUrl, options);\n    transportObj.on('message', this._transportMessage.bind(this));\n    transportObj.once('close', this._transportClose.bind(this));\n    transportObj.transportName = Transport.transportName;\n    this._transport = transportObj;\n\n    return;\n  }\n  this._close(2000, 'All transports failed', false);\n};\n\nSockJS.prototype._transportTimeout = function() {\n  debug('_transportTimeout');\n  if (this.readyState === SockJS.CONNECTING) {\n    this._transportClose(2007, 'Transport timed out');\n  }\n};\n\nSockJS.prototype._transportMessage = function(msg) {\n  debug('_transportMessage', msg);\n  var self = this\n    , type = msg.slice(0, 1)\n    , content = msg.slice(1)\n    , payload\n    ;\n\n  // first check for messages that don't need a payload\n  switch (type) {\n    case 'o':\n      this._open();\n      return;\n    case 'h':\n      this.dispatchEvent(new Event('heartbeat'));\n      debug('heartbeat', this.transport);\n      return;\n  }\n\n  if (content) {\n    try {\n      payload = JSON3.parse(content);\n    } catch (e) {\n      debug('bad json', content);\n    }\n  }\n\n  if (typeof payload === 'undefined') {\n    debug('empty payload', content);\n    return;\n  }\n\n  switch (type) {\n    case 'a':\n      if (Array.isArray(payload)) {\n        payload.forEach(function(p) {\n          debug('message', self.transport, p);\n          self.dispatchEvent(new TransportMessageEvent(p));\n        });\n      }\n      break;\n    case 'm':\n      debug('message', this.transport, payload);\n      this.dispatchEvent(new TransportMessageEvent(payload));\n      break;\n    case 'c':\n      if (Array.isArray(payload) && payload.length === 2) {\n        this._close(payload[0], payload[1], true);\n      }\n      break;\n  }\n};\n\nSockJS.prototype._transportClose = function(code, reason) {\n  debug('_transportClose', this.transport, code, reason);\n  if (this._transport) {\n    this._transport.removeAllListeners();\n    this._transport = null;\n    this.transport = null;\n  }\n\n  if (!userSetCode(code) && code !== 2000 && this.readyState === SockJS.CONNECTING) {\n    this._connect();\n    return;\n  }\n\n  this._close(code, reason);\n};\n\nSockJS.prototype._open = function() {\n  debug('_open', this._transport.transportName, this.readyState);\n  if (this.readyState === SockJS.CONNECTING) {\n    if (this._transportTimeoutId) {\n      clearTimeout(this._transportTimeoutId);\n      this._transportTimeoutId = null;\n    }\n    this.readyState = SockJS.OPEN;\n    this.transport = this._transport.transportName;\n    this.dispatchEvent(new Event('open'));\n    debug('connected', this.transport);\n  } else {\n    // The server might have been restarted, and lost track of our\n    // connection.\n    this._close(1006, 'Server lost session');\n  }\n};\n\nSockJS.prototype._close = function(code, reason, wasClean) {\n  debug('_close', this.transport, code, reason, wasClean, this.readyState);\n  var forceFail = false;\n\n  if (this._ir) {\n    forceFail = true;\n    this._ir.close();\n    this._ir = null;\n  }\n  if (this._transport) {\n    this._transport.close();\n    this._transport = null;\n    this.transport = null;\n  }\n\n  if (this.readyState === SockJS.CLOSED) {\n    throw new Error('InvalidStateError: SockJS has already been closed');\n  }\n\n  this.readyState = SockJS.CLOSING;\n  setTimeout(function() {\n    this.readyState = SockJS.CLOSED;\n\n    if (forceFail) {\n      this.dispatchEvent(new Event('error'));\n    }\n\n    var e = new CloseEvent('close');\n    e.wasClean = wasClean || false;\n    e.code = code || 1000;\n    e.reason = reason;\n\n    this.dispatchEvent(e);\n    this.onmessage = this.onclose = this.onerror = null;\n    debug('disconnected');\n  }.bind(this), 0);\n};\n\n// See: http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/\n// and RFC 2988.\nSockJS.prototype.countRTO = function(rtt) {\n  // In a local environment, when using IE8/9 and the `jsonp-polling`\n  // transport the time needed to establish a connection (the time that pass\n  // from the opening of the transport to the call of `_dispatchOpen`) is\n  // around 200msec (the lower bound used in the article above) and this\n  // causes spurious timeouts. For this reason we calculate a value slightly\n  // larger than that used in the article.\n  if (rtt > 100) {\n    return 4 * rtt; // rto > 400msec\n  }\n  return 300 + rtt; // 300msec < rto <= 400msec\n};\n\nmodule.exports = function(availableTransports) {\n  transports = transport(availableTransports);\n  require('./iframe-bootstrap')(SockJS, availableTransports);\n  return SockJS;\n};\n"]}
+},{"./event/close":2,"./event/event":4,"./event/eventtarget":5,"./event/trans-message":6,"./iframe-bootstrap":8,"./info-receiver":12,"./location":13,"./shims":15,"./utils/browser":44,"./utils/escape":45,"./utils/event":46,"./utils/log":48,"./utils/object":49,"./utils/random":50,"./utils/transport":51,"./utils/url":52,"./version":53,"debug":54,"inherits":57,"json3":58,"url-parse":59}],15:[function(require,module,exports){
+/* eslint-disable */
+/* jscs: disable */
+'use strict';
+
+// pulled specific shims from https://github.com/es-shims/es5-shim
+
+var ArrayPrototype = Array.prototype;
+var ObjectPrototype = Object.prototype;
+var FunctionPrototype = Function.prototype;
+var StringPrototype = String.prototype;
+var array_slice = ArrayPrototype.slice;
+
+var _toString = ObjectPrototype.toString;
+var isFunction = function (val) {
+    return ObjectPrototype.toString.call(val) === '[object Function]';
+};
+var isArray = function isArray(obj) {
+    return _toString.call(obj) === '[object Array]';
+};
+var isString = function isString(obj) {
+    return _toString.call(obj) === '[object String]';
+};
+
+var supportsDescriptors = Object.defineProperty && (function () {
+    try {
+        Object.defineProperty({}, 'x', {});
+        return true;
+    } catch (e) { /* this is ES3 */
+        return false;
+    }
+}());
+
+// Define configurable, writable and non-enumerable props
+// if they don't exist.
+var defineProperty;
+if (supportsDescriptors) {
+    defineProperty = function (object, name, method, forceAssign) {
+        if (!forceAssign && (name in object)) { return; }
+        Object.defineProperty(object, name, {
+            configurable: true,
+            enumerable: false,
+            writable: true,
+            value: method
+        });
+    };
+} else {
+    defineProperty = function (object, name, method, forceAssign) {
+        if (!forceAssign && (name in object)) { return; }
+        object[name] = method;
+    };
+}
+var defineProperties = function (object, map, forceAssign) {
+    for (var name in map) {
+        if (ObjectPrototype.hasOwnProperty.call(map, name)) {
+          defineProperty(object, name, map[name], forceAssign);
+        }
+    }
+};
+
+var toObject = function (o) {
+    if (o == null) { // this matches both null and undefined
+        throw new TypeError("can't convert " + o + ' to object');
+    }
+    return Object(o);
+};
+
+//
+// Util
+// ======
+//
+
+// ES5 9.4
+// http://es5.github.com/#x9.4
+// http://jsperf.com/to-integer
+
+function toInteger(num) {
+    var n = +num;
+    if (n !== n) { // isNaN
+        n = 0;
+    } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
+        n = (n > 0 || -1) * Math.floor(Math.abs(n));
+    }
+    return n;
+}
+
+function ToUint32(x) {
+    return x >>> 0;
+}
+
+//
+// Function
+// ========
+//
+
+// ES-5 15.3.4.5
+// http://es5.github.com/#x15.3.4.5
+
+function Empty() {}
+
+defineProperties(FunctionPrototype, {
+    bind: function bind(that) { // .length is 1
+        // 1. Let Target be the this value.
+        var target = this;
+        // 2. If IsCallable(Target) is false, throw a TypeError exception.
+        if (!isFunction(target)) {
+            throw new TypeError('Function.prototype.bind called on incompatible ' + target);
+        }
+        // 3. Let A be a new (possibly empty) internal list of all of the
+        //   argument values provided after thisArg (arg1, arg2 etc), in order.
+        // XXX slicedArgs will stand in for "A" if used
+        var args = array_slice.call(arguments, 1); // for normal call
+        // 4. Let F be a new native ECMAScript object.
+        // 11. Set the [[Prototype]] internal property of F to the standard
+        //   built-in Function prototype object as specified in 15.3.3.1.
+        // 12. Set the [[Call]] internal property of F as described in
+        //   15.3.4.5.1.
+        // 13. Set the [[Construct]] internal property of F as described in
+        //   15.3.4.5.2.
+        // 14. Set the [[HasInstance]] internal property of F as described in
+        //   15.3.4.5.3.
+        var binder = function () {
+
+            if (this instanceof bound) {
+                // 15.3.4.5.2 [[Construct]]
+                // When the [[Construct]] internal method of a function object,
+                // F that was created using the bind function is called with a
+                // list of arguments ExtraArgs, the following steps are taken:
+                // 1. Let target be the value of F's [[TargetFunction]]
+                //   internal property.
+                // 2. If target has no [[Construct]] internal method, a
+                //   TypeError exception is thrown.
+                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the
+                //   list boundArgs in the same order followed by the same
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Construct]] internal
+                //   method of target providing args as the arguments.
+
+                var result = target.apply(
+                    this,
+                    args.concat(array_slice.call(arguments))
+                );
+                if (Object(result) === result) {
+                    return result;
+                }
+                return this;
+
+            } else {
+                // 15.3.4.5.1 [[Call]]
+                // When the [[Call]] internal method of a function object, F,
+                // which was created using the bind function is called with a
+                // this value and a list of arguments ExtraArgs, the following
+                // steps are taken:
+                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
+                //   property.
+                // 2. Let boundThis be the value of F's [[BoundThis]] internal
+                //   property.
+                // 3. Let target be the value of F's [[TargetFunction]] internal
+                //   property.
+                // 4. Let args be a new list containing the same values as the
+                //   list boundArgs in the same order followed by the same
+                //   values as the list ExtraArgs in the same order.
+                // 5. Return the result of calling the [[Call]] internal method
+                //   of target providing boundThis as the this value and
+                //   providing args as the arguments.
+
+                // equiv: target.call(this, ...boundArgs, ...args)
+                return target.apply(
+                    that,
+                    args.concat(array_slice.call(arguments))
+                );
+
+            }
+
+        };
+
+        // 15. If the [[Class]] internal property of Target is "Function", then
+        //     a. Let L be the length property of Target minus the length of A.
+        //     b. Set the length own property of F to either 0 or L, whichever is
+        //       larger.
+        // 16. Else set the length own property of F to 0.
+
+        var boundLength = Math.max(0, target.length - args.length);
+
+        // 17. Set the attributes of the length own property of F to the values
+        //   specified in 15.3.5.1.
+        var boundArgs = [];
+        for (var i = 0; i < boundLength; i++) {
+            boundArgs.push('$' + i);
+        }
+
+        // XXX Build a dynamic function with desired amount of arguments is the only
+        // way to set the length property of a function.
+        // In environments where Content Security Policies enabled (Chrome extensions,
+        // for ex.) all use of eval or Function costructor throws an exception.
+        // However in all of these environments Function.prototype.bind exists
+        // and so this code will never be executed.
+        var bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this, arguments); }')(binder);
+
+        if (target.prototype) {
+            Empty.prototype = target.prototype;
+            bound.prototype = new Empty();
+            // Clean up dangling references.
+            Empty.prototype = null;
+        }
+
+        // TODO
+        // 18. Set the [[Extensible]] internal property of F to true.
+
+        // TODO
+        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
+        // 20. Call the [[DefineOwnProperty]] internal method of F with
+        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
+        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and
+        //   false.
+        // 21. Call the [[DefineOwnProperty]] internal method of F with
+        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower,
+        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
+        //   and false.
+
+        // TODO
+        // NOTE Function objects created using Function.prototype.bind do not
+        // have a prototype property or the [[Code]], [[FormalParameters]], and
+        // [[Scope]] internal properties.
+        // XXX can't delete prototype in pure-js.
+
+        // 22. Return F.
+        return bound;
+    }
+});
+
+//
+// Array
+// =====
+//
+
+// ES5 15.4.3.2
+// http://es5.github.com/#x15.4.3.2
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
+defineProperties(Array, { isArray: isArray });
+
+
+var boxedString = Object('a');
+var splitString = boxedString[0] !== 'a' || !(0 in boxedString);
+
+var properlyBoxesContext = function properlyBoxed(method) {
+    // Check node 0.6.21 bug where third parameter is not boxed
+    var properlyBoxesNonStrict = true;
+    var properlyBoxesStrict = true;
+    if (method) {
+        method.call('foo', function (_, __, context) {
+            if (typeof context !== 'object') { properlyBoxesNonStrict = false; }
+        });
+
+        method.call([1], function () {
+            'use strict';
+            properlyBoxesStrict = typeof this === 'string';
+        }, 'x');
+    }
+    return !!method && properlyBoxesNonStrict && properlyBoxesStrict;
+};
+
+defineProperties(ArrayPrototype, {
+    forEach: function forEach(fun /*, thisp*/) {
+        var object = toObject(this),
+            self = splitString && isString(this) ? this.split('') : object,
+            thisp = arguments[1],
+            i = -1,
+            length = self.length >>> 0;
+
+        // If no callback function or if callback is not a callable function
+        if (!isFunction(fun)) {
+            throw new TypeError(); // TODO message
+        }
+
+        while (++i < length) {
+            if (i in self) {
+                // Invoke the callback function with call, passing arguments:
+                // context, property value, property key, thisArg object
+                // context
+                fun.call(thisp, self[i], i, object);
+            }
+        }
+    }
+}, !properlyBoxesContext(ArrayPrototype.forEach));
+
+// ES5 15.4.4.14
+// http://es5.github.com/#x15.4.4.14
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
+var hasFirefox2IndexOfBug = Array.prototype.indexOf && [0, 1].indexOf(1, 2) !== -1;
+defineProperties(ArrayPrototype, {
+    indexOf: function indexOf(sought /*, fromIndex */ ) {
+        var self = splitString && isString(this) ? this.split('') : toObject(this),
+            length = self.length >>> 0;
+
+        if (!length) {
+            return -1;
+        }
+
+        var i = 0;
+        if (arguments.length > 1) {
+            i = toInteger(arguments[1]);
+        }
+
+        // handle negative indices
+        i = i >= 0 ? i : Math.max(0, length + i);
+        for (; i < length; i++) {
+            if (i in self && self[i] === sought) {
+                return i;
+            }
+        }
+        return -1;
+    }
+}, hasFirefox2IndexOfBug);
+
+//
+// String
+// ======
+//
+
+// ES5 15.5.4.14
+// http://es5.github.com/#x15.5.4.14
+
+// [bugfix, IE lt 9, firefox 4, Konqueror, Opera, obscure browsers]
+// Many browsers do not split properly with regular expressions or they
+// do not perform the split correctly under obscure conditions.
+// See http://blog.stevenlevithan.com/archives/cross-browser-split
+// I've tested in many browsers and this seems to cover the deviant ones:
+//    'ab'.split(/(?:ab)*/) should be ["", ""], not [""]
+//    '.'.split(/(.?)(.?)/) should be ["", ".", "", ""], not ["", ""]
+//    'tesst'.split(/(s)*/) should be ["t", undefined, "e", "s", "t"], not
+//       [undefined, "t", undefined, "e", ...]
+//    ''.split(/.?/) should be [], not [""]
+//    '.'.split(/()()/) should be ["."], not ["", "", "."]
+
+var string_split = StringPrototype.split;
+if (
+    'ab'.split(/(?:ab)*/).length !== 2 ||
+    '.'.split(/(.?)(.?)/).length !== 4 ||
+    'tesst'.split(/(s)*/)[1] === 't' ||
+    'test'.split(/(?:)/, -1).length !== 4 ||
+    ''.split(/.?/).length ||
+    '.'.split(/()()/).length > 1
+) {
+    (function () {
+        var compliantExecNpcg = /()??/.exec('')[1] === void 0; // NPCG: nonparticipating capturing group
+
+        StringPrototype.split = function (separator, limit) {
+            var string = this;
+            if (separator === void 0 && limit === 0) {
+                return [];
+            }
+
+            // If `separator` is not a regex, use native split
+            if (_toString.call(separator) !== '[object RegExp]') {
+                return string_split.call(this, separator, limit);
+            }
+
+            var output = [],
+                flags = (separator.ignoreCase ? 'i' : '') +
+                        (separator.multiline  ? 'm' : '') +
+                        (separator.extended   ? 'x' : '') + // Proposed for ES6
+                        (separator.sticky     ? 'y' : ''), // Firefox 3+
+                lastLastIndex = 0,
+                // Make `global` and avoid `lastIndex` issues by working with a copy
+                separator2, match, lastIndex, lastLength;
+            separator = new RegExp(separator.source, flags + 'g');
+            string += ''; // Type-convert
+            if (!compliantExecNpcg) {
+                // Doesn't need flags gy, but they don't hurt
+                separator2 = new RegExp('^' + separator.source + '$(?!\\s)', flags);
+            }
+            /* Values for `limit`, per the spec:
+             * If undefined: 4294967295 // Math.pow(2, 32) - 1
+             * If 0, Infinity, or NaN: 0
+             * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
+             * If negative number: 4294967296 - Math.floor(Math.abs(limit))
+             * If other: Type-convert, then use the above rules
+             */
+            limit = limit === void 0 ?
+                -1 >>> 0 : // Math.pow(2, 32) - 1
+                ToUint32(limit);
+            while (match = separator.exec(string)) {
+                // `separator.lastIndex` is not reliable cross-browser
+                lastIndex = match.index + match[0].length;
+                if (lastIndex > lastLastIndex) {
+                    output.push(string.slice(lastLastIndex, match.index));
+                    // Fix browsers whose `exec` methods don't consistently return `undefined` for
+                    // nonparticipating capturing groups
+                    if (!compliantExecNpcg && match.length > 1) {
+                        match[0].replace(separator2, function () {
+                            for (var i = 1; i < arguments.length - 2; i++) {
+                                if (arguments[i] === void 0) {
+                                    match[i] = void 0;
+                                }
+                            }
+                        });
+                    }
+                    if (match.length > 1 && match.index < string.length) {
+                        ArrayPrototype.push.apply(output, match.slice(1));
+                    }
+                    lastLength = match[0].length;
+                    lastLastIndex = lastIndex;
+                    if (output.length >= limit) {
+                        break;
+                    }
+                }
+                if (separator.lastIndex === match.index) {
+                    separator.lastIndex++; // Avoid an infinite loop
+                }
+            }
+            if (lastLastIndex === string.length) {
+                if (lastLength || !separator.test('')) {
+                    output.push('');
+                }
+            } else {
+                output.push(string.slice(lastLastIndex));
+            }
+            return output.length > limit ? output.slice(0, limit) : output;
+        };
+    }());
+
+// [bugfix, chrome]
+// If separator is undefined, then the result array contains just one String,
+// which is the this value (converted to a String). If limit is not undefined,
+// then the output array is truncated so that it contains no more than limit
+// elements.
+// "0".split(undefined, 0) -> []
+} else if ('0'.split(void 0, 0).length) {
+    StringPrototype.split = function split(separator, limit) {
+        if (separator === void 0 && limit === 0) { return []; }
+        return string_split.call(this, separator, limit);
+    };
+}
+
+// ES5 15.5.4.20
+// whitespace from: http://es5.github.io/#x15.5.4.20
+var ws = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003' +
+    '\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028' +
+    '\u2029\uFEFF';
+var zeroWidth = '\u200b';
+var wsRegexChars = '[' + ws + ']';
+var trimBeginRegexp = new RegExp('^' + wsRegexChars + wsRegexChars + '*');
+var trimEndRegexp = new RegExp(wsRegexChars + wsRegexChars + '*$');
+var hasTrimWhitespaceBug = StringPrototype.trim && (ws.trim() || !zeroWidth.trim());
+defineProperties(StringPrototype, {
+    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
+    // http://perfectionkills.com/whitespace-deviations/
+    trim: function trim() {
+        if (this === void 0 || this === null) {
+            throw new TypeError("can't convert " + this + ' to object');
+        }
+        return String(this).replace(trimBeginRegexp, '').replace(trimEndRegexp, '');
+    }
+}, hasTrimWhitespaceBug);
+
+// ECMA-262, 3rd B.2.3
+// Not an ECMAScript standard, although ECMAScript 3rd Edition has a
+// non-normative section suggesting uniform semantics and it should be
+// normalized across all browsers
+// [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE
+var string_substr = StringPrototype.substr;
+var hasNegativeSubstrBug = ''.substr && '0b'.substr(-1) !== 'b';
+defineProperties(StringPrototype, {
+    substr: function substr(start, length) {
+        return string_substr.call(
+            this,
+            start < 0 ? ((start = this.length + start) < 0 ? 0 : start) : start,
+            length
+        );
+    }
+}, hasNegativeSubstrBug);
+
+},{}],16:[function(require,module,exports){
+'use strict';
+
+module.exports = [
+  // streaming transports
+  require('./transport/websocket')
+, require('./transport/xhr-streaming')
+, require('./transport/xdr-streaming')
+, require('./transport/eventsource')
+, require('./transport/lib/iframe-wrap')(require('./transport/eventsource'))
+
+  // polling transports
+, require('./transport/htmlfile')
+, require('./transport/lib/iframe-wrap')(require('./transport/htmlfile'))
+, require('./transport/xhr-polling')
+, require('./transport/xdr-polling')
+, require('./transport/lib/iframe-wrap')(require('./transport/xhr-polling'))
+, require('./transport/jsonp-polling')
+];
+
+},{"./transport/eventsource":20,"./transport/htmlfile":21,"./transport/jsonp-polling":23,"./transport/lib/iframe-wrap":26,"./transport/websocket":38,"./transport/xdr-polling":39,"./transport/xdr-streaming":40,"./transport/xhr-polling":41,"./transport/xhr-streaming":42}],17:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , utils = require('../../utils/event')
+  , urlUtils = require('../../utils/url')
+  , XHR = global.XMLHttpRequest
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:browser:xhr');
+}
+
+function AbstractXHRObject(method, url, payload, opts) {
+  debug(method, url);
+  var self = this;
+  EventEmitter.call(this);
+
+  setTimeout(function () {
+    self._start(method, url, payload, opts);
+  }, 0);
+}
+
+inherits(AbstractXHRObject, EventEmitter);
+
+AbstractXHRObject.prototype._start = function(method, url, payload, opts) {
+  var self = this;
+
+  try {
+    this.xhr = new XHR();
+  } catch (x) {
+    // intentionally empty
+  }
+
+  if (!this.xhr) {
+    debug('no xhr');
+    this.emit('finish', 0, 'no xhr support');
+    this._cleanup();
+    return;
+  }
+
+  // several browsers cache POSTs
+  url = urlUtils.addQuery(url, 't=' + (+new Date()));
+
+  // Explorer tends to keep connection open, even after the
+  // tab gets closed: http://bugs.jquery.com/ticket/5280
+  this.unloadRef = utils.unloadAdd(function() {
+    debug('unload cleanup');
+    self._cleanup(true);
+  });
+  try {
+    this.xhr.open(method, url, true);
+    if (this.timeout && 'timeout' in this.xhr) {
+      this.xhr.timeout = this.timeout;
+      this.xhr.ontimeout = function() {
+        debug('xhr timeout');
+        self.emit('finish', 0, '');
+        self._cleanup(false);
+      };
+    }
+  } catch (e) {
+    debug('exception', e);
+    // IE raises an exception on wrong port.
+    this.emit('finish', 0, '');
+    this._cleanup(false);
+    return;
+  }
+
+  if ((!opts || !opts.noCredentials) && AbstractXHRObject.supportsCORS) {
+    debug('withCredentials');
+    // Mozilla docs says https://developer.mozilla.org/en/XMLHttpRequest :
+    // "This never affects same-site requests."
+
+    this.xhr.withCredentials = 'true';
+  }
+  if (opts && opts.headers) {
+    for (var key in opts.headers) {
+      this.xhr.setRequestHeader(key, opts.headers[key]);
+    }
+  }
+
+  this.xhr.onreadystatechange = function() {
+    if (self.xhr) {
+      var x = self.xhr;
+      var text, status;
+      debug('readyState', x.readyState);
+      switch (x.readyState) {
+      case 3:
+        // IE doesn't like peeking into responseText or status
+        // on Microsoft.XMLHTTP and readystate=3
+        try {
+          status = x.status;
+          text = x.responseText;
+        } catch (e) {
+          // intentionally empty
+        }
+        debug('status', status);
+        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450
+        if (status === 1223) {
+          status = 204;
+        }
+
+        // IE does return readystate == 3 for 404 answers.
+        if (status === 200 && text && text.length > 0) {
+          debug('chunk');
+          self.emit('chunk', status, text);
+        }
+        break;
+      case 4:
+        status = x.status;
+        debug('status', status);
+        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450
+        if (status === 1223) {
+          status = 204;
+        }
+        // IE returns this for a bad port
+        // http://msdn.microsoft.com/en-us/library/windows/desktop/aa383770(v=vs.85).aspx
+        if (status === 12005 || status === 12029) {
+          status = 0;
+        }
+
+        debug('finish', status, x.responseText);
+        self.emit('finish', status, x.responseText);
+        self._cleanup(false);
+        break;
+      }
+    }
+  };
+
+  try {
+    self.xhr.send(payload);
+  } catch (e) {
+    self.emit('finish', 0, '');
+    self._cleanup(false);
+  }
+};
+
+AbstractXHRObject.prototype._cleanup = function(abort) {
+  debug('cleanup');
+  if (!this.xhr) {
+    return;
+  }
+  this.removeAllListeners();
+  utils.unloadDel(this.unloadRef);
+
+  // IE needs this field to be a function
+  this.xhr.onreadystatechange = function() {};
+  if (this.xhr.ontimeout) {
+    this.xhr.ontimeout = null;
+  }
+
+  if (abort) {
+    try {
+      this.xhr.abort();
+    } catch (x) {
+      // intentionally empty
+    }
+  }
+  this.unloadRef = this.xhr = null;
+};
+
+AbstractXHRObject.prototype.close = function() {
+  debug('close');
+  this._cleanup(true);
+};
+
+AbstractXHRObject.enabled = !!XHR;
+// override XMLHttpRequest for IE6/7
+// obfuscate to avoid firewalls
+var axo = ['Active'].concat('Object').join('X');
+if (!AbstractXHRObject.enabled && (axo in global)) {
+  debug('overriding xmlhttprequest');
+  XHR = function() {
+    try {
+      return new global[axo]('Microsoft.XMLHTTP');
+    } catch (e) {
+      return null;
+    }
+  };
+  AbstractXHRObject.enabled = !!new XHR();
+}
+
+var cors = false;
+try {
+  cors = 'withCredentials' in new XHR();
+} catch (ignored) {
+  // intentionally empty
+}
+
+AbstractXHRObject.supportsCORS = cors;
+
+module.exports = AbstractXHRObject;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/transport/browser/abstract-xhr.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar EventEmitter = require('events').EventEmitter\n  , inherits = require('inherits')\n  , utils = require('../../utils/event')\n  , urlUtils = require('../../utils/url')\n  , XHR = global.XMLHttpRequest\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:browser:xhr');\n}\n\nfunction AbstractXHRObject(method, url, payload, opts) {\n  debug(method, url);\n  var self = this;\n  EventEmitter.call(this);\n\n  setTimeout(function () {\n    self._start(method, url, payload, opts);\n  }, 0);\n}\n\ninherits(AbstractXHRObject, EventEmitter);\n\nAbstractXHRObject.prototype._start = function(method, url, payload, opts) {\n  var self = this;\n\n  try {\n    this.xhr = new XHR();\n  } catch (x) {\n    // intentionally empty\n  }\n\n  if (!this.xhr) {\n    debug('no xhr');\n    this.emit('finish', 0, 'no xhr support');\n    this._cleanup();\n    return;\n  }\n\n  // several browsers cache POSTs\n  url = urlUtils.addQuery(url, 't=' + (+new Date()));\n\n  // Explorer tends to keep connection open, even after the\n  // tab gets closed: http://bugs.jquery.com/ticket/5280\n  this.unloadRef = utils.unloadAdd(function() {\n    debug('unload cleanup');\n    self._cleanup(true);\n  });\n  try {\n    this.xhr.open(method, url, true);\n    if (this.timeout && 'timeout' in this.xhr) {\n      this.xhr.timeout = this.timeout;\n      this.xhr.ontimeout = function() {\n        debug('xhr timeout');\n        self.emit('finish', 0, '');\n        self._cleanup(false);\n      };\n    }\n  } catch (e) {\n    debug('exception', e);\n    // IE raises an exception on wrong port.\n    this.emit('finish', 0, '');\n    this._cleanup(false);\n    return;\n  }\n\n  if ((!opts || !opts.noCredentials) && AbstractXHRObject.supportsCORS) {\n    debug('withCredentials');\n    // Mozilla docs says https://developer.mozilla.org/en/XMLHttpRequest :\n    // \"This never affects same-site requests.\"\n\n    this.xhr.withCredentials = 'true';\n  }\n  if (opts && opts.headers) {\n    for (var key in opts.headers) {\n      this.xhr.setRequestHeader(key, opts.headers[key]);\n    }\n  }\n\n  this.xhr.onreadystatechange = function() {\n    if (self.xhr) {\n      var x = self.xhr;\n      var text, status;\n      debug('readyState', x.readyState);\n      switch (x.readyState) {\n      case 3:\n        // IE doesn't like peeking into responseText or status\n        // on Microsoft.XMLHTTP and readystate=3\n        try {\n          status = x.status;\n          text = x.responseText;\n        } catch (e) {\n          // intentionally empty\n        }\n        debug('status', status);\n        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450\n        if (status === 1223) {\n          status = 204;\n        }\n\n        // IE does return readystate == 3 for 404 answers.\n        if (status === 200 && text && text.length > 0) {\n          debug('chunk');\n          self.emit('chunk', status, text);\n        }\n        break;\n      case 4:\n        status = x.status;\n        debug('status', status);\n        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450\n        if (status === 1223) {\n          status = 204;\n        }\n        // IE returns this for a bad port\n        // http://msdn.microsoft.com/en-us/library/windows/desktop/aa383770(v=vs.85).aspx\n        if (status === 12005 || status === 12029) {\n          status = 0;\n        }\n\n        debug('finish', status, x.responseText);\n        self.emit('finish', status, x.responseText);\n        self._cleanup(false);\n        break;\n      }\n    }\n  };\n\n  try {\n    self.xhr.send(payload);\n  } catch (e) {\n    self.emit('finish', 0, '');\n    self._cleanup(false);\n  }\n};\n\nAbstractXHRObject.prototype._cleanup = function(abort) {\n  debug('cleanup');\n  if (!this.xhr) {\n    return;\n  }\n  this.removeAllListeners();\n  utils.unloadDel(this.unloadRef);\n\n  // IE needs this field to be a function\n  this.xhr.onreadystatechange = function() {};\n  if (this.xhr.ontimeout) {\n    this.xhr.ontimeout = null;\n  }\n\n  if (abort) {\n    try {\n      this.xhr.abort();\n    } catch (x) {\n      // intentionally empty\n    }\n  }\n  this.unloadRef = this.xhr = null;\n};\n\nAbstractXHRObject.prototype.close = function() {\n  debug('close');\n  this._cleanup(true);\n};\n\nAbstractXHRObject.enabled = !!XHR;\n// override XMLHttpRequest for IE6/7\n// obfuscate to avoid firewalls\nvar axo = ['Active'].concat('Object').join('X');\nif (!AbstractXHRObject.enabled && (axo in global)) {\n  debug('overriding xmlhttprequest');\n  XHR = function() {\n    try {\n      return new global[axo]('Microsoft.XMLHTTP');\n    } catch (e) {\n      return null;\n    }\n  };\n  AbstractXHRObject.enabled = !!new XHR();\n}\n\nvar cors = false;\ntry {\n  cors = 'withCredentials' in new XHR();\n} catch (ignored) {\n  // intentionally empty\n}\n\nAbstractXHRObject.supportsCORS = cors;\n\nmodule.exports = AbstractXHRObject;\n"]}
+},{"../../utils/event":46,"../../utils/url":52,"debug":54,"events":3,"inherits":57}],18:[function(require,module,exports){
+(function (global){
+module.exports = global.EventSource;
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvYnJvd3Nlci9ldmVudHNvdXJjZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsibW9kdWxlLmV4cG9ydHMgPSBnbG9iYWwuRXZlbnRTb3VyY2U7XG4iXX0=
+},{}],19:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var Driver = global.WebSocket || global.MozWebSocket;
+if (Driver) {
+	module.exports = function WebSocketBrowserDriver(url) {
+		return new Driver(url);
+	};
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvYnJvd3Nlci93ZWJzb2NrZXQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgRHJpdmVyID0gZ2xvYmFsLldlYlNvY2tldCB8fCBnbG9iYWwuTW96V2ViU29ja2V0O1xuaWYgKERyaXZlcikge1xuXHRtb2R1bGUuZXhwb3J0cyA9IGZ1bmN0aW9uIFdlYlNvY2tldEJyb3dzZXJEcml2ZXIodXJsKSB7XG5cdFx0cmV0dXJuIG5ldyBEcml2ZXIodXJsKTtcblx0fTtcbn1cbiJdfQ==
+},{}],20:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , EventSourceReceiver = require('./receiver/eventsource')
+  , XHRCorsObject = require('./sender/xhr-cors')
+  , EventSourceDriver = require('eventsource')
+  ;
+
+function EventSourceTransport(transUrl) {
+  if (!EventSourceTransport.enabled()) {
+    throw new Error('Transport created when disabled');
+  }
+
+  AjaxBasedTransport.call(this, transUrl, '/eventsource', EventSourceReceiver, XHRCorsObject);
+}
+
+inherits(EventSourceTransport, AjaxBasedTransport);
+
+EventSourceTransport.enabled = function() {
+  return !!EventSourceDriver;
+};
+
+EventSourceTransport.transportName = 'eventsource';
+EventSourceTransport.roundTrips = 2;
+
+module.exports = EventSourceTransport;
+
+},{"./lib/ajax-based":24,"./receiver/eventsource":29,"./sender/xhr-cors":35,"eventsource":18,"inherits":57}],21:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , HtmlfileReceiver = require('./receiver/htmlfile')
+  , XHRLocalObject = require('./sender/xhr-local')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  ;
+
+function HtmlFileTransport(transUrl) {
+  if (!HtmlfileReceiver.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/htmlfile', HtmlfileReceiver, XHRLocalObject);
+}
+
+inherits(HtmlFileTransport, AjaxBasedTransport);
+
+HtmlFileTransport.enabled = function(info) {
+  return HtmlfileReceiver.enabled && info.sameOrigin;
+};
+
+HtmlFileTransport.transportName = 'htmlfile';
+HtmlFileTransport.roundTrips = 2;
+
+module.exports = HtmlFileTransport;
+
+},{"./lib/ajax-based":24,"./receiver/htmlfile":30,"./sender/xhr-local":37,"inherits":57}],22:[function(require,module,exports){
+(function (process){
+'use strict';
+
+// Few cool transports do work only for same-origin. In order to make
+// them work cross-domain we shall use iframe, served from the
+// remote domain. New browsers have capabilities to communicate with
+// cross domain iframe using postMessage(). In IE it was implemented
+// from IE 8+, but of course, IE got some details wrong:
+//    http://msdn.microsoft.com/en-us/library/cc197015(v=VS.85).aspx
+//    http://stevesouders.com/misc/test-postmessage.php
+
+var inherits = require('inherits')
+  , JSON3 = require('json3')
+  , EventEmitter = require('events').EventEmitter
+  , version = require('../version')
+  , urlUtils = require('../utils/url')
+  , iframeUtils = require('../utils/iframe')
+  , eventUtils = require('../utils/event')
+  , random = require('../utils/random')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:transport:iframe');
+}
+
+function IframeTransport(transport, transUrl, baseUrl) {
+  if (!IframeTransport.enabled()) {
+    throw new Error('Transport created when disabled');
+  }
+  EventEmitter.call(this);
+
+  var self = this;
+  this.origin = urlUtils.getOrigin(baseUrl);
+  this.baseUrl = baseUrl;
+  this.transUrl = transUrl;
+  this.transport = transport;
+  this.windowId = random.string(8);
+
+  var iframeUrl = urlUtils.addPath(baseUrl, '/iframe.html') + '#' + this.windowId;
+  debug(transport, transUrl, iframeUrl);
+
+  this.iframeObj = iframeUtils.createIframe(iframeUrl, function(r) {
+    debug('err callback');
+    self.emit('close', 1006, 'Unable to load an iframe (' + r + ')');
+    self.close();
+  });
+
+  this.onmessageCallback = this._message.bind(this);
+  eventUtils.attachEvent('message', this.onmessageCallback);
+}
+
+inherits(IframeTransport, EventEmitter);
+
+IframeTransport.prototype.close = function() {
+  debug('close');
+  this.removeAllListeners();
+  if (this.iframeObj) {
+    eventUtils.detachEvent('message', this.onmessageCallback);
+    try {
+      // When the iframe is not loaded, IE raises an exception
+      // on 'contentWindow'.
+      this.postMessage('c');
+    } catch (x) {
+      // intentionally empty
+    }
+    this.iframeObj.cleanup();
+    this.iframeObj = null;
+    this.onmessageCallback = this.iframeObj = null;
+  }
+};
+
+IframeTransport.prototype._message = function(e) {
+  debug('message', e.data);
+  if (!urlUtils.isOriginEqual(e.origin, this.origin)) {
+    debug('not same origin', e.origin, this.origin);
+    return;
+  }
+
+  var iframeMessage;
+  try {
+    iframeMessage = JSON3.parse(e.data);
+  } catch (ignored) {
+    debug('bad json', e.data);
+    return;
+  }
+
+  if (iframeMessage.windowId !== this.windowId) {
+    debug('mismatched window id', iframeMessage.windowId, this.windowId);
+    return;
+  }
+
+  switch (iframeMessage.type) {
+  case 's':
+    this.iframeObj.loaded();
+    // window global dependency
+    this.postMessage('s', JSON3.stringify([
+      version
+    , this.transport
+    , this.transUrl
+    , this.baseUrl
+    ]));
+    break;
+  case 't':
+    this.emit('message', iframeMessage.data);
+    break;
+  case 'c':
+    var cdata;
+    try {
+      cdata = JSON3.parse(iframeMessage.data);
+    } catch (ignored) {
+      debug('bad json', iframeMessage.data);
+      return;
+    }
+    this.emit('close', cdata[0], cdata[1]);
+    this.close();
+    break;
+  }
+};
+
+IframeTransport.prototype.postMessage = function(type, data) {
+  debug('postMessage', type, data);
+  this.iframeObj.post(JSON3.stringify({
+    windowId: this.windowId
+  , type: type
+  , data: data || ''
+  }), this.origin);
+};
+
+IframeTransport.prototype.send = function(message) {
+  debug('send', message);
+  this.postMessage('m', message);
+};
+
+IframeTransport.enabled = function() {
+  return iframeUtils.iframeEnabled;
+};
+
+IframeTransport.transportName = 'iframe';
+IframeTransport.roundTrips = 2;
+
+module.exports = IframeTransport;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvaWZyYW1lLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG4vLyBGZXcgY29vbCB0cmFuc3BvcnRzIGRvIHdvcmsgb25seSBmb3Igc2FtZS1vcmlnaW4uIEluIG9yZGVyIHRvIG1ha2Vcbi8vIHRoZW0gd29yayBjcm9zcy1kb21haW4gd2Ugc2hhbGwgdXNlIGlmcmFtZSwgc2VydmVkIGZyb20gdGhlXG4vLyByZW1vdGUgZG9tYWluLiBOZXcgYnJvd3NlcnMgaGF2ZSBjYXBhYmlsaXRpZXMgdG8gY29tbXVuaWNhdGUgd2l0aFxuLy8gY3Jvc3MgZG9tYWluIGlmcmFtZSB1c2luZyBwb3N0TWVzc2FnZSgpLiBJbiBJRSBpdCB3YXMgaW1wbGVtZW50ZWRcbi8vIGZyb20gSUUgOCssIGJ1dCBvZiBjb3Vyc2UsIElFIGdvdCBzb21lIGRldGFpbHMgd3Jvbmc6XG4vLyAgICBodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tL2VuLXVzL2xpYnJhcnkvY2MxOTcwMTUodj1WUy44NSkuYXNweFxuLy8gICAgaHR0cDovL3N0ZXZlc291ZGVycy5jb20vbWlzYy90ZXN0LXBvc3RtZXNzYWdlLnBocFxuXG52YXIgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgSlNPTjMgPSByZXF1aXJlKCdqc29uMycpXG4gICwgRXZlbnRFbWl0dGVyID0gcmVxdWlyZSgnZXZlbnRzJykuRXZlbnRFbWl0dGVyXG4gICwgdmVyc2lvbiA9IHJlcXVpcmUoJy4uL3ZlcnNpb24nKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vdXRpbHMvdXJsJylcbiAgLCBpZnJhbWVVdGlscyA9IHJlcXVpcmUoJy4uL3V0aWxzL2lmcmFtZScpXG4gICwgZXZlbnRVdGlscyA9IHJlcXVpcmUoJy4uL3V0aWxzL2V2ZW50JylcbiAgLCByYW5kb20gPSByZXF1aXJlKCcuLi91dGlscy9yYW5kb20nKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6dHJhbnNwb3J0OmlmcmFtZScpO1xufVxuXG5mdW5jdGlvbiBJZnJhbWVUcmFuc3BvcnQodHJhbnNwb3J0LCB0cmFuc1VybCwgYmFzZVVybCkge1xuICBpZiAoIUlmcmFtZVRyYW5zcG9ydC5lbmFibGVkKCkpIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoJ1RyYW5zcG9ydCBjcmVhdGVkIHdoZW4gZGlzYWJsZWQnKTtcbiAgfVxuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcblxuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHRoaXMub3JpZ2luID0gdXJsVXRpbHMuZ2V0T3JpZ2luKGJhc2VVcmwpO1xuICB0aGlzLmJhc2VVcmwgPSBiYXNlVXJsO1xuICB0aGlzLnRyYW5zVXJsID0gdHJhbnNVcmw7XG4gIHRoaXMudHJhbnNwb3J0ID0gdHJhbnNwb3J0O1xuICB0aGlzLndpbmRvd0lkID0gcmFuZG9tLnN0cmluZyg4KTtcblxuICB2YXIgaWZyYW1lVXJsID0gdXJsVXRpbHMuYWRkUGF0aChiYXNlVXJsLCAnL2lmcmFtZS5odG1sJykgKyAnIycgKyB0aGlzLndpbmRvd0lkO1xuICBkZWJ1Zyh0cmFuc3BvcnQsIHRyYW5zVXJsLCBpZnJhbWVVcmwpO1xuXG4gIHRoaXMuaWZyYW1lT2JqID0gaWZyYW1lVXRpbHMuY3JlYXRlSWZyYW1lKGlmcmFtZVVybCwgZnVuY3Rpb24ocikge1xuICAgIGRlYnVnKCdlcnIgY2FsbGJhY2snKTtcbiAgICBzZWxmLmVtaXQoJ2Nsb3NlJywgMTAwNiwgJ1VuYWJsZSB0byBsb2FkIGFuIGlmcmFtZSAoJyArIHIgKyAnKScpO1xuICAgIHNlbGYuY2xvc2UoKTtcbiAgfSk7XG5cbiAgdGhpcy5vbm1lc3NhZ2VDYWxsYmFjayA9IHRoaXMuX21lc3NhZ2UuYmluZCh0aGlzKTtcbiAgZXZlbnRVdGlscy5hdHRhY2hFdmVudCgnbWVzc2FnZScsIHRoaXMub25tZXNzYWdlQ2FsbGJhY2spO1xufVxuXG5pbmhlcml0cyhJZnJhbWVUcmFuc3BvcnQsIEV2ZW50RW1pdHRlcik7XG5cbklmcmFtZVRyYW5zcG9ydC5wcm90b3R5cGUuY2xvc2UgPSBmdW5jdGlvbigpIHtcbiAgZGVidWcoJ2Nsb3NlJyk7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIGlmICh0aGlzLmlmcmFtZU9iaikge1xuICAgIGV2ZW50VXRpbHMuZGV0YWNoRXZlbnQoJ21lc3NhZ2UnLCB0aGlzLm9ubWVzc2FnZUNhbGxiYWNrKTtcbiAgICB0cnkge1xuICAgICAgLy8gV2hlbiB0aGUgaWZyYW1lIGlzIG5vdCBsb2FkZWQsIElFIHJhaXNlcyBhbiBleGNlcHRpb25cbiAgICAgIC8vIG9uICdjb250ZW50V2luZG93Jy5cbiAgICAgIHRoaXMucG9zdE1lc3NhZ2UoJ2MnKTtcbiAgICB9IGNhdGNoICh4KSB7XG4gICAgICAvLyBpbnRlbnRpb25hbGx5IGVtcHR5XG4gICAgfVxuICAgIHRoaXMuaWZyYW1lT2JqLmNsZWFudXAoKTtcbiAgICB0aGlzLmlmcmFtZU9iaiA9IG51bGw7XG4gICAgdGhpcy5vbm1lc3NhZ2VDYWxsYmFjayA9IHRoaXMuaWZyYW1lT2JqID0gbnVsbDtcbiAgfVxufTtcblxuSWZyYW1lVHJhbnNwb3J0LnByb3RvdHlwZS5fbWVzc2FnZSA9IGZ1bmN0aW9uKGUpIHtcbiAgZGVidWcoJ21lc3NhZ2UnLCBlLmRhdGEpO1xuICBpZiAoIXVybFV0aWxzLmlzT3JpZ2luRXF1YWwoZS5vcmlnaW4sIHRoaXMub3JpZ2luKSkge1xuICAgIGRlYnVnKCdub3Qgc2FtZSBvcmlnaW4nLCBlLm9yaWdpbiwgdGhpcy5vcmlnaW4pO1xuICAgIHJldHVybjtcbiAgfVxuXG4gIHZhciBpZnJhbWVNZXNzYWdlO1xuICB0cnkge1xuICAgIGlmcmFtZU1lc3NhZ2UgPSBKU09OMy5wYXJzZShlLmRhdGEpO1xuICB9IGNhdGNoIChpZ25vcmVkKSB7XG4gICAgZGVidWcoJ2JhZCBqc29uJywgZS5kYXRhKTtcbiAgICByZXR1cm47XG4gIH1cblxuICBpZiAoaWZyYW1lTWVzc2FnZS53aW5kb3dJZCAhPT0gdGhpcy53aW5kb3dJZCkge1xuICAgIGRlYnVnKCdtaXNtYXRjaGVkIHdpbmRvdyBpZCcsIGlmcmFtZU1lc3NhZ2Uud2luZG93SWQsIHRoaXMud2luZG93SWQpO1xuICAgIHJldHVybjtcbiAgfVxuXG4gIHN3aXRjaCAoaWZyYW1lTWVzc2FnZS50eXBlKSB7XG4gIGNhc2UgJ3MnOlxuICAgIHRoaXMuaWZyYW1lT2JqLmxvYWRlZCgpO1xuICAgIC8vIHdpbmRvdyBnbG9iYWwgZGVwZW5kZW5jeVxuICAgIHRoaXMucG9zdE1lc3NhZ2UoJ3MnLCBKU09OMy5zdHJpbmdpZnkoW1xuICAgICAgdmVyc2lvblxuICAgICwgdGhpcy50cmFuc3BvcnRcbiAgICAsIHRoaXMudHJhbnNVcmxcbiAgICAsIHRoaXMuYmFzZVVybFxuICAgIF0pKTtcbiAgICBicmVhaztcbiAgY2FzZSAndCc6XG4gICAgdGhpcy5lbWl0KCdtZXNzYWdlJywgaWZyYW1lTWVzc2FnZS5kYXRhKTtcbiAgICBicmVhaztcbiAgY2FzZSAnYyc6XG4gICAgdmFyIGNkYXRhO1xuICAgIHRyeSB7XG4gICAgICBjZGF0YSA9IEpTT04zLnBhcnNlKGlmcmFtZU1lc3NhZ2UuZGF0YSk7XG4gICAgfSBjYXRjaCAoaWdub3JlZCkge1xuICAgICAgZGVidWcoJ2JhZCBqc29uJywgaWZyYW1lTWVzc2FnZS5kYXRhKTtcbiAgICAgIHJldHVybjtcbiAgICB9XG4gICAgdGhpcy5lbWl0KCdjbG9zZScsIGNkYXRhWzBdLCBjZGF0YVsxXSk7XG4gICAgdGhpcy5jbG9zZSgpO1xuICAgIGJyZWFrO1xuICB9XG59O1xuXG5JZnJhbWVUcmFuc3BvcnQucHJvdG90eXBlLnBvc3RNZXNzYWdlID0gZnVuY3Rpb24odHlwZSwgZGF0YSkge1xuICBkZWJ1ZygncG9zdE1lc3NhZ2UnLCB0eXBlLCBkYXRhKTtcbiAgdGhpcy5pZnJhbWVPYmoucG9zdChKU09OMy5zdHJpbmdpZnkoe1xuICAgIHdpbmRvd0lkOiB0aGlzLndpbmRvd0lkXG4gICwgdHlwZTogdHlwZVxuICAsIGRhdGE6IGRhdGEgfHwgJydcbiAgfSksIHRoaXMub3JpZ2luKTtcbn07XG5cbklmcmFtZVRyYW5zcG9ydC5wcm90b3R5cGUuc2VuZCA9IGZ1bmN0aW9uKG1lc3NhZ2UpIHtcbiAgZGVidWcoJ3NlbmQnLCBtZXNzYWdlKTtcbiAgdGhpcy5wb3N0TWVzc2FnZSgnbScsIG1lc3NhZ2UpO1xufTtcblxuSWZyYW1lVHJhbnNwb3J0LmVuYWJsZWQgPSBmdW5jdGlvbigpIHtcbiAgcmV0dXJuIGlmcmFtZVV0aWxzLmlmcmFtZUVuYWJsZWQ7XG59O1xuXG5JZnJhbWVUcmFuc3BvcnQudHJhbnNwb3J0TmFtZSA9ICdpZnJhbWUnO1xuSWZyYW1lVHJhbnNwb3J0LnJvdW5kVHJpcHMgPSAyO1xuXG5tb2R1bGUuZXhwb3J0cyA9IElmcmFtZVRyYW5zcG9ydDtcbiJdfQ==
+},{"../utils/event":46,"../utils/iframe":47,"../utils/random":50,"../utils/url":52,"../version":53,"debug":54,"events":3,"inherits":57,"json3":58}],23:[function(require,module,exports){
+(function (global){
+'use strict';
+
+// The simplest and most robust transport, using the well-know cross
+// domain hack - JSONP. This transport is quite inefficient - one
+// message could use up to one http request. But at least it works almost
+// everywhere.
+// Known limitations:
+//   o you will get a spinning cursor
+//   o for Konqueror a dumb timer is needed to detect errors
+
+var inherits = require('inherits')
+  , SenderReceiver = require('./lib/sender-receiver')
+  , JsonpReceiver = require('./receiver/jsonp')
+  , jsonpSender = require('./sender/jsonp')
+  ;
+
+function JsonPTransport(transUrl) {
+  if (!JsonPTransport.enabled()) {
+    throw new Error('Transport created when disabled');
+  }
+  SenderReceiver.call(this, transUrl, '/jsonp', jsonpSender, JsonpReceiver);
+}
+
+inherits(JsonPTransport, SenderReceiver);
+
+JsonPTransport.enabled = function() {
+  return !!global.document;
+};
+
+JsonPTransport.transportName = 'jsonp-polling';
+JsonPTransport.roundTrips = 1;
+JsonPTransport.needBody = true;
+
+module.exports = JsonPTransport;
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvanNvbnAtcG9sbGluZy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG4vLyBUaGUgc2ltcGxlc3QgYW5kIG1vc3Qgcm9idXN0IHRyYW5zcG9ydCwgdXNpbmcgdGhlIHdlbGwta25vdyBjcm9zc1xuLy8gZG9tYWluIGhhY2sgLSBKU09OUC4gVGhpcyB0cmFuc3BvcnQgaXMgcXVpdGUgaW5lZmZpY2llbnQgLSBvbmVcbi8vIG1lc3NhZ2UgY291bGQgdXNlIHVwIHRvIG9uZSBodHRwIHJlcXVlc3QuIEJ1dCBhdCBsZWFzdCBpdCB3b3JrcyBhbG1vc3Rcbi8vIGV2ZXJ5d2hlcmUuXG4vLyBLbm93biBsaW1pdGF0aW9uczpcbi8vICAgbyB5b3Ugd2lsbCBnZXQgYSBzcGlubmluZyBjdXJzb3Jcbi8vICAgbyBmb3IgS29ucXVlcm9yIGEgZHVtYiB0aW1lciBpcyBuZWVkZWQgdG8gZGV0ZWN0IGVycm9yc1xuXG52YXIgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgU2VuZGVyUmVjZWl2ZXIgPSByZXF1aXJlKCcuL2xpYi9zZW5kZXItcmVjZWl2ZXInKVxuICAsIEpzb25wUmVjZWl2ZXIgPSByZXF1aXJlKCcuL3JlY2VpdmVyL2pzb25wJylcbiAgLCBqc29ucFNlbmRlciA9IHJlcXVpcmUoJy4vc2VuZGVyL2pzb25wJylcbiAgO1xuXG5mdW5jdGlvbiBKc29uUFRyYW5zcG9ydCh0cmFuc1VybCkge1xuICBpZiAoIUpzb25QVHJhbnNwb3J0LmVuYWJsZWQoKSkge1xuICAgIHRocm93IG5ldyBFcnJvcignVHJhbnNwb3J0IGNyZWF0ZWQgd2hlbiBkaXNhYmxlZCcpO1xuICB9XG4gIFNlbmRlclJlY2VpdmVyLmNhbGwodGhpcywgdHJhbnNVcmwsICcvanNvbnAnLCBqc29ucFNlbmRlciwgSnNvbnBSZWNlaXZlcik7XG59XG5cbmluaGVyaXRzKEpzb25QVHJhbnNwb3J0LCBTZW5kZXJSZWNlaXZlcik7XG5cbkpzb25QVHJhbnNwb3J0LmVuYWJsZWQgPSBmdW5jdGlvbigpIHtcbiAgcmV0dXJuICEhZ2xvYmFsLmRvY3VtZW50O1xufTtcblxuSnNvblBUcmFuc3BvcnQudHJhbnNwb3J0TmFtZSA9ICdqc29ucC1wb2xsaW5nJztcbkpzb25QVHJhbnNwb3J0LnJvdW5kVHJpcHMgPSAxO1xuSnNvblBUcmFuc3BvcnQubmVlZEJvZHkgPSB0cnVlO1xuXG5tb2R1bGUuZXhwb3J0cyA9IEpzb25QVHJhbnNwb3J0O1xuIl19
+},{"./lib/sender-receiver":28,"./receiver/jsonp":31,"./sender/jsonp":33,"inherits":57}],24:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , urlUtils = require('../../utils/url')
+  , SenderReceiver = require('./sender-receiver')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:ajax-based');
+}
+
+function createAjaxSender(AjaxObject) {
+  return function(url, payload, callback) {
+    debug('create ajax sender', url, payload);
+    var opt = {};
+    if (typeof payload === 'string') {
+      opt.headers = {'Content-type': 'text/plain'};
+    }
+    var ajaxUrl = urlUtils.addPath(url, '/xhr_send');
+    var xo = new AjaxObject('POST', ajaxUrl, payload, opt);
+    xo.once('finish', function(status) {
+      debug('finish', status);
+      xo = null;
+
+      if (status !== 200 && status !== 204) {
+        return callback(new Error('http status ' + status));
+      }
+      callback();
+    });
+    return function() {
+      debug('abort');
+      xo.close();
+      xo = null;
+
+      var err = new Error('Aborted');
+      err.code = 1000;
+      callback(err);
+    };
+  };
+}
+
+function AjaxBasedTransport(transUrl, urlSuffix, Receiver, AjaxObject) {
+  SenderReceiver.call(this, transUrl, urlSuffix, createAjaxSender(AjaxObject), Receiver, AjaxObject);
+}
+
+inherits(AjaxBasedTransport, SenderReceiver);
+
+module.exports = AjaxBasedTransport;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL2FqYXgtYmFzZWQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvdXJsJylcbiAgLCBTZW5kZXJSZWNlaXZlciA9IHJlcXVpcmUoJy4vc2VuZGVyLXJlY2VpdmVyJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OmFqYXgtYmFzZWQnKTtcbn1cblxuZnVuY3Rpb24gY3JlYXRlQWpheFNlbmRlcihBamF4T2JqZWN0KSB7XG4gIHJldHVybiBmdW5jdGlvbih1cmwsIHBheWxvYWQsIGNhbGxiYWNrKSB7XG4gICAgZGVidWcoJ2NyZWF0ZSBhamF4IHNlbmRlcicsIHVybCwgcGF5bG9hZCk7XG4gICAgdmFyIG9wdCA9IHt9O1xuICAgIGlmICh0eXBlb2YgcGF5bG9hZCA9PT0gJ3N0cmluZycpIHtcbiAgICAgIG9wdC5oZWFkZXJzID0geydDb250ZW50LXR5cGUnOiAndGV4dC9wbGFpbid9O1xuICAgIH1cbiAgICB2YXIgYWpheFVybCA9IHVybFV0aWxzLmFkZFBhdGgodXJsLCAnL3hocl9zZW5kJyk7XG4gICAgdmFyIHhvID0gbmV3IEFqYXhPYmplY3QoJ1BPU1QnLCBhamF4VXJsLCBwYXlsb2FkLCBvcHQpO1xuICAgIHhvLm9uY2UoJ2ZpbmlzaCcsIGZ1bmN0aW9uKHN0YXR1cykge1xuICAgICAgZGVidWcoJ2ZpbmlzaCcsIHN0YXR1cyk7XG4gICAgICB4byA9IG51bGw7XG5cbiAgICAgIGlmIChzdGF0dXMgIT09IDIwMCAmJiBzdGF0dXMgIT09IDIwNCkge1xuICAgICAgICByZXR1cm4gY2FsbGJhY2sobmV3IEVycm9yKCdodHRwIHN0YXR1cyAnICsgc3RhdHVzKSk7XG4gICAgICB9XG4gICAgICBjYWxsYmFjaygpO1xuICAgIH0pO1xuICAgIHJldHVybiBmdW5jdGlvbigpIHtcbiAgICAgIGRlYnVnKCdhYm9ydCcpO1xuICAgICAgeG8uY2xvc2UoKTtcbiAgICAgIHhvID0gbnVsbDtcblxuICAgICAgdmFyIGVyciA9IG5ldyBFcnJvcignQWJvcnRlZCcpO1xuICAgICAgZXJyLmNvZGUgPSAxMDAwO1xuICAgICAgY2FsbGJhY2soZXJyKTtcbiAgICB9O1xuICB9O1xufVxuXG5mdW5jdGlvbiBBamF4QmFzZWRUcmFuc3BvcnQodHJhbnNVcmwsIHVybFN1ZmZpeCwgUmVjZWl2ZXIsIEFqYXhPYmplY3QpIHtcbiAgU2VuZGVyUmVjZWl2ZXIuY2FsbCh0aGlzLCB0cmFuc1VybCwgdXJsU3VmZml4LCBjcmVhdGVBamF4U2VuZGVyKEFqYXhPYmplY3QpLCBSZWNlaXZlciwgQWpheE9iamVjdCk7XG59XG5cbmluaGVyaXRzKEFqYXhCYXNlZFRyYW5zcG9ydCwgU2VuZGVyUmVjZWl2ZXIpO1xuXG5tb2R1bGUuZXhwb3J0cyA9IEFqYXhCYXNlZFRyYW5zcG9ydDtcbiJdfQ==
+},{"../../utils/url":52,"./sender-receiver":28,"debug":54,"inherits":57}],25:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:buffered-sender');
+}
+
+function BufferedSender(url, sender) {
+  debug(url);
+  EventEmitter.call(this);
+  this.sendBuffer = [];
+  this.sender = sender;
+  this.url = url;
+}
+
+inherits(BufferedSender, EventEmitter);
+
+BufferedSender.prototype.send = function(message) {
+  debug('send', message);
+  this.sendBuffer.push(message);
+  if (!this.sendStop) {
+    this.sendSchedule();
+  }
+};
+
+// For polling transports in a situation when in the message callback,
+// new message is being send. If the sending connection was started
+// before receiving one, it is possible to saturate the network and
+// timeout due to the lack of receiving socket. To avoid that we delay
+// sending messages by some small time, in order to let receiving
+// connection be started beforehand. This is only a halfmeasure and
+// does not fix the big problem, but it does make the tests go more
+// stable on slow networks.
+BufferedSender.prototype.sendScheduleWait = function() {
+  debug('sendScheduleWait');
+  var self = this;
+  var tref;
+  this.sendStop = function() {
+    debug('sendStop');
+    self.sendStop = null;
+    clearTimeout(tref);
+  };
+  tref = setTimeout(function() {
+    debug('timeout');
+    self.sendStop = null;
+    self.sendSchedule();
+  }, 25);
+};
+
+BufferedSender.prototype.sendSchedule = function() {
+  debug('sendSchedule', this.sendBuffer.length);
+  var self = this;
+  if (this.sendBuffer.length > 0) {
+    var payload = '[' + this.sendBuffer.join(',') + ']';
+    this.sendStop = this.sender(this.url, payload, function(err) {
+      self.sendStop = null;
+      if (err) {
+        debug('error', err);
+        self.emit('close', err.code || 1006, 'Sending error: ' + err);
+        self._cleanup();
+      } else {
+        self.sendScheduleWait();
+      }
+    });
+    this.sendBuffer = [];
+  }
+};
+
+BufferedSender.prototype._cleanup = function() {
+  debug('_cleanup');
+  this.removeAllListeners();
+};
+
+BufferedSender.prototype.stop = function() {
+  debug('stop');
+  this._cleanup();
+  if (this.sendStop) {
+    this.sendStop();
+    this.sendStop = null;
+  }
+};
+
+module.exports = BufferedSender;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL2J1ZmZlcmVkLXNlbmRlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6YnVmZmVyZWQtc2VuZGVyJyk7XG59XG5cbmZ1bmN0aW9uIEJ1ZmZlcmVkU2VuZGVyKHVybCwgc2VuZGVyKSB7XG4gIGRlYnVnKHVybCk7XG4gIEV2ZW50RW1pdHRlci5jYWxsKHRoaXMpO1xuICB0aGlzLnNlbmRCdWZmZXIgPSBbXTtcbiAgdGhpcy5zZW5kZXIgPSBzZW5kZXI7XG4gIHRoaXMudXJsID0gdXJsO1xufVxuXG5pbmhlcml0cyhCdWZmZXJlZFNlbmRlciwgRXZlbnRFbWl0dGVyKTtcblxuQnVmZmVyZWRTZW5kZXIucHJvdG90eXBlLnNlbmQgPSBmdW5jdGlvbihtZXNzYWdlKSB7XG4gIGRlYnVnKCdzZW5kJywgbWVzc2FnZSk7XG4gIHRoaXMuc2VuZEJ1ZmZlci5wdXNoKG1lc3NhZ2UpO1xuICBpZiAoIXRoaXMuc2VuZFN0b3ApIHtcbiAgICB0aGlzLnNlbmRTY2hlZHVsZSgpO1xuICB9XG59O1xuXG4vLyBGb3IgcG9sbGluZyB0cmFuc3BvcnRzIGluIGEgc2l0dWF0aW9uIHdoZW4gaW4gdGhlIG1lc3NhZ2UgY2FsbGJhY2ssXG4vLyBuZXcgbWVzc2FnZSBpcyBiZWluZyBzZW5kLiBJZiB0aGUgc2VuZGluZyBjb25uZWN0aW9uIHdhcyBzdGFydGVkXG4vLyBiZWZvcmUgcmVjZWl2aW5nIG9uZSwgaXQgaXMgcG9zc2libGUgdG8gc2F0dXJhdGUgdGhlIG5ldHdvcmsgYW5kXG4vLyB0aW1lb3V0IGR1ZSB0byB0aGUgbGFjayBvZiByZWNlaXZpbmcgc29ja2V0LiBUbyBhdm9pZCB0aGF0IHdlIGRlbGF5XG4vLyBzZW5kaW5nIG1lc3NhZ2VzIGJ5IHNvbWUgc21hbGwgdGltZSwgaW4gb3JkZXIgdG8gbGV0IHJlY2VpdmluZ1xuLy8gY29ubmVjdGlvbiBiZSBzdGFydGVkIGJlZm9yZWhhbmQuIFRoaXMgaXMgb25seSBhIGhhbGZtZWFzdXJlIGFuZFxuLy8gZG9lcyBub3QgZml4IHRoZSBiaWcgcHJvYmxlbSwgYnV0IGl0IGRvZXMgbWFrZSB0aGUgdGVzdHMgZ28gbW9yZVxuLy8gc3RhYmxlIG9uIHNsb3cgbmV0d29ya3MuXG5CdWZmZXJlZFNlbmRlci5wcm90b3R5cGUuc2VuZFNjaGVkdWxlV2FpdCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1Zygnc2VuZFNjaGVkdWxlV2FpdCcpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB0cmVmO1xuICB0aGlzLnNlbmRTdG9wID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ3NlbmRTdG9wJyk7XG4gICAgc2VsZi5zZW5kU3RvcCA9IG51bGw7XG4gICAgY2xlYXJUaW1lb3V0KHRyZWYpO1xuICB9O1xuICB0cmVmID0gc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICBkZWJ1ZygndGltZW91dCcpO1xuICAgIHNlbGYuc2VuZFN0b3AgPSBudWxsO1xuICAgIHNlbGYuc2VuZFNjaGVkdWxlKCk7XG4gIH0sIDI1KTtcbn07XG5cbkJ1ZmZlcmVkU2VuZGVyLnByb3RvdHlwZS5zZW5kU2NoZWR1bGUgPSBmdW5jdGlvbigpIHtcbiAgZGVidWcoJ3NlbmRTY2hlZHVsZScsIHRoaXMuc2VuZEJ1ZmZlci5sZW5ndGgpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIGlmICh0aGlzLnNlbmRCdWZmZXIubGVuZ3RoID4gMCkge1xuICAgIHZhciBwYXlsb2FkID0gJ1snICsgdGhpcy5zZW5kQnVmZmVyLmpvaW4oJywnKSArICddJztcbiAgICB0aGlzLnNlbmRTdG9wID0gdGhpcy5zZW5kZXIodGhpcy51cmwsIHBheWxvYWQsIGZ1bmN0aW9uKGVycikge1xuICAgICAgc2VsZi5zZW5kU3RvcCA9IG51bGw7XG4gICAgICBpZiAoZXJyKSB7XG4gICAgICAgIGRlYnVnKCdlcnJvcicsIGVycik7XG4gICAgICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBlcnIuY29kZSB8fCAxMDA2LCAnU2VuZGluZyBlcnJvcjogJyArIGVycik7XG4gICAgICAgIHNlbGYuX2NsZWFudXAoKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHNlbGYuc2VuZFNjaGVkdWxlV2FpdCgpO1xuICAgICAgfVxuICAgIH0pO1xuICAgIHRoaXMuc2VuZEJ1ZmZlciA9IFtdO1xuICB9XG59O1xuXG5CdWZmZXJlZFNlbmRlci5wcm90b3R5cGUuX2NsZWFudXAgPSBmdW5jdGlvbigpIHtcbiAgZGVidWcoJ19jbGVhbnVwJyk7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG59O1xuXG5CdWZmZXJlZFNlbmRlci5wcm90b3R5cGUuc3RvcCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1Zygnc3RvcCcpO1xuICB0aGlzLl9jbGVhbnVwKCk7XG4gIGlmICh0aGlzLnNlbmRTdG9wKSB7XG4gICAgdGhpcy5zZW5kU3RvcCgpO1xuICAgIHRoaXMuc2VuZFN0b3AgPSBudWxsO1xuICB9XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IEJ1ZmZlcmVkU2VuZGVyO1xuIl19
+},{"debug":54,"events":3,"inherits":57}],26:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var inherits = require('inherits')
+  , IframeTransport = require('../iframe')
+  , objectUtils = require('../../utils/object')
+  ;
+
+module.exports = function(transport) {
+
+  function IframeWrapTransport(transUrl, baseUrl) {
+    IframeTransport.call(this, transport.transportName, transUrl, baseUrl);
+  }
+
+  inherits(IframeWrapTransport, IframeTransport);
+
+  IframeWrapTransport.enabled = function(url, info) {
+    if (!global.document) {
+      return false;
+    }
+
+    var iframeInfo = objectUtils.extend({}, info);
+    iframeInfo.sameOrigin = true;
+    return transport.enabled(iframeInfo) && IframeTransport.enabled();
+  };
+
+  IframeWrapTransport.transportName = 'iframe-' + transport.transportName;
+  IframeWrapTransport.needBody = true;
+  IframeWrapTransport.roundTrips = IframeTransport.roundTrips + transport.roundTrips - 1; // html, javascript (2) + transport - no CORS (1)
+
+  IframeWrapTransport.facadeTransport = transport;
+
+  return IframeWrapTransport;
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL2lmcmFtZS13cmFwLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgSWZyYW1lVHJhbnNwb3J0ID0gcmVxdWlyZSgnLi4vaWZyYW1lJylcbiAgLCBvYmplY3RVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL29iamVjdCcpXG4gIDtcblxubW9kdWxlLmV4cG9ydHMgPSBmdW5jdGlvbih0cmFuc3BvcnQpIHtcblxuICBmdW5jdGlvbiBJZnJhbWVXcmFwVHJhbnNwb3J0KHRyYW5zVXJsLCBiYXNlVXJsKSB7XG4gICAgSWZyYW1lVHJhbnNwb3J0LmNhbGwodGhpcywgdHJhbnNwb3J0LnRyYW5zcG9ydE5hbWUsIHRyYW5zVXJsLCBiYXNlVXJsKTtcbiAgfVxuXG4gIGluaGVyaXRzKElmcmFtZVdyYXBUcmFuc3BvcnQsIElmcmFtZVRyYW5zcG9ydCk7XG5cbiAgSWZyYW1lV3JhcFRyYW5zcG9ydC5lbmFibGVkID0gZnVuY3Rpb24odXJsLCBpbmZvKSB7XG4gICAgaWYgKCFnbG9iYWwuZG9jdW1lbnQpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG5cbiAgICB2YXIgaWZyYW1lSW5mbyA9IG9iamVjdFV0aWxzLmV4dGVuZCh7fSwgaW5mbyk7XG4gICAgaWZyYW1lSW5mby5zYW1lT3JpZ2luID0gdHJ1ZTtcbiAgICByZXR1cm4gdHJhbnNwb3J0LmVuYWJsZWQoaWZyYW1lSW5mbykgJiYgSWZyYW1lVHJhbnNwb3J0LmVuYWJsZWQoKTtcbiAgfTtcblxuICBJZnJhbWVXcmFwVHJhbnNwb3J0LnRyYW5zcG9ydE5hbWUgPSAnaWZyYW1lLScgKyB0cmFuc3BvcnQudHJhbnNwb3J0TmFtZTtcbiAgSWZyYW1lV3JhcFRyYW5zcG9ydC5uZWVkQm9keSA9IHRydWU7XG4gIElmcmFtZVdyYXBUcmFuc3BvcnQucm91bmRUcmlwcyA9IElmcmFtZVRyYW5zcG9ydC5yb3VuZFRyaXBzICsgdHJhbnNwb3J0LnJvdW5kVHJpcHMgLSAxOyAvLyBodG1sLCBqYXZhc2NyaXB0ICgyKSArIHRyYW5zcG9ydCAtIG5vIENPUlMgKDEpXG5cbiAgSWZyYW1lV3JhcFRyYW5zcG9ydC5mYWNhZGVUcmFuc3BvcnQgPSB0cmFuc3BvcnQ7XG5cbiAgcmV0dXJuIElmcmFtZVdyYXBUcmFuc3BvcnQ7XG59O1xuIl19
+},{"../../utils/object":49,"../iframe":22,"inherits":57}],27:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:polling');
+}
+
+function Polling(Receiver, receiveUrl, AjaxObject) {
+  debug(receiveUrl);
+  EventEmitter.call(this);
+  this.Receiver = Receiver;
+  this.receiveUrl = receiveUrl;
+  this.AjaxObject = AjaxObject;
+  this._scheduleReceiver();
+}
+
+inherits(Polling, EventEmitter);
+
+Polling.prototype._scheduleReceiver = function() {
+  debug('_scheduleReceiver');
+  var self = this;
+  var poll = this.poll = new this.Receiver(this.receiveUrl, this.AjaxObject);
+
+  poll.on('message', function(msg) {
+    debug('message', msg);
+    self.emit('message', msg);
+  });
+
+  poll.once('close', function(code, reason) {
+    debug('close', code, reason, self.pollIsClosing);
+    self.poll = poll = null;
+
+    if (!self.pollIsClosing) {
+      if (reason === 'network') {
+        self._scheduleReceiver();
+      } else {
+        self.emit('close', code || 1006, reason);
+        self.removeAllListeners();
+      }
+    }
+  });
+};
+
+Polling.prototype.abort = function() {
+  debug('abort');
+  this.removeAllListeners();
+  this.pollIsClosing = true;
+  if (this.poll) {
+    this.poll.abort();
+  }
+};
+
+module.exports = Polling;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL3BvbGxpbmcuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnBvbGxpbmcnKTtcbn1cblxuZnVuY3Rpb24gUG9sbGluZyhSZWNlaXZlciwgcmVjZWl2ZVVybCwgQWpheE9iamVjdCkge1xuICBkZWJ1ZyhyZWNlaXZlVXJsKTtcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG4gIHRoaXMuUmVjZWl2ZXIgPSBSZWNlaXZlcjtcbiAgdGhpcy5yZWNlaXZlVXJsID0gcmVjZWl2ZVVybDtcbiAgdGhpcy5BamF4T2JqZWN0ID0gQWpheE9iamVjdDtcbiAgdGhpcy5fc2NoZWR1bGVSZWNlaXZlcigpO1xufVxuXG5pbmhlcml0cyhQb2xsaW5nLCBFdmVudEVtaXR0ZXIpO1xuXG5Qb2xsaW5nLnByb3RvdHlwZS5fc2NoZWR1bGVSZWNlaXZlciA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnX3NjaGVkdWxlUmVjZWl2ZXInKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICB2YXIgcG9sbCA9IHRoaXMucG9sbCA9IG5ldyB0aGlzLlJlY2VpdmVyKHRoaXMucmVjZWl2ZVVybCwgdGhpcy5BamF4T2JqZWN0KTtcblxuICBwb2xsLm9uKCdtZXNzYWdlJywgZnVuY3Rpb24obXNnKSB7XG4gICAgZGVidWcoJ21lc3NhZ2UnLCBtc2cpO1xuICAgIHNlbGYuZW1pdCgnbWVzc2FnZScsIG1zZyk7XG4gIH0pO1xuXG4gIHBvbGwub25jZSgnY2xvc2UnLCBmdW5jdGlvbihjb2RlLCByZWFzb24pIHtcbiAgICBkZWJ1ZygnY2xvc2UnLCBjb2RlLCByZWFzb24sIHNlbGYucG9sbElzQ2xvc2luZyk7XG4gICAgc2VsZi5wb2xsID0gcG9sbCA9IG51bGw7XG5cbiAgICBpZiAoIXNlbGYucG9sbElzQ2xvc2luZykge1xuICAgICAgaWYgKHJlYXNvbiA9PT0gJ25ldHdvcmsnKSB7XG4gICAgICAgIHNlbGYuX3NjaGVkdWxlUmVjZWl2ZXIoKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBjb2RlIHx8IDEwMDYsIHJlYXNvbik7XG4gICAgICAgIHNlbGYucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gICAgICB9XG4gICAgfVxuICB9KTtcbn07XG5cblBvbGxpbmcucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICB0aGlzLnJlbW92ZUFsbExpc3RlbmVycygpO1xuICB0aGlzLnBvbGxJc0Nsb3NpbmcgPSB0cnVlO1xuICBpZiAodGhpcy5wb2xsKSB7XG4gICAgdGhpcy5wb2xsLmFib3J0KCk7XG4gIH1cbn07XG5cbm1vZHVsZS5leHBvcnRzID0gUG9sbGluZztcbiJdfQ==
+},{"debug":54,"events":3,"inherits":57}],28:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , urlUtils = require('../../utils/url')
+  , BufferedSender = require('./buffered-sender')
+  , Polling = require('./polling')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:sender-receiver');
+}
+
+function SenderReceiver(transUrl, urlSuffix, senderFunc, Receiver, AjaxObject) {
+  var pollUrl = urlUtils.addPath(transUrl, urlSuffix);
+  debug(pollUrl);
+  var self = this;
+  BufferedSender.call(this, transUrl, senderFunc);
+
+  this.poll = new Polling(Receiver, pollUrl, AjaxObject);
+  this.poll.on('message', function(msg) {
+    debug('poll message', msg);
+    self.emit('message', msg);
+  });
+  this.poll.once('close', function(code, reason) {
+    debug('poll close', code, reason);
+    self.poll = null;
+    self.emit('close', code, reason);
+    self.close();
+  });
+}
+
+inherits(SenderReceiver, BufferedSender);
+
+SenderReceiver.prototype.close = function() {
+  debug('close');
+  this.removeAllListeners();
+  if (this.poll) {
+    this.poll.abort();
+    this.poll = null;
+  }
+  this.stop();
+};
+
+module.exports = SenderReceiver;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL3NlbmRlci1yZWNlaXZlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvdXJsJylcbiAgLCBCdWZmZXJlZFNlbmRlciA9IHJlcXVpcmUoJy4vYnVmZmVyZWQtc2VuZGVyJylcbiAgLCBQb2xsaW5nID0gcmVxdWlyZSgnLi9wb2xsaW5nJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnNlbmRlci1yZWNlaXZlcicpO1xufVxuXG5mdW5jdGlvbiBTZW5kZXJSZWNlaXZlcih0cmFuc1VybCwgdXJsU3VmZml4LCBzZW5kZXJGdW5jLCBSZWNlaXZlciwgQWpheE9iamVjdCkge1xuICB2YXIgcG9sbFVybCA9IHVybFV0aWxzLmFkZFBhdGgodHJhbnNVcmwsIHVybFN1ZmZpeCk7XG4gIGRlYnVnKHBvbGxVcmwpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIEJ1ZmZlcmVkU2VuZGVyLmNhbGwodGhpcywgdHJhbnNVcmwsIHNlbmRlckZ1bmMpO1xuXG4gIHRoaXMucG9sbCA9IG5ldyBQb2xsaW5nKFJlY2VpdmVyLCBwb2xsVXJsLCBBamF4T2JqZWN0KTtcbiAgdGhpcy5wb2xsLm9uKCdtZXNzYWdlJywgZnVuY3Rpb24obXNnKSB7XG4gICAgZGVidWcoJ3BvbGwgbWVzc2FnZScsIG1zZyk7XG4gICAgc2VsZi5lbWl0KCdtZXNzYWdlJywgbXNnKTtcbiAgfSk7XG4gIHRoaXMucG9sbC5vbmNlKCdjbG9zZScsIGZ1bmN0aW9uKGNvZGUsIHJlYXNvbikge1xuICAgIGRlYnVnKCdwb2xsIGNsb3NlJywgY29kZSwgcmVhc29uKTtcbiAgICBzZWxmLnBvbGwgPSBudWxsO1xuICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBjb2RlLCByZWFzb24pO1xuICAgIHNlbGYuY2xvc2UoKTtcbiAgfSk7XG59XG5cbmluaGVyaXRzKFNlbmRlclJlY2VpdmVyLCBCdWZmZXJlZFNlbmRlcik7XG5cblNlbmRlclJlY2VpdmVyLnByb3RvdHlwZS5jbG9zZSA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xvc2UnKTtcbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbiAgaWYgKHRoaXMucG9sbCkge1xuICAgIHRoaXMucG9sbC5hYm9ydCgpO1xuICAgIHRoaXMucG9sbCA9IG51bGw7XG4gIH1cbiAgdGhpcy5zdG9wKCk7XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IFNlbmRlclJlY2VpdmVyO1xuIl19
+},{"../../utils/url":52,"./buffered-sender":25,"./polling":27,"debug":54,"inherits":57}],29:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  , EventSourceDriver = require('eventsource')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:receiver:eventsource');
+}
+
+function EventSourceReceiver(url) {
+  debug(url);
+  EventEmitter.call(this);
+
+  var self = this;
+  var es = this.es = new EventSourceDriver(url);
+  es.onmessage = function(e) {
+    debug('message', e.data);
+    self.emit('message', decodeURI(e.data));
+  };
+  es.onerror = function(e) {
+    debug('error', es.readyState, e);
+    // ES on reconnection has readyState = 0 or 1.
+    // on network error it's CLOSED = 2
+    var reason = (es.readyState !== 2 ? 'network' : 'permanent');
+    self._cleanup();
+    self._close(reason);
+  };
+}
+
+inherits(EventSourceReceiver, EventEmitter);
+
+EventSourceReceiver.prototype.abort = function() {
+  debug('abort');
+  this._cleanup();
+  this._close('user');
+};
+
+EventSourceReceiver.prototype._cleanup = function() {
+  debug('cleanup');
+  var es = this.es;
+  if (es) {
+    es.onmessage = es.onerror = null;
+    es.close();
+    this.es = null;
+  }
+};
+
+EventSourceReceiver.prototype._close = function(reason) {
+  debug('close', reason);
+  var self = this;
+  // Safari and chrome < 15 crash if we close window before
+  // waiting for ES cleanup. See:
+  // https://code.google.com/p/chromium/issues/detail?id=89155
+  setTimeout(function() {
+    self.emit('close', null, reason);
+    self.removeAllListeners();
+  }, 200);
+};
+
+module.exports = EventSourceReceiver;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvcmVjZWl2ZXIvZXZlbnRzb3VyY2UuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgLCBFdmVudFNvdXJjZURyaXZlciA9IHJlcXVpcmUoJ2V2ZW50c291cmNlJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnJlY2VpdmVyOmV2ZW50c291cmNlJyk7XG59XG5cbmZ1bmN0aW9uIEV2ZW50U291cmNlUmVjZWl2ZXIodXJsKSB7XG4gIGRlYnVnKHVybCk7XG4gIEV2ZW50RW1pdHRlci5jYWxsKHRoaXMpO1xuXG4gIHZhciBzZWxmID0gdGhpcztcbiAgdmFyIGVzID0gdGhpcy5lcyA9IG5ldyBFdmVudFNvdXJjZURyaXZlcih1cmwpO1xuICBlcy5vbm1lc3NhZ2UgPSBmdW5jdGlvbihlKSB7XG4gICAgZGVidWcoJ21lc3NhZ2UnLCBlLmRhdGEpO1xuICAgIHNlbGYuZW1pdCgnbWVzc2FnZScsIGRlY29kZVVSSShlLmRhdGEpKTtcbiAgfTtcbiAgZXMub25lcnJvciA9IGZ1bmN0aW9uKGUpIHtcbiAgICBkZWJ1ZygnZXJyb3InLCBlcy5yZWFkeVN0YXRlLCBlKTtcbiAgICAvLyBFUyBvbiByZWNvbm5lY3Rpb24gaGFzIHJlYWR5U3RhdGUgPSAwIG9yIDEuXG4gICAgLy8gb24gbmV0d29yayBlcnJvciBpdCdzIENMT1NFRCA9IDJcbiAgICB2YXIgcmVhc29uID0gKGVzLnJlYWR5U3RhdGUgIT09IDIgPyAnbmV0d29yaycgOiAncGVybWFuZW50Jyk7XG4gICAgc2VsZi5fY2xlYW51cCgpO1xuICAgIHNlbGYuX2Nsb3NlKHJlYXNvbik7XG4gIH07XG59XG5cbmluaGVyaXRzKEV2ZW50U291cmNlUmVjZWl2ZXIsIEV2ZW50RW1pdHRlcik7XG5cbkV2ZW50U291cmNlUmVjZWl2ZXIucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICB0aGlzLl9jbGVhbnVwKCk7XG4gIHRoaXMuX2Nsb3NlKCd1c2VyJyk7XG59O1xuXG5FdmVudFNvdXJjZVJlY2VpdmVyLnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xlYW51cCcpO1xuICB2YXIgZXMgPSB0aGlzLmVzO1xuICBpZiAoZXMpIHtcbiAgICBlcy5vbm1lc3NhZ2UgPSBlcy5vbmVycm9yID0gbnVsbDtcbiAgICBlcy5jbG9zZSgpO1xuICAgIHRoaXMuZXMgPSBudWxsO1xuICB9XG59O1xuXG5FdmVudFNvdXJjZVJlY2VpdmVyLnByb3RvdHlwZS5fY2xvc2UgPSBmdW5jdGlvbihyZWFzb24pIHtcbiAgZGVidWcoJ2Nsb3NlJywgcmVhc29uKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICAvLyBTYWZhcmkgYW5kIGNocm9tZSA8IDE1IGNyYXNoIGlmIHdlIGNsb3NlIHdpbmRvdyBiZWZvcmVcbiAgLy8gd2FpdGluZyBmb3IgRVMgY2xlYW51cC4gU2VlOlxuICAvLyBodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9ODkxNTVcbiAgc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICBzZWxmLmVtaXQoJ2Nsb3NlJywgbnVsbCwgcmVhc29uKTtcbiAgICBzZWxmLnJlbW92ZUFsbExpc3RlbmVycygpO1xuICB9LCAyMDApO1xufTtcblxubW9kdWxlLmV4cG9ydHMgPSBFdmVudFNvdXJjZVJlY2VpdmVyO1xuIl19
+},{"debug":54,"events":3,"eventsource":18,"inherits":57}],30:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var inherits = require('inherits')
+  , iframeUtils = require('../../utils/iframe')
+  , urlUtils = require('../../utils/url')
+  , EventEmitter = require('events').EventEmitter
+  , random = require('../../utils/random')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:receiver:htmlfile');
+}
+
+function HtmlfileReceiver(url) {
+  debug(url);
+  EventEmitter.call(this);
+  var self = this;
+  iframeUtils.polluteGlobalNamespace();
+
+  this.id = 'a' + random.string(6);
+  url = urlUtils.addQuery(url, 'c=' + decodeURIComponent(iframeUtils.WPrefix + '.' + this.id));
+
+  debug('using htmlfile', HtmlfileReceiver.htmlfileEnabled);
+  var constructFunc = HtmlfileReceiver.htmlfileEnabled ?
+      iframeUtils.createHtmlfile : iframeUtils.createIframe;
+
+  global[iframeUtils.WPrefix][this.id] = {
+    start: function() {
+      debug('start');
+      self.iframeObj.loaded();
+    }
+  , message: function(data) {
+      debug('message', data);
+      self.emit('message', data);
+    }
+  , stop: function() {
+      debug('stop');
+      self._cleanup();
+      self._close('network');
+    }
+  };
+  this.iframeObj = constructFunc(url, function() {
+    debug('callback');
+    self._cleanup();
+    self._close('permanent');
+  });
+}
+
+inherits(HtmlfileReceiver, EventEmitter);
+
+HtmlfileReceiver.prototype.abort = function() {
+  debug('abort');
+  this._cleanup();
+  this._close('user');
+};
+
+HtmlfileReceiver.prototype._cleanup = function() {
+  debug('_cleanup');
+  if (this.iframeObj) {
+    this.iframeObj.cleanup();
+    this.iframeObj = null;
+  }
+  delete global[iframeUtils.WPrefix][this.id];
+};
+
+HtmlfileReceiver.prototype._close = function(reason) {
+  debug('_close', reason);
+  this.emit('close', null, reason);
+  this.removeAllListeners();
+};
+
+HtmlfileReceiver.htmlfileEnabled = false;
+
+// obfuscate to avoid firewalls
+var axo = ['Active'].concat('Object').join('X');
+if (axo in global) {
+  try {
+    HtmlfileReceiver.htmlfileEnabled = !!new global[axo]('htmlfile');
+  } catch (x) {
+    // intentionally empty
+  }
+}
+
+HtmlfileReceiver.enabled = HtmlfileReceiver.htmlfileEnabled || iframeUtils.iframeEnabled;
+
+module.exports = HtmlfileReceiver;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvcmVjZWl2ZXIvaHRtbGZpbGUuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBpZnJhbWVVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL2lmcmFtZScpXG4gICwgdXJsVXRpbHMgPSByZXF1aXJlKCcuLi8uLi91dGlscy91cmwnKVxuICAsIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIHJhbmRvbSA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL3JhbmRvbScpXG4gIDtcblxudmFyIGRlYnVnID0gZnVuY3Rpb24oKSB7fTtcbmlmIChwcm9jZXNzLmVudi5OT0RFX0VOViAhPT0gJ3Byb2R1Y3Rpb24nKSB7XG4gIGRlYnVnID0gcmVxdWlyZSgnZGVidWcnKSgnc29ja2pzLWNsaWVudDpyZWNlaXZlcjpodG1sZmlsZScpO1xufVxuXG5mdW5jdGlvbiBIdG1sZmlsZVJlY2VpdmVyKHVybCkge1xuICBkZWJ1Zyh1cmwpO1xuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICBpZnJhbWVVdGlscy5wb2xsdXRlR2xvYmFsTmFtZXNwYWNlKCk7XG5cbiAgdGhpcy5pZCA9ICdhJyArIHJhbmRvbS5zdHJpbmcoNik7XG4gIHVybCA9IHVybFV0aWxzLmFkZFF1ZXJ5KHVybCwgJ2M9JyArIGRlY29kZVVSSUNvbXBvbmVudChpZnJhbWVVdGlscy5XUHJlZml4ICsgJy4nICsgdGhpcy5pZCkpO1xuXG4gIGRlYnVnKCd1c2luZyBodG1sZmlsZScsIEh0bWxmaWxlUmVjZWl2ZXIuaHRtbGZpbGVFbmFibGVkKTtcbiAgdmFyIGNvbnN0cnVjdEZ1bmMgPSBIdG1sZmlsZVJlY2VpdmVyLmh0bWxmaWxlRW5hYmxlZCA/XG4gICAgICBpZnJhbWVVdGlscy5jcmVhdGVIdG1sZmlsZSA6IGlmcmFtZVV0aWxzLmNyZWF0ZUlmcmFtZTtcblxuICBnbG9iYWxbaWZyYW1lVXRpbHMuV1ByZWZpeF1bdGhpcy5pZF0gPSB7XG4gICAgc3RhcnQ6IGZ1bmN0aW9uKCkge1xuICAgICAgZGVidWcoJ3N0YXJ0Jyk7XG4gICAgICBzZWxmLmlmcmFtZU9iai5sb2FkZWQoKTtcbiAgICB9XG4gICwgbWVzc2FnZTogZnVuY3Rpb24oZGF0YSkge1xuICAgICAgZGVidWcoJ21lc3NhZ2UnLCBkYXRhKTtcbiAgICAgIHNlbGYuZW1pdCgnbWVzc2FnZScsIGRhdGEpO1xuICAgIH1cbiAgLCBzdG9wOiBmdW5jdGlvbigpIHtcbiAgICAgIGRlYnVnKCdzdG9wJyk7XG4gICAgICBzZWxmLl9jbGVhbnVwKCk7XG4gICAgICBzZWxmLl9jbG9zZSgnbmV0d29yaycpO1xuICAgIH1cbiAgfTtcbiAgdGhpcy5pZnJhbWVPYmogPSBjb25zdHJ1Y3RGdW5jKHVybCwgZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ2NhbGxiYWNrJyk7XG4gICAgc2VsZi5fY2xlYW51cCgpO1xuICAgIHNlbGYuX2Nsb3NlKCdwZXJtYW5lbnQnKTtcbiAgfSk7XG59XG5cbmluaGVyaXRzKEh0bWxmaWxlUmVjZWl2ZXIsIEV2ZW50RW1pdHRlcik7XG5cbkh0bWxmaWxlUmVjZWl2ZXIucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICB0aGlzLl9jbGVhbnVwKCk7XG4gIHRoaXMuX2Nsb3NlKCd1c2VyJyk7XG59O1xuXG5IdG1sZmlsZVJlY2VpdmVyLnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnX2NsZWFudXAnKTtcbiAgaWYgKHRoaXMuaWZyYW1lT2JqKSB7XG4gICAgdGhpcy5pZnJhbWVPYmouY2xlYW51cCgpO1xuICAgIHRoaXMuaWZyYW1lT2JqID0gbnVsbDtcbiAgfVxuICBkZWxldGUgZ2xvYmFsW2lmcmFtZVV0aWxzLldQcmVmaXhdW3RoaXMuaWRdO1xufTtcblxuSHRtbGZpbGVSZWNlaXZlci5wcm90b3R5cGUuX2Nsb3NlID0gZnVuY3Rpb24ocmVhc29uKSB7XG4gIGRlYnVnKCdfY2xvc2UnLCByZWFzb24pO1xuICB0aGlzLmVtaXQoJ2Nsb3NlJywgbnVsbCwgcmVhc29uKTtcbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbn07XG5cbkh0bWxmaWxlUmVjZWl2ZXIuaHRtbGZpbGVFbmFibGVkID0gZmFsc2U7XG5cbi8vIG9iZnVzY2F0ZSB0byBhdm9pZCBmaXJld2FsbHNcbnZhciBheG8gPSBbJ0FjdGl2ZSddLmNvbmNhdCgnT2JqZWN0Jykuam9pbignWCcpO1xuaWYgKGF4byBpbiBnbG9iYWwpIHtcbiAgdHJ5IHtcbiAgICBIdG1sZmlsZVJlY2VpdmVyLmh0bWxmaWxlRW5hYmxlZCA9ICEhbmV3IGdsb2JhbFtheG9dKCdodG1sZmlsZScpO1xuICB9IGNhdGNoICh4KSB7XG4gICAgLy8gaW50ZW50aW9uYWxseSBlbXB0eVxuICB9XG59XG5cbkh0bWxmaWxlUmVjZWl2ZXIuZW5hYmxlZCA9IEh0bWxmaWxlUmVjZWl2ZXIuaHRtbGZpbGVFbmFibGVkIHx8IGlmcmFtZVV0aWxzLmlmcmFtZUVuYWJsZWQ7XG5cbm1vZHVsZS5leHBvcnRzID0gSHRtbGZpbGVSZWNlaXZlcjtcbiJdfQ==
+},{"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,"debug":54,"events":3,"inherits":57}],31:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var utils = require('../../utils/iframe')
+  , random = require('../../utils/random')
+  , browser = require('../../utils/browser')
+  , urlUtils = require('../../utils/url')
+  , inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:receiver:jsonp');
+}
+
+function JsonpReceiver(url) {
+  debug(url);
+  var self = this;
+  EventEmitter.call(this);
+
+  utils.polluteGlobalNamespace();
+
+  this.id = 'a' + random.string(6);
+  var urlWithId = urlUtils.addQuery(url, 'c=' + encodeURIComponent(utils.WPrefix + '.' + this.id));
+
+  global[utils.WPrefix][this.id] = this._callback.bind(this);
+  this._createScript(urlWithId);
+
+  // Fallback mostly for Konqueror - stupid timer, 35 seconds shall be plenty.
+  this.timeoutId = setTimeout(function() {
+    debug('timeout');
+    self._abort(new Error('JSONP script loaded abnormally (timeout)'));
+  }, JsonpReceiver.timeout);
+}
+
+inherits(JsonpReceiver, EventEmitter);
+
+JsonpReceiver.prototype.abort = function() {
+  debug('abort');
+  if (global[utils.WPrefix][this.id]) {
+    var err = new Error('JSONP user aborted read');
+    err.code = 1000;
+    this._abort(err);
+  }
+};
+
+JsonpReceiver.timeout = 35000;
+JsonpReceiver.scriptErrorTimeout = 1000;
+
+JsonpReceiver.prototype._callback = function(data) {
+  debug('_callback', data);
+  this._cleanup();
+
+  if (this.aborting) {
+    return;
+  }
+
+  if (data) {
+    debug('message', data);
+    this.emit('message', data);
+  }
+  this.emit('close', null, 'network');
+  this.removeAllListeners();
+};
+
+JsonpReceiver.prototype._abort = function(err) {
+  debug('_abort', err);
+  this._cleanup();
+  this.aborting = true;
+  this.emit('close', err.code, err.message);
+  this.removeAllListeners();
+};
+
+JsonpReceiver.prototype._cleanup = function() {
+  debug('_cleanup');
+  clearTimeout(this.timeoutId);
+  if (this.script2) {
+    this.script2.parentNode.removeChild(this.script2);
+    this.script2 = null;
+  }
+  if (this.script) {
+    var script = this.script;
+    // Unfortunately, you can't really abort script loading of
+    // the script.
+    script.parentNode.removeChild(script);
+    script.onreadystatechange = script.onerror =
+        script.onload = script.onclick = null;
+    this.script = null;
+  }
+  delete global[utils.WPrefix][this.id];
+};
+
+JsonpReceiver.prototype._scriptError = function() {
+  debug('_scriptError');
+  var self = this;
+  if (this.errorTimer) {
+    return;
+  }
+
+  this.errorTimer = setTimeout(function() {
+    if (!self.loadedOkay) {
+      self._abort(new Error('JSONP script loaded abnormally (onerror)'));
+    }
+  }, JsonpReceiver.scriptErrorTimeout);
+};
+
+JsonpReceiver.prototype._createScript = function(url) {
+  debug('_createScript', url);
+  var self = this;
+  var script = this.script = global.document.createElement('script');
+  var script2;  // Opera synchronous load trick.
+
+  script.id = 'a' + random.string(8);
+  script.src = url;
+  script.type = 'text/javascript';
+  script.charset = 'UTF-8';
+  script.onerror = this._scriptError.bind(this);
+  script.onload = function() {
+    debug('onload');
+    self._abort(new Error('JSONP script loaded abnormally (onload)'));
+  };
+
+  // IE9 fires 'error' event after onreadystatechange or before, in random order.
+  // Use loadedOkay to determine if actually errored
+  script.onreadystatechange = function() {
+    debug('onreadystatechange', script.readyState);
+    if (/loaded|closed/.test(script.readyState)) {
+      if (script && script.htmlFor && script.onclick) {
+        self.loadedOkay = true;
+        try {
+          // In IE, actually execute the script.
+          script.onclick();
+        } catch (x) {
+          // intentionally empty
+        }
+      }
+      if (script) {
+        self._abort(new Error('JSONP script loaded abnormally (onreadystatechange)'));
+      }
+    }
+  };
+  // IE: event/htmlFor/onclick trick.
+  // One can't rely on proper order for onreadystatechange. In order to
+  // make sure, set a 'htmlFor' and 'event' properties, so that
+  // script code will be installed as 'onclick' handler for the
+  // script object. Later, onreadystatechange, manually execute this
+  // code. FF and Chrome doesn't work with 'event' and 'htmlFor'
+  // set. For reference see:
+  //   http://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html
+  // Also, read on that about script ordering:
+  //   http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order
+  if (typeof script.async === 'undefined' && global.document.attachEvent) {
+    // According to mozilla docs, in recent browsers script.async defaults
+    // to 'true', so we may use it to detect a good browser:
+    // https://developer.mozilla.org/en/HTML/Element/script
+    if (!browser.isOpera()) {
+      // Naively assume we're in IE
+      try {
+        script.htmlFor = script.id;
+        script.event = 'onclick';
+      } catch (x) {
+        // intentionally empty
+      }
+      script.async = true;
+    } else {
+      // Opera, second sync script hack
+      script2 = this.script2 = global.document.createElement('script');
+      script2.text = "try{var a = document.getElementById('" + script.id + "'); if(a)a.onerror();}catch(x){};";
+      script.async = script2.async = false;
+    }
+  }
+  if (typeof script.async !== 'undefined') {
+    script.async = true;
+  }
+
+  var head = global.document.getElementsByTagName('head')[0];
+  head.insertBefore(script, head.firstChild);
+  if (script2) {
+    head.insertBefore(script2, head.firstChild);
+  }
+};
+
+module.exports = JsonpReceiver;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/transport/receiver/jsonp.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar utils = require('../../utils/iframe')\n  , random = require('../../utils/random')\n  , browser = require('../../utils/browser')\n  , urlUtils = require('../../utils/url')\n  , inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:receiver:jsonp');\n}\n\nfunction JsonpReceiver(url) {\n  debug(url);\n  var self = this;\n  EventEmitter.call(this);\n\n  utils.polluteGlobalNamespace();\n\n  this.id = 'a' + random.string(6);\n  var urlWithId = urlUtils.addQuery(url, 'c=' + encodeURIComponent(utils.WPrefix + '.' + this.id));\n\n  global[utils.WPrefix][this.id] = this._callback.bind(this);\n  this._createScript(urlWithId);\n\n  // Fallback mostly for Konqueror - stupid timer, 35 seconds shall be plenty.\n  this.timeoutId = setTimeout(function() {\n    debug('timeout');\n    self._abort(new Error('JSONP script loaded abnormally (timeout)'));\n  }, JsonpReceiver.timeout);\n}\n\ninherits(JsonpReceiver, EventEmitter);\n\nJsonpReceiver.prototype.abort = function() {\n  debug('abort');\n  if (global[utils.WPrefix][this.id]) {\n    var err = new Error('JSONP user aborted read');\n    err.code = 1000;\n    this._abort(err);\n  }\n};\n\nJsonpReceiver.timeout = 35000;\nJsonpReceiver.scriptErrorTimeout = 1000;\n\nJsonpReceiver.prototype._callback = function(data) {\n  debug('_callback', data);\n  this._cleanup();\n\n  if (this.aborting) {\n    return;\n  }\n\n  if (data) {\n    debug('message', data);\n    this.emit('message', data);\n  }\n  this.emit('close', null, 'network');\n  this.removeAllListeners();\n};\n\nJsonpReceiver.prototype._abort = function(err) {\n  debug('_abort', err);\n  this._cleanup();\n  this.aborting = true;\n  this.emit('close', err.code, err.message);\n  this.removeAllListeners();\n};\n\nJsonpReceiver.prototype._cleanup = function() {\n  debug('_cleanup');\n  clearTimeout(this.timeoutId);\n  if (this.script2) {\n    this.script2.parentNode.removeChild(this.script2);\n    this.script2 = null;\n  }\n  if (this.script) {\n    var script = this.script;\n    // Unfortunately, you can't really abort script loading of\n    // the script.\n    script.parentNode.removeChild(script);\n    script.onreadystatechange = script.onerror =\n        script.onload = script.onclick = null;\n    this.script = null;\n  }\n  delete global[utils.WPrefix][this.id];\n};\n\nJsonpReceiver.prototype._scriptError = function() {\n  debug('_scriptError');\n  var self = this;\n  if (this.errorTimer) {\n    return;\n  }\n\n  this.errorTimer = setTimeout(function() {\n    if (!self.loadedOkay) {\n      self._abort(new Error('JSONP script loaded abnormally (onerror)'));\n    }\n  }, JsonpReceiver.scriptErrorTimeout);\n};\n\nJsonpReceiver.prototype._createScript = function(url) {\n  debug('_createScript', url);\n  var self = this;\n  var script = this.script = global.document.createElement('script');\n  var script2;  // Opera synchronous load trick.\n\n  script.id = 'a' + random.string(8);\n  script.src = url;\n  script.type = 'text/javascript';\n  script.charset = 'UTF-8';\n  script.onerror = this._scriptError.bind(this);\n  script.onload = function() {\n    debug('onload');\n    self._abort(new Error('JSONP script loaded abnormally (onload)'));\n  };\n\n  // IE9 fires 'error' event after onreadystatechange or before, in random order.\n  // Use loadedOkay to determine if actually errored\n  script.onreadystatechange = function() {\n    debug('onreadystatechange', script.readyState);\n    if (/loaded|closed/.test(script.readyState)) {\n      if (script && script.htmlFor && script.onclick) {\n        self.loadedOkay = true;\n        try {\n          // In IE, actually execute the script.\n          script.onclick();\n        } catch (x) {\n          // intentionally empty\n        }\n      }\n      if (script) {\n        self._abort(new Error('JSONP script loaded abnormally (onreadystatechange)'));\n      }\n    }\n  };\n  // IE: event/htmlFor/onclick trick.\n  // One can't rely on proper order for onreadystatechange. In order to\n  // make sure, set a 'htmlFor' and 'event' properties, so that\n  // script code will be installed as 'onclick' handler for the\n  // script object. Later, onreadystatechange, manually execute this\n  // code. FF and Chrome doesn't work with 'event' and 'htmlFor'\n  // set. For reference see:\n  //   http://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html\n  // Also, read on that about script ordering:\n  //   http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order\n  if (typeof script.async === 'undefined' && global.document.attachEvent) {\n    // According to mozilla docs, in recent browsers script.async defaults\n    // to 'true', so we may use it to detect a good browser:\n    // https://developer.mozilla.org/en/HTML/Element/script\n    if (!browser.isOpera()) {\n      // Naively assume we're in IE\n      try {\n        script.htmlFor = script.id;\n        script.event = 'onclick';\n      } catch (x) {\n        // intentionally empty\n      }\n      script.async = true;\n    } else {\n      // Opera, second sync script hack\n      script2 = this.script2 = global.document.createElement('script');\n      script2.text = \"try{var a = document.getElementById('\" + script.id + \"'); if(a)a.onerror();}catch(x){};\";\n      script.async = script2.async = false;\n    }\n  }\n  if (typeof script.async !== 'undefined') {\n    script.async = true;\n  }\n\n  var head = global.document.getElementsByTagName('head')[0];\n  head.insertBefore(script, head.firstChild);\n  if (script2) {\n    head.insertBefore(script2, head.firstChild);\n  }\n};\n\nmodule.exports = JsonpReceiver;\n"]}
+},{"../../utils/browser":44,"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,"debug":54,"events":3,"inherits":57}],32:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:receiver:xhr');
+}
+
+function XhrReceiver(url, AjaxObject) {
+  debug(url);
+  EventEmitter.call(this);
+  var self = this;
+
+  this.bufferPosition = 0;
+
+  this.xo = new AjaxObject('POST', url, null);
+  this.xo.on('chunk', this._chunkHandler.bind(this));
+  this.xo.once('finish', function(status, text) {
+    debug('finish', status, text);
+    self._chunkHandler(status, text);
+    self.xo = null;
+    var reason = status === 200 ? 'network' : 'permanent';
+    debug('close', reason);
+    self.emit('close', null, reason);
+    self._cleanup();
+  });
+}
+
+inherits(XhrReceiver, EventEmitter);
+
+XhrReceiver.prototype._chunkHandler = function(status, text) {
+  debug('_chunkHandler', status);
+  if (status !== 200 || !text) {
+    return;
+  }
+
+  for (var idx = -1; ; this.bufferPosition += idx + 1) {
+    var buf = text.slice(this.bufferPosition);
+    idx = buf.indexOf('\n');
+    if (idx === -1) {
+      break;
+    }
+    var msg = buf.slice(0, idx);
+    if (msg) {
+      debug('message', msg);
+      this.emit('message', msg);
+    }
+  }
+};
+
+XhrReceiver.prototype._cleanup = function() {
+  debug('_cleanup');
+  this.removeAllListeners();
+};
+
+XhrReceiver.prototype.abort = function() {
+  debug('abort');
+  if (this.xo) {
+    this.xo.close();
+    debug('close');
+    this.emit('close', null, 'user');
+    this.xo = null;
+  }
+  this._cleanup();
+};
+
+module.exports = XhrReceiver;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvcmVjZWl2ZXIveGhyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnJlY2VpdmVyOnhocicpO1xufVxuXG5mdW5jdGlvbiBYaHJSZWNlaXZlcih1cmwsIEFqYXhPYmplY3QpIHtcbiAgZGVidWcodXJsKTtcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG4gIHZhciBzZWxmID0gdGhpcztcblxuICB0aGlzLmJ1ZmZlclBvc2l0aW9uID0gMDtcblxuICB0aGlzLnhvID0gbmV3IEFqYXhPYmplY3QoJ1BPU1QnLCB1cmwsIG51bGwpO1xuICB0aGlzLnhvLm9uKCdjaHVuaycsIHRoaXMuX2NodW5rSGFuZGxlci5iaW5kKHRoaXMpKTtcbiAgdGhpcy54by5vbmNlKCdmaW5pc2gnLCBmdW5jdGlvbihzdGF0dXMsIHRleHQpIHtcbiAgICBkZWJ1ZygnZmluaXNoJywgc3RhdHVzLCB0ZXh0KTtcbiAgICBzZWxmLl9jaHVua0hhbmRsZXIoc3RhdHVzLCB0ZXh0KTtcbiAgICBzZWxmLnhvID0gbnVsbDtcbiAgICB2YXIgcmVhc29uID0gc3RhdHVzID09PSAyMDAgPyAnbmV0d29yaycgOiAncGVybWFuZW50JztcbiAgICBkZWJ1ZygnY2xvc2UnLCByZWFzb24pO1xuICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBudWxsLCByZWFzb24pO1xuICAgIHNlbGYuX2NsZWFudXAoKTtcbiAgfSk7XG59XG5cbmluaGVyaXRzKFhoclJlY2VpdmVyLCBFdmVudEVtaXR0ZXIpO1xuXG5YaHJSZWNlaXZlci5wcm90b3R5cGUuX2NodW5rSGFuZGxlciA9IGZ1bmN0aW9uKHN0YXR1cywgdGV4dCkge1xuICBkZWJ1ZygnX2NodW5rSGFuZGxlcicsIHN0YXR1cyk7XG4gIGlmIChzdGF0dXMgIT09IDIwMCB8fCAhdGV4dCkge1xuICAgIHJldHVybjtcbiAgfVxuXG4gIGZvciAodmFyIGlkeCA9IC0xOyA7IHRoaXMuYnVmZmVyUG9zaXRpb24gKz0gaWR4ICsgMSkge1xuICAgIHZhciBidWYgPSB0ZXh0LnNsaWNlKHRoaXMuYnVmZmVyUG9zaXRpb24pO1xuICAgIGlkeCA9IGJ1Zi5pbmRleE9mKCdcXG4nKTtcbiAgICBpZiAoaWR4ID09PSAtMSkge1xuICAgICAgYnJlYWs7XG4gICAgfVxuICAgIHZhciBtc2cgPSBidWYuc2xpY2UoMCwgaWR4KTtcbiAgICBpZiAobXNnKSB7XG4gICAgICBkZWJ1ZygnbWVzc2FnZScsIG1zZyk7XG4gICAgICB0aGlzLmVtaXQoJ21lc3NhZ2UnLCBtc2cpO1xuICAgIH1cbiAgfVxufTtcblxuWGhyUmVjZWl2ZXIucHJvdG90eXBlLl9jbGVhbnVwID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdfY2xlYW51cCcpO1xuICB0aGlzLnJlbW92ZUFsbExpc3RlbmVycygpO1xufTtcblxuWGhyUmVjZWl2ZXIucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICBpZiAodGhpcy54bykge1xuICAgIHRoaXMueG8uY2xvc2UoKTtcbiAgICBkZWJ1ZygnY2xvc2UnKTtcbiAgICB0aGlzLmVtaXQoJ2Nsb3NlJywgbnVsbCwgJ3VzZXInKTtcbiAgICB0aGlzLnhvID0gbnVsbDtcbiAgfVxuICB0aGlzLl9jbGVhbnVwKCk7XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IFhoclJlY2VpdmVyO1xuIl19
+},{"debug":54,"events":3,"inherits":57}],33:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var random = require('../../utils/random')
+  , urlUtils = require('../../utils/url')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:sender:jsonp');
+}
+
+var form, area;
+
+function createIframe(id) {
+  debug('createIframe', id);
+  try {
+    // ie6 dynamic iframes with target="" support (thanks Chris Lambacher)
+    return global.document.createElement('<iframe name="' + id + '">');
+  } catch (x) {
+    var iframe = global.document.createElement('iframe');
+    iframe.name = id;
+    return iframe;
+  }
+}
+
+function createForm() {
+  debug('createForm');
+  form = global.document.createElement('form');
+  form.style.display = 'none';
+  form.style.position = 'absolute';
+  form.method = 'POST';
+  form.enctype = 'application/x-www-form-urlencoded';
+  form.acceptCharset = 'UTF-8';
+
+  area = global.document.createElement('textarea');
+  area.name = 'd';
+  form.appendChild(area);
+
+  global.document.body.appendChild(form);
+}
+
+module.exports = function(url, payload, callback) {
+  debug(url, payload);
+  if (!form) {
+    createForm();
+  }
+  var id = 'a' + random.string(8);
+  form.target = id;
+  form.action = urlUtils.addQuery(urlUtils.addPath(url, '/jsonp_send'), 'i=' + id);
+
+  var iframe = createIframe(id);
+  iframe.id = id;
+  iframe.style.display = 'none';
+  form.appendChild(iframe);
+
+  try {
+    area.value = payload;
+  } catch (e) {
+    // seriously broken browsers get here
+  }
+  form.submit();
+
+  var completed = function(err) {
+    debug('completed', id, err);
+    if (!iframe.onerror) {
+      return;
+    }
+    iframe.onreadystatechange = iframe.onerror = iframe.onload = null;
+    // Opera mini doesn't like if we GC iframe
+    // immediately, thus this timeout.
+    setTimeout(function() {
+      debug('cleaning up', id);
+      iframe.parentNode.removeChild(iframe);
+      iframe = null;
+    }, 500);
+    area.value = '';
+    // It is not possible to detect if the iframe succeeded or
+    // failed to submit our form.
+    callback(err);
+  };
+  iframe.onerror = function() {
+    debug('onerror', id);
+    completed();
+  };
+  iframe.onload = function() {
+    debug('onload', id);
+    completed();
+  };
+  iframe.onreadystatechange = function(e) {
+    debug('onreadystatechange', id, iframe.readyState, e);
+    if (iframe.readyState === 'complete') {
+      completed();
+    }
+  };
+  return function() {
+    debug('aborted', id);
+    completed(new Error('Aborted'));
+  };
+};
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvc2VuZGVyL2pzb25wLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgcmFuZG9tID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvcmFuZG9tJylcbiAgLCB1cmxVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL3VybCcpXG4gIDtcblxudmFyIGRlYnVnID0gZnVuY3Rpb24oKSB7fTtcbmlmIChwcm9jZXNzLmVudi5OT0RFX0VOViAhPT0gJ3Byb2R1Y3Rpb24nKSB7XG4gIGRlYnVnID0gcmVxdWlyZSgnZGVidWcnKSgnc29ja2pzLWNsaWVudDpzZW5kZXI6anNvbnAnKTtcbn1cblxudmFyIGZvcm0sIGFyZWE7XG5cbmZ1bmN0aW9uIGNyZWF0ZUlmcmFtZShpZCkge1xuICBkZWJ1ZygnY3JlYXRlSWZyYW1lJywgaWQpO1xuICB0cnkge1xuICAgIC8vIGllNiBkeW5hbWljIGlmcmFtZXMgd2l0aCB0YXJnZXQ9XCJcIiBzdXBwb3J0ICh0aGFua3MgQ2hyaXMgTGFtYmFjaGVyKVxuICAgIHJldHVybiBnbG9iYWwuZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnPGlmcmFtZSBuYW1lPVwiJyArIGlkICsgJ1wiPicpO1xuICB9IGNhdGNoICh4KSB7XG4gICAgdmFyIGlmcmFtZSA9IGdsb2JhbC5kb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJhbWUnKTtcbiAgICBpZnJhbWUubmFtZSA9IGlkO1xuICAgIHJldHVybiBpZnJhbWU7XG4gIH1cbn1cblxuZnVuY3Rpb24gY3JlYXRlRm9ybSgpIHtcbiAgZGVidWcoJ2NyZWF0ZUZvcm0nKTtcbiAgZm9ybSA9IGdsb2JhbC5kb2N1bWVudC5jcmVhdGVFbGVtZW50KCdmb3JtJyk7XG4gIGZvcm0uc3R5bGUuZGlzcGxheSA9ICdub25lJztcbiAgZm9ybS5zdHlsZS5wb3NpdGlvbiA9ICdhYnNvbHV0ZSc7XG4gIGZvcm0ubWV0aG9kID0gJ1BPU1QnO1xuICBmb3JtLmVuY3R5cGUgPSAnYXBwbGljYXRpb24veC13d3ctZm9ybS11cmxlbmNvZGVkJztcbiAgZm9ybS5hY2NlcHRDaGFyc2V0ID0gJ1VURi04JztcblxuICBhcmVhID0gZ2xvYmFsLmRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3RleHRhcmVhJyk7XG4gIGFyZWEubmFtZSA9ICdkJztcbiAgZm9ybS5hcHBlbmRDaGlsZChhcmVhKTtcblxuICBnbG9iYWwuZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChmb3JtKTtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBmdW5jdGlvbih1cmwsIHBheWxvYWQsIGNhbGxiYWNrKSB7XG4gIGRlYnVnKHVybCwgcGF5bG9hZCk7XG4gIGlmICghZm9ybSkge1xuICAgIGNyZWF0ZUZvcm0oKTtcbiAgfVxuICB2YXIgaWQgPSAnYScgKyByYW5kb20uc3RyaW5nKDgpO1xuICBmb3JtLnRhcmdldCA9IGlkO1xuICBmb3JtLmFjdGlvbiA9IHVybFV0aWxzLmFkZFF1ZXJ5KHVybFV0aWxzLmFkZFBhdGgodXJsLCAnL2pzb25wX3NlbmQnKSwgJ2k9JyArIGlkKTtcblxuICB2YXIgaWZyYW1lID0gY3JlYXRlSWZyYW1lKGlkKTtcbiAgaWZyYW1lLmlkID0gaWQ7XG4gIGlmcmFtZS5zdHlsZS5kaXNwbGF5ID0gJ25vbmUnO1xuICBmb3JtLmFwcGVuZENoaWxkKGlmcmFtZSk7XG5cbiAgdHJ5IHtcbiAgICBhcmVhLnZhbHVlID0gcGF5bG9hZDtcbiAgfSBjYXRjaCAoZSkge1xuICAgIC8vIHNlcmlvdXNseSBicm9rZW4gYnJvd3NlcnMgZ2V0IGhlcmVcbiAgfVxuICBmb3JtLnN1Ym1pdCgpO1xuXG4gIHZhciBjb21wbGV0ZWQgPSBmdW5jdGlvbihlcnIpIHtcbiAgICBkZWJ1ZygnY29tcGxldGVkJywgaWQsIGVycik7XG4gICAgaWYgKCFpZnJhbWUub25lcnJvcikge1xuICAgICAgcmV0dXJuO1xuICAgIH1cbiAgICBpZnJhbWUub25yZWFkeXN0YXRlY2hhbmdlID0gaWZyYW1lLm9uZXJyb3IgPSBpZnJhbWUub25sb2FkID0gbnVsbDtcbiAgICAvLyBPcGVyYSBtaW5pIGRvZXNuJ3QgbGlrZSBpZiB3ZSBHQyBpZnJhbWVcbiAgICAvLyBpbW1lZGlhdGVseSwgdGh1cyB0aGlzIHRpbWVvdXQuXG4gICAgc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICAgIGRlYnVnKCdjbGVhbmluZyB1cCcsIGlkKTtcbiAgICAgIGlmcmFtZS5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKGlmcmFtZSk7XG4gICAgICBpZnJhbWUgPSBudWxsO1xuICAgIH0sIDUwMCk7XG4gICAgYXJlYS52YWx1ZSA9ICcnO1xuICAgIC8vIEl0IGlzIG5vdCBwb3NzaWJsZSB0byBkZXRlY3QgaWYgdGhlIGlmcmFtZSBzdWNjZWVkZWQgb3JcbiAgICAvLyBmYWlsZWQgdG8gc3VibWl0IG91ciBmb3JtLlxuICAgIGNhbGxiYWNrKGVycik7XG4gIH07XG4gIGlmcmFtZS5vbmVycm9yID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ29uZXJyb3InLCBpZCk7XG4gICAgY29tcGxldGVkKCk7XG4gIH07XG4gIGlmcmFtZS5vbmxvYWQgPSBmdW5jdGlvbigpIHtcbiAgICBkZWJ1Zygnb25sb2FkJywgaWQpO1xuICAgIGNvbXBsZXRlZCgpO1xuICB9O1xuICBpZnJhbWUub25yZWFkeXN0YXRlY2hhbmdlID0gZnVuY3Rpb24oZSkge1xuICAgIGRlYnVnKCdvbnJlYWR5c3RhdGVjaGFuZ2UnLCBpZCwgaWZyYW1lLnJlYWR5U3RhdGUsIGUpO1xuICAgIGlmIChpZnJhbWUucmVhZHlTdGF0ZSA9PT0gJ2NvbXBsZXRlJykge1xuICAgICAgY29tcGxldGVkKCk7XG4gICAgfVxuICB9O1xuICByZXR1cm4gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ2Fib3J0ZWQnLCBpZCk7XG4gICAgY29tcGxldGVkKG5ldyBFcnJvcignQWJvcnRlZCcpKTtcbiAgfTtcbn07XG4iXX0=
+},{"../../utils/random":50,"../../utils/url":52,"debug":54}],34:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  , eventUtils = require('../../utils/event')
+  , browser = require('../../utils/browser')
+  , urlUtils = require('../../utils/url')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:sender:xdr');
+}
+
+// References:
+//   http://ajaxian.com/archives/100-line-ajax-wrapper
+//   http://msdn.microsoft.com/en-us/library/cc288060(v=VS.85).aspx
+
+function XDRObject(method, url, payload) {
+  debug(method, url);
+  var self = this;
+  EventEmitter.call(this);
+
+  setTimeout(function() {
+    self._start(method, url, payload);
+  }, 0);
+}
+
+inherits(XDRObject, EventEmitter);
+
+XDRObject.prototype._start = function(method, url, payload) {
+  debug('_start');
+  var self = this;
+  var xdr = new global.XDomainRequest();
+  // IE caches even POSTs
+  url = urlUtils.addQuery(url, 't=' + (+new Date()));
+
+  xdr.onerror = function() {
+    debug('onerror');
+    self._error();
+  };
+  xdr.ontimeout = function() {
+    debug('ontimeout');
+    self._error();
+  };
+  xdr.onprogress = function() {
+    debug('progress', xdr.responseText);
+    self.emit('chunk', 200, xdr.responseText);
+  };
+  xdr.onload = function() {
+    debug('load');
+    self.emit('finish', 200, xdr.responseText);
+    self._cleanup(false);
+  };
+  this.xdr = xdr;
+  this.unloadRef = eventUtils.unloadAdd(function() {
+    self._cleanup(true);
+  });
+  try {
+    // Fails with AccessDenied if port number is bogus
+    this.xdr.open(method, url);
+    if (this.timeout) {
+      this.xdr.timeout = this.timeout;
+    }
+    this.xdr.send(payload);
+  } catch (x) {
+    this._error();
+  }
+};
+
+XDRObject.prototype._error = function() {
+  this.emit('finish', 0, '');
+  this._cleanup(false);
+};
+
+XDRObject.prototype._cleanup = function(abort) {
+  debug('cleanup', abort);
+  if (!this.xdr) {
+    return;
+  }
+  this.removeAllListeners();
+  eventUtils.unloadDel(this.unloadRef);
+
+  this.xdr.ontimeout = this.xdr.onerror = this.xdr.onprogress = this.xdr.onload = null;
+  if (abort) {
+    try {
+      this.xdr.abort();
+    } catch (x) {
+      // intentionally empty
+    }
+  }
+  this.unloadRef = this.xdr = null;
+};
+
+XDRObject.prototype.close = function() {
+  debug('close');
+  this._cleanup(true);
+};
+
+// IE 8/9 if the request target uses the same scheme - #79
+XDRObject.enabled = !!(global.XDomainRequest && browser.hasDomain());
+
+module.exports = XDRObject;
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvc2VuZGVyL3hkci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgRXZlbnRFbWl0dGVyID0gcmVxdWlyZSgnZXZlbnRzJykuRXZlbnRFbWl0dGVyXG4gICwgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgZXZlbnRVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL2V2ZW50JylcbiAgLCBicm93c2VyID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvYnJvd3NlcicpXG4gICwgdXJsVXRpbHMgPSByZXF1aXJlKCcuLi8uLi91dGlscy91cmwnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6c2VuZGVyOnhkcicpO1xufVxuXG4vLyBSZWZlcmVuY2VzOlxuLy8gICBodHRwOi8vYWpheGlhbi5jb20vYXJjaGl2ZXMvMTAwLWxpbmUtYWpheC13cmFwcGVyXG4vLyAgIGh0dHA6Ly9tc2RuLm1pY3Jvc29mdC5jb20vZW4tdXMvbGlicmFyeS9jYzI4ODA2MCh2PVZTLjg1KS5hc3B4XG5cbmZ1bmN0aW9uIFhEUk9iamVjdChtZXRob2QsIHVybCwgcGF5bG9hZCkge1xuICBkZWJ1ZyhtZXRob2QsIHVybCk7XG4gIHZhciBzZWxmID0gdGhpcztcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG5cbiAgc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICBzZWxmLl9zdGFydChtZXRob2QsIHVybCwgcGF5bG9hZCk7XG4gIH0sIDApO1xufVxuXG5pbmhlcml0cyhYRFJPYmplY3QsIEV2ZW50RW1pdHRlcik7XG5cblhEUk9iamVjdC5wcm90b3R5cGUuX3N0YXJ0ID0gZnVuY3Rpb24obWV0aG9kLCB1cmwsIHBheWxvYWQpIHtcbiAgZGVidWcoJ19zdGFydCcpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB4ZHIgPSBuZXcgZ2xvYmFsLlhEb21haW5SZXF1ZXN0KCk7XG4gIC8vIElFIGNhY2hlcyBldmVuIFBPU1RzXG4gIHVybCA9IHVybFV0aWxzLmFkZFF1ZXJ5KHVybCwgJ3Q9JyArICgrbmV3IERhdGUoKSkpO1xuXG4gIHhkci5vbmVycm9yID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ29uZXJyb3InKTtcbiAgICBzZWxmLl9lcnJvcigpO1xuICB9O1xuICB4ZHIub250aW1lb3V0ID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ29udGltZW91dCcpO1xuICAgIHNlbGYuX2Vycm9yKCk7XG4gIH07XG4gIHhkci5vbnByb2dyZXNzID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ3Byb2dyZXNzJywgeGRyLnJlc3BvbnNlVGV4dCk7XG4gICAgc2VsZi5lbWl0KCdjaHVuaycsIDIwMCwgeGRyLnJlc3BvbnNlVGV4dCk7XG4gIH07XG4gIHhkci5vbmxvYWQgPSBmdW5jdGlvbigpIHtcbiAgICBkZWJ1ZygnbG9hZCcpO1xuICAgIHNlbGYuZW1pdCgnZmluaXNoJywgMjAwLCB4ZHIucmVzcG9uc2VUZXh0KTtcbiAgICBzZWxmLl9jbGVhbnVwKGZhbHNlKTtcbiAgfTtcbiAgdGhpcy54ZHIgPSB4ZHI7XG4gIHRoaXMudW5sb2FkUmVmID0gZXZlbnRVdGlscy51bmxvYWRBZGQoZnVuY3Rpb24oKSB7XG4gICAgc2VsZi5fY2xlYW51cCh0cnVlKTtcbiAgfSk7XG4gIHRyeSB7XG4gICAgLy8gRmFpbHMgd2l0aCBBY2Nlc3NEZW5pZWQgaWYgcG9ydCBudW1iZXIgaXMgYm9ndXNcbiAgICB0aGlzLnhkci5vcGVuKG1ldGhvZCwgdXJsKTtcbiAgICBpZiAodGhpcy50aW1lb3V0KSB7XG4gICAgICB0aGlzLnhkci50aW1lb3V0ID0gdGhpcy50aW1lb3V0O1xuICAgIH1cbiAgICB0aGlzLnhkci5zZW5kKHBheWxvYWQpO1xuICB9IGNhdGNoICh4KSB7XG4gICAgdGhpcy5fZXJyb3IoKTtcbiAgfVxufTtcblxuWERST2JqZWN0LnByb3RvdHlwZS5fZXJyb3IgPSBmdW5jdGlvbigpIHtcbiAgdGhpcy5lbWl0KCdmaW5pc2gnLCAwLCAnJyk7XG4gIHRoaXMuX2NsZWFudXAoZmFsc2UpO1xufTtcblxuWERST2JqZWN0LnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKGFib3J0KSB7XG4gIGRlYnVnKCdjbGVhbnVwJywgYWJvcnQpO1xuICBpZiAoIXRoaXMueGRyKSB7XG4gICAgcmV0dXJuO1xuICB9XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIGV2ZW50VXRpbHMudW5sb2FkRGVsKHRoaXMudW5sb2FkUmVmKTtcblxuICB0aGlzLnhkci5vbnRpbWVvdXQgPSB0aGlzLnhkci5vbmVycm9yID0gdGhpcy54ZHIub25wcm9ncmVzcyA9IHRoaXMueGRyLm9ubG9hZCA9IG51bGw7XG4gIGlmIChhYm9ydCkge1xuICAgIHRyeSB7XG4gICAgICB0aGlzLnhkci5hYm9ydCgpO1xuICAgIH0gY2F0Y2ggKHgpIHtcbiAgICAgIC8vIGludGVudGlvbmFsbHkgZW1wdHlcbiAgICB9XG4gIH1cbiAgdGhpcy51bmxvYWRSZWYgPSB0aGlzLnhkciA9IG51bGw7XG59O1xuXG5YRFJPYmplY3QucHJvdG90eXBlLmNsb3NlID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdjbG9zZScpO1xuICB0aGlzLl9jbGVhbnVwKHRydWUpO1xufTtcblxuLy8gSUUgOC85IGlmIHRoZSByZXF1ZXN0IHRhcmdldCB1c2VzIHRoZSBzYW1lIHNjaGVtZSAtICM3OVxuWERST2JqZWN0LmVuYWJsZWQgPSAhIShnbG9iYWwuWERvbWFpblJlcXVlc3QgJiYgYnJvd3Nlci5oYXNEb21haW4oKSk7XG5cbm1vZHVsZS5leHBvcnRzID0gWERST2JqZWN0O1xuIl19
+},{"../../utils/browser":44,"../../utils/event":46,"../../utils/url":52,"debug":54,"events":3,"inherits":57}],35:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , XhrDriver = require('../driver/xhr')
+  ;
+
+function XHRCorsObject(method, url, payload, opts) {
+  XhrDriver.call(this, method, url, payload, opts);
+}
+
+inherits(XHRCorsObject, XhrDriver);
+
+XHRCorsObject.enabled = XhrDriver.enabled && XhrDriver.supportsCORS;
+
+module.exports = XHRCorsObject;
+
+},{"../driver/xhr":17,"inherits":57}],36:[function(require,module,exports){
+'use strict';
+
+var EventEmitter = require('events').EventEmitter
+  , inherits = require('inherits')
+  ;
+
+function XHRFake(/* method, url, payload, opts */) {
+  var self = this;
+  EventEmitter.call(this);
+
+  this.to = setTimeout(function() {
+    self.emit('finish', 200, '{}');
+  }, XHRFake.timeout);
+}
+
+inherits(XHRFake, EventEmitter);
+
+XHRFake.prototype.close = function() {
+  clearTimeout(this.to);
+};
+
+XHRFake.timeout = 2000;
+
+module.exports = XHRFake;
+
+},{"events":3,"inherits":57}],37:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , XhrDriver = require('../driver/xhr')
+  ;
+
+function XHRLocalObject(method, url, payload /*, opts */) {
+  XhrDriver.call(this, method, url, payload, {
+    noCredentials: true
+  });
+}
+
+inherits(XHRLocalObject, XhrDriver);
+
+XHRLocalObject.enabled = XhrDriver.enabled;
+
+module.exports = XHRLocalObject;
+
+},{"../driver/xhr":17,"inherits":57}],38:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var utils = require('../utils/event')
+  , urlUtils = require('../utils/url')
+  , inherits = require('inherits')
+  , EventEmitter = require('events').EventEmitter
+  , WebsocketDriver = require('./driver/websocket')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:websocket');
+}
+
+function WebSocketTransport(transUrl, ignore, options) {
+  if (!WebSocketTransport.enabled()) {
+    throw new Error('Transport created when disabled');
+  }
+
+  EventEmitter.call(this);
+  debug('constructor', transUrl);
+
+  var self = this;
+  var url = urlUtils.addPath(transUrl, '/websocket');
+  if (url.slice(0, 5) === 'https') {
+    url = 'wss' + url.slice(5);
+  } else {
+    url = 'ws' + url.slice(4);
+  }
+  this.url = url;
+
+  this.ws = new WebsocketDriver(this.url, [], options);
+  this.ws.onmessage = function(e) {
+    debug('message event', e.data);
+    self.emit('message', e.data);
+  };
+  // Firefox has an interesting bug. If a websocket connection is
+  // created after onunload, it stays alive even when user
+  // navigates away from the page. In such situation let's lie -
+  // let's not open the ws connection at all. See:
+  // https://github.com/sockjs/sockjs-client/issues/28
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=696085
+  this.unloadRef = utils.unloadAdd(function() {
+    debug('unload');
+    self.ws.close();
+  });
+  this.ws.onclose = function(e) {
+    debug('close event', e.code, e.reason);
+    self.emit('close', e.code, e.reason);
+    self._cleanup();
+  };
+  this.ws.onerror = function(e) {
+    debug('error event', e);
+    self.emit('close', 1006, 'WebSocket connection broken');
+    self._cleanup();
+  };
+}
+
+inherits(WebSocketTransport, EventEmitter);
+
+WebSocketTransport.prototype.send = function(data) {
+  var msg = '[' + data + ']';
+  debug('send', msg);
+  this.ws.send(msg);
+};
+
+WebSocketTransport.prototype.close = function() {
+  debug('close');
+  if (this.ws) {
+    this.ws.close();
+  }
+  this._cleanup();
+};
+
+WebSocketTransport.prototype._cleanup = function() {
+  debug('_cleanup');
+  var ws = this.ws;
+  if (ws) {
+    ws.onmessage = ws.onclose = ws.onerror = null;
+  }
+  utils.unloadDel(this.unloadRef);
+  this.unloadRef = this.ws = null;
+  this.removeAllListeners();
+};
+
+WebSocketTransport.enabled = function() {
+  debug('enabled');
+  return !!WebsocketDriver;
+};
+WebSocketTransport.transportName = 'websocket';
+
+// In theory, ws should require 1 round trip. But in chrome, this is
+// not very stable over SSL. Most likely a ws connection requires a
+// separate SSL connection, in which case 2 round trips are an
+// absolute minumum.
+WebSocketTransport.roundTrips = 2;
+
+module.exports = WebSocketTransport;
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvd2Vic29ja2V0LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIHV0aWxzID0gcmVxdWlyZSgnLi4vdXRpbHMvZXZlbnQnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vdXRpbHMvdXJsJylcbiAgLCBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgLCBXZWJzb2NrZXREcml2ZXIgPSByZXF1aXJlKCcuL2RyaXZlci93ZWJzb2NrZXQnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6d2Vic29ja2V0Jyk7XG59XG5cbmZ1bmN0aW9uIFdlYlNvY2tldFRyYW5zcG9ydCh0cmFuc1VybCwgaWdub3JlLCBvcHRpb25zKSB7XG4gIGlmICghV2ViU29ja2V0VHJhbnNwb3J0LmVuYWJsZWQoKSkge1xuICAgIHRocm93IG5ldyBFcnJvcignVHJhbnNwb3J0IGNyZWF0ZWQgd2hlbiBkaXNhYmxlZCcpO1xuICB9XG5cbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG4gIGRlYnVnKCdjb25zdHJ1Y3RvcicsIHRyYW5zVXJsKTtcblxuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB1cmwgPSB1cmxVdGlscy5hZGRQYXRoKHRyYW5zVXJsLCAnL3dlYnNvY2tldCcpO1xuICBpZiAodXJsLnNsaWNlKDAsIDUpID09PSAnaHR0cHMnKSB7XG4gICAgdXJsID0gJ3dzcycgKyB1cmwuc2xpY2UoNSk7XG4gIH0gZWxzZSB7XG4gICAgdXJsID0gJ3dzJyArIHVybC5zbGljZSg0KTtcbiAgfVxuICB0aGlzLnVybCA9IHVybDtcblxuICB0aGlzLndzID0gbmV3IFdlYnNvY2tldERyaXZlcih0aGlzLnVybCwgW10sIG9wdGlvbnMpO1xuICB0aGlzLndzLm9ubWVzc2FnZSA9IGZ1bmN0aW9uKGUpIHtcbiAgICBkZWJ1ZygnbWVzc2FnZSBldmVudCcsIGUuZGF0YSk7XG4gICAgc2VsZi5lbWl0KCdtZXNzYWdlJywgZS5kYXRhKTtcbiAgfTtcbiAgLy8gRmlyZWZveCBoYXMgYW4gaW50ZXJlc3RpbmcgYnVnLiBJZiBhIHdlYnNvY2tldCBjb25uZWN0aW9uIGlzXG4gIC8vIGNyZWF0ZWQgYWZ0ZXIgb251bmxvYWQsIGl0IHN0YXlzIGFsaXZlIGV2ZW4gd2hlbiB1c2VyXG4gIC8vIG5hdmlnYXRlcyBhd2F5IGZyb20gdGhlIHBhZ2UuIEluIHN1Y2ggc2l0dWF0aW9uIGxldCdzIGxpZSAtXG4gIC8vIGxldCdzIG5vdCBvcGVuIHRoZSB3cyBjb25uZWN0aW9uIGF0IGFsbC4gU2VlOlxuICAvLyBodHRwczovL2dpdGh1Yi5jb20vc29ja2pzL3NvY2tqcy1jbGllbnQvaXNzdWVzLzI4XG4gIC8vIGh0dHBzOi8vYnVnemlsbGEubW96aWxsYS5vcmcvc2hvd19idWcuY2dpP2lkPTY5NjA4NVxuICB0aGlzLnVubG9hZFJlZiA9IHV0aWxzLnVubG9hZEFkZChmdW5jdGlvbigpIHtcbiAgICBkZWJ1ZygndW5sb2FkJyk7XG4gICAgc2VsZi53cy5jbG9zZSgpO1xuICB9KTtcbiAgdGhpcy53cy5vbmNsb3NlID0gZnVuY3Rpb24oZSkge1xuICAgIGRlYnVnKCdjbG9zZSBldmVudCcsIGUuY29kZSwgZS5yZWFzb24pO1xuICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBlLmNvZGUsIGUucmVhc29uKTtcbiAgICBzZWxmLl9jbGVhbnVwKCk7XG4gIH07XG4gIHRoaXMud3Mub25lcnJvciA9IGZ1bmN0aW9uKGUpIHtcbiAgICBkZWJ1ZygnZXJyb3IgZXZlbnQnLCBlKTtcbiAgICBzZWxmLmVtaXQoJ2Nsb3NlJywgMTAwNiwgJ1dlYlNvY2tldCBjb25uZWN0aW9uIGJyb2tlbicpO1xuICAgIHNlbGYuX2NsZWFudXAoKTtcbiAgfTtcbn1cblxuaW5oZXJpdHMoV2ViU29ja2V0VHJhbnNwb3J0LCBFdmVudEVtaXR0ZXIpO1xuXG5XZWJTb2NrZXRUcmFuc3BvcnQucHJvdG90eXBlLnNlbmQgPSBmdW5jdGlvbihkYXRhKSB7XG4gIHZhciBtc2cgPSAnWycgKyBkYXRhICsgJ10nO1xuICBkZWJ1Zygnc2VuZCcsIG1zZyk7XG4gIHRoaXMud3Muc2VuZChtc2cpO1xufTtcblxuV2ViU29ja2V0VHJhbnNwb3J0LnByb3RvdHlwZS5jbG9zZSA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xvc2UnKTtcbiAgaWYgKHRoaXMud3MpIHtcbiAgICB0aGlzLndzLmNsb3NlKCk7XG4gIH1cbiAgdGhpcy5fY2xlYW51cCgpO1xufTtcblxuV2ViU29ja2V0VHJhbnNwb3J0LnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnX2NsZWFudXAnKTtcbiAgdmFyIHdzID0gdGhpcy53cztcbiAgaWYgKHdzKSB7XG4gICAgd3Mub25tZXNzYWdlID0gd3Mub25jbG9zZSA9IHdzLm9uZXJyb3IgPSBudWxsO1xuICB9XG4gIHV0aWxzLnVubG9hZERlbCh0aGlzLnVubG9hZFJlZik7XG4gIHRoaXMudW5sb2FkUmVmID0gdGhpcy53cyA9IG51bGw7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG59O1xuXG5XZWJTb2NrZXRUcmFuc3BvcnQuZW5hYmxlZCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnZW5hYmxlZCcpO1xuICByZXR1cm4gISFXZWJzb2NrZXREcml2ZXI7XG59O1xuV2ViU29ja2V0VHJhbnNwb3J0LnRyYW5zcG9ydE5hbWUgPSAnd2Vic29ja2V0JztcblxuLy8gSW4gdGhlb3J5LCB3cyBzaG91bGQgcmVxdWlyZSAxIHJvdW5kIHRyaXAuIEJ1dCBpbiBjaHJvbWUsIHRoaXMgaXNcbi8vIG5vdCB2ZXJ5IHN0YWJsZSBvdmVyIFNTTC4gTW9zdCBsaWtlbHkgYSB3cyBjb25uZWN0aW9uIHJlcXVpcmVzIGFcbi8vIHNlcGFyYXRlIFNTTCBjb25uZWN0aW9uLCBpbiB3aGljaCBjYXNlIDIgcm91bmQgdHJpcHMgYXJlIGFuXG4vLyBhYnNvbHV0ZSBtaW51bXVtLlxuV2ViU29ja2V0VHJhbnNwb3J0LnJvdW5kVHJpcHMgPSAyO1xuXG5tb2R1bGUuZXhwb3J0cyA9IFdlYlNvY2tldFRyYW5zcG9ydDtcbiJdfQ==
+},{"../utils/event":46,"../utils/url":52,"./driver/websocket":19,"debug":54,"events":3,"inherits":57}],39:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , XdrStreamingTransport = require('./xdr-streaming')
+  , XhrReceiver = require('./receiver/xhr')
+  , XDRObject = require('./sender/xdr')
+  ;
+
+function XdrPollingTransport(transUrl) {
+  if (!XDRObject.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/xhr', XhrReceiver, XDRObject);
+}
+
+inherits(XdrPollingTransport, AjaxBasedTransport);
+
+XdrPollingTransport.enabled = XdrStreamingTransport.enabled;
+XdrPollingTransport.transportName = 'xdr-polling';
+XdrPollingTransport.roundTrips = 2; // preflight, ajax
+
+module.exports = XdrPollingTransport;
+
+},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,"./xdr-streaming":40,"inherits":57}],40:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , XhrReceiver = require('./receiver/xhr')
+  , XDRObject = require('./sender/xdr')
+  ;
+
+// According to:
+//   http://stackoverflow.com/questions/1641507/detect-browser-support-for-cross-domain-xmlhttprequests
+//   http://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/
+
+function XdrStreamingTransport(transUrl) {
+  if (!XDRObject.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/xhr_streaming', XhrReceiver, XDRObject);
+}
+
+inherits(XdrStreamingTransport, AjaxBasedTransport);
+
+XdrStreamingTransport.enabled = function(info) {
+  if (info.cookie_needed || info.nullOrigin) {
+    return false;
+  }
+  return XDRObject.enabled && info.sameScheme;
+};
+
+XdrStreamingTransport.transportName = 'xdr-streaming';
+XdrStreamingTransport.roundTrips = 2; // preflight, ajax
+
+module.exports = XdrStreamingTransport;
+
+},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,"inherits":57}],41:[function(require,module,exports){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , XhrReceiver = require('./receiver/xhr')
+  , XHRCorsObject = require('./sender/xhr-cors')
+  , XHRLocalObject = require('./sender/xhr-local')
+  ;
+
+function XhrPollingTransport(transUrl) {
+  if (!XHRLocalObject.enabled && !XHRCorsObject.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/xhr', XhrReceiver, XHRCorsObject);
+}
+
+inherits(XhrPollingTransport, AjaxBasedTransport);
+
+XhrPollingTransport.enabled = function(info) {
+  if (info.nullOrigin) {
+    return false;
+  }
+
+  if (XHRLocalObject.enabled && info.sameOrigin) {
+    return true;
+  }
+  return XHRCorsObject.enabled;
+};
+
+XhrPollingTransport.transportName = 'xhr-polling';
+XhrPollingTransport.roundTrips = 2; // preflight, ajax
+
+module.exports = XhrPollingTransport;
+
+},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,"inherits":57}],42:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var inherits = require('inherits')
+  , AjaxBasedTransport = require('./lib/ajax-based')
+  , XhrReceiver = require('./receiver/xhr')
+  , XHRCorsObject = require('./sender/xhr-cors')
+  , XHRLocalObject = require('./sender/xhr-local')
+  , browser = require('../utils/browser')
+  ;
+
+function XhrStreamingTransport(transUrl) {
+  if (!XHRLocalObject.enabled && !XHRCorsObject.enabled) {
+    throw new Error('Transport created when disabled');
+  }
+  AjaxBasedTransport.call(this, transUrl, '/xhr_streaming', XhrReceiver, XHRCorsObject);
+}
+
+inherits(XhrStreamingTransport, AjaxBasedTransport);
+
+XhrStreamingTransport.enabled = function(info) {
+  if (info.nullOrigin) {
+    return false;
+  }
+  // Opera doesn't support xhr-streaming #60
+  // But it might be able to #92
+  if (browser.isOpera()) {
+    return false;
+  }
+
+  return XHRCorsObject.enabled;
+};
+
+XhrStreamingTransport.transportName = 'xhr-streaming';
+XhrStreamingTransport.roundTrips = 2; // preflight, ajax
+
+// Safari gets confused when a streaming ajax request is started
+// before onload. This causes the load indicator to spin indefinetely.
+// Only require body when used in a browser
+XhrStreamingTransport.needBody = !!global.document;
+
+module.exports = XhrStreamingTransport;
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQveGhyLXN0cmVhbWluZy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBBamF4QmFzZWRUcmFuc3BvcnQgPSByZXF1aXJlKCcuL2xpYi9hamF4LWJhc2VkJylcbiAgLCBYaHJSZWNlaXZlciA9IHJlcXVpcmUoJy4vcmVjZWl2ZXIveGhyJylcbiAgLCBYSFJDb3JzT2JqZWN0ID0gcmVxdWlyZSgnLi9zZW5kZXIveGhyLWNvcnMnKVxuICAsIFhIUkxvY2FsT2JqZWN0ID0gcmVxdWlyZSgnLi9zZW5kZXIveGhyLWxvY2FsJylcbiAgLCBicm93c2VyID0gcmVxdWlyZSgnLi4vdXRpbHMvYnJvd3NlcicpXG4gIDtcblxuZnVuY3Rpb24gWGhyU3RyZWFtaW5nVHJhbnNwb3J0KHRyYW5zVXJsKSB7XG4gIGlmICghWEhSTG9jYWxPYmplY3QuZW5hYmxlZCAmJiAhWEhSQ29yc09iamVjdC5lbmFibGVkKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdUcmFuc3BvcnQgY3JlYXRlZCB3aGVuIGRpc2FibGVkJyk7XG4gIH1cbiAgQWpheEJhc2VkVHJhbnNwb3J0LmNhbGwodGhpcywgdHJhbnNVcmwsICcveGhyX3N0cmVhbWluZycsIFhoclJlY2VpdmVyLCBYSFJDb3JzT2JqZWN0KTtcbn1cblxuaW5oZXJpdHMoWGhyU3RyZWFtaW5nVHJhbnNwb3J0LCBBamF4QmFzZWRUcmFuc3BvcnQpO1xuXG5YaHJTdHJlYW1pbmdUcmFuc3BvcnQuZW5hYmxlZCA9IGZ1bmN0aW9uKGluZm8pIHtcbiAgaWYgKGluZm8ubnVsbE9yaWdpbikge1xuICAgIHJldHVybiBmYWxzZTtcbiAgfVxuICAvLyBPcGVyYSBkb2Vzbid0IHN1cHBvcnQgeGhyLXN0cmVhbWluZyAjNjBcbiAgLy8gQnV0IGl0IG1pZ2h0IGJlIGFibGUgdG8gIzkyXG4gIGlmIChicm93c2VyLmlzT3BlcmEoKSkge1xuICAgIHJldHVybiBmYWxzZTtcbiAgfVxuXG4gIHJldHVybiBYSFJDb3JzT2JqZWN0LmVuYWJsZWQ7XG59O1xuXG5YaHJTdHJlYW1pbmdUcmFuc3BvcnQudHJhbnNwb3J0TmFtZSA9ICd4aHItc3RyZWFtaW5nJztcblhoclN0cmVhbWluZ1RyYW5zcG9ydC5yb3VuZFRyaXBzID0gMjsgLy8gcHJlZmxpZ2h0LCBhamF4XG5cbi8vIFNhZmFyaSBnZXRzIGNvbmZ1c2VkIHdoZW4gYSBzdHJlYW1pbmcgYWpheCByZXF1ZXN0IGlzIHN0YXJ0ZWRcbi8vIGJlZm9yZSBvbmxvYWQuIFRoaXMgY2F1c2VzIHRoZSBsb2FkIGluZGljYXRvciB0byBzcGluIGluZGVmaW5ldGVseS5cbi8vIE9ubHkgcmVxdWlyZSBib2R5IHdoZW4gdXNlZCBpbiBhIGJyb3dzZXJcblhoclN0cmVhbWluZ1RyYW5zcG9ydC5uZWVkQm9keSA9ICEhZ2xvYmFsLmRvY3VtZW50O1xuXG5tb2R1bGUuZXhwb3J0cyA9IFhoclN0cmVhbWluZ1RyYW5zcG9ydDtcbiJdfQ==
+},{"../utils/browser":44,"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,"inherits":57}],43:[function(require,module,exports){
+(function (global){
+'use strict';
+
+if (global.crypto && global.crypto.getRandomValues) {
+  module.exports.randomBytes = function(length) {
+    var bytes = new Uint8Array(length);
+    global.crypto.getRandomValues(bytes);
+    return bytes;
+  };
+} else {
+  module.exports.randomBytes = function(length) {
+    var bytes = new Array(length);
+    for (var i = 0; i < length; i++) {
+      bytes[i] = Math.floor(Math.random() * 256);
+    }
+    return bytes;
+  };
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9icm93c2VyLWNyeXB0by5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbmlmIChnbG9iYWwuY3J5cHRvICYmIGdsb2JhbC5jcnlwdG8uZ2V0UmFuZG9tVmFsdWVzKSB7XG4gIG1vZHVsZS5leHBvcnRzLnJhbmRvbUJ5dGVzID0gZnVuY3Rpb24obGVuZ3RoKSB7XG4gICAgdmFyIGJ5dGVzID0gbmV3IFVpbnQ4QXJyYXkobGVuZ3RoKTtcbiAgICBnbG9iYWwuY3J5cHRvLmdldFJhbmRvbVZhbHVlcyhieXRlcyk7XG4gICAgcmV0dXJuIGJ5dGVzO1xuICB9O1xufSBlbHNlIHtcbiAgbW9kdWxlLmV4cG9ydHMucmFuZG9tQnl0ZXMgPSBmdW5jdGlvbihsZW5ndGgpIHtcbiAgICB2YXIgYnl0ZXMgPSBuZXcgQXJyYXkobGVuZ3RoKTtcbiAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7XG4gICAgICBieXRlc1tpXSA9IE1hdGguZmxvb3IoTWF0aC5yYW5kb20oKSAqIDI1Nik7XG4gICAgfVxuICAgIHJldHVybiBieXRlcztcbiAgfTtcbn1cbiJdfQ==
+},{}],44:[function(require,module,exports){
+(function (global){
+'use strict';
+
+module.exports = {
+  isOpera: function() {
+    return global.navigator &&
+      /opera/i.test(global.navigator.userAgent);
+  }
+
+, isKonqueror: function() {
+    return global.navigator &&
+      /konqueror/i.test(global.navigator.userAgent);
+  }
+
+  // #187 wrap document.domain in try/catch because of WP8 from file:///
+, hasDomain: function () {
+    // non-browser client always has a domain
+    if (!global.document) {
+      return true;
+    }
+
+    try {
+      return !!global.document.domain;
+    } catch (e) {
+      return false;
+    }
+  }
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9icm93c2VyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG5tb2R1bGUuZXhwb3J0cyA9IHtcbiAgaXNPcGVyYTogZnVuY3Rpb24oKSB7XG4gICAgcmV0dXJuIGdsb2JhbC5uYXZpZ2F0b3IgJiZcbiAgICAgIC9vcGVyYS9pLnRlc3QoZ2xvYmFsLm5hdmlnYXRvci51c2VyQWdlbnQpO1xuICB9XG5cbiwgaXNLb25xdWVyb3I6IGZ1bmN0aW9uKCkge1xuICAgIHJldHVybiBnbG9iYWwubmF2aWdhdG9yICYmXG4gICAgICAva29ucXVlcm9yL2kudGVzdChnbG9iYWwubmF2aWdhdG9yLnVzZXJBZ2VudCk7XG4gIH1cblxuICAvLyAjMTg3IHdyYXAgZG9jdW1lbnQuZG9tYWluIGluIHRyeS9jYXRjaCBiZWNhdXNlIG9mIFdQOCBmcm9tIGZpbGU6Ly8vXG4sIGhhc0RvbWFpbjogZnVuY3Rpb24gKCkge1xuICAgIC8vIG5vbi1icm93c2VyIGNsaWVudCBhbHdheXMgaGFzIGEgZG9tYWluXG4gICAgaWYgKCFnbG9iYWwuZG9jdW1lbnQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cblxuICAgIHRyeSB7XG4gICAgICByZXR1cm4gISFnbG9iYWwuZG9jdW1lbnQuZG9tYWluO1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gIH1cbn07XG4iXX0=
+},{}],45:[function(require,module,exports){
+'use strict';
+
+var JSON3 = require('json3');
+
+// Some extra characters that Chrome gets wrong, and substitutes with
+// something else on the wire.
+var extraEscapable = /[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g
+  , extraLookup;
+
+// This may be quite slow, so let's delay until user actually uses bad
+// characters.
+var unrollLookup = function(escapable) {
+  var i;
+  var unrolled = {};
+  var c = [];
+  for (i = 0; i < 65536; i++) {
+    c.push( String.fromCharCode(i) );
+  }
+  escapable.lastIndex = 0;
+  c.join('').replace(escapable, function(a) {
+    unrolled[ a ] = '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+    return '';
+  });
+  escapable.lastIndex = 0;
+  return unrolled;
+};
+
+// Quote string, also taking care of unicode characters that browsers
+// often break. Especially, take care of unicode surrogates:
+// http://en.wikipedia.org/wiki/Mapping_of_Unicode_characters#Surrogates
+module.exports = {
+  quote: function(string) {
+    var quoted = JSON3.stringify(string);
+
+    // In most cases this should be very fast and good enough.
+    extraEscapable.lastIndex = 0;
+    if (!extraEscapable.test(quoted)) {
+      return quoted;
+    }
+
+    if (!extraLookup) {
+      extraLookup = unrollLookup(extraEscapable);
+    }
+
+    return quoted.replace(extraEscapable, function(a) {
+      return extraLookup[a];
+    });
+  }
+};
+
+},{"json3":58}],46:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var random = require('./random');
+
+var onUnload = {}
+  , afterUnload = false
+    // detect google chrome packaged apps because they don't allow the 'unload' event
+  , isChromePackagedApp = global.chrome && global.chrome.app && global.chrome.app.runtime
+  ;
+
+module.exports = {
+  attachEvent: function(event, listener) {
+    if (typeof global.addEventListener !== 'undefined') {
+      global.addEventListener(event, listener, false);
+    } else if (global.document && global.attachEvent) {
+      // IE quirks.
+      // According to: http://stevesouders.com/misc/test-postmessage.php
+      // the message gets delivered only to 'document', not 'window'.
+      global.document.attachEvent('on' + event, listener);
+      // I get 'window' for ie8.
+      global.attachEvent('on' + event, listener);
+    }
+  }
+
+, detachEvent: function(event, listener) {
+    if (typeof global.addEventListener !== 'undefined') {
+      global.removeEventListener(event, listener, false);
+    } else if (global.document && global.detachEvent) {
+      global.document.detachEvent('on' + event, listener);
+      global.detachEvent('on' + event, listener);
+    }
+  }
+
+, unloadAdd: function(listener) {
+    if (isChromePackagedApp) {
+      return null;
+    }
+
+    var ref = random.string(8);
+    onUnload[ref] = listener;
+    if (afterUnload) {
+      setTimeout(this.triggerUnloadCallbacks, 0);
+    }
+    return ref;
+  }
+
+, unloadDel: function(ref) {
+    if (ref in onUnload) {
+      delete onUnload[ref];
+    }
+  }
+
+, triggerUnloadCallbacks: function() {
+    for (var ref in onUnload) {
+      onUnload[ref]();
+      delete onUnload[ref];
+    }
+  }
+};
+
+var unloadTriggered = function() {
+  if (afterUnload) {
+    return;
+  }
+  afterUnload = true;
+  module.exports.triggerUnloadCallbacks();
+};
+
+// 'unload' alone is not reliable in opera within an iframe, but we
+// can't use `beforeunload` as IE fires it on javascript: links.
+if (!isChromePackagedApp) {
+  module.exports.attachEvent('unload', unloadTriggered);
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9ldmVudC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgcmFuZG9tID0gcmVxdWlyZSgnLi9yYW5kb20nKTtcblxudmFyIG9uVW5sb2FkID0ge31cbiAgLCBhZnRlclVubG9hZCA9IGZhbHNlXG4gICAgLy8gZGV0ZWN0IGdvb2dsZSBjaHJvbWUgcGFja2FnZWQgYXBwcyBiZWNhdXNlIHRoZXkgZG9uJ3QgYWxsb3cgdGhlICd1bmxvYWQnIGV2ZW50XG4gICwgaXNDaHJvbWVQYWNrYWdlZEFwcCA9IGdsb2JhbC5jaHJvbWUgJiYgZ2xvYmFsLmNocm9tZS5hcHAgJiYgZ2xvYmFsLmNocm9tZS5hcHAucnVudGltZVxuICA7XG5cbm1vZHVsZS5leHBvcnRzID0ge1xuICBhdHRhY2hFdmVudDogZnVuY3Rpb24oZXZlbnQsIGxpc3RlbmVyKSB7XG4gICAgaWYgKHR5cGVvZiBnbG9iYWwuYWRkRXZlbnRMaXN0ZW5lciAhPT0gJ3VuZGVmaW5lZCcpIHtcbiAgICAgIGdsb2JhbC5hZGRFdmVudExpc3RlbmVyKGV2ZW50LCBsaXN0ZW5lciwgZmFsc2UpO1xuICAgIH0gZWxzZSBpZiAoZ2xvYmFsLmRvY3VtZW50ICYmIGdsb2JhbC5hdHRhY2hFdmVudCkge1xuICAgICAgLy8gSUUgcXVpcmtzLlxuICAgICAgLy8gQWNjb3JkaW5nIHRvOiBodHRwOi8vc3RldmVzb3VkZXJzLmNvbS9taXNjL3Rlc3QtcG9zdG1lc3NhZ2UucGhwXG4gICAgICAvLyB0aGUgbWVzc2FnZSBnZXRzIGRlbGl2ZXJlZCBvbmx5IHRvICdkb2N1bWVudCcsIG5vdCAnd2luZG93Jy5cbiAgICAgIGdsb2JhbC5kb2N1bWVudC5hdHRhY2hFdmVudCgnb24nICsgZXZlbnQsIGxpc3RlbmVyKTtcbiAgICAgIC8vIEkgZ2V0ICd3aW5kb3cnIGZvciBpZTguXG4gICAgICBnbG9iYWwuYXR0YWNoRXZlbnQoJ29uJyArIGV2ZW50LCBsaXN0ZW5lcik7XG4gICAgfVxuICB9XG5cbiwgZGV0YWNoRXZlbnQ6IGZ1bmN0aW9uKGV2ZW50LCBsaXN0ZW5lcikge1xuICAgIGlmICh0eXBlb2YgZ2xvYmFsLmFkZEV2ZW50TGlzdGVuZXIgIT09ICd1bmRlZmluZWQnKSB7XG4gICAgICBnbG9iYWwucmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudCwgbGlzdGVuZXIsIGZhbHNlKTtcbiAgICB9IGVsc2UgaWYgKGdsb2JhbC5kb2N1bWVudCAmJiBnbG9iYWwuZGV0YWNoRXZlbnQpIHtcbiAgICAgIGdsb2JhbC5kb2N1bWVudC5kZXRhY2hFdmVudCgnb24nICsgZXZlbnQsIGxpc3RlbmVyKTtcbiAgICAgIGdsb2JhbC5kZXRhY2hFdmVudCgnb24nICsgZXZlbnQsIGxpc3RlbmVyKTtcbiAgICB9XG4gIH1cblxuLCB1bmxvYWRBZGQ6IGZ1bmN0aW9uKGxpc3RlbmVyKSB7XG4gICAgaWYgKGlzQ2hyb21lUGFja2FnZWRBcHApIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cblxuICAgIHZhciByZWYgPSByYW5kb20uc3RyaW5nKDgpO1xuICAgIG9uVW5sb2FkW3JlZl0gPSBsaXN0ZW5lcjtcbiAgICBpZiAoYWZ0ZXJVbmxvYWQpIHtcbiAgICAgIHNldFRpbWVvdXQodGhpcy50cmlnZ2VyVW5sb2FkQ2FsbGJhY2tzLCAwKTtcbiAgICB9XG4gICAgcmV0dXJuIHJlZjtcbiAgfVxuXG4sIHVubG9hZERlbDogZnVuY3Rpb24ocmVmKSB7XG4gICAgaWYgKHJlZiBpbiBvblVubG9hZCkge1xuICAgICAgZGVsZXRlIG9uVW5sb2FkW3JlZl07XG4gICAgfVxuICB9XG5cbiwgdHJpZ2dlclVubG9hZENhbGxiYWNrczogZnVuY3Rpb24oKSB7XG4gICAgZm9yICh2YXIgcmVmIGluIG9uVW5sb2FkKSB7XG4gICAgICBvblVubG9hZFtyZWZdKCk7XG4gICAgICBkZWxldGUgb25VbmxvYWRbcmVmXTtcbiAgICB9XG4gIH1cbn07XG5cbnZhciB1bmxvYWRUcmlnZ2VyZWQgPSBmdW5jdGlvbigpIHtcbiAgaWYgKGFmdGVyVW5sb2FkKSB7XG4gICAgcmV0dXJuO1xuICB9XG4gIGFmdGVyVW5sb2FkID0gdHJ1ZTtcbiAgbW9kdWxlLmV4cG9ydHMudHJpZ2dlclVubG9hZENhbGxiYWNrcygpO1xufTtcblxuLy8gJ3VubG9hZCcgYWxvbmUgaXMgbm90IHJlbGlhYmxlIGluIG9wZXJhIHdpdGhpbiBhbiBpZnJhbWUsIGJ1dCB3ZVxuLy8gY2FuJ3QgdXNlIGBiZWZvcmV1bmxvYWRgIGFzIElFIGZpcmVzIGl0IG9uIGphdmFzY3JpcHQ6IGxpbmtzLlxuaWYgKCFpc0Nocm9tZVBhY2thZ2VkQXBwKSB7XG4gIG1vZHVsZS5leHBvcnRzLmF0dGFjaEV2ZW50KCd1bmxvYWQnLCB1bmxvYWRUcmlnZ2VyZWQpO1xufVxuIl19
+},{"./random":50}],47:[function(require,module,exports){
+(function (process,global){
+'use strict';
+
+var eventUtils = require('./event')
+  , JSON3 = require('json3')
+  , browser = require('./browser')
+  ;
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:utils:iframe');
+}
+
+module.exports = {
+  WPrefix: '_jp'
+, currentWindowId: null
+
+, polluteGlobalNamespace: function() {
+    if (!(module.exports.WPrefix in global)) {
+      global[module.exports.WPrefix] = {};
+    }
+  }
+
+, postMessage: function(type, data) {
+    if (global.parent !== global) {
+      global.parent.postMessage(JSON3.stringify({
+        windowId: module.exports.currentWindowId
+      , type: type
+      , data: data || ''
+      }), '*');
+    } else {
+      debug('Cannot postMessage, no parent window.', type, data);
+    }
+  }
+
+, createIframe: function(iframeUrl, errorCallback) {
+    var iframe = global.document.createElement('iframe');
+    var tref, unloadRef;
+    var unattach = function() {
+      debug('unattach');
+      clearTimeout(tref);
+      // Explorer had problems with that.
+      try {
+        iframe.onload = null;
+      } catch (x) {
+        // intentionally empty
+      }
+      iframe.onerror = null;
+    };
+    var cleanup = function() {
+      debug('cleanup');
+      if (iframe) {
+        unattach();
+        // This timeout makes chrome fire onbeforeunload event
+        // within iframe. Without the timeout it goes straight to
+        // onunload.
+        setTimeout(function() {
+          if (iframe) {
+            iframe.parentNode.removeChild(iframe);
+          }
+          iframe = null;
+        }, 0);
+        eventUtils.unloadDel(unloadRef);
+      }
+    };
+    var onerror = function(err) {
+      debug('onerror', err);
+      if (iframe) {
+        cleanup();
+        errorCallback(err);
+      }
+    };
+    var post = function(msg, origin) {
+      debug('post', msg, origin);
+      try {
+        // When the iframe is not loaded, IE raises an exception
+        // on 'contentWindow'.
+        setTimeout(function() {
+          if (iframe && iframe.contentWindow) {
+            iframe.contentWindow.postMessage(msg, origin);
+          }
+        }, 0);
+      } catch (x) {
+        // intentionally empty
+      }
+    };
+
+    iframe.src = iframeUrl;
+    iframe.style.display = 'none';
+    iframe.style.position = 'absolute';
+    iframe.onerror = function() {
+      onerror('onerror');
+    };
+    iframe.onload = function() {
+      debug('onload');
+      // `onload` is triggered before scripts on the iframe are
+      // executed. Give it few seconds to actually load stuff.
+      clearTimeout(tref);
+      tref = setTimeout(function() {
+        onerror('onload timeout');
+      }, 2000);
+    };
+    global.document.body.appendChild(iframe);
+    tref = setTimeout(function() {
+      onerror('timeout');
+    }, 15000);
+    unloadRef = eventUtils.unloadAdd(cleanup);
+    return {
+      post: post
+    , cleanup: cleanup
+    , loaded: unattach
+    };
+  }
+
+/* jshint undef: false, newcap: false */
+/* eslint no-undef: 0, new-cap: 0 */
+, createHtmlfile: function(iframeUrl, errorCallback) {
+    var axo = ['Active'].concat('Object').join('X');
+    var doc = new global[axo]('htmlfile');
+    var tref, unloadRef;
+    var iframe;
+    var unattach = function() {
+      clearTimeout(tref);
+      iframe.onerror = null;
+    };
+    var cleanup = function() {
+      if (doc) {
+        unattach();
+        eventUtils.unloadDel(unloadRef);
+        iframe.parentNode.removeChild(iframe);
+        iframe = doc = null;
+        CollectGarbage();
+      }
+    };
+    var onerror = function(r) {
+      debug('onerror', r);
+      if (doc) {
+        cleanup();
+        errorCallback(r);
+      }
+    };
+    var post = function(msg, origin) {
+      try {
+        // When the iframe is not loaded, IE raises an exception
+        // on 'contentWindow'.
+        setTimeout(function() {
+          if (iframe && iframe.contentWindow) {
+              iframe.contentWindow.postMessage(msg, origin);
+          }
+        }, 0);
+      } catch (x) {
+        // intentionally empty
+      }
+    };
+
+    doc.open();
+    doc.write('<html><s' + 'cript>' +
+              'document.domain="' + global.document.domain + '";' +
+              '</s' + 'cript></html>');
+    doc.close();
+    doc.parentWindow[module.exports.WPrefix] = global[module.exports.WPrefix];
+    var c = doc.createElement('div');
+    doc.body.appendChild(c);
+    iframe = doc.createElement('iframe');
+    c.appendChild(iframe);
+    iframe.src = iframeUrl;
+    iframe.onerror = function() {
+      onerror('onerror');
+    };
+    tref = setTimeout(function() {
+      onerror('timeout');
+    }, 15000);
+    unloadRef = eventUtils.unloadAdd(cleanup);
+    return {
+      post: post
+    , cleanup: cleanup
+    , loaded: unattach
+    };
+  }
+};
+
+module.exports.iframeEnabled = false;
+if (global.document) {
+  // postMessage misbehaves in konqueror 4.6.5 - the messages are delivered with
+  // huge delay, or not at all.
+  module.exports.iframeEnabled = (typeof global.postMessage === 'function' ||
+    typeof global.postMessage === 'object') && (!browser.isKonqueror());
+}
+
+}).call(this,{ env: {} },typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/utils/iframe.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar eventUtils = require('./event')\n  , JSON3 = require('json3')\n  , browser = require('./browser')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:utils:iframe');\n}\n\nmodule.exports = {\n  WPrefix: '_jp'\n, currentWindowId: null\n\n, polluteGlobalNamespace: function() {\n    if (!(module.exports.WPrefix in global)) {\n      global[module.exports.WPrefix] = {};\n    }\n  }\n\n, postMessage: function(type, data) {\n    if (global.parent !== global) {\n      global.parent.postMessage(JSON3.stringify({\n        windowId: module.exports.currentWindowId\n      , type: type\n      , data: data || ''\n      }), '*');\n    } else {\n      debug('Cannot postMessage, no parent window.', type, data);\n    }\n  }\n\n, createIframe: function(iframeUrl, errorCallback) {\n    var iframe = global.document.createElement('iframe');\n    var tref, unloadRef;\n    var unattach = function() {\n      debug('unattach');\n      clearTimeout(tref);\n      // Explorer had problems with that.\n      try {\n        iframe.onload = null;\n      } catch (x) {\n        // intentionally empty\n      }\n      iframe.onerror = null;\n    };\n    var cleanup = function() {\n      debug('cleanup');\n      if (iframe) {\n        unattach();\n        // This timeout makes chrome fire onbeforeunload event\n        // within iframe. Without the timeout it goes straight to\n        // onunload.\n        setTimeout(function() {\n          if (iframe) {\n            iframe.parentNode.removeChild(iframe);\n          }\n          iframe = null;\n        }, 0);\n        eventUtils.unloadDel(unloadRef);\n      }\n    };\n    var onerror = function(err) {\n      debug('onerror', err);\n      if (iframe) {\n        cleanup();\n        errorCallback(err);\n      }\n    };\n    var post = function(msg, origin) {\n      debug('post', msg, origin);\n      try {\n        // When the iframe is not loaded, IE raises an exception\n        // on 'contentWindow'.\n        setTimeout(function() {\n          if (iframe && iframe.contentWindow) {\n            iframe.contentWindow.postMessage(msg, origin);\n          }\n        }, 0);\n      } catch (x) {\n        // intentionally empty\n      }\n    };\n\n    iframe.src = iframeUrl;\n    iframe.style.display = 'none';\n    iframe.style.position = 'absolute';\n    iframe.onerror = function() {\n      onerror('onerror');\n    };\n    iframe.onload = function() {\n      debug('onload');\n      // `onload` is triggered before scripts on the iframe are\n      // executed. Give it few seconds to actually load stuff.\n      clearTimeout(tref);\n      tref = setTimeout(function() {\n        onerror('onload timeout');\n      }, 2000);\n    };\n    global.document.body.appendChild(iframe);\n    tref = setTimeout(function() {\n      onerror('timeout');\n    }, 15000);\n    unloadRef = eventUtils.unloadAdd(cleanup);\n    return {\n      post: post\n    , cleanup: cleanup\n    , loaded: unattach\n    };\n  }\n\n/* jshint undef: false, newcap: false */\n/* eslint no-undef: 0, new-cap: 0 */\n, createHtmlfile: function(iframeUrl, errorCallback) {\n    var axo = ['Active'].concat('Object').join('X');\n    var doc = new global[axo]('htmlfile');\n    var tref, unloadRef;\n    var iframe;\n    var unattach = function() {\n      clearTimeout(tref);\n      iframe.onerror = null;\n    };\n    var cleanup = function() {\n      if (doc) {\n        unattach();\n        eventUtils.unloadDel(unloadRef);\n        iframe.parentNode.removeChild(iframe);\n        iframe = doc = null;\n        CollectGarbage();\n      }\n    };\n    var onerror = function(r) {\n      debug('onerror', r);\n      if (doc) {\n        cleanup();\n        errorCallback(r);\n      }\n    };\n    var post = function(msg, origin) {\n      try {\n        // When the iframe is not loaded, IE raises an exception\n        // on 'contentWindow'.\n        setTimeout(function() {\n          if (iframe && iframe.contentWindow) {\n              iframe.contentWindow.postMessage(msg, origin);\n          }\n        }, 0);\n      } catch (x) {\n        // intentionally empty\n      }\n    };\n\n    doc.open();\n    doc.write('<html><s' + 'cript>' +\n              'document.domain=\"' + global.document.domain + '\";' +\n              '</s' + 'cript></html>');\n    doc.close();\n    doc.parentWindow[module.exports.WPrefix] = global[module.exports.WPrefix];\n    var c = doc.createElement('div');\n    doc.body.appendChild(c);\n    iframe = doc.createElement('iframe');\n    c.appendChild(iframe);\n    iframe.src = iframeUrl;\n    iframe.onerror = function() {\n      onerror('onerror');\n    };\n    tref = setTimeout(function() {\n      onerror('timeout');\n    }, 15000);\n    unloadRef = eventUtils.unloadAdd(cleanup);\n    return {\n      post: post\n    , cleanup: cleanup\n    , loaded: unattach\n    };\n  }\n};\n\nmodule.exports.iframeEnabled = false;\nif (global.document) {\n  // postMessage misbehaves in konqueror 4.6.5 - the messages are delivered with\n  // huge delay, or not at all.\n  module.exports.iframeEnabled = (typeof global.postMessage === 'function' ||\n    typeof global.postMessage === 'object') && (!browser.isKonqueror());\n}\n"]}
+},{"./browser":44,"./event":46,"debug":54,"json3":58}],48:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var logObject = {};
+['log', 'debug', 'warn'].forEach(function (level) {
+  var levelExists;
+
+  try {
+    levelExists = global.console && global.console[level] && global.console[level].apply;
+  } catch(e) {
+    // do nothing
+  }
+
+  logObject[level] = levelExists ? function () {
+    return global.console[level].apply(global.console, arguments);
+  } : (level === 'log' ? function () {} : logObject.log);
+});
+
+module.exports = logObject;
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9sb2cuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBsb2dPYmplY3QgPSB7fTtcblsnbG9nJywgJ2RlYnVnJywgJ3dhcm4nXS5mb3JFYWNoKGZ1bmN0aW9uIChsZXZlbCkge1xuICB2YXIgbGV2ZWxFeGlzdHM7XG5cbiAgdHJ5IHtcbiAgICBsZXZlbEV4aXN0cyA9IGdsb2JhbC5jb25zb2xlICYmIGdsb2JhbC5jb25zb2xlW2xldmVsXSAmJiBnbG9iYWwuY29uc29sZVtsZXZlbF0uYXBwbHk7XG4gIH0gY2F0Y2goZSkge1xuICAgIC8vIGRvIG5vdGhpbmdcbiAgfVxuXG4gIGxvZ09iamVjdFtsZXZlbF0gPSBsZXZlbEV4aXN0cyA/IGZ1bmN0aW9uICgpIHtcbiAgICByZXR1cm4gZ2xvYmFsLmNvbnNvbGVbbGV2ZWxdLmFwcGx5KGdsb2JhbC5jb25zb2xlLCBhcmd1bWVudHMpO1xuICB9IDogKGxldmVsID09PSAnbG9nJyA/IGZ1bmN0aW9uICgpIHt9IDogbG9nT2JqZWN0LmxvZyk7XG59KTtcblxubW9kdWxlLmV4cG9ydHMgPSBsb2dPYmplY3Q7XG4iXX0=
+},{}],49:[function(require,module,exports){
+'use strict';
+
+module.exports = {
+  isObject: function(obj) {
+    var type = typeof obj;
+    return type === 'function' || type === 'object' && !!obj;
+  }
+
+, extend: function(obj) {
+    if (!this.isObject(obj)) {
+      return obj;
+    }
+    var source, prop;
+    for (var i = 1, length = arguments.length; i < length; i++) {
+      source = arguments[i];
+      for (prop in source) {
+        if (Object.prototype.hasOwnProperty.call(source, prop)) {
+          obj[prop] = source[prop];
+        }
+      }
+    }
+    return obj;
+  }
+};
+
+},{}],50:[function(require,module,exports){
+'use strict';
+
+/* global crypto:true */
+var crypto = require('crypto');
+
+// This string has length 32, a power of 2, so the modulus doesn't introduce a
+// bias.
+var _randomStringChars = 'abcdefghijklmnopqrstuvwxyz012345';
+module.exports = {
+  string: function(length) {
+    var max = _randomStringChars.length;
+    var bytes = crypto.randomBytes(length);
+    var ret = [];
+    for (var i = 0; i < length; i++) {
+      ret.push(_randomStringChars.substr(bytes[i] % max, 1));
+    }
+    return ret.join('');
+  }
+
+, number: function(max) {
+    return Math.floor(Math.random() * max);
+  }
+
+, numberString: function(max) {
+    var t = ('' + (max - 1)).length;
+    var p = new Array(t + 1).join('0');
+    return (p + this.number(max)).slice(-t);
+  }
+};
+
+},{"crypto":43}],51:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:utils:transport');
+}
+
+module.exports = function(availableTransports) {
+  return {
+    filterToEnabled: function(transportsWhitelist, info) {
+      var transports = {
+        main: []
+      , facade: []
+      };
+      if (!transportsWhitelist) {
+        transportsWhitelist = [];
+      } else if (typeof transportsWhitelist === 'string') {
+        transportsWhitelist = [transportsWhitelist];
+      }
+
+      availableTransports.forEach(function(trans) {
+        if (!trans) {
+          return;
+        }
+
+        if (trans.transportName === 'websocket' && info.websocket === false) {
+          debug('disabled from server', 'websocket');
+          return;
+        }
+
+        if (transportsWhitelist.length &&
+            transportsWhitelist.indexOf(trans.transportName) === -1) {
+          debug('not in whitelist', trans.transportName);
+          return;
+        }
+
+        if (trans.enabled(info)) {
+          debug('enabled', trans.transportName);
+          transports.main.push(trans);
+          if (trans.facadeTransport) {
+            transports.facade.push(trans.facadeTransport);
+          }
+        } else {
+          debug('disabled', trans.transportName);
+        }
+      });
+      return transports;
+    }
+  };
+};
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy90cmFuc3BvcnQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnV0aWxzOnRyYW5zcG9ydCcpO1xufVxuXG5tb2R1bGUuZXhwb3J0cyA9IGZ1bmN0aW9uKGF2YWlsYWJsZVRyYW5zcG9ydHMpIHtcbiAgcmV0dXJuIHtcbiAgICBmaWx0ZXJUb0VuYWJsZWQ6IGZ1bmN0aW9uKHRyYW5zcG9ydHNXaGl0ZWxpc3QsIGluZm8pIHtcbiAgICAgIHZhciB0cmFuc3BvcnRzID0ge1xuICAgICAgICBtYWluOiBbXVxuICAgICAgLCBmYWNhZGU6IFtdXG4gICAgICB9O1xuICAgICAgaWYgKCF0cmFuc3BvcnRzV2hpdGVsaXN0KSB7XG4gICAgICAgIHRyYW5zcG9ydHNXaGl0ZWxpc3QgPSBbXTtcbiAgICAgIH0gZWxzZSBpZiAodHlwZW9mIHRyYW5zcG9ydHNXaGl0ZWxpc3QgPT09ICdzdHJpbmcnKSB7XG4gICAgICAgIHRyYW5zcG9ydHNXaGl0ZWxpc3QgPSBbdHJhbnNwb3J0c1doaXRlbGlzdF07XG4gICAgICB9XG5cbiAgICAgIGF2YWlsYWJsZVRyYW5zcG9ydHMuZm9yRWFjaChmdW5jdGlvbih0cmFucykge1xuICAgICAgICBpZiAoIXRyYW5zKSB7XG4gICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKHRyYW5zLnRyYW5zcG9ydE5hbWUgPT09ICd3ZWJzb2NrZXQnICYmIGluZm8ud2Vic29ja2V0ID09PSBmYWxzZSkge1xuICAgICAgICAgIGRlYnVnKCdkaXNhYmxlZCBmcm9tIHNlcnZlcicsICd3ZWJzb2NrZXQnKTtcbiAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICBpZiAodHJhbnNwb3J0c1doaXRlbGlzdC5sZW5ndGggJiZcbiAgICAgICAgICAgIHRyYW5zcG9ydHNXaGl0ZWxpc3QuaW5kZXhPZih0cmFucy50cmFuc3BvcnROYW1lKSA9PT0gLTEpIHtcbiAgICAgICAgICBkZWJ1Zygnbm90IGluIHdoaXRlbGlzdCcsIHRyYW5zLnRyYW5zcG9ydE5hbWUpO1xuICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuXG4gICAgICAgIGlmICh0cmFucy5lbmFibGVkKGluZm8pKSB7XG4gICAgICAgICAgZGVidWcoJ2VuYWJsZWQnLCB0cmFucy50cmFuc3BvcnROYW1lKTtcbiAgICAgICAgICB0cmFuc3BvcnRzLm1haW4ucHVzaCh0cmFucyk7XG4gICAgICAgICAgaWYgKHRyYW5zLmZhY2FkZVRyYW5zcG9ydCkge1xuICAgICAgICAgICAgdHJhbnNwb3J0cy5mYWNhZGUucHVzaCh0cmFucy5mYWNhZGVUcmFuc3BvcnQpO1xuICAgICAgICAgIH1cbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICBkZWJ1ZygnZGlzYWJsZWQnLCB0cmFucy50cmFuc3BvcnROYW1lKTtcbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgICByZXR1cm4gdHJhbnNwb3J0cztcbiAgICB9XG4gIH07XG59O1xuIl19
+},{"debug":54}],52:[function(require,module,exports){
+(function (process){
+'use strict';
+
+var URL = require('url-parse');
+
+var debug = function() {};
+if (process.env.NODE_ENV !== 'production') {
+  debug = require('debug')('sockjs-client:utils:url');
+}
+
+module.exports = {
+  getOrigin: function(url) {
+    if (!url) {
+      return null;
+    }
+
+    var p = new URL(url);
+    if (p.protocol === 'file:') {
+      return null;
+    }
+
+    var port = p.port;
+    if (!port) {
+      port = (p.protocol === 'https:') ? '443' : '80';
+    }
+
+    return p.protocol + '//' + p.hostname + ':' + port;
+  }
+
+, isOriginEqual: function(a, b) {
+    var res = this.getOrigin(a) === this.getOrigin(b);
+    debug('same', a, b, res);
+    return res;
+  }
+
+, isSchemeEqual: function(a, b) {
+    return (a.split(':')[0] === b.split(':')[0]);
+  }
+
+, addPath: function (url, path) {
+    var qs = url.split('?');
+    return qs[0] + path + (qs[1] ? '?' + qs[1] : '');
+  }
+
+, addQuery: function (url, q) {
+    return url + (url.indexOf('?') === -1 ? ('?' + q) : ('&' + q));
+  }
+};
+
+}).call(this,{ env: {} })
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy91cmwuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgVVJMID0gcmVxdWlyZSgndXJsLXBhcnNlJyk7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6dXRpbHM6dXJsJyk7XG59XG5cbm1vZHVsZS5leHBvcnRzID0ge1xuICBnZXRPcmlnaW46IGZ1bmN0aW9uKHVybCkge1xuICAgIGlmICghdXJsKSB7XG4gICAgICByZXR1cm4gbnVsbDtcbiAgICB9XG5cbiAgICB2YXIgcCA9IG5ldyBVUkwodXJsKTtcbiAgICBpZiAocC5wcm90b2NvbCA9PT0gJ2ZpbGU6Jykge1xuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfVxuXG4gICAgdmFyIHBvcnQgPSBwLnBvcnQ7XG4gICAgaWYgKCFwb3J0KSB7XG4gICAgICBwb3J0ID0gKHAucHJvdG9jb2wgPT09ICdodHRwczonKSA/ICc0NDMnIDogJzgwJztcbiAgICB9XG5cbiAgICByZXR1cm4gcC5wcm90b2NvbCArICcvLycgKyBwLmhvc3RuYW1lICsgJzonICsgcG9ydDtcbiAgfVxuXG4sIGlzT3JpZ2luRXF1YWw6IGZ1bmN0aW9uKGEsIGIpIHtcbiAgICB2YXIgcmVzID0gdGhpcy5nZXRPcmlnaW4oYSkgPT09IHRoaXMuZ2V0T3JpZ2luKGIpO1xuICAgIGRlYnVnKCdzYW1lJywgYSwgYiwgcmVzKTtcbiAgICByZXR1cm4gcmVzO1xuICB9XG5cbiwgaXNTY2hlbWVFcXVhbDogZnVuY3Rpb24oYSwgYikge1xuICAgIHJldHVybiAoYS5zcGxpdCgnOicpWzBdID09PSBiLnNwbGl0KCc6JylbMF0pO1xuICB9XG5cbiwgYWRkUGF0aDogZnVuY3Rpb24gKHVybCwgcGF0aCkge1xuICAgIHZhciBxcyA9IHVybC5zcGxpdCgnPycpO1xuICAgIHJldHVybiBxc1swXSArIHBhdGggKyAocXNbMV0gPyAnPycgKyBxc1sxXSA6ICcnKTtcbiAgfVxuXG4sIGFkZFF1ZXJ5OiBmdW5jdGlvbiAodXJsLCBxKSB7XG4gICAgcmV0dXJuIHVybCArICh1cmwuaW5kZXhPZignPycpID09PSAtMSA/ICgnPycgKyBxKSA6ICgnJicgKyBxKSk7XG4gIH1cbn07XG4iXX0=
+},{"debug":54,"url-parse":59}],53:[function(require,module,exports){
+module.exports = '1.1.1';
+
+},{}],54:[function(require,module,exports){
+
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = require('./debug');
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+exports.storage = 'undefined' != typeof chrome
+               && 'undefined' != typeof chrome.storage
+                  ? chrome.storage.local
+                  : localstorage();
+
+/**
+ * Colors.
+ */
+
+exports.colors = [
+  'lightseagreen',
+  'forestgreen',
+  'goldenrod',
+  'dodgerblue',
+  'darkorchid',
+  'crimson'
+];
+
+/**
+ * Currently only WebKit-based Web Inspectors, Firefox >= v31,
+ * and the Firebug extension (any Firefox version) are known
+ * to support "%c" CSS customizations.
+ *
+ * TODO: add a `localStorage` variable to explicitly enable/disable colors
+ */
+
+function useColors() {
+  // is webkit? http://stackoverflow.com/a/16459606/376773
+  return ('WebkitAppearance' in document.documentElement.style) ||
+    // is firebug? http://stackoverflow.com/a/398120/376773
+    (window.console && (console.firebug || (console.exception && console.table))) ||
+    // is firefox >= v31?
+    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
+    (navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31);
+}
+
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
+
+exports.formatters.j = function(v) {
+  return JSON.stringify(v);
+};
+
+
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs() {
+  var args = arguments;
+  var useColors = this.useColors;
+
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
+
+  if (!useColors) return args;
+
+  var c = 'color: ' + this.color;
+  args = [args[0], c, 'color: inherit'].concat(Array.prototype.slice.call(args, 1));
+
+  // the final "%c" is somewhat tricky, because there could be other
+  // arguments passed either before or after the %c, so we need to
+  // figure out the correct index to insert the CSS into
+  var index = 0;
+  var lastC = 0;
+  args[0].replace(/%[a-z%]/g, function(match) {
+    if ('%%' === match) return;
+    index++;
+    if ('%c' === match) {
+      // we only are interested in the *last* %c
+      // (the user may have provided their own)
+      lastC = index;
+    }
+  });
+
+  args.splice(lastC, 0, c);
+  return args;
+}
+
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
+
+function log() {
+  // this hackery is required for IE8/9, where
+  // the `console.log` function doesn't have 'apply'
+  return 'object' === typeof console
+    && console.log
+    && Function.prototype.apply.call(console.log, console, arguments);
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
+  return r;
+}
+
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
+
+exports.enable(load());
+
+/**
+ * Localstorage attempts to return the localstorage.
+ *
+ * This is necessary because safari throws
+ * when a user disables cookies/localstorage
+ * and you attempt to access it.
+ *
+ * @return {LocalStorage}
+ * @api private
+ */
+
+function localstorage(){
+  try {
+    return window.localStorage;
+  } catch (e) {}
+}
+
+},{"./debug":55}],55:[function(require,module,exports){
+
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = debug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = require('ms');
+
+/**
+ * The currently active debug mode names, and names to skip.
+ */
+
+exports.names = [];
+exports.skips = [];
+
+/**
+ * Map of special "%n" handling functions, for the debug "format" argument.
+ *
+ * Valid key names are a single, lowercased letter, i.e. "n".
+ */
+
+exports.formatters = {};
+
+/**
+ * Previously assigned color.
+ */
+
+var prevColor = 0;
+
+/**
+ * Previous log timestamp.
+ */
+
+var prevTime;
+
+/**
+ * Select a color.
+ *
+ * @return {Number}
+ * @api private
+ */
+
+function selectColor() {
+  return exports.colors[prevColor++ % exports.colors.length];
+}
+
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
+
+function debug(namespace) {
+
+  // define the `disabled` version
+  function disabled() {
+  }
+  disabled.enabled = false;
+
+  // define the `enabled` version
+  function enabled() {
+
+    var self = enabled;
+
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
+
+    // add the `color` if not set
+    if (null == self.useColors) self.useColors = exports.useColors();
+    if (null == self.color && self.useColors) self.color = selectColor();
+
+    var args = Array.prototype.slice.call(arguments);
+
+    args[0] = exports.coerce(args[0]);
+
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %o
+      args = ['%o'].concat(args);
+    }
+
+    // apply any `formatters` transformations
+    var index = 0;
+    args[0] = args[0].replace(/%([a-z%])/g, function(match, format) {
+      // if we encounter an escaped % then don't increase the array index
+      if (match === '%%') return match;
+      index++;
+      var formatter = exports.formatters[format];
+      if ('function' === typeof formatter) {
+        var val = args[index];
+        match = formatter.call(self, val);
+
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
+
+    if ('function' === typeof exports.formatArgs) {
+      args = exports.formatArgs.apply(self, args);
+    }
+    var logFn = enabled.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
+  enabled.enabled = true;
+
+  var fn = exports.enabled(namespace) ? enabled : disabled;
+
+  fn.namespace = namespace;
+
+  return fn;
+}
+
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
+
+function enable(namespaces) {
+  exports.save(namespaces);
+
+  var split = (namespaces || '').split(/[\s,]+/);
+  var len = split.length;
+
+  for (var i = 0; i < len; i++) {
+    if (!split[i]) continue; // ignore empty strings
+    namespaces = split[i].replace(/\*/g, '.*?');
+    if (namespaces[0] === '-') {
+      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+    } else {
+      exports.names.push(new RegExp('^' + namespaces + '$'));
+    }
+  }
+}
+
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
+
+function disable() {
+  exports.enable('');
+}
+
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
+
+function enabled(name) {
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
+    }
+  }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
+
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
+
+},{"ms":56}],56:[function(require,module,exports){
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} options
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options){
+  options = options || {};
+  if ('string' == typeof val) return parse(val);
+  return options.long
+    ? long(val)
+    : short(val);
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  str = '' + str;
+  if (str.length > 10000) return;
+  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(str);
+  if (!match) return;
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'yrs':
+    case 'yr':
+    case 'y':
+      return n * y;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'hrs':
+    case 'hr':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'mins':
+    case 'min':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 'secs':
+    case 'sec':
+    case 's':
+      return n * s;
+    case 'milliseconds':
+    case 'millisecond':
+    case 'msecs':
+    case 'msec':
+    case 'ms':
+      return n;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function short(ms) {
+  if (ms >= d) return Math.round(ms / d) + 'd';
+  if (ms >= h) return Math.round(ms / h) + 'h';
+  if (ms >= m) return Math.round(ms / m) + 'm';
+  if (ms >= s) return Math.round(ms / s) + 's';
+  return ms + 'ms';
+}
+
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function long(ms) {
+  return plural(ms, d, 'day')
+    || plural(ms, h, 'hour')
+    || plural(ms, m, 'minute')
+    || plural(ms, s, 'second')
+    || ms + ' ms';
+}
+
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, n, name) {
+  if (ms < n) return;
+  if (ms < n * 1.5) return Math.floor(ms / n) + ' ' + name;
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
+
+},{}],57:[function(require,module,exports){
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
+} else {
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
+}
+
+},{}],58:[function(require,module,exports){
+(function (global){
+/*! JSON v3.3.2 | http://bestiejs.github.io/json3 | Copyright 2012-2014, Kit Cambridge | http://kit.mit-license.org */
+;(function () {
+  // Detect the `define` function exposed by asynchronous module loaders. The
+  // strict `define` check is necessary for compatibility with `r.js`.
+  var isLoader = typeof define === "function" && define.amd;
+
+  // A set of types used to distinguish objects from primitives.
+  var objectTypes = {
+    "function": true,
+    "object": true
+  };
+
+  // Detect the `exports` object exposed by CommonJS implementations.
+  var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;
+
+  // Use the `global` object exposed by Node (including Browserify via
+  // `insert-module-globals`), Narwhal, and Ringo as the default context,
+  // and the `window` object in browsers. Rhino exports a `global` function
+  // instead.
+  var root = objectTypes[typeof window] && window || this,
+      freeGlobal = freeExports && objectTypes[typeof module] && module && !module.nodeType && typeof global == "object" && global;
+
+  if (freeGlobal && (freeGlobal["global"] === freeGlobal || freeGlobal["window"] === freeGlobal || freeGlobal["self"] === freeGlobal)) {
+    root = freeGlobal;
+  }
+
+  // Public: Initializes JSON 3 using the given `context` object, attaching the
+  // `stringify` and `parse` functions to the specified `exports` object.
+  function runInContext(context, exports) {
+    context || (context = root["Object"]());
+    exports || (exports = root["Object"]());
+
+    // Native constructor aliases.
+    var Number = context["Number"] || root["Number"],
+        String = context["String"] || root["String"],
+        Object = context["Object"] || root["Object"],
+        Date = context["Date"] || root["Date"],
+        SyntaxError = context["SyntaxError"] || root["SyntaxError"],
+        TypeError = context["TypeError"] || root["TypeError"],
+        Math = context["Math"] || root["Math"],
+        nativeJSON = context["JSON"] || root["JSON"];
+
+    // Delegate to the native `stringify` and `parse` implementations.
+    if (typeof nativeJSON == "object" && nativeJSON) {
+      exports.stringify = nativeJSON.stringify;
+      exports.parse = nativeJSON.parse;
+    }
+
+    // Convenience aliases.
+    var objectProto = Object.prototype,
+        getClass = objectProto.toString,
+        isProperty, forEach, undef;
+
+    // Test the `Date#getUTC*` methods. Based on work by @Yaffle.
+    var isExtended = new Date(-3509827334573292);
+    try {
+      // The `getUTCFullYear`, `Month`, and `Date` methods return nonsensical
+      // results for certain dates in Opera >= 10.53.
+      isExtended = isExtended.getUTCFullYear() == -109252 && isExtended.getUTCMonth() === 0 && isExtended.getUTCDate() === 1 &&
+        // Safari < 2.0.2 stores the internal millisecond time value correctly,
+        // but clips the values returned by the date methods to the range of
+        // signed 32-bit integers ([-2 ** 31, 2 ** 31 - 1]).
+        isExtended.getUTCHours() == 10 && isExtended.getUTCMinutes() == 37 && isExtended.getUTCSeconds() == 6 && isExtended.getUTCMilliseconds() == 708;
+    } catch (exception) {}
+
+    // Internal: Determines whether the native `JSON.stringify` and `parse`
+    // implementations are spec-compliant. Based on work by Ken Snyder.
+    function has(name) {
+      if (has[name] !== undef) {
+        // Return cached feature test result.
+        return has[name];
+      }
+      var isSupported;
+      if (name == "bug-string-char-index") {
+        // IE <= 7 doesn't support accessing string characters using square
+        // bracket notation. IE 8 only supports this for primitives.
+        isSupported = "a"[0] != "a";
+      } else if (name == "json") {
+        // Indicates whether both `JSON.stringify` and `JSON.parse` are
+        // supported.
+        isSupported = has("json-stringify") && has("json-parse");
+      } else {
+        var value, serialized = '{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';
+        // Test `JSON.stringify`.
+        if (name == "json-stringify") {
+          var stringify = exports.stringify, stringifySupported = typeof stringify == "function" && isExtended;
+          if (stringifySupported) {
+            // A test function object with a custom `toJSON` method.
+            (value = function () {
+              return 1;
+            }).toJSON = value;
+            try {
+              stringifySupported =
+                // Firefox 3.1b1 and b2 serialize string, number, and boolean
+                // primitives as object literals.
+                stringify(0) === "0" &&
+                // FF 3.1b1, b2, and JSON 2 serialize wrapped primitives as object
+                // literals.
+                stringify(new Number()) === "0" &&
+                stringify(new String()) == '""' &&
+                // FF 3.1b1, 2 throw an error if the value is `null`, `undefined`, or
+                // does not define a canonical JSON representation (this applies to
+                // objects with `toJSON` properties as well, *unless* they are nested
+                // within an object or array).
+                stringify(getClass) === undef &&
+                // IE 8 serializes `undefined` as `"undefined"`. Safari <= 5.1.7 and
+                // FF 3.1b3 pass this test.
+                stringify(undef) === undef &&
+                // Safari <= 5.1.7 and FF 3.1b3 throw `Error`s and `TypeError`s,
+                // respectively, if the value is omitted entirely.
+                stringify() === undef &&
+                // FF 3.1b1, 2 throw an error if the given value is not a number,
+                // string, array, object, Boolean, or `null` literal. This applies to
+                // objects with custom `toJSON` methods as well, unless they are nested
+                // inside object or array literals. YUI 3.0.0b1 ignores custom `toJSON`
+                // methods entirely.
+                stringify(value) === "1" &&
+                stringify([value]) == "[1]" &&
+                // Prototype <= 1.6.1 serializes `[undefined]` as `"[]"` instead of
+                // `"[null]"`.
+                stringify([undef]) == "[null]" &&
+                // YUI 3.0.0b1 fails to serialize `null` literals.
+                stringify(null) == "null" &&
+                // FF 3.1b1, 2 halts serialization if an array contains a function:
+                // `[1, true, getClass, 1]` serializes as "[1,true,],". FF 3.1b3
+                // elides non-JSON values from objects and arrays, unless they
+                // define custom `toJSON` methods.
+                stringify([undef, getClass, null]) == "[null,null,null]" &&
+                // Simple serialization test. FF 3.1b1 uses Unicode escape sequences
+                // where character escape codes are expected (e.g., `\b` => `\u0008`).
+                stringify({ "a": [value, true, false, null, "\x00\b\n\f\r\t"] }) == serialized &&
+                // FF 3.1b1 and b2 ignore the `filter` and `width` arguments.
+                stringify(null, value) === "1" &&
+                stringify([1, 2], null, 1) == "[\n 1,\n 2\n]" &&
+                // JSON 2, Prototype <= 1.7, and older WebKit builds incorrectly
+                // serialize extended years.
+                stringify(new Date(-8.64e15)) == '"-271821-04-20T00:00:00.000Z"' &&
+                // The milliseconds are optional in ES 5, but required in 5.1.
+                stringify(new Date(8.64e15)) == '"+275760-09-13T00:00:00.000Z"' &&
+                // Firefox <= 11.0 incorrectly serializes years prior to 0 as negative
+                // four-digit years instead of six-digit years. Credits: @Yaffle.
+                stringify(new Date(-621987552e5)) == '"-000001-01-01T00:00:00.000Z"' &&
+                // Safari <= 5.1.5 and Opera >= 10.53 incorrectly serialize millisecond
+                // values less than 1000. Credits: @Yaffle.
+                stringify(new Date(-1)) == '"1969-12-31T23:59:59.999Z"';
+            } catch (exception) {
+              stringifySupported = false;
+            }
+          }
+          isSupported = stringifySupported;
+        }
+        // Test `JSON.parse`.
+        if (name == "json-parse") {
+          var parse = exports.parse;
+          if (typeof parse == "function") {
+            try {
+              // FF 3.1b1, b2 will throw an exception if a bare literal is provided.
+              // Conforming implementations should also coerce the initial argument to
+              // a string prior to parsing.
+              if (parse("0") === 0 && !parse(false)) {
+                // Simple parsing test.
+                value = parse(serialized);
+                var parseSupported = value["a"].length == 5 && value["a"][0] === 1;
+                if (parseSupported) {
+                  try {
+                    // Safari <= 5.1.2 and FF 3.1b1 allow unescaped tabs in strings.
+                    parseSupported = !parse('"\t"');
+                  } catch (exception) {}
+                  if (parseSupported) {
+                    try {
+                      // FF 4.0 and 4.0.1 allow leading `+` signs and leading
+                      // decimal points. FF 4.0, 4.0.1, and IE 9-10 also allow
+                      // certain octal literals.
+                      parseSupported = parse("01") !== 1;
+                    } catch (exception) {}
+                  }
+                  if (parseSupported) {
+                    try {
+                      // FF 4.0, 4.0.1, and Rhino 1.7R3-R4 allow trailing decimal
+                      // points. These environments, along with FF 3.1b1 and 2,
+                      // also allow trailing commas in JSON objects and arrays.
+                      parseSupported = parse("1.") !== 1;
+                    } catch (exception) {}
+                  }
+                }
+              }
+            } catch (exception) {
+              parseSupported = false;
+            }
+          }
+          isSupported = parseSupported;
+        }
+      }
+      return has[name] = !!isSupported;
+    }
+
+    if (!has("json")) {
+      // Common `[[Class]]` name aliases.
+      var functionClass = "[object Function]",
+          dateClass = "[object Date]",
+          numberClass = "[object Number]",
+          stringClass = "[object String]",
+          arrayClass = "[object Array]",
+          booleanClass = "[object Boolean]";
+
+      // Detect incomplete support for accessing string characters by index.
+      var charIndexBuggy = has("bug-string-char-index");
+
+      // Define additional utility methods if the `Date` methods are buggy.
+      if (!isExtended) {
+        var floor = Math.floor;
+        // A mapping between the months of the year and the number of days between
+        // January 1st and the first of the respective month.
+        var Months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334];
+        // Internal: Calculates the number of days between the Unix epoch and the
+        // first day of the given month.
+        var getDay = function (year, month) {
+          return Months[month] + 365 * (year - 1970) + floor((year - 1969 + (month = +(month > 1))) / 4) - floor((year - 1901 + month) / 100) + floor((year - 1601 + month) / 400);
+        };
+      }
+
+      // Internal: Determines if a property is a direct property of the given
+      // object. Delegates to the native `Object#hasOwnProperty` method.
+      if (!(isProperty = objectProto.hasOwnProperty)) {
+        isProperty = function (property) {
+          var members = {}, constructor;
+          if ((members.__proto__ = null, members.__proto__ = {
+            // The *proto* property cannot be set multiple times in recent
+            // versions of Firefox and SeaMonkey.
+            "toString": 1
+          }, members).toString != getClass) {
+            // Safari <= 2.0.3 doesn't implement `Object#hasOwnProperty`, but
+            // supports the mutable *proto* property.
+            isProperty = function (property) {
+              // Capture and break the object's prototype chain (see section 8.6.2
+              // of the ES 5.1 spec). The parenthesized expression prevents an
+              // unsafe transformation by the Closure Compiler.
+              var original = this.__proto__, result = property in (this.__proto__ = null, this);
+              // Restore the original prototype chain.
+              this.__proto__ = original;
+              return result;
+            };
+          } else {
+            // Capture a reference to the top-level `Object` constructor.
+            constructor = members.constructor;
+            // Use the `constructor` property to simulate `Object#hasOwnProperty` in
+            // other environments.
+            isProperty = function (property) {
+              var parent = (this.constructor || constructor).prototype;
+              return property in this && !(property in parent && this[property] === parent[property]);
+            };
+          }
+          members = null;
+          return isProperty.call(this, property);
+        };
+      }
+
+      // Internal: Normalizes the `for...in` iteration algorithm across
+      // environments. Each enumerated key is yielded to a `callback` function.
+      forEach = function (object, callback) {
+        var size = 0, Properties, members, property;
+
+        // Tests for bugs in the current environment's `for...in` algorithm. The
+        // `valueOf` property inherits the non-enumerable flag from
+        // `Object.prototype` in older versions of IE, Netscape, and Mozilla.
+        (Properties = function () {
+          this.valueOf = 0;
+        }).prototype.valueOf = 0;
+
+        // Iterate over a new instance of the `Properties` class.
+        members = new Properties();
+        for (property in members) {
+          // Ignore all properties inherited from `Object.prototype`.
+          if (isProperty.call(members, property)) {
+            size++;
+          }
+        }
+        Properties = members = null;
+
+        // Normalize the iteration algorithm.
+        if (!size) {
+          // A list of non-enumerable properties inherited from `Object.prototype`.
+          members = ["valueOf", "toString", "toLocaleString", "propertyIsEnumerable", "isPrototypeOf", "hasOwnProperty", "constructor"];
+          // IE <= 8, Mozilla 1.0, and Netscape 6.2 ignore shadowed non-enumerable
+          // properties.
+          forEach = function (object, callback) {
+            var isFunction = getClass.call(object) == functionClass, property, length;
+            var hasProperty = !isFunction && typeof object.constructor != "function" && objectTypes[typeof object.hasOwnProperty] && object.hasOwnProperty || isProperty;
+            for (property in object) {
+              // Gecko <= 1.0 enumerates the `prototype` property of functions under
+              // certain conditions; IE does not.
+              if (!(isFunction && property == "prototype") && hasProperty.call(object, property)) {
+                callback(property);
+              }
+            }
+            // Manually invoke the callback for each non-enumerable property.
+            for (length = members.length; property = members[--length]; hasProperty.call(object, property) && callback(property));
+          };
+        } else if (size == 2) {
+          // Safari <= 2.0.4 enumerates shadowed properties twice.
+          forEach = function (object, callback) {
+            // Create a set of iterated properties.
+            var members = {}, isFunction = getClass.call(object) == functionClass, property;
+            for (property in object) {
+              // Store each property name to prevent double enumeration. The
+              // `prototype` property of functions is not enumerated due to cross-
+              // environment inconsistencies.
+              if (!(isFunction && property == "prototype") && !isProperty.call(members, property) && (members[property] = 1) && isProperty.call(object, property)) {
+                callback(property);
+              }
+            }
+          };
+        } else {
+          // No bugs detected; use the standard `for...in` algorithm.
+          forEach = function (object, callback) {
+            var isFunction = getClass.call(object) == functionClass, property, isConstructor;
+            for (property in object) {
+              if (!(isFunction && property == "prototype") && isProperty.call(object, property) && !(isConstructor = property === "constructor")) {
+                callback(property);
+              }
+            }
+            // Manually invoke the callback for the `constructor` property due to
+            // cross-environment inconsistencies.
+            if (isConstructor || isProperty.call(object, (property = "constructor"))) {
+              callback(property);
+            }
+          };
+        }
+        return forEach(object, callback);
+      };
+
+      // Public: Serializes a JavaScript `value` as a JSON string. The optional
+      // `filter` argument may specify either a function that alters how object and
+      // array members are serialized, or an array of strings and numbers that
+      // indicates which properties should be serialized. The optional `width`
+      // argument may be either a string or number that specifies the indentation
+      // level of the output.
+      if (!has("json-stringify")) {
+        // Internal: A map of control characters and their escaped equivalents.
+        var Escapes = {
+          92: "\\\\",
+          34: '\\"',
+          8: "\\b",
+          12: "\\f",
+          10: "\\n",
+          13: "\\r",
+          9: "\\t"
+        };
+
+        // Internal: Converts `value` into a zero-padded string such that its
+        // length is at least equal to `width`. The `width` must be <= 6.
+        var leadingZeroes = "000000";
+        var toPaddedString = function (width, value) {
+          // The `|| 0` expression is necessary to work around a bug in
+          // Opera <= 7.54u2 where `0 == -0`, but `String(-0) !== "0"`.
+          return (leadingZeroes + (value || 0)).slice(-width);
+        };
+
+        // Internal: Double-quotes a string `value`, replacing all ASCII control
+        // characters (characters with code unit values between 0 and 31) with
+        // their escaped equivalents. This is an implementation of the
+        // `Quote(value)` operation defined in ES 5.1 section 15.12.3.
+        var unicodePrefix = "\\u00";
+        var quote = function (value) {
+          var result = '"', index = 0, length = value.length, useCharIndex = !charIndexBuggy || length > 10;
+          var symbols = useCharIndex && (charIndexBuggy ? value.split("") : value);
+          for (; index < length; index++) {
+            var charCode = value.charCodeAt(index);
+            // If the character is a control character, append its Unicode or
+            // shorthand escape sequence; otherwise, append the character as-is.
+            switch (charCode) {
+              case 8: case 9: case 10: case 12: case 13: case 34: case 92:
+                result += Escapes[charCode];
+                break;
+              default:
+                if (charCode < 32) {
+                  result += unicodePrefix + toPaddedString(2, charCode.toString(16));
+                  break;
+                }
+                result += useCharIndex ? symbols[index] : value.charAt(index);
+            }
+          }
+          return result + '"';
+        };
+
+        // Internal: Recursively serializes an object. Implements the
+        // `Str(key, holder)`, `JO(value)`, and `JA(value)` operations.
+        var serialize = function (property, object, callback, properties, whitespace, indentation, stack) {
+          var value, className, year, month, date, time, hours, minutes, seconds, milliseconds, results, element, index, length, prefix, result;
+          try {
+            // Necessary for host object support.
+            value = object[property];
+          } catch (exception) {}
+          if (typeof value == "object" && value) {
+            className = getClass.call(value);
+            if (className == dateClass && !isProperty.call(value, "toJSON")) {
+              if (value > -1 / 0 && value < 1 / 0) {
+                // Dates are serialized according to the `Date#toJSON` method
+                // specified in ES 5.1 section 15.9.5.44. See section 15.9.1.15
+                // for the ISO 8601 date time string format.
+                if (getDay) {
+                  // Manually compute the year, month, date, hours, minutes,
+                  // seconds, and milliseconds if the `getUTC*` methods are
+                  // buggy. Adapted from @Yaffle's `date-shim` project.
+                  date = floor(value / 864e5);
+                  for (year = floor(date / 365.2425) + 1970 - 1; getDay(year + 1, 0) <= date; year++);
+                  for (month = floor((date - getDay(year, 0)) / 30.42); getDay(year, month + 1) <= date; month++);
+                  date = 1 + date - getDay(year, month);
+                  // The `time` value specifies the time within the day (see ES
+                  // 5.1 section 15.9.1.2). The formula `(A % B + B) % B` is used
+                  // to compute `A modulo B`, as the `%` operator does not
+                  // correspond to the `modulo` operation for negative numbers.
+                  time = (value % 864e5 + 864e5) % 864e5;
+                  // The hours, minutes, seconds, and milliseconds are obtained by
+                  // decomposing the time within the day. See section 15.9.1.10.
+                  hours = floor(time / 36e5) % 24;
+                  minutes = floor(time / 6e4) % 60;
+                  seconds = floor(time / 1e3) % 60;
+                  milliseconds = time % 1e3;
+                } else {
+                  year = value.getUTCFullYear();
+                  month = value.getUTCMonth();
+                  date = value.getUTCDate();
+                  hours = value.getUTCHours();
+                  minutes = value.getUTCMinutes();
+                  seconds = value.getUTCSeconds();
+                  milliseconds = value.getUTCMilliseconds();
+                }
+                // Serialize extended years correctly.
+                value = (year <= 0 || year >= 1e4 ? (year < 0 ? "-" : "+") + toPaddedString(6, year < 0 ? -year : year) : toPaddedString(4, year)) +
+                  "-" + toPaddedString(2, month + 1) + "-" + toPaddedString(2, date) +
+                  // Months, dates, hours, minutes, and seconds should have two
+                  // digits; milliseconds should have three.
+                  "T" + toPaddedString(2, hours) + ":" + toPaddedString(2, minutes) + ":" + toPaddedString(2, seconds) +
+                  // Milliseconds are optional in ES 5.0, but required in 5.1.
+                  "." + toPaddedString(3, milliseconds) + "Z";
+              } else {
+                value = null;
+              }
+            } else if (typeof value.toJSON == "function" && ((className != numberClass && className != stringClass && className != arrayClass) || isProperty.call(value, "toJSON"))) {
+              // Prototype <= 1.6.1 adds non-standard `toJSON` methods to the
+              // `Number`, `String`, `Date`, and `Array` prototypes. JSON 3
+              // ignores all `toJSON` methods on these objects unless they are
+              // defined directly on an instance.
+              value = value.toJSON(property);
+            }
+          }
+          if (callback) {
+            // If a replacement function was provided, call it to obtain the value
+            // for serialization.
+            value = callback.call(object, property, value);
+          }
+          if (value === null) {
+            return "null";
+          }
+          className = getClass.call(value);
+          if (className == booleanClass) {
+            // Booleans are represented literally.
+            return "" + value;
+          } else if (className == numberClass) {
+            // JSON numbers must be finite. `Infinity` and `NaN` are serialized as
+            // `"null"`.
+            return value > -1 / 0 && value < 1 / 0 ? "" + value : "null";
+          } else if (className == stringClass) {
+            // Strings are double-quoted and escaped.
+            return quote("" + value);
+          }
+          // Recursively serialize objects and arrays.
+          if (typeof value == "object") {
+            // Check for cyclic structures. This is a linear search; performance
+            // is inversely proportional to the number of unique nested objects.
+            for (length = stack.length; length--;) {
+              if (stack[length] === value) {
+                // Cyclic structures cannot be serialized by `JSON.stringify`.
+                throw TypeError();
+              }
+            }
+            // Add the object to the stack of traversed objects.
+            stack.push(value);
+            results = [];
+            // Save the current indentation level and indent one additional level.
+            prefix = indentation;
+            indentation += whitespace;
+            if (className == arrayClass) {
+              // Recursively serialize array elements.
+              for (index = 0, length = value.length; index < length; index++) {
+                element = serialize(index, value, callback, properties, whitespace, indentation, stack);
+                results.push(element === undef ? "null" : element);
+              }
+              result = results.length ? (whitespace ? "[\n" + indentation + results.join(",\n" + indentation) + "\n" + prefix + "]" : ("[" + results.join(",") + "]")) : "[]";
+            } else {
+              // Recursively serialize object members. Members are selected from
+              // either a user-specified list of property names, or the object
+              // itself.
+              forEach(properties || value, function (property) {
+                var element = serialize(property, value, callback, properties, whitespace, indentation, stack);
+                if (element !== undef) {
+                  // According to ES 5.1 section 15.12.3: "If `gap` {whitespace}
+                  // is not the empty string, let `member` {quote(property) + ":"}
+                  // be the concatenation of `member` and the `space` character."
+                  // The "`space` character" refers to the literal space
+                  // character, not the `space` {width} argument provided to
+                  // `JSON.stringify`.
+                  results.push(quote(property) + ":" + (whitespace ? " " : "") + element);
+                }
+              });
+              result = results.length ? (whitespace ? "{\n" + indentation + results.join(",\n" + indentation) + "\n" + prefix + "}" : ("{" + results.join(",") + "}")) : "{}";
+            }
+            // Remove the object from the traversed object stack.
+            stack.pop();
+            return result;
+          }
+        };
+
+        // Public: `JSON.stringify`. See ES 5.1 section 15.12.3.
+        exports.stringify = function (source, filter, width) {
+          var whitespace, callback, properties, className;
+          if (objectTypes[typeof filter] && filter) {
+            if ((className = getClass.call(filter)) == functionClass) {
+              callback = filter;
+            } else if (className == arrayClass) {
+              // Convert the property names array into a makeshift set.
+              properties = {};
+              for (var index = 0, length = filter.length, value; index < length; value = filter[index++], ((className = getClass.call(value)), className == stringClass || className == numberClass) && (properties[value] = 1));
+            }
+          }
+          if (width) {
+            if ((className = getClass.call(width)) == numberClass) {
+              // Convert the `width` to an integer and create a string containing
+              // `width` number of space characters.
+              if ((width -= width % 1) > 0) {
+                for (whitespace = "", width > 10 && (width = 10); whitespace.length < width; whitespace += " ");
+              }
+            } else if (className == stringClass) {
+              whitespace = width.length <= 10 ? width : width.slice(0, 10);
+            }
+          }
+          // Opera <= 7.54u2 discards the values associated with empty string keys
+          // (`""`) only if they are used directly within an object member list
+          // (e.g., `!("" in { "": 1})`).
+          return serialize("", (value = {}, value[""] = source, value), callback, properties, whitespace, "", []);
+        };
+      }
+
+      // Public: Parses a JSON source string.
+      if (!has("json-parse")) {
+        var fromCharCode = String.fromCharCode;
+
+        // Internal: A map of escaped control characters and their unescaped
+        // equivalents.
+        var Unescapes = {
+          92: "\\",
+          34: '"',
+          47: "/",
+          98: "\b",
+          116: "\t",
+          110: "\n",
+          102: "\f",
+          114: "\r"
+        };
+
+        // Internal: Stores the parser state.
+        var Index, Source;
+
+        // Internal: Resets the parser state and throws a `SyntaxError`.
+        var abort = function () {
+          Index = Source = null;
+          throw SyntaxError();
+        };
+
+        // Internal: Returns the next token, or `"$"` if the parser has reached
+        // the end of the source string. A token may be a string, number, `null`
+        // literal, or Boolean literal.
+        var lex = function () {
+          var source = Source, length = source.length, value, begin, position, isSigned, charCode;
+          while (Index < length) {
+            charCode = source.charCodeAt(Index);
+            switch (charCode) {
+              case 9: case 10: case 13: case 32:
+                // Skip whitespace tokens, including tabs, carriage returns, line
+                // feeds, and space characters.
+                Index++;
+                break;
+              case 123: case 125: case 91: case 93: case 58: case 44:
+                // Parse a punctuator token (`{`, `}`, `[`, `]`, `:`, or `,`) at
+                // the current position.
+                value = charIndexBuggy ? source.charAt(Index) : source[Index];
+                Index++;
+                return value;
+              case 34:
+                // `"` delimits a JSON string; advance to the next character and
+                // begin parsing the string. String tokens are prefixed with the
+                // sentinel `@` character to distinguish them from punctuators and
+                // end-of-string tokens.
+                for (value = "@", Index++; Index < length;) {
+                  charCode = source.charCodeAt(Index);
+                  if (charCode < 32) {
+                    // Unescaped ASCII control characters (those with a code unit
+                    // less than the space character) are not permitted.
+                    abort();
+                  } else if (charCode == 92) {
+                    // A reverse solidus (`\`) marks the beginning of an escaped
+                    // control character (including `"`, `\`, and `/`) or Unicode
+                    // escape sequence.
+                    charCode = source.charCodeAt(++Index);
+                    switch (charCode) {
+                      case 92: case 34: case 47: case 98: case 116: case 110: case 102: case 114:
+                        // Revive escaped control characters.
+                        value += Unescapes[charCode];
+                        Index++;
+                        break;
+                      case 117:
+                        // `\u` marks the beginning of a Unicode escape sequence.
+                        // Advance to the first character and validate the
+                        // four-digit code point.
+                        begin = ++Index;
+                        for (position = Index + 4; Index < position; Index++) {
+                          charCode = source.charCodeAt(Index);
+                          // A valid sequence comprises four hexdigits (case-
+                          // insensitive) that form a single hexadecimal value.
+                          if (!(charCode >= 48 && charCode <= 57 || charCode >= 97 && charCode <= 102 || charCode >= 65 && charCode <= 70)) {
+                            // Invalid Unicode escape sequence.
+                            abort();
+                          }
+                        }
+                        // Revive the escaped character.
+                        value += fromCharCode("0x" + source.slice(begin, Index));
+                        break;
+                      default:
+                        // Invalid escape sequence.
+                        abort();
+                    }
+                  } else {
+                    if (charCode == 34) {
+                      // An unescaped double-quote character marks the end of the
+                      // string.
+                      break;
+                    }
+                    charCode = source.charCodeAt(Index);
+                    begin = Index;
+                    // Optimize for the common case where a string is valid.
+                    while (charCode >= 32 && charCode != 92 && charCode != 34) {
+                      charCode = source.charCodeAt(++Index);
+                    }
+                    // Append the string as-is.
+                    value += source.slice(begin, Index);
+                  }
+                }
+                if (source.charCodeAt(Index) == 34) {
+                  // Advance to the next character and return the revived string.
+                  Index++;
+                  return value;
+                }
+                // Unterminated string.
+                abort();
+              default:
+                // Parse numbers and literals.
+                begin = Index;
+                // Advance past the negative sign, if one is specified.
+                if (charCode == 45) {
+                  isSigned = true;
+                  charCode = source.charCodeAt(++Index);
+                }
+                // Parse an integer or floating-point value.
+                if (charCode >= 48 && charCode <= 57) {
+                  // Leading zeroes are interpreted as octal literals.
+                  if (charCode == 48 && ((charCode = source.charCodeAt(Index + 1)), charCode >= 48 && charCode <= 57)) {
+                    // Illegal octal literal.
+                    abort();
+                  }
+                  isSigned = false;
+                  // Parse the integer component.
+                  for (; Index < length && ((charCode = source.charCodeAt(Index)), charCode >= 48 && charCode <= 57); Index++);
+                  // Floats cannot contain a leading decimal point; however, this
+                  // case is already accounted for by the parser.
+                  if (source.charCodeAt(Index) == 46) {
+                    position = ++Index;
+                    // Parse the decimal component.
+                    for (; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);
+                    if (position == Index) {
+                      // Illegal trailing decimal.
+                      abort();
+                    }
+                    Index = position;
+                  }
+                  // Parse exponents. The `e` denoting the exponent is
+                  // case-insensitive.
+                  charCode = source.charCodeAt(Index);
+                  if (charCode == 101 || charCode == 69) {
+                    charCode = source.charCodeAt(++Index);
+                    // Skip past the sign following the exponent, if one is
+                    // specified.
+                    if (charCode == 43 || charCode == 45) {
+                      Index++;
+                    }
+                    // Parse the exponential component.
+                    for (position = Index; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);
+                    if (position == Index) {
+                      // Illegal empty exponent.
+                      abort();
+                    }
+                    Index = position;
+                  }
+                  // Coerce the parsed value to a JavaScript number.
+                  return +source.slice(begin, Index);
+                }
+                // A negative sign may only precede numbers.
+                if (isSigned) {
+                  abort();
+                }
+                // `true`, `false`, and `null` literals.
+                if (source.slice(Index, Index + 4) == "true") {
+                  Index += 4;
+                  return true;
+                } else if (source.slice(Index, Index + 5) == "false") {
+                  Index += 5;
+                  return false;
+                } else if (source.slice(Index, Index + 4) == "null") {
+                  Index += 4;
+                  return null;
+                }
+                // Unrecognized token.
+                abort();
+            }
+          }
+          // Return the sentinel `$` character if the parser has reached the end
+          // of the source string.
+          return "$";
+        };
+
+        // Internal: Parses a JSON `value` token.
+        var get = function (value) {
+          var results, hasMembers;
+          if (value == "$") {
+            // Unexpected end of input.
+            abort();
+          }
+          if (typeof value == "string") {
+            if ((charIndexBuggy ? value.charAt(0) : value[0]) == "@") {
+              // Remove the sentinel `@` character.
+              return value.slice(1);
+            }
+            // Parse object and array literals.
+            if (value == "[") {
+              // Parses a JSON array, returning a new JavaScript array.
+              results = [];
+              for (;; hasMembers || (hasMembers = true)) {
+                value = lex();
+                // A closing square bracket marks the end of the array literal.
+                if (value == "]") {
+                  break;
+                }
+                // If the array literal contains elements, the current token
+                // should be a comma separating the previous element from the
+                // next.
+                if (hasMembers) {
+                  if (value == ",") {
+                    value = lex();
+                    if (value == "]") {
+                      // Unexpected trailing `,` in array literal.
+                      abort();
+                    }
+                  } else {
+                    // A `,` must separate each array element.
+                    abort();
+                  }
+                }
+                // Elisions and leading commas are not permitted.
+                if (value == ",") {
+                  abort();
+                }
+                results.push(get(value));
+              }
+              return results;
+            } else if (value == "{") {
+              // Parses a JSON object, returning a new JavaScript object.
+              results = {};
+              for (;; hasMembers || (hasMembers = true)) {
+                value = lex();
+                // A closing curly brace marks the end of the object literal.
+                if (value == "}") {
+                  break;
+                }
+                // If the object literal contains members, the current token
+                // should be a comma separator.
+                if (hasMembers) {
+                  if (value == ",") {
+                    value = lex();
+                    if (value == "}") {
+                      // Unexpected trailing `,` in object literal.
+                      abort();
+                    }
+                  } else {
+                    // A `,` must separate each object member.
+                    abort();
+                  }
+                }
+                // Leading commas are not permitted, object property names must be
+                // double-quoted strings, and a `:` must separate each property
+                // name and value.
+                if (value == "," || typeof value != "string" || (charIndexBuggy ? value.charAt(0) : value[0]) != "@" || lex() != ":") {
+                  abort();
+                }
+                results[value.slice(1)] = get(lex());
+              }
+              return results;
+            }
+            // Unexpected token encountered.
+            abort();
+          }
+          return value;
+        };
+
+        // Internal: Updates a traversed object member.
+        var update = function (source, property, callback) {
+          var element = walk(source, property, callback);
+          if (element === undef) {
+            delete source[property];
+          } else {
+            source[property] = element;
+          }
+        };
+
+        // Internal: Recursively traverses a parsed JSON object, invoking the
+        // `callback` function for each value. This is an implementation of the
+        // `Walk(holder, name)` operation defined in ES 5.1 section 15.12.2.
+        var walk = function (source, property, callback) {
+          var value = source[property], length;
+          if (typeof value == "object" && value) {
+            // `forEach` can't be used to traverse an array in Opera <= 8.54
+            // because its `Object#hasOwnProperty` implementation returns `false`
+            // for array indices (e.g., `![1, 2, 3].hasOwnProperty("0")`).
+            if (getClass.call(value) == arrayClass) {
+              for (length = value.length; length--;) {
+                update(value, length, callback);
+              }
+            } else {
+              forEach(value, function (property) {
+                update(value, property, callback);
+              });
+            }
+          }
+          return callback.call(source, property, value);
+        };
+
+        // Public: `JSON.parse`. See ES 5.1 section 15.12.2.
+        exports.parse = function (source, callback) {
+          var result, value;
+          Index = 0;
+          Source = "" + source;
+          result = get(lex());
+          // If a JSON string contains multiple tokens, it is invalid.
+          if (lex() != "$") {
+            abort();
+          }
+          // Reset the parser state.
+          Index = Source = null;
+          return callback && getClass.call(callback) == functionClass ? walk((value = {}, value[""] = result, value), "", callback) : result;
+        };
+      }
+    }
+
+    exports["runInContext"] = runInContext;
+    return exports;
+  }
+
+  if (freeExports && !isLoader) {
+    // Export for CommonJS environments.
+    runInContext(root, freeExports);
+  } else {
+    // Export for web browsers and JavaScript engines.
+    var nativeJSON = root.JSON,
+        previousJSON = root["JSON3"],
+        isRestored = false;
+
+    var JSON3 = runInContext(root, (root["JSON3"] = {
+      // Public: Restores the original value of the global `JSON` object and
+      // returns a reference to the `JSON3` object.
+      "noConflict": function () {
+        if (!isRestored) {
+          isRestored = true;
+          root.JSON = nativeJSON;
+          root["JSON3"] = previousJSON;
+          nativeJSON = previousJSON = null;
+        }
+        return JSON3;
+      }
+    }));
+
+    root.JSON = {
+      "parse": JSON3.parse,
+      "stringify": JSON3.stringify
+    };
+  }
+
+  // Export for asynchronous module loaders.
+  if (isLoader) {
+    define(function () {
+      return JSON3;
+    });
+  }
+}).call(this);
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["node_modules/json3/lib/json3.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["/*! JSON v3.3.2 | http://bestiejs.github.io/json3 | Copyright 2012-2014, Kit Cambridge | http://kit.mit-license.org */\n;(function () {\n  // Detect the `define` function exposed by asynchronous module loaders. The\n  // strict `define` check is necessary for compatibility with `r.js`.\n  var isLoader = typeof define === \"function\" && define.amd;\n\n  // A set of types used to distinguish objects from primitives.\n  var objectTypes = {\n    \"function\": true,\n    \"object\": true\n  };\n\n  // Detect the `exports` object exposed by CommonJS implementations.\n  var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;\n\n  // Use the `global` object exposed by Node (including Browserify via\n  // `insert-module-globals`), Narwhal, and Ringo as the default context,\n  // and the `window` object in browsers. Rhino exports a `global` function\n  // instead.\n  var root = objectTypes[typeof window] && window || this,\n      freeGlobal = freeExports && objectTypes[typeof module] && module && !module.nodeType && typeof global == \"object\" && global;\n\n  if (freeGlobal && (freeGlobal[\"global\"] === freeGlobal || freeGlobal[\"window\"] === freeGlobal || freeGlobal[\"self\"] === freeGlobal)) {\n    root = freeGlobal;\n  }\n\n  // Public: Initializes JSON 3 using the given `context` object, attaching the\n  // `stringify` and `parse` functions to the specified `exports` object.\n  function runInContext(context, exports) {\n    context || (context = root[\"Object\"]());\n    exports || (exports = root[\"Object\"]());\n\n    // Native constructor aliases.\n    var Number = context[\"Number\"] || root[\"Number\"],\n        String = context[\"String\"] || root[\"String\"],\n        Object = context[\"Object\"] || root[\"Object\"],\n        Date = context[\"Date\"] || root[\"Date\"],\n        SyntaxError = context[\"SyntaxError\"] || root[\"SyntaxError\"],\n        TypeError = context[\"TypeError\"] || root[\"TypeError\"],\n        Math = context[\"Math\"] || root[\"Math\"],\n        nativeJSON = context[\"JSON\"] || root[\"JSON\"];\n\n    // Delegate to the native `stringify` and `parse` implementations.\n    if (typeof nativeJSON == \"object\" && nativeJSON) {\n      exports.stringify = nativeJSON.stringify;\n      exports.parse = nativeJSON.parse;\n    }\n\n    // Convenience aliases.\n    var objectProto = Object.prototype,\n        getClass = objectProto.toString,\n        isProperty, forEach, undef;\n\n    // Test the `Date#getUTC*` methods. Based on work by @Yaffle.\n    var isExtended = new Date(-3509827334573292);\n    try {\n      // The `getUTCFullYear`, `Month`, and `Date` methods return nonsensical\n      // results for certain dates in Opera >= 10.53.\n      isExtended = isExtended.getUTCFullYear() == -109252 && isExtended.getUTCMonth() === 0 && isExtended.getUTCDate() === 1 &&\n        // Safari < 2.0.2 stores the internal millisecond time value correctly,\n        // but clips the values returned by the date methods to the range of\n        // signed 32-bit integers ([-2 ** 31, 2 ** 31 - 1]).\n        isExtended.getUTCHours() == 10 && isExtended.getUTCMinutes() == 37 && isExtended.getUTCSeconds() == 6 && isExtended.getUTCMilliseconds() == 708;\n    } catch (exception) {}\n\n    // Internal: Determines whether the native `JSON.stringify` and `parse`\n    // implementations are spec-compliant. Based on work by Ken Snyder.\n    function has(name) {\n      if (has[name] !== undef) {\n        // Return cached feature test result.\n        return has[name];\n      }\n      var isSupported;\n      if (name == \"bug-string-char-index\") {\n        // IE <= 7 doesn't support accessing string characters using square\n        // bracket notation. IE 8 only supports this for primitives.\n        isSupported = \"a\"[0] != \"a\";\n      } else if (name == \"json\") {\n        // Indicates whether both `JSON.stringify` and `JSON.parse` are\n        // supported.\n        isSupported = has(\"json-stringify\") && has(\"json-parse\");\n      } else {\n        var value, serialized = '{\"a\":[1,true,false,null,\"\\\\u0000\\\\b\\\\n\\\\f\\\\r\\\\t\"]}';\n        // Test `JSON.stringify`.\n        if (name == \"json-stringify\") {\n          var stringify = exports.stringify, stringifySupported = typeof stringify == \"function\" && isExtended;\n          if (stringifySupported) {\n            // A test function object with a custom `toJSON` method.\n            (value = function () {\n              return 1;\n            }).toJSON = value;\n            try {\n              stringifySupported =\n                // Firefox 3.1b1 and b2 serialize string, number, and boolean\n                // primitives as object literals.\n                stringify(0) === \"0\" &&\n                // FF 3.1b1, b2, and JSON 2 serialize wrapped primitives as object\n                // literals.\n                stringify(new Number()) === \"0\" &&\n                stringify(new String()) == '\"\"' &&\n                // FF 3.1b1, 2 throw an error if the value is `null`, `undefined`, or\n                // does not define a canonical JSON representation (this applies to\n                // objects with `toJSON` properties as well, *unless* they are nested\n                // within an object or array).\n                stringify(getClass) === undef &&\n                // IE 8 serializes `undefined` as `\"undefined\"`. Safari <= 5.1.7 and\n                // FF 3.1b3 pass this test.\n                stringify(undef) === undef &&\n                // Safari <= 5.1.7 and FF 3.1b3 throw `Error`s and `TypeError`s,\n                // respectively, if the value is omitted entirely.\n                stringify() === undef &&\n                // FF 3.1b1, 2 throw an error if the given value is not a number,\n                // string, array, object, Boolean, or `null` literal. This applies to\n                // objects with custom `toJSON` methods as well, unless they are nested\n                // inside object or array literals. YUI 3.0.0b1 ignores custom `toJSON`\n                // methods entirely.\n                stringify(value) === \"1\" &&\n                stringify([value]) == \"[1]\" &&\n                // Prototype <= 1.6.1 serializes `[undefined]` as `\"[]\"` instead of\n                // `\"[null]\"`.\n                stringify([undef]) == \"[null]\" &&\n                // YUI 3.0.0b1 fails to serialize `null` literals.\n                stringify(null) == \"null\" &&\n                // FF 3.1b1, 2 halts serialization if an array contains a function:\n                // `[1, true, getClass, 1]` serializes as \"[1,true,],\". FF 3.1b3\n                // elides non-JSON values from objects and arrays, unless they\n                // define custom `toJSON` methods.\n                stringify([undef, getClass, null]) == \"[null,null,null]\" &&\n                // Simple serialization test. FF 3.1b1 uses Unicode escape sequences\n                // where character escape codes are expected (e.g., `\\b` => `\\u0008`).\n                stringify({ \"a\": [value, true, false, null, \"\\x00\\b\\n\\f\\r\\t\"] }) == serialized &&\n                // FF 3.1b1 and b2 ignore the `filter` and `width` arguments.\n                stringify(null, value) === \"1\" &&\n                stringify([1, 2], null, 1) == \"[\\n 1,\\n 2\\n]\" &&\n                // JSON 2, Prototype <= 1.7, and older WebKit builds incorrectly\n                // serialize extended years.\n                stringify(new Date(-8.64e15)) == '\"-271821-04-20T00:00:00.000Z\"' &&\n                // The milliseconds are optional in ES 5, but required in 5.1.\n                stringify(new Date(8.64e15)) == '\"+275760-09-13T00:00:00.000Z\"' &&\n                // Firefox <= 11.0 incorrectly serializes years prior to 0 as negative\n                // four-digit years instead of six-digit years. Credits: @Yaffle.\n                stringify(new Date(-621987552e5)) == '\"-000001-01-01T00:00:00.000Z\"' &&\n                // Safari <= 5.1.5 and Opera >= 10.53 incorrectly serialize millisecond\n                // values less than 1000. Credits: @Yaffle.\n                stringify(new Date(-1)) == '\"1969-12-31T23:59:59.999Z\"';\n            } catch (exception) {\n              stringifySupported = false;\n            }\n          }\n          isSupported = stringifySupported;\n        }\n        // Test `JSON.parse`.\n        if (name == \"json-parse\") {\n          var parse = exports.parse;\n          if (typeof parse == \"function\") {\n            try {\n              // FF 3.1b1, b2 will throw an exception if a bare literal is provided.\n              // Conforming implementations should also coerce the initial argument to\n              // a string prior to parsing.\n              if (parse(\"0\") === 0 && !parse(false)) {\n                // Simple parsing test.\n                value = parse(serialized);\n                var parseSupported = value[\"a\"].length == 5 && value[\"a\"][0] === 1;\n                if (parseSupported) {\n                  try {\n                    // Safari <= 5.1.2 and FF 3.1b1 allow unescaped tabs in strings.\n                    parseSupported = !parse('\"\\t\"');\n                  } catch (exception) {}\n                  if (parseSupported) {\n                    try {\n                      // FF 4.0 and 4.0.1 allow leading `+` signs and leading\n                      // decimal points. FF 4.0, 4.0.1, and IE 9-10 also allow\n                      // certain octal literals.\n                      parseSupported = parse(\"01\") !== 1;\n                    } catch (exception) {}\n                  }\n                  if (parseSupported) {\n                    try {\n                      // FF 4.0, 4.0.1, and Rhino 1.7R3-R4 allow trailing decimal\n                      // points. These environments, along with FF 3.1b1 and 2,\n                      // also allow trailing commas in JSON objects and arrays.\n                      parseSupported = parse(\"1.\") !== 1;\n                    } catch (exception) {}\n                  }\n                }\n              }\n            } catch (exception) {\n              parseSupported = false;\n            }\n          }\n          isSupported = parseSupported;\n        }\n      }\n      return has[name] = !!isSupported;\n    }\n\n    if (!has(\"json\")) {\n      // Common `[[Class]]` name aliases.\n      var functionClass = \"[object Function]\",\n          dateClass = \"[object Date]\",\n          numberClass = \"[object Number]\",\n          stringClass = \"[object String]\",\n          arrayClass = \"[object Array]\",\n          booleanClass = \"[object Boolean]\";\n\n      // Detect incomplete support for accessing string characters by index.\n      var charIndexBuggy = has(\"bug-string-char-index\");\n\n      // Define additional utility methods if the `Date` methods are buggy.\n      if (!isExtended) {\n        var floor = Math.floor;\n        // A mapping between the months of the year and the number of days between\n        // January 1st and the first of the respective month.\n        var Months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334];\n        // Internal: Calculates the number of days between the Unix epoch and the\n        // first day of the given month.\n        var getDay = function (year, month) {\n          return Months[month] + 365 * (year - 1970) + floor((year - 1969 + (month = +(month > 1))) / 4) - floor((year - 1901 + month) / 100) + floor((year - 1601 + month) / 400);\n        };\n      }\n\n      // Internal: Determines if a property is a direct property of the given\n      // object. Delegates to the native `Object#hasOwnProperty` method.\n      if (!(isProperty = objectProto.hasOwnProperty)) {\n        isProperty = function (property) {\n          var members = {}, constructor;\n          if ((members.__proto__ = null, members.__proto__ = {\n            // The *proto* property cannot be set multiple times in recent\n            // versions of Firefox and SeaMonkey.\n            \"toString\": 1\n          }, members).toString != getClass) {\n            // Safari <= 2.0.3 doesn't implement `Object#hasOwnProperty`, but\n            // supports the mutable *proto* property.\n            isProperty = function (property) {\n              // Capture and break the object's prototype chain (see section 8.6.2\n              // of the ES 5.1 spec). The parenthesized expression prevents an\n              // unsafe transformation by the Closure Compiler.\n              var original = this.__proto__, result = property in (this.__proto__ = null, this);\n              // Restore the original prototype chain.\n              this.__proto__ = original;\n              return result;\n            };\n          } else {\n            // Capture a reference to the top-level `Object` constructor.\n            constructor = members.constructor;\n            // Use the `constructor` property to simulate `Object#hasOwnProperty` in\n            // other environments.\n            isProperty = function (property) {\n              var parent = (this.constructor || constructor).prototype;\n              return property in this && !(property in parent && this[property] === parent[property]);\n            };\n          }\n          members = null;\n          return isProperty.call(this, property);\n        };\n      }\n\n      // Internal: Normalizes the `for...in` iteration algorithm across\n      // environments. Each enumerated key is yielded to a `callback` function.\n      forEach = function (object, callback) {\n        var size = 0, Properties, members, property;\n\n        // Tests for bugs in the current environment's `for...in` algorithm. The\n        // `valueOf` property inherits the non-enumerable flag from\n        // `Object.prototype` in older versions of IE, Netscape, and Mozilla.\n        (Properties = function () {\n          this.valueOf = 0;\n        }).prototype.valueOf = 0;\n\n        // Iterate over a new instance of the `Properties` class.\n        members = new Properties();\n        for (property in members) {\n          // Ignore all properties inherited from `Object.prototype`.\n          if (isProperty.call(members, property)) {\n            size++;\n          }\n        }\n        Properties = members = null;\n\n        // Normalize the iteration algorithm.\n        if (!size) {\n          // A list of non-enumerable properties inherited from `Object.prototype`.\n          members = [\"valueOf\", \"toString\", \"toLocaleString\", \"propertyIsEnumerable\", \"isPrototypeOf\", \"hasOwnProperty\", \"constructor\"];\n          // IE <= 8, Mozilla 1.0, and Netscape 6.2 ignore shadowed non-enumerable\n          // properties.\n          forEach = function (object, callback) {\n            var isFunction = getClass.call(object) == functionClass, property, length;\n            var hasProperty = !isFunction && typeof object.constructor != \"function\" && objectTypes[typeof object.hasOwnProperty] && object.hasOwnProperty || isProperty;\n            for (property in object) {\n              // Gecko <= 1.0 enumerates the `prototype` property of functions under\n              // certain conditions; IE does not.\n              if (!(isFunction && property == \"prototype\") && hasProperty.call(object, property)) {\n                callback(property);\n              }\n            }\n            // Manually invoke the callback for each non-enumerable property.\n            for (length = members.length; property = members[--length]; hasProperty.call(object, property) && callback(property));\n          };\n        } else if (size == 2) {\n          // Safari <= 2.0.4 enumerates shadowed properties twice.\n          forEach = function (object, callback) {\n            // Create a set of iterated properties.\n            var members = {}, isFunction = getClass.call(object) == functionClass, property;\n            for (property in object) {\n              // Store each property name to prevent double enumeration. The\n              // `prototype` property of functions is not enumerated due to cross-\n              // environment inconsistencies.\n              if (!(isFunction && property == \"prototype\") && !isProperty.call(members, property) && (members[property] = 1) && isProperty.call(object, property)) {\n                callback(property);\n              }\n            }\n          };\n        } else {\n          // No bugs detected; use the standard `for...in` algorithm.\n          forEach = function (object, callback) {\n            var isFunction = getClass.call(object) == functionClass, property, isConstructor;\n            for (property in object) {\n              if (!(isFunction && property == \"prototype\") && isProperty.call(object, property) && !(isConstructor = property === \"constructor\")) {\n                callback(property);\n              }\n            }\n            // Manually invoke the callback for the `constructor` property due to\n            // cross-environment inconsistencies.\n            if (isConstructor || isProperty.call(object, (property = \"constructor\"))) {\n              callback(property);\n            }\n          };\n        }\n        return forEach(object, callback);\n      };\n\n      // Public: Serializes a JavaScript `value` as a JSON string. The optional\n      // `filter` argument may specify either a function that alters how object and\n      // array members are serialized, or an array of strings and numbers that\n      // indicates which properties should be serialized. The optional `width`\n      // argument may be either a string or number that specifies the indentation\n      // level of the output.\n      if (!has(\"json-stringify\")) {\n        // Internal: A map of control characters and their escaped equivalents.\n        var Escapes = {\n          92: \"\\\\\\\\\",\n          34: '\\\\\"',\n          8: \"\\\\b\",\n          12: \"\\\\f\",\n          10: \"\\\\n\",\n          13: \"\\\\r\",\n          9: \"\\\\t\"\n        };\n\n        // Internal: Converts `value` into a zero-padded string such that its\n        // length is at least equal to `width`. The `width` must be <= 6.\n        var leadingZeroes = \"000000\";\n        var toPaddedString = function (width, value) {\n          // The `|| 0` expression is necessary to work around a bug in\n          // Opera <= 7.54u2 where `0 == -0`, but `String(-0) !== \"0\"`.\n          return (leadingZeroes + (value || 0)).slice(-width);\n        };\n\n        // Internal: Double-quotes a string `value`, replacing all ASCII control\n        // characters (characters with code unit values between 0 and 31) with\n        // their escaped equivalents. This is an implementation of the\n        // `Quote(value)` operation defined in ES 5.1 section 15.12.3.\n        var unicodePrefix = \"\\\\u00\";\n        var quote = function (value) {\n          var result = '\"', index = 0, length = value.length, useCharIndex = !charIndexBuggy || length > 10;\n          var symbols = useCharIndex && (charIndexBuggy ? value.split(\"\") : value);\n          for (; index < length; index++) {\n            var charCode = value.charCodeAt(index);\n            // If the character is a control character, append its Unicode or\n            // shorthand escape sequence; otherwise, append the character as-is.\n            switch (charCode) {\n              case 8: case 9: case 10: case 12: case 13: case 34: case 92:\n                result += Escapes[charCode];\n                break;\n              default:\n                if (charCode < 32) {\n                  result += unicodePrefix + toPaddedString(2, charCode.toString(16));\n                  break;\n                }\n                result += useCharIndex ? symbols[index] : value.charAt(index);\n            }\n          }\n          return result + '\"';\n        };\n\n        // Internal: Recursively serializes an object. Implements the\n        // `Str(key, holder)`, `JO(value)`, and `JA(value)` operations.\n        var serialize = function (property, object, callback, properties, whitespace, indentation, stack) {\n          var value, className, year, month, date, time, hours, minutes, seconds, milliseconds, results, element, index, length, prefix, result;\n          try {\n            // Necessary for host object support.\n            value = object[property];\n          } catch (exception) {}\n          if (typeof value == \"object\" && value) {\n            className = getClass.call(value);\n            if (className == dateClass && !isProperty.call(value, \"toJSON\")) {\n              if (value > -1 / 0 && value < 1 / 0) {\n                // Dates are serialized according to the `Date#toJSON` method\n                // specified in ES 5.1 section 15.9.5.44. See section 15.9.1.15\n                // for the ISO 8601 date time string format.\n                if (getDay) {\n                  // Manually compute the year, month, date, hours, minutes,\n                  // seconds, and milliseconds if the `getUTC*` methods are\n                  // buggy. Adapted from @Yaffle's `date-shim` project.\n                  date = floor(value / 864e5);\n                  for (year = floor(date / 365.2425) + 1970 - 1; getDay(year + 1, 0) <= date; year++);\n                  for (month = floor((date - getDay(year, 0)) / 30.42); getDay(year, month + 1) <= date; month++);\n                  date = 1 + date - getDay(year, month);\n                  // The `time` value specifies the time within the day (see ES\n                  // 5.1 section 15.9.1.2). The formula `(A % B + B) % B` is used\n                  // to compute `A modulo B`, as the `%` operator does not\n                  // correspond to the `modulo` operation for negative numbers.\n                  time = (value % 864e5 + 864e5) % 864e5;\n                  // The hours, minutes, seconds, and milliseconds are obtained by\n                  // decomposing the time within the day. See section 15.9.1.10.\n                  hours = floor(time / 36e5) % 24;\n                  minutes = floor(time / 6e4) % 60;\n                  seconds = floor(time / 1e3) % 60;\n                  milliseconds = time % 1e3;\n                } else {\n                  year = value.getUTCFullYear();\n                  month = value.getUTCMonth();\n                  date = value.getUTCDate();\n                  hours = value.getUTCHours();\n                  minutes = value.getUTCMinutes();\n                  seconds = value.getUTCSeconds();\n                  milliseconds = value.getUTCMilliseconds();\n                }\n                // Serialize extended years correctly.\n                value = (year <= 0 || year >= 1e4 ? (year < 0 ? \"-\" : \"+\") + toPaddedString(6, year < 0 ? -year : year) : toPaddedString(4, year)) +\n                  \"-\" + toPaddedString(2, month + 1) + \"-\" + toPaddedString(2, date) +\n                  // Months, dates, hours, minutes, and seconds should have two\n                  // digits; milliseconds should have three.\n                  \"T\" + toPaddedString(2, hours) + \":\" + toPaddedString(2, minutes) + \":\" + toPaddedString(2, seconds) +\n                  // Milliseconds are optional in ES 5.0, but required in 5.1.\n                  \".\" + toPaddedString(3, milliseconds) + \"Z\";\n              } else {\n                value = null;\n              }\n            } else if (typeof value.toJSON == \"function\" && ((className != numberClass && className != stringClass && className != arrayClass) || isProperty.call(value, \"toJSON\"))) {\n              // Prototype <= 1.6.1 adds non-standard `toJSON` methods to the\n              // `Number`, `String`, `Date`, and `Array` prototypes. JSON 3\n              // ignores all `toJSON` methods on these objects unless they are\n              // defined directly on an instance.\n              value = value.toJSON(property);\n            }\n          }\n          if (callback) {\n            // If a replacement function was provided, call it to obtain the value\n            // for serialization.\n            value = callback.call(object, property, value);\n          }\n          if (value === null) {\n            return \"null\";\n          }\n          className = getClass.call(value);\n          if (className == booleanClass) {\n            // Booleans are represented literally.\n            return \"\" + value;\n          } else if (className == numberClass) {\n            // JSON numbers must be finite. `Infinity` and `NaN` are serialized as\n            // `\"null\"`.\n            return value > -1 / 0 && value < 1 / 0 ? \"\" + value : \"null\";\n          } else if (className == stringClass) {\n            // Strings are double-quoted and escaped.\n            return quote(\"\" + value);\n          }\n          // Recursively serialize objects and arrays.\n          if (typeof value == \"object\") {\n            // Check for cyclic structures. This is a linear search; performance\n            // is inversely proportional to the number of unique nested objects.\n            for (length = stack.length; length--;) {\n              if (stack[length] === value) {\n                // Cyclic structures cannot be serialized by `JSON.stringify`.\n                throw TypeError();\n              }\n            }\n            // Add the object to the stack of traversed objects.\n            stack.push(value);\n            results = [];\n            // Save the current indentation level and indent one additional level.\n            prefix = indentation;\n            indentation += whitespace;\n            if (className == arrayClass) {\n              // Recursively serialize array elements.\n              for (index = 0, length = value.length; index < length; index++) {\n                element = serialize(index, value, callback, properties, whitespace, indentation, stack);\n                results.push(element === undef ? \"null\" : element);\n              }\n              result = results.length ? (whitespace ? \"[\\n\" + indentation + results.join(\",\\n\" + indentation) + \"\\n\" + prefix + \"]\" : (\"[\" + results.join(\",\") + \"]\")) : \"[]\";\n            } else {\n              // Recursively serialize object members. Members are selected from\n              // either a user-specified list of property names, or the object\n              // itself.\n              forEach(properties || value, function (property) {\n                var element = serialize(property, value, callback, properties, whitespace, indentation, stack);\n                if (element !== undef) {\n                  // According to ES 5.1 section 15.12.3: \"If `gap` {whitespace}\n                  // is not the empty string, let `member` {quote(property) + \":\"}\n                  // be the concatenation of `member` and the `space` character.\"\n                  // The \"`space` character\" refers to the literal space\n                  // character, not the `space` {width} argument provided to\n                  // `JSON.stringify`.\n                  results.push(quote(property) + \":\" + (whitespace ? \" \" : \"\") + element);\n                }\n              });\n              result = results.length ? (whitespace ? \"{\\n\" + indentation + results.join(\",\\n\" + indentation) + \"\\n\" + prefix + \"}\" : (\"{\" + results.join(\",\") + \"}\")) : \"{}\";\n            }\n            // Remove the object from the traversed object stack.\n            stack.pop();\n            return result;\n          }\n        };\n\n        // Public: `JSON.stringify`. See ES 5.1 section 15.12.3.\n        exports.stringify = function (source, filter, width) {\n          var whitespace, callback, properties, className;\n          if (objectTypes[typeof filter] && filter) {\n            if ((className = getClass.call(filter)) == functionClass) {\n              callback = filter;\n            } else if (className == arrayClass) {\n              // Convert the property names array into a makeshift set.\n              properties = {};\n              for (var index = 0, length = filter.length, value; index < length; value = filter[index++], ((className = getClass.call(value)), className == stringClass || className == numberClass) && (properties[value] = 1));\n            }\n          }\n          if (width) {\n            if ((className = getClass.call(width)) == numberClass) {\n              // Convert the `width` to an integer and create a string containing\n              // `width` number of space characters.\n              if ((width -= width % 1) > 0) {\n                for (whitespace = \"\", width > 10 && (width = 10); whitespace.length < width; whitespace += \" \");\n              }\n            } else if (className == stringClass) {\n              whitespace = width.length <= 10 ? width : width.slice(0, 10);\n            }\n          }\n          // Opera <= 7.54u2 discards the values associated with empty string keys\n          // (`\"\"`) only if they are used directly within an object member list\n          // (e.g., `!(\"\" in { \"\": 1})`).\n          return serialize(\"\", (value = {}, value[\"\"] = source, value), callback, properties, whitespace, \"\", []);\n        };\n      }\n\n      // Public: Parses a JSON source string.\n      if (!has(\"json-parse\")) {\n        var fromCharCode = String.fromCharCode;\n\n        // Internal: A map of escaped control characters and their unescaped\n        // equivalents.\n        var Unescapes = {\n          92: \"\\\\\",\n          34: '\"',\n          47: \"/\",\n          98: \"\\b\",\n          116: \"\\t\",\n          110: \"\\n\",\n          102: \"\\f\",\n          114: \"\\r\"\n        };\n\n        // Internal: Stores the parser state.\n        var Index, Source;\n\n        // Internal: Resets the parser state and throws a `SyntaxError`.\n        var abort = function () {\n          Index = Source = null;\n          throw SyntaxError();\n        };\n\n        // Internal: Returns the next token, or `\"$\"` if the parser has reached\n        // the end of the source string. A token may be a string, number, `null`\n        // literal, or Boolean literal.\n        var lex = function () {\n          var source = Source, length = source.length, value, begin, position, isSigned, charCode;\n          while (Index < length) {\n            charCode = source.charCodeAt(Index);\n            switch (charCode) {\n              case 9: case 10: case 13: case 32:\n                // Skip whitespace tokens, including tabs, carriage returns, line\n                // feeds, and space characters.\n                Index++;\n                break;\n              case 123: case 125: case 91: case 93: case 58: case 44:\n                // Parse a punctuator token (`{`, `}`, `[`, `]`, `:`, or `,`) at\n                // the current position.\n                value = charIndexBuggy ? source.charAt(Index) : source[Index];\n                Index++;\n                return value;\n              case 34:\n                // `\"` delimits a JSON string; advance to the next character and\n                // begin parsing the string. String tokens are prefixed with the\n                // sentinel `@` character to distinguish them from punctuators and\n                // end-of-string tokens.\n                for (value = \"@\", Index++; Index < length;) {\n                  charCode = source.charCodeAt(Index);\n                  if (charCode < 32) {\n                    // Unescaped ASCII control characters (those with a code unit\n                    // less than the space character) are not permitted.\n                    abort();\n                  } else if (charCode == 92) {\n                    // A reverse solidus (`\\`) marks the beginning of an escaped\n                    // control character (including `\"`, `\\`, and `/`) or Unicode\n                    // escape sequence.\n                    charCode = source.charCodeAt(++Index);\n                    switch (charCode) {\n                      case 92: case 34: case 47: case 98: case 116: case 110: case 102: case 114:\n                        // Revive escaped control characters.\n                        value += Unescapes[charCode];\n                        Index++;\n                        break;\n                      case 117:\n                        // `\\u` marks the beginning of a Unicode escape sequence.\n                        // Advance to the first character and validate the\n                        // four-digit code point.\n                        begin = ++Index;\n                        for (position = Index + 4; Index < position; Index++) {\n                          charCode = source.charCodeAt(Index);\n                          // A valid sequence comprises four hexdigits (case-\n                          // insensitive) that form a single hexadecimal value.\n                          if (!(charCode >= 48 && charCode <= 57 || charCode >= 97 && charCode <= 102 || charCode >= 65 && charCode <= 70)) {\n                            // Invalid Unicode escape sequence.\n                            abort();\n                          }\n                        }\n                        // Revive the escaped character.\n                        value += fromCharCode(\"0x\" + source.slice(begin, Index));\n                        break;\n                      default:\n                        // Invalid escape sequence.\n                        abort();\n                    }\n                  } else {\n                    if (charCode == 34) {\n                      // An unescaped double-quote character marks the end of the\n                      // string.\n                      break;\n                    }\n                    charCode = source.charCodeAt(Index);\n                    begin = Index;\n                    // Optimize for the common case where a string is valid.\n                    while (charCode >= 32 && charCode != 92 && charCode != 34) {\n                      charCode = source.charCodeAt(++Index);\n                    }\n                    // Append the string as-is.\n                    value += source.slice(begin, Index);\n                  }\n                }\n                if (source.charCodeAt(Index) == 34) {\n                  // Advance to the next character and return the revived string.\n                  Index++;\n                  return value;\n                }\n                // Unterminated string.\n                abort();\n              default:\n                // Parse numbers and literals.\n                begin = Index;\n                // Advance past the negative sign, if one is specified.\n                if (charCode == 45) {\n                  isSigned = true;\n                  charCode = source.charCodeAt(++Index);\n                }\n                // Parse an integer or floating-point value.\n                if (charCode >= 48 && charCode <= 57) {\n                  // Leading zeroes are interpreted as octal literals.\n                  if (charCode == 48 && ((charCode = source.charCodeAt(Index + 1)), charCode >= 48 && charCode <= 57)) {\n                    // Illegal octal literal.\n                    abort();\n                  }\n                  isSigned = false;\n                  // Parse the integer component.\n                  for (; Index < length && ((charCode = source.charCodeAt(Index)), charCode >= 48 && charCode <= 57); Index++);\n                  // Floats cannot contain a leading decimal point; however, this\n                  // case is already accounted for by the parser.\n                  if (source.charCodeAt(Index) == 46) {\n                    position = ++Index;\n                    // Parse the decimal component.\n                    for (; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);\n                    if (position == Index) {\n                      // Illegal trailing decimal.\n                      abort();\n                    }\n                    Index = position;\n                  }\n                  // Parse exponents. The `e` denoting the exponent is\n                  // case-insensitive.\n                  charCode = source.charCodeAt(Index);\n                  if (charCode == 101 || charCode == 69) {\n                    charCode = source.charCodeAt(++Index);\n                    // Skip past the sign following the exponent, if one is\n                    // specified.\n                    if (charCode == 43 || charCode == 45) {\n                      Index++;\n                    }\n                    // Parse the exponential component.\n                    for (position = Index; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);\n                    if (position == Index) {\n                      // Illegal empty exponent.\n                      abort();\n                    }\n                    Index = position;\n                  }\n                  // Coerce the parsed value to a JavaScript number.\n                  return +source.slice(begin, Index);\n                }\n                // A negative sign may only precede numbers.\n                if (isSigned) {\n                  abort();\n                }\n                // `true`, `false`, and `null` literals.\n                if (source.slice(Index, Index + 4) == \"true\") {\n                  Index += 4;\n                  return true;\n                } else if (source.slice(Index, Index + 5) == \"false\") {\n                  Index += 5;\n                  return false;\n                } else if (source.slice(Index, Index + 4) == \"null\") {\n                  Index += 4;\n                  return null;\n                }\n                // Unrecognized token.\n                abort();\n            }\n          }\n          // Return the sentinel `$` character if the parser has reached the end\n          // of the source string.\n          return \"$\";\n        };\n\n        // Internal: Parses a JSON `value` token.\n        var get = function (value) {\n          var results, hasMembers;\n          if (value == \"$\") {\n            // Unexpected end of input.\n            abort();\n          }\n          if (typeof value == \"string\") {\n            if ((charIndexBuggy ? value.charAt(0) : value[0]) == \"@\") {\n              // Remove the sentinel `@` character.\n              return value.slice(1);\n            }\n            // Parse object and array literals.\n            if (value == \"[\") {\n              // Parses a JSON array, returning a new JavaScript array.\n              results = [];\n              for (;; hasMembers || (hasMembers = true)) {\n                value = lex();\n                // A closing square bracket marks the end of the array literal.\n                if (value == \"]\") {\n                  break;\n                }\n                // If the array literal contains elements, the current token\n                // should be a comma separating the previous element from the\n                // next.\n                if (hasMembers) {\n                  if (value == \",\") {\n                    value = lex();\n                    if (value == \"]\") {\n                      // Unexpected trailing `,` in array literal.\n                      abort();\n                    }\n                  } else {\n                    // A `,` must separate each array element.\n                    abort();\n                  }\n                }\n                // Elisions and leading commas are not permitted.\n                if (value == \",\") {\n                  abort();\n                }\n                results.push(get(value));\n              }\n              return results;\n            } else if (value == \"{\") {\n              // Parses a JSON object, returning a new JavaScript object.\n              results = {};\n              for (;; hasMembers || (hasMembers = true)) {\n                value = lex();\n                // A closing curly brace marks the end of the object literal.\n                if (value == \"}\") {\n                  break;\n                }\n                // If the object literal contains members, the current token\n                // should be a comma separator.\n                if (hasMembers) {\n                  if (value == \",\") {\n                    value = lex();\n                    if (value == \"}\") {\n                      // Unexpected trailing `,` in object literal.\n                      abort();\n                    }\n                  } else {\n                    // A `,` must separate each object member.\n                    abort();\n                  }\n                }\n                // Leading commas are not permitted, object property names must be\n                // double-quoted strings, and a `:` must separate each property\n                // name and value.\n                if (value == \",\" || typeof value != \"string\" || (charIndexBuggy ? value.charAt(0) : value[0]) != \"@\" || lex() != \":\") {\n                  abort();\n                }\n                results[value.slice(1)] = get(lex());\n              }\n              return results;\n            }\n            // Unexpected token encountered.\n            abort();\n          }\n          return value;\n        };\n\n        // Internal: Updates a traversed object member.\n        var update = function (source, property, callback) {\n          var element = walk(source, property, callback);\n          if (element === undef) {\n            delete source[property];\n          } else {\n            source[property] = element;\n          }\n        };\n\n        // Internal: Recursively traverses a parsed JSON object, invoking the\n        // `callback` function for each value. This is an implementation of the\n        // `Walk(holder, name)` operation defined in ES 5.1 section 15.12.2.\n        var walk = function (source, property, callback) {\n          var value = source[property], length;\n          if (typeof value == \"object\" && value) {\n            // `forEach` can't be used to traverse an array in Opera <= 8.54\n            // because its `Object#hasOwnProperty` implementation returns `false`\n            // for array indices (e.g., `![1, 2, 3].hasOwnProperty(\"0\")`).\n            if (getClass.call(value) == arrayClass) {\n              for (length = value.length; length--;) {\n                update(value, length, callback);\n              }\n            } else {\n              forEach(value, function (property) {\n                update(value, property, callback);\n              });\n            }\n          }\n          return callback.call(source, property, value);\n        };\n\n        // Public: `JSON.parse`. See ES 5.1 section 15.12.2.\n        exports.parse = function (source, callback) {\n          var result, value;\n          Index = 0;\n          Source = \"\" + source;\n          result = get(lex());\n          // If a JSON string contains multiple tokens, it is invalid.\n          if (lex() != \"$\") {\n            abort();\n          }\n          // Reset the parser state.\n          Index = Source = null;\n          return callback && getClass.call(callback) == functionClass ? walk((value = {}, value[\"\"] = result, value), \"\", callback) : result;\n        };\n      }\n    }\n\n    exports[\"runInContext\"] = runInContext;\n    return exports;\n  }\n\n  if (freeExports && !isLoader) {\n    // Export for CommonJS environments.\n    runInContext(root, freeExports);\n  } else {\n    // Export for web browsers and JavaScript engines.\n    var nativeJSON = root.JSON,\n        previousJSON = root[\"JSON3\"],\n        isRestored = false;\n\n    var JSON3 = runInContext(root, (root[\"JSON3\"] = {\n      // Public: Restores the original value of the global `JSON` object and\n      // returns a reference to the `JSON3` object.\n      \"noConflict\": function () {\n        if (!isRestored) {\n          isRestored = true;\n          root.JSON = nativeJSON;\n          root[\"JSON3\"] = previousJSON;\n          nativeJSON = previousJSON = null;\n        }\n        return JSON3;\n      }\n    }));\n\n    root.JSON = {\n      \"parse\": JSON3.parse,\n      \"stringify\": JSON3.stringify\n    };\n  }\n\n  // Export for asynchronous module loaders.\n  if (isLoader) {\n    define(function () {\n      return JSON3;\n    });\n  }\n}).call(this);\n"]}
+},{}],59:[function(require,module,exports){
+'use strict';
+
+var required = require('requires-port')
+  , lolcation = require('./lolcation')
+  , qs = require('querystringify')
+  , relativere = /^\/(?!\/)/
+  , protocolre = /^([a-z0-9.+-]+:)?(\/\/)?(.*)$/i; // actual protocol is first match
+
+/**
+ * These are the parse instructions for the URL parsers, it informs the parser
+ * about:
+ *
+ * 0. The char it Needs to parse, if it's a string it should be done using
+ *    indexOf, RegExp using exec and NaN means set as current value.
+ * 1. The property we should set when parsing this value.
+ * 2. Indication if it's backwards or forward parsing, when set as number it's
+ *    the value of extra chars that should be split off.
+ * 3. Inherit from location if non existing in the parser.
+ * 4. `toLowerCase` the resulting value.
+ */
+var instructions = [
+  ['#', 'hash'],                        // Extract from the back.
+  ['?', 'query'],                       // Extract from the back.
+  ['/', 'pathname'],                    // Extract from the back.
+  ['@', 'auth', 1],                     // Extract from the front.
+  [NaN, 'host', undefined, 1, 1],       // Set left over value.
+  [/\:(\d+)$/, 'port'],                 // RegExp the back.
+  [NaN, 'hostname', undefined, 1, 1]    // Set left over.
+];
+
+ /**
+ * @typedef ProtocolExtract
+ * @type Object
+ * @property {String} protocol Protocol matched in the URL, in lowercase
+ * @property {Boolean} slashes Indicates whether the protocol is followed by double slash ("//")
+ * @property {String} rest     Rest of the URL that is not part of the protocol
+ */
+
+ /**
+  * Extract protocol information from a URL with/without double slash ("//")
+  *
+  * @param  {String} address   URL we want to extract from.
+  * @return {ProtocolExtract}  Extracted information
+  * @private
+  */
+function extractProtocol(address) {
+  var match = protocolre.exec(address);
+  return {
+    protocol: match[1] ? match[1].toLowerCase() : '',
+    slashes: !!match[2],
+    rest: match[3] ? match[3] : ''
+  };
+}
+
+/**
+ * The actual URL instance. Instead of returning an object we've opted-in to
+ * create an actual constructor as it's much more memory efficient and
+ * faster and it pleases my CDO.
+ *
+ * @constructor
+ * @param {String} address URL we want to parse.
+ * @param {Object|String} location Location defaults for relative paths.
+ * @param {Boolean|Function} parser Parser for the query string.
+ * @api public
+ */
+function URL(address, location, parser) {
+  if (!(this instanceof URL)) {
+    return new URL(address, location, parser);
+  }
+
+  var relative = relativere.test(address)
+    , parse, instruction, index, key
+    , type = typeof location
+    , url = this
+    , i = 0;
+
+  //
+  // The following if statements allows this module two have compatibility with
+  // 2 different API:
+  //
+  // 1. Node.js's `url.parse` api which accepts a URL, boolean as arguments
+  //    where the boolean indicates that the query string should also be parsed.
+  //
+  // 2. The `URL` interface of the browser which accepts a URL, object as
+  //    arguments. The supplied object will be used as default values / fall-back
+  //    for relative paths.
+  //
+  if ('object' !== type && 'string' !== type) {
+    parser = location;
+    location = null;
+  }
+
+  if (parser && 'function' !== typeof parser) {
+    parser = qs.parse;
+  }
+
+  location = lolcation(location);
+
+  // extract protocol information before running the instructions
+  var extracted = extractProtocol(address);
+  url.protocol = extracted.protocol || location.protocol || '';
+  url.slashes = extracted.slashes || location.slashes;
+  address = extracted.rest;
+
+  for (; i < instructions.length; i++) {
+    instruction = instructions[i];
+    parse = instruction[0];
+    key = instruction[1];
+
+    if (parse !== parse) {
+      url[key] = address;
+    } else if ('string' === typeof parse) {
+      if (~(index = address.indexOf(parse))) {
+        if ('number' === typeof instruction[2]) {
+          url[key] = address.slice(0, index);
+          address = address.slice(index + instruction[2]);
+        } else {
+          url[key] = address.slice(index);
+          address = address.slice(0, index);
+        }
+      }
+    } else if (index = parse.exec(address)) {
+      url[key] = index[1];
+      address = address.slice(0, address.length - index[0].length);
+    }
+
+    url[key] = url[key] || (instruction[3] || ('port' === key && relative) ? location[key] || '' : '');
+
+    //
+    // Hostname, host and protocol should be lowercased so they can be used to
+    // create a proper `origin`.
+    //
+    if (instruction[4]) {
+      url[key] = url[key].toLowerCase();
+    }
+  }
+
+  //
+  // Also parse the supplied query string in to an object. If we're supplied
+  // with a custom parser as function use that instead of the default build-in
+  // parser.
+  //
+  if (parser) url.query = parser(url.query);
+
+  //
+  // We should not add port numbers if they are already the default port number
+  // for a given protocol. As the host also contains the port number we're going
+  // override it with the hostname which contains no port number.
+  //
+  if (!required(url.port, url.protocol)) {
+    url.host = url.hostname;
+    url.port = '';
+  }
+
+  //
+  // Parse down the `auth` for the username and password.
+  //
+  url.username = url.password = '';
+  if (url.auth) {
+    instruction = url.auth.split(':');
+    url.username = instruction[0] || '';
+    url.password = instruction[1] || '';
+  }
+
+  //
+  // The href is just the compiled result.
+  //
+  url.href = url.toString();
+}
+
+/**
+ * This is convenience method for changing properties in the URL instance to
+ * insure that they all propagate correctly.
+ *
+ * @param {String} prop          Property we need to adjust.
+ * @param {Mixed} value          The newly assigned value.
+ * @param {Boolean|Function} fn  When setting the query, it will be the function used to parse
+ *                               the query.
+ *                               When setting the protocol, double slash will be removed from
+ *                               the final url if it is true.
+ * @returns {URL}
+ * @api public
+ */
+URL.prototype.set = function set(part, value, fn) {
+  var url = this;
+
+  if ('query' === part) {
+    if ('string' === typeof value && value.length) {
+      value = (fn || qs.parse)(value);
+    }
+
+    url[part] = value;
+  } else if ('port' === part) {
+    url[part] = value;
+
+    if (!required(value, url.protocol)) {
+      url.host = url.hostname;
+      url[part] = '';
+    } else if (value) {
+      url.host = url.hostname +':'+ value;
+    }
+  } else if ('hostname' === part) {
+    url[part] = value;
+
+    if (url.port) value += ':'+ url.port;
+    url.host = value;
+  } else if ('host' === part) {
+    url[part] = value;
+
+    if (/\:\d+/.test(value)) {
+      value = value.split(':');
+      url.hostname = value[0];
+      url.port = value[1];
+    }
+  } else if ('protocol' === part) {
+    url.protocol = value;
+    url.slashes = !fn;
+  } else {
+    url[part] = value;
+  }
+
+  url.href = url.toString();
+  return url;
+};
+
+/**
+ * Transform the properties back in to a valid and full URL string.
+ *
+ * @param {Function} stringify Optional query stringify function.
+ * @returns {String}
+ * @api public
+ */
+URL.prototype.toString = function toString(stringify) {
+  if (!stringify || 'function' !== typeof stringify) stringify = qs.stringify;
+
+  var query
+    , url = this
+    , protocol = url.protocol;
+
+  if (protocol && protocol.charAt(protocol.length - 1) !== ':') protocol += ':';
+
+  var result = protocol + (url.slashes ? '//' : '');
+
+  if (url.username) {
+    result += url.username;
+    if (url.password) result += ':'+ url.password;
+    result += '@';
+  }
+
+  result += url.hostname;
+  if (url.port) result += ':'+ url.port;
+
+  result += url.pathname;
+
+  query = 'object' === typeof url.query ? stringify(url.query) : url.query;
+  if (query) result += '?' !== query.charAt(0) ? '?'+ query : query;
+
+  if (url.hash) result += url.hash;
+
+  return result;
+};
+
+//
+// Expose the URL parser and some additional properties that might be useful for
+// others.
+//
+URL.qs = qs;
+URL.location = lolcation;
+module.exports = URL;
+
+},{"./lolcation":60,"querystringify":61,"requires-port":62}],60:[function(require,module,exports){
+(function (global){
+'use strict';
+
+var slashes = /^[A-Za-z][A-Za-z0-9+-.]*:\/\//;
+
+/**
+ * These properties should not be copied or inherited from. This is only needed
+ * for all non blob URL's as a blob URL does not include a hash, only the
+ * origin.
+ *
+ * @type {Object}
+ * @private
+ */
+var ignore = { hash: 1, query: 1 }
+  , URL;
+
+/**
+ * The location object differs when your code is loaded through a normal page,
+ * Worker or through a worker using a blob. And with the blobble begins the
+ * trouble as the location object will contain the URL of the blob, not the
+ * location of the page where our code is loaded in. The actual origin is
+ * encoded in the `pathname` so we can thankfully generate a good "default"
+ * location from it so we can generate proper relative URL's again.
+ *
+ * @param {Object|String} loc Optional default location object.
+ * @returns {Object} lolcation object.
+ * @api public
+ */
+module.exports = function lolcation(loc) {
+  loc = loc || global.location || {};
+  URL = URL || require('./');
+
+  var finaldestination = {}
+    , type = typeof loc
+    , key;
+
+  if ('blob:' === loc.protocol) {
+    finaldestination = new URL(unescape(loc.pathname), {});
+  } else if ('string' === type) {
+    finaldestination = new URL(loc, {});
+    for (key in ignore) delete finaldestination[key];
+  } else if ('object' === type) {
+    for (key in loc) {
+      if (key in ignore) continue;
+      finaldestination[key] = loc[key];
+    }
+
+    if (finaldestination.slashes === undefined) {
+      finaldestination.slashes = slashes.test(loc.href);
+    }
+  }
+
+  return finaldestination;
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy91cmwtcGFyc2UvbG9sY2F0aW9uLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIHNsYXNoZXMgPSAvXltBLVphLXpdW0EtWmEtejAtOSstLl0qOlxcL1xcLy87XG5cbi8qKlxuICogVGhlc2UgcHJvcGVydGllcyBzaG91bGQgbm90IGJlIGNvcGllZCBvciBpbmhlcml0ZWQgZnJvbS4gVGhpcyBpcyBvbmx5IG5lZWRlZFxuICogZm9yIGFsbCBub24gYmxvYiBVUkwncyBhcyBhIGJsb2IgVVJMIGRvZXMgbm90IGluY2x1ZGUgYSBoYXNoLCBvbmx5IHRoZVxuICogb3JpZ2luLlxuICpcbiAqIEB0eXBlIHtPYmplY3R9XG4gKiBAcHJpdmF0ZVxuICovXG52YXIgaWdub3JlID0geyBoYXNoOiAxLCBxdWVyeTogMSB9XG4gICwgVVJMO1xuXG4vKipcbiAqIFRoZSBsb2NhdGlvbiBvYmplY3QgZGlmZmVycyB3aGVuIHlvdXIgY29kZSBpcyBsb2FkZWQgdGhyb3VnaCBhIG5vcm1hbCBwYWdlLFxuICogV29ya2VyIG9yIHRocm91Z2ggYSB3b3JrZXIgdXNpbmcgYSBibG9iLiBBbmQgd2l0aCB0aGUgYmxvYmJsZSBiZWdpbnMgdGhlXG4gKiB0cm91YmxlIGFzIHRoZSBsb2NhdGlvbiBvYmplY3Qgd2lsbCBjb250YWluIHRoZSBVUkwgb2YgdGhlIGJsb2IsIG5vdCB0aGVcbiAqIGxvY2F0aW9uIG9mIHRoZSBwYWdlIHdoZXJlIG91ciBjb2RlIGlzIGxvYWRlZCBpbi4gVGhlIGFjdHVhbCBvcmlnaW4gaXNcbiAqIGVuY29kZWQgaW4gdGhlIGBwYXRobmFtZWAgc28gd2UgY2FuIHRoYW5rZnVsbHkgZ2VuZXJhdGUgYSBnb29kIFwiZGVmYXVsdFwiXG4gKiBsb2NhdGlvbiBmcm9tIGl0IHNvIHdlIGNhbiBnZW5lcmF0ZSBwcm9wZXIgcmVsYXRpdmUgVVJMJ3MgYWdhaW4uXG4gKlxuICogQHBhcmFtIHtPYmplY3R8U3RyaW5nfSBsb2MgT3B0aW9uYWwgZGVmYXVsdCBsb2NhdGlvbiBvYmplY3QuXG4gKiBAcmV0dXJucyB7T2JqZWN0fSBsb2xjYXRpb24gb2JqZWN0LlxuICogQGFwaSBwdWJsaWNcbiAqL1xubW9kdWxlLmV4cG9ydHMgPSBmdW5jdGlvbiBsb2xjYXRpb24obG9jKSB7XG4gIGxvYyA9IGxvYyB8fCBnbG9iYWwubG9jYXRpb24gfHwge307XG4gIFVSTCA9IFVSTCB8fCByZXF1aXJlKCcuLycpO1xuXG4gIHZhciBmaW5hbGRlc3RpbmF0aW9uID0ge31cbiAgICAsIHR5cGUgPSB0eXBlb2YgbG9jXG4gICAgLCBrZXk7XG5cbiAgaWYgKCdibG9iOicgPT09IGxvYy5wcm90b2NvbCkge1xuICAgIGZpbmFsZGVzdGluYXRpb24gPSBuZXcgVVJMKHVuZXNjYXBlKGxvYy5wYXRobmFtZSksIHt9KTtcbiAgfSBlbHNlIGlmICgnc3RyaW5nJyA9PT0gdHlwZSkge1xuICAgIGZpbmFsZGVzdGluYXRpb24gPSBuZXcgVVJMKGxvYywge30pO1xuICAgIGZvciAoa2V5IGluIGlnbm9yZSkgZGVsZXRlIGZpbmFsZGVzdGluYXRpb25ba2V5XTtcbiAgfSBlbHNlIGlmICgnb2JqZWN0JyA9PT0gdHlwZSkge1xuICAgIGZvciAoa2V5IGluIGxvYykge1xuICAgICAgaWYgKGtleSBpbiBpZ25vcmUpIGNvbnRpbnVlO1xuICAgICAgZmluYWxkZXN0aW5hdGlvbltrZXldID0gbG9jW2tleV07XG4gICAgfVxuXG4gICAgaWYgKGZpbmFsZGVzdGluYXRpb24uc2xhc2hlcyA9PT0gdW5kZWZpbmVkKSB7XG4gICAgICBmaW5hbGRlc3RpbmF0aW9uLnNsYXNoZXMgPSBzbGFzaGVzLnRlc3QobG9jLmhyZWYpO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBmaW5hbGRlc3RpbmF0aW9uO1xufTtcbiJdfQ==
+},{"./":59}],61:[function(require,module,exports){
+'use strict';
+
+var has = Object.prototype.hasOwnProperty;
+
+/**
+ * Simple query string parser.
+ *
+ * @param {String} query The query string that needs to be parsed.
+ * @returns {Object}
+ * @api public
+ */
+function querystring(query) {
+  var parser = /([^=?&]+)=([^&]*)/g
+    , result = {}
+    , part;
+
+  //
+  // Little nifty parsing hack, leverage the fact that RegExp.exec increments
+  // the lastIndex property so we can continue executing this loop until we've
+  // parsed all results.
+  //
+  for (;
+    part = parser.exec(query);
+    result[decodeURIComponent(part[1])] = decodeURIComponent(part[2])
+  );
+
+  return result;
+}
+
+/**
+ * Transform a query string to an object.
+ *
+ * @param {Object} obj Object that should be transformed.
+ * @param {String} prefix Optional prefix.
+ * @returns {String}
+ * @api public
+ */
+function querystringify(obj, prefix) {
+  prefix = prefix || '';
+
+  var pairs = [];
+
+  //
+  // Optionally prefix with a '?' if needed
+  //
+  if ('string' !== typeof prefix) prefix = '?';
+
+  for (var key in obj) {
+    if (has.call(obj, key)) {
+      pairs.push(encodeURIComponent(key) +'='+ encodeURIComponent(obj[key]));
+    }
+  }
+
+  return pairs.length ? prefix + pairs.join('&') : '';
+}
+
+//
+// Expose the module.
+//
+exports.stringify = querystringify;
+exports.parse = querystring;
+
+},{}],62:[function(require,module,exports){
+'use strict';
+
+/**
+ * Check if we're required to add a port number.
+ *
+ * @see https://url.spec.whatwg.org/#default-port
+ * @param {Number|String} port Port number we need to check
+ * @param {String} protocol Protocol we need to check against.
+ * @returns {Boolean} Is it a default port for the given protocol
+ * @api private
+ */
+module.exports = function required(port, protocol) {
+  protocol = protocol.split(':')[0];
+  port = +port;
+
+  if (!port) return false;
+
+  switch (protocol) {
+    case 'http':
+    case 'ws':
+    return port !== 80;
+
+    case 'https':
+    case 'wss':
+    return port !== 443;
+
+    case 'ftp':
+    return port !== 21;
+
+    case 'gopher':
+    return port !== 70;
+
+    case 'file':
+    return false;
+  }
+
+  return port !== 0;
+};
+
+},{}]},{},[1])(1)
+});
+
+
+//# sourceMappingURL=sockjs.js.map
\ No newline at end of file
diff --git a/src/main/resources/static/sockjs/dist/sockjs.js.map b/src/main/resources/static/sockjs/dist/sockjs.js.map
new file mode 100644
index 0000000000000000000000000000000000000000..8380c23fd16e87ca5133f169a33a637c459b1c0e
--- /dev/null
+++ b/src/main/resources/static/sockjs/dist/sockjs.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["node_modules/browserify/node_modules/browser-pack/_prelude.js","lib/entry.js","lib/event/close.js","lib/event/emitter.js","lib/event/event.js","lib/event/eventtarget.js","lib/event/trans-message.js","lib/facade.js","lib/iframe-bootstrap.js","lib/info-ajax.js","lib/info-iframe-receiver.js","lib/info-iframe.js","lib/info-receiver.js","lib/location.js","lib/main.js","lib/shims.js","lib/transport-list.js","lib/transport/browser/abstract-xhr.js","lib/transport/browser/eventsource.js","lib/transport/browser/websocket.js","lib/transport/eventsource.js","lib/transport/htmlfile.js","lib/transport/iframe.js","lib/transport/jsonp-polling.js","lib/transport/lib/ajax-based.js","lib/transport/lib/buffered-sender.js","lib/transport/lib/iframe-wrap.js","lib/transport/lib/polling.js","lib/transport/lib/sender-receiver.js","lib/transport/receiver/eventsource.js","lib/transport/receiver/htmlfile.js","lib/transport/receiver/jsonp.js","lib/transport/receiver/xhr.js","lib/transport/sender/jsonp.js","lib/transport/sender/xdr.js","lib/transport/sender/xhr-cors.js","lib/transport/sender/xhr-fake.js","lib/transport/sender/xhr-local.js","lib/transport/websocket.js","lib/transport/xdr-polling.js","lib/transport/xdr-streaming.js","lib/transport/xhr-polling.js","lib/transport/xhr-streaming.js","lib/utils/browser-crypto.js","lib/utils/browser.js","lib/utils/escape.js","lib/utils/event.js","lib/utils/iframe.js","lib/utils/log.js","lib/utils/object.js","lib/utils/random.js","lib/utils/transport.js","lib/utils/url.js","lib/version.js","node_modules/debug/browser.js","node_modules/debug/debug.js","node_modules/debug/node_modules/ms/index.js","node_modules/inherits/inherits_browser.js","node_modules/json3/lib/json3.js","node_modules/url-parse/index.js","node_modules/url-parse/lolcation.js","node_modules/url-parse/node_modules/querystringify/index.js","node_modules/url-parse/node_modules/requires-port/index.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACbA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5FA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACbA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzdA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpMA;AACA;AACA;AACA;AACA;;ACJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACXA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC3BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChJA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1FA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1FA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1LA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACzEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACtGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC1GA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACfA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AChCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5CA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACpBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACjDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC5EA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC9LA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AClDA;AACA;;ACDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACrMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7HA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACz4BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7QA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACxDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"sockjs.js","sourceRoot":"/source/","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","(function (global){\n'use strict';\n\nvar transportList = require('./transport-list');\n\nmodule.exports = require('./main')(transportList);\n\n// TODO can't get rid of this until all servers do\nif ('_sockjs_onload' in global) {\n  setTimeout(global._sockjs_onload, 1);\n}\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9lbnRyeS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgdHJhbnNwb3J0TGlzdCA9IHJlcXVpcmUoJy4vdHJhbnNwb3J0LWxpc3QnKTtcblxubW9kdWxlLmV4cG9ydHMgPSByZXF1aXJlKCcuL21haW4nKSh0cmFuc3BvcnRMaXN0KTtcblxuLy8gVE9ETyBjYW4ndCBnZXQgcmlkIG9mIHRoaXMgdW50aWwgYWxsIHNlcnZlcnMgZG9cbmlmICgnX3NvY2tqc19vbmxvYWQnIGluIGdsb2JhbCkge1xuICBzZXRUaW1lb3V0KGdsb2JhbC5fc29ja2pzX29ubG9hZCwgMSk7XG59XG4iXX0=","'use strict';\n\nvar inherits = require('inherits')\n  , Event = require('./event')\n  ;\n\nfunction CloseEvent() {\n  Event.call(this);\n  this.initEvent('close', false, false);\n  this.wasClean = false;\n  this.code = 0;\n  this.reason = '';\n}\n\ninherits(CloseEvent, Event);\n\nmodule.exports = CloseEvent;\n","'use strict';\n\nvar inherits = require('inherits')\n  , EventTarget = require('./eventtarget')\n  ;\n\nfunction EventEmitter() {\n  EventTarget.call(this);\n}\n\ninherits(EventEmitter, EventTarget);\n\nEventEmitter.prototype.removeAllListeners = function(type) {\n  if (type) {\n    delete this._listeners[type];\n  } else {\n    this._listeners = {};\n  }\n};\n\nEventEmitter.prototype.once = function(type, listener) {\n  var self = this\n    , fired = false;\n\n  function g() {\n    self.removeListener(type, g);\n\n    if (!fired) {\n      fired = true;\n      listener.apply(this, arguments);\n    }\n  }\n\n  this.on(type, g);\n};\n\nEventEmitter.prototype.emit = function() {\n  var type = arguments[0];\n  var listeners = this._listeners[type];\n  if (!listeners) {\n    return;\n  }\n  // equivalent of Array.prototype.slice.call(arguments, 1);\n  var l = arguments.length;\n  var args = new Array(l - 1);\n  for (var ai = 1; ai < l; ai++) {\n    args[ai - 1] = arguments[ai];\n  }\n  for (var i = 0; i < listeners.length; i++) {\n    listeners[i].apply(this, args);\n  }\n};\n\nEventEmitter.prototype.on = EventEmitter.prototype.addListener = EventTarget.prototype.addEventListener;\nEventEmitter.prototype.removeListener = EventTarget.prototype.removeEventListener;\n\nmodule.exports.EventEmitter = EventEmitter;\n","'use strict';\n\nfunction Event(eventType) {\n  this.type = eventType;\n}\n\nEvent.prototype.initEvent = function(eventType, canBubble, cancelable) {\n  this.type = eventType;\n  this.bubbles = canBubble;\n  this.cancelable = cancelable;\n  this.timeStamp = +new Date();\n  return this;\n};\n\nEvent.prototype.stopPropagation = function() {};\nEvent.prototype.preventDefault = function() {};\n\nEvent.CAPTURING_PHASE = 1;\nEvent.AT_TARGET = 2;\nEvent.BUBBLING_PHASE = 3;\n\nmodule.exports = Event;\n","'use strict';\n\n/* Simplified implementation of DOM2 EventTarget.\n *   http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventTarget\n */\n\nfunction EventTarget() {\n  this._listeners = {};\n}\n\nEventTarget.prototype.addEventListener = function(eventType, listener) {\n  if (!(eventType in this._listeners)) {\n    this._listeners[eventType] = [];\n  }\n  var arr = this._listeners[eventType];\n  // #4\n  if (arr.indexOf(listener) === -1) {\n    // Make a copy so as not to interfere with a current dispatchEvent.\n    arr = arr.concat([listener]);\n  }\n  this._listeners[eventType] = arr;\n};\n\nEventTarget.prototype.removeEventListener = function(eventType, listener) {\n  var arr = this._listeners[eventType];\n  if (!arr) {\n    return;\n  }\n  var idx = arr.indexOf(listener);\n  if (idx !== -1) {\n    if (arr.length > 1) {\n      // Make a copy so as not to interfere with a current dispatchEvent.\n      this._listeners[eventType] = arr.slice(0, idx).concat(arr.slice(idx + 1));\n    } else {\n      delete this._listeners[eventType];\n    }\n    return;\n  }\n};\n\nEventTarget.prototype.dispatchEvent = function() {\n  var event = arguments[0];\n  var t = event.type;\n  // equivalent of Array.prototype.slice.call(arguments, 0);\n  var args = arguments.length === 1 ? [event] : Array.apply(null, arguments);\n  // TODO: This doesn't match the real behavior; per spec, onfoo get\n  // their place in line from the /first/ time they're set from\n  // non-null. Although WebKit bumps it to the end every time it's\n  // set.\n  if (this['on' + t]) {\n    this['on' + t].apply(this, args);\n  }\n  if (t in this._listeners) {\n    // Grab a reference to the listeners list. removeEventListener may alter the list.\n    var listeners = this._listeners[t];\n    for (var i = 0; i < listeners.length; i++) {\n      listeners[i].apply(this, args);\n    }\n  }\n};\n\nmodule.exports = EventTarget;\n","'use strict';\n\nvar inherits = require('inherits')\n  , Event = require('./event')\n  ;\n\nfunction TransportMessageEvent(data) {\n  Event.call(this);\n  this.initEvent('message', false, false);\n  this.data = data;\n}\n\ninherits(TransportMessageEvent, Event);\n\nmodule.exports = TransportMessageEvent;\n","'use strict';\n\nvar JSON3 = require('json3')\n  , iframeUtils = require('./utils/iframe')\n  ;\n\nfunction FacadeJS(transport) {\n  this._transport = transport;\n  transport.on('message', this._transportMessage.bind(this));\n  transport.on('close', this._transportClose.bind(this));\n}\n\nFacadeJS.prototype._transportClose = function(code, reason) {\n  iframeUtils.postMessage('c', JSON3.stringify([code, reason]));\n};\nFacadeJS.prototype._transportMessage = function(frame) {\n  iframeUtils.postMessage('t', frame);\n};\nFacadeJS.prototype._send = function(data) {\n  this._transport.send(data);\n};\nFacadeJS.prototype._close = function() {\n  this._transport.close();\n  this._transport.removeAllListeners();\n};\n\nmodule.exports = FacadeJS;\n","(function (process){\n'use strict';\n\nvar urlUtils = require('./utils/url')\n  , eventUtils = require('./utils/event')\n  , JSON3 = require('json3')\n  , FacadeJS = require('./facade')\n  , InfoIframeReceiver = require('./info-iframe-receiver')\n  , iframeUtils = require('./utils/iframe')\n  , loc = require('./location')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:iframe-bootstrap');\n}\n\nmodule.exports = function(SockJS, availableTransports) {\n  var transportMap = {};\n  availableTransports.forEach(function(at) {\n    if (at.facadeTransport) {\n      transportMap[at.facadeTransport.transportName] = at.facadeTransport;\n    }\n  });\n\n  // hard-coded for the info iframe\n  // TODO see if we can make this more dynamic\n  transportMap[InfoIframeReceiver.transportName] = InfoIframeReceiver;\n  var parentOrigin;\n\n  /* eslint-disable camelcase */\n  SockJS.bootstrap_iframe = function() {\n    /* eslint-enable camelcase */\n    var facade;\n    iframeUtils.currentWindowId = loc.hash.slice(1);\n    var onMessage = function(e) {\n      if (e.source !== parent) {\n        return;\n      }\n      if (typeof parentOrigin === 'undefined') {\n        parentOrigin = e.origin;\n      }\n      if (e.origin !== parentOrigin) {\n        return;\n      }\n\n      var iframeMessage;\n      try {\n        iframeMessage = JSON3.parse(e.data);\n      } catch (ignored) {\n        debug('bad json', e.data);\n        return;\n      }\n\n      if (iframeMessage.windowId !== iframeUtils.currentWindowId) {\n        return;\n      }\n      switch (iframeMessage.type) {\n      case 's':\n        var p;\n        try {\n          p = JSON3.parse(iframeMessage.data);\n        } catch (ignored) {\n          debug('bad json', iframeMessage.data);\n          break;\n        }\n        var version = p[0];\n        var transport = p[1];\n        var transUrl = p[2];\n        var baseUrl = p[3];\n        debug(version, transport, transUrl, baseUrl);\n        // change this to semver logic\n        if (version !== SockJS.version) {\n          throw new Error('Incompatible SockJS! Main site uses:' +\n                    ' \"' + version + '\", the iframe:' +\n                    ' \"' + SockJS.version + '\".');\n        }\n\n        if (!urlUtils.isOriginEqual(transUrl, loc.href) ||\n            !urlUtils.isOriginEqual(baseUrl, loc.href)) {\n          throw new Error('Can\\'t connect to different domain from within an ' +\n                    'iframe. (' + loc.href + ', ' + transUrl + ', ' + baseUrl + ')');\n        }\n        facade = new FacadeJS(new transportMap[transport](transUrl, baseUrl));\n        break;\n      case 'm':\n        facade._send(iframeMessage.data);\n        break;\n      case 'c':\n        if (facade) {\n          facade._close();\n        }\n        facade = null;\n        break;\n      }\n    };\n\n    eventUtils.attachEvent('message', onMessage);\n\n    // Start\n    iframeUtils.postMessage('s');\n  };\n};\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pZnJhbWUtYm9vdHN0cmFwLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgdXJsVXRpbHMgPSByZXF1aXJlKCcuL3V0aWxzL3VybCcpXG4gICwgZXZlbnRVdGlscyA9IHJlcXVpcmUoJy4vdXRpbHMvZXZlbnQnKVxuICAsIEpTT04zID0gcmVxdWlyZSgnanNvbjMnKVxuICAsIEZhY2FkZUpTID0gcmVxdWlyZSgnLi9mYWNhZGUnKVxuICAsIEluZm9JZnJhbWVSZWNlaXZlciA9IHJlcXVpcmUoJy4vaW5mby1pZnJhbWUtcmVjZWl2ZXInKVxuICAsIGlmcmFtZVV0aWxzID0gcmVxdWlyZSgnLi91dGlscy9pZnJhbWUnKVxuICAsIGxvYyA9IHJlcXVpcmUoJy4vbG9jYXRpb24nKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6aWZyYW1lLWJvb3RzdHJhcCcpO1xufVxuXG5tb2R1bGUuZXhwb3J0cyA9IGZ1bmN0aW9uKFNvY2tKUywgYXZhaWxhYmxlVHJhbnNwb3J0cykge1xuICB2YXIgdHJhbnNwb3J0TWFwID0ge307XG4gIGF2YWlsYWJsZVRyYW5zcG9ydHMuZm9yRWFjaChmdW5jdGlvbihhdCkge1xuICAgIGlmIChhdC5mYWNhZGVUcmFuc3BvcnQpIHtcbiAgICAgIHRyYW5zcG9ydE1hcFthdC5mYWNhZGVUcmFuc3BvcnQudHJhbnNwb3J0TmFtZV0gPSBhdC5mYWNhZGVUcmFuc3BvcnQ7XG4gICAgfVxuICB9KTtcblxuICAvLyBoYXJkLWNvZGVkIGZvciB0aGUgaW5mbyBpZnJhbWVcbiAgLy8gVE9ETyBzZWUgaWYgd2UgY2FuIG1ha2UgdGhpcyBtb3JlIGR5bmFtaWNcbiAgdHJhbnNwb3J0TWFwW0luZm9JZnJhbWVSZWNlaXZlci50cmFuc3BvcnROYW1lXSA9IEluZm9JZnJhbWVSZWNlaXZlcjtcbiAgdmFyIHBhcmVudE9yaWdpbjtcblxuICAvKiBlc2xpbnQtZGlzYWJsZSBjYW1lbGNhc2UgKi9cbiAgU29ja0pTLmJvb3RzdHJhcF9pZnJhbWUgPSBmdW5jdGlvbigpIHtcbiAgICAvKiBlc2xpbnQtZW5hYmxlIGNhbWVsY2FzZSAqL1xuICAgIHZhciBmYWNhZGU7XG4gICAgaWZyYW1lVXRpbHMuY3VycmVudFdpbmRvd0lkID0gbG9jLmhhc2guc2xpY2UoMSk7XG4gICAgdmFyIG9uTWVzc2FnZSA9IGZ1bmN0aW9uKGUpIHtcbiAgICAgIGlmIChlLnNvdXJjZSAhPT0gcGFyZW50KSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cbiAgICAgIGlmICh0eXBlb2YgcGFyZW50T3JpZ2luID09PSAndW5kZWZpbmVkJykge1xuICAgICAgICBwYXJlbnRPcmlnaW4gPSBlLm9yaWdpbjtcbiAgICAgIH1cbiAgICAgIGlmIChlLm9yaWdpbiAhPT0gcGFyZW50T3JpZ2luKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cblxuICAgICAgdmFyIGlmcmFtZU1lc3NhZ2U7XG4gICAgICB0cnkge1xuICAgICAgICBpZnJhbWVNZXNzYWdlID0gSlNPTjMucGFyc2UoZS5kYXRhKTtcbiAgICAgIH0gY2F0Y2ggKGlnbm9yZWQpIHtcbiAgICAgICAgZGVidWcoJ2JhZCBqc29uJywgZS5kYXRhKTtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuXG4gICAgICBpZiAoaWZyYW1lTWVzc2FnZS53aW5kb3dJZCAhPT0gaWZyYW1lVXRpbHMuY3VycmVudFdpbmRvd0lkKSB7XG4gICAgICAgIHJldHVybjtcbiAgICAgIH1cbiAgICAgIHN3aXRjaCAoaWZyYW1lTWVzc2FnZS50eXBlKSB7XG4gICAgICBjYXNlICdzJzpcbiAgICAgICAgdmFyIHA7XG4gICAgICAgIHRyeSB7XG4gICAgICAgICAgcCA9IEpTT04zLnBhcnNlKGlmcmFtZU1lc3NhZ2UuZGF0YSk7XG4gICAgICAgIH0gY2F0Y2ggKGlnbm9yZWQpIHtcbiAgICAgICAgICBkZWJ1ZygnYmFkIGpzb24nLCBpZnJhbWVNZXNzYWdlLmRhdGEpO1xuICAgICAgICAgIGJyZWFrO1xuICAgICAgICB9XG4gICAgICAgIHZhciB2ZXJzaW9uID0gcFswXTtcbiAgICAgICAgdmFyIHRyYW5zcG9ydCA9IHBbMV07XG4gICAgICAgIHZhciB0cmFuc1VybCA9IHBbMl07XG4gICAgICAgIHZhciBiYXNlVXJsID0gcFszXTtcbiAgICAgICAgZGVidWcodmVyc2lvbiwgdHJhbnNwb3J0LCB0cmFuc1VybCwgYmFzZVVybCk7XG4gICAgICAgIC8vIGNoYW5nZSB0aGlzIHRvIHNlbXZlciBsb2dpY1xuICAgICAgICBpZiAodmVyc2lvbiAhPT0gU29ja0pTLnZlcnNpb24pIHtcbiAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ0luY29tcGF0aWJsZSBTb2NrSlMhIE1haW4gc2l0ZSB1c2VzOicgK1xuICAgICAgICAgICAgICAgICAgICAnIFwiJyArIHZlcnNpb24gKyAnXCIsIHRoZSBpZnJhbWU6JyArXG4gICAgICAgICAgICAgICAgICAgICcgXCInICsgU29ja0pTLnZlcnNpb24gKyAnXCIuJyk7XG4gICAgICAgIH1cblxuICAgICAgICBpZiAoIXVybFV0aWxzLmlzT3JpZ2luRXF1YWwodHJhbnNVcmwsIGxvYy5ocmVmKSB8fFxuICAgICAgICAgICAgIXVybFV0aWxzLmlzT3JpZ2luRXF1YWwoYmFzZVVybCwgbG9jLmhyZWYpKSB7XG4gICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCdDYW5cXCd0IGNvbm5lY3QgdG8gZGlmZmVyZW50IGRvbWFpbiBmcm9tIHdpdGhpbiBhbiAnICtcbiAgICAgICAgICAgICAgICAgICAgJ2lmcmFtZS4gKCcgKyBsb2MuaHJlZiArICcsICcgKyB0cmFuc1VybCArICcsICcgKyBiYXNlVXJsICsgJyknKTtcbiAgICAgICAgfVxuICAgICAgICBmYWNhZGUgPSBuZXcgRmFjYWRlSlMobmV3IHRyYW5zcG9ydE1hcFt0cmFuc3BvcnRdKHRyYW5zVXJsLCBiYXNlVXJsKSk7XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSAnbSc6XG4gICAgICAgIGZhY2FkZS5fc2VuZChpZnJhbWVNZXNzYWdlLmRhdGEpO1xuICAgICAgICBicmVhaztcbiAgICAgIGNhc2UgJ2MnOlxuICAgICAgICBpZiAoZmFjYWRlKSB7XG4gICAgICAgICAgZmFjYWRlLl9jbG9zZSgpO1xuICAgICAgICB9XG4gICAgICAgIGZhY2FkZSA9IG51bGw7XG4gICAgICAgIGJyZWFrO1xuICAgICAgfVxuICAgIH07XG5cbiAgICBldmVudFV0aWxzLmF0dGFjaEV2ZW50KCdtZXNzYWdlJywgb25NZXNzYWdlKTtcblxuICAgIC8vIFN0YXJ0XG4gICAgaWZyYW1lVXRpbHMucG9zdE1lc3NhZ2UoJ3MnKTtcbiAgfTtcbn07XG4iXX0=","(function (process){\n'use strict';\n\nvar EventEmitter = require('events').EventEmitter\n  , inherits = require('inherits')\n  , JSON3 = require('json3')\n  , objectUtils = require('./utils/object')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:info-ajax');\n}\n\nfunction InfoAjax(url, AjaxObject) {\n  EventEmitter.call(this);\n\n  var self = this;\n  var t0 = +new Date();\n  this.xo = new AjaxObject('GET', url);\n\n  this.xo.once('finish', function(status, text) {\n    var info, rtt;\n    if (status === 200) {\n      rtt = (+new Date()) - t0;\n      if (text) {\n        try {\n          info = JSON3.parse(text);\n        } catch (e) {\n          debug('bad json', text);\n        }\n      }\n\n      if (!objectUtils.isObject(info)) {\n        info = {};\n      }\n    }\n    self.emit('finish', info, rtt);\n    self.removeAllListeners();\n  });\n}\n\ninherits(InfoAjax, EventEmitter);\n\nInfoAjax.prototype.close = function() {\n  this.removeAllListeners();\n  this.xo.close();\n};\n\nmodule.exports = InfoAjax;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pbmZvLWFqYXguanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIEpTT04zID0gcmVxdWlyZSgnanNvbjMnKVxuICAsIG9iamVjdFV0aWxzID0gcmVxdWlyZSgnLi91dGlscy9vYmplY3QnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6aW5mby1hamF4Jyk7XG59XG5cbmZ1bmN0aW9uIEluZm9BamF4KHVybCwgQWpheE9iamVjdCkge1xuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcblxuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB0MCA9ICtuZXcgRGF0ZSgpO1xuICB0aGlzLnhvID0gbmV3IEFqYXhPYmplY3QoJ0dFVCcsIHVybCk7XG5cbiAgdGhpcy54by5vbmNlKCdmaW5pc2gnLCBmdW5jdGlvbihzdGF0dXMsIHRleHQpIHtcbiAgICB2YXIgaW5mbywgcnR0O1xuICAgIGlmIChzdGF0dXMgPT09IDIwMCkge1xuICAgICAgcnR0ID0gKCtuZXcgRGF0ZSgpKSAtIHQwO1xuICAgICAgaWYgKHRleHQpIHtcbiAgICAgICAgdHJ5IHtcbiAgICAgICAgICBpbmZvID0gSlNPTjMucGFyc2UodGV4dCk7XG4gICAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgICBkZWJ1ZygnYmFkIGpzb24nLCB0ZXh0KTtcbiAgICAgICAgfVxuICAgICAgfVxuXG4gICAgICBpZiAoIW9iamVjdFV0aWxzLmlzT2JqZWN0KGluZm8pKSB7XG4gICAgICAgIGluZm8gPSB7fTtcbiAgICAgIH1cbiAgICB9XG4gICAgc2VsZi5lbWl0KCdmaW5pc2gnLCBpbmZvLCBydHQpO1xuICAgIHNlbGYucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIH0pO1xufVxuXG5pbmhlcml0cyhJbmZvQWpheCwgRXZlbnRFbWl0dGVyKTtcblxuSW5mb0FqYXgucHJvdG90eXBlLmNsb3NlID0gZnVuY3Rpb24oKSB7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIHRoaXMueG8uY2xvc2UoKTtcbn07XG5cbm1vZHVsZS5leHBvcnRzID0gSW5mb0FqYXg7XG4iXX0=","'use strict';\n\nvar inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  , JSON3 = require('json3')\n  , XHRLocalObject = require('./transport/sender/xhr-local')\n  , InfoAjax = require('./info-ajax')\n  ;\n\nfunction InfoReceiverIframe(transUrl) {\n  var self = this;\n  EventEmitter.call(this);\n\n  this.ir = new InfoAjax(transUrl, XHRLocalObject);\n  this.ir.once('finish', function(info, rtt) {\n    self.ir = null;\n    self.emit('message', JSON3.stringify([info, rtt]));\n  });\n}\n\ninherits(InfoReceiverIframe, EventEmitter);\n\nInfoReceiverIframe.transportName = 'iframe-info-receiver';\n\nInfoReceiverIframe.prototype.close = function() {\n  if (this.ir) {\n    this.ir.close();\n    this.ir = null;\n  }\n  this.removeAllListeners();\n};\n\nmodule.exports = InfoReceiverIframe;\n","(function (process,global){\n'use strict';\n\nvar EventEmitter = require('events').EventEmitter\n  , inherits = require('inherits')\n  , JSON3 = require('json3')\n  , utils = require('./utils/event')\n  , IframeTransport = require('./transport/iframe')\n  , InfoReceiverIframe = require('./info-iframe-receiver')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:info-iframe');\n}\n\nfunction InfoIframe(baseUrl, url) {\n  var self = this;\n  EventEmitter.call(this);\n\n  var go = function() {\n    var ifr = self.ifr = new IframeTransport(InfoReceiverIframe.transportName, url, baseUrl);\n\n    ifr.once('message', function(msg) {\n      if (msg) {\n        var d;\n        try {\n          d = JSON3.parse(msg);\n        } catch (e) {\n          debug('bad json', msg);\n          self.emit('finish');\n          self.close();\n          return;\n        }\n\n        var info = d[0], rtt = d[1];\n        self.emit('finish', info, rtt);\n      }\n      self.close();\n    });\n\n    ifr.once('close', function() {\n      self.emit('finish');\n      self.close();\n    });\n  };\n\n  // TODO this seems the same as the 'needBody' from transports\n  if (!global.document.body) {\n    utils.attachEvent('load', go);\n  } else {\n    go();\n  }\n}\n\ninherits(InfoIframe, EventEmitter);\n\nInfoIframe.enabled = function() {\n  return IframeTransport.enabled();\n};\n\nInfoIframe.prototype.close = function() {\n  if (this.ifr) {\n    this.ifr.close();\n  }\n  this.removeAllListeners();\n  this.ifr = null;\n};\n\nmodule.exports = InfoIframe;\n\n}).call(this,{ env: {} },typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pbmZvLWlmcmFtZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIEpTT04zID0gcmVxdWlyZSgnanNvbjMnKVxuICAsIHV0aWxzID0gcmVxdWlyZSgnLi91dGlscy9ldmVudCcpXG4gICwgSWZyYW1lVHJhbnNwb3J0ID0gcmVxdWlyZSgnLi90cmFuc3BvcnQvaWZyYW1lJylcbiAgLCBJbmZvUmVjZWl2ZXJJZnJhbWUgPSByZXF1aXJlKCcuL2luZm8taWZyYW1lLXJlY2VpdmVyJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OmluZm8taWZyYW1lJyk7XG59XG5cbmZ1bmN0aW9uIEluZm9JZnJhbWUoYmFzZVVybCwgdXJsKSB7XG4gIHZhciBzZWxmID0gdGhpcztcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG5cbiAgdmFyIGdvID0gZnVuY3Rpb24oKSB7XG4gICAgdmFyIGlmciA9IHNlbGYuaWZyID0gbmV3IElmcmFtZVRyYW5zcG9ydChJbmZvUmVjZWl2ZXJJZnJhbWUudHJhbnNwb3J0TmFtZSwgdXJsLCBiYXNlVXJsKTtcblxuICAgIGlmci5vbmNlKCdtZXNzYWdlJywgZnVuY3Rpb24obXNnKSB7XG4gICAgICBpZiAobXNnKSB7XG4gICAgICAgIHZhciBkO1xuICAgICAgICB0cnkge1xuICAgICAgICAgIGQgPSBKU09OMy5wYXJzZShtc2cpO1xuICAgICAgICB9IGNhdGNoIChlKSB7XG4gICAgICAgICAgZGVidWcoJ2JhZCBqc29uJywgbXNnKTtcbiAgICAgICAgICBzZWxmLmVtaXQoJ2ZpbmlzaCcpO1xuICAgICAgICAgIHNlbGYuY2xvc2UoKTtcbiAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICB2YXIgaW5mbyA9IGRbMF0sIHJ0dCA9IGRbMV07XG4gICAgICAgIHNlbGYuZW1pdCgnZmluaXNoJywgaW5mbywgcnR0KTtcbiAgICAgIH1cbiAgICAgIHNlbGYuY2xvc2UoKTtcbiAgICB9KTtcblxuICAgIGlmci5vbmNlKCdjbG9zZScsIGZ1bmN0aW9uKCkge1xuICAgICAgc2VsZi5lbWl0KCdmaW5pc2gnKTtcbiAgICAgIHNlbGYuY2xvc2UoKTtcbiAgICB9KTtcbiAgfTtcblxuICAvLyBUT0RPIHRoaXMgc2VlbXMgdGhlIHNhbWUgYXMgdGhlICduZWVkQm9keScgZnJvbSB0cmFuc3BvcnRzXG4gIGlmICghZ2xvYmFsLmRvY3VtZW50LmJvZHkpIHtcbiAgICB1dGlscy5hdHRhY2hFdmVudCgnbG9hZCcsIGdvKTtcbiAgfSBlbHNlIHtcbiAgICBnbygpO1xuICB9XG59XG5cbmluaGVyaXRzKEluZm9JZnJhbWUsIEV2ZW50RW1pdHRlcik7XG5cbkluZm9JZnJhbWUuZW5hYmxlZCA9IGZ1bmN0aW9uKCkge1xuICByZXR1cm4gSWZyYW1lVHJhbnNwb3J0LmVuYWJsZWQoKTtcbn07XG5cbkluZm9JZnJhbWUucHJvdG90eXBlLmNsb3NlID0gZnVuY3Rpb24oKSB7XG4gIGlmICh0aGlzLmlmcikge1xuICAgIHRoaXMuaWZyLmNsb3NlKCk7XG4gIH1cbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbiAgdGhpcy5pZnIgPSBudWxsO1xufTtcblxubW9kdWxlLmV4cG9ydHMgPSBJbmZvSWZyYW1lO1xuIl19","(function (process){\n'use strict';\n\nvar EventEmitter = require('events').EventEmitter\n  , inherits = require('inherits')\n  , urlUtils = require('./utils/url')\n  , XDR = require('./transport/sender/xdr')\n  , XHRCors = require('./transport/sender/xhr-cors')\n  , XHRLocal = require('./transport/sender/xhr-local')\n  , XHRFake = require('./transport/sender/xhr-fake')\n  , InfoIframe = require('./info-iframe')\n  , InfoAjax = require('./info-ajax')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:info-receiver');\n}\n\nfunction InfoReceiver(baseUrl, urlInfo) {\n  debug(baseUrl);\n  var self = this;\n  EventEmitter.call(this);\n\n  setTimeout(function() {\n    self.doXhr(baseUrl, urlInfo);\n  }, 0);\n}\n\ninherits(InfoReceiver, EventEmitter);\n\n// TODO this is currently ignoring the list of available transports and the whitelist\n\nInfoReceiver._getReceiver = function(baseUrl, url, urlInfo) {\n  // determine method of CORS support (if needed)\n  if (urlInfo.sameOrigin) {\n    return new InfoAjax(url, XHRLocal);\n  }\n  if (XHRCors.enabled) {\n    return new InfoAjax(url, XHRCors);\n  }\n  if (XDR.enabled && urlInfo.sameScheme) {\n    return new InfoAjax(url, XDR);\n  }\n  if (InfoIframe.enabled()) {\n    return new InfoIframe(baseUrl, url);\n  }\n  return new InfoAjax(url, XHRFake);\n};\n\nInfoReceiver.prototype.doXhr = function(baseUrl, urlInfo) {\n  var self = this\n    , url = urlUtils.addPath(baseUrl, '/info')\n    ;\n  debug('doXhr', url);\n\n  this.xo = InfoReceiver._getReceiver(baseUrl, url, urlInfo);\n\n  this.timeoutRef = setTimeout(function() {\n    debug('timeout');\n    self._cleanup(false);\n    self.emit('finish');\n  }, InfoReceiver.timeout);\n\n  this.xo.once('finish', function(info, rtt) {\n    debug('finish', info, rtt);\n    self._cleanup(true);\n    self.emit('finish', info, rtt);\n  });\n};\n\nInfoReceiver.prototype._cleanup = function(wasClean) {\n  debug('_cleanup');\n  clearTimeout(this.timeoutRef);\n  this.timeoutRef = null;\n  if (!wasClean && this.xo) {\n    this.xo.close();\n  }\n  this.xo = null;\n};\n\nInfoReceiver.prototype.close = function() {\n  debug('close');\n  this.removeAllListeners();\n  this._cleanup(false);\n};\n\nInfoReceiver.timeout = 8000;\n\nmodule.exports = InfoReceiver;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9pbmZvLXJlY2VpdmVyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi91dGlscy91cmwnKVxuICAsIFhEUiA9IHJlcXVpcmUoJy4vdHJhbnNwb3J0L3NlbmRlci94ZHInKVxuICAsIFhIUkNvcnMgPSByZXF1aXJlKCcuL3RyYW5zcG9ydC9zZW5kZXIveGhyLWNvcnMnKVxuICAsIFhIUkxvY2FsID0gcmVxdWlyZSgnLi90cmFuc3BvcnQvc2VuZGVyL3hoci1sb2NhbCcpXG4gICwgWEhSRmFrZSA9IHJlcXVpcmUoJy4vdHJhbnNwb3J0L3NlbmRlci94aHItZmFrZScpXG4gICwgSW5mb0lmcmFtZSA9IHJlcXVpcmUoJy4vaW5mby1pZnJhbWUnKVxuICAsIEluZm9BamF4ID0gcmVxdWlyZSgnLi9pbmZvLWFqYXgnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6aW5mby1yZWNlaXZlcicpO1xufVxuXG5mdW5jdGlvbiBJbmZvUmVjZWl2ZXIoYmFzZVVybCwgdXJsSW5mbykge1xuICBkZWJ1ZyhiYXNlVXJsKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcblxuICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkge1xuICAgIHNlbGYuZG9YaHIoYmFzZVVybCwgdXJsSW5mbyk7XG4gIH0sIDApO1xufVxuXG5pbmhlcml0cyhJbmZvUmVjZWl2ZXIsIEV2ZW50RW1pdHRlcik7XG5cbi8vIFRPRE8gdGhpcyBpcyBjdXJyZW50bHkgaWdub3JpbmcgdGhlIGxpc3Qgb2YgYXZhaWxhYmxlIHRyYW5zcG9ydHMgYW5kIHRoZSB3aGl0ZWxpc3RcblxuSW5mb1JlY2VpdmVyLl9nZXRSZWNlaXZlciA9IGZ1bmN0aW9uKGJhc2VVcmwsIHVybCwgdXJsSW5mbykge1xuICAvLyBkZXRlcm1pbmUgbWV0aG9kIG9mIENPUlMgc3VwcG9ydCAoaWYgbmVlZGVkKVxuICBpZiAodXJsSW5mby5zYW1lT3JpZ2luKSB7XG4gICAgcmV0dXJuIG5ldyBJbmZvQWpheCh1cmwsIFhIUkxvY2FsKTtcbiAgfVxuICBpZiAoWEhSQ29ycy5lbmFibGVkKSB7XG4gICAgcmV0dXJuIG5ldyBJbmZvQWpheCh1cmwsIFhIUkNvcnMpO1xuICB9XG4gIGlmIChYRFIuZW5hYmxlZCAmJiB1cmxJbmZvLnNhbWVTY2hlbWUpIHtcbiAgICByZXR1cm4gbmV3IEluZm9BamF4KHVybCwgWERSKTtcbiAgfVxuICBpZiAoSW5mb0lmcmFtZS5lbmFibGVkKCkpIHtcbiAgICByZXR1cm4gbmV3IEluZm9JZnJhbWUoYmFzZVVybCwgdXJsKTtcbiAgfVxuICByZXR1cm4gbmV3IEluZm9BamF4KHVybCwgWEhSRmFrZSk7XG59O1xuXG5JbmZvUmVjZWl2ZXIucHJvdG90eXBlLmRvWGhyID0gZnVuY3Rpb24oYmFzZVVybCwgdXJsSW5mbykge1xuICB2YXIgc2VsZiA9IHRoaXNcbiAgICAsIHVybCA9IHVybFV0aWxzLmFkZFBhdGgoYmFzZVVybCwgJy9pbmZvJylcbiAgICA7XG4gIGRlYnVnKCdkb1hocicsIHVybCk7XG5cbiAgdGhpcy54byA9IEluZm9SZWNlaXZlci5fZ2V0UmVjZWl2ZXIoYmFzZVVybCwgdXJsLCB1cmxJbmZvKTtcblxuICB0aGlzLnRpbWVvdXRSZWYgPSBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkge1xuICAgIGRlYnVnKCd0aW1lb3V0Jyk7XG4gICAgc2VsZi5fY2xlYW51cChmYWxzZSk7XG4gICAgc2VsZi5lbWl0KCdmaW5pc2gnKTtcbiAgfSwgSW5mb1JlY2VpdmVyLnRpbWVvdXQpO1xuXG4gIHRoaXMueG8ub25jZSgnZmluaXNoJywgZnVuY3Rpb24oaW5mbywgcnR0KSB7XG4gICAgZGVidWcoJ2ZpbmlzaCcsIGluZm8sIHJ0dCk7XG4gICAgc2VsZi5fY2xlYW51cCh0cnVlKTtcbiAgICBzZWxmLmVtaXQoJ2ZpbmlzaCcsIGluZm8sIHJ0dCk7XG4gIH0pO1xufTtcblxuSW5mb1JlY2VpdmVyLnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKHdhc0NsZWFuKSB7XG4gIGRlYnVnKCdfY2xlYW51cCcpO1xuICBjbGVhclRpbWVvdXQodGhpcy50aW1lb3V0UmVmKTtcbiAgdGhpcy50aW1lb3V0UmVmID0gbnVsbDtcbiAgaWYgKCF3YXNDbGVhbiAmJiB0aGlzLnhvKSB7XG4gICAgdGhpcy54by5jbG9zZSgpO1xuICB9XG4gIHRoaXMueG8gPSBudWxsO1xufTtcblxuSW5mb1JlY2VpdmVyLnByb3RvdHlwZS5jbG9zZSA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xvc2UnKTtcbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbiAgdGhpcy5fY2xlYW51cChmYWxzZSk7XG59O1xuXG5JbmZvUmVjZWl2ZXIudGltZW91dCA9IDgwMDA7XG5cbm1vZHVsZS5leHBvcnRzID0gSW5mb1JlY2VpdmVyO1xuIl19","(function (global){\n'use strict';\n\nmodule.exports = global.location || {\n  origin: 'http://localhost:80'\n, protocol: 'http'\n, host: 'localhost'\n, port: 80\n, href: 'http://localhost/'\n, hash: ''\n};\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9sb2NhdGlvbi5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG5tb2R1bGUuZXhwb3J0cyA9IGdsb2JhbC5sb2NhdGlvbiB8fCB7XG4gIG9yaWdpbjogJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAnXG4sIHByb3RvY29sOiAnaHR0cCdcbiwgaG9zdDogJ2xvY2FsaG9zdCdcbiwgcG9ydDogODBcbiwgaHJlZjogJ2h0dHA6Ly9sb2NhbGhvc3QvJ1xuLCBoYXNoOiAnJ1xufTtcbiJdfQ==","(function (process,global){\n'use strict';\n\nrequire('./shims');\n\nvar URL = require('url-parse')\n  , inherits = require('inherits')\n  , JSON3 = require('json3')\n  , random = require('./utils/random')\n  , escape = require('./utils/escape')\n  , urlUtils = require('./utils/url')\n  , eventUtils = require('./utils/event')\n  , transport = require('./utils/transport')\n  , objectUtils = require('./utils/object')\n  , browser = require('./utils/browser')\n  , log = require('./utils/log')\n  , Event = require('./event/event')\n  , EventTarget = require('./event/eventtarget')\n  , loc = require('./location')\n  , CloseEvent = require('./event/close')\n  , TransportMessageEvent = require('./event/trans-message')\n  , InfoReceiver = require('./info-receiver')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:main');\n}\n\nvar transports;\n\n// follow constructor steps defined at http://dev.w3.org/html5/websockets/#the-websocket-interface\nfunction SockJS(url, protocols, options) {\n  if (!(this instanceof SockJS)) {\n    return new SockJS(url, protocols, options);\n  }\n  if (arguments.length < 1) {\n    throw new TypeError(\"Failed to construct 'SockJS: 1 argument required, but only 0 present\");\n  }\n  EventTarget.call(this);\n\n  this.readyState = SockJS.CONNECTING;\n  this.extensions = '';\n  this.protocol = '';\n\n  // non-standard extension\n  options = options || {};\n  if (options.protocols_whitelist) {\n    log.warn(\"'protocols_whitelist' is DEPRECATED. Use 'transports' instead.\");\n  }\n  this._transportsWhitelist = options.transports;\n  this._transportOptions = options.transportOptions || {};\n\n  var sessionId = options.sessionId || 8;\n  if (typeof sessionId === 'function') {\n    this._generateSessionId = sessionId;\n  } else if (typeof sessionId === 'number') {\n    this._generateSessionId = function() {\n      return random.string(sessionId);\n    };\n  } else {\n    throw new TypeError('If sessionId is used in the options, it needs to be a number or a function.');\n  }\n\n  this._server = options.server || random.numberString(1000);\n\n  // Step 1 of WS spec - parse and validate the url. Issue #8\n  var parsedUrl = new URL(url);\n  if (!parsedUrl.host || !parsedUrl.protocol) {\n    throw new SyntaxError(\"The URL '\" + url + \"' is invalid\");\n  } else if (parsedUrl.hash) {\n    throw new SyntaxError('The URL must not contain a fragment');\n  } else if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {\n    throw new SyntaxError(\"The URL's scheme must be either 'http:' or 'https:'. '\" + parsedUrl.protocol + \"' is not allowed.\");\n  }\n\n  var secure = parsedUrl.protocol === 'https:';\n  // Step 2 - don't allow secure origin with an insecure protocol\n  if (loc.protocol === 'https' && !secure) {\n    throw new Error('SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS');\n  }\n\n  // Step 3 - check port access - no need here\n  // Step 4 - parse protocols argument\n  if (!protocols) {\n    protocols = [];\n  } else if (!Array.isArray(protocols)) {\n    protocols = [protocols];\n  }\n\n  // Step 5 - check protocols argument\n  var sortedProtocols = protocols.sort();\n  sortedProtocols.forEach(function(proto, i) {\n    if (!proto) {\n      throw new SyntaxError(\"The protocols entry '\" + proto + \"' is invalid.\");\n    }\n    if (i < (sortedProtocols.length - 1) && proto === sortedProtocols[i + 1]) {\n      throw new SyntaxError(\"The protocols entry '\" + proto + \"' is duplicated.\");\n    }\n  });\n\n  // Step 6 - convert origin\n  var o = urlUtils.getOrigin(loc.href);\n  this._origin = o ? o.toLowerCase() : null;\n\n  // remove the trailing slash\n  parsedUrl.set('pathname', parsedUrl.pathname.replace(/\\/+$/, ''));\n\n  // store the sanitized url\n  this.url = parsedUrl.href;\n  debug('using url', this.url);\n\n  // Step 7 - start connection in background\n  // obtain server info\n  // http://sockjs.github.io/sockjs-protocol/sockjs-protocol-0.3.3.html#section-26\n  this._urlInfo = {\n    nullOrigin: !browser.hasDomain()\n  , sameOrigin: urlUtils.isOriginEqual(this.url, loc.href)\n  , sameScheme: urlUtils.isSchemeEqual(this.url, loc.href)\n  };\n\n  this._ir = new InfoReceiver(this.url, this._urlInfo);\n  this._ir.once('finish', this._receiveInfo.bind(this));\n}\n\ninherits(SockJS, EventTarget);\n\nfunction userSetCode(code) {\n  return code === 1000 || (code >= 3000 && code <= 4999);\n}\n\nSockJS.prototype.close = function(code, reason) {\n  // Step 1\n  if (code && !userSetCode(code)) {\n    throw new Error('InvalidAccessError: Invalid code');\n  }\n  // Step 2.4 states the max is 123 bytes, but we are just checking length\n  if (reason && reason.length > 123) {\n    throw new SyntaxError('reason argument has an invalid length');\n  }\n\n  // Step 3.1\n  if (this.readyState === SockJS.CLOSING || this.readyState === SockJS.CLOSED) {\n    return;\n  }\n\n  // TODO look at docs to determine how to set this\n  var wasClean = true;\n  this._close(code || 1000, reason || 'Normal closure', wasClean);\n};\n\nSockJS.prototype.send = function(data) {\n  // #13 - convert anything non-string to string\n  // TODO this currently turns objects into [object Object]\n  if (typeof data !== 'string') {\n    data = '' + data;\n  }\n  if (this.readyState === SockJS.CONNECTING) {\n    throw new Error('InvalidStateError: The connection has not been established yet');\n  }\n  if (this.readyState !== SockJS.OPEN) {\n    return;\n  }\n  this._transport.send(escape.quote(data));\n};\n\nSockJS.version = require('./version');\n\nSockJS.CONNECTING = 0;\nSockJS.OPEN = 1;\nSockJS.CLOSING = 2;\nSockJS.CLOSED = 3;\n\nSockJS.prototype._receiveInfo = function(info, rtt) {\n  debug('_receiveInfo', rtt);\n  this._ir = null;\n  if (!info) {\n    this._close(1002, 'Cannot connect to server');\n    return;\n  }\n\n  // establish a round-trip timeout (RTO) based on the\n  // round-trip time (RTT)\n  this._rto = this.countRTO(rtt);\n  // allow server to override url used for the actual transport\n  this._transUrl = info.base_url ? info.base_url : this.url;\n  info = objectUtils.extend(info, this._urlInfo);\n  debug('info', info);\n  // determine list of desired and supported transports\n  var enabledTransports = transports.filterToEnabled(this._transportsWhitelist, info);\n  this._transports = enabledTransports.main;\n  debug(this._transports.length + ' enabled transports');\n\n  this._connect();\n};\n\nSockJS.prototype._connect = function() {\n  for (var Transport = this._transports.shift(); Transport; Transport = this._transports.shift()) {\n    debug('attempt', Transport.transportName);\n    if (Transport.needBody) {\n      if (!global.document.body ||\n          (typeof global.document.readyState !== 'undefined' &&\n            global.document.readyState !== 'complete' &&\n            global.document.readyState !== 'interactive')) {\n        debug('waiting for body');\n        this._transports.unshift(Transport);\n        eventUtils.attachEvent('load', this._connect.bind(this));\n        return;\n      }\n    }\n\n    // calculate timeout based on RTO and round trips. Default to 5s\n    var timeoutMs = (this._rto * Transport.roundTrips) || 5000;\n    this._transportTimeoutId = setTimeout(this._transportTimeout.bind(this), timeoutMs);\n    debug('using timeout', timeoutMs);\n\n    var transportUrl = urlUtils.addPath(this._transUrl, '/' + this._server + '/' + this._generateSessionId());\n    var options = this._transportOptions[Transport.transportName];\n    debug('transport url', transportUrl);\n    var transportObj = new Transport(transportUrl, this._transUrl, options);\n    transportObj.on('message', this._transportMessage.bind(this));\n    transportObj.once('close', this._transportClose.bind(this));\n    transportObj.transportName = Transport.transportName;\n    this._transport = transportObj;\n\n    return;\n  }\n  this._close(2000, 'All transports failed', false);\n};\n\nSockJS.prototype._transportTimeout = function() {\n  debug('_transportTimeout');\n  if (this.readyState === SockJS.CONNECTING) {\n    this._transportClose(2007, 'Transport timed out');\n  }\n};\n\nSockJS.prototype._transportMessage = function(msg) {\n  debug('_transportMessage', msg);\n  var self = this\n    , type = msg.slice(0, 1)\n    , content = msg.slice(1)\n    , payload\n    ;\n\n  // first check for messages that don't need a payload\n  switch (type) {\n    case 'o':\n      this._open();\n      return;\n    case 'h':\n      this.dispatchEvent(new Event('heartbeat'));\n      debug('heartbeat', this.transport);\n      return;\n  }\n\n  if (content) {\n    try {\n      payload = JSON3.parse(content);\n    } catch (e) {\n      debug('bad json', content);\n    }\n  }\n\n  if (typeof payload === 'undefined') {\n    debug('empty payload', content);\n    return;\n  }\n\n  switch (type) {\n    case 'a':\n      if (Array.isArray(payload)) {\n        payload.forEach(function(p) {\n          debug('message', self.transport, p);\n          self.dispatchEvent(new TransportMessageEvent(p));\n        });\n      }\n      break;\n    case 'm':\n      debug('message', this.transport, payload);\n      this.dispatchEvent(new TransportMessageEvent(payload));\n      break;\n    case 'c':\n      if (Array.isArray(payload) && payload.length === 2) {\n        this._close(payload[0], payload[1], true);\n      }\n      break;\n  }\n};\n\nSockJS.prototype._transportClose = function(code, reason) {\n  debug('_transportClose', this.transport, code, reason);\n  if (this._transport) {\n    this._transport.removeAllListeners();\n    this._transport = null;\n    this.transport = null;\n  }\n\n  if (!userSetCode(code) && code !== 2000 && this.readyState === SockJS.CONNECTING) {\n    this._connect();\n    return;\n  }\n\n  this._close(code, reason);\n};\n\nSockJS.prototype._open = function() {\n  debug('_open', this._transport.transportName, this.readyState);\n  if (this.readyState === SockJS.CONNECTING) {\n    if (this._transportTimeoutId) {\n      clearTimeout(this._transportTimeoutId);\n      this._transportTimeoutId = null;\n    }\n    this.readyState = SockJS.OPEN;\n    this.transport = this._transport.transportName;\n    this.dispatchEvent(new Event('open'));\n    debug('connected', this.transport);\n  } else {\n    // The server might have been restarted, and lost track of our\n    // connection.\n    this._close(1006, 'Server lost session');\n  }\n};\n\nSockJS.prototype._close = function(code, reason, wasClean) {\n  debug('_close', this.transport, code, reason, wasClean, this.readyState);\n  var forceFail = false;\n\n  if (this._ir) {\n    forceFail = true;\n    this._ir.close();\n    this._ir = null;\n  }\n  if (this._transport) {\n    this._transport.close();\n    this._transport = null;\n    this.transport = null;\n  }\n\n  if (this.readyState === SockJS.CLOSED) {\n    throw new Error('InvalidStateError: SockJS has already been closed');\n  }\n\n  this.readyState = SockJS.CLOSING;\n  setTimeout(function() {\n    this.readyState = SockJS.CLOSED;\n\n    if (forceFail) {\n      this.dispatchEvent(new Event('error'));\n    }\n\n    var e = new CloseEvent('close');\n    e.wasClean = wasClean || false;\n    e.code = code || 1000;\n    e.reason = reason;\n\n    this.dispatchEvent(e);\n    this.onmessage = this.onclose = this.onerror = null;\n    debug('disconnected');\n  }.bind(this), 0);\n};\n\n// See: http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/\n// and RFC 2988.\nSockJS.prototype.countRTO = function(rtt) {\n  // In a local environment, when using IE8/9 and the `jsonp-polling`\n  // transport the time needed to establish a connection (the time that pass\n  // from the opening of the transport to the call of `_dispatchOpen`) is\n  // around 200msec (the lower bound used in the article above) and this\n  // causes spurious timeouts. For this reason we calculate a value slightly\n  // larger than that used in the article.\n  if (rtt > 100) {\n    return 4 * rtt; // rto > 400msec\n  }\n  return 300 + rtt; // 300msec < rto <= 400msec\n};\n\nmodule.exports = function(availableTransports) {\n  transports = transport(availableTransports);\n  require('./iframe-bootstrap')(SockJS, availableTransports);\n  return SockJS;\n};\n\n}).call(this,{ env: {} },typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/main.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nrequire('./shims');\n\nvar URL = require('url-parse')\n  , inherits = require('inherits')\n  , JSON3 = require('json3')\n  , random = require('./utils/random')\n  , escape = require('./utils/escape')\n  , urlUtils = require('./utils/url')\n  , eventUtils = require('./utils/event')\n  , transport = require('./utils/transport')\n  , objectUtils = require('./utils/object')\n  , browser = require('./utils/browser')\n  , log = require('./utils/log')\n  , Event = require('./event/event')\n  , EventTarget = require('./event/eventtarget')\n  , loc = require('./location')\n  , CloseEvent = require('./event/close')\n  , TransportMessageEvent = require('./event/trans-message')\n  , InfoReceiver = require('./info-receiver')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:main');\n}\n\nvar transports;\n\n// follow constructor steps defined at http://dev.w3.org/html5/websockets/#the-websocket-interface\nfunction SockJS(url, protocols, options) {\n  if (!(this instanceof SockJS)) {\n    return new SockJS(url, protocols, options);\n  }\n  if (arguments.length < 1) {\n    throw new TypeError(\"Failed to construct 'SockJS: 1 argument required, but only 0 present\");\n  }\n  EventTarget.call(this);\n\n  this.readyState = SockJS.CONNECTING;\n  this.extensions = '';\n  this.protocol = '';\n\n  // non-standard extension\n  options = options || {};\n  if (options.protocols_whitelist) {\n    log.warn(\"'protocols_whitelist' is DEPRECATED. Use 'transports' instead.\");\n  }\n  this._transportsWhitelist = options.transports;\n  this._transportOptions = options.transportOptions || {};\n\n  var sessionId = options.sessionId || 8;\n  if (typeof sessionId === 'function') {\n    this._generateSessionId = sessionId;\n  } else if (typeof sessionId === 'number') {\n    this._generateSessionId = function() {\n      return random.string(sessionId);\n    };\n  } else {\n    throw new TypeError('If sessionId is used in the options, it needs to be a number or a function.');\n  }\n\n  this._server = options.server || random.numberString(1000);\n\n  // Step 1 of WS spec - parse and validate the url. Issue #8\n  var parsedUrl = new URL(url);\n  if (!parsedUrl.host || !parsedUrl.protocol) {\n    throw new SyntaxError(\"The URL '\" + url + \"' is invalid\");\n  } else if (parsedUrl.hash) {\n    throw new SyntaxError('The URL must not contain a fragment');\n  } else if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {\n    throw new SyntaxError(\"The URL's scheme must be either 'http:' or 'https:'. '\" + parsedUrl.protocol + \"' is not allowed.\");\n  }\n\n  var secure = parsedUrl.protocol === 'https:';\n  // Step 2 - don't allow secure origin with an insecure protocol\n  if (loc.protocol === 'https' && !secure) {\n    throw new Error('SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS');\n  }\n\n  // Step 3 - check port access - no need here\n  // Step 4 - parse protocols argument\n  if (!protocols) {\n    protocols = [];\n  } else if (!Array.isArray(protocols)) {\n    protocols = [protocols];\n  }\n\n  // Step 5 - check protocols argument\n  var sortedProtocols = protocols.sort();\n  sortedProtocols.forEach(function(proto, i) {\n    if (!proto) {\n      throw new SyntaxError(\"The protocols entry '\" + proto + \"' is invalid.\");\n    }\n    if (i < (sortedProtocols.length - 1) && proto === sortedProtocols[i + 1]) {\n      throw new SyntaxError(\"The protocols entry '\" + proto + \"' is duplicated.\");\n    }\n  });\n\n  // Step 6 - convert origin\n  var o = urlUtils.getOrigin(loc.href);\n  this._origin = o ? o.toLowerCase() : null;\n\n  // remove the trailing slash\n  parsedUrl.set('pathname', parsedUrl.pathname.replace(/\\/+$/, ''));\n\n  // store the sanitized url\n  this.url = parsedUrl.href;\n  debug('using url', this.url);\n\n  // Step 7 - start connection in background\n  // obtain server info\n  // http://sockjs.github.io/sockjs-protocol/sockjs-protocol-0.3.3.html#section-26\n  this._urlInfo = {\n    nullOrigin: !browser.hasDomain()\n  , sameOrigin: urlUtils.isOriginEqual(this.url, loc.href)\n  , sameScheme: urlUtils.isSchemeEqual(this.url, loc.href)\n  };\n\n  this._ir = new InfoReceiver(this.url, this._urlInfo);\n  this._ir.once('finish', this._receiveInfo.bind(this));\n}\n\ninherits(SockJS, EventTarget);\n\nfunction userSetCode(code) {\n  return code === 1000 || (code >= 3000 && code <= 4999);\n}\n\nSockJS.prototype.close = function(code, reason) {\n  // Step 1\n  if (code && !userSetCode(code)) {\n    throw new Error('InvalidAccessError: Invalid code');\n  }\n  // Step 2.4 states the max is 123 bytes, but we are just checking length\n  if (reason && reason.length > 123) {\n    throw new SyntaxError('reason argument has an invalid length');\n  }\n\n  // Step 3.1\n  if (this.readyState === SockJS.CLOSING || this.readyState === SockJS.CLOSED) {\n    return;\n  }\n\n  // TODO look at docs to determine how to set this\n  var wasClean = true;\n  this._close(code || 1000, reason || 'Normal closure', wasClean);\n};\n\nSockJS.prototype.send = function(data) {\n  // #13 - convert anything non-string to string\n  // TODO this currently turns objects into [object Object]\n  if (typeof data !== 'string') {\n    data = '' + data;\n  }\n  if (this.readyState === SockJS.CONNECTING) {\n    throw new Error('InvalidStateError: The connection has not been established yet');\n  }\n  if (this.readyState !== SockJS.OPEN) {\n    return;\n  }\n  this._transport.send(escape.quote(data));\n};\n\nSockJS.version = require('./version');\n\nSockJS.CONNECTING = 0;\nSockJS.OPEN = 1;\nSockJS.CLOSING = 2;\nSockJS.CLOSED = 3;\n\nSockJS.prototype._receiveInfo = function(info, rtt) {\n  debug('_receiveInfo', rtt);\n  this._ir = null;\n  if (!info) {\n    this._close(1002, 'Cannot connect to server');\n    return;\n  }\n\n  // establish a round-trip timeout (RTO) based on the\n  // round-trip time (RTT)\n  this._rto = this.countRTO(rtt);\n  // allow server to override url used for the actual transport\n  this._transUrl = info.base_url ? info.base_url : this.url;\n  info = objectUtils.extend(info, this._urlInfo);\n  debug('info', info);\n  // determine list of desired and supported transports\n  var enabledTransports = transports.filterToEnabled(this._transportsWhitelist, info);\n  this._transports = enabledTransports.main;\n  debug(this._transports.length + ' enabled transports');\n\n  this._connect();\n};\n\nSockJS.prototype._connect = function() {\n  for (var Transport = this._transports.shift(); Transport; Transport = this._transports.shift()) {\n    debug('attempt', Transport.transportName);\n    if (Transport.needBody) {\n      if (!global.document.body ||\n          (typeof global.document.readyState !== 'undefined' &&\n            global.document.readyState !== 'complete' &&\n            global.document.readyState !== 'interactive')) {\n        debug('waiting for body');\n        this._transports.unshift(Transport);\n        eventUtils.attachEvent('load', this._connect.bind(this));\n        return;\n      }\n    }\n\n    // calculate timeout based on RTO and round trips. Default to 5s\n    var timeoutMs = (this._rto * Transport.roundTrips) || 5000;\n    this._transportTimeoutId = setTimeout(this._transportTimeout.bind(this), timeoutMs);\n    debug('using timeout', timeoutMs);\n\n    var transportUrl = urlUtils.addPath(this._transUrl, '/' + this._server + '/' + this._generateSessionId());\n    var options = this._transportOptions[Transport.transportName];\n    debug('transport url', transportUrl);\n    var transportObj = new Transport(transportUrl, this._transUrl, options);\n    transportObj.on('message', this._transportMessage.bind(this));\n    transportObj.once('close', this._transportClose.bind(this));\n    transportObj.transportName = Transport.transportName;\n    this._transport = transportObj;\n\n    return;\n  }\n  this._close(2000, 'All transports failed', false);\n};\n\nSockJS.prototype._transportTimeout = function() {\n  debug('_transportTimeout');\n  if (this.readyState === SockJS.CONNECTING) {\n    this._transportClose(2007, 'Transport timed out');\n  }\n};\n\nSockJS.prototype._transportMessage = function(msg) {\n  debug('_transportMessage', msg);\n  var self = this\n    , type = msg.slice(0, 1)\n    , content = msg.slice(1)\n    , payload\n    ;\n\n  // first check for messages that don't need a payload\n  switch (type) {\n    case 'o':\n      this._open();\n      return;\n    case 'h':\n      this.dispatchEvent(new Event('heartbeat'));\n      debug('heartbeat', this.transport);\n      return;\n  }\n\n  if (content) {\n    try {\n      payload = JSON3.parse(content);\n    } catch (e) {\n      debug('bad json', content);\n    }\n  }\n\n  if (typeof payload === 'undefined') {\n    debug('empty payload', content);\n    return;\n  }\n\n  switch (type) {\n    case 'a':\n      if (Array.isArray(payload)) {\n        payload.forEach(function(p) {\n          debug('message', self.transport, p);\n          self.dispatchEvent(new TransportMessageEvent(p));\n        });\n      }\n      break;\n    case 'm':\n      debug('message', this.transport, payload);\n      this.dispatchEvent(new TransportMessageEvent(payload));\n      break;\n    case 'c':\n      if (Array.isArray(payload) && payload.length === 2) {\n        this._close(payload[0], payload[1], true);\n      }\n      break;\n  }\n};\n\nSockJS.prototype._transportClose = function(code, reason) {\n  debug('_transportClose', this.transport, code, reason);\n  if (this._transport) {\n    this._transport.removeAllListeners();\n    this._transport = null;\n    this.transport = null;\n  }\n\n  if (!userSetCode(code) && code !== 2000 && this.readyState === SockJS.CONNECTING) {\n    this._connect();\n    return;\n  }\n\n  this._close(code, reason);\n};\n\nSockJS.prototype._open = function() {\n  debug('_open', this._transport.transportName, this.readyState);\n  if (this.readyState === SockJS.CONNECTING) {\n    if (this._transportTimeoutId) {\n      clearTimeout(this._transportTimeoutId);\n      this._transportTimeoutId = null;\n    }\n    this.readyState = SockJS.OPEN;\n    this.transport = this._transport.transportName;\n    this.dispatchEvent(new Event('open'));\n    debug('connected', this.transport);\n  } else {\n    // The server might have been restarted, and lost track of our\n    // connection.\n    this._close(1006, 'Server lost session');\n  }\n};\n\nSockJS.prototype._close = function(code, reason, wasClean) {\n  debug('_close', this.transport, code, reason, wasClean, this.readyState);\n  var forceFail = false;\n\n  if (this._ir) {\n    forceFail = true;\n    this._ir.close();\n    this._ir = null;\n  }\n  if (this._transport) {\n    this._transport.close();\n    this._transport = null;\n    this.transport = null;\n  }\n\n  if (this.readyState === SockJS.CLOSED) {\n    throw new Error('InvalidStateError: SockJS has already been closed');\n  }\n\n  this.readyState = SockJS.CLOSING;\n  setTimeout(function() {\n    this.readyState = SockJS.CLOSED;\n\n    if (forceFail) {\n      this.dispatchEvent(new Event('error'));\n    }\n\n    var e = new CloseEvent('close');\n    e.wasClean = wasClean || false;\n    e.code = code || 1000;\n    e.reason = reason;\n\n    this.dispatchEvent(e);\n    this.onmessage = this.onclose = this.onerror = null;\n    debug('disconnected');\n  }.bind(this), 0);\n};\n\n// See: http://www.erg.abdn.ac.uk/~gerrit/dccp/notes/ccid2/rto_estimator/\n// and RFC 2988.\nSockJS.prototype.countRTO = function(rtt) {\n  // In a local environment, when using IE8/9 and the `jsonp-polling`\n  // transport the time needed to establish a connection (the time that pass\n  // from the opening of the transport to the call of `_dispatchOpen`) is\n  // around 200msec (the lower bound used in the article above) and this\n  // causes spurious timeouts. For this reason we calculate a value slightly\n  // larger than that used in the article.\n  if (rtt > 100) {\n    return 4 * rtt; // rto > 400msec\n  }\n  return 300 + rtt; // 300msec < rto <= 400msec\n};\n\nmodule.exports = function(availableTransports) {\n  transports = transport(availableTransports);\n  require('./iframe-bootstrap')(SockJS, availableTransports);\n  return SockJS;\n};\n"]}","/* eslint-disable */\n/* jscs: disable */\n'use strict';\n\n// pulled specific shims from https://github.com/es-shims/es5-shim\n\nvar ArrayPrototype = Array.prototype;\nvar ObjectPrototype = Object.prototype;\nvar FunctionPrototype = Function.prototype;\nvar StringPrototype = String.prototype;\nvar array_slice = ArrayPrototype.slice;\n\nvar _toString = ObjectPrototype.toString;\nvar isFunction = function (val) {\n    return ObjectPrototype.toString.call(val) === '[object Function]';\n};\nvar isArray = function isArray(obj) {\n    return _toString.call(obj) === '[object Array]';\n};\nvar isString = function isString(obj) {\n    return _toString.call(obj) === '[object String]';\n};\n\nvar supportsDescriptors = Object.defineProperty && (function () {\n    try {\n        Object.defineProperty({}, 'x', {});\n        return true;\n    } catch (e) { /* this is ES3 */\n        return false;\n    }\n}());\n\n// Define configurable, writable and non-enumerable props\n// if they don't exist.\nvar defineProperty;\nif (supportsDescriptors) {\n    defineProperty = function (object, name, method, forceAssign) {\n        if (!forceAssign && (name in object)) { return; }\n        Object.defineProperty(object, name, {\n            configurable: true,\n            enumerable: false,\n            writable: true,\n            value: method\n        });\n    };\n} else {\n    defineProperty = function (object, name, method, forceAssign) {\n        if (!forceAssign && (name in object)) { return; }\n        object[name] = method;\n    };\n}\nvar defineProperties = function (object, map, forceAssign) {\n    for (var name in map) {\n        if (ObjectPrototype.hasOwnProperty.call(map, name)) {\n          defineProperty(object, name, map[name], forceAssign);\n        }\n    }\n};\n\nvar toObject = function (o) {\n    if (o == null) { // this matches both null and undefined\n        throw new TypeError(\"can't convert \" + o + ' to object');\n    }\n    return Object(o);\n};\n\n//\n// Util\n// ======\n//\n\n// ES5 9.4\n// http://es5.github.com/#x9.4\n// http://jsperf.com/to-integer\n\nfunction toInteger(num) {\n    var n = +num;\n    if (n !== n) { // isNaN\n        n = 0;\n    } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {\n        n = (n > 0 || -1) * Math.floor(Math.abs(n));\n    }\n    return n;\n}\n\nfunction ToUint32(x) {\n    return x >>> 0;\n}\n\n//\n// Function\n// ========\n//\n\n// ES-5 15.3.4.5\n// http://es5.github.com/#x15.3.4.5\n\nfunction Empty() {}\n\ndefineProperties(FunctionPrototype, {\n    bind: function bind(that) { // .length is 1\n        // 1. Let Target be the this value.\n        var target = this;\n        // 2. If IsCallable(Target) is false, throw a TypeError exception.\n        if (!isFunction(target)) {\n            throw new TypeError('Function.prototype.bind called on incompatible ' + target);\n        }\n        // 3. Let A be a new (possibly empty) internal list of all of the\n        //   argument values provided after thisArg (arg1, arg2 etc), in order.\n        // XXX slicedArgs will stand in for \"A\" if used\n        var args = array_slice.call(arguments, 1); // for normal call\n        // 4. Let F be a new native ECMAScript object.\n        // 11. Set the [[Prototype]] internal property of F to the standard\n        //   built-in Function prototype object as specified in 15.3.3.1.\n        // 12. Set the [[Call]] internal property of F as described in\n        //   15.3.4.5.1.\n        // 13. Set the [[Construct]] internal property of F as described in\n        //   15.3.4.5.2.\n        // 14. Set the [[HasInstance]] internal property of F as described in\n        //   15.3.4.5.3.\n        var binder = function () {\n\n            if (this instanceof bound) {\n                // 15.3.4.5.2 [[Construct]]\n                // When the [[Construct]] internal method of a function object,\n                // F that was created using the bind function is called with a\n                // list of arguments ExtraArgs, the following steps are taken:\n                // 1. Let target be the value of F's [[TargetFunction]]\n                //   internal property.\n                // 2. If target has no [[Construct]] internal method, a\n                //   TypeError exception is thrown.\n                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal\n                //   property.\n                // 4. Let args be a new list containing the same values as the\n                //   list boundArgs in the same order followed by the same\n                //   values as the list ExtraArgs in the same order.\n                // 5. Return the result of calling the [[Construct]] internal\n                //   method of target providing args as the arguments.\n\n                var result = target.apply(\n                    this,\n                    args.concat(array_slice.call(arguments))\n                );\n                if (Object(result) === result) {\n                    return result;\n                }\n                return this;\n\n            } else {\n                // 15.3.4.5.1 [[Call]]\n                // When the [[Call]] internal method of a function object, F,\n                // which was created using the bind function is called with a\n                // this value and a list of arguments ExtraArgs, the following\n                // steps are taken:\n                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal\n                //   property.\n                // 2. Let boundThis be the value of F's [[BoundThis]] internal\n                //   property.\n                // 3. Let target be the value of F's [[TargetFunction]] internal\n                //   property.\n                // 4. Let args be a new list containing the same values as the\n                //   list boundArgs in the same order followed by the same\n                //   values as the list ExtraArgs in the same order.\n                // 5. Return the result of calling the [[Call]] internal method\n                //   of target providing boundThis as the this value and\n                //   providing args as the arguments.\n\n                // equiv: target.call(this, ...boundArgs, ...args)\n                return target.apply(\n                    that,\n                    args.concat(array_slice.call(arguments))\n                );\n\n            }\n\n        };\n\n        // 15. If the [[Class]] internal property of Target is \"Function\", then\n        //     a. Let L be the length property of Target minus the length of A.\n        //     b. Set the length own property of F to either 0 or L, whichever is\n        //       larger.\n        // 16. Else set the length own property of F to 0.\n\n        var boundLength = Math.max(0, target.length - args.length);\n\n        // 17. Set the attributes of the length own property of F to the values\n        //   specified in 15.3.5.1.\n        var boundArgs = [];\n        for (var i = 0; i < boundLength; i++) {\n            boundArgs.push('$' + i);\n        }\n\n        // XXX Build a dynamic function with desired amount of arguments is the only\n        // way to set the length property of a function.\n        // In environments where Content Security Policies enabled (Chrome extensions,\n        // for ex.) all use of eval or Function costructor throws an exception.\n        // However in all of these environments Function.prototype.bind exists\n        // and so this code will never be executed.\n        var bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this, arguments); }')(binder);\n\n        if (target.prototype) {\n            Empty.prototype = target.prototype;\n            bound.prototype = new Empty();\n            // Clean up dangling references.\n            Empty.prototype = null;\n        }\n\n        // TODO\n        // 18. Set the [[Extensible]] internal property of F to true.\n\n        // TODO\n        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).\n        // 20. Call the [[DefineOwnProperty]] internal method of F with\n        //   arguments \"caller\", PropertyDescriptor {[[Get]]: thrower, [[Set]]:\n        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and\n        //   false.\n        // 21. Call the [[DefineOwnProperty]] internal method of F with\n        //   arguments \"arguments\", PropertyDescriptor {[[Get]]: thrower,\n        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},\n        //   and false.\n\n        // TODO\n        // NOTE Function objects created using Function.prototype.bind do not\n        // have a prototype property or the [[Code]], [[FormalParameters]], and\n        // [[Scope]] internal properties.\n        // XXX can't delete prototype in pure-js.\n\n        // 22. Return F.\n        return bound;\n    }\n});\n\n//\n// Array\n// =====\n//\n\n// ES5 15.4.3.2\n// http://es5.github.com/#x15.4.3.2\n// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray\ndefineProperties(Array, { isArray: isArray });\n\n\nvar boxedString = Object('a');\nvar splitString = boxedString[0] !== 'a' || !(0 in boxedString);\n\nvar properlyBoxesContext = function properlyBoxed(method) {\n    // Check node 0.6.21 bug where third parameter is not boxed\n    var properlyBoxesNonStrict = true;\n    var properlyBoxesStrict = true;\n    if (method) {\n        method.call('foo', function (_, __, context) {\n            if (typeof context !== 'object') { properlyBoxesNonStrict = false; }\n        });\n\n        method.call([1], function () {\n            'use strict';\n            properlyBoxesStrict = typeof this === 'string';\n        }, 'x');\n    }\n    return !!method && properlyBoxesNonStrict && properlyBoxesStrict;\n};\n\ndefineProperties(ArrayPrototype, {\n    forEach: function forEach(fun /*, thisp*/) {\n        var object = toObject(this),\n            self = splitString && isString(this) ? this.split('') : object,\n            thisp = arguments[1],\n            i = -1,\n            length = self.length >>> 0;\n\n        // If no callback function or if callback is not a callable function\n        if (!isFunction(fun)) {\n            throw new TypeError(); // TODO message\n        }\n\n        while (++i < length) {\n            if (i in self) {\n                // Invoke the callback function with call, passing arguments:\n                // context, property value, property key, thisArg object\n                // context\n                fun.call(thisp, self[i], i, object);\n            }\n        }\n    }\n}, !properlyBoxesContext(ArrayPrototype.forEach));\n\n// ES5 15.4.4.14\n// http://es5.github.com/#x15.4.4.14\n// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf\nvar hasFirefox2IndexOfBug = Array.prototype.indexOf && [0, 1].indexOf(1, 2) !== -1;\ndefineProperties(ArrayPrototype, {\n    indexOf: function indexOf(sought /*, fromIndex */ ) {\n        var self = splitString && isString(this) ? this.split('') : toObject(this),\n            length = self.length >>> 0;\n\n        if (!length) {\n            return -1;\n        }\n\n        var i = 0;\n        if (arguments.length > 1) {\n            i = toInteger(arguments[1]);\n        }\n\n        // handle negative indices\n        i = i >= 0 ? i : Math.max(0, length + i);\n        for (; i < length; i++) {\n            if (i in self && self[i] === sought) {\n                return i;\n            }\n        }\n        return -1;\n    }\n}, hasFirefox2IndexOfBug);\n\n//\n// String\n// ======\n//\n\n// ES5 15.5.4.14\n// http://es5.github.com/#x15.5.4.14\n\n// [bugfix, IE lt 9, firefox 4, Konqueror, Opera, obscure browsers]\n// Many browsers do not split properly with regular expressions or they\n// do not perform the split correctly under obscure conditions.\n// See http://blog.stevenlevithan.com/archives/cross-browser-split\n// I've tested in many browsers and this seems to cover the deviant ones:\n//    'ab'.split(/(?:ab)*/) should be [\"\", \"\"], not [\"\"]\n//    '.'.split(/(.?)(.?)/) should be [\"\", \".\", \"\", \"\"], not [\"\", \"\"]\n//    'tesst'.split(/(s)*/) should be [\"t\", undefined, \"e\", \"s\", \"t\"], not\n//       [undefined, \"t\", undefined, \"e\", ...]\n//    ''.split(/.?/) should be [], not [\"\"]\n//    '.'.split(/()()/) should be [\".\"], not [\"\", \"\", \".\"]\n\nvar string_split = StringPrototype.split;\nif (\n    'ab'.split(/(?:ab)*/).length !== 2 ||\n    '.'.split(/(.?)(.?)/).length !== 4 ||\n    'tesst'.split(/(s)*/)[1] === 't' ||\n    'test'.split(/(?:)/, -1).length !== 4 ||\n    ''.split(/.?/).length ||\n    '.'.split(/()()/).length > 1\n) {\n    (function () {\n        var compliantExecNpcg = /()??/.exec('')[1] === void 0; // NPCG: nonparticipating capturing group\n\n        StringPrototype.split = function (separator, limit) {\n            var string = this;\n            if (separator === void 0 && limit === 0) {\n                return [];\n            }\n\n            // If `separator` is not a regex, use native split\n            if (_toString.call(separator) !== '[object RegExp]') {\n                return string_split.call(this, separator, limit);\n            }\n\n            var output = [],\n                flags = (separator.ignoreCase ? 'i' : '') +\n                        (separator.multiline  ? 'm' : '') +\n                        (separator.extended   ? 'x' : '') + // Proposed for ES6\n                        (separator.sticky     ? 'y' : ''), // Firefox 3+\n                lastLastIndex = 0,\n                // Make `global` and avoid `lastIndex` issues by working with a copy\n                separator2, match, lastIndex, lastLength;\n            separator = new RegExp(separator.source, flags + 'g');\n            string += ''; // Type-convert\n            if (!compliantExecNpcg) {\n                // Doesn't need flags gy, but they don't hurt\n                separator2 = new RegExp('^' + separator.source + '$(?!\\\\s)', flags);\n            }\n            /* Values for `limit`, per the spec:\n             * If undefined: 4294967295 // Math.pow(2, 32) - 1\n             * If 0, Infinity, or NaN: 0\n             * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;\n             * If negative number: 4294967296 - Math.floor(Math.abs(limit))\n             * If other: Type-convert, then use the above rules\n             */\n            limit = limit === void 0 ?\n                -1 >>> 0 : // Math.pow(2, 32) - 1\n                ToUint32(limit);\n            while (match = separator.exec(string)) {\n                // `separator.lastIndex` is not reliable cross-browser\n                lastIndex = match.index + match[0].length;\n                if (lastIndex > lastLastIndex) {\n                    output.push(string.slice(lastLastIndex, match.index));\n                    // Fix browsers whose `exec` methods don't consistently return `undefined` for\n                    // nonparticipating capturing groups\n                    if (!compliantExecNpcg && match.length > 1) {\n                        match[0].replace(separator2, function () {\n                            for (var i = 1; i < arguments.length - 2; i++) {\n                                if (arguments[i] === void 0) {\n                                    match[i] = void 0;\n                                }\n                            }\n                        });\n                    }\n                    if (match.length > 1 && match.index < string.length) {\n                        ArrayPrototype.push.apply(output, match.slice(1));\n                    }\n                    lastLength = match[0].length;\n                    lastLastIndex = lastIndex;\n                    if (output.length >= limit) {\n                        break;\n                    }\n                }\n                if (separator.lastIndex === match.index) {\n                    separator.lastIndex++; // Avoid an infinite loop\n                }\n            }\n            if (lastLastIndex === string.length) {\n                if (lastLength || !separator.test('')) {\n                    output.push('');\n                }\n            } else {\n                output.push(string.slice(lastLastIndex));\n            }\n            return output.length > limit ? output.slice(0, limit) : output;\n        };\n    }());\n\n// [bugfix, chrome]\n// If separator is undefined, then the result array contains just one String,\n// which is the this value (converted to a String). If limit is not undefined,\n// then the output array is truncated so that it contains no more than limit\n// elements.\n// \"0\".split(undefined, 0) -> []\n} else if ('0'.split(void 0, 0).length) {\n    StringPrototype.split = function split(separator, limit) {\n        if (separator === void 0 && limit === 0) { return []; }\n        return string_split.call(this, separator, limit);\n    };\n}\n\n// ES5 15.5.4.20\n// whitespace from: http://es5.github.io/#x15.5.4.20\nvar ws = '\\x09\\x0A\\x0B\\x0C\\x0D\\x20\\xA0\\u1680\\u180E\\u2000\\u2001\\u2002\\u2003' +\n    '\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200A\\u202F\\u205F\\u3000\\u2028' +\n    '\\u2029\\uFEFF';\nvar zeroWidth = '\\u200b';\nvar wsRegexChars = '[' + ws + ']';\nvar trimBeginRegexp = new RegExp('^' + wsRegexChars + wsRegexChars + '*');\nvar trimEndRegexp = new RegExp(wsRegexChars + wsRegexChars + '*$');\nvar hasTrimWhitespaceBug = StringPrototype.trim && (ws.trim() || !zeroWidth.trim());\ndefineProperties(StringPrototype, {\n    // http://blog.stevenlevithan.com/archives/faster-trim-javascript\n    // http://perfectionkills.com/whitespace-deviations/\n    trim: function trim() {\n        if (this === void 0 || this === null) {\n            throw new TypeError(\"can't convert \" + this + ' to object');\n        }\n        return String(this).replace(trimBeginRegexp, '').replace(trimEndRegexp, '');\n    }\n}, hasTrimWhitespaceBug);\n\n// ECMA-262, 3rd B.2.3\n// Not an ECMAScript standard, although ECMAScript 3rd Edition has a\n// non-normative section suggesting uniform semantics and it should be\n// normalized across all browsers\n// [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE\nvar string_substr = StringPrototype.substr;\nvar hasNegativeSubstrBug = ''.substr && '0b'.substr(-1) !== 'b';\ndefineProperties(StringPrototype, {\n    substr: function substr(start, length) {\n        return string_substr.call(\n            this,\n            start < 0 ? ((start = this.length + start) < 0 ? 0 : start) : start,\n            length\n        );\n    }\n}, hasNegativeSubstrBug);\n","'use strict';\n\nmodule.exports = [\n  // streaming transports\n  require('./transport/websocket')\n, require('./transport/xhr-streaming')\n, require('./transport/xdr-streaming')\n, require('./transport/eventsource')\n, require('./transport/lib/iframe-wrap')(require('./transport/eventsource'))\n\n  // polling transports\n, require('./transport/htmlfile')\n, require('./transport/lib/iframe-wrap')(require('./transport/htmlfile'))\n, require('./transport/xhr-polling')\n, require('./transport/xdr-polling')\n, require('./transport/lib/iframe-wrap')(require('./transport/xhr-polling'))\n, require('./transport/jsonp-polling')\n];\n","(function (process,global){\n'use strict';\n\nvar EventEmitter = require('events').EventEmitter\n  , inherits = require('inherits')\n  , utils = require('../../utils/event')\n  , urlUtils = require('../../utils/url')\n  , XHR = global.XMLHttpRequest\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:browser:xhr');\n}\n\nfunction AbstractXHRObject(method, url, payload, opts) {\n  debug(method, url);\n  var self = this;\n  EventEmitter.call(this);\n\n  setTimeout(function () {\n    self._start(method, url, payload, opts);\n  }, 0);\n}\n\ninherits(AbstractXHRObject, EventEmitter);\n\nAbstractXHRObject.prototype._start = function(method, url, payload, opts) {\n  var self = this;\n\n  try {\n    this.xhr = new XHR();\n  } catch (x) {\n    // intentionally empty\n  }\n\n  if (!this.xhr) {\n    debug('no xhr');\n    this.emit('finish', 0, 'no xhr support');\n    this._cleanup();\n    return;\n  }\n\n  // several browsers cache POSTs\n  url = urlUtils.addQuery(url, 't=' + (+new Date()));\n\n  // Explorer tends to keep connection open, even after the\n  // tab gets closed: http://bugs.jquery.com/ticket/5280\n  this.unloadRef = utils.unloadAdd(function() {\n    debug('unload cleanup');\n    self._cleanup(true);\n  });\n  try {\n    this.xhr.open(method, url, true);\n    if (this.timeout && 'timeout' in this.xhr) {\n      this.xhr.timeout = this.timeout;\n      this.xhr.ontimeout = function() {\n        debug('xhr timeout');\n        self.emit('finish', 0, '');\n        self._cleanup(false);\n      };\n    }\n  } catch (e) {\n    debug('exception', e);\n    // IE raises an exception on wrong port.\n    this.emit('finish', 0, '');\n    this._cleanup(false);\n    return;\n  }\n\n  if ((!opts || !opts.noCredentials) && AbstractXHRObject.supportsCORS) {\n    debug('withCredentials');\n    // Mozilla docs says https://developer.mozilla.org/en/XMLHttpRequest :\n    // \"This never affects same-site requests.\"\n\n    this.xhr.withCredentials = 'true';\n  }\n  if (opts && opts.headers) {\n    for (var key in opts.headers) {\n      this.xhr.setRequestHeader(key, opts.headers[key]);\n    }\n  }\n\n  this.xhr.onreadystatechange = function() {\n    if (self.xhr) {\n      var x = self.xhr;\n      var text, status;\n      debug('readyState', x.readyState);\n      switch (x.readyState) {\n      case 3:\n        // IE doesn't like peeking into responseText or status\n        // on Microsoft.XMLHTTP and readystate=3\n        try {\n          status = x.status;\n          text = x.responseText;\n        } catch (e) {\n          // intentionally empty\n        }\n        debug('status', status);\n        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450\n        if (status === 1223) {\n          status = 204;\n        }\n\n        // IE does return readystate == 3 for 404 answers.\n        if (status === 200 && text && text.length > 0) {\n          debug('chunk');\n          self.emit('chunk', status, text);\n        }\n        break;\n      case 4:\n        status = x.status;\n        debug('status', status);\n        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450\n        if (status === 1223) {\n          status = 204;\n        }\n        // IE returns this for a bad port\n        // http://msdn.microsoft.com/en-us/library/windows/desktop/aa383770(v=vs.85).aspx\n        if (status === 12005 || status === 12029) {\n          status = 0;\n        }\n\n        debug('finish', status, x.responseText);\n        self.emit('finish', status, x.responseText);\n        self._cleanup(false);\n        break;\n      }\n    }\n  };\n\n  try {\n    self.xhr.send(payload);\n  } catch (e) {\n    self.emit('finish', 0, '');\n    self._cleanup(false);\n  }\n};\n\nAbstractXHRObject.prototype._cleanup = function(abort) {\n  debug('cleanup');\n  if (!this.xhr) {\n    return;\n  }\n  this.removeAllListeners();\n  utils.unloadDel(this.unloadRef);\n\n  // IE needs this field to be a function\n  this.xhr.onreadystatechange = function() {};\n  if (this.xhr.ontimeout) {\n    this.xhr.ontimeout = null;\n  }\n\n  if (abort) {\n    try {\n      this.xhr.abort();\n    } catch (x) {\n      // intentionally empty\n    }\n  }\n  this.unloadRef = this.xhr = null;\n};\n\nAbstractXHRObject.prototype.close = function() {\n  debug('close');\n  this._cleanup(true);\n};\n\nAbstractXHRObject.enabled = !!XHR;\n// override XMLHttpRequest for IE6/7\n// obfuscate to avoid firewalls\nvar axo = ['Active'].concat('Object').join('X');\nif (!AbstractXHRObject.enabled && (axo in global)) {\n  debug('overriding xmlhttprequest');\n  XHR = function() {\n    try {\n      return new global[axo]('Microsoft.XMLHTTP');\n    } catch (e) {\n      return null;\n    }\n  };\n  AbstractXHRObject.enabled = !!new XHR();\n}\n\nvar cors = false;\ntry {\n  cors = 'withCredentials' in new XHR();\n} catch (ignored) {\n  // intentionally empty\n}\n\nAbstractXHRObject.supportsCORS = cors;\n\nmodule.exports = AbstractXHRObject;\n\n}).call(this,{ env: {} },typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/transport/browser/abstract-xhr.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar EventEmitter = require('events').EventEmitter\n  , inherits = require('inherits')\n  , utils = require('../../utils/event')\n  , urlUtils = require('../../utils/url')\n  , XHR = global.XMLHttpRequest\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:browser:xhr');\n}\n\nfunction AbstractXHRObject(method, url, payload, opts) {\n  debug(method, url);\n  var self = this;\n  EventEmitter.call(this);\n\n  setTimeout(function () {\n    self._start(method, url, payload, opts);\n  }, 0);\n}\n\ninherits(AbstractXHRObject, EventEmitter);\n\nAbstractXHRObject.prototype._start = function(method, url, payload, opts) {\n  var self = this;\n\n  try {\n    this.xhr = new XHR();\n  } catch (x) {\n    // intentionally empty\n  }\n\n  if (!this.xhr) {\n    debug('no xhr');\n    this.emit('finish', 0, 'no xhr support');\n    this._cleanup();\n    return;\n  }\n\n  // several browsers cache POSTs\n  url = urlUtils.addQuery(url, 't=' + (+new Date()));\n\n  // Explorer tends to keep connection open, even after the\n  // tab gets closed: http://bugs.jquery.com/ticket/5280\n  this.unloadRef = utils.unloadAdd(function() {\n    debug('unload cleanup');\n    self._cleanup(true);\n  });\n  try {\n    this.xhr.open(method, url, true);\n    if (this.timeout && 'timeout' in this.xhr) {\n      this.xhr.timeout = this.timeout;\n      this.xhr.ontimeout = function() {\n        debug('xhr timeout');\n        self.emit('finish', 0, '');\n        self._cleanup(false);\n      };\n    }\n  } catch (e) {\n    debug('exception', e);\n    // IE raises an exception on wrong port.\n    this.emit('finish', 0, '');\n    this._cleanup(false);\n    return;\n  }\n\n  if ((!opts || !opts.noCredentials) && AbstractXHRObject.supportsCORS) {\n    debug('withCredentials');\n    // Mozilla docs says https://developer.mozilla.org/en/XMLHttpRequest :\n    // \"This never affects same-site requests.\"\n\n    this.xhr.withCredentials = 'true';\n  }\n  if (opts && opts.headers) {\n    for (var key in opts.headers) {\n      this.xhr.setRequestHeader(key, opts.headers[key]);\n    }\n  }\n\n  this.xhr.onreadystatechange = function() {\n    if (self.xhr) {\n      var x = self.xhr;\n      var text, status;\n      debug('readyState', x.readyState);\n      switch (x.readyState) {\n      case 3:\n        // IE doesn't like peeking into responseText or status\n        // on Microsoft.XMLHTTP and readystate=3\n        try {\n          status = x.status;\n          text = x.responseText;\n        } catch (e) {\n          // intentionally empty\n        }\n        debug('status', status);\n        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450\n        if (status === 1223) {\n          status = 204;\n        }\n\n        // IE does return readystate == 3 for 404 answers.\n        if (status === 200 && text && text.length > 0) {\n          debug('chunk');\n          self.emit('chunk', status, text);\n        }\n        break;\n      case 4:\n        status = x.status;\n        debug('status', status);\n        // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450\n        if (status === 1223) {\n          status = 204;\n        }\n        // IE returns this for a bad port\n        // http://msdn.microsoft.com/en-us/library/windows/desktop/aa383770(v=vs.85).aspx\n        if (status === 12005 || status === 12029) {\n          status = 0;\n        }\n\n        debug('finish', status, x.responseText);\n        self.emit('finish', status, x.responseText);\n        self._cleanup(false);\n        break;\n      }\n    }\n  };\n\n  try {\n    self.xhr.send(payload);\n  } catch (e) {\n    self.emit('finish', 0, '');\n    self._cleanup(false);\n  }\n};\n\nAbstractXHRObject.prototype._cleanup = function(abort) {\n  debug('cleanup');\n  if (!this.xhr) {\n    return;\n  }\n  this.removeAllListeners();\n  utils.unloadDel(this.unloadRef);\n\n  // IE needs this field to be a function\n  this.xhr.onreadystatechange = function() {};\n  if (this.xhr.ontimeout) {\n    this.xhr.ontimeout = null;\n  }\n\n  if (abort) {\n    try {\n      this.xhr.abort();\n    } catch (x) {\n      // intentionally empty\n    }\n  }\n  this.unloadRef = this.xhr = null;\n};\n\nAbstractXHRObject.prototype.close = function() {\n  debug('close');\n  this._cleanup(true);\n};\n\nAbstractXHRObject.enabled = !!XHR;\n// override XMLHttpRequest for IE6/7\n// obfuscate to avoid firewalls\nvar axo = ['Active'].concat('Object').join('X');\nif (!AbstractXHRObject.enabled && (axo in global)) {\n  debug('overriding xmlhttprequest');\n  XHR = function() {\n    try {\n      return new global[axo]('Microsoft.XMLHTTP');\n    } catch (e) {\n      return null;\n    }\n  };\n  AbstractXHRObject.enabled = !!new XHR();\n}\n\nvar cors = false;\ntry {\n  cors = 'withCredentials' in new XHR();\n} catch (ignored) {\n  // intentionally empty\n}\n\nAbstractXHRObject.supportsCORS = cors;\n\nmodule.exports = AbstractXHRObject;\n"]}","(function (global){\nmodule.exports = global.EventSource;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvYnJvd3Nlci9ldmVudHNvdXJjZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsibW9kdWxlLmV4cG9ydHMgPSBnbG9iYWwuRXZlbnRTb3VyY2U7XG4iXX0=","(function (global){\n'use strict';\n\nvar Driver = global.WebSocket || global.MozWebSocket;\nif (Driver) {\n\tmodule.exports = function WebSocketBrowserDriver(url) {\n\t\treturn new Driver(url);\n\t};\n}\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvYnJvd3Nlci93ZWJzb2NrZXQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgRHJpdmVyID0gZ2xvYmFsLldlYlNvY2tldCB8fCBnbG9iYWwuTW96V2ViU29ja2V0O1xuaWYgKERyaXZlcikge1xuXHRtb2R1bGUuZXhwb3J0cyA9IGZ1bmN0aW9uIFdlYlNvY2tldEJyb3dzZXJEcml2ZXIodXJsKSB7XG5cdFx0cmV0dXJuIG5ldyBEcml2ZXIodXJsKTtcblx0fTtcbn1cbiJdfQ==","'use strict';\n\nvar inherits = require('inherits')\n  , AjaxBasedTransport = require('./lib/ajax-based')\n  , EventSourceReceiver = require('./receiver/eventsource')\n  , XHRCorsObject = require('./sender/xhr-cors')\n  , EventSourceDriver = require('eventsource')\n  ;\n\nfunction EventSourceTransport(transUrl) {\n  if (!EventSourceTransport.enabled()) {\n    throw new Error('Transport created when disabled');\n  }\n\n  AjaxBasedTransport.call(this, transUrl, '/eventsource', EventSourceReceiver, XHRCorsObject);\n}\n\ninherits(EventSourceTransport, AjaxBasedTransport);\n\nEventSourceTransport.enabled = function() {\n  return !!EventSourceDriver;\n};\n\nEventSourceTransport.transportName = 'eventsource';\nEventSourceTransport.roundTrips = 2;\n\nmodule.exports = EventSourceTransport;\n","'use strict';\n\nvar inherits = require('inherits')\n  , HtmlfileReceiver = require('./receiver/htmlfile')\n  , XHRLocalObject = require('./sender/xhr-local')\n  , AjaxBasedTransport = require('./lib/ajax-based')\n  ;\n\nfunction HtmlFileTransport(transUrl) {\n  if (!HtmlfileReceiver.enabled) {\n    throw new Error('Transport created when disabled');\n  }\n  AjaxBasedTransport.call(this, transUrl, '/htmlfile', HtmlfileReceiver, XHRLocalObject);\n}\n\ninherits(HtmlFileTransport, AjaxBasedTransport);\n\nHtmlFileTransport.enabled = function(info) {\n  return HtmlfileReceiver.enabled && info.sameOrigin;\n};\n\nHtmlFileTransport.transportName = 'htmlfile';\nHtmlFileTransport.roundTrips = 2;\n\nmodule.exports = HtmlFileTransport;\n","(function (process){\n'use strict';\n\n// Few cool transports do work only for same-origin. In order to make\n// them work cross-domain we shall use iframe, served from the\n// remote domain. New browsers have capabilities to communicate with\n// cross domain iframe using postMessage(). In IE it was implemented\n// from IE 8+, but of course, IE got some details wrong:\n//    http://msdn.microsoft.com/en-us/library/cc197015(v=VS.85).aspx\n//    http://stevesouders.com/misc/test-postmessage.php\n\nvar inherits = require('inherits')\n  , JSON3 = require('json3')\n  , EventEmitter = require('events').EventEmitter\n  , version = require('../version')\n  , urlUtils = require('../utils/url')\n  , iframeUtils = require('../utils/iframe')\n  , eventUtils = require('../utils/event')\n  , random = require('../utils/random')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:transport:iframe');\n}\n\nfunction IframeTransport(transport, transUrl, baseUrl) {\n  if (!IframeTransport.enabled()) {\n    throw new Error('Transport created when disabled');\n  }\n  EventEmitter.call(this);\n\n  var self = this;\n  this.origin = urlUtils.getOrigin(baseUrl);\n  this.baseUrl = baseUrl;\n  this.transUrl = transUrl;\n  this.transport = transport;\n  this.windowId = random.string(8);\n\n  var iframeUrl = urlUtils.addPath(baseUrl, '/iframe.html') + '#' + this.windowId;\n  debug(transport, transUrl, iframeUrl);\n\n  this.iframeObj = iframeUtils.createIframe(iframeUrl, function(r) {\n    debug('err callback');\n    self.emit('close', 1006, 'Unable to load an iframe (' + r + ')');\n    self.close();\n  });\n\n  this.onmessageCallback = this._message.bind(this);\n  eventUtils.attachEvent('message', this.onmessageCallback);\n}\n\ninherits(IframeTransport, EventEmitter);\n\nIframeTransport.prototype.close = function() {\n  debug('close');\n  this.removeAllListeners();\n  if (this.iframeObj) {\n    eventUtils.detachEvent('message', this.onmessageCallback);\n    try {\n      // When the iframe is not loaded, IE raises an exception\n      // on 'contentWindow'.\n      this.postMessage('c');\n    } catch (x) {\n      // intentionally empty\n    }\n    this.iframeObj.cleanup();\n    this.iframeObj = null;\n    this.onmessageCallback = this.iframeObj = null;\n  }\n};\n\nIframeTransport.prototype._message = function(e) {\n  debug('message', e.data);\n  if (!urlUtils.isOriginEqual(e.origin, this.origin)) {\n    debug('not same origin', e.origin, this.origin);\n    return;\n  }\n\n  var iframeMessage;\n  try {\n    iframeMessage = JSON3.parse(e.data);\n  } catch (ignored) {\n    debug('bad json', e.data);\n    return;\n  }\n\n  if (iframeMessage.windowId !== this.windowId) {\n    debug('mismatched window id', iframeMessage.windowId, this.windowId);\n    return;\n  }\n\n  switch (iframeMessage.type) {\n  case 's':\n    this.iframeObj.loaded();\n    // window global dependency\n    this.postMessage('s', JSON3.stringify([\n      version\n    , this.transport\n    , this.transUrl\n    , this.baseUrl\n    ]));\n    break;\n  case 't':\n    this.emit('message', iframeMessage.data);\n    break;\n  case 'c':\n    var cdata;\n    try {\n      cdata = JSON3.parse(iframeMessage.data);\n    } catch (ignored) {\n      debug('bad json', iframeMessage.data);\n      return;\n    }\n    this.emit('close', cdata[0], cdata[1]);\n    this.close();\n    break;\n  }\n};\n\nIframeTransport.prototype.postMessage = function(type, data) {\n  debug('postMessage', type, data);\n  this.iframeObj.post(JSON3.stringify({\n    windowId: this.windowId\n  , type: type\n  , data: data || ''\n  }), this.origin);\n};\n\nIframeTransport.prototype.send = function(message) {\n  debug('send', message);\n  this.postMessage('m', message);\n};\n\nIframeTransport.enabled = function() {\n  return iframeUtils.iframeEnabled;\n};\n\nIframeTransport.transportName = 'iframe';\nIframeTransport.roundTrips = 2;\n\nmodule.exports = IframeTransport;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvaWZyYW1lLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG4vLyBGZXcgY29vbCB0cmFuc3BvcnRzIGRvIHdvcmsgb25seSBmb3Igc2FtZS1vcmlnaW4uIEluIG9yZGVyIHRvIG1ha2Vcbi8vIHRoZW0gd29yayBjcm9zcy1kb21haW4gd2Ugc2hhbGwgdXNlIGlmcmFtZSwgc2VydmVkIGZyb20gdGhlXG4vLyByZW1vdGUgZG9tYWluLiBOZXcgYnJvd3NlcnMgaGF2ZSBjYXBhYmlsaXRpZXMgdG8gY29tbXVuaWNhdGUgd2l0aFxuLy8gY3Jvc3MgZG9tYWluIGlmcmFtZSB1c2luZyBwb3N0TWVzc2FnZSgpLiBJbiBJRSBpdCB3YXMgaW1wbGVtZW50ZWRcbi8vIGZyb20gSUUgOCssIGJ1dCBvZiBjb3Vyc2UsIElFIGdvdCBzb21lIGRldGFpbHMgd3Jvbmc6XG4vLyAgICBodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tL2VuLXVzL2xpYnJhcnkvY2MxOTcwMTUodj1WUy44NSkuYXNweFxuLy8gICAgaHR0cDovL3N0ZXZlc291ZGVycy5jb20vbWlzYy90ZXN0LXBvc3RtZXNzYWdlLnBocFxuXG52YXIgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgSlNPTjMgPSByZXF1aXJlKCdqc29uMycpXG4gICwgRXZlbnRFbWl0dGVyID0gcmVxdWlyZSgnZXZlbnRzJykuRXZlbnRFbWl0dGVyXG4gICwgdmVyc2lvbiA9IHJlcXVpcmUoJy4uL3ZlcnNpb24nKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vdXRpbHMvdXJsJylcbiAgLCBpZnJhbWVVdGlscyA9IHJlcXVpcmUoJy4uL3V0aWxzL2lmcmFtZScpXG4gICwgZXZlbnRVdGlscyA9IHJlcXVpcmUoJy4uL3V0aWxzL2V2ZW50JylcbiAgLCByYW5kb20gPSByZXF1aXJlKCcuLi91dGlscy9yYW5kb20nKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6dHJhbnNwb3J0OmlmcmFtZScpO1xufVxuXG5mdW5jdGlvbiBJZnJhbWVUcmFuc3BvcnQodHJhbnNwb3J0LCB0cmFuc1VybCwgYmFzZVVybCkge1xuICBpZiAoIUlmcmFtZVRyYW5zcG9ydC5lbmFibGVkKCkpIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoJ1RyYW5zcG9ydCBjcmVhdGVkIHdoZW4gZGlzYWJsZWQnKTtcbiAgfVxuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcblxuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHRoaXMub3JpZ2luID0gdXJsVXRpbHMuZ2V0T3JpZ2luKGJhc2VVcmwpO1xuICB0aGlzLmJhc2VVcmwgPSBiYXNlVXJsO1xuICB0aGlzLnRyYW5zVXJsID0gdHJhbnNVcmw7XG4gIHRoaXMudHJhbnNwb3J0ID0gdHJhbnNwb3J0O1xuICB0aGlzLndpbmRvd0lkID0gcmFuZG9tLnN0cmluZyg4KTtcblxuICB2YXIgaWZyYW1lVXJsID0gdXJsVXRpbHMuYWRkUGF0aChiYXNlVXJsLCAnL2lmcmFtZS5odG1sJykgKyAnIycgKyB0aGlzLndpbmRvd0lkO1xuICBkZWJ1Zyh0cmFuc3BvcnQsIHRyYW5zVXJsLCBpZnJhbWVVcmwpO1xuXG4gIHRoaXMuaWZyYW1lT2JqID0gaWZyYW1lVXRpbHMuY3JlYXRlSWZyYW1lKGlmcmFtZVVybCwgZnVuY3Rpb24ocikge1xuICAgIGRlYnVnKCdlcnIgY2FsbGJhY2snKTtcbiAgICBzZWxmLmVtaXQoJ2Nsb3NlJywgMTAwNiwgJ1VuYWJsZSB0byBsb2FkIGFuIGlmcmFtZSAoJyArIHIgKyAnKScpO1xuICAgIHNlbGYuY2xvc2UoKTtcbiAgfSk7XG5cbiAgdGhpcy5vbm1lc3NhZ2VDYWxsYmFjayA9IHRoaXMuX21lc3NhZ2UuYmluZCh0aGlzKTtcbiAgZXZlbnRVdGlscy5hdHRhY2hFdmVudCgnbWVzc2FnZScsIHRoaXMub25tZXNzYWdlQ2FsbGJhY2spO1xufVxuXG5pbmhlcml0cyhJZnJhbWVUcmFuc3BvcnQsIEV2ZW50RW1pdHRlcik7XG5cbklmcmFtZVRyYW5zcG9ydC5wcm90b3R5cGUuY2xvc2UgPSBmdW5jdGlvbigpIHtcbiAgZGVidWcoJ2Nsb3NlJyk7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIGlmICh0aGlzLmlmcmFtZU9iaikge1xuICAgIGV2ZW50VXRpbHMuZGV0YWNoRXZlbnQoJ21lc3NhZ2UnLCB0aGlzLm9ubWVzc2FnZUNhbGxiYWNrKTtcbiAgICB0cnkge1xuICAgICAgLy8gV2hlbiB0aGUgaWZyYW1lIGlzIG5vdCBsb2FkZWQsIElFIHJhaXNlcyBhbiBleGNlcHRpb25cbiAgICAgIC8vIG9uICdjb250ZW50V2luZG93Jy5cbiAgICAgIHRoaXMucG9zdE1lc3NhZ2UoJ2MnKTtcbiAgICB9IGNhdGNoICh4KSB7XG4gICAgICAvLyBpbnRlbnRpb25hbGx5IGVtcHR5XG4gICAgfVxuICAgIHRoaXMuaWZyYW1lT2JqLmNsZWFudXAoKTtcbiAgICB0aGlzLmlmcmFtZU9iaiA9IG51bGw7XG4gICAgdGhpcy5vbm1lc3NhZ2VDYWxsYmFjayA9IHRoaXMuaWZyYW1lT2JqID0gbnVsbDtcbiAgfVxufTtcblxuSWZyYW1lVHJhbnNwb3J0LnByb3RvdHlwZS5fbWVzc2FnZSA9IGZ1bmN0aW9uKGUpIHtcbiAgZGVidWcoJ21lc3NhZ2UnLCBlLmRhdGEpO1xuICBpZiAoIXVybFV0aWxzLmlzT3JpZ2luRXF1YWwoZS5vcmlnaW4sIHRoaXMub3JpZ2luKSkge1xuICAgIGRlYnVnKCdub3Qgc2FtZSBvcmlnaW4nLCBlLm9yaWdpbiwgdGhpcy5vcmlnaW4pO1xuICAgIHJldHVybjtcbiAgfVxuXG4gIHZhciBpZnJhbWVNZXNzYWdlO1xuICB0cnkge1xuICAgIGlmcmFtZU1lc3NhZ2UgPSBKU09OMy5wYXJzZShlLmRhdGEpO1xuICB9IGNhdGNoIChpZ25vcmVkKSB7XG4gICAgZGVidWcoJ2JhZCBqc29uJywgZS5kYXRhKTtcbiAgICByZXR1cm47XG4gIH1cblxuICBpZiAoaWZyYW1lTWVzc2FnZS53aW5kb3dJZCAhPT0gdGhpcy53aW5kb3dJZCkge1xuICAgIGRlYnVnKCdtaXNtYXRjaGVkIHdpbmRvdyBpZCcsIGlmcmFtZU1lc3NhZ2Uud2luZG93SWQsIHRoaXMud2luZG93SWQpO1xuICAgIHJldHVybjtcbiAgfVxuXG4gIHN3aXRjaCAoaWZyYW1lTWVzc2FnZS50eXBlKSB7XG4gIGNhc2UgJ3MnOlxuICAgIHRoaXMuaWZyYW1lT2JqLmxvYWRlZCgpO1xuICAgIC8vIHdpbmRvdyBnbG9iYWwgZGVwZW5kZW5jeVxuICAgIHRoaXMucG9zdE1lc3NhZ2UoJ3MnLCBKU09OMy5zdHJpbmdpZnkoW1xuICAgICAgdmVyc2lvblxuICAgICwgdGhpcy50cmFuc3BvcnRcbiAgICAsIHRoaXMudHJhbnNVcmxcbiAgICAsIHRoaXMuYmFzZVVybFxuICAgIF0pKTtcbiAgICBicmVhaztcbiAgY2FzZSAndCc6XG4gICAgdGhpcy5lbWl0KCdtZXNzYWdlJywgaWZyYW1lTWVzc2FnZS5kYXRhKTtcbiAgICBicmVhaztcbiAgY2FzZSAnYyc6XG4gICAgdmFyIGNkYXRhO1xuICAgIHRyeSB7XG4gICAgICBjZGF0YSA9IEpTT04zLnBhcnNlKGlmcmFtZU1lc3NhZ2UuZGF0YSk7XG4gICAgfSBjYXRjaCAoaWdub3JlZCkge1xuICAgICAgZGVidWcoJ2JhZCBqc29uJywgaWZyYW1lTWVzc2FnZS5kYXRhKTtcbiAgICAgIHJldHVybjtcbiAgICB9XG4gICAgdGhpcy5lbWl0KCdjbG9zZScsIGNkYXRhWzBdLCBjZGF0YVsxXSk7XG4gICAgdGhpcy5jbG9zZSgpO1xuICAgIGJyZWFrO1xuICB9XG59O1xuXG5JZnJhbWVUcmFuc3BvcnQucHJvdG90eXBlLnBvc3RNZXNzYWdlID0gZnVuY3Rpb24odHlwZSwgZGF0YSkge1xuICBkZWJ1ZygncG9zdE1lc3NhZ2UnLCB0eXBlLCBkYXRhKTtcbiAgdGhpcy5pZnJhbWVPYmoucG9zdChKU09OMy5zdHJpbmdpZnkoe1xuICAgIHdpbmRvd0lkOiB0aGlzLndpbmRvd0lkXG4gICwgdHlwZTogdHlwZVxuICAsIGRhdGE6IGRhdGEgfHwgJydcbiAgfSksIHRoaXMub3JpZ2luKTtcbn07XG5cbklmcmFtZVRyYW5zcG9ydC5wcm90b3R5cGUuc2VuZCA9IGZ1bmN0aW9uKG1lc3NhZ2UpIHtcbiAgZGVidWcoJ3NlbmQnLCBtZXNzYWdlKTtcbiAgdGhpcy5wb3N0TWVzc2FnZSgnbScsIG1lc3NhZ2UpO1xufTtcblxuSWZyYW1lVHJhbnNwb3J0LmVuYWJsZWQgPSBmdW5jdGlvbigpIHtcbiAgcmV0dXJuIGlmcmFtZVV0aWxzLmlmcmFtZUVuYWJsZWQ7XG59O1xuXG5JZnJhbWVUcmFuc3BvcnQudHJhbnNwb3J0TmFtZSA9ICdpZnJhbWUnO1xuSWZyYW1lVHJhbnNwb3J0LnJvdW5kVHJpcHMgPSAyO1xuXG5tb2R1bGUuZXhwb3J0cyA9IElmcmFtZVRyYW5zcG9ydDtcbiJdfQ==","(function (global){\n'use strict';\n\n// The simplest and most robust transport, using the well-know cross\n// domain hack - JSONP. This transport is quite inefficient - one\n// message could use up to one http request. But at least it works almost\n// everywhere.\n// Known limitations:\n//   o you will get a spinning cursor\n//   o for Konqueror a dumb timer is needed to detect errors\n\nvar inherits = require('inherits')\n  , SenderReceiver = require('./lib/sender-receiver')\n  , JsonpReceiver = require('./receiver/jsonp')\n  , jsonpSender = require('./sender/jsonp')\n  ;\n\nfunction JsonPTransport(transUrl) {\n  if (!JsonPTransport.enabled()) {\n    throw new Error('Transport created when disabled');\n  }\n  SenderReceiver.call(this, transUrl, '/jsonp', jsonpSender, JsonpReceiver);\n}\n\ninherits(JsonPTransport, SenderReceiver);\n\nJsonPTransport.enabled = function() {\n  return !!global.document;\n};\n\nJsonPTransport.transportName = 'jsonp-polling';\nJsonPTransport.roundTrips = 1;\nJsonPTransport.needBody = true;\n\nmodule.exports = JsonPTransport;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvanNvbnAtcG9sbGluZy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG4vLyBUaGUgc2ltcGxlc3QgYW5kIG1vc3Qgcm9idXN0IHRyYW5zcG9ydCwgdXNpbmcgdGhlIHdlbGwta25vdyBjcm9zc1xuLy8gZG9tYWluIGhhY2sgLSBKU09OUC4gVGhpcyB0cmFuc3BvcnQgaXMgcXVpdGUgaW5lZmZpY2llbnQgLSBvbmVcbi8vIG1lc3NhZ2UgY291bGQgdXNlIHVwIHRvIG9uZSBodHRwIHJlcXVlc3QuIEJ1dCBhdCBsZWFzdCBpdCB3b3JrcyBhbG1vc3Rcbi8vIGV2ZXJ5d2hlcmUuXG4vLyBLbm93biBsaW1pdGF0aW9uczpcbi8vICAgbyB5b3Ugd2lsbCBnZXQgYSBzcGlubmluZyBjdXJzb3Jcbi8vICAgbyBmb3IgS29ucXVlcm9yIGEgZHVtYiB0aW1lciBpcyBuZWVkZWQgdG8gZGV0ZWN0IGVycm9yc1xuXG52YXIgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgU2VuZGVyUmVjZWl2ZXIgPSByZXF1aXJlKCcuL2xpYi9zZW5kZXItcmVjZWl2ZXInKVxuICAsIEpzb25wUmVjZWl2ZXIgPSByZXF1aXJlKCcuL3JlY2VpdmVyL2pzb25wJylcbiAgLCBqc29ucFNlbmRlciA9IHJlcXVpcmUoJy4vc2VuZGVyL2pzb25wJylcbiAgO1xuXG5mdW5jdGlvbiBKc29uUFRyYW5zcG9ydCh0cmFuc1VybCkge1xuICBpZiAoIUpzb25QVHJhbnNwb3J0LmVuYWJsZWQoKSkge1xuICAgIHRocm93IG5ldyBFcnJvcignVHJhbnNwb3J0IGNyZWF0ZWQgd2hlbiBkaXNhYmxlZCcpO1xuICB9XG4gIFNlbmRlclJlY2VpdmVyLmNhbGwodGhpcywgdHJhbnNVcmwsICcvanNvbnAnLCBqc29ucFNlbmRlciwgSnNvbnBSZWNlaXZlcik7XG59XG5cbmluaGVyaXRzKEpzb25QVHJhbnNwb3J0LCBTZW5kZXJSZWNlaXZlcik7XG5cbkpzb25QVHJhbnNwb3J0LmVuYWJsZWQgPSBmdW5jdGlvbigpIHtcbiAgcmV0dXJuICEhZ2xvYmFsLmRvY3VtZW50O1xufTtcblxuSnNvblBUcmFuc3BvcnQudHJhbnNwb3J0TmFtZSA9ICdqc29ucC1wb2xsaW5nJztcbkpzb25QVHJhbnNwb3J0LnJvdW5kVHJpcHMgPSAxO1xuSnNvblBUcmFuc3BvcnQubmVlZEJvZHkgPSB0cnVlO1xuXG5tb2R1bGUuZXhwb3J0cyA9IEpzb25QVHJhbnNwb3J0O1xuIl19","(function (process){\n'use strict';\n\nvar inherits = require('inherits')\n  , urlUtils = require('../../utils/url')\n  , SenderReceiver = require('./sender-receiver')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:ajax-based');\n}\n\nfunction createAjaxSender(AjaxObject) {\n  return function(url, payload, callback) {\n    debug('create ajax sender', url, payload);\n    var opt = {};\n    if (typeof payload === 'string') {\n      opt.headers = {'Content-type': 'text/plain'};\n    }\n    var ajaxUrl = urlUtils.addPath(url, '/xhr_send');\n    var xo = new AjaxObject('POST', ajaxUrl, payload, opt);\n    xo.once('finish', function(status) {\n      debug('finish', status);\n      xo = null;\n\n      if (status !== 200 && status !== 204) {\n        return callback(new Error('http status ' + status));\n      }\n      callback();\n    });\n    return function() {\n      debug('abort');\n      xo.close();\n      xo = null;\n\n      var err = new Error('Aborted');\n      err.code = 1000;\n      callback(err);\n    };\n  };\n}\n\nfunction AjaxBasedTransport(transUrl, urlSuffix, Receiver, AjaxObject) {\n  SenderReceiver.call(this, transUrl, urlSuffix, createAjaxSender(AjaxObject), Receiver, AjaxObject);\n}\n\ninherits(AjaxBasedTransport, SenderReceiver);\n\nmodule.exports = AjaxBasedTransport;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL2FqYXgtYmFzZWQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvdXJsJylcbiAgLCBTZW5kZXJSZWNlaXZlciA9IHJlcXVpcmUoJy4vc2VuZGVyLXJlY2VpdmVyJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OmFqYXgtYmFzZWQnKTtcbn1cblxuZnVuY3Rpb24gY3JlYXRlQWpheFNlbmRlcihBamF4T2JqZWN0KSB7XG4gIHJldHVybiBmdW5jdGlvbih1cmwsIHBheWxvYWQsIGNhbGxiYWNrKSB7XG4gICAgZGVidWcoJ2NyZWF0ZSBhamF4IHNlbmRlcicsIHVybCwgcGF5bG9hZCk7XG4gICAgdmFyIG9wdCA9IHt9O1xuICAgIGlmICh0eXBlb2YgcGF5bG9hZCA9PT0gJ3N0cmluZycpIHtcbiAgICAgIG9wdC5oZWFkZXJzID0geydDb250ZW50LXR5cGUnOiAndGV4dC9wbGFpbid9O1xuICAgIH1cbiAgICB2YXIgYWpheFVybCA9IHVybFV0aWxzLmFkZFBhdGgodXJsLCAnL3hocl9zZW5kJyk7XG4gICAgdmFyIHhvID0gbmV3IEFqYXhPYmplY3QoJ1BPU1QnLCBhamF4VXJsLCBwYXlsb2FkLCBvcHQpO1xuICAgIHhvLm9uY2UoJ2ZpbmlzaCcsIGZ1bmN0aW9uKHN0YXR1cykge1xuICAgICAgZGVidWcoJ2ZpbmlzaCcsIHN0YXR1cyk7XG4gICAgICB4byA9IG51bGw7XG5cbiAgICAgIGlmIChzdGF0dXMgIT09IDIwMCAmJiBzdGF0dXMgIT09IDIwNCkge1xuICAgICAgICByZXR1cm4gY2FsbGJhY2sobmV3IEVycm9yKCdodHRwIHN0YXR1cyAnICsgc3RhdHVzKSk7XG4gICAgICB9XG4gICAgICBjYWxsYmFjaygpO1xuICAgIH0pO1xuICAgIHJldHVybiBmdW5jdGlvbigpIHtcbiAgICAgIGRlYnVnKCdhYm9ydCcpO1xuICAgICAgeG8uY2xvc2UoKTtcbiAgICAgIHhvID0gbnVsbDtcblxuICAgICAgdmFyIGVyciA9IG5ldyBFcnJvcignQWJvcnRlZCcpO1xuICAgICAgZXJyLmNvZGUgPSAxMDAwO1xuICAgICAgY2FsbGJhY2soZXJyKTtcbiAgICB9O1xuICB9O1xufVxuXG5mdW5jdGlvbiBBamF4QmFzZWRUcmFuc3BvcnQodHJhbnNVcmwsIHVybFN1ZmZpeCwgUmVjZWl2ZXIsIEFqYXhPYmplY3QpIHtcbiAgU2VuZGVyUmVjZWl2ZXIuY2FsbCh0aGlzLCB0cmFuc1VybCwgdXJsU3VmZml4LCBjcmVhdGVBamF4U2VuZGVyKEFqYXhPYmplY3QpLCBSZWNlaXZlciwgQWpheE9iamVjdCk7XG59XG5cbmluaGVyaXRzKEFqYXhCYXNlZFRyYW5zcG9ydCwgU2VuZGVyUmVjZWl2ZXIpO1xuXG5tb2R1bGUuZXhwb3J0cyA9IEFqYXhCYXNlZFRyYW5zcG9ydDtcbiJdfQ==","(function (process){\n'use strict';\n\nvar inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:buffered-sender');\n}\n\nfunction BufferedSender(url, sender) {\n  debug(url);\n  EventEmitter.call(this);\n  this.sendBuffer = [];\n  this.sender = sender;\n  this.url = url;\n}\n\ninherits(BufferedSender, EventEmitter);\n\nBufferedSender.prototype.send = function(message) {\n  debug('send', message);\n  this.sendBuffer.push(message);\n  if (!this.sendStop) {\n    this.sendSchedule();\n  }\n};\n\n// For polling transports in a situation when in the message callback,\n// new message is being send. If the sending connection was started\n// before receiving one, it is possible to saturate the network and\n// timeout due to the lack of receiving socket. To avoid that we delay\n// sending messages by some small time, in order to let receiving\n// connection be started beforehand. This is only a halfmeasure and\n// does not fix the big problem, but it does make the tests go more\n// stable on slow networks.\nBufferedSender.prototype.sendScheduleWait = function() {\n  debug('sendScheduleWait');\n  var self = this;\n  var tref;\n  this.sendStop = function() {\n    debug('sendStop');\n    self.sendStop = null;\n    clearTimeout(tref);\n  };\n  tref = setTimeout(function() {\n    debug('timeout');\n    self.sendStop = null;\n    self.sendSchedule();\n  }, 25);\n};\n\nBufferedSender.prototype.sendSchedule = function() {\n  debug('sendSchedule', this.sendBuffer.length);\n  var self = this;\n  if (this.sendBuffer.length > 0) {\n    var payload = '[' + this.sendBuffer.join(',') + ']';\n    this.sendStop = this.sender(this.url, payload, function(err) {\n      self.sendStop = null;\n      if (err) {\n        debug('error', err);\n        self.emit('close', err.code || 1006, 'Sending error: ' + err);\n        self._cleanup();\n      } else {\n        self.sendScheduleWait();\n      }\n    });\n    this.sendBuffer = [];\n  }\n};\n\nBufferedSender.prototype._cleanup = function() {\n  debug('_cleanup');\n  this.removeAllListeners();\n};\n\nBufferedSender.prototype.stop = function() {\n  debug('stop');\n  this._cleanup();\n  if (this.sendStop) {\n    this.sendStop();\n    this.sendStop = null;\n  }\n};\n\nmodule.exports = BufferedSender;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL2J1ZmZlcmVkLXNlbmRlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6YnVmZmVyZWQtc2VuZGVyJyk7XG59XG5cbmZ1bmN0aW9uIEJ1ZmZlcmVkU2VuZGVyKHVybCwgc2VuZGVyKSB7XG4gIGRlYnVnKHVybCk7XG4gIEV2ZW50RW1pdHRlci5jYWxsKHRoaXMpO1xuICB0aGlzLnNlbmRCdWZmZXIgPSBbXTtcbiAgdGhpcy5zZW5kZXIgPSBzZW5kZXI7XG4gIHRoaXMudXJsID0gdXJsO1xufVxuXG5pbmhlcml0cyhCdWZmZXJlZFNlbmRlciwgRXZlbnRFbWl0dGVyKTtcblxuQnVmZmVyZWRTZW5kZXIucHJvdG90eXBlLnNlbmQgPSBmdW5jdGlvbihtZXNzYWdlKSB7XG4gIGRlYnVnKCdzZW5kJywgbWVzc2FnZSk7XG4gIHRoaXMuc2VuZEJ1ZmZlci5wdXNoKG1lc3NhZ2UpO1xuICBpZiAoIXRoaXMuc2VuZFN0b3ApIHtcbiAgICB0aGlzLnNlbmRTY2hlZHVsZSgpO1xuICB9XG59O1xuXG4vLyBGb3IgcG9sbGluZyB0cmFuc3BvcnRzIGluIGEgc2l0dWF0aW9uIHdoZW4gaW4gdGhlIG1lc3NhZ2UgY2FsbGJhY2ssXG4vLyBuZXcgbWVzc2FnZSBpcyBiZWluZyBzZW5kLiBJZiB0aGUgc2VuZGluZyBjb25uZWN0aW9uIHdhcyBzdGFydGVkXG4vLyBiZWZvcmUgcmVjZWl2aW5nIG9uZSwgaXQgaXMgcG9zc2libGUgdG8gc2F0dXJhdGUgdGhlIG5ldHdvcmsgYW5kXG4vLyB0aW1lb3V0IGR1ZSB0byB0aGUgbGFjayBvZiByZWNlaXZpbmcgc29ja2V0LiBUbyBhdm9pZCB0aGF0IHdlIGRlbGF5XG4vLyBzZW5kaW5nIG1lc3NhZ2VzIGJ5IHNvbWUgc21hbGwgdGltZSwgaW4gb3JkZXIgdG8gbGV0IHJlY2VpdmluZ1xuLy8gY29ubmVjdGlvbiBiZSBzdGFydGVkIGJlZm9yZWhhbmQuIFRoaXMgaXMgb25seSBhIGhhbGZtZWFzdXJlIGFuZFxuLy8gZG9lcyBub3QgZml4IHRoZSBiaWcgcHJvYmxlbSwgYnV0IGl0IGRvZXMgbWFrZSB0aGUgdGVzdHMgZ28gbW9yZVxuLy8gc3RhYmxlIG9uIHNsb3cgbmV0d29ya3MuXG5CdWZmZXJlZFNlbmRlci5wcm90b3R5cGUuc2VuZFNjaGVkdWxlV2FpdCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1Zygnc2VuZFNjaGVkdWxlV2FpdCcpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB0cmVmO1xuICB0aGlzLnNlbmRTdG9wID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ3NlbmRTdG9wJyk7XG4gICAgc2VsZi5zZW5kU3RvcCA9IG51bGw7XG4gICAgY2xlYXJUaW1lb3V0KHRyZWYpO1xuICB9O1xuICB0cmVmID0gc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICBkZWJ1ZygndGltZW91dCcpO1xuICAgIHNlbGYuc2VuZFN0b3AgPSBudWxsO1xuICAgIHNlbGYuc2VuZFNjaGVkdWxlKCk7XG4gIH0sIDI1KTtcbn07XG5cbkJ1ZmZlcmVkU2VuZGVyLnByb3RvdHlwZS5zZW5kU2NoZWR1bGUgPSBmdW5jdGlvbigpIHtcbiAgZGVidWcoJ3NlbmRTY2hlZHVsZScsIHRoaXMuc2VuZEJ1ZmZlci5sZW5ndGgpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIGlmICh0aGlzLnNlbmRCdWZmZXIubGVuZ3RoID4gMCkge1xuICAgIHZhciBwYXlsb2FkID0gJ1snICsgdGhpcy5zZW5kQnVmZmVyLmpvaW4oJywnKSArICddJztcbiAgICB0aGlzLnNlbmRTdG9wID0gdGhpcy5zZW5kZXIodGhpcy51cmwsIHBheWxvYWQsIGZ1bmN0aW9uKGVycikge1xuICAgICAgc2VsZi5zZW5kU3RvcCA9IG51bGw7XG4gICAgICBpZiAoZXJyKSB7XG4gICAgICAgIGRlYnVnKCdlcnJvcicsIGVycik7XG4gICAgICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBlcnIuY29kZSB8fCAxMDA2LCAnU2VuZGluZyBlcnJvcjogJyArIGVycik7XG4gICAgICAgIHNlbGYuX2NsZWFudXAoKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHNlbGYuc2VuZFNjaGVkdWxlV2FpdCgpO1xuICAgICAgfVxuICAgIH0pO1xuICAgIHRoaXMuc2VuZEJ1ZmZlciA9IFtdO1xuICB9XG59O1xuXG5CdWZmZXJlZFNlbmRlci5wcm90b3R5cGUuX2NsZWFudXAgPSBmdW5jdGlvbigpIHtcbiAgZGVidWcoJ19jbGVhbnVwJyk7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG59O1xuXG5CdWZmZXJlZFNlbmRlci5wcm90b3R5cGUuc3RvcCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1Zygnc3RvcCcpO1xuICB0aGlzLl9jbGVhbnVwKCk7XG4gIGlmICh0aGlzLnNlbmRTdG9wKSB7XG4gICAgdGhpcy5zZW5kU3RvcCgpO1xuICAgIHRoaXMuc2VuZFN0b3AgPSBudWxsO1xuICB9XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IEJ1ZmZlcmVkU2VuZGVyO1xuIl19","(function (global){\n'use strict';\n\nvar inherits = require('inherits')\n  , IframeTransport = require('../iframe')\n  , objectUtils = require('../../utils/object')\n  ;\n\nmodule.exports = function(transport) {\n\n  function IframeWrapTransport(transUrl, baseUrl) {\n    IframeTransport.call(this, transport.transportName, transUrl, baseUrl);\n  }\n\n  inherits(IframeWrapTransport, IframeTransport);\n\n  IframeWrapTransport.enabled = function(url, info) {\n    if (!global.document) {\n      return false;\n    }\n\n    var iframeInfo = objectUtils.extend({}, info);\n    iframeInfo.sameOrigin = true;\n    return transport.enabled(iframeInfo) && IframeTransport.enabled();\n  };\n\n  IframeWrapTransport.transportName = 'iframe-' + transport.transportName;\n  IframeWrapTransport.needBody = true;\n  IframeWrapTransport.roundTrips = IframeTransport.roundTrips + transport.roundTrips - 1; // html, javascript (2) + transport - no CORS (1)\n\n  IframeWrapTransport.facadeTransport = transport;\n\n  return IframeWrapTransport;\n};\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL2lmcmFtZS13cmFwLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgSWZyYW1lVHJhbnNwb3J0ID0gcmVxdWlyZSgnLi4vaWZyYW1lJylcbiAgLCBvYmplY3RVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL29iamVjdCcpXG4gIDtcblxubW9kdWxlLmV4cG9ydHMgPSBmdW5jdGlvbih0cmFuc3BvcnQpIHtcblxuICBmdW5jdGlvbiBJZnJhbWVXcmFwVHJhbnNwb3J0KHRyYW5zVXJsLCBiYXNlVXJsKSB7XG4gICAgSWZyYW1lVHJhbnNwb3J0LmNhbGwodGhpcywgdHJhbnNwb3J0LnRyYW5zcG9ydE5hbWUsIHRyYW5zVXJsLCBiYXNlVXJsKTtcbiAgfVxuXG4gIGluaGVyaXRzKElmcmFtZVdyYXBUcmFuc3BvcnQsIElmcmFtZVRyYW5zcG9ydCk7XG5cbiAgSWZyYW1lV3JhcFRyYW5zcG9ydC5lbmFibGVkID0gZnVuY3Rpb24odXJsLCBpbmZvKSB7XG4gICAgaWYgKCFnbG9iYWwuZG9jdW1lbnQpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG5cbiAgICB2YXIgaWZyYW1lSW5mbyA9IG9iamVjdFV0aWxzLmV4dGVuZCh7fSwgaW5mbyk7XG4gICAgaWZyYW1lSW5mby5zYW1lT3JpZ2luID0gdHJ1ZTtcbiAgICByZXR1cm4gdHJhbnNwb3J0LmVuYWJsZWQoaWZyYW1lSW5mbykgJiYgSWZyYW1lVHJhbnNwb3J0LmVuYWJsZWQoKTtcbiAgfTtcblxuICBJZnJhbWVXcmFwVHJhbnNwb3J0LnRyYW5zcG9ydE5hbWUgPSAnaWZyYW1lLScgKyB0cmFuc3BvcnQudHJhbnNwb3J0TmFtZTtcbiAgSWZyYW1lV3JhcFRyYW5zcG9ydC5uZWVkQm9keSA9IHRydWU7XG4gIElmcmFtZVdyYXBUcmFuc3BvcnQucm91bmRUcmlwcyA9IElmcmFtZVRyYW5zcG9ydC5yb3VuZFRyaXBzICsgdHJhbnNwb3J0LnJvdW5kVHJpcHMgLSAxOyAvLyBodG1sLCBqYXZhc2NyaXB0ICgyKSArIHRyYW5zcG9ydCAtIG5vIENPUlMgKDEpXG5cbiAgSWZyYW1lV3JhcFRyYW5zcG9ydC5mYWNhZGVUcmFuc3BvcnQgPSB0cmFuc3BvcnQ7XG5cbiAgcmV0dXJuIElmcmFtZVdyYXBUcmFuc3BvcnQ7XG59O1xuIl19","(function (process){\n'use strict';\n\nvar inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:polling');\n}\n\nfunction Polling(Receiver, receiveUrl, AjaxObject) {\n  debug(receiveUrl);\n  EventEmitter.call(this);\n  this.Receiver = Receiver;\n  this.receiveUrl = receiveUrl;\n  this.AjaxObject = AjaxObject;\n  this._scheduleReceiver();\n}\n\ninherits(Polling, EventEmitter);\n\nPolling.prototype._scheduleReceiver = function() {\n  debug('_scheduleReceiver');\n  var self = this;\n  var poll = this.poll = new this.Receiver(this.receiveUrl, this.AjaxObject);\n\n  poll.on('message', function(msg) {\n    debug('message', msg);\n    self.emit('message', msg);\n  });\n\n  poll.once('close', function(code, reason) {\n    debug('close', code, reason, self.pollIsClosing);\n    self.poll = poll = null;\n\n    if (!self.pollIsClosing) {\n      if (reason === 'network') {\n        self._scheduleReceiver();\n      } else {\n        self.emit('close', code || 1006, reason);\n        self.removeAllListeners();\n      }\n    }\n  });\n};\n\nPolling.prototype.abort = function() {\n  debug('abort');\n  this.removeAllListeners();\n  this.pollIsClosing = true;\n  if (this.poll) {\n    this.poll.abort();\n  }\n};\n\nmodule.exports = Polling;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL3BvbGxpbmcuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnBvbGxpbmcnKTtcbn1cblxuZnVuY3Rpb24gUG9sbGluZyhSZWNlaXZlciwgcmVjZWl2ZVVybCwgQWpheE9iamVjdCkge1xuICBkZWJ1ZyhyZWNlaXZlVXJsKTtcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG4gIHRoaXMuUmVjZWl2ZXIgPSBSZWNlaXZlcjtcbiAgdGhpcy5yZWNlaXZlVXJsID0gcmVjZWl2ZVVybDtcbiAgdGhpcy5BamF4T2JqZWN0ID0gQWpheE9iamVjdDtcbiAgdGhpcy5fc2NoZWR1bGVSZWNlaXZlcigpO1xufVxuXG5pbmhlcml0cyhQb2xsaW5nLCBFdmVudEVtaXR0ZXIpO1xuXG5Qb2xsaW5nLnByb3RvdHlwZS5fc2NoZWR1bGVSZWNlaXZlciA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnX3NjaGVkdWxlUmVjZWl2ZXInKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICB2YXIgcG9sbCA9IHRoaXMucG9sbCA9IG5ldyB0aGlzLlJlY2VpdmVyKHRoaXMucmVjZWl2ZVVybCwgdGhpcy5BamF4T2JqZWN0KTtcblxuICBwb2xsLm9uKCdtZXNzYWdlJywgZnVuY3Rpb24obXNnKSB7XG4gICAgZGVidWcoJ21lc3NhZ2UnLCBtc2cpO1xuICAgIHNlbGYuZW1pdCgnbWVzc2FnZScsIG1zZyk7XG4gIH0pO1xuXG4gIHBvbGwub25jZSgnY2xvc2UnLCBmdW5jdGlvbihjb2RlLCByZWFzb24pIHtcbiAgICBkZWJ1ZygnY2xvc2UnLCBjb2RlLCByZWFzb24sIHNlbGYucG9sbElzQ2xvc2luZyk7XG4gICAgc2VsZi5wb2xsID0gcG9sbCA9IG51bGw7XG5cbiAgICBpZiAoIXNlbGYucG9sbElzQ2xvc2luZykge1xuICAgICAgaWYgKHJlYXNvbiA9PT0gJ25ldHdvcmsnKSB7XG4gICAgICAgIHNlbGYuX3NjaGVkdWxlUmVjZWl2ZXIoKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBjb2RlIHx8IDEwMDYsIHJlYXNvbik7XG4gICAgICAgIHNlbGYucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gICAgICB9XG4gICAgfVxuICB9KTtcbn07XG5cblBvbGxpbmcucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICB0aGlzLnJlbW92ZUFsbExpc3RlbmVycygpO1xuICB0aGlzLnBvbGxJc0Nsb3NpbmcgPSB0cnVlO1xuICBpZiAodGhpcy5wb2xsKSB7XG4gICAgdGhpcy5wb2xsLmFib3J0KCk7XG4gIH1cbn07XG5cbm1vZHVsZS5leHBvcnRzID0gUG9sbGluZztcbiJdfQ==","(function (process){\n'use strict';\n\nvar inherits = require('inherits')\n  , urlUtils = require('../../utils/url')\n  , BufferedSender = require('./buffered-sender')\n  , Polling = require('./polling')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:sender-receiver');\n}\n\nfunction SenderReceiver(transUrl, urlSuffix, senderFunc, Receiver, AjaxObject) {\n  var pollUrl = urlUtils.addPath(transUrl, urlSuffix);\n  debug(pollUrl);\n  var self = this;\n  BufferedSender.call(this, transUrl, senderFunc);\n\n  this.poll = new Polling(Receiver, pollUrl, AjaxObject);\n  this.poll.on('message', function(msg) {\n    debug('poll message', msg);\n    self.emit('message', msg);\n  });\n  this.poll.once('close', function(code, reason) {\n    debug('poll close', code, reason);\n    self.poll = null;\n    self.emit('close', code, reason);\n    self.close();\n  });\n}\n\ninherits(SenderReceiver, BufferedSender);\n\nSenderReceiver.prototype.close = function() {\n  debug('close');\n  this.removeAllListeners();\n  if (this.poll) {\n    this.poll.abort();\n    this.poll = null;\n  }\n  this.stop();\n};\n\nmodule.exports = SenderReceiver;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvbGliL3NlbmRlci1yZWNlaXZlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIGluaGVyaXRzID0gcmVxdWlyZSgnaW5oZXJpdHMnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvdXJsJylcbiAgLCBCdWZmZXJlZFNlbmRlciA9IHJlcXVpcmUoJy4vYnVmZmVyZWQtc2VuZGVyJylcbiAgLCBQb2xsaW5nID0gcmVxdWlyZSgnLi9wb2xsaW5nJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnNlbmRlci1yZWNlaXZlcicpO1xufVxuXG5mdW5jdGlvbiBTZW5kZXJSZWNlaXZlcih0cmFuc1VybCwgdXJsU3VmZml4LCBzZW5kZXJGdW5jLCBSZWNlaXZlciwgQWpheE9iamVjdCkge1xuICB2YXIgcG9sbFVybCA9IHVybFV0aWxzLmFkZFBhdGgodHJhbnNVcmwsIHVybFN1ZmZpeCk7XG4gIGRlYnVnKHBvbGxVcmwpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIEJ1ZmZlcmVkU2VuZGVyLmNhbGwodGhpcywgdHJhbnNVcmwsIHNlbmRlckZ1bmMpO1xuXG4gIHRoaXMucG9sbCA9IG5ldyBQb2xsaW5nKFJlY2VpdmVyLCBwb2xsVXJsLCBBamF4T2JqZWN0KTtcbiAgdGhpcy5wb2xsLm9uKCdtZXNzYWdlJywgZnVuY3Rpb24obXNnKSB7XG4gICAgZGVidWcoJ3BvbGwgbWVzc2FnZScsIG1zZyk7XG4gICAgc2VsZi5lbWl0KCdtZXNzYWdlJywgbXNnKTtcbiAgfSk7XG4gIHRoaXMucG9sbC5vbmNlKCdjbG9zZScsIGZ1bmN0aW9uKGNvZGUsIHJlYXNvbikge1xuICAgIGRlYnVnKCdwb2xsIGNsb3NlJywgY29kZSwgcmVhc29uKTtcbiAgICBzZWxmLnBvbGwgPSBudWxsO1xuICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBjb2RlLCByZWFzb24pO1xuICAgIHNlbGYuY2xvc2UoKTtcbiAgfSk7XG59XG5cbmluaGVyaXRzKFNlbmRlclJlY2VpdmVyLCBCdWZmZXJlZFNlbmRlcik7XG5cblNlbmRlclJlY2VpdmVyLnByb3RvdHlwZS5jbG9zZSA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xvc2UnKTtcbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbiAgaWYgKHRoaXMucG9sbCkge1xuICAgIHRoaXMucG9sbC5hYm9ydCgpO1xuICAgIHRoaXMucG9sbCA9IG51bGw7XG4gIH1cbiAgdGhpcy5zdG9wKCk7XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IFNlbmRlclJlY2VpdmVyO1xuIl19","(function (process){\n'use strict';\n\nvar inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  , EventSourceDriver = require('eventsource')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:receiver:eventsource');\n}\n\nfunction EventSourceReceiver(url) {\n  debug(url);\n  EventEmitter.call(this);\n\n  var self = this;\n  var es = this.es = new EventSourceDriver(url);\n  es.onmessage = function(e) {\n    debug('message', e.data);\n    self.emit('message', decodeURI(e.data));\n  };\n  es.onerror = function(e) {\n    debug('error', es.readyState, e);\n    // ES on reconnection has readyState = 0 or 1.\n    // on network error it's CLOSED = 2\n    var reason = (es.readyState !== 2 ? 'network' : 'permanent');\n    self._cleanup();\n    self._close(reason);\n  };\n}\n\ninherits(EventSourceReceiver, EventEmitter);\n\nEventSourceReceiver.prototype.abort = function() {\n  debug('abort');\n  this._cleanup();\n  this._close('user');\n};\n\nEventSourceReceiver.prototype._cleanup = function() {\n  debug('cleanup');\n  var es = this.es;\n  if (es) {\n    es.onmessage = es.onerror = null;\n    es.close();\n    this.es = null;\n  }\n};\n\nEventSourceReceiver.prototype._close = function(reason) {\n  debug('close', reason);\n  var self = this;\n  // Safari and chrome < 15 crash if we close window before\n  // waiting for ES cleanup. See:\n  // https://code.google.com/p/chromium/issues/detail?id=89155\n  setTimeout(function() {\n    self.emit('close', null, reason);\n    self.removeAllListeners();\n  }, 200);\n};\n\nmodule.exports = EventSourceReceiver;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvcmVjZWl2ZXIvZXZlbnRzb3VyY2UuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgLCBFdmVudFNvdXJjZURyaXZlciA9IHJlcXVpcmUoJ2V2ZW50c291cmNlJylcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnJlY2VpdmVyOmV2ZW50c291cmNlJyk7XG59XG5cbmZ1bmN0aW9uIEV2ZW50U291cmNlUmVjZWl2ZXIodXJsKSB7XG4gIGRlYnVnKHVybCk7XG4gIEV2ZW50RW1pdHRlci5jYWxsKHRoaXMpO1xuXG4gIHZhciBzZWxmID0gdGhpcztcbiAgdmFyIGVzID0gdGhpcy5lcyA9IG5ldyBFdmVudFNvdXJjZURyaXZlcih1cmwpO1xuICBlcy5vbm1lc3NhZ2UgPSBmdW5jdGlvbihlKSB7XG4gICAgZGVidWcoJ21lc3NhZ2UnLCBlLmRhdGEpO1xuICAgIHNlbGYuZW1pdCgnbWVzc2FnZScsIGRlY29kZVVSSShlLmRhdGEpKTtcbiAgfTtcbiAgZXMub25lcnJvciA9IGZ1bmN0aW9uKGUpIHtcbiAgICBkZWJ1ZygnZXJyb3InLCBlcy5yZWFkeVN0YXRlLCBlKTtcbiAgICAvLyBFUyBvbiByZWNvbm5lY3Rpb24gaGFzIHJlYWR5U3RhdGUgPSAwIG9yIDEuXG4gICAgLy8gb24gbmV0d29yayBlcnJvciBpdCdzIENMT1NFRCA9IDJcbiAgICB2YXIgcmVhc29uID0gKGVzLnJlYWR5U3RhdGUgIT09IDIgPyAnbmV0d29yaycgOiAncGVybWFuZW50Jyk7XG4gICAgc2VsZi5fY2xlYW51cCgpO1xuICAgIHNlbGYuX2Nsb3NlKHJlYXNvbik7XG4gIH07XG59XG5cbmluaGVyaXRzKEV2ZW50U291cmNlUmVjZWl2ZXIsIEV2ZW50RW1pdHRlcik7XG5cbkV2ZW50U291cmNlUmVjZWl2ZXIucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICB0aGlzLl9jbGVhbnVwKCk7XG4gIHRoaXMuX2Nsb3NlKCd1c2VyJyk7XG59O1xuXG5FdmVudFNvdXJjZVJlY2VpdmVyLnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xlYW51cCcpO1xuICB2YXIgZXMgPSB0aGlzLmVzO1xuICBpZiAoZXMpIHtcbiAgICBlcy5vbm1lc3NhZ2UgPSBlcy5vbmVycm9yID0gbnVsbDtcbiAgICBlcy5jbG9zZSgpO1xuICAgIHRoaXMuZXMgPSBudWxsO1xuICB9XG59O1xuXG5FdmVudFNvdXJjZVJlY2VpdmVyLnByb3RvdHlwZS5fY2xvc2UgPSBmdW5jdGlvbihyZWFzb24pIHtcbiAgZGVidWcoJ2Nsb3NlJywgcmVhc29uKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICAvLyBTYWZhcmkgYW5kIGNocm9tZSA8IDE1IGNyYXNoIGlmIHdlIGNsb3NlIHdpbmRvdyBiZWZvcmVcbiAgLy8gd2FpdGluZyBmb3IgRVMgY2xlYW51cC4gU2VlOlxuICAvLyBodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9ODkxNTVcbiAgc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICBzZWxmLmVtaXQoJ2Nsb3NlJywgbnVsbCwgcmVhc29uKTtcbiAgICBzZWxmLnJlbW92ZUFsbExpc3RlbmVycygpO1xuICB9LCAyMDApO1xufTtcblxubW9kdWxlLmV4cG9ydHMgPSBFdmVudFNvdXJjZVJlY2VpdmVyO1xuIl19","(function (process,global){\n'use strict';\n\nvar inherits = require('inherits')\n  , iframeUtils = require('../../utils/iframe')\n  , urlUtils = require('../../utils/url')\n  , EventEmitter = require('events').EventEmitter\n  , random = require('../../utils/random')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:receiver:htmlfile');\n}\n\nfunction HtmlfileReceiver(url) {\n  debug(url);\n  EventEmitter.call(this);\n  var self = this;\n  iframeUtils.polluteGlobalNamespace();\n\n  this.id = 'a' + random.string(6);\n  url = urlUtils.addQuery(url, 'c=' + decodeURIComponent(iframeUtils.WPrefix + '.' + this.id));\n\n  debug('using htmlfile', HtmlfileReceiver.htmlfileEnabled);\n  var constructFunc = HtmlfileReceiver.htmlfileEnabled ?\n      iframeUtils.createHtmlfile : iframeUtils.createIframe;\n\n  global[iframeUtils.WPrefix][this.id] = {\n    start: function() {\n      debug('start');\n      self.iframeObj.loaded();\n    }\n  , message: function(data) {\n      debug('message', data);\n      self.emit('message', data);\n    }\n  , stop: function() {\n      debug('stop');\n      self._cleanup();\n      self._close('network');\n    }\n  };\n  this.iframeObj = constructFunc(url, function() {\n    debug('callback');\n    self._cleanup();\n    self._close('permanent');\n  });\n}\n\ninherits(HtmlfileReceiver, EventEmitter);\n\nHtmlfileReceiver.prototype.abort = function() {\n  debug('abort');\n  this._cleanup();\n  this._close('user');\n};\n\nHtmlfileReceiver.prototype._cleanup = function() {\n  debug('_cleanup');\n  if (this.iframeObj) {\n    this.iframeObj.cleanup();\n    this.iframeObj = null;\n  }\n  delete global[iframeUtils.WPrefix][this.id];\n};\n\nHtmlfileReceiver.prototype._close = function(reason) {\n  debug('_close', reason);\n  this.emit('close', null, reason);\n  this.removeAllListeners();\n};\n\nHtmlfileReceiver.htmlfileEnabled = false;\n\n// obfuscate to avoid firewalls\nvar axo = ['Active'].concat('Object').join('X');\nif (axo in global) {\n  try {\n    HtmlfileReceiver.htmlfileEnabled = !!new global[axo]('htmlfile');\n  } catch (x) {\n    // intentionally empty\n  }\n}\n\nHtmlfileReceiver.enabled = HtmlfileReceiver.htmlfileEnabled || iframeUtils.iframeEnabled;\n\nmodule.exports = HtmlfileReceiver;\n\n}).call(this,{ env: {} },typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvcmVjZWl2ZXIvaHRtbGZpbGUuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBpZnJhbWVVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL2lmcmFtZScpXG4gICwgdXJsVXRpbHMgPSByZXF1aXJlKCcuLi8uLi91dGlscy91cmwnKVxuICAsIEV2ZW50RW1pdHRlciA9IHJlcXVpcmUoJ2V2ZW50cycpLkV2ZW50RW1pdHRlclxuICAsIHJhbmRvbSA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL3JhbmRvbScpXG4gIDtcblxudmFyIGRlYnVnID0gZnVuY3Rpb24oKSB7fTtcbmlmIChwcm9jZXNzLmVudi5OT0RFX0VOViAhPT0gJ3Byb2R1Y3Rpb24nKSB7XG4gIGRlYnVnID0gcmVxdWlyZSgnZGVidWcnKSgnc29ja2pzLWNsaWVudDpyZWNlaXZlcjpodG1sZmlsZScpO1xufVxuXG5mdW5jdGlvbiBIdG1sZmlsZVJlY2VpdmVyKHVybCkge1xuICBkZWJ1Zyh1cmwpO1xuICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTtcbiAgdmFyIHNlbGYgPSB0aGlzO1xuICBpZnJhbWVVdGlscy5wb2xsdXRlR2xvYmFsTmFtZXNwYWNlKCk7XG5cbiAgdGhpcy5pZCA9ICdhJyArIHJhbmRvbS5zdHJpbmcoNik7XG4gIHVybCA9IHVybFV0aWxzLmFkZFF1ZXJ5KHVybCwgJ2M9JyArIGRlY29kZVVSSUNvbXBvbmVudChpZnJhbWVVdGlscy5XUHJlZml4ICsgJy4nICsgdGhpcy5pZCkpO1xuXG4gIGRlYnVnKCd1c2luZyBodG1sZmlsZScsIEh0bWxmaWxlUmVjZWl2ZXIuaHRtbGZpbGVFbmFibGVkKTtcbiAgdmFyIGNvbnN0cnVjdEZ1bmMgPSBIdG1sZmlsZVJlY2VpdmVyLmh0bWxmaWxlRW5hYmxlZCA/XG4gICAgICBpZnJhbWVVdGlscy5jcmVhdGVIdG1sZmlsZSA6IGlmcmFtZVV0aWxzLmNyZWF0ZUlmcmFtZTtcblxuICBnbG9iYWxbaWZyYW1lVXRpbHMuV1ByZWZpeF1bdGhpcy5pZF0gPSB7XG4gICAgc3RhcnQ6IGZ1bmN0aW9uKCkge1xuICAgICAgZGVidWcoJ3N0YXJ0Jyk7XG4gICAgICBzZWxmLmlmcmFtZU9iai5sb2FkZWQoKTtcbiAgICB9XG4gICwgbWVzc2FnZTogZnVuY3Rpb24oZGF0YSkge1xuICAgICAgZGVidWcoJ21lc3NhZ2UnLCBkYXRhKTtcbiAgICAgIHNlbGYuZW1pdCgnbWVzc2FnZScsIGRhdGEpO1xuICAgIH1cbiAgLCBzdG9wOiBmdW5jdGlvbigpIHtcbiAgICAgIGRlYnVnKCdzdG9wJyk7XG4gICAgICBzZWxmLl9jbGVhbnVwKCk7XG4gICAgICBzZWxmLl9jbG9zZSgnbmV0d29yaycpO1xuICAgIH1cbiAgfTtcbiAgdGhpcy5pZnJhbWVPYmogPSBjb25zdHJ1Y3RGdW5jKHVybCwgZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ2NhbGxiYWNrJyk7XG4gICAgc2VsZi5fY2xlYW51cCgpO1xuICAgIHNlbGYuX2Nsb3NlKCdwZXJtYW5lbnQnKTtcbiAgfSk7XG59XG5cbmluaGVyaXRzKEh0bWxmaWxlUmVjZWl2ZXIsIEV2ZW50RW1pdHRlcik7XG5cbkh0bWxmaWxlUmVjZWl2ZXIucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICB0aGlzLl9jbGVhbnVwKCk7XG4gIHRoaXMuX2Nsb3NlKCd1c2VyJyk7XG59O1xuXG5IdG1sZmlsZVJlY2VpdmVyLnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnX2NsZWFudXAnKTtcbiAgaWYgKHRoaXMuaWZyYW1lT2JqKSB7XG4gICAgdGhpcy5pZnJhbWVPYmouY2xlYW51cCgpO1xuICAgIHRoaXMuaWZyYW1lT2JqID0gbnVsbDtcbiAgfVxuICBkZWxldGUgZ2xvYmFsW2lmcmFtZVV0aWxzLldQcmVmaXhdW3RoaXMuaWRdO1xufTtcblxuSHRtbGZpbGVSZWNlaXZlci5wcm90b3R5cGUuX2Nsb3NlID0gZnVuY3Rpb24ocmVhc29uKSB7XG4gIGRlYnVnKCdfY2xvc2UnLCByZWFzb24pO1xuICB0aGlzLmVtaXQoJ2Nsb3NlJywgbnVsbCwgcmVhc29uKTtcbiAgdGhpcy5yZW1vdmVBbGxMaXN0ZW5lcnMoKTtcbn07XG5cbkh0bWxmaWxlUmVjZWl2ZXIuaHRtbGZpbGVFbmFibGVkID0gZmFsc2U7XG5cbi8vIG9iZnVzY2F0ZSB0byBhdm9pZCBmaXJld2FsbHNcbnZhciBheG8gPSBbJ0FjdGl2ZSddLmNvbmNhdCgnT2JqZWN0Jykuam9pbignWCcpO1xuaWYgKGF4byBpbiBnbG9iYWwpIHtcbiAgdHJ5IHtcbiAgICBIdG1sZmlsZVJlY2VpdmVyLmh0bWxmaWxlRW5hYmxlZCA9ICEhbmV3IGdsb2JhbFtheG9dKCdodG1sZmlsZScpO1xuICB9IGNhdGNoICh4KSB7XG4gICAgLy8gaW50ZW50aW9uYWxseSBlbXB0eVxuICB9XG59XG5cbkh0bWxmaWxlUmVjZWl2ZXIuZW5hYmxlZCA9IEh0bWxmaWxlUmVjZWl2ZXIuaHRtbGZpbGVFbmFibGVkIHx8IGlmcmFtZVV0aWxzLmlmcmFtZUVuYWJsZWQ7XG5cbm1vZHVsZS5leHBvcnRzID0gSHRtbGZpbGVSZWNlaXZlcjtcbiJdfQ==","(function (process,global){\n'use strict';\n\nvar utils = require('../../utils/iframe')\n  , random = require('../../utils/random')\n  , browser = require('../../utils/browser')\n  , urlUtils = require('../../utils/url')\n  , inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:receiver:jsonp');\n}\n\nfunction JsonpReceiver(url) {\n  debug(url);\n  var self = this;\n  EventEmitter.call(this);\n\n  utils.polluteGlobalNamespace();\n\n  this.id = 'a' + random.string(6);\n  var urlWithId = urlUtils.addQuery(url, 'c=' + encodeURIComponent(utils.WPrefix + '.' + this.id));\n\n  global[utils.WPrefix][this.id] = this._callback.bind(this);\n  this._createScript(urlWithId);\n\n  // Fallback mostly for Konqueror - stupid timer, 35 seconds shall be plenty.\n  this.timeoutId = setTimeout(function() {\n    debug('timeout');\n    self._abort(new Error('JSONP script loaded abnormally (timeout)'));\n  }, JsonpReceiver.timeout);\n}\n\ninherits(JsonpReceiver, EventEmitter);\n\nJsonpReceiver.prototype.abort = function() {\n  debug('abort');\n  if (global[utils.WPrefix][this.id]) {\n    var err = new Error('JSONP user aborted read');\n    err.code = 1000;\n    this._abort(err);\n  }\n};\n\nJsonpReceiver.timeout = 35000;\nJsonpReceiver.scriptErrorTimeout = 1000;\n\nJsonpReceiver.prototype._callback = function(data) {\n  debug('_callback', data);\n  this._cleanup();\n\n  if (this.aborting) {\n    return;\n  }\n\n  if (data) {\n    debug('message', data);\n    this.emit('message', data);\n  }\n  this.emit('close', null, 'network');\n  this.removeAllListeners();\n};\n\nJsonpReceiver.prototype._abort = function(err) {\n  debug('_abort', err);\n  this._cleanup();\n  this.aborting = true;\n  this.emit('close', err.code, err.message);\n  this.removeAllListeners();\n};\n\nJsonpReceiver.prototype._cleanup = function() {\n  debug('_cleanup');\n  clearTimeout(this.timeoutId);\n  if (this.script2) {\n    this.script2.parentNode.removeChild(this.script2);\n    this.script2 = null;\n  }\n  if (this.script) {\n    var script = this.script;\n    // Unfortunately, you can't really abort script loading of\n    // the script.\n    script.parentNode.removeChild(script);\n    script.onreadystatechange = script.onerror =\n        script.onload = script.onclick = null;\n    this.script = null;\n  }\n  delete global[utils.WPrefix][this.id];\n};\n\nJsonpReceiver.prototype._scriptError = function() {\n  debug('_scriptError');\n  var self = this;\n  if (this.errorTimer) {\n    return;\n  }\n\n  this.errorTimer = setTimeout(function() {\n    if (!self.loadedOkay) {\n      self._abort(new Error('JSONP script loaded abnormally (onerror)'));\n    }\n  }, JsonpReceiver.scriptErrorTimeout);\n};\n\nJsonpReceiver.prototype._createScript = function(url) {\n  debug('_createScript', url);\n  var self = this;\n  var script = this.script = global.document.createElement('script');\n  var script2;  // Opera synchronous load trick.\n\n  script.id = 'a' + random.string(8);\n  script.src = url;\n  script.type = 'text/javascript';\n  script.charset = 'UTF-8';\n  script.onerror = this._scriptError.bind(this);\n  script.onload = function() {\n    debug('onload');\n    self._abort(new Error('JSONP script loaded abnormally (onload)'));\n  };\n\n  // IE9 fires 'error' event after onreadystatechange or before, in random order.\n  // Use loadedOkay to determine if actually errored\n  script.onreadystatechange = function() {\n    debug('onreadystatechange', script.readyState);\n    if (/loaded|closed/.test(script.readyState)) {\n      if (script && script.htmlFor && script.onclick) {\n        self.loadedOkay = true;\n        try {\n          // In IE, actually execute the script.\n          script.onclick();\n        } catch (x) {\n          // intentionally empty\n        }\n      }\n      if (script) {\n        self._abort(new Error('JSONP script loaded abnormally (onreadystatechange)'));\n      }\n    }\n  };\n  // IE: event/htmlFor/onclick trick.\n  // One can't rely on proper order for onreadystatechange. In order to\n  // make sure, set a 'htmlFor' and 'event' properties, so that\n  // script code will be installed as 'onclick' handler for the\n  // script object. Later, onreadystatechange, manually execute this\n  // code. FF and Chrome doesn't work with 'event' and 'htmlFor'\n  // set. For reference see:\n  //   http://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html\n  // Also, read on that about script ordering:\n  //   http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order\n  if (typeof script.async === 'undefined' && global.document.attachEvent) {\n    // According to mozilla docs, in recent browsers script.async defaults\n    // to 'true', so we may use it to detect a good browser:\n    // https://developer.mozilla.org/en/HTML/Element/script\n    if (!browser.isOpera()) {\n      // Naively assume we're in IE\n      try {\n        script.htmlFor = script.id;\n        script.event = 'onclick';\n      } catch (x) {\n        // intentionally empty\n      }\n      script.async = true;\n    } else {\n      // Opera, second sync script hack\n      script2 = this.script2 = global.document.createElement('script');\n      script2.text = \"try{var a = document.getElementById('\" + script.id + \"'); if(a)a.onerror();}catch(x){};\";\n      script.async = script2.async = false;\n    }\n  }\n  if (typeof script.async !== 'undefined') {\n    script.async = true;\n  }\n\n  var head = global.document.getElementsByTagName('head')[0];\n  head.insertBefore(script, head.firstChild);\n  if (script2) {\n    head.insertBefore(script2, head.firstChild);\n  }\n};\n\nmodule.exports = JsonpReceiver;\n\n}).call(this,{ env: {} },typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/transport/receiver/jsonp.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar utils = require('../../utils/iframe')\n  , random = require('../../utils/random')\n  , browser = require('../../utils/browser')\n  , urlUtils = require('../../utils/url')\n  , inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:receiver:jsonp');\n}\n\nfunction JsonpReceiver(url) {\n  debug(url);\n  var self = this;\n  EventEmitter.call(this);\n\n  utils.polluteGlobalNamespace();\n\n  this.id = 'a' + random.string(6);\n  var urlWithId = urlUtils.addQuery(url, 'c=' + encodeURIComponent(utils.WPrefix + '.' + this.id));\n\n  global[utils.WPrefix][this.id] = this._callback.bind(this);\n  this._createScript(urlWithId);\n\n  // Fallback mostly for Konqueror - stupid timer, 35 seconds shall be plenty.\n  this.timeoutId = setTimeout(function() {\n    debug('timeout');\n    self._abort(new Error('JSONP script loaded abnormally (timeout)'));\n  }, JsonpReceiver.timeout);\n}\n\ninherits(JsonpReceiver, EventEmitter);\n\nJsonpReceiver.prototype.abort = function() {\n  debug('abort');\n  if (global[utils.WPrefix][this.id]) {\n    var err = new Error('JSONP user aborted read');\n    err.code = 1000;\n    this._abort(err);\n  }\n};\n\nJsonpReceiver.timeout = 35000;\nJsonpReceiver.scriptErrorTimeout = 1000;\n\nJsonpReceiver.prototype._callback = function(data) {\n  debug('_callback', data);\n  this._cleanup();\n\n  if (this.aborting) {\n    return;\n  }\n\n  if (data) {\n    debug('message', data);\n    this.emit('message', data);\n  }\n  this.emit('close', null, 'network');\n  this.removeAllListeners();\n};\n\nJsonpReceiver.prototype._abort = function(err) {\n  debug('_abort', err);\n  this._cleanup();\n  this.aborting = true;\n  this.emit('close', err.code, err.message);\n  this.removeAllListeners();\n};\n\nJsonpReceiver.prototype._cleanup = function() {\n  debug('_cleanup');\n  clearTimeout(this.timeoutId);\n  if (this.script2) {\n    this.script2.parentNode.removeChild(this.script2);\n    this.script2 = null;\n  }\n  if (this.script) {\n    var script = this.script;\n    // Unfortunately, you can't really abort script loading of\n    // the script.\n    script.parentNode.removeChild(script);\n    script.onreadystatechange = script.onerror =\n        script.onload = script.onclick = null;\n    this.script = null;\n  }\n  delete global[utils.WPrefix][this.id];\n};\n\nJsonpReceiver.prototype._scriptError = function() {\n  debug('_scriptError');\n  var self = this;\n  if (this.errorTimer) {\n    return;\n  }\n\n  this.errorTimer = setTimeout(function() {\n    if (!self.loadedOkay) {\n      self._abort(new Error('JSONP script loaded abnormally (onerror)'));\n    }\n  }, JsonpReceiver.scriptErrorTimeout);\n};\n\nJsonpReceiver.prototype._createScript = function(url) {\n  debug('_createScript', url);\n  var self = this;\n  var script = this.script = global.document.createElement('script');\n  var script2;  // Opera synchronous load trick.\n\n  script.id = 'a' + random.string(8);\n  script.src = url;\n  script.type = 'text/javascript';\n  script.charset = 'UTF-8';\n  script.onerror = this._scriptError.bind(this);\n  script.onload = function() {\n    debug('onload');\n    self._abort(new Error('JSONP script loaded abnormally (onload)'));\n  };\n\n  // IE9 fires 'error' event after onreadystatechange or before, in random order.\n  // Use loadedOkay to determine if actually errored\n  script.onreadystatechange = function() {\n    debug('onreadystatechange', script.readyState);\n    if (/loaded|closed/.test(script.readyState)) {\n      if (script && script.htmlFor && script.onclick) {\n        self.loadedOkay = true;\n        try {\n          // In IE, actually execute the script.\n          script.onclick();\n        } catch (x) {\n          // intentionally empty\n        }\n      }\n      if (script) {\n        self._abort(new Error('JSONP script loaded abnormally (onreadystatechange)'));\n      }\n    }\n  };\n  // IE: event/htmlFor/onclick trick.\n  // One can't rely on proper order for onreadystatechange. In order to\n  // make sure, set a 'htmlFor' and 'event' properties, so that\n  // script code will be installed as 'onclick' handler for the\n  // script object. Later, onreadystatechange, manually execute this\n  // code. FF and Chrome doesn't work with 'event' and 'htmlFor'\n  // set. For reference see:\n  //   http://jaubourg.net/2010/07/loading-script-as-onclick-handler-of.html\n  // Also, read on that about script ordering:\n  //   http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order\n  if (typeof script.async === 'undefined' && global.document.attachEvent) {\n    // According to mozilla docs, in recent browsers script.async defaults\n    // to 'true', so we may use it to detect a good browser:\n    // https://developer.mozilla.org/en/HTML/Element/script\n    if (!browser.isOpera()) {\n      // Naively assume we're in IE\n      try {\n        script.htmlFor = script.id;\n        script.event = 'onclick';\n      } catch (x) {\n        // intentionally empty\n      }\n      script.async = true;\n    } else {\n      // Opera, second sync script hack\n      script2 = this.script2 = global.document.createElement('script');\n      script2.text = \"try{var a = document.getElementById('\" + script.id + \"'); if(a)a.onerror();}catch(x){};\";\n      script.async = script2.async = false;\n    }\n  }\n  if (typeof script.async !== 'undefined') {\n    script.async = true;\n  }\n\n  var head = global.document.getElementsByTagName('head')[0];\n  head.insertBefore(script, head.firstChild);\n  if (script2) {\n    head.insertBefore(script2, head.firstChild);\n  }\n};\n\nmodule.exports = JsonpReceiver;\n"]}","(function (process){\n'use strict';\n\nvar inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:receiver:xhr');\n}\n\nfunction XhrReceiver(url, AjaxObject) {\n  debug(url);\n  EventEmitter.call(this);\n  var self = this;\n\n  this.bufferPosition = 0;\n\n  this.xo = new AjaxObject('POST', url, null);\n  this.xo.on('chunk', this._chunkHandler.bind(this));\n  this.xo.once('finish', function(status, text) {\n    debug('finish', status, text);\n    self._chunkHandler(status, text);\n    self.xo = null;\n    var reason = status === 200 ? 'network' : 'permanent';\n    debug('close', reason);\n    self.emit('close', null, reason);\n    self._cleanup();\n  });\n}\n\ninherits(XhrReceiver, EventEmitter);\n\nXhrReceiver.prototype._chunkHandler = function(status, text) {\n  debug('_chunkHandler', status);\n  if (status !== 200 || !text) {\n    return;\n  }\n\n  for (var idx = -1; ; this.bufferPosition += idx + 1) {\n    var buf = text.slice(this.bufferPosition);\n    idx = buf.indexOf('\\n');\n    if (idx === -1) {\n      break;\n    }\n    var msg = buf.slice(0, idx);\n    if (msg) {\n      debug('message', msg);\n      this.emit('message', msg);\n    }\n  }\n};\n\nXhrReceiver.prototype._cleanup = function() {\n  debug('_cleanup');\n  this.removeAllListeners();\n};\n\nXhrReceiver.prototype.abort = function() {\n  debug('abort');\n  if (this.xo) {\n    this.xo.close();\n    debug('close');\n    this.emit('close', null, 'user');\n    this.xo = null;\n  }\n  this._cleanup();\n};\n\nmodule.exports = XhrReceiver;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvcmVjZWl2ZXIveGhyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnJlY2VpdmVyOnhocicpO1xufVxuXG5mdW5jdGlvbiBYaHJSZWNlaXZlcih1cmwsIEFqYXhPYmplY3QpIHtcbiAgZGVidWcodXJsKTtcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG4gIHZhciBzZWxmID0gdGhpcztcblxuICB0aGlzLmJ1ZmZlclBvc2l0aW9uID0gMDtcblxuICB0aGlzLnhvID0gbmV3IEFqYXhPYmplY3QoJ1BPU1QnLCB1cmwsIG51bGwpO1xuICB0aGlzLnhvLm9uKCdjaHVuaycsIHRoaXMuX2NodW5rSGFuZGxlci5iaW5kKHRoaXMpKTtcbiAgdGhpcy54by5vbmNlKCdmaW5pc2gnLCBmdW5jdGlvbihzdGF0dXMsIHRleHQpIHtcbiAgICBkZWJ1ZygnZmluaXNoJywgc3RhdHVzLCB0ZXh0KTtcbiAgICBzZWxmLl9jaHVua0hhbmRsZXIoc3RhdHVzLCB0ZXh0KTtcbiAgICBzZWxmLnhvID0gbnVsbDtcbiAgICB2YXIgcmVhc29uID0gc3RhdHVzID09PSAyMDAgPyAnbmV0d29yaycgOiAncGVybWFuZW50JztcbiAgICBkZWJ1ZygnY2xvc2UnLCByZWFzb24pO1xuICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBudWxsLCByZWFzb24pO1xuICAgIHNlbGYuX2NsZWFudXAoKTtcbiAgfSk7XG59XG5cbmluaGVyaXRzKFhoclJlY2VpdmVyLCBFdmVudEVtaXR0ZXIpO1xuXG5YaHJSZWNlaXZlci5wcm90b3R5cGUuX2NodW5rSGFuZGxlciA9IGZ1bmN0aW9uKHN0YXR1cywgdGV4dCkge1xuICBkZWJ1ZygnX2NodW5rSGFuZGxlcicsIHN0YXR1cyk7XG4gIGlmIChzdGF0dXMgIT09IDIwMCB8fCAhdGV4dCkge1xuICAgIHJldHVybjtcbiAgfVxuXG4gIGZvciAodmFyIGlkeCA9IC0xOyA7IHRoaXMuYnVmZmVyUG9zaXRpb24gKz0gaWR4ICsgMSkge1xuICAgIHZhciBidWYgPSB0ZXh0LnNsaWNlKHRoaXMuYnVmZmVyUG9zaXRpb24pO1xuICAgIGlkeCA9IGJ1Zi5pbmRleE9mKCdcXG4nKTtcbiAgICBpZiAoaWR4ID09PSAtMSkge1xuICAgICAgYnJlYWs7XG4gICAgfVxuICAgIHZhciBtc2cgPSBidWYuc2xpY2UoMCwgaWR4KTtcbiAgICBpZiAobXNnKSB7XG4gICAgICBkZWJ1ZygnbWVzc2FnZScsIG1zZyk7XG4gICAgICB0aGlzLmVtaXQoJ21lc3NhZ2UnLCBtc2cpO1xuICAgIH1cbiAgfVxufTtcblxuWGhyUmVjZWl2ZXIucHJvdG90eXBlLl9jbGVhbnVwID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdfY2xlYW51cCcpO1xuICB0aGlzLnJlbW92ZUFsbExpc3RlbmVycygpO1xufTtcblxuWGhyUmVjZWl2ZXIucHJvdG90eXBlLmFib3J0ID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdhYm9ydCcpO1xuICBpZiAodGhpcy54bykge1xuICAgIHRoaXMueG8uY2xvc2UoKTtcbiAgICBkZWJ1ZygnY2xvc2UnKTtcbiAgICB0aGlzLmVtaXQoJ2Nsb3NlJywgbnVsbCwgJ3VzZXInKTtcbiAgICB0aGlzLnhvID0gbnVsbDtcbiAgfVxuICB0aGlzLl9jbGVhbnVwKCk7XG59O1xuXG5tb2R1bGUuZXhwb3J0cyA9IFhoclJlY2VpdmVyO1xuIl19","(function (process,global){\n'use strict';\n\nvar random = require('../../utils/random')\n  , urlUtils = require('../../utils/url')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:sender:jsonp');\n}\n\nvar form, area;\n\nfunction createIframe(id) {\n  debug('createIframe', id);\n  try {\n    // ie6 dynamic iframes with target=\"\" support (thanks Chris Lambacher)\n    return global.document.createElement('<iframe name=\"' + id + '\">');\n  } catch (x) {\n    var iframe = global.document.createElement('iframe');\n    iframe.name = id;\n    return iframe;\n  }\n}\n\nfunction createForm() {\n  debug('createForm');\n  form = global.document.createElement('form');\n  form.style.display = 'none';\n  form.style.position = 'absolute';\n  form.method = 'POST';\n  form.enctype = 'application/x-www-form-urlencoded';\n  form.acceptCharset = 'UTF-8';\n\n  area = global.document.createElement('textarea');\n  area.name = 'd';\n  form.appendChild(area);\n\n  global.document.body.appendChild(form);\n}\n\nmodule.exports = function(url, payload, callback) {\n  debug(url, payload);\n  if (!form) {\n    createForm();\n  }\n  var id = 'a' + random.string(8);\n  form.target = id;\n  form.action = urlUtils.addQuery(urlUtils.addPath(url, '/jsonp_send'), 'i=' + id);\n\n  var iframe = createIframe(id);\n  iframe.id = id;\n  iframe.style.display = 'none';\n  form.appendChild(iframe);\n\n  try {\n    area.value = payload;\n  } catch (e) {\n    // seriously broken browsers get here\n  }\n  form.submit();\n\n  var completed = function(err) {\n    debug('completed', id, err);\n    if (!iframe.onerror) {\n      return;\n    }\n    iframe.onreadystatechange = iframe.onerror = iframe.onload = null;\n    // Opera mini doesn't like if we GC iframe\n    // immediately, thus this timeout.\n    setTimeout(function() {\n      debug('cleaning up', id);\n      iframe.parentNode.removeChild(iframe);\n      iframe = null;\n    }, 500);\n    area.value = '';\n    // It is not possible to detect if the iframe succeeded or\n    // failed to submit our form.\n    callback(err);\n  };\n  iframe.onerror = function() {\n    debug('onerror', id);\n    completed();\n  };\n  iframe.onload = function() {\n    debug('onload', id);\n    completed();\n  };\n  iframe.onreadystatechange = function(e) {\n    debug('onreadystatechange', id, iframe.readyState, e);\n    if (iframe.readyState === 'complete') {\n      completed();\n    }\n  };\n  return function() {\n    debug('aborted', id);\n    completed(new Error('Aborted'));\n  };\n};\n\n}).call(this,{ env: {} },typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvc2VuZGVyL2pzb25wLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgcmFuZG9tID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvcmFuZG9tJylcbiAgLCB1cmxVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL3VybCcpXG4gIDtcblxudmFyIGRlYnVnID0gZnVuY3Rpb24oKSB7fTtcbmlmIChwcm9jZXNzLmVudi5OT0RFX0VOViAhPT0gJ3Byb2R1Y3Rpb24nKSB7XG4gIGRlYnVnID0gcmVxdWlyZSgnZGVidWcnKSgnc29ja2pzLWNsaWVudDpzZW5kZXI6anNvbnAnKTtcbn1cblxudmFyIGZvcm0sIGFyZWE7XG5cbmZ1bmN0aW9uIGNyZWF0ZUlmcmFtZShpZCkge1xuICBkZWJ1ZygnY3JlYXRlSWZyYW1lJywgaWQpO1xuICB0cnkge1xuICAgIC8vIGllNiBkeW5hbWljIGlmcmFtZXMgd2l0aCB0YXJnZXQ9XCJcIiBzdXBwb3J0ICh0aGFua3MgQ2hyaXMgTGFtYmFjaGVyKVxuICAgIHJldHVybiBnbG9iYWwuZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnPGlmcmFtZSBuYW1lPVwiJyArIGlkICsgJ1wiPicpO1xuICB9IGNhdGNoICh4KSB7XG4gICAgdmFyIGlmcmFtZSA9IGdsb2JhbC5kb2N1bWVudC5jcmVhdGVFbGVtZW50KCdpZnJhbWUnKTtcbiAgICBpZnJhbWUubmFtZSA9IGlkO1xuICAgIHJldHVybiBpZnJhbWU7XG4gIH1cbn1cblxuZnVuY3Rpb24gY3JlYXRlRm9ybSgpIHtcbiAgZGVidWcoJ2NyZWF0ZUZvcm0nKTtcbiAgZm9ybSA9IGdsb2JhbC5kb2N1bWVudC5jcmVhdGVFbGVtZW50KCdmb3JtJyk7XG4gIGZvcm0uc3R5bGUuZGlzcGxheSA9ICdub25lJztcbiAgZm9ybS5zdHlsZS5wb3NpdGlvbiA9ICdhYnNvbHV0ZSc7XG4gIGZvcm0ubWV0aG9kID0gJ1BPU1QnO1xuICBmb3JtLmVuY3R5cGUgPSAnYXBwbGljYXRpb24veC13d3ctZm9ybS11cmxlbmNvZGVkJztcbiAgZm9ybS5hY2NlcHRDaGFyc2V0ID0gJ1VURi04JztcblxuICBhcmVhID0gZ2xvYmFsLmRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3RleHRhcmVhJyk7XG4gIGFyZWEubmFtZSA9ICdkJztcbiAgZm9ybS5hcHBlbmRDaGlsZChhcmVhKTtcblxuICBnbG9iYWwuZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChmb3JtKTtcbn1cblxubW9kdWxlLmV4cG9ydHMgPSBmdW5jdGlvbih1cmwsIHBheWxvYWQsIGNhbGxiYWNrKSB7XG4gIGRlYnVnKHVybCwgcGF5bG9hZCk7XG4gIGlmICghZm9ybSkge1xuICAgIGNyZWF0ZUZvcm0oKTtcbiAgfVxuICB2YXIgaWQgPSAnYScgKyByYW5kb20uc3RyaW5nKDgpO1xuICBmb3JtLnRhcmdldCA9IGlkO1xuICBmb3JtLmFjdGlvbiA9IHVybFV0aWxzLmFkZFF1ZXJ5KHVybFV0aWxzLmFkZFBhdGgodXJsLCAnL2pzb25wX3NlbmQnKSwgJ2k9JyArIGlkKTtcblxuICB2YXIgaWZyYW1lID0gY3JlYXRlSWZyYW1lKGlkKTtcbiAgaWZyYW1lLmlkID0gaWQ7XG4gIGlmcmFtZS5zdHlsZS5kaXNwbGF5ID0gJ25vbmUnO1xuICBmb3JtLmFwcGVuZENoaWxkKGlmcmFtZSk7XG5cbiAgdHJ5IHtcbiAgICBhcmVhLnZhbHVlID0gcGF5bG9hZDtcbiAgfSBjYXRjaCAoZSkge1xuICAgIC8vIHNlcmlvdXNseSBicm9rZW4gYnJvd3NlcnMgZ2V0IGhlcmVcbiAgfVxuICBmb3JtLnN1Ym1pdCgpO1xuXG4gIHZhciBjb21wbGV0ZWQgPSBmdW5jdGlvbihlcnIpIHtcbiAgICBkZWJ1ZygnY29tcGxldGVkJywgaWQsIGVycik7XG4gICAgaWYgKCFpZnJhbWUub25lcnJvcikge1xuICAgICAgcmV0dXJuO1xuICAgIH1cbiAgICBpZnJhbWUub25yZWFkeXN0YXRlY2hhbmdlID0gaWZyYW1lLm9uZXJyb3IgPSBpZnJhbWUub25sb2FkID0gbnVsbDtcbiAgICAvLyBPcGVyYSBtaW5pIGRvZXNuJ3QgbGlrZSBpZiB3ZSBHQyBpZnJhbWVcbiAgICAvLyBpbW1lZGlhdGVseSwgdGh1cyB0aGlzIHRpbWVvdXQuXG4gICAgc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICAgIGRlYnVnKCdjbGVhbmluZyB1cCcsIGlkKTtcbiAgICAgIGlmcmFtZS5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKGlmcmFtZSk7XG4gICAgICBpZnJhbWUgPSBudWxsO1xuICAgIH0sIDUwMCk7XG4gICAgYXJlYS52YWx1ZSA9ICcnO1xuICAgIC8vIEl0IGlzIG5vdCBwb3NzaWJsZSB0byBkZXRlY3QgaWYgdGhlIGlmcmFtZSBzdWNjZWVkZWQgb3JcbiAgICAvLyBmYWlsZWQgdG8gc3VibWl0IG91ciBmb3JtLlxuICAgIGNhbGxiYWNrKGVycik7XG4gIH07XG4gIGlmcmFtZS5vbmVycm9yID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ29uZXJyb3InLCBpZCk7XG4gICAgY29tcGxldGVkKCk7XG4gIH07XG4gIGlmcmFtZS5vbmxvYWQgPSBmdW5jdGlvbigpIHtcbiAgICBkZWJ1Zygnb25sb2FkJywgaWQpO1xuICAgIGNvbXBsZXRlZCgpO1xuICB9O1xuICBpZnJhbWUub25yZWFkeXN0YXRlY2hhbmdlID0gZnVuY3Rpb24oZSkge1xuICAgIGRlYnVnKCdvbnJlYWR5c3RhdGVjaGFuZ2UnLCBpZCwgaWZyYW1lLnJlYWR5U3RhdGUsIGUpO1xuICAgIGlmIChpZnJhbWUucmVhZHlTdGF0ZSA9PT0gJ2NvbXBsZXRlJykge1xuICAgICAgY29tcGxldGVkKCk7XG4gICAgfVxuICB9O1xuICByZXR1cm4gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ2Fib3J0ZWQnLCBpZCk7XG4gICAgY29tcGxldGVkKG5ldyBFcnJvcignQWJvcnRlZCcpKTtcbiAgfTtcbn07XG4iXX0=","(function (process,global){\n'use strict';\n\nvar EventEmitter = require('events').EventEmitter\n  , inherits = require('inherits')\n  , eventUtils = require('../../utils/event')\n  , browser = require('../../utils/browser')\n  , urlUtils = require('../../utils/url')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:sender:xdr');\n}\n\n// References:\n//   http://ajaxian.com/archives/100-line-ajax-wrapper\n//   http://msdn.microsoft.com/en-us/library/cc288060(v=VS.85).aspx\n\nfunction XDRObject(method, url, payload) {\n  debug(method, url);\n  var self = this;\n  EventEmitter.call(this);\n\n  setTimeout(function() {\n    self._start(method, url, payload);\n  }, 0);\n}\n\ninherits(XDRObject, EventEmitter);\n\nXDRObject.prototype._start = function(method, url, payload) {\n  debug('_start');\n  var self = this;\n  var xdr = new global.XDomainRequest();\n  // IE caches even POSTs\n  url = urlUtils.addQuery(url, 't=' + (+new Date()));\n\n  xdr.onerror = function() {\n    debug('onerror');\n    self._error();\n  };\n  xdr.ontimeout = function() {\n    debug('ontimeout');\n    self._error();\n  };\n  xdr.onprogress = function() {\n    debug('progress', xdr.responseText);\n    self.emit('chunk', 200, xdr.responseText);\n  };\n  xdr.onload = function() {\n    debug('load');\n    self.emit('finish', 200, xdr.responseText);\n    self._cleanup(false);\n  };\n  this.xdr = xdr;\n  this.unloadRef = eventUtils.unloadAdd(function() {\n    self._cleanup(true);\n  });\n  try {\n    // Fails with AccessDenied if port number is bogus\n    this.xdr.open(method, url);\n    if (this.timeout) {\n      this.xdr.timeout = this.timeout;\n    }\n    this.xdr.send(payload);\n  } catch (x) {\n    this._error();\n  }\n};\n\nXDRObject.prototype._error = function() {\n  this.emit('finish', 0, '');\n  this._cleanup(false);\n};\n\nXDRObject.prototype._cleanup = function(abort) {\n  debug('cleanup', abort);\n  if (!this.xdr) {\n    return;\n  }\n  this.removeAllListeners();\n  eventUtils.unloadDel(this.unloadRef);\n\n  this.xdr.ontimeout = this.xdr.onerror = this.xdr.onprogress = this.xdr.onload = null;\n  if (abort) {\n    try {\n      this.xdr.abort();\n    } catch (x) {\n      // intentionally empty\n    }\n  }\n  this.unloadRef = this.xdr = null;\n};\n\nXDRObject.prototype.close = function() {\n  debug('close');\n  this._cleanup(true);\n};\n\n// IE 8/9 if the request target uses the same scheme - #79\nXDRObject.enabled = !!(global.XDomainRequest && browser.hasDomain());\n\nmodule.exports = XDRObject;\n\n}).call(this,{ env: {} },typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvc2VuZGVyL3hkci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgRXZlbnRFbWl0dGVyID0gcmVxdWlyZSgnZXZlbnRzJykuRXZlbnRFbWl0dGVyXG4gICwgaW5oZXJpdHMgPSByZXF1aXJlKCdpbmhlcml0cycpXG4gICwgZXZlbnRVdGlscyA9IHJlcXVpcmUoJy4uLy4uL3V0aWxzL2V2ZW50JylcbiAgLCBicm93c2VyID0gcmVxdWlyZSgnLi4vLi4vdXRpbHMvYnJvd3NlcicpXG4gICwgdXJsVXRpbHMgPSByZXF1aXJlKCcuLi8uLi91dGlscy91cmwnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6c2VuZGVyOnhkcicpO1xufVxuXG4vLyBSZWZlcmVuY2VzOlxuLy8gICBodHRwOi8vYWpheGlhbi5jb20vYXJjaGl2ZXMvMTAwLWxpbmUtYWpheC13cmFwcGVyXG4vLyAgIGh0dHA6Ly9tc2RuLm1pY3Jvc29mdC5jb20vZW4tdXMvbGlicmFyeS9jYzI4ODA2MCh2PVZTLjg1KS5hc3B4XG5cbmZ1bmN0aW9uIFhEUk9iamVjdChtZXRob2QsIHVybCwgcGF5bG9hZCkge1xuICBkZWJ1ZyhtZXRob2QsIHVybCk7XG4gIHZhciBzZWxmID0gdGhpcztcbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG5cbiAgc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICBzZWxmLl9zdGFydChtZXRob2QsIHVybCwgcGF5bG9hZCk7XG4gIH0sIDApO1xufVxuXG5pbmhlcml0cyhYRFJPYmplY3QsIEV2ZW50RW1pdHRlcik7XG5cblhEUk9iamVjdC5wcm90b3R5cGUuX3N0YXJ0ID0gZnVuY3Rpb24obWV0aG9kLCB1cmwsIHBheWxvYWQpIHtcbiAgZGVidWcoJ19zdGFydCcpO1xuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB4ZHIgPSBuZXcgZ2xvYmFsLlhEb21haW5SZXF1ZXN0KCk7XG4gIC8vIElFIGNhY2hlcyBldmVuIFBPU1RzXG4gIHVybCA9IHVybFV0aWxzLmFkZFF1ZXJ5KHVybCwgJ3Q9JyArICgrbmV3IERhdGUoKSkpO1xuXG4gIHhkci5vbmVycm9yID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ29uZXJyb3InKTtcbiAgICBzZWxmLl9lcnJvcigpO1xuICB9O1xuICB4ZHIub250aW1lb3V0ID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ29udGltZW91dCcpO1xuICAgIHNlbGYuX2Vycm9yKCk7XG4gIH07XG4gIHhkci5vbnByb2dyZXNzID0gZnVuY3Rpb24oKSB7XG4gICAgZGVidWcoJ3Byb2dyZXNzJywgeGRyLnJlc3BvbnNlVGV4dCk7XG4gICAgc2VsZi5lbWl0KCdjaHVuaycsIDIwMCwgeGRyLnJlc3BvbnNlVGV4dCk7XG4gIH07XG4gIHhkci5vbmxvYWQgPSBmdW5jdGlvbigpIHtcbiAgICBkZWJ1ZygnbG9hZCcpO1xuICAgIHNlbGYuZW1pdCgnZmluaXNoJywgMjAwLCB4ZHIucmVzcG9uc2VUZXh0KTtcbiAgICBzZWxmLl9jbGVhbnVwKGZhbHNlKTtcbiAgfTtcbiAgdGhpcy54ZHIgPSB4ZHI7XG4gIHRoaXMudW5sb2FkUmVmID0gZXZlbnRVdGlscy51bmxvYWRBZGQoZnVuY3Rpb24oKSB7XG4gICAgc2VsZi5fY2xlYW51cCh0cnVlKTtcbiAgfSk7XG4gIHRyeSB7XG4gICAgLy8gRmFpbHMgd2l0aCBBY2Nlc3NEZW5pZWQgaWYgcG9ydCBudW1iZXIgaXMgYm9ndXNcbiAgICB0aGlzLnhkci5vcGVuKG1ldGhvZCwgdXJsKTtcbiAgICBpZiAodGhpcy50aW1lb3V0KSB7XG4gICAgICB0aGlzLnhkci50aW1lb3V0ID0gdGhpcy50aW1lb3V0O1xuICAgIH1cbiAgICB0aGlzLnhkci5zZW5kKHBheWxvYWQpO1xuICB9IGNhdGNoICh4KSB7XG4gICAgdGhpcy5fZXJyb3IoKTtcbiAgfVxufTtcblxuWERST2JqZWN0LnByb3RvdHlwZS5fZXJyb3IgPSBmdW5jdGlvbigpIHtcbiAgdGhpcy5lbWl0KCdmaW5pc2gnLCAwLCAnJyk7XG4gIHRoaXMuX2NsZWFudXAoZmFsc2UpO1xufTtcblxuWERST2JqZWN0LnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKGFib3J0KSB7XG4gIGRlYnVnKCdjbGVhbnVwJywgYWJvcnQpO1xuICBpZiAoIXRoaXMueGRyKSB7XG4gICAgcmV0dXJuO1xuICB9XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG4gIGV2ZW50VXRpbHMudW5sb2FkRGVsKHRoaXMudW5sb2FkUmVmKTtcblxuICB0aGlzLnhkci5vbnRpbWVvdXQgPSB0aGlzLnhkci5vbmVycm9yID0gdGhpcy54ZHIub25wcm9ncmVzcyA9IHRoaXMueGRyLm9ubG9hZCA9IG51bGw7XG4gIGlmIChhYm9ydCkge1xuICAgIHRyeSB7XG4gICAgICB0aGlzLnhkci5hYm9ydCgpO1xuICAgIH0gY2F0Y2ggKHgpIHtcbiAgICAgIC8vIGludGVudGlvbmFsbHkgZW1wdHlcbiAgICB9XG4gIH1cbiAgdGhpcy51bmxvYWRSZWYgPSB0aGlzLnhkciA9IG51bGw7XG59O1xuXG5YRFJPYmplY3QucHJvdG90eXBlLmNsb3NlID0gZnVuY3Rpb24oKSB7XG4gIGRlYnVnKCdjbG9zZScpO1xuICB0aGlzLl9jbGVhbnVwKHRydWUpO1xufTtcblxuLy8gSUUgOC85IGlmIHRoZSByZXF1ZXN0IHRhcmdldCB1c2VzIHRoZSBzYW1lIHNjaGVtZSAtICM3OVxuWERST2JqZWN0LmVuYWJsZWQgPSAhIShnbG9iYWwuWERvbWFpblJlcXVlc3QgJiYgYnJvd3Nlci5oYXNEb21haW4oKSk7XG5cbm1vZHVsZS5leHBvcnRzID0gWERST2JqZWN0O1xuIl19","'use strict';\n\nvar inherits = require('inherits')\n  , XhrDriver = require('../driver/xhr')\n  ;\n\nfunction XHRCorsObject(method, url, payload, opts) {\n  XhrDriver.call(this, method, url, payload, opts);\n}\n\ninherits(XHRCorsObject, XhrDriver);\n\nXHRCorsObject.enabled = XhrDriver.enabled && XhrDriver.supportsCORS;\n\nmodule.exports = XHRCorsObject;\n","'use strict';\n\nvar EventEmitter = require('events').EventEmitter\n  , inherits = require('inherits')\n  ;\n\nfunction XHRFake(/* method, url, payload, opts */) {\n  var self = this;\n  EventEmitter.call(this);\n\n  this.to = setTimeout(function() {\n    self.emit('finish', 200, '{}');\n  }, XHRFake.timeout);\n}\n\ninherits(XHRFake, EventEmitter);\n\nXHRFake.prototype.close = function() {\n  clearTimeout(this.to);\n};\n\nXHRFake.timeout = 2000;\n\nmodule.exports = XHRFake;\n","'use strict';\n\nvar inherits = require('inherits')\n  , XhrDriver = require('../driver/xhr')\n  ;\n\nfunction XHRLocalObject(method, url, payload /*, opts */) {\n  XhrDriver.call(this, method, url, payload, {\n    noCredentials: true\n  });\n}\n\ninherits(XHRLocalObject, XhrDriver);\n\nXHRLocalObject.enabled = XhrDriver.enabled;\n\nmodule.exports = XHRLocalObject;\n","(function (process){\n'use strict';\n\nvar utils = require('../utils/event')\n  , urlUtils = require('../utils/url')\n  , inherits = require('inherits')\n  , EventEmitter = require('events').EventEmitter\n  , WebsocketDriver = require('./driver/websocket')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:websocket');\n}\n\nfunction WebSocketTransport(transUrl, ignore, options) {\n  if (!WebSocketTransport.enabled()) {\n    throw new Error('Transport created when disabled');\n  }\n\n  EventEmitter.call(this);\n  debug('constructor', transUrl);\n\n  var self = this;\n  var url = urlUtils.addPath(transUrl, '/websocket');\n  if (url.slice(0, 5) === 'https') {\n    url = 'wss' + url.slice(5);\n  } else {\n    url = 'ws' + url.slice(4);\n  }\n  this.url = url;\n\n  this.ws = new WebsocketDriver(this.url, [], options);\n  this.ws.onmessage = function(e) {\n    debug('message event', e.data);\n    self.emit('message', e.data);\n  };\n  // Firefox has an interesting bug. If a websocket connection is\n  // created after onunload, it stays alive even when user\n  // navigates away from the page. In such situation let's lie -\n  // let's not open the ws connection at all. See:\n  // https://github.com/sockjs/sockjs-client/issues/28\n  // https://bugzilla.mozilla.org/show_bug.cgi?id=696085\n  this.unloadRef = utils.unloadAdd(function() {\n    debug('unload');\n    self.ws.close();\n  });\n  this.ws.onclose = function(e) {\n    debug('close event', e.code, e.reason);\n    self.emit('close', e.code, e.reason);\n    self._cleanup();\n  };\n  this.ws.onerror = function(e) {\n    debug('error event', e);\n    self.emit('close', 1006, 'WebSocket connection broken');\n    self._cleanup();\n  };\n}\n\ninherits(WebSocketTransport, EventEmitter);\n\nWebSocketTransport.prototype.send = function(data) {\n  var msg = '[' + data + ']';\n  debug('send', msg);\n  this.ws.send(msg);\n};\n\nWebSocketTransport.prototype.close = function() {\n  debug('close');\n  if (this.ws) {\n    this.ws.close();\n  }\n  this._cleanup();\n};\n\nWebSocketTransport.prototype._cleanup = function() {\n  debug('_cleanup');\n  var ws = this.ws;\n  if (ws) {\n    ws.onmessage = ws.onclose = ws.onerror = null;\n  }\n  utils.unloadDel(this.unloadRef);\n  this.unloadRef = this.ws = null;\n  this.removeAllListeners();\n};\n\nWebSocketTransport.enabled = function() {\n  debug('enabled');\n  return !!WebsocketDriver;\n};\nWebSocketTransport.transportName = 'websocket';\n\n// In theory, ws should require 1 round trip. But in chrome, this is\n// not very stable over SSL. Most likely a ws connection requires a\n// separate SSL connection, in which case 2 round trips are an\n// absolute minumum.\nWebSocketTransport.roundTrips = 2;\n\nmodule.exports = WebSocketTransport;\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQvd2Vic29ja2V0LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIHV0aWxzID0gcmVxdWlyZSgnLi4vdXRpbHMvZXZlbnQnKVxuICAsIHVybFV0aWxzID0gcmVxdWlyZSgnLi4vdXRpbHMvdXJsJylcbiAgLCBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBFdmVudEVtaXR0ZXIgPSByZXF1aXJlKCdldmVudHMnKS5FdmVudEVtaXR0ZXJcbiAgLCBXZWJzb2NrZXREcml2ZXIgPSByZXF1aXJlKCcuL2RyaXZlci93ZWJzb2NrZXQnKVxuICA7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6d2Vic29ja2V0Jyk7XG59XG5cbmZ1bmN0aW9uIFdlYlNvY2tldFRyYW5zcG9ydCh0cmFuc1VybCwgaWdub3JlLCBvcHRpb25zKSB7XG4gIGlmICghV2ViU29ja2V0VHJhbnNwb3J0LmVuYWJsZWQoKSkge1xuICAgIHRocm93IG5ldyBFcnJvcignVHJhbnNwb3J0IGNyZWF0ZWQgd2hlbiBkaXNhYmxlZCcpO1xuICB9XG5cbiAgRXZlbnRFbWl0dGVyLmNhbGwodGhpcyk7XG4gIGRlYnVnKCdjb25zdHJ1Y3RvcicsIHRyYW5zVXJsKTtcblxuICB2YXIgc2VsZiA9IHRoaXM7XG4gIHZhciB1cmwgPSB1cmxVdGlscy5hZGRQYXRoKHRyYW5zVXJsLCAnL3dlYnNvY2tldCcpO1xuICBpZiAodXJsLnNsaWNlKDAsIDUpID09PSAnaHR0cHMnKSB7XG4gICAgdXJsID0gJ3dzcycgKyB1cmwuc2xpY2UoNSk7XG4gIH0gZWxzZSB7XG4gICAgdXJsID0gJ3dzJyArIHVybC5zbGljZSg0KTtcbiAgfVxuICB0aGlzLnVybCA9IHVybDtcblxuICB0aGlzLndzID0gbmV3IFdlYnNvY2tldERyaXZlcih0aGlzLnVybCwgW10sIG9wdGlvbnMpO1xuICB0aGlzLndzLm9ubWVzc2FnZSA9IGZ1bmN0aW9uKGUpIHtcbiAgICBkZWJ1ZygnbWVzc2FnZSBldmVudCcsIGUuZGF0YSk7XG4gICAgc2VsZi5lbWl0KCdtZXNzYWdlJywgZS5kYXRhKTtcbiAgfTtcbiAgLy8gRmlyZWZveCBoYXMgYW4gaW50ZXJlc3RpbmcgYnVnLiBJZiBhIHdlYnNvY2tldCBjb25uZWN0aW9uIGlzXG4gIC8vIGNyZWF0ZWQgYWZ0ZXIgb251bmxvYWQsIGl0IHN0YXlzIGFsaXZlIGV2ZW4gd2hlbiB1c2VyXG4gIC8vIG5hdmlnYXRlcyBhd2F5IGZyb20gdGhlIHBhZ2UuIEluIHN1Y2ggc2l0dWF0aW9uIGxldCdzIGxpZSAtXG4gIC8vIGxldCdzIG5vdCBvcGVuIHRoZSB3cyBjb25uZWN0aW9uIGF0IGFsbC4gU2VlOlxuICAvLyBodHRwczovL2dpdGh1Yi5jb20vc29ja2pzL3NvY2tqcy1jbGllbnQvaXNzdWVzLzI4XG4gIC8vIGh0dHBzOi8vYnVnemlsbGEubW96aWxsYS5vcmcvc2hvd19idWcuY2dpP2lkPTY5NjA4NVxuICB0aGlzLnVubG9hZFJlZiA9IHV0aWxzLnVubG9hZEFkZChmdW5jdGlvbigpIHtcbiAgICBkZWJ1ZygndW5sb2FkJyk7XG4gICAgc2VsZi53cy5jbG9zZSgpO1xuICB9KTtcbiAgdGhpcy53cy5vbmNsb3NlID0gZnVuY3Rpb24oZSkge1xuICAgIGRlYnVnKCdjbG9zZSBldmVudCcsIGUuY29kZSwgZS5yZWFzb24pO1xuICAgIHNlbGYuZW1pdCgnY2xvc2UnLCBlLmNvZGUsIGUucmVhc29uKTtcbiAgICBzZWxmLl9jbGVhbnVwKCk7XG4gIH07XG4gIHRoaXMud3Mub25lcnJvciA9IGZ1bmN0aW9uKGUpIHtcbiAgICBkZWJ1ZygnZXJyb3IgZXZlbnQnLCBlKTtcbiAgICBzZWxmLmVtaXQoJ2Nsb3NlJywgMTAwNiwgJ1dlYlNvY2tldCBjb25uZWN0aW9uIGJyb2tlbicpO1xuICAgIHNlbGYuX2NsZWFudXAoKTtcbiAgfTtcbn1cblxuaW5oZXJpdHMoV2ViU29ja2V0VHJhbnNwb3J0LCBFdmVudEVtaXR0ZXIpO1xuXG5XZWJTb2NrZXRUcmFuc3BvcnQucHJvdG90eXBlLnNlbmQgPSBmdW5jdGlvbihkYXRhKSB7XG4gIHZhciBtc2cgPSAnWycgKyBkYXRhICsgJ10nO1xuICBkZWJ1Zygnc2VuZCcsIG1zZyk7XG4gIHRoaXMud3Muc2VuZChtc2cpO1xufTtcblxuV2ViU29ja2V0VHJhbnNwb3J0LnByb3RvdHlwZS5jbG9zZSA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnY2xvc2UnKTtcbiAgaWYgKHRoaXMud3MpIHtcbiAgICB0aGlzLndzLmNsb3NlKCk7XG4gIH1cbiAgdGhpcy5fY2xlYW51cCgpO1xufTtcblxuV2ViU29ja2V0VHJhbnNwb3J0LnByb3RvdHlwZS5fY2xlYW51cCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnX2NsZWFudXAnKTtcbiAgdmFyIHdzID0gdGhpcy53cztcbiAgaWYgKHdzKSB7XG4gICAgd3Mub25tZXNzYWdlID0gd3Mub25jbG9zZSA9IHdzLm9uZXJyb3IgPSBudWxsO1xuICB9XG4gIHV0aWxzLnVubG9hZERlbCh0aGlzLnVubG9hZFJlZik7XG4gIHRoaXMudW5sb2FkUmVmID0gdGhpcy53cyA9IG51bGw7XG4gIHRoaXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7XG59O1xuXG5XZWJTb2NrZXRUcmFuc3BvcnQuZW5hYmxlZCA9IGZ1bmN0aW9uKCkge1xuICBkZWJ1ZygnZW5hYmxlZCcpO1xuICByZXR1cm4gISFXZWJzb2NrZXREcml2ZXI7XG59O1xuV2ViU29ja2V0VHJhbnNwb3J0LnRyYW5zcG9ydE5hbWUgPSAnd2Vic29ja2V0JztcblxuLy8gSW4gdGhlb3J5LCB3cyBzaG91bGQgcmVxdWlyZSAxIHJvdW5kIHRyaXAuIEJ1dCBpbiBjaHJvbWUsIHRoaXMgaXNcbi8vIG5vdCB2ZXJ5IHN0YWJsZSBvdmVyIFNTTC4gTW9zdCBsaWtlbHkgYSB3cyBjb25uZWN0aW9uIHJlcXVpcmVzIGFcbi8vIHNlcGFyYXRlIFNTTCBjb25uZWN0aW9uLCBpbiB3aGljaCBjYXNlIDIgcm91bmQgdHJpcHMgYXJlIGFuXG4vLyBhYnNvbHV0ZSBtaW51bXVtLlxuV2ViU29ja2V0VHJhbnNwb3J0LnJvdW5kVHJpcHMgPSAyO1xuXG5tb2R1bGUuZXhwb3J0cyA9IFdlYlNvY2tldFRyYW5zcG9ydDtcbiJdfQ==","'use strict';\n\nvar inherits = require('inherits')\n  , AjaxBasedTransport = require('./lib/ajax-based')\n  , XdrStreamingTransport = require('./xdr-streaming')\n  , XhrReceiver = require('./receiver/xhr')\n  , XDRObject = require('./sender/xdr')\n  ;\n\nfunction XdrPollingTransport(transUrl) {\n  if (!XDRObject.enabled) {\n    throw new Error('Transport created when disabled');\n  }\n  AjaxBasedTransport.call(this, transUrl, '/xhr', XhrReceiver, XDRObject);\n}\n\ninherits(XdrPollingTransport, AjaxBasedTransport);\n\nXdrPollingTransport.enabled = XdrStreamingTransport.enabled;\nXdrPollingTransport.transportName = 'xdr-polling';\nXdrPollingTransport.roundTrips = 2; // preflight, ajax\n\nmodule.exports = XdrPollingTransport;\n","'use strict';\n\nvar inherits = require('inherits')\n  , AjaxBasedTransport = require('./lib/ajax-based')\n  , XhrReceiver = require('./receiver/xhr')\n  , XDRObject = require('./sender/xdr')\n  ;\n\n// According to:\n//   http://stackoverflow.com/questions/1641507/detect-browser-support-for-cross-domain-xmlhttprequests\n//   http://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/\n\nfunction XdrStreamingTransport(transUrl) {\n  if (!XDRObject.enabled) {\n    throw new Error('Transport created when disabled');\n  }\n  AjaxBasedTransport.call(this, transUrl, '/xhr_streaming', XhrReceiver, XDRObject);\n}\n\ninherits(XdrStreamingTransport, AjaxBasedTransport);\n\nXdrStreamingTransport.enabled = function(info) {\n  if (info.cookie_needed || info.nullOrigin) {\n    return false;\n  }\n  return XDRObject.enabled && info.sameScheme;\n};\n\nXdrStreamingTransport.transportName = 'xdr-streaming';\nXdrStreamingTransport.roundTrips = 2; // preflight, ajax\n\nmodule.exports = XdrStreamingTransport;\n","'use strict';\n\nvar inherits = require('inherits')\n  , AjaxBasedTransport = require('./lib/ajax-based')\n  , XhrReceiver = require('./receiver/xhr')\n  , XHRCorsObject = require('./sender/xhr-cors')\n  , XHRLocalObject = require('./sender/xhr-local')\n  ;\n\nfunction XhrPollingTransport(transUrl) {\n  if (!XHRLocalObject.enabled && !XHRCorsObject.enabled) {\n    throw new Error('Transport created when disabled');\n  }\n  AjaxBasedTransport.call(this, transUrl, '/xhr', XhrReceiver, XHRCorsObject);\n}\n\ninherits(XhrPollingTransport, AjaxBasedTransport);\n\nXhrPollingTransport.enabled = function(info) {\n  if (info.nullOrigin) {\n    return false;\n  }\n\n  if (XHRLocalObject.enabled && info.sameOrigin) {\n    return true;\n  }\n  return XHRCorsObject.enabled;\n};\n\nXhrPollingTransport.transportName = 'xhr-polling';\nXhrPollingTransport.roundTrips = 2; // preflight, ajax\n\nmodule.exports = XhrPollingTransport;\n","(function (global){\n'use strict';\n\nvar inherits = require('inherits')\n  , AjaxBasedTransport = require('./lib/ajax-based')\n  , XhrReceiver = require('./receiver/xhr')\n  , XHRCorsObject = require('./sender/xhr-cors')\n  , XHRLocalObject = require('./sender/xhr-local')\n  , browser = require('../utils/browser')\n  ;\n\nfunction XhrStreamingTransport(transUrl) {\n  if (!XHRLocalObject.enabled && !XHRCorsObject.enabled) {\n    throw new Error('Transport created when disabled');\n  }\n  AjaxBasedTransport.call(this, transUrl, '/xhr_streaming', XhrReceiver, XHRCorsObject);\n}\n\ninherits(XhrStreamingTransport, AjaxBasedTransport);\n\nXhrStreamingTransport.enabled = function(info) {\n  if (info.nullOrigin) {\n    return false;\n  }\n  // Opera doesn't support xhr-streaming #60\n  // But it might be able to #92\n  if (browser.isOpera()) {\n    return false;\n  }\n\n  return XHRCorsObject.enabled;\n};\n\nXhrStreamingTransport.transportName = 'xhr-streaming';\nXhrStreamingTransport.roundTrips = 2; // preflight, ajax\n\n// Safari gets confused when a streaming ajax request is started\n// before onload. This causes the load indicator to spin indefinetely.\n// Only require body when used in a browser\nXhrStreamingTransport.needBody = !!global.document;\n\nmodule.exports = XhrStreamingTransport;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi90cmFuc3BvcnQveGhyLXN0cmVhbWluZy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBpbmhlcml0cyA9IHJlcXVpcmUoJ2luaGVyaXRzJylcbiAgLCBBamF4QmFzZWRUcmFuc3BvcnQgPSByZXF1aXJlKCcuL2xpYi9hamF4LWJhc2VkJylcbiAgLCBYaHJSZWNlaXZlciA9IHJlcXVpcmUoJy4vcmVjZWl2ZXIveGhyJylcbiAgLCBYSFJDb3JzT2JqZWN0ID0gcmVxdWlyZSgnLi9zZW5kZXIveGhyLWNvcnMnKVxuICAsIFhIUkxvY2FsT2JqZWN0ID0gcmVxdWlyZSgnLi9zZW5kZXIveGhyLWxvY2FsJylcbiAgLCBicm93c2VyID0gcmVxdWlyZSgnLi4vdXRpbHMvYnJvd3NlcicpXG4gIDtcblxuZnVuY3Rpb24gWGhyU3RyZWFtaW5nVHJhbnNwb3J0KHRyYW5zVXJsKSB7XG4gIGlmICghWEhSTG9jYWxPYmplY3QuZW5hYmxlZCAmJiAhWEhSQ29yc09iamVjdC5lbmFibGVkKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdUcmFuc3BvcnQgY3JlYXRlZCB3aGVuIGRpc2FibGVkJyk7XG4gIH1cbiAgQWpheEJhc2VkVHJhbnNwb3J0LmNhbGwodGhpcywgdHJhbnNVcmwsICcveGhyX3N0cmVhbWluZycsIFhoclJlY2VpdmVyLCBYSFJDb3JzT2JqZWN0KTtcbn1cblxuaW5oZXJpdHMoWGhyU3RyZWFtaW5nVHJhbnNwb3J0LCBBamF4QmFzZWRUcmFuc3BvcnQpO1xuXG5YaHJTdHJlYW1pbmdUcmFuc3BvcnQuZW5hYmxlZCA9IGZ1bmN0aW9uKGluZm8pIHtcbiAgaWYgKGluZm8ubnVsbE9yaWdpbikge1xuICAgIHJldHVybiBmYWxzZTtcbiAgfVxuICAvLyBPcGVyYSBkb2Vzbid0IHN1cHBvcnQgeGhyLXN0cmVhbWluZyAjNjBcbiAgLy8gQnV0IGl0IG1pZ2h0IGJlIGFibGUgdG8gIzkyXG4gIGlmIChicm93c2VyLmlzT3BlcmEoKSkge1xuICAgIHJldHVybiBmYWxzZTtcbiAgfVxuXG4gIHJldHVybiBYSFJDb3JzT2JqZWN0LmVuYWJsZWQ7XG59O1xuXG5YaHJTdHJlYW1pbmdUcmFuc3BvcnQudHJhbnNwb3J0TmFtZSA9ICd4aHItc3RyZWFtaW5nJztcblhoclN0cmVhbWluZ1RyYW5zcG9ydC5yb3VuZFRyaXBzID0gMjsgLy8gcHJlZmxpZ2h0LCBhamF4XG5cbi8vIFNhZmFyaSBnZXRzIGNvbmZ1c2VkIHdoZW4gYSBzdHJlYW1pbmcgYWpheCByZXF1ZXN0IGlzIHN0YXJ0ZWRcbi8vIGJlZm9yZSBvbmxvYWQuIFRoaXMgY2F1c2VzIHRoZSBsb2FkIGluZGljYXRvciB0byBzcGluIGluZGVmaW5ldGVseS5cbi8vIE9ubHkgcmVxdWlyZSBib2R5IHdoZW4gdXNlZCBpbiBhIGJyb3dzZXJcblhoclN0cmVhbWluZ1RyYW5zcG9ydC5uZWVkQm9keSA9ICEhZ2xvYmFsLmRvY3VtZW50O1xuXG5tb2R1bGUuZXhwb3J0cyA9IFhoclN0cmVhbWluZ1RyYW5zcG9ydDtcbiJdfQ==","(function (global){\n'use strict';\n\nif (global.crypto && global.crypto.getRandomValues) {\n  module.exports.randomBytes = function(length) {\n    var bytes = new Uint8Array(length);\n    global.crypto.getRandomValues(bytes);\n    return bytes;\n  };\n} else {\n  module.exports.randomBytes = function(length) {\n    var bytes = new Array(length);\n    for (var i = 0; i < length; i++) {\n      bytes[i] = Math.floor(Math.random() * 256);\n    }\n    return bytes;\n  };\n}\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9icm93c2VyLWNyeXB0by5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbmlmIChnbG9iYWwuY3J5cHRvICYmIGdsb2JhbC5jcnlwdG8uZ2V0UmFuZG9tVmFsdWVzKSB7XG4gIG1vZHVsZS5leHBvcnRzLnJhbmRvbUJ5dGVzID0gZnVuY3Rpb24obGVuZ3RoKSB7XG4gICAgdmFyIGJ5dGVzID0gbmV3IFVpbnQ4QXJyYXkobGVuZ3RoKTtcbiAgICBnbG9iYWwuY3J5cHRvLmdldFJhbmRvbVZhbHVlcyhieXRlcyk7XG4gICAgcmV0dXJuIGJ5dGVzO1xuICB9O1xufSBlbHNlIHtcbiAgbW9kdWxlLmV4cG9ydHMucmFuZG9tQnl0ZXMgPSBmdW5jdGlvbihsZW5ndGgpIHtcbiAgICB2YXIgYnl0ZXMgPSBuZXcgQXJyYXkobGVuZ3RoKTtcbiAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7XG4gICAgICBieXRlc1tpXSA9IE1hdGguZmxvb3IoTWF0aC5yYW5kb20oKSAqIDI1Nik7XG4gICAgfVxuICAgIHJldHVybiBieXRlcztcbiAgfTtcbn1cbiJdfQ==","(function (global){\n'use strict';\n\nmodule.exports = {\n  isOpera: function() {\n    return global.navigator &&\n      /opera/i.test(global.navigator.userAgent);\n  }\n\n, isKonqueror: function() {\n    return global.navigator &&\n      /konqueror/i.test(global.navigator.userAgent);\n  }\n\n  // #187 wrap document.domain in try/catch because of WP8 from file:///\n, hasDomain: function () {\n    // non-browser client always has a domain\n    if (!global.document) {\n      return true;\n    }\n\n    try {\n      return !!global.document.domain;\n    } catch (e) {\n      return false;\n    }\n  }\n};\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9icm93c2VyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG5tb2R1bGUuZXhwb3J0cyA9IHtcbiAgaXNPcGVyYTogZnVuY3Rpb24oKSB7XG4gICAgcmV0dXJuIGdsb2JhbC5uYXZpZ2F0b3IgJiZcbiAgICAgIC9vcGVyYS9pLnRlc3QoZ2xvYmFsLm5hdmlnYXRvci51c2VyQWdlbnQpO1xuICB9XG5cbiwgaXNLb25xdWVyb3I6IGZ1bmN0aW9uKCkge1xuICAgIHJldHVybiBnbG9iYWwubmF2aWdhdG9yICYmXG4gICAgICAva29ucXVlcm9yL2kudGVzdChnbG9iYWwubmF2aWdhdG9yLnVzZXJBZ2VudCk7XG4gIH1cblxuICAvLyAjMTg3IHdyYXAgZG9jdW1lbnQuZG9tYWluIGluIHRyeS9jYXRjaCBiZWNhdXNlIG9mIFdQOCBmcm9tIGZpbGU6Ly8vXG4sIGhhc0RvbWFpbjogZnVuY3Rpb24gKCkge1xuICAgIC8vIG5vbi1icm93c2VyIGNsaWVudCBhbHdheXMgaGFzIGEgZG9tYWluXG4gICAgaWYgKCFnbG9iYWwuZG9jdW1lbnQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cblxuICAgIHRyeSB7XG4gICAgICByZXR1cm4gISFnbG9iYWwuZG9jdW1lbnQuZG9tYWluO1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gIH1cbn07XG4iXX0=","'use strict';\n\nvar JSON3 = require('json3');\n\n// Some extra characters that Chrome gets wrong, and substitutes with\n// something else on the wire.\nvar extraEscapable = /[\\x00-\\x1f\\ud800-\\udfff\\ufffe\\uffff\\u0300-\\u0333\\u033d-\\u0346\\u034a-\\u034c\\u0350-\\u0352\\u0357-\\u0358\\u035c-\\u0362\\u0374\\u037e\\u0387\\u0591-\\u05af\\u05c4\\u0610-\\u0617\\u0653-\\u0654\\u0657-\\u065b\\u065d-\\u065e\\u06df-\\u06e2\\u06eb-\\u06ec\\u0730\\u0732-\\u0733\\u0735-\\u0736\\u073a\\u073d\\u073f-\\u0741\\u0743\\u0745\\u0747\\u07eb-\\u07f1\\u0951\\u0958-\\u095f\\u09dc-\\u09dd\\u09df\\u0a33\\u0a36\\u0a59-\\u0a5b\\u0a5e\\u0b5c-\\u0b5d\\u0e38-\\u0e39\\u0f43\\u0f4d\\u0f52\\u0f57\\u0f5c\\u0f69\\u0f72-\\u0f76\\u0f78\\u0f80-\\u0f83\\u0f93\\u0f9d\\u0fa2\\u0fa7\\u0fac\\u0fb9\\u1939-\\u193a\\u1a17\\u1b6b\\u1cda-\\u1cdb\\u1dc0-\\u1dcf\\u1dfc\\u1dfe\\u1f71\\u1f73\\u1f75\\u1f77\\u1f79\\u1f7b\\u1f7d\\u1fbb\\u1fbe\\u1fc9\\u1fcb\\u1fd3\\u1fdb\\u1fe3\\u1feb\\u1fee-\\u1fef\\u1ff9\\u1ffb\\u1ffd\\u2000-\\u2001\\u20d0-\\u20d1\\u20d4-\\u20d7\\u20e7-\\u20e9\\u2126\\u212a-\\u212b\\u2329-\\u232a\\u2adc\\u302b-\\u302c\\uaab2-\\uaab3\\uf900-\\ufa0d\\ufa10\\ufa12\\ufa15-\\ufa1e\\ufa20\\ufa22\\ufa25-\\ufa26\\ufa2a-\\ufa2d\\ufa30-\\ufa6d\\ufa70-\\ufad9\\ufb1d\\ufb1f\\ufb2a-\\ufb36\\ufb38-\\ufb3c\\ufb3e\\ufb40-\\ufb41\\ufb43-\\ufb44\\ufb46-\\ufb4e\\ufff0-\\uffff]/g\n  , extraLookup;\n\n// This may be quite slow, so let's delay until user actually uses bad\n// characters.\nvar unrollLookup = function(escapable) {\n  var i;\n  var unrolled = {};\n  var c = [];\n  for (i = 0; i < 65536; i++) {\n    c.push( String.fromCharCode(i) );\n  }\n  escapable.lastIndex = 0;\n  c.join('').replace(escapable, function(a) {\n    unrolled[ a ] = '\\\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);\n    return '';\n  });\n  escapable.lastIndex = 0;\n  return unrolled;\n};\n\n// Quote string, also taking care of unicode characters that browsers\n// often break. Especially, take care of unicode surrogates:\n// http://en.wikipedia.org/wiki/Mapping_of_Unicode_characters#Surrogates\nmodule.exports = {\n  quote: function(string) {\n    var quoted = JSON3.stringify(string);\n\n    // In most cases this should be very fast and good enough.\n    extraEscapable.lastIndex = 0;\n    if (!extraEscapable.test(quoted)) {\n      return quoted;\n    }\n\n    if (!extraLookup) {\n      extraLookup = unrollLookup(extraEscapable);\n    }\n\n    return quoted.replace(extraEscapable, function(a) {\n      return extraLookup[a];\n    });\n  }\n};\n","(function (global){\n'use strict';\n\nvar random = require('./random');\n\nvar onUnload = {}\n  , afterUnload = false\n    // detect google chrome packaged apps because they don't allow the 'unload' event\n  , isChromePackagedApp = global.chrome && global.chrome.app && global.chrome.app.runtime\n  ;\n\nmodule.exports = {\n  attachEvent: function(event, listener) {\n    if (typeof global.addEventListener !== 'undefined') {\n      global.addEventListener(event, listener, false);\n    } else if (global.document && global.attachEvent) {\n      // IE quirks.\n      // According to: http://stevesouders.com/misc/test-postmessage.php\n      // the message gets delivered only to 'document', not 'window'.\n      global.document.attachEvent('on' + event, listener);\n      // I get 'window' for ie8.\n      global.attachEvent('on' + event, listener);\n    }\n  }\n\n, detachEvent: function(event, listener) {\n    if (typeof global.addEventListener !== 'undefined') {\n      global.removeEventListener(event, listener, false);\n    } else if (global.document && global.detachEvent) {\n      global.document.detachEvent('on' + event, listener);\n      global.detachEvent('on' + event, listener);\n    }\n  }\n\n, unloadAdd: function(listener) {\n    if (isChromePackagedApp) {\n      return null;\n    }\n\n    var ref = random.string(8);\n    onUnload[ref] = listener;\n    if (afterUnload) {\n      setTimeout(this.triggerUnloadCallbacks, 0);\n    }\n    return ref;\n  }\n\n, unloadDel: function(ref) {\n    if (ref in onUnload) {\n      delete onUnload[ref];\n    }\n  }\n\n, triggerUnloadCallbacks: function() {\n    for (var ref in onUnload) {\n      onUnload[ref]();\n      delete onUnload[ref];\n    }\n  }\n};\n\nvar unloadTriggered = function() {\n  if (afterUnload) {\n    return;\n  }\n  afterUnload = true;\n  module.exports.triggerUnloadCallbacks();\n};\n\n// 'unload' alone is not reliable in opera within an iframe, but we\n// can't use `beforeunload` as IE fires it on javascript: links.\nif (!isChromePackagedApp) {\n  module.exports.attachEvent('unload', unloadTriggered);\n}\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9ldmVudC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgcmFuZG9tID0gcmVxdWlyZSgnLi9yYW5kb20nKTtcblxudmFyIG9uVW5sb2FkID0ge31cbiAgLCBhZnRlclVubG9hZCA9IGZhbHNlXG4gICAgLy8gZGV0ZWN0IGdvb2dsZSBjaHJvbWUgcGFja2FnZWQgYXBwcyBiZWNhdXNlIHRoZXkgZG9uJ3QgYWxsb3cgdGhlICd1bmxvYWQnIGV2ZW50XG4gICwgaXNDaHJvbWVQYWNrYWdlZEFwcCA9IGdsb2JhbC5jaHJvbWUgJiYgZ2xvYmFsLmNocm9tZS5hcHAgJiYgZ2xvYmFsLmNocm9tZS5hcHAucnVudGltZVxuICA7XG5cbm1vZHVsZS5leHBvcnRzID0ge1xuICBhdHRhY2hFdmVudDogZnVuY3Rpb24oZXZlbnQsIGxpc3RlbmVyKSB7XG4gICAgaWYgKHR5cGVvZiBnbG9iYWwuYWRkRXZlbnRMaXN0ZW5lciAhPT0gJ3VuZGVmaW5lZCcpIHtcbiAgICAgIGdsb2JhbC5hZGRFdmVudExpc3RlbmVyKGV2ZW50LCBsaXN0ZW5lciwgZmFsc2UpO1xuICAgIH0gZWxzZSBpZiAoZ2xvYmFsLmRvY3VtZW50ICYmIGdsb2JhbC5hdHRhY2hFdmVudCkge1xuICAgICAgLy8gSUUgcXVpcmtzLlxuICAgICAgLy8gQWNjb3JkaW5nIHRvOiBodHRwOi8vc3RldmVzb3VkZXJzLmNvbS9taXNjL3Rlc3QtcG9zdG1lc3NhZ2UucGhwXG4gICAgICAvLyB0aGUgbWVzc2FnZSBnZXRzIGRlbGl2ZXJlZCBvbmx5IHRvICdkb2N1bWVudCcsIG5vdCAnd2luZG93Jy5cbiAgICAgIGdsb2JhbC5kb2N1bWVudC5hdHRhY2hFdmVudCgnb24nICsgZXZlbnQsIGxpc3RlbmVyKTtcbiAgICAgIC8vIEkgZ2V0ICd3aW5kb3cnIGZvciBpZTguXG4gICAgICBnbG9iYWwuYXR0YWNoRXZlbnQoJ29uJyArIGV2ZW50LCBsaXN0ZW5lcik7XG4gICAgfVxuICB9XG5cbiwgZGV0YWNoRXZlbnQ6IGZ1bmN0aW9uKGV2ZW50LCBsaXN0ZW5lcikge1xuICAgIGlmICh0eXBlb2YgZ2xvYmFsLmFkZEV2ZW50TGlzdGVuZXIgIT09ICd1bmRlZmluZWQnKSB7XG4gICAgICBnbG9iYWwucmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudCwgbGlzdGVuZXIsIGZhbHNlKTtcbiAgICB9IGVsc2UgaWYgKGdsb2JhbC5kb2N1bWVudCAmJiBnbG9iYWwuZGV0YWNoRXZlbnQpIHtcbiAgICAgIGdsb2JhbC5kb2N1bWVudC5kZXRhY2hFdmVudCgnb24nICsgZXZlbnQsIGxpc3RlbmVyKTtcbiAgICAgIGdsb2JhbC5kZXRhY2hFdmVudCgnb24nICsgZXZlbnQsIGxpc3RlbmVyKTtcbiAgICB9XG4gIH1cblxuLCB1bmxvYWRBZGQ6IGZ1bmN0aW9uKGxpc3RlbmVyKSB7XG4gICAgaWYgKGlzQ2hyb21lUGFja2FnZWRBcHApIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cblxuICAgIHZhciByZWYgPSByYW5kb20uc3RyaW5nKDgpO1xuICAgIG9uVW5sb2FkW3JlZl0gPSBsaXN0ZW5lcjtcbiAgICBpZiAoYWZ0ZXJVbmxvYWQpIHtcbiAgICAgIHNldFRpbWVvdXQodGhpcy50cmlnZ2VyVW5sb2FkQ2FsbGJhY2tzLCAwKTtcbiAgICB9XG4gICAgcmV0dXJuIHJlZjtcbiAgfVxuXG4sIHVubG9hZERlbDogZnVuY3Rpb24ocmVmKSB7XG4gICAgaWYgKHJlZiBpbiBvblVubG9hZCkge1xuICAgICAgZGVsZXRlIG9uVW5sb2FkW3JlZl07XG4gICAgfVxuICB9XG5cbiwgdHJpZ2dlclVubG9hZENhbGxiYWNrczogZnVuY3Rpb24oKSB7XG4gICAgZm9yICh2YXIgcmVmIGluIG9uVW5sb2FkKSB7XG4gICAgICBvblVubG9hZFtyZWZdKCk7XG4gICAgICBkZWxldGUgb25VbmxvYWRbcmVmXTtcbiAgICB9XG4gIH1cbn07XG5cbnZhciB1bmxvYWRUcmlnZ2VyZWQgPSBmdW5jdGlvbigpIHtcbiAgaWYgKGFmdGVyVW5sb2FkKSB7XG4gICAgcmV0dXJuO1xuICB9XG4gIGFmdGVyVW5sb2FkID0gdHJ1ZTtcbiAgbW9kdWxlLmV4cG9ydHMudHJpZ2dlclVubG9hZENhbGxiYWNrcygpO1xufTtcblxuLy8gJ3VubG9hZCcgYWxvbmUgaXMgbm90IHJlbGlhYmxlIGluIG9wZXJhIHdpdGhpbiBhbiBpZnJhbWUsIGJ1dCB3ZVxuLy8gY2FuJ3QgdXNlIGBiZWZvcmV1bmxvYWRgIGFzIElFIGZpcmVzIGl0IG9uIGphdmFzY3JpcHQ6IGxpbmtzLlxuaWYgKCFpc0Nocm9tZVBhY2thZ2VkQXBwKSB7XG4gIG1vZHVsZS5leHBvcnRzLmF0dGFjaEV2ZW50KCd1bmxvYWQnLCB1bmxvYWRUcmlnZ2VyZWQpO1xufVxuIl19","(function (process,global){\n'use strict';\n\nvar eventUtils = require('./event')\n  , JSON3 = require('json3')\n  , browser = require('./browser')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:utils:iframe');\n}\n\nmodule.exports = {\n  WPrefix: '_jp'\n, currentWindowId: null\n\n, polluteGlobalNamespace: function() {\n    if (!(module.exports.WPrefix in global)) {\n      global[module.exports.WPrefix] = {};\n    }\n  }\n\n, postMessage: function(type, data) {\n    if (global.parent !== global) {\n      global.parent.postMessage(JSON3.stringify({\n        windowId: module.exports.currentWindowId\n      , type: type\n      , data: data || ''\n      }), '*');\n    } else {\n      debug('Cannot postMessage, no parent window.', type, data);\n    }\n  }\n\n, createIframe: function(iframeUrl, errorCallback) {\n    var iframe = global.document.createElement('iframe');\n    var tref, unloadRef;\n    var unattach = function() {\n      debug('unattach');\n      clearTimeout(tref);\n      // Explorer had problems with that.\n      try {\n        iframe.onload = null;\n      } catch (x) {\n        // intentionally empty\n      }\n      iframe.onerror = null;\n    };\n    var cleanup = function() {\n      debug('cleanup');\n      if (iframe) {\n        unattach();\n        // This timeout makes chrome fire onbeforeunload event\n        // within iframe. Without the timeout it goes straight to\n        // onunload.\n        setTimeout(function() {\n          if (iframe) {\n            iframe.parentNode.removeChild(iframe);\n          }\n          iframe = null;\n        }, 0);\n        eventUtils.unloadDel(unloadRef);\n      }\n    };\n    var onerror = function(err) {\n      debug('onerror', err);\n      if (iframe) {\n        cleanup();\n        errorCallback(err);\n      }\n    };\n    var post = function(msg, origin) {\n      debug('post', msg, origin);\n      try {\n        // When the iframe is not loaded, IE raises an exception\n        // on 'contentWindow'.\n        setTimeout(function() {\n          if (iframe && iframe.contentWindow) {\n            iframe.contentWindow.postMessage(msg, origin);\n          }\n        }, 0);\n      } catch (x) {\n        // intentionally empty\n      }\n    };\n\n    iframe.src = iframeUrl;\n    iframe.style.display = 'none';\n    iframe.style.position = 'absolute';\n    iframe.onerror = function() {\n      onerror('onerror');\n    };\n    iframe.onload = function() {\n      debug('onload');\n      // `onload` is triggered before scripts on the iframe are\n      // executed. Give it few seconds to actually load stuff.\n      clearTimeout(tref);\n      tref = setTimeout(function() {\n        onerror('onload timeout');\n      }, 2000);\n    };\n    global.document.body.appendChild(iframe);\n    tref = setTimeout(function() {\n      onerror('timeout');\n    }, 15000);\n    unloadRef = eventUtils.unloadAdd(cleanup);\n    return {\n      post: post\n    , cleanup: cleanup\n    , loaded: unattach\n    };\n  }\n\n/* jshint undef: false, newcap: false */\n/* eslint no-undef: 0, new-cap: 0 */\n, createHtmlfile: function(iframeUrl, errorCallback) {\n    var axo = ['Active'].concat('Object').join('X');\n    var doc = new global[axo]('htmlfile');\n    var tref, unloadRef;\n    var iframe;\n    var unattach = function() {\n      clearTimeout(tref);\n      iframe.onerror = null;\n    };\n    var cleanup = function() {\n      if (doc) {\n        unattach();\n        eventUtils.unloadDel(unloadRef);\n        iframe.parentNode.removeChild(iframe);\n        iframe = doc = null;\n        CollectGarbage();\n      }\n    };\n    var onerror = function(r) {\n      debug('onerror', r);\n      if (doc) {\n        cleanup();\n        errorCallback(r);\n      }\n    };\n    var post = function(msg, origin) {\n      try {\n        // When the iframe is not loaded, IE raises an exception\n        // on 'contentWindow'.\n        setTimeout(function() {\n          if (iframe && iframe.contentWindow) {\n              iframe.contentWindow.postMessage(msg, origin);\n          }\n        }, 0);\n      } catch (x) {\n        // intentionally empty\n      }\n    };\n\n    doc.open();\n    doc.write('<html><s' + 'cript>' +\n              'document.domain=\"' + global.document.domain + '\";' +\n              '</s' + 'cript></html>');\n    doc.close();\n    doc.parentWindow[module.exports.WPrefix] = global[module.exports.WPrefix];\n    var c = doc.createElement('div');\n    doc.body.appendChild(c);\n    iframe = doc.createElement('iframe');\n    c.appendChild(iframe);\n    iframe.src = iframeUrl;\n    iframe.onerror = function() {\n      onerror('onerror');\n    };\n    tref = setTimeout(function() {\n      onerror('timeout');\n    }, 15000);\n    unloadRef = eventUtils.unloadAdd(cleanup);\n    return {\n      post: post\n    , cleanup: cleanup\n    , loaded: unattach\n    };\n  }\n};\n\nmodule.exports.iframeEnabled = false;\nif (global.document) {\n  // postMessage misbehaves in konqueror 4.6.5 - the messages are delivered with\n  // huge delay, or not at all.\n  module.exports.iframeEnabled = (typeof global.postMessage === 'function' ||\n    typeof global.postMessage === 'object') && (!browser.isKonqueror());\n}\n\n}).call(this,{ env: {} },typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["lib/utils/iframe.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["'use strict';\n\nvar eventUtils = require('./event')\n  , JSON3 = require('json3')\n  , browser = require('./browser')\n  ;\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:utils:iframe');\n}\n\nmodule.exports = {\n  WPrefix: '_jp'\n, currentWindowId: null\n\n, polluteGlobalNamespace: function() {\n    if (!(module.exports.WPrefix in global)) {\n      global[module.exports.WPrefix] = {};\n    }\n  }\n\n, postMessage: function(type, data) {\n    if (global.parent !== global) {\n      global.parent.postMessage(JSON3.stringify({\n        windowId: module.exports.currentWindowId\n      , type: type\n      , data: data || ''\n      }), '*');\n    } else {\n      debug('Cannot postMessage, no parent window.', type, data);\n    }\n  }\n\n, createIframe: function(iframeUrl, errorCallback) {\n    var iframe = global.document.createElement('iframe');\n    var tref, unloadRef;\n    var unattach = function() {\n      debug('unattach');\n      clearTimeout(tref);\n      // Explorer had problems with that.\n      try {\n        iframe.onload = null;\n      } catch (x) {\n        // intentionally empty\n      }\n      iframe.onerror = null;\n    };\n    var cleanup = function() {\n      debug('cleanup');\n      if (iframe) {\n        unattach();\n        // This timeout makes chrome fire onbeforeunload event\n        // within iframe. Without the timeout it goes straight to\n        // onunload.\n        setTimeout(function() {\n          if (iframe) {\n            iframe.parentNode.removeChild(iframe);\n          }\n          iframe = null;\n        }, 0);\n        eventUtils.unloadDel(unloadRef);\n      }\n    };\n    var onerror = function(err) {\n      debug('onerror', err);\n      if (iframe) {\n        cleanup();\n        errorCallback(err);\n      }\n    };\n    var post = function(msg, origin) {\n      debug('post', msg, origin);\n      try {\n        // When the iframe is not loaded, IE raises an exception\n        // on 'contentWindow'.\n        setTimeout(function() {\n          if (iframe && iframe.contentWindow) {\n            iframe.contentWindow.postMessage(msg, origin);\n          }\n        }, 0);\n      } catch (x) {\n        // intentionally empty\n      }\n    };\n\n    iframe.src = iframeUrl;\n    iframe.style.display = 'none';\n    iframe.style.position = 'absolute';\n    iframe.onerror = function() {\n      onerror('onerror');\n    };\n    iframe.onload = function() {\n      debug('onload');\n      // `onload` is triggered before scripts on the iframe are\n      // executed. Give it few seconds to actually load stuff.\n      clearTimeout(tref);\n      tref = setTimeout(function() {\n        onerror('onload timeout');\n      }, 2000);\n    };\n    global.document.body.appendChild(iframe);\n    tref = setTimeout(function() {\n      onerror('timeout');\n    }, 15000);\n    unloadRef = eventUtils.unloadAdd(cleanup);\n    return {\n      post: post\n    , cleanup: cleanup\n    , loaded: unattach\n    };\n  }\n\n/* jshint undef: false, newcap: false */\n/* eslint no-undef: 0, new-cap: 0 */\n, createHtmlfile: function(iframeUrl, errorCallback) {\n    var axo = ['Active'].concat('Object').join('X');\n    var doc = new global[axo]('htmlfile');\n    var tref, unloadRef;\n    var iframe;\n    var unattach = function() {\n      clearTimeout(tref);\n      iframe.onerror = null;\n    };\n    var cleanup = function() {\n      if (doc) {\n        unattach();\n        eventUtils.unloadDel(unloadRef);\n        iframe.parentNode.removeChild(iframe);\n        iframe = doc = null;\n        CollectGarbage();\n      }\n    };\n    var onerror = function(r) {\n      debug('onerror', r);\n      if (doc) {\n        cleanup();\n        errorCallback(r);\n      }\n    };\n    var post = function(msg, origin) {\n      try {\n        // When the iframe is not loaded, IE raises an exception\n        // on 'contentWindow'.\n        setTimeout(function() {\n          if (iframe && iframe.contentWindow) {\n              iframe.contentWindow.postMessage(msg, origin);\n          }\n        }, 0);\n      } catch (x) {\n        // intentionally empty\n      }\n    };\n\n    doc.open();\n    doc.write('<html><s' + 'cript>' +\n              'document.domain=\"' + global.document.domain + '\";' +\n              '</s' + 'cript></html>');\n    doc.close();\n    doc.parentWindow[module.exports.WPrefix] = global[module.exports.WPrefix];\n    var c = doc.createElement('div');\n    doc.body.appendChild(c);\n    iframe = doc.createElement('iframe');\n    c.appendChild(iframe);\n    iframe.src = iframeUrl;\n    iframe.onerror = function() {\n      onerror('onerror');\n    };\n    tref = setTimeout(function() {\n      onerror('timeout');\n    }, 15000);\n    unloadRef = eventUtils.unloadAdd(cleanup);\n    return {\n      post: post\n    , cleanup: cleanup\n    , loaded: unattach\n    };\n  }\n};\n\nmodule.exports.iframeEnabled = false;\nif (global.document) {\n  // postMessage misbehaves in konqueror 4.6.5 - the messages are delivered with\n  // huge delay, or not at all.\n  module.exports.iframeEnabled = (typeof global.postMessage === 'function' ||\n    typeof global.postMessage === 'object') && (!browser.isKonqueror());\n}\n"]}","(function (global){\n'use strict';\n\nvar logObject = {};\n['log', 'debug', 'warn'].forEach(function (level) {\n  var levelExists;\n\n  try {\n    levelExists = global.console && global.console[level] && global.console[level].apply;\n  } catch(e) {\n    // do nothing\n  }\n\n  logObject[level] = levelExists ? function () {\n    return global.console[level].apply(global.console, arguments);\n  } : (level === 'log' ? function () {} : logObject.log);\n});\n\nmodule.exports = logObject;\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy9sb2cuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImdlbmVyYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIndXNlIHN0cmljdCc7XG5cbnZhciBsb2dPYmplY3QgPSB7fTtcblsnbG9nJywgJ2RlYnVnJywgJ3dhcm4nXS5mb3JFYWNoKGZ1bmN0aW9uIChsZXZlbCkge1xuICB2YXIgbGV2ZWxFeGlzdHM7XG5cbiAgdHJ5IHtcbiAgICBsZXZlbEV4aXN0cyA9IGdsb2JhbC5jb25zb2xlICYmIGdsb2JhbC5jb25zb2xlW2xldmVsXSAmJiBnbG9iYWwuY29uc29sZVtsZXZlbF0uYXBwbHk7XG4gIH0gY2F0Y2goZSkge1xuICAgIC8vIGRvIG5vdGhpbmdcbiAgfVxuXG4gIGxvZ09iamVjdFtsZXZlbF0gPSBsZXZlbEV4aXN0cyA/IGZ1bmN0aW9uICgpIHtcbiAgICByZXR1cm4gZ2xvYmFsLmNvbnNvbGVbbGV2ZWxdLmFwcGx5KGdsb2JhbC5jb25zb2xlLCBhcmd1bWVudHMpO1xuICB9IDogKGxldmVsID09PSAnbG9nJyA/IGZ1bmN0aW9uICgpIHt9IDogbG9nT2JqZWN0LmxvZyk7XG59KTtcblxubW9kdWxlLmV4cG9ydHMgPSBsb2dPYmplY3Q7XG4iXX0=","'use strict';\n\nmodule.exports = {\n  isObject: function(obj) {\n    var type = typeof obj;\n    return type === 'function' || type === 'object' && !!obj;\n  }\n\n, extend: function(obj) {\n    if (!this.isObject(obj)) {\n      return obj;\n    }\n    var source, prop;\n    for (var i = 1, length = arguments.length; i < length; i++) {\n      source = arguments[i];\n      for (prop in source) {\n        if (Object.prototype.hasOwnProperty.call(source, prop)) {\n          obj[prop] = source[prop];\n        }\n      }\n    }\n    return obj;\n  }\n};\n","'use strict';\n\n/* global crypto:true */\nvar crypto = require('crypto');\n\n// This string has length 32, a power of 2, so the modulus doesn't introduce a\n// bias.\nvar _randomStringChars = 'abcdefghijklmnopqrstuvwxyz012345';\nmodule.exports = {\n  string: function(length) {\n    var max = _randomStringChars.length;\n    var bytes = crypto.randomBytes(length);\n    var ret = [];\n    for (var i = 0; i < length; i++) {\n      ret.push(_randomStringChars.substr(bytes[i] % max, 1));\n    }\n    return ret.join('');\n  }\n\n, number: function(max) {\n    return Math.floor(Math.random() * max);\n  }\n\n, numberString: function(max) {\n    var t = ('' + (max - 1)).length;\n    var p = new Array(t + 1).join('0');\n    return (p + this.number(max)).slice(-t);\n  }\n};\n","(function (process){\n'use strict';\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:utils:transport');\n}\n\nmodule.exports = function(availableTransports) {\n  return {\n    filterToEnabled: function(transportsWhitelist, info) {\n      var transports = {\n        main: []\n      , facade: []\n      };\n      if (!transportsWhitelist) {\n        transportsWhitelist = [];\n      } else if (typeof transportsWhitelist === 'string') {\n        transportsWhitelist = [transportsWhitelist];\n      }\n\n      availableTransports.forEach(function(trans) {\n        if (!trans) {\n          return;\n        }\n\n        if (trans.transportName === 'websocket' && info.websocket === false) {\n          debug('disabled from server', 'websocket');\n          return;\n        }\n\n        if (transportsWhitelist.length &&\n            transportsWhitelist.indexOf(trans.transportName) === -1) {\n          debug('not in whitelist', trans.transportName);\n          return;\n        }\n\n        if (trans.enabled(info)) {\n          debug('enabled', trans.transportName);\n          transports.main.push(trans);\n          if (trans.facadeTransport) {\n            transports.facade.push(trans.facadeTransport);\n          }\n        } else {\n          debug('disabled', trans.transportName);\n        }\n      });\n      return transports;\n    }\n  };\n};\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy90cmFuc3BvcnQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgZGVidWcgPSBmdW5jdGlvbigpIHt9O1xuaWYgKHByb2Nlc3MuZW52Lk5PREVfRU5WICE9PSAncHJvZHVjdGlvbicpIHtcbiAgZGVidWcgPSByZXF1aXJlKCdkZWJ1ZycpKCdzb2NranMtY2xpZW50OnV0aWxzOnRyYW5zcG9ydCcpO1xufVxuXG5tb2R1bGUuZXhwb3J0cyA9IGZ1bmN0aW9uKGF2YWlsYWJsZVRyYW5zcG9ydHMpIHtcbiAgcmV0dXJuIHtcbiAgICBmaWx0ZXJUb0VuYWJsZWQ6IGZ1bmN0aW9uKHRyYW5zcG9ydHNXaGl0ZWxpc3QsIGluZm8pIHtcbiAgICAgIHZhciB0cmFuc3BvcnRzID0ge1xuICAgICAgICBtYWluOiBbXVxuICAgICAgLCBmYWNhZGU6IFtdXG4gICAgICB9O1xuICAgICAgaWYgKCF0cmFuc3BvcnRzV2hpdGVsaXN0KSB7XG4gICAgICAgIHRyYW5zcG9ydHNXaGl0ZWxpc3QgPSBbXTtcbiAgICAgIH0gZWxzZSBpZiAodHlwZW9mIHRyYW5zcG9ydHNXaGl0ZWxpc3QgPT09ICdzdHJpbmcnKSB7XG4gICAgICAgIHRyYW5zcG9ydHNXaGl0ZWxpc3QgPSBbdHJhbnNwb3J0c1doaXRlbGlzdF07XG4gICAgICB9XG5cbiAgICAgIGF2YWlsYWJsZVRyYW5zcG9ydHMuZm9yRWFjaChmdW5jdGlvbih0cmFucykge1xuICAgICAgICBpZiAoIXRyYW5zKSB7XG4gICAgICAgICAgcmV0dXJuO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKHRyYW5zLnRyYW5zcG9ydE5hbWUgPT09ICd3ZWJzb2NrZXQnICYmIGluZm8ud2Vic29ja2V0ID09PSBmYWxzZSkge1xuICAgICAgICAgIGRlYnVnKCdkaXNhYmxlZCBmcm9tIHNlcnZlcicsICd3ZWJzb2NrZXQnKTtcbiAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICBpZiAodHJhbnNwb3J0c1doaXRlbGlzdC5sZW5ndGggJiZcbiAgICAgICAgICAgIHRyYW5zcG9ydHNXaGl0ZWxpc3QuaW5kZXhPZih0cmFucy50cmFuc3BvcnROYW1lKSA9PT0gLTEpIHtcbiAgICAgICAgICBkZWJ1Zygnbm90IGluIHdoaXRlbGlzdCcsIHRyYW5zLnRyYW5zcG9ydE5hbWUpO1xuICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuXG4gICAgICAgIGlmICh0cmFucy5lbmFibGVkKGluZm8pKSB7XG4gICAgICAgICAgZGVidWcoJ2VuYWJsZWQnLCB0cmFucy50cmFuc3BvcnROYW1lKTtcbiAgICAgICAgICB0cmFuc3BvcnRzLm1haW4ucHVzaCh0cmFucyk7XG4gICAgICAgICAgaWYgKHRyYW5zLmZhY2FkZVRyYW5zcG9ydCkge1xuICAgICAgICAgICAgdHJhbnNwb3J0cy5mYWNhZGUucHVzaCh0cmFucy5mYWNhZGVUcmFuc3BvcnQpO1xuICAgICAgICAgIH1cbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICBkZWJ1ZygnZGlzYWJsZWQnLCB0cmFucy50cmFuc3BvcnROYW1lKTtcbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgICByZXR1cm4gdHJhbnNwb3J0cztcbiAgICB9XG4gIH07XG59O1xuIl19","(function (process){\n'use strict';\n\nvar URL = require('url-parse');\n\nvar debug = function() {};\nif (process.env.NODE_ENV !== 'production') {\n  debug = require('debug')('sockjs-client:utils:url');\n}\n\nmodule.exports = {\n  getOrigin: function(url) {\n    if (!url) {\n      return null;\n    }\n\n    var p = new URL(url);\n    if (p.protocol === 'file:') {\n      return null;\n    }\n\n    var port = p.port;\n    if (!port) {\n      port = (p.protocol === 'https:') ? '443' : '80';\n    }\n\n    return p.protocol + '//' + p.hostname + ':' + port;\n  }\n\n, isOriginEqual: function(a, b) {\n    var res = this.getOrigin(a) === this.getOrigin(b);\n    debug('same', a, b, res);\n    return res;\n  }\n\n, isSchemeEqual: function(a, b) {\n    return (a.split(':')[0] === b.split(':')[0]);\n  }\n\n, addPath: function (url, path) {\n    var qs = url.split('?');\n    return qs[0] + path + (qs[1] ? '?' + qs[1] : '');\n  }\n\n, addQuery: function (url, q) {\n    return url + (url.indexOf('?') === -1 ? ('?' + q) : ('&' + q));\n  }\n};\n\n}).call(this,{ env: {} })\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy91cmwuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSIsImZpbGUiOiJnZW5lcmF0ZWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG52YXIgVVJMID0gcmVxdWlyZSgndXJsLXBhcnNlJyk7XG5cbnZhciBkZWJ1ZyA9IGZ1bmN0aW9uKCkge307XG5pZiAocHJvY2Vzcy5lbnYuTk9ERV9FTlYgIT09ICdwcm9kdWN0aW9uJykge1xuICBkZWJ1ZyA9IHJlcXVpcmUoJ2RlYnVnJykoJ3NvY2tqcy1jbGllbnQ6dXRpbHM6dXJsJyk7XG59XG5cbm1vZHVsZS5leHBvcnRzID0ge1xuICBnZXRPcmlnaW46IGZ1bmN0aW9uKHVybCkge1xuICAgIGlmICghdXJsKSB7XG4gICAgICByZXR1cm4gbnVsbDtcbiAgICB9XG5cbiAgICB2YXIgcCA9IG5ldyBVUkwodXJsKTtcbiAgICBpZiAocC5wcm90b2NvbCA9PT0gJ2ZpbGU6Jykge1xuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfVxuXG4gICAgdmFyIHBvcnQgPSBwLnBvcnQ7XG4gICAgaWYgKCFwb3J0KSB7XG4gICAgICBwb3J0ID0gKHAucHJvdG9jb2wgPT09ICdodHRwczonKSA/ICc0NDMnIDogJzgwJztcbiAgICB9XG5cbiAgICByZXR1cm4gcC5wcm90b2NvbCArICcvLycgKyBwLmhvc3RuYW1lICsgJzonICsgcG9ydDtcbiAgfVxuXG4sIGlzT3JpZ2luRXF1YWw6IGZ1bmN0aW9uKGEsIGIpIHtcbiAgICB2YXIgcmVzID0gdGhpcy5nZXRPcmlnaW4oYSkgPT09IHRoaXMuZ2V0T3JpZ2luKGIpO1xuICAgIGRlYnVnKCdzYW1lJywgYSwgYiwgcmVzKTtcbiAgICByZXR1cm4gcmVzO1xuICB9XG5cbiwgaXNTY2hlbWVFcXVhbDogZnVuY3Rpb24oYSwgYikge1xuICAgIHJldHVybiAoYS5zcGxpdCgnOicpWzBdID09PSBiLnNwbGl0KCc6JylbMF0pO1xuICB9XG5cbiwgYWRkUGF0aDogZnVuY3Rpb24gKHVybCwgcGF0aCkge1xuICAgIHZhciBxcyA9IHVybC5zcGxpdCgnPycpO1xuICAgIHJldHVybiBxc1swXSArIHBhdGggKyAocXNbMV0gPyAnPycgKyBxc1sxXSA6ICcnKTtcbiAgfVxuXG4sIGFkZFF1ZXJ5OiBmdW5jdGlvbiAodXJsLCBxKSB7XG4gICAgcmV0dXJuIHVybCArICh1cmwuaW5kZXhPZignPycpID09PSAtMSA/ICgnPycgKyBxKSA6ICgnJicgKyBxKSk7XG4gIH1cbn07XG4iXX0=","module.exports = '1.1.1';\n","\n/**\n * This is the web browser implementation of `debug()`.\n *\n * Expose `debug()` as the module.\n */\n\nexports = module.exports = require('./debug');\nexports.log = log;\nexports.formatArgs = formatArgs;\nexports.save = save;\nexports.load = load;\nexports.useColors = useColors;\nexports.storage = 'undefined' != typeof chrome\n               && 'undefined' != typeof chrome.storage\n                  ? chrome.storage.local\n                  : localstorage();\n\n/**\n * Colors.\n */\n\nexports.colors = [\n  'lightseagreen',\n  'forestgreen',\n  'goldenrod',\n  'dodgerblue',\n  'darkorchid',\n  'crimson'\n];\n\n/**\n * Currently only WebKit-based Web Inspectors, Firefox >= v31,\n * and the Firebug extension (any Firefox version) are known\n * to support \"%c\" CSS customizations.\n *\n * TODO: add a `localStorage` variable to explicitly enable/disable colors\n */\n\nfunction useColors() {\n  // is webkit? http://stackoverflow.com/a/16459606/376773\n  return ('WebkitAppearance' in document.documentElement.style) ||\n    // is firebug? http://stackoverflow.com/a/398120/376773\n    (window.console && (console.firebug || (console.exception && console.table))) ||\n    // is firefox >= v31?\n    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages\n    (navigator.userAgent.toLowerCase().match(/firefox\\/(\\d+)/) && parseInt(RegExp.$1, 10) >= 31);\n}\n\n/**\n * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.\n */\n\nexports.formatters.j = function(v) {\n  return JSON.stringify(v);\n};\n\n\n/**\n * Colorize log arguments if enabled.\n *\n * @api public\n */\n\nfunction formatArgs() {\n  var args = arguments;\n  var useColors = this.useColors;\n\n  args[0] = (useColors ? '%c' : '')\n    + this.namespace\n    + (useColors ? ' %c' : ' ')\n    + args[0]\n    + (useColors ? '%c ' : ' ')\n    + '+' + exports.humanize(this.diff);\n\n  if (!useColors) return args;\n\n  var c = 'color: ' + this.color;\n  args = [args[0], c, 'color: inherit'].concat(Array.prototype.slice.call(args, 1));\n\n  // the final \"%c\" is somewhat tricky, because there could be other\n  // arguments passed either before or after the %c, so we need to\n  // figure out the correct index to insert the CSS into\n  var index = 0;\n  var lastC = 0;\n  args[0].replace(/%[a-z%]/g, function(match) {\n    if ('%%' === match) return;\n    index++;\n    if ('%c' === match) {\n      // we only are interested in the *last* %c\n      // (the user may have provided their own)\n      lastC = index;\n    }\n  });\n\n  args.splice(lastC, 0, c);\n  return args;\n}\n\n/**\n * Invokes `console.log()` when available.\n * No-op when `console.log` is not a \"function\".\n *\n * @api public\n */\n\nfunction log() {\n  // this hackery is required for IE8/9, where\n  // the `console.log` function doesn't have 'apply'\n  return 'object' === typeof console\n    && console.log\n    && Function.prototype.apply.call(console.log, console, arguments);\n}\n\n/**\n * Save `namespaces`.\n *\n * @param {String} namespaces\n * @api private\n */\n\nfunction save(namespaces) {\n  try {\n    if (null == namespaces) {\n      exports.storage.removeItem('debug');\n    } else {\n      exports.storage.debug = namespaces;\n    }\n  } catch(e) {}\n}\n\n/**\n * Load `namespaces`.\n *\n * @return {String} returns the previously persisted debug modes\n * @api private\n */\n\nfunction load() {\n  var r;\n  try {\n    r = exports.storage.debug;\n  } catch(e) {}\n  return r;\n}\n\n/**\n * Enable namespaces listed in `localStorage.debug` initially.\n */\n\nexports.enable(load());\n\n/**\n * Localstorage attempts to return the localstorage.\n *\n * This is necessary because safari throws\n * when a user disables cookies/localstorage\n * and you attempt to access it.\n *\n * @return {LocalStorage}\n * @api private\n */\n\nfunction localstorage(){\n  try {\n    return window.localStorage;\n  } catch (e) {}\n}\n","\n/**\n * This is the common logic for both the Node.js and web browser\n * implementations of `debug()`.\n *\n * Expose `debug()` as the module.\n */\n\nexports = module.exports = debug;\nexports.coerce = coerce;\nexports.disable = disable;\nexports.enable = enable;\nexports.enabled = enabled;\nexports.humanize = require('ms');\n\n/**\n * The currently active debug mode names, and names to skip.\n */\n\nexports.names = [];\nexports.skips = [];\n\n/**\n * Map of special \"%n\" handling functions, for the debug \"format\" argument.\n *\n * Valid key names are a single, lowercased letter, i.e. \"n\".\n */\n\nexports.formatters = {};\n\n/**\n * Previously assigned color.\n */\n\nvar prevColor = 0;\n\n/**\n * Previous log timestamp.\n */\n\nvar prevTime;\n\n/**\n * Select a color.\n *\n * @return {Number}\n * @api private\n */\n\nfunction selectColor() {\n  return exports.colors[prevColor++ % exports.colors.length];\n}\n\n/**\n * Create a debugger with the given `namespace`.\n *\n * @param {String} namespace\n * @return {Function}\n * @api public\n */\n\nfunction debug(namespace) {\n\n  // define the `disabled` version\n  function disabled() {\n  }\n  disabled.enabled = false;\n\n  // define the `enabled` version\n  function enabled() {\n\n    var self = enabled;\n\n    // set `diff` timestamp\n    var curr = +new Date();\n    var ms = curr - (prevTime || curr);\n    self.diff = ms;\n    self.prev = prevTime;\n    self.curr = curr;\n    prevTime = curr;\n\n    // add the `color` if not set\n    if (null == self.useColors) self.useColors = exports.useColors();\n    if (null == self.color && self.useColors) self.color = selectColor();\n\n    var args = Array.prototype.slice.call(arguments);\n\n    args[0] = exports.coerce(args[0]);\n\n    if ('string' !== typeof args[0]) {\n      // anything else let's inspect with %o\n      args = ['%o'].concat(args);\n    }\n\n    // apply any `formatters` transformations\n    var index = 0;\n    args[0] = args[0].replace(/%([a-z%])/g, function(match, format) {\n      // if we encounter an escaped % then don't increase the array index\n      if (match === '%%') return match;\n      index++;\n      var formatter = exports.formatters[format];\n      if ('function' === typeof formatter) {\n        var val = args[index];\n        match = formatter.call(self, val);\n\n        // now we need to remove `args[index]` since it's inlined in the `format`\n        args.splice(index, 1);\n        index--;\n      }\n      return match;\n    });\n\n    if ('function' === typeof exports.formatArgs) {\n      args = exports.formatArgs.apply(self, args);\n    }\n    var logFn = enabled.log || exports.log || console.log.bind(console);\n    logFn.apply(self, args);\n  }\n  enabled.enabled = true;\n\n  var fn = exports.enabled(namespace) ? enabled : disabled;\n\n  fn.namespace = namespace;\n\n  return fn;\n}\n\n/**\n * Enables a debug mode by namespaces. This can include modes\n * separated by a colon and wildcards.\n *\n * @param {String} namespaces\n * @api public\n */\n\nfunction enable(namespaces) {\n  exports.save(namespaces);\n\n  var split = (namespaces || '').split(/[\\s,]+/);\n  var len = split.length;\n\n  for (var i = 0; i < len; i++) {\n    if (!split[i]) continue; // ignore empty strings\n    namespaces = split[i].replace(/\\*/g, '.*?');\n    if (namespaces[0] === '-') {\n      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));\n    } else {\n      exports.names.push(new RegExp('^' + namespaces + '$'));\n    }\n  }\n}\n\n/**\n * Disable debug output.\n *\n * @api public\n */\n\nfunction disable() {\n  exports.enable('');\n}\n\n/**\n * Returns true if the given mode name is enabled, false otherwise.\n *\n * @param {String} name\n * @return {Boolean}\n * @api public\n */\n\nfunction enabled(name) {\n  var i, len;\n  for (i = 0, len = exports.skips.length; i < len; i++) {\n    if (exports.skips[i].test(name)) {\n      return false;\n    }\n  }\n  for (i = 0, len = exports.names.length; i < len; i++) {\n    if (exports.names[i].test(name)) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/**\n * Coerce `val`.\n *\n * @param {Mixed} val\n * @return {Mixed}\n * @api private\n */\n\nfunction coerce(val) {\n  if (val instanceof Error) return val.stack || val.message;\n  return val;\n}\n","/**\n * Helpers.\n */\n\nvar s = 1000;\nvar m = s * 60;\nvar h = m * 60;\nvar d = h * 24;\nvar y = d * 365.25;\n\n/**\n * Parse or format the given `val`.\n *\n * Options:\n *\n *  - `long` verbose formatting [false]\n *\n * @param {String|Number} val\n * @param {Object} options\n * @return {String|Number}\n * @api public\n */\n\nmodule.exports = function(val, options){\n  options = options || {};\n  if ('string' == typeof val) return parse(val);\n  return options.long\n    ? long(val)\n    : short(val);\n};\n\n/**\n * Parse the given `str` and return milliseconds.\n *\n * @param {String} str\n * @return {Number}\n * @api private\n */\n\nfunction parse(str) {\n  str = '' + str;\n  if (str.length > 10000) return;\n  var match = /^((?:\\d+)?\\.?\\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(str);\n  if (!match) return;\n  var n = parseFloat(match[1]);\n  var type = (match[2] || 'ms').toLowerCase();\n  switch (type) {\n    case 'years':\n    case 'year':\n    case 'yrs':\n    case 'yr':\n    case 'y':\n      return n * y;\n    case 'days':\n    case 'day':\n    case 'd':\n      return n * d;\n    case 'hours':\n    case 'hour':\n    case 'hrs':\n    case 'hr':\n    case 'h':\n      return n * h;\n    case 'minutes':\n    case 'minute':\n    case 'mins':\n    case 'min':\n    case 'm':\n      return n * m;\n    case 'seconds':\n    case 'second':\n    case 'secs':\n    case 'sec':\n    case 's':\n      return n * s;\n    case 'milliseconds':\n    case 'millisecond':\n    case 'msecs':\n    case 'msec':\n    case 'ms':\n      return n;\n  }\n}\n\n/**\n * Short format for `ms`.\n *\n * @param {Number} ms\n * @return {String}\n * @api private\n */\n\nfunction short(ms) {\n  if (ms >= d) return Math.round(ms / d) + 'd';\n  if (ms >= h) return Math.round(ms / h) + 'h';\n  if (ms >= m) return Math.round(ms / m) + 'm';\n  if (ms >= s) return Math.round(ms / s) + 's';\n  return ms + 'ms';\n}\n\n/**\n * Long format for `ms`.\n *\n * @param {Number} ms\n * @return {String}\n * @api private\n */\n\nfunction long(ms) {\n  return plural(ms, d, 'day')\n    || plural(ms, h, 'hour')\n    || plural(ms, m, 'minute')\n    || plural(ms, s, 'second')\n    || ms + ' ms';\n}\n\n/**\n * Pluralization helper.\n */\n\nfunction plural(ms, n, name) {\n  if (ms < n) return;\n  if (ms < n * 1.5) return Math.floor(ms / n) + ' ' + name;\n  return Math.ceil(ms / n) + ' ' + name + 's';\n}\n","if (typeof Object.create === 'function') {\n  // implementation from standard node.js 'util' module\n  module.exports = function inherits(ctor, superCtor) {\n    ctor.super_ = superCtor\n    ctor.prototype = Object.create(superCtor.prototype, {\n      constructor: {\n        value: ctor,\n        enumerable: false,\n        writable: true,\n        configurable: true\n      }\n    });\n  };\n} else {\n  // old school shim for old browsers\n  module.exports = function inherits(ctor, superCtor) {\n    ctor.super_ = superCtor\n    var TempCtor = function () {}\n    TempCtor.prototype = superCtor.prototype\n    ctor.prototype = new TempCtor()\n    ctor.prototype.constructor = ctor\n  }\n}\n","(function (global){\n/*! JSON v3.3.2 | http://bestiejs.github.io/json3 | Copyright 2012-2014, Kit Cambridge | http://kit.mit-license.org */\n;(function () {\n  // Detect the `define` function exposed by asynchronous module loaders. The\n  // strict `define` check is necessary for compatibility with `r.js`.\n  var isLoader = typeof define === \"function\" && define.amd;\n\n  // A set of types used to distinguish objects from primitives.\n  var objectTypes = {\n    \"function\": true,\n    \"object\": true\n  };\n\n  // Detect the `exports` object exposed by CommonJS implementations.\n  var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;\n\n  // Use the `global` object exposed by Node (including Browserify via\n  // `insert-module-globals`), Narwhal, and Ringo as the default context,\n  // and the `window` object in browsers. Rhino exports a `global` function\n  // instead.\n  var root = objectTypes[typeof window] && window || this,\n      freeGlobal = freeExports && objectTypes[typeof module] && module && !module.nodeType && typeof global == \"object\" && global;\n\n  if (freeGlobal && (freeGlobal[\"global\"] === freeGlobal || freeGlobal[\"window\"] === freeGlobal || freeGlobal[\"self\"] === freeGlobal)) {\n    root = freeGlobal;\n  }\n\n  // Public: Initializes JSON 3 using the given `context` object, attaching the\n  // `stringify` and `parse` functions to the specified `exports` object.\n  function runInContext(context, exports) {\n    context || (context = root[\"Object\"]());\n    exports || (exports = root[\"Object\"]());\n\n    // Native constructor aliases.\n    var Number = context[\"Number\"] || root[\"Number\"],\n        String = context[\"String\"] || root[\"String\"],\n        Object = context[\"Object\"] || root[\"Object\"],\n        Date = context[\"Date\"] || root[\"Date\"],\n        SyntaxError = context[\"SyntaxError\"] || root[\"SyntaxError\"],\n        TypeError = context[\"TypeError\"] || root[\"TypeError\"],\n        Math = context[\"Math\"] || root[\"Math\"],\n        nativeJSON = context[\"JSON\"] || root[\"JSON\"];\n\n    // Delegate to the native `stringify` and `parse` implementations.\n    if (typeof nativeJSON == \"object\" && nativeJSON) {\n      exports.stringify = nativeJSON.stringify;\n      exports.parse = nativeJSON.parse;\n    }\n\n    // Convenience aliases.\n    var objectProto = Object.prototype,\n        getClass = objectProto.toString,\n        isProperty, forEach, undef;\n\n    // Test the `Date#getUTC*` methods. Based on work by @Yaffle.\n    var isExtended = new Date(-3509827334573292);\n    try {\n      // The `getUTCFullYear`, `Month`, and `Date` methods return nonsensical\n      // results for certain dates in Opera >= 10.53.\n      isExtended = isExtended.getUTCFullYear() == -109252 && isExtended.getUTCMonth() === 0 && isExtended.getUTCDate() === 1 &&\n        // Safari < 2.0.2 stores the internal millisecond time value correctly,\n        // but clips the values returned by the date methods to the range of\n        // signed 32-bit integers ([-2 ** 31, 2 ** 31 - 1]).\n        isExtended.getUTCHours() == 10 && isExtended.getUTCMinutes() == 37 && isExtended.getUTCSeconds() == 6 && isExtended.getUTCMilliseconds() == 708;\n    } catch (exception) {}\n\n    // Internal: Determines whether the native `JSON.stringify` and `parse`\n    // implementations are spec-compliant. Based on work by Ken Snyder.\n    function has(name) {\n      if (has[name] !== undef) {\n        // Return cached feature test result.\n        return has[name];\n      }\n      var isSupported;\n      if (name == \"bug-string-char-index\") {\n        // IE <= 7 doesn't support accessing string characters using square\n        // bracket notation. IE 8 only supports this for primitives.\n        isSupported = \"a\"[0] != \"a\";\n      } else if (name == \"json\") {\n        // Indicates whether both `JSON.stringify` and `JSON.parse` are\n        // supported.\n        isSupported = has(\"json-stringify\") && has(\"json-parse\");\n      } else {\n        var value, serialized = '{\"a\":[1,true,false,null,\"\\\\u0000\\\\b\\\\n\\\\f\\\\r\\\\t\"]}';\n        // Test `JSON.stringify`.\n        if (name == \"json-stringify\") {\n          var stringify = exports.stringify, stringifySupported = typeof stringify == \"function\" && isExtended;\n          if (stringifySupported) {\n            // A test function object with a custom `toJSON` method.\n            (value = function () {\n              return 1;\n            }).toJSON = value;\n            try {\n              stringifySupported =\n                // Firefox 3.1b1 and b2 serialize string, number, and boolean\n                // primitives as object literals.\n                stringify(0) === \"0\" &&\n                // FF 3.1b1, b2, and JSON 2 serialize wrapped primitives as object\n                // literals.\n                stringify(new Number()) === \"0\" &&\n                stringify(new String()) == '\"\"' &&\n                // FF 3.1b1, 2 throw an error if the value is `null`, `undefined`, or\n                // does not define a canonical JSON representation (this applies to\n                // objects with `toJSON` properties as well, *unless* they are nested\n                // within an object or array).\n                stringify(getClass) === undef &&\n                // IE 8 serializes `undefined` as `\"undefined\"`. Safari <= 5.1.7 and\n                // FF 3.1b3 pass this test.\n                stringify(undef) === undef &&\n                // Safari <= 5.1.7 and FF 3.1b3 throw `Error`s and `TypeError`s,\n                // respectively, if the value is omitted entirely.\n                stringify() === undef &&\n                // FF 3.1b1, 2 throw an error if the given value is not a number,\n                // string, array, object, Boolean, or `null` literal. This applies to\n                // objects with custom `toJSON` methods as well, unless they are nested\n                // inside object or array literals. YUI 3.0.0b1 ignores custom `toJSON`\n                // methods entirely.\n                stringify(value) === \"1\" &&\n                stringify([value]) == \"[1]\" &&\n                // Prototype <= 1.6.1 serializes `[undefined]` as `\"[]\"` instead of\n                // `\"[null]\"`.\n                stringify([undef]) == \"[null]\" &&\n                // YUI 3.0.0b1 fails to serialize `null` literals.\n                stringify(null) == \"null\" &&\n                // FF 3.1b1, 2 halts serialization if an array contains a function:\n                // `[1, true, getClass, 1]` serializes as \"[1,true,],\". FF 3.1b3\n                // elides non-JSON values from objects and arrays, unless they\n                // define custom `toJSON` methods.\n                stringify([undef, getClass, null]) == \"[null,null,null]\" &&\n                // Simple serialization test. FF 3.1b1 uses Unicode escape sequences\n                // where character escape codes are expected (e.g., `\\b` => `\\u0008`).\n                stringify({ \"a\": [value, true, false, null, \"\\x00\\b\\n\\f\\r\\t\"] }) == serialized &&\n                // FF 3.1b1 and b2 ignore the `filter` and `width` arguments.\n                stringify(null, value) === \"1\" &&\n                stringify([1, 2], null, 1) == \"[\\n 1,\\n 2\\n]\" &&\n                // JSON 2, Prototype <= 1.7, and older WebKit builds incorrectly\n                // serialize extended years.\n                stringify(new Date(-8.64e15)) == '\"-271821-04-20T00:00:00.000Z\"' &&\n                // The milliseconds are optional in ES 5, but required in 5.1.\n                stringify(new Date(8.64e15)) == '\"+275760-09-13T00:00:00.000Z\"' &&\n                // Firefox <= 11.0 incorrectly serializes years prior to 0 as negative\n                // four-digit years instead of six-digit years. Credits: @Yaffle.\n                stringify(new Date(-621987552e5)) == '\"-000001-01-01T00:00:00.000Z\"' &&\n                // Safari <= 5.1.5 and Opera >= 10.53 incorrectly serialize millisecond\n                // values less than 1000. Credits: @Yaffle.\n                stringify(new Date(-1)) == '\"1969-12-31T23:59:59.999Z\"';\n            } catch (exception) {\n              stringifySupported = false;\n            }\n          }\n          isSupported = stringifySupported;\n        }\n        // Test `JSON.parse`.\n        if (name == \"json-parse\") {\n          var parse = exports.parse;\n          if (typeof parse == \"function\") {\n            try {\n              // FF 3.1b1, b2 will throw an exception if a bare literal is provided.\n              // Conforming implementations should also coerce the initial argument to\n              // a string prior to parsing.\n              if (parse(\"0\") === 0 && !parse(false)) {\n                // Simple parsing test.\n                value = parse(serialized);\n                var parseSupported = value[\"a\"].length == 5 && value[\"a\"][0] === 1;\n                if (parseSupported) {\n                  try {\n                    // Safari <= 5.1.2 and FF 3.1b1 allow unescaped tabs in strings.\n                    parseSupported = !parse('\"\\t\"');\n                  } catch (exception) {}\n                  if (parseSupported) {\n                    try {\n                      // FF 4.0 and 4.0.1 allow leading `+` signs and leading\n                      // decimal points. FF 4.0, 4.0.1, and IE 9-10 also allow\n                      // certain octal literals.\n                      parseSupported = parse(\"01\") !== 1;\n                    } catch (exception) {}\n                  }\n                  if (parseSupported) {\n                    try {\n                      // FF 4.0, 4.0.1, and Rhino 1.7R3-R4 allow trailing decimal\n                      // points. These environments, along with FF 3.1b1 and 2,\n                      // also allow trailing commas in JSON objects and arrays.\n                      parseSupported = parse(\"1.\") !== 1;\n                    } catch (exception) {}\n                  }\n                }\n              }\n            } catch (exception) {\n              parseSupported = false;\n            }\n          }\n          isSupported = parseSupported;\n        }\n      }\n      return has[name] = !!isSupported;\n    }\n\n    if (!has(\"json\")) {\n      // Common `[[Class]]` name aliases.\n      var functionClass = \"[object Function]\",\n          dateClass = \"[object Date]\",\n          numberClass = \"[object Number]\",\n          stringClass = \"[object String]\",\n          arrayClass = \"[object Array]\",\n          booleanClass = \"[object Boolean]\";\n\n      // Detect incomplete support for accessing string characters by index.\n      var charIndexBuggy = has(\"bug-string-char-index\");\n\n      // Define additional utility methods if the `Date` methods are buggy.\n      if (!isExtended) {\n        var floor = Math.floor;\n        // A mapping between the months of the year and the number of days between\n        // January 1st and the first of the respective month.\n        var Months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334];\n        // Internal: Calculates the number of days between the Unix epoch and the\n        // first day of the given month.\n        var getDay = function (year, month) {\n          return Months[month] + 365 * (year - 1970) + floor((year - 1969 + (month = +(month > 1))) / 4) - floor((year - 1901 + month) / 100) + floor((year - 1601 + month) / 400);\n        };\n      }\n\n      // Internal: Determines if a property is a direct property of the given\n      // object. Delegates to the native `Object#hasOwnProperty` method.\n      if (!(isProperty = objectProto.hasOwnProperty)) {\n        isProperty = function (property) {\n          var members = {}, constructor;\n          if ((members.__proto__ = null, members.__proto__ = {\n            // The *proto* property cannot be set multiple times in recent\n            // versions of Firefox and SeaMonkey.\n            \"toString\": 1\n          }, members).toString != getClass) {\n            // Safari <= 2.0.3 doesn't implement `Object#hasOwnProperty`, but\n            // supports the mutable *proto* property.\n            isProperty = function (property) {\n              // Capture and break the object's prototype chain (see section 8.6.2\n              // of the ES 5.1 spec). The parenthesized expression prevents an\n              // unsafe transformation by the Closure Compiler.\n              var original = this.__proto__, result = property in (this.__proto__ = null, this);\n              // Restore the original prototype chain.\n              this.__proto__ = original;\n              return result;\n            };\n          } else {\n            // Capture a reference to the top-level `Object` constructor.\n            constructor = members.constructor;\n            // Use the `constructor` property to simulate `Object#hasOwnProperty` in\n            // other environments.\n            isProperty = function (property) {\n              var parent = (this.constructor || constructor).prototype;\n              return property in this && !(property in parent && this[property] === parent[property]);\n            };\n          }\n          members = null;\n          return isProperty.call(this, property);\n        };\n      }\n\n      // Internal: Normalizes the `for...in` iteration algorithm across\n      // environments. Each enumerated key is yielded to a `callback` function.\n      forEach = function (object, callback) {\n        var size = 0, Properties, members, property;\n\n        // Tests for bugs in the current environment's `for...in` algorithm. The\n        // `valueOf` property inherits the non-enumerable flag from\n        // `Object.prototype` in older versions of IE, Netscape, and Mozilla.\n        (Properties = function () {\n          this.valueOf = 0;\n        }).prototype.valueOf = 0;\n\n        // Iterate over a new instance of the `Properties` class.\n        members = new Properties();\n        for (property in members) {\n          // Ignore all properties inherited from `Object.prototype`.\n          if (isProperty.call(members, property)) {\n            size++;\n          }\n        }\n        Properties = members = null;\n\n        // Normalize the iteration algorithm.\n        if (!size) {\n          // A list of non-enumerable properties inherited from `Object.prototype`.\n          members = [\"valueOf\", \"toString\", \"toLocaleString\", \"propertyIsEnumerable\", \"isPrototypeOf\", \"hasOwnProperty\", \"constructor\"];\n          // IE <= 8, Mozilla 1.0, and Netscape 6.2 ignore shadowed non-enumerable\n          // properties.\n          forEach = function (object, callback) {\n            var isFunction = getClass.call(object) == functionClass, property, length;\n            var hasProperty = !isFunction && typeof object.constructor != \"function\" && objectTypes[typeof object.hasOwnProperty] && object.hasOwnProperty || isProperty;\n            for (property in object) {\n              // Gecko <= 1.0 enumerates the `prototype` property of functions under\n              // certain conditions; IE does not.\n              if (!(isFunction && property == \"prototype\") && hasProperty.call(object, property)) {\n                callback(property);\n              }\n            }\n            // Manually invoke the callback for each non-enumerable property.\n            for (length = members.length; property = members[--length]; hasProperty.call(object, property) && callback(property));\n          };\n        } else if (size == 2) {\n          // Safari <= 2.0.4 enumerates shadowed properties twice.\n          forEach = function (object, callback) {\n            // Create a set of iterated properties.\n            var members = {}, isFunction = getClass.call(object) == functionClass, property;\n            for (property in object) {\n              // Store each property name to prevent double enumeration. The\n              // `prototype` property of functions is not enumerated due to cross-\n              // environment inconsistencies.\n              if (!(isFunction && property == \"prototype\") && !isProperty.call(members, property) && (members[property] = 1) && isProperty.call(object, property)) {\n                callback(property);\n              }\n            }\n          };\n        } else {\n          // No bugs detected; use the standard `for...in` algorithm.\n          forEach = function (object, callback) {\n            var isFunction = getClass.call(object) == functionClass, property, isConstructor;\n            for (property in object) {\n              if (!(isFunction && property == \"prototype\") && isProperty.call(object, property) && !(isConstructor = property === \"constructor\")) {\n                callback(property);\n              }\n            }\n            // Manually invoke the callback for the `constructor` property due to\n            // cross-environment inconsistencies.\n            if (isConstructor || isProperty.call(object, (property = \"constructor\"))) {\n              callback(property);\n            }\n          };\n        }\n        return forEach(object, callback);\n      };\n\n      // Public: Serializes a JavaScript `value` as a JSON string. The optional\n      // `filter` argument may specify either a function that alters how object and\n      // array members are serialized, or an array of strings and numbers that\n      // indicates which properties should be serialized. The optional `width`\n      // argument may be either a string or number that specifies the indentation\n      // level of the output.\n      if (!has(\"json-stringify\")) {\n        // Internal: A map of control characters and their escaped equivalents.\n        var Escapes = {\n          92: \"\\\\\\\\\",\n          34: '\\\\\"',\n          8: \"\\\\b\",\n          12: \"\\\\f\",\n          10: \"\\\\n\",\n          13: \"\\\\r\",\n          9: \"\\\\t\"\n        };\n\n        // Internal: Converts `value` into a zero-padded string such that its\n        // length is at least equal to `width`. The `width` must be <= 6.\n        var leadingZeroes = \"000000\";\n        var toPaddedString = function (width, value) {\n          // The `|| 0` expression is necessary to work around a bug in\n          // Opera <= 7.54u2 where `0 == -0`, but `String(-0) !== \"0\"`.\n          return (leadingZeroes + (value || 0)).slice(-width);\n        };\n\n        // Internal: Double-quotes a string `value`, replacing all ASCII control\n        // characters (characters with code unit values between 0 and 31) with\n        // their escaped equivalents. This is an implementation of the\n        // `Quote(value)` operation defined in ES 5.1 section 15.12.3.\n        var unicodePrefix = \"\\\\u00\";\n        var quote = function (value) {\n          var result = '\"', index = 0, length = value.length, useCharIndex = !charIndexBuggy || length > 10;\n          var symbols = useCharIndex && (charIndexBuggy ? value.split(\"\") : value);\n          for (; index < length; index++) {\n            var charCode = value.charCodeAt(index);\n            // If the character is a control character, append its Unicode or\n            // shorthand escape sequence; otherwise, append the character as-is.\n            switch (charCode) {\n              case 8: case 9: case 10: case 12: case 13: case 34: case 92:\n                result += Escapes[charCode];\n                break;\n              default:\n                if (charCode < 32) {\n                  result += unicodePrefix + toPaddedString(2, charCode.toString(16));\n                  break;\n                }\n                result += useCharIndex ? symbols[index] : value.charAt(index);\n            }\n          }\n          return result + '\"';\n        };\n\n        // Internal: Recursively serializes an object. Implements the\n        // `Str(key, holder)`, `JO(value)`, and `JA(value)` operations.\n        var serialize = function (property, object, callback, properties, whitespace, indentation, stack) {\n          var value, className, year, month, date, time, hours, minutes, seconds, milliseconds, results, element, index, length, prefix, result;\n          try {\n            // Necessary for host object support.\n            value = object[property];\n          } catch (exception) {}\n          if (typeof value == \"object\" && value) {\n            className = getClass.call(value);\n            if (className == dateClass && !isProperty.call(value, \"toJSON\")) {\n              if (value > -1 / 0 && value < 1 / 0) {\n                // Dates are serialized according to the `Date#toJSON` method\n                // specified in ES 5.1 section 15.9.5.44. See section 15.9.1.15\n                // for the ISO 8601 date time string format.\n                if (getDay) {\n                  // Manually compute the year, month, date, hours, minutes,\n                  // seconds, and milliseconds if the `getUTC*` methods are\n                  // buggy. Adapted from @Yaffle's `date-shim` project.\n                  date = floor(value / 864e5);\n                  for (year = floor(date / 365.2425) + 1970 - 1; getDay(year + 1, 0) <= date; year++);\n                  for (month = floor((date - getDay(year, 0)) / 30.42); getDay(year, month + 1) <= date; month++);\n                  date = 1 + date - getDay(year, month);\n                  // The `time` value specifies the time within the day (see ES\n                  // 5.1 section 15.9.1.2). The formula `(A % B + B) % B` is used\n                  // to compute `A modulo B`, as the `%` operator does not\n                  // correspond to the `modulo` operation for negative numbers.\n                  time = (value % 864e5 + 864e5) % 864e5;\n                  // The hours, minutes, seconds, and milliseconds are obtained by\n                  // decomposing the time within the day. See section 15.9.1.10.\n                  hours = floor(time / 36e5) % 24;\n                  minutes = floor(time / 6e4) % 60;\n                  seconds = floor(time / 1e3) % 60;\n                  milliseconds = time % 1e3;\n                } else {\n                  year = value.getUTCFullYear();\n                  month = value.getUTCMonth();\n                  date = value.getUTCDate();\n                  hours = value.getUTCHours();\n                  minutes = value.getUTCMinutes();\n                  seconds = value.getUTCSeconds();\n                  milliseconds = value.getUTCMilliseconds();\n                }\n                // Serialize extended years correctly.\n                value = (year <= 0 || year >= 1e4 ? (year < 0 ? \"-\" : \"+\") + toPaddedString(6, year < 0 ? -year : year) : toPaddedString(4, year)) +\n                  \"-\" + toPaddedString(2, month + 1) + \"-\" + toPaddedString(2, date) +\n                  // Months, dates, hours, minutes, and seconds should have two\n                  // digits; milliseconds should have three.\n                  \"T\" + toPaddedString(2, hours) + \":\" + toPaddedString(2, minutes) + \":\" + toPaddedString(2, seconds) +\n                  // Milliseconds are optional in ES 5.0, but required in 5.1.\n                  \".\" + toPaddedString(3, milliseconds) + \"Z\";\n              } else {\n                value = null;\n              }\n            } else if (typeof value.toJSON == \"function\" && ((className != numberClass && className != stringClass && className != arrayClass) || isProperty.call(value, \"toJSON\"))) {\n              // Prototype <= 1.6.1 adds non-standard `toJSON` methods to the\n              // `Number`, `String`, `Date`, and `Array` prototypes. JSON 3\n              // ignores all `toJSON` methods on these objects unless they are\n              // defined directly on an instance.\n              value = value.toJSON(property);\n            }\n          }\n          if (callback) {\n            // If a replacement function was provided, call it to obtain the value\n            // for serialization.\n            value = callback.call(object, property, value);\n          }\n          if (value === null) {\n            return \"null\";\n          }\n          className = getClass.call(value);\n          if (className == booleanClass) {\n            // Booleans are represented literally.\n            return \"\" + value;\n          } else if (className == numberClass) {\n            // JSON numbers must be finite. `Infinity` and `NaN` are serialized as\n            // `\"null\"`.\n            return value > -1 / 0 && value < 1 / 0 ? \"\" + value : \"null\";\n          } else if (className == stringClass) {\n            // Strings are double-quoted and escaped.\n            return quote(\"\" + value);\n          }\n          // Recursively serialize objects and arrays.\n          if (typeof value == \"object\") {\n            // Check for cyclic structures. This is a linear search; performance\n            // is inversely proportional to the number of unique nested objects.\n            for (length = stack.length; length--;) {\n              if (stack[length] === value) {\n                // Cyclic structures cannot be serialized by `JSON.stringify`.\n                throw TypeError();\n              }\n            }\n            // Add the object to the stack of traversed objects.\n            stack.push(value);\n            results = [];\n            // Save the current indentation level and indent one additional level.\n            prefix = indentation;\n            indentation += whitespace;\n            if (className == arrayClass) {\n              // Recursively serialize array elements.\n              for (index = 0, length = value.length; index < length; index++) {\n                element = serialize(index, value, callback, properties, whitespace, indentation, stack);\n                results.push(element === undef ? \"null\" : element);\n              }\n              result = results.length ? (whitespace ? \"[\\n\" + indentation + results.join(\",\\n\" + indentation) + \"\\n\" + prefix + \"]\" : (\"[\" + results.join(\",\") + \"]\")) : \"[]\";\n            } else {\n              // Recursively serialize object members. Members are selected from\n              // either a user-specified list of property names, or the object\n              // itself.\n              forEach(properties || value, function (property) {\n                var element = serialize(property, value, callback, properties, whitespace, indentation, stack);\n                if (element !== undef) {\n                  // According to ES 5.1 section 15.12.3: \"If `gap` {whitespace}\n                  // is not the empty string, let `member` {quote(property) + \":\"}\n                  // be the concatenation of `member` and the `space` character.\"\n                  // The \"`space` character\" refers to the literal space\n                  // character, not the `space` {width} argument provided to\n                  // `JSON.stringify`.\n                  results.push(quote(property) + \":\" + (whitespace ? \" \" : \"\") + element);\n                }\n              });\n              result = results.length ? (whitespace ? \"{\\n\" + indentation + results.join(\",\\n\" + indentation) + \"\\n\" + prefix + \"}\" : (\"{\" + results.join(\",\") + \"}\")) : \"{}\";\n            }\n            // Remove the object from the traversed object stack.\n            stack.pop();\n            return result;\n          }\n        };\n\n        // Public: `JSON.stringify`. See ES 5.1 section 15.12.3.\n        exports.stringify = function (source, filter, width) {\n          var whitespace, callback, properties, className;\n          if (objectTypes[typeof filter] && filter) {\n            if ((className = getClass.call(filter)) == functionClass) {\n              callback = filter;\n            } else if (className == arrayClass) {\n              // Convert the property names array into a makeshift set.\n              properties = {};\n              for (var index = 0, length = filter.length, value; index < length; value = filter[index++], ((className = getClass.call(value)), className == stringClass || className == numberClass) && (properties[value] = 1));\n            }\n          }\n          if (width) {\n            if ((className = getClass.call(width)) == numberClass) {\n              // Convert the `width` to an integer and create a string containing\n              // `width` number of space characters.\n              if ((width -= width % 1) > 0) {\n                for (whitespace = \"\", width > 10 && (width = 10); whitespace.length < width; whitespace += \" \");\n              }\n            } else if (className == stringClass) {\n              whitespace = width.length <= 10 ? width : width.slice(0, 10);\n            }\n          }\n          // Opera <= 7.54u2 discards the values associated with empty string keys\n          // (`\"\"`) only if they are used directly within an object member list\n          // (e.g., `!(\"\" in { \"\": 1})`).\n          return serialize(\"\", (value = {}, value[\"\"] = source, value), callback, properties, whitespace, \"\", []);\n        };\n      }\n\n      // Public: Parses a JSON source string.\n      if (!has(\"json-parse\")) {\n        var fromCharCode = String.fromCharCode;\n\n        // Internal: A map of escaped control characters and their unescaped\n        // equivalents.\n        var Unescapes = {\n          92: \"\\\\\",\n          34: '\"',\n          47: \"/\",\n          98: \"\\b\",\n          116: \"\\t\",\n          110: \"\\n\",\n          102: \"\\f\",\n          114: \"\\r\"\n        };\n\n        // Internal: Stores the parser state.\n        var Index, Source;\n\n        // Internal: Resets the parser state and throws a `SyntaxError`.\n        var abort = function () {\n          Index = Source = null;\n          throw SyntaxError();\n        };\n\n        // Internal: Returns the next token, or `\"$\"` if the parser has reached\n        // the end of the source string. A token may be a string, number, `null`\n        // literal, or Boolean literal.\n        var lex = function () {\n          var source = Source, length = source.length, value, begin, position, isSigned, charCode;\n          while (Index < length) {\n            charCode = source.charCodeAt(Index);\n            switch (charCode) {\n              case 9: case 10: case 13: case 32:\n                // Skip whitespace tokens, including tabs, carriage returns, line\n                // feeds, and space characters.\n                Index++;\n                break;\n              case 123: case 125: case 91: case 93: case 58: case 44:\n                // Parse a punctuator token (`{`, `}`, `[`, `]`, `:`, or `,`) at\n                // the current position.\n                value = charIndexBuggy ? source.charAt(Index) : source[Index];\n                Index++;\n                return value;\n              case 34:\n                // `\"` delimits a JSON string; advance to the next character and\n                // begin parsing the string. String tokens are prefixed with the\n                // sentinel `@` character to distinguish them from punctuators and\n                // end-of-string tokens.\n                for (value = \"@\", Index++; Index < length;) {\n                  charCode = source.charCodeAt(Index);\n                  if (charCode < 32) {\n                    // Unescaped ASCII control characters (those with a code unit\n                    // less than the space character) are not permitted.\n                    abort();\n                  } else if (charCode == 92) {\n                    // A reverse solidus (`\\`) marks the beginning of an escaped\n                    // control character (including `\"`, `\\`, and `/`) or Unicode\n                    // escape sequence.\n                    charCode = source.charCodeAt(++Index);\n                    switch (charCode) {\n                      case 92: case 34: case 47: case 98: case 116: case 110: case 102: case 114:\n                        // Revive escaped control characters.\n                        value += Unescapes[charCode];\n                        Index++;\n                        break;\n                      case 117:\n                        // `\\u` marks the beginning of a Unicode escape sequence.\n                        // Advance to the first character and validate the\n                        // four-digit code point.\n                        begin = ++Index;\n                        for (position = Index + 4; Index < position; Index++) {\n                          charCode = source.charCodeAt(Index);\n                          // A valid sequence comprises four hexdigits (case-\n                          // insensitive) that form a single hexadecimal value.\n                          if (!(charCode >= 48 && charCode <= 57 || charCode >= 97 && charCode <= 102 || charCode >= 65 && charCode <= 70)) {\n                            // Invalid Unicode escape sequence.\n                            abort();\n                          }\n                        }\n                        // Revive the escaped character.\n                        value += fromCharCode(\"0x\" + source.slice(begin, Index));\n                        break;\n                      default:\n                        // Invalid escape sequence.\n                        abort();\n                    }\n                  } else {\n                    if (charCode == 34) {\n                      // An unescaped double-quote character marks the end of the\n                      // string.\n                      break;\n                    }\n                    charCode = source.charCodeAt(Index);\n                    begin = Index;\n                    // Optimize for the common case where a string is valid.\n                    while (charCode >= 32 && charCode != 92 && charCode != 34) {\n                      charCode = source.charCodeAt(++Index);\n                    }\n                    // Append the string as-is.\n                    value += source.slice(begin, Index);\n                  }\n                }\n                if (source.charCodeAt(Index) == 34) {\n                  // Advance to the next character and return the revived string.\n                  Index++;\n                  return value;\n                }\n                // Unterminated string.\n                abort();\n              default:\n                // Parse numbers and literals.\n                begin = Index;\n                // Advance past the negative sign, if one is specified.\n                if (charCode == 45) {\n                  isSigned = true;\n                  charCode = source.charCodeAt(++Index);\n                }\n                // Parse an integer or floating-point value.\n                if (charCode >= 48 && charCode <= 57) {\n                  // Leading zeroes are interpreted as octal literals.\n                  if (charCode == 48 && ((charCode = source.charCodeAt(Index + 1)), charCode >= 48 && charCode <= 57)) {\n                    // Illegal octal literal.\n                    abort();\n                  }\n                  isSigned = false;\n                  // Parse the integer component.\n                  for (; Index < length && ((charCode = source.charCodeAt(Index)), charCode >= 48 && charCode <= 57); Index++);\n                  // Floats cannot contain a leading decimal point; however, this\n                  // case is already accounted for by the parser.\n                  if (source.charCodeAt(Index) == 46) {\n                    position = ++Index;\n                    // Parse the decimal component.\n                    for (; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);\n                    if (position == Index) {\n                      // Illegal trailing decimal.\n                      abort();\n                    }\n                    Index = position;\n                  }\n                  // Parse exponents. The `e` denoting the exponent is\n                  // case-insensitive.\n                  charCode = source.charCodeAt(Index);\n                  if (charCode == 101 || charCode == 69) {\n                    charCode = source.charCodeAt(++Index);\n                    // Skip past the sign following the exponent, if one is\n                    // specified.\n                    if (charCode == 43 || charCode == 45) {\n                      Index++;\n                    }\n                    // Parse the exponential component.\n                    for (position = Index; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);\n                    if (position == Index) {\n                      // Illegal empty exponent.\n                      abort();\n                    }\n                    Index = position;\n                  }\n                  // Coerce the parsed value to a JavaScript number.\n                  return +source.slice(begin, Index);\n                }\n                // A negative sign may only precede numbers.\n                if (isSigned) {\n                  abort();\n                }\n                // `true`, `false`, and `null` literals.\n                if (source.slice(Index, Index + 4) == \"true\") {\n                  Index += 4;\n                  return true;\n                } else if (source.slice(Index, Index + 5) == \"false\") {\n                  Index += 5;\n                  return false;\n                } else if (source.slice(Index, Index + 4) == \"null\") {\n                  Index += 4;\n                  return null;\n                }\n                // Unrecognized token.\n                abort();\n            }\n          }\n          // Return the sentinel `$` character if the parser has reached the end\n          // of the source string.\n          return \"$\";\n        };\n\n        // Internal: Parses a JSON `value` token.\n        var get = function (value) {\n          var results, hasMembers;\n          if (value == \"$\") {\n            // Unexpected end of input.\n            abort();\n          }\n          if (typeof value == \"string\") {\n            if ((charIndexBuggy ? value.charAt(0) : value[0]) == \"@\") {\n              // Remove the sentinel `@` character.\n              return value.slice(1);\n            }\n            // Parse object and array literals.\n            if (value == \"[\") {\n              // Parses a JSON array, returning a new JavaScript array.\n              results = [];\n              for (;; hasMembers || (hasMembers = true)) {\n                value = lex();\n                // A closing square bracket marks the end of the array literal.\n                if (value == \"]\") {\n                  break;\n                }\n                // If the array literal contains elements, the current token\n                // should be a comma separating the previous element from the\n                // next.\n                if (hasMembers) {\n                  if (value == \",\") {\n                    value = lex();\n                    if (value == \"]\") {\n                      // Unexpected trailing `,` in array literal.\n                      abort();\n                    }\n                  } else {\n                    // A `,` must separate each array element.\n                    abort();\n                  }\n                }\n                // Elisions and leading commas are not permitted.\n                if (value == \",\") {\n                  abort();\n                }\n                results.push(get(value));\n              }\n              return results;\n            } else if (value == \"{\") {\n              // Parses a JSON object, returning a new JavaScript object.\n              results = {};\n              for (;; hasMembers || (hasMembers = true)) {\n                value = lex();\n                // A closing curly brace marks the end of the object literal.\n                if (value == \"}\") {\n                  break;\n                }\n                // If the object literal contains members, the current token\n                // should be a comma separator.\n                if (hasMembers) {\n                  if (value == \",\") {\n                    value = lex();\n                    if (value == \"}\") {\n                      // Unexpected trailing `,` in object literal.\n                      abort();\n                    }\n                  } else {\n                    // A `,` must separate each object member.\n                    abort();\n                  }\n                }\n                // Leading commas are not permitted, object property names must be\n                // double-quoted strings, and a `:` must separate each property\n                // name and value.\n                if (value == \",\" || typeof value != \"string\" || (charIndexBuggy ? value.charAt(0) : value[0]) != \"@\" || lex() != \":\") {\n                  abort();\n                }\n                results[value.slice(1)] = get(lex());\n              }\n              return results;\n            }\n            // Unexpected token encountered.\n            abort();\n          }\n          return value;\n        };\n\n        // Internal: Updates a traversed object member.\n        var update = function (source, property, callback) {\n          var element = walk(source, property, callback);\n          if (element === undef) {\n            delete source[property];\n          } else {\n            source[property] = element;\n          }\n        };\n\n        // Internal: Recursively traverses a parsed JSON object, invoking the\n        // `callback` function for each value. This is an implementation of the\n        // `Walk(holder, name)` operation defined in ES 5.1 section 15.12.2.\n        var walk = function (source, property, callback) {\n          var value = source[property], length;\n          if (typeof value == \"object\" && value) {\n            // `forEach` can't be used to traverse an array in Opera <= 8.54\n            // because its `Object#hasOwnProperty` implementation returns `false`\n            // for array indices (e.g., `![1, 2, 3].hasOwnProperty(\"0\")`).\n            if (getClass.call(value) == arrayClass) {\n              for (length = value.length; length--;) {\n                update(value, length, callback);\n              }\n            } else {\n              forEach(value, function (property) {\n                update(value, property, callback);\n              });\n            }\n          }\n          return callback.call(source, property, value);\n        };\n\n        // Public: `JSON.parse`. See ES 5.1 section 15.12.2.\n        exports.parse = function (source, callback) {\n          var result, value;\n          Index = 0;\n          Source = \"\" + source;\n          result = get(lex());\n          // If a JSON string contains multiple tokens, it is invalid.\n          if (lex() != \"$\") {\n            abort();\n          }\n          // Reset the parser state.\n          Index = Source = null;\n          return callback && getClass.call(callback) == functionClass ? walk((value = {}, value[\"\"] = result, value), \"\", callback) : result;\n        };\n      }\n    }\n\n    exports[\"runInContext\"] = runInContext;\n    return exports;\n  }\n\n  if (freeExports && !isLoader) {\n    // Export for CommonJS environments.\n    runInContext(root, freeExports);\n  } else {\n    // Export for web browsers and JavaScript engines.\n    var nativeJSON = root.JSON,\n        previousJSON = root[\"JSON3\"],\n        isRestored = false;\n\n    var JSON3 = runInContext(root, (root[\"JSON3\"] = {\n      // Public: Restores the original value of the global `JSON` object and\n      // returns a reference to the `JSON3` object.\n      \"noConflict\": function () {\n        if (!isRestored) {\n          isRestored = true;\n          root.JSON = nativeJSON;\n          root[\"JSON3\"] = previousJSON;\n          nativeJSON = previousJSON = null;\n        }\n        return JSON3;\n      }\n    }));\n\n    root.JSON = {\n      \"parse\": JSON3.parse,\n      \"stringify\": JSON3.stringify\n    };\n  }\n\n  // Export for asynchronous module loaders.\n  if (isLoader) {\n    define(function () {\n      return JSON3;\n    });\n  }\n}).call(this);\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,{"version":3,"sources":["node_modules/json3/lib/json3.js"],"names":[],"mappings":";AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["/*! JSON v3.3.2 | http://bestiejs.github.io/json3 | Copyright 2012-2014, Kit Cambridge | http://kit.mit-license.org */\n;(function () {\n  // Detect the `define` function exposed by asynchronous module loaders. The\n  // strict `define` check is necessary for compatibility with `r.js`.\n  var isLoader = typeof define === \"function\" && define.amd;\n\n  // A set of types used to distinguish objects from primitives.\n  var objectTypes = {\n    \"function\": true,\n    \"object\": true\n  };\n\n  // Detect the `exports` object exposed by CommonJS implementations.\n  var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;\n\n  // Use the `global` object exposed by Node (including Browserify via\n  // `insert-module-globals`), Narwhal, and Ringo as the default context,\n  // and the `window` object in browsers. Rhino exports a `global` function\n  // instead.\n  var root = objectTypes[typeof window] && window || this,\n      freeGlobal = freeExports && objectTypes[typeof module] && module && !module.nodeType && typeof global == \"object\" && global;\n\n  if (freeGlobal && (freeGlobal[\"global\"] === freeGlobal || freeGlobal[\"window\"] === freeGlobal || freeGlobal[\"self\"] === freeGlobal)) {\n    root = freeGlobal;\n  }\n\n  // Public: Initializes JSON 3 using the given `context` object, attaching the\n  // `stringify` and `parse` functions to the specified `exports` object.\n  function runInContext(context, exports) {\n    context || (context = root[\"Object\"]());\n    exports || (exports = root[\"Object\"]());\n\n    // Native constructor aliases.\n    var Number = context[\"Number\"] || root[\"Number\"],\n        String = context[\"String\"] || root[\"String\"],\n        Object = context[\"Object\"] || root[\"Object\"],\n        Date = context[\"Date\"] || root[\"Date\"],\n        SyntaxError = context[\"SyntaxError\"] || root[\"SyntaxError\"],\n        TypeError = context[\"TypeError\"] || root[\"TypeError\"],\n        Math = context[\"Math\"] || root[\"Math\"],\n        nativeJSON = context[\"JSON\"] || root[\"JSON\"];\n\n    // Delegate to the native `stringify` and `parse` implementations.\n    if (typeof nativeJSON == \"object\" && nativeJSON) {\n      exports.stringify = nativeJSON.stringify;\n      exports.parse = nativeJSON.parse;\n    }\n\n    // Convenience aliases.\n    var objectProto = Object.prototype,\n        getClass = objectProto.toString,\n        isProperty, forEach, undef;\n\n    // Test the `Date#getUTC*` methods. Based on work by @Yaffle.\n    var isExtended = new Date(-3509827334573292);\n    try {\n      // The `getUTCFullYear`, `Month`, and `Date` methods return nonsensical\n      // results for certain dates in Opera >= 10.53.\n      isExtended = isExtended.getUTCFullYear() == -109252 && isExtended.getUTCMonth() === 0 && isExtended.getUTCDate() === 1 &&\n        // Safari < 2.0.2 stores the internal millisecond time value correctly,\n        // but clips the values returned by the date methods to the range of\n        // signed 32-bit integers ([-2 ** 31, 2 ** 31 - 1]).\n        isExtended.getUTCHours() == 10 && isExtended.getUTCMinutes() == 37 && isExtended.getUTCSeconds() == 6 && isExtended.getUTCMilliseconds() == 708;\n    } catch (exception) {}\n\n    // Internal: Determines whether the native `JSON.stringify` and `parse`\n    // implementations are spec-compliant. Based on work by Ken Snyder.\n    function has(name) {\n      if (has[name] !== undef) {\n        // Return cached feature test result.\n        return has[name];\n      }\n      var isSupported;\n      if (name == \"bug-string-char-index\") {\n        // IE <= 7 doesn't support accessing string characters using square\n        // bracket notation. IE 8 only supports this for primitives.\n        isSupported = \"a\"[0] != \"a\";\n      } else if (name == \"json\") {\n        // Indicates whether both `JSON.stringify` and `JSON.parse` are\n        // supported.\n        isSupported = has(\"json-stringify\") && has(\"json-parse\");\n      } else {\n        var value, serialized = '{\"a\":[1,true,false,null,\"\\\\u0000\\\\b\\\\n\\\\f\\\\r\\\\t\"]}';\n        // Test `JSON.stringify`.\n        if (name == \"json-stringify\") {\n          var stringify = exports.stringify, stringifySupported = typeof stringify == \"function\" && isExtended;\n          if (stringifySupported) {\n            // A test function object with a custom `toJSON` method.\n            (value = function () {\n              return 1;\n            }).toJSON = value;\n            try {\n              stringifySupported =\n                // Firefox 3.1b1 and b2 serialize string, number, and boolean\n                // primitives as object literals.\n                stringify(0) === \"0\" &&\n                // FF 3.1b1, b2, and JSON 2 serialize wrapped primitives as object\n                // literals.\n                stringify(new Number()) === \"0\" &&\n                stringify(new String()) == '\"\"' &&\n                // FF 3.1b1, 2 throw an error if the value is `null`, `undefined`, or\n                // does not define a canonical JSON representation (this applies to\n                // objects with `toJSON` properties as well, *unless* they are nested\n                // within an object or array).\n                stringify(getClass) === undef &&\n                // IE 8 serializes `undefined` as `\"undefined\"`. Safari <= 5.1.7 and\n                // FF 3.1b3 pass this test.\n                stringify(undef) === undef &&\n                // Safari <= 5.1.7 and FF 3.1b3 throw `Error`s and `TypeError`s,\n                // respectively, if the value is omitted entirely.\n                stringify() === undef &&\n                // FF 3.1b1, 2 throw an error if the given value is not a number,\n                // string, array, object, Boolean, or `null` literal. This applies to\n                // objects with custom `toJSON` methods as well, unless they are nested\n                // inside object or array literals. YUI 3.0.0b1 ignores custom `toJSON`\n                // methods entirely.\n                stringify(value) === \"1\" &&\n                stringify([value]) == \"[1]\" &&\n                // Prototype <= 1.6.1 serializes `[undefined]` as `\"[]\"` instead of\n                // `\"[null]\"`.\n                stringify([undef]) == \"[null]\" &&\n                // YUI 3.0.0b1 fails to serialize `null` literals.\n                stringify(null) == \"null\" &&\n                // FF 3.1b1, 2 halts serialization if an array contains a function:\n                // `[1, true, getClass, 1]` serializes as \"[1,true,],\". FF 3.1b3\n                // elides non-JSON values from objects and arrays, unless they\n                // define custom `toJSON` methods.\n                stringify([undef, getClass, null]) == \"[null,null,null]\" &&\n                // Simple serialization test. FF 3.1b1 uses Unicode escape sequences\n                // where character escape codes are expected (e.g., `\\b` => `\\u0008`).\n                stringify({ \"a\": [value, true, false, null, \"\\x00\\b\\n\\f\\r\\t\"] }) == serialized &&\n                // FF 3.1b1 and b2 ignore the `filter` and `width` arguments.\n                stringify(null, value) === \"1\" &&\n                stringify([1, 2], null, 1) == \"[\\n 1,\\n 2\\n]\" &&\n                // JSON 2, Prototype <= 1.7, and older WebKit builds incorrectly\n                // serialize extended years.\n                stringify(new Date(-8.64e15)) == '\"-271821-04-20T00:00:00.000Z\"' &&\n                // The milliseconds are optional in ES 5, but required in 5.1.\n                stringify(new Date(8.64e15)) == '\"+275760-09-13T00:00:00.000Z\"' &&\n                // Firefox <= 11.0 incorrectly serializes years prior to 0 as negative\n                // four-digit years instead of six-digit years. Credits: @Yaffle.\n                stringify(new Date(-621987552e5)) == '\"-000001-01-01T00:00:00.000Z\"' &&\n                // Safari <= 5.1.5 and Opera >= 10.53 incorrectly serialize millisecond\n                // values less than 1000. Credits: @Yaffle.\n                stringify(new Date(-1)) == '\"1969-12-31T23:59:59.999Z\"';\n            } catch (exception) {\n              stringifySupported = false;\n            }\n          }\n          isSupported = stringifySupported;\n        }\n        // Test `JSON.parse`.\n        if (name == \"json-parse\") {\n          var parse = exports.parse;\n          if (typeof parse == \"function\") {\n            try {\n              // FF 3.1b1, b2 will throw an exception if a bare literal is provided.\n              // Conforming implementations should also coerce the initial argument to\n              // a string prior to parsing.\n              if (parse(\"0\") === 0 && !parse(false)) {\n                // Simple parsing test.\n                value = parse(serialized);\n                var parseSupported = value[\"a\"].length == 5 && value[\"a\"][0] === 1;\n                if (parseSupported) {\n                  try {\n                    // Safari <= 5.1.2 and FF 3.1b1 allow unescaped tabs in strings.\n                    parseSupported = !parse('\"\\t\"');\n                  } catch (exception) {}\n                  if (parseSupported) {\n                    try {\n                      // FF 4.0 and 4.0.1 allow leading `+` signs and leading\n                      // decimal points. FF 4.0, 4.0.1, and IE 9-10 also allow\n                      // certain octal literals.\n                      parseSupported = parse(\"01\") !== 1;\n                    } catch (exception) {}\n                  }\n                  if (parseSupported) {\n                    try {\n                      // FF 4.0, 4.0.1, and Rhino 1.7R3-R4 allow trailing decimal\n                      // points. These environments, along with FF 3.1b1 and 2,\n                      // also allow trailing commas in JSON objects and arrays.\n                      parseSupported = parse(\"1.\") !== 1;\n                    } catch (exception) {}\n                  }\n                }\n              }\n            } catch (exception) {\n              parseSupported = false;\n            }\n          }\n          isSupported = parseSupported;\n        }\n      }\n      return has[name] = !!isSupported;\n    }\n\n    if (!has(\"json\")) {\n      // Common `[[Class]]` name aliases.\n      var functionClass = \"[object Function]\",\n          dateClass = \"[object Date]\",\n          numberClass = \"[object Number]\",\n          stringClass = \"[object String]\",\n          arrayClass = \"[object Array]\",\n          booleanClass = \"[object Boolean]\";\n\n      // Detect incomplete support for accessing string characters by index.\n      var charIndexBuggy = has(\"bug-string-char-index\");\n\n      // Define additional utility methods if the `Date` methods are buggy.\n      if (!isExtended) {\n        var floor = Math.floor;\n        // A mapping between the months of the year and the number of days between\n        // January 1st and the first of the respective month.\n        var Months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334];\n        // Internal: Calculates the number of days between the Unix epoch and the\n        // first day of the given month.\n        var getDay = function (year, month) {\n          return Months[month] + 365 * (year - 1970) + floor((year - 1969 + (month = +(month > 1))) / 4) - floor((year - 1901 + month) / 100) + floor((year - 1601 + month) / 400);\n        };\n      }\n\n      // Internal: Determines if a property is a direct property of the given\n      // object. Delegates to the native `Object#hasOwnProperty` method.\n      if (!(isProperty = objectProto.hasOwnProperty)) {\n        isProperty = function (property) {\n          var members = {}, constructor;\n          if ((members.__proto__ = null, members.__proto__ = {\n            // The *proto* property cannot be set multiple times in recent\n            // versions of Firefox and SeaMonkey.\n            \"toString\": 1\n          }, members).toString != getClass) {\n            // Safari <= 2.0.3 doesn't implement `Object#hasOwnProperty`, but\n            // supports the mutable *proto* property.\n            isProperty = function (property) {\n              // Capture and break the object's prototype chain (see section 8.6.2\n              // of the ES 5.1 spec). The parenthesized expression prevents an\n              // unsafe transformation by the Closure Compiler.\n              var original = this.__proto__, result = property in (this.__proto__ = null, this);\n              // Restore the original prototype chain.\n              this.__proto__ = original;\n              return result;\n            };\n          } else {\n            // Capture a reference to the top-level `Object` constructor.\n            constructor = members.constructor;\n            // Use the `constructor` property to simulate `Object#hasOwnProperty` in\n            // other environments.\n            isProperty = function (property) {\n              var parent = (this.constructor || constructor).prototype;\n              return property in this && !(property in parent && this[property] === parent[property]);\n            };\n          }\n          members = null;\n          return isProperty.call(this, property);\n        };\n      }\n\n      // Internal: Normalizes the `for...in` iteration algorithm across\n      // environments. Each enumerated key is yielded to a `callback` function.\n      forEach = function (object, callback) {\n        var size = 0, Properties, members, property;\n\n        // Tests for bugs in the current environment's `for...in` algorithm. The\n        // `valueOf` property inherits the non-enumerable flag from\n        // `Object.prototype` in older versions of IE, Netscape, and Mozilla.\n        (Properties = function () {\n          this.valueOf = 0;\n        }).prototype.valueOf = 0;\n\n        // Iterate over a new instance of the `Properties` class.\n        members = new Properties();\n        for (property in members) {\n          // Ignore all properties inherited from `Object.prototype`.\n          if (isProperty.call(members, property)) {\n            size++;\n          }\n        }\n        Properties = members = null;\n\n        // Normalize the iteration algorithm.\n        if (!size) {\n          // A list of non-enumerable properties inherited from `Object.prototype`.\n          members = [\"valueOf\", \"toString\", \"toLocaleString\", \"propertyIsEnumerable\", \"isPrototypeOf\", \"hasOwnProperty\", \"constructor\"];\n          // IE <= 8, Mozilla 1.0, and Netscape 6.2 ignore shadowed non-enumerable\n          // properties.\n          forEach = function (object, callback) {\n            var isFunction = getClass.call(object) == functionClass, property, length;\n            var hasProperty = !isFunction && typeof object.constructor != \"function\" && objectTypes[typeof object.hasOwnProperty] && object.hasOwnProperty || isProperty;\n            for (property in object) {\n              // Gecko <= 1.0 enumerates the `prototype` property of functions under\n              // certain conditions; IE does not.\n              if (!(isFunction && property == \"prototype\") && hasProperty.call(object, property)) {\n                callback(property);\n              }\n            }\n            // Manually invoke the callback for each non-enumerable property.\n            for (length = members.length; property = members[--length]; hasProperty.call(object, property) && callback(property));\n          };\n        } else if (size == 2) {\n          // Safari <= 2.0.4 enumerates shadowed properties twice.\n          forEach = function (object, callback) {\n            // Create a set of iterated properties.\n            var members = {}, isFunction = getClass.call(object) == functionClass, property;\n            for (property in object) {\n              // Store each property name to prevent double enumeration. The\n              // `prototype` property of functions is not enumerated due to cross-\n              // environment inconsistencies.\n              if (!(isFunction && property == \"prototype\") && !isProperty.call(members, property) && (members[property] = 1) && isProperty.call(object, property)) {\n                callback(property);\n              }\n            }\n          };\n        } else {\n          // No bugs detected; use the standard `for...in` algorithm.\n          forEach = function (object, callback) {\n            var isFunction = getClass.call(object) == functionClass, property, isConstructor;\n            for (property in object) {\n              if (!(isFunction && property == \"prototype\") && isProperty.call(object, property) && !(isConstructor = property === \"constructor\")) {\n                callback(property);\n              }\n            }\n            // Manually invoke the callback for the `constructor` property due to\n            // cross-environment inconsistencies.\n            if (isConstructor || isProperty.call(object, (property = \"constructor\"))) {\n              callback(property);\n            }\n          };\n        }\n        return forEach(object, callback);\n      };\n\n      // Public: Serializes a JavaScript `value` as a JSON string. The optional\n      // `filter` argument may specify either a function that alters how object and\n      // array members are serialized, or an array of strings and numbers that\n      // indicates which properties should be serialized. The optional `width`\n      // argument may be either a string or number that specifies the indentation\n      // level of the output.\n      if (!has(\"json-stringify\")) {\n        // Internal: A map of control characters and their escaped equivalents.\n        var Escapes = {\n          92: \"\\\\\\\\\",\n          34: '\\\\\"',\n          8: \"\\\\b\",\n          12: \"\\\\f\",\n          10: \"\\\\n\",\n          13: \"\\\\r\",\n          9: \"\\\\t\"\n        };\n\n        // Internal: Converts `value` into a zero-padded string such that its\n        // length is at least equal to `width`. The `width` must be <= 6.\n        var leadingZeroes = \"000000\";\n        var toPaddedString = function (width, value) {\n          // The `|| 0` expression is necessary to work around a bug in\n          // Opera <= 7.54u2 where `0 == -0`, but `String(-0) !== \"0\"`.\n          return (leadingZeroes + (value || 0)).slice(-width);\n        };\n\n        // Internal: Double-quotes a string `value`, replacing all ASCII control\n        // characters (characters with code unit values between 0 and 31) with\n        // their escaped equivalents. This is an implementation of the\n        // `Quote(value)` operation defined in ES 5.1 section 15.12.3.\n        var unicodePrefix = \"\\\\u00\";\n        var quote = function (value) {\n          var result = '\"', index = 0, length = value.length, useCharIndex = !charIndexBuggy || length > 10;\n          var symbols = useCharIndex && (charIndexBuggy ? value.split(\"\") : value);\n          for (; index < length; index++) {\n            var charCode = value.charCodeAt(index);\n            // If the character is a control character, append its Unicode or\n            // shorthand escape sequence; otherwise, append the character as-is.\n            switch (charCode) {\n              case 8: case 9: case 10: case 12: case 13: case 34: case 92:\n                result += Escapes[charCode];\n                break;\n              default:\n                if (charCode < 32) {\n                  result += unicodePrefix + toPaddedString(2, charCode.toString(16));\n                  break;\n                }\n                result += useCharIndex ? symbols[index] : value.charAt(index);\n            }\n          }\n          return result + '\"';\n        };\n\n        // Internal: Recursively serializes an object. Implements the\n        // `Str(key, holder)`, `JO(value)`, and `JA(value)` operations.\n        var serialize = function (property, object, callback, properties, whitespace, indentation, stack) {\n          var value, className, year, month, date, time, hours, minutes, seconds, milliseconds, results, element, index, length, prefix, result;\n          try {\n            // Necessary for host object support.\n            value = object[property];\n          } catch (exception) {}\n          if (typeof value == \"object\" && value) {\n            className = getClass.call(value);\n            if (className == dateClass && !isProperty.call(value, \"toJSON\")) {\n              if (value > -1 / 0 && value < 1 / 0) {\n                // Dates are serialized according to the `Date#toJSON` method\n                // specified in ES 5.1 section 15.9.5.44. See section 15.9.1.15\n                // for the ISO 8601 date time string format.\n                if (getDay) {\n                  // Manually compute the year, month, date, hours, minutes,\n                  // seconds, and milliseconds if the `getUTC*` methods are\n                  // buggy. Adapted from @Yaffle's `date-shim` project.\n                  date = floor(value / 864e5);\n                  for (year = floor(date / 365.2425) + 1970 - 1; getDay(year + 1, 0) <= date; year++);\n                  for (month = floor((date - getDay(year, 0)) / 30.42); getDay(year, month + 1) <= date; month++);\n                  date = 1 + date - getDay(year, month);\n                  // The `time` value specifies the time within the day (see ES\n                  // 5.1 section 15.9.1.2). The formula `(A % B + B) % B` is used\n                  // to compute `A modulo B`, as the `%` operator does not\n                  // correspond to the `modulo` operation for negative numbers.\n                  time = (value % 864e5 + 864e5) % 864e5;\n                  // The hours, minutes, seconds, and milliseconds are obtained by\n                  // decomposing the time within the day. See section 15.9.1.10.\n                  hours = floor(time / 36e5) % 24;\n                  minutes = floor(time / 6e4) % 60;\n                  seconds = floor(time / 1e3) % 60;\n                  milliseconds = time % 1e3;\n                } else {\n                  year = value.getUTCFullYear();\n                  month = value.getUTCMonth();\n                  date = value.getUTCDate();\n                  hours = value.getUTCHours();\n                  minutes = value.getUTCMinutes();\n                  seconds = value.getUTCSeconds();\n                  milliseconds = value.getUTCMilliseconds();\n                }\n                // Serialize extended years correctly.\n                value = (year <= 0 || year >= 1e4 ? (year < 0 ? \"-\" : \"+\") + toPaddedString(6, year < 0 ? -year : year) : toPaddedString(4, year)) +\n                  \"-\" + toPaddedString(2, month + 1) + \"-\" + toPaddedString(2, date) +\n                  // Months, dates, hours, minutes, and seconds should have two\n                  // digits; milliseconds should have three.\n                  \"T\" + toPaddedString(2, hours) + \":\" + toPaddedString(2, minutes) + \":\" + toPaddedString(2, seconds) +\n                  // Milliseconds are optional in ES 5.0, but required in 5.1.\n                  \".\" + toPaddedString(3, milliseconds) + \"Z\";\n              } else {\n                value = null;\n              }\n            } else if (typeof value.toJSON == \"function\" && ((className != numberClass && className != stringClass && className != arrayClass) || isProperty.call(value, \"toJSON\"))) {\n              // Prototype <= 1.6.1 adds non-standard `toJSON` methods to the\n              // `Number`, `String`, `Date`, and `Array` prototypes. JSON 3\n              // ignores all `toJSON` methods on these objects unless they are\n              // defined directly on an instance.\n              value = value.toJSON(property);\n            }\n          }\n          if (callback) {\n            // If a replacement function was provided, call it to obtain the value\n            // for serialization.\n            value = callback.call(object, property, value);\n          }\n          if (value === null) {\n            return \"null\";\n          }\n          className = getClass.call(value);\n          if (className == booleanClass) {\n            // Booleans are represented literally.\n            return \"\" + value;\n          } else if (className == numberClass) {\n            // JSON numbers must be finite. `Infinity` and `NaN` are serialized as\n            // `\"null\"`.\n            return value > -1 / 0 && value < 1 / 0 ? \"\" + value : \"null\";\n          } else if (className == stringClass) {\n            // Strings are double-quoted and escaped.\n            return quote(\"\" + value);\n          }\n          // Recursively serialize objects and arrays.\n          if (typeof value == \"object\") {\n            // Check for cyclic structures. This is a linear search; performance\n            // is inversely proportional to the number of unique nested objects.\n            for (length = stack.length; length--;) {\n              if (stack[length] === value) {\n                // Cyclic structures cannot be serialized by `JSON.stringify`.\n                throw TypeError();\n              }\n            }\n            // Add the object to the stack of traversed objects.\n            stack.push(value);\n            results = [];\n            // Save the current indentation level and indent one additional level.\n            prefix = indentation;\n            indentation += whitespace;\n            if (className == arrayClass) {\n              // Recursively serialize array elements.\n              for (index = 0, length = value.length; index < length; index++) {\n                element = serialize(index, value, callback, properties, whitespace, indentation, stack);\n                results.push(element === undef ? \"null\" : element);\n              }\n              result = results.length ? (whitespace ? \"[\\n\" + indentation + results.join(\",\\n\" + indentation) + \"\\n\" + prefix + \"]\" : (\"[\" + results.join(\",\") + \"]\")) : \"[]\";\n            } else {\n              // Recursively serialize object members. Members are selected from\n              // either a user-specified list of property names, or the object\n              // itself.\n              forEach(properties || value, function (property) {\n                var element = serialize(property, value, callback, properties, whitespace, indentation, stack);\n                if (element !== undef) {\n                  // According to ES 5.1 section 15.12.3: \"If `gap` {whitespace}\n                  // is not the empty string, let `member` {quote(property) + \":\"}\n                  // be the concatenation of `member` and the `space` character.\"\n                  // The \"`space` character\" refers to the literal space\n                  // character, not the `space` {width} argument provided to\n                  // `JSON.stringify`.\n                  results.push(quote(property) + \":\" + (whitespace ? \" \" : \"\") + element);\n                }\n              });\n              result = results.length ? (whitespace ? \"{\\n\" + indentation + results.join(\",\\n\" + indentation) + \"\\n\" + prefix + \"}\" : (\"{\" + results.join(\",\") + \"}\")) : \"{}\";\n            }\n            // Remove the object from the traversed object stack.\n            stack.pop();\n            return result;\n          }\n        };\n\n        // Public: `JSON.stringify`. See ES 5.1 section 15.12.3.\n        exports.stringify = function (source, filter, width) {\n          var whitespace, callback, properties, className;\n          if (objectTypes[typeof filter] && filter) {\n            if ((className = getClass.call(filter)) == functionClass) {\n              callback = filter;\n            } else if (className == arrayClass) {\n              // Convert the property names array into a makeshift set.\n              properties = {};\n              for (var index = 0, length = filter.length, value; index < length; value = filter[index++], ((className = getClass.call(value)), className == stringClass || className == numberClass) && (properties[value] = 1));\n            }\n          }\n          if (width) {\n            if ((className = getClass.call(width)) == numberClass) {\n              // Convert the `width` to an integer and create a string containing\n              // `width` number of space characters.\n              if ((width -= width % 1) > 0) {\n                for (whitespace = \"\", width > 10 && (width = 10); whitespace.length < width; whitespace += \" \");\n              }\n            } else if (className == stringClass) {\n              whitespace = width.length <= 10 ? width : width.slice(0, 10);\n            }\n          }\n          // Opera <= 7.54u2 discards the values associated with empty string keys\n          // (`\"\"`) only if they are used directly within an object member list\n          // (e.g., `!(\"\" in { \"\": 1})`).\n          return serialize(\"\", (value = {}, value[\"\"] = source, value), callback, properties, whitespace, \"\", []);\n        };\n      }\n\n      // Public: Parses a JSON source string.\n      if (!has(\"json-parse\")) {\n        var fromCharCode = String.fromCharCode;\n\n        // Internal: A map of escaped control characters and their unescaped\n        // equivalents.\n        var Unescapes = {\n          92: \"\\\\\",\n          34: '\"',\n          47: \"/\",\n          98: \"\\b\",\n          116: \"\\t\",\n          110: \"\\n\",\n          102: \"\\f\",\n          114: \"\\r\"\n        };\n\n        // Internal: Stores the parser state.\n        var Index, Source;\n\n        // Internal: Resets the parser state and throws a `SyntaxError`.\n        var abort = function () {\n          Index = Source = null;\n          throw SyntaxError();\n        };\n\n        // Internal: Returns the next token, or `\"$\"` if the parser has reached\n        // the end of the source string. A token may be a string, number, `null`\n        // literal, or Boolean literal.\n        var lex = function () {\n          var source = Source, length = source.length, value, begin, position, isSigned, charCode;\n          while (Index < length) {\n            charCode = source.charCodeAt(Index);\n            switch (charCode) {\n              case 9: case 10: case 13: case 32:\n                // Skip whitespace tokens, including tabs, carriage returns, line\n                // feeds, and space characters.\n                Index++;\n                break;\n              case 123: case 125: case 91: case 93: case 58: case 44:\n                // Parse a punctuator token (`{`, `}`, `[`, `]`, `:`, or `,`) at\n                // the current position.\n                value = charIndexBuggy ? source.charAt(Index) : source[Index];\n                Index++;\n                return value;\n              case 34:\n                // `\"` delimits a JSON string; advance to the next character and\n                // begin parsing the string. String tokens are prefixed with the\n                // sentinel `@` character to distinguish them from punctuators and\n                // end-of-string tokens.\n                for (value = \"@\", Index++; Index < length;) {\n                  charCode = source.charCodeAt(Index);\n                  if (charCode < 32) {\n                    // Unescaped ASCII control characters (those with a code unit\n                    // less than the space character) are not permitted.\n                    abort();\n                  } else if (charCode == 92) {\n                    // A reverse solidus (`\\`) marks the beginning of an escaped\n                    // control character (including `\"`, `\\`, and `/`) or Unicode\n                    // escape sequence.\n                    charCode = source.charCodeAt(++Index);\n                    switch (charCode) {\n                      case 92: case 34: case 47: case 98: case 116: case 110: case 102: case 114:\n                        // Revive escaped control characters.\n                        value += Unescapes[charCode];\n                        Index++;\n                        break;\n                      case 117:\n                        // `\\u` marks the beginning of a Unicode escape sequence.\n                        // Advance to the first character and validate the\n                        // four-digit code point.\n                        begin = ++Index;\n                        for (position = Index + 4; Index < position; Index++) {\n                          charCode = source.charCodeAt(Index);\n                          // A valid sequence comprises four hexdigits (case-\n                          // insensitive) that form a single hexadecimal value.\n                          if (!(charCode >= 48 && charCode <= 57 || charCode >= 97 && charCode <= 102 || charCode >= 65 && charCode <= 70)) {\n                            // Invalid Unicode escape sequence.\n                            abort();\n                          }\n                        }\n                        // Revive the escaped character.\n                        value += fromCharCode(\"0x\" + source.slice(begin, Index));\n                        break;\n                      default:\n                        // Invalid escape sequence.\n                        abort();\n                    }\n                  } else {\n                    if (charCode == 34) {\n                      // An unescaped double-quote character marks the end of the\n                      // string.\n                      break;\n                    }\n                    charCode = source.charCodeAt(Index);\n                    begin = Index;\n                    // Optimize for the common case where a string is valid.\n                    while (charCode >= 32 && charCode != 92 && charCode != 34) {\n                      charCode = source.charCodeAt(++Index);\n                    }\n                    // Append the string as-is.\n                    value += source.slice(begin, Index);\n                  }\n                }\n                if (source.charCodeAt(Index) == 34) {\n                  // Advance to the next character and return the revived string.\n                  Index++;\n                  return value;\n                }\n                // Unterminated string.\n                abort();\n              default:\n                // Parse numbers and literals.\n                begin = Index;\n                // Advance past the negative sign, if one is specified.\n                if (charCode == 45) {\n                  isSigned = true;\n                  charCode = source.charCodeAt(++Index);\n                }\n                // Parse an integer or floating-point value.\n                if (charCode >= 48 && charCode <= 57) {\n                  // Leading zeroes are interpreted as octal literals.\n                  if (charCode == 48 && ((charCode = source.charCodeAt(Index + 1)), charCode >= 48 && charCode <= 57)) {\n                    // Illegal octal literal.\n                    abort();\n                  }\n                  isSigned = false;\n                  // Parse the integer component.\n                  for (; Index < length && ((charCode = source.charCodeAt(Index)), charCode >= 48 && charCode <= 57); Index++);\n                  // Floats cannot contain a leading decimal point; however, this\n                  // case is already accounted for by the parser.\n                  if (source.charCodeAt(Index) == 46) {\n                    position = ++Index;\n                    // Parse the decimal component.\n                    for (; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);\n                    if (position == Index) {\n                      // Illegal trailing decimal.\n                      abort();\n                    }\n                    Index = position;\n                  }\n                  // Parse exponents. The `e` denoting the exponent is\n                  // case-insensitive.\n                  charCode = source.charCodeAt(Index);\n                  if (charCode == 101 || charCode == 69) {\n                    charCode = source.charCodeAt(++Index);\n                    // Skip past the sign following the exponent, if one is\n                    // specified.\n                    if (charCode == 43 || charCode == 45) {\n                      Index++;\n                    }\n                    // Parse the exponential component.\n                    for (position = Index; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);\n                    if (position == Index) {\n                      // Illegal empty exponent.\n                      abort();\n                    }\n                    Index = position;\n                  }\n                  // Coerce the parsed value to a JavaScript number.\n                  return +source.slice(begin, Index);\n                }\n                // A negative sign may only precede numbers.\n                if (isSigned) {\n                  abort();\n                }\n                // `true`, `false`, and `null` literals.\n                if (source.slice(Index, Index + 4) == \"true\") {\n                  Index += 4;\n                  return true;\n                } else if (source.slice(Index, Index + 5) == \"false\") {\n                  Index += 5;\n                  return false;\n                } else if (source.slice(Index, Index + 4) == \"null\") {\n                  Index += 4;\n                  return null;\n                }\n                // Unrecognized token.\n                abort();\n            }\n          }\n          // Return the sentinel `$` character if the parser has reached the end\n          // of the source string.\n          return \"$\";\n        };\n\n        // Internal: Parses a JSON `value` token.\n        var get = function (value) {\n          var results, hasMembers;\n          if (value == \"$\") {\n            // Unexpected end of input.\n            abort();\n          }\n          if (typeof value == \"string\") {\n            if ((charIndexBuggy ? value.charAt(0) : value[0]) == \"@\") {\n              // Remove the sentinel `@` character.\n              return value.slice(1);\n            }\n            // Parse object and array literals.\n            if (value == \"[\") {\n              // Parses a JSON array, returning a new JavaScript array.\n              results = [];\n              for (;; hasMembers || (hasMembers = true)) {\n                value = lex();\n                // A closing square bracket marks the end of the array literal.\n                if (value == \"]\") {\n                  break;\n                }\n                // If the array literal contains elements, the current token\n                // should be a comma separating the previous element from the\n                // next.\n                if (hasMembers) {\n                  if (value == \",\") {\n                    value = lex();\n                    if (value == \"]\") {\n                      // Unexpected trailing `,` in array literal.\n                      abort();\n                    }\n                  } else {\n                    // A `,` must separate each array element.\n                    abort();\n                  }\n                }\n                // Elisions and leading commas are not permitted.\n                if (value == \",\") {\n                  abort();\n                }\n                results.push(get(value));\n              }\n              return results;\n            } else if (value == \"{\") {\n              // Parses a JSON object, returning a new JavaScript object.\n              results = {};\n              for (;; hasMembers || (hasMembers = true)) {\n                value = lex();\n                // A closing curly brace marks the end of the object literal.\n                if (value == \"}\") {\n                  break;\n                }\n                // If the object literal contains members, the current token\n                // should be a comma separator.\n                if (hasMembers) {\n                  if (value == \",\") {\n                    value = lex();\n                    if (value == \"}\") {\n                      // Unexpected trailing `,` in object literal.\n                      abort();\n                    }\n                  } else {\n                    // A `,` must separate each object member.\n                    abort();\n                  }\n                }\n                // Leading commas are not permitted, object property names must be\n                // double-quoted strings, and a `:` must separate each property\n                // name and value.\n                if (value == \",\" || typeof value != \"string\" || (charIndexBuggy ? value.charAt(0) : value[0]) != \"@\" || lex() != \":\") {\n                  abort();\n                }\n                results[value.slice(1)] = get(lex());\n              }\n              return results;\n            }\n            // Unexpected token encountered.\n            abort();\n          }\n          return value;\n        };\n\n        // Internal: Updates a traversed object member.\n        var update = function (source, property, callback) {\n          var element = walk(source, property, callback);\n          if (element === undef) {\n            delete source[property];\n          } else {\n            source[property] = element;\n          }\n        };\n\n        // Internal: Recursively traverses a parsed JSON object, invoking the\n        // `callback` function for each value. This is an implementation of the\n        // `Walk(holder, name)` operation defined in ES 5.1 section 15.12.2.\n        var walk = function (source, property, callback) {\n          var value = source[property], length;\n          if (typeof value == \"object\" && value) {\n            // `forEach` can't be used to traverse an array in Opera <= 8.54\n            // because its `Object#hasOwnProperty` implementation returns `false`\n            // for array indices (e.g., `![1, 2, 3].hasOwnProperty(\"0\")`).\n            if (getClass.call(value) == arrayClass) {\n              for (length = value.length; length--;) {\n                update(value, length, callback);\n              }\n            } else {\n              forEach(value, function (property) {\n                update(value, property, callback);\n              });\n            }\n          }\n          return callback.call(source, property, value);\n        };\n\n        // Public: `JSON.parse`. See ES 5.1 section 15.12.2.\n        exports.parse = function (source, callback) {\n          var result, value;\n          Index = 0;\n          Source = \"\" + source;\n          result = get(lex());\n          // If a JSON string contains multiple tokens, it is invalid.\n          if (lex() != \"$\") {\n            abort();\n          }\n          // Reset the parser state.\n          Index = Source = null;\n          return callback && getClass.call(callback) == functionClass ? walk((value = {}, value[\"\"] = result, value), \"\", callback) : result;\n        };\n      }\n    }\n\n    exports[\"runInContext\"] = runInContext;\n    return exports;\n  }\n\n  if (freeExports && !isLoader) {\n    // Export for CommonJS environments.\n    runInContext(root, freeExports);\n  } else {\n    // Export for web browsers and JavaScript engines.\n    var nativeJSON = root.JSON,\n        previousJSON = root[\"JSON3\"],\n        isRestored = false;\n\n    var JSON3 = runInContext(root, (root[\"JSON3\"] = {\n      // Public: Restores the original value of the global `JSON` object and\n      // returns a reference to the `JSON3` object.\n      \"noConflict\": function () {\n        if (!isRestored) {\n          isRestored = true;\n          root.JSON = nativeJSON;\n          root[\"JSON3\"] = previousJSON;\n          nativeJSON = previousJSON = null;\n        }\n        return JSON3;\n      }\n    }));\n\n    root.JSON = {\n      \"parse\": JSON3.parse,\n      \"stringify\": JSON3.stringify\n    };\n  }\n\n  // Export for asynchronous module loaders.\n  if (isLoader) {\n    define(function () {\n      return JSON3;\n    });\n  }\n}).call(this);\n"]}","'use strict';\n\nvar required = require('requires-port')\n  , lolcation = require('./lolcation')\n  , qs = require('querystringify')\n  , relativere = /^\\/(?!\\/)/\n  , protocolre = /^([a-z0-9.+-]+:)?(\\/\\/)?(.*)$/i; // actual protocol is first match\n\n/**\n * These are the parse instructions for the URL parsers, it informs the parser\n * about:\n *\n * 0. The char it Needs to parse, if it's a string it should be done using\n *    indexOf, RegExp using exec and NaN means set as current value.\n * 1. The property we should set when parsing this value.\n * 2. Indication if it's backwards or forward parsing, when set as number it's\n *    the value of extra chars that should be split off.\n * 3. Inherit from location if non existing in the parser.\n * 4. `toLowerCase` the resulting value.\n */\nvar instructions = [\n  ['#', 'hash'],                        // Extract from the back.\n  ['?', 'query'],                       // Extract from the back.\n  ['/', 'pathname'],                    // Extract from the back.\n  ['@', 'auth', 1],                     // Extract from the front.\n  [NaN, 'host', undefined, 1, 1],       // Set left over value.\n  [/\\:(\\d+)$/, 'port'],                 // RegExp the back.\n  [NaN, 'hostname', undefined, 1, 1]    // Set left over.\n];\n\n /**\n * @typedef ProtocolExtract\n * @type Object\n * @property {String} protocol Protocol matched in the URL, in lowercase\n * @property {Boolean} slashes Indicates whether the protocol is followed by double slash (\"//\")\n * @property {String} rest     Rest of the URL that is not part of the protocol\n */\n\n /**\n  * Extract protocol information from a URL with/without double slash (\"//\")\n  *\n  * @param  {String} address   URL we want to extract from.\n  * @return {ProtocolExtract}  Extracted information\n  * @private\n  */\nfunction extractProtocol(address) {\n  var match = protocolre.exec(address);\n  return {\n    protocol: match[1] ? match[1].toLowerCase() : '',\n    slashes: !!match[2],\n    rest: match[3] ? match[3] : ''\n  };\n}\n\n/**\n * The actual URL instance. Instead of returning an object we've opted-in to\n * create an actual constructor as it's much more memory efficient and\n * faster and it pleases my CDO.\n *\n * @constructor\n * @param {String} address URL we want to parse.\n * @param {Object|String} location Location defaults for relative paths.\n * @param {Boolean|Function} parser Parser for the query string.\n * @api public\n */\nfunction URL(address, location, parser) {\n  if (!(this instanceof URL)) {\n    return new URL(address, location, parser);\n  }\n\n  var relative = relativere.test(address)\n    , parse, instruction, index, key\n    , type = typeof location\n    , url = this\n    , i = 0;\n\n  //\n  // The following if statements allows this module two have compatibility with\n  // 2 different API:\n  //\n  // 1. Node.js's `url.parse` api which accepts a URL, boolean as arguments\n  //    where the boolean indicates that the query string should also be parsed.\n  //\n  // 2. The `URL` interface of the browser which accepts a URL, object as\n  //    arguments. The supplied object will be used as default values / fall-back\n  //    for relative paths.\n  //\n  if ('object' !== type && 'string' !== type) {\n    parser = location;\n    location = null;\n  }\n\n  if (parser && 'function' !== typeof parser) {\n    parser = qs.parse;\n  }\n\n  location = lolcation(location);\n\n  // extract protocol information before running the instructions\n  var extracted = extractProtocol(address);\n  url.protocol = extracted.protocol || location.protocol || '';\n  url.slashes = extracted.slashes || location.slashes;\n  address = extracted.rest;\n\n  for (; i < instructions.length; i++) {\n    instruction = instructions[i];\n    parse = instruction[0];\n    key = instruction[1];\n\n    if (parse !== parse) {\n      url[key] = address;\n    } else if ('string' === typeof parse) {\n      if (~(index = address.indexOf(parse))) {\n        if ('number' === typeof instruction[2]) {\n          url[key] = address.slice(0, index);\n          address = address.slice(index + instruction[2]);\n        } else {\n          url[key] = address.slice(index);\n          address = address.slice(0, index);\n        }\n      }\n    } else if (index = parse.exec(address)) {\n      url[key] = index[1];\n      address = address.slice(0, address.length - index[0].length);\n    }\n\n    url[key] = url[key] || (instruction[3] || ('port' === key && relative) ? location[key] || '' : '');\n\n    //\n    // Hostname, host and protocol should be lowercased so they can be used to\n    // create a proper `origin`.\n    //\n    if (instruction[4]) {\n      url[key] = url[key].toLowerCase();\n    }\n  }\n\n  //\n  // Also parse the supplied query string in to an object. If we're supplied\n  // with a custom parser as function use that instead of the default build-in\n  // parser.\n  //\n  if (parser) url.query = parser(url.query);\n\n  //\n  // We should not add port numbers if they are already the default port number\n  // for a given protocol. As the host also contains the port number we're going\n  // override it with the hostname which contains no port number.\n  //\n  if (!required(url.port, url.protocol)) {\n    url.host = url.hostname;\n    url.port = '';\n  }\n\n  //\n  // Parse down the `auth` for the username and password.\n  //\n  url.username = url.password = '';\n  if (url.auth) {\n    instruction = url.auth.split(':');\n    url.username = instruction[0] || '';\n    url.password = instruction[1] || '';\n  }\n\n  //\n  // The href is just the compiled result.\n  //\n  url.href = url.toString();\n}\n\n/**\n * This is convenience method for changing properties in the URL instance to\n * insure that they all propagate correctly.\n *\n * @param {String} prop          Property we need to adjust.\n * @param {Mixed} value          The newly assigned value.\n * @param {Boolean|Function} fn  When setting the query, it will be the function used to parse\n *                               the query.\n *                               When setting the protocol, double slash will be removed from\n *                               the final url if it is true.\n * @returns {URL}\n * @api public\n */\nURL.prototype.set = function set(part, value, fn) {\n  var url = this;\n\n  if ('query' === part) {\n    if ('string' === typeof value && value.length) {\n      value = (fn || qs.parse)(value);\n    }\n\n    url[part] = value;\n  } else if ('port' === part) {\n    url[part] = value;\n\n    if (!required(value, url.protocol)) {\n      url.host = url.hostname;\n      url[part] = '';\n    } else if (value) {\n      url.host = url.hostname +':'+ value;\n    }\n  } else if ('hostname' === part) {\n    url[part] = value;\n\n    if (url.port) value += ':'+ url.port;\n    url.host = value;\n  } else if ('host' === part) {\n    url[part] = value;\n\n    if (/\\:\\d+/.test(value)) {\n      value = value.split(':');\n      url.hostname = value[0];\n      url.port = value[1];\n    }\n  } else if ('protocol' === part) {\n    url.protocol = value;\n    url.slashes = !fn;\n  } else {\n    url[part] = value;\n  }\n\n  url.href = url.toString();\n  return url;\n};\n\n/**\n * Transform the properties back in to a valid and full URL string.\n *\n * @param {Function} stringify Optional query stringify function.\n * @returns {String}\n * @api public\n */\nURL.prototype.toString = function toString(stringify) {\n  if (!stringify || 'function' !== typeof stringify) stringify = qs.stringify;\n\n  var query\n    , url = this\n    , protocol = url.protocol;\n\n  if (protocol && protocol.charAt(protocol.length - 1) !== ':') protocol += ':';\n\n  var result = protocol + (url.slashes ? '//' : '');\n\n  if (url.username) {\n    result += url.username;\n    if (url.password) result += ':'+ url.password;\n    result += '@';\n  }\n\n  result += url.hostname;\n  if (url.port) result += ':'+ url.port;\n\n  result += url.pathname;\n\n  query = 'object' === typeof url.query ? stringify(url.query) : url.query;\n  if (query) result += '?' !== query.charAt(0) ? '?'+ query : query;\n\n  if (url.hash) result += url.hash;\n\n  return result;\n};\n\n//\n// Expose the URL parser and some additional properties that might be useful for\n// others.\n//\nURL.qs = qs;\nURL.location = lolcation;\nmodule.exports = URL;\n","(function (global){\n'use strict';\n\nvar slashes = /^[A-Za-z][A-Za-z0-9+-.]*:\\/\\//;\n\n/**\n * These properties should not be copied or inherited from. This is only needed\n * for all non blob URL's as a blob URL does not include a hash, only the\n * origin.\n *\n * @type {Object}\n * @private\n */\nvar ignore = { hash: 1, query: 1 }\n  , URL;\n\n/**\n * The location object differs when your code is loaded through a normal page,\n * Worker or through a worker using a blob. And with the blobble begins the\n * trouble as the location object will contain the URL of the blob, not the\n * location of the page where our code is loaded in. The actual origin is\n * encoded in the `pathname` so we can thankfully generate a good \"default\"\n * location from it so we can generate proper relative URL's again.\n *\n * @param {Object|String} loc Optional default location object.\n * @returns {Object} lolcation object.\n * @api public\n */\nmodule.exports = function lolcation(loc) {\n  loc = loc || global.location || {};\n  URL = URL || require('./');\n\n  var finaldestination = {}\n    , type = typeof loc\n    , key;\n\n  if ('blob:' === loc.protocol) {\n    finaldestination = new URL(unescape(loc.pathname), {});\n  } else if ('string' === type) {\n    finaldestination = new URL(loc, {});\n    for (key in ignore) delete finaldestination[key];\n  } else if ('object' === type) {\n    for (key in loc) {\n      if (key in ignore) continue;\n      finaldestination[key] = loc[key];\n    }\n\n    if (finaldestination.slashes === undefined) {\n      finaldestination.slashes = slashes.test(loc.href);\n    }\n  }\n\n  return finaldestination;\n};\n\n}).call(this,typeof global !== \"undefined\" ? global : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : {})\n//# sourceMappingURL=data:application/json;charset:utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5vZGVfbW9kdWxlcy91cmwtcGFyc2UvbG9sY2F0aW9uLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxudmFyIHNsYXNoZXMgPSAvXltBLVphLXpdW0EtWmEtejAtOSstLl0qOlxcL1xcLy87XG5cbi8qKlxuICogVGhlc2UgcHJvcGVydGllcyBzaG91bGQgbm90IGJlIGNvcGllZCBvciBpbmhlcml0ZWQgZnJvbS4gVGhpcyBpcyBvbmx5IG5lZWRlZFxuICogZm9yIGFsbCBub24gYmxvYiBVUkwncyBhcyBhIGJsb2IgVVJMIGRvZXMgbm90IGluY2x1ZGUgYSBoYXNoLCBvbmx5IHRoZVxuICogb3JpZ2luLlxuICpcbiAqIEB0eXBlIHtPYmplY3R9XG4gKiBAcHJpdmF0ZVxuICovXG52YXIgaWdub3JlID0geyBoYXNoOiAxLCBxdWVyeTogMSB9XG4gICwgVVJMO1xuXG4vKipcbiAqIFRoZSBsb2NhdGlvbiBvYmplY3QgZGlmZmVycyB3aGVuIHlvdXIgY29kZSBpcyBsb2FkZWQgdGhyb3VnaCBhIG5vcm1hbCBwYWdlLFxuICogV29ya2VyIG9yIHRocm91Z2ggYSB3b3JrZXIgdXNpbmcgYSBibG9iLiBBbmQgd2l0aCB0aGUgYmxvYmJsZSBiZWdpbnMgdGhlXG4gKiB0cm91YmxlIGFzIHRoZSBsb2NhdGlvbiBvYmplY3Qgd2lsbCBjb250YWluIHRoZSBVUkwgb2YgdGhlIGJsb2IsIG5vdCB0aGVcbiAqIGxvY2F0aW9uIG9mIHRoZSBwYWdlIHdoZXJlIG91ciBjb2RlIGlzIGxvYWRlZCBpbi4gVGhlIGFjdHVhbCBvcmlnaW4gaXNcbiAqIGVuY29kZWQgaW4gdGhlIGBwYXRobmFtZWAgc28gd2UgY2FuIHRoYW5rZnVsbHkgZ2VuZXJhdGUgYSBnb29kIFwiZGVmYXVsdFwiXG4gKiBsb2NhdGlvbiBmcm9tIGl0IHNvIHdlIGNhbiBnZW5lcmF0ZSBwcm9wZXIgcmVsYXRpdmUgVVJMJ3MgYWdhaW4uXG4gKlxuICogQHBhcmFtIHtPYmplY3R8U3RyaW5nfSBsb2MgT3B0aW9uYWwgZGVmYXVsdCBsb2NhdGlvbiBvYmplY3QuXG4gKiBAcmV0dXJucyB7T2JqZWN0fSBsb2xjYXRpb24gb2JqZWN0LlxuICogQGFwaSBwdWJsaWNcbiAqL1xubW9kdWxlLmV4cG9ydHMgPSBmdW5jdGlvbiBsb2xjYXRpb24obG9jKSB7XG4gIGxvYyA9IGxvYyB8fCBnbG9iYWwubG9jYXRpb24gfHwge307XG4gIFVSTCA9IFVSTCB8fCByZXF1aXJlKCcuLycpO1xuXG4gIHZhciBmaW5hbGRlc3RpbmF0aW9uID0ge31cbiAgICAsIHR5cGUgPSB0eXBlb2YgbG9jXG4gICAgLCBrZXk7XG5cbiAgaWYgKCdibG9iOicgPT09IGxvYy5wcm90b2NvbCkge1xuICAgIGZpbmFsZGVzdGluYXRpb24gPSBuZXcgVVJMKHVuZXNjYXBlKGxvYy5wYXRobmFtZSksIHt9KTtcbiAgfSBlbHNlIGlmICgnc3RyaW5nJyA9PT0gdHlwZSkge1xuICAgIGZpbmFsZGVzdGluYXRpb24gPSBuZXcgVVJMKGxvYywge30pO1xuICAgIGZvciAoa2V5IGluIGlnbm9yZSkgZGVsZXRlIGZpbmFsZGVzdGluYXRpb25ba2V5XTtcbiAgfSBlbHNlIGlmICgnb2JqZWN0JyA9PT0gdHlwZSkge1xuICAgIGZvciAoa2V5IGluIGxvYykge1xuICAgICAgaWYgKGtleSBpbiBpZ25vcmUpIGNvbnRpbnVlO1xuICAgICAgZmluYWxkZXN0aW5hdGlvbltrZXldID0gbG9jW2tleV07XG4gICAgfVxuXG4gICAgaWYgKGZpbmFsZGVzdGluYXRpb24uc2xhc2hlcyA9PT0gdW5kZWZpbmVkKSB7XG4gICAgICBmaW5hbGRlc3RpbmF0aW9uLnNsYXNoZXMgPSBzbGFzaGVzLnRlc3QobG9jLmhyZWYpO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBmaW5hbGRlc3RpbmF0aW9uO1xufTtcbiJdfQ==","'use strict';\n\nvar has = Object.prototype.hasOwnProperty;\n\n/**\n * Simple query string parser.\n *\n * @param {String} query The query string that needs to be parsed.\n * @returns {Object}\n * @api public\n */\nfunction querystring(query) {\n  var parser = /([^=?&]+)=([^&]*)/g\n    , result = {}\n    , part;\n\n  //\n  // Little nifty parsing hack, leverage the fact that RegExp.exec increments\n  // the lastIndex property so we can continue executing this loop until we've\n  // parsed all results.\n  //\n  for (;\n    part = parser.exec(query);\n    result[decodeURIComponent(part[1])] = decodeURIComponent(part[2])\n  );\n\n  return result;\n}\n\n/**\n * Transform a query string to an object.\n *\n * @param {Object} obj Object that should be transformed.\n * @param {String} prefix Optional prefix.\n * @returns {String}\n * @api public\n */\nfunction querystringify(obj, prefix) {\n  prefix = prefix || '';\n\n  var pairs = [];\n\n  //\n  // Optionally prefix with a '?' if needed\n  //\n  if ('string' !== typeof prefix) prefix = '?';\n\n  for (var key in obj) {\n    if (has.call(obj, key)) {\n      pairs.push(encodeURIComponent(key) +'='+ encodeURIComponent(obj[key]));\n    }\n  }\n\n  return pairs.length ? prefix + pairs.join('&') : '';\n}\n\n//\n// Expose the module.\n//\nexports.stringify = querystringify;\nexports.parse = querystring;\n","'use strict';\n\n/**\n * Check if we're required to add a port number.\n *\n * @see https://url.spec.whatwg.org/#default-port\n * @param {Number|String} port Port number we need to check\n * @param {String} protocol Protocol we need to check against.\n * @returns {Boolean} Is it a default port for the given protocol\n * @api private\n */\nmodule.exports = function required(port, protocol) {\n  protocol = protocol.split(':')[0];\n  port = +port;\n\n  if (!port) return false;\n\n  switch (protocol) {\n    case 'http':\n    case 'ws':\n    return port !== 80;\n\n    case 'https':\n    case 'wss':\n    return port !== 443;\n\n    case 'ftp':\n    return port !== 21;\n\n    case 'gopher':\n    return port !== 70;\n\n    case 'file':\n    return false;\n  }\n\n  return port !== 0;\n};\n"]}
\ No newline at end of file
diff --git a/src/main/resources/static/sockjs/dist/sockjs.min.js b/src/main/resources/static/sockjs/dist/sockjs.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..e26188127c2fcfb8aff2baba6e71c15a531edfb5
--- /dev/null
+++ b/src/main/resources/static/sockjs/dist/sockjs.min.js
@@ -0,0 +1,3 @@
+/* sockjs-client v1.1.1 | http://sockjs.org | MIT license */
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;"undefined"!=typeof window?e=window:"undefined"!=typeof global?e=global:"undefined"!=typeof self&&(e=self),e.SockJS=t()}}(function(){var t;return function e(t,n,r){function i(s,a){if(!n[s]){if(!t[s]){var u="function"==typeof require&&require;if(!a&&u)return u(s,!0);if(o)return o(s,!0);var l=new Error("Cannot find module '"+s+"'");throw l.code="MODULE_NOT_FOUND",l}var c=n[s]={exports:{}};t[s][0].call(c.exports,function(e){var n=t[s][1][e];return i(n?n:e)},c,c.exports,e,t,n,r)}return n[s].exports}for(var o="function"==typeof require&&require,s=0;s<r.length;s++)i(r[s]);return i}({1:[function(t,e){(function(n){"use strict";var r=t("./transport-list");e.exports=t("./main")(r),"_sockjs_onload"in n&&setTimeout(n._sockjs_onload,1)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./main":14,"./transport-list":16}],2:[function(t,e){"use strict";function n(){i.call(this),this.initEvent("close",!1,!1),this.wasClean=!1,this.code=0,this.reason=""}var r=t("inherits"),i=t("./event");r(n,i),e.exports=n},{"./event":4,inherits:54}],3:[function(t,e){"use strict";function n(){i.call(this)}var r=t("inherits"),i=t("./eventtarget");r(n,i),n.prototype.removeAllListeners=function(t){t?delete this._listeners[t]:this._listeners={}},n.prototype.once=function(t,e){function n(){r.removeListener(t,n),i||(i=!0,e.apply(this,arguments))}var r=this,i=!1;this.on(t,n)},n.prototype.emit=function(){var t=arguments[0],e=this._listeners[t];if(e){for(var n=arguments.length,r=new Array(n-1),i=1;n>i;i++)r[i-1]=arguments[i];for(var o=0;o<e.length;o++)e[o].apply(this,r)}},n.prototype.on=n.prototype.addListener=i.prototype.addEventListener,n.prototype.removeListener=i.prototype.removeEventListener,e.exports.EventEmitter=n},{"./eventtarget":5,inherits:54}],4:[function(t,e){"use strict";function n(t){this.type=t}n.prototype.initEvent=function(t,e,n){return this.type=t,this.bubbles=e,this.cancelable=n,this.timeStamp=+new Date,this},n.prototype.stopPropagation=function(){},n.prototype.preventDefault=function(){},n.CAPTURING_PHASE=1,n.AT_TARGET=2,n.BUBBLING_PHASE=3,e.exports=n},{}],5:[function(t,e){"use strict";function n(){this._listeners={}}n.prototype.addEventListener=function(t,e){t in this._listeners||(this._listeners[t]=[]);var n=this._listeners[t];-1===n.indexOf(e)&&(n=n.concat([e])),this._listeners[t]=n},n.prototype.removeEventListener=function(t,e){var n=this._listeners[t];if(n){var r=n.indexOf(e);return-1!==r?void(n.length>1?this._listeners[t]=n.slice(0,r).concat(n.slice(r+1)):delete this._listeners[t]):void 0}},n.prototype.dispatchEvent=function(){var t=arguments[0],e=t.type,n=1===arguments.length?[t]:Array.apply(null,arguments);if(this["on"+e]&&this["on"+e].apply(this,n),e in this._listeners)for(var r=this._listeners[e],i=0;i<r.length;i++)r[i].apply(this,n)},e.exports=n},{}],6:[function(t,e){"use strict";function n(t){i.call(this),this.initEvent("message",!1,!1),this.data=t}var r=t("inherits"),i=t("./event");r(n,i),e.exports=n},{"./event":4,inherits:54}],7:[function(t,e){"use strict";function n(t){this._transport=t,t.on("message",this._transportMessage.bind(this)),t.on("close",this._transportClose.bind(this))}var r=t("json3"),i=t("./utils/iframe");n.prototype._transportClose=function(t,e){i.postMessage("c",r.stringify([t,e]))},n.prototype._transportMessage=function(t){i.postMessage("t",t)},n.prototype._send=function(t){this._transport.send(t)},n.prototype._close=function(){this._transport.close(),this._transport.removeAllListeners()},e.exports=n},{"./utils/iframe":47,json3:55}],8:[function(t,e){"use strict";var n=t("./utils/url"),r=t("./utils/event"),i=t("json3"),o=t("./facade"),s=t("./info-iframe-receiver"),a=t("./utils/iframe"),u=t("./location");e.exports=function(t,e){var l={};e.forEach(function(t){t.facadeTransport&&(l[t.facadeTransport.transportName]=t.facadeTransport)}),l[s.transportName]=s;var c;t.bootstrap_iframe=function(){var e;a.currentWindowId=u.hash.slice(1);var s=function(r){if(r.source===parent&&("undefined"==typeof c&&(c=r.origin),r.origin===c)){var s;try{s=i.parse(r.data)}catch(f){return}if(s.windowId===a.currentWindowId)switch(s.type){case"s":var h;try{h=i.parse(s.data)}catch(f){break}var d=h[0],p=h[1],v=h[2],m=h[3];if(d!==t.version)throw new Error('Incompatible SockJS! Main site uses: "'+d+'", the iframe: "'+t.version+'".');if(!n.isOriginEqual(v,u.href)||!n.isOriginEqual(m,u.href))throw new Error("Can't connect to different domain from within an iframe. ("+u.href+", "+v+", "+m+")");e=new o(new l[p](v,m));break;case"m":e._send(s.data);break;case"c":e&&e._close(),e=null}}};r.attachEvent("message",s),a.postMessage("s")}}},{"./facade":7,"./info-iframe-receiver":10,"./location":13,"./utils/event":46,"./utils/iframe":47,"./utils/url":52,debug:void 0,json3:55}],9:[function(t,e){"use strict";function n(t,e){r.call(this);var n=this,i=+new Date;this.xo=new e("GET",t),this.xo.once("finish",function(t,e){var r,a;if(200===t){if(a=+new Date-i,e)try{r=o.parse(e)}catch(u){}s.isObject(r)||(r={})}n.emit("finish",r,a),n.removeAllListeners()})}var r=t("events").EventEmitter,i=t("inherits"),o=t("json3"),s=t("./utils/object");i(n,r),n.prototype.close=function(){this.removeAllListeners(),this.xo.close()},e.exports=n},{"./utils/object":49,debug:void 0,events:3,inherits:54,json3:55}],10:[function(t,e){"use strict";function n(t){var e=this;i.call(this),this.ir=new a(t,s),this.ir.once("finish",function(t,n){e.ir=null,e.emit("message",o.stringify([t,n]))})}var r=t("inherits"),i=t("events").EventEmitter,o=t("json3"),s=t("./transport/sender/xhr-local"),a=t("./info-ajax");r(n,i),n.transportName="iframe-info-receiver",n.prototype.close=function(){this.ir&&(this.ir.close(),this.ir=null),this.removeAllListeners()},e.exports=n},{"./info-ajax":9,"./transport/sender/xhr-local":37,events:3,inherits:54,json3:55}],11:[function(t,e){(function(n){"use strict";function r(t,e){var r=this;i.call(this);var o=function(){var n=r.ifr=new u(l.transportName,e,t);n.once("message",function(t){if(t){var e;try{e=s.parse(t)}catch(n){return r.emit("finish"),void r.close()}var i=e[0],o=e[1];r.emit("finish",i,o)}r.close()}),n.once("close",function(){r.emit("finish"),r.close()})};n.document.body?o():a.attachEvent("load",o)}var i=t("events").EventEmitter,o=t("inherits"),s=t("json3"),a=t("./utils/event"),u=t("./transport/iframe"),l=t("./info-iframe-receiver");o(r,i),r.enabled=function(){return u.enabled()},r.prototype.close=function(){this.ifr&&this.ifr.close(),this.removeAllListeners(),this.ifr=null},e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./info-iframe-receiver":10,"./transport/iframe":22,"./utils/event":46,debug:void 0,events:3,inherits:54,json3:55}],12:[function(t,e){"use strict";function n(t,e){var n=this;r.call(this),setTimeout(function(){n.doXhr(t,e)},0)}var r=t("events").EventEmitter,i=t("inherits"),o=t("./utils/url"),s=t("./transport/sender/xdr"),a=t("./transport/sender/xhr-cors"),u=t("./transport/sender/xhr-local"),l=t("./transport/sender/xhr-fake"),c=t("./info-iframe"),f=t("./info-ajax");i(n,r),n._getReceiver=function(t,e,n){return n.sameOrigin?new f(e,u):a.enabled?new f(e,a):s.enabled&&n.sameScheme?new f(e,s):c.enabled()?new c(t,e):new f(e,l)},n.prototype.doXhr=function(t,e){var r=this,i=o.addPath(t,"/info");this.xo=n._getReceiver(t,i,e),this.timeoutRef=setTimeout(function(){r._cleanup(!1),r.emit("finish")},n.timeout),this.xo.once("finish",function(t,e){r._cleanup(!0),r.emit("finish",t,e)})},n.prototype._cleanup=function(t){clearTimeout(this.timeoutRef),this.timeoutRef=null,!t&&this.xo&&this.xo.close(),this.xo=null},n.prototype.close=function(){this.removeAllListeners(),this._cleanup(!1)},n.timeout=8e3,e.exports=n},{"./info-ajax":9,"./info-iframe":11,"./transport/sender/xdr":34,"./transport/sender/xhr-cors":35,"./transport/sender/xhr-fake":36,"./transport/sender/xhr-local":37,"./utils/url":52,debug:void 0,events:3,inherits:54}],13:[function(t,e){(function(t){"use strict";e.exports=t.location||{origin:"http://localhost:80",protocol:"http",host:"localhost",port:80,href:"http://localhost/",hash:""}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],14:[function(t,e){(function(n){"use strict";function r(t,e,n){if(!(this instanceof r))return new r(t,e,n);if(arguments.length<1)throw new TypeError("Failed to construct 'SockJS: 1 argument required, but only 0 present");b.call(this),this.readyState=r.CONNECTING,this.extensions="",this.protocol="",n=n||{},n.protocols_whitelist&&m.warn("'protocols_whitelist' is DEPRECATED. Use 'transports' instead."),this._transportsWhitelist=n.transports,this._transportOptions=n.transportOptions||{};var i=n.sessionId||8;if("function"==typeof i)this._generateSessionId=i;else{if("number"!=typeof i)throw new TypeError("If sessionId is used in the options, it needs to be a number or a function.");this._generateSessionId=function(){return l.string(i)}}this._server=n.server||l.numberString(1e3);var o=new s(t);if(!o.host||!o.protocol)throw new SyntaxError("The URL '"+t+"' is invalid");if(o.hash)throw new SyntaxError("The URL must not contain a fragment");if("http:"!==o.protocol&&"https:"!==o.protocol)throw new SyntaxError("The URL's scheme must be either 'http:' or 'https:'. '"+o.protocol+"' is not allowed.");var a="https:"===o.protocol;if("https"===g.protocol&&!a)throw new Error("SecurityError: An insecure SockJS connection may not be initiated from a page loaded over HTTPS");e?Array.isArray(e)||(e=[e]):e=[];var u=e.sort();u.forEach(function(t,e){if(!t)throw new SyntaxError("The protocols entry '"+t+"' is invalid.");if(e<u.length-1&&t===u[e+1])throw new SyntaxError("The protocols entry '"+t+"' is duplicated.")});var c=f.getOrigin(g.href);this._origin=c?c.toLowerCase():null,o.set("pathname",o.pathname.replace(/\/+$/,"")),this.url=o.href,this._urlInfo={nullOrigin:!v.hasDomain(),sameOrigin:f.isOriginEqual(this.url,g.href),sameScheme:f.isSchemeEqual(this.url,g.href)},this._ir=new _(this.url,this._urlInfo),this._ir.once("finish",this._receiveInfo.bind(this))}function i(t){return 1e3===t||t>=3e3&&4999>=t}t("./shims");var o,s=t("url-parse"),a=t("inherits"),u=t("json3"),l=t("./utils/random"),c=t("./utils/escape"),f=t("./utils/url"),h=t("./utils/event"),d=t("./utils/transport"),p=t("./utils/object"),v=t("./utils/browser"),m=t("./utils/log"),y=t("./event/event"),b=t("./event/eventtarget"),g=t("./location"),w=t("./event/close"),x=t("./event/trans-message"),_=t("./info-receiver");a(r,b),r.prototype.close=function(t,e){if(t&&!i(t))throw new Error("InvalidAccessError: Invalid code");if(e&&e.length>123)throw new SyntaxError("reason argument has an invalid length");if(this.readyState!==r.CLOSING&&this.readyState!==r.CLOSED){var n=!0;this._close(t||1e3,e||"Normal closure",n)}},r.prototype.send=function(t){if("string"!=typeof t&&(t=""+t),this.readyState===r.CONNECTING)throw new Error("InvalidStateError: The connection has not been established yet");this.readyState===r.OPEN&&this._transport.send(c.quote(t))},r.version=t("./version"),r.CONNECTING=0,r.OPEN=1,r.CLOSING=2,r.CLOSED=3,r.prototype._receiveInfo=function(t,e){if(this._ir=null,!t)return void this._close(1002,"Cannot connect to server");this._rto=this.countRTO(e),this._transUrl=t.base_url?t.base_url:this.url,t=p.extend(t,this._urlInfo);var n=o.filterToEnabled(this._transportsWhitelist,t);this._transports=n.main,this._connect()},r.prototype._connect=function(){for(var t=this._transports.shift();t;t=this._transports.shift()){if(t.needBody&&(!n.document.body||"undefined"!=typeof n.document.readyState&&"complete"!==n.document.readyState&&"interactive"!==n.document.readyState))return this._transports.unshift(t),void h.attachEvent("load",this._connect.bind(this));var e=this._rto*t.roundTrips||5e3;this._transportTimeoutId=setTimeout(this._transportTimeout.bind(this),e);var r=f.addPath(this._transUrl,"/"+this._server+"/"+this._generateSessionId()),i=this._transportOptions[t.transportName],o=new t(r,this._transUrl,i);return o.on("message",this._transportMessage.bind(this)),o.once("close",this._transportClose.bind(this)),o.transportName=t.transportName,void(this._transport=o)}this._close(2e3,"All transports failed",!1)},r.prototype._transportTimeout=function(){this.readyState===r.CONNECTING&&this._transportClose(2007,"Transport timed out")},r.prototype._transportMessage=function(t){var e,n=this,r=t.slice(0,1),i=t.slice(1);switch(r){case"o":return void this._open();case"h":return void this.dispatchEvent(new y("heartbeat"))}if(i)try{e=u.parse(i)}catch(o){}if("undefined"!=typeof e)switch(r){case"a":Array.isArray(e)&&e.forEach(function(t){n.dispatchEvent(new x(t))});break;case"m":this.dispatchEvent(new x(e));break;case"c":Array.isArray(e)&&2===e.length&&this._close(e[0],e[1],!0)}},r.prototype._transportClose=function(t,e){return this._transport&&(this._transport.removeAllListeners(),this._transport=null,this.transport=null),i(t)||2e3===t||this.readyState!==r.CONNECTING?void this._close(t,e):void this._connect()},r.prototype._open=function(){this.readyState===r.CONNECTING?(this._transportTimeoutId&&(clearTimeout(this._transportTimeoutId),this._transportTimeoutId=null),this.readyState=r.OPEN,this.transport=this._transport.transportName,this.dispatchEvent(new y("open"))):this._close(1006,"Server lost session")},r.prototype._close=function(t,e,n){var i=!1;if(this._ir&&(i=!0,this._ir.close(),this._ir=null),this._transport&&(this._transport.close(),this._transport=null,this.transport=null),this.readyState===r.CLOSED)throw new Error("InvalidStateError: SockJS has already been closed");this.readyState=r.CLOSING,setTimeout(function(){this.readyState=r.CLOSED,i&&this.dispatchEvent(new y("error"));var o=new w("close");o.wasClean=n||!1,o.code=t||1e3,o.reason=e,this.dispatchEvent(o),this.onmessage=this.onclose=this.onerror=null}.bind(this),0)},r.prototype.countRTO=function(t){return t>100?4*t:300+t},e.exports=function(e){return o=d(e),t("./iframe-bootstrap")(r,e),r}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./event/close":2,"./event/event":4,"./event/eventtarget":5,"./event/trans-message":6,"./iframe-bootstrap":8,"./info-receiver":12,"./location":13,"./shims":15,"./utils/browser":44,"./utils/escape":45,"./utils/event":46,"./utils/log":48,"./utils/object":49,"./utils/random":50,"./utils/transport":51,"./utils/url":52,"./version":53,debug:void 0,inherits:54,json3:55,"url-parse":56}],15:[function(){"use strict";function t(t){var e=+t;return e!==e?e=0:0!==e&&e!==1/0&&e!==-(1/0)&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function e(t){return t>>>0}function n(){}var r,i=Array.prototype,o=Object.prototype,s=Function.prototype,a=String.prototype,u=i.slice,l=o.toString,c=function(t){return"[object Function]"===o.toString.call(t)},f=function(t){return"[object Array]"===l.call(t)},h=function(t){return"[object String]"===l.call(t)},d=Object.defineProperty&&function(){try{return Object.defineProperty({},"x",{}),!0}catch(t){return!1}}();r=d?function(t,e,n,r){!r&&e in t||Object.defineProperty(t,e,{configurable:!0,enumerable:!1,writable:!0,value:n})}:function(t,e,n,r){!r&&e in t||(t[e]=n)};var p=function(t,e,n){for(var i in e)o.hasOwnProperty.call(e,i)&&r(t,i,e[i],n)},v=function(t){if(null==t)throw new TypeError("can't convert "+t+" to object");return Object(t)};p(s,{bind:function(t){var e=this;if(!c(e))throw new TypeError("Function.prototype.bind called on incompatible "+e);for(var r=u.call(arguments,1),i=function(){if(this instanceof l){var n=e.apply(this,r.concat(u.call(arguments)));return Object(n)===n?n:this}return e.apply(t,r.concat(u.call(arguments)))},o=Math.max(0,e.length-r.length),s=[],a=0;o>a;a++)s.push("$"+a);var l=Function("binder","return function ("+s.join(",")+"){ return binder.apply(this, arguments); }")(i);return e.prototype&&(n.prototype=e.prototype,l.prototype=new n,n.prototype=null),l}}),p(Array,{isArray:f});var m=Object("a"),y="a"!==m[0]||!(0 in m),b=function(t){var e=!0,n=!0;return t&&(t.call("foo",function(t,n,r){"object"!=typeof r&&(e=!1)}),t.call([1],function(){n="string"==typeof this},"x")),!!t&&e&&n};p(i,{forEach:function(t){var e=v(this),n=y&&h(this)?this.split(""):e,r=arguments[1],i=-1,o=n.length>>>0;if(!c(t))throw new TypeError;for(;++i<o;)i in n&&t.call(r,n[i],i,e)}},!b(i.forEach));var g=Array.prototype.indexOf&&-1!==[0,1].indexOf(1,2);p(i,{indexOf:function(e){var n=y&&h(this)?this.split(""):v(this),r=n.length>>>0;if(!r)return-1;var i=0;for(arguments.length>1&&(i=t(arguments[1])),i=i>=0?i:Math.max(0,r+i);r>i;i++)if(i in n&&n[i]===e)return i;return-1}},g);var w=a.split;2!=="ab".split(/(?:ab)*/).length||4!==".".split(/(.?)(.?)/).length||"t"==="tesst".split(/(s)*/)[1]||4!=="test".split(/(?:)/,-1).length||"".split(/.?/).length||".".split(/()()/).length>1?!function(){var t=void 0===/()??/.exec("")[1];a.split=function(n,r){var o=this;if(void 0===n&&0===r)return[];if("[object RegExp]"!==l.call(n))return w.call(this,n,r);var s,a,u,c,f=[],h=(n.ignoreCase?"i":"")+(n.multiline?"m":"")+(n.extended?"x":"")+(n.sticky?"y":""),d=0;for(n=new RegExp(n.source,h+"g"),o+="",t||(s=new RegExp("^"+n.source+"$(?!\\s)",h)),r=void 0===r?-1>>>0:e(r);(a=n.exec(o))&&(u=a.index+a[0].length,!(u>d&&(f.push(o.slice(d,a.index)),!t&&a.length>1&&a[0].replace(s,function(){for(var t=1;t<arguments.length-2;t++)void 0===arguments[t]&&(a[t]=void 0)}),a.length>1&&a.index<o.length&&i.push.apply(f,a.slice(1)),c=a[0].length,d=u,f.length>=r)));)n.lastIndex===a.index&&n.lastIndex++;return d===o.length?(c||!n.test(""))&&f.push(""):f.push(o.slice(d)),f.length>r?f.slice(0,r):f}}():"0".split(void 0,0).length&&(a.split=function(t,e){return void 0===t&&0===e?[]:w.call(this,t,e)});var x="	\n\f\r   ᠎ �          �　\u2028\u2029",_="​",E="["+x+"]",j=new RegExp("^"+E+E+"*"),T=new RegExp(E+E+"*$"),S=a.trim&&(x.trim()||!_.trim());p(a,{trim:function(){if(void 0===this||null===this)throw new TypeError("can't convert "+this+" to object");return String(this).replace(j,"").replace(T,"")}},S);var O=a.substr,C="".substr&&"b"!=="0b".substr(-1);p(a,{substr:function(t,e){return O.call(this,0>t&&(t=this.length+t)<0?0:t,e)}},C)},{}],16:[function(t,e){"use strict";e.exports=[t("./transport/websocket"),t("./transport/xhr-streaming"),t("./transport/xdr-streaming"),t("./transport/eventsource"),t("./transport/lib/iframe-wrap")(t("./transport/eventsource")),t("./transport/htmlfile"),t("./transport/lib/iframe-wrap")(t("./transport/htmlfile")),t("./transport/xhr-polling"),t("./transport/xdr-polling"),t("./transport/lib/iframe-wrap")(t("./transport/xhr-polling")),t("./transport/jsonp-polling")]},{"./transport/eventsource":20,"./transport/htmlfile":21,"./transport/jsonp-polling":23,"./transport/lib/iframe-wrap":26,"./transport/websocket":38,"./transport/xdr-polling":39,"./transport/xdr-streaming":40,"./transport/xhr-polling":41,"./transport/xhr-streaming":42}],17:[function(t,e){(function(n){"use strict";function r(t,e,n,r){var o=this;i.call(this),setTimeout(function(){o._start(t,e,n,r)},0)}var i=t("events").EventEmitter,o=t("inherits"),s=t("../../utils/event"),a=t("../../utils/url"),u=n.XMLHttpRequest;o(r,i),r.prototype._start=function(t,e,n,i){var o=this;try{this.xhr=new u}catch(l){}if(!this.xhr)return this.emit("finish",0,"no xhr support"),void this._cleanup();e=a.addQuery(e,"t="+ +new Date),this.unloadRef=s.unloadAdd(function(){o._cleanup(!0)});try{this.xhr.open(t,e,!0),this.timeout&&"timeout"in this.xhr&&(this.xhr.timeout=this.timeout,this.xhr.ontimeout=function(){o.emit("finish",0,""),o._cleanup(!1)})}catch(c){return this.emit("finish",0,""),void this._cleanup(!1)}if(i&&i.noCredentials||!r.supportsCORS||(this.xhr.withCredentials="true"),i&&i.headers)for(var f in i.headers)this.xhr.setRequestHeader(f,i.headers[f]);this.xhr.onreadystatechange=function(){if(o.xhr){var t,e,n=o.xhr;switch(n.readyState){case 3:try{e=n.status,t=n.responseText}catch(r){}1223===e&&(e=204),200===e&&t&&t.length>0&&o.emit("chunk",e,t);break;case 4:e=n.status,1223===e&&(e=204),(12005===e||12029===e)&&(e=0),o.emit("finish",e,n.responseText),o._cleanup(!1)}}};try{o.xhr.send(n)}catch(c){o.emit("finish",0,""),o._cleanup(!1)}},r.prototype._cleanup=function(t){if(this.xhr){if(this.removeAllListeners(),s.unloadDel(this.unloadRef),this.xhr.onreadystatechange=function(){},this.xhr.ontimeout&&(this.xhr.ontimeout=null),t)try{this.xhr.abort()}catch(e){}this.unloadRef=this.xhr=null}},r.prototype.close=function(){this._cleanup(!0)},r.enabled=!!u;var l=["Active"].concat("Object").join("X");!r.enabled&&l in n&&(u=function(){try{return new n[l]("Microsoft.XMLHTTP")}catch(t){return null}},r.enabled=!!new u);var c=!1;try{c="withCredentials"in new u}catch(f){}r.supportsCORS=c,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/event":46,"../../utils/url":52,debug:void 0,events:3,inherits:54}],18:[function(t,e){(function(t){e.exports=t.EventSource}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],19:[function(t,e){(function(t){"use strict";var n=t.WebSocket||t.MozWebSocket;n&&(e.exports=function(t){return new n(t)})}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],20:[function(t,e){"use strict";function n(t){if(!n.enabled())throw new Error("Transport created when disabled");i.call(this,t,"/eventsource",o,s)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./receiver/eventsource"),s=t("./sender/xhr-cors"),a=t("eventsource");r(n,i),n.enabled=function(){return!!a},n.transportName="eventsource",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/eventsource":29,"./sender/xhr-cors":35,eventsource:18,inherits:54}],21:[function(t,e){"use strict";function n(t){if(!i.enabled)throw new Error("Transport created when disabled");s.call(this,t,"/htmlfile",i,o)}var r=t("inherits"),i=t("./receiver/htmlfile"),o=t("./sender/xhr-local"),s=t("./lib/ajax-based");r(n,s),n.enabled=function(t){return i.enabled&&t.sameOrigin},n.transportName="htmlfile",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/htmlfile":30,"./sender/xhr-local":37,inherits:54}],22:[function(t,e){"use strict";function n(t,e,r){if(!n.enabled())throw new Error("Transport created when disabled");o.call(this);var i=this;this.origin=a.getOrigin(r),this.baseUrl=r,this.transUrl=e,this.transport=t,this.windowId=c.string(8);var s=a.addPath(r,"/iframe.html")+"#"+this.windowId;this.iframeObj=u.createIframe(s,function(t){i.emit("close",1006,"Unable to load an iframe ("+t+")"),i.close()}),this.onmessageCallback=this._message.bind(this),l.attachEvent("message",this.onmessageCallback)}var r=t("inherits"),i=t("json3"),o=t("events").EventEmitter,s=t("../version"),a=t("../utils/url"),u=t("../utils/iframe"),l=t("../utils/event"),c=t("../utils/random");r(n,o),n.prototype.close=function(){if(this.removeAllListeners(),this.iframeObj){l.detachEvent("message",this.onmessageCallback);try{this.postMessage("c")}catch(t){}this.iframeObj.cleanup(),this.iframeObj=null,this.onmessageCallback=this.iframeObj=null}},n.prototype._message=function(t){if(a.isOriginEqual(t.origin,this.origin)){var e;try{e=i.parse(t.data)}catch(n){return}if(e.windowId===this.windowId)switch(e.type){case"s":this.iframeObj.loaded(),this.postMessage("s",i.stringify([s,this.transport,this.transUrl,this.baseUrl]));break;case"t":this.emit("message",e.data);break;case"c":var r;try{r=i.parse(e.data)}catch(n){return}this.emit("close",r[0],r[1]),this.close()}}},n.prototype.postMessage=function(t,e){this.iframeObj.post(i.stringify({windowId:this.windowId,type:t,data:e||""}),this.origin)},n.prototype.send=function(t){this.postMessage("m",t)},n.enabled=function(){return u.iframeEnabled},n.transportName="iframe",n.roundTrips=2,e.exports=n},{"../utils/event":46,"../utils/iframe":47,"../utils/random":50,"../utils/url":52,"../version":53,debug:void 0,events:3,inherits:54,json3:55}],23:[function(t,e){(function(n){"use strict";function r(t){if(!r.enabled())throw new Error("Transport created when disabled");o.call(this,t,"/jsonp",a,s)}var i=t("inherits"),o=t("./lib/sender-receiver"),s=t("./receiver/jsonp"),a=t("./sender/jsonp");i(r,o),r.enabled=function(){return!!n.document},r.transportName="jsonp-polling",r.roundTrips=1,r.needBody=!0,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./lib/sender-receiver":28,"./receiver/jsonp":31,"./sender/jsonp":33,inherits:54}],24:[function(t,e){"use strict";function n(t){return function(e,n,r){var i={};"string"==typeof n&&(i.headers={"Content-type":"text/plain"});var s=o.addPath(e,"/xhr_send"),a=new t("POST",s,n,i);return a.once("finish",function(t){return a=null,200!==t&&204!==t?r(new Error("http status "+t)):void r()}),function(){a.close(),a=null;var t=new Error("Aborted");t.code=1e3,r(t)}}}function r(t,e,r,i){s.call(this,t,e,n(i),r,i)}var i=t("inherits"),o=t("../../utils/url"),s=t("./sender-receiver");i(r,s),e.exports=r},{"../../utils/url":52,"./sender-receiver":28,debug:void 0,inherits:54}],25:[function(t,e){"use strict";function n(t,e){i.call(this),this.sendBuffer=[],this.sender=e,this.url=t}var r=t("inherits"),i=t("events").EventEmitter;r(n,i),n.prototype.send=function(t){this.sendBuffer.push(t),this.sendStop||this.sendSchedule()},n.prototype.sendScheduleWait=function(){var t,e=this;this.sendStop=function(){e.sendStop=null,clearTimeout(t)},t=setTimeout(function(){e.sendStop=null,e.sendSchedule()},25)},n.prototype.sendSchedule=function(){var t=this;if(this.sendBuffer.length>0){var e="["+this.sendBuffer.join(",")+"]";this.sendStop=this.sender(this.url,e,function(e){t.sendStop=null,e?(t.emit("close",e.code||1006,"Sending error: "+e),t._cleanup()):t.sendScheduleWait()}),this.sendBuffer=[]}},n.prototype._cleanup=function(){this.removeAllListeners()},n.prototype.stop=function(){this._cleanup(),this.sendStop&&(this.sendStop(),this.sendStop=null)},e.exports=n},{debug:void 0,events:3,inherits:54}],26:[function(t,e){(function(n){"use strict";var r=t("inherits"),i=t("../iframe"),o=t("../../utils/object");e.exports=function(t){function e(e,n){i.call(this,t.transportName,e,n)}return r(e,i),e.enabled=function(e,r){if(!n.document)return!1;var s=o.extend({},r);return s.sameOrigin=!0,t.enabled(s)&&i.enabled()},e.transportName="iframe-"+t.transportName,e.needBody=!0,e.roundTrips=i.roundTrips+t.roundTrips-1,e.facadeTransport=t,e}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/object":49,"../iframe":22,inherits:54}],27:[function(t,e){"use strict";function n(t,e,n){i.call(this),this.Receiver=t,this.receiveUrl=e,this.AjaxObject=n,this._scheduleReceiver()}var r=t("inherits"),i=t("events").EventEmitter;r(n,i),n.prototype._scheduleReceiver=function(){var t=this,e=this.poll=new this.Receiver(this.receiveUrl,this.AjaxObject);e.on("message",function(e){t.emit("message",e)}),e.once("close",function(n,r){t.poll=e=null,t.pollIsClosing||("network"===r?t._scheduleReceiver():(t.emit("close",n||1006,r),t.removeAllListeners()))})},n.prototype.abort=function(){this.removeAllListeners(),this.pollIsClosing=!0,this.poll&&this.poll.abort()},e.exports=n},{debug:void 0,events:3,inherits:54}],28:[function(t,e){"use strict";function n(t,e,n,r,a){var u=i.addPath(t,e),l=this;o.call(this,t,n),this.poll=new s(r,u,a),this.poll.on("message",function(t){l.emit("message",t)}),this.poll.once("close",function(t,e){l.poll=null,l.emit("close",t,e),l.close()})}var r=t("inherits"),i=t("../../utils/url"),o=t("./buffered-sender"),s=t("./polling");r(n,o),n.prototype.close=function(){this.removeAllListeners(),this.poll&&(this.poll.abort(),this.poll=null),this.stop()},e.exports=n},{"../../utils/url":52,"./buffered-sender":25,"./polling":27,debug:void 0,inherits:54}],29:[function(t,e){"use strict";function n(t){i.call(this);var e=this,n=this.es=new o(t);n.onmessage=function(t){e.emit("message",decodeURI(t.data))},n.onerror=function(t){var r=2!==n.readyState?"network":"permanent";e._cleanup(),e._close(r)}}var r=t("inherits"),i=t("events").EventEmitter,o=t("eventsource");r(n,i),n.prototype.abort=function(){this._cleanup(),this._close("user")},n.prototype._cleanup=function(){var t=this.es;t&&(t.onmessage=t.onerror=null,t.close(),this.es=null)},n.prototype._close=function(t){var e=this;setTimeout(function(){e.emit("close",null,t),e.removeAllListeners()},200)},e.exports=n},{debug:void 0,events:3,eventsource:18,inherits:54}],30:[function(t,e){(function(n){"use strict";function r(t){a.call(this);var e=this;o.polluteGlobalNamespace(),this.id="a"+u.string(6),t=s.addQuery(t,"c="+decodeURIComponent(o.WPrefix+"."+this.id));var i=r.htmlfileEnabled?o.createHtmlfile:o.createIframe;n[o.WPrefix][this.id]={start:function(){e.iframeObj.loaded()},message:function(t){e.emit("message",t)},stop:function(){e._cleanup(),e._close("network")}},this.iframeObj=i(t,function(){e._cleanup(),e._close("permanent")})}var i=t("inherits"),o=t("../../utils/iframe"),s=t("../../utils/url"),a=t("events").EventEmitter,u=t("../../utils/random");i(r,a),r.prototype.abort=function(){this._cleanup(),this._close("user")},r.prototype._cleanup=function(){this.iframeObj&&(this.iframeObj.cleanup(),this.iframeObj=null),delete n[o.WPrefix][this.id]},r.prototype._close=function(t){this.emit("close",null,t),this.removeAllListeners()},r.htmlfileEnabled=!1;var l=["Active"].concat("Object").join("X");if(l in n)try{r.htmlfileEnabled=!!new n[l]("htmlfile")}catch(c){}r.enabled=r.htmlfileEnabled||o.iframeEnabled,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,debug:void 0,events:3,inherits:54}],31:[function(t,e){(function(n){"use strict";function r(t){var e=this;l.call(this),i.polluteGlobalNamespace(),this.id="a"+o.string(6);var s=a.addQuery(t,"c="+encodeURIComponent(i.WPrefix+"."+this.id));n[i.WPrefix][this.id]=this._callback.bind(this),this._createScript(s),this.timeoutId=setTimeout(function(){e._abort(new Error("JSONP script loaded abnormally (timeout)"))},r.timeout)}var i=t("../../utils/iframe"),o=t("../../utils/random"),s=t("../../utils/browser"),a=t("../../utils/url"),u=t("inherits"),l=t("events").EventEmitter;u(r,l),r.prototype.abort=function(){if(n[i.WPrefix][this.id]){var t=new Error("JSONP user aborted read");t.code=1e3,this._abort(t)}},r.timeout=35e3,r.scriptErrorTimeout=1e3,r.prototype._callback=function(t){this._cleanup(),this.aborting||(t&&this.emit("message",t),this.emit("close",null,"network"),this.removeAllListeners())},r.prototype._abort=function(t){this._cleanup(),this.aborting=!0,this.emit("close",t.code,t.message),this.removeAllListeners()},r.prototype._cleanup=function(){if(clearTimeout(this.timeoutId),this.script2&&(this.script2.parentNode.removeChild(this.script2),this.script2=null),this.script){var t=this.script;t.parentNode.removeChild(t),t.onreadystatechange=t.onerror=t.onload=t.onclick=null,this.script=null}delete n[i.WPrefix][this.id]},r.prototype._scriptError=function(){var t=this;this.errorTimer||(this.errorTimer=setTimeout(function(){t.loadedOkay||t._abort(new Error("JSONP script loaded abnormally (onerror)"))},r.scriptErrorTimeout))},r.prototype._createScript=function(t){var e,r=this,i=this.script=n.document.createElement("script");if(i.id="a"+o.string(8),i.src=t,i.type="text/javascript",i.charset="UTF-8",i.onerror=this._scriptError.bind(this),i.onload=function(){r._abort(new Error("JSONP script loaded abnormally (onload)"))},i.onreadystatechange=function(){if(/loaded|closed/.test(i.readyState)){if(i&&i.htmlFor&&i.onclick){r.loadedOkay=!0;try{i.onclick()}catch(t){}}i&&r._abort(new Error("JSONP script loaded abnormally (onreadystatechange)"))
+}},"undefined"==typeof i.async&&n.document.attachEvent)if(s.isOpera())e=this.script2=n.document.createElement("script"),e.text="try{var a = document.getElementById('"+i.id+"'); if(a)a.onerror();}catch(x){};",i.async=e.async=!1;else{try{i.htmlFor=i.id,i.event="onclick"}catch(a){}i.async=!0}"undefined"!=typeof i.async&&(i.async=!0);var u=n.document.getElementsByTagName("head")[0];u.insertBefore(i,u.firstChild),e&&u.insertBefore(e,u.firstChild)},e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/browser":44,"../../utils/iframe":47,"../../utils/random":50,"../../utils/url":52,debug:void 0,events:3,inherits:54}],32:[function(t,e){"use strict";function n(t,e){i.call(this);var n=this;this.bufferPosition=0,this.xo=new e("POST",t,null),this.xo.on("chunk",this._chunkHandler.bind(this)),this.xo.once("finish",function(t,e){n._chunkHandler(t,e),n.xo=null;var r=200===t?"network":"permanent";n.emit("close",null,r),n._cleanup()})}var r=t("inherits"),i=t("events").EventEmitter;r(n,i),n.prototype._chunkHandler=function(t,e){if(200===t&&e)for(var n=-1;;this.bufferPosition+=n+1){var r=e.slice(this.bufferPosition);if(n=r.indexOf("\n"),-1===n)break;var i=r.slice(0,n);i&&this.emit("message",i)}},n.prototype._cleanup=function(){this.removeAllListeners()},n.prototype.abort=function(){this.xo&&(this.xo.close(),this.emit("close",null,"user"),this.xo=null),this._cleanup()},e.exports=n},{debug:void 0,events:3,inherits:54}],33:[function(t,e){(function(n){"use strict";function r(t){try{return n.document.createElement('<iframe name="'+t+'">')}catch(e){var r=n.document.createElement("iframe");return r.name=t,r}}function i(){o=n.document.createElement("form"),o.style.display="none",o.style.position="absolute",o.method="POST",o.enctype="application/x-www-form-urlencoded",o.acceptCharset="UTF-8",s=n.document.createElement("textarea"),s.name="d",o.appendChild(s),n.document.body.appendChild(o)}var o,s,a=t("../../utils/random"),u=t("../../utils/url");e.exports=function(t,e,n){o||i();var l="a"+a.string(8);o.target=l,o.action=u.addQuery(u.addPath(t,"/jsonp_send"),"i="+l);var c=r(l);c.id=l,c.style.display="none",o.appendChild(c);try{s.value=e}catch(f){}o.submit();var h=function(t){c.onerror&&(c.onreadystatechange=c.onerror=c.onload=null,setTimeout(function(){c.parentNode.removeChild(c),c=null},500),s.value="",n(t))};return c.onerror=function(){h()},c.onload=function(){h()},c.onreadystatechange=function(t){"complete"===c.readyState&&h()},function(){h(new Error("Aborted"))}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/random":50,"../../utils/url":52,debug:void 0}],34:[function(t,e){(function(n){"use strict";function r(t,e,n){var r=this;i.call(this),setTimeout(function(){r._start(t,e,n)},0)}var i=t("events").EventEmitter,o=t("inherits"),s=t("../../utils/event"),a=t("../../utils/browser"),u=t("../../utils/url");o(r,i),r.prototype._start=function(t,e,r){var i=this,o=new n.XDomainRequest;e=u.addQuery(e,"t="+ +new Date),o.onerror=function(){i._error()},o.ontimeout=function(){i._error()},o.onprogress=function(){i.emit("chunk",200,o.responseText)},o.onload=function(){i.emit("finish",200,o.responseText),i._cleanup(!1)},this.xdr=o,this.unloadRef=s.unloadAdd(function(){i._cleanup(!0)});try{this.xdr.open(t,e),this.timeout&&(this.xdr.timeout=this.timeout),this.xdr.send(r)}catch(a){this._error()}},r.prototype._error=function(){this.emit("finish",0,""),this._cleanup(!1)},r.prototype._cleanup=function(t){if(this.xdr){if(this.removeAllListeners(),s.unloadDel(this.unloadRef),this.xdr.ontimeout=this.xdr.onerror=this.xdr.onprogress=this.xdr.onload=null,t)try{this.xdr.abort()}catch(e){}this.unloadRef=this.xdr=null}},r.prototype.close=function(){this._cleanup(!0)},r.enabled=!(!n.XDomainRequest||!a.hasDomain()),e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../../utils/browser":44,"../../utils/event":46,"../../utils/url":52,debug:void 0,events:3,inherits:54}],35:[function(t,e){"use strict";function n(t,e,n,r){i.call(this,t,e,n,r)}var r=t("inherits"),i=t("../driver/xhr");r(n,i),n.enabled=i.enabled&&i.supportsCORS,e.exports=n},{"../driver/xhr":17,inherits:54}],36:[function(t,e){"use strict";function n(){var t=this;r.call(this),this.to=setTimeout(function(){t.emit("finish",200,"{}")},n.timeout)}var r=t("events").EventEmitter,i=t("inherits");i(n,r),n.prototype.close=function(){clearTimeout(this.to)},n.timeout=2e3,e.exports=n},{events:3,inherits:54}],37:[function(t,e){"use strict";function n(t,e,n){i.call(this,t,e,n,{noCredentials:!0})}var r=t("inherits"),i=t("../driver/xhr");r(n,i),n.enabled=i.enabled,e.exports=n},{"../driver/xhr":17,inherits:54}],38:[function(t,e){"use strict";function n(t,e,o){if(!n.enabled())throw new Error("Transport created when disabled");s.call(this);var u=this,l=i.addPath(t,"/websocket");l="https"===l.slice(0,5)?"wss"+l.slice(5):"ws"+l.slice(4),this.url=l,this.ws=new a(this.url,[],o),this.ws.onmessage=function(t){u.emit("message",t.data)},this.unloadRef=r.unloadAdd(function(){u.ws.close()}),this.ws.onclose=function(t){u.emit("close",t.code,t.reason),u._cleanup()},this.ws.onerror=function(t){u.emit("close",1006,"WebSocket connection broken"),u._cleanup()}}var r=t("../utils/event"),i=t("../utils/url"),o=t("inherits"),s=t("events").EventEmitter,a=t("./driver/websocket");o(n,s),n.prototype.send=function(t){var e="["+t+"]";this.ws.send(e)},n.prototype.close=function(){this.ws&&this.ws.close(),this._cleanup()},n.prototype._cleanup=function(){var t=this.ws;t&&(t.onmessage=t.onclose=t.onerror=null),r.unloadDel(this.unloadRef),this.unloadRef=this.ws=null,this.removeAllListeners()},n.enabled=function(){return!!a},n.transportName="websocket",n.roundTrips=2,e.exports=n},{"../utils/event":46,"../utils/url":52,"./driver/websocket":19,debug:void 0,events:3,inherits:54}],39:[function(t,e){"use strict";function n(t){if(!a.enabled)throw new Error("Transport created when disabled");i.call(this,t,"/xhr",s,a)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./xdr-streaming"),s=t("./receiver/xhr"),a=t("./sender/xdr");r(n,i),n.enabled=o.enabled,n.transportName="xdr-polling",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,"./xdr-streaming":40,inherits:54}],40:[function(t,e){"use strict";function n(t){if(!s.enabled)throw new Error("Transport created when disabled");i.call(this,t,"/xhr_streaming",o,s)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./receiver/xhr"),s=t("./sender/xdr");r(n,i),n.enabled=function(t){return t.cookie_needed||t.nullOrigin?!1:s.enabled&&t.sameScheme},n.transportName="xdr-streaming",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xdr":34,inherits:54}],41:[function(t,e){"use strict";function n(t){if(!a.enabled&&!s.enabled)throw new Error("Transport created when disabled");i.call(this,t,"/xhr",o,s)}var r=t("inherits"),i=t("./lib/ajax-based"),o=t("./receiver/xhr"),s=t("./sender/xhr-cors"),a=t("./sender/xhr-local");r(n,i),n.enabled=function(t){return t.nullOrigin?!1:a.enabled&&t.sameOrigin?!0:s.enabled},n.transportName="xhr-polling",n.roundTrips=2,e.exports=n},{"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,inherits:54}],42:[function(t,e){(function(n){"use strict";function r(t){if(!u.enabled&&!a.enabled)throw new Error("Transport created when disabled");o.call(this,t,"/xhr_streaming",s,a)}var i=t("inherits"),o=t("./lib/ajax-based"),s=t("./receiver/xhr"),a=t("./sender/xhr-cors"),u=t("./sender/xhr-local"),l=t("../utils/browser");i(r,o),r.enabled=function(t){return t.nullOrigin?!1:l.isOpera()?!1:a.enabled},r.transportName="xhr-streaming",r.roundTrips=2,r.needBody=!!n.document,e.exports=r}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"../utils/browser":44,"./lib/ajax-based":24,"./receiver/xhr":32,"./sender/xhr-cors":35,"./sender/xhr-local":37,inherits:54}],43:[function(t,e){(function(t){"use strict";e.exports.randomBytes=t.crypto&&t.crypto.getRandomValues?function(e){var n=new Uint8Array(e);return t.crypto.getRandomValues(n),n}:function(t){for(var e=new Array(t),n=0;t>n;n++)e[n]=Math.floor(256*Math.random());return e}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],44:[function(t,e){(function(t){"use strict";e.exports={isOpera:function(){return t.navigator&&/opera/i.test(t.navigator.userAgent)},isKonqueror:function(){return t.navigator&&/konqueror/i.test(t.navigator.userAgent)},hasDomain:function(){if(!t.document)return!0;try{return!!t.document.domain}catch(e){return!1}}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],45:[function(t,e){"use strict";var n,r=t("json3"),i=/[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g,o=function(t){var e,n={},r=[];for(e=0;65536>e;e++)r.push(String.fromCharCode(e));return t.lastIndex=0,r.join("").replace(t,function(t){return n[t]="\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4),""}),t.lastIndex=0,n};e.exports={quote:function(t){var e=r.stringify(t);return i.lastIndex=0,i.test(e)?(n||(n=o(i)),e.replace(i,function(t){return n[t]})):e}}},{json3:55}],46:[function(t,e){(function(n){"use strict";var r=t("./random"),i={},o=!1,s=n.chrome&&n.chrome.app&&n.chrome.app.runtime;e.exports={attachEvent:function(t,e){"undefined"!=typeof n.addEventListener?n.addEventListener(t,e,!1):n.document&&n.attachEvent&&(n.document.attachEvent("on"+t,e),n.attachEvent("on"+t,e))},detachEvent:function(t,e){"undefined"!=typeof n.addEventListener?n.removeEventListener(t,e,!1):n.document&&n.detachEvent&&(n.document.detachEvent("on"+t,e),n.detachEvent("on"+t,e))},unloadAdd:function(t){if(s)return null;var e=r.string(8);return i[e]=t,o&&setTimeout(this.triggerUnloadCallbacks,0),e},unloadDel:function(t){t in i&&delete i[t]},triggerUnloadCallbacks:function(){for(var t in i)i[t](),delete i[t]}};var a=function(){o||(o=!0,e.exports.triggerUnloadCallbacks())};s||e.exports.attachEvent("unload",a)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./random":50}],47:[function(t,e){(function(n){"use strict";var r=t("./event"),i=t("json3"),o=t("./browser");e.exports={WPrefix:"_jp",currentWindowId:null,polluteGlobalNamespace:function(){e.exports.WPrefix in n||(n[e.exports.WPrefix]={})},postMessage:function(t,r){n.parent!==n&&n.parent.postMessage(i.stringify({windowId:e.exports.currentWindowId,type:t,data:r||""}),"*")},createIframe:function(t,e){var i,o,s=n.document.createElement("iframe"),a=function(){clearTimeout(i);try{s.onload=null}catch(t){}s.onerror=null},u=function(){s&&(a(),setTimeout(function(){s&&s.parentNode.removeChild(s),s=null},0),r.unloadDel(o))},l=function(t){s&&(u(),e(t))},c=function(t,e){try{setTimeout(function(){s&&s.contentWindow&&s.contentWindow.postMessage(t,e)},0)}catch(n){}};return s.src=t,s.style.display="none",s.style.position="absolute",s.onerror=function(){l("onerror")},s.onload=function(){clearTimeout(i),i=setTimeout(function(){l("onload timeout")},2e3)},n.document.body.appendChild(s),i=setTimeout(function(){l("timeout")},15e3),o=r.unloadAdd(u),{post:c,cleanup:u,loaded:a}},createHtmlfile:function(t,i){var o,s,a,u=["Active"].concat("Object").join("X"),l=new n[u]("htmlfile"),c=function(){clearTimeout(o),a.onerror=null},f=function(){l&&(c(),r.unloadDel(s),a.parentNode.removeChild(a),a=l=null,CollectGarbage())},h=function(t){l&&(f(),i(t))},d=function(t,e){try{setTimeout(function(){a&&a.contentWindow&&a.contentWindow.postMessage(t,e)},0)}catch(n){}};l.open(),l.write('<html><script>document.domain="'+n.document.domain+'";</script></html>'),l.close(),l.parentWindow[e.exports.WPrefix]=n[e.exports.WPrefix];var p=l.createElement("div");return l.body.appendChild(p),a=l.createElement("iframe"),p.appendChild(a),a.src=t,a.onerror=function(){h("onerror")},o=setTimeout(function(){h("timeout")},15e3),s=r.unloadAdd(f),{post:d,cleanup:f,loaded:c}}},e.exports.iframeEnabled=!1,n.document&&(e.exports.iframeEnabled=("function"==typeof n.postMessage||"object"==typeof n.postMessage)&&!o.isKonqueror())}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./browser":44,"./event":46,debug:void 0,json3:55}],48:[function(t,e){(function(t){"use strict";var n={};["log","debug","warn"].forEach(function(e){var r;try{r=t.console&&t.console[e]&&t.console[e].apply}catch(i){}n[e]=r?function(){return t.console[e].apply(t.console,arguments)}:"log"===e?function(){}:n.log}),e.exports=n}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],49:[function(t,e){"use strict";e.exports={isObject:function(t){var e=typeof t;return"function"===e||"object"===e&&!!t},extend:function(t){if(!this.isObject(t))return t;for(var e,n,r=1,i=arguments.length;i>r;r++){e=arguments[r];for(n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])}return t}}},{}],50:[function(t,e){"use strict";var n=t("crypto"),r="abcdefghijklmnopqrstuvwxyz012345";e.exports={string:function(t){for(var e=r.length,i=n.randomBytes(t),o=[],s=0;t>s;s++)o.push(r.substr(i[s]%e,1));return o.join("")},number:function(t){return Math.floor(Math.random()*t)},numberString:function(t){var e=(""+(t-1)).length,n=new Array(e+1).join("0");return(n+this.number(t)).slice(-e)}}},{crypto:43}],51:[function(t,e){"use strict";e.exports=function(t){return{filterToEnabled:function(e,n){var r={main:[],facade:[]};return e?"string"==typeof e&&(e=[e]):e=[],t.forEach(function(t){t&&("websocket"!==t.transportName||n.websocket!==!1)&&(e.length&&-1===e.indexOf(t.transportName)||t.enabled(n)&&(r.main.push(t),t.facadeTransport&&r.facade.push(t.facadeTransport)))}),r}}}},{debug:void 0}],52:[function(t,e){"use strict";var n=t("url-parse");e.exports={getOrigin:function(t){if(!t)return null;var e=new n(t);if("file:"===e.protocol)return null;var r=e.port;return r||(r="https:"===e.protocol?"443":"80"),e.protocol+"//"+e.hostname+":"+r},isOriginEqual:function(t,e){var n=this.getOrigin(t)===this.getOrigin(e);return n},isSchemeEqual:function(t,e){return t.split(":")[0]===e.split(":")[0]},addPath:function(t,e){var n=t.split("?");return n[0]+e+(n[1]?"?"+n[1]:"")},addQuery:function(t,e){return t+(-1===t.indexOf("?")?"?"+e:"&"+e)}}},{debug:void 0,"url-parse":56}],53:[function(t,e){e.exports="1.1.1"},{}],54:[function(t,e){e.exports="function"==typeof Object.create?function(t,e){t.super_=e,t.prototype=Object.create(e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}})}:function(t,e){t.super_=e;var n=function(){};n.prototype=e.prototype,t.prototype=new n,t.prototype.constructor=t}},{}],55:[function(e,n,r){(function(e){(function(){function i(t,e){function n(t){if(n[t]!==m)return n[t];var i;if("bug-string-char-index"==t)i="a"!="a"[0];else if("json"==t)i=n("json-stringify")&&n("json-parse");else{var s,a='{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';if("json-stringify"==t){var u=e.stringify,c="function"==typeof u&&g;if(c){(s=function(){return 1}).toJSON=s;try{c="0"===u(0)&&"0"===u(new r)&&'""'==u(new o)&&u(b)===m&&u(m)===m&&u()===m&&"1"===u(s)&&"[1]"==u([s])&&"[null]"==u([m])&&"null"==u(null)&&"[null,null,null]"==u([m,b,null])&&u({a:[s,!0,!1,null,"\x00\b\n\f\r	"]})==a&&"1"===u(null,s)&&"[\n 1,\n 2\n]"==u([1,2],null,1)&&'"-271821-04-20T00:00:00.000Z"'==u(new l(-864e13))&&'"+275760-09-13T00:00:00.000Z"'==u(new l(864e13))&&'"-000001-01-01T00:00:00.000Z"'==u(new l(-621987552e5))&&'"1969-12-31T23:59:59.999Z"'==u(new l(-1))}catch(f){c=!1}}i=c}if("json-parse"==t){var h=e.parse;if("function"==typeof h)try{if(0===h("0")&&!h(!1)){s=h(a);var d=5==s.a.length&&1===s.a[0];if(d){try{d=!h('"	"')}catch(f){}if(d)try{d=1!==h("01")}catch(f){}if(d)try{d=1!==h("1.")}catch(f){}}}}catch(f){d=!1}i=d}}return n[t]=!!i}t||(t=u.Object()),e||(e=u.Object());var r=t.Number||u.Number,o=t.String||u.String,a=t.Object||u.Object,l=t.Date||u.Date,c=t.SyntaxError||u.SyntaxError,f=t.TypeError||u.TypeError,h=t.Math||u.Math,d=t.JSON||u.JSON;"object"==typeof d&&d&&(e.stringify=d.stringify,e.parse=d.parse);var p,v,m,y=a.prototype,b=y.toString,g=new l(-0xc782b5b800cec);try{g=-109252==g.getUTCFullYear()&&0===g.getUTCMonth()&&1===g.getUTCDate()&&10==g.getUTCHours()&&37==g.getUTCMinutes()&&6==g.getUTCSeconds()&&708==g.getUTCMilliseconds()}catch(w){}if(!n("json")){var x="[object Function]",_="[object Date]",E="[object Number]",j="[object String]",T="[object Array]",S="[object Boolean]",O=n("bug-string-char-index");if(!g)var C=h.floor,A=[0,31,59,90,120,151,181,212,243,273,304,334],N=function(t,e){return A[e]+365*(t-1970)+C((t-1969+(e=+(e>1)))/4)-C((t-1901+e)/100)+C((t-1601+e)/400)};if((p=y.hasOwnProperty)||(p=function(t){var e,n={};return(n.__proto__=null,n.__proto__={toString:1},n).toString!=b?p=function(t){var e=this.__proto__,n=t in(this.__proto__=null,this);return this.__proto__=e,n}:(e=n.constructor,p=function(t){var n=(this.constructor||e).prototype;return t in this&&!(t in n&&this[t]===n[t])}),n=null,p.call(this,t)}),v=function(t,e){var n,r,i,o=0;(n=function(){this.valueOf=0}).prototype.valueOf=0,r=new n;for(i in r)p.call(r,i)&&o++;return n=r=null,o?v=2==o?function(t,e){var n,r={},i=b.call(t)==x;for(n in t)i&&"prototype"==n||p.call(r,n)||!(r[n]=1)||!p.call(t,n)||e(n)}:function(t,e){var n,r,i=b.call(t)==x;for(n in t)i&&"prototype"==n||!p.call(t,n)||(r="constructor"===n)||e(n);(r||p.call(t,n="constructor"))&&e(n)}:(r=["valueOf","toString","toLocaleString","propertyIsEnumerable","isPrototypeOf","hasOwnProperty","constructor"],v=function(t,e){var n,i,o=b.call(t)==x,a=!o&&"function"!=typeof t.constructor&&s[typeof t.hasOwnProperty]&&t.hasOwnProperty||p;for(n in t)o&&"prototype"==n||!a.call(t,n)||e(n);for(i=r.length;n=r[--i];a.call(t,n)&&e(n));}),v(t,e)},!n("json-stringify")){var k={92:"\\\\",34:'\\"',8:"\\b",12:"\\f",10:"\\n",13:"\\r",9:"\\t"},I="000000",P=function(t,e){return(I+(e||0)).slice(-t)},L="\\u00",R=function(t){for(var e='"',n=0,r=t.length,i=!O||r>10,o=i&&(O?t.split(""):t);r>n;n++){var s=t.charCodeAt(n);switch(s){case 8:case 9:case 10:case 12:case 13:case 34:case 92:e+=k[s];break;default:if(32>s){e+=L+P(2,s.toString(16));break}e+=i?o[n]:t.charAt(n)}}return e+'"'},U=function(t,e,n,r,i,o,s){var a,u,l,c,h,d,y,g,w,x,O,A,k,I,L,M;try{a=e[t]}catch(q){}if("object"==typeof a&&a)if(u=b.call(a),u!=_||p.call(a,"toJSON"))"function"==typeof a.toJSON&&(u!=E&&u!=j&&u!=T||p.call(a,"toJSON"))&&(a=a.toJSON(t));else if(a>-1/0&&1/0>a){if(N){for(h=C(a/864e5),l=C(h/365.2425)+1970-1;N(l+1,0)<=h;l++);for(c=C((h-N(l,0))/30.42);N(l,c+1)<=h;c++);h=1+h-N(l,c),d=(a%864e5+864e5)%864e5,y=C(d/36e5)%24,g=C(d/6e4)%60,w=C(d/1e3)%60,x=d%1e3}else l=a.getUTCFullYear(),c=a.getUTCMonth(),h=a.getUTCDate(),y=a.getUTCHours(),g=a.getUTCMinutes(),w=a.getUTCSeconds(),x=a.getUTCMilliseconds();a=(0>=l||l>=1e4?(0>l?"-":"+")+P(6,0>l?-l:l):P(4,l))+"-"+P(2,c+1)+"-"+P(2,h)+"T"+P(2,y)+":"+P(2,g)+":"+P(2,w)+"."+P(3,x)+"Z"}else a=null;if(n&&(a=n.call(e,t,a)),null===a)return"null";if(u=b.call(a),u==S)return""+a;if(u==E)return a>-1/0&&1/0>a?""+a:"null";if(u==j)return R(""+a);if("object"==typeof a){for(I=s.length;I--;)if(s[I]===a)throw f();if(s.push(a),O=[],L=o,o+=i,u==T){for(k=0,I=a.length;I>k;k++)A=U(k,a,n,r,i,o,s),O.push(A===m?"null":A);M=O.length?i?"[\n"+o+O.join(",\n"+o)+"\n"+L+"]":"["+O.join(",")+"]":"[]"}else v(r||a,function(t){var e=U(t,a,n,r,i,o,s);e!==m&&O.push(R(t)+":"+(i?" ":"")+e)}),M=O.length?i?"{\n"+o+O.join(",\n"+o)+"\n"+L+"}":"{"+O.join(",")+"}":"{}";return s.pop(),M}};e.stringify=function(t,e,n){var r,i,o,a;if(s[typeof e]&&e)if((a=b.call(e))==x)i=e;else if(a==T){o={};for(var u,l=0,c=e.length;c>l;u=e[l++],a=b.call(u),(a==j||a==E)&&(o[u]=1));}if(n)if((a=b.call(n))==E){if((n-=n%1)>0)for(r="",n>10&&(n=10);r.length<n;r+=" ");}else a==j&&(r=n.length<=10?n:n.slice(0,10));return U("",(u={},u[""]=t,u),i,o,r,"",[])}}if(!n("json-parse")){var M,q,D=o.fromCharCode,W={92:"\\",34:'"',47:"/",98:"\b",116:"	",110:"\n",102:"\f",114:"\r"},J=function(){throw M=q=null,c()},B=function(){for(var t,e,n,r,i,o=q,s=o.length;s>M;)switch(i=o.charCodeAt(M)){case 9:case 10:case 13:case 32:M++;break;case 123:case 125:case 91:case 93:case 58:case 44:return t=O?o.charAt(M):o[M],M++,t;case 34:for(t="@",M++;s>M;)if(i=o.charCodeAt(M),32>i)J();else if(92==i)switch(i=o.charCodeAt(++M)){case 92:case 34:case 47:case 98:case 116:case 110:case 102:case 114:t+=W[i],M++;break;case 117:for(e=++M,n=M+4;n>M;M++)i=o.charCodeAt(M),i>=48&&57>=i||i>=97&&102>=i||i>=65&&70>=i||J();t+=D("0x"+o.slice(e,M));break;default:J()}else{if(34==i)break;for(i=o.charCodeAt(M),e=M;i>=32&&92!=i&&34!=i;)i=o.charCodeAt(++M);t+=o.slice(e,M)}if(34==o.charCodeAt(M))return M++,t;J();default:if(e=M,45==i&&(r=!0,i=o.charCodeAt(++M)),i>=48&&57>=i){for(48==i&&(i=o.charCodeAt(M+1),i>=48&&57>=i)&&J(),r=!1;s>M&&(i=o.charCodeAt(M),i>=48&&57>=i);M++);if(46==o.charCodeAt(M)){for(n=++M;s>n&&(i=o.charCodeAt(n),i>=48&&57>=i);n++);n==M&&J(),M=n}if(i=o.charCodeAt(M),101==i||69==i){for(i=o.charCodeAt(++M),(43==i||45==i)&&M++,n=M;s>n&&(i=o.charCodeAt(n),i>=48&&57>=i);n++);n==M&&J(),M=n}return+o.slice(e,M)}if(r&&J(),"true"==o.slice(M,M+4))return M+=4,!0;if("false"==o.slice(M,M+5))return M+=5,!1;if("null"==o.slice(M,M+4))return M+=4,null;J()}return"$"},G=function(t){var e,n;if("$"==t&&J(),"string"==typeof t){if("@"==(O?t.charAt(0):t[0]))return t.slice(1);if("["==t){for(e=[];t=B(),"]"!=t;n||(n=!0))n&&(","==t?(t=B(),"]"==t&&J()):J()),","==t&&J(),e.push(G(t));return e}if("{"==t){for(e={};t=B(),"}"!=t;n||(n=!0))n&&(","==t?(t=B(),"}"==t&&J()):J()),(","==t||"string"!=typeof t||"@"!=(O?t.charAt(0):t[0])||":"!=B())&&J(),e[t.slice(1)]=G(B());return e}J()}return t},F=function(t,e,n){var r=H(t,e,n);r===m?delete t[e]:t[e]=r},H=function(t,e,n){var r,i=t[e];if("object"==typeof i&&i)if(b.call(i)==T)for(r=i.length;r--;)F(i,r,n);else v(i,function(t){F(i,t,n)});return n.call(t,e,i)};e.parse=function(t,e){var n,r;return M=0,q=""+t,n=G(B()),"$"!=B()&&J(),M=q=null,e&&b.call(e)==x?H((r={},r[""]=n,r),"",e):n}}}return e.runInContext=i,e}var o="function"==typeof t&&t.amd,s={"function":!0,object:!0},a=s[typeof r]&&r&&!r.nodeType&&r,u=s[typeof window]&&window||this,l=a&&s[typeof n]&&n&&!n.nodeType&&"object"==typeof e&&e;if(!l||l.global!==l&&l.window!==l&&l.self!==l||(u=l),a&&!o)i(u,a);else{var c=u.JSON,f=u.JSON3,h=!1,d=i(u,u.JSON3={noConflict:function(){return h||(h=!0,u.JSON=c,u.JSON3=f,c=f=null),d}});u.JSON={parse:d.parse,stringify:d.stringify}}o&&t(function(){return d})}).call(this)}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],56:[function(t,e){"use strict";function n(t){var e=u.exec(t);return{protocol:e[1]?e[1].toLowerCase():"",slashes:!!e[2],rest:e[3]?e[3]:""}}function r(t,e,u){if(!(this instanceof r))return new r(t,e,u);var c,f,h,d,p=a.test(t),v=typeof e,m=this,y=0;"object"!==v&&"string"!==v&&(u=e,e=null),u&&"function"!=typeof u&&(u=s.parse),e=o(e);var b=n(t);for(m.protocol=b.protocol||e.protocol||"",m.slashes=b.slashes||e.slashes,t=b.rest;y<l.length;y++)f=l[y],c=f[0],d=f[1],c!==c?m[d]=t:"string"==typeof c?~(h=t.indexOf(c))&&("number"==typeof f[2]?(m[d]=t.slice(0,h),t=t.slice(h+f[2])):(m[d]=t.slice(h),t=t.slice(0,h))):(h=c.exec(t))&&(m[d]=h[1],t=t.slice(0,t.length-h[0].length)),m[d]=m[d]||(f[3]||"port"===d&&p?e[d]||"":""),f[4]&&(m[d]=m[d].toLowerCase());u&&(m.query=u(m.query)),i(m.port,m.protocol)||(m.host=m.hostname,m.port=""),m.username=m.password="",m.auth&&(f=m.auth.split(":"),m.username=f[0]||"",m.password=f[1]||""),m.href=m.toString()}var i=t("requires-port"),o=t("./lolcation"),s=t("querystringify"),a=/^\/(?!\/)/,u=/^([a-z0-9.+-]+:)?(\/\/)?(.*)$/i,l=[["#","hash"],["?","query"],["/","pathname"],["@","auth",1],[0/0,"host",void 0,1,1],[/\:(\d+)$/,"port"],[0/0,"hostname",void 0,1,1]];r.prototype.set=function(t,e,n){var r=this;return"query"===t?("string"==typeof e&&e.length&&(e=(n||s.parse)(e)),r[t]=e):"port"===t?(r[t]=e,i(e,r.protocol)?e&&(r.host=r.hostname+":"+e):(r.host=r.hostname,r[t]="")):"hostname"===t?(r[t]=e,r.port&&(e+=":"+r.port),r.host=e):"host"===t?(r[t]=e,/\:\d+/.test(e)&&(e=e.split(":"),r.hostname=e[0],r.port=e[1])):"protocol"===t?(r.protocol=e,r.slashes=!n):r[t]=e,r.href=r.toString(),r},r.prototype.toString=function(t){t&&"function"==typeof t||(t=s.stringify);var e,n=this,r=n.protocol;r&&":"!==r.charAt(r.length-1)&&(r+=":");var i=r+(n.slashes?"//":"");return n.username&&(i+=n.username,n.password&&(i+=":"+n.password),i+="@"),i+=n.hostname,n.port&&(i+=":"+n.port),i+=n.pathname,e="object"==typeof n.query?t(n.query):n.query,e&&(i+="?"!==e.charAt(0)?"?"+e:e),n.hash&&(i+=n.hash),i},r.qs=s,r.location=o,e.exports=r},{"./lolcation":57,querystringify:58,"requires-port":59}],57:[function(t,e){(function(n){"use strict";var r,i=/^[A-Za-z][A-Za-z0-9+-.]*:\/\//,o={hash:1,query:1};e.exports=function(e){e=e||n.location||{},r=r||t("./");var s,a={},u=typeof e;if("blob:"===e.protocol)a=new r(unescape(e.pathname),{});else if("string"===u){a=new r(e,{});for(s in o)delete a[s]}else if("object"===u){for(s in e)s in o||(a[s]=e[s]);void 0===a.slashes&&(a.slashes=i.test(e.href))}return a}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./":56}],58:[function(t,e,n){"use strict";function r(t){for(var e,n=/([^=?&]+)=([^&]*)/g,r={};e=n.exec(t);r[decodeURIComponent(e[1])]=decodeURIComponent(e[2]));return r}function i(t,e){e=e||"";var n=[];"string"!=typeof e&&(e="?");for(var r in t)o.call(t,r)&&n.push(encodeURIComponent(r)+"="+encodeURIComponent(t[r]));return n.length?e+n.join("&"):""}var o=Object.prototype.hasOwnProperty;n.stringify=i,n.parse=r},{}],59:[function(t,e){"use strict";e.exports=function(t,e){if(e=e.split(":")[0],t=+t,!t)return!1;switch(e){case"http":case"ws":return 80!==t;case"https":case"wss":return 443!==t;case"ftp":return 21!==t;case"gopher":return 70!==t;case"file":return!1}return 0!==t}},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/src/main/resources/static/sockjs/gulpfile.js b/src/main/resources/static/sockjs/gulpfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..14878b6fd2f3842de72c14c15e3fe73f698466f9
--- /dev/null
+++ b/src/main/resources/static/sockjs/gulpfile.js
@@ -0,0 +1,132 @@
+/* eslint camelcase: 0 */
+'use strict';
+
+var util = require('util')
+  , gulp = require('gulp')
+  , browserify = require('browserify')
+  , uglify = require('gulp-uglify')
+  , sourcemaps = require('gulp-sourcemaps')
+  , source = require('vinyl-source-stream')
+  , buffer = require('vinyl-buffer')
+  , envify = require('envify/custom')
+  , mocha = require('gulp-mocha')
+  , eslint = require('gulp-eslint')
+  , rename = require('gulp-rename')
+  , header = require('gulp-header')
+  , pkg = require('./package.json')
+  , fs = require('fs')
+  ;
+
+var libName = 'sockjs-' + pkg.version
+  , browserifyOptions = {
+      entries: './lib/entry.js'
+    , standalone: 'SockJS'
+    , insertGlobalVars: {
+        process: function () {
+          return '{ env: {} }';
+        }
+      }
+    }
+  ;
+
+var banner = '/* sockjs-client v<%= pkg.version %> | http://sockjs.org | MIT license */\n';
+
+gulp.task('test', function () {
+  gulp.src('tests/node.js', {read: false})
+    .pipe(mocha());
+});
+
+gulp.task('eslint', function () {
+  gulp.src([
+      'lib/**/*.js',
+      'tests/lib/**/*.js',
+      'tests/support/**/*.js',
+      'tests/*.js'
+    ])
+    .pipe(eslint())
+    .pipe(eslint.format());
+});
+
+gulp.task('watch', function () {
+  gulp.watch('tests/*.js', ['test']);
+});
+
+gulp.task('write-version', function () {
+  fs.writeFileSync('./lib/version.js', "module.exports = '" + pkg.version + "';\n");
+});
+
+gulp.task('testbundle', ['browserify:min'], function() {
+  return gulp.src('./build/' + libName + '.min.js')
+    .pipe(rename('sockjs.js'))
+    .pipe(gulp.dest('./tests/html/lib/'));
+});
+
+gulp.task('testbundle-debug', ['browserify'], function() {
+  gulp.src('./build/sockjs.js')
+    .pipe(rename('sockjs.js'))
+    .pipe(gulp.dest('./tests/html/lib/'));
+
+  return gulp.src('./build/sockjs.js.map')
+    .pipe(rename('sockjs.js.map'))
+    .pipe(gulp.dest('./tests/html/lib/'));
+});
+
+gulp.task('browserify', ['write-version'], function () {
+  return browserify(util._extend({
+      debug: true
+    }, browserifyOptions))
+    .bundle()
+    .pipe(source('sockjs.js'))
+    .pipe(buffer())
+    .pipe(sourcemaps.init({ loadMaps: true }))
+      .pipe(header(banner, { pkg: pkg }))
+    .pipe(sourcemaps.write('./'))
+    .pipe(gulp.dest('./build/'))
+    ;
+});
+
+gulp.task('browserify:min', ['write-version'], function () {
+  return browserify(browserifyOptions)
+    .exclude('debug')
+    .transform(envify({
+      NODE_ENV: 'production'
+    }))
+    .bundle()
+    .pipe(source(libName + '.min.js'))
+    .pipe(buffer())
+    .pipe(uglify({
+      compress: {
+        // remove debug statements from output entirely
+        pure_funcs: ['debug']
+      }
+    }))
+    .pipe(header(banner, { pkg: pkg }))
+    .pipe(gulp.dest('./build/'))
+    ;
+});
+
+gulp.task('release', ['browserify', 'browserify:min'], function () {
+  // sockjs-{version}.min.js
+  gulp.src('./build/' + libName + '.min.js')
+    .pipe(gulp.dest('./dist/'));
+
+  // sockjs-{version}.js
+  gulp.src('./build/sockjs.js')
+    .pipe(rename(libName + '.js'))
+    .pipe(gulp.dest('./dist/'));
+
+  gulp.src('./build/sockjs.js.map')
+    .pipe(gulp.dest('./dist/'));
+});
+
+gulp.task('stable-release', ['release'], function () {
+  // sockjs.min.js
+  gulp.src('./build/' + libName + '.min.js')
+    .pipe(rename('sockjs.min.js'))
+    .pipe(gulp.dest('./dist/'));
+
+  // sockjs.js
+  gulp.src('./build/sockjs.js')
+    .pipe(rename('sockjs.js'))
+    .pipe(gulp.dest('./dist/'));
+});
diff --git a/src/main/resources/static/sockjs/package.json b/src/main/resources/static/sockjs/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..d9b794b97d1c30f92e98da83071fa69ce7d3cc75
--- /dev/null
+++ b/src/main/resources/static/sockjs/package.json
@@ -0,0 +1,71 @@
+{
+  "name": "sockjs-client",
+  "description": "SockJS-client is a browser JavaScript library that provides a WebSocket-like object. SockJS gives you a coherent, cross-browser, Javascript API which creates a low latency, full duplex, cross-domain communication channel between the browser and the web server.",
+  "version": "1.1.1",
+  "author": "Bryce Kahle",
+  "browser": {
+    "./lib/transport/driver/websocket.js": "./lib/transport/browser/websocket.js",
+    "eventsource": "./lib/transport/browser/eventsource.js",
+    "./lib/transport/driver/xhr.js": "./lib/transport/browser/abstract-xhr.js",
+    "crypto": "./lib/utils/browser-crypto.js",
+    "events": "./lib/event/emitter.js"
+  },
+  "bugs": {
+    "url": "https://github.com/sockjs/sockjs-client/issues"
+  },
+  "contributors": [
+    {
+      "name": "Bryce Kahle",
+      "email": "bkahle@gmail.com"
+    },
+    {
+      "name": "Marek Majkowski",
+      "email": "deadbeef@popcount.org"
+    }
+  ],
+  "dependencies": {
+    "debug": "^2.2.0",
+    "eventsource": "~0.1.6",
+    "faye-websocket": "~0.11.0",
+    "inherits": "^2.0.1",
+    "json3": "^3.3.2",
+    "url-parse": "^1.1.1"
+  },
+  "devDependencies": {
+    "browserify": "^6.1.0",
+    "envify": "~3.0.0",
+    "expect.js": "~0.3.1",
+    "gulp": "^3.8.8",
+    "gulp-eslint": "~0.1.8",
+    "gulp-header": "^1.2.2",
+    "gulp-mocha": "~1.1.1",
+    "gulp-rename": "~1.2.0",
+    "gulp-sourcemaps": "~1.2.4",
+    "gulp-uglify": "~1.0.1",
+    "mocha": "^1.21.5",
+    "node-static": "^0.7.6",
+    "proxyquire": "~1.0.1",
+    "sockjs": "^0.3.17",
+    "vinyl-buffer": "~1.0.0",
+    "vinyl-source-stream": "^1.0.0",
+    "zuul": "git://github.com/brycekahle/zuul#ngrok"
+  },
+  "homepage": "http://sockjs.org",
+  "keywords": [
+    "websockets",
+    "websocket"
+  ],
+  "license": "MIT",
+  "main": "./lib/entry.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sockjs/sockjs-client.git"
+  },
+  "scripts": {
+    "test": "make test",
+    "test_local": "zuul --local 9090 -- tests/browser.js",
+    "zuul": "zuul -- tests/browser.js",
+    "gulp": "gulp",
+    "lint": "gulp eslint"
+  }
+}
diff --git a/src/main/resources/static/sockjs/tests/browser.js b/src/main/resources/static/sockjs/tests/browser.js
new file mode 100644
index 0000000000000000000000000000000000000000..7a71f747d435259ddef4e446194632dc83e9ca6f
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/browser.js
@@ -0,0 +1,17 @@
+'use strict';
+
+require('../lib/shims');
+
+// prevent global leak warnings on this
+global._jp = {};
+/* eslint-disable camelcase */
+global._sockjs_global = null;
+/* eslint-enable camelcase */
+
+require('./lib/main');
+require('./lib/utils');
+require('./lib/receivers');
+require('./lib/senders');
+require('./lib/end-to-end');
+require('./lib/iframe');
+require('./lib/transports');
diff --git a/src/main/resources/static/sockjs/tests/html/example-cursors.html b/src/main/resources/static/sockjs/tests/html/example-cursors.html
new file mode 100644
index 0000000000000000000000000000000000000000..6ddfc3b55994cf7a89d9e3f9634daf4bef9486e6
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/html/example-cursors.html
@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta charset="UTF-8" />
+
+  <link href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" rel="icon" type="image/x-icon" />
+
+  <script type="text/javascript" src="lib/sockjs.js"></script>
+  <script type="text/javascript" src="static/jquery.min.js"></script>
+
+  <script type="text/javascript" src="config.js"></script>
+
+  <style type="text/css">
+      .cursor {
+        height: 30px;
+        width: 30px;
+        position: absolute;
+        border: 1px solid gray;
+        z-index: -1;
+      }
+  </style>
+
+</head>
+<body>
+
+<form>
+  <select id="transport">
+  <option value="">- any - </option>
+  <option value="websocket">websocket</option>
+  <option value="not-websocket">- not websocket -</option>
+  <option value="xdr-streaming">xdr-streaming</option>
+  <option value="xhr-streaming">xhr-streaming</option>
+  <option value="iframe-eventsource">iframe-eventsource</option>
+  <option value="iframe-htmlfile">iframe-htmlfile</option>
+  <option value="xdr-polling">xdr-polling</option>
+  <option value="xhr-polling">xhr-polling</option>
+  <option value="iframe-xhr-polling">iframe-xhr-polling</option>
+  <option value="jsonp-polling">jsonp-polling</option>
+  </select>
+  <input type="checkbox" id="sameOrigin" checked>Same Origin?
+  <input type="button" value="Connect" id="connect">
+  <input type="button" value="Disconnect" id="disconnect" disabled="yes">
+</form>
+
+  Latency: <code id="latency"></code><br>
+  <code id="logs" style="height:200px; overflow:auto; display: block; border: 1px gray solid;">
+  </code>
+
+<script>
+    function log(a) {
+            if ('console' in window && 'log' in window.console) {
+                console.log(a);
+            }
+            $('#logs').append($("<code>").text(a));
+            $('#logs').append($("<br>"));
+            $('#logs').scrollTop($('#logs').scrollTop()+10000);
+      }
+
+    var sjs = null;
+    var transport;
+    $('#connect').click(function() {
+        $('#connect').attr('disabled', true);
+        $('#disconnect').each(function(_,e){e.disabled='';});
+        var transport = $('#transport').val() || undefined;
+        if (transport === 'not-websocket') {
+            transport = ['xdr-streaming',
+                      'xhr-streaming',
+                      'eventsource',
+                      'iframe-eventsource',
+                      'htmlfile',
+                      'iframe-htmlfile',
+                      'xdr-polling',
+                      'xhr-polling',
+                      'iframe-xhr-polling',
+                      'jsonp-polling'];
+        }
+        log('[connecting] ' + transport);
+        var url;
+        if ($('#sameOrigin').prop('checked')) {
+          if (window.location.origin) url = window.location.origin;
+          else {
+            url = window.location.protocol + '//' + window.location.hostname +
+              (window.location.port ? ':' + window.location.port : '');
+          }
+        } else {
+          url = clientOptions.url;
+        }
+        sjs = new SockJS(url + '/broadcast', null, { transports: transport });
+        sjs.onopen = onopen
+        sjs.onclose = onclose;
+        sjs.onmessage = xonmessage;
+    });
+    $('#disconnect').click(function() {
+        $('#disconnect').attr('disabled', true);
+        log('[disconnecting]');
+        sjs.close();
+    });
+
+    var onopen = function() {
+        log('connected ' + sjs.transport);
+        $('#sameOrigin').attr('disabled', true);
+    };
+    var onclose = function(e) {
+        log('disconnected ' + e.code + ', ' + e.reason);
+        $('#connect').each(function(_,e){e.disabled='';});
+        $('#disconnect').attr('disabled', true);
+        $('#sameOrigin').attr('disabled', false);
+    };
+    var myself = (''+Math.random()).substr(2);
+    var xonmessage = function(e) {
+        var msg = JSON.parse(e.data);
+        if (msg.id === myself) {
+            var td = (new Date()).getTime() - msg.t;
+            $('#latency').text('' + td + ' ms');
+        }
+        var id = 'cursor_'+msg.id;
+        if ($('#'+id).length === 0) {
+            $("body").append('<div id="' + id + '" class="cursor"></div>');
+        }
+        $('#'+id).offset({top:msg.y-15, left:msg.x-15});
+    };
+    var x, y;
+    var last_x, last_y, tref;
+    $(document).mousemove(function(e) {
+         x = e.pageX; y = e.pageY;
+         if(!tref) poll();
+    });
+    var poll = function() {
+         tref = null;
+         if (last_x === x && last_y === y)
+             return;
+         var msg = {x:x, y:y, t: (new Date()).getTime(), id:myself};
+         last_x = x; last_y = y;
+         var raw_msg = JSON.stringify(msg);
+         if (sjs && sjs.readyState === SockJS.OPEN) {
+             sjs.send(raw_msg);
+         }
+         tref = setTimeout(poll, 200);
+    };
+    $('#connect').each(function(_,e){e.disabled='';});
+    $('#disconnect').attr('disabled', true);
+</script>
+</body>
+</html>
diff --git a/src/main/resources/static/sockjs/tests/html/iframe.html b/src/main/resources/static/sockjs/tests/html/iframe.html
new file mode 100644
index 0000000000000000000000000000000000000000..2176f2cd43fbe9d21952b181f5c0d81ea0150c84
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/html/iframe.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <script>
+    document.domain = document.domain;
+  </script>
+  <script src="/lib/sockjs.js"></script>
+</head>
+<body>
+  <h2>Don't panic!</h2>
+  <script>
+    c = parent._sockjs_global;
+    window_id = window.location.hash.slice(1);
+    hook = c(window_id);
+    hook.callback = function(code) {eval(code);};
+    hook.open();
+  </script>
+</body>
diff --git a/src/main/resources/static/sockjs/tests/html/index.html b/src/main/resources/static/sockjs/tests/html/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..a37568ded76dd6cec4b00a663db703afb08ac34b
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/html/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta charset="UTF-8" />
+
+  <link href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" rel="icon" type="image/x-icon" />
+
+</head>
+<body>
+  <h1>SockJS</h1>
+  <ul>
+    <li><a href="/__zuul">Zuul tests</a></li>
+    <li><a href="example-cursors.html">Cursors example</a></li>
+    <li><a href="smoke-latency.html">Smoketest: latency</a></li>
+    <li><a href="smoke-reconnect.html">Smoketest: reconnect</a></li>
+    <li><a href="web-worker.html">Web Worker</a></li>
+  </ul>
+</body>
+</html>
diff --git a/src/main/resources/static/sockjs/tests/html/smoke-latency.html b/src/main/resources/static/sockjs/tests/html/smoke-latency.html
new file mode 100644
index 0000000000000000000000000000000000000000..97b7904dfb4bc2c9613234cbd4e7f67bc1453df1
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/html/smoke-latency.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta charset="UTF-8" />
+
+  <link href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" rel="icon" type="image/x-icon" />
+
+  <script type="text/javascript" src="lib/sockjs.js"></script>
+  <script type="text/javascript" src="static/jquery.min.js"></script>
+
+  <script type="text/javascript" src="config.js"></script>
+</head>
+<body>
+<form>
+  <input type="text" id="url" size="40">
+  <br />
+  <select id="transport">
+  <option value="">- any - </option>
+  <option value="websocket">websocket</option>
+  <option value="xdr-streaming">xdr-streaming</option>
+  <option value="xhr-streaming">xhr-streaming</option>
+  <option value="eventsource">eventsource</option>
+  <option value="iframe-eventsource">iframe-eventsource</option>
+  <option value="htmlfile">htmlfile</option>
+  <option value="iframe-htmlfile">iframe-htmlfile</option>
+  <option value="xdr-polling">xdr-polling</option>
+  <option value="xhr-polling">xhr-polling</option>
+  <option value="iframe-xhr-polling">iframe-xhr-polling</option>
+  <option value="jsonp-polling">jsonp-polling</option>
+  </select>
+  <input type="checkbox" id="sameOrigin" checked>Same Origin?
+  <input type="button" value="Connect" id="connect">
+  <input type="button" value="Disconnect" id="disconnect" disabled="yes">
+</form>
+
+  Latency: <code id="latency"></code><br>
+  <code id="logs" style="height:200px; overflow:auto; display: block; border: 1px gray solid;">
+  </code>
+
+<script>
+    function log(a) {
+            if ('console' in window && 'log' in window.console) {
+                console.log(a);
+            }
+            $('#logs').append($("<code>").text(a));
+            $('#logs').append($("<br>"));
+            $('#logs').scrollTop($('#logs').scrollTop()+10000);
+      }
+
+    var sjs;
+    function onopen() {
+            log('connected ' + sjs.transport);
+            $('#sameOrigin').attr('disabled', true);
+            send();
+    };
+    function onclose(e) {
+            log('disconnected ' + e.code + ', ' + e.reason);
+            $('#connect').each(function(_,e){e.disabled='';});
+            $('#disconnect').attr('disabled', true);
+            $('#sameOrigin').attr('disabled', false);
+    };
+    function send() {
+        sjs.send(JSON.stringify({t: (new Date()).getTime()}));
+    };
+    var i = 0;
+    function xonmessage(e) {
+            var msg = JSON.parse(e.data);
+            var td = (new Date()).getTime() - msg.t;
+            $('#latency').text(''+i +'  ' + td + ' ms');
+            i += 1;
+            send();
+    };
+
+    $('#connect').click(function() {
+        $('#connect').attr('disabled', true);
+        $('#disconnect').each(function(_,e){e.disabled='';});
+        var transport = $('#transport').val() || undefined;
+        log('[connecting] ' + transport);
+        var url;
+        if ($('#url').val()) {
+          url = $('#url').val();
+        } else if ($('#sameOrigin').prop('checked')) {
+          if (window.location.origin) url = window.location.origin;
+          else {
+            url = window.location.protocol + '//' + window.location.hostname +
+              (window.location.port ? ':' + window.location.port : '');
+          }
+          url += '/echo';
+        } else {
+          url = clientOptions.url + '/echo';
+        }
+        sjs = new SockJS(url, null, { transports: transport });
+        sjs.onopen = onopen
+        sjs.onclose = onclose;
+        sjs.onmessage = xonmessage;
+    });
+    $('#disconnect').click(function() {
+        $('#disconnect').attr('disabled', true);
+        log('[disconnecting]');
+        sjs.close();
+    });
+</script>
+</body>
+</html>
diff --git a/src/main/resources/static/sockjs/tests/html/smoke-reconnect.html b/src/main/resources/static/sockjs/tests/html/smoke-reconnect.html
new file mode 100644
index 0000000000000000000000000000000000000000..2ef4f0aa884ced47736761e6ae700994fa280bd2
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/html/smoke-reconnect.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta charset="UTF-8" />
+
+  <link href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" rel="icon" type="image/x-icon" />
+
+  <script type="text/javascript" src="lib/sockjs.js"></script>
+  <script type="text/javascript" src="static/jquery.min.js"></script>
+
+  <script type="text/javascript" src="config.js"></script>
+</head>
+<body>
+<form>
+  <select id="transport">
+  <option value="">- any - </option>
+  <option value="websocket">websocket</option>
+  <option value="xdr-streaming">xdr-streaming</option>
+  <option value="xhr-streaming">xhr-streaming</option>
+  <option value="iframe-eventsource">iframe-eventsource</option>
+  <option value="iframe-htmlfile">iframe-htmlfile</option>
+  <option value="xdr-polling">xdr-polling</option>
+  <option value="xhr-polling">xhr-polling</option>
+  <option value="iframe-xhr-polling">iframe-xhr-polling</option>
+  <option value="jsonp-polling">jsonp-polling</option>
+  </select>
+  <input type="checkbox" id="sameOrigin" checked>Same Origin?
+  <input type="button" value="Start" id="connect">
+  <input type="button" value="Stop" id="disconnect" disabled="yes">
+</form>
+
+  Connected: <code id="out"></code><br>
+  <code id="logs" style="height:200px; overflow:auto; display: block; border: 1px gray solid;">
+  </code>
+
+<script>
+    function log(a) {
+            if ('console' in window && 'log' in window.console) {
+                console.log(a);
+            }
+            $('#logs').append($("<code>").text(a));
+            $('#logs').append($("<br>"));
+            $('#logs').scrollTop($('#logs').scrollTop()+10000);
+      }
+
+    var started = false;
+    var sjs;
+    var i = 0;
+    var transport;
+    var t0;
+    function onopen() {
+      $('#sameOrigin').attr('disabled', true);
+       var td = (new Date()).getTime() - t0;
+       i += 1;
+       $('#out').text(''+i +'  ' + td + ' ms');
+       sjs.close();
+    };
+    function onclose(e) {
+        if (started && e.code === 1000) {
+            t0 = (new Date()).getTime();
+            var url;
+            if ($('#sameOrigin').prop('checked')) {
+              if (window.location.origin) url = window.location.origin;
+              else {
+                url = window.location.protocol + '//' + window.location.hostname +
+                  (window.location.port ? ':' + window.location.port : '');
+              }
+            } else {
+              url = clientOptions.url;
+            }
+            sjs = new SockJS(clientOptions.url + '/echo', null, { transports: transport });
+            sjs.onopen = onopen
+            sjs.onclose = onclose;
+        } else {
+            log('[stopped] ' + e.code + ', ' + e.reason);
+            $('#connect').each(function(_,e){e.disabled='';});
+            $('#disconnect').attr('disabled', true);
+            $('#sameOrigin').attr('disabled', false);
+        }
+    };
+
+    $('#connect').click(function() {
+        started = true;
+        transport = $('#transport').val() || undefined;
+        log('[starting] ' + transport);
+        onclose({code:1000});
+        $('#connect').attr('disabled', true);
+        $('#disconnect').each(function(_,e){e.disabled='';});
+    });
+    $('#disconnect').click(function() {
+        $('#disconnect').attr('disabled', true);
+        log('[stopping...]');
+        started = false;
+    });
+</script>
+</body>
+</html>
diff --git a/src/main/resources/static/sockjs/tests/html/sockjs-in-head.html b/src/main/resources/static/sockjs/tests/html/sockjs-in-head.html
new file mode 100644
index 0000000000000000000000000000000000000000..97b7d9391f457d1c2cf2feb6e2587e0f820a9675
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/html/sockjs-in-head.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <script>
+    document.domain = document.domain;
+  </script>
+  <script src="/__zuul/test-bundle.js?no=cache"></script>
+  <script>
+    c = parent._sockjs_global;
+    window_id = window.location.hash.slice(1);
+    hook = c(window_id);
+    hook.callback = function(code) {eval(code);};
+    hook.open();
+  </script>
+  <script src="slow-script.js?yes=nocache"></script>
+</head>
+<body>
+  <h2>Don't panic!</h2>
+</body>
diff --git a/src/main/resources/static/sockjs/tests/html/sockjs-in-parent.html b/src/main/resources/static/sockjs/tests/html/sockjs-in-parent.html
new file mode 100755
index 0000000000000000000000000000000000000000..d06e3adc1838a9e2abd2f33f101cb8806a6c693f
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/html/sockjs-in-parent.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <script>
+    document.domain = document.domain;
+  </script>
+  <script>
+    c = parent._sockjs_global;
+    window_id = window.location.hash.slice(1);
+    hook = c(window_id);
+    hook.callback = function(code) {eval(code);};
+    hook.open();
+  </script>
+</head>
+<body>
+  <h2>Don't panic!</h2>
+</body>
diff --git a/src/main/resources/static/sockjs/tests/html/static/jquery.min.js b/src/main/resources/static/sockjs/tests/html/static/jquery.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..198b3ff07d801dffa2c42fcf3b67eb3295eef85f
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/html/static/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/src/main/resources/static/sockjs/tests/html/web-worker.html b/src/main/resources/static/sockjs/tests/html/web-worker.html
new file mode 100644
index 0000000000000000000000000000000000000000..44c933d51e0bbf4d2e8fff9d814cdd22114dcd40
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/html/web-worker.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta charset="UTF-8" />
+
+  <link href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=" rel="icon" type="image/x-icon" />
+
+  <script type="text/javascript" src="lib/sockjs.js"></script>
+  <script type="text/javascript" src="static/jquery.min.js"></script>
+
+  <script type="text/javascript" src="config.js"></script>
+</head>
+<body>
+<form>
+  <select id="transport">
+  <option value="">- any - </option>
+  <option value="websocket">websocket</option>
+  <option value="xdr-streaming">xdr-streaming</option>
+  <option value="xhr-streaming">xhr-streaming</option>
+  <option value="eventsource">eventsource</option>
+  <option value="iframe-eventsource">iframe-eventsource</option>
+  <option value="htmlfile">htmlfile</option>
+  <option value="iframe-htmlfile">iframe-htmlfile</option>
+  <option value="xdr-polling">xdr-polling</option>
+  <option value="xhr-polling">xhr-polling</option>
+  <option value="iframe-xhr-polling">iframe-xhr-polling</option>
+  <option value="jsonp-polling">jsonp-polling</option>
+  </select>
+  <input type="checkbox" id="sameOrigin" checked>Same Origin?
+  <input type="button" value="Connect" id="connect">
+  <input type="button" value="Disconnect" id="disconnect" disabled="yes">
+</form>
+
+  Latency: <code id="latency"></code><br>
+  <code id="logs" style="height:200px; overflow:auto; display: block; border: 1px gray solid;">
+  </code>
+
+<script>
+  /* global $, clientOptions */
+  'use strict';
+  function log(a) {
+    if ('console' in window && 'log' in window.console) {
+        console.log(a);
+    }
+    $('#logs').append($('<code>').text(a));
+    $('#logs').append($('<br>'));
+    $('#logs').scrollTop($('#logs').scrollTop() + 10000);
+  }
+
+  var worker;
+  function send() {
+    worker.postMessage(JSON.stringify({ type: 'message', data: JSON.stringify({ t: (new Date()).getTime()}) }));
+  }
+  function onopen() {
+    log('connected');
+    $('#sameOrigin').attr('disabled', true);
+    send();
+  }
+  function onclose(code, reason) {
+    log('disconnected ' + code + ', ' + reason);
+    $('#connect').each(function(_,e){
+      e.disabled = '';
+    });
+    $('#disconnect').attr('disabled', true);
+    $('#sameOrigin').attr('disabled', false);
+  }
+
+  var i = 0;
+  function xonmessage(e) {
+    var msg = JSON.parse(e);
+    var td = (new Date()).getTime() - msg.t;
+    $('#latency').text('' + i + '  ' + td + ' ms');
+    i += 1;
+    send();
+  }
+
+  $('#connect').click(function() {
+      $('#connect').attr('disabled', true);
+      $('#disconnect').each(function(_,e){
+        e.disabled = '';
+      });
+      var transport = $('#transport').val() || undefined;
+      log('[connecting] ' + transport);
+      var url;
+      if ($('#sameOrigin').prop('checked')) {
+        if (window.location.origin) {
+          url = window.location.origin;
+        } else {
+          url = window.location.protocol + '//' + window.location.hostname +
+            (window.location.port ? ':' + window.location.port : '');
+        }
+      } else {
+        url = clientOptions.url;
+      }
+      worker = new Worker('lib/worker.js');
+      worker.onmessage = function (e) {
+        var msg = JSON.parse(e.data);
+        switch (msg.type) {
+          case 'message':
+            xonmessage(msg.data);
+            break;
+          case 'open':
+            onopen();
+            break;
+          case 'close':
+            onclose(msg.code, msg.reason);
+            break;
+          case 'error':
+            console.error(msg.data);
+            break;
+          default:
+            console.error('unknown type: ' + msg.type);
+        }
+      };
+
+      worker.postMessage(JSON.stringify({ type: 'open', url: url + '/echo', transports: transport }));
+  });
+  $('#disconnect').click(function() {
+    $('#disconnect').attr('disabled', true);
+    log('[disconnecting]');
+    worker.postMessage(JSON.stringify({ type: 'close' }));
+  });
+</script>
+</body>
+</html>
diff --git a/src/main/resources/static/sockjs/tests/node.js b/src/main/resources/static/sockjs/tests/node.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f2b0af4b0e0f6641a61a42cab1f379b70a1322f
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/node.js
@@ -0,0 +1,15 @@
+'use strict';
+
+var server = require('./support/sockjs_server');
+
+require('./lib/main');
+require('./lib/main-node');
+require('./lib/utils');
+require('./lib/receivers');
+require('./lib/senders');
+require('./lib/end-to-end');
+require('./lib/transports');
+
+after(function() {
+	server.close();
+});
diff --git a/src/main/resources/static/sockjs/tests/support/sockjs_app.js b/src/main/resources/static/sockjs/tests/support/sockjs_app.js
new file mode 100644
index 0000000000000000000000000000000000000000..894ce5471284f9f9680fbb76170549e6cd290d6f
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/support/sockjs_app.js
@@ -0,0 +1,88 @@
+/* eslint camelcase: 0 */
+'use strict';
+var sockjs = require('sockjs');
+var debug = require('debug')('sockjs-client:test-server:app');
+
+exports.install = function(opts, server) {
+  var sjs_echo = sockjs.createServer(opts);
+  sjs_echo.on('connection', function(conn) {
+    debug('    [+] echo open    ' + conn);
+    conn.on('close', function() {
+      debug('    [-] echo close   ' + conn);
+    });
+    conn.on('data', function(m) {
+      var d = JSON.stringify(m);
+      debug('    [ ] echo message ' + conn,
+                  d.slice(0, 64) +
+                  ((d.length > 64) ? '...' : ''));
+      conn.write(m);
+    });
+  });
+
+  var sjs_close = sockjs.createServer(opts);
+  sjs_close.on('connection', function(conn) {
+    debug('    [+] close open    ' + conn);
+    conn.close(3000, 'Go away!');
+    conn.on('close', function() {
+      debug('    [-] close close   ' + conn);
+    });
+  });
+
+  var sjs_ticker = sockjs.createServer(opts);
+  sjs_ticker.on('connection', function(conn) {
+    debug('    [+] ticker open   ' + conn);
+    var tref;
+    var schedule = function() {
+      conn.write('tick!');
+      tref = setTimeout(schedule, 1000);
+    };
+    tref = setTimeout(schedule, 1000);
+    conn.on('close', function() {
+      clearTimeout(tref);
+      debug('    [-] ticker close   ' + conn);
+    });
+  });
+
+  var broadcast = {};
+  var sjs_broadcast = sockjs.createServer(opts);
+  sjs_broadcast.on('connection', function(conn) {
+    debug('    [+] broadcast open ' + conn);
+    broadcast[conn.id] = conn;
+    conn.on('close', function() {
+      delete broadcast[conn.id];
+      debug('    [-] broadcast close' + conn);
+    });
+    conn.on('data', function(m) {
+      debug('    [-] broadcast message', m);
+      for(var id in broadcast) {
+          broadcast[id].write(m);
+      }
+    });
+  });
+
+  var sjs_amplify = sockjs.createServer(opts);
+  sjs_amplify.on('connection', function(conn) {
+    debug('    [+] amp open    ' + conn);
+    conn.on('close', function() {
+      debug('    [-] amp close   ' + conn);
+    });
+    conn.on('data', function(m) {
+      var n = Math.floor(Number(m));
+      n = (n > 0 && n < 19) ? n : 1;
+      debug('    [ ] amp message: 2^' + n);
+      conn.write(new Array(Math.pow(2, n) + 1).join('x'));
+    });
+  });
+
+
+  sjs_echo.installHandlers(server, {prefix: '/echo',
+                                    response_limit: 4096});
+  sjs_echo.installHandlers(server, {prefix: '/disabled_websocket_echo',
+                                    websocket: false});
+  sjs_echo.installHandlers(server, {prefix: '/cookie_needed_echo',
+                                    jsessionid: true});
+  sjs_close.installHandlers(server, {prefix: '/close'});
+  sjs_ticker.installHandlers(server, {prefix: '/ticker'});
+  sjs_amplify.installHandlers(server, {prefix: '/amplify'});
+  sjs_broadcast.installHandlers(server, {prefix: '/broadcast'});
+};
diff --git a/src/main/resources/static/sockjs/tests/support/sockjs_server.js b/src/main/resources/static/sockjs/tests/support/sockjs_server.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d5a079d54bcfb573171c89d3fdfdffdebc3b3f3
--- /dev/null
+++ b/src/main/resources/static/sockjs/tests/support/sockjs_server.js
@@ -0,0 +1,78 @@
+/* eslint camelcase: 0 */
+'use strict';
+
+var http = require('http');
+var nodeStatic = require('node-static');
+var sockjs = require('./sockjs_app');
+var url = require('url');
+var path = require('path');
+var debug = require('debug')('sockjs-client:test-server:main');
+
+var port = process.env.ZUUL_PORT || 8081;
+var clientOptions = {
+  // Address of a sockjs test server.
+  url: 'http://localhost:' + port,
+  sockjs_opts: {
+      // websocket:false
+      info: {cookie_needed: false}
+  }
+};
+
+var staticDir = new nodeStatic.Server(path.join(__dirname, '../html'), { cache: 0 });
+
+var server = http.createServer();
+server.addListener('request', function(req, res) {
+  if ( /\/slow-script.js/.test(req.url) ) {
+    res.setHeader('content-type', 'application/javascript');
+    res.writeHead(200);
+    setTimeout(function() {
+        res.end('var a = 1;\n');
+    }, 500);
+  } else if ( /\/streaming.txt/.test(req.url) ) {
+    res.setHeader('content-type', 'text/plain');
+    res.setHeader('Access-Control-Allow-Origin', '*');
+
+    res.writeHead(200);
+    res.write(new Array(2049).join('a') + '\n');
+    setTimeout(function() {
+        res.end('b\n');
+    }, 250);
+  } else if ( /\/simple.txt/.test(req.url) ) {
+    res.setHeader('content-type', 'text/plain');
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    res.writeHead(200);
+    res.end(new Array(2049).join('a') + '\nb\n');
+  } else if (req.url === '/config.js') {
+    if (req.headers.referer) {
+      var parsedOrigin = url.parse(req.headers.referer);
+      clientOptions.url = parsedOrigin.protocol + '//' + parsedOrigin.hostname + ':' + port;
+    }
+    res.setHeader('content-type', 'application/javascript');
+    res.writeHead(200);
+    res.end('var clientOptions = ' +
+            JSON.stringify(clientOptions) + ';');
+  } else if (req.url === '/domain.js') {
+    res.setHeader('content-type', 'application/javascript');
+    res.writeHead(200);
+    res.end('document.domain = document.domain;');
+  } else {
+    staticDir.serve(req, res);
+  }
+});
+server.addListener('upgrade', function(req, res){
+  console.log('upgrade kill');
+  res.end();
+});
+
+sockjs.install({
+  sockjs_url: '/lib/sockjs.js',
+  websocket: true,
+  log: function (severity, message) {
+    debug('[%s] %s', severity, message);
+  }
+}, server);
+
+console.log(' [*] Listening on', port);
+server.listen(port);
+
+module.exports = server;
diff --git a/src/main/resources/static/stomp-ws/Cakefile b/src/main/resources/static/stomp-ws/Cakefile
new file mode 100644
index 0000000000000000000000000000000000000000..e74b7990de6ca543cc92907e8ad8ebfdfe0b0f07
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/Cakefile
@@ -0,0 +1,86 @@
+fs     = require 'fs'
+{exec} = require 'child_process'
+util   = require 'util'
+
+binDir = "./node_modules/.bin/"
+
+task 'watch', 'Watch for changes in coffee files to build and test', ->
+    util.log "Watching for changes in src and test"
+    lastTest = 0
+    watchDir 'src', ->
+      invoke 'build:src'
+      invoke 'build:min'
+      invoke 'build:doc'
+      invoke 'build:test'
+    watchDir 'test', ->
+      invoke 'build:test'
+    watchDir 'dist/test', (file)->
+      # We only want to run tests once (a second), 
+      # even if a bunch of test files change
+      time = new Date().getTime()
+      if (time-lastTest) > 1000
+        lastTest = time
+        invoke 'test'
+
+task 'test', 'Run the tests', ->
+  util.log "Running tests..."
+  exec binDir + "jasmine-node --nocolor dist/test", (err, stdout, stderr) -> 
+    if err
+      handleError(parseTestResults(stdout), stderr)
+    else
+      displayNotification "Tests pass!"
+      util.log lastLine(stdout)
+
+task 'build', 'Build source and tests', ->
+  invoke 'build:src'
+  invoke 'build:min'
+  invoke 'build:test'
+
+task 'build:src', 'Build the src files into lib', ->
+  util.log "Compiling src..."
+  exec binDir + "coffee -o lib/ -c src/", (err, stdout, stderr) -> 
+    handleError(err) if err
+
+task 'build:min', 'Build the minified files into lib', ->
+  util.log "Minify src..."
+  exec binDir + "uglifyjs -m --comments all -o lib/stomp.min.js lib/stomp.js", (err, stdout, stderr) ->
+    handleError(err) if err
+
+task 'build:doc', 'Build docco documentation', ->
+  util.log "Building doc..."
+  exec binDir + "docco -o doc/ src/*.coffee", (err, stdout, stderr) -> 
+    handleError(err) if err
+
+task 'build:test', 'Build the test files into lib/test', ->
+  util.log "Compiling test..."
+  exec binDir + "coffee -o dist/test/ -c test/", (err, stdout, stderr) -> 
+    handleError(err) if err
+
+watchDir = (dir, callback) ->
+  fs.readdir dir, (err, files) ->
+      handleError(err) if err
+      for file in files then do (file) ->
+          fs.watchFile "#{dir}/#{file}", (curr, prev) ->
+              if +curr.mtime isnt +prev.mtime
+                  callback "#{dir}/#{file}"
+
+parseTestResults = (data) ->
+  lines = (line for line in data.split('\n') when line.length > 5)
+  results = lines.pop()
+  details = lines[1...lines.length-2].join('\n')
+  results + '\n\n' + details + '\n'
+
+lastLine = (data) ->
+  (line for line in data.split('\n') when line.length > 5).pop()
+
+handleError = (error, stderr) -> 
+  if stderr? and !error
+    util.log stderr
+    displayNotification stderr.match(/\n(Error:[^\n]+)/)?[1]
+  else
+    util.log error
+    displayNotification error
+        
+displayNotification = (message = '') -> 
+  options = { title: 'CoffeeScript' }
+  try require('growl').notify message, options
diff --git a/src/main/resources/static/stomp-ws/LICENSE.txt b/src/main/resources/static/stomp-ws/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..65ee1c1226efc8dd16aff1e327a19d088c3be071
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/README.md b/src/main/resources/static/stomp-ws/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..9e3ce3d5572fba8d1ff5210884efb391bd9147be
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/README.md
@@ -0,0 +1,77 @@
+# STOMP.js
+
+This library provides a STOMP client for Web browser (using Web Sockets) or node.js applications (either using raw TCP sockets or Web Sockets).
+
+# Project Status
+
+__This project is _no longer maintained_ ([some context about this decision](http://jmesnil.net/weblog/2015/09/04/stepping-out-from-personal-open-source-projects/)).__
+
+__If you encounter bugs with it or need enhancements, you can fork it and modify it as the project is under the Apache License 2.0.__
+
+## Web Browser support
+
+The library file is located in `lib/stomp.js` (a minified version is available in `lib/stomp.min.js`).
+It does not require any dependency (except WebSocket support from the browser or an alternative to WebSocket!)
+
+Online [documentation][doc] describes the library API (including the [annotated source code][annotated]).
+
+## node.js support
+
+Install the 'stompjs' module
+
+    $ npm install stompjs
+
+In the node.js app, require the module with:
+
+    var Stomp = require('stompjs');
+
+To connect to a STOMP broker over a TCP socket, use the `Stomp.overTCP(host, port)` method:
+
+    var client = Stomp.overTCP('localhost', 61613);
+
+To connect to a STOMP broker over a WebSocket, use instead the `Stomp.overWS(url)` method:
+
+    var client = Stomp.overWS('ws://localhost:61614');
+
+## Development Requirements
+
+For development (testing, building) the project requires node.js. This allows us to run tests without the browser continuously during development (see `cake watch`).
+
+    $ npm install
+
+## Building and Testing
+
+[![Build Status](https://secure.travis-ci.org/jmesnil/stomp-websocket.png)](http://travis-ci.org/jmesnil/stomp-websocket)
+
+To build JavaScript from the CoffeeScript source code:
+
+    $ cake build
+
+To run tests:
+
+    $ cake test
+
+To continuously run tests on file changes:
+
+    $ cake watch
+
+
+## Browser Tests
+
+* Make sure you have a running STOMP broker which supports the WebSocket protocol
+ (see the [documentation][doc])
+* Open in your web browser the project's [test page](browsertests/index.html)
+* Check all tests pass
+
+## Use
+
+The project contains examples for using stomp.js
+to send and receive STOMP messages from a server directly in the Web Browser or in a WebWorker.
+
+## Authors
+
+ * [Jeff Mesnil](http://jmesnil.net/)
+ * [Jeff Lindsay](http://github.com/progrium)
+
+[doc]: http://jmesnil.net/stomp-websocket/doc/
+[annotated]: http://jmesnil.net/stomp-websocket/doc/stomp.html
diff --git a/src/main/resources/static/stomp-ws/RELEASE_NOTES.md b/src/main/resources/static/stomp-ws/RELEASE_NOTES.md
new file mode 100644
index 0000000000000000000000000000000000000000..9757438204b4d1105d4ac620d4c2534a0ffe6088
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/RELEASE_NOTES.md
@@ -0,0 +1,32 @@
+# Release Notes
+
+## 2.0 (2012/11/29)
+
+### STOMP 1.1 support
+
+* heart-beat
+* nack
+* content-length
+
+### API change
+
+* the `errorCallback` passed to the `connect()` method is no longer called when the
+  client is properly disconnected by calling `disconnect()`.
+
+* ack() method takes 3 parameters:
+  * `messageID` & `subscription` are MANDATORY.
+  * `headers` is OPTIONAL
+
+* the `client` object has a `heartbeat` field which can be used to configure heart-beating by changing its `incoming` and `outgoing` integer fields (default value for both is 10000ms):
+
+    client.heartbeat.outgoing = 20000 // client will send heartbeats every 20000ms
+    client.heartbeat.incoming = 0 // client does not want to receive heartbeats
+                                  // from the server
+
+### Minified version
+
+In addition to the regular `stomp.js` file, the library is also available in a minified version `stomp.min.js`
+
+### Annotated source
+
+The source is now [documented](http://jmesnil.net/stomp-websocket/stomp.html) :)
diff --git a/src/main/resources/static/stomp-ws/bower.json b/src/main/resources/static/stomp-ws/bower.json
new file mode 100644
index 0000000000000000000000000000000000000000..71ed85494334622ecadb29a5e32635deb3d6e6a9
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/bower.json
@@ -0,0 +1,4 @@
+{
+  "name": "stomp-websocket",
+  "main": "lib/stomp.min.js"
+}
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/browsertests/index.html b/src/main/resources/static/stomp-ws/browsertests/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..86db35428dbaf043464df6767ea32dd4953cc718
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/index.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Stomp Over Web Socket</title>
+  <link rel="stylesheet" href="qunit.css" media="screen" />
+  <link rel="stylesheet" href="test.css" media="screen" />
+  <script src="qunit.js"></script>
+  <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js'></script>
+
+  <script src="../lib/stomp.js"></script>
+
+  <!-- define all valid Test variables used by the tests -->
+  <script src="unit/config.js"></script>
+  <!-- check web socket support -->
+  <script src="unit/websocket.js"></script>
+  <!-- check Stomp frame marshalling -->
+  <script src="unit/frame.js"></script>
+  <!-- check connect method arguments -->
+  <script src="unit/parse_connect.js"></script>
+  <!-- check connection/disconnection -->
+  <script src="unit/connection.js"></script>
+  <!-- check send/receive messages -->
+  <script src="unit/message.js"></script>
+  <!-- check transactions -->
+  <script src="unit/transaction.js"></script>
+  <!-- check subscriptions -->
+  <script src="unit/subscription.js"></script>
+  <!-- check acknowledgement -->
+  <script src="unit/ack.js"></script>
+  
+</head>
+<body>
+  <section>
+    <h1 id="qunit-header">Stomp Over Web Socket</h1>
+    <section>
+      <p>Tests requires that a Stomp Server accepting WebSocket protocol is running with the configuration:</p>
+      <ul>
+        <li>URL: <span id="test_url"></span>
+        <li>Destination: <span id="test_destination"></span>
+        <li>User: <span id="test_login"></span> /  <span id="test_password"></span>
+      </ul>
+      <p>These values can be configured in <a href="unit/config.js">unit/config.js</a>
+    </section>
+    
+    <h2 id="qunit-banner"></h2>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+    
+    <pre id="debug"></pre>
+  </section>
+</body>
+</html>
diff --git a/src/main/resources/static/stomp-ws/browsertests/integration/integration.html b/src/main/resources/static/stomp-ws/browsertests/integration/integration.html
new file mode 100644
index 0000000000000000000000000000000000000000..37ed4453d7d3fbd6141e9491f4793148e78c50c5
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/integration/integration.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js'></script>
+    <script src='../../dist/stomp.js'></script>
+    <script src='integration.js'></script>
+  </head>
+  <body>
+    <!-- all values are defined in integration.js -->
+    <p>To run the integration tests, you need a Stomp server listening to <span id="server_url"></span>
+      with a queue <span id="queue_name"></span>.
+    </p>
+    <pre id="debug"></pre>
+  </body>
+</html>
+
diff --git a/src/main/resources/static/stomp-ws/browsertests/integration/integration.js b/src/main/resources/static/stomp-ws/browsertests/integration/integration.js
new file mode 100644
index 0000000000000000000000000000000000000000..4cd86bb21200beb06716df1a63872389ebd5875b
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/integration/integration.js
@@ -0,0 +1,41 @@
+$(document).ready(function(){
+
+  var url = "ws://localhost:61623";
+  var login = "admin";
+  var passcode = "password"
+  var destination = "/topic/chat.general";
+  
+  $("#server_url").text(url);
+  $("#queue_name").text(destination);
+  
+  var client = Stomp.client(url);
+
+  debug = function(str) {
+    $("#debug").append(str + "\n");
+  };
+  client.debug = debug;
+  // the client is notified when it is connected to the server.
+  var onconnect = function(frame) {
+      debug("connected to Stomp");
+      client.subscribe(destination,
+        function(frame) {
+          client.unsubscribe(destination);
+          client.disconnect();
+        },
+        { receipt: 1234 });
+  };
+  client.onerror = function(frame) {
+      debug("connected to Stomp");
+  };
+  client.ondisconnect = function() {
+    debug("disconnected from Stomp");
+  };
+  client.onreceipt = function() {
+    debug("receipt from Stomp");
+    client.send(destination, {foo: 1}, "test")
+  };
+
+  client.connect(login, passcode, onconnect);
+
+  return false;
+});
diff --git a/src/main/resources/static/stomp-ws/browsertests/qunit.css b/src/main/resources/static/stomp-ws/browsertests/qunit.css
new file mode 100644
index 0000000000000000000000000000000000000000..5714bf4a597e8d13ac34efdb7153ea3430f50f80
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/qunit.css
@@ -0,0 +1,119 @@
+
+ol#qunit-tests {
+	font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
+	margin:0;
+	padding:0;
+	list-style-position:inside;
+
+	font-size: smaller;
+}
+ol#qunit-tests li{
+	padding:0.4em 0.5em 0.4em 2.5em;
+	border-bottom:1px solid #fff;
+	font-size:small;
+	list-style-position:inside;
+}
+ol#qunit-tests li ol{
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+	margin-top:0.5em;
+	margin-left:0;
+	padding:0.5em;
+	background-color:#fff;
+	border-radius:15px;
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+}
+ol#qunit-tests li li{
+	border-bottom:none;
+	margin:0.5em;
+	background-color:#fff;
+	list-style-position: inside;
+	padding:0.4em 0.5em 0.4em 0.5em;
+}
+
+ol#qunit-tests li li.pass{
+	border-left:26px solid #C6E746;
+	background-color:#fff;
+	color:#5E740B;
+	}
+ol#qunit-tests li li.fail{
+	border-left:26px solid #EE5757;
+	background-color:#fff;
+	color:#710909;
+}
+ol#qunit-tests li.pass{
+	background-color:#D2E0E6;
+	color:#528CE0;
+}
+ol#qunit-tests li.fail{
+	background-color:#EE5757;
+	color:#000;
+}
+ol#qunit-tests li strong {
+	cursor:pointer;
+}
+h1#qunit-header{
+	background-color:#0d3349;
+	margin:0;
+	padding:0.5em 0 0.5em 1em;
+	color:#fff;
+	font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
+	border-top-right-radius:15px;
+	border-top-left-radius:15px;
+	-moz-border-radius-topright:15px;
+	-moz-border-radius-topleft:15px;
+	-webkit-border-top-right-radius:15px;
+	-webkit-border-top-left-radius:15px;
+	text-shadow: rgba(0, 0, 0, 0.5) 4px 4px 1px;
+}
+h2#qunit-banner{
+	font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
+	height:5px;
+	margin:0;
+	padding:0;
+}
+h2#qunit-banner.qunit-pass{
+	background-color:#C6E746;
+}
+h2#qunit-banner.qunit-fail, #qunit-testrunner-toolbar {
+	background-color:#EE5757;
+}
+#qunit-testrunner-toolbar {
+	font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
+	padding:0;
+	/*width:80%;*/
+	padding:0em 0 0.5em 2em;
+	font-size: small;
+}
+h2#qunit-userAgent {
+	font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
+	background-color:#2b81af;
+	margin:0;
+	padding:0;
+	color:#fff;
+	font-size: small;
+	padding:0.5em 0 0.5em 2.5em;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+p#qunit-testresult{
+	font-family:"Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
+	margin:0;
+	font-size: small;
+	color:#2b81af;
+	border-bottom-right-radius:15px;
+	border-bottom-left-radius:15px;
+	-moz-border-radius-bottomright:15px;
+	-moz-border-radius-bottomleft:15px;
+	-webkit-border-bottom-right-radius:15px;
+	-webkit-border-bottom-left-radius:15px;
+	background-color:#D2E0E6;
+	padding:0.5em 0.5em 0.5em 2.5em;
+}
+strong b.fail{
+	color:#710909;
+	}
+strong b.pass{
+	color:#5E740B;
+	}
diff --git a/src/main/resources/static/stomp-ws/browsertests/qunit.js b/src/main/resources/static/stomp-ws/browsertests/qunit.js
new file mode 100644
index 0000000000000000000000000000000000000000..8bef02615152b00674e9630b8e34911c6eb915c5
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/qunit.js
@@ -0,0 +1,1042 @@
+/*
+ * QUnit - A JavaScript Unit Testing Framework
+ * 
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2009 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+var QUnit = {
+
+	// Initialize the configuration options
+	init: function() {
+		config = {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			blocking: false,
+			autorun: false,
+			assertions: [],
+			filters: [],
+			queue: []
+		};
+
+		var tests = id("qunit-tests"),
+			banner = id("qunit-banner"),
+			result = id("qunit-testresult");
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+	},
+	
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+
+		synchronize(function() {
+			if ( config.currentModule ) {
+				QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+			}
+
+			config.currentModule = name;
+			config.moduleTestEnvironment = testEnvironment;
+			config.moduleStats = { all: 0, bad: 0 };
+
+			QUnit.moduleStart( name, testEnvironment );
+		});
+	},
+
+	asyncTest: function(testName, expected, callback) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = 0;
+		}
+
+		QUnit.test(testName, expected, callback, true);
+	},
+	
+	test: function(testName, expected, callback, async) {
+		var name = testName, testEnvironment, testEnvironmentArg;
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+		// is 2nd argument a testEnvironment?
+		if ( expected && typeof expected === 'object') {
+			testEnvironmentArg =  expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			name = config.currentModule + " module: " + name;
+		}
+
+		if ( !validTest(name) ) {
+			return;
+		}
+
+		synchronize(function() {
+			QUnit.testStart( testName );
+
+			testEnvironment = extend({
+				setup: function() {},
+				teardown: function() {}
+			}, config.moduleTestEnvironment);
+			if (testEnvironmentArg) {
+				extend(testEnvironment,testEnvironmentArg);
+			}
+
+			// allow utility functions to access the current test environment
+			QUnit.current_testEnvironment = testEnvironment;
+			
+			config.assertions = [];
+			config.expected = expected;
+
+			try {
+				if ( !config.pollution ) {
+					saveGlobal();
+				}
+
+				testEnvironment.setup.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Setup failed on " + name + ": " + e.message );
+			}
+
+			if ( async ) {
+				QUnit.stop();
+			}
+
+			try {
+				callback.call(testEnvironment);
+			} catch(e) {
+				fail("Test " + name + " died, exception and test follows", e, callback);
+				QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message );
+				// else next test will carry the responsibility
+				saveGlobal();
+
+				// Restart the tests if they're blocking
+				if ( config.blocking ) {
+					start();
+				}
+			}
+		});
+
+		synchronize(function() {
+			try {
+				checkPollution();
+				testEnvironment.teardown.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Teardown failed on " + name + ": " + e.message );
+			}
+
+			try {
+				QUnit.reset();
+			} catch(e) {
+				fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, reset);
+			}
+
+			if ( config.expected && config.expected != config.assertions.length ) {
+				QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" );
+			}
+
+			var good = 0, bad = 0,
+				tests = id("qunit-tests");
+
+			config.stats.all += config.assertions.length;
+			config.moduleStats.all += config.assertions.length;
+
+			if ( tests ) {
+				var ol  = document.createElement("ol");
+				ol.style.display = "none";
+
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					var assertion = config.assertions[i];
+
+					var li = document.createElement("li");
+					li.className = assertion.result ? "pass" : "fail";
+					li.appendChild(document.createTextNode(assertion.message || "(no message)"));
+					ol.appendChild( li );
+
+					if ( assertion.result ) {
+						good++;
+					} else {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+
+				var b = document.createElement("strong");
+				b.innerHTML = name + " <b style='color:black;'>(<b class='fail'>" + bad + "</b>, <b class='pass'>" + good + "</b>, " + config.assertions.length + ")</b>";
+				
+				addEvent(b, "click", function() {
+					var next = b.nextSibling, display = next.style.display;
+					next.style.display = display === "none" ? "block" : "none";
+				});
+				
+				addEvent(b, "dblclick", function(e) {
+					var target = e && e.target ? e.target : window.event.srcElement;
+					if ( target.nodeName.toLowerCase() === "strong" ) {
+						var text = "", node = target.firstChild;
+
+						while ( node.nodeType === 3 ) {
+							text += node.nodeValue;
+							node = node.nextSibling;
+						}
+
+						text = text.replace(/(^\s*|\s*$)/g, "");
+
+						if ( window.location ) {
+							window.location.href = window.location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent(text);
+						}
+					}
+				});
+
+				var li = document.createElement("li");
+				li.className = bad ? "fail" : "pass";
+				li.appendChild( b );
+				li.appendChild( ol );
+				tests.appendChild( li );
+
+				if ( bad ) {
+					var toolbar = id("qunit-testrunner-toolbar");
+					if ( toolbar ) {
+						toolbar.style.display = "block";
+						id("qunit-filter-pass").disabled = null;
+						id("qunit-filter-missing").disabled = null;
+					}
+				}
+
+			} else {
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					if ( !config.assertions[i].result ) {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+			}
+
+			QUnit.testDone( testName, bad, config.assertions.length );
+
+			if ( !window.setTimeout && !config.queue.length ) {
+				done();
+			}
+		});
+
+		if ( window.setTimeout && !config.doneTimer ) {
+			config.doneTimer = window.setTimeout(function(){
+				if ( !config.queue.length ) {
+					done();
+				} else {
+					synchronize( done );
+				}
+			}, 13);
+		}
+	},
+	
+	/**
+	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	 */
+	expect: function(asserts) {
+		config.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		QUnit.log(a, msg);
+
+		config.assertions.push({
+			result: !!a,
+			message: msg
+		});
+	},
+
+	/**
+	 * Checks that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 *
+	 * Prefered to ok( actual == expected, message )
+	 *
+	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+	 *
+	 * @param Object actual
+	 * @param Object expected
+	 * @param String message (optional)
+	 */
+	equal: function(actual, expected, message) {
+		push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		push(expected != actual, actual, expected, message);
+	},
+	
+	deepEqual: function(a, b, message) {
+		push(QUnit.equiv(a, b), a, b, message);
+	},
+
+	notDeepEqual: function(a, b, message) {
+		push(!QUnit.equiv(a, b), a, b, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		push(expected !== actual, actual, expected, message);
+	},
+	
+	start: function() {
+		// A slight delay, to avoid any current callbacks
+		if ( window.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+	
+	stop: function(timeout) {
+		config.blocking = true;
+
+		if ( timeout && window.setTimeout ) {
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	},
+	
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery("#main").html( config.fixture );
+			jQuery.event.global = {};
+			jQuery.ajaxSettings = extend({}, config.ajaxSettings);
+		}
+	},
+	
+	/**
+	 * Trigger an event on an element.
+	 *
+	 * @example triggerEvent( document.body, "click" );
+	 *
+	 * @param DOMElement elem
+	 * @param String type
+	 */
+	triggerEvent: function( elem, type, event ) {
+		if ( document.createEvent ) {
+			event = document.createEvent("MouseEvents");
+			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+				0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			elem.dispatchEvent( event );
+
+		} else if ( elem.fireEvent ) {
+			elem.fireEvent("on"+type);
+		}
+	},
+	
+	// Safe object type checking
+	is: function( type, obj ) {
+		return Object.prototype.toString.call( obj ) === "[object "+ type +"]";
+	},
+	
+	// Logging callbacks
+	done: function(failures, total) {},
+	log: function(result, message) {},
+	testStart: function(name) {},
+	testDone: function(name, failures, total) {},
+	moduleStart: function(name, testEnvironment) {},
+	moduleDone: function(name, failures, total) {}
+};
+
+// Backwards compatibility, deprecated
+QUnit.equals = QUnit.equal;
+QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+var config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		GETParams = location.search.slice(1).split('&');
+
+	for ( var i = 0; i < GETParams.length; i++ ) {
+		GETParams[i] = decodeURIComponent( GETParams[i] );
+		if ( GETParams[i] === "noglobals" ) {
+			GETParams.splice( i, 1 );
+			i--;
+			config.noglobals = true;
+		} else if ( GETParams[i].search('=') > -1 ) {
+			GETParams.splice( i, 1 );
+			i--;
+		}
+	}
+	
+	// restrict modules/tests by get parameters
+	config.filters = GETParams;
+	
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = !!(location.protocol === 'file:');
+})();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+if ( typeof exports === "undefined" || typeof require === "undefined" ) {
+	extend(window, QUnit);
+	window.QUnit = QUnit;
+} else {
+	extend(exports, QUnit);
+	exports.QUnit = QUnit;
+}
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+addEvent(window, "load", function() {
+	// Initialize the config, saving the execution queue
+	var oldconfig = extend({}, config);
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	var userAgent = id("qunit-userAgent");
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+	
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		toolbar.style.display = "none";
+		
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		filter.disabled = true;
+		addEvent( filter, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("pass") > -1 ) {
+					li[i].style.display = filter.checked ? "none" : "";
+				}
+			}
+		});
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+
+		var missing = document.createElement("input");
+		missing.type = "checkbox";
+		missing.id = "qunit-filter-missing";
+		missing.disabled = true;
+		addEvent( missing, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("fail") > -1 && li[i].innerHTML.indexOf('missing test - untested code is broken code') > - 1 ) {
+					li[i].parentNode.parentNode.style.display = missing.checked ? "none" : "block";
+				}
+			}
+		});
+		toolbar.appendChild( missing );
+
+		label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-missing");
+		label.innerHTML = "Hide missing tests (untested code is broken code)";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('main');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if ( window.jQuery ) {
+		config.ajaxSettings = window.jQuery.ajaxSettings;
+	}
+
+	QUnit.start();
+});
+
+function done() {
+	if ( config.doneTimer && window.clearTimeout ) {
+		window.clearTimeout( config.doneTimer );
+		config.doneTimer = null;
+	}
+
+	if ( config.queue.length ) {
+		config.doneTimer = window.setTimeout(function(){
+			if ( !config.queue.length ) {
+				done();
+			} else {
+				synchronize( done );
+			}
+		}, 13);
+
+		return;
+	}
+
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		html = ['Tests completed in ',
+		+new Date - config.started, ' milliseconds.<br/>',
+		'<span class="passed">', config.stats.all - config.stats.bad, '</span> tests of <span class="total">', config.stats.all, '</span> passed, <span class="failed">', config.stats.bad,'</span> failed.'].join('');
+
+	if ( banner ) {
+		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+	}
+
+	if ( tests ) {	
+		var result = id("qunit-testresult");
+
+		if ( !result ) {
+			result = document.createElement("p");
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests.nextSibling );
+		}
+
+		result.innerHTML = html;
+	}
+
+	QUnit.done( config.stats.bad, config.stats.all );
+}
+
+function validTest( name ) {
+	var i = config.filters.length,
+		run = false;
+
+	if ( !i ) {
+		return true;
+	}
+	
+	while ( i-- ) {
+		var filter = config.filters[i],
+			not = filter.charAt(0) == '!';
+
+		if ( not ) {
+			filter = filter.slice(1);
+		}
+
+		if ( name.indexOf(filter) !== -1 ) {
+			return !not;
+		}
+
+		if ( not ) {
+			run = true;
+		}
+	}
+
+	return run;
+}
+
+function push(result, actual, expected, message) {
+	message = message || (result ? "okay" : "failed");
+	QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + QUnit.jsDump.parse(expected) + " result: " + QUnit.jsDump.parse(actual) );
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	while ( config.queue.length && !config.blocking ) {
+		config.queue.shift()();
+	}
+}
+
+function saveGlobal() {
+	config.pollution = [];
+	
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			config.pollution.push( key );
+		}
+	}
+}
+
+function checkPollution( name ) {
+	var old = config.pollution;
+	saveGlobal();
+	
+	var newGlobals = diff( old, config.pollution );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+		config.expected++;
+	}
+
+	var deletedGlobals = diff( config.pollution, old );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+		config.expected++;
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var result = a.slice();
+	for ( var i = 0; i < result.length; i++ ) {
+		for ( var j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice(i, 1);
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function fail(message, exception, callback) {
+	if ( typeof console !== "undefined" && console.error && console.warn ) {
+		console.error(message);
+		console.error(exception);
+		console.warn(callback.toString());
+
+	} else if ( window.opera && opera.postError ) {
+		opera.postError(message, exception, callback.toString);
+	}
+}
+
+function extend(a, b) {
+	for ( var prop in b ) {
+		a[prop] = b[prop];
+	}
+
+	return a;
+}
+
+function addEvent(elem, type, fn) {
+	if ( elem.addEventListener ) {
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+		elem.attachEvent( "on" + type, fn );
+	} else {
+		fn();
+	}
+}
+
+function id(name) {
+	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+		document.getElementById( name );
+}
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rathé <prathe@gmail.com>
+QUnit.equiv = function () {
+
+    var innerEquiv; // the real equiv function
+    var callers = []; // stack to decide between skip/abort functions
+
+
+    // Determine what is o.
+    function hoozit(o) {
+        if (QUnit.is("String", o)) {
+            return "string";
+            
+        } else if (QUnit.is("Boolean", o)) {
+            return "boolean";
+
+        } else if (QUnit.is("Number", o)) {
+
+            if (isNaN(o)) {
+                return "nan";
+            } else {
+                return "number";
+            }
+
+        } else if (typeof o === "undefined") {
+            return "undefined";
+
+        // consider: typeof null === object
+        } else if (o === null) {
+            return "null";
+
+        // consider: typeof [] === object
+        } else if (QUnit.is( "Array", o)) {
+            return "array";
+        
+        // consider: typeof new Date() === object
+        } else if (QUnit.is( "Date", o)) {
+            return "date";
+
+        // consider: /./ instanceof Object;
+        //           /./ instanceof RegExp;
+        //          typeof /./ === "function"; // => false in IE and Opera,
+        //                                          true in FF and Safari
+        } else if (QUnit.is( "RegExp", o)) {
+            return "regexp";
+
+        } else if (typeof o === "object") {
+            return "object";
+
+        } else if (QUnit.is( "Function", o)) {
+            return "function";
+        } else {
+            return undefined;
+        }
+    }
+
+    // Call the o related callback with the given arguments.
+    function bindCallbacks(o, callbacks, args) {
+        var prop = hoozit(o);
+        if (prop) {
+            if (hoozit(callbacks[prop]) === "function") {
+                return callbacks[prop].apply(callbacks, args);
+            } else {
+                return callbacks[prop]; // or undefined
+            }
+        }
+    }
+    
+    var callbacks = function () {
+
+        // for string, boolean, number and null
+        function useStrictEquality(b, a) {
+            if (b instanceof a.constructor || a instanceof b.constructor) {
+                // to catch short annotaion VS 'new' annotation of a declaration
+                // e.g. var i = 1;
+                //      var j = new Number(1);
+                return a == b;
+            } else {
+                return a === b;
+            }
+        }
+
+        return {
+            "string": useStrictEquality,
+            "boolean": useStrictEquality,
+            "number": useStrictEquality,
+            "null": useStrictEquality,
+            "undefined": useStrictEquality,
+
+            "nan": function (b) {
+                return isNaN(b);
+            },
+
+            "date": function (b, a) {
+                return hoozit(b) === "date" && a.valueOf() === b.valueOf();
+            },
+
+            "regexp": function (b, a) {
+                return hoozit(b) === "regexp" &&
+                    a.source === b.source && // the regex itself
+                    a.global === b.global && // and its modifers (gmi) ...
+                    a.ignoreCase === b.ignoreCase &&
+                    a.multiline === b.multiline;
+            },
+
+            // - skip when the property is a method of an instance (OOP)
+            // - abort otherwise,
+            //   initial === would have catch identical references anyway
+            "function": function () {
+                var caller = callers[callers.length - 1];
+                return caller !== Object &&
+                        typeof caller !== "undefined";
+            },
+
+            "array": function (b, a) {
+                var i;
+                var len;
+
+                // b could be an object literal here
+                if ( ! (hoozit(b) === "array")) {
+                    return false;
+                }
+
+                len = a.length;
+                if (len !== b.length) { // safe and faster
+                    return false;
+                }
+                for (i = 0; i < len; i++) {
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        return false;
+                    }
+                }
+                return true;
+            },
+
+            "object": function (b, a) {
+                var i;
+                var eq = true; // unless we can proove it
+                var aProperties = [], bProperties = []; // collection of strings
+
+                // comparing constructors is more strict than using instanceof
+                if ( a.constructor !== b.constructor) {
+                    return false;
+                }
+
+                // stack constructor before traversing properties
+                callers.push(a.constructor);
+
+                for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
+
+                    aProperties.push(i); // collect a's properties
+
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        eq = false;
+                    }
+                }
+
+                callers.pop(); // unstack, we are done
+
+                for (i in b) {
+                    bProperties.push(i); // collect b's properties
+                }
+
+                // Ensures identical properties name
+                return eq && innerEquiv(aProperties.sort(), bProperties.sort());
+            }
+        };
+    }();
+
+    innerEquiv = function () { // can take multiple arguments
+        var args = Array.prototype.slice.apply(arguments);
+        if (args.length < 2) {
+            return true; // end transition
+        }
+
+        return (function (a, b) {
+            if (a === b) {
+                return true; // catch the most you can
+            } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || hoozit(a) !== hoozit(b)) {
+                return false; // don't lose time with error prone cases
+            } else {
+                return bindCallbacks(a, callbacks, [b, a]);
+            }
+
+        // apply transition with (1..n) arguments
+        })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1));
+    };
+
+    return innerEquiv;
+
+}();
+
+/**
+ * jsDump
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 5/15/2008
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return '"' + str.toString().replace(/"/g, '\\"') + '"';
+	};
+	function literal( o ) {
+		return o + '';	
+	};
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join )
+			arr = arr.join( ',' + s + inner );
+		if ( !arr )
+			return pre + post;
+		return [ pre, inner + arr, base + post ].join(s);
+	};
+	function array( arr ) {
+		var i = arr.length,	ret = Array(i);					
+		this.up();
+		while ( i-- )
+			ret[i] = this.parse( arr[i] );				
+		this.down();
+		return join( '[', ret, ']' );
+	};
+	
+	var reName = /^function (\w+)/;
+	
+	var jsDump = {
+		parse:function( obj, type ) { //type is used mostly internally, you can fix a (custom)type in advance
+			var	parser = this.parsers[ type || this.typeOf(obj) ];
+			type = typeof parser;			
+			
+			return type == 'function' ? parser.call( this, obj ) :
+				   type == 'string' ? parser :
+				   this.parsers.error;
+		},
+		typeOf:function( obj ) {
+			var type;
+			if ( obj === null ) {
+				type = "null";
+			} else if (typeof obj === "undefined") {
+				type = "undefined";
+			} else if (QUnit.is("RegExp", obj)) {
+				type = "regexp";
+			} else if (QUnit.is("Date", obj)) {
+				type = "date";
+			} else if (QUnit.is("Function", obj)) {
+				type = "function";
+			} else if (QUnit.is("Array", obj)) {
+				type = "array";
+			} else if (QUnit.is("Window", obj) || QUnit.is("global", obj)) {
+				type = "window";
+			} else if (QUnit.is("HTMLDocument", obj)) {
+				type = "document";
+			} else if (QUnit.is("HTMLCollection", obj) || QUnit.is("NodeList", obj)) {
+				type = "nodelist";
+			} else if (/^\[object HTML/.test(Object.prototype.toString.call( obj ))) {
+				type = "node";
+			} else {
+				type = typeof obj;
+			}
+			return type;
+		},
+		separator:function() {
+			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+		},
+		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+			if ( !this.multiline )
+				return '';
+			var chr = this.indentChar;
+			if ( this.HTML )
+				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
+			return Array( this._depth_ + (extra||0) ).join(chr);
+		},
+		up:function( a ) {
+			this._depth_ += a || 1;
+		},
+		down:function( a ) {
+			this._depth_ -= a || 1;
+		},
+		setParser:function( name, parser ) {
+			this.parsers[name] = parser;
+		},
+		// The next 3 are exposed so you can use them
+		quote:quote, 
+		literal:literal,
+		join:join,
+		//
+		_depth_: 1,
+		// This is the list of parsers, to modify them, use jsDump.setParser
+		parsers:{
+			window: '[Window]',
+			document: '[Document]',
+			error:'[ERROR]', //when no parser is found, shouldn't happen
+			unknown: '[Unknown]',
+			'null':'null',
+			undefined:'undefined',
+			'function':function( fn ) {
+				var ret = 'function',
+					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
+				if ( name )
+					ret += ' ' + name;
+				ret += '(';
+				
+				ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, this.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map ) {
+				var ret = [ ];
+				this.up();
+				for ( var key in map )
+					ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) );
+				this.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = this.HTML ? '&lt;' : '<',
+					close = this.HTML ? '&gt;' : '>';
+					
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+					
+				for ( var a in this.DOMAttrs ) {
+					var val = node[this.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + this.parse( val, 'attribute' );
+				}
+				return ret + close + open + '/' + tag + close;
+			},
+			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
+				var l = fn.length;
+				if ( !l ) return '';				
+				
+				var args = Array(l);
+				while ( l-- )
+					args[l] = String.fromCharCode(97+l);//97 is 'a'
+				return ' ' + args.join(', ') + ' ';
+			},
+			key:quote, //object calls it internally, the key part of an item in a map
+			functionCode:'[code]', //function calls it internally, it's the content of the function
+			attribute:quote, //node calls it internally, it's an html attribute value
+			string:quote,
+			date:quote,
+			regexp:literal, //regex
+			number:literal,
+			'boolean':literal
+		},
+		DOMAttrs:{//attributes to dump from nodes, name=>realName
+			id:'id',
+			name:'name',
+			'class':'className'
+		},
+		HTML:true,//if true, entities are escaped ( <, >, \t, space and \n )
+		indentChar:'   ',//indentation unit
+		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
+	};
+
+	return jsDump;
+})();
+
+})(this);
diff --git a/src/main/resources/static/stomp-ws/browsertests/test.css b/src/main/resources/static/stomp-ws/browsertests/test.css
new file mode 100644
index 0000000000000000000000000000000000000000..c2cc9c795c5cf983c8aa542b6e40bdaacc45f0a0
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/test.css
@@ -0,0 +1,8 @@
+#debug {
+  background-color: #F0F0F0;
+  font-size: 12px;
+  height: 75%;
+  overflow: auto;
+  padding: 10px;
+  z-index: 100;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/browsertests/unit/ack.js b/src/main/resources/static/stomp-ws/browsertests/unit/ack.js
new file mode 100644
index 0000000000000000000000000000000000000000..f6477fad750f6bf1c691c7a6f7a94688737f4703
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/unit/ack.js
@@ -0,0 +1,50 @@
+module("Stomp Acknowledgement");
+
+test("Subscribe using client ack mode, send a message and ack it", function() {
+  
+  var body = Math.random();
+  
+  var client = Stomp.client(TEST.url);
+  
+  client.debug = TEST.debug;
+  client.connect(TEST.login, TEST.password, function() {
+    var onmessage = function(message) {
+      start();        
+      // we should receive the 2nd message outside the transaction
+      equals(message.body, body);
+      var receipt = Math.random();
+      client.onreceipt = function(frame) {
+        equals(receipt, frame.headers['receipt-id'])
+        client.disconnect();
+      }
+      message.ack({'receipt': receipt});
+    }
+    var sub = client.subscribe(TEST.destination, onmessage, {'ack': 'client'});      
+    client.send(TEST.destination, {}, body);
+  });
+  stop(TEST.timeout);
+});
+
+test("Subscribe using client ack mode, send a message and nack it", function() {
+  
+  var body = Math.random();
+  
+  var client = Stomp.client(TEST.url);
+  
+  client.debug = TEST.debug;
+  client.connect(TEST.login, TEST.password, function() {
+    var onmessage = function(message) {
+      start();        
+      equals(message.body, body);
+      var receipt = Math.random();
+      client.onreceipt = function(frame) {
+        equals(receipt, frame.headers['receipt-id'])
+        client.disconnect();
+      }
+      message.nack({'receipt': receipt});
+    }
+    var sub = client.subscribe(TEST.destination, onmessage, {'ack': 'client'});      
+    client.send(TEST.destination, {}, body);
+  });
+  stop(TEST.timeout);
+});
diff --git a/src/main/resources/static/stomp-ws/browsertests/unit/config.js b/src/main/resources/static/stomp-ws/browsertests/unit/config.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a647870c3db0290fb2ca1beeff4e4b8303c521c
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/unit/config.js
@@ -0,0 +1,22 @@
+$(document).ready(function(){
+  
+  TEST = {
+    destination : "/topic/chat.general",
+    login : "admin",
+    password : "password",
+    url : "ws://localhost:61614",
+    badUrl: "ws://localhost:61625",
+    timeout: 2000,
+    debug : function(str) {
+      $("#debug").append(str + "\n");
+    }
+    
+  };
+
+  // fill server requirements:
+  $("#test_url").text(TEST.url);
+  $("#test_destination").text(TEST.destination);
+  $("#test_login").text(TEST.login);
+  $("#test_password").text(TEST.password);
+  
+});
diff --git a/src/main/resources/static/stomp-ws/browsertests/unit/connection.js b/src/main/resources/static/stomp-ws/browsertests/unit/connection.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cf5cc1b38919787299351b04da1fb9411c2717e
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/unit/connection.js
@@ -0,0 +1,35 @@
+module("Stomp Connection");
+
+test("Connect to an invalid Stomp server", function() {
+  
+  var client = Stomp.client(TEST.badUrl);
+  client.connect("foo", "bar", 
+    function() {},
+    function() {
+      start();
+    });
+  stop(TEST.timeout);
+});
+
+test("Connect to a valid Stomp server", function() {
+  
+  var client = Stomp.client(TEST.url);
+  client.connect(TEST.login, TEST.password, 
+    function() {
+      start();
+    });
+  stop(TEST.timeout);
+});
+
+test("Disconnect", function() {
+  
+  var client = Stomp.client(TEST.url);
+  client.connect(TEST.login, TEST.password, 
+    function() {
+      // once connected, we disconnect
+      client.disconnect(function() {
+        start();
+      });
+    });
+  stop(TEST.timeout);
+});
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/browsertests/unit/frame.js b/src/main/resources/static/stomp-ws/browsertests/unit/frame.js
new file mode 100644
index 0000000000000000000000000000000000000000..e442d876d626132f08e59852c841eaab65cb4575
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/unit/frame.js
@@ -0,0 +1,63 @@
+module("Stomp Frame");
+
+test("marshall a CONNECT frame", function() {
+  var out = Stomp.Frame.marshall("CONNECT", {login: 'jmesnil', passcode: 'wombats'});
+  equals(out, "CONNECT\nlogin:jmesnil\npasscode:wombats\n\n\0");
+});
+
+test("marshall a SEND frame", function() {
+  var out = Stomp.Frame.marshall("SEND", {destination: '/queue/test'}, "hello, world!");
+  equals(out, "SEND\ndestination:/queue/test\ncontent-length:13\n\nhello, world!\0");
+});
+
+test("marshall a SEND frame without content-length", function() {
+  var out = Stomp.Frame.marshall("SEND", {destination: '/queue/test', 'content-length': false}, "hello, world!");
+  equals(out, "SEND\ndestination:/queue/test\n\nhello, world!\0");
+});
+
+test("unmarshall a CONNECTED frame", function() {
+  var data = "CONNECTED\nsession-id: 1234\n\n\0";
+  var frame = Stomp.Frame.unmarshall(data).frames[0];
+  equals(frame.command, "CONNECTED");
+  same(frame.headers, {'session-id': "1234"});
+  equals(frame.body, '');
+});
+
+test("unmarshall a RECEIVE frame", function() {
+  var data = "RECEIVE\nfoo: abc\nbar: 1234\n\nhello, world!\0";
+  var frame = Stomp.Frame.unmarshall(data).frames[0];
+  equals(frame.command, "RECEIVE");
+  same(frame.headers, {foo: 'abc', bar: "1234"});
+  equals(frame.body, "hello, world!");
+});
+
+test("unmarshall should not include the null byte in the body", function() {
+  var body1 = 'Just the text please.',
+      body2 = 'And the newline\n',
+      msg = "MESSAGE\ndestination: /queue/test\nmessage-id: 123\n\n";
+
+  equals(Stomp.Frame.unmarshall(msg + body1 + '\0').frames[0].body, body1);
+  equals(Stomp.Frame.unmarshall(msg + body2 + '\0').frames[0].body, body2);
+});
+
+test("unmarshall should support colons (:) in header values", function() {
+  var dest = 'foo:bar:baz',
+      msg = "MESSAGE\ndestination: " + dest + "\nmessage-id: 456\n\n\0";
+
+  equals(Stomp.Frame.unmarshall(msg).frames[0].headers.destination, dest);
+});
+
+test("only the 1st value of repeated headers is used", function() {
+  var msg = "MESSAGE\ndestination: /queue/test\nfoo:World\nfoo:Hello\n\n\0";
+
+  equals(Stomp.Frame.unmarshall(msg).frames[0].headers['foo'], 'World');
+});
+
+test("Content length of UTF-8 strings", function() {
+  equals(0,  Stomp.Frame.sizeOfUTF8());
+  equals(0,  Stomp.Frame.sizeOfUTF8(""));
+  equals(1,  Stomp.Frame.sizeOfUTF8("a"));
+  equals(2,  Stomp.Frame.sizeOfUTF8("Ñ„"));
+  equals(3,  Stomp.Frame.sizeOfUTF8("â„–"));
+  equals(15, Stomp.Frame.sizeOfUTF8("1 a ф № @ ®"));
+});
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/browsertests/unit/message.js b/src/main/resources/static/stomp-ws/browsertests/unit/message.js
new file mode 100644
index 0000000000000000000000000000000000000000..bcc8263e3a43508446167fb7525591204a126826
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/unit/message.js
@@ -0,0 +1,42 @@
+module("Stomp Message");
+
+test("Send and receive a message", function() {
+  var body = Math.random();
+  
+  var client = Stomp.client(TEST.url);
+  client.debug = TEST.debug;
+  client.connect(TEST.login, TEST.password,
+    function() {
+      client.subscribe(TEST.destination, function(message)
+      {
+        start();
+        equals(message.body, body);
+        client.disconnect();
+      });
+      
+      client.send(TEST.destination, {}, body);
+    });
+    stop(TEST.timeout);
+});
+
+test("Send and receive a message with a JSON body", function() {
+  
+  var client = Stomp.client(TEST.url);
+  var payload = {text: "hello", bool: true, value: Math.random()};
+  
+  client.connect(TEST.login, TEST.password,
+    function() {
+      client.subscribe(TEST.destination, function(message)
+      {
+        start();
+        var res = JSON.parse(message.body);
+        equals(res.text, payload.text);
+        equals(res.bool, payload.bool);
+        equals(res.value, payload.value);
+        client.disconnect();
+      });
+      
+      client.send(TEST.destination, {}, JSON.stringify(payload));
+    });
+    stop(TEST.timeout);
+});
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/browsertests/unit/parse_connect.js b/src/main/resources/static/stomp-ws/browsertests/unit/parse_connect.js
new file mode 100644
index 0000000000000000000000000000000000000000..ecc7bdadc899e5ccf6d60ad656e22bc2e2e8cd4e
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/unit/parse_connect.js
@@ -0,0 +1,76 @@
+(function() {
+  module("Parse connect method arguments", {
+
+    setup: function() {
+      // prepare something for all following tests
+      myConnectCallback = function() {
+        // called back when the client is connected to STOMP broker
+      };
+
+      myErrorCallback = function() {
+        // called back if the client can not connect to STOMP broker
+      };
+
+      client = Stomp.client(TEST.url);
+      
+      checkArgs = function(args, expectedHeaders, expectedConnectCallback, expectedErrorCallback) {
+        var headers = args[0];
+        var connectCallback = args[1];
+        var errorCallback = args[2];
+
+        deepEqual(headers, expectedHeaders);
+        strictEqual(connectCallback, expectedConnectCallback);
+        strictEqual(errorCallback, expectedErrorCallback);        
+      }
+    }
+  });
+
+  test("connect(login, passcode, connectCallback)", function() {
+    checkArgs(
+      client._parseConnect("jmesnil", "wombats", myConnectCallback),
+      
+      {login: 'jmesnil', passcode: 'wombats'},
+      myConnectCallback,
+      undefined);
+  });
+
+  test("connect(login, passcode, connectCallback, errorCallback)", function() {
+    checkArgs(
+      client._parseConnect("jmesnil", "wombats", myConnectCallback, myErrorCallback),
+      
+      {login: 'jmesnil', passcode: 'wombats'},
+      myConnectCallback,
+      myErrorCallback);
+  });
+
+  test("connect(login, passcode, connectCallback, errorCallback, vhost)", function() {
+    checkArgs(
+      client._parseConnect("jmesnil", "wombats", myConnectCallback, myErrorCallback, "myvhost"),
+      
+      {login: 'jmesnil', passcode: 'wombats', host: 'myvhost'},
+      myConnectCallback,
+      myErrorCallback);
+  });
+
+  test("connect(headers, connectCallback)", function() {
+    var headers = {login: 'jmesnil', passcode: 'wombats', host: 'myvhost'};
+
+    checkArgs(
+      client._parseConnect(headers, myConnectCallback),
+      
+      headers,
+      myConnectCallback,
+      undefined);
+  });
+
+  test("connect(headers, connectCallback, errorCallback)", function() {
+    var headers = {login: 'jmesnil', passcode: 'wombats', host: 'myvhost'};
+
+    checkArgs(
+      client._parseConnect(headers, myConnectCallback, myErrorCallback),
+      
+      headers,
+      myConnectCallback,
+      myErrorCallback);
+  });
+})();
diff --git a/src/main/resources/static/stomp-ws/browsertests/unit/subscription.js b/src/main/resources/static/stomp-ws/browsertests/unit/subscription.js
new file mode 100644
index 0000000000000000000000000000000000000000..efc800e374f0196cf00a5da6dbe6b561a26a711b
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/unit/subscription.js
@@ -0,0 +1,50 @@
+var client = null;
+
+module("Stomp Subscription", {
+  setup: function() {
+    client = Stomp.client(TEST.url);
+    client.debug = TEST.debug;
+  },
+
+  teardown: function() {
+    client.disconnect();
+  }
+});
+
+test("Should receive messages sent to destination after subscribing", 1, function() {
+  var msg = 'Is anybody out there?';
+
+  client.connect(TEST.login, TEST.password, function() {
+    client.subscribe(TEST.destination, function(frame) {
+      start();
+      equals(frame.body, msg);
+    });
+
+    client.send(TEST.destination, {}, msg);
+  });
+
+  stop(TEST.timeout);
+});
+
+test("Should no longer receive messages after unsubscribing to destination", 1, function() {
+  var msg1 = 'Calling all cars!',
+      subscription1 = null,
+      subscription2 = null;
+
+  client.connect(TEST.login, TEST.password, function() {
+    subscription1 = client.subscribe(TEST.destination, function(frame) {
+      start();
+      ok(false, 'Should not have received message!');
+    });
+
+    subscription2 = client.subscribe(TEST.destination, function(frame) {
+      start();
+      equals(frame.body, msg1);
+    });
+
+    subscription1.unsubscribe();
+    client.send(TEST.destination, {}, msg1);
+  });
+
+  stop(TEST.timeout);
+});
diff --git a/src/main/resources/static/stomp-ws/browsertests/unit/transaction.js b/src/main/resources/static/stomp-ws/browsertests/unit/transaction.js
new file mode 100644
index 0000000000000000000000000000000000000000..c26afacab93230b8f0597a9f58d3a6bcec2c4ad5
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/unit/transaction.js
@@ -0,0 +1,73 @@
+module("Stomp Transaction");
+
+test("Send a message in a transaction and abort", function() {
+  
+  var body = Math.random();
+  var body2 = Math.random();
+  
+  var client = Stomp.client(TEST.url);
+  
+  client.debug = TEST.debug;
+  client.connect(TEST.login, TEST.password,
+    function() {
+      client.subscribe(TEST.destination, function(message)
+      {
+        start();
+        // we should receive the 2nd message outside the transaction
+        equals(message.body, body2);
+        client.disconnect();
+      });
+      
+      var tx = client.begin("txid_" + Math.random());
+      client.send(TEST.destination, {transaction: tx.id}, body);
+      tx.abort();
+      client.send(TEST.destination, {}, body2);
+    });
+    stop(TEST.timeout);
+});
+
+test("Send a message in a transaction and commit", function() {
+  
+  var body = Math.random();
+  
+  var client = Stomp.client(TEST.url);
+  
+  client.debug = TEST.debug;
+  client.connect(TEST.login, TEST.password,
+    function() {
+      client.subscribe(TEST.destination, function(message)
+      {
+        start();
+        equals(message.body, body);
+        client.disconnect();
+      });
+      var tx = client.begin();
+      client.send(TEST.destination, {transaction: tx.id}, body);
+      tx.commit();
+    });
+    stop(TEST.timeout);
+});
+
+test("Send a message outside a transaction and abort", function() {
+
+  var body = Math.random();
+
+  var client = Stomp.client(TEST.url);
+
+  client.debug = TEST.debug;
+  client.connect(TEST.login, TEST.password,
+    function() {
+      client.subscribe(TEST.destination, function(message)
+      {
+        start();
+        // we should receive the message since it was sent outside the transaction
+        equals(message.body, body);
+        client.disconnect();
+      });
+
+      var tx = client.begin();
+      client.send(TEST.destination, {}, body);
+      tx.abort();
+    });
+    stop(TEST.timeout);
+});
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/browsertests/unit/websocket.js b/src/main/resources/static/stomp-ws/browsertests/unit/websocket.js
new file mode 100644
index 0000000000000000000000000000000000000000..977594cccff47d6add0ad06a9544853655f11964
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/browsertests/unit/websocket.js
@@ -0,0 +1,5 @@
+module("Web Sockets");
+
+test("check Web Sockets support", function() {
+  ok(WebSocket, "this browser support Web Sockets");
+});
diff --git a/src/main/resources/static/stomp-ws/coffeelint.json b/src/main/resources/static/stomp-ws/coffeelint.json
new file mode 100644
index 0000000000000000000000000000000000000000..37625b9d2d8e735633f7e9aa6d984534a7312634
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/coffeelint.json
@@ -0,0 +1,6 @@
+{
+  "max_line_length": {
+    "value": 80,
+    "level": "warn"
+  }
+}
diff --git a/src/main/resources/static/stomp-ws/doc/.gitignore b/src/main/resources/static/stomp-ws/doc/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5c7eae97262f4630deb0133107818b58ce055e73
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/doc/.gitignore
@@ -0,0 +1,3 @@
+docco.css
+stomp.html
+stomp-node.html
diff --git a/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_advise_from_the_doctor.svg b/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_advise_from_the_doctor.svg
new file mode 100755
index 0000000000000000000000000000000000000000..d9ea72016e0f9631b59dc71f5e5d8b46fad14686
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_advise_from_the_doctor.svg
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.1, 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="485.012" height="588"
+	 viewBox="0 0 485.012 588" overflow="visible" enable-background="new 0 0 485.012 588" xml:space="preserve">
+<g>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M326.012,107c1.502-2.374,2.992-2.218,4-3c1.692,7.648,2.497,21.504-4,22
+		C322.916,118.464,329.735,112.989,326.012,107z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M151.012,120c3.96,9.488,3.407,27.333,1,35
+		c-7.678-9.19-2.225-19.309-6-34C149.153,120.315,150.098,121.115,151.012,120z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M332.012,147c-0.241,1.759-1.721,2.279-4,2c1.646-5.103-2.973-3.807-2-11
+		c1,0,2,0,3,0C328.168,142.927,330.625,141.098,332.012,147z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M263.012,166c-6.943,0.81-10.526-7.079-6-15c0.804,0.529,1.623,1.043,3,1
+		C257.116,160.431,262.048,160.164,263.012,166z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M359.012,161c-4.377,6.957-9.708,12.958-12,22
+		C342.866,170.709,349.391,151.823,359.012,161z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M264.012,186c3.328,2.398,2.602,2.671,4,7c-3.729,1.063-1.583-3.75-5-3
+		C264.757,187.961,262.267,188.039,264.012,186z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M347.012,197c3.035,0.314,4.058,5.648,2,8
+		C347.664,202.998,345.547,198.759,347.012,197z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M213.012,200c-0.553,2.371-3.866,4.149-6,2
+		C208.458,199.043,209.246,201.137,213.012,200z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M232.012,222c2.323,1.117,2.677-0.214,5,2c-0.226,1.44-2.985,0.349-3,2
+		C232.252,225.759,231.732,224.279,232.012,222z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M285.012,237c-1,0-2,0-3,0c2.011-1.995-0.74-4.335-3-5
+		c1.745-2.039-0.745-1.961,1-4c11.712,5.623,16.382,19.198,24,29c-1.183,2.693-5.214-0.004-7,0
+		C297.658,250.379,283.828,244.286,285.012,237z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M255.012,262c1.794-0.127,2.109,1.224,4,1
+		c5.528,7.22,2.976,14.854-11,11C248.699,268.937,251.954,267.612,255.012,262z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M245.012,268c5.254,1.035-2.79,3.965,0,5
+		c0.274,2.693-8.817-0.004-3,0C242.421,271.758,243.152,270.092,245.012,268z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M239.012,271c-0.615,0.89-1.208,1.789,0,2
+		c0.168,2.168-3.547,0.453-5,1C234.926,272.247,235.871,270.526,239.012,271z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M327.012,299c-1,18.609-4.609,28.575-8,46c-13.346-6.354,2.438-17.015-1-27
+		C324.154,315.976,318.696,303.5,327.012,299z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M192.012,325c3.173,0.603,6.774,0.206,7,4
+		c-1.555,3.207-4.511,1.31-9,1c0.615-0.891,1.208-1.788,0-2C190.662,326.983,192.311,326.966,192.012,325z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M188.012,377c2.092,1.158,3.758-0.468,5,3
+		c0.523,4.119-5.41,5.09-8,3C187.448,380.368,185.575,379.632,188.012,377z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M214.012,392c-1.393-1.273-0.435-4.898-3-5
+		c5.326-5.069,14.299-2.146,15,3C221.515,394.303,219.724,392.188,214.012,392z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M189.012,393c0.905-3.9,3.681,3.314,4,0c1.357,0.31,0.83,2.504,1,4
+		C191.078,396.934,191.067,393.944,189.012,393z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M152.012,417c2.324,0.676,4.2,1.8,4,5
+		C154.298,420.714,152.08,419.933,152.012,417z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M165.012,487c2.442,0.997,2.131,0.332,6,1c-0.692,1.763-1.105,3.097,0,4
+		c-5.536,2.636-10.812,7.383-14,7c-1.417-2.293-5.428-7.181-4-9c1.787-0.282,2.052,0.945,1,1
+		C157.555,494.748,162.215,489.714,165.012,487z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M213.012,500c3.118,1.322,4.498-6.501,7-9
+		c5.27,4.896-3.922,8.561-6,16C208.244,506.509,212.007,505.438,213.012,500z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M174.012,508c-3.469,2.024-4.557-3.056-3-5
+		C172.987,503.691,173.678,505.667,174.012,508z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M174.012,521c0.162-1.172,1.823-0.844,3-1c0.857,3.19-1.574,3.093-2,5
+		C170.089,523.115,176.019,520.69,174.012,521z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M190.012,565c-7.083,1.985-8.017,13.883-18,14c0.998-2.442,0.332-2.131,1-6
+		c1.623,1.499,3.414-2.413,8-3c-2.998-2.836-5.457-0.353-10-2c-1.158-3.469,0.468-1.842-3-3c0.677-3.198,3.323-1.887,4-3
+		c1.109,3.429,2.495,1.065,3,4C181.803,566.066,183.639,562.814,190.012,565z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M136.012,124c6.081-1.33,0.901-13.578,3-14c-1.764-2.311-4.646-15.29-3-19
+		c1.523-3.432,4.646-3.048,6-6c0.62-1.351-1.15-4.289-1-5c0.356-1.686,2.156-1.152,3-3c1.01-2.213-0.471-5.99,0-8
+		c4.229-18.04,16.669-27.779,25-38c4.207-0.725,6.255-1.801,8-5c2.406-4.411,2.765-3.086,7-6c1.499-1.031,4.334-3.72,8-6
+		c23.388-14.547,58.442-14.144,90-12c0.856,0.058,1.814-1.262,2-2c0.955,1.712,3.318,2.015,4,4c0.831-4.004,10.221,4.475,16,5
+		c0.996,7.51,17.634,10.706,24,25c9.226,4.596,15.3,11.263,18,20c6.004-1.222,3.889,5.467,6,11c0.894,2.342,2.985,2.912,3,3
+		c1.462,8.717-3.415,22.111-1,31c0.873,3.211,3.693,4.421,4,7c0.294,2.472-2.496,6.758-2,10c0.502,3.276,3.25,4.977,3,8
+		c-0.443,1.454-0.878-0.102-2,0c-0.848,13.582-2.468,14.61-5,28c3.418,1.716,3.923,2.639,9,4c-1.646,0.336,0.342,6.408,1,4
+		c1.031,3.685,2.299,28.651-1,29c2.427,1.352,0.623,1.999,2,3c-4.259,3.229-1.681,12.876-4,13c3.308,3.043,0.187,8.463,2,13
+		c-1.111,0.983-4.909,4.296-2,6c-10.071,12.31-10.151,23.17-24,30c1.33,12.422-6.88,20.946-9,27c-0.388,1.107,1.561,1.866,1,3
+		c-0.884,1.789-0.957-0.862-2,0c-2.649,2.19-1.047,6.096-2,8c-0.887,1.771-1.044-0.889-2,0c-1.668,1.552-2.843,8.209-4,10
+		c-3.925,6.072-10.245,12.801-14,18c-7.266,10.061-18.983,15.848-26,22c-32.305,10.389-73.176-12.726-91-42c-1,0-2,0-3,0
+		c-3.544-7.906-13.61-18.508-12-28c-0.162-1.172-1.823-0.843-3-1c2.105-5.545-3.907-13.739-1-17c-0.536-2.062-4.731-0.238-2-3
+		c-14.005,3.148-10.309-15.088-20-19c-1.418-7.107-7.586-17.381-10-25c2.066-22.721-5.235-32.281,4-44
+		c11.752,0.648,3.772-5.215,2-11c-1.18-3.852,4.021-7.245-2-9c1.791-2.635-2.648-12.831,2-15c-2.774-1.226-4.677-3.323-7-5
+		C134.365,121.599,135.772,122.914,136.012,124z M296.012,67c-6.846-5.993-1.415-19.076,6-19c-2.35-0.013,0.365-2.729,2-2
+		c5.668,4.151,2.98,7.978,7,14c5.847-12.377,1.045-21.84-2-39c-5.792-0.541-6.957-5.709-11-8c-19.218-7.989-53.275-8.009-70-3
+		c12.745,4.247,17.204,3.087,27,10c1.373-2.279-2.578-3.759,0-4c14.358,5.932,18.776-4.713,26,7c-2.333,0-4.667,0-7,0
+		c0.475,3.808-0.425,6.242-3,7c-2.843-3.509-8.599-9.376-13-8c5.636,3.697,8.595,10.072,14,14c0.054,1.72-0.77,2.563-2,3
+		c-7.851-10.011-14.416-15.422-27-21c-4.689,8.75,17.303,20.254-1,20c3.813,5.057-7.388,3.363-10,6c1.377,1.001-0.427,1.648,2,3
+		c-11.945-9.802-22.066-8.975-30-15c0.157-1.177-0.172-2.838,1-3c7.206,5.545,12.793,3.04,21,1c-10.702-4.204-16.086-10.784-28-4
+		c3.364,6.457-11.235,9.327-14,16c4.882,2.548,12.383,6.104,17,3c-4.132,0.465-4.972-2.362-7-4c2.884-6.462,10.089,4.051,9-1
+		c16.634,5.11,20.635,11.491,34,20c-3.296,3.415,3.84,2.036,4,5c-2.438,2.308,3.507,8.889,1,12c-10.266-10.538-29.08-15.717-40-18
+		c-0.21-0.044,0.987-2.003,1-2c-10.69-2.864-15.551-2.738-30-4c1.988,5.942,15.868,0.708,15,9c-9.854,2.729-13.782-4.736-22,2
+		c-1.101,5.574-3.737,8.931-6,16c1.858,1.565,6.195-0.456,7-3c-2.259-0.56,1.212-1.56-1-3c5.363-1.856,4.421-4.083,8-8
+		c8.226,7.452-3.126,12.931-4,20c-0.264,2.135,2.151,5.573,2,6c-0.232,0.655-4.676,1.438-5,2c-3.141,5.453,6.494,13.405,1,20
+		c4.136,9.471,6.8,19.151,9,37c-5.441,1.525-3.312,5.755-2,10c-2.822,1.004-2.506,1.465-4,2c0.535,1.494,0.996,1.178,2,4
+		c6.015-4.585,18.819-13.996,26-12c7.03,1.954,9.364,4.9,16,7c7.242,2.291,19.295,2.131,22,7c0.624,1.123-0.968,3.741,0,5
+		c-0.39-0.507,6.049,3.986,7,4c0.92-5.009,5.567,1.113,9,0c2.026-1.307,1.373-5.293,4-6c1.151,1.182,1.132,3.535,1,6
+		c1.453-0.547,5.169,1.168,5-1c-0.692-8.755,13.528-15.422,20-21c0.102,1.122-1.453,1.557,0,2c10.091-3.584,27.271-8.868,40-5
+		c-0.556,0.003-1.135-0.81,0-1c2.574,3.078-0.022,5.218,1,8c4.275,1.201,5.098,0.653,7,3c-0.191,3.142-1.858,4.809-5,5
+		c-11.975-10.482-36.291,0.998-50,3c-0.834,4.162-7.751,4.155-5,9c5.465-1.202,8.2-5.133,12-8c0.102,1.122-1.453,1.557,0,2
+		c13.437-7.123,31.299-5.738,38,7c-1.003-0.003-1.19,0.81-2,1c-1.891,0.224-2.206-1.127-4-1c-9.741,10.837-20.524,6.212-29,3
+		c5.233-1.001,11.008,4.594,16,0c-4.986,0.845-8.617-4.357-13-7c-5.615,2.444-6.876,9.811-13,7c0.381-2.832,4.882-3.63,9-7
+		c-2.806-0.013,2.381-2.729-2-2c-0.966,1.308-8.156,5.841-13,9c-3.729,0.396-0.42-6.247-3-7c-1.009,1.991-1.729,4.271-4,5
+		c-2.023-0.886-6.23-1.681-9,0c7.918,4.693-9.467,4.528-8,3c-4.179,10.138,0.088,19.823,0,31c1.177,0.157,2.839-0.172,3,1
+		c-3.347,0.903-0.873,2.237,0,4c-1.303-1.724-4.697,5.658-4,3c-3.06,11.654,1.245,16.669,5,24c11.597,1.662,14.441-7.918,24-8
+		c2.817-5.792-6.255-11.231,1-12c-1.119,1.44-1.078,2.44,1,3c4.187,6.216-2.46,19.512-17,24c0.534,1.389,1.712,6.521,4,9
+		c1.456-1.712,6.291,1.652,7,4c-2.242,0.424-3.188,2.146-5,3c6.142,2.082,16.157,0.792,22-2c-5.296-1.09-6.108-0.506-13,0
+		c-1.979-2.688-4.405-4.928-4-10c1.278-0.055,1.385-1.282,3-1c-0.123,4.183,8.183,8.376,12,5c-2.942-1.035-3.265-3.965-2-5
+		c2.205,0.556,4.746,2.346,3,4c4.406-0.662,4.097,0.165,7-2c-0.306,2.306,2.889,1.111,3,3c-1.393,1.253-0.435,5.654-3,3
+		c-1.052,4.386,3.382,3.285,3,7c-0.56,1.44-1.56,2.44-3,3c-9.358-3.958-18.937,1.651-23,0c0.889-1.745,4.378,0.745,2-1
+		c-10.226,4.742-19.478,3.101-28,3c-8.432-0.1-23.233-6.504-35,4c-0.886-2.884-1.539-12.76,0-16c7.193,2.182,12.484,1.559,20,2
+		c2.526-4.27,4.755-11.343,0-15c-9.053-4.915-4.619-14.985,2-23c-0.937,3.485-0.431,3.729-1,10c1.122,0.211,1.557,1.11,2,2
+		c5.217-2.5,7.078,0.356,11-1c-6.097-5.23,1.344-10.451,0-17c-5.515-11.2,0.837-18.416-4-28c-1.283,2.668-2.687,3.662-3,5
+		c-0.776-0.224-1.973-0.027-2-1c5.032-2.581,4.312-5.581,5-9c-7.413-1.93-10.8-13.187-18-12c1.208,0.211,0.615,1.11,0,2
+		c4.197,2.503,3.126,0.534,5,6c-8.617,2.708-21.552,10.015-32,3c9.901,0.262,21.592,2.538,30-6c-2.435-1.899-4.944-3.723-10-3
+		c0.572,3.695-5.255,3.627-3,6c-8.197,3.992-7.354-0.679-13,0c1.852-1.763-0.257-3.097-2-4c-0.677,1.113-3.323-0.199-4,3
+		c1.759,0.241,2.279,1.721,2,4c-1.307,1.943-5.293-2.003-6,2c4.726,5.831,10.201,4.978,14,11c-7.243,1.844-13.965-2.951-18-5
+		c2.897-0.56-1.534-1.56-1-3c3.566,2.128-0.476-2.228,0-4c-3.056-0.723-3.644,1.022-6,1c-0.294,7.38,10.57,15.918,11,13
+		c2.031,4.746,12.012,1.058,10,5c18.646,2.194,30.79-7.049,35-16c1.269,4.11-3.268,7.966-6,13c-20.343,12.116-37.396,9.69-51-8
+		c-2.063,2.709-0.875-2.286-2-2c-0.057,0.61-0.149,1.184-1,1c-2.916,0.832-2.607,7.375,0,17c2.52,9.3,7.375,12.772,11,19
+		c0.699,1.2,3.785,8.015,4,10c0.367,3.392-3.105,9.406-3,13c0.08,2.719,2.691,5.481,3,9c0.71,8.095-1.758,17.541,5,26
+		c4.485-14.684-5.559-28.089,1-39c8.541,4.942,2.815,13.054,5,25c3.161,1.945,1.187,6.392,1,10c1.177,0.157,2.838-0.172,3,1
+		c-4.938,5.994,6.408,16.642,7,25c4.578-1.816,1.849,5.243,5,2c7.581,14.562,18.106,21.848,38,21c10.975-0.468,31.877,0.423,33-9
+		c6.56-1.297,12.103-10.193,12-12c10.159-6.512,15.397-18.097,21-28c-0.206,0.364,0.558,1.541,1,1c2.957-3.612,2.878-11.817,4-13
+		c0.454-0.479,4.994-2.623,2-6c1.177-0.157,2.839,0.172,3-1c-1.783-5.137,3.866-17.438,6-28c-3.175-4.084,3.89-27.432,4-28
+		c2.005-10.324,3.82-21.033,0-29c3.299-2.51-1.823-10.653,2-15c-3.927-3.749,0.749-9.354-4-16c3.079,1.101,1.246-6.016,1-9
+		c3.141,0.474,4.086-1.247,5-3c-4.861-0.492,2.861-5.514-2-3c1.945-2.903,3.301-2.594,2-7c-1.177-0.157-2.839,0.172-3-1
+		c2.88-2.351,0.812-9.011,7-12c-0.003,1.003,0.81,1.19,1,2c-4.112,2.212,1.182,3.663,2,4c-0.139,4.312-3.592,4.271-1,8
+		c7.096-8.67-0.994-20.371,3-26c-3.124-0.681-1.682-3.045,0-4c-3.26-0.29-2.517-7.583,0-8c-3.543-10.077-3.515-19.43-4-31
+		c-4.691-1.918-3.483-8.201-8-8c-3.791-7.377-15.473-25.666-25-24c1.364,1.666,5.479,13.43,2,13c-0.818,13.392,1.472,14.605-4,22
+		c-3.14-1.131-2.642,0.288-5-1c0.279,2.279-0.241,3.759-2,4C303.258,66.348,296.468,72.708,296.012,67z M151.012,94
+		c9.673-26.836,6.376-45.551,35-46c-4.485-4.515-15.083-2.917-22-5c-2.304,4.081-2.222,4.393-6,7
+		C159.681,60.352,139.336,87.188,151.012,94z M146.012,121c3.775,14.691-1.678,24.81,6,34c2.407-7.667,2.96-25.512-1-35
+		C150.098,121.115,149.153,120.315,146.012,121z M347.012,183c2.292-9.042,7.623-15.043,12-22
+		C349.391,151.823,342.866,170.709,347.012,183z M338.012,242c1.453-0.547,5.169,1.168,5-1c2.942-4.6,6.378-22.007,12-24
+		c-0.505-7.815,2.472-10.398-1-19c1.748-3.968,0.442-8.715,2-14c0.312-1.056,2.568-0.934,3-3c0.712-3.41-0.645-9.52-2-13
+		c-5.852,3.855-3.99,18.497-11,19c0.649,4.525-0.674,4.536-2,5C342.952,209.263,340.081,223.312,338.012,242z M203.012,177
+		c-0.61-0.057-1.184-0.149-1-1c10.271,0.378,17.964-3.025,28,3c0-1.667,0-3.333,0-5c-9.286-1.241-36.146-8.616-43-2
+		c-1.104,1.065-1.785,5.254-4,9C190.474,182.353,197.219,175.165,203.012,177z M171.012,193c-2.399-1.823,6.305-0.962,6-4
+		c-0.557-5.435,1.18-11.642,4-16c-9.628-0.628-4.672,13.328-11,16c-2.335-6.072-9.836-1.724-18-7
+		C158.778,188.764,163.997,190.366,171.012,193z M206.012,185c0.843-0.752,4.578-0.362,5-4
+		C207.86,180.261,204.354,184.237,206.012,185z M248.012,274c13.976,3.854,16.528-3.78,11-11c-1.891,0.224-2.206-1.127-4-1
+		C251.954,267.612,248.699,268.937,248.012,274z M242.012,273c-5.817-0.004,3.274,2.693,3,0c-2.79-1.035,5.254-3.965,0-5
+		C243.152,270.092,242.421,271.758,242.012,273z M234.012,274c1.453-0.547,5.168,1.168,5-1c-1.208-0.211-0.615-1.11,0-2
+		C235.871,270.526,234.926,272.247,234.012,274z M303.012,186c2.002-3.307,8.812,0.611,9-8c-4.318-0.012-5.605,1.837-8-1
+		c-2.606,3.754-4.484,2.915-9,1c1.418,6.367,8.739,3.85,11,1c-0.003,1.003,0.81,1.19,1,2c-1.184,1.483-3.777,1.556-5,3
+		C303.887,184.239,301.444,185.646,303.012,186z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M171.012,279c-1.493,5.736,0.74,13.392,4,26c3.162-1.859,0.188-2.591,3-3
+		c2.208,0.125,0.425,4.242,1,6c5.251,0.403,2.505-3.39,4-5c4.55,2.914,2.188,6.248,2,10c-4.85,0.184-6.843-2.49-9-5
+		c-0.003,9.646,4.759,25.403,9,33c5.224-4.081-6.124-18.424-1-21c0.869-0.437,3.884,2.804,5,3c5.234,0.921,6.775-1.717,12,1
+		c-1.545,0.835,3.149,4.354,3,4c0.82,1.948-0.739,5.1,0,6c6.081,7.407,22.575,12.014,21,22c-7.414,3.459-16.801-8.628-18-10
+		c-1.242-1.786-2.908,0.776-5-1c0.181,4.268,2.163,9.396-1,12c0.86,0.807,0.594,2.739,2,3c-5.391,3.36,0.955,13.511-7,15
+		c1.146,3.276-0.563,4.724,3,8c9.977-1.695,19.363-6.043,29,1c5.794,19.485-20.089,26.323-36,31c0.615,0.891,1.208,1.788,0,2
+		c6.059,1.326,7.531,4.159,13,7c-2.086,9.567-1.202,16.466,12,20c-0.571,6.295,3.908,12.167,0,16c12.138,8.754,11.495,11.057,11,33
+		c-3.025,3.141-5.956,12.677-15,15c4.903,16.09,0.446,39.883,0,47c-6.597-0.618-3.45,7.057-11,8c-3.984,8.304-9.915,10.962-12,24
+		c-3.511,0.483-3.289,1.157-6,0c-1.143-8.128,12.279-14.111,6-24c4.453-0.214,4.128-5.205,9-5c1.131-2.954,5.107-6.943,7-9
+		c1.663-1.807,5.174-1.91,5-5c-0.327-5.791-0.402-13.311-1-19c0.354-1.401,1.761-0.086,2,1c3.741-1.891-1.812-4.276-2-5
+		c-0.489-1.88,5.284-8.365-3-4c-0.872-1.035-0.872-3.965,0-5c-0.56-2.259-1.56,1.213-3-1c2.729-6.682,10.323-13.18,15-19
+		c-1.383-2.903-0.119-2.594,0-7c4.659,2.589,5.299-8.642,6-7c-1.564-4.085-4.306-7.752-9-11c-5.531,1.025-11.301,7.441-13,9
+		c-4.03,3.697-13.292,16.87-23,11c14.127-4.41,18.923-15.779,31-21c-0.954-2.575,6.022-2.757,4-12c-0.56-2.56-3.925-5.919-4-6
+		c-14.321-15.521-33.543,28.974-47,21c0.615-0.891,1.208-1.788,0-2c-0.943-1.85,5.723-0.613,2-2c8.749-3.531,11.019-5.236,12-8
+		c2.104-5.926,13.32-7.808,19-13c5.556-5.08,9.098-18.988-2-23c-5.235-1.893-13.849,1.687-19,5c-12.856,8.271-20.003,26.801-42,25
+		c0.777-0.89,1.075-2.258,1-4c14.48,0.51,28.476-13.203,33-25c15.964-9.791,36.745-14.917,55-24c4.677-9.349-10.813,1.051-15-7
+		c-0.11-0.212,0.506-3.385,1-3c-7.765-6.054-33.843,4.677-40,9c-1.454-0.443,0.102-0.878,0-2c-7.444,2.773-8.627,5.102-15,6
+		c-0.559,4.769,1.739,6.588,0,8c1.223,1.444,3.816,1.517,5,3c0.168,2.169-3.547,0.453-5,1c1.307-4.307-2.837-3.162-4-5
+		c-7.863,5.96-12.458,13.983-17,20c-7.353,9.739-17.417,15.214-25,25c0.644,2.951,6.451,4.049,4,7c6.162,0.049,12.26,10.585,6,9
+		c4.838,23.506,10.921,38.557,25,70c1.828,1.24-1.728,3.86-4,2c-2.111-3.798-2.048-10.815-7-14c0.115-9.16-9.413-24.92-9-32
+		c-5.406-0.988,0.406,2.988-5,2c4.845,14.788,12.497,31.675,14,42c3.97,5.016,10.37,12.709,14,21c5.468,1.367,7.773,14.586,15,16
+		c0.005,5.365,7.376,8.751,6,12c-15.029-6.921-26.86-30.439-34-43c-1,0-2,0-3,0c3.167-3.276-6.167-4.724-3-8
+		c-1.924-0.424-3.61,0.686-2,1c-7.468,13.457-31.779,18.104-46,29c-3.302-0.573,1.259-6.47-1-6c2.148-1.176,4.02-2.277,4-4
+		c15.842-6.454,26.069-16.626,40-28c-1.606-7.905-6.252-13.336-6-24c-6.387-3.789-1.812-20.988-7-23c1.138-15.993-9.112-24.713-4-34
+		c5.894-10.707,24.659-17.037,28-31c0.81,0.19,0.997,1.003,2,1c3.614-7.505,9.875-13.302,15-18c3.251-2.98,3.079-2.236,6-6
+		c2.531-3.261,6.472-8.83,8-10c3.131-2.398,1.015-5.059,2-7c0.841-1.657,6.913-5.09,4-8c0.354-1.401,1.761-0.086,2,1
+		c0.045-2.687,3.718-7.529,11-6c-0.294-2.039-2.706-1.961-3-4c-18.588,5.991-35.494-9.642-54-1c-0.778,3.957-17.432,10.764-19,13
+		c-17.059,7.774-29.045,18.421-45,20c-4.056-6.322,22.502-13.219,22-13c11.603-5.056,20.871-14.092,35-19
+		c-1.409-1.181,18.935-9.739,1-11c-0.184-0.851,0.39-0.943,1-1c-4.308-1.226-8.376-5.992-12-5c-11.026,3.019-31.625,15.365-37-1
+		c-13.256,2.952-31.941,9.877-43,15c-1.454-0.443,0.102-0.878,0-2c-6.89,4.118-17.589,9.734-22,13c-1.548,2.754-6.002,0.097-7-1
+		c-0.286-1.763,4.709-3.097,2-4c0.426-1.952,2.857,1.636,2-3c13.809-2.874,19.881-15.699,36-18c-0.693-0.384,8.675-8.164,6-4
+		c4.515-4.335,11.536-7.246,22-12c1.065-0.484,2.847,0.258,4,0c2.106-0.472,2.18-3.104,4-4c5.207-2.562,13.75-5.57,16-7
+		c10.719-6.812,24.123-10.701,31-16c0.813-0.627,1.118-1.467,1-3c14.38-2.84,29.178-17.594,46-16
+		C170.862,280.184,170.955,279.61,171.012,279z M214.012,507c2.078-7.439,11.27-11.104,6-16c-2.502,2.499-3.882,10.322-7,9
+		C212.007,505.438,208.244,506.509,214.012,507z M226.012,390c-0.701-5.146-9.674-8.069-15-3c2.565,0.102,1.607,3.727,3,5
+		C219.724,392.188,221.515,394.303,226.012,390z M190.012,328c1.208,0.212,0.615,1.109,0,2c4.489,0.31,7.445,2.207,9-1
+		c-0.226-3.794-3.827-3.397-7-4C192.311,326.966,190.662,326.983,190.012,328z M187.012,374c0.102-1.907,3.727,0.797,5,1
+		c0.87-1.464,1.497-3.17,4-3c0.906-17.836,2.053-23.951,3-32c0.552-4.688,2.047-8.631-9-7
+		C188.172,348.673,184.086,362.229,187.012,374z M183.012,385c2.443-5.707-3.149-10.724-2-16c-12.71,1.496-11.496,16.537-17,23
+		C169.926,390.592,178.396,386.796,183.012,385z M185.012,383c2.59,2.09,8.523,1.119,8-3c-1.242-3.468-2.908-1.842-5-3
+		C185.575,379.632,187.448,380.368,185.012,383z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M306.012,69c1.759-0.241,2.279-1.721,2-4
+		c2.358,1.288,1.86-0.131,5,1c5.472-7.395,3.182-8.608,4-22c3.479,0.43-0.636-11.334-2-13c9.527-1.666,21.209,16.623,25,24
+		c4.517-0.201,3.309,6.082,8,8c0.485,11.57,0.457,20.923,4,31c-2.517,0.417-3.26,7.71,0,8c-1.682,0.955-3.124,3.319,0,4
+		c-3.994,5.629,4.096,17.33-3,26c-2.592-3.729,0.861-3.688,1-8c-0.818-0.337-6.112-1.788-2-4c-0.19-0.81-1.003-0.997-1-2
+		c-6.188,2.989-4.12,9.649-7,12c0.161,1.172,1.823,0.843,3,1c1.301,4.406-0.055,4.097-2,7c4.861-2.514-2.861,2.508,2,3
+		c-0.914,1.753-1.859,3.474-5,3c0.246,2.984,2.079,10.101-1,9c4.749,6.646,0.073,12.251,4,16c-3.823,4.347,1.299,12.49-2,15
+		c3.82,7.967,2.005,18.676,0,29c-0.11,0.568-7.175,23.916-4,28c-2.134,10.562-7.783,22.863-6,28c-0.161,1.172-1.823,0.843-3,1
+		c2.994,3.377-1.546,5.521-2,6c-1.122,1.183-1.043,9.388-4,13c-0.442,0.541-1.206-0.636-1-1c-5.603,9.903-10.841,21.488-21,28
+		c0.103,1.807-5.44,10.703-12,12c-1.123,9.423-22.025,8.532-33,9c-19.894,0.848-30.419-6.438-38-21c-3.151,3.243-0.422-3.816-5-2
+		c-0.592-8.358-11.938-19.006-7-25c-0.162-1.172-1.823-0.843-3-1c0.187-3.608,2.161-8.055-1-10c-2.185-11.946,3.541-20.058-5-25
+		c-6.559,10.911,3.485,24.316-1,39c-6.758-8.459-4.29-17.905-5-26c-0.309-3.519-2.92-6.281-3-9c-0.105-3.594,3.367-9.608,3-13
+		c-0.215-1.985-3.301-8.8-4-10c-3.625-6.228-8.48-9.7-11-19c-2.607-9.625-2.916-16.168,0-17c0.851,0.184,0.943-0.39,1-1
+		c1.125-0.286-0.063,4.709,2,2c13.604,17.69,30.657,20.116,51,8c2.732-5.034,7.269-8.89,6-13c-4.21,8.951-16.354,18.194-35,16
+		c2.012-3.942-7.969-0.254-10-5c-0.43,2.918-11.294-5.62-11-13c2.356,0.022,2.944-1.723,6-1c-0.476,1.772,3.566,6.128,0,4
+		c-0.534,1.44,3.897,2.44,1,3c4.035,2.049,10.757,6.844,18,5c-3.799-6.022-9.274-5.169-14-11c0.707-4.003,4.693-0.057,6-2
+		c0.279-2.279-0.241-3.759-2-4c0.677-3.199,3.323-1.887,4-3c1.743,0.903,3.852,2.237,2,4c5.646-0.679,4.803,3.992,13,0
+		c-2.255-2.373,3.572-2.305,3-6c5.056-0.723,7.565,1.101,10,3c-8.408,8.538-20.099,6.262-30,6c10.448,7.015,23.383-0.292,32-3
+		c-1.874-5.466-0.803-3.497-5-6c0.615-0.89,1.208-1.789,0-2c7.2-1.187,10.587,10.07,18,12c-0.688,3.419,0.032,6.419-5,9
+		c0.027,0.973,1.224,0.776,2,1c0.313-1.338,1.717-2.332,3-5c4.837,9.584-1.515,16.8,4,28c1.344,6.549-6.097,11.77,0,17
+		c-3.922,1.356-5.783-1.5-11,1c-0.443-0.89-0.878-1.789-2-2c0.569-6.271,0.063-6.515,1-10c-6.619,8.015-11.053,18.085-2,23
+		c4.755,3.657,2.526,10.73,0,15c-7.516-0.441-12.807,0.182-20-2c-1.539,3.24-0.886,13.116,0,16c11.767-10.504,26.568-4.1,35-4
+		c8.522,0.101,17.774,1.742,28-3c2.378,1.745-1.111-0.745-2,1c4.063,1.651,13.642-3.958,23,0c1.44-0.56,2.44-1.56,3-3
+		c0.382-3.715-4.052-2.614-3-7c2.565,2.654,1.607-1.747,3-3c-0.111-1.889-3.306-0.694-3-3c-2.903,2.165-2.594,1.338-7,2
+		c1.746-1.654-0.795-3.444-3-4c-1.265,1.035-0.942,3.965,2,5c-3.817,3.376-12.123-0.817-12-5c-1.615-0.282-1.722,0.945-3,1
+		c-0.405,5.072,2.021,7.312,4,10c6.892-0.506,7.704-1.09,13,0c-5.843,2.792-15.858,4.082-22,2c1.812-0.854,2.758-2.576,5-3
+		c-0.709-2.348-5.544-5.712-7-4c-2.288-2.479-3.466-7.611-4-9c14.54-4.488,21.187-17.784,17-24c-2.078-0.56-2.119-1.56-1-3
+		c-7.255,0.769,1.817,6.208-1,12c-9.559,0.082-12.403,9.662-24,8c-3.755-7.331-8.06-12.346-5-24c-0.697,2.658,2.697-4.724,4-3
+		c-0.873-1.763-3.347-3.097,0-4c-0.161-1.172-1.823-0.843-3-1c0.088-11.177-4.179-20.862,0-31c-1.467,1.528,15.918,1.693,8-3
+		c2.77-1.681,6.977-0.886,9,0c2.271-0.729,2.991-3.009,4-5c2.58,0.753-0.729,7.396,3,7c4.844-3.159,12.034-7.692,13-9
+		c4.381-0.729-0.806,1.987,2,2c-4.118,3.37-8.619,4.168-9,7c6.124,2.811,7.385-4.556,13-7c4.383,2.643,8.014,7.845,13,7
+		c-4.992,4.594-10.767-1.001-16,0c8.476,3.212,19.259,7.837,29-3c1.794-0.127,2.109,1.224,4,1c0.81-0.19,0.997-1.003,2-1
+		c-6.701-12.738-24.563-14.123-38-7c-1.453-0.443,0.102-0.878,0-2c-3.8,2.867-6.535,6.798-12,8c-2.751-4.845,4.166-4.838,5-9
+		c13.709-2.002,38.025-13.482,50-3c3.142-0.191,4.809-1.858,5-5c-1.902-2.347-2.725-1.799-7-3c-1.022-2.782,1.574-4.922-1-8
+		c-1.135,0.19-0.556,1.003,0,1c-12.729-3.868-29.909,1.416-40,5c-1.453-0.443,0.102-0.878,0-2c-6.472,5.578-20.692,12.245-20,21
+		c0.169,2.168-3.547,0.453-5,1c0.132-2.465,0.151-4.818-1-6c-2.627,0.707-1.974,4.693-4,6c-3.433,1.113-8.08-5.009-9,0
+		c-0.951-0.014-7.39-4.507-7-4c-0.968-1.259,0.624-3.877,0-5c-2.705-4.869-14.758-4.709-22-7c-6.636-2.1-8.97-5.046-16-7
+		c-7.181-1.996-19.985,7.415-26,12c-1.004-2.822-1.465-2.506-2-4c1.494-0.535,1.178-0.996,4-2c-1.312-4.245-3.441-8.475,2-10
+		c-2.2-17.849-4.864-27.529-9-37c5.494-6.595-4.141-14.547-1-20c0.324-0.562,4.768-1.345,5-2c0.151-0.427-2.264-3.865-2-6
+		c0.874-7.069,12.226-12.548,4-20c-3.579,3.917-2.637,6.144-8,8c2.212,1.44-1.259,2.44,1,3c-0.805,2.544-5.142,4.565-7,3
+		c2.263-7.069,4.899-10.426,6-16c8.218-6.736,12.146,0.729,22-2c0.868-8.292-13.012-3.058-15-9c14.449,1.262,19.31,1.136,30,4
+		c-0.013-0.003-1.21,1.956-1,2c10.92,2.283,29.734,7.462,40,18c2.507-3.111-3.438-9.692-1-12c-0.16-2.964-7.296-1.585-4-5
+		c-13.365-8.509-17.366-14.89-34-20c1.089,5.051-6.116-5.462-9,1c2.028,1.638,2.868,4.465,7,4c-4.617,3.104-12.118-0.452-17-3
+		c2.765-6.673,17.364-9.543,14-16c11.914-6.784,17.298-0.204,28,4c-8.207,2.04-13.794,4.545-21-1c-1.172,0.162-0.843,1.823-1,3
+		c7.934,6.025,18.055,5.198,30,15c-2.427-1.352-0.623-1.999-2-3c2.612-2.637,13.813-0.943,10-6c18.303,0.254-3.689-11.25,1-20
+		c12.584,5.578,19.149,10.989,27,21c1.23-0.437,2.054-1.28,2-3c-5.405-3.928-8.364-10.303-14-14c4.401-1.376,10.157,4.491,13,8
+		c2.575-0.758,3.475-3.192,3-7c2.333,0,4.667,0,7,0c-7.224-11.713-11.642-1.068-26-7c-2.578,0.241,1.373,1.721,0,4
+		c-9.796-6.913-14.255-5.753-27-10c16.725-5.009,50.782-4.989,70,3c4.043,2.291,5.208,7.459,11,8c3.045,17.16,7.847,26.623,2,39
+		c-4.02-6.022-1.332-9.849-7-14c-1.635-0.729-4.35,1.987-2,2c-7.415-0.076-12.846,13.007-6,19
+		C296.468,72.708,303.258,66.348,306.012,69z M238.012,50c2.901,10.407,10.013,8.925,12,17c6.026,0.903,7.209,11.113,10,3
+		c2.01,5.572,3.9,0.112,6,0c4.545-0.242,8.532,4.009,16,1c0.835-12.104-11.236-8.034-20-9c-1.241-2.092-2.908-3.758-5-5
+		c-0.215,5.521,7.39,6.92,4,10C252.345,54.324,245.195,57.713,238.012,50z M274.012,50c-1.877,1.907,0.594,1.81,0,5
+		c7.041,1.887,10.153,7.505,10,12c5.457,0.518,2.806,4.354,8,7c2.374-11.471-9.306-17.29-16-23c0.556,0.003,1.135-0.81,0-1
+		C275.8,51.208,274.902,50.615,274.012,50z M315.012,85c3.91,0.875,4.656-5.538,12-8c3.553,4.216,4.497,10.096,10,15
+		c2.044-6.322,2.677-6.873,3-12c-5.092-4.904-6.233-8.887-9-17c-4.482,0.726-1.41,4.424-5,2c1.349-2.86,4.37-7.123,1-6
+		c1.573-2.092,2.378-3.758,1-5C323.097,66.472,315.158,71.517,315.012,85z M172.012,94c-2.292,2.754-1.838,5.087-1,7
+		c0.057-0.61,0.149-1.184,1-1c-0.003,0.555,0.81,1.135,1,0c-2.729,0.286,3.042-4.709,0-2c-1.122-0.102-1.557,1.454-2,0
+		C172.623,98.428,174.368,94.272,172.012,94z M326.012,126c6.497-0.496,5.692-14.352,4-22c-1.008,0.782-2.498,0.626-4,3
+		C329.735,112.989,322.916,118.464,326.012,126z M329.012,138c-1,0-2,0-3,0c-0.973,7.193,3.646,5.897,2,11
+		c2.279,0.279,3.759-0.241,4-2C330.625,141.098,328.168,142.927,329.012,138z M260.012,152c-1.377,0.043-2.196-0.471-3-1
+		c-4.526,7.921-0.943,15.81,6,15C262.048,160.164,257.116,160.431,260.012,152z M240.012,165c1.22,0.113,2.367,0.299,2,2
+		c0.667,0,1.333,0,2,0c0.61-0.057,1.184-0.149,1-1c-1.988-0.677,0.988-3.323-1-4c-1.666,4.395-0.334-7.395-2-3
+		c-0.224,0.776-0.027,1.973-1,2c0.003-0.555-0.81-1.135-1,0C241.117,161.903,240.704,163.237,240.012,165z M319.012,198
+		c-13.882,12.985-40.772,7.227-47-1c1.534-0.239,0.146-1.646-1-2c0.955,15.57,38.225,22.581,50,5c-2.709-2.063,2.286-0.875,2-2
+		c-3.724-1.386,2.943-0.15,2-2c-0.545-6.537,5.661-6.44,8-14c-1.758-0.575-5.875,1.208-6-1c0.239-1.427,1.646-1.687,2-3
+		c-4.303-0.355-1.296-8.439-7-5C328.324,183.28,323.22,189.665,319.012,198z M263.012,190c3.417-0.75,1.271,4.063,5,3
+		c-1.398-4.329-0.672-4.602-4-7C262.267,188.039,264.757,187.961,263.012,190z M308.012,198c-0.88-3.213,3.296-1.37,3-4
+		c-3.254-3.7-4.665,0.958-9,1c-8.331,0.08-17.737-7.474-22-2C291.977,204.184,297.536,195.409,308.012,198z M207.012,202
+		c2.134,2.149,5.447,0.371,6-2C209.246,201.137,208.458,199.043,207.012,202z M262.012,225c1.987,0.013,1.271,2.729,4,2
+		c-0.729-2.729,1.987-2.013,2-4C265.589,219.885,263.589,222.246,262.012,225z M234.012,226c0.015-1.651,2.774-0.56,3-2
+		c-2.323-2.214-2.677-0.883-5-2C231.732,224.279,232.252,225.759,234.012,226z M297.012,257c1.786-0.004,5.817,2.693,7,0
+		c-7.618-9.802-12.288-23.377-24-29c-1.745,2.039,0.745,1.961-1,4c2.26,0.665,5.011,3.005,3,5c1,0,2,0,3,0
+		C283.828,244.286,297.658,250.379,297.012,257z M222.012,235c-4.505,0.639-8.385,10.398-9,15c-1.177,0.157-2.838-0.172-3,1
+		c1.717,1.382-0.717,4.618,1,6c5.414-6.253,8.209-15.124,13-22c-1.44,0.534-2.44-3.897-3-1
+		C221.622,234.057,222.195,234.149,222.012,235z M317.012,258c-1.104-0.903-0.692-2.237,0-4c-9.047,3.734-5.967,19.253-7,31
+		c-0.443,5.042-2.673,9.688-2,14c4.739-7.432,7.432-15.337,4-30C316.348,265.848,312.288,256.489,317.012,258z M238.012,307
+		c1.535-12.795,34.718-6.498,36-19c-14.902,1.798-20.57,3.102-32,2c-0.102-1.122,1.454-1.557,0-2c-0.211,1.122-1.11,1.557-2,2
+		c-0.003-1.003,0.81-1.19,1-2c-1.453,0.547-5.168-1.168-5,1c1.208,0.211,0.615,1.11,0,2c3.142,2.091,6.889,2.03,9,7
+		c-5.464,1.582-6.73,4.037-9,5C238.417,303.622,233.966,307.178,238.012,307z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M158.012,50c3.778-2.607,3.696-2.919,6-7
+		c6.917,2.083,17.515,0.485,22,5c-28.624,0.449-25.327,19.164-35,46C139.336,87.188,159.681,60.352,158.012,50z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M261.012,67c3.39-3.08-4.215-4.479-4-10c2.092,1.242,3.759,2.908,5,5
+		c8.764,0.966,20.835-3.104,20,9c-7.468,3.009-11.455-1.242-16-1c-2.1,0.112-3.99,5.572-6,0c-2.791,8.113-3.974-2.097-10-3
+		c-1.987-8.075-9.099-6.593-12-17C245.195,57.713,252.345,54.324,261.012,67z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M276.012,50c1.135,0.19,0.556,1.003,0,1c6.694,5.71,18.374,11.529,16,23
+		c-5.194-2.646-2.543-6.482-8-7c0.153-4.495-2.959-10.113-10-12c0.594-3.19-1.877-3.093,0-5C274.902,50.615,275.8,51.208,276.012,50
+		z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M328.012,54c1.378,1.242,0.573,2.908-1,5c3.37-1.123,0.349,3.14-1,6
+		c3.59,2.424,0.518-1.274,5-2c2.767,8.113,3.908,12.096,9,17c-0.323,5.127-0.956,5.678-3,12c-5.503-4.904-6.447-10.784-10-15
+		c-7.344,2.462-8.09,8.875-12,8C315.158,71.517,323.097,66.472,328.012,54z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M171.012,98c0.443,1.454,0.878-0.102,2,0c3.042-2.709-2.729,2.286,0,2
+		c-0.19,1.135-1.003,0.555-1,0c-0.851-0.184-0.943,0.39-1,1c-0.838-1.913-1.292-4.246,1-7C174.368,94.272,172.623,98.428,171.012,98
+		z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M240.012,161c0.19-1.135,1.003-0.555,1,0c0.973-0.027,0.776-1.224,1-2
+		c1.666-4.395,0.334,7.395,2,3c1.988,0.677-0.988,3.323,1,4c0.184,0.851-0.39,0.943-1,1c-0.667,0-1.333,0-2,0
+		c0.367-1.701-0.78-1.887-2-2C240.704,163.237,241.117,161.903,240.012,161z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M344.012,192c1.326-0.464,2.649-0.475,2-5
+		c7.01-0.503,5.148-15.145,11-19c1.355,3.48,2.712,9.59,2,13c-0.432,2.066-2.688,1.944-3,3c-1.558,5.285-0.252,10.032-2,14
+		c3.472,8.602,0.495,11.185,1,19c-5.622,1.993-9.058,19.4-12,24c0.169,2.168-3.547,0.453-5,1
+		C340.081,223.312,342.952,209.263,344.012,192z M349.012,205c2.058-2.352,1.035-7.686-2-8
+		C345.547,198.759,347.664,202.998,349.012,205z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M183.012,181c2.215-3.746,2.896-7.935,4-9
+		c6.854-6.616,33.714,0.759,43,2c0,1.667,0,3.333,0,5c-10.036-6.025-17.729-2.622-28-3c-0.184,0.851,0.39,0.943,1,1
+		C197.219,175.165,190.474,182.353,183.012,181z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M302.012,184c1.223-1.444,3.816-1.517,5-3
+		c-0.19-0.81-1.003-0.997-1-2c-2.261,2.85-9.582,5.367-11-1c4.516,1.915,6.394,2.754,9-1c2.395,2.837,3.682,0.988,8,1
+		c-0.188,8.611-6.998,4.693-9,8C301.444,185.646,303.887,184.239,302.012,184z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M322.012,173c5.704-3.439,2.697,4.645,7,5c-0.354,1.313-1.761,1.573-2,3
+		c0.125,2.208,4.242,0.425,6,1c-2.339,7.56-8.545,7.463-8,14c0.943,1.85-5.724,0.614-2,2c0.286,1.125-4.709-0.063-2,2
+		c-11.775,17.581-49.045,10.57-50-5c1.146,0.354,2.534,1.761,1,2c6.228,8.227,33.118,13.985,47,1
+		C323.22,189.665,328.324,183.28,322.012,173z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M152.012,182c8.164,5.276,15.665,0.928,18,7
+		c6.328-2.672,1.372-16.628,11-16c-2.82,4.358-4.557,10.565-4,16c0.305,3.038-8.399,2.177-6,4
+		C163.997,190.366,158.778,188.764,152.012,182z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M211.012,181c-0.422,3.638-4.157,3.248-5,4
+		C204.354,184.237,207.86,180.261,211.012,181z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M280.012,193c4.263-5.474,13.669,2.08,22,2c4.335-0.042,5.746-4.7,9-1
+		c0.296,2.63-3.88,0.787-3,4C297.536,195.409,291.977,204.184,280.012,193z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M268.012,223c-0.013,1.987-2.729,1.271-2,4c-2.729,0.729-2.013-1.987-4-2
+		C263.589,222.246,265.589,219.885,268.012,223z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M221.012,234c0.56-2.897,1.56,1.534,3,1c-4.791,6.876-7.586,15.747-13,22
+		c-1.717-1.382,0.717-4.618-1-6c0.162-1.172,1.823-0.843,3-1c0.615-4.602,4.495-14.361,9-15
+		C222.195,234.149,221.622,234.057,221.012,234z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M312.012,269c3.432,14.663,0.739,22.568-4,30c-0.673-4.312,1.557-8.958,2-14
+		c1.033-11.747-2.047-27.266,7-31c-0.692,1.763-1.104,3.097,0,4C312.288,256.489,316.348,265.848,312.012,269z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M482.012,324c-7.472-0.169-14.49-3.106-19-5c-4.049-1.7-11.058-0.731-16-2
+		c-3.016-0.773-3.607-3.264-6-4c-11.726-3.606-25.691-0.998-35-6c-0.083-0.045,1.314-1.898,1-2c-9.535-3.072-23.992-5.318-38-12
+		c-0.761-0.363-0.58,0.766,0,1c-9.022-3.644-21.116-8.786-30-16c7.33-7.676,17.196,7.915,28,5c2.078,0.56,2.119,1.56,1,3
+		c29.586,3.857,44.419,8.945,75,16c1.711,0.044,2.59-0.743,3-2c1.135,0.19,0.556,1.003,0,1c11.356,4.778,26.058,6.562,39,17
+		C484.539,320.632,484.229,321.368,482.012,324z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M236.012,303c2.27-0.963,3.536-3.418,9-5c-2.111-4.97-5.858-4.909-9-7
+		c0.615-0.89,1.208-1.789,0-2c-0.168-2.168,3.547-0.453,5-1c-0.19,0.81-1.003,0.997-1,2c0.89-0.443,1.789-0.878,2-2
+		c1.454,0.443-0.102,0.878,0,2c11.43,1.102,17.098-0.202,32-2c-1.282,12.502-34.465,6.205-36,19
+		C233.966,307.178,238.417,303.622,236.012,303z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M349.012,312c1.541-4.748,3.609,2.434,5,0c1.966,3.736,1.392,10.758,7,14
+		c-0.991,3.246-1.943,6.919,2,8c-0.834,5.751-0.841,11.084,0,16c-0.737,2.263-3.812,2.188-4,5c-0.891-0.615-1.789-1.209-2,0
+		c-6.12-7.081-4.88-14.894-3-20c-3.263-10.973-4.526-21.548-13-31c0.147-2.187,2.52-2.147,5-2
+		C347.184,305.596,351.894,307.195,349.012,312z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M310.012,326c0.282,1.787-0.945,2.052-1,1c-1.172,0.161-0.844,1.823-1,3
+		c-7.321,4.382-9.807,16.781-19,25c-1.988-0.677,0.988-3.323-1-4c0.56-2.078,1.56-2.119,3-1
+		C294.617,340.897,302.891,326.982,310.012,326z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M190.012,333c11.047-1.631,9.552,2.312,9,7
+		c-0.947,8.049-2.094,14.164-3,32c-2.503-0.17-3.13,1.536-4,3c-1.273-0.203-4.898-2.907-5-1
+		C184.086,362.229,188.172,348.673,190.012,333z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M317.012,348c-3.801,8.998-15.622,23.993-26,27c-0.61,0.177-2.95-1.015-3-1
+		c-5.828,1.729-14.746,6.319-23,7c-9.672,0.798-23.146,1.674-30,0c-8.886-2.171-22.542-11.981-28-13c-2.214,1.639-3.646-3.324-2-5
+		c2.265,2.561,7.62-0.163,5,3c17.262,2.051,34.077,14.372,51,8c5.639,1.943,16.048-2.125,23-4c1.135,0.19,0.556,1.003,0,1
+		C295.755,370.127,306.016,357.49,317.012,348z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M136.012,365c0.354-1.567,1.761,0.875,2-1c1.654,2.713,3.693,5.635,4,7
+		c-3.582,5.105-9.471,6.582-16,4c0.627-1.12,0.276-7.319,0-8c0.65-1.017,2.299-1.034,2-3c2.397,3.907-0.664,10.888,9,6
+		C135.235,367.908,137.798,366.241,136.012,365z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M164.012,392c5.504-6.463,4.29-21.504,17-23
+		c-1.149,5.276,4.443,10.293,2,16C178.396,386.796,169.926,390.592,164.012,392z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M14.012,384c10.729,6.938,14.253,21.081,24,29c0,1.333,0,2.667,0,4
+		c4.732,3.369,0.605,4.168,7,7c-3.945,0.498,3.215,6.277,2,11c2.67-2.517,5.749,11.854,7,13c10.392,9.517,6.789,23.083,14,31
+		c-1.848,10.862,5.012,14.136-1,22c-8.302-9.33-9.943-24.406-12-33c-0.162-1.172-1.823-0.844-3-1c0.479-1.272,1.234-8.424-1-6
+		c-3.667-17.225-12.687-35.35-23-49c-4.989-6.604-6.787-15.346-14-19c2.212-1.44-1.259-2.44,1-3c-6.517-4.912-10.421-7.979-13-16
+		C11.445,374.834,12.037,378.283,14.012,384z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M92.012,385c0.252-0.482,5.297-2.274,6,1c1.717-3.411,2.816-1.64,4-6
+		c0.89,0.615,1.789,1.209,2,0c3.151-0.151,0.422,5.578,5,4C114.34,395.17,90.708,394.905,92.012,385z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M44.012,474c2.508,3.085-0.788,9.17-10,8c0.002-4.416-7.185-5.576-5-9
+		c-11.015-1.191-9.325-13.814-17-16c2.124-2.616-3.875-3.168-1-7c-7.559-4.878-13.818-24.06-2-12c4.191,0.059,3.091,1.433,8,2
+		C25.929,455.221,38.267,470.267,44.012,474z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M124.012,470c4.885,3.268,3.975,6.123,8,10c5.651-0.477,12.782-6.469,14-6
+		c5.576,2.147,6.679,8.702,1,11c-5.362,2.169-10.572-3.517-17,0C127.417,477.893,122.841,476.426,124.012,470z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M141.012,487c-0.727,11.557,10.526,23.561,13,37c-3.614-0.719-2.857-5.81-7-6
+		c-1.03-8.866-9.433-18.824-8-31C139.902,487.615,140.8,488.209,141.012,487z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M198.012,503c2.999-2.362,3.649,1.175,3,3c-2.679,2.838-6.25,5.031-10,9
+		C184.64,510.27,199.271,505.767,198.012,503z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M174.012,508c1.125,0.903-0.063,2.237,2,4c3.32-2.608,3.132-1.323,8-1
+		c-2.554,4.288-3.759,3.711-10,4C172.619,512.087,171.527,510.041,174.012,508z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M164.012,520c-0.851-0.184-0.943,0.39-1,1c-4.614-2.063,1.692-5.937-1-8
+		c0.226-1.44,2.985-0.349,3-2c3.484,0.294-0.084,2.706,2,3c-2.491,1.719-3.514,4.813-2,6
+		C164.822,521.135,164.008,520.555,164.012,520z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M173.012,524c0,1,0,2,0,3c-2.265,2.735-7.526,2.474-11,4
+		c-4.984,3.389-2.53,9.032-8,10C156.822,532.395,163.526,522.626,173.012,524z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M191.012,527c2.401,9.046,3.696,28.84-8,29c-1.536-5.442,5.842-4.904,7-10
+		C191.227,540.654,181.771,531.799,191.012,527z"/>
+</g>
+</svg>
diff --git a/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_elephant_climbing.svg b/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_elephant_climbing.svg
new file mode 100755
index 0000000000000000000000000000000000000000..07664cc508f78e5ba22876594b729dee728224fb
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_elephant_climbing.svg
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="elephant_climbing_xA0_Image_1_" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="147.062px"
+	 height="186.684px" viewBox="0 0 147.062 186.684" enable-background="new 0 0 147.062 186.684" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  x="68.355" y="114.091" width="147.062" height="186.684" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M101.445,2.334c1.237,0.123,1.578,1.142,1.68,2.4
+		C101.917,4.669,101.282,2.998,101.445,2.334z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M88.245,12.415c-0.056,0.744-0.851,0.749-1.439,0.96
+		c-3.215,2.225-4.465,6.416-6.48,9.84c-2.358-0.167-0.592-3.056,0.24-3.6c0.018-1.583,1.098-2.103,1.2-3.6
+		c1.784-1.495,2.751-3.809,5.279-4.56C87.629,11.59,88.28,11.66,88.245,12.415z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M77.445,23.694c1.328-0.048,2.299,0.261,2.16,1.68
+		C78.413,25.966,77.34,25.116,77.445,23.694z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M78.885,26.095c-0.153,1.767-1.438,2.403-2.16,3.6
+		c-0.704-0.016-0.892-0.548-1.2-0.96C76.418,27.75,77.143,25.445,78.885,26.095z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M74.565,30.175c-1.076,0.043-1.733,0.506-2.16,1.2
+		c-1.011-0.381-2.143-1.268-1.92-2.16C70.903,27.537,74.45,28.019,74.565,30.175z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M100.005,28.734c1.019,0.021,1.513,0.567,1.439,1.68
+		C100.237,30.583,99.863,29.917,100.005,28.734z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M44.805,33.055c0.431-0.031,0.506,0.293,0.96,0.24
+		c-0.462,3.662,1.138,5.262,1.44,8.16c-1.218-0.058-2.267-2.267-2.64-3.84C44.197,36.067,44.261,34.165,44.805,33.055z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M79.845,38.814c1.528-0.009,1.311,1.81,0,1.92
+		C79.496,40.044,79.174,39.319,79.845,38.814z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M88.965,40.734c2.667-0.027,3.708,1.572,4.8,3.12
+		c2.277,0.319,6.86,1.188,6.72,3.6c-0.043,0.743-0.701,1.781-2.16,1.68c-0.597-0.364-0.851-1.069-0.72-2.16
+		c-3.172-0.429-5.448-1.752-6.48-4.32c-0.641-0.399-1.34-0.74-2.159-0.96C88.965,41.375,88.965,41.055,88.965,40.734z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M49.365,42.655c-0.106-0.214-0.21-0.43-0.48-0.48
+		C48.877,39.409,52.03,42.562,49.365,42.655z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M48.405,42.655c0.231,1.271-0.452,1.628-1.2,1.92
+		c-0.149,1.131-0.573,1.987-1.44,2.4c-1.083,0.202-1.199-0.562-1.92-0.72c-1.142,0.378-1.385,1.655-3.36,1.2
+		c-0.125-0.355-0.355-0.605-0.48-0.96c0.382-1.538,2.069-1.771,3.12-2.64c0.826,0.133,0.139,0.928,0,1.44
+		c0.737,0.508,0.671-0.427,0.72-0.48c0.755-0.814,1.419-1.136,1.68-2.4C46.477,42.503,47.825,42.195,48.405,42.655z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M98.805,52.015c0.644,3.023-3.64,5.265-4.561,2.4
+		C95.438,53.347,97.042,51.019,98.805,52.015z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M45.045,64.734c-2.128,0.192-1.726,2.915-3.36,3.6
+		c-1.084-1.56,1.297-3.173,1.92-4.56C44.501,63.679,45.013,63.966,45.045,64.734z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M46.005,65.935c0.605,0.834,1.496,1.384,1.68,2.64
+		c-1.111,0.151-1.732-0.188-2.16-0.72c-0.868,0.572-0.806,2.074-2.4,1.92C43.138,67.547,43.893,66.062,46.005,65.935z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M112.725,67.135c-0.027,0.613-0.44,0.84-0.72,1.2
+		C109.705,68.337,111.64,65.594,112.725,67.135z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M111.525,70.975c-0.97,0.943,0.165,2.036-0.24,2.88
+		c-1.715-1.058-3.747-2.9-3.84-4.8C109.63,68.292,110.877,69.517,111.525,70.975z M109.845,70.975
+		c0.013-0.413-0.185-0.615-0.48-0.72C109.352,70.667,109.549,70.87,109.845,70.975z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M112.245,75.055c1.028-0.068,1.062,0.859,1.2,1.68
+		C112.231,76.989,112.198,76.062,112.245,75.055z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M25.845,95.454c1.391,2.77,3.715,4.605,5.04,7.44
+		c-0.295,0.104-0.493,0.308-0.48,0.72c-1.154,0.035-0.843-1.396-1.68-1.68c-0.357,0.388,0.158,1.155-0.48,1.68
+		c-2.804-1.757-1.789-7.331-6.48-7.199C21.798,93.823,23.892,95.938,25.845,95.454z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M93.525,106.015c-1.659,1.062-3.391-0.574-3.84-2.16
+		c0.825-0.796,1.675-0.276,1.92,0.72C92.812,104.487,93.41,105.01,93.525,106.015z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M145.845,107.454c0.644,0.717,1.338,1.383,1.199,2.881
+		c-1.593-0.394-1.732,0.666-2.88,0.72C144.553,109.683,145.067,108.437,145.845,107.454z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M129.044,109.854c-0.501,0.102-0.635-0.164-0.96-0.24
+		C128.128,108.918,129.225,109.036,129.044,109.854z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M39.525,114.415c0,0.64,0,1.279,0,1.92c0.457,0.595,0.654-1.091,1.68-0.721
+		c0.218,1.818-0.804,2.396-2.4,2.4c-0.176-0.225-0.436-0.363-0.72-0.48c0.403-1.971-0.977-2.827-1.68-4.319
+		C37.827,112.104,38.301,113.997,39.525,114.415z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M9.285,123.774c0.16,0,0.32,0,0.48,0c1.45,0.303,0.898,1.854,1.2,2.641
+		c1.085,2.832,3.333,4.774,5.28,7.439c1.25,1.711,2.347,3.663,3.6,5.28c1.967,2.539,3.968,4.886,5.76,7.92
+		c0.554,0.938,1.424,1.912,1.68,2.64c0.588,1.677,0.331,4.134,0.96,6.24c0.267,0.894,1.051,1.768,1.2,2.64
+		c0.339,1.995-0.944,4.409-0.48,6.48c0.376,1.681,2.11,2.101,2.88,3.84c-0.556,2.596,1.237,5.45-0.24,6.72
+		c-2.195-0.32-1.743-4.354-1.92-5.279c-0.897-2.37-3.167-3.569-3.12-6.48c0.019-1.163,0.903-2.106,0.96-3.12
+		c0.122-2.179-1.547-4.546-1.92-6.479c-0.17-0.882,0.04-2.098-0.24-3.12c-0.332-1.213-1.677-3.439-2.64-4.8
+		c-1.358-1.919-3.223-3.741-4.56-5.761c-1.162-1.754-2.036-3.705-3.12-5.76c-0.08-0.152-0.093-0.726-0.24-0.96
+		c-1.083-1.724-3.307-3.094-4.32-5.04c-0.732-1.407-0.653-2.791-1.2-4.32C9.285,124.255,9.285,124.015,9.285,123.774z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M34.965,178.494c1.062,0.022,0.77-1.31,1.92-1.199
+		c0.784-0.063,0.509,0.931,1.2,0.96c0.95-0.251,1.211-1.188,2.4-1.2c0.176,0.224,0.437,0.363,0.72,0.479
+		c0.121,2.041-1.471,2.37-2.88,2.881c-0.241-0.479-1.061-0.379-0.96-1.2c-2.531,0.429-3.245,2.674-5.28,3.6
+		c-0.881,0.001-0.92-0.84-1.44-1.2c0.29-0.989,1.435-1.125,1.92-1.92c-0.048-0.912-1.009-0.91-0.96-1.92
+		C31.935,175.909,34.753,177.343,34.965,178.494z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M33.765,184.734c-0.388,0.412-1.004,0.597-1.92,0.48
+		c-0.807,0.553-1.057,1.663-2.64,1.439c-0.125-0.354-0.355-0.604-0.48-0.96C29.294,184.233,33.21,181.868,33.765,184.734z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M102.645,8.575c-0.042,2.021-1.526,3.259-0.48,5.04
+		c-0.56,0.64-1.394,1.006-2.399,1.2c0.695,1.187,0.483,2.678,0.24,3.84c-2.815,0.746-3.669-2.362-5.521-3.36
+		c0.299,2.138,2.207,3.481,2.88,6.48c0.541,2.41,2.563,4.221,2.641,6.24c-2.798,0.376-2.552-4.314-4.32-5.76
+		c0.506-2.184-0.803-2.605-1.68-4.08c-0.742-1.247-1.107-2.849-2.641-3.36c-0.048-0.798,1.188-0.944,1.68-0.48
+		c0.201-1.481-1.777-0.782-1.92-1.92c0.095-0.946,1.333-0.748,1.681-1.44c-0.084-1.756-1.396-2.284-2.88-2.64
+		c-0.584-0.937-0.95-2.09-1.681-2.88c0.474-0.887,0.795-1.926,1.92-2.16c0.57,1.51-0.4,4.561,2.16,4.08
+		c0.613-0.717-0.384-2.04,0-2.88c0.65-0.22,2.517,0.123,3.12,0.72c1.204-0.116,4.126-1.412,4.08,0.72
+		c-1.367,0.633-3.533,0.466-5.52,0.48c0.714,1.686,3.229,1.57,4.8,2.4c2.632-1.084,8.355-5.846,2.88-7.44
+		c-0.463,0.098-0.189,0.931-0.96,0.72c-3.27-1.551-6.522,1.375-9.601,0.72c-0.213-1.333,0.752-1.488,1.92-1.44
+		c1.841-1.128,5.965-2.184,8.4-0.48c0.909-0.804,2.138-0.748,2.88-0.24c0.725,0.496,1.459,2.787,1.44,3.6
+		c-0.037,1.588-1.745,1.762-1.44,3.36C103.628,7.798,103.703,8.752,102.645,8.575z M100.005,11.214
+		c-0.275-0.755,0.376-0.583,0.479-0.96c-0.146-0.013-0.284-0.036-0.24-0.24c-0.16,0-0.319,0-0.479,0
+		c0.177,1.592-0.777-0.512-0.96,0.72C99.571,10.529,99.547,11.112,100.005,11.214z M94.485,11.935
+		c0.628,0.068,1.032-0.088,0.96-0.72C94.817,11.147,94.413,11.302,94.485,11.935z M96.405,13.135c-0.613-0.126-0.84-0.318-1.2,0.24
+		c0.692,1.308,1.393,2.608,3.12,2.88c-0.142-0.906-1.294-2.055-0.479-3.12c0.041,0.359-0.086,0.886,0.239,0.96
+		c0.438-1.353-0.777-1.292,0-2.88C96.503,10.833,97.301,12.831,96.405,13.135z M98.805,11.214c-0.017,0.003,0.015,0.223,0,0.24
+		C97.666,12.757,99.958,11.011,98.805,11.214z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M15.045,78.175c0.608,0.391,0.248-0.229,0-0.72
+		c1.012-0.801,0.445-1.779,0.96-2.88c1.334-0.666,2.017-1.983,3.6-2.4c1.518-2.002,3.116-3.924,6.24-4.32
+		c0.103-0.437-0.378-1.318,0.48-1.92c1.286,0.365,2.047-0.116,3.12,0.24c0.158-0.878-0.519-0.921-0.48-1.68
+		c0.85-0.67,2.096-0.944,3.36-1.2c1.62-1.82,4.173-2.707,6.48-3.84c2.113-2.207,4.333-4.307,6.24-6.72
+		c0.741,0.059,1.356,0.244,1.92,0.48c0.412-0.308,0.482-0.958,0.96-1.2c0.688-0.405,1.323,1.149,1.92-0.24
+		c1.423,0.983,3.604-0.033,4.56-0.96c1.097,0.024,2.435-0.194,2.88,0.48c0.437-0.284,0.189-1.251,0.48-1.68
+		c2.85-0.156,4.078-3.06,6.24-3.12c0.292,2.161-2.012,3.727-3.84,4.56c-0.76,2.152-2.118,5.338-0.96,7.92
+		c-0.28,0.36-0.693,0.587-0.72,1.2c-3.111,0.391-2.662-2.778-3.6-4.56c-0.988,0.612-1.091,2.109-1.92,2.88
+		c-0.478-0.242-0.84-0.6-1.2-0.96c-0.842,1.531-1.455,4.12-0.96,6.24c-0.681,1.399-1.351,2.809-1.44,4.8
+		c-1.251-0.155-0.931-1.858-0.48-2.64c-0.234-0.646-1.169-0.59-1.44-1.2c0.769-3.956,2.016-7.052,1.44-11.52
+		c-0.892,0.628-0.467,2.573-0.96,3.6c-0.4,0-0.8,0-1.2,0c-0.58,0.788,0.02,1.831,0,2.88c-0.026,1.414,0.089,3.477-0.96,4.08
+		c-0.904-0.588,0.491-2.156,0-3.84c-2.849,2.751-8.408,2.792-11.52,5.28c-1.492-0.361-2.684,0.135-3.84,0.72
+		c3.964,1.775,8.882,1.609,12.24,3.6c-0.374,0.934-2.275,0.1-2.88-0.24c-0.772,0.385,0.844,0.897,0,1.44
+		c-1.708-0.211-3.119-0.722-4.56-1.2c-0.995-0.275-0.936,0.505-1.68,0.48c-2.293-1.243-5.571,1.012-7.92-0.48
+		c-2.577,1.023-2.646,4.555-4.56,6.24c-0.501,0.102-0.636-0.165-0.96-0.24c-2.706,1.455-2.302,6.018-4.08,8.4
+		c-1.145,0.185-1.065-0.855-2.16-0.72c-0.852,0.152,0.071,1.348-0.24,2.4c-0.307,0.333-1.133,0.146-1.44,0.48
+		c-1.287,3.621-1.141,9.751-2.16,14.16c-0.569,2.463-0.522,5.24-0.96,7.68c-0.115,0.642-0.603,1.249-0.72,1.92
+		c-0.296,1.698-0.42,4.016-0.24,5.76c0.293,2.839,1.987,5.547,0.48,7.44c-1.82-0.101-2.354-1.485-3.36-2.4
+		c-3.264,5.295-0.714,13.927,4.08,16.08c2.005,1.555,1.871,4.442,2.64,6.72c0.851,2.518,3.706,3.142,6,4.561
+		c-1.049,0.951-2.7,1.3-3.12,2.88c-1.007-0.433-0.822-2.058-0.96-3.36c-0.398-0.401-1.409-0.19-2.16-0.239
+		c-0.629-2.011-2.091-3.189-2.16-5.761c-4.661-2.619-5.929-8.63-8.88-12.96c0.021-3.471-1.044-5.696-0.48-9.12
+		c1.274-0.854,0.839-2.184,1.2-3.6c0.651-2.551,2.441-5.098,2.88-7.68c0.173-1.02-0.12-2.043,0-3.12
+		c0.098-0.886,0.614-1.794,0.72-2.64c0.333-2.675,0.38-6.272,0.24-8.641c-0.102-1.713-0.779-3.402-0.72-5.04
+		c0.055-1.529,1.09-2.978,0-4.32c-1.179-0.059-0.824,1.416-2.4,0.96c-0.635-0.529-0.384-1.031-0.24-1.92
+		c-0.84-3.535-1.018-6.77-0.48-10.08c0.561-0.074,0.992-0.47,1.44,0c0.673-3.327-2.755-6.748-0.96-10.08
+		c0.287-0.533,0.979-1.293,1.44-1.92c1.295-1.758,2.978-3.479,4.08-5.76c1.57-3.247,3.012-5.994,4.8-8.16
+		c1.549-0.291,1.999-1.682,3.12-2.4c2.097,0.257,2.496-1.185,3.6-1.92c-0.752-0.848-0.833-2.368-0.72-4.08
+		c2.655-2.705,5.432-5.288,9.84-6.24c2.204-1.156,4.04-2.68,6.96-3.12c2.624-2.336,4.392-5.528,9.6-5.28
+		c0.802-0.001,0.636,0.964,1.2,1.2c1.239,0.04,1.548-1.309,2.64-0.72c0.639,1.222-0.275,2.126-0.48,3.36
+		c-0.494,2.977-0.288,6.534,0.72,8.88c0.469,1.092,1.793,1.659,1.2,2.88c-2.122,0.21-2.833-4.149-3.12-7.2
+		c-0.139-1.474-0.443-3.589,0-5.52c-1.394-0.354-1.601,0.479-2.4,0.72c-0.674-0.286-0.646-1.273-0.96-1.92
+		c-3.098,0.742-5.23,2.45-6.72,4.8c-6.017,2.864-13.152,4.608-16.8,9.84c0.715,3.926,1.622,7.658,4.08,9.84
+		c1.126-0.122,1.642-0.364,2.16,0.48c4.167,0.087,5.78-2.38,8.88-3.36c1.466,2.112-1.566,3.348-3.12,4.32
+		c-1.259,0.788-2.742,1.769-4.32,2.4c-4.411-1.35-6.288-5.232-8.16-9.12c-0.549,0.315-0.72,1.28-0.72,1.68
+		c0,3.593,5.417,4.877,5.52,8.88c-0.467,0.493-0.749,1.171-1.68,1.2c-0.077,0.563-0.379,0.901-0.24,1.68
+		c-0.735,1.644-2.284,2.29-3.36,3.84c-0.977,1.408-1.016,3.424-1.92,4.8c-0.669,1.019-2.107,1.447-2.88,2.4
+		c-0.699,0.862-0.558,1.973-1.44,2.64c0.245,1.115,1.289,1.431,0.96,3.12c-0.56,0-1.12,0-1.68,0c0.553,0.486,0.786,1.294,1.44,1.68
+		c-0.452,0.588-0.814,1.266-0.96,2.16c0.055,0.825,0.714,1.046,1.44,1.2C13.023,80.031,13.859,77.333,15.045,78.175z M12.645,51.055
+		c-3.137,1.343-3.181,5.779-5.28,8.16c-0.11,2.377-0.191,3.667-0.24,5.76c0.916,0.524,1.039,1.841,1.44,2.88
+		c-0.074,0.566-0.833,0.447-0.72,1.2c0.318,1.635-1.015,3.401,0.48,4.32c1.182-0.258,1.171-1.709,1.44-2.88
+		c1.361-1.199,1.973-3.147,3.12-4.56c0-0.56,0-1.12,0-1.68c2.454-1.786,4.216-4.264,6.96-5.76c0.106-2.134,1.896-2.585,3.12-3.6
+		c-2.298-2.421-4.74-4.7-6-8.16C14.134,46.784,13.512,49.042,12.645,51.055z M48.405,65.214c1.28-0.975,1.453-3.636,1.68-4.8
+		c0.318-1.625,0.641-3.136,0.96-4.8c0.748-0.244,0.957-1.929,0.72-2.4c-0.24,0-0.48,0-0.72,0
+		C49.795,57.353,49.089,60.809,48.405,65.214z M45.765,56.814c-0.017,0.003,0.015,0.223,0,0.24
+		C44.625,58.357,46.917,56.611,45.765,56.814z M45.525,58.734C45.272,60.127,46.565,58.834,45.525,58.734L45.525,58.734z
+		 M5.925,63.055c0-0.48,0-0.96,0-1.44c-0.24,0-0.48,0-0.72,0C5.043,62.521,4.911,62.905,5.925,63.055z M4.005,63.774
+		c-0.312,0.559-0.663,1.458-0.72,2.16c-0.111,1.366,0.73,4.464,1.68,5.28c-0.021-2.015,0.33-5.104,0.72-7.44
+		C5.125,63.774,4.565,63.774,4.005,63.774z M13.605,66.895c0.058-0.342,0.395-0.405,0.48-0.72
+		C13.591,65.964,13.007,66.797,13.605,66.895z M36.165,68.575c-1.09-0.75-3.138-0.542-3.84-1.68c-0.436,0.65-1.448-0.133-1.92-0.24
+		c0.198,0.678-0.338,0.622-0.24,1.2C32.091,67.233,34.936,69.211,36.165,68.575z M28.965,67.375c0.241,0,0.286,0.194,0.48,0.24
+		c-0.023-0.377,0.032-0.833-0.48-0.72C28.965,67.055,28.965,67.214,28.965,67.375z M12.165,69.535
+		c0.701,0.063,0.921-0.931,0.24-0.96C12.33,68.899,12.063,69.033,12.165,69.535z M6.405,70.015c0.306-0.284,0.102-0.907-0.24-1.2
+		C6.296,69.163,5.884,70.055,6.405,70.015z M38.805,69.055c-0.42,0.066-1.197-0.676-1.44,0
+		C37.979,68.794,38.509,69.784,38.805,69.055z M7.125,99.055c-1.177-5.305,0.673-11.676-0.24-19.2c-0.33,0.01-0.527-0.113-0.72-0.24
+		c-0.695,5.637,0.902,11.405-0.48,16.8c1.204,2.229,0.217,5.07,0,7.68c-0.369,4.433-0.222,8.989,0.48,12.24
+		C6.947,111.994,6.296,103.622,7.125,99.055z M6.885,79.615c0.295-0.871,0.246-3.394,0.24-5.28c-0.361-0.569-1.011-0.24-1.2-0.48
+		c0.425-0.295,0.973-0.467,1.2-0.96c-0.162-0.638-0.378-1.222-0.72-1.68c-0.269,1.171-0.414,2.466-1.2,3.12
+		C7.707,74.44,5.233,79.224,6.885,79.615z M4.485,73.135c0.547,0.067,0.902-0.058,0.96-0.48c-0.563-0.077-0.537-0.743-0.96-0.96
+		C4.68,72.524,4.037,72.708,4.485,73.135z M4.005,74.334c0.459-0.101,1.033-0.087,0.96-0.72C4.363,73.573,4.382,74.152,4.005,74.334
+		z M11.445,74.334c0.601,0.041,0.751-0.369,0.96-0.72c-0.32,0-0.64,0-0.96,0C11.445,73.854,11.445,74.095,11.445,74.334z
+		 M4.485,82.734c1.672-2.137,0.147-4.438,0.72-7.92c-1.174,0.747-1.417-0.369-2.4-0.48C2.79,76.915,2.017,81.885,4.485,82.734z
+		 M9.045,75.535c0.419-0.489-0.179-0.471,0.24-0.96c-0.418,0.018-0.746-0.054-0.96-0.24C8.405,74.895,8.571,75.369,9.045,75.535z
+		 M10.725,75.535C11.971,75.023,11.151,74.204,10.725,75.535L10.725,75.535z M10.005,84.175c-0.638,0.002-1.371-0.091-1.68,0.24
+		c0.566,3.806-1.318,7.464,0.24,10.08c0.627-1.622,0.244-3.53,0.72-5.28c0.086-0.316,0.553-0.539,0.72-0.96
+		c0.29-0.73,0.234-1.768,0.48-2.4c0.022-0.057,0.428,0.047,0.48,0c0.155-0.141-0.109-0.772,0-0.96c0.504-0.869,1.92-1.203,1.68-2.4
+		c-1.925-0.075-2.051-1.949-2.4-3.6c0.438,0.41,0.949-0.461,1.2-0.96c-0.547-0.33-0.902,0.619-0.96,0
+		c0.001-0.639,0.668-0.612,0.96-0.96c-0.987-0.865-2.01-0.218-3.36-0.72c0.024,1.896,0.139,3.701,0.48,5.28
+		C10.215,80.993,12.488,83.173,10.005,84.175z M2.085,82.495C1.765,84.486,3.078,83.005,2.085,82.495L2.085,82.495z M2.085,125.215
+		c0.564-2.556,0.891-5.35,2.88-6.48c-0.931-0.989,0.147-3.987-0.96-4.8C3.304,117.478-0.144,121.724,2.085,125.215z M7.845,120.895
+		c0-0.16,0-0.32,0-0.479c0.146-0.014,0.284-0.036,0.24-0.24c-1.622-0.219-0.327-3.354-2.16-3.36
+		C6.347,118.393,6.382,120.357,7.845,120.895z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M40.965,159.774c-0.222-3.788-2.078-7.545-1.44-12
+		c0.239-1.668,1.623-4.39,1.2-7.2c-0.078-0.516-0.422-1.088-0.48-1.68c-0.195-2.001,0.396-3.986,0.24-5.52
+		c-0.099-0.971-0.836-1.946-0.96-2.881c-0.143-1.077,0.274-2.205,0.24-3.359c-0.044-1.505-0.647-2.709-0.24-4.08
+		c0.672-2.267,3.722-3.511,5.04-5.521c1.13,0.486,2.484-0.457,3.36,0.48c0.719-0.158-0.229-0.513,0-0.96
+		c1.038,0.002,0.948,1.132,1.68,1.439c0.266-1.545-0.884-1.676-0.72-3.119c0.757,0.202,0.683,1.237,1.44,1.439
+		c0.864-1.272-0.883-1.99-1.92-2.16c0.482-5.357,8.068-3.612,8.88-8.64c1.458-0.543,1.956-2.045,3.12-2.88
+		c-0.337-1.025,0.465-1.178-0.24-2.16c1.93-0.55,0.84-4.119,2.88-4.56c-1.824-2.476-2.953-5.488-5.04-8.161
+		c-2.486-3.183-5.128-6.29-7.92-9.36c-1.194-1.313-2.626-2.247-3.36-4.08c-1.322-1.078-2.708-2.092-3.12-4.08
+		c1.521,0.606,2.399,2.176,3.36,3.36c2.896,3.57,6.266,7.106,9.36,10.8c0.086-1.875-2.583-2.995-3.12-5.04
+		c-2.461-1.905-3.779-4.614-5.76-7.2c-0.574-0.75-1.854-1.425-1.68-2.64c3.416,2.824,5.024,7.456,8.64,10.08
+		c0.325,0.715,0.478,1.602,1.2,1.92c0.338-1.542-1.995-2.482-2.4-4.08c-0.388-0.333-0.76-0.68-1.2-0.96
+		c-1.135-2.875-4.398-4.868-4.08-8.4c1.256,0.475,0.943,1.696,1.44,2.64c0.363,0.689,0.934,1.194,1.44,1.92
+		c3.129,4.487,6.641,9.069,9.84,13.68c0.458,0.451,0.434-0.142,1.2,0c1.447,2.473,3.29,4.551,5.28,6.48
+		c0.489-0.151,0.067-1.213,0.96-0.96c-0.907-1.793-1.245-3.048-0.72-5.28c-0.541-0.659-1.622-0.778-1.68-1.92
+		c-1.267-0.253-2.391-0.65-3.12-1.44c0.443-1.894,2.687-0.452,3.84-0.24c1.452,2.147,4.18,3.19,3.12,7.2
+		c-0.051,1.149-1.491,0.909-1.2,2.4c1.64,1.104,2.587-1.386,3.84-0.72c0.533,0.653,0.149,1.926-0.24,2.4
+		c0.378,0.382,1.286,0.067,1.68-0.24c0.594,0.287,0.938,0.822,1.2,1.44c3.786,1.254,5.529,4.55,9.6,5.52
+		c0.995,1.565,2.416,2.704,2.64,5.04c1.189,0.412,2.673,0.528,3.36,1.44c0.254,0.895-0.505,0.774-0.72,1.2
+		c0.047,0.753,0.949,0.65,0.72,1.68c-2.683,1.218-3.248-3.339-5.52-4.08c-2.347-0.267-3.802,0.358-5.28,0.96
+		c-0.539-0.261-0.445-1.154-1.44-0.96c-0.74,0.353-0.506,1.947-0.239,2.641c-0.42,1.241-1.306,3.535-0.24,4.8
+		c0.103,0.662-0.895,0.225-0.96,0.72c-0.17,0.89,0.41,1.03,0.24,1.92c1.841,1.039,1.865,3.895,4.56,4.08
+		c0.125-0.981,1.107-2.358,2.64-2.64c-0.184-0.776-0.664-1.256-1.439-1.44c-0.942,0.338-1.072,1.488-2.4,1.44
+		c-0.864-0.779-0.691-1.589,0-2.4c-0.381-0.739-1.787-0.452-1.92-1.439c0.293-1.097,2.188-1.369,2.88-0.721
+		c1.139,0.019,0.19-2.05,1.44-1.92c1.011,0.029,0.238,1.842,0.479,2.641c0.267,1.253,1.235,1.805,1.44,3.119
+		c4.369,0.167,7.993,0.12,12.72,0.721c-1.022-1.197-4.493,0.033-4.32-2.88c0.657-0.537,1.185,0.593,1.921,0.72
+		c2.372,0.369,3.889-0.725,5.279,0c1.114-0.647,0.042-3.048,1.681-3.601c-0.071-0.95,0.293-1.467,0.72-1.92
+		c-1.706-3.824-1.954-7.636-4.32-10.8c-0.074-2.006,0.049-4.209-1.439-4.8c-0.071-1.213-0.979-2.427-1.681-3.36
+		c-3.795-5.05-6.729-11.033-10.319-16.08c0.283-3.207-0.836-6.973-1.92-9.6c-0.141-0.94,0.986-0.613,1.199-1.2
+		c-1.956-2.204-3.84-4.479-6-6.48c-0.147-1.812-1.01-5.597,1.2-5.76c0.64,1.399-0.485,3.481,0.24,5.04
+		c4.35,4.37,7.393,10.047,13.2,12.96c0.757-0.65,0.645-1.24,0.479-2.4c1.676-1.285,1.949-3.971,3.601-5.28
+		c-0.307-1.133-1.776-1.104-1.92-2.4c0.524-1.664,2.943-2.617,5.04-1.92c-0.199,0.678,0.338,0.622,0.239,1.2
+		c-0.349,0.451-1.57,0.029-1.92,0.48c0.751,3.105-1.187,3.811-1.92,6c0.08,0.56,0.246,1.034,0.72,1.2
+		c0.335-1.252,0.908-1.896,0.96-2.88c1.762,0.655,2.49,1.523,2.4,3.12c-0.063,1.124-1.652,1.842-1.68,2.4
+		c-0.01,0.198,3.083,5.645,4.8,4.8c2.017,1.993,6.412,2.854,5.52,6.96c-1.754-0.002-1.525-1.889-2.159-2.88
+		c-1.178-1.838-3.037-2.544-5.28-3.36c-0.715,0.326-0.997,1.083-1.44,1.68c-2.066-0.463-3.624-1.424-5.52-1.44
+		c-0.201-0.519-0.621-0.818-0.48-1.68c-1.209-0.153-1.649,0.014-2.399-0.24c0.443-2.284-0.826-2.854-1.92-3.6
+		c0.183,2.336-0.915,4.375-0.48,6.24c0.28,1.203,2.788,4.14,4.32,4.8c1.06,0.457,2.91,0.345,3.84,0.24
+		c0.599,0.762,1.198,1.522,2.4,1.68c-0.068,0.931,0.786,1.733,1.439,1.2c0.644-0.405-0.875-1.471,0-2.16
+		c4.123,1.665,5.445,7.318,9.84,7.92c0.646,0.643-0.306,0.912-0.479,1.44c0.842,1.043,1.695-0.414,2.64,0.24
+		c0.142,0.861-0.279,1.161-0.479,1.68c0.468,1.018,1.818-0.17,2.159,0.721c0.269,1.316-1.249,0.988-1.439,1.199
+		c0.225,1.014,1.415,0.67,1.92,0.24c0.834,0.605,0.354,1.683-0.24,2.16c0.791,0.17,1.534,0.386,2.4,0.48
+		c0.052,1.078,0.12,2.094-0.48,3.119c0.181,1.021,1.879,0.522,1.681,1.921c-1.007,0.031-1.395,0.464-1.921,0.479
+		c-0.023,1.704,1.421,1.939,1.44,3.6c-1.222-0.538-2.158-1.361-3.12-2.159c-0.838,1.167,0.894,1.819,0.48,3.359
+		c2.243,0.62,4.705,0.28,6.96-0.239c2.23-1.793,1.332-5.882,2.16-8.641c-0.722-3.373-0.529-6.464-2.4-9.6
+		c-1.019-1.707-2.096-4.5-3.36-6.24c0.611-1.838-0.6-3.212-1.199-4.56c0.349-0.371,1.229-0.211,1.92-0.24
+		c-0.17-0.63-1.127-0.474-1.44-0.96c-0.036-1.557,0.041-2.999,0.72-3.84c-0.132-1.201,0.178-2.199,0-3.36
+		c-0.037-0.245-0.455-0.671-0.479-0.96c-0.037-0.429,0.486-0.857,0.479-1.2c-0.008-0.431-0.636-1.588-0.72-2.4
+		c-0.1-0.969-0.069-1.859,0-2.64c0.071-0.795,0.139-2.436,0.72-3.6c0.124-0.247,0.611-0.354,0.721-0.72
+		c0.3-1.011,0.434-2.175,0.239-3.36c-0.557,1.093-1.531,2.605-3.12,1.92c-0.689-1.466,0.997-1.202,1.2-2.4
+		c-2.688-1.347,0.426-3.169,0.24-5.52c0.431-0.031,0.506,0.293,0.96,0.24c-0.991-2.768-1.073-5.276-3.12-7.2c0-0.48,0-0.96,0-1.44
+		c-2.521-3.475-8.389-6.367-14.16-4.32c-0.514-0.526-0.659-1.42-1.199-1.92c-0.628,0.333,0.116,2.037-0.48,2.4
+		c-1.366-0.592-2.687,0.361-3.84,0.72c1.006,1.874,3.291,2.469,3.6,5.04c-0.661,0.486-1.221-0.733-1.68-1.2
+		c-2.374-1.066-4.703-2.177-6.96-3.36c-1.403,0.69-2.554-0.321-3.84-0.48c-0.315,0.084-0.378,0.422-0.721,0.48
+		c-1.144,4.375-3.59,7.45-5.52,11.04c-0.274,0.889-0.023,1.391-0.24,1.92c-0.996,0.131-1.918-0.292-3.359-0.24
+		c-2.047-4.093-4.728-12.625-8.88-14.4c-2.238-0.957-2.391,3.62-3.6,4.8c0.097,0.962,0.834,2.228,0.24,3.12
+		c-3.529-0.334-2.121-5.929-2.64-8.64c0.233,0.006,0.186,0.293,0.24,0.48c0.451-0.331-0.401-1.196-0.24-1.44
+		c0.419-2.301,1.992-3.448,1.92-6.24c-0.467-0.886-2.15-0.461-1.92-1.44c-0.507,3.112-1.008,8.04-3.12,10.32
+		c0.659,2.041,2.61,4.271,0.72,6.48c-1.202-0.161-1.858,0.222-2.88,0.24c-0.55-0.25-0.667-0.933-1.2-1.2
+		c-2.664-0.073-3.711,1.833-5.76,0.72c-0.126-1.007,0.419-1.341,0.48-2.16c1.671-0.649,3.349-1.292,3.84-3.12
+		c1.894-0.585,2.841-2.119,4.32-3.12c0.993-3.008,1.223-6.777,2.64-9.36c-0.317-2.002-1.66-2.98-2.64-4.32
+		c-2.226,0.224-4.269-0.506-6.24-0.24c-0.946,0.128-1.652,0.937-2.64,0.72c-1.167,0.113-0.987,1.573-2.64,1.2
+		c0.011-0.411-0.178-0.622-0.48-0.72c1.324-2.996,5.781-2.859,10.08-2.88c0.35,0.53,1.285,0.475,1.44,1.2
+		c2.869-1.239,4.246,2.874,5.04,5.28c2.149,0.571,2.674,2.766,3.12,5.04c0.352-0.449,0.459-1.141,1.44-0.96
+		c0.756-0.037,0.467,0.973,0.96,1.2c1.307-0.187,1.872,0.369,2.64,0.72c0.391,0.569,0.532,1.388,0.72,2.16
+		c1.711-0.572-0.162-1.7,0-2.88c2.416-0.126,2.286,2.451,1.92,5.04c0.863,1.102,3.491-0.314,4.319,1.68
+		c-0.246,0.983-0.664,1.261-1.68,0.96c1.372,1.428,3.077,2.523,4.561,3.84c-0.241,0.959-0.488,1.912-0.721,2.88
+		c1.248-0.515,2.229-3.369,3.601-4.56c0.047-0.927,0.008-1.769-0.24-2.4c1.019-0.181,1.069-1.33,1.439-2.16
+		c1.526-0.897,2.622,0.071,4.08,0.48c0.08-0.879-0.267-1.333-0.479-1.92c-0.955-0.175-0.965-0.175-1.92,0
+		c-1.654-0.382-1.807-1.41-2.641-2.88c-0.488-0.862-1.771-1.336-1.439-2.4c0.445-0.674,1.783-0.456,2.88-0.48
+		c0.604,0.997,0.66,2.54,1.92,2.88c1.341-1.31,3.63-0.199,6-0.48c0.951,2.097,3.596,1.731,5.521,2.4
+		c-1.098-2.822-3.647-4.192-5.521-6.24c-0.639-1.921-1.507-3.613-2.4-5.28c-0.656,0.224-1.023,0.737-1.68,0.96
+		c0.216,1.335-0.562,1.677-1.2,2.16c0.513,0.898-0.028,1.364-0.479,1.92c-2.228,0.307-2.396-1.444-4.561-1.2
+		c0.278,1.242,2.277,0.763,2.4,2.16c-0.596,0.83-1.547-0.201-2.4-0.48c-1.359,0.16-2.228-0.172-2.64-0.96
+		c0.128-0.672,1.156-0.443,1.68-0.72c-0.544-0.576-2.349,0.108-2.64-0.72c0-0.4,0-0.8,0-1.2c2.712-1.144,5.394,0.957,6.72,1.2
+		c0.968,0.087,0.372-1.388,1.44-1.2c-0.152-0.808-1.169-0.751-0.96-1.92c0.759,0.04,0.802-0.638,1.68-0.48
+		c0.051-1.149-0.238-2.639,0.48-3.12c4.823,1.176,3.163,8.837,8.64,9.36c0.774,1.385,2.573,1.747,3.36,3.12
+		c0.227,0.929-0.936,0.988-0.24,1.68c0.384,0.673,1.08-0.337,1.92,0c0.297-1.657-1.243-1.477-1.2-2.88
+		c1.26-0.32,2.314,1.481,2.64,2.88c-0.439,0.649-0.812,0.042-1.199,0.48c0.259,0.528,1.632,0.523,2.399,0.24
+		c0.151-1.111-1.186-0.734-0.96-1.92c1.769-0.866,2.107,1.282,3.12,1.92c5.285,0.411,9.611,4.016,12,8.4
+		c0.402,0.738,0.112,2.033,0.48,3.36c0.452,1.631,1.901,3.057,2.399,4.8c0.195,0.682,0.067,1.546,0.24,2.16
+		c0.168,0.597,0.669,1.085,0.72,1.68c0.266,3.076-2.146,6.013-2.16,8.88c-0.002,0.519,0.38,0.852,0.48,1.44
+		c0.293,1.715-0.451,3.09,0,5.28c0.276,1.339,0.901,2.861,0.24,4.8c-0.332,0.974-1.273,1.663-1.44,2.4
+		c-0.319,1.406,0.052,2.615,0.72,4.08c0.692,1.518,1.404,3.956,2.16,5.52c0.189,0.391,0.801,0.746,0.96,1.2
+		c0.347,0.989,0.197,2.227,0.48,3.36c0.633,2.533,1.716,4.226,1.68,7.68c-0.038,3.655-0.718,6.594-2.64,10.32
+		c0.432,0.607,1.425-0.521,1.2,0.96c0.646-1.458,3.872-0.705,4.08-1.92c0.617,0.084,1.784,0.139,1.199,0.72
+		c1.419-1.354,4.498-0.153,7.44-0.72c2.012-0.388,4.414-0.552,5.04,1.92c-0.713,0.218-1.508,0.468-2.4,0.239
+		c-0.251-0.063-0.19-0.497-0.72-0.479c-2.429,0.078-4.918,3.131-7.44,0.96c-0.627,0.712,0.72,1.182-0.239,1.92
+		c-1.096,0.136-1.495-0.426-2.641-0.24c-1.957,2.214-5.116,1.623-8.399,1.2c-0.243-1.123,0.962-0.797,0.72-1.92
+		c-1.477-0.432-2.774,1.021-4.56,1.2c-2.676,0.268-5.334-1.1-7.2-2.16c-3.28,0-4.064-2.496-6.48-3.36
+		c0.577-1.183,1.849-1.671,1.92-3.359c-0.977,0.622-2.833,3.067-1.92,5.04c2.547,0.173,3.922,1.519,4.561,3.6
+		c2.433-0.141,5.423-0.31,5.52,1.44c-1.879,3.116-8.822-0.598-10.08,3.359c-0.772-0.053-1.016,0.425-1.92,0.24
+		c-4.083,2.32-11.372,2.008-15.84,0.479c-1.567,0.037-2.163,2.312-3.6,1.681c-0.696,0.504-0.935,1.466-1.921,1.68
+		c-2.496-0.623-4.598-1.642-5.279-4.08c-1.86,0.38-2.958,1.522-4.8,1.92c0.051,1.182-0.493,2.325-0.72,3.84
+		c1.788-0.211,1.804-2.195,3.839-2.159c0.56,1.807-1.588,2.639-2.879,3.359c0.157,2.877-1.156,4.284-1.2,6.96
+		c-1.232,0.448-2.245,1.115-2.88,2.16c0.101,0.779,0.998,0.763,1.2,1.44c0.199,4.599-2.065,6.734-3.12,10.08
+		c-0.766,0.205-0.743-0.378-1.2-0.48c-0.823,0.457-0.211,2.35-0.96,2.88c-1.48-0.593-0.435-1.494-0.72-2.64
+		c-0.915,0.765-0.729,2.631-1.68,3.359c-0.819-0.376-0.656-1.021-0.48-1.92c-1.325,0.867-0.655,2.381-0.96,3.601
+		c-0.656,2.618-2.638,4.906-3.36,7.68c-0.442,1.698-0.25,3.295-0.96,5.04c-0.678,0.198-0.622-0.338-1.2-0.24
+		c0.231,3.47-4.34,3.896-5.04,7.2c0.289,1.231,2.706,0.334,2.88,1.68c-1.045,0.748-1.841-0.46-2.64-0.72
+		c-1.201,0.107-1.283,1.109-2.64,0.48c0.101,1.179,0.684,1.876,0.72,3.12c-0.319,0.24-0.893,0.227-0.96,0.72
+		c-1.651-1.093-3.787-4.091-2.16-6.24c-2.273-1.246-3.453-3.587-6-4.56c-0.197-1.157,0.453-1.468,1.2-1.681
+		c0.066-0.945-1.026-0.733-0.96-1.68c0.13-0.537,0.995-1.196,1.2-1.2c0.089-0.002,0.594,0.417,0.48,0.48
+		C40.195,160.975,40.258,160.294,40.965,159.774z M65.925,33.774c-0.292,0.027-0.568,0.072-0.48,0.48c0.766-0.142,0.742,0.451,1.2,0
+		c-0.34-0.62-0.02-1.9-0.96-1.92C65.511,33.069,66.099,33.041,65.925,33.774z M100.245,33.055c0.598,0.226,0.07-1.374,0-0.48
+		C100.266,32.967,99.845,33.619,100.245,33.055z M94.725,36.655c0.24,0,0.479,0,0.72,0c0.067-0.628-0.088-1.033-0.72-0.96
+		C94.725,36.015,94.725,36.334,94.725,36.655z M64.245,38.814c0.153-0.656-0.305-1.905-0.72-1.2
+		C63.854,38.065,63.505,38.424,64.245,38.814z M73.845,39.774c0.16,0,0.319,0,0.479,0c0.269-0.346,0.259-0.585-0.24-0.72
+		C74.095,39.385,73.972,39.582,73.845,39.774z M57.045,40.254c0.035-0.283,0.427-0.544,0-0.72
+		C57.01,39.818,56.618,40.079,57.045,40.254z M75.285,39.535c-0.021,0.655,0.4,0.483,0,0.96c0.804,0.003,0.992-0.608,1.44-0.96
+		C76.164,39.608,75.733,40.004,75.285,39.535z M58.965,41.455c-0.043-0.783,0.564-1.155-0.48-1.2
+		C58.45,40.85,58.44,41.419,58.965,41.455z M76.725,42.175c0.144-0.624-0.097-0.864-0.72-0.72
+		C75.839,42.1,76.501,41.918,76.725,42.175z M77.205,46.015c0.067-0.547-0.058-0.902-0.479-0.96
+		C76.422,45.336,76.533,46.052,77.205,46.015z M98.805,72.655c-0.033-0.447-0.158-0.802-0.48-0.96
+		C98.379,72.12,98.083,72.896,98.805,72.655z M87.765,74.575c1.031,0.169,0.78-1.249,0.24-1.44
+		C87.729,73.418,87.733,73.983,87.765,74.575z M59.445,87.294c0.636,0.822,1.279,1.596,1.92,2.4c1.253,1.573,2.345,3.561,4.32,4.32
+		c0.209-1.523-1.082-2.276-1.92-3.12c-2.614-2.632-5.126-5.365-6.96-8.4c-0.24,0-0.48,0-0.72,0
+		C57.013,84.463,58.293,85.806,59.445,87.294z M95.685,84.175c-0.181-0.779-0.398-1.522-1.44-1.44
+		C94.266,83.673,94.539,84.361,95.685,84.175z M98.805,86.334c0.184-1.144-0.818-1.102-1.44-1.44
+		C97.376,85.843,97.857,86.323,98.805,86.334z M101.925,87.774c0.159,0,0.319,0,0.479,0c0.014-0.307,0.308-0.332,0.24-0.72
+		c-0.359,0.041-0.886-0.086-0.96,0.24C101.872,87.348,101.964,87.496,101.925,87.774z M106.485,93.295
+		c-1.354,1.597-2.763-0.223-4.32-0.48c1.261,3.521-2.176,4.99-1.439,7.92c1.172-0.527,1.033-1.551,1.2-2.64
+		c1.221-0.778,1.658-2.342,2.88-3.12c2.143-0.143,3.605,0.395,3.84,2.16c-0.677,1.083-1.344,2.177-3.12,2.16
+		c0.08,0.959-0.428,1.332-0.24,2.399c1.315,0.685,2.443,1.557,3.36,2.641c1.534-0.504,2.956-0.039,4.08-1.2
+		c0.786,0.39,0.917-0.055,1.92,0c0.304-0.576,0.721-1.039,0.96-1.681c-1.771-5.748-7.294-7.745-10.08-12.479
+		C104.87,90.494,106.286,91.847,106.485,93.295z M62.565,93.295c-0.01,0.859,0.435,2.137,1.44,2.64
+		c0.982-2.089-0.807-2.585-1.68-3.6c-0.995-1.158-1.318-2.491-2.4-2.88C60.485,91.054,61.514,92.186,62.565,93.295z M100.485,92.334
+		c0.065-0.495,1.062-0.057,0.96-0.72c-0.833-0.607-1.15-1.73-2.16-2.16C99.565,90.534,99.765,91.695,100.485,92.334z
+		 M66.405,104.095c-4.044,3.556-4.821,10.379-9.12,13.68c-0.942,0.338-1.913,0.646-2.16,1.68c0.858,0.662,1.436,1.604,1.68,2.881
+		c4.723,2.345,0.886,7.066,1.92,11.52c0.791,0.592,1.241,1.642,1.44,3.12c0.151,1.125-0.681,2.919,0.48,3.12
+		c0.555-0.443,0.956-1.746,0.72-2.88c0.757-0.154,0.573-1.231,0.72-1.681c0.623-1.898,1.708-3.221,3.12-4.08
+		c0.659-1.854,1.505-4.142,1.2-6.239c0.658-0.782,0.59-2.29,1.2-3.12c-1.312-0.856,0.367-2.166,0-3.601
+		c2.712-0.832,4.613-4.129,7.92-2.88c0.391-2.318-0.722-4.132-0.72-5.76c0.001-1.291,1.041-2.317,0.239-3.6
+		c1.521-4.229,6.734,0.567,9.12-2.16c-2.652-2.227-6.258-3.502-8.88-5.76c-1.188-0.224-2.04,0.331-2.88,0.239
+		c-1.926-0.21-2.661-1.855-4.32-2.399C67.546,98.836,66.965,101.455,66.405,104.095z M62.805,101.215
+		c0.28,0.04,0.261,0.379,0.24,0.72c0.24,0,0.48,0,0.72,0c0.318-0.507-0.119-0.709,0.24-1.44c-0.472,0.072-0.476-0.323-0.72-0.479
+		C63.493,101.048,63.453,100.773,62.805,101.215z M65.445,101.694c0-0.56,0-1.12,0-1.68C63.955,99.69,64.443,101.82,65.445,101.694z
+		 M105.044,104.095c-0.131-0.349,0.281-1.24-0.239-1.2C104.625,103.45,103.849,104.012,105.044,104.095z M61.605,104.814
+		c0.032-0.315,0.036-1.736-0.24-0.96C61.333,104.17,61.329,105.591,61.605,104.814z M60.405,106.734c0.372-0.185,0.372-2.77,0-2.16
+		C60.743,105.492,59.778,106.322,60.405,106.734z M112.965,106.255c0.047-0.688,0.029-1.311-0.721-1.2
+		C111.778,105.518,111.994,106.523,112.965,106.255z M113.205,106.015c0.565-0.006,0.707,0.413,1.44,0.24
+		c0.036-0.597-0.124-0.996-0.48-1.2C114.014,105.544,112.953,105.122,113.205,106.015z M62.085,105.774c0.16,0,0.32,0,0.48,0
+		c0-0.16,0-0.32,0-0.479c-0.16,0-0.32,0-0.48,0C62.085,105.454,62.085,105.614,62.085,105.774z M61.845,107.454
+		c0.077-0.556-0.039-0.921-0.24-1.199c-0.24,0-0.48,0-0.72,0C60.822,107.037,61.17,107.409,61.845,107.454z M60.885,108.415
+		c0-0.32,0-0.641,0-0.961c-0.24,0-0.48,0-0.72,0C60.124,108.056,60.534,108.206,60.885,108.415z M59.205,109.135
+		c0.448,0.191,0.879,0.4,1.44,0.479c0.164-1.204-0.577-1.503-1.44-1.68C59.205,108.335,59.205,108.734,59.205,109.135z
+		 M58.485,109.614c0.346,0.269,0.585,0.259,0.72-0.239c-0.331,0.01-0.527-0.113-0.72-0.24
+		C58.485,109.295,58.485,109.454,58.485,109.614z M58.725,111.534c0.203-0.937-0.856-1.845-1.44-1.199
+		C58.176,110.323,57.87,111.51,58.725,111.534z M57.285,112.734c0.051-0.29,0.267-0.147,0.48,0c0.617-1.12-0.439-1.722-1.2-2.16
+		C56.501,111.598,57.048,112.012,57.285,112.734z M112.005,112.015c0.031-0.315,0.036-1.736-0.24-0.96
+		c0.194,0.544-0.448,1.606,0,0.96C111.845,112.015,111.925,112.015,112.005,112.015z M118.485,111.774
+		c0.422-0.138,1.41,0.29,1.44-0.24c-0.554,0.074-0.267-0.693-0.721-0.72C119.276,111.445,118.274,111.004,118.485,111.774z
+		 M56.805,113.215c-0.217-1.062-0.537-2.022-1.92-1.92C55.357,112.103,55.627,113.112,56.805,113.215z M126.165,112.015
+		c0.16,0,0.32,0,0.48,0c0-0.16,0-0.32,0-0.48c-0.16,0-0.32,0-0.48,0C126.165,111.694,126.165,111.854,126.165,112.015z
+		 M130.725,112.494c0.204-0.704,0.604,0.312,1.2,0c0.018-0.418-0.054-0.746-0.24-0.96c-0.655-0.021-0.483,0.4-0.96,0
+		C131.054,112.082,130.106,112.437,130.725,112.494z M53.205,112.734c0.578-0.479,1.162,0.419,1.68-0.24
+		c-0.812,0.093-0.377-1.062-1.44-0.72C53.37,112.099,53.103,112.233,53.205,112.734z M123.765,113.454
+		c0.682,0.103,1.867-0.507,1.2-0.96c-0.003,0.242-0.421,0.303-0.48,0c-0.014-0.146-0.036-0.284-0.24-0.239
+		C124.451,113.021,123.867,112.997,123.765,113.454z M122.805,113.694c0.239,0,0.479,0,0.72,0c0-0.24,0-0.479,0-0.72
+		c-0.16,0-0.32,0-0.48,0C123.032,113.281,122.737,113.307,122.805,113.694z M52.725,115.614c-0.427-1.013-0.46-2.42-1.92-2.399
+		C51.077,114.383,51.669,115.23,52.725,115.614z M106.005,114.415c0.655-0.387-0.352-0.806-0.48-0.24
+		C105.766,114.174,105.81,114.369,106.005,114.415z M103.125,115.854c0.452,0.424,1.111-0.299,1.44-0.72
+		C103.658,114.973,103.275,114.841,103.125,115.854z M74.805,118.255c0.662,0.308,1.174-0.699,0.72-0.721
+		C75.598,118.088,74.832,117.801,74.805,118.255z M51.285,118.975c0.24,0,0.48,0,0.72,0c-0.041-0.359,0.086-0.886-0.24-0.96
+		C51.662,118.392,51.01,118.22,51.285,118.975z M72.165,118.734c-0.317-0.003-0.219-0.421-0.48-0.479
+		C71.1,118.532,71.953,119.385,72.165,118.734z M53.205,125.935c-0.496-0.145-0.909-0.371-0.72-1.2
+		c-0.997,0.749-0.376-0.046-1.2-0.479C50.561,125.252,52.42,127.148,53.205,125.935z M48.405,126.415
+		c0.2-0.349,1.183-1.86-0.24-1.681C48.308,125.231,47.868,126.312,48.405,126.415z M57.285,126.415
+		c0.521-0.549,0.087-1.498-0.72-1.44C56.045,125.523,56.478,126.472,57.285,126.415z M69.045,128.574
+		c0.871-0.054,0.884-1.82,0.48-2.399c-0.32,0-0.64,0-0.96,0C68.707,127.3,68.363,128.541,69.045,128.574z M49.365,128.095
+		c0.103-0.457,0.517-0.604,0.48-1.2c-0.24,0-0.48,0-0.72,0C48.999,127.508,48.807,127.734,49.365,128.095z M41.925,129.055
+		c-0.219,2.156-0.146,4.44,0,6.72c0.135,2.103,0.971,4.164,0.96,6.24c-0.017,3.146-1.523,5.921-1.68,9.12
+		c1.286,1.154,0.689,2.764,0.96,4.08c0.152,0.74,0.65,1.293,0.72,2.16c0.204,2.513-1.508,5.14-1.2,6.72
+		c0.333,1.704,2.173,1.714,3.12,2.88c0.376,0.463,0.561,0.804,0.72,1.68c-0.199,0.601-0.658,0.942-0.72,1.681
+		c0.704,0.017,0.526,0.914,1.44,0.72c1.043-2.877,3.25-4.59,3.12-8.64c2.203-0.97,0.236-4.717,2.4-5.521
+		c0.05-0.851-1.126-0.474-0.96-1.44c0.537-1.703,1.644-2.836,1.68-5.039c-1.201-0.64-3.171-0.51-4.32-1.2
+		c-0.728-2.082,0.278-3.876,0.96-5.28c-0.861-1.539-0.724-4.076-3.12-4.08c0.09-1.279-0.767-2.755-0.72-4.32
+		c0.816-0.783,0.747-2.453,1.2-3.6c-0.19-0.609-1.47-0.13-1.44-0.96c1.458,0.104,0.297-2.377-0.48-2.88
+		C43.933,129.073,43.188,129.908,41.925,129.055z M52.485,133.375c-0.14-0.567,0.54-1.247,1.44-1.44
+		c-0.696-0.264-1.224-0.696-1.92-0.96C52.129,132.082,51.333,133.04,52.485,133.375z M48.885,132.415
+		c-0.081-0.194-0.637-0.29-0.72,0C48.006,132.971,49.103,132.934,48.885,132.415z M63.765,134.574
+		c0.733-0.173,0.875,0.246,1.44,0.24C65.139,134.019,63.983,134.008,63.765,134.574z M53.205,135.295
+		c0.359-0.041,0.886,0.085,0.96-0.24c-0.317-0.003-0.219-0.421-0.48-0.48c-0.053,0.188-0.201,0.279-0.48,0.24
+		c0-0.133-0.194-0.272-0.24,0C53.152,134.867,53.244,135.016,53.205,135.295z M47.685,136.734c0.345-0.614,1.024-0.896,1.2-1.68
+		c-0.278-0.201-0.643-0.316-1.2-0.24C48.427,135.639,47.143,136.283,47.685,136.734z M50.565,135.295
+		C49.331,135.874,51.391,135.915,50.565,135.295L50.565,135.295z M65.205,138.654c0.103-0.457,0.517-0.603,0.48-1.2
+		c-0.325-0.075-0.458-0.341-0.96-0.239C64.729,137.851,64.592,138.628,65.205,138.654z M49.365,138.175
+		c0.522,0.027,1.429,0.915,2.4,1.2C51.972,138.208,49.929,136.999,49.365,138.175z M49.605,140.335c0.33,0.01,0.527-0.113,0.72-0.24
+		c0.96,1.521,2.754,2.206,4.56,2.88c-0.786-2.145-3.795-1.758-4.32-3.6c-0.785,0.285-2.056-0.893-1.68-0.24
+		C49.231,139.428,49.249,140.051,49.605,140.335z M59.925,140.095c-0.396-0.004-0.134-0.666-0.48-0.72
+		C59.24,139.863,59.654,140.865,59.925,140.095z M57.045,141.534c-0.878,0.158-0.921-0.519-1.68-0.479
+		C55.064,142.097,56.86,142.419,57.045,141.534z M64.485,141.774c0.035-0.283,0.427-0.544,0-0.72
+		C64.45,141.338,64.058,141.599,64.485,141.774z M60.885,142.975C61.693,143.703,61.613,142.087,60.885,142.975L60.885,142.975z
+		 M53.685,148.494c0.484-0.636,1.51-0.729,1.44-1.92c-0.169-0.711-1.379-0.38-1.44-1.199c0.023-0.617,0.937-0.344,0.96-0.96
+		c-1.278-0.322-1.418-1.782-3.36-1.44C51.807,145.093,51.838,147.701,53.685,148.494z M62.565,145.854
+		c0.188-0.166,0.534-1.339,0-1.439C62.825,145.029,61.836,145.559,62.565,145.854z M60.645,146.574c0.138-0.146,0.562-1.138,0-1.199
+		C60.507,145.521,60.083,146.513,60.645,146.574z M57.045,152.095c1.187-0.493,1.142-2.218,1.2-3.84
+		c0.043-0.514,1.433-1.709,0.48-1.681C58.022,148.244,56.22,149.645,57.045,152.095z M50.325,147.534c0.24,0,0.48,0,0.72,0
+		c0.031-0.431-0.238-0.562-0.72-0.479C50.325,147.215,50.325,147.375,50.325,147.534z M51.765,160.975c0.32,0,0.64,0,0.96,0
+		c0-0.16,0-0.32,0-0.48c-0.241,0.001-0.286-0.194-0.48-0.239c-0.054,0.186-0.007,0.473-0.24,0.479
+		c-0.071-0.212-0.48-1.22-0.72-0.479C51.622,160.317,51.559,160.781,51.765,160.975z"/>
+</g>
+</svg>
diff --git a/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_follow_the_leader.svg b/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_follow_the_leader.svg
new file mode 100755
index 0000000000000000000000000000000000000000..cc4ca228b8fb7311c9047017d056b51d2e66839b
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_follow_the_leader.svg
@@ -0,0 +1,574 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1_xA0_Image_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" width="517.761px" height="245.291px" viewBox="0 0 517.761 245.291"
+	 style="enable-background:new 0 0 517.761 245.291;" xml:space="preserve">
+<g>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M506.291,0.019c3.016,0.05,6.367-0.235,8.76,0.438
+		c-1.762,1.383-2.112,3.121-0.438,4.817c-1.091,0.661-2.148,1.355-3.504,1.752c0.404,2.221,0.361,3.049-0.875,4.38
+		c-1.397,0.375-1.355-0.689-2.19-0.876c-1.46,0.73-1.262,3.118-3.941,2.627c0.162-2.79-0.866-4.389-1.752-6.131
+		c2.052-1.16,4.294-2.13,7.008-2.628C508.235,3.038,506.314,2.477,506.291,0.019z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M515.926,0.019c0.584,0,1.168,0,1.752,0
+		c0.441,1.317-0.977,0.776-1.752,0.876C515.926,0.603,515.926,0.311,515.926,0.019z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M141.025,4.836c-0.064,0.958-1.104,0.94-2.19,0.876
+		c0.005,1.602,0.866,2.347,1.752,3.066c-0.454,1.098-1.986,1.385-0.438,2.19c-1.292,1.575-3.638,4.117-5.255,3.941
+		c0.474-1.277,1.855-1.648,1.752-3.503c-0.321-0.409-0.796-0.664-1.314-0.876c-0.625,0.835-1.018,1.901-1.314,3.065
+		c-1.568-0.184-2.107-1.396-2.19-3.065c-0.947,0.367-1.494,1.134-3.066,0.876c-0.228-0.648-0.648-1.104-0.876-1.752
+		C129.17,5.41,136.649,1.772,141.025,4.836z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M480.888,4.836c-3.561,4.469-13.503,2.555-18.832,5.256
+		c-4.896,1.235-11.213,1.05-14.891,3.503c-2.875,0.629-6.984,0.024-7.884,2.628c1.454,0.882,4.275,0.396,5.693,1.314
+		c-0.047,2.435-3.506,1.458-3.941,3.504c-1.2,1.044,1.729,1.931,0.438,3.065c-1.473,1.153-3.641,0.075-4.379-0.876
+		c-1.824,0.172-2.557,1.92-4.38,0.876c-0.469-1.636,1.087-1.248,0.876-2.627c-0.747-0.859-3.073-0.14-3.504-1.314
+		c0.921-2.875,5.791-1.801,7.445-3.942c-4.971-1.568-6.832,0.836-10.949,1.752c-2.731,0.607-5.115,3.609-8.321,3.066
+		c-2.466,1.622-5.583,2.592-8.321,3.941c-1.309,2.052-3.725,2.941-6.132,4.818c-2.348,1.831-3.633,4.336-6.569,5.255
+		c-1.035,0.324-1.494,1.838-2.189,2.19c-1.808,0.915-4.062,0.667-5.694,1.752c-2.295,1.526-2.692,4.519-4.817,6.131
+		c-4.591,3.483-10.384,5.794-14.453,9.635c-6.079,1.975-11.52,2.115-16.643,5.256c-0.876,0-1.752,0-2.628,0
+		c-7.301,3.098-18.909,3.113-28.468,2.628c0.212,1.208,1.547,7.677-2.189,7.445c-1.231,0.063-1.264-1.073-1.314-2.19
+		c-1.938,1.275-2.314,4.109-4.817,4.818c-0.862-1.566,0.203-2.337,0-4.38c0.197-1.219-2.388,0.343-2.19-0.876
+		c1.661-2.135,4.623-2.968,5.694-5.693c-4.481-0.336-7.474-2.162-10.949-3.504c-3.214,3.681-12.771,4.363-15.329-0.438
+		c-2.368,0.476-6.112-0.689-8.321-1.752c0.645-1.544,2.317-2.062,4.38-2.189c1.11-1.07-0.924-0.934-0.438-2.628
+		c2.871-0.066,4.032,1.077,7.008,1.752c-0.872,1.026-1.009,2.787-0.876,4.817c3.097,2.452,9.296,2.867,11.825-0.438
+		c-4.479-3.565-9.29-9.13-6.132-16.643c-0.329-1.423-1.584-1.92-2.628-2.628c0.052,2.228-2.362,2.907-2.189,5.256
+		c-3.267-1.825-5.261,1.069-7.445,1.751c0.02-1.731,0.964-2.54,1.313-3.941c-4.679,0.139-6.548,3.087-7.883,6.569
+		c-1.634,0.465-0.693-1.643-2.19-1.314c-2.203-0.159-0.898,3.189-3.504,2.628c0.43-3.59-1.57-3.735-2.628-6.569
+		c1.614-1.452,5.496-0.636,6.132-3.066c2.068-0.024,2.405,1.683,3.941,2.19c2.193,0.148,3.063-1.025,5.256-0.876
+		c0.393-1.414-1.429-0.616-1.752-1.314c2.997-3.515,6.797-2.512,11.388-3.066c-0.486-2.288-2.128-3.42-3.942-4.379
+		c-1.958,0.085-2.486,1.601-3.941,2.189c-1.414,0.392-0.615-1.428-1.313-1.751c-1.609-0.143-3.878,0.374-4.818-0.438
+		c0.987-1.495,2.773-2.191,3.942-3.504c-3.269-0.145-7.428,2.458-8.321,6.131c-0.894,0.88-0.859-0.193-1.752-0.438
+		c-2.434,0.487-1.875,3.965-3.942,4.818c-1.419-3.493,1.221-6.576,3.504-8.759c2.582-0.484,5.942-0.189,7.445-1.752
+		c0.135-1.01-1.265-0.487-1.313-1.314c-2.45,0.879-4.747,0.681-7.008,1.752c-0.61,0.289-1.535,1.276-1.752,1.314
+		c-1.129,0.196-3.196-2.302-3.941,0c-1.189,0.313,0.313-2.065-0.876-1.752c-3.488,0.161-2.917,4.382-6.132,4.818
+		c0.364-3.138-4.78-0.767-5.693-2.628c0.295-1.895,2.408-1.972,4.38-2.19c1.194-1.188-1.133-1.09-0.876-2.628
+		c2.792-0.019,3.928,1.62,5.693,2.628c2.73-1.211,5.861-2.022,8.321-3.504c-1.468-2.587-5.445-0.042-6.131-3.503
+		c4.512-3.146,8.589-0.444,10.073,3.941c2.627,0.584,5.37,1.054,7.445,2.19c1.208-0.105,1.336-1.292,1.752-2.19
+		c1.583,0.461,2.425,1.663,3.503,2.628c1.875-0.754,4.184-1.073,7.008-0.876c0.479-1.939-0.742-2.178-0.876-3.504
+		c4.196-0.717,3.851,2.435,7.445,1.314c-0.715,3.635,2.025,3.815,2.628,6.132c-4.12,0.616-5.544-1.463-9.197-1.314
+		c-0.935,0.205-0.834-0.626-0.876-1.314c-4.615,2.341,1.624,4.929,0.876,8.759c0.562,1.19,2.243,1.261,2.628,2.628
+		c-2.889,6.914,0.029,15.263,7.884,15.329c0.169,0.308-0.212,1.039,0,1.314c1.781,2.315,9.728,5.352,13.577,4.818
+		c3.209-0.445,5.298-3.324,7.007-5.256c2.226,0.328,3.359-0.437,3.941-1.751c0.507,1.976,3.194,1.77,3.504,3.941
+		c2.932-1.066,7.727-1.36,9.636,0.876c3.239,0.466,3.867-1.68,7.008-1.314c1.375,0.207,1.156-1.179,2.189-1.314
+		c7.024-1.443,13.646-3.288,18.833-6.569c3.736-2.541,6.86-5.695,10.948-7.883c0.802-2.557,2.351-4.365,3.942-6.132
+		c7.958-0.572,13.396-8.224,19.271-12.263c1.836-1.263,3.855-1.751,5.693-2.627c1.498-0.714,3.006-2.132,4.817-2.628
+		c2.953-0.808,5.55-0.637,7.884-3.066c-5.822-2.266-11.448,2.321-17.519,2.628c-2.364,2.46-6.658,4.646-10.512,7.007
+		c-1.144,0.702-1.925,2.053-3.065,2.628c-1.277,0.644-3.305,0.782-4.817,1.314c-2.657,0.935-9.21,1.577-13.577,0.876
+		c-1.763-0.283-4.647-0.748-5.693-1.314c-2.19-1.184-2.998-5.932-6.57-3.942c-0.442,2.049,1.757,1.455,1.314,3.504
+		c-0.954,1.381-3.931,0.741-6.132,0.876c-0.752,0.562-0.543,2.085-1.752,2.19c-3.554-0.709-7-4.855-10.949-4.38
+		c-1.786,0.215-2.229,1.941-4.38,2.19c-1.864-0.909-4.445-1.103-6.131-2.19c0.691-1.79,2.819-2.144,3.065-4.379
+		c5.328,0.803,8.606,3.656,14.015,4.379c1.986-1.226,3.966-2.458,6.57-3.066c-0.81-2.211-2.881-0.3-4.38-0.438
+		c-1.197-0.109-2.434-1.069-3.941-1.313c-1.636-0.266-3.499,0.275-4.818,0c-4.062-0.849-7.956-2.971-10.511-4.818
+		c-1.999,0.221-2.482-0.761-3.942,0c-1.413,0.392-0.615-1.428-1.313-1.752c-1.239-0.075-3.005,0.377-3.065-0.876
+		c1.344-1.757,2.809-1.907,2.628-4.379c2.562-0.081,3.855,1.107,5.255,2.19c1.266-0.741,3.3-1.277,4.38,0
+		c-0.627,1.563-2.657,1.722-3.065,3.503c-0.098,1.849,2.275,1.228,3.065,2.19c1.452-0.154,0.688-2.524,0.876-3.942
+		c3.535-3.489,9.739-8.431,15.767-6.569c0.207,1.375-1.179,1.157-1.313,2.19c0.272,1.188,1.83,1.09,1.752,2.628
+		c-2.195,0.286-3.484,1.479-5.256,2.189c-0.607-0.56-0.268-2.068-0.876-2.627c-3.833,0.984-9.754-0.119-8.76,5.693
+		c1.604,1.024,3.165,2.091,4.818,3.066c1.309-0.153,3.677-1.219,4.817-0.876c1.354,0.406,1.234,1.488,2.628,1.752
+		c4.163,0.789,8.241,0.416,11.387,0.876c0.595-1.909-1.043-1.585-1.313-2.628c0.632-1.704,1.968-2.704,2.628-4.38
+		c3.98,0.413,5.317-3.937,9.635-1.752c-1.276,2.561-0.35,2.555,0.876,4.38c-2.041,1.316-6.08,0.635-6.569,3.504
+		c-1.205-0.254-1.829-1.09-3.065-1.314c-0.354,0.083-0.437,0.439-0.876,0.438c0.122,3.089,3.16,3.263,3.941,5.693
+		c10.671,4.182,24.014,0.695,31.096-6.569c-0.753-2.78-3.652-0.929-6.569-1.752c-0.3-2.197,1.054-2.742,2.628-3.066
+		c-0.174-2.655,1.866-3.097,3.065-4.379c1.93,1.136,5.254,0.877,7.008,2.189c-1.056,2.302-4.352,2.364-5.693,4.38
+		c-0.393,1.414,1.428,0.615,1.752,1.314c2.804-2.312,5.87-2.765,11.387-3.942c4.191-0.894,7.225-3.116,11.388-0.438
+		c3.465-1.49,6.073,0.3,9.197-1.314c0.49-1.379,0.039-0.991,0-2.627c-0.113-0.91-1.925-0.12-2.19-0.876
+		c0.34-0.39,0.471-0.989,0.438-1.752c-1.624-1.293-2.719-1.159-5.256-0.876c-1.087,0.559,1.888,0.699,1.313,2.19
+		c-1.285,0.081-2.97,0.692-5.255,0.876c-0.729,1.375,1.629,1.79,0.438,2.19c-2.806-0.652-4.017-2.439-7.008-0.876
+		c-0.879-0.893,0.193-0.859,0.438-1.752c-0.518-0.504-1.548-0.496-2.628-0.438c0.808-2.012,0.387-3.059,1.313-4.38
+		c2.815,0.251,5.739,0.393,7.446,1.752c2.869-1.795,8.085-1.64,10.511,0.438c1.842,0.09,1.84-1.664,3.504-1.752
+		c1.377-0.063,1.505,1.124,1.752,2.19c1.815,0.119,1.706-0.575,3.065,0c0.546,1.86-1.457,1.171-1.752,2.19
+		c0.997,0.755,2.567,0.937,4.38,0.876c0.441-1.317-0.976-0.776-1.752-0.876c2.171-4.928,9.868-4.269,13.577-1.752
+		c3.07-1.164,6.557-1.911,10.512-2.19C473.077,3.381,477.735,2.913,480.888,4.836z M427.018,8.34
+		C425.543,7.01,425.691,9.959,427.018,8.34L427.018,8.34z M347.308,10.092c-0.093,1.302,1.562,1.544,2.19,0.876
+		C349.805,9.451,347.962,9.397,347.308,10.092z M439.282,11.844c1.522,2.354,3.631-0.991,6.132-0.438
+		C444.527,9.353,440.083,10.141,439.282,11.844z M360.885,24.544c0.776-0.1,2.193,0.441,1.752-0.876
+		C361.639,23.546,360.991,23.774,360.885,24.544z M331.98,60.458c-2.503,0.277-5.059-0.97-7.008,0.876
+		c2.201,0.899,4.434,0.109,6.569,0c4.492-0.23,8.982-0.14,12.701-1.752C340.111,57.132,335.691,60.047,331.98,60.458z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M125.259,8.778c-1.701-3.143,2.633-3.697,4.379-4.818
+		c0.745-0.161,0.827,0.342,0.876,0.876C128.411,5.798,128.072,8.525,125.259,8.778z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M346.432,5.712c0.119,1.816-0.575,1.707,0,3.066
+		c-1.799,0.828-3.69,1.565-6.131,1.752c-0.376-1.397,0.688-1.354,0.876-2.19c-1.096-0.802-3.604-0.191-3.504-2.19
+		C340.647,6.228,343.043,4.669,346.432,5.712z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M233.875,10.53c-1.163,0.004-2.501-0.166-3.065,0.438
+		c0.801,1.097,3.683,0.112,3.503,2.189c0.426,1.74-2.447,0.18-2.19,1.752c0.775,1.269,3.234,0.854,3.066,3.066
+		c-5.057,1.261-3.966-3.625-7.445-3.942c-0.27,1.876,1.426,1.786,1.314,3.504c-1.879,0.127-2.894-0.61-3.942-1.314
+		c0,1.022,0,2.044,0,3.066c-3.009-1.509-7.491-6.589-4.379-10.073c2.202,0.815,2.616,0.815,4.817,0
+		c-0.543,1.187-1.69,1.09-0.876,2.628C227.563,11.591,231.777,6.076,233.875,10.53z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M215.042,50.823c-3.302-0.237-3.683,2.448-7.445,1.752
+		C207.659,50.05,213.712,47.861,215.042,50.823z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M413.442,60.02c-0.568,2.509-2.609,4.336-5.256,3.504
+		c-1.57-1.95-2.003-6.586,0.438-7.884c0.51-0.071,0.779,0.097,0.876,0.438C408.28,59.59,410.54,61.745,413.442,60.02z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M400.741,77.101c0.421,2.319-0.825,2.971-2.19,3.504
+		c-0.236,1.551,1.552,1.077,1.314,2.628c-4.278,0.215-4.698-2.755-9.197-1.314c-1.18-1.173,0.558-1.666,0.876-2.628
+		c-5.095,0.13-10.375,0.448-12.264-2.628c-1.425,0.508-4.766,0.822-6.131,0c-0.521-1.835,1.846-0.782,2.189-1.751
+		c-0.306-1.738-3.122-0.966-3.504-2.628c-0.159-1.473,1.898-0.73,2.628-1.314c0.397-0.916,1.293-1.335,2.628-1.314
+		c3.02,1.406,4.145,3.761,7.445,3.942c0.034,1.64-1.888,1.324-1.313,3.503c2.514,2.243,5.106-0.732,8.321-0.438
+		c0.965-0.925-0.562-1.294-0.438-2.627C395.309,70.945,397.168,76.746,400.741,77.101z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M76.644,97.685c0.745-0.161,0.827,0.342,0.876,0.876
+		c-0.373-0.081-0.413,0.171-0.438,0.438C76.569,98.928,76.713,98.201,76.644,97.685z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M461.18,118.27c1.525,2.125,2.413,4.886,5.693,5.256
+		c2.999-0.775,5.281-4.991,8.76-2.628c-0.871,2.487-5.325,1.391-6.132,3.942c0.231,3.271,2.939,4.067,5.693,4.817
+		c0.606,1.52-2.37,2.752-2.628,4.817c1.102,0.358,0.922,1.998,0.876,3.504c-1.869,1.78-7.269,0.031-7.445,3.504
+		c1.377,1.248,1.849-1.064,3.504-0.876c0.7,1.489,2.728,1.652,3.941,2.628c0.24,1.747,0.24,1.319,0,3.065
+		c1.359,1.82,4.304,1.956,7.008,1.314c1.86,2.957,4.633,5.003,7.445,7.008c0.218,1.13-1.047,4.075-1.752,5.693
+		c-2.271-0.502-1.4-4.147-2.628-5.693c-2.868,0.257-3.668,1.319-6.131,0c-1.084,0.422,0.604,1.682,0,3.065
+		c-3.449,0.931-4.461,4.299-6.57,6.569c-2.896,0.414-3.548-1.415-6.569-0.876c0.125,1.773,0.752,3.044,0.876,4.817
+		c7.975,1.661,16.287,2.984,18.395,10.512c-0.678,1.365-1.669,2.419-2.628,3.504c-0.284,6.869-4.639,9.667-4.817,16.643
+		c2.084,0.501,1.19,1.377,2.19,2.628c1.989-0.201,4.142-2.079,6.131-0.876c-1.012,7.2-10.196,5.747-16.204,6.132
+		c-1.694-1.813-0.223-4.612,0-7.008c4.905-1.099,4.185-6.821,4.379-11.825c0.138-3.527,2.255-5.082,3.066-7.884
+		c-2.669-0.757-7.438-2.468-11.825-1.313c2.581,4.134,3.313,10.117,7.007,13.139c-4.009,7.963-10.828,13.113-16.204,19.709
+		c0.049,1.119,1.466,0.869,2.628,0.876c-0.53,1.857-0.53,3.836,0,5.693c1.642,0.693,4.416,0.256,4.379,2.628
+		c-6.312,4.131-9.571-4.616-16.204-4.38c0.071-0.509-0.097-0.779-0.438-0.876c0.191-2.437,1.445-3.81,2.628-5.256
+		c1.304,0.581,2.223,0.449,3.065-0.438c2.556-3.723,4.526-8.029,6.57-12.264c2.331-1.464,5.314-2.275,5.255-6.131
+		c-4.467-1.372-4.382-7.297-10.511-7.008c-1.301-2.057-3.697-3.019-4.817-5.256c-1.46,0-2.92,0-4.38,0
+		c-0.48-1.179-0.083-2.246,0.438-3.504c-0.321-1.576-3.453-0.343-3.941-1.751c2.251-5.439,8.854-7.84,10.949-14.016
+		c0.711-2.097,0.216-4.479,0.876-6.569c0.644-2.039,2.234-4.088,3.065-6.132c0.92-2.261,1.002-4.545,2.628-6.131
+		c-0.421-1.477-2.117-1.679-3.504-2.19c-0.742,1.171,0.689,3.196,0.876,4.818c-2.374,7.547-14.979,5.746-16.643-1.314
+		c-1.288-5.466,2.232-8.402,7.445-8.76c-2.646-3.192-7.864-3.814-10.511-7.007c-1.022,0-2.044,0-3.066,0
+		c-1.501-3.233-6.62-2.932-10.511-2.628c0.019-0.749-0.325-1.134-0.876-1.314c-0.029-2.824,4.582-2.605,5.693-0.876
+		c9.966,0.838,14.636,6.971,21.898,10.511c0.832-1.72-2.48-5.808,0-7.883c1.212,2.598,4.8,4.922,2.628,8.322
+		c1.563,1.135,2.823-1.062,4.817-0.876c0.023,2.066-1.85,2.237-2.628,3.503c0.049,0.828,1.448,0.305,1.314,1.314
+		c1.766-0.57,2.919-1.753,3.065-3.941c0.398-2.15-1.836-1.669-1.752-3.504C456.817,124.461,457.783,121.505,461.18,118.27z
+		 M455.924,137.102c0.76,1.285,2.054,2.034,3.941,2.19c0.093-0.491,0.486-0.683,0.876-0.876
+		C461.006,134.545,456.603,133.252,455.924,137.102z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M329.79,170.826c1.086-0.319-1.445-1.317,0-2.189
+		c2.174-0.422,2.336,1.168,3.941,1.313c2.681-0.239,3.488-2.352,6.132-2.628c1.404-0.382,1.37,0.675,1.752,1.314
+		c2.502,0.179,4.424-2.108,6.132-1.314c1.015,3.293-2.716,5-5.256,6.132c-0.191,3.293,3.853,0.863,5.256,1.752
+		c-2.43,3.696-8.305-0.495-9.636,3.941c-1.107,3.692,2.128,4.329,3.066,6.57c1.054,2.518,0.488,4.865,0.876,7.883
+		c2.896,2.214,10.23-0.012,10.511,4.817c1.671,0.374,2.786,1.303,4.38,1.752c0.113,2.011,0.466,2.116,0,3.942
+		c-4.673,0.95-5.432-4.679-8.321-5.694c-2.695-0.946-4.688,0.644-8.321,1.314c-1.628,0.167-1.146-1.774-3.066-1.314
+		c-2.076,3.495,2.396,9.889-3.065,10.949c-3.037-1.927-0.478-4.446-0.876-8.321c-4.152,0.228-4.98,3.779-10.512,2.628
+		c1.992,4.972-0.129,8.168-0.875,13.577c1.169,2.075,3.579,0.775,6.131,0.876c0.384,1.222,1.049,2.163,1.314,3.504
+		c-4.924,1.639-8.51-1.239-12.264-3.066c1.071-2.14,2.084-4.339,2.19-7.445c-1.483-1.144-3.331-1.925-5.694-2.189
+		c-2.23,0.835-2.802,3.329-3.941,5.256c-1.967,0.515-3.71,1.254-4.817,2.628c0.229,1.376,0.769,2.443,1.313,3.503
+		c2.64-0.303,4.495,0.177,3.942,3.066c-1.913-0.308-2.467,0.745-4.38,0.438c-2.07-2.747-3.434-6.201-4.818-9.635
+		c1.774-1,3.8-1.749,5.694-2.628c-0.799-4.314,0.474-9.136,3.504-10.949c-5.558-2.099-10.551-9.593-5.694-15.767
+		c2.367-0.363,3.864-3.589,6.132-2.628c-0.107,2.229-2.979,1.692-3.941,3.065c-0.066,1.162-0.757,1.995-0.876,3.065
+		c-0.576,5.146,2.18,8.131,6.131,9.636c2.699-0.951,3.808-3.492,7.446-3.504c0.716-2.122,4.68-3.717,6.131-6.132
+		c0.559-0.929,0.232-2.228,0.876-3.065c1.988-2.588,7.466-4.835,2.19-8.321c0.938-0.96,2.209-1.587,2.189-3.504
+		c-0.188-1.711-2.593-1.203-2.189-3.504C329.225,169.931,329.61,170.276,329.79,170.826z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M402.493,169.074c1.953,0.091,1.538,2.55,3.065,3.066
+		c2.219,0.612,1.202-2.01,3.065-1.752c0.865,4.717,3.568,7.247,3.066,12.263c-1.161,1.029-2.337,2.043-4.38,2.19
+		c0.574,2.332-0.526,3.931,0.876,5.693c3.678-0.521,11.424-1.549,9.635,4.817c-3.736-2.288-6.608-1.159-10.949,0
+		c1.757,1.754,8.217,5.293,2.628,8.321c-1.426-0.034-0.935-1.984-1.313-3.065c-0.816-1.228-2.398-1.689-3.941-2.19
+		c-3.413,2.573-5.506,6.466-9.197,8.76c1.834,4.81,0.73,7.546-0.438,12.701c0.529,2.038,2.687,0.752,3.941,1.313
+		c0.14,1.028,0.692,1.645,0.438,3.066c-4.682,0.301-6.84-1.92-9.197-3.942c-0.021-2.064,1.413-2.674,1.313-4.817
+		c-3.689-2.633-10.127,1.305-10.949,5.693c-0.359,1.674,2.112,0.517,1.752,2.19c-0.133,2.584-3.208,0.708-4.38,0.438
+		c-1.172-2.32-0.544-5.459,0-8.321c1.318-1.31,3.615-1.641,4.818-3.065c-0.003-1.896-1.017-2.779-0.876-4.818
+		c-6.14-1.532-12.106-1.982-17.081,0.876c-1.843,1.06-2.488,3.185-4.817,3.066c-1.426-3.85,6.681-7.284,10.511-7.884
+		c3.432-0.537,7.263,0.083,10.512,0.438c3.301-4.583,8.674-7.093,12.701-10.949c0.835-1.96,1.72-3.671,3.065-5.694
+		c0.556-0.834,1.814-1.943,2.189-3.503c0.516-2.142-0.591-4.711,0-7.008C399.302,174.033,403.526,171.982,402.493,169.074z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M24.088,26.296c-0.288-1.312-0.936,0.419-1.752,0
+		c-0.508-1.681-1.636-2.744-1.313-5.255c-1.734,0.456-1.705,2.675-1.752,4.817c-1.443,1.769-1.777,4.647-3.942,5.694
+		c0.318-1.34-0.755-1.289-0.438-2.628c-0.964,0.496-0.03,2.89-1.314,3.066c-1.789-0.938-1.994-2.31-4.817-1.314
+		c0.132-1.77,1.901-4.01,0-5.256c0.483-1.999,2.751-2.212,2.627-4.817c0.088-1.694-2.167-1.045-3.065-1.752
+		c1.49-4.225-0.249-10.489,2.19-14.453c3.253,0.002,5.625-0.233,10.073,0c3.84,0.201,8.012-0.933,10.949-0.876
+		c2.186,0.042,4.157,1.296,6.131,1.314c0.831,0.008,1.833-0.713,2.628-0.876c4.534-0.926,10.263,0.507,16.205,0.438
+		c13.458-0.156,34.508,0.074,47.739,0.438c4,0.11,7.862-0.801,11.825,0.876c-0.619,2.19-3.849,0.868-3.066,3.504
+		c-2.772,0.45-5.263-1.27-7.445,0c0.153,1.452,2.524,0.687,3.941,0.876c-0.058,1.08-0.066,2.11,0.438,2.627
+		c1.851-0.485,4.167-0.504,6.57-0.438c0.059,1.693,1.776,1.727,2.189,3.065c1.092-0.368,2.347-0.573,3.942-0.438
+		c0.588,0.872,0.835,2.085,1.314,3.066c0.997-0.213,2.237-0.869,3.065,0c-0.305,1.154-1.994,0.926-2.189,2.19
+		c-0.037,2.519,3.468,1.496,4.817,2.627c-0.274,1.478-2.429,1.075-2.628,2.628c1.941,1.118,5.963,0.486,5.256,5.256
+		c-1.382,0.214-1.546-0.79-3.066-0.438c1.283,2.286,6.536,2.72,4.818,6.569c-1.384,1.064-1.72-1.846-3.942-1.314
+		c-1,1.428,1.692,2.192,1.752,3.942c-1.163,1.019-0.7,2.36-0.438,3.942c-1.209-0.225-3.666-1.95-4.38,0
+		c-0.092,1.552,2.055,0.865,1.752,2.627c-2.558,0.661-2.699-1.096-3.941-1.751c-1.798,2.543,2.074,3.169,2.189,5.255
+		c-2.882,1.709-3.333-2.396-5.693-2.628c-1.003,1.605,2.278,2.673,2.19,4.818c-5.3,0.536-6.008-7.063-7.007-12.263
+		c-3.542,4.509,2.048,9.447,3.503,13.139c-2.72,1.546-4.404-1.325-4.817-3.504c-1.231-0.063-1.263,1.073-1.314,2.19
+		c-1.979-0.065-1.878-2.21-2.628-3.504c0.007-1.599,1.245-1.967,1.752-3.066c-2.787-1.751-2.396,3.434-3.942,4.38
+		c-1.63,0.024-1.263-1.949-1.314-3.504c-1.292,0.594-2.711,0.548-3.503-0.438c-0.111-1.57,1.315-1.604,1.314-3.065
+		c-2.712-0.866-0.008-2.47-0.438-4.818c-1.181-1.593-4.675-0.873-5.256-3.066c-1.178-0.301-0.846,0.906-1.314,1.314
+		c0.988,1.348,3.153,1.519,3.066,3.942c-0.733,0.773-1.467-0.389-3.066,0c-1.285,0.372,0.57,1.102,0,2.19
+		c-2.937-0.661-5.859,0.994-6.569-2.19c-1.338-0.316-1.596,0.448-2.628,0.438c-1.532-1.276-1.344-3.373-0.876-5.694
+		c-0.728,0.732-1.146,1.773-2.628,1.752c-0.039-1.713-0.536-2.968-2.627-2.627c-0.127-2.463,0.769-3.903,2.189-4.818
+		c-0.042-1.125-1.709-0.626-1.751-1.752c-0.078-1.538,1.479-1.44,1.751-2.628c-0.89-2.176-3.51-2.621-3.503-5.693
+		c-1.167,0.731,0.243,4.039-0.876,4.817c-1.831-0.067-2.393-1.403-2.19-3.503c-2.317-0.711-1.371,1.841-3.504,1.314
+		c-1.025-1.569,0.266-3.933,0.876-5.256c-1.153-1.101-1.475,1.099-2.627,1.314c-1.534,0.074-1.379-1.541-2.19-2.19
+		c-0.961,0.499-1.79,1.13-3.504,0.876c1.276-4.198-2.982-5.076-3.942-8.321c-1.34,0.557-3.174,0.621-4.379,1.314
+		c1.331,1.442,3.455,2.093,4.379,3.941c0.384,1.406-1.136,0.908-1.313,1.752c0.229,2.544,4.296,1.251,3.941,4.38
+		c-1.314,0-2.628,0-3.941,0c0.594,1.596,2.434,1.946,2.627,3.941c-0.637,0.677-2.242,0.386-3.503,0.438
+		c-1.351,0.584,0.816,1.948-0.438,2.628c-1.443-0.163-2.188-1.023-3.066-1.752c-0.95-0.074-0.198,1.554-0.438,2.19
+		c-3.502,0.437-2.964-3.167-4.38-4.817c-1.245,0.97-1.803,4.691-0.438,5.693c0.175,1.78-1.864,1.348-2.189,2.628
+		c1.011,2.2,1.157,5.267,3.065,6.569c1.236-0.516-0.49-3.994,1.314-3.941c3.209,1.174,0.036,5.354,0.438,7.883
+		c3.359-1.021,0.46-8.3,5.694-7.445c0.404,2.01-1.096,2.116-0.876,3.941c1.715-0.218,3.337-2.251,5.255-0.876
+		c0.13,4.218-3.664,4.511-4.379,7.883c3.875-0.541,5.522-7.005,11.387-7.007c1.4,1.812,5.077,1.346,5.255,4.38
+		c1.506-0.192,2.455,0.173,3.504,0.438c0.271,2.752-3.709,1.254-4.38,3.065c1.004,0.824,4.331-0.925,4.818,1.314
+		c-0.206,1.984-3.354,1.026-3.066,3.504c-3.717,0.757-6.634-3.328-8.759-1.314c0.945,0.515,2.011,0.909,3.066,1.314
+		c0.395,3.023-1.426,3.83-4.38,3.504c1.203,2.447,2.835,4.464,6.569,4.379c1.017-1.173,1.523-2.856,2.628-3.941
+		c3.282,0.958,3.826-0.427,6.57-0.876c0.537,1.997-1.536,1.384-1.752,2.627c1.364,0.937,2.5-1.385,3.941-1.751
+		c2.827,0.531,3.402,3.313,7.008,3.065c0.509,2.261-1.208,2.295-2.19,3.066c1.15,0.894,4.1-0.012,3.503,2.628
+		c-2.669,0.495-2.934,0.728-3.941,2.627c-2.565-0.5-2.909-3.223-5.694-3.503c-1.004,0.751,1.892,1.291,2.19,2.19
+		c0.02,1.333-0.925,1.703-1.314,2.627c0.607,1.908,2.263,0.043,3.504,0c1.24,1.388,4.097,1.159,5.694,2.19
+		c-1.571,2.774,0.311,2.296,0.875,4.818c-1.337,1.647-3.463-0.806-6.131-0.438c0.389,2.093,3.486,1.478,3.504,3.941
+		c-1.948,0.664-3.449-1.101-5.694,0.438c-0.419-0.895-0.895-1.733-1.314-2.627c-1.882,1.363-4.803-0.448-5.255,1.751
+		c2.503,0.783,3.651,1.867,6.131,1.752c-0.29,2.63-4.172,1.667-4.817,3.942c1.521-0.067,5.847-2.593,9.197-0.876
+		c0.186,0.916-0.3,1.16-0.438,1.752c0.637,0.823,2.867,0.053,3.503,0.876c-0.571,1.763-0.866,1.075,0,2.628
+		c0.307,1.621-1.535,1.092-2.189,1.751c0.384,0.774,1.388,1.279,0.438,2.19c-3.928,0.318-4.118,2.207-6.57-1.752
+		c-1.441,0.019-2.18,0.74-3.941,0.438c0.996,1.778,5.163,0.385,4.817,3.504c-2.156,1.494-3.292-1.217-5.255-1.314
+		c1.109,1.758,4.812,2.943,3.941,5.256c-1.188,1.137-1.637-0.937-2.627-1.314c-1.325,0.663,0.363,1.922,0,3.065
+		c-1.288,0.141-5.304,1.395-5.694-1.314c-1.92-0.46-1.438,1.481-3.066,1.314c-1.238-1.244-1.643-3.321-2.627-4.817
+		c-0.644,0.002-2.2,1.219-0.876,1.752c-0.912,1.44-1.847-0.739-2.628-0.876c-0.805,0.619,0.687,2.127-0.438,3.065
+		c-1.847-0.343-1.911-2.468-3.504-3.065c-1.062,0.251,0.206,2.833-1.313,2.627c-1.372-0.234-1.578-1.633-1.752-3.065
+		c-1.284,0.03-1.627,1.001-2.19,1.752c-1.542-2.254-4.193-3.398-7.007-4.38c0.31-3.23-2.777-3.062-2.628-6.131
+		c-0.73,0-1.46,0-2.19,0c-0.264,1.577,1.337,1.291,1.314,2.627c-0.763,0.405-2.351-0.015-2.19,1.314
+		c-0.403,1.717,2.31,0.318,2.628,1.314c-0.486,1.85-2.923,1.749-2.628,4.38c-1.175,0.185-3.43-1.612-3.066,0.876
+		c-2.267-0.451-3.482-0.435-5.255,0.438c-0.44-0.874-1.937-0.691-1.752-2.19c-4.56-0.696-7.052-3.459-10.511-5.256
+		c-2.496,2.289-3.513-1.413-6.131,0c-1.206-2.403-2.268-5.407-2.19-7.883c-1.34-0.318-1.288,0.756-2.628,0.438
+		c-0.9-0.706-1.016-2.196-0.876-3.942c-0.912-1.016-1.847,0.491-2.628-0.876c0-1.313,0-2.627,0-3.941
+		c-1.785-0.326-1.508,1.412-3.503,0.876c-0.909-1.751,0.202-3.404,0.876-4.818c-1.848-7.575,1.402-17.436-0.876-25.402
+		c0.681-0.721,1.707,0.149,2.627,0.438c0.288-2.049,1.675-2.998,3.504-3.504c1.727-0.121,1.339,1.873,3.066,1.752
+		c0.904-0.994,0.896-2.9,1.752-3.942c1.055-0.179,0.952,0.8,2.19,0.438c-0.065-2.023-1.24-3.611-0.438-5.255
+		c3.467,0.329,2.581,5.01,5.255,6.131c0.599-2.101-2.822-5.682-1.314-8.759c1.506,0.1,1.909,1.303,2.19,2.628
+		c0.648-0.228,1.104-0.648,1.752-0.876c-0.065-2.945-1.42-2.881-1.314-5.256C23.814,26.358,22.81,31.978,24.088,26.296z
+		 M90.221,21.041c0.292,0,0.584,0,0.876,0c0-0.292,0-0.584,0-0.876c-0.292,0-0.584,0-0.876,0
+		C90.221,20.457,90.221,20.749,90.221,21.041z M49.49,21.479c0.439-0.001,0.521,0.354,0.876,0.438
+		c-0.001-0.439,0.354-0.521,0.438-0.876c-0.439,0.001-0.521-0.355-0.876-0.438C49.93,21.042,49.573,21.124,49.49,21.479z
+		 M30.658,22.792c0-0.583,0-1.167,0-1.751c-0.584,0-1.168,0-1.752,0C28.703,22.412,29.287,22.996,30.658,22.792z M24.526,25.42
+		c0.338-0.299,1.14-2.609-0.438-2.19C24.328,23.867,23.576,25.494,24.526,25.42z M33.723,31.552
+		c-0.132,1.154,0.606,1.437,1.752,1.314C35.807,31.325,34.329,30.906,33.723,31.552z M39.417,34.618
+		c-0.362-1.238,0.617-1.134,0.438-2.189c-0.56-0.024-0.606-0.562-1.314-0.438C37.6,32.924,38.378,34.375,39.417,34.618z
+		 M48.614,36.37c1.958,0.061,1.683-2.113,2.19-3.503C49.262,33.222,48.609,34.467,48.614,36.37z M113.434,41.188
+		c-0.135-1.471,0.584-3.796-1.314-3.504C111.41,38.613,112.222,40.825,113.434,41.188z M109.054,43.377
+		c2.506,0.806,2.22-3.687,0.438-3.504C108.814,40.51,109.106,42.116,109.054,43.377z M22.774,44.691
+		c0.591-1.647-2.021-2.312-2.627-1.313C21.239,43.598,21.609,44.542,22.774,44.691z M123.069,45.567
+		c0.597-0.558,0.676-2.145-0.438-2.189C121.588,43.676,121.277,45.807,123.069,45.567z M60.439,47.319c0.876,0,1.752,0,2.628,0
+		c-0.069-0.515,0.075-1.243-0.438-1.314C62.447,46.991,60.228,45.939,60.439,47.319z M23.65,50.385
+		c1.062-0.513-0.584-2.75-1.314-1.314C23.164,49.12,22.64,50.519,23.65,50.385z M66.133,51.261
+		C64.363,49.72,65.1,52.669,66.133,51.261L66.133,51.261z M87.593,60.458c1.384,0.07,2.644,0.016,3.066-0.876
+		C90.079,59.053,87.647,59.144,87.593,60.458z M37.665,60.896c1.403,0.203,1.544,1.667,3.066,1.752
+		c1.194-1.623-1.041-2.844-2.628-3.066C38.122,60.185,37.897,60.543,37.665,60.896z M72.703,60.896
+		c0.1,1.505,1.303,1.908,2.627,2.19c0.343-0.938,1.064-2.447,0.438-3.066C74.383,59.948,74.304,61.184,72.703,60.896z
+		 M36.789,63.086c0.175-1.635-0.35-2.57-1.752-2.628C34.862,62.093,35.387,63.028,36.789,63.086z M80.586,66.151
+		c2.041,0.187,4.433-0.438,3.066-3.065C81.761,63.239,80.739,64.261,80.586,66.151z M54.308,73.159
+		c-0.945-3.143-3.715-4.46-5.693-6.57C50.174,69.118,50.327,73.052,54.308,73.159z M78.396,73.159c1.605,0,3.382,0.17,3.066-1.752
+		C80.444,71.996,78.189,71.347,78.396,73.159z M40.731,79.291c-0.149-0.354-1.163-0.528-1.314,0
+		C39.127,80.305,41.128,80.238,40.731,79.291z M59.125,82.794c0.557-0.519,0.186-1.654-0.438-2.19
+		C58.927,81.241,58.176,82.868,59.125,82.794z M52.556,85.86c1.288-0.318,1.846-1.365,1.751-3.065
+		c-0.625-0.105-0.738-0.721-1.314-0.876C52.54,82.931,52.103,85.278,52.556,85.86z M59.563,87.174c1.022,0,2.044,0,3.066,0
+		C62.995,84.496,59.197,84.496,59.563,87.174z M86.279,85.86c0.439-0.001,0.521,0.355,0.876,0.438
+		c-0.001-0.439,0.355-0.521,0.438-0.876c-0.439,0.001-0.521-0.355-0.876-0.438C86.719,85.423,86.363,85.505,86.279,85.86z
+		 M38.979,89.364c0.584,0,1.168,0,1.752,0c0.382-1.404-0.674-1.37-1.314-1.752C39.279,88.204,38.793,88.448,38.979,89.364z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M146.719,3.96c4.565,1.217,10.681-0.753,16.205,0
+		c1.635,0.223,2.72,0.437,4.818,0.438c6.358,0.006,14.83-0.344,21.022,0.438c1.646,0.208,3.351,0.416,4.379,1.752
+		c-3.607-0.396-5.754,0.669-7.883,1.752c0.871,1.801,5.036,0.737,6.131,0c2.542,0.687,7.232,3.345,10.073,0.876
+		c-1.351-1.217-3.481,0.043-4.379-0.876c0.767-1.861,3.646-1.609,3.941-3.942c3.959-0.289,7.81-0.395,10.073,1.752
+		c1.418-0.587,3.3-1.277,4.38,0c-0.395,1.941-3.728,0.944-4.817,2.19c2.812-0.184,2.334,2.921,5.255,2.628
+		c-0.872,3.792,1.266,4.573,2.19,6.569c-1.732,0.644-3.396,0.445-5.256-0.438c-0.421,2.173,1.168,2.336,1.314,3.942
+		c-2.939,0.458-2.523-2.44-4.817-2.628c-1.154-0.132-1.438,0.606-1.314,1.752c-2.075-1.283-3.619-3.097-3.066-7.008
+		c-1.783-0.031-1.885,1.619-1.752,3.504c-0.584,0-1.168,0-1.752,0c0.614,2.366-1.183,2.321-1.313,3.942
+		c1.952,2.648,6.543,0.285,8.759,2.189c-0.114,1.93-3,1.089-3.942,2.19c1.564,2.107,4.299,0.352,6.131,2.19
+		c0.037,2.688-3.895,1.633-5.693,1.314c0.583,2.397,4.926,1.962,5.256,4.818c-1.644,1.101-4.367,0.168-5.256-0.876
+		c-0.283,1.743,1.159,1.761,0.876,3.503c-3.414-0.382-4.213-3.378-7.007-4.379c-1.472,1.036,0.986,3.295-0.438,4.379
+		c-1.12-0.968-2.026-2.825-1.314-4.379c-0.584,0-1.168,0-1.752,0c-1.571,0.035-0.348,2.863-1.314,3.503
+		c-3.142-1.238-1.832-6.927-6.131-7.007c0.155-0.575,0.771-0.689,0.876-1.314c-2.425,0.527-2.545-1.251-4.38-1.314
+		c-1.25,0.588-0.014,2.299,0.876,2.19c-1.91,1.534,0.402,1.619,0.438,3.504c-2.865,0.091-4.466-1.082-4.818-3.504
+		c-2.823,1.836,1.722,3.402,1.752,5.256c-1.386-0.072-1.464,1.164-3.066,0.875c-0.965-1.078-1.221-2.867-3.065-3.065
+		c-1.763,2.057,2.98,3.248,1.752,4.817c-1.282,0.114-1.346-0.99-2.628-0.876c0.207,3.151,4.263,2.452,4.379,5.694
+		c2.614,0.227,2.458-1.907,4.818-0.876c-0.285,0.445-1.007,0.453-0.876,1.314c1.477,1.305,3.436-0.633,5.256-0.438
+		c0.136,2.472-4.281,0.391-3.942,3.066c2.297,0.682,6.399-0.602,9.197-0.876c-1.418,3.138,2.712,2.645,3.942,4.379
+		c-0.404,1.933-2.574,2.098-3.942,3.066c0.564,1.625,2.753,1.626,2.628,3.942c-2.556-0.366-3.541,0.839-3.942,2.627
+		c0.305,2.177,3.314,1.65,3.066,4.38c-0.876,0-1.752,0-2.628,0c-0.433,1.747,1.309,1.319,0.876,3.066
+		c-2.194-0.844-1.78-0.225-2.19,1.314c-1.575-0.323-2.765-1.031-4.379-1.314c-0.357,2.417,2.69,3.217,1.751,4.817
+		c-3.465,0.107-3.454-3.262-5.255-4.817c-1.394,1.708,0.527,3.836,0.876,5.255c-3.559,0.493-3.583-2.549-4.818-4.38
+		c-0.848,0.466-0.105,2.523-1.313,2.628c-1.653-1.749-2.597-4.48-1.314-7.007c-1.768-0.016-2.207,1.297-2.19,3.066
+		c-4.004-1.995,0.615-6.146,1.752-8.322c2.814,0.333,3.376-1.587,4.817-2.627c-0.455-1.589-1.453-2.635-2.19-3.942
+		c-1.122,0.484-0.86,2.352-0.875,3.942c-1.94,0.188-0.952-2.553-2.628-2.628c1.57,3.202-2.563,2.464-1.752,6.131
+		c-2.476-0.298-1.995-3.552-3.066-5.255c-1.473-0.013-0.892,2.028-1.752,2.628c-2.489-1.985,1.097-4.477,0.438-7.446
+		c-3.618,0.324-3.162,4.722-5.255,6.57c-2.705-0.8-4.119-2.889-6.132-4.38c-1.058,1.222,1.615,4.301,0.438,5.694
+		c-2.003-0.041-1.837-2.251-3.065-3.066c-1.253,0.061-0.801,1.827-0.876,3.066c-4.441-0.725-0.707-5.056-0.438-7.446
+		c-2.623,0.589-1.875,4.548-4.818,4.818c-0.857-0.818-0.135-1.604,0-2.628c-1.054-1.166-2.328,0.606-3.065-0.876
+		c-0.381-1.695,1.069-1.558,1.313-2.628c0.13-1.151-1.699-0.345-1.313-1.751c0.759-1.577,2.284-2.388,3.941-3.066
+		c-0.67-1.393-0.153-1.927,0-3.504c-1.629-0.461-0.859,1.477-1.752,1.752c-3.481-1.85,1.529-5.081,2.628-6.569
+		c-3.245-0.033-3.652,2.771-6.131,3.503c0.177-3.911,3.676-4.499,7.007-5.255c-0.142-2.778-2.977-2.863-3.504-5.256
+		c-2.838,0.309-1.098,2.521-0.876,4.38c-2.871-0.779-2.487-4.812-3.941-7.007c-1.579,1.195-1.004,4.543-2.19,6.131
+		c-1.773-0.417-1.812-2.568-1.752-4.818c-1.551-0.237-1.077,1.551-2.628,1.314c-0.603-0.564-0.433-1.902-0.438-3.065
+		c-0.895-1.04-1.733,0.602-2.627-0.438c-0.334-7.78,6.771-8.12,12.263-10.073c-0.413-3.479,1.101-5.031,3.941-5.256
+		c-2.435-3.938-4.608,4.216-7.445,2.628C144.289,6.494,146.703,6.426,146.719,3.96z M156.354,10.092
+		c0.086-1.254,0.054-2.391-1.314-2.19C154.954,9.156,154.986,10.292,156.354,10.092z M199.713,13.157
+		c1.62,0.306,1.935-0.693,1.751-2.189c-0.438,0-0.875,0-1.313,0C200.513,12.206,199.534,12.102,199.713,13.157z M154.603,13.595
+		c-1.25-0.794-1.79-2.298-4.38-1.751C149.541,14.294,153.303,14.581,154.603,13.595z M191.392,12.282
+		c0.288,1.61,1.615,2.181,2.628,3.065c0.419-0.895,0.895-1.733,1.314-2.628C194.197,12.389,192.437,11.365,191.392,12.282z
+		 M161.172,13.157c-1.093,1.071-1.665,2.123-0.438,3.504c2.349-0.133,3.212-1.751,6.132-1.314
+		C167.052,11.884,162.584,15.348,161.172,13.157z M170.807,17.537c0.47,1.136,1.904,1.308,2.19,2.628c-1.168,0-2.336,0-3.503,0
+		c0.099,3.603-6.252,0.756-5.694,4.817c2.736-2.486,7.043-3.034,11.387-1.752c-0.598-3.225,0.957-4.298,1.752-6.131
+		c-0.624-1.128-1.026-2.478-2.628-2.628c-0.602,0.999,1.129,1.646,0,1.752c-1.508-0.828-2.134-2.538-3.942-3.066
+		C171.015,15.585,171.797,14.824,170.807,17.537z M190.516,17.975c1.324-0.281,2.527-0.684,2.627-2.19
+		c-4.343,0.84-4.982-2.025-7.883-2.628C185.757,16.018,188.435,16.698,190.516,17.975z M197.523,15.347
+		c1.368,0.201,1.4-0.936,1.314-2.19c-0.438,0-0.876,0-1.314,0C197.523,13.887,197.523,14.617,197.523,15.347z M156.792,18.413
+		c0.73,0,1.46,0,2.189,0c0-0.584,0-1.168,0-1.752c-0.729,0-1.459,0-2.189,0C156.792,17.245,156.792,17.829,156.792,18.413z
+		 M163.8,18.413c-1.864-0.258-3.067,0.145-2.628,2.19c3.203-0.447,5.635-1.665,8.759-2.19
+		C169.603,15.224,164.612,16.939,163.8,18.413z M192.706,19.727c0.922-0.393,2.614-0.014,2.19-1.752
+		C193.613,18.006,192.426,18.134,192.706,19.727z M157.23,21.917c1.277,0.644,1.277-1.958,0-1.314
+		C157.23,21.041,157.23,21.479,157.23,21.917z M157.668,29.8c-0.292,0-0.584,0-0.876,0c0.542-1.21,1.279-2.225,1.313-3.942
+		c-2.541-0.789-1.716,1.788-3.065,2.19c-0.759-1.49,0.552-3.096-0.438-4.818c-1.08-0.058-2.11-0.066-2.628,0.438
+		c1.317,2.917,1.075,7.393,5.694,7.008c0.814-1.521,2.642-2.029,3.065-3.942C157.935,26.123,157.882,29.096,157.668,29.8z
+		 M187.45,26.296c1.208-0.397,3.076-0.136,3.941-0.876c-2.058-0.278-2.285-2.386-4.817-2.19
+		C186.29,24.829,186.869,25.563,187.45,26.296z M172.559,27.61c0.438,0,0.876,0,1.314,0c0.057-0.786-0.435-1.025-1.314-0.876
+		C172.559,27.026,172.559,27.318,172.559,27.61z M163.8,28.048c0.654,0.695,2.497,0.641,2.19-0.876
+		C164.903,27.108,163.864,27.091,163.8,28.048z M167.304,35.056c-0.194-0.828,0.596-2.639-0.876-2.189
+		C166.363,33.952,166.346,34.991,167.304,35.056z M175.187,33.304c-0.082-0.649-1.059-0.402-1.752-0.438
+		C172.5,34.477,175.666,34.842,175.187,33.304z M165.114,44.253c-0.814,0.354-1.77,0.566-2.19,1.313
+		c-1.338-0.414-1.373-2.131-3.066-2.189c0.114,4.266,3.725,5.035,5.694,7.445c1.125-3.488,3.467-9.999,0-12.263
+		c-0.17,1.144-0.225,2.403-0.876,3.066c-1-0.898-0.806-2.99-2.628-3.066c-0.292,0-0.584,0-0.876,0
+		C160.703,42.241,164.008,42.147,165.114,44.253z M170.369,41.188c0.292,0,0.584,0,0.876,0c0-0.584,0-1.168,0-1.752
+		c-0.292,0-0.584,0-0.876,0C170.369,40.02,170.369,40.604,170.369,41.188z M176.939,42.939c-0.022-1.73-0.898-2.606-2.628-2.628
+		C173.902,42.473,174.778,43.348,176.939,42.939z M156.354,43.377c0.343-0.304,0.975-2.444,0-2.628
+		C156.011,41.053,155.379,43.193,156.354,43.377z M168.18,42.063c-0.124,1.145,0.16,1.884,1.314,1.751
+		c-0.18-1.055,0.8-0.952,0.438-2.189C169.104,41.527,168.965,42.119,168.18,42.063z M151.975,43.815
+		c1.115-0.053,1.698-0.637,1.752-1.751C152.355,41.86,151.771,42.444,151.975,43.815z M173.873,44.253
+		c0.266-1.727-0.98-1.94-2.19-2.19C171.933,43.273,172.147,44.52,173.873,44.253z M185.26,51.699
+		c0.203-1.371-0.381-1.955-1.752-1.752C183.659,50.964,183.792,51.999,185.26,51.699z M190.954,53.451
+		c-0.833,0.918-3.249,0.255-2.627,2.627c1.905,0.007,3.94,0.145,5.255-0.438c0.006-3.072-2.865-3.267-3.504-5.693
+		c-0.583,0-1.167,0-1.751,0C188.14,51.884,188.893,52.574,190.954,53.451z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M271.978,31.552c-0.497,2.867-6.457,2.586-4.817,6.131
+		c-1.684,4.142-8.51,0.495-10.074,4.818c-1.336-4.116,3.678-5.661,5.694-7.884C267.043,36.693,268.906,33.03,271.978,31.552z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M242.634,199.732c-0.625,0.155-1.496,2.231-0.438,2.628
+		c-0.705,0.957-1.441-1.741-1.314-3.066c-1.469,0.138-1.228,1.984-1.314,3.504c3.888,3.119,8.573,5.442,13.577,7.445
+		c0.254,3.688,2.218,5.666,2.628,9.197c-0.892,0.568-2.638,0.282-2.628,1.752c-2.334-1.069-5.103-3.39-3.503-7.007
+		c-3.791-3.801-8.431-6.753-14.891-7.884c0.403-3.977,3.285-5.475,3.066-10.073c-1.444,0.016-1.674,1.245-1.752,2.628
+		c-0.975-1.653,0.679-4.113-2.19-4.38c-1.299,1.621-1.101,4.738-2.189,6.569c-1.797,0.201,0.178-0.936-0.438-2.189
+		c-1.797,0.831-2.214,3.041-3.066,4.817c-0.81-0.065-0.269-1.482-0.876-1.752c-0.641,0.381-1.388,0.656-1.314,1.752
+		c-0.692-0.768-0.586-2.333-0.876-3.504c-1.128,0.478-2.105,1.107-2.628,2.19c0.719,3.807,2.618,6.434,4.38,9.197
+		c-0.805,2.586-1.673,7.34,0.438,9.197c-1.86,2.102-6.179,1.179-6.569-2.628c-0.207-1.375,1.179-1.157,1.313-2.189
+		c-0.394-0.774-1.057-1.279-1.313-2.19c0.107-1.352,0.444-2.476,0.876-3.504c-0.417-2.503-1.675-4.164-2.628-6.131
+		c-1.648-1.429-4.35-2.597-3.504-5.256c3.931-0.157,6.807-1.369,9.197-3.065c-0.539-1.943-1.961-3.003-2.19-5.256
+		c-1.029,0.431-0.727,2.192-2.189,2.189c0.314-2.167,0.601-4.362,0.438-7.007c-0.563-1.226-0.906,1.379-2.19,0.875
+		c0.38-1.809,1.371-3.008,1.752-4.817c-1.277-1.052-1.111-0.033-3.066-1.313c0.059-1.693,1.776-1.728,2.19-3.066
+		c-0.301-2.618-1.685-4.154-4.38-4.379c0.373-0.65,1.102-0.942,2.19-0.876c0.128-1.588-2.961,0.041-2.19-2.19
+		c-1.577,0.154-2.111,0.67-3.503,0c1.027-1.727-0.825-1.339-0.876-3.065c0.584,0,1.167,0,1.751,0
+		c-0.781-1.623-2.167-3.744-1.314-5.693c2.554-0.046-0.124,2.433,1.752,3.065c1.245,0.076-0.529-2.865,1.314-2.189
+		c0.452,5.096,7.351,3.744,7.008,9.635c9.82-3.465,12.807-13.763,22.774-17.08c1.667-1.253,2.379-3.462,3.942-4.818
+		c4.98-0.891,8.575-5.918,14.015-2.628c2.439-2.318,8.561-0.412,10.511-2.189c4.848,2.452,9.577,5.021,13.577,8.321
+		c-0.659-4.332,0.976-8.135,3.941-7.445c-0.129,2.818,1.129,4.826-0.875,6.132c3.074,1.427,4.519-2.206,4.379-4.38
+		c0.476,0.108,0.298,0.871,0.876,0.876c5.014-2.462,4.896-12.26,0.876-15.767c4.215,1.877,6.203,5.77,5.693,10.511
+		c-0.573,5.341-5.343,9.655-7.445,12.701c4.557-2.128,11.695-7.419,10.949-14.891c1.962,0.678,1.849,3.461,1.752,4.817
+		c-0.454,6.397-9.093,11.531-12.701,15.329c0.571,1.181,3.232,0.271,3.504,1.752c-0.78,4.278-8.855-1.29-8.321,3.941
+		c-6.165,1.426-6.34,8.843-14.015,8.759c-1.507-1.086-2.994-4.153-4.818-3.503c-1.729,2.475,1.452,3.792,2.19,5.255
+		c0.978,2.344-1.803,2.734-2.19,4.818c-0.262,1.414,0.742,3.058,0.438,4.379c-0.609,2.654-2.707,4.022-4.38,5.694
+		c-1.036,0.118-1.381-2.65-2.628-0.876c-1.18-0.519,0.002-2.284,0-3.066c-2.826,0.999-2.068,4.051-5.255,4.818
+		c-2.058,0.495-5.24-1.079-7.445-0.438c0.823-1.51,0.823-1.117,0-2.628c1.461,0.002,1.495-1.425,3.066-1.313
+		c1.773-0.168,2.016,1.196,3.065,1.752c1.37-1.259,1.496-3.76,3.941-3.942c0.842-2.752,2.589-5.943-0.438-7.883
+		c-0.999,0.607-0.163,3.049-0.438,4.38c-1.188-0.855-0.922-3.165-2.189-3.942c-1.178-0.302-0.847,0.905-1.314,1.314
+		c-1.497-0.84-2.089-2.583-3.066-3.942c-1.681,2.275-1.441,5.646-1.751,8.322c-1.181-1.484-2.094-0.487-2.19,1.313
+		c-0.902-0.12-0.412-1.632-1.314-1.752c-1.874,0.651-0.384,2.167-0.438,3.504c-0.131,3.227-0.966,7.258-1.752,10.073
+		c-1.228-0.7,0.615-1.972,0-3.504c-3.69-0.275-2.069,5.832-0.876,7.008C244.293,202.406,242.783,200.639,242.634,199.732z
+		 M212.852,169.95c0.024-0.56,0.562-0.606,0.438-1.313c-0.292,0-0.584,0-0.876,0C211.924,169.267,211.942,169.705,212.852,169.95z
+		 M268.913,163.819c-0.699-0.324,0.1-2.145-1.314-1.752c0.441,1.306-0.595,2.467,0,4.817c-0.519-0.129-1.654-1.764-2.189-0.438
+		c0.857,0.895,0.764,2.74,2.189,3.066c1.026-1.602,3.61-1.646,5.256-2.628c-0.311-2.354,0.499-3.588,0.876-5.256
+		c-0.708-0.752-1.832-1.088-3.504-0.876C269.93,161.917,269.537,162.983,268.913,163.819z M267.161,180.023
+		c1.412-2.036-1.537-4.541-3.504-3.065C265.038,177.766,265.323,179.671,267.161,180.023z M267.161,184.841
+		c0.553-3.187-4.119-0.518-3.942,2.627C265.752,187.13,266.914,186.261,267.161,184.841z M224.677,193.163
+		c0.025-0.268,0.065-0.519,0.438-0.438c-0.049-0.534-0.131-1.037-0.876-0.876C224.308,192.364,224.164,193.091,224.677,193.163z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M406.434,226.01c0.027,2.654-4.04,1.215-3.504,4.379
+		c3.098,1.482,4.125-2.875,6.569-3.503c1.448,0.656-0.91,1.07-0.438,2.189c0.931,0.76,1.915-2.153,3.941-1.752
+		c-0.154,0.575-0.771,0.688-0.876,1.313c0.244,1.781,2.021,0.124,3.066,0c0.731-0.086,1.899,1.62,2.189-0.875
+		c1.238-0.362,1.135,0.617,2.189,0.438c0.595-0.136,0.363-1.097,0.438-1.752c2.128-0.229,1.934,1.862,3.941,1.752
+		c1.448-0.657-0.91-1.071-0.438-2.189c1.116,1.123,2.124-0.099,2.628-0.876c1.936,0.607,3.827,0.521,5.255-0.438
+		c2.242,2.857,7.019,1.065,10.073,3.504c0.656-1.836-4.089-2.033-5.255-3.504c2.5-0.827,7.044,2.212,9.197,1.752
+		c-0.912-0.548-1.848-1.072-2.628-1.752c1.895-1.004,4.238,1.299,6.131,1.752c1.077-1.128-0.468-2.104-1.313-2.628
+		c1.785-1.184,2.601,2.35,4.817,2.19c1.312-0.288-0.419-0.937,0-1.752c1.881,0.601,2.884,2.08,4.818,2.628
+		c1.454-0.927-1.315-1.272-0.876-2.628c2.755,1.186,4.79,3.093,7.007,4.817c0.61-2.654-2.081-2.006-1.752-4.38
+		c2.578,0.78,3.146,3.569,5.694,4.38c0.396-2.294-2.148-1.648-1.752-3.941c1.773-0.168,2.016,1.195,3.065,1.752
+		c0.595-0.136,0.363-1.097,0.438-1.752c2.213-0.022,2.26,2.12,3.942,2.628c1.335-0.536-0.641-1.672,0.438-2.19
+		c0.786-0.056,0.924,0.536,1.752,0.438c0.978-0.064-0.568-1.104,0-2.19c2.561,1.757,5.07,0.861,6.569,3.504
+		c1.219-2.602,2.429-0.224,3.942,0.438c0.677-0.637,0.919-1.709,0.876-3.066c2.546,2.723,3.862-0.81,5.693,2.628
+		c1.955,0.058,2.831-0.964,3.941-1.752c1.896-0.145,1.078,2.426,3.066,2.19c1.317-0.611-0.911-2.268,0.438-3.066
+		c2.162,0.697,5.633,4.799,7.884,1.314c1.597,0.331-0.042,1.397,0.438,3.065c1.209-0.104,0.999-1.629,1.752-2.189
+		c2.327,1.413-0.841,5.63,2.19,6.131c-2.127,2.254-1.105,7.654-2.628,10.512c-6.839-0.245-13.468,0.442-20.146,0.438
+		c-6.639-0.005-14.155-0.403-20.147,0c-0.693,0.047-1.209,0.549-1.751,0.876c-4.489-1.065-12.614-2.186-18.396-2.189
+		c-4.05-0.003-8.857-0.099-12.263,0.438c-3.138,0.494-10.821,1.616-15.767,0.876c-1.463-0.219-4.205-0.932-6.569-0.876
+		c-5.352,0.127-10.471-0.243-15.768,0c-3.01,0.139-6.058,0.201-8.759,0.876c-8.603-1.915-15.612-0.372-25.402-0.438
+		c-11.704-0.078-23.855-1.425-36.352-0.438c-0.779,0.062-0.929,0.42-1.752,0.438c-39.377,0.856-81.955,0.876-122.631,0.876
+		c-20.933,0-46.78,0.209-68.761-0.438c-7.199-0.212-13.817-0.595-20.584-0.438c-10.587,0.245-19.693-0.502-31.534,0.438
+		c-1.465,0.116-2.582,0.633-3.942,0.438c-0.35-0.05-1.336-0.854-1.752-0.876c-2.528-0.134-5.872,0.848-8.759,0.876
+		c-3.328,0.032-7.986,0.208-12.263,0c-3.442-0.168-7.514,0.29-10.949,0c-0.188-0.017-0.311-0.829-0.438-0.876
+		c-0.772-0.284-5.423-0.077-7.007,0c-9.199,0.444-22.626,1.819-30.658,1.313c-0.853-0.054-1.268,0.528-1.752,0.438
+		c-1.813-0.337-3.48-1.999-5.255-2.19c0.303-1.373,1.168-0.57,2.189-0.438c2.516-1.96,0.673-5.314,0.438-8.321
+		c-0.353-4.524,0.167-9.365,3.504-10.073c3.711-0.787,4.171,2.378,7.445,3.065c0.945-0.997-0.877-1.696-1.314-2.628
+		c2.404-1.224,3.806,2.317,5.694,3.066c0.351-1.52-0.652-1.684-0.438-3.066c2.324,0.305,2.104,3.151,4.379,3.504
+		c0.404-2.01-1.096-2.116-0.875-3.941c2.653,0.787,2.87,1.59,4.817,2.628c1.557,0.681,0.264-1.488,1.314-1.314
+		c2.435,0.047,1.458,3.507,3.504,3.941c0.979-0.188,0.177-2.158,0.438-3.065c1.678,1.893,3.194,1.229,4.817,3.065
+		c0.234-1.693-0.782-2.138-0.438-3.941c2.084,0.689,1.452,4.096,3.066,5.256c2.071-0.514-0.681-3.499,0.876-4.817
+		c2.852,1.184,0.173,5.364,2.628,6.569c1.145-0.607-0.213-3.717,0.875-4.38c1.298,0.308,0.694,2.518,2.19,2.628
+		c0.97-0.344-0.083-2.711,1.752-2.19c0.677,0.637,0.386,2.242,0.438,3.504c1.245-0.799,0.971-3.116,2.628-3.504
+		c1.448,0.742,1.131,3.249,2.19,4.38c1.317-0.581,0.324-3.472,1.313-4.38c1.232-0.063,1.263,1.073,1.314,2.19
+		c0.39-0.194,0.784-0.385,0.876-0.876c0.984,0.184,0.012,2.324,0.876,2.628c1.623-0.129,0.197-3.307,2.19-3.066
+		c0.219,1.378-0.955,1.713,0,2.628c1.717-0.326,1.659-2.429,3.504-2.628c0.869,0.829,0.212,2.069,0,3.066
+		c1.96,0.062,2.475-1.32,3.941-1.752c0.653,1.078,1.8,0.98,0.876,2.628c1.348,0.326,0.842-1.202,2.19-0.876
+		c0.389,0.778,1.223,1.113,0.876,2.628c2.365,0.612,1.446-2.058,3.066-2.19c0.37,1.83-0.852,2.068-0.876,3.504
+		c1.128,1.076,2.105-0.469,2.627-1.313c1.312,0.288-0.418,0.936,0,1.752c1.336-0.562,1.172-2.624,3.066-2.628
+		c0.504,0.518,0.496,1.548,0.438,2.628c2.532-1.548,7.03-1.326,9.635,0.438c1.269-0.877-1.263-1.622-0.876-3.065
+		c3.713-0.059,5.587-0.93,8.759-0.876c0.595-0.136,0.364-1.097,0.438-1.752c2.614,0.307,3.88,1.96,5.694,3.065
+		c0.994-1.266-2.518-1.437-0.876-3.504c3.342-0.275,4.028,2.104,6.569,2.628c1.351-0.584-0.816-1.947,0.438-2.628
+		c1.965,0.08,2.704,1.385,3.942,2.19c1.393-2.425,2.501-0.146,4.817,0c0.95,0.073,0.199-1.554,0.438-2.19
+		c3.263-0.051,3.733,2.691,6.132,3.504c1.092-0.839-1.504-1.679-1.314-3.065c2.022,0.107,2.929,0.31,4.817-1.314
+		c1.166,0.732,2.162,1.635,4.38,1.314c0.91-0.112,0.12-1.924,0.876-2.19c2.299,0.475,3.334,2.214,5.256,3.066
+		c0.967-0.055,0.186-1.858,0.438-2.628c1.954,0.09,1.539,2.55,3.066,3.065c1.881,0.422,0.768-2.151,2.19-2.189
+		c1.755,0.435,1.875,2.505,2.628,3.941c1.65,0.337,2.093-0.534,3.503-0.438c0.759,2.161,3.786,2.054,6.132,2.628
+		c0.713-2.174-1.524-1.396-1.314-3.066c1.08-0.058,2.11-0.066,2.628,0.438c0.351-1.52-0.652-1.684-0.438-3.066
+		c1.874-0.122,2.166,1.338,4.379,0.876c0.443-2.049-1.756-1.455-1.314-3.504c1.515,0.091,2.331,0.882,3.504,1.314
+		c0.95,0.074,0.199-1.554,0.438-2.189c1.49,0.198,3.326,1.609,4.818,0.438c1.129-0.105-0.602-0.754,0-1.752
+		c1.465,0.433,2.405,1.391,3.941,1.752c1.07-0.279,0.066-2.048-0.438-2.189c2.36-1.759,3.051,1.899,5.256,1.752
+		c1.276-0.614-0.776-1.51-0.438-2.628c3.352-0.433,2.517,3.322,5.255,3.503c0.631-0.239-0.345-2.54-0.438-3.503
+		c3.345-0.279,3.077,3.054,4.818,4.379c1.179-0.518-0.002-2.283,0-3.065c1.847,0.052,2.215,1.58,3.504,2.189
+		c0.95,0.074,0.198-1.553,0.438-2.189c1.824,0.425,2.403,0.142,4.38,0.876c0.903-0.119,0.104-1.939,1.314-1.752
+		c2.169,0.313,2.096,2.867,4.818,2.628c0.967-0.055,0.186-1.857,0.438-2.628c3.688-0.038,2.371,4.929,5.256,5.693
+		c2.197-0.754-1.327-3.585,0.438-5.255c2.229-0.039,1.165,3.215,3.066,3.503c1.587,0.42,0.445-1.89,1.313-2.189
+		c2.61-0.273,0.633,4.039,3.504,3.504c0.651-0.663,0.706-1.923,0.876-3.065c2.254-0.064,1.5,2.879,2.628,3.941
+		c1.568-0.184,0.958-2.546,2.628-2.628c0.258,1.348,0.112,3.1,1.751,3.065c1.155,0.134,1.13-0.914,1.314-1.752
+		c1.932,0.612,2.51,0.312,3.504-0.876c2.777,2.087,4.707-0.102,7.883,1.752c0.91-0.112,0.12-1.924,0.876-2.189
+		c2.546,0.665,3.957,2.467,6.57,3.065c1.058-1.186-1.356-1.557-0.876-3.504c3.786,0.886,4.573,4.771,9.197,4.818
+		c-0.5-2.565-3.965-2.166-3.942-5.256c0.981,0.479,2.194,0.726,3.066,1.313c0.594-0.135,0.363-1.096,0.438-1.751
+		c1.922-0.024,2.347,1.448,3.941,1.751c1.249-0.995-1.49-1.691-0.875-3.503c2.084-0.188,2.711,1.084,3.503,2.189
+		c1.448-0.657-0.91-1.071-0.438-2.189c2.622,0.005,2.854,2.401,4.38,3.503c1.392-1-0.566-2.318-0.438-3.503
+		c2.581,0.193,4.227,1.32,7.446,0.876c-0.068,1.089,0.688,1.355,0.876,2.189c0.985-0.182-0.066-2.401,1.313-2.189
+		c2.232,0.249,1.463,3.5,3.941,3.503c1.272-1.019-0.822-2.359-0.438-3.941c2.979-1.008,4.425,0.748,4.817-0.438
+		c2.603,1.138,0.209,4.58,2.628,5.693c1.277-0.749-0.992-1.594-0.438-3.066c1.163,0.443,2.492,0.721,2.628,2.19
+		c1.056,0.179,0.952-0.8,2.19-0.438c-0.522-2.229-3.164-2.729-4.818-2.627c-0.205-3.199,2.562-0.667,4.38-0.876
+		c0.714,2.498,2.973,3.45,4.817,4.817c0.751-2.218-2.041-2.209-0.875-3.504c3.148-0.375,2.546,3.002,5.255,3.065
+		c0.036-2.079-2.304-1.783-2.189-3.941c2.649,0.124,2.979,2.569,5.256,3.065c1.524-1.272-0.959-2.224-1.314-3.065
+		c2.182-1.436,4.871,0.373,6.569,0.876c0.95,0.074,0.199-1.554,0.438-2.189c2.506-0.316,1.874,2.506,4.38,2.189
+		c1.421-0.759-1.138-1.147-0.438-2.628c2.039-0.141,2.438,1.358,3.942,1.752c1.284-0.372-0.57-1.103,0-2.189
+		c3.03-0.257,3.092,2.455,4.817,3.503c0.979-0.188,0.177-2.158,0.438-3.065c2.717,0.787,2.749,4.259,5.256,5.256
+		c1.756-1.928-1.813-2.255-1.313-4.38c1.722-1.765,3.271-0.912,4.817,0.438c1.05,0.173-0.243-1.995,1.313-1.314
+		c0.764,2.011,1.373,4.175,3.066,5.256c0.185-2.643-2.215-3.868-0.438-5.693c1.207,1.037,1.292,2.223,3.504,1.313
+		c0.084,1.96,0.63,3.458,1.752,4.38c0.984-0.973-1.284-3.656,0.438-4.38c1.148,0.081,1.822,2.542,2.628,0.438
+		c1.124,0.044,0.704,1.632,1.314,2.189c2.111,0.359,0.855-2.647,2.628-2.628c-0.255,1.714,0.376,2.543,0.876,3.504
+		c1.15-0.31,0.864-2.056,1.751-2.628c0.95-0.073,0.199,1.554,0.438,2.189c1.636,0.469,1.248-1.087,2.628-0.876
+		c0,1.606,0,3.212,0,4.818c2.088-0.979,1.512-4.62,3.941-5.256c0.097,1.41-0.774,1.854-0.438,3.504
+		c1.613-0.431,1.72-2.368,3.941-2.19c-0.34,0.391-0.471,0.989-0.438,1.752c1.752,0.141,1.762-1.883,1.752,0.876
+		c1.742-0.382,2.2-0.382,3.942,0c0.146-1.721-2.729-1.87-1.314-3.504c2.15,0.04,1.953,2.428,3.942,2.628
+		c1.429-0.993-1.382-2.9,0-3.941c2.04,0.149,1.892,2.487,3.065,3.504c1.482-0.945-0.898-3.032,0.438-3.941
+		c1.78-0.175,1.348,1.863,2.628,2.189c1.04-0.274-0.067-2.696,0.876-3.065c1.408,0.928,1.209,3.463,3.066,3.941
+		c0.789-0.57-0.55-2.367,0.438-3.504c1.819,0.225,1.584,2.504,2.628,3.504c0.651-0.663,0.705-1.922,0.876-3.065
+		c1.968,1.287,2.411,1.287,4.38,0c-0.186,0.915,0.3,1.159,0.438,1.751c1.763,0.303,1.076-1.844,2.628-1.751
+		c0.34,0.974,0.253,2.374,1.313,2.627c0.976-0.922,0.378-3.418,2.19-3.503c-0.192,1.505,0.173,2.454,0.438,3.503
+		c2.053-0.283,1.741-2.931,3.066-3.941c0.993,0.466,0.167,2.753,0.438,3.941c2.031-0.45,2.406-2.557,3.942-3.503
+		c1.284,0.372-0.57,1.102,0,2.189c1.601-0.005,2.346-0.865,3.065-1.752c1.087,1.401-1.179,3.185-0.438,5.693
+		c1.706-0.441,0.068-1.507,0.438-3.065c1.182-1.592,3.599-1.949,4.38-3.941c2.021,0.326-1.521,1.731-1.314,3.065
+		C403.233,229.508,404.536,226.313,406.434,226.01z M266.722,230.389c0.205-2.103-1.405-2.39-2.628-3.065
+		C262.958,228.888,265.497,229.806,266.722,230.389z M271.102,229.952c-0.584,0-1.168,0-1.752,0
+		C268.587,231.92,271.25,231.11,271.102,229.952z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M202.779,48.195c-0.045,1.56-2.21,1.002-2.189,2.628
+		c1.376,1.396,3.028-1.134,4.379,0c0.975,1.317,0.517,1.528,0.438,3.504c5.121,1.11,10.707-4.26,15.767-0.876
+		c-0.131,1.183-1.843,0.785-2.19,1.751c0.213,1.477,3.492,1.444,2.19,3.066c-5.227,0.847-4.448-4.312-9.198-3.941
+		c-0.339,0.978,2.188,1.561,0,1.751c1.274,3.225,8.817,2.116,7.446,6.57c-1.654,0.193-2.056-0.864-3.066-1.314
+		c-0.988,0.326-0.171,2.457-0.438,3.503c-2.894,0.12-3.323-2.225-4.379-3.941c0.42-0.748,1.375-0.96,2.189-1.314
+		c-0.749-1.314-1.594-0.486-3.065-0.438c-1.498,0.901-0.235,2.284-0.876,3.504c-1.551,0.237-1.077-1.551-2.628-1.314
+		c-0.966,0.639-0.348,2.864-1.314,3.503c-2.069-0.704-2.297-3.25-2.19-6.131c-2.849,0.959-3.369-0.743-5.255-1.752
+		C199.301,54.428,199.015,47.497,202.779,48.195z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M400.741,77.101c0-0.438,0-0.875,0-1.314c1.88-1.355,2.036-0.014,4.38,0
+		c4.609-2.106,9.181-4.25,12.263-7.883c-4.901-1.324-7.221,6.165-13.139,2.628c-0.054-2.097,1.459-2.628,3.503-2.628
+		c0.257-1.538-2.069-1.44-0.876-2.627c0.354-0.377,1.2-0.261,1.314-0.876c2.248,0.087,2.756,1.915,3.941,3.065
+		c1.567-1.206,4.693-0.854,7.445-0.876c4.539-3.337,7.935-8.786,12.701-11.825c2.155-1.374,5.119-2.166,7.884-3.503
+		c3.757-1.819,8.784-4.441,15.329-4.38c2.984,0.028,4.976,0.828,7.007-1.314c0.679-0.715,1.924-2.631,2.628-3.941
+		c2.023-3.764,2.231-6.206,6.569-8.759c2.575-1.516,3.013-2.706,6.132-4.38c2.285-1.226,4.462-2.063,7.445-3.066
+		c5.188-1.744,10.573-0.727,19.271-0.876c-0.567-1.476-2.56-1.528-3.503-2.627c-4.838,1.447-9.038-2.187-7.446-7.008
+		c2.104-0.207,1.967,1.83,3.066,2.628c1.931-0.113,2.117-1.971,2.628-3.504c1.681,1.968,4.161,3.138,5.693,5.256
+		c-0.562,0.752-2.619,0.009-2.628,1.314c2.412,4.693,9.141,0.728,12.701,0c2.234,5.455-6.852,2.963-7.445,7.007
+		c0.858,1.185,4.354-0.267,5.255,0.876c-0.11,1.787-2.396,1.399-3.065,2.628c0.521,1.669,1.164,3.215,1.752,4.817
+		c1.876,0.27,1.786-1.426,3.504-1.314c2.244,3.341-1.265,6.74,0,10.073c-2.404,0.728-3.367-3.082-6.132-2.189
+		c-0.41-2.6,1.196-3.184,1.752-4.818c-0.007-1.599-1.245-1.967-1.752-3.066c-1.842-0.09-1.84,1.665-3.504,1.752
+		c-0.056-3.01-2.23-3.901-4.817-4.379c0.924-2.726,5.218-2.082,6.132-4.818c-2.741-0.696-7.596,2.134-11.388,0.438
+		c-1.333,0.273-2.239,0.973-2.189,2.628c-4.299,0.91-7.538,3.375-10.512,5.693c-1.899,1.481-3.468,3.23-4.817,5.256
+		c1.6,4.693-2.311,6.803-2.189,11.387c5.797,0.456,11.379,4.591,15.767,7.883c8.98-0.075,14.598,3.213,16.643,10.073
+		c1.054,1.867,4.148,1.691,5.256,3.504c-2.023,1.169-2.085,3.037-2.19,5.255c-1.695,0.236-1.803-1.116-3.065-1.314
+		c-0.894,0.566-0.796,2.124-2.628,1.752c-0.971-1.949,0-5.839-0.876-7.883c1.08,0.058,2.11,0.066,2.628-0.438
+		c-1.958-6.071-6.947-9.111-14.453-9.635c0.645,3.341,3.023,4.55,3.066,7.883c0.044,3.411-2.84,6.576-2.628,10.511
+		c0.126,1.626,2.317,1.187,2.189,3.066c-1.146,1.044-3.89,0.489-4.817,1.752c1.077,2.058,3.449,2.051,4.817,3.941
+		c0.744,1.028,0.275,2.885,1.752,3.504c-0.754,2.687,1.624,3.964,0.438,5.693c-1.998,0.538-1.384-1.536-2.628-1.751
+		c-1.119,0.049-0.869,1.466-0.876,2.627c-1.427-1.017-2.276,1.432-3.941,0c-0.236-1.987,0.88-2.624,1.313-3.941
+		c-0.009-1.305-2.066-0.562-2.628-1.314c0.979-2.086,3.829-2.303,4.817-4.38c-0.604-2.023-2.8-2.456-5.693-2.19
+		c-0.945-1.829-2.215-3.333-4.817-3.503c0.101-1.506,1.303-1.909,2.628-2.19c-0.861-1.564,0.137-2.404,1.313-3.066
+		c2.188-0.437,2.144,1.36,3.941,1.314c1.422-0.33,1.045-2.459,1.752-3.504c-2.156,0.437-5.51,0.153-7.883-0.438
+		c-0.562-1.729,1.275-1.06,1.313-2.189c0.188-1.209-1.633-0.411-1.752-1.314c0.011-2.326,3.823-0.849,5.256-1.752
+		c1.229,1.106,0.365,4.307,2.628,4.38c2.24-1.707,2.314-5.401,1.752-7.446c-0.316-1.15-2.211-3.675-3.504-5.255
+		c-1.831-2.239-4.157-3.343-7.445-5.256c-2.989-1.739-4.783-3.147-9.197-2.19c-2.198,3.934-4.021,8.243-7.008,11.387
+		c1.627-0.271,2.004-1.792,4.38-1.314c0.37,1.966,0.938,3.734,0.876,6.132c-2.342-0.152-2.233,2.146-3.941,2.628
+		c0.177-2.951-3.836-1.712-5.694-2.628c-0.561-1.729,1.276-1.06,1.314-2.19c-2.892,0.583-6.399,6.581-4.817,10.511
+		c1.061,0.317,5.184-3.232,6.131,0.438c0.42,1.587-1.891,0.445-2.189,1.314c0.229,1.376,0.769,2.443,1.313,3.504
+		c0.185,1.499-1.312,1.316-1.752,2.189c0.045,1.351,1.497,4.44-0.876,4.38c-1.587,0.419-0.445-1.891-1.313-2.19
+		c-2.026-1.185-3.187-3.237-6.569-3.066c0.986-2.079,2.444-3.687,4.817-4.379c0.207-1.847-1.194-2.768-1.313-4.38
+		c-0.273-3.667,2.274-6.354,3.941-8.759c8.653-4.486,11.367-14.911,15.329-24.088c0.204-1.373-1.102-1.235-1.752-1.752
+		c4.216-6.149,8.881-11.85,16.643-14.453c-2.689-0.493-8.166,0.004-9.636,2.19c-4.687,0.13-6.477,3.159-9.635,4.817
+		c-2.364,4.351-6.941,6.49-7.445,12.701c-1.923,1.143-3.523,2.608-4.818,4.38c-0.369,1.83,0.852,2.068,0.876,3.503
+		c-3.983,9.301-10.465,16.105-17.519,22.336c3.068-0.312,5.352-0.581,7.445,0.876c-0.17,1.874-2.001,2.086-3.941,2.19
+		c-1.22,1.271,1.438,1.136,0.876,3.066c-3.603-0.683-1.604,4.235-3.941,4.817c-2.378,0.334-2.059-2.029-3.066-3.066
+		c-2.388-0.49-1.515,2.281-3.065,2.628c-2.885-1.155-0.416-5.54,0.438-7.007c-3.932,0.833-7.064,4.641-12.7,5.693
+		c-1.768,0.33-4.368,2.398-7.446,2.19c-0.132,1.592,2.336,0.585,3.066,1.314c0.122,1.583-1.918,1.001-2.628,1.752
+		c0.708,1.774,2.782,2.181,3.065,4.379c-0.637,0.644-2.866,0.644-3.504,0c-1.451,0.008-0.444,2.476-1.313,3.066
+		c-2.113-0.515-2.247-3.008-5.693-2.19c-0.718-2.907,1.216-3.163,1.313-5.255c-0.759-1.228-1.147-0.412-2.628-0.438
+		c0.006-0.87,1.195-0.557,0.876-1.752c-4.249,1.494-9.336,3.318-14.453,2.628c1.062,2.997,2.124,6.967-0.438,9.197
+		c-1.632,0.464-1.414-0.922-2.189-1.314c-2.126-0.082-1.531,2.557-3.504,2.628c0.135-2.179-2.682-1.407-3.504-2.628
+		c0.652-2.851,4.368-2.639,4.38-6.131c1.544-0.5,3.751-0.336,4.38-1.752c-8.897-1.466-20.931-0.401-24.965,5.693
+		c-4.205-0.091-5.464-0.828-8.759-1.314c-1.421,0.759,1.138,1.148,0.438,2.628c-2.616,0.304-5.091,0.749-5.256,3.504
+		c-2.149,0.398-1.668-1.835-3.503-1.752c-1.859,0.355-4.679,1.816-6.132,0c0.859-2.499,3.778-2.937,5.693-4.38
+		c0.382-0.899-2.229-0.874-0.876-1.313c3.349-4.012,12.192,1.502,17.957,1.313c3.773-6.542,17.099-8.191,25.84-5.693
+		c1.09,0.067,1.355-0.688,2.189-0.876c1.397-0.375,1.355,0.689,2.19,0.876c1.22-1.389,3.173-0.796,4.817-1.314
+		c1.545-0.486,2.659-1.585,3.941-1.752c4.428-0.575,7.748,0.514,11.825-0.876c9.517-3.243,21.17-8.741,27.593-15.767
+		c0.522-0.572,0.752-1.567,1.313-2.19c2.881-3.193,6.511-8.142,8.321-13.139c0.031-1.491-1.288-1.631-2.189-2.189
+		c0.423-1.913,2.251-2.421,3.065-3.942c-1.814-1.441-5.205-1.375-8.321-0.876c-7.782,1.246-14.904,5.756-20.146,9.197
+		c-2.229,2.734-5.611,4.316-7.008,7.883c-3.958,1.901-7.935,5.282-12.263,7.884C408.218,76.033,404.736,78.847,400.741,77.101z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M203.217,95.496c2.261,1.996-1.685,4.51-2.627,6.131
+		c0.456,2.172,3.206,2.05,4.817,3.066c4.017,6.494,10.779,10.243,16.205,15.329c0.014,2.901,1.385,4.713,0.875,7.007
+		c-1.159,5.225-10.119,7.757-15.329,6.132c-2.948,1.578-4.709,4.342-7.007,6.569c0.051,5.016-1.28,8.647-3.942,10.949
+		c1.605,4.281-2.534,6.086-2.19,10.512c-1.258,0.056-2.08,0.548-1.752,2.189c-1.17,1.165-3.223,1.448-3.065,3.941
+		c3.459,1.105,6.324-4.619,9.635-1.751c1.13,0.979,3.107,5.186,3.065,6.569c-0.059,1.976-1.526,2.208-2.627,4.379
+		c-1.237,2.439-2.699,6.874-3.066,9.636c-0.305,2.296,0.224,4.32,0,7.008c-5.028,3.293-6.065,10.577-10.073,14.891
+		c-1.558-0.193-1.918-1.586-3.066-2.189c-1.271,0.334-1.136,2.075-3.066,1.751c-2.659-3.201-4.846-11.494-0.438-14.452
+		c2.139-0.051,4.615,0.235,6.131-0.438c0.404-2.01-1.096-2.116-0.876-3.941c3.016-1.984,6.765-5.449,6.131-9.636
+		c-2.498,0.568-3.705,2.427-5.255,3.942c-3.119-0.491-4.285,0.97-6.131,1.752c-0.802-1.242-3.29-0.799-4.818-1.314
+		c-0.589-2.915-0.421-6.587-3.066-7.445c-0.352,0.231-0.711,0.457-1.314,0.438c-1.485,2.231,0.508,4.736,1.314,6.132
+		c0.392,9.59-7.533,10.862-10.511,17.081c-6.785,2.445-8.274-3.912-13.139-4.817c0.742-3.347,4.373-3.804,6.57-5.694
+		c1.019,0.978,3.296,1.181,4.817,0.438c0.327-3.101-2.101-3.446-1.751-6.569c-6.873-5.207-14.354,1.552-19.709,4.379
+		c-3.019-1.244-7.128-2.142-8.321,1.314c1.485,1.972,4.384,0.484,6.57,0.438c5.066-0.107,8.48-0.073,10.511,3.504
+		c0.596,5.828,3.154,9.693,3.503,15.767c-1.982-0.062-2.292-1.795-4.379-1.751c-1.638,1.202,1.43,2.851,0,3.941
+		c-3.04,1.475-10.104-3.76-10.511-6.132c-0.496-2.884,1.568-3.665,3.065-6.132c-0.362-1.626-1.534-0.095-2.189,0.438
+		c-6.182-4.015-17.872,2.775-23.65-0.876c0.227-3.715,1.879-6.005,2.19-9.636c-3.196-0.13-3.426,2.706-3.942,5.256
+		c-0.854,2.519-3.193,2.989-3.066,5.256c0.233,4.15,8.028,6.535,11.825,7.884c2.403,6.485,0.772,13.706,0.876,21.897
+		c-1.564-0.625-2.737-1.642-4.379-2.189c-0.659,1.239-0.272,3.523-1.314,4.38c-1.607-5.108-8.415-5.017-7.008-13.14
+		c0.93-1.26,3.571-0.809,3.504-3.065c-1.162-1.869-2.456,0.174-3.942,0.438c-0.307-1.913,0.745-2.467,0.438-4.38
+		c-2.179-4.245-10.662-2.186-14.015-5.256c-1.859-0.107-2.358,1.146-4.38,0.876c-0.087-1.55,0.559-2.667-0.876-4.38
+		c4.054-3.392,6.253-8.638,9.197-13.139c-0.705-1.814-2.614-3.635-4.379-3.065c-1.137-2.701-2.639-4.994-3.942-7.884
+		c-1.611-3.572-3.114-7.203-3.504-12.263c-0.313-4.061-0.296-7.667-2.627-10.512c-1.567-10.202,9.119-8.128,10.511-14.453
+		c0.481-2.188-1.023-4.409-1.314-5.693c-1.202-5.301-1.727-9.776-5.694-12.701c-8.845-6.523-20.429,1.577-26.278,8.321
+		c-0.184,2.384-0.023,3.415-0.438,4.817c-2.591-1.605,0.977-5.625,0-7.007c-0.692,1.764-2.464,4.141-2.628,6.569
+		c-0.197,2.918,1.55,4.908,1.314,7.008c-3.718-0.817-1.475-6.791-2.628-9.197c-2.003,1.354-1.992,4.723-3.066,7.007
+		c-2.196-2.534,3.046-6.289-0.438-7.445c0.923-2.872,2.91-4.682,4.379-7.007c-0.112-0.91-1.924-0.12-2.19-0.876
+		c1.204-1.736,2.633-2.456,5.256-3.504c1.947-0.778,4.416-2.875,6.131-3.503c0.905-0.332,1.181,0.512,1.752,0.438
+		c1.17-0.151,2.48-1.63,3.066-1.751c12.139-2.512,19.249,4.137,24.526,11.387c0.079,5.118,0.917,7.005,3.065,9.635
+		c0.938,0.59,1.405-0.574,2.628-0.438c0.523,0.059,1.36,0.872,1.314,0.876c1.312-0.119,2.713-1.368,4.379-1.752
+		c5.69-1.311,12.612-0.891,18.833-1.752c5.892-0.816,10.838-2.187,18.395-2.628c2.089-0.122,4.625-0.093,6.131-0.438
+		c2.311-0.53,5.274-2.618,8.322-3.942c2.982-1.295,6.674-2.229,8.759-3.503c3.701-2.262,6.801-6.435,8.321-9.635
+		c-1.68-1.252-2.829,1.055-4.38,1.314c-4.968,0.297-7.253-2.09-10.511-3.504c3.558-3.849,8.968-9.437,15.767-6.131
+		c0.872-0.442,1.871-0.757,2.19-1.752c-1.404-3.122-5.974-3.078-6.132-7.445c2.947,0.994,5.643,2.241,8.759,3.065
+		c1.966-1.641,3.122-1.789,7.884-1.752c1.581,0.012,3.355-0.179,4.379,0c1.828,0.32,2.746,1.477,4.38,1.314
+		C200.482,98.749,201.428,96.961,203.217,95.496z M60.439,123.087c-1.239,2.125-4.73,4.312-4.38,6.569
+		c2.223-2.156,4.458-4.301,6.57-6.569C61.899,123.087,61.169,123.087,60.439,123.087z M63.505,125.715
+		c1.747-0.296,2.455-1.632,3.503-2.628C64.94,123.063,64.52,124.686,63.505,125.715z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M54.746,164.694c1.727-0.559,1.138,1.199,1.752,1.752
+		c3.04,0.318,5.911,0.805,6.57,3.504c1.261,0.053,2.867-0.239,3.503,0.438c0.169,1.629-2.109,0.811-2.19,2.189
+		c-0.284,1.744,2.584,0.336,2.19,2.19c-0.584,0.729-2.481,0.146-3.065,0.875c0.256,2.738-0.394,4.571-1.314,6.132
+		c-0.876,0-1.752,0-2.628,0c-0.847-0.905-1.067-2.437-1.752-3.504c-1.497,0.547-2.042,2.046-1.752,4.38
+		c-0.352-0.231-0.711-0.457-1.314-0.438c0.071,2.557,1.486,3.77,1.314,6.569c-2.114-0.654-1.828,1.092-1.752,2.628
+		c-1.717-0.765-0.063-4.9-1.751-5.693c-1.283,0.614-1.347,2.448-1.314,4.379c-1.052,2.948-5.743,5.635-6.57,8.76
+		c-0.934,3.531,2.066,5.09,6.57,4.38c3.201-0.505,5.649-2.956,7.883-3.942c1.931,0.551,2.812,2.152,2.628,4.818
+		c-1.774-0.631-4.459-1.453-6.57-0.438c-1.743,0.301-1.04,3.048-3.065,3.066c-0.818-0.779,0.355-1.113,0-2.628
+		c-1.888-0.574-0.543,2.085-2.19,1.752c-0.365-2.275-4.967-0.88-6.132,0c-1.133-0.619-2.088-1.416-1.751-3.504
+		c-6.101,1.053-6.632,7.675-6.57,14.891c0.385,1.221,1.759,1.452,3.066,1.752c-0.4,0.768-0.814,1.521-2.19,1.313
+		c0.928,0.44,2.624,1.267,1.314,2.628c-1.283-0.907-2.38-1.999-3.066-3.504c-1.324,0.663,0.363,1.923,0,3.066
+		c-1.963-0.043-2.006-2.571-0.876-3.504c-0.432-2.126-2.642-2.511-4.817-1.752c-0.351-3.596,4.019-0.337,5.255-1.752
+		c0.13-1.882-2.078-1.426-2.627-2.628c0.636-1.298,1.708,0.577,3.065,0c0.304-2.931-1.01-4.245-2.19-5.693
+		c0.772-1.271,2.357-1.73,2.628-3.504c-2.617-1.032-4.996-2.304-7.007-3.941c-2.539-0.203-3.086,1.585-5.694,1.313
+		c-0.743-2.057,2.058-0.57,1.314-2.628c0.074-0.949-1.553-0.198-2.189-0.438c1.286-2.027-1.595-2.482-0.438-4.38
+		c1.021,0,2.043,0,3.065,0c-1.763-3.424-4.55,0.527-6.569-0.438c-0.455,2.216-1.962,3.811-0.438,5.693
+		c-6.047,0.688-5.366-6.777-2.628-9.197c-0.919-3.392,0.628-6.952,2.19-9.197c-4.466-1.396-3.465,6.458-6.569,7.883
+		c-1.017-1.831-0.585-3.229,0-5.255c-1.397-0.376-1.355,0.688-2.19,0.876c-0.166,2.938,0.911,4.637,2.628,5.693
+		c-2.975,3.721-6.597-1.365-5.256-6.132c3.146-4.592,7.791-7.684,11.387-11.825c9.947-2.07,15.847,3.323,14.891,13.577
+		c4.3,2.184,9.061-2.167,13.139-3.065c0.644-1.666-1.958-0.086-1.314-1.752c0.534-0.795,3.85,0.543,3.942-1.752
+		c-0.339-1.589-2.823,1.467-2.628-0.876c2.878-0.188,5.28-0.852,6.132-3.065c2.713-0.061,4.106-1.441,5.693-2.628
+		c-0.364-1.826-3.11-1.27-3.941-2.628c-0.408-1.843-0.133-2.1-0.876-3.941c1.694-0.381,1.558,1.069,2.627,1.313
+		C54.675,166.375,54.885,165.71,54.746,164.694z M19.271,175.206c5.11-0.585,5.417,3.634,8.759,4.817
+		C29.105,176.413,22.714,172.942,19.271,175.206z M17.519,181.775c-0.226,1.565,3.928,1.002,4.379,0.438
+		C21.415,180.784,18.679,181.346,17.519,181.775z M16.643,188.783c2.356,0.166,3.97-0.409,4.38-2.19
+		c-0.841-1.203-2.052-2.036-4.38-1.751C15.846,186.336,16.702,186.945,16.643,188.783z M18.395,191.411
+		c1.961-1.119,3.946-1.941,6.131-1.752C22.997,187.081,18.924,189.118,18.395,191.411z"/>
+</g>
+</svg>
diff --git a/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_the_dynamometer_test.svg b/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_the_dynamometer_test.svg
new file mode 100755
index 0000000000000000000000000000000000000000..215ae85c0ab573a53457fc7b34bd0ba1aae07b5d
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/doc/i/johnny_automatic/johnny_automatic_the_dynamometer_test.svg
@@ -0,0 +1,2508 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="the_dynamometer_test_xA0_Image_1_"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="499.265px"
+	 height="646.488px" viewBox="0 0 499.265 646.488" style="enable-background:new 0 0 499.265 646.488;" xml:space="preserve">
+<g>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M97.68,14.796c0.509,6.252-6.417,4.941-5.34-0.712
+		C95.138,13.74,95.829,13.212,97.68,14.796z M93.764,16.933c0.503,0.538,1.729,1.125,2.492,0.356
+		c0.113-0.826-0.057-1.367-0.356-1.78C94.593,15.389,94.073,16.055,93.764,16.933z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M26.833,17.645c-0.908,2.063-5.635,1.589-7.477,0.712
+		c-1.813-0.014-2.776,0.708-3.916-0.356c0-2.438,2.695-0.803,4.272-0.712C22.166,17.431,25.04,16.913,26.833,17.645z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M278.18,20.137c1.07,0.015,1.034,2.527-0.356,2.136
+		C277.042,21.524,277.75,20.69,278.18,20.137z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M226.913,34.733c-1.974,0.194-1.838-1.722-2.492-2.848
+		c-1.975-3.248-4.232-6.211-7.477-8.188c-1.837,0.816-3.317-0.604-4.984-0.712c-8.521-0.555-15.312,3.974-17.8,11.036
+		c0.93,2.037,3.779,2.154,5.34,3.561c1.936-1.268,2.993-3.416,4.628-4.984c-0.535-1.462-2.729-2.832-1.78-4.628
+		c2.888-0.158,2.139,3.32,3.56,4.628c2.182,0.324,3.42-1.365,5.34-1.424c3.846-0.118,7.307,2.975,8.544,6.052
+		c3.311,0.294,5.264-2.501,8.188-1.424c-1.019,3.135-5.507,2.8-8.188,4.272c-0.778-0.052-0.765-0.897-0.712-1.78
+		c-1.585-0.279-0.701,1.91-2.136,1.78c-1.287,0.337-0.497-1.402-0.712-2.136c-2.683-4.604-10.794-3.36-12.816,1.068
+		c-0.809-0.416-1.065,0.188-1.424-1.068c-2.562,3.891-7.798,1.002-10.324-1.068c-0.775-2.61,0.863-3.262,1.78-4.984
+		c0.336-0.632,0.001-1.421,0.356-2.136c1.408-2.834,5.523-6.595,8.188-7.476c5.287-1.749,12.049-1.591,17.089,0
+		C222.195,26.129,227.526,29.173,226.913,34.733z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M190.6,21.561c0.163,1.112-0.761,1.138-1.78,1.068
+		C188.794,21.562,189.867,20.822,190.6,21.561z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M260.022,21.561c0.475,0,0.949,0,1.424,0
+		c0.125,1.198,0.81,2.596-0.355,3.204C259.37,24.606,259.715,22.93,260.022,21.561z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M214.097,24.765c1.28,0.263,1.161,1.924,1.78,2.848
+		c-1.333-0.765-1.076,0.683-2.848,0.356C212.837,26.354,213.744,25.836,214.097,24.765z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M209.825,25.121c0.475,0,0.949,0,1.424,0
+		c-0.041,1.264,0.257,2.868-1.068,2.848C208.834,28.204,209.513,25.475,209.825,25.121z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M274.264,25.833c-0.981,3.403-8.088,0.342-6.408,4.984
+		c2.088-0.522,5.058-0.163,6.764-1.068c-0.236-1.898,0.275-3.047,1.068-3.916c1.867,0.864,0.19,5.343-0.712,6.764
+		c-1.875-0.873-5.939,0.638-8.9,0.356C263.354,27.128,270.405,24.683,274.264,25.833z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M207.333,25.833c0.356,0,0.712,0,1.068,0c0.07,1.019,0.044,1.943-1.068,1.78
+		C206.875,27.145,206.875,26.3,207.333,25.833z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M217.301,26.545c2.056,0.079,0.529,2.243,0,2.848
+		C215.899,28.829,216.367,27.319,217.301,26.545z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M221.217,29.393c-0.365,1.178-0.986,2.099-2.492,2.136
+		C218.322,29.389,220.116,27.964,221.217,29.393z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M198.788,30.105c0.475,0,0.949,0,1.424,0
+		c0.114,0.826-0.057,1.367-0.356,1.78C198.744,32.048,198.718,31.125,198.788,30.105z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M431.622,31.173c0.575-0.1,0.613,0.336,1.068,0.356
+		c0.382,9.28-0.303,17.818-0.356,27.77c-0.011,1.958,0.969,5.186-1.424,6.052c-1.008-8.55,1.226-23.16,0.355-33.109
+		C431.166,31.666,431.603,31.628,431.622,31.173z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M281.027,39.717c-0.478,1.065-0.687,2.399-2.136,2.492
+		c-0.158-0.317-0.312-0.637-0.712-0.712C278.209,39.791,279.957,38.32,281.027,39.717z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M21.137,40.073c-0.337,1.882-4.384,1.674-6.052,1.068
+		C14.759,38.594,20.04,38.964,21.137,40.073z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M216.589,44.346c-0.07,1.433-0.003,3.729-0.356,5.696
+		c-4.805-0.548-7.873-1.165-13.172-0.712c-0.188-1.85,0.469-2.853,0.712-4.272c1.591-0.167,0.778,2.07,1.78,2.492
+		c3.169-0.701,6.856,0.898,9.256-0.356c-1.736-2.954-6.28-0.257-8.9-1.424c0-0.356,0-0.712,0-1.068
+		C208.786,43.9,213.125,44.561,216.589,44.346z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M22.561,50.042c-0.2,3.326-8.658,1.503-9.612,1.068
+		C13.987,48.526,19.891,49.935,22.561,50.042z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M201.992,52.178c-0.042,1.025,0.194,2.33-0.356,2.848
+		C199.014,56.274,198.986,51.671,201.992,52.178z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M220.149,52.178c0.125,1.431-0.005,2.605-1.068,2.848
+		c-0.971,0.26-0.717-0.707-1.424-0.712C217.688,52.802,218.498,52.069,220.149,52.178z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M22.561,66.774c-3.299,0.455-8.196,1.264-9.612-0.356
+		c0.809-2.514,6.609-0.036,8.544-1.424C22.117,65.32,22.729,65.656,22.561,66.774z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M313.425,69.267c0.513,0.199,0.869,0.555,1.068,1.068
+		c-0.273,1.151-0.985,1.863-2.137,2.136c-0.157-0.317-0.312-0.637-0.712-0.712C311.688,70.377,312.694,69.96,313.425,69.267z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M133.993,70.334c0.429,1.972-1.017,2.069-1.068,3.561
+		C130.943,73.582,132.139,70.045,133.993,70.334z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M136.485,71.759c0.575-0.1,0.613,0.336,1.068,0.356
+		c-0.212,1.331-0.428,2.658-1.78,2.848C135.591,73.476,135.972,72.551,136.485,71.759z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M141.114,73.183c0.317,0.158,0.637,0.312,0.712,0.712
+		c-0.037,1.506-0.958,2.127-2.136,2.492C138.889,75.238,140.285,73.825,141.114,73.183z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M297.761,74.607c0.271,1.458-1.147,1.226-2.137,1.424
+		C295.502,74.722,296.921,74.955,297.761,74.607z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M144.674,75.675c0.352,1.726-1.279,2.733-2.136,2.136
+		C142.416,76.265,143.518,75.943,144.674,75.675z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M116.192,77.099c0.744-0.151,0.943,0.244,1.424,0.356
+		c0.165,1.115-0.31,1.589-1.424,1.424C116.404,77.743,115.524,77.778,116.192,77.099z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M146.81,77.811c0.38,1.661-1.065,2.673-2.136,1.78
+		C144.755,78.367,145.733,78.04,146.81,77.811z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M114.057,78.879c0.475,0,0.949,0,1.424,0
+		c-0.172,1.122,1.093,0.806,0.712,2.136C115.421,81.673,113.399,79.65,114.057,78.879z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M97.68,79.947c0.356,0,0.712,0,1.068,0c0.07,1.019,0.044,1.943-1.068,1.78
+		C97.223,81.259,97.223,80.415,97.68,79.947z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M83.439,81.015c-1.934,2.054-5.744,1.245-8.9,1.424
+		c-7.353,0.418-17.921,0.315-25.633,1.068c-2.273,0.222-4.566,1.574-6.408,0.356c0.445-2.047,3.184-1.801,4.628-2.848
+		c1.879,0.981,3.544,0.55,6.052,0.356c8.054-0.623,17.93,0.799,26.701-0.712C80.832,80.495,81.7,80.493,83.439,81.015z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M112.632,81.371c1.14,0.047,1.566,0.807,1.424,2.136
+		C112.579,83.792,111.971,82.137,112.632,81.371z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M83.439,86c-1.326,2.501-5.784,1.542-9.968,1.78
+		c-5.813,0.331-9.823,0.582-14.597,0.712c-5.486,0.15-11.43,0.744-16.376-0.356c1.754-2.214,4.951-1.47,7.832-1.424
+		C60.916,86.881,72.468,86.169,83.439,86z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M84.507,91.696c-1.617,2.653-3.837,1.698-6.764,1.424
+		c-3.216-0.302-6.657,0.65-9.969,0.712c-9.19,0.171-18.692,0.111-27.769-0.356c0.253-0.682,0.469-1.062,1.068-1.424
+		c1.504-0.908,2.993-0.132,5.34,0C56.899,92.642,72.088,90.526,84.507,91.696z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M83.795,96.68c-0.342,1.664-2.472,1.626-3.561,1.78
+		c-10.142,1.435-23.434-0.563-33.465,0c-2.597,0.146-4.801,1.348-7.12,0.356c2.773-3.205,8.042-2.21,14.241-2.492
+		c7.473-0.339,15.849,0.215,22.785,0.356c0.26,0.005,0.645-0.754,1.068-0.712C78.329,96.027,81.785,97.355,83.795,96.68z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M103.732,103.8c0.639-0.045,0.751,0.436,1.424,0.356
+		c0.047,1.233-0.307,2.067-1.78,1.78C102.951,104.874,103.278,104.726,103.732,103.8z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M83.439,107.004c0.238,0,0.475,0,0.712,0
+		c0.444,0.978-0.707,0.71-0.712,0.712c-5.716,1.906-16.283,0.688-24.565,1.068c-6.469,0.297-12.556,1.781-17.801,1.068
+		c1.188-3.307,3.225-1.791,6.408-1.78c4.05,0.014,9.588-0.541,13.529-0.712C69.294,107,78.365,107.117,83.439,107.004z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M117.261,113.413c-0.127,1.653-1.388,2.173-2.848,2.492
+		C113.666,114.783,116.132,112.66,117.261,113.413z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M83.795,122.669c-1.651,2.836-7.475,1.472-11.749,1.78
+		c-1.688,0.122-3.11,1.077-4.272,0.356C70.359,120.572,78.203,123,83.795,122.669z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M84.151,128.365c-2.312,5.482-10.361,1.53-15.309,2.492
+		C71.057,126.406,79.232,129.668,84.151,128.365z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M92.339,134.773c1.378-0.31,1.267,0.87,2.136,1.068
+		c-0.433,1.11-0.666,2.42-2.492,2.136C91.165,137.054,91.997,135.623,92.339,134.773z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M246.138,151.506c-0.293,1.724-2.051,1.983-2.492,3.56
+		c-1.242-0.538-2.553-1.007-3.204-2.136c0.118-1.781,1.097-2.7,1.78-3.916C244.404,148.755,244.762,150.211,246.138,151.506z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M30.037,153.286c-0.352,1.429-1.479,2.081-1.78,3.56
+		c-1.104,0.036-1.701-0.435-2.492-0.712C24.231,152.266,27.982,151.219,30.037,153.286z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M251.834,156.49c-1.818,0.438-1.921,2.588-3.56,3.204
+		c-1.435-0.346-2.005-1.555-2.848-2.492C246.781,154.542,250.721,151.962,251.834,156.49z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M114.057,156.134c-0.355,1.544-2.153,1.644-3.561,2.136
+		C110.356,156.35,112.979,155.696,114.057,156.134z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M213.385,157.915c2.75-0.002,2.794,3.014,1.424,4.628
+		c-0.831,0-1.661,0-2.492,0C212.014,160.704,211.796,158.68,213.385,157.915z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M213.741,163.967c0.334,1.408,0.278,2.064-0.356,3.204
+		c-1.855-0.232-3.217,0.422-4.272,0c-0.078-1.146,0.63-1.506,0.356-2.848C210.98,163.543,211.722,163.776,213.741,163.967z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M213.741,172.155c-0.758,1.259-2.893,1.142-4.984,1.068
+		C208.096,169.25,214.303,167.14,213.741,172.155z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M78.811,192.092c-2.447,4.861-6.046,8.93-8.9,13.529
+		c-1.462,2.355-2.692,4.816-4.272,7.12c-1.512,2.206-3.436,4.163-4.272,6.765c-2.065,0.266-1.92,4.384-3.916,3.56
+		c-0.96-1.002,0.631-1.461,0.356-2.848c1.322,0.016,0.868-1.743,2.136-1.78c-0.2-1.624,1.342-1.506,1.068-3.204
+		c5.881-7.055,9.503-16.368,16.021-22.785c0.317-0.158,0.637-0.312,0.712-0.712C78.318,191.636,78.356,192.072,78.811,192.092z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M82.015,196.008c-2.436,5.515-5.552,10.35-7.476,16.376
+		c-2.833,4.573-5.005,10.783-7.833,16.021c-0.731,1.354-1.416,4.127-3.56,3.561c-0.02-2.037,1.04-2.995,2.136-3.917
+		c0.416-2.44,1.921-4.327,2.848-6.408c0.979-2.199,1.665-4.336,2.492-6.408c1.544-3.867,3.79-7.141,4.628-11.037
+		c2.034-2.713,3.379-6.115,5.696-8.544C81.522,195.552,81.56,195.989,82.015,196.008z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M285.656,235.17c1.101-0.06,1.601,1.252,1.067,1.78
+		c-1.096,0.265-0.684-0.977-1.78-0.712C285.069,235.77,285.57,235.678,285.656,235.17z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M205.196,239.086c-0.509,1.775-0.896,5.399-3.916,5.696
+		C201.19,242.845,201.849,238.755,205.196,239.086z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M40.717,241.934c-0.029,1.748-4.375,2.197-4.272,0
+		C37.708,241.65,39.985,240.669,40.717,241.934z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M206.977,241.578c0.192,1.261-1.261,0.875-1.068,2.136
+		c0.112,0.837,1.688,0.211,1.424,1.424c-1.036,0.535-3.141,1.402-4.272,0.712c0.197-0.99,1.376-0.997,2.136-1.424
+		c-0.215-0.853-0.512-1.625-0.356-2.848C205.295,241.091,206.521,241.091,206.977,241.578z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M41.429,245.494c-0.63,1.048-3.213,3.074-4.272,1.424
+		C37.684,245.772,40.021,244.575,41.429,245.494z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M61.01,259.735c-2.417,0.638-6.531,3.458-7.477-0.356
+		c-1.584-0.279-2.136,0.474-3.56,0.356C51.194,255.108,60.892,253.553,61.01,259.735z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M320.901,257.243c0.316,0.158,0.637,0.312,0.712,0.712
+		c-1.938,3.819-6.196,5.776-10.681,6.052C313.338,260.834,318.755,260.674,320.901,257.243z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M322.682,261.159c-1.435,3.076-5.821,3.198-6.053,7.477
+		c-1.404,1.207-3.101,2.12-4.984,2.848c-0.459,1.409,1.172,0.727,0.712,2.136c-0.942,0.719-2.852,0.471-3.204,1.78
+		c-2.6-1.645-4.743,2.362-5.34-1.068c1.059-0.366,2.846-0.002,3.204-1.068c-0.079-1.464-2.31-0.775-2.136-2.492
+		c0.887-0.299,1.907-0.466,3.204-0.355c0.672-0.515,1.578-0.795,1.424-2.136C314.506,266.736,317.786,261.621,322.682,261.159z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M62.078,263.295c-2.116,6.681-10.54,5.885-16.376,6.764
+		c-0.196-1.976,1.165-2.396,1.424-3.916c1.034-0.118,2.342-0.919,3.204-2.136C54.585,263.306,59.138,261.772,62.078,263.295z
+		 M52.822,266.143c1.867,0.226,6.255-0.493,4.628-1.424C56.282,265.978,53.637,264.162,52.822,266.143z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M335.498,270.771c-1.883,1.796-3.626,3.732-6.053,4.984
+		C331.149,273.979,332.207,269.787,335.498,270.771z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M346.891,271.127c0.468,0.125,0.56,0.626,1.067,0.712
+		c-1.035,2.643-1.371,5.986-4.271,6.764C344.808,275.876,346.308,273.46,346.891,271.127z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M344.754,272.195c0.454,2.187-1.589,4.766-3.56,5.696
+		C340.821,275.667,342.867,273.293,344.754,272.195z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M336.922,273.62c-2.724,3.815-7.005,7.931-12.104,8.188
+		c-0.063-1.25,1.203-1.171,1.424-2.136c4.408-0.932,6.62-4.061,9.612-6.408C336.429,273.163,336.467,273.6,336.922,273.62z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M209.825,277.536c-2.083-0.172-2.936-1.574-3.917-2.848
+		C207.733,273.754,210.505,275.915,209.825,277.536z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M182.768,275.755c1.727,0.01,2.958,1.998,1.78,2.848
+		C183.189,278.419,182.732,277.333,182.768,275.755z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M347.958,276.111c0.287,0.188,0.578,0.372,1.068,0.356
+		c0.118,1.738-1.631,4.484-3.56,5.34C345.62,279.232,347.774,278.657,347.958,276.111z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M309.865,276.824c-1.399,1.807-4.898,3.004-7.833,2.136
+		C302.851,276.571,307.905,276.93,309.865,276.824z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M54.602,280.028c-0.26,0.809-1.071,1.064-1.78,1.424
+		c-1.914-0.222-2.887-1.385-4.628-1.78c0-0.355,0-0.712,0-1.068C49.783,278.297,53.041,279.145,54.602,280.028z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M335.498,278.959c0.146,2.52-2.158,2.589-2.849,4.272
+		c-4.229,1.036-7.459,6.72-12.816,4.272c0.507-1.578,2.162-1.062,3.204-1.424c3.58-1.243,6.566-3.346,9.612-4.984
+		c0.48-0.825,1.504-1.107,1.78-2.136C334.786,278.959,335.142,278.959,335.498,278.959z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M357.571,279.316c-0.933,3.814-2.44,7.054-5.341,8.9
+		c-1.479-1.132-0.048-2.641,1.068-3.205c0.448-2.399,1.86-3.836,2.848-5.696C356.621,279.316,357.097,279.316,357.571,279.316z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M351.163,279.671c1.365,1.052-0.927,3.858-2.492,4.272
+		C348.868,281.887,350.17,280.933,351.163,279.671z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M353.299,280.74c-0.725,2.124-0.975,4.722-3.204,5.34
+		C350.516,283.653,351.282,281.571,353.299,280.74z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M61.722,284.3c-0.206,0.863-1.344,0.792-2.136,1.068
+		c1.44,1.328,3.006-0.096,4.628,0.712c-4.045,4.246-10.679-0.081-14.241-2.492c0.933-1.59,3.043,0.139,4.984,0.356
+		C57.454,284.223,60.299,283.327,61.722,284.3z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M332.649,285.724c-1.274,3.828-5.325,4.88-7.476,7.832
+		c-0.962-0.818-3.901,0.341-4.272-1.068c-0.168-1.474,1.665-0.946,2.492-1.424c2.73-1.66,5.783-2.998,7.832-5.34
+		C331.7,285.724,332.175,285.724,332.649,285.724z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M57.45,288.928c2.003,0.545,5.866-0.355,7.832,1.068
+		c-1.22,1.787-6.086-0.018-6.764,0C57.742,290.061,57.385,289.705,57.45,288.928z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M357.215,293.556c0.744-0.151,0.942,0.244,1.424,0.356
+		c-0.77,3.061-3.027,6.421-5.34,6.764C353.148,296.847,356.735,296.756,357.215,293.556z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M338.702,297.472c1.152-0.439,0.272,1.152,1.424,0.712
+		c-0.62,3.618-2.584,7.387-5.696,8.9C334.846,302.873,337.749,301.147,338.702,297.472z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M358.995,299.964c0.677,0.883,0.97-1.617,2.492-1.068
+		c-0.933,1.916-1.667,4.029-3.561,4.984c-0.667-0.678-0.039-0.895,0-1.78c-0.38-0.809-1.08,1.022-2.136,0.712
+		c-0.654-1.149,1.315-1.916,2.136-2.848c0.633-0.718,0.771-2.515,2.137-2.136C360.198,299.032,359.446,299.347,358.995,299.964z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M485.736,300.321c-0.648,0.471-2.433-0.203-2.492-1.424
+		C483.894,298.426,485.678,299.1,485.736,300.321z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M320.189,314.917c-1.546,1.303-1.865,3.831-3.204,5.34
+		c-0.455-0.494-1.681-0.218-2.137-0.712c1.146-3.443,2.604-7.801,5.696-8.188c0.697,0.666,0.11,1.304,0,2.136
+		c4.777-0.92,5.9-5.493,8.9-8.188c0.848-0.845,0.531,1.052,1.068,1.068c0.884,0.026,3.743-4.915,4.628-6.764
+		c1.921,1.721,0.27,2.631-0.712,4.272c-0.723,1.208-1.226,3.122-2.136,4.272c-2.406,3.039-6.486,4.653-9.612,6.764
+		C321.851,314.917,321.02,314.917,320.189,314.917z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M484.312,304.237c-0.786-0.757-2.898-0.187-2.849-1.78
+		C482.686,301.583,484.851,302.228,484.312,304.237z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M480.04,304.949c-0.167,1.508-3.525,1.276-4.628,0.712
+		c0-0.356,0-0.712,0-1.068C476.681,303.766,479.088,304.33,480.04,304.949z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M471.852,306.373c1.083,0.341,2.13,0.719,3.204,1.068
+		c0.065,0.303-0.139,0.336-0.355,0.356c0,0.237,0,0.475,0,0.712c-1.007-0.298-2.197-0.413-3.204-0.712
+		C471.345,307.053,471.74,306.854,471.852,306.373z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M471.852,309.577c-1.606,1.3-5.255,1.38-5.34-1.068
+		C468.103,307.765,470.592,308.839,471.852,309.577z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M467.224,312.425c-1.932-0.057-5.549,1.036-5.696-2.136
+		C463.285,310.172,466.761,310.197,467.224,312.425z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M460.815,313.849c0.235,2.864-6.633,2.564-4.984,0
+		C456.606,313.515,459.026,314.067,460.815,313.849z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M456.543,317.053c-0.441,1.904-4.883,0.995-6.408,0.712
+		C451.416,315.418,453.615,316.43,456.543,317.053z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M168.883,316.697c-0.492,1.287-2.294,1.944-2.136,2.848
+		c-0.945-0.123-1.202-0.935-1.424-1.78C166.626,317.372,167.524,316.024,168.883,316.697z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M368.964,317.053c-1.09,2.353-3.021,3.862-4.629,5.696
+		c-2.071-2.017-2.401,1.489-4.628,1.424c-1.087-2.819,3.355-3,3.916-5.34C366.458,320.635,366.66,315.738,368.964,317.053z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M338.346,317.765c-1.471,3.158-4.04,5.216-6.408,7.477
+		c-5.704-1.187-9.298,2.428-13.528,1.068c-1.603-0.133-2.875,1.405-3.916,0.712c-0.509-0.503,0.077-1.729,0.355-2.492
+		c1.105-0.468,1.017,0.096,2.492,0c3.723-1.619,8.218-2.463,11.393-4.628c0.639-0.045,0.751,0.436,1.424,0.356
+		c1.202-0.578,2.125-1.436,3.205-2.136C335.576,319.404,336.55,315.747,338.346,317.765z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M452.271,319.189c0.007,2.293-3.395,0.899-4.983,0.712
+		C447.425,317.463,450.937,318.747,452.271,319.189z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M163.187,319.189c1.793,0.011,0.353,1.046,0.712,2.492
+		C162.285,321.85,162.928,320.017,163.187,319.189z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M303.457,324.886c-0.522,1.496-1.403,2.632-2.492,3.56
+		c-1.303,0.234-1.366-0.771-2.492-0.712C298.393,324.901,301.324,323.428,303.457,324.886z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M230.474,327.022c1.118-0.169,0.94,0.958,1.78,1.067
+		c-0.238,1.295-2.071,0.578-2.492,0C229.887,327.623,230.388,327.53,230.474,327.022z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M204.84,335.922c-1.485-0.481,0.083-2.312,0.356-3.204
+		c0.291-1.608-0.686-4.484,0.712-4.984C208.199,329.326,206.642,335.005,204.84,335.922z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M312.356,334.498c0.416,1.84-2.475,0.373-2.491,1.78
+		C308.898,335.289,311.132,334.477,312.356,334.498z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M315.917,337.703c1.292,0.323,0.217,1.05,0.356,2.136
+		c-0.826,0.113-1.367-0.058-1.78-0.356C314.734,338.655,315.676,338.529,315.917,337.703z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M331.226,338.058c-1.422,3.047-4.877,7.19-8.544,5.696
+		c-0.085-1.391,1.322-1.288,2.136-1.78c-0.964-1.123-1.839-0.956-3.561-0.712c0-0.475,0-0.949,0-1.424
+		c2.958,0.632,4.753-1.617,6.053,0.355C328.562,339.558,329.413,336.988,331.226,338.058z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M308.085,338.415c0.744-0.151,0.942,0.243,1.424,0.355
+		c-0.42,0.768-0.773,1.601-1.78,1.78C307.471,339.461,308.343,339.503,308.085,338.415z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M315.562,342.686c-0.326,2.653-4.067,3.413-5.696,1.78
+		C309.773,340.187,313.382,340.736,315.562,342.686z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M410.261,348.027c2.226,0.451,0.203,4.597,1.068,6.408
+		c0.68,1.457,3.954,0.317,3.561,2.848C409.167,358.471,407.797,351.728,410.261,348.027z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M372.167,369.744c0.559,1.224-2.383,1.689-2.136,0.355
+		C370.452,369.69,371.29,369.697,372.167,369.744z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M377.864,372.948c0.316,0.158,0.637,0.312,0.712,0.712
+		c0.013,4.912-3.148,12.89,0.355,17.444c-4.001,7.257-7.592,14.614-10.324,23.497c-0.884,2.875-1.566,6.475-2.492,9.969
+		c-1.335,5.041-2.131,9.848-6.052,12.816c-1.966-2.516,1.034-4.279,2.136-6.764c1.724-3.889,0.581-9.371,3.204-12.817
+		c-0.235-5.395,4.17-11.16,6.052-16.021c0.502-1.294,0.243-2.706,0.712-3.916c1.091-2.812,3.448-4.241,4.629-6.765
+		c-0.355-2.374-1.643-3.816-2.492-5.696C375.839,381.603,375.979,376.402,377.864,372.948z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M354.367,378.288c-1.657,3.531-6.204,0.44-8.545,0
+		c-0.252,2.27,2.391,1.645,2.492,3.561c-0.98,2.777-4.911,0.492-7.477,1.424c0.007,1.536,1.773,1.312,1.78,2.849
+		c-0.246,1.325-1.759,2.783-3.204,1.779c1.07-2.859,1.925-3.259-1.78-4.984c0.308-2.136,4.192-2.357,6.053-1.779
+		c0.671-2.404-3.58-2.776-5.696-3.561c2.33-3.685,6.738-0.675,9.968,0C350.178,378.04,352.543,377.292,354.367,378.288z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M209.469,385.052c-0.317,2.886-3.508,2.84-5.34,2.492
+		C204.467,384.996,207.521,384.011,209.469,385.052z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M396.021,397.513c-0.638,1.854-2.219,2.765-4.272,3.203
+		C392.187,398.663,394.077,398.061,396.021,397.513z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M395.664,401.073c1.609,1.699-2.328,3.454-4.628,3.561
+		C391.522,402.389,394.47,402.607,395.664,401.073z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M389.612,407.481c-1.238,2.203-2.375,4.508-4.984,5.341
+		C385.68,410.666,387.69,407.582,389.612,407.481z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M378.22,408.549c-0.556,3.005-3.589,3.531-5.696,4.984
+		c-1.468-2.223,4.106-2.814,4.628-5.341C377.727,408.093,377.765,408.53,378.22,408.549z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M392.46,408.549c-1.236,3.866-3.884,6.321-7.832,7.477
+		c0.061-3.529,5.84-4.345,7.12-7.833C392.162,408.135,392.382,408.272,392.46,408.549z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M341.906,408.905c-0.873,3.004-4.288,4.287-7.12,6.053
+		c-1.55,0.966-3.204,2.845-4.984,2.136c2.751-3.539,7.667-4.912,10.681-8.188C340.957,408.905,341.432,408.905,341.906,408.905z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M340.838,414.601c-0.54,1.668-2.982,2.335-4.628,3.204
+		c-1.585,0.837-3.565,2.607-4.984,1.425c-0.103-1.349,1.421-1.139,2.492-1.78C335.601,416.322,337.795,413.948,340.838,414.601z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M68.486,417.805c0.845,2.832-6.044,6.379-7.12,2.137
+		C63.445,417.808,64.914,417.25,68.486,417.805z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M388.9,417.805c0.316,0.158,0.637,0.312,0.712,0.712
+		c-1.913,2.359-2.84,5.705-7.12,5.696c-5.434,5.011-7.996,12.892-15.665,15.665c0.165-2.235,2.699-2.532,3.916-3.916
+		c0.616-0.7,0.564-1.764,1.068-2.492c0.477-0.689,1.699-1.574,2.492-2.492c1.872-2.166,4.841-6.162,7.12-7.832
+		C384.026,421.24,387.148,420.959,388.9,417.805z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M382.848,418.162c-1.286,2.867-3.585,4.722-6.052,6.408
+		C377.137,422.139,380.025,419.287,382.848,418.162z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M79.879,422.434c-1.219,0.518-2.671,2.284-3.916,0.712
+		c-1.016,0.646-1.455,1.868-3.56,1.424C68.62,419.052,79.177,417.995,79.879,422.434z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M93.052,424.57c0.016,1.688-3.021,2.186-2.136,3.561
+		c-0.995,1.085-0.973-1.855-2.136-1.78c-1.218-0.15-1.07,1.066-1.78,1.424c-1.772,0.348-2.121-0.728-3.204-1.068
+		C84.246,421.561,90.9,421.841,93.052,424.57z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M233.322,427.417c-1.448-0.023-1.72,1.129-3.205,1.068
+		c-1.043-1.683,0.098-3.818,0.712-4.984C233.053,423.415,233.529,425.074,233.322,427.417z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M107.648,427.417c-1.327,3.395-9.945,6.018-8.544-0.355
+		C101.43,424.596,105.8,424.486,107.648,427.417z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M383.204,427.774c-0.624,2.461-2.639,3.532-4.984,4.272
+		C379.338,430.079,380.853,428.508,383.204,427.774z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M386.765,428.13c-1.919,2.472-4.354,4.428-6.765,6.408
+		c-0.452-2.948,4.674-3.394,5.34-6.408C385.814,428.13,386.289,428.13,386.765,428.13z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M122.601,430.978c-0.721,1.366-1.462,1.333-3.205,1.068
+		c-1.167,0.494-1.422,1.9-2.492,2.492c-1.485-0.533-2.775-1.261-3.204-2.849C115.062,428.42,120.144,428.057,122.601,430.978z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M135.062,433.114c-0.533,2.959-6.725,3.756-7.833,1.068
+		C128.18,430.796,133.323,430.3,135.062,433.114z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M60.298,432.046c2.687-0.01,5.671,0.794,3.916,3.56
+		c-1.411-1.258-3.306,0.18-4.628-1.067C59.355,433.239,59.826,432.642,60.298,432.046z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M224.421,434.539c0.528,2.273-0.343,5.682-3.917,4.984
+		C219.093,436.276,222.167,433.282,224.421,434.539z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M376.796,441.659c1.548,0.544,0.148,2.543-1.068,2.492
+		C374.685,443.003,376.146,442.201,376.796,441.659z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M214.453,444.151c0.174,3.615-2.415,4.468-4.984,5.34
+		C207.648,447.07,211.362,441.708,214.453,444.151z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M363.623,443.794c-1.411,3.006-5.317,5.329-8.544,5.341
+		C356.645,446.072,359.975,444.774,363.623,443.794z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M64.214,445.931c-1.009,1.511-4.274,1.206-5.34,0
+		C59.365,443.413,63.484,444.009,64.214,445.931z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M329.09,449.135c0.444,0.86,1.459,1.151,2.492,1.424
+		c0.66,3.075,7.735,2.94,5.696,6.408c-1.685-0.689-2.635-2.112-4.629-2.492c-1.206-2.71-5.146-2.686-6.764-4.984
+		c0.861-0.583,1.729-0.906,2.848-0.355c-0.357-0.711-1.574-0.562-1.424-1.78c3.858-0.151,7.352,3.07,10.681,4.628
+		c-0.647,0.926,0.154,1.074-0.356,2.136C335.577,451.666,331.97,450.765,329.09,449.135z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M378.932,448.067c-0.038,1.99-1.407,3.711-2.492,5.34
+		c-1.737,2.609-3.249,5.608-6.764,6.408c-0.312-1.143,0.923-0.737,1.067-1.424c-2.197-0.156-4.887,4.78-7.832,2.849
+		c2.762-3.291,7.555-4.55,9.612-8.545c1.824-0.905,2.834-2.624,3.916-4.271C377.563,448.597,377.697,447.782,378.932,448.067z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M363.623,450.559c-0.91,2.347-5.827,5.348-8.544,3.916
+		c-0.15-1.218,1.066-1.069,1.424-1.78C359.374,453.557,360.678,450.708,363.623,450.559z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M371.1,451.271c-0.612,3.777-4.85,5.237-8.188,7.477
+		c-0.586,0.393-1.009,1.188-1.424,1.424c-0.265,0.149-0.906-0.249-1.424,0c-0.605,0.291-0.846,0.994-1.068,1.068
+		c-0.239,0.079-0.396-0.478-0.712-0.356c-0.979,0.375-2.37,1.502-3.204,0.356c0.371-1.604,2.08-1.505,3.204-2.137
+		c4.114-2.312,8.679-4.575,11.748-7.832C370.388,451.271,370.743,451.271,371.1,451.271z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M203.772,454.119c0.271,3.477-1.166,5.243-3.561,6.053
+		c0.051-0.851-1.534-2.163-1.424-3.561C198.976,454.229,201.006,452.133,203.772,454.119z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M194.872,463.375c-0.772,2.433-2.345,4.063-5.34,4.272
+		C187.411,464.641,192.986,460.22,194.872,463.375z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M227.27,470.852c0.833,4.114-4.39,5.562-5.696,2.492
+		C221.16,470.357,225.174,469.085,227.27,470.852z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M64.214,470.852c-0.058,0.413,0.079,0.634,0.356,0.712
+		c-1.401,1.499-3.293,1.559-5.34,1.068C59.198,469.717,62.857,470.912,64.214,470.852z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M162.119,471.564c0.744-0.151,0.943,0.244,1.424,0.355
+		c-0.443,1.1-0.422,2.664-2.136,2.492C162.075,473.894,161.45,472.082,162.119,471.564z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M210.893,472.632c1.304,0.831,3.272,1,3.916,2.491
+		c-1.212,2.335-5.504,5.319-7.476,1.78C207.683,474.644,210.29,474.64,210.893,472.632z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M188.107,475.124c-0.435,1.701-1.845,2.428-3.204,3.204
+		C181.906,476.912,186.224,472.748,188.107,475.124z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M201.28,478.684c-0.443,2.05-2.507,2.478-3.56,3.916
+		c-1.02-0.997-3.189-0.846-4.272-1.78C192.898,477.618,199.176,475.457,201.28,478.684z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M89.135,479.396c-0.697,1.32-1.262,2.772-2.136,3.916
+		c-1.132-0.544-1.566-0.125-2.848,0c-0.629-0.596,0.316-1.192,0-2.492C86.099,480.659,87.39,477.577,89.135,479.396z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M64.214,482.957c-1.708-0.649-2.12-0.027-2.492,1.424
+		c-1.941-0.38-4.084-0.998-3.204-3.204C60.296,480.113,64.361,479.485,64.214,482.957z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M191.312,492.569c1.238,3.184-2.949,3.753-4.628,3.204
+		C186.668,492.764,188.377,491.757,191.312,492.569z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M63.858,498.621c-2.167,1.108-3.505-0.759-5.34-1.067
+		C58.492,493.612,65.543,495.779,63.858,498.621z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M81.303,497.197c-0.289,2.44-1.875,3.584-4.628,3.561
+		C75.197,497.862,79.413,496.723,81.303,497.197z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M192.736,502.181c1.287-0.337,0.497,1.402,0.712,2.136
+		C191.533,504.69,191.943,502.727,192.736,502.181z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M69.911,503.605c1.607-0.269,1.333,2.379-0.356,1.78
+		C69.441,504.56,69.612,504.018,69.911,503.605z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M467.936,508.589c2.893,0.549,3.017,3.866,6.765,3.561
+		c0.609-1.803-1.66-1.796-0.713-2.849c1.678,0.459,2.376,1.896,2.849,3.561c-0.577,0.966-1.079,2.006-2.136,2.492
+		c1.502,2.127,1.28,5.478-1.425,6.052c2.008,3.18,4.676,10.141,1.78,13.885c1.077,1.785,2.256,4.727,0,6.053
+		c1.717,2.48,1.802,5.745,2.849,7.832c-0.295,0.893-1.247,1.126-1.78,1.78c1.07,3.254,2.113,8.441-2.849,9.256
+		c-1.011-1.244-3.191-1.317-3.204-3.56c-2.271-1.759-4.886-5.108-3.204-7.833c2.271-0.399,3.396,2.197,2.137,3.204
+		c-1.278,0.21-0.01-2.126-1.425-1.779c-1.197,0.768,0.468,1.635,0.356,2.491c1.088,0.258,1.298-0.363,2.136-0.355
+		c0.264,1.873,0.957,3.315,1.78,4.628c1.784-1.033-1.569-3.337-0.355-4.984c1.228-0.722,1.576-0.471,3.204-0.355
+		c-0.982-2.113-2.926-4.321-3.204-6.053c0.251-1.155,2.009-0.25,1.067-1.78c0.855-0.86,0.943,0.864,2.492,0.356
+		c-0.739-2.821-2.852-4.269-4.271-6.408c1.453-0.933,2.182-0.699,3.56,0.355c0.99-5.738-6.827-5.75-7.832-10.68
+		c0.316-0.158,0.637-0.312,0.712-0.712c4.027,0.244,3.573,4.971,7.477,5.34c-0.439-2.114-3.476-2.92-2.492-5.34
+		c0.748-0.867,1.582,0.314,2.136-0.356c-0.626-2.127-2.262-3.412-2.136-5.34c-1.451-2.94-5.764-3.019-6.053-7.121
+		c3.262,0.774,3.951,4.119,7.477,4.629C475.606,513.153,466.006,512.802,467.936,508.589z M476.124,548.819
+		c0.267-2.165-1.454-2.343-2.849-2.848C473.445,547.701,474.646,548.399,476.124,548.819z M472.208,554.515
+		c0.647,0.545,2.2,1.256,2.848,0.712c-0.066-1.356-0.506-2.342-1.78-2.492c-0.237,0-0.475,0-0.712,0
+		C472.71,553.593,471.913,553.509,472.208,554.515z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M58.874,508.946c1.187,0,2.374,0,3.56,0c0.377,0.995,1.689,2.322,0.712,3.56
+		c-1.242-1.041-2.057-1.777-4.272-1.067C58.168,510.764,58.701,509.755,58.874,508.946z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M190.956,509.301c0.212,0.737-0.44,2.339,0.356,2.492
+		c-0.622,1.698-2.855,1.694-4.984,1.068C185.516,510.464,188.779,508.658,190.956,509.301z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M323.749,514.642c0.468,0.125,0.561,0.626,1.068,0.712
+		c0.058,2.312-1.083,3.426-2.136,4.628C321.328,519.038,323.461,516.231,323.749,514.642z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M328.021,517.846c-1.738,2.771-2.872,6.146-5.696,7.832
+		c-0.929-2.549,3.06-3.056,2.492-6.408C326.001,518.983,326.745,516.917,328.021,517.846z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M329.802,519.982c0.686,0.75-0.342,2.674-1.068,3.916
+		c-0.394,0.674-1.275,1.311-1.78,2.137c-1.093,1.788-1.734,4.107-4.271,4.628C324.471,526.518,327.043,523.157,329.802,519.982z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M332.294,520.694c0.355,0,0.712,0,1.068,0
+		c-0.725,2.964-2.269,5.66-3.917,7.832c-1.595,2.103-3.624,4.438-6.052,5.696C325.092,528.445,331.016,526.892,332.294,520.694z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M365.403,521.05c1.964-0.409,2.474,2.493,3.916,1.424
+		c1.966,1.572,0.793,4.146,2.492,6.052C367.937,527.942,365.339,524.412,365.403,521.05z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M189.888,524.254c1.536,0.485,0.899,1.526,1.424,2.492
+		c-1.434,1.309-5.194,3.604-5.696,1.424C185.264,526.643,188.936,525.302,189.888,524.254z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M13.66,529.238c2.515-0.459,5.758-2.356,7.12,0
+		c-2.803,0.758-5.209,1.911-8.544,2.137C12.886,530.25,13.71,530.362,13.66,529.238z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M367.539,530.306c2.427,1.728,4.155,6.381,3.916,9.257
+		C368.877,538.073,366.07,533.529,367.539,530.306z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M364.691,533.51c3.261,2.825,5.316,7.577,5.34,11.749
+		c-1.006,0.294-0.922-0.502-1.78-0.356c-1.056,2.48,0.629,3.719,0.356,6.053c-2.68-0.524-1.698-4.71-3.916-5.696
+		c0.164,3.281,2.742,6.032,1.067,8.188c-1.842-3.019-3.28-8.363-4.628-12.817c0.56-0.152,0.305-1.119,1.424-0.712
+		c0.28-2.061-1.63-3.427-0.712-4.984c1.771-0.347,1.409,1.439,2.492,1.78C365.62,536.487,364.238,535.007,364.691,533.51z
+		 M366.472,540.275c-0.055-1.133-0.808-1.566-0.713-2.849c-0.355,0-0.712,0-1.067,0C365.008,538.653,365.15,540.053,366.472,540.275
+		z M368.251,544.191c-0.59-1.071-0.42-2.902-1.779-3.204C365.936,541.806,366.97,545.189,368.251,544.191z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M63.146,546.683c-0.271,1.509-1.66,1.9-2.492,2.848
+		c-0.763-0.78-1.108-1.978-2.136-2.492C58.348,543.964,62.667,544.714,63.146,546.683z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M359.351,545.971c0.356,0,0.713,0,1.068,0
+		c1.59,4.767,3.201,7.533,3.916,12.816c-2.378-0.499-0.844,2.366-1.424,2.848c-2.581-0.09-1.537-2.948-2.136-4.271
+		c-1.875-2.279-2.553-5.755-3.561-8.9c0.728-0.761,1.409,0.1,2.136,0.355C359.351,547.87,359.351,546.92,359.351,545.971z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M315.205,551.311c1.108,0.316,2.449,0.399,2.848,1.424
+		C316.871,552.494,315.53,552.41,315.205,551.311z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M62.434,555.583c0.37,1.41,1.04,2.521,1.068,4.272
+		c-0.77,0.298-1.214,0.922-2.492,0.712c-0.665-0.634,0.289-0.905,0-2.137c-0.353-1.189-2.786-0.299-3.56-1.067
+		c0.219-0.317,0.43-0.637,0-0.712C58.396,554.859,61.059,555.357,62.434,555.583z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M70.979,567.688c0.639-0.046,0.751,0.436,1.424,0.356
+		c0.093,1.16-0.423,1.713-1.424,1.779C70.492,569.369,70.492,568.143,70.979,567.688z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M444.438,573.74c-0.933-1.203-2.745-1.527-3.561-2.848
+		c0.252-2.435,4.908-3.62,7.477-2.492c0.466,0.204,2.135,2.512,2.137,2.492C450.371,572.787,446.702,573.132,444.438,573.74z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M62.791,573.028c-0.414-0.058-0.634,0.079-0.712,0.356
+		c-2.265-0.162-1.948-2.528-4.628-1.424C57.729,567.462,65.057,570.178,62.791,573.028z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M185.26,570.536c2.67-0.227,2.395,4.155,1.78,6.053
+		C184.489,576.526,184.016,572.229,185.26,570.536z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M460.815,571.604c-0.207,3.623-5.12,5.111-7.12,2.136
+		C453.72,570.655,458.67,570.422,460.815,571.604z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M156.422,576.588c-1.088,0.983-1.116-1.252-2.492-1.068
+		c-2.354,0.615,0.792,3.164-1.068,4.272c-2.255-0.679-2.522-3.717-4.984-3.204c-0.542-1.621,0.042-2.646,0.712-3.916
+		C152.145,570.642,158.212,571.073,156.422,576.588z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M450.491,577.3c-1.787,1.074-3.398,1.387-5.696,2.492
+		c-1.237-0.068-1.352-1.259-2.492-1.424C442.328,573.621,449.312,574.325,450.491,577.3z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M172.443,579.081c-0.791-0.277-1.388-0.748-2.492-0.712
+		c-1.991,1.396,0.752,3.387,0,4.628c-3.477,0.788-3.033-3.562-3.204-6.765C169.267,575.151,172.447,575.343,172.443,579.081z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M440.878,581.216c-1.432,2.639-5.282,3.546-7.832,1.424
+		c0.172-1.802-0.061-1.795,0.712-2.848C436.306,580.851,440.124,578.433,440.878,581.216z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M54.958,585.132c-1.112,1.008-1.88-0.487-2.848-0.712
+		c-1.496,0.285-1.829,1.731-3.56,1.78C47.191,582.564,54.635,580.515,54.958,585.132z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M187.396,588.336c-5.146,0.716-3.689-6.114-1.068-5.696
+		C188.351,582.963,188.734,586.19,187.396,588.336z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M430.198,584.065c-1.182,3.806-6.213,6.265-8.9,2.848
+		c0.554-1.396-0.174-2.221,0.355-3.204C424.762,585.534,427.087,582.258,430.198,584.065z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M278.892,586.913c-0.657,2.311-4.566,1.367-5.34,3.561
+		c-1.765-0.19-2.354-2.451-3.917-1.78c-0.679-2.577,1.851-1.947,2.137-3.561C274.422,586.094,276.198,585.862,278.892,586.913z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M156.778,589.405c-1.479,0.174-1.958-0.653-2.848-1.068
+		c-0.726,0.105-0.698,0.964-1.424,1.068c-0.346,1.458,0.881,2.281,0,3.204c-2.71,0.605-1.828-3.602-3.917-4.272
+		C149.597,585.125,158.483,584.764,156.778,589.405z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M346.891,587.981c-0.664,2.362-4.958,1.559-7.12,1.424
+		c0.192-1.261-1.261-0.875-1.068-2.136c0.346-0.01,0.276-0.437,0.355-0.712C342.165,585.511,344.865,587.675,346.891,587.981z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M25.053,587.625c-0.508,1.474-1.896,1.451-3.916,1.78
+		c-2.886,0.47-6.351,2.706-8.9,1.78c0.054-2.774,4.271-1.805,6.052-2.492c0.663-0.256,0.933-0.939,1.424-1.068
+		C21.503,587.154,23.806,586.746,25.053,587.625z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M360.419,588.693c-1.589,2.17-4.442,0.961-6.052,2.848
+		c-0.803-0.978-1.851-1.71-2.492-2.848C353.729,586.155,358.491,587.056,360.419,588.693z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M374.659,590.473c-2.434,1.537-4.959,1.661-7.12,2.848
+		c0.208-1.632-1.188-1.659-1.78-2.492C366.53,586.801,372.246,589.194,374.659,590.473z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M421.298,590.473c-1.213,1.5-3.977,1.146-6.053,2.492
+		c-1.473-0.427-2.212-1.586-2.136-3.561C416.011,587.908,419.313,588.21,421.298,590.473z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M293.132,590.829c-1.615,2.227-4.215,1.264-6.408,2.849
+		c-1.135-0.883-2.177-1.857-2.848-3.204C285.604,588.876,291.838,588.804,293.132,590.829z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M305.593,591.541c-3.213,0.794-5.857,3.461-7.832,0
+		C297.923,587.787,304.602,589.764,305.593,591.541z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M389.968,591.897c-0.551,0.784-2.79,0.734-4.271,1.424
+		c-0.136,0.063-2.208,1.771-2.137,1.78c-1.749-0.244-2.617-3.572-2.136-5.34C383.872,589.504,389.452,589.049,389.968,591.897z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M172.087,590.829c-0.141,1.334,1.465,1.99,0.356,3.204
+		c-1.115,0.527-1.456,0.015-2.136-0.712c-1.839,0.297-1.036,3.236-3.204,3.204C165.018,593.282,168.227,588.392,172.087,590.829z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M321.97,591.897c-0.593,1.032-4.999,3.339-6.765,3.204
+		c-1.548-0.118-2.143-1.63-3.561-2.136C311.665,588.548,318.913,591.448,321.97,591.897z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M400.648,591.897c-0.219,0.316-0.43,0.637,0,0.712
+		c-2.653,1.662-6.638,3.069-7.832-0.712C394.68,589.96,398.406,591.192,400.648,591.897z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M336.21,593.677c-1.807,2.604-7.79,1.552-8.9-2.137
+		c1.863,0.224,6.842-1.311,8.188,0C336.155,592.18,334.987,593.156,336.21,593.677z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M280.672,593.677c-1.736,1.697-3.537,1.37-6.408,2.136
+		c-0.046-1.497-1.677-1.409-1.78-2.848C274.024,590.785,279.15,592.47,280.672,593.677z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M350.45,592.609c-0.351,1.694-4.118,3.573-6.052,3.204
+		c-1.643-0.313-1.253-2.014-2.849-2.136C342.821,590.283,348.801,593.02,350.45,592.609z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M364.335,594.745c-1.816,1.171-3.574,0.698-5.34,1.425
+		c-0.619-0.924-1.479-1.607-2.137-2.492C357.921,590.7,363.691,592.837,364.335,594.745z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M411.686,594.033c-1.592,0.782-3.446,1.301-4.984,2.137
+		c-1.085-0.459-1.835-1.251-2.849-1.78C404.217,591.582,410.716,591.644,411.686,594.033z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M269.635,594.745c-1.17,1.44-3.892,1.33-4.983,2.849
+		c1.524,2.158,4.622,0.761,6.408,2.848c-1.62,2.758-8.678,2.352-7.121-2.136c-0.822-1.041-2.651-1.873-4.271-1.068
+		c-0.861-2.7,2.569-6.078,4.984-3.56C266.742,593.603,268.877,593.486,269.635,594.745z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M142.538,595.101c-1.565,3.791-9.367,5.493-5.696,0
+		C138.951,596.65,141.207,593.305,142.538,595.101z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M296.336,597.593c-2.304-0.117-4.633,0.477-6.764,1.424
+		c-1.424-0.475-1.951-1.847-3.204-2.492c0.173-1.67,2.262-0.631,3.204-2.136C292.022,595.261,296.13,594.477,296.336,597.593z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M376.796,595.101c-0.115,1.33-1.951,0.977-3.204,1.424
+		c-2.499,0.892-4.498,2.546-4.984-1.78C370.744,594.578,374.63,593.816,376.796,595.101z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M309.152,595.813c-1.274,1.811-4.55,1.62-6.052,3.204
+		c-0.286-0.188-0.578-0.371-1.068-0.355c-0.309-0.797-0.01-1.468-1.067-2.137C302.247,593.512,307.306,594.732,309.152,595.813z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M186.684,601.866c-1.737-0.247-2.979-1.066-3.204-2.137
+		c-0.577-2.739,3.565-5.854,4.628-2.492C188.434,598.269,188.019,600.348,186.684,601.866z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M387.12,597.237c-0.539,2.19-4.015,1.445-5.34,2.849
+		c-0.121-1.185-1.349-1.263-1.78-2.137C380.836,594.726,384.797,596.407,387.12,597.237z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M324.817,597.237c-0.009,1.998-2.641,1.233-3.204,1.78
+		c-1.967,1.555-4.388,0.096-4.628-2.136C319.014,595.866,323.107,596.684,324.817,597.237z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M340.126,596.169c-0.668,0.679,0.211,0.644,0,1.779
+		c-1.895,1.073-4.157,1.776-6.052,2.849c-1.844-0.056-1.766-2.032-3.561-2.136C332.524,594.291,336.525,598.033,340.126,596.169z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M135.062,600.441c-2.016,0.474-1.247-1.838-2.848-1.779
+		c-3.684-0.092-2.252,3.168-5.34,3.204C125.607,596.71,136.011,594.288,135.062,600.441z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M147.878,596.525c-0.016,1.084,0.752,1.385,1.068,2.137
+		c1.21-0.334,2.609-0.477,3.917-0.713c1.067,2.469,2.881,0.301,4.984,1.068c0.284,0.665,0.595,1.304,0.712,2.137
+		c3.093-0.746,2.904-0.67,6.408-0.713c0.359,0.709,0.615,1.521,1.424,1.78c1.895,0.2,3.07-1.154,4.628,0
+		c-1.382,2.869-4.64,2.855-7.477,3.561c-0.299-0.413-0.469-0.955-0.356-1.78c-0.475,0-0.949,0-1.424,0
+		c-0.918,0.269,0.26,2.634-1.068,2.492c-1.086-0.62-2.775-3.346-4.984-3.204c-2.274,0.146-2.301,2.2-4.272,3.204
+		c-0.785-0.538-1.049-2.355,0-2.849c-0.208-0.74-0.748-1.15-1.068-1.779c-1.538,0.912-3.256-0.392-4.628,0.355
+		c-0.706-0.673-0.173-1.682,0-2.492c-2.295,0.457-3.125,2.085-5.34,1.068c-0.452-0.8,0.516-2.642,1.068-3.561
+		C143.974,598.004,145.083,596.398,147.878,596.525z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M284.231,597.949c-1.723,1.967-4.17,1.553-6.052,2.849
+		c-1.63-0.032-1.701-1.622-3.204-1.78C276.125,595.02,280.907,597.318,284.231,597.949z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M399.937,597.949c-0.93,2.09-6.935,3.189-7.477,1.068
+		C391.944,596.997,398.684,595.716,399.937,597.949z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M352.587,598.662c-0.949,1.661-4.075,1.146-6.053,1.779
+		c-0.16-1.025-1.26-1.113-1.067-2.492C346.972,596.579,351.806,596.392,352.587,598.662z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M365.047,600.797c-1.624-0.149-3.497,1.122-5.696,1.424
+		c-1.38-0.756-2.601-1.671-2.848-3.56C359.208,598.148,364.38,598.101,365.047,600.797z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M244.002,601.154c-1.208-0.131-5.792,0.764-6.408-1.068
+		C238.224,597.557,243.758,598.967,244.002,601.154z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M292.776,599.729c1.89,2.455,5.941-0.447,6.052,2.849
+		c-1.837,0.655-4.226,0.758-5.34,2.136c-0.955-0.588-1.576-1.509-2.492-2.136C290.976,601.014,292.376,600.872,292.776,599.729z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M376.796,601.154c-0.211,1.136,0.668,1.101,0,1.779
+		c-2.417-0.071-5.023,0.727-7.477-0.355C369.475,598.895,374.576,600.233,376.796,601.154z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M314.137,602.933c-2.943,1.185-6.646,1.961-8.9-0.355
+		C306.092,599.347,313.226,600.84,314.137,602.933z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M328.021,601.509c-0.669,2.634-4.133,1.926-5.696,2.849
+		c-1.456-0.882-1.196-1.331-2.492-2.137C321.776,600.799,325.463,600.453,328.021,601.509z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M343.33,602.221c-1.538,2.019-6.594,2.797-7.12-0.712
+		C338.226,600.421,341.178,600.804,343.33,602.221z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M388.544,602.221c-1.135,2.693-5.142,2.291-7.477,1.424
+		C381.223,599.963,386.324,601.3,388.544,602.221z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M285.656,602.578c-0.938,2.017-7.494,2.979-7.477-0.356
+		C280.454,600.999,284.445,601.654,285.656,602.578z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M355.791,603.645c-0.095,2.517-4.028,1.194-4.984,2.849
+		c-1.642-0.376-3.11-0.924-3.204-2.849C348.778,602.258,353.526,602.355,355.791,603.645z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M174.579,603.645c-0.622,1.823-3.608,2.941-4.984,2.849
+		C168.774,604.589,173.12,602.184,174.579,603.645z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M273.907,604.358c-0.284,3.212-3.956,1.186-6.052,2.848
+		c-0.743-0.681-1.581-1.267-1.78-2.492C267.884,601.1,270.836,604.978,273.907,604.358z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M423.79,602.933c0.157,0.317,0.312,0.637,0.712,0.712
+		c-1.871,2.031-4.643,2.115-7.12,3.204c-11.207,4.93-23.899,10.697-35.958,15.665c-2.39,0.984-5.093,1.79-7.477,2.849
+		c-2.222,0.986-4.2,2.9-6.764,2.492c-0.249-2.545,2.889-2.311,4.271-2.849c3.572-1.39,6.601-3.054,10.325-4.628
+		c13.132-5.552,26.923-11.013,40.941-17.089C422.779,602.873,423.371,602.989,423.79,602.933z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M366.115,605.425c-0.035,2.813-4.38,1.316-5.34,3.204
+		c-0.937-0.487-1.649-1.199-2.137-2.136C359.687,603.74,363.438,605.049,366.115,605.425z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M331.226,607.562c-2.226,0.385-3.693,1.528-5.696,2.136
+		c-0.587-0.956-1.718-1.367-2.136-2.492C324.325,605.421,331.302,604.038,331.226,607.562z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M378.576,606.494c0.716,1.593-1.195,1.305-2.137,1.78
+		c-0.59,0.298-0.969,1.007-1.424,1.067c-1.721,0.229-3.423-0.453-4.628-1.067C371.897,605.114,375.074,605.537,378.576,606.494z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M305.236,606.494c-0.634,2.688-4.287,2.358-6.052,3.916
+		c-1.844-0.056-1.766-2.032-3.561-2.136C296.567,604.419,302.337,606.585,305.236,606.494z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M318.409,608.274c-2.586,1.163-3.68,1.691-6.408,1.78
+		c-0.101-1.764-2.671-1.854-1.78-3.561C313.133,606.289,317.444,605.415,318.409,608.274z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M344.398,607.917c-0.589,1.908-5.034,1.842-6.053,2.137
+		c-0.9-0.162-0.584-1.809-2.136-2.137C336.776,604.976,342.515,606.359,344.398,607.917z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M290.284,609.341c-0.523,2.046-2.762,1.552-5.696,1.78
+		c-0.619-1.16-1.778-1.781-2.136-3.204C284.637,605.894,287.804,608.159,290.284,609.341z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M356.146,609.698c-0.972,2.113-4.575,1.595-6.052,3.204
+		c-1.357-0.305-1.933-1.391-2.849-2.136C349.043,608.058,353.552,608.622,356.146,609.698z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M456.188,608.986c0.157,0.316,0.312,0.637,0.712,0.712
+		c-12.127,5.837-26.243,11.435-37.738,16.732c-8.217,1.692-12.251,6.558-20.293,6.765c0.371-1.528,1.53-2.268,3.561-2.136
+		c14.146-5.819,29.951-11.784,42.722-17.801c0.975-0.324-0.632-1.248,0.356-1.78c0.82-0.109,0.396,1.028,1.068,1.067
+		C450.115,611.23,452.862,609.426,456.188,608.986z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M367.184,611.478c-1.105,0.557-2.392,0.932-3.204,1.78
+		c-1.798-0.102-3.087-0.711-4.629-1.068C359.457,609.015,366.116,608.934,367.184,611.478z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M321.613,611.833c0.151,1.063-4.191,2.665-5.34,2.492
+		c-3.471-0.521-3.356-3.91,1.067-3.916C319.439,610.407,320.617,611.974,321.613,611.833z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M334.43,612.545c-0.906,1.592-4.889,1.986-6.052,2.137
+		C322.153,609.967,332.158,609.911,334.43,612.545z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M308.085,612.902c-1.639,1.945-4.761,2.145-6.765,0.712
+		C300.993,610.662,306.39,611.365,308.085,612.902z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M433.402,612.19c-4.681,2.677-10.126,4.589-15.309,6.765
+		c-0.179,1.119,0.775,1.392,0,2.136c-0.778-0.053-0.765-0.897-0.712-1.78c-1.067,0.594-2.665,0.658-3.205,1.78
+		c-6.505,2.371-13.192,4.844-19.937,7.477c-2.6,1.015-5.202,3.144-8.188,2.848c0.085-2.214,2.613-1.943,3.916-2.492
+		c10.883-4.578,23.077-9.015,33.466-14.24c3.406-0.392,5.521-2.075,8.188-3.204C432.758,611.172,432.724,612.039,433.402,612.19z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M346.179,613.97c-1.462,2.281-3.556,1.733-6.053,2.848
+		c-0.776-0.647-1.237-1.61-2.492-1.78C339.305,612.405,343.584,612.165,346.179,613.97z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M357.927,615.394c-1.918,0.931-5.379,2.364-7.477,0
+		C351.525,612.944,357.226,612.811,357.927,615.394z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M324.462,616.818c-0.168,2.416-5.401,1.685-6.053-0.355
+		C319.406,614.83,323.211,615.142,324.462,616.818z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M338.702,619.667c-2.562-0.168-6.175,0.716-6.765-1.425
+		C333.557,616.316,338.569,616.448,338.702,619.667z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M348.671,618.598c-0.729,3.466-5.632,3.975-7.477,1.424
+		C341.567,616.955,346.571,617.11,348.671,618.598z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M427.706,628.922c-5.668,3.003-12.913,6.302-18.869,7.833
+		c1.413-3.162,5.471-3.376,8.545-4.629c2.945-1.199,5.744-2.965,8.544-3.916c0.303,0.065,0.336-0.139,0.356-0.355
+		C427.008,627.959,426.979,628.818,427.706,628.922z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M433.402,632.483c-3.515,1.372-7.383,4.219-11.393,3.916
+		c0.092-1.225,2.137-1.9,3.56-2.492c1.386-0.576,3.15-1.467,4.272-1.78C431.02,631.798,432.849,631.066,433.402,632.483z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M34.309,262.227c1.78-0.497,4.846,0.543,7.12,0.712
+		c0.168,1.118-0.958,0.94-1.068,1.78c0.749,0.866,1.583-0.315,2.136,0.356c-0.433,2.178-3.405,1.816-4.628,3.204
+		c-2.127-1.376-6.113-0.125-5.34-3.204c2.812-0.369,5.49,1.06,7.833,0C39.363,263.106,34.756,264.747,34.309,262.227z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M499.265,5.54c-1.389,53.047-1.068,101.987-1.067,160.919
+		c0,13.205-0.447,26.424,0,39.874c0.454,13.673-0.356,27.746-0.356,42.01c0,27.652-0.146,57.174-0.355,83.308
+		c-0.103,12.697,0.725,25.392,0.355,38.094c-0.386,13.267-0.643,26.711-0.355,40.229c0.549,25.97-0.584,52.128-0.356,78.323
+		c0.423,48.656-0.887,105.764-0.356,157.715c-5.348,1.1-10.768-0.055-16.021,0c-15.166,0.158-29.671-0.084-44.502-0.355
+		c-14.279-0.263-28.876,0.042-43.434,0c-4.611-0.014-9.129-0.682-13.528-0.713c-21.432-0.15-43.679,0.176-64.083-0.355
+		c-22.101-0.575-40.988-0.286-60.167-0.356c-22.065-0.081-43.59,0.395-64.794-0.355c-9.923-0.352-19.66-0.816-29.549-0.712
+		c-32.282,0.34-63.598-0.714-96.836-0.713c-22.063,0.002-43.213-0.613-63.727-0.355c-0.76-2.315,2.06-2.908,1.068-4.272
+		c-1.11-1.462,0.716-3.692-0.356-4.984c-0.768-1.831,0.527-3.578,0.712-5.34c0.202-1.923-0.014-4.135,0-6.053
+		c0.031-4.073,0.016-8.062,0-12.104c-0.155-38.812,1.026-80.826,0-118.908c-0.26-9.636-0.184-18.851-0.356-27.77
+		c-0.012-0.641,0.432-1.086,0.356-1.424c-0.048-0.214-0.747-0.202-0.712-1.068c-0.008,0.2,0.681-1.148,0.712-1.78
+		c0.124-2.533-0.551-5.444-0.356-7.477c0.084-0.881,0.692-1.611,0.712-2.491c0.175-7.751-0.534-15.438-0.356-23.142
+		c0.014-0.62-0.168-2.077,0-2.848c0.185-0.849,0.993-1.097,1.068-2.137c0.372-5.12,0.035-11.548,0-17.444
+		c-0.047-7.95-0.591-15.904-0.356-23.854c0.204-6.897-0.062-14.384,0-21.005c0.006-0.671-0.416-1.042-0.356-1.424
+		c0.045-0.282,0.708-0.643,0.712-0.712c0.473-7.061-0.218-14.219,0-21.361c0.461-15.12-0.759-30.339,0-44.857
+		c0.264-5.034-0.348-9.364,0-16.021c0.049-0.941,0.474-1.092,0.356-2.136c-0.09-0.795-0.983-1.308-0.356-2.136
+		c0.186-14.198,0.359-27.312,0.712-40.586c0.064-2.421,0.104-5.177,0-7.476c-0.037-0.822-0.719-1.78-0.712-2.492
+		c0.008-0.84,0.687-1.585,0.712-2.492c0.122-4.374-0.153-8.793-0.356-13.172c-0.09-1.938,0.228-3.662,0.356-5.696
+		c0.031-0.491-0.504-1.15-0.356-1.78c0.075-0.319,0.739-0.604,0.712-1.068c-0.049-0.853-1.014-1.853-1.068-2.848
+		c-0.122-2.256-0.037-4.975,0-7.476c-0.001,0.117,0.761-1.68,0.712-2.848c-0.021-0.513-0.717-0.92-0.712-1.424
+		c0.042-4.279,0.745-9.752,0.356-14.597c-1.021-1.076-0.01-2.375,0-3.56c0.152-19.263,0.153-43.381,0.356-65.151
+		c0.23-24.723,0.413-50.104,0-74.051C4.708,17.658,2.373,4.046,4.404,0.556c1.501-0.99,5.764-0.356,8.9-0.356
+		c17.614,0,36.035,0.712,54.114,0.712c42.362,0,88.088,0.474,128.521,0.712c40.946,0.241,82.302,0.854,122.826,1.424
+		c5.122,0.072,10.199,0.4,15.309,0.356c5.264-0.046,10.422,0.718,15.664,0.712c10.654-0.012,21.417-0.162,32.042,0
+		C419.555,4.693,458.989,5.761,499.265,5.54z M408.837,286.792c0.897-1.246-0.384-2.774-2.136-2.492
+		C408.02,285.672,407.6,285.135,408.837,286.792z M371.812,6.608c-17.012-0.422-33.37-0.294-49.13-0.712
+		c-1.762-0.047-3.547-0.73-5.341-0.712c-1.424,0.015-3.356,0.782-3.916,0.712c-0.249-0.031-0.397-0.682-1.068-0.712
+		c-4.565-0.206-9.22-0.311-13.884-0.356c-16.656-0.163-33.219,0.039-49.842,0c-3.92-0.009-7.742-0.703-11.749-0.712
+		c-3.854-0.008-7.848,0.464-11.749,0.356c-1.816-0.05-3.526-0.698-5.34-0.712c-2.229-0.017-4.514,0.375-6.764,0.356
+		c-20.15-0.175-39.334-0.611-59.455-1.068c-8.148-0.185-16.354,0.232-24.565,0c-6.625-0.187-13.346-0.447-19.225-0.356
+		c-2.965,0.045-4.426,0.686-5.696,0.712c-0.017,0-0.463-0.68-0.712-0.712c0.053,0.007-0.935,0.377-1.424,0.356
+		c-4.354-0.191-12.307-0.306-19.937-0.356c-16.62-0.108-33.468-0.178-50.91-0.356c-8.116-0.083-16.452-0.412-24.209,0
+		C6.467,2.358,6.095,2.829,5.828,3.048c-0.48,6.004-0.294,13.599-0.356,20.293c-0.495,53.249-0.703,96.358,0,147.034
+		c0.406,29.258-0.269,57.792,0,86.156c0.104,10.985,0.232,24.052,0,34.89c-0.013,0.612-0.346,1.186-0.356,1.78
+		c-0.187,11.809-0.356,20.697-0.356,34.177c0,4.117-0.591,8.045,0.712,11.037c1.643-14.806,1.036-28.295,1.424-41.654
+		c0.907-31.201,0.221-63.779,0.356-91.852c0.058-11.963,0-23.173,0-35.246c0-23.54,0.681-46.733,0.712-66.931
+		c0.02-12.778-0.671-26.26-0.356-40.229c0.065-2.893,0.108-5.635,0-8.188c-0.137-3.234,0.31-5.911,0.356-9.256
+		c0.104-7.544-0.323-21.301-0.356-30.617C7.594,10.554,7.674,5.527,8.32,4.828c1.53-1.657,9.147-0.936,14.953-0.712
+		C37.7,4.672,59.303,5.021,71.334,5.184c9.863,0.133,20.157-0.229,28.837-0.356c17.21-0.252,39.761,1.068,61.234,1.068
+		c22.216,0,43.073,0.598,62.659,0.712c5.003,0.029,9.835-0.336,14.596-0.356c3.786-0.016,8.763,0.639,13.884,0.712
+		c20.91,0.3,40.56,0.455,60.167,0.356c9.592-0.048,19.732,0.779,29.905,0.712c10.208-0.067,20.407,0.293,30.617,0.356
+		c10.095,0.062,20.232,0.002,30.262,0.356c10.732,0.378,21.473-0.045,32.041,0.356c10.707,0.406,19.459,0.068,28.837,0.356
+		c2.487,0.077,4.876-0.349,7.477-0.356c0.843-0.002,1.991,0.651,2.849,0.712c6.173,0.437,12.613-0.267,19.225-0.356
+		c0.975,9.09,0.978,18.09,0.712,27.057c-0.253,8.533-0.091,17.07-0.356,25.633c-0.525,16.966-0.534,35.996-0.355,54.826
+		c0.255,26.898,0.011,54.231,0,81.171c-0.003,7.8,0.041,16.331-0.356,21.717c-0.042,0.569,1.206,2.906-0.712,2.492
+		c1.162,2.443,0.788,5.468,0.712,8.188c-0.478,17.184-0.182,34.908,0,52.334c0.027,2.587,0.637,5.584-1.067,7.476
+		c2.558-1.554,1.061,2.414,1.067,2.492c1.143,12.893-0.074,20.905,0,32.753c0.01,1.516-0.319,1.299-0.355,2.137
+		c-0.554,12.685,0.485,27.742,0.355,41.298c-0.137,14.37-0.927,27.59-0.712,40.941c0.218,13.505,0.154,26.818,0,41.298
+		c-0.309,29.061-0.355,54.894-0.355,86.512c0,29.85,0.564,60.204-0.713,90.784c-0.965,0.886,0.301,0.519,0.713,0
+		c0.135,3.829,0.151,8.918,0,12.46c-2.474,2.079-6.073,1.476-9.257,1.424c-18.22-0.294-38.112-0.538-58.387-1.067
+		c-4.05-0.105-7.578-0.781-8.9,0.712c0.578,2.614,4.202-0.514,4.629,1.068c1.105,0.302,2.445,0.107,3.56,0
+		c1.266-0.123,2.372-0.887,3.204-0.713c0.306,0.064,0.614,0.709,0.712,0.713c3.111,0.119,6.521-0.02,9.969,0
+		c18.709,0.102,39.642,0.299,56.25,0.712c0.992-6.094,0.298-12.321,0.356-18.513c0.161-17.169,0.138-37.415,0.356-57.318
+		c0.283-25.854,0.278-53.321,0.712-79.392c0.604-36.319-0.962-75.261-0.356-113.569c0.181-11.447,0.205-25.955,0-40.586
+		c0.379-1.676-1.335,0.72-1.068-1.067c1.952,0.032,0.997-1.887,1.068-2.849c0.125-1.684,0.336-3.75,0.356-5.34
+		c0.336-26.499,0.486-46,0.355-69.779c-0.148-27.074,0.326-56.605,0.356-84.375c0.062-57.416,0.521-103.979,0.355-162.699
+		C456.994,6.866,408.079,7.507,371.812,6.608z M12.592,9.1c-0.745,3.599-0.228,10.117-0.356,13.173
+		c5.001,0.409,9.669,0.775,14.24,0.356c0.218-4.028,2.124-6.68,3.561-9.613c-3.554-1.39-7.319-0.137-10.681-0.356
+		c-1.503-0.098-3.634-0.197-4.628-1.424c1.709-1.245,4.469-1.139,7.121-1.068c3.342,0.09,10.359,2.082,10.68-1.068
+		C26.271,8.795,19.206,8.842,12.592,9.1z M35.733,9.1c-2.098,3.681-5.698,7.48-5.696,12.104c-0.274,0.468-1.622,2.751,0,2.848
+		c2.321-5.274,3.409-11.781,8.544-14.241c-0.056-0.419,0.062-1.01-0.356-1.068C38.072,9.54,36.471,8.888,35.733,9.1z M48.194,8.744
+		c-0.494,0.575-1.009,1.127-1.424,1.78c10.825-0.142,19.731,1.424,30.974,1.424c1.969,0,4.901-0.586,5.696,0.712
+		c-0.77,1.218-2.311,1.329-3.56,1.424c-2.596,0.198-5.879-0.9-9.256-1.068c-10.746-0.535-17.721-0.348-26.345-0.356
+		c-1.237,1.255-2.283,2.701-2.848,4.628c12.833,0.563,32.707,0.384,43.79,0.356c0.238-2.611,0.498-5.198,0.356-8.188
+		C73.072,8.896,58.62,9.296,48.194,8.744z M202.704,156.49c-3.595,5.875-7.784,11.221-12.816,15.665
+		c-2.207,1.948-5.116,3.631-7.476,5.696c-2.49,2.178-4.301,4.913-6.765,6.765c-1.96,1.474-3.835,2.896-5.696,4.272
+		c-1.358,1.004-2.974,1.485-4.272,2.492c-2.949,2.287-4.775,5.909-8.9,6.408c-1.992,5.879,1.645,9.194,3.916,12.817
+		c1.607,0.42,0.796-1.578,2.492-1.068c0.933,2.034,0.128,5.806,2.492,6.408c-0.434-2.177-1.31-3.912-1.424-6.408
+		c3.863-0.065,2.548,5.047,4.984,6.408c0.376-1.878,1.305-3.204,1.424-5.34c1.503-0.034,2.086-2.287,2.492-2.849
+		c2.835-3.924,5.391-6.913,9.256-9.612c0.632-1.044,0.486-1.205,0.712-2.136c3.905-1.332,5.975-4.256,9.968-5.34
+		c4.285-1.164,6.419,0.252,9.969,1.424c1.812,0.599,1.211,0.841,2.492,1.78c0.488,0.358,1.238,0.615,1.424,0.712
+		c0.911,0.475,2.127,0.565,3.204,1.068c3.524,1.646,7.156,4.744,11.393,4.628c2.198,2.026,5.663,4.862,9.256,4.272
+		c2.349-0.385,2.869-3.261,5.34-3.204c4.131,1.468,8.856,4.752,13.884,5.34c3.618,0.423,4.076-1.256,6.764-2.136
+		c2.772-0.907,6.191-0.718,8.545-1.424c1.15-0.345,1.807-1.199,2.848-1.424c3.536-0.764,5.839,0.332,8.9,1.068
+		c1.932,0.464,4.144,0.608,5.696,1.068c1.461,0.433,2.763,1.819,4.272,2.136c0.771,0.162,1.745-0.244,2.492,0
+		c3.365,1.1,6.424,3.539,10.324,4.272c0.551-9.615,1.149-23.719,0.712-33.109c-0.07-1.517,0.896-3.908-0.712-4.628
+		c-1.328,1.114-1.275,4.146-1.424,6.764c-0.148,2.603,0.11,5.228,0,7.833c2.387,0.563,3.089,8.005-1.068,7.12
+		c-0.194-0.518,0.416-1.84-0.356-1.78c0.054,0.884-0.184,1.478-0.712,1.78c-2.047-1.178-3.066,0.32-5.34,0.712
+		c1.558-0.252,2.425,0.186,2.848,1.068c0.727-0.817,2.957-0.129,4.272-0.356c0.492,0.932,1.721,1.128,1.78,2.492
+		c-2.245,1.541-6.936,1.128-9.257,0.712c-0.653-0.889-1.19-1.895-2.492-2.136c1.586-3.737,0.903-7.87,0.713-13.173
+		c-0.138-3.822,0.672-7.955,0.712-11.392c0.059-5.123-1.49-9.372,2.136-11.393c2.104-0.388,4.815-0.168,6.765-0.712
+		c0.917-0.175,2.014,2.359,2.136,0.712c0.195-19.379,0.205-38.271,0.356-55.183c0.07-7.922,0.816-16.208,0.355-23.853
+		c-0.167-2.779,0.155-4.484,0.356-6.408c0.433-4.15-0.415-8.851-0.356-13.528c0.01-0.792,0.652-1.644,0.712-2.492
+		c0.226-3.172,0.122-6.968,0-9.969c-0.375-9.25,0.271-21.691-0.355-31.685c-0.108-1.72-0.132-4.86-2.137-5.34
+		c-1.897,1.222,0.099,3.659,0.356,4.984c0.111,10.332-0.676,19.982-0.712,28.837c-0.003,0.753,0.682,1.354,0.712,2.136
+		c0.021,0.53-0.35,1.048-0.356,1.78c-0.008,0.953,0.109,2.084,0,2.848c-0.113,0.794-0.82,0.871-1.067,1.78
+		c-0.337,1.239,0.827,3.427-0.356,4.628c-6.078,1.089-7.718-4.688-11.036-7.477c-2.973-0.046-5.164-2.104-8.188-1.068
+		c-4.595,1.574-2.443,8.629-6.765,10.325c-1.094-1.754-2.472-3.224-5.34-3.205c-1.509-3.238-4.939-4.555-7.477-6.764
+		c-1.152-0.44-0.271,1.152-1.424,0.712c-0.516-0.908-1.946-0.901-1.424-2.848c-1.062-0.079-1.211,1.315-2.137,0.356
+		c0.379-2.204-1.052-0.534-1.424-2.136c0.666-11.409,1.377-24.108,0.712-35.602c-3.49-0.557-9.445,0.106-14.24-0.712
+		c0.903,1.891,2.775,1.45,4.272,2.492c1.569,1.092,3.641,3.926,4.628,6.052c5.015,10.794,1.355,22.192-6.052,28.125
+		c-2.423,5.873-6.495,10.227-12.105,12.46c-0.673,0.268-1.05-0.184-1.78,0c-1.833,0.462-3.136,2.318-4.984,2.848
+		c-2.121-0.072-3.798,0.951-6.052,1.068c-3.313,0.172-5.914-1.022-7.832-1.424c-4.966-1.041-8.669-0.529-11.749-2.492
+		c-1.69-1.078-3.079-3.049-4.272-4.628c-3.456-4.573-6.583-10.627-5.696-19.581c0.19-1.919,1.319-4.015,1.424-6.408
+		c1.483-0.89,2.322-2.425,2.848-4.272c3.597-4.354,8.485-7.417,14.953-8.9c1.497,0.329,1.495,0.091,2.848,0.712
+		c0.368-3.43,3.545-4.049,5.34-6.052c-16.776,0.142-35.135,0.134-53.759-0.712c-8.776-0.398-15.409,0.11-23.497,0
+		c-2.965-0.04-6.054-0.667-8.9-0.712C115.448,9.244,101.507,9.828,89.135,9.1c-1.655,8.936-0.731,17.962-0.712,26.701
+		c0.034,15.675-0.416,32.235,0,46.282c0.261,8.814,0.194,16.814,0.356,25.989c0.047,2.677,0.637,5.027,0.356,7.477
+		c-0.175,1.521-0.964,2.785-1.068,4.272c-0.371,5.335,1.7,10.516,1.068,16.021c-0.164,1.428-0.926,2.806-1.068,4.272
+		c-0.373,3.847,0.302,8.263,0.356,12.816c0.022,1.854-1.114,4.061,0.356,5.696c1.261-2.537,2.882-4.713,5.696-5.696
+		c1.314-1.89,2.303-4.105,3.916-5.696c-1.814-3.228-0.063-7.063-0.356-10.68c-0.103-1.271-0.825-2.292-1.068-3.56
+		c-1.181-6.174-0.531-9.792,2.136-13.529c4.423-4.596,11.286-6.752,15.665-11.393c-3.695-6.273-8.233-11.704-12.104-17.801
+		c2.372-6.137,3.761-13.823,9.612-18.157c4.143-3.068,9.825-5.316,15.665-7.476c2.146-0.794,5.221-1.222,7.833-2.136
+		c1.829-0.64,3.143-1.982,4.628-2.136c2.132-0.221,4.389,0.889,6.409,1.424c1.016,0.57,1.72-1.084,2.848-1.068
+		c0.316,0.005,1.193,0.78,1.424,0.712c1.25-0.369,0.87-1.589,2.492-1.424c0.362,0.037,2.126,0.931,3.56,1.78
+		c3.465,2.053,5.643,4.294,8.188,6.408c3.03,2.516,7.178,7.076,6.408,11.393c-0.599,3.356-4.854,4.568-4.272,8.9
+		c-3.886,5.251-7.825,10.451-13.529,13.884c-0.745-0.205-1.016-0.882-2.136-0.712c-2.041,4.367-6.577,6.24-8.9,10.325
+		c3.174,3.353,3.992,9.062,7.121,12.46c2.04,0.96,4.021,1.796,6.764,2.848c2.204,0.844,5.59,1.649,6.052,3.56
+		c1.271,5.253-7.335,6.51-11.749,8.188c0.429,3.075-0.781,7.833-4.628,9.257c-0.246,3.413,0.434,5.856,0.712,7.832
+		c1.421,1.071,3.933,1.052,5.696,1.78c-0.423-1.757,1.715-1.362,2.492-2.136c0.708-0.705,0.652-1.538,1.424-2.136
+		c1.968-1.524,4.071-1.59,6.408-2.492c1.62-0.625,2.954-1.823,4.628-2.492c1.704-0.681,3.458-1.229,5.34-1.424
+		c4.17-4.137,7.198-9.416,13.528-11.393c0.273-1.828-0.617-2.704,0-3.916c7.199-5.262,16.801-8.12,25.989-11.393
+		c0.381-1.042,1.01-1.838,0.712-3.56c1.295-2.473,5.059-3.373,4.984-6.408c-0.04-1.604-2.854-3.611-3.917-6.052
+		c-0.714-1.643-1.444-4.354-2.136-6.408c-1.98-5.876,0.942-10.508,1.424-15.309c1.735-1.129,1.625-3.275,2.848-4.984
+		c1.391-1.944,4.352-3.774,7.12-5.34c2.776-1.57,5.696-3.545,7.833-4.628c6.419-3.253,13.842,0.754,21.361,1.068
+		c0.032,1.33,0.399,1.015,0,2.136c1.95-0.289,2.134,1.189,3.916,1.068c-0.258,1.089,0.614,1.047,0.356,2.136
+		c3.052,1.22,3.825,4.719,6.052,6.764c0.798,4.373,1.696,6.667,2.849,10.324c-0.934,1.233-1.449,3.169-0.356,4.628
+		c-1.661,0.712-2.08,2.667-1.78,5.34c-3.013,4.506-8.716,5.984-7.832,13.528c-4.007,4.656-6.727,10.599-13.172,12.817
+		c-0.576,1.204-1.013,2.547-1.424,3.916c-2.002,0.608-3.342,1.879-4.984,2.848c-1.376,4.795-3.934,8.409-6.765,11.749
+		c-0.813,0.492-2.221,0.39-2.136,1.78c4.731-1.291,3.961,3.979,1.424,4.628c-1.607,0.302-2.008-0.603-2.492-1.424
+		c0.129,3.773,3.65,6.846,5.34,9.613c0.628,1.028,1.216,2.658,1.78,3.204c1.751,1.696,4.518,1.176,6.052,3.204
+		c0.927,2.482-1.821,3.147-1.068,4.272c0.085-0.387,0.586-0.854,0.712-0.356c-0.442,1.101-1.175,1.91-2.136,2.492
+		c-2.374-1.8-5.771,1.164-8.188-0.712c0.305-1.981-1.502-2.678-1.78-4.984c-4.077-1.856-5.758-6.11-8.544-9.256
+		c-2.879,0.35-2.677-1.367-4.628-2.492C212.397,159.927,205.42,157.921,202.704,156.49z M225.489,11.592
+		c0.576,0.581,1.489-0.318,2.848,0C228.551,10.244,225.172,9.933,225.489,11.592z M255.751,11.592
+		c-0.076,2.154,0.222,3.966,0.355,4.984c0.811-0.258,1.818-0.317,2.492-0.712c-1.004-1.75,0.423-2.783,0.356-4.628
+		C257.841,11.309,256.341,10.996,255.751,11.592z M261.091,11.236c-0.683,0.86-0.225,2.861-0.356,4.272
+		c7.464-0.022,13.72-2.397,21.005-1.424c0-0.831,0-1.662,0-2.492C274.752,11.857,268.221,11.101,261.091,11.236z M285.3,16.933
+		c-1.096,0.668-0.898,1.079-1.068,2.136c-0.72,4.483-0.08,10.116,0,14.597c0.055,2.994-0.144,5.455,0,8.188
+		c0.095,1.788-0.673,4.988,2.137,4.628c0.269-3.131,0.487-5.682-0.712-8.188c0.422-10.518,1.683-18.4,0.355-26.345
+		c-0.355,0-0.712,0-1.068,0C284.332,14.025,284.139,15.553,285.3,16.933z M307.017,12.304c-0.173,0.421-0.38,0.807-0.712,1.068
+		c0.926,4.896-0.772,11.394,0.356,17.8c2.069-0.171,0.943-2.463,1.067-3.916c0.388-4.548,0.45-10.988,0.712-14.953
+		C307.966,12.304,307.491,12.304,307.017,12.304z M309.509,12.304c0.08,0.673-0.401,0.786-0.356,1.424
+		c-0.233,1.302,0.771,1.366,0.713,2.492c-0.79,1.932-0.269,5.197-0.356,8.188c-0.081,2.75-1.468,7.209,2.136,6.052
+		c-0.056-5.936-0.445-12.348-0.355-18.157C310.695,12.304,310.103,12.304,309.509,12.304z M313.781,27.969
+		c0.032,1.396-0.302,2.951,0,4.272c1.865-0.847,1.067-3.896,1.067-6.408c0-3.639-0.412-7.602,0.356-9.256
+		c-0.971-1.367-0.297-2.23-0.356-4.272c-0.355,0-0.712,0-1.067,0C312.981,17.12,313.658,22.675,313.781,27.969z M394.24,17.645
+		c-1.25-0.063-1.171,1.203-2.136,1.424c-2.731,6.337-7.371,13.321-10.681,21.005c-1.859,1.733-2.679,4.457-3.56,6.409
+		c-0.957,2.117-2.117,3.024-3.205,4.984c-0.438,0.79-0.591,1.862-1.067,2.848c-1.347,2.782-2.379,5.478-4.272,7.833
+		c0.803,1.951,0.849,4.825,1.068,6.408c2.467-1.449,2.333-5.5,4.628-7.121c0-0.593,0-1.187,0-1.78
+		c5.807-8.909,9.767-19.664,16.732-27.413c1.095-3.752,3.475-6.98,4.984-9.612c1.054-1.837,1.161-4.156,2.849-4.628
+		c-0.524-2.412,2.124-3.186,1.424-4.628c-2.529-0.374-3.767,0.171-6.053-0.356C394.858,14.702,394.137,15.76,394.24,17.645z
+		 M402.429,16.577c3.008-1.022,8.218,0.229,7.477-3.561C406.356,13.809,402.429,12.127,402.429,16.577z M456.543,13.373
+		c-2.499,0.04-5.459-0.312-8.188-0.356c-4.142-0.067-9.11,0.659-13.885,0c-1.497-0.207-2.965,1.581-4.271,1.78
+		c-3.441,0.526-7.848-1.411-9.257,2.848c12.38,0.189,25.917-1.212,37.382-2.136c1.402-0.113,3.826,0.602,4.628-1.068
+		C461.649,12.44,458.828,13.336,456.543,13.373z M467.224,13.729c-2.129,34.782,0.339,67.058-1.78,102.888
+		c-0.51,8.622,0,17.703,0,26.701c0,33.956-0.806,65.256-0.355,96.124c7.509,0.924,16.512,2.228,23.497,2.492
+		c0.995-3.068,0.436-6.66,0.355-10.324c-0.098-4.489,0.637-9.076,0.712-13.529c0.066-3.916-0.3-7.846-0.355-11.749
+		c-0.409-28.64-0.067-54.229,0.355-80.459c0.34-21.091-0.104-38.17,0.712-59.811c0.392-10.392-0.174-22.822,0-33.465
+		c0.076-4.654,0.673-12.287,0.356-18.869C484.538,13.519,476.487,14.183,467.224,13.729z M289.572,16.933
+		c0.061-0.891-0.547-1.115-1.068-1.424C287.237,16.207,288.453,17.855,289.572,16.933z M261.803,18.356
+		c1.076-0.11,2.769,0.396,2.849-0.712C263.758,17.938,261.585,16.953,261.803,18.356z M453.339,18.712
+		c-1.444,0.087-2.991-0.494-4.628-0.356c-0.875,0.074-1.567,0.574-2.492,0.712c-4.388,0.657-8.32,0.21-11.749,0.356
+		c-2.316,0.099-4.479,0.625-6.408,0.712c-5.25,0.236-9.908-1.935-10.68,3.204c12.06-0.076,24.54-1.849,35.245-2.492
+		c3.671-0.221,7.731,0.879,11.036-1.068c-0.828-0.534-0.543-0.871-0.355-1.78C459.727,16.824,456.185,18.542,453.339,18.712z
+		 M205.908,18.712c-7.133,1.414-14.293,8.573-15.665,13.885c-0.598,2.316-0.621,6.931-0.356,9.256
+		c0.57,4.998,3.936,8.831,5.696,12.816c3.771,2.166,8.11,5.663,13.528,5.696c4.334,0.027,11.982-2.188,14.241-3.916
+		c1.3-0.995,3.98-4.662,5.34-7.477c0.905-1.874,0.718-2.979,1.068-4.272c1.308-4.829,0.827-9.062-0.356-13.173
+		C224.773,24.328,217.554,16.404,205.908,18.712z M258.599,21.205c-0.771,3.244,0.368,8.139,0.356,12.816
+		c-0.007,2.456-0.891,4.974,0,7.121c1.159-0.121,1.85-1.888,3.204-0.712c-0.417,1.614-1.648,3.714-3.204,2.136
+		c0.351,3.369,5.225,1.347,8.9,1.068c3.003-0.228,5.685-0.766,7.12,0c-0.645,2.018-3.688,1.678-5.696,1.78
+		c-3.033,0.154-6.678-0.731-8.188,1.424c2.848,1.019,6.354-0.151,9.969-0.356c4.282-0.244,9.024,0.624,11.748-0.712
+		c-0.254-9.321-2.078-19.606-0.712-27.057C273.634,19.062,267.07,21.008,258.599,21.205z M373.592,20.137
+		c-0.146,0.858,0.65,0.774,0.355,1.78c2.417,0.989,5.285-0.891,9.257-0.356c0.181-1.058,2.413-2.458,0.712-3.204
+		C381.565,20.146,375.232,18.675,373.592,20.137z M41.429,19.068c0,1.306,0,2.611,0,3.917c10.692,0,24.115,0,35.246,0
+		c2.845,0,9.425,1.598,8.544-3.204C72.977,18.782,53.658,20.064,41.429,19.068z M401.005,19.424
+		c-0.789,1.11-1.693,2.105-2.137,3.561c1.153,0.305,3.547-0.865,5.696-0.712c0.021-1.286,0.888-1.724,1.068-2.849
+		C403.695,18.953,403.243,20.089,401.005,19.424z M255.038,46.838c1.788,0.419,4.375,0.76,5.341-0.356
+		c-4.349-0.673-3.757-4.591-3.561-9.613c0.195-4.973-0.276-11.248,0-16.021c-0.455-0.02-0.493-0.457-1.067-0.356
+		C255.173,28.465,254.982,36.75,255.038,46.838z M459.747,22.273c-4.744-0.063-9.974,1.607-14.952,1.78
+		c-2.181,0.076-3.857,0.097-6.053,0.356c-7.649,0.902-15.546-0.304-22.785,1.78c0.353,1.394-0.786,2.067,0,2.848
+		c10.938-0.74,26.142-2.028,38.806-2.848c3.02-0.196,9.446,1.154,9.257-2.848C462.772,22.364,461.133,22.291,459.747,22.273z
+		 M373.947,28.325c2.41-0.423,4.72,0.225,6.765-1.068c0.321-3.288-2.574-3.359-5.696-3.204
+		C374.804,25.515,373.487,27.326,373.947,28.325z M12.592,24.765c-0.686,0.594-0.455,3.283,0,3.917
+		c3.803-0.97,7.473,0.674,11.749,0.356c0.508-1.391,1.425-2.372,1.424-4.272C21.354,24.994,15.936,24.426,12.592,24.765z
+		 M41.786,24.409c-0.262,1.993-1.79,2.72-2.848,3.916c9.512,0.342,21.665,0.356,33.465,0.356c4.25,0,8.892-0.181,12.816-1.068
+		c0.245-1.432-0.341-2.032-0.356-3.204C70.03,24.849,56.368,24.994,41.786,24.409z M26.121,48.262
+		c0.105,0.936-1.381,0.28-1.068,1.424c-0.056,0.419,0.061,1.01-0.356,1.068c-0.211,0.734,0.356,1.525,0.356,2.492
+		c-0.001,1.764-1.196,6.896,0,7.12c2.835,0.08,1.404-3.055,1.424-4.628c0.042-3.235,0.913-7.042,1.068-11.037
+		c0.082-2.093-0.541-4.287-0.356-6.052c0.053-0.506,0.59-0.608,0.712-1.068c0.599-2.266,1.075-3.289,1.424-4.984
+		c0.559-2.712,0.176-5.325,0.712-7.833c-0.356,0-0.712,0-1.068,0C26.69,32.57,26.078,41.271,26.121,48.262z M395.309,30.105
+		c2.503-1.77,8.239-0.305,9.256-3.56C400.73,24.984,395.308,25.386,395.309,30.105z M440.522,30.105
+		c-4.39,0.215-9.076-0.23-13.173,0.356c-0.952,0.136-1.889,0.631-2.848,0.712c-4.529,0.383-9.986-1.507-9.969,3.205
+		c3.884,0.572,11.347-2.024,14.597-1.068c-0.496,2.044-3.16,2.902-4.984,3.204c-2.685,0.445-6.366-0.3-9.612,0
+		c-0.895,0.444-3.245,1.783-3.56,3.916c2.88,0.171,6.432-0.531,9.612-0.712c2.816-0.16,6.405-0.892,7.12,0.712
+		c-4.696,2.069-11.929,1.6-18.157,2.136c-1.192,1.132-0.673,1.876-1.424,3.56c4.482,0.635,10.554-0.069,15.309-0.356
+		c1.524-0.092,3.804-1.557,4.628,0.356c-1.713,2.275-4.832,1.61-8.544,1.78c-4.501,0.207-8.743,1.341-12.461,1.068
+		c0.376,1.8-0.812,2.037-0.712,3.561c4.479,0.462,10.536-0.536,15.665-0.712c1.907-0.065,4.413-0.193,5.696,0.712
+		c-1.354,2.537-4.875,1.213-7.477,1.424c-1.996,0.162-4.315,0.896-6.765,1.068c-5.484,0.385-11.364-1.541-11.748,3.561
+		c4.132,0.05,9.79-0.122,14.597-0.356c3.378-0.165,7.107-1.4,9.612,0c-0.108,1.57-1.819,1.583-2.849,1.78
+		c-4.316,0.826-10.537,0.263-15.664,0.712c-2.267,0.199-4.443,1.094-6.408,1.068c0.285,1.235-0.53,1.368-0.356,2.492
+		c3.536,0.534,8.061-0.122,12.104-0.356c4.914-0.285,10.696-2.012,13.529,0c-1.906,1.881-4.6,1.728-7.833,1.78
+		c-3.617,0.059-6.372,0.41-8.9,0.712c-5.121,0.612-11.23-0.596-13.172,3.204c7.71-0.231,17.724-1.185,25.633-1.78
+		c1.587-0.12,4.238-1.345,4.984,0.712c-4.013,2.22-10.243,1.643-16.021,2.136c-3.256,0.277-6.392,0.946-9.257,1.068
+		c-3.167,0.134-7.086-0.012-7.477,3.56c2,0.817,8.729-1.379,8.545,1.78c-2.031,2.241-9.983-1.438-9.969,2.848
+		c2.298,1.445,7.87-1.74,9.257,1.068c-2.892,2.449-11.667-0.985-11.037,4.984c2.459,0.972,6.13-1.331,8.9,0
+		c-1.195,3.652-7.473,1.059-11.036,2.848c0.037,1.461-1.423,1.425-1.068,3.204c5.52,0.422,10.197-1.565,16.021-0.356
+		c0.27,2.348-2.68,1.585-4.271,1.78c-1.873,0.229-3.885,0.556-5.696,0.712c-3.993,0.343-8.701-0.621-8.9,3.56
+		c1.961,0.246,5.667,0.188,9.256,0c2.732-0.143,6.621-1.833,7.477,0.712c-2.562,1.463-8.817,1.513-12.104,1.78
+		c-2.707,0.221-6.813-0.621-6.765,2.136c2.157,1.178,5.222,0.886,7.833,0.712c1.746-0.117,3.476-0.316,5.34-0.356
+		c1.497-0.032,3.915-1.36,4.628,0.712c-0.639,2.197-3.351,1.221-5.34,1.424c-3.277,0.334-7.139,0.745-9.612,1.424
+		c-0.269-0.474-3.48-0.893-3.204,0.356c-0.193,2.413,3.426,1.399,4.984,1.424c2.211,0.035,4.387,0.147,6.408,0
+		c2.734-0.199,6.04-1.863,7.12,0.356c-3.164,2.77-10.363,1.504-14.597,3.204c3.762,2.491,11.405-0.557,15.309,2.136
+		c-1.122,2.201-5.791,0.854-6.765,3.204c2.893-0.467,6.8,0.34,10.681,0c5.808-0.509,11.767-0.583,17.444-1.068
+		c2.211-0.189,4.891-1.484,6.765,0c-1.862,2.346-4.636,1.541-8.188,1.78c-7.754,0.522-12.64,0.755-21.36,1.78
+		c0.3,2.7,3.868,2.243,6.052,2.136c4.533-0.222,10.386-1.159,14.597-1.424c1.737-0.109,4.506-1.044,4.984,1.068
+		c-2.564,1.737-7.052,0.68-11.036,1.068c-2.201,0.215-4.424,0.792-6.408,1.068c-1.77,0.246-4.515,0.153-4.984,1.78
+		c0.708,2.821,4.127,1.219,6.408,1.068c5.415-0.359,12.644-0.212,17.089-1.424c1.578,0.32,1.567,2.23,3.916,1.78
+		c0.045-3.285,1.006-6.336,1.424-8.544c0.233-1.231-1.007-3.452,1.068-3.204c-0.304,7.78,0.08,18.439,0,25.989
+		c-0.022,2.05,1.108,4.471-1.425,5.34c-2.06-1.46-0.797-5.021-0.712-7.833c0.078-2.577-0.032-4.959-0.355-6.408
+		c-4.886,2.947-18.13,0.62-24.565,3.204c0.397,2.925,3.721,1.879,6.408,1.78c2.208-0.081,4.773,0.148,7.121,0
+		c3.428-0.217,7.241-1.608,8.544,0.356c-4.5,2.234-12.738,1.276-16.377,2.492c1.303,2.507,5.417,1.958,9.257,1.78
+		c2.021-0.094,5.079-1.446,5.696,0.712c-2.393,1.405-6.145,1.45-9.612,1.78c0.06,2.859,3.616,3.063,5.695,3.204
+		c11.522,0.783,26.261-1.741,37.738-1.78c0.015-1.172,0.601-1.772,0.355-3.204c-5.996,0.482-14.325,0.939-19.937,0.712
+		c-1.188-0.048-3.546,1.494-3.916-0.712c1.3-2.379,5.136-1.424,8.188-1.424c5.682,0,11.959,0.246,15.664-1.068
+		c0-0.95,0-1.899,0-2.848c-4.609-0.484-10.783,0.797-16.376,0.712c-1.764-0.027-4.446,0.744-5.341-1.068
+		c1.755-1.369,4.209-0.612,6.408-0.712c4.707-0.213,9.882-1.055,14.953-0.712c0.538-1.341,0.595-2.615,0.355-3.916
+		c-3.442,0.066-8.229,0.381-12.816,0.712c-2.717,0.196-7.667,2.378-7.832-1.068c5.647-1.948,14.572-0.618,20.648-2.136
+		c-0.346-1.458,0.882-2.281,0-3.204c-2.294-1.12-5.477,0.439-8.9,0.712c-5.771,0.46-12.581,1.053-16.376-0.356
+		c6.455-2.682,16.608-1.667,24.921-2.492c0.41-1.212,0.934-2.705,0.355-3.916c-7.485-0.781-16.707,1.525-23.853,1.068
+		c0.568-3.275,5.48-2.192,8.9-2.492c5.529-0.484,11.488-0.789,15.309-1.424c-0.078-1.146,0.63-1.506,0.356-2.848
+		c-2.157-0.492-4.204,0.467-6.409,0.712c-3.366,0.374-7.034,0.109-10.324,0.356c-3.709,0.278-7.071,1.947-9.612,0.712
+		c1.058-2.406,3.938-1.285,6.053-1.424c1.788-0.118,3.73-0.949,5.696-1.068c3.528-0.214,6.878,0.263,10.68-0.356
+		c1.66-0.271,4.165,0.194,4.272-2.136c-16.861-0.701-36.596,3.477-53.402,3.204c0.427-2.284,2.504-2.612,3.916-2.848
+		c1.951-0.326,4.228,0.417,6.408,0.356c13.133-0.364,29.826-2.739,42.366-3.204c1.198-0.63-0.24-2.055,0.712-3.204
+		c-5.748-0.305-12.92,1.316-20.293,1.78c-7.564,0.476-13.876,1.282-19.937,1.78c-2.438,0.2-4.894-0.162-7.12,0
+		c-1.604,0.117-3.301,1.007-4.629,0c1.257-2.598,4.876-2.051,7.121-2.136c4.139-0.156,8.44,0.052,12.816-0.356
+		c10.494-0.979,21.155-2.19,31.686-2.848c-0.02-1.153,0.909-2.867-0.356-3.917c-4.388,0.165-9.249,1.614-14.597,2.136
+		c-1.953,0.19-4.035-0.182-6.053,0c-6.49,0.584-12.851,2.513-18.868,2.492c-0.848-0.003-1.98-0.324-2.849-0.356
+		c-2.502-0.093-4.987,1.457-7.12,0.356c0-0.475,0-0.95,0-1.424c6.774-1.676,13.48-0.327,19.581-1.424
+		c1.907-0.343,3.306-0.216,4.984-0.356c1.719-0.144,3.541-0.847,5.34-1.068c7.017-0.864,13.423-1.427,19.938-2.492
+		c0.077-1.714,0.272-2.738,0-3.916c-4.149,0.679-8.516,1.44-12.817,1.78c-5.621,0.444-11.265,0.644-16.732,1.068
+		c-2.327,0.181-4.772,0.873-7.12,1.068c-2.669,0.223-5.331,0.034-7.832,0.356c-2.027,0.261-4.323,1.707-6.053,0.356
+		c0.388-2.873,3.914-1.889,6.053-2.136c1.465-0.169,2.971-0.939,4.271-1.068c1.419-0.14,3.106,0.435,4.629,0.356
+		c4.536-0.236,9.3-1.359,14.24-1.78c7.085-0.604,14.58-1.329,21.361-1.424c-0.291-1.483,0.483-2.972,0-3.561
+		c-11.308,0.507-20.13,1.905-30.618,2.849c-3.95,0.355-7.988,0.211-11.392,0.712c-2.344,0.345-4.706,0.926-6.409-0.356
+		c1.584-4.321,11.26-0.83,15.31-3.56c0.269,1.315,1.075,0.712,1.424,0.712c1.798-0.002,3.891-0.214,5.696-0.356
+		c3.383-0.266,6.296-0.214,9.256-0.356c5.787-0.276,11.23-1.166,16.733-1.424c0.271-1.009,1.05-2.688,0.355-3.56
+		c-7.295,0.397-15.396,1.284-22.073,2.136c-2.827,0.361-5.677,0.161-8.544,0.356c-4.756,0.323-9.416,1.108-13.885,1.068
+		c-1.539-0.014-3.465,1.123-4.628-0.712c2.001-1.979,5.111-0.959,7.832-1.068c1.712-0.068,3.707-0.082,5.341-0.356
+		c1.029-0.172,2.148-0.966,3.204-1.068c1.725-0.166,3.476,0.497,5.34,0.356c1.879-0.142,3.847-0.906,5.696-1.068
+		c7.564-0.663,14.789-0.678,21.717-2.136c0.17-1.275,0.579-2.057,0-3.204c-7.037,0.731-13.638,1.528-19.937,1.78
+		c-3.146,0.126-6.212,0.813-9.257,1.068c-3.905,0.327-7.707,0.04-11.036,0.356c-3.293,0.312-6.667,1.938-8.545-1.068
+		c7.359-1.364,13.529-0.724,21.718-1.424c6.121-0.523,13.091-1.759,18.513-2.136c2.787-0.194,7.096,0.875,8.544-1.068
+		c0.786-0.044,0.151-1.51,0.356-2.136c-3.823-0.916-7.587,0.167-11.037,0.356c-1.144-0.313-0.487,1.174-1.424,1.068
+		c0.318-1.149-1.161-0.5-1.424-1.068c-13.335,1.049-27.753,3.25-40.229,2.848c-0.11,3.994-0.466,8.997-0.356,14.241
+		c0.107,5.128-0.405,9.125-0.356,13.885c0.039,3.744,1.369,8.341-2.136,8.9c0.511-13.048,0.04-23.412,0.356-34.534
+		c0.21-0.739,0.685-1.213,1.424-1.424c0.04-1.583-1.211-1.884,0-2.848c16.226-0.907,37.377-2.619,55.183-4.272
+		c-0.209-1.654,0.486-2.149,0-3.204c-6.919,0.534-12.927,1.35-19.226,1.78c-2.087,0.143-4.075-0.184-6.052,0
+		c-2.515,0.234-5.269,1.76-7.477-0.356c2.549-2.232,7.353-1.25,11.036-1.424c3.561-0.168,7.442-1.258,11.037-1.424
+		c3.181-0.146,10.355,1.556,10.681-3.204c-4.226-0.5-9.264,1.125-14.241,1.424c-2.001,0.12-3.959-0.291-6.052,0
+		c-3.735,0.52-6.495,1.985-8.545-0.356c5.644-1.723,16.64-2.097,23.854-2.848c2.434-0.253,6.055,0.154,4.984-3.56
+		c-8.287,0.573-16.825,1.073-25.989,2.492c-0.457-1.645-2.133,0.046-2.137-1.78c10.063-1.969,19.231-1.386,28.481-3.204
+		c-0.208-1.654,0.487-2.149,0-3.204c-4.219,0.84-8.872,0.284-13.173,0.712c-1.868,0.186-3.617,1.058-5.34,1.068
+		c-1.094,0.006-2.095-0.438-3.204-0.356c-2.2,0.163-5.234,1.991-6.408-1.068c7.624-1.347,19.53-1.376,27.77-2.492
+		c0.922-1.027-0.16-2.208,0-3.56c-4.61-0.268-8.8,0.706-12.817,1.068c-2.042,0.185-4.057-0.17-6.052,0
+		c-3.246,0.278-7.033,2.686-8.9,0c2.329-0.898,5.549-1.363,8.9-1.78c5.982-0.745,12.854-1.171,18.157-1.424
+		c0.88-1.018,1.661-2.136,1.424-4.272c-1.097-0.119-3.128,1.32-4.272,1.424c0.101-0.009-1.238-0.688-1.78-0.712
+		c-2.034-0.092-4.485,0.591-6.764,0.712c-2.879,0.153-5.92-0.159-8.545,0c-2.81,0.171-6.266,2.159-7.477-1.068
+		c5.253-1.644,10.791-1.121,14.597-1.424c2.417-0.193,4.763-0.551,7.121-0.712c2.585-0.176,6.388,0.881,7.476-1.78
+		c-0.277-0.079-0.414-0.298-0.355-0.712c-2.536-1.214-6.574-0.539-8.188-0.712c-4.271-0.458-9.803,0.145-13.885,0.356
+		c-1.504,0.078-4.334,1.292-4.984-1.068c8.649-1.869,18.159,0.024,27.413-1.78c-0.486-1.535,0.313-2.739-0.712-3.204
+		C456.603,28.946,448.459,29.716,440.522,30.105z M85.219,30.105c-0.455-0.02-0.493-0.456-1.068-0.356
+		c-0.912,0.917-1.938,0.398-3.204,1.424c-3.148-2.192-6.725,0.05-10.325,0c-0.958-0.013-1.858-0.612-2.848-0.712
+		c-2.112-0.212-4.219,0.635-6.408,0.712c-3.969,0.14-8.014-0.926-12.104-0.712c-3.803,0.2-7.262,0.692-10.681,0
+		c-0.581,0.576,0.318,1.489,0,2.848c3.04,0.893,8.412,0.097,12.817,0c2.748-0.061,5.902-0.352,7.12,1.068
+		c-2.164,1.348-5.187,0.589-7.833,0.712c-4.35,0.202-8.745,0.493-12.816,0c-0.631,0.674-0.259,2.351-0.356,3.56
+		c3.77,0.254,8.072,0.253,12.46,0c3.209-0.185,6.793-1.8,8.9,0c-0.527,0.066-0.326,0.86-0.356,1.424
+		c-2.328,1.64-4.968,0.527-7.833,0.356c-4.66-0.278-10.048,0.809-13.884,0.356c0.234,1.302-0.771,1.366-0.712,2.492
+		c5.691,0.385,13.025,0.426,18.869,0.356c1.609-0.02,4.129-1.384,4.984,0.356c-0.464,1.672-3.445,0.827-4.628,1.78
+		c-5.599-1.334-13.973,0.944-19.581,0c0.099,1.523-1.088,1.761-0.712,3.56c5.958,0.562,13.019,0.356,18.869,0.356
+		c2.266,0,5.062-0.747,6.408,1.068c-7.567,1.202-16.337,0.08-25.633,1.068c-0.581,0.576,0.318,1.489,0,2.848
+		c4.531,0.601,15.461-0.651,22.073,0c1.546,0.152,3.065,0.032,3.56,1.424c-8.046,0.539-18.192,0.741-25.633,0.712
+		c-0.215,0.853-0.512,1.624-0.356,2.848c5.535,1.18,12.298,0.415,17.801,0.356c2.509-0.026,6.065-0.87,7.476,1.424
+		c-7.945,0.627-18.346,0.45-24.921,0.356c-0.868,1.073-1.148,2.4-0.712,3.916c8.496-0.58,20.809-0.547,28.125,0
+		c-0.338-6.827-0.945-14.228-0.712-21.005c0.103-2.974,0.29-4.9,0.712-7.477c0.232-1.414-0.863-4.079,1.424-3.916
+		c1.043,1.998-0.382,4.275,0,6.764c3.075,0.262,5.512-1.593,8.544-1.78c4.204-0.259,8.669,1.133,13.172,0
+		c0.07-1.375,0.013-2.624-0.356-3.56c-2.186,0.14-5.102,0.602-7.833,0.712c-2.72,0.11-6.502,0.886-7.832-1.424
+		c4.55-1.849,11.546,0.179,15.665-0.712C85.459,32.719,85.146,31.219,85.219,30.105z M12.236,31.173
+		c0.22,3.934-0.452,8.758,0.356,12.105c2.726,0.347,9.676-1.554,9.968,1.424c-3.021,1.593-7.355,0.648-10.324,0.712
+		c0.32,3.804-0.693,6.821,0.356,9.969c2.799,0.023,8.986-1.784,9.612,1.424c-3.229,0.213-7.324-0.441-9.968,0.356
+		c-0.352,3.072-0.343,9.871,0,13.885c3.649,0.127,6.81-0.439,10.324,0c-0.143-3.348,1.365-7.204,0-9.613
+		c-2.401,0.335-7.804,1.042-9.612-0.355c1.249-2.549,6.596-1,9.968-1.424c1.301-7.995,0.501-16.826,1.068-24.565
+		c-3.426-0.143-8.164,1.208-9.613-1.068c0.905-3.719,9.733,2.168,10.325-2.492C21.256,30.348,16.291,30.262,12.236,31.173z
+		 M371.812,30.817c-0.979,1.158-1.575,2.697-3.204,3.204c-0.401,2.371,1.594,3.96,0.712,6.408c1.424,0,2.848,0,4.272,0
+		c0.045-1.498,1.379-1.706,1.424-3.204c-0.894-1.583-4.402,0.739-4.628-1.78c2.054-3.203,7.975-0.341,8.544-4.984
+		C376.165,30.187,374.41,30.923,371.812,30.817z M393.173,34.377c1.977,0.639,4.318-0.709,7.12-0.356
+		c-0.009-0.838,0.613-1.048,0.355-2.136C398.512,32.31,393.466,31.132,393.173,34.377z M309.152,36.157
+		c-0.322,1.214,0.2,3.542,0,5.696c0.422,0.528,1.346,0.554,1.78,1.068c0.012,2.956,1.601,4.334,3.204,5.696
+		c0.534-0.415,0.871-1.028,1.78-1.068c1.088,0.336,1.116,1.732,2.492,1.78c0.538-0.886,1.221-1.627,2.492-1.78
+		c0.707,0.243,0.814,1.084,1.424,1.424c4.716-0.057,9.752-0.967,14.241-0.356c0.895-0.937-0.894-1.199-1.068-2.136
+		c0.721-2.295,4.408-3.357,3.204-6.409c-2.309-0.118-2.795,4.797-5.34,2.136c-1.105-0.037-1.017,1.12-2.492,0.712
+		c-1.207-0.217-0.571-2.277-2.137-2.136c-0.813,1.049-0.387,2.789-3.204,2.492c-0.706-0.244,0.223-2.121-1.067-1.78
+		c-0.825,0.718-0.476,2.61-1.78,2.848c-1.088-0.257-1.298,0.364-2.137,0.356c-0.79-1.533,1.5-2.873,0-2.848
+		c-0.997,0.545-0.451,2.634-2.136,2.492c-0.776,0.064-1.133-0.292-1.068-1.068c-1.356-0.171-0.726,1.647-2.492,1.068
+		c-0.803-0.77,0.295-1.214,0-2.492c-0.891,0.044-1.114,0.68-1.424-0.356c0.785-1.811,2.99-1.173,3.916-2.136
+		c0.114-0.826-0.057-1.367-0.355-1.78c-1.347-0.516-0.684,0.978-1.78,0.712C313.867,36.57,311.436,34.965,309.152,36.157z
+		 M305.948,37.582c-0.643,8.496,1.002,21.586,0.356,31.685c-0.076,1.192-0.354,2.565-1.068,3.56
+		c2.077-0.505,0.191,4.352,2.137,2.848c0.231-10.037,0.514-24.597,0.355-38.806c-0.455-0.02-0.493-0.456-1.067-0.356
+		C306.575,37.021,306.074,37.114,305.948,37.582z M391.393,37.582c-0.389,0.724-0.9,2.262-1.78,1.424
+		c0.156,3.587-3.242,5.154-2.492,8.188c3.19-0.37,6.575-0.545,7.12-3.56c-1.831-1.214-3.867,1.099-4.984-0.356
+		c0.522-4.7,10.099-0.345,9.257-6.409C396.119,37.029,393.355,38.107,391.393,37.582z M63.146,41.142
+		c-0.07,7.678,0.741,17.717,1.068,24.565c0.077,1.611,0.58,4.886-1.78,4.984c-0.639-1.636,0.359-2.712-0.356-4.272
+		c-8.25,1.077-19.689-0.042-28.837,1.068c-0.551,0.729-0.551,3.187,0,3.916c4.131-0.991,8.826-0.712,13.884-0.712
+		c3.671,0,7.791-0.763,9.969,1.068c-7.092,1.213-17.994,0.78-24.209,0.712c-0.413,1.159-0.668,3.875,0,4.984
+		c4.041-1.243,7.972-0.864,12.46-1.068c12.938-0.588,28.588-0.226,39.518-0.356c0.632-0.674,0.259-2.351,0.356-3.56
+		c-3.486,0.469-8.079-0.123-12.816,0c-2.578,0.067-5.773,0.978-6.764-1.068c0.815-1.708,3.008-0.39,4.628-0.356
+		c4.603,0.096,10.956-0.367,14.953,0.356c-0.164-2.128,0.137-2.937-0.356-4.272c-3.322,0.123-7.215-0.161-10.681,0
+		c-2.419,0.113-5.503,1.507-6.764-0.712c5.083,0.253,11.749-1.365,17.445-0.356c0.565-1.006,0.565-3.978,0-4.984
+		c-5.441,1.126-12.076,0.948-18.157,0.355c1.577-2.758,5.239-1.188,7.476-1.068c3.756,0.201,8.383-1.368,10.681-0.356
+		c0.551-0.729,0.551-3.187,0-3.916c-2.608-0.439-7.307,0.001-11.037,0c-1.324,0-4.547,1.292-3.916-1.068
+		c2.901-0.912,7.751-0.134,11.749-0.356c1.169-0.065,2.489-0.684,3.56-0.356c0-1.305,0-2.611,0-3.916
+		c-2.5,0.233-4.976-0.147-7.476,0c-2.761,0.162-6.65,1.889-7.833-0.356c1.15-1.862,4.406-0.685,7.12-0.712
+		c2.879-0.029,5.814-0.573,8.188-0.356c-0.149-1.938-0.019-2.776-0.356-3.916c-6.33-0.237-10.685,1.094-15.665,0
+		c3.259-3.577,11.372-0.28,16.021-2.136c0-0.831,0-1.661,0-2.492C77.781,41.455,69.585,39.962,63.146,41.142z M370.388,46.125
+		c1.23-0.43,1.528-1.794,1.779-3.204c-0.458-0.49-1.546-0.352-2.491-0.356C370.017,43.648,368.913,46.176,370.388,46.125z
+		 M358.639,43.278c0,0.356,0,0.712,0,1.068c0.421,0.41,1.259,0.403,2.137,0.356C361.122,43.162,359.636,42.386,358.639,43.278z
+		 M344.042,47.906c-1.487-0.53-1.015-3.02-2.848-3.204C340.638,47.048,342.041,49.3,344.042,47.906z M347.246,48.974
+		c-0.207,1.395,1.465,0.909,1.78,1.78c0.408,1.476-0.749,1.387-0.712,2.492c0.665,0.697,1.304,0.11,2.136,0
+		c1.154,1.52,0.571,3.39-0.355,4.628c1.061,0.007,0.456,1.68,1.068,2.136c1.806-0.263,2.811,0.274,3.204,1.424
+		c0.31-0.521,0.532-1.128,1.424-1.068c0.034,0.915,1.39,0.509,1.424,1.424c0.121,1.104-0.824,1.701,0,2.492
+		c1.825-0.073,2.12-1.678,2.492-3.204c-0.04-0.673-1.177-0.247-1.068-1.068c1.366-3.718,2.137-6.246,2.849-10.324
+		c-2.562-0.329-5.112-1.613-7.833-0.712c-1.156-1.335-1.703-3.281-3.204-4.272C350.516,47.259,349.314,48.549,347.246,48.974z
+		 M309.509,57.162c0.254-3.113,0.866-3.812,2.136-6.052c-0.515-0.553-0.748-1.387-1.067-2.136c-0.475,0-0.949,0-1.425,0
+		C308.814,50.562,309.028,56.157,309.509,57.162z M383.204,53.246c3.828-1.113,8.523,0.812,9.256-3.204
+		C388.806,49.159,383.082,49.176,383.204,53.246z M335.498,56.806c-0.771,1.033,0.647,2.048-0.712,2.492
+		c-1.032-0.748-3.143-0.417-3.204-2.136c-0.061-1.01,1.204-0.695,0.712-2.136c-3.134-0.879-0.954,3.556-2.137,4.628
+		c-2.119,0.221-2.384-1.413-3.56-2.136c-0.702,0.247,0.088,1.986-0.712,2.136c-2.654-1.769-3.795,0.869-5.696,1.424
+		c-1.236-0.663-1.649-2.148-3.204-2.492c-0.963,0.652-0.062,1.205-0.712,1.78c-1.424,0.022-2.829-2.629-3.561-1.068
+		c0.573,1.823,0.979,2.027,1.068,4.628c9.95-1.127,23.889,0.114,32.397-2.136c-1.717-0.711-4.024,0.768-4.272-1.78
+		c0.755-1.569,0.578-3.849,1.78-5.696c-2.249,0.362-1.997,3.225-3.204,4.628c-0.527-0.659-1.841-0.534-1.78-1.78
+		c-0.264-1.569,1.152-1.458,1.424-2.492c-0.455-0.02-0.493-0.456-1.068-0.356C338.122,55.395,338.139,57.429,335.498,56.806z
+		 M323.037,57.518c-0.172-1.121,1.093-0.806,0.712-2.136C322.32,55.544,321.397,57.066,323.037,57.518z M381.067,56.45
+		c-0.133,1.528-1.667,1.656-1.424,3.56c2.938-1.096,8.381,0.311,8.188-3.916C385.173,55.963,383.49,55.796,381.067,56.45z
+		 M309.865,66.774c-1.291,2.042-0.375,4.171,0,7.121c1.466,0.279,1.826-0.546,3.204-0.356c1.047,0.614,1.211,2.111,3.204,1.78
+		c-0.137-2.024-0.754-5.201,0.355-7.832c-1.536-0.614-1.462-1.69-3.56-1.068c-0.299-0.413-0.47-0.954-0.356-1.78
+		c-2.744,0.252-2.464-2.52-3.561-3.917C308.847,62.993,308.978,64.914,309.865,66.774z M25.053,66.418
+		c0.778-0.758,0.45-2.893,1.424-4.272c-0.839-0.11-0.662-1.236-1.78-1.068C24.622,62.085,23.541,65.412,25.053,66.418z
+		 M377.864,62.858c-0.837,1.062-1.375,2.423-2.137,3.56c3.341-0.198,6.131-1.276,9.257-0.712c0.596-0.591,0.283-2.09,0.355-3.204
+		C382.575,62.2,380.866,62.146,377.864,62.858z M356.858,67.487c0.927,1.278,1.708,0.736,3.561,0.712
+		c0.011-1.435-0.103-2.746-1.068-3.204C359.253,66.558,357.021,65.987,356.858,67.487z M25.053,72.471
+		c1.021-1.146,1.291-4.974-0.356-5.34C23.795,67.708,23.2,72.468,25.053,72.471z M374.659,68.911
+		c-0.412,1.249-1.8,1.523-1.779,3.204c3.159-1.35,9.21,0.191,10.324-3.204C379.892,68.534,378.583,69.041,374.659,68.911z
+		 M143.25,71.759c-3.296,0.043-6.348-2.376-9.613-2.848c-8.903-1.288-18.687,4.264-20.292,10.324c-0.356,0-0.712,0-1.068,0
+		c0.599,2.972-2.005,2.742-1.78,5.34c1.048,1.208,2.706,1.804,4.272,2.492c1.921-3.3,4.532-5.911,7.833-7.833
+		c0.104-1.527-1.678-1.17-1.78-2.492c0.996-0.547,0.796-2.289,2.136-2.492c0.282,0.786,1.673,0.462,1.78,1.424
+		c0.125,1.237-1.81,1.352-0.712,2.492c4.299-0.111,6.294-1.557,9.968-1.068c2,0.266,6.647,2.642,7.833,3.56
+		c2.194,1.7,3.512,6.177,5.696,6.408c1.748,0.185,3.278-2.04,4.272-2.848C151.657,77.355,145.541,76.47,143.25,71.759z
+		 M357.927,69.979c0.178,1.445,1.609,2.029,2.849,1.424c-0.205-0.626,0.43-2.092-0.356-2.136
+		C359.901,69.817,359.03,70.014,357.927,69.979z M28.613,73.895c0.856-0.821,0.543-1.148,0.356-2.492
+		c1.126-0.489,1.19-0.078,2.492,0c-0.015-1.291-1.889-0.722-2.492-1.424C28.197,70.411,27.829,73.087,28.613,73.895z
+		 M243.646,73.539c-6.138-1.616-15.4-2.228-19.581,1.78c1.802,0.259,2.108-0.977,3.56-1.068c0.667,1.231,2.286,1.512,1.78,3.916
+		c2.151,0.341,1.794,3.19,3.204,4.272c0.971-2.734-0.918-7.624,3.204-8.544c1.592,1.019,3.774,1.448,6.409,1.424
+		c2.049,0.922,4.242,3.585,6.408,3.204C246.924,76.906,245.383,75.125,243.646,73.539z M12.236,72.827
+		c-0.683,0.86-0.225,2.861-0.356,4.272c3.638-0.695,6.264-0.465,10.324-0.356c0.66-0.765,0.24-2.608,0.356-3.917
+		C19.119,72.827,15.678,72.827,12.236,72.827z M24.697,77.811c-0.054,0.658-1.206,0.219-1.424,0.712
+		c-0.157,1.938-0.027,3.587,2.136,3.204c0.099-3.561,0.978-5.316,0-8.9c-0.475,0-0.949,0-1.424,0
+		C23.448,74.766,23.594,76.626,24.697,77.811z M358.995,75.675c1.445,0.14,2.48-0.13,2.492-1.424
+		C360.896,72.097,357.45,73.658,358.995,75.675z M373.592,74.607c0.511,0.439,0.674,1.224,0.712,2.136
+		c2.18,0.162,4.034-0.001,4.628-1.424C378.132,72.984,375.337,73.89,373.592,74.607z M76.319,151.506
+		c-2.997,0.222-5.165,0.952-7.833,0c2.909-3.442,10.186-0.821,15.665-2.848c-0.257-1.088,0.364-1.297,0.356-2.136
+		c-1.039,0.089-1.229-0.67-1.78-1.068c-0.568,0.263,0.082,1.743-1.068,1.424c-4.234-0.662-8.877,1.214-11.393,0
+		c1.743-4.147,14.168,0.743,14.597-4.272c-0.895-1.403-2.995-0.141-4.984,0c-2.035,0.144-4.184-0.021-6.408,0
+		c-2.077,0.019-4.739,0.677-5.34-0.712c4.043-3.577,9.649-1.771,16.021-1.78c0.792-0.869,0.781-2.542,0.712-4.272
+		c-5.688,1.59-9.48,0.175-14.953,1.78c-0.249-0.938-1.621-0.752-1.78-1.78c3.658-2.111,11.14-1.646,15.665-1.78
+		c1.795-2.004,0.713-4.557,0.712-6.764c-0.003-4.546,0.813-9.104,0-13.529c-7.322,1.389-15.517-0.021-23.497,0.356
+		c-1.859,0.088-3.604,0.629-5.34,0.712c-3.76,0.18-7.337-0.258-11.393,0c-0.283,0.018-4.954,1.535-4.628-0.356
+		c0.214-1.245,8.226-1.434,10.324-1.424c8.882,0.042,13.987,0.169,23.853,0c1.162,0.094,0.755-1.381,1.78-1.424
+		c2.257,2.163,4.841,0.126,8.9,0.712c0.786-2.181,0.151-5.783,0.356-8.544c-8.108-1.138-16.792,0.229-24.565,0.712
+		c-5.405,0.336-10.866-0.495-15.665,0c-1.403,0.145-3.285,1.569-4.272,0.356c1.132-1.922,3.223-2.307,5.34-2.492
+		c10.094-0.884,27.333-0.194,38.806-0.712c0.746-8.064,0.306-16.326,0.712-24.565c-1.007-0.829-1.646,0.99-3.204,0.712
+		c-11.961-0.59-25.69,0.647-35.602,1.068c-3.668,0.156-7.542-0.391-11.037,0c-0.901,0.101-2.183,0.037-2.848,1.068
+		c-0.935,2.597,2.933,0.39,2.492,2.492c-1.265,0.989-3.472,1.037-2.848,3.916c0.575,0.92,3.137-0.148,3.204,0.356
+		c0.062,1.604-2.424,0.661-2.492,2.136c-0.543,2.085,0.773,2.312,1.78,2.848c-1.52,0.379-2.115,1.682-1.78,3.916
+		c0.37,0.816,2.542-0.169,2.848,0.712c-1.99,0.491-4.827,5.165-1.068,6.052c-0.031,1.156-2.123,0.25-1.78,1.78
+		c-0.021,1.961,0.014,3.534,0.356,4.272c0.877-0.047,1.715-0.054,2.136,0.356c2.096-3.015,0.514-8.041,0.712-12.816
+		c0.104-2.519,0.514-5.073,0.712-7.833c0.185-2.581,0.25-5.639,2.136-7.12c-0.598,5.638-0.707,12.642-0.712,19.581
+		c-0.001,1.338-0.229,3.062-0.356,4.628c-0.252,3.104-0.216,7.291-0.712,8.9c-0.249,0.809-0.697,2.066-2.136,2.136
+		c0.462-2.149,0.842-4.379,0.712-7.121c-1.32-0.252-1.528,0.608-2.848,0.356c0.279,1.466-0.547,1.827-0.356,3.204
+		c0.316,0.871,1.735,0.638,2.136,1.424c-1.094,0.33-2.638,0.21-2.492,1.78c-0.143,2.89,2.702,1.754,4.272,1.78
+		c2.579,0.042,5.997,0.477,8.544,0.356c0.661-0.031,1.407-0.601,2.136-0.712c5.195-0.791,13.442-0.202,17.801,0
+		c3.527,0.164,6.212-0.928,9.256-0.712c3.32,0.235,7.509-0.72,9.969,0.712c-3.585,2.91-8.772,0.33-13.173,1.068
+		c-6.639,1.114-15.71,1.042-23.141,1.424c-5.27,0.271-10.245,0.594-14.953,0.356c-0.465,0.725,0.012,2.887,0.356,3.917
+		c6.939-0.383,12.728-0.401,19.581-0.712c3.02-0.137,5.971-0.33,8.544,0.356c-0.797,1.221-2.571,1.464-3.916,2.136
+		c-4.297-1.677-10.443,0.307-15.665,0.356c-3.226,0.031-6.243-1.244-8.9,0c-0.01,1.552-0.212,3.298,0.712,3.916
+		c8.863-0.132,18.723-1.714,28.125-0.712c-2.701,2.852-7.149,1.378-12.104,1.78c-5.708,0.463-12.277,0.692-16.732,1.068
+		c-0.263,2.211,1.91,3.345,3.916,4.272c1.727-2.203,4.939-2.17,8.188-2.136c6.049,0.063,13.883-0.2,18.157,0.712
+		c-0.077-3.773,0.934-7.68,1.068-11.036c0.055-1.387-1.081-2.679,0.356-3.561c1.231-0.282,1.503,0.396,2.136,0.712
+		c-0.837,0.469-1.005,1.606-1.424,2.492c0.306,5.793-1.457,13.735-1.068,21.005c0.2,3.729,1.324,7.182-1.424,9.257
+		c-1.557-1.198,0.317-2.904,0.356-4.628c0.023-1.043-0.61-2.05-0.712-3.204c-0.301-3.394,0.712-7.234,0-9.968
+		c-7.332,0.36-14.354,1.178-20.648,0.712c0.508,1.627,2.37,1.902,3.204,3.204c2.276,0,5.312,0,8.188,0
+		c2.511,0,6.139-0.883,6.765,1.424c-4.112,0.712-7.66-0.119-12.104,0.356c0.192,6.164,9.403,1.331,11.748,4.984
+		c-3.175,0.603-5.915-0.5-8.188,1.068c-0.298,3.265,4.639,1.295,6.052,2.849c-0.507,1.51-3.06,0.975-4.984,1.068
+		c0.325,1.795-2.679,1.602-1.78,2.848c7.217-0.267,18.303,0.264,26.345-0.356c2.083-0.161,6.241,0.136,6.408-2.848
+		c-2.251,0.138-6.248,0.04-7.476-0.712C75.962,151.151,76.251,151.218,76.319,151.506z M219.437,105.936
+		c0.479,0.827,0.589,2.021,1.068,2.848c0.712,0,1.424,0,2.136,0c0.596-0.59,0.283-2.09,0.356-3.204
+		c3.719-2.333,7.03-5.074,9.969-8.188c-1.922-1.045-4.046-1.888-3.917-4.984c1.32-1.434,3.18-2.493,4.984-2.492
+		c0.493-0.935,0.881-4.294-0.712-4.272c-0.75-0.956-0.799,1.788-1.78,1.78c-0.936-1.912-1.333-4.363-2.492-6.052
+		c-1.467,0.638-1.7,2.563-0.712,3.917c-1.178,0.365-2.099,0.986-2.136,2.492c1.592,1.503,1.53,3.388,0.356,5.34
+		c1.037,1.456,2.249,2.735,3.204,4.272c-1.137,4.135-7.742,4.531-7.476,8.9c-1.87,0.208-2.389-0.935-2.492-2.492
+		c-6.793-5.299-3.795-21.003,1.068-25.989c-0.078-0.277-0.298-0.414-0.712-0.356C213.29,82.655,211.715,100.455,219.437,105.936z
+		 M358.995,79.947c1.089-0.258,1.047,0.614,2.136,0.356c0.523-0.518,0.523-2.33,0-2.848
+		C359.339,77.206,358.784,78.193,358.995,79.947z M305.593,78.523c0.477,44.525-1.168,79.305-0.356,121.757
+		c0.498-16.312,1.267-31.508,1.425-48.774c0.194-21.324,0.084-48.565,0.712-73.695c-0.356,0-0.712,0-1.068,0
+		C306.301,78.282,305.681,78.136,305.593,78.523z M309.152,79.591c-0.609,25.89-0.701,54.074-0.712,76.899
+		c-0.002,4.922-0.316,9.696-0.355,14.597c-0.106,13.205-0.251,25.269-0.356,37.738c-0.019,2.183-1.202,5.059,2.137,5.34
+		c-2.229-6.29-0.694-14.382-0.713-21.717c-0.004-1.806-0.366-3.609-0.355-5.34c0.043-7.118,0.712-14.323,0.712-21.717
+		c0-30.115,1.365-58.1,1.068-86.156c-0.218-0.02-0.422-0.053-0.356-0.356c-0.021-0.217-0.053-0.421-0.355-0.356
+		C309.779,79.031,309.278,79.124,309.152,79.591z M11.88,79.591c0,0.593,0,1.187,0,1.78c2.742-1.325,9.392,2.069,10.68-1.78
+		C19.932,79.529,13.709,78.498,11.88,79.591z M248.63,84.575c-1.69-1.79-2.804-5.925-6.408-4.628
+		c-0.098,1.284,1.408,0.965,1.424,2.136c-0.32,0.629-0.859,1.039-1.068,1.78c2.833,0.535-0.023,1.968,0.712,3.204
+		c0.949,0,1.899,0,2.848,0c1.137,1.525,3.011,2.722,2.848,4.984c-0.136,1.883-1.72,2.336-2.492,3.916
+		c1.121,0.502,2.136,1.502,3.56,0.712C252.042,91.401,247.655,88.754,248.63,84.575z M358.995,83.863
+		c0.455,0.494,1.681,0.218,2.136,0.712c0.606-1.112,0.774-1.88,0-2.848C359.519,81.539,358.807,82.251,358.995,83.863z
+		 M23.272,82.795c1.148,1.302-1.08,3.944,1.424,3.56c-0.677-1.994,1.784-3.386,0-4.272C24.643,82.742,23.491,82.302,23.272,82.795z
+		 M11.88,83.507c0.073,1.114-0.24,2.613,0.356,3.204C15.743,86.658,19.645,87,22.205,86c0-0.831,0-1.662,0-2.492
+		C18.507,82.611,14.908,83.702,11.88,83.507z M117.261,88.492c0.235-1.071,1.368-1.243,1.068-2.848
+		C116.958,85.361,116.382,87.704,117.261,88.492z M347.958,98.46c5.48-1.047,6.105-6.949,7.121-12.46
+		c-0.079-0.277-0.299-0.414-0.712-0.356C352.049,89.733,349.66,93.753,347.958,98.46z M358.283,87.779
+		c1.32-0.252,1.527,0.608,2.848,0.356c0.08-0.276,0.01-0.702,0.356-0.712C361.619,85.634,357.618,85.277,358.283,87.779z
+		 M23.628,87.779c-1.05,3.444,0.432,7.886-1.424,9.969c1.318,3.75-0.271,8.286-0.356,11.749c-0.028,1.151,0.695,2.075,0.712,3.204
+		c0.018,1.18-0.62,2.553-0.712,3.916c-0.508,7.548,0.195,15.306-0.712,22.785c-0.12,0.983-1.117,2.042-0.356,3.204
+		c0.792,0.75,1.717-0.375,3.205,0c0.659-0.764-0.471-1.896-0.356-3.204c0.481-0.35,0.712-0.95,1.068-1.424
+		c-0.25-6.347-0.695-13.259-0.356-19.937c0.182-3.584,1.163-7.092,1.424-10.324c0.61-7.562-0.503-13.925,0-19.937
+		c-0.508-0.085-0.601-0.586-1.068-0.712C24.604,87.568,23.916,87.473,23.628,87.779z M11.88,88.848
+		c0.127,1.549,0.054,1.637,0.356,2.492c2.39-1.526,9.481,1.649,9.612-2.136C19.281,87.758,15.167,88.293,11.88,88.848z
+		 M142.894,88.135c-2.492,0-4.984,0-7.476,0C135.945,89.792,141.528,89.003,142.894,88.135z M358.639,91.696
+		c1.007,0.294,0.923-0.502,1.78-0.356c0-0.475,0-0.949,0-1.424c-0.421-0.41-1.259-0.403-2.136-0.356
+		C357.836,90.644,358.011,90.944,358.639,91.696z M150.37,92.408c0.654-0.458,1.566-1.596,0.712-2.492c-0.475,0-0.949,0-1.424,0
+		C149.719,90.922,149.352,92.358,150.37,92.408z M141.826,90.627c-1.786,0.231-4.501-0.466-5.696,0.356
+		C137.916,90.752,140.631,91.45,141.826,90.627z M313.425,101.664c0-3.085,0-6.171,0-9.256c-0.078-0.277-0.298-0.414-0.712-0.356
+		C313.32,94.474,311.729,99.492,313.425,101.664z M12.236,93.12c-0.523,0.518-0.523,2.33,0,2.848
+		c2.756-0.563,5.978-1.155,8.544,0.712c-1.774,2.094-5.308,2.526-8.544,1.424c-0.376,1.095-0.765,3.515-0.356,4.272
+		c1.517,0.475,6.704-1.194,7.832,0.712c-1.304,1.662-4.445,1.489-7.476,1.424c-0.551,0.729-0.551,3.187,0,3.916
+		c3.198-0.733,4.489-1.19,8.544-1.068c0.701-3.557-0.528-6.896,1.068-9.612c-1.182-1.048-0.119-2.992-0.356-4.984
+		c-1.702-0.041-2.375,0.948-3.56,1.424C16.813,92.917,14.023,93.019,12.236,93.12z M129.009,93.476
+		c2.851-0.235,6.642,0.471,8.9-0.356C135.171,92.688,130.159,92.705,129.009,93.476z M355.791,96.68
+		c1.642,1.103,3.11-0.555,3.204-2.136C357.557,92.854,355.718,94.736,355.791,96.68z M120.821,95.256
+		c0.311,1.59,2.988,0.713,4.272,0.356C123.686,95.666,122.358,94.799,120.821,95.256z M125.805,98.104
+		c5.844-0.148,10.76,0.633,16.732,0.356c1.084-0.016,1.384,0.751,2.136,1.068c0.361-1.182,1.97-1.115,1.78-2.848
+		C139.142,96.662,130.717,96.841,125.805,98.104z M356.503,99.884c-0.049-1.375-1.39-1.458-2.849-1.424
+		C353.571,100.423,355.112,100.212,356.503,99.884z M124.737,99.528c-0.729,0.186-2.632,0.057-2.136,1.78
+		c4.474-0.086,9.324-0.356,13.884-0.356c2.289,0,4.789,0.579,6.408-0.712C137.989,100.028,129.317,98.365,124.737,99.528z
+		 M351.163,101.664c-0.341,1.62,1.496,2.241,2.491,1.424C353.857,101.331,352.366,101.055,351.163,101.664z M121.533,103.088
+		c1.375,1.11,3.892,0.7,6.052,0.712c5.007,0.027,10.633,0.807,13.885-1.068C134.804,102.114,126.146,102.111,121.533,103.088z
+		 M312.713,115.549c1.314-0.903,0.702-3.445,0.712-5.34c0.012-2.096-0.009-4.288,0-6.052c-0.079-0.276-0.01-0.702-0.355-0.712
+		C312.262,106.791,312.933,111.615,312.713,115.549z M119.396,105.224c-0.447,0.146-0.728,0.459-0.712,1.068
+		c2.918,0.072,6.209-1.102,9.969-0.712c1.816,0.188,3.576,1.059,5.34,1.068c1.765,0.009,4.244,0.011,5.34-1.424
+		C133.914,104.959,126.223,104.502,119.396,105.224z M228.693,113.769c0.001-0.357-0.289-0.424-0.356-0.712
+		c0.302-1.953,1.583-2.927,2.848-3.917c-2.145,0.395-7.331,0.705-7.833,3.917c0.28,0.789,2.204-0.068,1.78,1.424
+		c-1.551,1.535-1.246,4.925-4.272,4.984c-0.328-2.939,1.72-3.502,2.136-5.696c-2.178,0.314-3.012,1.972-4.272,3.204
+		c-1.172,0.717-2.968,0.489-3.204,2.848c2.305,0.78,5.457,0.714,7.476,1.78c-0.178-3.739,2.738-4.383,4.984-5.696
+		c2.415,1.167,4.548,5.744,7.832,2.848c-2.905-6.483,7.36-7.493,6.765-12.817C238.514,109.111,234.451,112.287,228.693,113.769z
+		 M348.314,108.072c-0.537-0.575-1.311-1.852-2.136-1.068C345.787,108.254,348.299,108.406,348.314,108.072z M137.197,108.428
+		c1.146,0.397,2.479,0.606,3.561,1.068c0.185-0.527,0.526-0.897,0.712-1.424C140.622,107.252,137.497,106.788,137.197,108.428z
+		 M122.601,108.428c-4.538-0.148-8.195,3.697-11.037,6.052c-5.442,2.984-11.411,5.44-12.816,12.46
+		c3.037,0.051,0.955,2.003,3.56,1.78c0.095,1.565-2.007,2.273-1.068,3.56c0.468,0.901,1.844-2.149,2.492-1.068
+		c-0.167,1.969-1.569,2.703-1.78,4.628c3.156,0.016,5.225-2.461,6.764-3.56c3.221-2.3,6.711-3.405,10.324-4.984
+		c3.768-1.647,7.795-2.241,10.325-5.34c-2.222-3.245-6.889,1.32-9.256-0.356c0.064-1.004,1.692-0.444,1.424-1.78
+		c-0.316-0.752-1.084-1.052-1.068-2.136c0.728-0.696,1.062-1.786,1.068-3.204c-1.772-0.579-2.121,1.335-3.204,0.356
+		c1.763-4.639,9.194,0.779,12.104-3.56C127.508,110.936,125.513,108.524,122.601,108.428z M342.263,109.497
+		c0.765,0.54,1.063,1.547,2.491,1.424c-0.141-1.283-0.579-2.268-1.779-2.492C342.889,108.937,342.388,109.029,342.263,109.497z
+		 M11.88,110.208c-0.465,0.725,0.012,2.887,0.356,3.916c1.587-0.189,5.454-1.1,6.408,0.356c-1.092,1.519-3.708,1.514-6.408,1.424
+		c-0.857,0.982-0.647,2.092,0,3.204c1.479-1.265,5.188-1.42,6.764,0c-1.115,2.417-3.84,3.255-6.764,2.136
+		c-0.874,1.765,0.101,3.642,0,5.696c1.544-0.543,5.612-3.041,6.408,0c-1.78,1.068-4.188,1.508-6.408,2.136
+		c0.258,1.089-0.614,1.047-0.356,2.136c1.941,1.05,2.594-1.147,3.916-1.78c2.151-0.252,2.146,1.651,4.272,1.424
+		c-0.242-6.417,0.787-13.993,0.712-21.361C17.31,110.271,14.715,109.716,11.88,110.208z M337.99,111.276
+		c0.19,1.364,1.388,1.933,2.492,1.424c0.146-1.452-0.365-2.246-1.78-2.136C338.627,110.964,338.307,111.119,337.99,111.276z
+		 M331.582,116.973c0.06-0.415,0.562-0.387,1.067-0.356c-0.244-1.536-1.271-2.289-3.204-2.136
+		C329.577,115.892,330.478,116.534,331.582,116.973z M246.494,115.549c0.219,2.421-4.089,4.979-1.424,6.408
+		c0.973-1.998,2.85-4.976,2.492-7.121C247.608,115.476,247.208,115.67,246.494,115.549z M326.953,118.753
+		c0.793-1.053,0.35-3.249-1.424-2.848C324.949,116.86,325.378,118.284,326.953,118.753z M321.97,120.533
+		c1.452,0.147,2.246-0.365,2.136-1.78C323.149,116.614,320.814,118.302,321.97,120.533z M230.474,120.889
+		c-0.385-1.276-0.982-2.341-2.492-2.492C228.036,119.914,229.339,121.582,230.474,120.889z M336.21,119.465
+		c-3.872,7.999-10.132,18.089-14.953,26.345c-1.617,2.77-3.975,6.919-4.271,9.256c-0.398,3.137,0.442,6.999,1.067,10.324
+		c0.317-2.029,1.933-3.714,2.849-5.34c3.113-5.527,5.642-10.945,8.9-16.376c2.067-3.446,4.142-7.046,6.052-10.68
+		c1.912-3.637,4.077-7.336,5.341-11.393C340.339,120.083,338.94,119.108,336.21,119.465z M221.573,124.093
+		c-2.771-0.552-4.525-2.121-8.188-1.78c-2.562,1.947-5.975,3.044-8.9,4.628c1.436,2.481,4.318,3.514,6.764,4.984
+		c1.415,1.671,1.462,4.709,3.917,5.34c0.149-1.455-1.172-1.439-0.712-3.204c1.988-0.704,1.214-4.978,4.272-3.56
+		c0.118-1.424-0.635-1.977-0.356-3.561c0.526-0.185,0.897-0.526,1.424-0.712c1.061,0.126,0.908,1.465,2.492,1.068
+		C222.971,126.433,221.801,125.145,221.573,124.093z M426.282,128.009c-7.007,1.007-16.219-0.458-21.718,2.136
+		c0,0.831,0,1.662,0,2.492c6.959-1.751,17.673-0.767,26.346-2.136c-0.19-1.377,0.636-1.738,0.355-3.204
+		C429.602,126.074,428.075,127.751,426.282,128.009z M222.285,130.145c1.64,1.92,1.7,5.42,3.916,6.765
+		c1.49-2.499-1.723-5.659-2.492-8.188c-0.356,0-0.712,0-1.068,0C222.529,129.203,222.134,129.401,222.285,130.145z M312.001,134.062
+		c1.307-0.014,0.792-3.697,0.355-4.272C311.582,131.166,312.438,133.022,312.001,134.062z M147.878,130.145
+		c-0.612-0.019-0.913,0.274-1.068,0.712c3.037,0.76,5.507,2.087,7.476,3.916c1.708-0.19,3.229-0.569,3.56-2.136
+		C155.6,130.731,150.948,131.229,147.878,130.145z M108.36,154.71c-0.249-1.554,1.028-1.583,1.068-2.848
+		c-1.765,0.274-1.886-0.009-3.916,0c-1.299-1.339-0.277-3.263-0.356-5.34c-3.486,0.692-6.274,5.101-6.052,10.681
+		c0.415,0.06,0.386,0.562,0.356,1.068c3.71,0.68,3.802,4.98,6.764,6.408c0.053-1.094-1.252-1.601-0.356-2.492
+		c0.888-0.253,1.463,1.567,2.136,0.356c-1.167-0.494-1.687-1.636-2.492-2.492c0.707-0.599,0.567-2.043,1.424-2.492
+		c0.346,0.816,1.55,0.632,2.136,1.068c0.941,0.7,0.955,2.197,2.136,3.56c1.88,2.17,5.026,2.566,4.984,4.984
+		c5.359,1.524,6.509,7.257,14.953,5.696c0.183-1.36,1.17-1.915,1.424-3.204c-1.113-0.549-2.954-0.37-3.56-1.424
+		c0.395-0.673,0.454-1.682,0.712-2.492c0.883,0.053,1.728,0.066,1.78-0.712c-2.13-1.067-3.012,1.889-4.984,2.136
+		c-0.061,1.007,0.306,2.442-0.712,2.492c-1.032-0.985-2.233-1.802-3.204-2.848c0-1.187,0-2.374,0-3.56
+		c2.498-1.418,5.014-2.819,8.544-3.205c-0.794,3.67,4.116,3.039,6.409,2.492c0-0.712,0-1.424,0-2.136
+		c-1.975-0.935-3.747-1.666-5.696-1.78c-0.174-1.124,0.642-1.257,0.356-2.492c-2.505-0.429-4.577,2.5-7.121,3.204
+		c-0.148-1.394-1.21-1.875-1.424-3.204c1.031-1.342,1.928-2.818,2.492-4.628c2.915-0.17,3.91-2.261,6.052-3.204
+		c-1.269-2.05-6.405-1.745-4.628-5.696c-4.902-3.062,7.073-3.4,8.9-4.984c-1.332-1.517-2.754-2.942-3.56-4.984
+		c-0.276-0.08-0.702-0.01-0.712-0.356c-3.796,1.854-10.164-1.883-11.749,1.068c0.918,1.183,2.94-0.854,3.204,0.712
+		c-1.493,1.593-2.982,3.189-5.34,3.916c-0.305,1.136,0.561,1.101,0.712,1.78c-0.724,0.819-2.448,0.637-2.848,1.78
+		c0.982,0.124,2.5-1.022,3.204,0c0.21,1.781-3.442,1.101-4.272,0.712c0.812-1.791,0.315-5.435-2.848-5.696
+		c1.189,2.201,1.452,3.356,1.068,6.764c-2.122,0.015-0.936,3.337-2.492,3.916c-1.328-0.215-2.563-0.522-3.204-1.424
+		c-0.29-1.965-1.581-2.929-2.136-4.628c-0.334-1.704,0.951-2.828-0.356-3.56c-2.892,2.98,1.386,6.649,1.78,8.9
+		c0.286,1.629-0.08,2.498,0.712,3.204c0.475,0.593,2.017,0.119,2.492,0.712c-0.243,1.905,1.603,1.721,1.424,3.561
+		c0.962-0.42,2.592-1.422,2.848,0.356c-1.611,0.05-1.863,1.459-3.56,1.424c-0.872-0.473,0.391-1.325-0.356-1.424
+		C110.664,155.156,108.564,155.452,108.36,154.71z M222.285,138.333c0.329,0.779-0.326,2.796,1.424,2.136
+		c0.227-1.651-0.646-2.203-1.424-2.848c0-1.543-0.621-2.465-1.424-3.204C220.415,135.261,221.703,136.954,222.285,138.333z
+		 M185.972,139.045c-1.841,1.72-3.796,3.325-6.052,4.628c-0.001,1.423-0.711,2.137-0.712,3.56c-2.124,1.646-5.968,3.163-8.188,3.561
+		c0.43,0.075,0.219,0.395,0,0.712c-4.347,0.208-8.829,1.251-12.104,3.916c7.831,0.117,12.655-2.772,19.581-3.56
+		c1.639-0.347,2.33,1.644,3.204,0c0.438-1.625-2.406,0.033-2.492-1.068c-0.234-1.303,0.771-1.366,0.712-2.492
+		c6.288-2.85,12.493-5.783,18.157-9.257c0.958-0.584,2.907-0.179,3.204-1.424c-1.247-1.957-5.009-1.399-7.12-2.492
+		C191.247,136.251,189.385,138.424,185.972,139.045z M312.001,140.114c0.213,20.519-1.52,40.245-0.356,63.727
+		c2.832-19.182,0.124-44.413,1.068-64.438c-0.078-0.277-0.298-0.414-0.712-0.356C312.001,139.402,312.001,139.758,312.001,140.114z
+		 M19.356,145.098c0.005,0.588,0.987,0.199,1.068,0.712c1.26-0.877,4.767,0.494,5.34-1.068
+		C24.557,143.788,19.923,143.78,19.356,145.098z M443.37,148.658c-1.501,0.181-2.817,0.929-4.271,1.068
+		c-3.572,0.34-7.646-0.442-11.037,0c-0.88,0.115-2.934-0.067-3.204,1.424c2.586-0.568,3.162,0.874,4.629,1.424
+		c9.898,0.669,21.749-0.321,31.329-0.712c0.342-0.938,0.688-3.05,0-3.917C455.321,147.868,449.186,147.955,443.37,148.658z
+		 M29.681,166.103c0.079-0.277,0.298-0.414,0.712-0.356c-0.03-6.357,0.397-11.007,0.356-16.732c-2.352-1.191-6.766-0.741-9.256,0
+		c0.457,6.548-0.835,13.115-0.356,18.513c2.048,0.312,5.25,0.798,6.764-0.356c-2.677-0.034-2.262-1.26-2.492-2.492
+		c0.965-0.459,1.977-0.871,3.56-0.712C29.911,164.432,29.345,165.851,29.681,166.103z M17.22,149.37
+		c-0.199,0.513-0.555,0.869-1.068,1.068c0.031,7.562-0.154,11.354,0,18.157c0.671,0.23,2.91-0.502,3.204-1.78
+		c-0.8-0.505-2.085-0.526-2.136-1.78c-0.241-5.599,1.782-10.773,1.068-15.665C17.933,149.37,17.576,149.37,17.22,149.37z
+		 M137.197,153.286c0.263,0.568,1.743-0.081,1.424,1.068c-1.102,0.672-1.961,0.526-2.848,0.712c0.406,2.196,4.44,0.658,5.696,0.356
+		c0.13,1.056,0.617,1.756,1.424,2.136c1.085-1.148,0.372-3.652-0.356-4.984c-0.215-0.734,0.575-2.473-0.712-2.136
+		C140.932,152.037,138.563,152.16,137.197,153.286z M226.201,161.831c-2.015-2.357-2.803-5.898-5.696-7.476
+		c-1.174,0.013-1.361,1.012-1.424,2.136c1.781,1.483,3.006,3.715,4.628,5.696c1.438,1.755,3.135,4.344,5.696,3.917
+		C229.998,163.707,227.272,163.083,226.201,161.831z M443.37,155.066c-3.023,0.151-6.527-0.748-7.832,1.424
+		c0.643,1.055,2.018,0.578,3.204,1.068c1.039,0.429,1.56,1.202,2.849,1.424c1.656,0.286,4.15,0.11,6.052,0
+		c4.747-0.275,9.835-0.72,13.173-1.78c-0.295-1.278,0.803-1.723,0-2.492C455.789,153.743,448.854,154.793,443.37,155.066z
+		 M74.539,156.134c-6.692,0.304-13.946,0.378-20.293,0.712c-2.03,0.107-4.347-0.021-5.34,0.356c-0.936,0.355-2.57-0.309-3.204,1.068
+		c2.869-0.097,6.326,0.393,8.188-0.712c1.303,0.477,1.253,2.307,2.848,2.492c1.192-0.611-0.133-1.532,1.424-1.78
+		c5.705,1.112,12.593-0.316,18.157-0.712c2.396-0.17,5.617,1.321,6.764-1.424C80.597,154.738,77.459,156.001,74.539,156.134z
+		 M161.406,159.338c-1.17-0.016-0.852-1.521-2.136-1.424c-2.466,0.026-4.194,0.791-6.052,1.424c1.286,0.851,1.819,2.453,3.916,2.492
+		c2.551-2.9,8.368-0.266,12.104,0c0.729-0.694,1.64-1.208,1.78-2.492c-1.347-0.67-3.398-0.637-4.272-1.78
+		C165.81,159.677,163.68,158.476,161.406,159.338z M109.784,177.495c-3.24-2.337-6.312-4.843-10.324-6.408
+		c-0.855-3.773-4.609-4.647-6.052-7.832c0.319-1.625-0.593-2.018-0.712-3.205c-1.152,0.44-0.272-1.152-1.424-0.712
+		c-2.083,2.782-3.633,6.098-3.916,10.681c-1.11,0.907-2.097,1.938-3.56,2.492c0.964,0.321-0.814,0.796-0.712,1.424
+		c-8.685,5.213-17.961,9.694-22.785,18.157c-1.298,2.276-2.485,4.331-3.56,6.408c-0.45,0.869-1.012,2.177-1.068,3.205
+		c1.206-0.107,3.159-2.532,3.916-4.272c2.946-2.201,5.006-4.763,7.477-7.477c1.451-1.594,2.665-4.853,5.34-4.272
+		c-1.24,3.863-4.743,5.463-6.052,9.256c-4.885,4.456-9.383,9.965-13.173,14.953c-2.653,3.492-5.089,7.168-7.832,10.681
+		c-2.1,2.688-4.991,4.726-6.765,7.476c-1.177,1.826-1.446,4.239-3.204,5.696c0.112,3.338-3.893,6.66-3.56,10.325
+		c-2.067,2.423-2.172,5.55-3.204,8.544c-0.735,2.13-1.811,3.976-2.136,5.696c-0.721,3.815,0.939,8.628,2.848,10.681
+		c1.382,1.485,3.982,2.177,5.696,3.56c2.428,1.959,3.942,5.234,6.408,7.833c1.07,1.127,2.631,2.045,3.917,3.204
+		c1.368,1.234,2.285,2.934,3.56,3.916c4.224,3.254,10.119,5.387,16.376,6.052c1.396,0.741,1.906,2.366,4.272,2.136
+		c-2.872-6.037-4.885-11.806-7.833-17.089c-1.09-7.421,1.548-13.707,6.052-18.869c-0.951-0.603-2.598,0.56-3.916,0.712
+		c-0.873-1.975-0.833-4.863-2.136-6.408c-1.648-0.043-3.021-1.314-4.628-1.424c-5.126-0.35-9.945,2.911-13.529,4.628
+		c-0.926-0.261-0.933-1.44-1.424-2.136c-0.091,0.833-1.564,0.205-1.78,0c3.223-4.403,7.975-7.066,13.529-6.052
+		c0.692,0.126,1.292,0.898,2.136,1.068c0.703,0.141,1.537-0.202,2.136,0c1.723,0.58,3.64,2.952,4.984,0.356
+		c-1.46-1.833-4.41-3.914-7.477-4.628c-2.425-0.565-6.154,1.068-6.764-1.78c1.242-1.194,2.649-0.76,4.628-1.068
+		c2.528-0.393,5.306-1.688,6.765-1.424c1.768,0.321,2.439,1.9,4.272,2.136c5.563-7.847,10.911-15.91,14.241-25.989
+		c0.146-0.858-0.65-0.774-0.356-1.78c0.441-2.088,2.192-3.827,2.848-6.052c0.234-0.796-0.239-1.729,0-2.492
+		c0.234-0.749,1.158-1.347,1.424-2.136c0.908-2.694-0.322-5.653,1.78-7.833c3.035,4.006,1.028,10.329,1.068,13.885
+		c0.05,4.466,1.915,6.012,2.848,9.256c0.225,0.781,0.17,1.953,0.356,2.848c0.544,2.614,0.66,4.68,1.068,7.476
+		c1.153-0.462,1.181-1.939,1.424-2.848c0.276-1.032,0.753-2.574,0.712-3.56c-0.07-1.687-2.078-4.195-2.492-6.764
+		c-0.602-3.736-2.347-5.71-0.356-8.188c2.408,0.678,3.057,3.114,5.34,3.916c-0.219-5.323-3.152-10.426-2.848-16.021
+		c-0.875-1.023-1.523-2.274-2.136-3.56c0-0.95,0-1.899,0-2.848c-1.987-1.692-6.331-1.027-6.408-4.628
+		c3.321,0.469,7.006,3.178,8.9,4.628c2.023,1.549,4.516,3.882,5.696,6.408c0.404,0.864,1.575,2.682,0.356,3.56
+		c-2.698-1.218-2.788-5.044-5.34-6.408c0.617,1.519,1.669,2.603,1.78,4.628c4.147,3.622,5.607,8.029,7.833,13.172
+		c-0.085,0.508-0.586,0.601-0.712,1.068c1.485,0.77,1.249,3.261,3.56,3.204c0.017-2.035-1.549-2.485-1.068-4.984
+		c-0.175-1.125,1.767-0.132,1.424-1.424c-0.745-2.697-2.495-4.388-2.136-8.188c-1.085-1.606-2.856-3.335-2.136-5.696
+		c-0.93-1.681-2.663-2.559-2.848-4.984c-1.465-1.227-2.529-3.036-3.916-4.628c-1.193-1.37-3.702-2.705-2.848-4.984
+		c1.873-0.33,1.882,1.203,3.204,1.424c-0.236-0.808-0.92-2.985,0.356-3.204c1.678,0.458,2.874,1.399,4.628,1.78
+		c2.888,3.164,6.136,5.968,10.324,7.833c0.897-2.189,2.107-4.064,3.205-6.053c1.283-0.852,2.821-1.451,3.204-3.204
+		C114.898,178.79,112.438,178.045,109.784,177.495z M442.303,161.475c0.251,5.134,12.702,2.91,18.156,2.848
+		c0.419-1.279,0.773-3.171,0.356-4.272C454.84,160.721,448.725,161.251,442.303,161.475z M70.267,161.119
+		c-2.712,0.083-5.778,0.007-8.188,1.068c2.087,1.765,5.956,1.208,9.256,1.068c1.877-0.08,4.02-0.232,5.696-0.356
+		c2.079-0.154,4.813,0.144,5.696-1.78C78.494,160.76,74.207,160.998,70.267,161.119z M297.761,165.035
+		c0.713-0.474,0.793-1.58,1.067-2.492c-0.857,0.146-0.773-0.65-1.78-0.356C296.467,162.873,296.446,165.157,297.761,165.035z
+		 M63.858,165.391c1.132,4.634,7.172,2.021,11.037,1.78c2.613-0.163,4.971,0.123,7.476,0c-0.293-0.894,0.692-3.065-0.712-2.848
+		C76.629,164.827,68.937,164.348,63.858,165.391z M290.996,168.951c0.62-0.026,1.107,0.08,1.424,0.356
+		c1.014-0.667,1.014-3.606,0-4.272c-0.355,0-0.712,0-1.067,0C290.692,165.799,291.112,167.643,290.996,168.951z M188.107,168.595
+		c1.14-0.047,1.566-0.807,1.424-2.136c-0.356,0-0.712,0-1.068,0C188.01,167.384,187.683,167.533,188.107,168.595z M451.203,167.527
+		c-0.082,1.388,0.765,1.846,1.067,2.848c2.763-0.205,6.364,0.43,8.545-0.356c0-0.949,0-1.899,0-2.848
+		C458.546,167.109,453.887,166.906,451.203,167.527z M160.694,167.883c-0.387,1.559,3.003,2.194,2.848,0.356
+		C163.514,167.155,161.215,167.405,160.694,167.883z M234.034,171.087c0.08-0.276,0.01-0.702,0.356-0.712
+		c-0.174-1.606-1.448-2.113-3.204-2.136C229.935,170.319,232.396,171.894,234.034,171.087z M65.639,169.663
+		c0.577,1.285-0.061,1.723,0.356,2.848c3.417,0.521,11.32,0.031,12.104-1.424c1.569-0.329,4.114,0.317,3.916-1.78
+		C77.111,168.558,70.695,169.378,65.639,169.663z M295.269,171.799c-1.327-0.669-3.014,1.124-4.272,0.712
+		c-0.076,3.901-1.421,10.802,0.712,13.528c-0.06-0.772,1.263-0.161,1.78-0.356C294.9,181.874,294.651,176.404,295.269,171.799z
+		 M453.695,175.715c2.574-0.273,6.091,0.396,7.12-1.424C460.886,171.083,449.714,171.723,453.695,175.715z M65.995,174.647
+		c-0.078,1.302-0.489,1.366,0,2.492c1.581-0.555,3.365-0.907,3.916-2.492C68.811,173.725,67.379,174.752,65.995,174.647z
+		 M134.706,177.139c-3.823-1.267-3.166,2.502-0.712,3.561c1.906-1.18,4.5-1.672,6.765-2.492
+		C139.989,176.001,135.951,174.898,134.706,177.139z M453.695,178.563c0.579,2.027,7.019,2.429,6.764-0.712
+		C458.45,177.014,455.229,177.767,453.695,178.563z M456.899,182.124c0.771,1.202,0.149,1.585,0.712,2.848
+		c1.224,0.156,1.995-0.141,2.848-0.356c-0.042-1.025,0.194-2.331-0.355-2.848C458.637,181.488,458.276,182.314,456.899,182.124z
+		 M120.109,191.38c1.883,1.547,4.209,4.186,6.764,3.916c0.424-3.662-2.263-7.206-4.628-9.256
+		C121.974,188.261,120.173,188.953,120.109,191.38z M455.831,190.668c1.43-0.35,3.124-0.437,4.984-0.356c0-1.068,0-2.136,0-3.204
+		C457.672,186.812,455.094,187.082,455.831,190.668z M103.376,193.516c0.817,0.156,2.296,1.469,3.204,0.356
+		c-2.417-1.737-3.856-4.451-6.764-5.696C100.176,190.783,102.94,190.985,103.376,193.516z M290.996,190.668
+		c0.674,0.631,2.352,0.259,3.561,0.356c-0.009-0.839,0.612-1.048,0.355-2.136C293.535,188.15,290.747,188.638,290.996,190.668z
+		 M455.831,192.804c-0.046,2.279,4.869,1.743,4.984,0C459.09,192.354,457.523,192.815,455.831,192.804z M106.58,194.94
+		c0.277,0.079,0.414,0.298,0.356,0.712c2.597,1.2,3.32,4.275,6.052,5.34c1.452,1.634,3.92,5.243,6.052,3.917
+		c-0.491-1.919-3.592-1.774-2.492-4.272c-1.122-0.776-2.83-0.968-3.561-2.136c-0.259-0.971,0.708-0.716,0.712-1.424
+		C111.506,196.535,108.695,193.235,106.58,194.94z M457.255,197.432c2.117-0.456,1.644,1.68,3.204,1.78
+		C462.131,196.566,458.409,195.521,457.255,197.432z M45.346,201.348c-2.374,0.294-6.999,0.698-7.121,2.492
+		c3.291-1.094,9.381,0.341,11.749-2.492C48.793,200.991,47.017,201.142,45.346,201.348z M199.144,206.688
+		c-0.629-0.32-1.039-0.859-1.78-1.068c-0.872,2.022-0.459,2.935,0.356,4.628c-1.612,2.535-2.133,5.54-4.272,8.188
+		c-0.798-0.982-0.505-3.055-1.78-3.56c-0.798,0.937,0.919,2.388,0.712,3.916c-1.72,1.443-0.111,4.796-1.424,6.052
+		c-1.168-0.137-1.569-1.041-2.492-1.424c-0.723,0.82-1.277,1.808-2.136,2.492c-0.863-1.985-0.532-5.165-2.136-6.408
+		c-1.526,2.978,3.032,8.714,2.136,12.816c-0.011,0.052-0.827,1.035-1.068,1.424c-0.361,0.581-0.542,1.729-1.424,1.424
+		c-0.734-0.097-0.085-1.577-1.068-1.424c-0.791,1.939-1.311,4.148-2.492,5.696c-1.266-0.989-0.349-4.161-1.78-4.984
+		c-1.004,1.966,1.574,5.297,1.068,6.765c-0.357-0.001-0.424,0.288-0.712,0.356c-1.982-0.154,0.033-4.306-2.136-4.272
+		c-0.573,0.533,0.564,2.042-1.068,2.136c-0.67-1.134,0.09-1.49-0.356-2.848c-1.73-0.999-1.251-4.208-3.204-4.984
+		c1.131,7.303,2.784,12.858,3.56,21.005c3.842,0.155,9.456,1.312,7.121-3.204c0.482-0.824,1.431-1.18,1.068-2.849
+		c0.831,0.108,1.534,0.76,1.78-0.356c-0.529-0.301-0.515-1.146-0.712-1.78c0.937-1.415,1.35,0.564,2.492-0.356
+		c-0.407-2.24-0.197-2.81,0.712-4.272c-0.522-0.564-0.734-2.827,0.712-2.492c0.733,0.098,0.335,1.327,1.068,1.424
+		c-0.227-1.554-0.188-3.373-1.068-4.272c0.727-0.579,1.455-1.155,2.492-1.424c0.274-1.342-0.434-1.702-0.356-2.848
+		c3.222-1.051,1.574-6.97,5.696-7.12c1.527-7.069,3.254-14.033,6.409-19.581c-1.207-0.217-0.571-2.277-2.136-2.136
+		C199.515,202.313,200.13,205.301,199.144,206.688z M26.833,205.265c1.208,0.462,2.922-0.284,3.916-1.068
+		C29.003,203.561,28.38,204.805,26.833,205.265z M16.864,205.977c0.457,0.49,2.129,0.62,2.136-0.356
+		c-0.629-0.32-1.04-0.859-1.78-1.068C17.3,205.226,16.819,205.338,16.864,205.977z M262.515,209.537
+		c0.672,1.336,2.949,0.925,4.272,0.712C266.586,206.951,263.795,210.699,262.515,209.537z M127.229,219.505
+		c-0.281-3.075-1.531-8.176-4.272-9.969c-0.237,0-0.475,0-0.712,0C124.2,212.565,124.26,217.49,127.229,219.505z M227.27,213.453
+		c0.979-0.807,0.71-4.458-0.712-3.56C227.047,210.823,225.641,212.393,227.27,213.453z M155.354,212.029
+		c0.299-0.413,0.469-0.955,0.356-1.78c-0.594,0-1.187,0-1.78,0C154.153,211.094,154.409,211.906,155.354,212.029z M162.119,215.589
+		c-1.184-1.18,1.089-3.857-1.068-4.272C160.565,212.821,160.881,215.928,162.119,215.589z M220.149,219.505
+		c-0.052,0.883-0.066,1.728,0.712,1.78c0.935-1.888-1.855-2.801-2.848-3.916c-0.744-1.867-2.649-2.572-3.204-4.628
+		c-1.773-0.663-2.818,0.159-4.984,0c-3.286,2.287,0.653,5.699-0.356,8.544c1.378,0.745,2.54-0.109,3.204-1.068
+		c-0.521-1.733-1.958-2.552-2.492-4.272c0.7-1.583,2.062-1.771,3.56-1.78c-0.272,3.028,3.765,3,1.78,5.696
+		C217.229,220.823,217.925,219.059,220.149,219.505z M255.038,214.165c1.188,0.025,3.973,1.763,4.629,0
+		C259.213,213.217,255.432,212.941,255.038,214.165z M254.326,217.013c-0.207,1.275,1.054,1.082,2.137,1.068
+		C256.587,216.845,254.791,216.591,254.326,217.013z M106.224,222.353c-1.081-2.241-1.638-5.007-4.984-4.984
+		C101.209,220.489,104.512,222.162,106.224,222.353z M120.109,226.981c0.351,1.012-0.803,2.445,1.068,2.492
+		c-0.021-3.186-2.205-7.287-3.204-10.681C116.966,222.484,119.135,224.174,120.109,226.981z M138.266,223.421
+		c1.233-0.886,0.373-2.965-1.068-3.204C136.364,221.31,136.86,223.453,138.266,223.421z M252.546,221.285
+		c0.599,0.604,2.091,0.283,1.78-1.068c-0.475,0-0.949,0-1.424,0C252.918,220.707,252.734,220.999,252.546,221.285z M226.913,224.489
+		c0.878,0.047,1.715,0.054,2.136-0.356c-0.138-1.523-1.627-1.696-3.204-1.78c-0.034-0.559,0.048-1.234-0.712-1.068
+		C225.352,222.728,226.506,223.235,226.913,224.489z M206.977,328.089c0.511-2.817-1.946-5.61-4.272-6.764
+		c0.256,2.036-0.38,3.18-0.356,4.984c2.695,0.763,1.209,6.256-1.068,6.408c-0.51-0.951,2.322-5.494-0.356-6.408
+		c-1.286,1.324-0.319,4.902-3.204,4.628c0.032-2.342,1.625-3.122,1.424-5.696c-0.996-0.077-1.772-0.015-1.424-2.136
+		c-1.53,0.176-1.854-1.694-3.917-0.712c-0.705,1.3,0.626,1.736,1.068,2.848c-1.469,1.992-3.84-0.391-6.052-0.356
+		c-1.296,0.02-2.104,1.28-3.204,1.068c-0.437,1.822-2.879,4.713-5.696,5.34c-0.97-1.074,0.247-2.121,0.356-3.204
+		c-1.856-0.432-1.381,1.467-1.424,2.849c-3.447,0.202-4.05,7.475,0,7.477c0.571-1.092,1.89-1.434,2.136-2.849
+		c-3.396-1.73,0.042-4.397,3.204-2.848c2.394-2.315,3.982-6.405,7.833-5.696c1.247,0.229,2.671,1.441,3.56,2.848
+		c-1.439,1.34-1.854,2.053-3.916,1.424c-0.351,2.219-1.434,2.88-2.136,5.341c-3.432-2.599-5.738,0.503-7.833,3.56
+		c1.18,0.957,1.64,2.633,3.204,3.204c0.912-0.274,2.019-0.354,2.492-1.067c-0.453-0.496-1.744-0.155-1.78-1.068
+		c0.573-1.3,3.731-2.161,3.916,0c-0.112,0.837-1.688,0.211-1.424,1.424c0.95,0,1.899,0,2.848,0c0.62-0.894-0.35-1.961,1.068-2.492
+		c2.8-1.023,3.643,2.327,6.408,1.068c2.56,5.309,11.635,1.95,16.376,3.204c1.872-2.002,3.542-2.155,5.696-3.561
+		c2.207,0.401,4.307,0.079,4.984-2.136c-1.361-2.396-5.224-5.825-3.56-8.9c1.252,0.409,1.549,1.773,1.78,3.204
+		c1.656,1.548,2.253,4.156,3.561,6.053c4.287-0.287,8.145-0.204,11.392-1.068c5.89-1.568,10.426-5.19,15.665-7.477
+		c0.398-0.174,1.007,0.13,1.425,0c3.19-0.988,5.973-4.084,10.324-3.204c6.127-4.353,17.247-4.084,21.005-9.968
+		c0.212-0.333-0.147-1.052,0-1.424c0.098-0.248,0.963-0.443,1.067-0.712c0.642-1.649,0.501-4.248,1.068-6.764
+		c1.186-5.254,3.495-11.042,3.916-16.376c0.142-1.792,0.964-3.683,1.068-5.34c0.165-2.619-0.144-5.458,0-8.544
+		c0.247-5.306,0.526-11.393-0.356-16.376c-0.085-0.485-0.688-0.613-0.712-1.068c-0.138-2.768,1.132-5.617,0-8.188
+		c2.201-4.516,1.354-11.23,1.068-17.445c-4.09-1.921-7.382-7.515-11.036-11.037c-1.079,0.107-1,1.374-2.137,1.424
+		c-1.602-0.891-2.505-2.479-4.271-3.204c-0.466,0.722-1.885,0.489-2.137,1.424c4.159,2.972,9.53,6.595,10.681,11.393
+		c-1.92,0.947-1.877-2.127-4.272-1.78c-1.361,2,1.594,2.322,1.068,4.628c-0.49-0.016-0.782,0.167-1.068,0.356
+		c-3.688-2.839-8.437-4.617-13.172-6.408c0.088,1.81,2.815,0.981,2.491,3.204c1.575-0.236,3.73,1.298,4.272,3.204
+		c-3.935-1.643-7.315-0.632-12.104-2.136c-1.288,3.668-3.812,7.948-3.56,12.816c0.07,1.366,0.864,2.827,1.067,4.272
+		c0.196,1.395-0.68,2.993,0.712,3.916c0.218-2.589,0.94-6.852,3.917-6.408c-0.307-1.612,0.393-2.218,1.424-2.492
+		c0.38,0.332,0.11,1.313,1.067,1.068c0.945-1.666,0.914-4.308,2.849-4.984c0.551,0.518,0.313,1.822,0.355,2.848
+		c0.91-0.188,1.246-0.472,1.78,0.356c-0.698,2.742-1.19,5.692-2.492,7.832c-0.836-0.35-0.844-1.529-1.424-2.136
+		c-0.041,1.442-0.784,1.845-0.712,2.848c0.206,2.87,4.521,3.634,4.272,7.12c-1.156-0.742-2.32-1.477-3.561-2.136
+		c-0.018,1.916,1.674,2.124,1.78,3.917c-1.683,0.753,0.652,3.312-1.068,3.916c-1.418-0.006-1.026-1.822-2.848-1.424
+		c-0.566,1.893,0.286,3.8,0,6.409c-0.749,0.319-1.583,0.553-2.137,1.068c-1.235,3.986-5.681,4.762-4.628,11.037
+		c3.285-1.177,6.669-1.577,8.9-3.56c0.292-0.26,0.111-1.105,0.356-1.424c0.338-0.441,1.422-1.093,1.779-1.424
+		c0.706-0.652,1.154-1.334,2.137-1.424c0.948,1.654-0.3,4.989-2.137,3.916c0.295,3.261-3.452,2.481-3.204,5.696
+		c1.891-1.656,4.41,1.858,6.053,1.424c0.693,2.155,3.015,2.682,3.916,4.628c-0.491,1.526-0.797,3.238-3.204,2.848
+		c0.157-1.344-0.702-1.671-1.068-2.492c-4.127,0.173-11.284-2.875-13.884,1.424c8.308-0.832,8.569,6.382,14.597,7.833
+		c-0.396,4.015-6.86,3.036-9.613,1.78c-1.112-0.109,0.905,1.029-0.355,1.068c-1.004-0.658-3.01-0.312-3.916-1.068
+		c0.366-2.171,2.703,0.479,3.56-0.356c-2.365-3.118-5.845-3.103-10.324-4.272c0.333,3.227,6.388,0.732,6.408,4.272
+		c-3.469,0.222-8.305-4.021-10.324-0.712c3.247,0.465,6.122,0.583,9.256,1.78c-0.868-0.342-1.179,1.6-0.712,1.424
+		c0.199-0.513,0.556-0.869,1.068-1.068c-0.484,3.816,6.43,1.853,7.832,4.272c-4.361,2.632-13.022,3.36-15.665,0.356
+		c-0.158-0.18-0.876,0.151-1.068,0c-1.344-1.063-1.393-3.146-2.848-3.916c-2.015-1.067-4.775-0.655-6.764-0.356
+		c0,1.187,0,2.373,0,3.56c2.468,2.299,6.744,0.27,6.764,4.272c0.984-2.398,5.694,1.314,5.696,2.136
+		c-1.125,0.038-2.435-1.573-3.204-0.712c1.796,1.408,4.187,2.221,6.409,3.204c-0.623,2.727-4.186,0.976-6.765,2.136
+		c0.064-1.365-0.292-0.129-1.068-0.356c-0.499-0.568-1.227-0.909-2.136-1.068c-1.677,1.527-3.688,2.72-5.34,4.272
+		c-1.48,0.126-4.219,0.375-5.696,1.068c-2.907-1.437-7.029-3.316-7.833-5.696c-0.584,0.903-1.19-1.155-2.492-0.712
+		c-0.461,3.695,7.903,3.465,7.476,7.12c-1.487-0.411-2.213-1.584-4.272-1.424c-0.11,1.771,2.434,0.888,2.492,2.492
+		c-0.776,0.766-1.883,1.202-2.848,1.78c0.02-0.456,0.456-0.493,0.356-1.068c-2.211,0.95-3.089-0.727-5.696-0.356
+		c-0.707,0.48,0.112,2.485-1.068,2.492c-1.942-0.55-2.868-2.116-5.34-2.136c0.802,2.005,1.957,4.091,3.204,6.052
+		c1.086,1.709,3.733,3.71,1.78,6.053c-2.694-2.626-3.851-6.686-6.408-8.545c-0.395-1.385-0.984-2.575-1.78-3.56
+		c-0.006,1.654,1.209,7.221-1.78,7.832c-1.098-1.716,0.754-4.26-0.356-6.052c-0.02-2.534-0.68-0.143-0.712,1.424
+		c-0.053,2.573,0.731,5.363-1.424,5.696C206.621,335.316,209.568,329.712,206.977,328.089z M262.871,223.421
+		c-0.93,0.5,1.908,0.194,1.067,1.78c-1.147,0.514-2.986,0.336-4.628,0.356c-0.254,2.238-1.468,3.517-2.492,4.984
+		c0.098,0.733,1.326,0.335,1.424,1.068c-0.748,0.319-1.582,0.553-2.136,1.068c-0.259,0.971,0.707,0.716,0.712,1.424
+		c-1.127,0.297-1.81,1.039-2.492,1.78c1.242,0.284-1.421,2.387,0.356,2.136c3.707-2.227,5.263-6.604,9.256-8.544
+		c0-0.712,0-1.424,0-2.136c2.068-0.662,2.405-3.054,4.984-3.204C267.702,223.247,264.764,222.483,262.871,223.421z M219.437,225.914
+		c0.964-0.143,1.855-2.577,0-2.492C218.859,223.842,218.143,225.675,219.437,225.914z M176.715,226.625
+		c-0.111-1.076,0.395-2.769-0.712-2.848C175.51,224.375,175.181,226.967,176.715,226.625z M286.724,225.557
+		c2.147,1.137,2.788,2.842,4.629,4.272c1.081,0.841,3.162,1.669,3.916,3.56c-0.526,1.873,1.609,3.425,2.136,5.34
+		c0.622,2.265,0.666,6.077,0.356,8.188c-0.57,3.88-3.097,7.56-2.492,11.748c0.125,0.866,0.608,1.34,0.712,2.136
+		c0.078,0.605-0.417,1.24-0.356,1.78c0.062,0.545,0.643,1.236,0.712,1.78c1.205,9.354,0.064,24.196-0.712,30.974
+		c-0.415,3.627-1.803,6.849-2.492,10.68c-0.191,1.064-0.912,1.629-1.067,2.492c-0.809,4.483-1.042,8.064-3.204,11.393
+		c2.896,2.075,4.51,4.59,6.764,7.476c1.434,1.835,3.261,3.675,4.272,5.341c0.509,0.837,0.544,2.042,1.068,2.848
+		c1.668,2.565,5.481,4.337,6.052,7.477c1.847,0.764,2.931,3.176,5.34,4.272c0.376,0.171,1.073-0.211,1.425,0
+		c1.763,1.058,4.886,4.314,6.764,4.628c2.686,0.448,4.443-2.126,7.477-2.492c1.156,0.519,2.931,1.871,3.916,1.424
+		c0.329-0.744,0.087-1.7,0.712-2.848c-2.777,1.041-2.954-1.881-6.052-0.712c-0.11-0.84-1.236-0.663-1.068-1.78
+		c4.028,0.014,7.056-3.15,9.612-5.696c2.018,3.089-3.602,4.378-4.628,6.765c4.807,0.296,4.681-4.34,7.832-5.697
+		c0.837,1.753-1.931,3.008-0.355,3.205c5.317-5.683,11.876-9.41,22.429-9.613c1.739-2.414,3.904-4.402,6.408-6.052
+		c0.456-0.968,1.112-1.736,1.424-2.849c5.357-3.068,8.947-7.904,12.461-12.816c0.35-3.91-0.658-6.462-3.916-6.765
+		c-0.531,2.436-1.883,4.051-2.849,6.052c0.724,3.834-2.267,8.856-5.34,8.9c0.392-1.745,1.526-2.746,2.848-3.56
+		c0.818-3.81,2.486-6.77,3.561-10.324c-2.179,0.554-4.039,4.502-6.408,6.052c-0.265-0.803-1.997-0.139-2.849-0.356
+		c-0.426,1.3-0.499,1.599-0.712,2.492c-3.903,1.793-5.991,5.401-9.968,7.121c-1.429-1.358-2.081,0.487-3.561-0.356
+		c-0.014-5.446,1.282-11.171,6.408-10.325c0.381-1.993,2.036-2.711,3.204-3.916c0.53-3.388,2.625-8.292,1.78-14.241
+		c-1.309-5.723-3.609-8.425-3.561-15.665c-0.277-0.079-0.414-0.298-0.355-0.712c-6.45-2.925-10.606-8.144-13.885-14.241
+		c-4.755,1.432-2.884-3.762-4.628-5.34c-2.647-0.155-2.415,2.57-4.629,2.848c-2.028-0.463-0.44-4.543-1.424-6.052
+		c-1.077,0.109-1.271,1.102-2.848,0.712c-0.171-1.12,0.507-1.392,0.712-2.136c-0.457-0.612-2.129-0.007-2.137-1.068
+		c1.671-2.715-0.312-6.095-0.712-8.9c-4.076,1.857-5.923,5.944-10.324,7.477c0.277,0.079,0.414,0.298,0.356,0.712
+		c-1.898,0.95-3.201,2.496-5.341,3.204c-0.857,0.146-0.773-0.65-1.78-0.356c-1.073,1.033-2.626,3.184-4.271,2.492
+		c-0.312-1.143,0.923-0.738,1.067-1.424c-1.141,0.311-1.113-0.548-1.424-1.068c0.497-1.646,2.095-1.543,3.204-2.136
+		c0.705-0.376,1.913-1.434,2.849-2.136c1.805-1.353,2.367-2.331,3.204-3.56c0.642-0.942,2.167-1.33,2.848-2.136
+		c0.311-0.367,0.023-1.34,0.356-1.78c0.49-0.648,3.045-2.114,1.424-3.56c-0.597,1.701-2.406,5.439-4.272,3.56
+		c1.054-2.151,2.586-3.823,3.204-6.408c-1.978,0.395-1.674,3.072-3.916,3.204c-0.572-3.644,4.086-5.501,1.78-8.544
+		c-1.453,1.158-1.622,3.6-3.204,4.628c-0.59-1.242-0.925-3.492-0.356-5.34c-1.23-0.289-1.503,0.665-2.136,0
+		c-0.005-1.839-0.749-2.145-2.136-3.204c1.25,6.323-2.698,13.43-5.696,16.376c-1.344,1.321-3.528,2.728-4.984,2.848
+		c-0.073-2.447,0.91-3.836,1.424-5.696c-2.619-5.332-4.522-11.379-8.9-14.953c-0.512,0.556-0.896,1.239-1.78,1.424
+		c-1.405-0.73-2.017-2.255-3.916-2.492C286.724,224.608,286.724,225.083,286.724,225.557z M303.101,226.981
+		c0.764,0.423,0.831,1.542,1.424,2.136c1.574-0.924,1.243-3.985-0.355-4.628C303.873,225.38,303.193,225.887,303.101,226.981z
+		 M101.952,230.542c0.49-0.016,0.782,0.168,1.068,0.356c1.285-1.474-0.562-3.571-1.78-4.628
+		C100.534,227.417,102.232,228.69,101.952,230.542z M199.144,236.238c2.022,0.144,3.029-3.788,4.984-1.424
+		c-2.098,2.055-4.858,3.449-5.696,6.764c-0.481-0.112-0.68-0.507-1.424-0.356c-1.389,1.724-0.871,6.259-1.068,8.544
+		c3.486-5.3,5.127,0.464,8.544,3.917c1.521,1.537,2.891,1.506,2.848,3.56c4.685,0.634,4.251-4.595,3.916-7.12
+		c-1.244,1.375-3.696,1.124-2.848,2.848c-1.23-1.262-2.477-2.507-3.56-3.917c1.067-0.803,6.171-2.699,7.833,0
+		c-0.626,0.086-0.812,0.613-0.712,1.424c2.728,1.448,6.189,2.902,9.969,1.424c-1.264-1.928,0.862-3.601-1.068-5.34
+		c0.501-1.992,4.014-2.292,5.34-0.712c-1.335,1.038-2.701,2.046-2.136,4.984c1.542,0,3.085,0,4.628,0
+		c0.208,0.741,0.748,1.15,1.068,1.78c2.831,0.202,4.13-1.961,6.052-0.712c1.161-1.094,0.658-3.852,1.424-5.34
+		c-0.657-1.242-1.414-2.383-1.424-4.272c-1.379-1.707-3-3.124-4.272-4.984c-0.96-1.405-1.44-4.482-3.56-3.56
+		c0.128,1.897,3.001,2.921,1.78,4.984c-1.453-0.802-1.283-3.227-2.848-3.916c-1.461,0.626,0.208,3.002-1.068,3.204
+		c-1.182-0.243-0.399-2.449-1.424-2.848c-1.287-0.19-2.292-0.185-3.917-0.712c-0.848,1.67,3.177,4.627,1.424,6.053
+		c-1.75-1.573-1.843-4.803-3.204-6.765c-0.944,0.005-2.096-0.197-2.136,0.712c1.218,0.805,3.761,4.57,0.712,5.34
+		c-0.578-0.609-1.078-1.295-1.068-2.492c-1.963-0.055-2.59-1.445-2.848-3.204c-3.666-0.369-2.35-5.72-6.052-6.052
+		c-0.216,1.996,1.845,1.715,2.136,3.204c0.052,0.883,0.066,1.728-0.712,1.78c-1.36-1.607-1.359-4.575-3.56-5.34
+		c-1.163,0.887,1.331,2.227,0,3.204c-1.808-0.74-0.607-2.597-1.78-3.56c-0.356,0-0.712,0-1.068,0
+		C202.248,230.505,197.261,232.156,199.144,236.238z M183.124,233.034c-0.079-1.146,0.629-1.506,0.356-2.848
+		c-0.455-0.02-0.493-0.457-1.068-0.356C182.641,231.639,181.558,232.56,183.124,233.034z M103.02,239.442
+		c-1.909-1.468-1.535,1.878-3.56,1.424c-1.456-1.63-3.214-2.957-5.696-3.56c-0.101,1.442-1.225,1.861-2.492,2.136
+		c0,0.712,0,1.424,0,2.136c-0.748,1.274-2.218,0.208-2.492,1.424c0.402,0.429,1.016,0.646,0.712,1.78
+		c-0.085,2.288-4.159,0.588-4.984,2.136c4.96,2.066,9.838,1.204,15.665,1.068c0.576-1.203,1.917-0.808,2.848-1.424
+		c2.423-1.603,3.488-5.034,6.764-5.696c-0.011,4.289-4.614,5.793-4.628,8.9c0.356,0,0.712,0,1.068,0
+		c1.085-0.435-0.521-1.358,0.356-1.78c1.088,0.257,1.297-0.364,2.136-0.356c2.998-2.223,4.478-10.906-0.356-11.749
+		c-0.601,1.536,0.032,4.304-1.78,4.628c-0.833-1.659-0.248-4.736-2.492-4.984C103.812,236.712,104.851,238.562,103.02,239.442z
+		 M376.439,239.086c1.062-0.007,2.169,0.033,2.137-1.068c-0.822-0.483-1.588-1.023-2.849-1.068
+		C375.556,238.071,376.82,237.756,376.439,239.086z M395.309,239.442c-1.098-1.751-4.324-1.372-6.765-1.78
+		C388.743,240.134,393.575,239.668,395.309,239.442z M367.184,239.798c-0.439,2.053-2.102,2.883-4.984,2.492
+		c-1.066,2.731-3.829,3.767-5.341,6.052c4.512,0.568,5.703-5.196,10.681-5.34c0.78-2.187,4.503-1.431,5.341-3.56
+		C370.329,240.019,370.035,240.138,367.184,239.798z M120.109,246.562c5.37,2.364,11.104,3.111,12.104,10.325
+		c3.178-0.876,7.327-2.22,7.832-6.764c-1.231-1.299-2.991,0.203-4.272-0.356c-0.252-1.32,0.608-1.527,0.356-2.848
+		c-1.12-0.171-1.392,0.507-2.136,0.712c-1.369-0.885-2.084-2.425-2.848-3.916c-2.637,0.264-3.654-1.093-4.272-2.849
+		c-3.041,0.513-4.011-0.032-6.052-1.068C120.417,241.718,121.134,244.538,120.109,246.562z M109.784,249.054
+		c1.877,0.097,1.983-1.577,3.561-1.78c3.738,2.437,5.339-2.481,6.052-5.34c-1.491-0.645-2.787-1.485-4.628-1.78
+		C112.799,243.489,112.76,246.638,109.784,249.054z M339.771,253.327c0.317-4.709-1.392-7.391-1.78-11.393
+		c-0.49,0.016-0.782-0.168-1.068-0.356C337.802,245.564,337.847,250.384,339.771,253.327z M78.455,245.85
+		c1.118-0.18,1.455,0.839,1.78-0.356c-0.918-0.84-1.226-1.853-0.356-2.848C78.078,241.445,77.807,244.393,78.455,245.85z
+		 M464.731,246.918c5.355,1.518,13.453,1.435,19.581,1.78c1.72,0.097,3.389,1.196,4.628,0c0-0.712,0-1.424,0-2.136
+		c-8.174-0.962-15.548-1.522-24.209-2.492C464.731,245.02,464.731,245.969,464.731,246.918z M153.218,250.123
+		c-0.596,0.59-0.283,2.09-0.356,3.204c1.745-1.104,2.631-0.297,4.272,0.356c1.793-0.699,2.699-2.286,3.56-3.917
+		C158.763,248.775,155.554,249.701,153.218,250.123z M466.155,249.411c-0.421,0.172-0.807,0.379-1.067,0.712
+		c-0.732,11.905-0.19,28.943-0.356,41.298c7.723-2.483,14.424-5.988,21.361-9.257c1.067,0,2.136,0,3.204,0
+		c-0.992-9.884,0.487-20.661-0.712-30.973C480.833,250.671,473.809,250.545,466.155,249.411z M344.042,254.039
+		c0.106,0.712,0.858,3.093,1.425,3.204c-0.607-2.241-0.114-5.583-1.425-7.12C344.159,251.443,343.884,252.973,344.042,254.039z
+		 M239.018,253.327c0.862-0.718,0.974-2.61-0.356-2.848C238.347,251.468,237.375,253.193,239.018,253.327z M17.933,251.902
+		c-1.759,1.811-7.279-0.535-5.696,3.204c1.596,0.172,1.589-1.258,2.848-1.424c3.259,0.545,8.308,1.103,9.612-1.424
+		C22.349,252.232,19.782,252.426,17.933,251.902z M94.476,252.258c-1.226-0.96-3.208,0.333-3.56,0.356
+		C91.555,253.076,94.355,253.418,94.476,252.258z M348.314,259.023c1.859-1.191,0.6-3.659,0-5.34c-0.356,0-0.712,0-1.068,0
+		C346.653,255.123,347.279,258.061,348.314,259.023z M443.015,290.708c-1.81-0.919-1.763-3.697-3.916-4.272
+		c-0.72-3.219-2.635-4.537-4.272-6.765c-1.189-1.617-1.851-3.576-2.849-4.984c-1.65-2.33-4.113-3.913-6.408-6.052
+		c-2.173-2.027-3.989-4.691-6.052-6.764c-3.231-3.25-7.412-5.441-11.036-7.833c-0.812-0.1-1.339,0.086-1.425,0.712
+		c3.739,2.047,7.244,5.435,9.969,8.188c0.933,0.943,2.649,1.866,2.492,3.204c-2.401-1.125-4.843-5.721-7.477-4.272
+		c6.049,4.395,11.488,9.398,15.309,16.021c0.005-0.359,0.624-0.448,0.712,0c5.368,7.449,9.948,15.685,13.885,24.565
+		c1.845-0.054,2.851-0.947,3.916-1.78C446.359,295.842,441.638,294.295,443.015,290.708z M131.501,259.379
+		c0.542,1.546,2.381,1.199,3.561,1.068c0.002,0,3.405-1.323,3.56-1.424c1.769-1.158,3.918-4.226,2.848-4.628
+		C138.627,256.537,135.863,258.756,131.501,259.379z M68.486,257.243c1.397-0.091,1.323,1.288,2.848,1.068
+		c0.084-1.575,0.675-2.569-0.712-3.204c-0.286,1.314-1.465,0.295-2.136,0C67.822,255.74,68.776,256.011,68.486,257.243z
+		 M83.795,257.599c1.239,0.881,1.029,1.481,0,2.492c0.673,0.75,2.049,0.799,2.492,1.78c-0.277,0.909-1.77,0.604-1.78,1.78
+		c1.789,0.551,3.224-1.647,3.916,0c-0.732,1.879-2.418,2.804-4.628,3.204c-0.657,2.318,1.042,2.281,1.78,3.204
+		c-0.336,1.088-1.732,1.116-1.78,2.492c0.631,0.081,1.783-0.359,1.424,0.712c-0.061,1.363-2.289,0.559-2.136,2.136
+		c0.634,0.197,1.479,0.183,1.78,0.712c-0.259,0.809-1.071,1.065-1.78,1.424c-0.378,1.328,1.335,0.563,1.068,1.78
+		c-0.224,0.726-1.799,0.1-1.424,1.424c0.301,0.767,2.27-0.133,2.492,0.712c0.164,1.943-3.011,0.549-2.848,2.492
+		c1.306-0.244,2.795-0.402,3.204,1.068c-0.838,0.942-2.766,0.794-3.916,1.424c-0.717,3.144,2.037,2.936,3.56,4.628
+		c-0.519,0.905-2.159,0.689-2.492,1.78c1.125-0.057,2.149-0.013,2.492,0.712c-0.653,1.246-2.652,1.146-3.56,2.136
+		c0.653,0.335-0.549,1.796-0.356,2.848c0.301,0.767,2.27-0.133,2.492,0.712c0.045,1.588-1.812,1.273-2.492,2.136
+		c-0.267,1.216,1.446,0.452,1.068,1.78c-1.031,0.274-1.73,0.88-1.424,2.492c0.533,1.213,1.485-0.205,1.78,1.068
+		c-0.265,1.04-1.922,0.689-1.78,2.136c-0.032,0.972,0.593,0.717,0,1.424c0.247,0.702,1.986-0.088,2.136,0.712
+		c0.11,1.771-2.248,1.075-2.492,2.492c1.045,0.302-0.463,0.896,0,1.78c1.267-0.08,2.134,0.24,2.492,1.068
+		c-1.244,0.893-2.971,1.301-3.204,3.204c0.277,0.909,1.77,0.604,1.78,1.78c-0.04,1.165-1.088,0.88-1.424,2.136
+		c-0.436,1.63,0.399,3.243,0.712,4.628c-0.145,0.687-1.38,0.281-1.068,1.425c0.11,0.839,1.236,0.662,1.068,1.779
+		c-2.886,1.8-0.89,7.061-0.356,9.612c-0.224,0.607-1.075,0.586-1.424,1.068c0.243,0.944,1.975,0.398,1.78,1.78
+		c-0.359,0.709-1.323,0.812-1.78,1.424c1.119-0.051,1.223,0.913,1.424,1.78c-1.065,0.003-1.496,0.64-1.78,1.424
+		c2.354,0.218,2.884,0.093,5.34,0c3.932-29.389,4.858-59.904,7.832-90.428c0.679-0.151,0.645-1.017,1.78-0.712
+		c0,1.068,0,2.136,0,3.204c1.332,0.698,1.871-0.779,3.204-1.068c0.679,0.152,0.644,1.017,1.78,0.712
+		c6.446-0.791,14.806-1.864,21.717-2.136c-0.008-0.838,0.613-1.048,0.356-2.136c-9.129-1.136-16.621,2.497-24.565,2.848
+		c0.294-1.621-0.762-1.875-0.356-3.204c-3.965-0.157-6.212-0.222-11.037-0.356C85.238,256.668,83.659,256.276,83.795,257.599z
+		 M143.606,258.667c-0.079-0.277-0.298-0.414-0.712-0.356c-1.083,1.291-2.565,2.181-4.272,2.848c3.186,2.629,3.49,8.14,9.256,8.188
+		C146.169,266.072,144.834,262.422,143.606,258.667z M184.903,262.227c1.82,0.04,2.199-1.362,2.136-3.204
+		C184.834,258.492,183.886,260.67,184.903,262.227z M438.742,262.227c0.862-1.04-0.224-2.412-1.78-2.136
+		C436.947,261.411,438.298,261.367,438.742,262.227z M74.183,260.803c-2.593,1.917-5.098,3.921-6.764,6.764
+		c0.399,2.707-2.031,5.259,0.356,6.053c0.46-4.663,1.926-8.828,5.696-11.037c0.593-0.475,2.266,0.129,2.136-1.068
+		C75.521,260.889,74.994,260.704,74.183,260.803z M102.308,261.159c0.047,1.14,0.807,1.566,2.136,1.424
+		c0.152-0.678,0.767-0.895,0.712-1.78C103.619,260.992,103.161,260.906,102.308,261.159z M389.256,261.515
+		c-8.509,0.509-17.18,0.857-24.921,2.136c0.375,1.643,1.879,2.156,2.849,3.204c5.986-2.337,16.268-1.677,23.497-2.492
+		C390.853,262.767,389.422,262.773,389.256,261.515z M110.853,268.635c0.966-0.458,2.021-0.827,1.78-2.492
+		c-1.089,0.258-1.047-0.614-2.136-0.356C110.223,267.129,110.931,267.489,110.853,268.635z M358.283,267.923
+		c0.332,1.21,1.097,1.988,2.136,2.492c0.691-0.686-0.374-1.433-0.355-2.492C358.927,268.134,358.962,267.255,358.283,267.923z
+		 M206.977,271.483c-3.225,3.251-11.615,3.008-16.733,3.204c-0.634,1.265-1.333,2.465-2.848,2.848
+		c-1.261-1.35-0.556-4.666-1.424-6.408c-1.509-0.641-2.239-0.075-4.272,0c0,1.068,0,2.136,0,3.204
+		c-4.112,2.247-11.772,2.61-17.088,2.492c-0.922,0.739-0.75,2.572-2.848,2.136c-1.924-0.212-0.461-3.811-1.424-4.984
+		c-3.544-0.325-4.713,2.347-4.628,4.628c1.359,0.726,4.356,2.979,2.136,4.984c-1.27-2.053-2.547-4.098-4.628-5.34
+		c-3.014,0.818-7.634,1-11.037,0.356c-1.098,1.141,0.837,1.255,0.712,2.492c-2.244,1.909-0.532,7.774-1.068,11.393
+		c0.411,1.077-2.019,2.054-0.356,2.136c7.332-0.663,15.913-1.841,22.073-2.492c4.702-0.497,9.449-0.555,14.241-1.068
+		c6.979-0.748,16.105-2.081,22.073-2.136c3.21-0.03,6.786-2.101,7.833,0c-0.311-1.142,0.548-1.114,1.068-1.424
+		c5.876-0.769,12.877-0.414,17.801-2.136c0.142-3.113-1.375-5.475-1.068-8.188c0.244-2.148,2.188-3.729,2.136-6.052
+		c-4.885-0.376-7.976,1.043-12.817,0.712c-0.493,0.574-0.301,1.835-1.068,2.136c-0.831,0-1.662,0-2.492,0
+		c-1.032-1.862,0.458-4.408-0.356-6.052C207.359,267.144,206.929,269.633,206.977,271.483z M245.07,287.148
+		c2.922,0.383,3.807,3.955,7.12,2.848c1.021,0.557,2.475,1.109,2.848-0.356c-2.613-0.354-1.814-4.119-3.916-4.984
+		c-0.665-0.633,0.29-0.905,0-2.136c-1.084-0.825-1.535,1.363-2.848,1.424c-1.362-1.537,1.288-3.562,0-4.984
+		c-0.354,0.952-0.595,2.016-2.136,1.78c-0.803-0.77,0.294-1.214,0-2.492c-0.626-0.205-2.092,0.43-2.136-0.356
+		c-0.624-2.699-1.26-5.386-2.848-7.121C240.554,278.136,242.273,283.181,245.07,287.148z M403.497,274.688
+		c2.163-0.958,2.535,2.955,4.271,2.492c-0.5-3.297-3.008-4.587-6.052-5.34C401.869,273.23,403.824,272.817,403.497,274.688z
+		 M67.418,275.755c0.271,1.585,0.47,4.814,2.492,4.628c-0.917-2.472-1.784-4.568-2.492-6.408
+		C66.503,274.231,67.272,274.899,67.418,275.755z M76.319,278.248c-0.097-1.209,0.276-2.886-0.356-3.56c-0.356,0-0.712,0-1.068,0
+		C73.919,276.104,75.366,277.629,76.319,278.248z M121.533,277.18c-0.684,1.094-2.24,1.998-1.424,3.56
+		c1.875-1.093,2.553-2.288,4.984-2.136c-0.81-1.444-1.229-3.281-3.204-3.56C121.143,275.913,121.38,275.802,121.533,277.18z
+		 M420.586,278.248c1.434,0.241,2.401,2.4,3.56,1.78c-0.797-1.458-1.327-3.182-3.204-3.561
+		C420.643,276.881,420.472,277.422,420.586,278.248z M415.957,279.671c0.594,0,1.187,0,1.78,0c-0.016-0.49,0.168-0.781,0.356-1.068
+		C417.438,277.644,415.543,277.696,415.957,279.671z M430.91,296.76c0.586,1.126,1.331,2.494,1.78,3.561
+		c0.77,1.83,0.43,4.729,2.848,5.696c1.331-1.432-0.408-3.121-1.068-4.628c-1.067-2.439-2.146-4.745-2.492-7.477
+		c-3.417-3.703-5.864-8.376-8.544-12.816c-1.923,0.369-2.312-2.656-3.916-1.424C423.762,284.853,427.773,290.734,430.91,296.76z
+		 M436.962,295.336c-2.954-2.149-4.425-5.781-5.696-9.612c-1.49-0.29-1.651-1.909-2.491-2.848c-2.049,0.067-3.374-3.704-4.984-1.78
+		c2.548,0.775,3.526,3.119,5.34,4.628c0,0.356,0,0.712,0,1.068c3.058,3.029,4.549,7.321,6.408,11.393
+		c0.969,2.12,1.783,5.332,4.272,6.052C440.007,301.501,437.312,298.701,436.962,295.336z M137.91,285.012
+		c-0.41,3.149-0.501,10.007,2.136,9.613c0.165-2.897-0.116-8.425,0-12.461c-0.455-0.02-0.493-0.456-1.068-0.356
+		C138.405,282.408,138.092,283.608,137.91,285.012z M126.517,284.3c3.203,3.931,5.504,10.214,5.696,16.021
+		c2.112,0.379,5.918-0.934,6.408,1.068c-0.763,1.966-4.369,1.09-6.408,1.78c-0.559,1.117-1.473,3.329-0.712,4.628
+		c2.715-0.134,4.058-1.639,7.121-1.424c0.232,1.904-0.467,4.74,0.356,6.053c0.9-2.812,0.453-7.551,0-11.037
+		c0.834-1.941,0.685-3.585-1.068-4.272c-0.329,0.621,0.012,1.911-1.068,1.78c-2.692-1.795-2.524-5.652-3.916-8.544
+		c-1.427-2.965-4.197-5.275-4.272-8.188c-0.356,0-0.712,0-1.068,0C127.427,283.073,127.086,283.8,126.517,284.3z M410.261,284.3
+		c0.045,0.787,1.511,0.151,2.137,0.356c-0.061-0.533,0.127-1.313-0.356-1.424C412.104,284.243,409.712,282.801,410.261,284.3z
+		 M414.89,286.436c3.585,1.518,3.769,6.437,7.476,7.832c0.617-1.38-0.878-1.888-1.424-2.848c-0.316-0.558-0.341-1.651-0.712-2.136
+		c-1.536-2.011-4.56-2.962-4.984-6.052c-0.532,0.061-1.313-0.127-1.424,0.356C415.194,283.52,414.2,285.819,414.89,286.436z
+		 M418.449,285.012c2.369,0.587,3.894,4.81,6.053,6.765c-0.294,1.006,0.502,0.922,0.355,1.78c3.187,1.086,1.868,6.676,5.696,7.12
+		c-2.648-5.539-5.494-10.882-9.256-15.309c-0.112-0.481-0.507-0.68-0.356-1.424c-1.231,0.373-1.895-1.628-2.848-0.356
+		C418.621,283.654,418.42,284.448,418.449,285.012z M476.479,288.928c-4.074,1.77-8.478,3.104-12.104,5.696
+		c-1.749-0.691-2.919,1.344-4.983,1.424c-0.786,0.282-0.463,1.673-1.425,1.78c-5.564,1.199-10.545,4.427-16.021,6.764
+		c-2.727,1.164-5.375,2.749-8.188,3.916c-6.798,2.821-14.696,5.792-20.648,8.544c-1.386,0.641-2.521,1.473-3.916,2.136
+		c-0.42,0.2-1.31,0.132-1.78,0.356c-5.079,2.417-10.342,3.885-15.309,6.408c5.214,0.841,9.396,2.57,14.952,2.136
+		c4.064,2.451,10.97,2.435,17.089,3.561c5.087,0.936,9.944,2.137,13.885,2.848c1.886-1.121,3.178-0.245,4.984,0
+		c1.042,0.142,1.986-0.163,2.848,0c1.397,0.265,2.547,1.201,3.916,1.425c1.321,0.215,2.689-0.243,3.917,0
+		c0.974,0.192,1.872,0.897,2.848,1.067c1.89,0.33,4.053,0.075,6.053,0.356c3.145,0.441,6.239,1.454,9.256,1.78
+		c2.101,0.227,3.069,0.411,4.272,0.712c0.718,0.179,1.401-0.166,2.136,0c1.353,0.306,2.691,1.331,3.916,1.424
+		c0.794,0.061,1.345-0.48,2.137-0.356c1.572,0.248,4.048,2.17,5.34,0c-1.066-0.233,0.341-0.761,0-1.424
+		c-10.662-1.977-20.493-4.072-30.617-5.696c-4.299-0.689-8.755-0.768-13.173-1.424c-1.002-0.148-1.731-0.881-2.848-1.068
+		c-0.756-0.126-1.643,0.468-2.492,0.356c-3.339-0.436-6.834-1.971-10.324-2.492c-1.182-0.176-2.354,0.315-3.561,0
+		c-5.449-1.424-12.982-1.579-18.513-3.204c0.055-1.132,0.808-1.566,0.712-2.848c2.963-1.072,5.604-2.466,7.832-4.272
+		c3.056,0.869,3.907-1,6.408-0.356c3.277-1.788,6.569-3.061,9.969-4.628c1.992-0.918,4.073-1.936,6.053-2.848
+		c3.944-1.818,7.856-3.447,11.748-5.34c7.87-3.827,16.18-7.077,23.854-11.749c1.123,0.174,1.257-0.641,2.492-0.356
+		c1.357-1.767,3.651-1.3,5.34-3.204c2.598,0.123,4.104-3.486,6.053-1.78c-1.146,1.817-3.333,2.577-5.341,3.561
+		c-6.228,3.052-12.205,6.041-18.156,8.9c-3.763,1.808-7.623,3.217-11.393,4.984c-10.311,4.834-20.656,9.865-30.974,14.241
+		c0.37,1.802,2.144,2.55,0.712,4.272c24.511,4.356,44.923,8.405,65.863,9.612c0.315-1.16-0.222-2.698,0.355-4.272
+		c-2.242-0.58-1.581,1.742-3.204,1.78c-14.294-2.783-24.313-2.68-39.161-6.053c-2.915,1.607-10.568-1.251-16.021-0.355
+		c0.661-1.88,0.896-3.16,0.712-4.272c0.904-0.714,1.983,0.889,3.205,0c1.776,2.418,5.472,1.729,7.832,2.136
+		c0.885,0.153,1.973,0.89,2.848,1.068c1.908,0.389,3.904,0.869,5.696,1.068c3.307,0.367,5.433,0.911,7.833,1.068
+		c8.979,0.587,16.268,2.164,23.496,2.492c2.246-2.027,4.44-4.105,6.765-6.053c-0.17-6.727-0.011-19.373,0-28.481
+		c-4.195,1.595-7.699,4.677-11.393,6.408c-1.45,0.68-3.108,0.779-4.628,1.424c-1.01,0.429-1.777,1.304-2.848,1.78
+		c-4.352,1.934-7.631,3.321-11.393,5.34c-5.47,2.935-11.021,5.332-16.377,7.832c-2.618,1.222-5.548,2.965-8.545,2.848
+		c0.272-2.09,2.256-2.479,3.917-3.204c3.295-1.44,6.342-2.854,9.612-4.272c1.691-0.734,3.657-1.386,5.34-2.136
+		c3.456-1.542,7.812-4.454,10.324-5.34c0.451-0.159,0.712-0.557,1.068-0.712c4.144-1.811,9.905-3.928,12.816-5.34
+		c1.998-0.969,2.575-1.428,3.561-2.136c2.932-2.107,5.757-3,8.544-4.272c-0.362-2.485-0.429-5.268-0.355-8.188
+		C484.354,284.621,480.47,287.195,476.479,288.928z M137.554,365.471c0.421-1.269-1.311-3.101-0.712-5.696
+		c-1.35-1.38-1.515-3.944-2.848-5.34c-1.702-6.159-6.139-12.057-6.764-17.089c-2.426-1.599-2.746-4.694-3.916-7.12
+		c-1.168-2.421-2.77-4.645-3.917-7.121c-0.182-0.393,0.166-1.022,0-1.424c-0.888-2.158-2.218-4.188-3.204-6.409
+		c-2.912-6.56-6.747-12.625-8.9-19.225c-0.644-1.136-2.157-1.402-1.78-3.56c-2.825-1.45-3.949-6.491-7.833-5.696
+		c2.05,3.053,4.419,5.787,4.984,10.324c1.042,0.32,1.094,0.32,2.136,0c2.872,6.849,7.116,12.957,10.324,19.225
+		c1.058,2.067,2.521,4.637,3.204,6.764c1.962,6.106,5.007,10.375,6.408,16.376c0.951,0.707,1.399,1.999,2.136,3.204
+		c0.73,1.195,4.431,7.056,1.424,6.765c-1.489-0.145-2.407-5.557-2.848-6.765c-0.907-2.484-2.731-5.043-4.272-7.832
+		c-1.481-2.681-2.314-5.726-3.56-8.544c-1.241-2.808-2.748-5.59-3.916-8.188c-1.409-3.133-2.222-6.336-4.272-8.188
+		c1.49,6.233,6.013,12.493,7.477,19.937c4.41,6.271,6.509,14.852,9.968,22.073c1.574-0.497,2.214,3.001,4.272,3.204
+		c-0.107-2.332-3.706-4.605-1.424-6.053c1.833,2.276,2.034,4.003,3.204,6.765c-0.097,0.734-1.577,0.085-1.424,1.068
+		c2.648,3.688,4.393,8.935,2.492,14.597C136.701,371.027,135.272,366.394,137.554,365.471z M414.89,292.132
+		c0.961,0.7,2.155,1.167,2.136,2.848c1.979,0.637,2.364,4.749,4.628,3.916c-3.105-4.015-4.892-9.349-9.612-11.749
+		c-0.237,0-0.475,0-0.712,0C411.724,289.602,414.516,289.658,414.89,292.132z M141.114,316.341c-0.364,0.348-0.72,0.704-1.068,1.068
+		c0.021,0.217,0.053,0.421,0.356,0.356c0.076-0.399,0.396-0.554,0.712-0.712c0,0.831,0,1.662,0,2.492
+		c3.867-0.695,5.069-3.639,8.9-3.56c5.686,0.117,8.04,5.966,9.256,11.037c-1.409,0.608-3.513,0.521-4.272,1.78
+		c4.765,1.092,8.264,5.207,7.833,10.324c0.941,0.839,1.269,2.291,1.78,3.56c5.562-1.506,7.136,4.977,11.036,1.78
+		c0.12-3.674-4.247-5.468-2.136-8.9c-1.434-0.346-2.18-1.381-3.205-2.136c0.314-1.358-0.192-1.6-1.424-2.849
+		c0.65-2.646-0.372-5.944,1.068-8.9c0.951-0.592,1.988-1.098,3.205-1.424c-0.361-5.698,5.865-5.455,11.748-6.052
+		c5.409-0.549,9.045-2.155,12.104,0c0.551-1.822,3.246-1.501,3.917-3.204c-0.405-2.444-2.945-2.751-2.492-6.052
+		c-0.341-1.083-2.127-0.721-1.78-2.492c0.965-2.597,4.884-6.669,8.188-6.408c1.707,0.135,2.242,2.134,4.272,2.136
+		c3.397-1.825,6.897-3.546,11.393-4.272c0.204-1.933,1.714-2.558,1.424-4.984c-2.958-1.125-6.725,0.145-9.969,0.356
+		c-2.617,0.17-3.728,0.859-5.34,1.068c-0.791,0.103-1.76-0.426-2.492-0.356c-3.728,0.359-9.289,1.279-12.46,1.78
+		c-2.444,0.385-5.085,0.088-7.477,0.356c-5.541,0.62-11.377,1.725-14.953,2.136c-2.504,0.288-5.454-0.203-7.476,0
+		c-0.004,0-0.232,0.626-0.712,0.712c-0.877,0.157-2.128,0.206-3.204,0.356c-5.047,0.704-11.886,0.438-16.376,2.848
+		C141.469,304.317,140.921,309.357,141.114,316.341z M115.836,292.488c0.802,2.996,1.959,5.636,3.204,8.188
+		c3.927-3.503-1.67-10.282-4.272-11.392c-0.079-0.278-0.298-0.414-0.712-0.356C113.162,290.362,115.32,291.33,115.836,292.488z
+		 M409.193,291.42c1.295,2.631,3.969,4.665,5.696,6.408c0.763,0.77,0.723,2.385,2.136,2.136c-1.906-3.315-4.224-6.22-6.765-8.9
+		C409.771,291.049,409.479,291.232,409.193,291.42z M112.632,302.812c1.37-3.015-0.979-7.559-4.272-8.188
+		C109.33,297.809,110.304,300.988,112.632,302.812z M425.569,299.964c-0.48-2.367-1.146-4.55-3.204-5.34
+		C423.059,296.78,423.327,299.359,425.569,299.964z M412.397,301.389c0.283-2.246-1.78-5.056-3.916-6.052
+		C408.952,298.188,410.894,299.569,412.397,301.389z M46.058,297.472c-0.234-0.478-0.761-0.663-1.424-0.712
+		c-3.072,0.871-8.39,2.166-12.46,1.78c-0.848,1.579-3.242,0.013-4.628,1.424c5.294,0.882,10.338-1.373,15.309-1.068
+		c0.471-0.004,0.325-0.624,0.712-0.712c2.909-0.453,5.334,0.179,7.477-0.712C50.599,295.181,47.26,297.196,46.058,297.472z
+		 M200.212,301.389c-0.33,1.871,1.029,2.875,1.424,4.628c2.525-0.31,0.781-2.62,0-3.56c0.056-2.081,3.026-1.246,3.916-2.492
+		C204.295,296.973,200.652,298.891,200.212,301.389z M18.645,301.033c-2.906,0.573-3.625,0.771-5.696,1.78
+		c-0.871,0.424-2.445-0.069-1.78,1.424c0.758,0.22,2.893-0.773,4.984-0.356c-0.007-2.033,4.041-1.883,3.204-3.56
+		C19.267,300.65,18.979,300.966,18.645,301.033z M403.853,302.457c1.43-0.113,3.661,0.575,3.204-1.424
+		C406.107,301.625,403.876,300.937,403.853,302.457z M92.696,312.781c-0.789,2.253-3.453,3.27-3.917,5.34
+		c0.527,0.066,0.327,0.86,0.356,1.424c5.853-1.489,9.512-6.316,7.833-14.241c-2.64-0.089-1.848-3.611-4.272-3.916
+		C92.753,304.625,93.969,309.144,92.696,312.781z M426.638,302.812c-5.861-0.576-12.691,0.954-15.664,2.136
+		c0.923,1.053,2.158,0.073,3.56,0c6.459-0.337,10.368-0.833,15.665-0.356C429.83,303.259,428.233,302.969,426.638,302.812z
+		 M369.319,305.661c-1.366,1.007-0.645,4.103-2.848,4.272c0,0.593,0,1.187,0,1.78c2.206-0.522,1.957-3.501,3.56-4.628
+		c0.678,0.153,0.895,0.767,1.78,0.712c0.341-0.727,0.728-1.409,1.068-2.136C371.518,304.52,370.502,306.498,369.319,305.661z
+		 M69.911,307.085c0.621,1.159-0.22,3.78,1.068,4.272c0.368-1.531,0.856-2.941,1.424-4.272
+		C71.611,306.261,71.015,307.206,69.911,307.085z M246.138,314.561c-4.16-0.257-6.126-4.52-9.968-3.916
+		c-0.016,0.49,0.167,0.782,0.356,1.068c2.367,0.494,4.265,2.294,6.408,3.56c2.043,1.208,4.6,3.284,6.764,2.136
+		C248.295,316.676,246.61,316.225,246.138,314.561z M234.034,313.137c1.775,0.604,3.682,2.955,5.696,2.136
+		C238.255,314.45,236.131,311.026,234.034,313.137z M100.172,324.53c4.349-0.874,6.962-3.481,9.612-6.053
+		c-1.356-1.61-1.134-4.799-3.204-5.696C106.231,318.485,102.637,320.942,100.172,324.53z M138.622,320.613
+		c1.159-0.027,0.76-1.613,1.068-2.492c-0.527-0.911-0.548-4.181-1.068-3.917C138.622,316.341,138.622,318.477,138.622,320.613z
+		 M194.16,316.697c0.792,1.938,2.983,2.476,3.916,4.272c0.148-0.791,1.952-0.342,1.78,0.356c-0.161,1.22-0.961,3.053,0.712,3.204
+		c0.467-1.313,0.32-3.24,0.712-4.628C198.747,319.188,196.922,316.011,194.16,316.697z M227.625,319.189
+		c0.295,0.307,2.079,0.634,3.204,1.424c0.67,0.471,0.614,1.268,1.068,1.424c1.007,0.347,2.601,0.745,2.848-0.356
+		c-2.89-1.264-4.968-3.339-8.188-4.272C227.185,317.961,227.204,318.75,227.625,319.189z M145.03,322.394
+		c1.396-0.384,2.424-1.137,3.204-2.136C147.062,319.458,144.741,320.549,145.03,322.394z M185.26,322.394
+		c2.407-0.204,4.489-0.732,5.696-2.136C188.888,319.472,186.251,320.941,185.26,322.394z M63.858,326.31
+		c1.507-1.341,1.954-3.743,2.848-5.697c-0.455-0.02-0.493-0.456-1.068-0.356C64.729,321.958,64.276,324.117,63.858,326.31z
+		 M68.843,330.938c-0.244,0.81-1.044,1.538-1.424,2.492c-0.796,1.996-0.916,4.335-1.78,6.052c-0.683,1.356-2.231,2.192-2.848,3.561
+		c-0.584,1.294-0.837,3.354-1.424,4.984c-0.262,0.727-0.795,1.448-1.068,2.136c-0.796,2.005-0.597,3.821-1.424,5.696
+		c-0.782,1.772-2.5,2.425-3.204,4.272c1.676,0.278,2.637,2.169,4.272,1.424c3.491-4.963,6.232-11.759,8.544-17.801
+		c0.776-2.028,2.051-4.406,2.492-6.408c1.107-5.025,0.08-10.106,0.712-15.309C69.971,324.942,69.845,327.602,68.843,330.938z
+		 M177.427,324.53c-0.086-0.626-0.613-0.812-1.424-0.712c-0.082,1.108-0.27,2.605-1.78,1.78c0.113,0.836,0.562,1.337,0.356,2.492
+		c2.986-1.167,4.837-3.47,8.544-3.916c0.123-1.063,1.076-1.297,1.78-1.78C181.348,322.042,178.77,322.667,177.427,324.53z
+		 M363.268,338.058c-0.674,0.08-0.786-0.401-1.425-0.355c-2.426,2.795-6.672,3.771-9.968,5.695c-0.803,0.234-0.7-1.059-1.78-1.424
+		c-2.005,1.199-3.771,2.638-7.477,2.137c-1.356,5.068-7.122,1.713-8.188,6.052c-0.029,0.12,2.792,2.644,0,3.561
+		c-0.628-0.312-1.103-1.191-1.424,0c0.836,0.113,1.336,0.562,2.492,0.355c5.177-3.06,11.066-6.252,17.089-7.476
+		c2.115-0.431,3.973-0.227,5.696-0.713c6.929-1.952,9.756-6.843,14.597-10.68c1.742-1.382,3.971-2.303,5.34-4.272
+		c-1.282-2.107-0.297-3.48-0.355-6.052c-0.455-0.02-0.494-0.457-1.068-0.356C373.495,330.248,369.092,334.864,363.268,338.058z
+		 M453.339,338.77c-0.961-0.179-1.818-0.875-2.848-1.067c-2.51-0.472-5.186-0.323-7.833-0.713c-2.202-0.323-4.507-1.042-6.764-1.424
+		c-5.042-0.853-10.421-1.05-15.309-2.136c-1.027-0.229-1.851-0.882-2.849-1.068c-0.825-0.154-1.66,0.133-2.492,0
+		c-4.404-0.705-9.059-1.645-12.816-2.136c-5.426-0.71-10.69-2.817-16.021-2.492c-0.075-0.431-0.396-0.219-0.712,0
+		c0.093,2.244-0.312,2.84,0,4.628c4.031-0.204,7.161,1.83,11.748,1.068c1.336,1.649,3.211,1.452,5.696,1.067
+		c2.638,1.362,5.539,1.668,8.545,2.137c4.186,0.652,7.96,1.495,11.748,2.136c2.49,0.422,3.788,0.202,5.696,0.712
+		c1.852,0.494,3.142,0.473,4.984,0.712c5.489,0.714,10.313,2.067,16.021,2.849c12.115,1.657,25.668,4.074,38.806,5.696
+		c0.376-1.095,0.766-3.515,0.356-4.272C477.875,342.075,465.632,341.061,453.339,338.77z M485.736,329.514
+		c1.565-0.216,2.791-0.77,3.204-2.137C487.294,327.511,486.493,328.491,485.736,329.514z M266.431,334.854
+		c0.814,0.227,2.147,0.706,2.849,0c0.249-1.555-0.605-2.005-0.356-3.561C265.835,330.443,266.623,333.785,266.431,334.854z
+		 M98.036,335.21c0.51,3.764,3.497,8.132,3.917,13.172c1.983,0.751,3.983,3.368,6.052,2.849c-1.417-0.702-0.431-2.12-0.712-3.204
+		c-1.232-4.746-4.16-9.203-5.696-13.529C100.187,334.566,98.298,333.385,98.036,335.21z M365.047,345.89
+		c-4.498,3.078-9.479,3.997-14.952,4.984c-6.482,1.169-11.588,4.082-16.732,7.477c-1.744,0.305-3.842,1.238-3.561,2.492
+		c0.861,1.63,3.008,1.976,4.628,2.848c1.95-1.287,3.255-1.413,4.984-3.204c4.48-1.028,8.259-3.872,13.173-4.628
+		c3.721-0.572,6.871,0.665,9.968-0.712c2.131-0.948,4.749-1.967,6.053-3.204c0.554-0.526,0.85-1.63,1.424-2.137
+		c0.296-0.26,1.143-0.147,1.424-0.355c2.194-1.621,3.809-4.463,5.696-6.408c0.982-1.013,2.223-1.273,2.849-2.492
+		c-0.431-1.51-0.431-3.118,0-4.628c-0.325-0.969-0.662,0.948-1.78,0.355c-0.158-0.673,0.484-2.146-0.712-1.78
+		C373.789,338.623,369.638,342.75,365.047,345.89z M267.143,337.346c1.271,0.586,3.541,0.61,3.204-1.424
+		C268.772,335.89,267.777,336.438,267.143,337.346z M267.855,339.482c0.448,2.026,2.713,2.031,3.916,1.068
+		C272.046,337.592,269.174,338.55,267.855,339.482z M401.717,341.262c-0.507-0.917-0.834-2.015-2.136-2.136
+		c-0.237,0-0.475,0-0.713,0c-0.13,1.056-0.617,1.756-1.424,2.136c-0.458-0.61-0.736-1.399-1.78-1.424
+		c-1.563,1.946-4.633-0.334-6.408,0c0.073,8.254-0.274,14.394-0.355,21.717c7.066,1.401,16.097,3.092,23.497,3.561
+		c0.515,0.032,1.063,0.745,1.779,0.712c1.361-0.064,1.277,0.106,2.492,0.355c6.823,1.398,16.4,1.91,21.718,3.204
+		c2.052,0.5,3.99,0.067,6.052,0.356c1.996,0.279,4.003,1.251,6.053,1.424c2.148,0.182,3.789,0.737,5.696,1.068
+		c0.604,0.104,1.045-0.414,1.779-0.356c1.813,0.144,4.225,1.24,6.408,1.424c9.146,0.77,17.005,2.55,24.565,3.204
+		c0.446-5.628,0.279-12.357,0.356-19.937c-1.261-0.192-0.876,1.261-2.137,1.068c-0.776-0.647-0.647-2.2-1.424-2.849
+		c-4.077-0.729-6.652,1.721-7.832-2.492c-2.991-0.262-4.479,0.98-6.408,1.78c-1.489-1.837-4.193-3.355-7.121-1.78
+		c-1.029-0.868-1.427-2.37-2.848-2.848c-1.451-0.265-1.226,1.147-2.849,0.712c-0.017-1.17-0.623-1.75-1.424-2.136
+		c-3.065-0.94-3.49,2.82-5.34,2.848c-0.398,0.006-1.05-1.758-2.492-2.136c-2.395-0.628-2.633-0.166-3.916-1.068
+		c-1.417-0.229-1.432,0.942-2.849,0.712c-1.645-1.416-4.373-2.725-6.764-1.424c-1.881-1.279-5.659-0.803-7.12,0
+		c-0.951-0.473-0.468-2.381-1.068-3.204c-2.53-0.351-3.429-0.1-5.341,0.712c-1.213-2.379-3.558-1.61-5.34-0.712
+		c-0.751-0.316-0.618-1.518-1.78-1.424c-1.709,1.397-2.157,0.559-3.916-0.356c-0.84,0.11-0.662,1.236-1.78,1.068
+		c-1.014-0.41-1.167-1.681-2.136-2.137c-1.748-0.323-1.356,1.492-2.849,1.425C404.322,341.268,403.147,341.137,401.717,341.262z
+		 M4.76,399.292c-0.233,16.935-0.455,34.991-0.356,49.131c0.018,2.543-0.303,4.933-0.356,7.476
+		c-0.47,22.436,0.476,43.687,0.356,65.863c-0.056,10.44-1.142,19.901,0.356,30.261c-1.489,1.687-0.362,6.594-0.356,7.833
+		c-1.292,1.131-0.076,2.006,0,3.56c0.324,1.03-0.593,2.104-0.712,3.561c-0.14,1.698,0.382,4.164,0.356,6.408
+		C4,577.396,2.724,581.376,4.76,584.065c-1.833,1.51-0.738,4.078-0.712,6.052c0.09,6.718-0.329,13.98-0.356,20.649
+		c-0.019,4.741-0.3,9.673-0.356,14.597c-0.054,4.761,0.135,9.583,0.712,13.884c35.799,2.169,73.696,0.521,104.312,1.068
+		c20.25,0.361,39.272,1.022,59.099,1.068c1.305,0.003,3.705,1.005,4.628-0.712c-20.677-0.971-47.2-1.189-66.575-1.425
+		c-7.104-0.086-13.106-0.079-19.937-0.355c-27.92-1.132-50.783,0.462-79.747-1.424c0.071-20.109,0.072-41.929,0.356-64.795
+		c0.138-11.134-0.808-22.519-0.356-34.178c1.406-36.268-0.943-73.52,0.356-111.077c0.434-12.556,0.356-25.511,0.356-38.093
+		c0-16.447,0.543-34.304-1.424-48.774C4.038,359.625,5.033,379.425,4.76,399.292z M150.726,341.262
+		c-1.783,3.296,1.524,7.33-0.712,10.324c3.23-1.192,5.907-0.906,9.968-1.424c0.161-3.339,0.391-6.513,0.712-9.612
+		C157.027,341.43,153.991,340.784,150.726,341.262z M269.991,344.111c1.319-0.105,3.05,0.201,2.848-1.425
+		c-0.265-0.803-1.996-0.139-2.848-0.355C269.991,342.923,269.991,343.517,269.991,344.111z M371.812,352.655
+		c0.691,4.821,4.063,7.561,3.204,12.104c-1.761-1.168-4.473,0.729-6.052-0.356c1.728-1.693-1.824-3.402-1.78-5.696
+		c0.423-1,0.801-2.047,1.067-3.203c-5.339,2.374-10.531,4.895-16.021,7.12c0.758,0.719,3.178-0.7,4.272,0.355
+		c-0.12,1.948-0.6,2.937,0.355,4.272c-1.315,1.413-2.829,2.629-3.204,4.984c-2.44,2.195-5.424,1.582-9.256,1.067
+		c0.699,1.556,3.309,1.202,3.916,2.849c-2.841-0.807-5.997-0.448-7.477-3.204c1.714-2.351,5.382-1.533,8.9-1.424
+		c-2.417-3.519-9.169,0.518-10.681-3.204c1.815-1.39,5.408-1.001,7.477-2.137c-1.771,0.348-1.409-1.438-2.492-1.78
+		c-5.193,2.639-11.357,4.308-13.528,9.969c-0.136,1.323,1.442,0.931,1.068,2.492c-0.409,1.471-0.409,2.802,0,4.272
+		c-1.502,1.751-1.78,4.477-2.492,6.764c-1.232,3.956-4.301,7.778-4.272,11.037c-1.387,1.104-2.149,2.834-2.136,5.34
+		c-1.712,3.272-2.89,7.079-3.204,11.749c-0.455-0.021-0.493-0.457-1.068-0.356c-1.358,5.114-2.036,9.64-3.204,15.665
+		c-0.522,2.695-1.575,5.285-1.78,7.832c-0.491,6.111,0.885,11.783,1.78,16.021c0.438,2.075,0.197,4.221,2.136,5.341
+		c-0.012-1.08,1.249-0.888,2.137-1.068c1.067,3.003,0.049,5.982-0.356,7.477c-1.911,7.05-6.938,13.662-7.832,21.717
+		c-0.363,3.274-0.443,7.176,0,11.036c0.249,2.169,1.227,4.018,1.424,6.053c0.287,2.97,0.199,6.781-0.356,9.968
+		c-0.084,0.483-0.712,1.166-0.712,1.78c0.002,1.542,0.682,5.632,1.068,7.12c0.656,2.527,2.593,4.941,3.204,7.477
+		c0.223,0.923,0.043,1.905,0.356,2.848c-3.875,6.45-6.353,14.297-7.833,23.142c1.649,1.145,3.244,0.593,5.341,0.712
+		c3.913,0.222,6.929,2.287,9.968,3.916c4.529,2.427,9.018,4.273,13.529,6.053c2.803,1.104,4.751,1.505,7.476,2.492
+		c3.21,1.161,8.089,3.068,11.393,2.136c1.588,1.379,4.886,1.049,7.833,1.068c0.909-1.645,3.486-2.909,2.492-5.341
+		c-4.214,0.384-9.728-0.251-14.953-0.712c-0.089-1.098-1.281-1.092-1.78-1.78c-1.925-0.096-2.12-0.306-3.916,0
+		c-2.891-0.696-4.949-2.271-6.765-3.204c-1.552-0.798-3.364-1.205-4.983-2.136c-1.521-0.875-2.973-2.319-4.272-2.849
+		c-0.601-0.244-0.835,0.506-1.424,0.356c-0.639-0.161-1.44-1.148-2.137-1.424c-2.197-0.871-4.401-1.582-6.764-1.78
+		c-2.682-0.225-6.289,1.624-8.545-0.356c0.41-1.252,1.951-1.372,2.849-2.136c0.357,0.474,0.337,1.324,1.067,1.424
+		c0.324-0.744,1.051-1.085,2.137-1.067c4.466,0.303,8.364,2.997,12.104,2.848c5.265,2.448,8.895,6.532,15.309,7.832
+		c-0.113-1.785-2.296-1.502-2.136-3.56c0.686-0.691,1.432,0.374,2.491,0.355c-0.113-1.903-2.631-1.403-2.491-3.56
+		c2.838-0.466,2.688,2.059,4.983,2.136c0.679-1.221,1.886-1.912,1.78-3.916c0.475,0,0.949,0,1.424,0
+		c1.347-4.888,5.102-9.661,4.272-15.309c-0.24-1.636-1.479-2.954-1.78-4.628c-0.394-2.197-0.48-4.854-0.355-6.409
+		c0.346-4.324,2.563-6.137,3.916-9.612c1.632-4.19-0.384-10.233-1.068-14.952c-0.613-4.229-0.195-8.253-1.067-13.528
+		c-0.711-0.477-1.544-0.83-1.78-1.78c0.347-1.772-1.356-3.891,0.712-4.272c1.418,1.549,0.361,5.572,2.492,6.408
+		c0.152,9.562,4.32,18.855,2.492,27.058c-0.653,2.928-2.637,4.613-3.204,6.764c-0.576,2.181-0.759,5.118-0.356,8.188
+		c0.272,2.073,1.952,4.538,2.136,6.053c0.535,4.394-1.856,6.99-2.491,10.324c-0.603,3.159-1.231,5.621-2.492,7.12
+		c-1.07,1.271-0.971,3.131,0.712,3.916c0.745-2.814,1.703-5.416,3.204-7.476c2.923,3.484,2.748,10.067,5.34,13.884
+		c2.056,0.48,3.323-0.302,4.984-1.067c6.089-13.83,7.956-29.603,9.612-46.994c0.686-7.199-2.881-13.396-2.136-19.581
+		c0.313-2.605,1.835-4.98,2.136-7.477c0.432-3.576-0.387-6.444,0-9.612c0.26-2.124,1.714-4.168,0.712-6.408
+		c-1.839-0.292-3.354,1.438-5.34,2.136c-1.499,0.527-3.174,0.28-4.628,1.068c-1.774-3.922-5.902-5.49-9.613-7.477
+		c-0.603-3.418,4.534-2.875,5.341-1.067c0.386,2.938,2.955,3.69,4.628,5.34c2.348-1.925,5.337-3.207,6.053-6.765
+		c-2.845-0.863-5.441,1.637-6.765,0c0.035-1.982,1.665-2.369,3.204-2.848c2.246-2.383,4.087-5.17,7.12-6.765
+		c0.366-2.806,2.985-3.906,4.272-6.052c0.494-0.823,0.479-2.126,1.068-3.204c0.497-0.91,1.651-1.572,2.136-2.492
+		c0.442-0.841,0.305-2.051,0.712-2.849c0.464-0.907,1.451-1.336,1.78-2.136c0.853-2.073,0.234-4.698,0.712-7.12
+		c0.323-1.638,1.604-3.036,2.136-4.628c1.726-5.157,2.172-10.873,4.272-15.665c1.039,0.089,1.229-0.67,1.78-1.068
+		c0.986-8.863,1.933-17.767,7.832-21.717c1.254-4.25,4.148-7.793,3.916-12.46c0.581-1.319,1.655-2.143,1.78-3.917
+		c-2.412-0.316-4.417-1.041-6.052-2.136c-0.658,1.479-2.591,1.683-3.204,3.204c1.938,1.512,3.013-1.663,4.271-0.712
+		c0.124,1.785-1.595,1.728-2.492,2.492c0.832,2.498-1.676,3.736-0.712,6.052c1.606,0.938,2.087-2.175,3.916-0.355
+		c-0.79,1.583-2.966,1.78-4.271,2.848c-0.459,2.372-1.416,4.243-2.849,6.408c-0.673,0.08-0.785-0.4-1.424-0.355
+		c-0.793,1.343-1.145,3.127-3.204,3.204c-1.2-0.312,0.068-1.679-1.424-2.136c-3.894,7.043-7.657,16.211-12.461,22.072
+		c-0.571,0.697-1.446,2.113-2.492,1.78c1.484-4.806,5.035-7.544,6.053-12.816c0.726-0.104,0.698-0.963,1.424-1.068
+		c1.006-7.062,8.646-11.439,9.257-18.868c-0.04-0.673-1.178-0.247-1.068-1.068c2.912-0.346,2.712-3.862,2.492-6.408
+		c-0.518-0.195-1.84,0.416-1.78-0.356c0.526-2.046,3.826-4.033,2.492-5.696c-1.593-0.05-1.023,2.062-1.78,2.849
+		c-2.232,0.099-3.092,3.213-5.34,2.136c1-2.204,3.756-2.652,4.271-5.34c-1.342,0.273-1.701-0.435-2.848-0.356
+		c0.973,1.844-2.185,3.784-3.561,3.204c0.161-1.976,2.688-1.584,2.849-3.56c-1.827,0.002-2.336-0.521-3.916,0
+		c0.25-1.056,1.061-1.551,0.712-3.204c-0.677-1.425-2.443,0.356-2.849-1.068c0.193-1.951,3.604-1.747,2.492-3.916
+		c-2.634-0.193-3.451,3.968-4.984,1.78c0.599-2.014,3.123-2.1,4.272-3.561c0-0.949,0-1.898,0-2.849
+		c-1.307,0.248-2.706,0.615-3.916,0c-0.158,1.123-1.628,2.111-2.492,1.425c1.273-2.116,2.364-2.444,2.848-4.984
+		c-1.306-0.103-1.812,2.435-3.203,1.068c0.214-1.804,2.581-1.453,2.848-3.204c-0.729-2.354,0.525-3.379,1.068-5.341
+		c-1.229-1.146-1.001-3.746-2.849-4.272C377.273,347.199,373.595,348.979,371.812,352.655z M186.328,344.466
+		c-0.488,1.648-1.492,2.78-2.492,3.916c0.188,0.999,1.681,0.693,1.78,1.78c-1.234,3.038-5.177,3.368-6.409,6.408
+		c1.669,5.63-0.474,11.271-3.204,15.309c2.319,0.472,2.961-2.289,3.561-3.204c1.022-1.562,2.434-3.691,2.136-4.628
+		c3.24-2.693,3.846-8.021,6.765-11.036c0.063-4.21,3.599-4.946,3.916-8.9C189.551,343.953,188.957,345.172,186.328,344.466z
+		 M271.771,346.247c0.857-0.146,0.773,0.65,1.78,0.356c0.088-0.954,1.5-1.354,0.712-2.137
+		C272.98,344.608,271.995,345.046,271.771,346.247z M243.29,355.147c1.488,0.773,3.837,2.562,5.696,1.78
+		c-2.38-2.496-3.135-5.56-2.492-9.612C243.262,348.478,243.26,351.245,243.29,355.147z M276.043,348.739
+		c-1.302,0.234-1.365-0.771-2.491-0.712c0,0.355,0,0.712,0,1.067c1.36-1.027,1.915,1.1,3.204,0c-0.285-0.573-0.961-2.562-1.78-1.424
+		C275.933,347.425,275.663,348.407,276.043,348.739z M275.331,351.943c0.683,0.888,2.846,0.259,2.849-0.712
+		C277.493,350.65,275.21,350.628,275.331,351.943z M206.265,352.655c-0.269,1.607,2.378,1.333,1.78-0.356
+		C207.219,352.185,206.678,352.356,206.265,352.655z M77.743,356.571c0.11,0.84,1.236,0.662,1.068,1.78
+		c-1.599,0.175-2.667-0.181-3.916-0.356c-0.103,3.852-1.131,7.566-0.356,10.681c0.9,3.618,5.634,4.397,6.052,7.832
+		c1.982-0.871,2.258,0.72,3.917,1.068c-0.41-1.607-1.655-2.38-1.78-4.272c1.115-0.737,0.813-2.696,1.424-3.916
+		c0.586-1.17,2.459-1.761,1.78-2.848c-2.471-0.098-2.407,2.34-4.628,2.492c-0.373-2.39,1.983-2.052,2.136-3.916
+		c-2.018-0.528-3.279,2.461-4.272,0.712c0.541-1.358,2.198-1.6,2.848-2.849c-2.219,0.493-0.853-1.246-1.424-1.78
+		c-0.888,0.251-1.463,0.351-2.136-0.355c1.456-1.674,0.714-2.654,0-4.628c1.391-1.3,3.774,0.474,4.628-1.068
+		c-4.525-0.573-9.6-0.192-13.528-2.136C70.594,355.909,75.047,356.409,77.743,356.571z M276.043,354.079c0,0.475,0,0.949,0,1.425
+		c1.016,0.812,1.455,0.613,3.561,0.712c0.206-1.156-0.242-1.656-0.356-2.492C278.134,353.795,276.634,353.483,276.043,354.079z
+		 M176.003,359.063c-0.375-1.998-0.621-4.126-2.136-4.984C173.626,356.693,174.543,358.15,176.003,359.063z M208.4,356.571
+		c3.588,1.72,3.477,8.728,0.712,11.393c-0.443,3.146,0.585,7.882-1.424,8.9c-1.042-2.644,0.583-5.872,0-8.544
+		c-3.396,1.465,1.759,9.705-2.136,11.036c0.799-4.438-0.337-6.74,0.356-10.681c-0.871-0.315-0.385-1.987-1.78-1.78
+		c-0.354,2.374-0.303,5.234-0.356,7.833c-0.032,1.543,0.618,3.652-0.712,4.271c-0.831-1.384,0.076-5.963,0-8.9
+		c-0.035-1.354,0.889-3.697-1.068-3.204c-1.744,3.167,0.687,9.232-2.136,11.393c-0.427-4.48,1.051-7.675,0.356-11.748
+		c-5.053,1.826-0.329,8.972-3.204,11.748c-1.001-2.202,0.29-6.697-0.712-8.9c-1.124-0.174-1.257,0.642-2.492,0.356
+		c-1.49,1.832-0.042,6.603-1.068,8.9c-2.681-1.871-0.209-5.834,0-8.9c-0.751-0.316-1.052-1.084-2.136-1.068
+		c-1.135,2.543,0.259,7.616-1.78,9.257c-1.308-3.384,3.391-10.971-2.136-11.393c-0.143,2.601,1.225,6.962-0.356,9.612
+		c0.361,0.956,0.937,3.299-1.068,2.848c-0.918-2.147,2.612-8.204-1.068-8.9c-0.604,1.956,0.803,5.893-1.068,7.477
+		c0.183-2.338-0.331-4.163,0-5.696c-1.676-0.028-1.477,2.126-2.136,3.204c-0.122,0.2-0.906,0.105-1.068,0.356
+		c-2.213,3.425,0.476,7.7-2.848,9.612c-1.465,0.159-1.105-1.506-2.848-1.068c1.597,2.557,2.141,6.167,2.492,9.969
+		c2.426-0.362,4.4,0.167,7.476,0c3.367-2.967,6.134,1.243,9.969,1.068c0.172-0.421,0.379-0.808,0.712-1.068
+		c-0.129-1.889-1.232-2.803-2.492-3.561c-0.448,1.367-4.45,2.498-4.628,0c1.656-1.341,3.222-4.988,5.696-4.984
+		c2.071,0.004,3.847,2.465,4.272,5.341c4.78,0.236,9.727-1.523,13.528-1.068c1.372-1.812,0.096-3.194,0-4.628
+		c-0.229-3.42,1.246-7.355,1.424-11.036c0.333-6.864-0.129-13.972-0.712-19.938C210.218,354.354,209.508,355.661,208.4,356.571z
+		 M214.453,354.435c1.307,1.938-1.333,4.293,0.356,5.34c0.513-1.029,1.494-1.592,1.78-2.848c1.771-0.109,3.267,0.056,4.628,0.355
+		C219.664,355.027,217.495,354.058,214.453,354.435z M295.624,354.791c-0.492,0.752,0.568,2.331,1.78,2.492
+		C298.392,355.877,297.184,353.552,295.624,354.791z M157.49,357.639c-1.949,0.169-1.967-1.594-3.916-1.424
+		c-1.707,2.95-5.147,1.183-7.477,0c-0.28,2.739,2.319,4.791,1.78,8.188c2.082-0.249,2.077,0.536,3.56,1.425
+		c0.024-1.756,0.173-3.387,1.78-3.561c1.92,0.773,0.708,3.225,0.356,5.34c2.579-0.15,0.562-4.896,3.204-4.983
+		c1.471,0.189,0.937,2.386,2.136,2.848c0.342-1.712,1.113-1.882,2.492-3.204c1.96-1.88,1.619-5.051,1.424-7.477
+		C160.043,355.513,159.536,356.317,157.49,357.639z M128.653,358.707c-1.325-3.503-5.488-2.775-8.9-2.136
+		c-0.528,1.996-3.119,3.002-3.561,5.341c-0.416,2.205,0.676,3.845,0.712,6.408c0.621,0.544,3.163,1.401,3.56,0
+		c-5.052-1.949-0.254-7.192,2.492-8.188c-1.259-0.313-1.834,0.914-2.136-0.356c0.237-1.808,2.451-2.317,3.204-1.068
+		c0.388,0.906-1.667,1.381,0,1.425c1.634,0.328,1.72-0.891,3.204-0.712c1.673,1.057,3.291,2.168,2.848,5.34
+		c-1.936,0.936-0.619,3.104-2.848,3.916c-0.608-2.353-0.805-5.387-4.272-5.696c-0.968,1.62-0.413,2.979,0,4.984
+		c-1.02-0.07-1.943-0.044-1.78,1.068c3.587,1.03,5.759,0.549,9.612,1.78c1.959-2.735,0.752-8.242-0.356-11.749
+		C130.02,358.764,129.479,358.593,128.653,358.707z M226.201,357.995c-0.205-0.626,0.43-2.091-0.356-2.136
+		C224.776,356.106,224.088,358.337,226.201,357.995z M49.618,359.063c1.097-0.003,2.564-1.679,1.068-2.136
+		C50.11,357.463,48.834,358.237,49.618,359.063z M277.111,358.707c0.631,0.937,2.055,0.413,3.204,0c0-0.475,0-0.949,0-1.424
+		C279.49,356.823,277.545,357.037,277.111,358.707z M37.513,358.707c1.242-0.419,3.264-0.059,3.916-1.067
+		C40.233,357.189,37.835,357.25,37.513,358.707z M144.674,366.54c2.319-1.549,0.509-6.149,0-8.188
+		c-0.419,0.056-1.011-0.062-1.068,0.355C145.409,360.515,143.023,365.208,144.674,366.54z M189.176,363.335
+		c2.295,1.126,3.711,2.119,4.984,3.56c0.831,0,1.661,0,2.492,0c0.571-1.4-1.538-0.124-1.424-1.067
+		c0.19-1.353,1.388-1.698,2.492-2.137c0,0.356,0,0.713,0,1.068c3.026,0.394,3.067-0.435,5.34,0.712
+		c-0.06-1.009-0.653-1.483-0.712-2.492c-1.266-0.554-0.215,1.209-1.068,1.068c-0.31-1.036-0.533-0.4-1.424-0.356
+		c-0.78-0.74,0.312-1.15-0.356-1.779c-1.068,0-2.136,0-3.204,0c-0.668,0.679,0.211,0.644,0,1.779
+		c-0.858-0.146-0.774,0.65-1.78,0.356c-0.288-1.41-0.831-3.113-1.78-2.849c-0.557-1.668,1.137-2.024,0.356-2.848
+		C189.375,358.143,190.763,362.153,189.176,363.335z M15.44,362.267c-1.354,0.426-4.576-1.016-4.272,1.068
+		c4.208,0.516,9.425-1.584,14.241-2.137c1.111-0.127,2.16,0.191,3.204,0c0.508-0.093,0.599-0.588,1.068-0.712
+		c1.768-0.467,3.573,0.022,3.917-1.424C28.138,360.724,19.529,359.236,15.44,362.267z M204.128,366.183
+		c1.139-0.922,1.524-1.9,4.272-1.067c1.743-1.817,0.615-4.185-0.356-6.053C203.297,358.895,203.297,362.331,204.128,366.183z
+		 M221.217,367.607c0.56-2.104,0.916-4.875,1.424-7.12c-0.992-1.947-3.385-0.162-3.916,1.425c1.275,2.878,1.084,7.223,1.068,11.392
+		C221.71,372.589,220.714,369.5,221.217,367.607z M278.18,360.487c-0.151,1.849,1.729,2.215,2.848,1.78c0-0.712,0-1.424,0-2.136
+		C280.002,360.173,278.697,359.937,278.18,360.487z M53.89,361.199c-2.033,1.375-4.629,0.785-5.696,3.561
+		c5.129,0.367,6.989,2.779,11.036,3.916c0.835-2.191-1.409-2.593-0.356-5.34C56.646,363.19,55.945,361.518,53.89,361.199z
+		 M41.786,362.979c0,0.475,0,0.949,0,1.424c2.163-0.316,1.781-1.446,3.916-0.355c-0.146-0.858,0.65-0.774,0.356-1.78
+		C44.042,361.913,43.926,363.458,41.786,362.979z M225.489,364.403c0.543-0.005,0.781-2.638-0.356-2.136
+		C224.842,362.526,224.178,364.731,225.489,364.403z M278.892,364.403c0.349-0.034,2.27,1.468,2.492-0.355
+		C281.298,363.533,278.454,363.219,278.892,364.403z M248.274,365.116c0.685-0.066,1.116,0.358,1.424,0.712
+		c1.945,2.23,3.158,6.596,4.272,9.968c0.235,0.715,0.602,2.207,0.712,2.849c0.098,0.571-0.777,0.898-0.712,1.424
+		c0.059,0.475,0.855,0.65,1.067,1.424c0.22,0.8-0.319,2.908,0.713,3.561c2.272-6.198,0.291-9.775-2.137-14.953
+		c-1.154-2.461-1.972-5.014-4.628-6.052C249.093,364.748,248.505,364.753,248.274,365.116z M389.612,366.895
+		c2.154,0.746,4.448,0.688,6.765,1.068c2.264,0.371,4.442,1.371,6.764,1.78c1.308,0.23,2.54-0.192,3.916,0
+		c2.332,0.326,4.678,1.067,7.12,1.424c2.831,0.413,5.725,0.622,8.545,1.068c0.887,0.14,1.616,0.893,2.492,1.067
+		c0.828,0.166,1.935-0.136,2.848,0c5.008,0.746,9.85,2.078,14.597,1.78c3.688,1.359,7.222,1.608,10.325,2.137
+		c7.724,1.314,17.062,2.268,22.784,3.204c1.189,0.194,2.337,0.898,3.561,1.067c1.302,0.18,2.628-0.191,3.916,0
+		c2.052,0.305,3.942,1.588,6.053,0.712c0.887-4.871-2.67-3.503-5.696-3.916c-5.417-0.737-11.447-2.438-17.801-3.204
+		c-0.742-0.089-1.438,0.402-2.137,0.356c-0.529-0.035-1.146-0.623-1.779-0.712c-4.654-0.656-9.589-1.162-14.241-1.78
+		c-11.95-1.589-23.463-4.417-34.89-4.984c-7.163-2.09-14.932-2.307-23.141-3.916C389.737,365.33,390.157,365.763,389.612,366.895z
+		 M236.526,369.387c-0.002,0.838-0.652,3.637-1.068,4.629c-0.485,1.156-1.521,1.608-1.78,2.848
+		c-0.805,3.86,0.838,7.857-2.136,10.324c-0.231-1.281-0.132-1.478-1.068-2.492c2.013-0.597,1.409-3.812,1.78-6.052
+		c-3.94,1.26-3.268,6.588-4.272,9.969c2.338,1.09,4.648,1.837,6.764,0c1.958,1.115,4.34-0.399,5.696-1.068
+		c0.146,0.447,0.459,0.728,1.068,0.712c1.17-1.085,4.043-0.467,4.984-1.78c-0.011-3.758,0.188-9.645-2.136-12.816
+		c-0.063,3.734,0.055,7.65-1.78,9.612c0.374-2.943-0.544-7.077-0.356-10.324c0.113-1.962,0.813-4.213-1.424-4.628
+		c-0.881,4.138,0.459,10.789-1.068,14.952c-1.18-0.007-0.362-2.012-1.068-2.492c0.977-2.917,0.779-6.785,0.712-9.968
+		c-0.031-1.452,0.434-3.551-1.068-4.272c-1.531,0.577-0.321,2.382-0.356,3.56c-0.063,2.126-0.185,4.673-0.356,7.121
+		c-0.167,2.391-0.311,4.916-1.068,6.408c-1.114-4.723,0.116-9.12,0.356-13.173c0.102-1.719,0.342-4.226-0.712-5.696
+		C234.602,366.659,236.53,367.26,236.526,369.387z M38.581,379c-0.335-1.919,0.753-5.263-0.712-6.052
+		c0.012,3.923-1.756,9.266,0,13.528c2.199-1.479,1.816-5.542,3.917-7.12c-0.508-3.949,1.576-5.308,1.068-9.257
+		c0.075-0.43,0.395-0.219,0.712,0c-0.575-1.086-0.619-2.703-1.068-3.916c-0.62,0.027-1.107-0.079-1.424-0.355
+		C39.684,369.726,40.977,376.838,38.581,379z M278.535,367.251c0.267,0.841,3.134,1.299,2.849-0.356
+		C281.211,365.684,278.501,366.117,278.535,367.251z M291.353,367.607c0.997,0.35-0.518,0.95,0.355,1.425
+		c1.042-0.32,1.094-0.32,2.136,0c0.216-0.853,0.513-1.624,0.356-2.849C292.94,366.348,291.985,366.816,291.353,367.607z
+		 M313.425,366.895c0.149,1.274,1.136,1.713,2.492,1.78c0.697-0.665,0.11-1.304,0-2.136
+		C314.762,366.333,314.261,366.782,313.425,366.895z M44.633,370.099c0.945-0.359,2.026-0.585,2.136-1.779
+		c-0.325-0.624-0.662-1.237-1.78-1.068C44.439,367.769,44.676,369.074,44.633,370.099z M53.178,369.387
+		c0.994,0.714,3.313,2.315,3.917,0.356C56.236,368.851,54.387,367.977,53.178,369.387z M278.892,369.744
+		c-0.234,1.576,2.435,1.976,2.492,0.355C280.774,369.032,280.088,369.704,278.892,369.744z M49.262,370.099
+		c0.643,2.092-0.346,4.26-1.424,6.408c0.537,1.125,1.924,1.398,1.78,3.205c-2.225,3.708-4.211,7.655-6.764,11.036
+		c0.787,1.23,1.986,2.048,2.492,3.56c-0.586,1.906-1.286,3.699-2.848,4.629c0.883,2.757-1.592,3.398-2.136,5.696
+		c1.78,1.954,1.861,4.859,0,6.408c1.203,2.262-0.856,3.407-1.068,5.34c1.822-0.279,2.586,0.499,4.272,0.356
+		c1.255-2.714,1.068-7.151,0.356-9.969c1.938-2.432,4.196-5.707,2.848-10.324c0.684-1.095,2.023-2.215,1.068-3.916
+		c0.503-0.684,1.729-0.645,2.492-1.068c-0.21-2.806,1.48-4.448,1.068-8.188c1.129-2.435,4.11-4.92,4.272-7.832
+		c0.058-1.032-1.322-1.747-0.356-2.849C53.369,371.865,51.177,369.691,49.262,370.099z M76.675,392.884
+		c-0.217-0.02-0.421-0.053-0.356-0.355c0.502-5.277-0.481-9.678,0.356-16.021c-1.071-0.352-1.588-1.259-3.204-1.067
+		c0.802,3.977,1.068,10.066,1.068,15.664c0,2.225,0.591,5.089-0.712,6.053c-1.279-7.18-0.295-13.246-1.424-22.429
+		c-1.136,0.305-1.101-0.561-1.78-0.712c-0.447,6.169,1.142,13.681-0.712,21.005c-2.224-1.519-0.827-4.941-0.712-7.477
+		c0.201-4.42-0.238-9.213,0-13.173c-1.25-0.294-2.014-1.072-3.204-1.424c-0.742,5.472-0.238,12.556-1.424,18.868
+		c-2.283-1.988-0.679-5.716-0.712-8.9c-0.04-3.806-0.089-7.618,0-10.68c-1.126,0.059-1.19-0.946-2.492-0.712
+		c-0.307,4.19-0.361,7.841-0.712,11.748c-0.114,1.271,0.62,3.246-0.712,4.272c-0.93-2.519-0.394-7.286-0.356-11.037
+		c0.023-2.357,0.68-4.997-0.712-5.695c-2.101,1.7-0.842,5.218-1.068,7.476c-0.167,1.672-0.85,3.688-1.068,5.341
+		c-0.176,1.331,0.896,3.425-1.068,3.916c-0.233-2.141,0.469-5.216-0.356-6.765c-2.671,2.312-1.577,8.392-3.204,11.749
+		c1.552,1.935,3.918,1.88,6.052,2.848c1.939,0.881,3.667,2.976,5.696,3.916c2.292,1.063,3.594,1.365,5.34,2.492
+		c3.516,2.271,6.486,5.221,9.968,7.12c0.629,1.745,2.313,2.435,3.56,3.561c1.21-0.614,2.609-0.248,3.917,0
+		c-2.765-3.881-7.415-5.876-7.833-12.104c-2.244-2.777-0.708-6.555-1.78-8.9C76.97,391.994,77.158,392.774,76.675,392.884z
+		 M87.355,373.303c-0.01,2.384,0.773,3.974,2.492,4.629c1.189-0.235,1.741-1.107,2.848-1.425c0.886,1.014,2.965,0.833,3.204,2.492
+		c7.724,0.614,15.6,3.311,24.209,3.204c2.201,1.019,4.171,1.499,6.764,1.068c0.629,0.32,1.04,0.859,1.78,1.068
+		c3.799-0.239,8.807,1.291,12.816,1.424c0.185-1.958,1.383-4.778,0.712-6.408c-0.772,1.348-2.173,0.338-2.848-0.356
+		c-0.281,0.787-1.245,0.892-1.78,1.425c-0.41-0.421-0.403-1.259-0.356-2.137c-3.059-0.065-3.151,2.559-5.696,2.137
+		c-0.234-1.303,0.771-1.366,0.712-2.492c-1.612,0.286-2.379,1.419-4.272,1.424c-0.668-0.63,0.424-1.039-0.356-1.78
+		c-1.902,0.59-2.966,2.019-5.34,2.137c-0.711-2.085,1.8-2.213,0.712-3.561c-2.349-0.094-1.792,2.718-4.628,2.136
+		c-0.44-1.331,0.175-1.841-0.356-2.848c-2.976-0.005-4.836,2.99-7.477,2.136c-0.321-1.864,1.746-1.34,1.424-3.204
+		c-2.314,0.06-2.043,2.704-4.984,2.136c0-0.593,0-1.187,0-1.779c-1.455,0.324-1.881,1.679-3.56,1.779
+		c-0.004-0.47-0.624-0.325-0.712-0.712c-0.265-1.096,0.977-0.684,0.712-1.779c-1.771,0.127-2.077,1.72-3.56,2.136
+		c-0.934-0.254-0.341-2.032-1.424-2.136c-0.684,0.858-1.672,1.413-2.492,2.136c-0.299-0.413-0.47-0.955-0.356-1.78
+		c-1.889-1.212-6.926,1.231-5.34-2.136C88.884,372.222,88.14,372.783,87.355,373.303z M397.444,376.152
+		c1.454-0.445,2.895-0.903,3.204-2.492C398.596,372.498,398.021,374.774,397.444,376.152z M168.527,377.576
+		c0.469,1.904,3.049,1.697,3.916,3.204c0.61,0.577,0.138,2.236,1.424,2.136c0.759-2.92,1.348-6.009,2.136-8.899
+		C172.692,373.099,172.165,377.671,168.527,377.576z M277.468,377.932c1.578,0.035,2.663-0.422,2.848-1.78
+		c-0.797-0.39-1.783-0.59-2.492-1.068C277.635,376.339,276.779,376.675,277.468,377.932z M150.37,377.22
+		c-0.618,2.234-2.941,8.485-0.356,11.393c1.035-0.626,0.32-3.003,1.78-3.205c1.138,0.287,1.018,1.831,1.78,2.492
+		c4.492,0.208,6.118,4.535,5.34,8.9c2.045,0.278,4.282,0.145,6.764,0.713c0.824-0.792-0.121-1.389,0-2.492
+		c0.315-0.106,1.809-0.714,0.712-1.068c-0.611,1.04-0.884-1.219-0.712-2.137c0.799-0.506,2.346-0.265,2.492-1.424
+		c-1.071-0.792-1.243-0.42-2.848-0.355c0.081-1.487-0.579-1.682,0-2.849c-1.578,0.088-2.664,0.77-2.848-1.067
+		c0.05-1.143,1.9-1.556,1.068-2.492c-1.786-0.077-2.817-0.358-4.272-1.425c-1.541,1.514-2.4-0.287-2.848-1.779
+		c-0.199,0.513-0.555,0.868-1.068,1.067c-0.317-1.106-1.189-1.658-1.424-2.848c1.288-0.611,2.253-1.544,3.204-2.492
+		C153.874,374.699,153.094,379.083,150.37,377.22z M300.253,381.848c1.756-0.261,2.304-1.731,2.136-3.916
+		c0.464-0.452,2.964-1.975,1.424-2.137C300.216,375.635,299.441,379.609,300.253,381.848z M77.743,385.764
+		c-0.117,1.754-1.348,3.8,0,4.628c-0.104-5.207,3.558-6.647,4.272-11.036c-1.678-0.339-2.54-1.495-3.916-2.136
+		C77.323,379.496,77.934,382.895,77.743,385.764z M397.089,378.644c-0.061,0.891,0.547,1.114,1.067,1.424
+		c-0.071-1.115,1.939-1.966,0.356-2.492C398.413,378.307,397.562,378.287,397.089,378.644z M304.881,380.424
+		c2.777,1.473,6.823,0.672,8.9,2.136c0.551-0.636,2.137-0.236,2.492-1.068c-0.245,1.194,0.597,1.302,1.424,1.424
+		c0.17-1.275,0.579-2.057,0-3.203c-4.203-0.426-8.598-0.659-12.461-1.425C305.494,379.375,304.873,379.585,304.881,380.424z
+		 M278.18,381.848C277.807,376.613,273.555,383.544,278.18,381.848L278.18,381.848z M425.926,380.424
+		c-0.981,2.104-1.577,4.594-2.136,7.12c-1.288,1.56-4.115,4.979-2.492,7.12c-0.148-1.334,1.544-0.83,2.136-1.424
+		c0.516-0.517,0.495-1.808,1.068-2.849c0.39-0.708,1.25-1.59,1.78-2.492c1.515-2.579,1.947-3.994,2.492-6.408
+		C427.95,381.01,427.595,380.061,425.926,380.424z M303.457,383.984c-1.213,0.264-0.587-1.312-1.425-1.424
+		c-0.146,0.607-0.459-0.075-1.067,0C300.874,383.888,302.724,385.672,303.457,383.984z M489.297,439.167
+		c-4.55-6.031-9.693-11.451-14.241-17.089c-1.873-2.321-4.398-4.31-5.696-7.12c-2.852-1.366-4.44-3.781-6.408-6.053
+		c-2.887-3.332-5.728-6.216-8.544-9.256c-1.27-1.37-3.172-3.067-3.204-4.984c-5.059-2.299-6.843-7.873-11.037-11.036
+		c-1.974,0.28-3.398,1.11-4.983,1.779c0.516,2.441,3.521,4.031,4.628,5.341c0.299,0.354,0.074,1.1,0.355,1.424
+		c1.141,1.313,2.74,2.259,3.917,3.561c1.198,1.326,2.004,2.938,3.204,4.271c1.163,1.294,2.745,2.272,3.916,3.561
+		c1.209,1.331,1.97,2.974,3.204,4.272c3.364,3.54,8.032,6.172,9.612,11.036c1.023,0.638,2.031,1.292,2.136,2.849
+		c-0.813,1.411-2.221-1.334-2.136,0.355c0.442,15.581-0.271,30.814,0,47.35c1.604,3.381,6.404,3.564,9.256,5.696
+		c-0.3-4.136-5.746-9.413-1.067-12.104c-0.53-0.907-2.685-2.044-1.424-3.56c1.663,0.116,1.54,2.02,3.203,2.136
+		c0.938-1.196,0.062-2.96-0.712-3.56c-1.363,0.742-4.879,1.326-5.34-0.712c0.064-1.835,2.438-1.36,4.272-1.425
+		c1.67-4.344-1.818-8.324-1.068-11.748c2.279,2.53,2.986,7.915,2.492,12.104c1.687,1.506,2.881,7.191,0.712,9.256
+		c-0.783-0.215-2.653-0.895-2.848,0.356c1.133,1.952,3.695,2.476,4.271,4.984c-0.104,1.083-1.883,0.49-2.136,1.424
+		c0.756,1.942,1.977,4.431,0.712,6.408c2.551,2.178,1.105,7.013,0,8.544c0.773,1.921,1.081,4.329-0.712,5.341
+		c0.189,1.353,1.111,1.974,1.068,3.56c-0.043,1.026-1.519,0.618-1.425,1.78c0.564,1.691,2.208,2.302,2.137,4.629
+		c-1.771,1.579-3.241,3.613-2.849,6.408c-1.132-0.411-2.553-0.533-2.848-1.78c0.551-1.11,1.481-1.842,2.136-2.849
+		c0.222-2.002-2.879-2.178-1.424-4.271c1.192-0.182,2.508,2.7,2.848,1.067c-0.124-2.371-3.171-4.895-4.271-7.476
+		c1.671-1.323,1.758,1.399,3.56,1.067c0.636-3.371-4.753-4.093-2.492-6.764c1.057,0.725,1.885,3.173,3.561,2.136
+		c-0.861-3.648-3.559-5.461-4.628-8.9c1.994-0.961,3.578,2.555,5.34,1.78c-0.179-4.925-2.931-7.275-7.12-8.188
+		c-0.978-1.159-1.841-2.432-3.204-3.204c0.35,27.735,0.01,60.698,0,88.647c7.979,1.159,15.241,3.034,23.853,3.561
+		c1.046-12.91,0.551-25.667,0.713-35.958c0.122-7.812-0.109-16.224,0-23.497c0.025-1.731,0.753-3.834-0.356-3.916
+		c-1.606,0.529-0.071,4.201-2.136,4.272c-2.594-1.905,1.911-3.933,0-5.34c-1.816-0.393-0.32,2.528-2.137,2.136
+		c-0.336-1.8-0.622-3.65-2.492-3.916c0.087,1.079,1.966,2.599,0.356,3.204c-1.623-0.672-3.367-4.748-1.068-6.053
+		c1.053,0.965,2.532,1.503,2.849,3.204c3.444-0.952,2.507,2.478,5.34,2.137c0.241-3.967,1.049-9.659-4.272-9.612
+		c-0.364,1.464,1.215,3.028-0.355,3.56c-1.8-1.217-4.7-3.064-4.272-5.34c1.63,0.269,1.519,2.279,3.204,2.492
+		c1.461-3.219-3.19-5.021-2.848-7.121c1.995,0.242,1.979,2.812,3.916,2.137c0,0.593,0,1.187,0,1.78
+		c1.572,0.758,3.202,3.102,4.628,2.848c0.556-8.142,0.046-17.897,0.356-26.701c-3.181-0.499-5.654-1.703-7.121-3.916
+		c0.232-5.222-0.952-9.334,0-15.309c-0.034-0.915-1.39-0.509-1.424-1.424c0.61-0.458,1.4-0.736,1.424-1.78
+		c-5.101-6.766-11.397-12.337-16.376-19.225c0.707-0.005,0.452-0.972,1.424-0.712c5.294,6.572,11.335,12.399,16.732,18.868
+		c0.229,5.838,0.472,13.143,1.068,20.293c1.413,0.073,2.143,0.625,4.272,0.712c0.315-1.23,0.135-3.046-0.356-4.984
+		c-0.533-0.624-1.485,0.314-1.78-1.067c0.717-1.302,2.084-1.951,2.137-3.916c-1.242,0.078-2.553,1.936-3.204,1.424
+		c0.096-2.159,2.516-1.993,3.204-3.561C489.464,445.914,489.232,443.295,489.297,439.167z M275.688,385.408
+		c0.212-1.07-1.503-2.02-2.136-1.067C274.105,384.854,274.254,385.774,275.688,385.408z M90.204,413.534
+		c0.028-0.555-1.035-0.247-0.356,0c1.272,0.718,3.698,1.487,5.696,1.78c2.112,0.309,3.851,0.847,5.696,1.067
+		c1.093,0.131,2.153-0.388,3.205-0.355c0.952,0.028,1.851,0.614,2.848,0.712c4.073,0.398,9.559-0.021,14.241-0.356
+		c3.068-0.22,6.167-0.479,8.188-0.712c3.764-0.435,7.604,0.862,11.037-0.712c2.41,1.031,5.646,1.236,8.9,1.424
+		c0.906-0.388,1.38,1.667,1.424,0c-0.365-2.985,2.922-4.733,3.56-7.832c-1.053-0.489-1.329-1.757-2.492-2.136
+		c0,0.949,0,1.898,0,2.848c-1.744,0.393-0.022,4.25-2.492,3.916c0.527-2.72-0.001-6.578-0.356-8.9
+		c-0.524-3.43,2.549-9.203-1.78-9.612c-0.556,4.544,0.924,10.474,0,15.309c-0.158,0.826-0.435,2.126-1.424,2.492
+		c-0.872-2.876-0.228-7.203-0.712-11.036c-0.064-0.512-0.346-1.26-0.356-1.78c-0.034-1.84,1.263-4.488-0.712-5.341
+		c-1.229,5.388,0.104,12.54-1.78,16.733c-1.741-1.324-1.446-4.032-1.424-6.765c0.016-2.023,0.326-4.031,0.356-6.052
+		c0.02-1.378,1.175-3.702-0.712-3.917c-2.467,0.626-1.285,3.629-1.424,5.341c-0.284,3.488-1.312,6.943-1.424,10.324
+		c-1.033,0.747-2.117,1.443-3.204,2.136c-0.341-2.117,1.625-4.929,0-6.052c-1.252,1.239,0.069,5.054-2.136,5.34
+		c-0.942-0.831,0.551-3.038-0.712-2.848c-1.005,0.419,0.398,3.246-1.068,3.204c-0.205-0.626,0.431-2.092-0.356-2.137
+		c-0.589,0.599-0.283,2.091-1.78,1.78c-0.712-4.073,0.738-8.306,1.068-11.748c0.116-1.214,1.119-3.886-0.712-4.272
+		c-2.483,4.449-1.011,12.204-3.917,15.665c-0.961-0.106-0.638-1.498-1.424-1.78c-0.603,0.702,0.011,2.621-1.78,2.136
+		c-0.956-5.153,0.447-8.968,1.068-12.816c-2.41,1.786-4.873,4.125-7.477,6.408c-2.102,1.844-4.903,6.517-8.188,4.628
+		c0.311-2.3,2.038-3.184,3.917-3.916c4.456-5.156,10.414-8.811,13.884-14.952c1.125-0.346,2.725-1.556,2.136-2.492
+		c-4.38-0.658-5.005,3.136-7.12,5.34c-0.531,0.554-1.449,0.764-2.136,1.425c-3.128,3.009-7.513,11.063-9.612,10.68
+		c-0.504-0.092-2.115,2.898-3.204,1.78c-0.509-2.064,1.838-2.845,2.492-4.628c0.883-2.408,1.378-8.809,1.068-11.037
+		c-0.232-1.662-2.251-6.271-3.916-7.476c0.146,3.161,1.061,5.644,0,9.612c-1.564,1.047-2.344,2.877-4.272,3.561
+		c-0.297-1.342-1.125-0.259-1.78-0.713c-2.187-1.512-1.441-6.253-4.272-7.12c-1.676,0.698-3.025,1.722-4.984,2.136
+		c1.334,2.938,2.61,5.935,4.984,7.833c0.911-1.15,1.971-2.086,3.56-1.78c-0.395,1.86-2.395,2.114-2.848,3.916
+		c4.514,1.102,6.059-4.262,8.544-2.848c-1.009,2.669-3.876,3.48-5.34,5.696c2.246,0.649,3.49-0.871,4.984,0.355
+		c-0.872,1.265-1.435,2.838-2.848,3.561c-1.042,0.093-1.094-0.805-2.136-0.712c-2.924,1.357-7.14-1.871-8.9,1.067
+		c4.557,2.533,12.111,1.919,16.021-0.355c0.085,0.508,0.586,0.601,0.712,1.067C103.545,413.792,95.982,413.44,90.204,413.534z
+		 M90.56,387.544c1.089,0.258,1.047-0.614,2.136-0.356c0.107-0.938-0.493-1.168-1.424-1.067
+		C91.711,387.272,90.12,386.392,90.56,387.544z M283.164,396.445c1.262,1.556,2.318,3.171,3.204,4.271
+		c2.725,3.388,4.477,6.876,7.12,8.188c-2.728-7.359-7.952-12.222-11.393-18.868c-0.49,0.016-0.782-0.168-1.068-0.356
+		C278.262,392.743,281.302,394.149,283.164,396.445z M101.596,392.529c0.447-0.644,1.343-2.669-0.356-2.492
+		C100.691,390.779,100.175,392.231,101.596,392.529z M268.211,391.46c0.564,0.522,2.827,0.734,2.492-0.712
+		c-0.327-0.622-1.113-0.786-2.136-0.712C268.646,390.709,268.166,390.822,268.211,391.46z M300.965,391.816
+		c2.251,1.541,6.054,0.462,7.476,2.137c2.239-2.508,3.812,0.654,7.121,0.712c0.16-1.264,1.201-1.646,1.424-2.849
+		C311.612,392.021,303.587,388.189,300.965,391.816z M264.651,393.596c0.184,1.358,1.27,1.815,2.848,1.78
+		C267.808,393.598,265.892,392.705,264.651,393.596z M222.641,394.665c-0.786,2.354-0.109,5.149-0.356,7.477
+		c-0.269,2.539,0.178,4.866-0.712,6.764c-0.836-1.062-1.069-2.728-1.424-4.271c-2.709,0.851,0.004,7.124-3.204,7.476
+		c-0.824-0.791,0.121-1.388,0-2.492c-1.994,0.096-3.386-0.411-4.272-1.424c0.006-1.549,0.118-3.203-0.356-4.271
+		c-2.33,1.468-0.066,7.528-2.492,8.9c-0.683-2.166-0.399-5.297-1.068-7.477c-3.45,1.618-2.516,9.473-2.136,12.816
+		c2.775,0.035,5.583-1.244,7.12-1.78c1.53-0.533,3.595-0.287,4.628-0.712c2.997-1.232,3.224-4.455,5.34-6.408
+		c0.206-5.632,1.294-9.929,1.424-14.953C224.188,394.312,223.1,394.174,222.641,394.665z M135.417,399.649
+		c1.585-0.412,1.225-4.336,1.424-4.984c-0.356,0-0.712,0-1.068,0C135.226,395.897,135.459,397.91,135.417,399.649z M132.213,400.004
+		c1.225-0.477,1.576-3.977,0-4.271C132.213,397.157,132.213,398.581,132.213,400.004z M466.155,396.445
+		c-1.139,1.828-1.705,4.228-1.424,7.477c2.333,3.125,5.585,5.332,7.477,8.9c5.552,4.535,11.3,11.959,17.089,17.444
+		c0.184-6.045,0.066-15.968-0.356-22.785c-2.901-0.777-5.716-1.642-8.544-2.492c-0.341-0.663,1.065-1.189,0-1.424
+		C475.745,404.185,471.078,393.605,466.155,396.445z M183.479,400.716c1.791-0.31,0.509-1.781,1.068-3.56
+		c-0.49,0.016-0.782-0.168-1.068-0.356C182.726,398.149,183.617,399.025,183.479,400.716z M220.149,402.497
+		c0.117-1.362,1.565-5.269-0.356-5.34C220.765,399.608,217.775,401.972,220.149,402.497z M161.763,402.141
+		c2.056,0.866,5.322,0.885,7.12-0.356c-0.114-0.825,0.057-1.366,0.356-1.78c-1.846-0.34-5.472,0.363-7.833-0.355
+		C160.715,400.334,161.781,401.082,161.763,402.141z M218.013,403.921c-0.263-1.688,0.401-2.448,0.356-3.917
+		c-0.456-0.02-0.493-0.456-1.068-0.355C216.809,400.583,216.384,403.978,218.013,403.921z M485.736,401.785
+		c0.234-1.323-1.696-2.312-2.492-1.424C484.215,400.696,483.921,402.295,485.736,401.785z M88.779,408.193
+		c-2.03-2.241-4.221-4.322-5.696-7.12C83.271,403.774,85.064,407.844,88.779,408.193z M429.13,411.753
+		c-0.977-3.533-3.713-5.306-5.34-8.188c-0.356,0-0.713,0-1.068,0c-2.21,1.73-3.84,3.235-6.053,4.984
+		c-1.53,1.21-3.763,2.363-4.271,4.272c1.291,1.793,2.697,3.473,4.271,4.983c9.967,0.833,18.615,2.984,28.838,3.561
+		c0.301-1.562,0.048-3.863-0.712-5.34C438.597,415.578,431.495,416.034,429.13,411.753z M164.255,411.753
+		c2.182-0.903,3.774-2.396,5.696-3.561c0-0.949,0-1.898,0-2.848C165.613,402.189,158.869,409.531,164.255,411.753z M36.445,408.905
+		c0.409-0.669,0.059-2.957-1.424-2.848C35.064,407.438,34.589,409.337,36.445,408.905z M216.233,408.549
+		c0.49-0.016,0.782,0.167,1.068,0.355c-0.047-0.877-0.054-1.715,0.356-2.136c-0.62,0.026-1.107-0.079-1.424-0.355
+		C216.233,407.125,216.233,407.837,216.233,408.549z M275.331,416.738c-0.05,3.166-0.383,7.725,1.78,7.476
+		c0.964-1.068,0.966-3.192,1.068-4.983c0.22-3.859,0.112-8.516-0.356-11.749c-0.075-0.399-0.395-0.554-0.712-0.712
+		C275.342,408.183,275.392,412.894,275.331,416.738z M441.946,407.837c0.003,1.467,1.601,2.68,2.849,1.779
+		C444.662,408.052,443.155,407.313,441.946,407.837z M269.635,422.434c-1.035-1.44,0.818-7.457-1.067-8.188
+		c-1.253,2.188-1.898,4.984-2.137,8.188c2.271,0.934,4.551,1.857,6.765,2.848c0.967-1.562-0.454-1.907-0.712-3.204
+		c0.725-1.357-0.386-2.265-0.712-3.561c0.456-1.963,0.896-6.77-0.356-8.188C269.966,413.617,271.959,419.403,269.635,422.434z
+		 M55.67,446.287c0.085-0.387,0.586-0.854,0.712-0.355c-0.156,1.731-0.842,4.467,0,6.052c1.689-0.467,3.41-1.084,5.34-0.355
+		c1.704-1.964,4.106-0.738,6.408-1.068c1.238-0.178,1.878-1.063,3.204-1.424c6.468-1.762,15.811-0.575,23.497-1.78
+		c0.516-0.434,0.477-1.422,1.424-1.424c0.568,0.263-0.082,1.742,1.068,1.424c3.726,0.018,6.934-0.196,9.968,0
+		c1.514-2.64,2.136-6.172,4.628-7.832c1.561,1.354,1.954,4.877,3.204,7.476c2.9,0.526,2.596-2.15,4.628-2.492
+		c8.298-1.382,14.379,0.943,14.953,9.612c3.511,0.296,5.341,1.045,6.408,4.272c-0.565,2.046-1.413,3.81-2.136,5.696
+		c0.514,1.623,1.989,2.283,2.492,3.916c-1.334,2.503,2.699,4.454,1.424,7.833c0.845,0.904,1.903,0.899,2.492,2.136
+		c-0.267-0.561-0.294,1.303-0.356,1.068c0.505,1.935,0.372,2.05-0.356,3.56c0.532,0.773,2.042,0.568,2.136,1.78
+		c-0.266,1.396-2.099,1.224-2.136,2.848c0.563,0.624,0.477,1.897,0.712,2.849c0.763,0.424,1.989,0.384,2.492,1.068
+		c-0.332,0.854-1.431,0.942-1.068,2.492c4.037-0.352,1.388,5.33,3.56,6.052c0.697-10.343,0.114-25.056,0.712-34.533
+		c-2.854,0.837-1.163-2.872-2.136-3.916c-1.14-0.881-1.579,1.319-3.56,0.712c-2.37-1.063-0.917-4.61-1.424-7.12
+		c-0.372-1.84-1.699-2.545-1.78-3.917c1.619-3.039-0.354-8.968,0.712-12.104c-3.417-2.516-5.224-6.643-7.476-10.324
+		c-24.105-5.211-52.87-10.481-78.323-16.377C55.085,421.907,57.351,436.684,55.67,446.287z M166.747,416.381
+		c2.061,0.044,4.409,0.374,3.917-2.136C169.061,413.385,166.844,414.59,166.747,416.381z M235.102,414.601
+		c-4.474,4.821-9.419,9.098-14.241,13.529c-9.123,8.385-17.67,17.165-26.345,25.633c-4.443,4.338-9.206,8.358-13.173,13.173
+		c1.074,3.1,3.187,7.241,0.712,9.968c1.271,0.85,0.976,1.559,1.78,3.204c-0.685,1.333-1.619,2.416-2.136,3.916
+		c1.541,2.926,0.064,6.828,1.424,9.613c-0.771,0.851-0.666,1.867-0.712,2.848c-0.277,5.864,0.27,11.479,0.356,17.444
+		c0.077,5.376,0.231,11.684-0.356,15.665c-0.444,3.012-0.321,6.282,0,9.257c1.48,0.418,3.352,0.445,4.984,0.712
+		c1.54-1.445,4.008-3.397,7.121-2.137c0.839-4.597-1.313-8.646,0.712-13.172c3.622-2.861,6.546-4.377,12.104-4.984
+		c1.762,1.162,0.189,3.766,1.424,5.696c3.669,0.58,3.599-3.089,4.628-5.341c1.743-3.812,5.023-7.446,7.476-11.392
+		c2.556-4.111,5.457-7.85,7.121-12.105c3.777-4.055,6.16-9.504,9.612-13.884c0.299-0.888,0.466-1.908,0.356-3.204
+		c2.502-0.082,3.635-1.453,5.696-1.068c1.544-7.713,0.439-16.474,1.068-25.633c-1.088-0.258-1.297,0.363-2.136,0.355
+		c-1.746,4.952,0.314,15.377-3.204,19.581c1.008-2.938-0.18-2.936-0.356-6.053c1.467-1.903,0.943-5.962,1.068-9.256
+		c0.077-2.015,1.448-3.95-0.712-3.916c-1.709,3.702-0.703,8.891-0.712,13.885c-0.001,0.749-0.293,1.725-0.356,2.491
+		c-0.254,3.106,1.158,7.337-1.424,8.9c-1.573-2.351-0.477-5.17-0.356-7.832c0.137-3.02-0.361-6.131-0.356-9.256
+		c0.017-11.393,0.712-23.069,0.712-34.89c0-4.057,0.267-8.138-0.712-11.749C235.813,414.601,235.458,414.601,235.102,414.601z
+		 M194.16,421.009c1.151,0.613,2.239-1.426,4.628-0.712c0.762-0.409,1.456-3.741-0.356-3.56
+		C197.438,418.591,194.813,418.814,194.16,421.009z M45.702,421.009c0.341-0.727,0.727-1.408,1.068-2.136
+		c-2.197-1.44-5.155,0.044-7.832-0.712c-0.479,1.112-0.693,3.343,0.712,3.561C39.018,419.94,43.309,421.533,45.702,421.009z
+		 M17.933,419.585c1.481-0.347,3.446,1.379,3.56-0.712C20.453,418.467,18.876,418.908,17.933,419.585z M144.318,418.874
+		c-0.531,2.079-2.038,3.185-2.136,5.696c1.384,0.99,4.027,0.72,6.052,1.068c1.254-1.713,2.471-3.463,2.848-6.053
+		C149.049,418.865,146.74,418.254,144.318,418.874z M10.812,420.297c0.277,0.079,0.414,0.299,0.356,0.712c0.594,0,1.187,0,1.78,0
+		C13.274,419.361,11.215,419.338,10.812,420.297z M242.222,426.35c-0.366,2.44-1.14,6.807,1.068,6.764
+		c0.793-4.416,1.555-9.238,1.424-12.816c-0.078-0.277-0.298-0.413-0.712-0.355C243.724,421.4,242.607,423.777,242.222,426.35z
+		 M38.225,423.146c0.471,2.14,1.414,3.808,1.068,6.764c1.329,0.515,3.185-0.291,5.34,0c0.877-1.971,0.896-4.801,1.424-7.12
+		C42.939,422.888,40.092,422.585,38.225,423.146z M155.354,425.282c-1.138,2.66-3.795,3.8-6.053,5.341
+		c-1.912-0.874-5.224-2.058-7.832-1.068c-0.876,4.312,7.309,3.997,10.324,2.492c1.912-0.954,4.403-4.859,4.628-6.765
+		C156.066,425.282,155.71,425.282,155.354,425.282z M448.354,429.554c0.943-0.6,1.512-1.574,1.424-3.204
+		c-0.679-0.152-0.644-1.018-1.779-0.712C447.313,426.583,447.588,428.948,448.354,429.554z M444.083,426.35
+		c-0.005,0.707-0.972,0.452-0.713,1.424c0.828,3.059-0.364,11.204,1.068,15.665c1.854-3.859,1.11-12.159,0.712-17.089
+		C444.795,426.35,444.438,426.35,444.083,426.35z M145.742,427.062c-1.625,0.201-2.217-0.631-3.916-0.356
+		C141.926,428.53,145.485,427.542,145.742,427.062z M304.881,429.91c1.692,0.253,2.012-2.82,0-2.492
+		C304.373,427.893,304.373,429.435,304.881,429.91z M439.811,427.417c-0.005,0.471-0.624,0.326-0.712,0.713
+		c0.236,7.595-0.475,16.139,0.355,23.141c-0.127-2.133,2.4-3.178,2.849-5.696c0.319-1.796-0.573-4.175-0.712-6.408
+		c-0.254-4.09,0.744-8.655-0.713-11.749C440.522,427.417,440.166,427.417,439.811,427.417z M300.253,428.486
+		C299.088,433.26,304.472,429.925,300.253,428.486L300.253,428.486z M434.47,428.486c-0.071,9.437,0.564,20.687,0.713,30.262
+		c4.284-1.491,1.736-6.835,1.779-11.037c0.064-6.261,0.693-12.823,0.356-19.225C436.369,428.486,435.42,428.486,434.47,428.486z
+		 M189.532,430.623c-0.011,5.21,0.302,10.745-1.424,14.24c-0.33-1.686-0.23-4.088-0.356-5.696c-0.25-3.197,1.055-7.211-0.712-8.188
+		c-2.125,2.979-0.333,9.872-2.136,13.173c0.999,2.684,0.957,7.294,0,9.968c3.466-1.162,5.577-3.679,7.477-6.408
+		c-2.656-4.544-1.555-12.208-1.068-17.801c-0.455-0.02-0.493-0.456-1.068-0.355C190.211,430.115,189.335,429.833,189.532,430.623z
+		 M432.69,464.087c0.762-5.042,0.355-11.413,0.355-17.444c0-5.693-0.62-11.584-0.355-16.733c-0.357,0.002-0.424-0.288-0.713-0.355
+		c-0.48,0.111-0.68,0.507-1.424,0.355c-1.566,2.216-0.258,5.333-0.355,8.188c-0.295,8.614-1.585,18.774-1.068,27.413
+		c0.09,1.501-0.902,3.918,0.712,4.629C431.29,468.686,432.369,466.208,432.69,464.087z M293.132,431.69
+		c1.689,0.599,1.963-2.049,0.356-1.78C293.189,430.324,293.019,430.865,293.132,431.69z M423.79,431.69
+		c1.184,10.794,0,22.843,0,34.533c0,4.06-0.589,8.143,0.712,11.037c0.343-1.348,1.707-1.178,2.136-2.492
+		c0.41-1.259-0.016-3.479,0-4.984c0.126-12.039,0.269-23.791,0.356-35.957c-0.592-1.764,2.511-2.687,0-3.204
+		C425.76,430.812,425.099,431.575,423.79,431.69z M288.86,432.758c0.413,0.299,0.954,0.47,1.779,0.355
+		c0.015-1.082,0.207-2.343-1.067-2.136C289.42,431.657,288.555,431.623,288.86,432.758z M152.15,434.539
+		c2.209-0.283,3.868-1.117,4.628-2.849C153.816,431.22,153.561,433.457,152.15,434.539z M183.479,444.151
+		c1.104-2.443-0.833-4.956-0.712-7.477c0.082-1.707,2.373-3.746,0.356-4.984C180.638,433.89,178.9,443.04,183.479,444.151z
+		 M286.368,433.827c0.324-1.512-0.582-1.793-1.425-2.137C284.14,432.598,284.608,434.393,286.368,433.827z M39.649,433.47
+		c-1.176,4.752,0.917,10.615-0.712,14.953c1.323,0.432,3.56-0.183,4.628-1.068c0.794-5.121-0.538-10.848,1.068-14.597
+		C43.547,432.311,39.736,431.776,39.649,433.47z M159.982,432.402c-3.337,2.122-6.012,4.906-10.681,5.696
+		c1.009,3.857,3.738,5.993,3.205,11.393c3.724,1.163,8.724,2.877,13.528,1.78c0.218-2.355,0.283-5.565,0.356-9.612
+		c-0.892-0.65-2.345-0.741-2.848-1.78C163.804,435.938,162.462,433.601,159.982,432.402z M419.518,433.114
+		c0.069,3.097-0.47,4.666,0.712,6.409c-0.117,6.645-1.432,13.888-1.424,21.005c0.002,2.292,0.712,4.588,0.712,7.12
+		c0,2.274-0.435,4.983-0.356,7.476c0.057,1.811-0.644,5.368,1.78,6.053c1.659-14.192-0.157-32.312,0.356-48.418
+		c-0.455-0.02-0.493-0.456-1.068-0.356C420.226,432.873,419.605,432.728,419.518,433.114z M275.331,435.25
+		c0.521,0.479,2.82,0.728,2.849-0.356c-0.478-0.234-0.663-0.761-0.712-1.424C276.016,433.324,275.222,433.834,275.331,435.25z
+		 M414.89,433.827c-0.02,0.454-0.457,0.493-0.356,1.067c-0.261,2.481,0.62,4.896,0.712,7.833c0.077,2.45-1.112,4.813-1.068,7.12
+		c0.029,1.49,0.906,3.044,1.068,4.628c0.552,5.388-0.945,11.086-1.068,16.732c-0.15,6.972,0.32,13.71,0.356,19.226
+		c0.01,1.526-0.946,4.443,1.424,4.983c1.454-2.14,0.129-4.376-0.355-6.764c1.651-4.618,1.079-11.308,1.067-17.445
+		c-0.017-9.587,0.356-19.289,0.356-29.549c0-2.849,0.845-6.635-1.068-7.832C415.602,433.827,415.245,433.827,414.89,433.827z
+		 M268.211,437.743c1.577,0.033,2.446-0.64,2.136-2.492c-0.42-0.41-1.258-0.403-2.136-0.356
+		C267.688,435.413,267.688,437.224,268.211,437.743z M242.578,437.031c1.268,0.672,2.688,0.326,2.848-1.068
+		C244.674,434.858,242.208,435.03,242.578,437.031z M245.782,438.81c0.877,0.047,1.715,0.055,2.136-0.355
+		c0.1-0.812-0.085-1.339-0.712-1.424C246.792,437.685,245.317,437.277,245.782,438.81z M258.955,437.386c0,0.475,0,0.949,0,1.424
+		c0.743,0.702,2.363,0.272,3.204,0C262.293,437.206,260.061,436.628,258.955,437.386z M248.63,440.235
+		c0.83,0.651,2.02-0.616,1.78-2.137C248.927,437.92,248.702,439,248.63,440.235z M251.834,440.59
+		c1.424,0.237,1.431-0.942,1.424-2.136c-0.49,0.016-0.782-0.168-1.068-0.356C252.209,439.158,251.143,439.905,251.834,440.59z
+		 M256.818,439.878c0.114-0.825-0.057-1.367-0.355-1.78c-0.356,0-0.712,0-1.068,0C255.302,439.259,255.817,439.812,256.818,439.878z
+		 M264.295,447.355c-0.024,2.672-1.902,9.272,0.712,9.612c0.776-3.567,0.143-6.36,1.424-9.257
+		C266.01,447.301,265.173,447.308,264.295,447.355z M260.379,457.679c2.649-1.458,0.824-5.697,0.712-9.256c-0.475,0-0.949,0-1.424,0
+		C259.688,451.109,257.601,456.634,260.379,457.679z M255.395,449.135c-0.293,8.901-1.207,18.237-0.712,25.988
+		c1.089,0.259,1.047-0.614,2.136-0.355c1.663-5.248,0.205-12.751,0-18.869c-0.093-2.785,1.028-6.056-0.712-6.764
+		C255.869,449.135,255.632,449.135,255.395,449.135z M38.938,451.271c-0.161,5.533,2.583,9.55,7.832,8.544
+		c0.3-0.759-0.158-2.249,0.356-3.56c-1.33-0.381-1.015,0.884-2.136,0.712c-0.617-2.686-1.923-3.91-0.712-6.765
+		C42.704,449.476,40.095,450.431,38.938,451.271z M250.766,459.815c1.772,0.467,1.515-1.096,2.848-1.067
+		c-0.766-2.363-0.259-4.92-1.068-8.545C248.465,450.249,251.051,457.951,250.766,459.815z M246.494,459.459c0.593,0,1.187,0,1.78,0
+		c0.922-2.117-0.672-4.98,0.356-7.832c-0.421-0.41-1.259-0.403-2.136-0.356C246.119,453.754,246.459,456.653,246.494,459.459z
+		 M117.973,454.475c0.518-0.194,1.84,0.416,1.78-0.356c-0.71-0.357-0.562-1.574-1.78-1.424
+		C117.724,453.791,117.724,453.379,117.973,454.475z M288.86,455.187c0.085,0.508,0.586,0.601,0.712,1.068
+		c1.746,0.123,2.754-0.885,2.136-2.137C290.817,453.407,288.778,453.826,288.86,455.187z M163.898,456.611
+		c-4.659,0.333-9.188-1.449-12.104-2.136c-1.461,1.837,3.046,1.919,1.424,3.916c1.096,0.266,0.684-0.977,1.78-0.712
+		c2.46,0.522,5.542,1.558,8.9,1.068c1.712-0.25,2.693-1.932,4.628-1.424c0.508-1.272,2.077-1.484,2.492-2.849
+		C168.898,455.044,166.654,456.415,163.898,456.611z M93.764,455.899c0.775,1.85,5.781,0.809,5.34-0.355
+		C96.883,456.302,96.247,455.403,93.764,455.899z M68.843,457.324c1.019,0.069,1.943,0.044,1.78-1.068
+		c-0.62,0.026-1.107-0.08-1.424-0.356C69.086,456.38,68.692,456.579,68.843,457.324z M268.211,456.967
+		c0.149,1.84-0.291,3.852-0.355,6.052c-0.093,3.139-0.437,6.939,1.424,8.545c0.303-4.558,0.304-10.198,0-15.665
+		c-0.356,0-0.712,0-1.068,0C268.211,456.255,268.211,456.611,268.211,456.967z M112.988,463.375c0.402-2.055-0.58-3.635,0.356-6.052
+		C109.856,457.091,111.263,462.749,112.988,463.375z M275.331,459.103c1.023-0.045,1.691-0.445,1.425-1.779
+		c-0.594,0-1.188-0.001-1.78,0C274.861,458.149,275.032,458.69,275.331,459.103z M108.716,458.036
+		c-2.599,0.908-7.044,2.532-10.681,1.067c-7.542,2-15.676,0.134-22.073,0.712c-1.558,0.142-3.083,1.268-4.984,0.356
+		c-7.344,2.263-13.931-0.29-21.361,0.356c-0.399,3.982,3.516,3.319,5.696,2.136c0.748,0.676,1.824,1.024,2.848,1.424
+		c12.613-0.822,31.726-0.183,45.214,0c2.521,0.034,4.84,0.14,6.764-0.712C108.753,461.775,110.702,458.542,108.716,458.036z
+		 M122.245,460.171c-0.489-0.148-0.798,0.391-1.068,0.356c-1.952-0.254-5.289-1.117-6.408-1.068
+		c-0.069,1.73-0.081,3.403,0.712,4.272c4.813-0.418,3.775,3.05,6.764,4.628c1.776-0.004,2.286-1.275,4.272-1.068
+		c-0.637-2.892,1.321-3.188,2.492-4.272C125.99,463.375,124.548,460.869,122.245,460.171z M152.15,485.804
+		c0.008,7.426,0.64,14.841-0.712,21.717c1.137,1.929,0.745,4.447,0.712,7.121c-0.058,4.658-0.165,9.039-0.356,13.528
+		c-0.255,5.975,0.434,11.789,0,17.089c2.289,1.827,7.825,3.524,11.393,1.779c-1.007-0.061-2.442,0.307-2.492-0.712
+		c-0.031-2.523,4.168-0.815,3.561-3.916c-0.985,0.253-3.29,1.583-3.917,0c0.139-0.508,0.427-0.601,0-1.067
+		c1.505-0.632,4.126-0.146,4.272-2.137c-0.843-0.954-2.647,1.439-3.917,0c-0.042-1.94,2.356-1.441,3.204-2.492
+		c-1.75-0.327-3.102,1.034-3.916-0.355c-0.41-2.784,3.707-1.04,4.628-2.492c-0.29-2.961-3.554-1.666-3.917-3.916
+		c0.56-1.222,3.283-0.278,4.272-1.068c-0.594-8.883-1.521-16.036,0-24.565c-0.316-0.751-1.084-1.052-1.068-2.136
+		c0.473-13.193,1.982-25.201,1.424-38.806c0.27-0.923,1.812-1.644,1.068-2.492c-4.481,0.341-9.061-0.26-13.528-1.424
+		C153.374,467.828,152.141,477.009,152.15,485.804z M278.18,469.784c-0.562-2.86,1.007-6.838-0.356-8.188
+		C276.549,463.934,277.357,468.295,278.18,469.784z M272.127,470.852c1.088,0.257,1.298-0.364,2.137-0.356
+		c-0.013-2.271,0.974-8.224-2.137-8.544C271.726,464.098,272.384,467.719,272.127,470.852z M263.583,465.511
+		c0.919,2.324-0.44,5.128,0.355,7.121c3.7,0.628,2.798-6.789,1.78-8.545C264.978,464.533,264.218,464.959,263.583,465.511z
+		 M259.667,473.7c1.277,0.21,1.722-0.413,2.492-0.712c-0.841-2.083,0.41-4.365,0-7.12c-0.825-0.599-1.517-1.332-2.849-1.424
+		C259.159,466.552,259.106,471.166,259.667,473.7z M410.617,465.156c-1.762,2.655-0.869,7.277-1.068,12.104
+		c-0.265,6.423-0.675,12.104-0.712,18.868c-0.009,1.614-1.069,4.97,1.424,5.341c1.52-0.354,1.292-2.148,1.425-3.204
+		c0.477-3.801,0.284-9.125,0-13.173c-0.185-2.616,0.018-4.826,0-7.12c-0.009-1.173-0.7-2.373-0.712-3.561
+		c-0.006-0.504,0.593-0.419,0.712-0.712c1.127-2.79-0.671-6.277,0-8.544C411.329,465.156,410.973,465.156,410.617,465.156z
+		 M54.246,465.868c-0.427,1.969,1.843,1.242,1.78,2.848c-0.438,3.688-1.56,8.104,1.068,9.969c-0.603,0.703-2.055,0.556-1.78,2.136
+		c-0.389,1.932,0.718,2.367,0.712,3.917c-0.485,0.753-0.588,1.206-0.712,2.136c-1.282,9.654,0.766,21.558,0,30.262
+		c4.699,4.413,9.853-1.868,14.597-2.849c2.056,1.13,4.633,1.198,6.764,0.712c0.891-1.942,1.66-2.835,2.136-5.696
+		c3.456-4.761,5.333-10.599,7.833-16.021c1.58-3.429,3.22-7.077,4.628-10.324c0.896-2.064,2.372-4.343,2.492-6.765
+		c1.985-3.02,4.375-7.464,4.984-10.681C82.102,465.64,69.595,465.673,54.246,465.868z M250.054,475.48
+		c1.156,0.206,1.656-0.242,2.492-0.356c0.385-2.172,0.72-6.075,0.356-7.832C249.494,466.818,250.481,472.373,250.054,475.48z
+		 M376.796,468.36c0-0.475,0-0.949,0-1.424c-0.475,0-0.949,0-1.424,0C375.206,468.05,375.681,468.525,376.796,468.36z
+		 M245.426,467.648c0.209,2.995-0.437,6.845,0.356,9.256c0.831,0,1.661,0,2.492,0C250.002,473.853,249.27,466.846,245.426,467.648z
+		 M81.659,508.234c0,0.712,0,1.424,0,2.136c-1.007,1.247-2.1,2.41-2.492,4.272c0.877-0.048,1.715-0.055,2.136,0.355
+		c0.737-1.161,1.7-2.097,1.424-4.272c1.827-4.337,4.72-8.001,5.34-12.816c0.627-0.322,0.588-1.311,1.424-1.424
+		c-0.521-2.6,1.497-2.692,0.712-4.628c0.475,0,0.949,0,1.424,0c0-0.712,0-1.425,0-2.137c0.971,0.216,1.153-0.301,1.424-0.712
+		c1.714-2.597,2.272-6.322,3.56-8.9c1.602-3.208,3.655-5.393,4.984-8.544c-0.189-0.997-0.523-1.851-0.712-2.849
+		c-0.356,0-0.712,0-1.068,0C93.318,482.202,88.334,495,81.659,508.234z M129.009,469.784c-1.183,2.259-7.416-0.533-7.121,3.204
+		c2.188-0.224,6.98-0.182,7.833-2.848C129.643,469.862,129.423,469.726,129.009,469.784z M287.436,474.056c0.594,0,1.187,0,1.78,0
+		c0.207-0.98,0.887-1.487,1.068-2.492C288.378,469.577,285.542,471.928,287.436,474.056z M16.508,480.464
+		c-2.089,0.587-4.973,1.255-6.052,3.204c3,1.152,8.578-1.061,11.393-1.78c7.005-1.79,15.434-3.081,22.073-4.628
+		c3.485-0.812,7.141,0.196,6.764-3.561c-2.044-0.415-5.566,1.204-7.476,1.068c1.458,0.393-1.136,1.354-1.068,0.355
+		c0.197,0.002,0.404-0.288,0-0.355C35.025,477.719,24.559,478.204,16.508,480.464z M274.976,474.412
+		c0.167,6.153-0.394,11.984-0.356,18.869c0.011,1.946-0.599,4.597,0.712,5.34c0.539,1.077,1.562-0.295,2.492,0
+		c0.007-3.245,0.758-6.869,0.356-10.324c-0.153-1.316-0.72-2.21-0.712-3.56c0.021-3.688,1.863-7.562,0-11.037
+		c-0.821-0.336-1.148-0.023-2.492-0.355C274.924,473.765,274.342,474.151,274.976,474.412z M404.564,476.548
+		c-0.567,2.29,0.038,5.831,0,8.9c-0.075,6.2-0.832,12.374,0.713,17.444c1.752-3.691,0.573-8.526,0.712-13.528
+		c0.139-5.014,0.543-10.334,1.067-15.309c-0.075-0.399-0.395-0.555-0.712-0.712C406.355,474.545,404.806,475.574,404.564,476.548z
+		 M122.601,475.124c1.834,9.915,3.641,22.17,5.34,33.466c1.661,0.813,4.578,0.166,5.696-0.712
+		c0.312-6.795-3.423-14.963-2.848-22.785c-2.137-2.527-0.899-7.995-2.848-11.393C126.931,473.894,124.134,475.383,122.601,475.124z
+		 M267.855,482.957c-0.185-3.151,0.203-5.73,0.355-8.545c-0.455-0.02-0.493-0.456-1.068-0.355
+		C266.381,475.684,266.473,481.25,267.855,482.957z M264.651,481.888c-0.031-2.538,0.411-4.724-0.356-7.12
+		C264.275,476.289,263.203,480.253,264.651,481.888z M271.06,481.888c-0.229-1.433,0.463-3.785-0.356-4.628
+		C270.369,478.036,269.673,481.704,271.06,481.888z M26.121,483.668c-4.364,0.929-9.103,1.353-12.104,2.492
+		c-0.776,0.295-2.163,0.471-2.492,1.424c13.054-2.483,26.236-5.029,38.45-8.544C42.142,478.941,33.938,482.004,26.121,483.668z
+		 M244.714,487.228c-2.975-0.932-7.66-0.652-8.9,2.137c1.53,1.669,6.023,1.482,4.984,4.628c1.543,0,3.085,0,4.628,0
+		C245.789,491.566,246.126,488.726,244.714,487.228z M288.147,489.72c0.097-1.282,0.09-2.462-1.424-2.136
+		C285.906,488.506,286.683,489.994,288.147,489.72z M242.578,508.589c1.231-0.289,1.503,0.665,2.136,0
+		c-0.152-1.924,0.854-7.93-1.424-8.9C242.395,502.165,243.081,504.918,242.578,508.589z M10.456,517.134
+		c5.277-1.013,11.25-1.33,15.309-3.561c-1.923,0.064-2.825-1.107-3.916,0c-0.541-1.141-0.112-1.256,0-2.492
+		c-1.237-0.78-3.217-0.818-4.628-1.424c0.717-1.285-0.035-1.724-0.356-2.849c0.78-0.763,1.978-1.107,2.492-2.136
+		c-1.176-0.723-3.748-0.05-4.628-1.068c0.48-0.825,1.012-1.599,1.78-2.136c-2.033-0.136-3.124,0.147-5.696-0.356
+		C10.097,505.67,10.553,513.126,10.456,517.134z M386.765,512.862c0.06,0.264-0.417,1.189-0.356,1.78
+		c0.091,0.896,0.761,1.524,0.712,2.136c-0.051,0.63-0.757,0.75-0.712,1.424c0.107,1.611,0.195,4.197,1.78,4.272
+		c1.509-7.646-1.24-13.662-3.561-17.801c-0.137-0.245-0.251-0.44-0.712-0.356C383.695,507.783,386.134,510.108,386.765,512.862z
+		 M226.201,521.406c3.982-1.896,1.43-9.913,1.78-14.597c-0.455-0.02-0.493-0.456-1.068-0.355
+		C225.159,509.704,225.742,517.122,226.201,521.406z M130.789,511.793c-0.231,1.3,0.24,1.896,0.712,2.492
+		c2.175-0.08,3.716-0.793,3.917-2.848C133.98,510.442,132.398,511.832,130.789,511.793z M125.449,513.217
+		c0.843,1.439,2.738,1.587,4.272,0.712C130.04,511.612,125.593,511.017,125.449,513.217z M267.855,512.862
+		c0.499,2.467,3.145,2.788,3.56,5.34c-1.491,2.958,1.225,4.901,1.068,8.545c0.812,0.81,1.799-1.126,2.492,0.355
+		c0.783,6.361-3.52,7.636-6.765,9.969c5.21,1.512,9.29-1.429,13.173-1.068C282.974,522.422,278.26,513.261,267.855,512.862z
+		 M28.969,514.998c-4.3,1.99-10.726,1.854-14.953,3.916c-1.468,0.193-2.998,0.325-3.56,1.424c0.085,1.394,1.035,0.047,1.424,0
+		c6.745-0.797,10.818-2.874,16.732-2.491c0.372-1.053,1.802-1.046,1.424-2.849C29.681,514.998,29.325,514.998,28.969,514.998z
+		 M435.538,516.778c1.771-0.246,3.289-0.746,4.272-1.78C438.078,515.283,436.053,515.275,435.538,516.778z M127.585,516.421
+		c0.319,1.758-0.216,2.285,0.356,3.916c-5.478,4.644,0.457,10.971,2.136,16.377c1.317,0.571,3.725,0.52,4.628-0.355
+		c1.36,0.453,5.104,0.159,6.052-1.78c-3.058,0.324-5.745-1.201-6.765-3.916c-2.22-0.272-3.454-1.531-4.628-2.849
+		c-0.656-6.791,5.521-6.874,8.188-9.968c-2.191,0.647-1.39-1.696-2.848-1.78c-2.138-0.002-3.225,1.047-4.984,1.424
+		C128.784,517.315,128.522,515.527,127.585,516.421z M113.345,516.421c-5.003-0.664-7.783,2.824-12.105,0.713
+		c-1.901,1.38-3.501,1-5.696,1.779c1.851,4.138,3.32,7.159,1.424,11.749c2.589,1.473,5.128-0.913,6.052-3.561
+		c0.664-1.903-0.363-4.353,1.424-4.984c-0.244-0.706-2.121,0.223-1.78-1.067c3.259-3.559,10.4-4.099,13.528-0.356
+		C116.905,518.919,114.232,517.753,113.345,516.421z M267.855,524.61c0.251,1.612-0.185,3.359,0,5.341
+		c-0.556,1.441-2.66,2.901-2.137,4.271c3.854-1.066,4.989-6.158,4.628-10.324c-1.063-2.378-3.058-3.824-4.271-6.052
+		c-1.253-0.172-1.728-1.121-2.849-1.425c-0.237,0-0.475,0-0.712,0C264.717,518.57,267.262,520.802,267.855,524.61z M138.978,524.254
+		c2.002,0.862,1.878,3.881,3.916,4.983c2.32,1.256,4.623,0.302,7.121-1.067c0.386-2.774,0.265-5.04,0.356-9.257
+		C146.201,515.423,139.362,517.575,138.978,524.254z M120.465,523.542c2.285,0.623,1.412-1.911,2.848-2.137
+		c0.812,0.1,1.338-0.086,1.424-0.712c-1.119-0.496,0.49-1.757-0.356-2.136c-0.49,0.016-0.782-0.168-1.068-0.356
+		c-0.359,0.709-0.616,1.521-1.424,1.78c-0.702-0.247,0.088-1.986-0.712-2.136C120.189,519.066,120.978,521.25,120.465,523.542z
+		 M22.917,519.27c-2.346,0.812-5.175,2.318-8.188,2.848c-2.02,0.355-3.659,0.061-4.272,1.425c4.28,0.007,7.518-1.027,10.324-2.492
+		c1.71,0.048,3.239-0.084,3.561-1.425C23.721,519.653,23.233,519.546,22.917,519.27z M260.734,521.406
+		c-1.375,2.663-4.2,1.369-7.12,2.492c-3.15,1.212-4.774,5.635-9.256,3.561c-5.172,3.135-10.453,6.16-16.732,8.188
+		c-0.668,0.085,0.202,0.586-0.356,0.712c-2.381,0.62-4.537,2.27-6.765,3.204c-1.337,0.561-3.119,0.291-3.916,1.78
+		c1.07,2.371,1.641,5.241,2.848,7.476c10.189-3.682,17.983-7.137,27.413-9.968c2.874-3.061,8.239-3.629,11.749-6.053
+		c1.396-0.091,1.323,1.288,2.848,1.068c4.587-2.338,4.354-14.113-1.779-14.597C259.474,520.531,260.928,520.145,260.734,521.406z
+		 M17.576,524.254c3.848-0.543,7.971-0.812,10.325-2.849C23.823,521.719,20.571,522.858,17.576,524.254z M89.491,523.898
+		c-1.261,0.192-0.875-1.261-2.136-1.068c-0.785,0.521,0.209,2.82-1.068,2.849c-1.226-0.147-0.91-3.103-2.136-2.136
+		c-0.864,0.204,0.167,2.303-1.068,2.136c-1.382-0.042-1.102-1.746-2.492-1.78c-0.234,1.278,1.148,2.758-0.356,3.204
+		c-1.669,0.199-1.44-2.84-2.848-1.78c0.097,1.171,0.893,2.68-0.712,2.849c-1.371-0.053-0.866-1.981-1.78-2.492
+		c-1.939,0.078-1.718,2.317-2.848,3.204c-0.708-0.005-0.453-0.972-1.424-0.712c-0.193,1.468-0.911,2.411-1.78,3.204
+		c-1.32,0.252-1.528-0.608-2.848-0.356c-0.193,1.469-0.911,2.412-1.78,3.204c-1.312-0.111-0.837-2.011-1.424-2.848
+		c-1.965,0.289-1.072,3.438-2.848,3.916c-1.275-0.149-0.779-2.069-2.136-2.136c-1.709,1.851-2.784,4.337-6.052,4.628
+		c-0.71-0.357-0.562-1.574-1.78-1.424c-1.788,0.229-1.771,2.263-3.56,2.492c-1.323,0.136-0.931-1.443-2.492-1.068
+		c-1.588,0.904-2.314,2.67-4.628,2.848c-1.278,0.21-0.01-2.126-1.424-1.779c-1.847,0.525-2.425,2.321-4.272,2.848
+		c-1.261,0.192-0.875-1.261-2.136-1.068c-0.891,0.296-1.398,0.976-2.492,1.068c-0.634-0.196-1.479-0.183-1.78-0.712
+		c-1.126-0.059-1.19,0.946-2.492,0.712c-2.81-1.392-5.805-0.263-8.544-0.712c-2.259-0.37-3.743-2.131-6.052-2.136
+		c-0.031,2.048-0.077,4.111,0.356,5.696c1.484,1.502,2.724,0.896,4.272,1.067c0.779,0.087,1.699,0.967,2.492,1.068
+		c6.183,0.79,11.506-0.151,16.733-0.712c0.96-0.104,1.858,0.427,2.848,0.355c1.723-0.124,4.021-1.175,6.052-1.779
+		c1.827-0.545,3.819-1.764,5.696-2.137c1.011-0.201,2.197,0.253,3.204,0c3.996-1.001,7.435-3.945,11.749-3.56
+		c0.693-0.73,1.679-1.17,2.492-1.78c6.107-0.465,11.88-6.098,18.869-5.696c2.326-1.466,5.65-0.866,7.833-1.78
+		C95.43,526.467,91.717,517.691,89.491,523.898z M109.428,528.17c5.199,0.961,4.949-4.85,1.78-6.053
+		C108.711,522.728,108.392,525.783,109.428,528.17z M131.145,526.747c0.933,1.496,3.283,2.064,4.984,2.136
+		c-0.152-1.628-0.542-3.019-0.356-4.984c-1.263,0.189-0.935-0.852-2.136-1.424C132.63,523.721,131.538,524.884,131.145,526.747z
+		 M408.125,526.747c3.137,0.338,4.189-1.048,6.052-1.78c1.702-0.67,4.014-0.579,4.984-2.137
+		C414.921,523.574,411.017,524.653,408.125,526.747z M140.401,529.594c0.132-1.438-1.181-1.43-1.424-2.492
+		c-0.178-1.603-0.24-3.32-1.78-3.56C136.476,525.73,137.679,528.894,140.401,529.594z M10.812,532.086
+		c7.35,0.947,14.497-1.086,19.581-3.561c-4.134-1.622-7.203,0.915-10.325-0.712c3.061-1.924,8.907-1.975,10.681-3.204
+		c-8.166-1.03-14.595,2.075-20.649,4.272c1.052,0.253,2.513,0.098,2.848,1.068C12.341,530.767,11.629,531.48,10.812,532.086z
+		 M196.652,526.035c0.078,1.82-0.062,3.858,1.068,4.628c0.536-0.532,0.106-2.03,1.424-1.78c0.986,0.98-0.32,1.487-0.356,2.492
+		c0.399,0.075,0.554,0.396,0.712,0.712c1.346,0.04,1.914-0.696,2.136-1.78c-1.366-1.245-1.112-2.702-0.712-4.984
+		C198.992,524.246,198.166,526.367,196.652,526.035z M106.224,528.882c0.01,4.771,0.898,9.077,0.356,12.816
+		c0.689,0.379,0.93,1.206,1.424,1.78c-0.526-4.775,1.077-7.618-0.712-11.036c2.004-2.296,0.101-4.678-0.356-6.765
+		c-0.356,0-0.712,0-1.068,0C104.466,526.741,105.925,527.59,106.224,528.882z M22.561,533.155c2.524,0.15,4.396-0.352,5.696-1.425
+		C26.769,531.304,23.715,532.09,22.561,533.155z M28.257,534.222c1.812,0.276,4.125,0.782,4.628-1.067
+		C31.809,532.969,28.623,532.634,28.257,534.222z M110.14,536.359c0.11-0.84,1.237-0.663,1.068-1.78
+		c-0.414-0.299-0.955-0.47-1.78-0.356C109.354,535.246,109.519,536.031,110.14,536.359z M137.197,538.138
+		c-2.825,0.545-6.738-0.589-8.9,1.425c0.555,1.465,2.001-0.121,2.848,0c0.814,0.116,0.693,0.951,1.78,1.067
+		c2.132,0.229,2.759-0.632,3.916-1.067c2.065-0.778,4.964-0.667,6.052-2.492c-0.47-0.005-0.325-0.624-0.712-0.712
+		C140.576,537.029,139.175,537.757,137.197,538.138z M280.315,539.563c1.681-0.219,2.812-0.985,2.849-2.849
+		c-0.481-0.111-0.681-0.507-1.425-0.355C281.991,538.153,280.427,538.131,280.315,539.563z M384.628,542.055
+		c-0.83,0-1.661,0-2.492,0c0.03,1.275,0.554,2.057,0.712,3.204c-3.13,2.447-3.728,7.427-4.271,12.46
+		c1.643,1.574,4.841,0.92,7.476,0.712c1.138-4.512,0.829-10.591,0.713-14.597c-0.076-2.601,1.283-5.653-0.356-7.476
+		C386.128,538.571,385.321,540.256,384.628,542.055z M109.784,554.16c0.505,4.686,1.755,10.268,0,13.885
+		c4.525-0.299,3.254-8.771,1.78-11.037c1.616-5.926,0.525-13.255-0.712-19.225c-0.455-0.02-0.493-0.456-1.068-0.356
+		C110.542,543.476,109.245,549.153,109.784,554.16z M56.382,542.767c-0.241,0.827-1.183,0.953-1.424,1.78
+		c0.963,3.975-0.183,7.69,0,11.392c0.023,0.471,0.665,0.969,0.712,1.425c0.095,0.918-0.672,1.595-0.712,2.492
+		c-0.087,1.932,0.008,4.129,0,6.052c-0.016,3.575-0.055,8.757,0.712,11.393c-0.434,0.04-0.843,0.106-0.712,0.712
+		c1.279,1.525,4.188,0.717,5.34,0.712c1.12,0.527-1.351,1.84,0.356,1.78c2.504-0.615,3.509-0.052,5.34,0.712
+		c1.421-0.195,2.938-2.184,3.916-0.712c-0.028,1.989-2.714,1.321-2.492,3.561c2.472-0.852,4.151-2.495,7.121-2.849
+		c0.085,0.508,0.586,0.601,0.712,1.068c-0.736,1.399-2.504,1.769-2.848,3.561c4.279-0.093,5.259-3.074,9.612-2.492
+		c-0.003-3.948-1.614-6.766-2.136-11.749c-0.42-0.173-0.807-0.38-1.068-0.712c0.565-2.207-0.29-5.487-1.424-7.12
+		c0.897-1.757-0.692-3.51-1.068-4.984c-0.104-0.405,0.446-0.514,0.356-1.068c-0.454-2.795-1.794-5.925-2.136-8.9
+		c-0.298-2.599-0.701-3.331-1.068-4.984c-0.397-1.786,0.359-4.525-1.424-6.052C66.74,539.138,61.739,541.934,56.382,542.767z
+		 M140.758,539.918c-2.754,1.163-5.704,2.129-8.9,2.849c-0.636,4.346,2.056,9.928,1.78,13.885c3.844,4.539,7.466,5.775,16.021,5.34
+		c0.298-0.77,0.921-1.215,0.712-2.492c-0.727-0.878-1.455,1.188-2.492,0c0.497-1.086,3.033-2.982,1.068-4.272
+		c-0.913,1.224-1.118,3.154-3.204,3.204c-0.102-1.306,2.435-1.813,1.068-3.204c-0.411,1.08-2.131,3.61-3.204,1.78
+		c0.782-1.71,2.999-1.985,3.204-4.272c-2.599,0.254-3.383,4.206-6.052,3.204c0.713-2.372,3.861-2.309,4.628-4.628
+		c-2.498,0.113-2.433,2.788-4.984,2.849c0.001-0.357-0.288-0.424-0.356-0.712c0.704-1.985,4.057-1.717,3.561-4.629
+		c-2.058-0.159-1.775,2.022-3.561,2.137c-1.286-2.458,2.546-2.6,2.848-4.629c-1.367,0.306-2.773,2.434-4.272,1.425
+		c-0.424-2.204,2.186-1.374,2.492-2.849c-0.405-1.447-3.02,1.229-3.204-1.424c0.637-1.617,3.499-1.011,3.916-2.849
+		C141.68,540.183,141.367,539.903,140.758,539.918z M365.759,622.514c1.159-0.499,2.243-1.598,3.561-2.136
+		c8.274-3.382,16.896-6.365,25.277-10.324c8.214-3.882,16.663-7.594,24.921-11.037c0.399-0.036,0.554,0.518,0.712,0
+		c-0.286-1.925,5.085-2.626,7.477-3.56c3.987-1.558,9.627-4.634,15.664-7.121c2.602-1.071,5.095-1.888,8.188-3.204
+		c3.052-1.298,9.293-2.985,7.12-6.408c-16.767,6.255-31.911,14.134-48.773,20.293c-0.727,0.46-0.9,1.473-1.78,1.78
+		c-13.927,5.113-28.812,12.165-43.078,18.157c-4.451,1.869-8.81,4.02-13.172,5.695c-0.938,0.36-2.9,1.816-3.561,0
+		c1.073-1.986,3.372-2.521,4.984-3.204c1.667-0.705,3.516-1.51,5.696-1.779c3.677-2.989,8.328-3.225,12.46-6.053
+		c7.564-2.928,16.819-6.739,23.497-9.612c1.665-0.716,3.297-1.388,4.984-2.136c6.775-3.004,12.872-5.973,19.581-8.9
+		c8.281-3.614,16.119-6.777,24.209-10.325c2.25-0.986,4.481-2.204,6.765-3.204c4.194-1.836,8.639-2.124,11.036-4.983
+		c0.103-3.307,0.046-6.455-1.78-7.833c-1.888,1.244-7.058,3.511-7.477-0.712c-0.161-1.467,1.275-1.336,1.425-2.492
+		c-0.505-1.157-2.369-0.954-2.137-2.848c1.126-3.276,5.201-3.605,8.9-2.492c0.309-1.168,0.04-2.438,0.356-4.272
+		c-0.895-1.004-2.684-1.113-2.849-2.848c0.179-1.127,1.647-0.964,2.137-1.78c-1.812-2.224-3.662-4.408-3.561-8.545
+		c-2.054-0.329-2.73-0.322-3.56,0.356c-0.959,0.784-2.343,0.712-2.137,2.136c2.124-0.105,3.89,0.146,5.341,0.712
+		c-0.452,1.447-1.763,2.036-2.849,2.849c0.561,0.545,1.984-0.507,2.492,0.712c0.352,0.836,0.624,1.749,0.712,2.849
+		c-1.28,0.381-2.986,0.336-3.204,1.779c2.083,0.409,4.405,0.579,4.984,2.492c-2.271,2.469-8.627,3.037-9.612-1.067
+		c0.583-0.604,1.489-0.885,1.424-2.137c-0.903-1.944-1.021-4.675-3.204-5.34c-1.417,3.093,0.271,9.29-2.492,11.036
+		c1.039,0.741,3.661-0.101,3.561,1.78c-0.235,2.139-3.293,1.454-3.561,3.561c2.311-0.294,3.53,0.504,3.916,2.136
+		c-0.782,1.235-1.894,2.141-3.56,2.492c-1.306-1.188-3.696-1.289-4.984-2.492c-0.993,2.08-2.592,2.775-1.424,5.34
+		c-1.05,1.324-2.947,1.8-3.917,3.204c0.713,0,1.425,0,2.137,0c0.705,1.915,2.981,0.265,3.56,2.492c-1.086,3.165-7.148,3.161-8.188,0
+		c-0.352-1.42,1.064-1.071,0.713-2.492c-1.022,0.041-3.783,1.119-4.629,2.492c3.139-0.694,4.631,1.919,3.561,4.272
+		c-2.629-1.303-3.042,1.045-5.34,1.068c-2.818-0.399-2.736-3.025-4.272-3.916c-0.63,0.319-1.04,0.859-1.78,1.067
+		c-0.257,2.037,2.212,1.349,2.136,3.204c-2.025,2.424-7.617,4.792-10.324,1.424c-0.425,0.881-1.219,1.393-2.136,1.78
+		c-0.226,1.412,1.354,1.021,1.068,2.492c-1.489,1.716-3.465,2.943-5.341,4.272c-1.728-1.12-4.057-1.64-3.916-4.628
+		c0.923-0.738,2.11-1.213,3.561-1.425c0.377-1.326-0.75-1.148-1.068-1.779c-1.186-0.112,1.071-1.688-0.712-1.425
+		c-2.148,0.818-3.958,1.977-6.408,2.492c0.058,1.604,2.203,1.12,2.136,2.849c-1.071,0.353-1.589,1.259-3.204,1.067
+		c-0.233,1.047-1.312,2.426-2.136,1.78c0.005-1.299-1.35-1.737-1.78-3.56c-2.627,1.011-4.839,0.272-6.408,2.136
+		c-0.38-0.332-0.111-1.313-1.068-1.068c-3.423,0.031-6.5,0.613-9.969,1.068c-0.32-2.365-3.731-2.312-6.052-3.561
+		c-1.658,0.688-3.714,2.165-5.34,1.78c-0.867-2.693-2.798-4.322-5.696-4.984c-0.771,2.868-3.155,1.957-4.984,3.561
+		c-1.469-0.667-1.459-2.813-2.849-3.561c-2.967,0.308-6.785-2.297-9.968,0.356c1.876,0.259,4.208,0.063,4.628,1.78
+		c-2.026,0.229-3.095,1.415-5.341,1.424c-1.244-0.299-1.571-1.514-2.491-2.136c-1.452,0.441-3.212,1.322-4.984,1.779
+		c-1.472,0.38-3.851-0.339-4.272,1.425c1.625,0.393,3.98,0.054,4.628,1.424c-1.294,1.554-3.713,1.983-6.052,2.492
+		c-1.916-1.134-2.031-3.122-2.849-4.628c-4.541,0.013-8.736,2.507-13.885,2.848c-3.162,0.209-6.203-1.261-9.256-1.068
+		c-2.036,0.129-3.606,1.337-5.696,1.068c-2.277-0.293-3.585-1.59-5.34-3.204c-3.352-0.391-4.925,1.268-7.121,2.848
+		c0.102-2.236-2.031-2.24-2.492-3.916c0.073-0.527,1.918-1.84,0.356-1.78c-4.306,1.525-13.98,1.278-17.444,3.561
+		c0.789,1.347,3.825,0.447,3.56,2.848c-2.682,0.048-3.706,1.753-6.052,2.137c-0.897-1.12-2.126-1.909-2.492-3.561
+		c-2.576,0.747-4.804,1.843-6.409,3.561c1.405,0.375,3.426,0.135,3.56,1.78c-2.094,0.872-4.692,1.241-6.408,2.492
+		c-1.994-2.873-5.523-1.831-8.9-1.78c-0.215-1.328,0.152-3.237-1.068-3.561c-0.99,0.434-0.661,2.187-0.712,3.561
+		c1.457,0.798,3.881,0.628,4.628,2.136c-2.031,0.698-3.082,2.377-5.34,2.849c-1.67-1.078-2.843-1.957-2.136-4.629
+		c-2.181,1.054-1.511,0.047-2.848-1.067c-2.184,0.543-4.845,1.706-7.476,2.492c-2.233,0.666-5.557,0.818-5.696,2.848
+		c1.211,0.499,4.038,2.212,6.408,1.424c0.662-0.397-0.851-2.942,0.712-3.204c1.838,0.416,4.14,0.369,4.984,1.78
+		c-0.147,1.396-2.287,0.799-2.492,2.136c5.594,2.137,11.418,2.733,16.732,3.917c2.661,0.592,5.399,1.804,7.477,0.712
+		c-0.718-1.762-0.718-2.511,0-4.272c-1.938-0.431-4.104-3.043-1.78-4.628c2.794,0.985,4.418,0.112,7.12,1.779
+		c-0.551,1.586-3.398,0.874-3.56,2.849c1.735,1.902,4.836,0.275,5.696,2.848c-0.681,1.27-4.722,0.534-6.053,2.137
+		c0.963,1.109,3.049,1.504,4.628,1.78c2.264,0.396,4.977,0.666,7.833,1.067c10.136,2.344,21.562,4.856,32.753,7.12
+		c2.838,0.574,5.933,0.988,8.545,1.425c2.758,0.46,5.996,1.748,7.832,2.136c0.804,0.17,1.7-0.168,2.492,0
+		c4.95,1.052,9.908,2.283,14.597,3.204c2.818,0.554,3.997,0.535,6.052,1.068c1.117,0.29,3.862,0.061,3.917,2.136
+		c-4.686,0.076-9.481-1.558-14.241-2.492c-7.033-1.381-14.417-2.189-20.293-4.271c-2.007,0.604-3.692-0.612-5.696-1.068
+		c-4.669-1.063-8.07-1.588-12.46-2.492c-3.638-0.749-7.596-0.904-11.037-1.78c-0.825-0.21-1.608-0.896-2.492-1.068
+		c-0.846-0.164-1.981,0.169-2.848,0c-0.747-0.145-1.422-0.888-2.136-1.067c-2.497-0.627-5.142-0.521-7.833-1.068
+		c-4.433-0.902-8.999-2.271-13.528-3.204c-11.267-2.32-22.388-4.465-31.329-6.408c-2.344-0.51-4.107-1.579-6.052-1.424
+		c-0.87,0.069-1.218,0.992-2.492,1.424c-1.003,0.34-2.943,0.053-3.917,0.356c-0.66,0.205-1.12,0.817-1.78,1.067
+		c-2.446,0.926-5.218,1.702-7.121,1.78c-9.474,4.854-22.582,7.646-32.753,12.816c-1.999-1.184-2.413,1.063-4.272,1.068
+		c-0.005-0.944,0.198-2.097-0.712-2.137c-6.648-0.791-13.743-2.752-21.005-3.916c-3.367-0.539-6.836-1.146-9.612-1.067
+		c-1.655-1.365-4.403-1.767-6.409-1.068c-2.894-3.718-20.855-1.389-14.24-8.9c8.273-1.508,14.213-6.675,22.073-7.477
+		c2.353-1.418,4.543-4.588,3.916-7.832c-1.682-0.021-0.787,2.536-3.204,1.78c0.617,1.06-0.115,1.806,0.356,2.492
+		c-40.374,14-76.036,24.907-116.061,38.806c-1.963-0.064-3.04,0.758-4.272,1.424c-0.002,1.826,0.521,2.336,0,3.916
+		c0.809,0.704,1.989-0.379,3.56,0c0.267-1.097-1.227-0.434-0.712-1.78c5.972-0.875,11.253-3.607,17.089-5.34
+		c5.479-1.627,9.588-3.012,14.597-4.628c11.35-3.663,22.947-6.954,33.821-10.325c4.69-1.453,9.999-3.364,14.241-4.628
+		c3.43-1.021,6.042-2.09,8.9-1.78c-2.901,2.489-6.841,2.88-10.325,3.916c-3.903,1.161-9.246,2.555-12.46,3.917
+		c-3.062,1.297-8.083,2.843-12.104,3.56c-2.24,1.342-4.5,1.693-7.12,2.492c-1.837,0.56-3.91,1.395-5.696,1.78
+		c-0.554,0.119-1.242-0.17-1.78,0c-2.648,0.833-5.131,2.36-7.832,3.204c-9.872,3.083-20.148,5.75-29.193,9.612
+		c4.34,0.139,10.482-0.329,13.172,0.356c5.034-2.581,10.654-4.137,16.021-6.053c7.644-2.729,16.045-5.51,23.497-7.832
+		c6.428-2.004,11.573-3.734,17.089-5.696c5.891-2.096,11.799-3.632,17.445-5.696c1.511-0.553,3.576-2.246,5.34-1.068
+		c-3.849,3.109-8.892,3.518-13.529,4.984c-8.506,2.69-17.187,6.06-25.633,8.9c-7.146,2.403-14.376,4.72-21.717,6.765
+		c-1.802,1.305-4.362,2.037-6.764,2.848c-2.493,0.842-5.392,1.136-7.12,2.849c2.611,0,5.222,0,7.832,0
+		c18.454-7.712,40.834-13.369,59.455-20.649c2.515-0.086,5.447-1.011,7.833-1.78c2.837-0.914,5.467-3.084,8.188-1.779
+		c-7.357,4.392-18.263,5.234-25.989,9.256c-2.996-0.113-5.69,1.562-8.544,2.492c-12.181,3.967-25.619,7.875-36.669,12.461
+		c2.843,0.592,6.887,0.254,11.037,0.355c0.938-0.248,0.752-1.621,1.78-1.78c18.297-5.594,37.266-12.122,54.47-17.444
+		c3.933-1.217,7.208-3.025,11.037-2.849c-1.27,2.142-4.341,2.443-6.764,3.204c-2.481,0.779-5.165,1.903-7.833,2.137
+		c-1.981,1.598-4.402,1.411-6.764,2.136c-1.681,0.516-3.257,1.586-4.984,2.137c-3.653,1.164-7.369,1.975-11.036,3.204
+		c-7.258,2.432-14.294,5.522-21.005,7.476c-1.758,0.512-3.752,0.12-4.984,1.78c8.519,1.639,12.973-1.607,18.869-3.56
+		c4.494-1.488,9.479-3.421,12.816-4.629c0.7-0.253,1.802-0.127,2.492-0.355c5.536-1.835,10.695-3.669,16.377-5.696
+		c0.719-0.257,1.416-0.83,2.136-1.068c0.536-0.177,1.236,0.158,1.78,0c0.419-0.122,0.954-0.909,1.424-1.068
+		c0.738-0.249,1.762-0.094,2.492-0.355c1.287-0.462,2.646-1.377,3.917-1.78c0.54-0.171,1.229,0.137,1.78,0
+		c1.838-0.457,3.562-2.358,5.696-1.78c-0.942,3.282-5.008,2.793-7.476,3.561c-0.604,0.188-1.467,0.844-2.136,1.068
+		c-4.445,1.488-8.548,3.049-12.104,4.271c-9.186,3.158-19.135,6.382-28.125,9.257c-1.944,0.621-3.683,1.078-4.984,2.492
+		c2.448,0.365,3.917-0.411,6.052,0.355c4.755-1.888,7.886-3.237,13.528-4.271c2.219-1.608,5.273-2.606,8.188-3.561
+		c2.953-0.967,6.166-1.635,8.9-2.849c3.211-1.229,7.993-2.471,12.104-3.916c1.538-0.54,3.143-0.907,4.628-1.424
+		c3.592-1.249,8.22-4.729,11.392-2.492c-2.422,0.9-4.82,1.825-7.832,2.137c-2.647,1.978-6.352,2.074-9.612,3.204
+		c-1.243,0.431-2.308,1.453-3.561,1.779c-2.168,0.566-3.363,0.832-4.984,1.425c-2.656,0.971-5.278,1.652-7.833,2.492
+		c-1.205,0.396-2.354,1.322-3.56,1.779c-3.697,1.402-7.585,2.335-11.037,3.561c-1.172,0.416-2.781,0.743-3.56,1.78
+		c2.746,0.391,4.438-0.374,6.764,0.355c0.26-0.809,1.071-1.064,1.78-1.424c3.149-0.538,5.039-1.299,7.477-2.136
+		c2.511-0.863,4.96-1.921,6.764-2.492c0.892-0.283,1.677-0.412,2.492-0.712c5.637-2.079,9.84-3.62,14.953-5.341
+		c3.562-1.198,7.048-3.08,10.68-4.271c0.703-0.23,1.651-0.089,2.492-0.356c2.26-0.719,5.585-2.734,7.833-1.424
+		c-2.509,1.925-5.761,2.307-8.544,3.204c-4.439,1.43-9.434,3.158-12.46,4.271c-4.317,1.588-8.413,3.144-12.461,4.629
+		c-4.012,1.472-8.087,2.358-12.104,3.916c-1.103,0.428-2.865,1.072-3.56,2.136c3.497-0.053,7.135-0.003,9.256,0.356
+		c0.625-0.917-0.37-1.711,1.068-2.137c6.469-2.164,13.101-4.621,19.581-6.764c4.913-1.625,10.246-3.471,16.021-5.341
+		c2.322-0.751,5.853-2.838,7.476-1.067c-14.035,4.971-29.165,10.281-42.366,14.952c3.344,0.907,8.057-0.1,10.68,0.712
+		c4.56-3.078,9.597-3.411,14.953-5.34c0.783-0.282,1.317-1.099,2.136-1.424c1.605-0.637,3.021-0.466,4.272-1.068
+		c0.696-0.335,0.649-0.19,1.068-0.355c5.382-2.128,10.856-4.369,16.021-6.409c2.192-0.865,4.604-1.289,6.765-2.136
+		c3.979-1.559,7.727-3.907,11.748-5.34c4.4-1.568,8.14-2.903,11.749-4.272c0.588-0.006,0.199-0.987,0.712-1.068
+		c5.176-0.964,11.562-3.692,15.665-5.696c0.833-0.406,2.07-0.444,2.492-0.712c0.94-0.598,0.317-1.215,1.424-1.424
+		c0.736-0.139,2.332,0.168,2.848,0.712c-1.696,2.235-4.688,2.62-7.12,3.561c-2.605,1.007-5.242,2.23-7.833,3.204
+		c-10.599,3.981-21.182,7.759-31.329,12.104c-3.933,1.684-7.936,3.69-11.393,4.984c-1.445,0.54-3.086,0.521-4.628,1.067
+		c-5.969,2.12-11.982,4.717-17.801,6.765c-1.93,0.679-4.396,1.077-5.696,2.848c4.457-0.138,6.841-0.503,11.037,0
+		c3.618-1.979,7.508-3.563,11.393-4.983c10.25-3.748,21.497-7.688,30.973-11.749c4.759-2.04,9.357-3.959,14.241-5.34
+		c0.322-0.628,0.796-1.103,1.424-1.425c6.06-1.18,12.255-5.308,18.869-7.12c0.726-0.829,2.364-2.604,3.916-1.424
+		c-0.827,2.843-4.215,3.021-6.408,3.916c-19.635,8.024-40.627,16.603-60.878,24.209c-2.809,1.056-5.958,1.811-8.188,3.916
+		c2.848,0,5.696,0,8.544,0c0.849-0.575,1.569-1.278,2.492-1.779c12.091-3.88,24.35-9.172,36.669-13.885
+		c9.401-3.598,18.926-7.095,27.413-11.037c2.845-1.321,5.979-3.048,9.256-2.848c-0.851,2.173-3.551,2.123-5.34,2.848
+		c-1.903,0.771-3.853,1.685-5.696,2.492c-3.804,1.668-7.806,3.248-11.392,4.984c-16.662,6.127-33.339,12.478-48.774,18.869
+		c4.85,0.188,9.893,0.995,13.885,0.355c2.669-0.427,5.269-2.107,7.833-3.204c7.399-3.163,14.421-6.544,21.717-9.256
+		c4.7-5.112,13.723-5.651,19.937-9.969c4.052-0.361,8.447-3.404,13.173-4.272c1.067-0.504,1.884-2.658,3.56-1.424
+		c-0.829,2.758-4.213,3.381-6.408,4.272c-9.091,3.69-18.043,7.581-26.701,11.393c-7.303,3.215-15.949,6.728-22.785,9.968
+		c-1.253,0.595-2.63,1.125-3.56,2.137c7.875,1.816,14.616-3.331,20.293-6.053c14.995-5.509,28.164-12.318,42.01-18.156
+		c1.002-0.236,3.199-1.674,3.56-0.356c-1.464,1.729-3.786,2.637-6.052,3.561c-6.952,2.831-14.812,5.454-19.937,8.9
+		c-2.105,0.361-4.595,1.437-7.121,2.492c-2.395,1.001-4.975,2.166-6.764,3.56c-0.593,0-1.187,0-1.78,0
+		c-1.66,1.401-3.846,2.242-6.052,3.204c-2.189,0.956-4.776,1.618-6.408,3.204c1.958,0.178,4.665-0.393,6.052,0.356
+		c4.86-2.456,12.004-5.801,16.733-7.832c1.917-0.824,3.801-1.681,5.696-2.492c7.91-3.388,14.99-7.213,22.073-9.969
+		c1.983-0.771,4.364-1.369,6.052-2.136c1.514-0.688,3.387-3.253,5.34-1.425c-3.652,2.878-8.477,3.926-12.816,5.696
+		c-4.385,1.789-8.595,4.027-12.817,6.053c-4.208,2.019-8.617,3.808-12.816,5.696c-3.256,1.464-6.737,2.797-9.612,4.272
+		c-0.67,0.344-2.663,0.833-2.136,2.136c2.623-0.343,6.468-0.21,8.9,0c5.202-3.454,14.46-4.992,19.225-9.969
+		c0.421,0.41,1.259,0.403,2.136,0.356c7.004-3.427,14.477-7.426,21.717-10.681c2.348-1.056,4.934-2.436,7.476-2.492
+		c-0.415,1.785-2.446,2.479-3.916,3.204c-1.535,0.758-3.416,1.601-5.34,1.78c-10.756,6.166-24.458,11.318-36.313,17.444
+		c1.094,1.424,5.2-0.486,6.764,0.356c3.246-3.117,7.944-3.84,12.104-5.696c8.4-3.747,17-7.734,25.277-11.393
+		c1.118-0.402,0.94,0.103,1.78-0.355c2.546-1.137,5.834-3.419,8.544-3.205c-2.467,3.18-6.691,4.212-10.324,5.696
+		c-7.13,2.914-14.596,5.911-22.073,9.257c-3.686,1.649-7.75,2.961-10.68,5.34c2.127,0.9,6.58-0.063,8.188,0.356
+		c2.099-1.685,4.65-2.801,7.121-3.916c2.824-1.276,7.396-2.895,8.9-3.561c7.87-3.482,16.194-7.729,24.209-10.681
+		c1.084-0.398,2.21-1.98,3.56-0.712c-2.588,2.447-6.189,3.501-9.612,4.984c-6.911,2.997-13.716,6.368-20.292,9.257
+		c-3.338,1.466-7.262,2.12-9.612,4.628c2.879,0.284,5.414-0.507,7.476,0c11.136-5.937,25.494-11.048,35.602-16.377
+		c1.126-0.594,3.539-2.604,4.628-0.712c-9.602,5.651-21.571,10.304-32.041,14.597c-1.073,0.44-3.634,0.75-3.56,2.492
+		c2.849-0.917,5.706,0.432,8.9,0c1.838-0.248,1.997-0.852,3.204-1.424c3.621-1.718,8.516-3.777,12.461-5.696
+		c2.438-1.186,4.95-2.095,7.477-3.204c2.438-1.071,4.82-2.653,7.12-3.561c1.187-0.468,2.61-0.541,3.916-1.068
+		c0.775-0.312,1.916-2.261,2.849-0.712c-0.187,1.716-2.128,1.988-3.204,2.492c-5.647,2.644-10.993,4.386-16.377,6.765
+		c-4.021,1.776-8.115,3.964-11.749,6.052c1.957,0.518,5.258,0.398,8.188,0c0.782-0.404,1.183-1.19,2.137-1.424
+		c3.577-1.14,6.082-2.18,9.256-3.56c2.509-1.092,5.145-2.118,7.477-3.204c4.953-2.309,9.365-5.804,13.885-6.053
+		c-3.371,3.85-9.046,5.317-13.885,7.477c-5.117,2.282-10.362,4.22-14.953,6.764c5.414,1.323,8.828-0.658,12.461-2.136
+		c5.2-2.115,11.578-5.254,15.665-6.765c3.25-1.201,6.541-4.009,8.544-2.492c-3.396,2.734-8.104,4.352-12.461,6.053
+		c-4.501,1.757-9.105,3.204-12.816,5.696c2.255,0,4.51,0,6.765,0c6.034-2.897,12.673-5.79,18.869-8.544
+		c1.854-0.825,4.881-2.499,6.408-1.425c-1.018,1.44-3.015,2.163-4.629,2.849c-3.749,1.592-7.637,2.763-11.036,4.271
+		c-1.724,0.766-3.783,1.494-4.984,2.849c6.249,1.722,9.542-1.001,12.816-2.492c2.949-1.343,6.284-1.92,9.257-3.204
+		c3.279-1.417,6.373-3.854,9.969-3.916c-2.041,2.49-5.786,3.595-8.9,4.984c-1.657,0.739-3.405,1.468-4.984,2.136
+		c-1.67,0.706-3.692,0.887-4.629,2.492c1.225,0.298,2.493,0.599,4.272,0.356c1.377-0.188,1.584-1.115,3.204-1.78
+		c0.567-0.233,2.439-0.385,3.204-0.712c3.409-1.462,7.34-3.146,10.681-4.629c2.014-0.894,4.229-3.585,6.408-1.779
+		c-5.208,4.312-12.48,5.358-17.801,8.9c3.143,0.444,7.723,0.355,12.104,0.355c1.089-0.659-1.569-0.533-1.068-1.78
+		c2.231-1.28,4.913-2.17,7.477-3.204c2.492-1.005,4.957-2.762,7.477-2.492c-0.222,2.417-3.883,2.537-6.408,3.561
+		c-1.179,0.478-2.465,1.254-3.561,1.78c-1.072,0.516-2.979,0.42-2.492,2.136c6.519,0.592,9.768-1.162,13.529-2.848
+		c2.162-0.97,4.506-3.393,7.12-1.78c-2.527,1.863-6.314,2.468-8.9,4.272c5.225,1.649,8.006-0.367,11.393-1.78
+		c1.913-0.799,4.304-2.282,6.052-1.068c-1.234,1.851-4.803,1.368-6.052,3.204c3.167-0.2,5.306,0.627,8.544,0.356
+		c2.728-1.058,4.091-2.944,7.12-2.137c0.281,1.468-1.704,0.669-1.424,2.137c5.562-0.863,11.552,0.398,18.513,0
+		c-0.203-1.518-2.302-1.228-3.204-1.425c-9.151-1.993-17.502-3.979-25.989-4.983c-1.53-1.135-4.273-1.348-6.764-1.78
+		c-2.228-0.387-5.623,0.033-5.696-2.137c1.62-1.385,3.907-0.389,5.696,0c5.07,1.104,10.472,2.996,16.021,3.561
+		c0.211-1.136-0.668-1.102,0-1.78c3.514-1.523,5.492-2.701,9.612-3.204c1.655-1.692,4.165-1.973,6.408-2.848
+		c3.024-1.18,6.841-2.812,9.257-3.916c4.779-2.186,9.872-3.429,13.884-6.053c2.591-0.554,5.505-1.959,8.188-3.204
+		c2.391-1.108,5.715-3.979,7.121-1.424c-6.525,2.731-13.022,5.49-19.226,8.544c-10.326,3.463-20.655,8.569-30.261,12.104
+		c-1.308,0.481-3.62,0.473-4.272,2.137c2.139,0.952,4.473,0.621,6.765,1.067c6.654,1.297,13.024,3.757,18.868,3.916
+		c1.657,2.268,4.685,1.094,7.477,1.068c7.928-0.072,17.848,0.791,26.701,0.356c0.915-0.035,0.509-1.39,1.424-1.425
+		c2.176-0.356,3.939-1.969,5.696-2.848c0.502-0.251,0.61,0.286,1.424,0c1.089-0.383,2.928-3.169,3.917-0.356
+		c-2.913,1.728-6.937,2.554-8.9,4.272c3.728,1.061,6.139,0.05,9.968,0.712c5.105-2.993,9.362-4.641,15.309-6.764
+		c0.727-0.461,0.9-1.474,1.78-1.78c1.882-0.442,3.481-1.659,5.341-2.492c1.755-0.787,4.374-0.969,5.34-2.849
+		c-4.871-2.201-7.902-0.243-12.104,1.425c-4.264,1.691-8.173,3.46-11.749,4.983c-1.683,0.718-4.213,2.41-5.695,0.713
+		c5.26-2.265,12.159-5.505,17.088-7.477c0.784-0.313,2.554,0.463,2.492-1.068c-4.692-3.133-7.776-0.754-12.46,1.068
+		c-5.066,1.971-9.605,4-14.241,6.052c-2.085,0.923-4.76,3.168-6.764,1.425c8.754-3.943,17.63-7.767,26.701-11.393
+		c0.139-0.858,0.16-2.911,0-3.917c-8.857,2.196-16.237,6.842-23.854,9.969c-2.555,1.049-5.552,2.608-8.544,2.137
+		c2.255-2.136,6.332-2.449,8.544-4.629c7.848-1.89,15.608-6.935,23.854-9.612c0.494-1.128,0.494-3.144,0-4.272
+		c-1.009-1.068-3.027,0.959-3.204-1.067c0.778-0.883,2.579-0.743,3.204-1.78c-0.164-1.735,0.372-4.17-0.356-5.34
+		c-6.786,2.506-13.41,5.512-19.581,8.188c-2.055,0.892-4.308,2.601-6.764,1.78c3.841-2.767,8.721-4.104,13.172-6.052
+		c4.594-2.011,9.128-4.043,13.529-6.053c-0.329-2.107,0.789-3.449,0-4.984c-5.297,2.014-10.457,4.545-15.665,6.765
+		c-5.169,2.202-9.993,5.57-15.665,6.052c1.584-2.298,4.787-2.597,7.833-3.916c2.437-1.055,4.95-2.736,7.832-3.916
+		c2.521-1.031,5.002-1.998,8.188-3.56c2.658-1.304,9.406-2.654,7.12-6.409c-10.188,3.602-21.302,9.383-30.974,13.173
+		c-0.89,0.349-3.618,2.083-4.271,0c1.984-0.863,4.1-1.597,5.696-2.848c0.593,0,1.187,0,1.779,0
+		c6.795-3.349,14.622-6.524,21.361-9.257c2.421-0.981,5.053-1.65,6.765-3.56c0.625-0.308-0.492-1.854-0.713-2.492
+		c-13.322,4.359-24.296,11.067-37.737,15.309c-0.588,0.005-0.199,0.987-0.712,1.067c-8.751,3.592-17.404,7.279-25.633,11.393
+		c-3.916,1.164-7.902,3.446-11.393,4.984c-4.049,1.784-8.036,3.201-12.104,4.984c-1.458,0.639-3.071,1.442-4.628,2.136
+		c-1.141,0.508-3.658,2.297-4.629,0.356C362.536,622.222,364.903,622.883,365.759,622.514z M265.007,542.411
+		c0.522,0.77,2.283,0.977,2.492-0.355c-2.797,0.311-4.695-0.548-7.12-1.425C259.656,542.486,263.19,543.018,265.007,542.411z
+		 M210.893,545.971c0.217,1.36,0.697,2.345,0.712,3.56c0.054,4.406-3.706,7.115-5.34,10.325
+		c10.272,1.981,12.976-13.502,7.476-18.513C214.167,543.573,211.814,544.139,210.893,545.971z M276.756,542.767
+		c-2.695,0.235-5.868-1.325-7.477,0.712c4.285,0.516,7.754,0.103,10.681-0.712c1.31-0.365,3.13,0.476,3.204-1.424
+		C281.101,541.184,279.09,542.563,276.756,542.767z M106.936,547.395c0.177,0.562,1.151-0.354,0.712,0.712
+		c-0.852,5.676-1.863,13.158,0.712,18.869c0.239-7.851-0.457-14.521-0.356-22.429c-0.816-0.134-0.475-1.425-1.068-1.78
+		C107.169,544.306,106.614,546.372,106.936,547.395z M205.908,543.479c0.681,2.518,3.801,3.705,2.492,7.12
+		c0.854-0.141-0.197,1.622,1.068,1.068c0.761-3.046-0.566-5.697-1.424-8.9C206.925,542.596,206.653,543.274,205.908,543.479z
+		 M41.429,547.751c1.546,0.804,4.554,0.389,4.272-1.78C43.597,546.59,42.286,546.428,41.429,547.751z M185.972,552.735
+		c0.825,3.938,2.575,5.388,1.78,10.325c6.316-0.923,9.544-4.935,16.021-5.696c2.867-1.353,4.35-6.852,2.492-10.681
+		C198.77,544.708,192.82,550.809,185.972,552.735z M261.803,549.531c1.287-1.1-0.096,2.18,0.356,3.561
+		c3.342,2.473,5.869,5.761,7.832,9.612c-2.673,4.188-4.646,6.16-4.272,13.885c3.648,2.396,6.223,0.355,11.749,0.712
+		c0.38-1.33-0.885-1.015-0.712-2.136c0.537-1.124,2.334-0.988,2.491-2.492c-1.885-0.606-3.554-1.431-4.271-3.204
+		c1.305-2.019,4.778-1.867,5.696-4.272c-1.732-1.938-4.066-1.62-6.408-2.848c0.671-2.177,3.624-2.072,4.628-3.917
+		c0.635-0.543-1.042-1.786-1.068-2.848c-1.198-0.226-3.307,0.459-3.916-0.356c-0.096-1.638,1.493-1.592,1.78-2.848
+		c0.059-1.008-2.194,0.296-2.136-0.712c-0.078-2.215,1.701-2.571,2.136-4.272c-3.457-0.168-10.206-0.771-13.173-0.356
+		C262.455,547.838,261.338,549.384,261.803,549.531z M11.168,550.244c0.519-0.905,1.86-0.989,2.848-1.425
+		c0.031-1.691-2.424-0.898-3.204-1.78c-0.205,0.745-0.882,1.017-0.712,2.137c0.56,0.034,1.234-0.048,1.068,0.712
+		C10.97,549.886,10.764,550.175,11.168,550.244z M37.157,547.395c-0.077,0.006-0.423,0.667-0.712,0.712
+		c-0.737,0.114-1.686-0.204-2.492,0c-1.026,0.26-1.827,1.376-2.848,1.78c-5.499,2.174-12.764,1.832-16.733,4.628
+		c8.743,2.856,17.397-1.828,25.277-3.204c0.428-1.114,0.711-2.374,1.068-3.56C39.452,548.544,38.338,547.306,37.157,547.395z
+		 M148.59,551.311c2.773,1.635,8.212,3.538,12.104,3.204c2.535-0.217,7.061-0.48,6.765-3.56c-2.087-0.621-4.459,0.929-7.121,1.067
+		c-0.736,0.039-1.391-0.637-2.136-0.712c-2.972-0.298-6.118-0.04-8.188-1.424c0.148-1.217-0.107-2.028-1.424-1.78
+		C148.59,549.175,148.59,550.244,148.59,551.311z M10.456,550.599c0.058,1.1-0.841,2.013,0,2.849
+		c3.234-0.778,7.27-2.508,11.037-2.849c2.124-0.192,3.584-0.085,4.272-1.424c-3.718,0.158-6.742-0.378-9.968-0.712
+		C16.202,550.479,12.313,552.012,10.456,550.599z M253.614,562.348c0.49-0.459,0.353-1.547,0.356-2.492
+		c-3.559-7.824-10.699-9.926-19.225-10.681c-0.7-0.106-0.706,0.48-1.068,0.712c-1.974-1.268-6.549,0.083-8.544,1.068
+		c9.343,1.164,23.395-0.113,24.921,9.968c-0.26,1.401-1.948,1.375-2.492,2.492c0.933,0.126,1.808,1.115,2.848,1.424
+		c1.215,0.361,4.162,0.639,4.628-0.355C256.056,563.671,253.586,563.349,253.614,562.348z M25.053,558.076
+		c-5.769-1.568-9.751,1.211-14.597,2.492c-0.588,1.184,0.348,2.014,0.356,3.56c5.494-0.861,12.57-2.404,17.801-4.628
+		c-1.286-0.138-2.375-0.473-3.204-1.068c1.553-2.052,3.632,0.135,5.696,0.356c3.719,0.399,6.04-1.496,8.9-2.136
+		c1.959-0.438,4.792,0.395,5.696-1.78c-1.358-0.066-3.054,0.205-3.204-1.068c-0.194-2.33,3.8-0.472,3.916-2.492
+		c-5.945,0.251-12.988,4.557-20.293,4.272C26.29,556.939,25.97,557.806,25.053,558.076z M179.919,553.448
+		c-0.005,0.707-0.972,0.452-0.712,1.424c2.929,3.943,1.899,9.256,0,13.173c5.607-2.297,4.184-10.755,1.78-14.597
+		C180.631,553.448,180.275,553.448,179.919,553.448z M152.506,555.583c-0.357-0.001-0.424,0.288-0.712,0.355
+		c0.464,1.12-0.043,2.432,0.356,3.917c0.35,1.299,1.972,4.054,2.136,4.628c0.078,0.272-0.449,0.548-0.356,0.712
+		c2.129,3.751,6.481,4.263,10.681,5.696c4.17-1.288,9.459-1.459,12.816-3.561c1.727-2.802,3.136-10.087-0.356-12.104
+		c-1.756,1.305,1.375,4.484-1.424,5.341c-0.462-0.601-0.029-2.363-0.712-3.561c-2.06,0.808-1.286,5.217-3.204,4.984
+		c-1.637-0.198,0.638-2.188,0.356-3.916c-2.343-0.724-1.85,4.265-4.984,3.916c-0.735-2.396,1.687-1.636,1.424-3.561
+		c-2.014,0.479-1.952,3.033-4.628,2.849c0.001-0.357-0.288-0.424-0.356-0.712c0.279-2.165,3.979-2.571,2.848-4.984
+		C160.926,556.748,156.514,556.432,152.506,555.583z M10.812,558.076c1.933,0.153,2.89-0.67,3.916-1.424
+		c-1.48-0.656-2.224-0.568-4.272-1.068C9.688,556.346,10.274,557.573,10.812,558.076z M48.194,556.295
+		c0.964,0.861,1.266,0.32,2.848,0.712C51.754,555.13,48.343,555.142,48.194,556.295z M430.198,558.788
+		c2.1,1.062,4.496-1.111,3.56-3.204C431.284,555.364,430.237,556.572,430.198,558.788z M46.414,559.856
+		c-1.483-0.534-1.746-2.289-3.56-2.492c-1.255,1.712-5.436,0.497-6.408,2.492c5.347,0.354,9.177,2.025,13.884,2.136
+		C50.822,559.482,48.475,559.812,46.414,559.856z M304.881,566.264c3.008,1.027,7.102,0.967,8.188,3.916
+		c1.302-0.234,1.365,0.771,2.492,0.712c1.495,2.302,4.054,3.54,5.695,5.696c-1.033,0.071-0.923,0.555-2.491,0.712
+		c-1.088-0.35-2.608-2.121-3.561-1.424c0.724,0.26,1.454,1.071,0.712,1.78c-0.899-0.525-1.59-1.258-2.848-1.425
+		c0.1,0.812-0.086,1.339-0.713,1.425c-1.392-1.246-3.055-2.1-4.983-1.068c-0.956-0.236-1.893-1.563-2.849-0.712
+		c-0.809,0.38,1.022,1.08,0.712,2.136c-1.261-0.192-0.875,1.261-2.136,1.068c-2.168-1.438-4.272-0.733-6.408-2.136
+		c-1.648,0.807-4.662-0.078-5.34-1.425c-1.766-0.039-1.75,0.35-3.205,0c0.08,0.674-0.4,0.786-0.355,1.425
+		c1.96,1.125,4.335,1.836,7.12,2.136c8.813,5.874,19.961,2.216,29.905,0c0.075,0.399,0.396,0.554,0.712,0.712
+		c-0.1,0.535-1.53,1.499-0.712,1.78c5.974-2.527,10.829-4.794,15.665-8.9c-7.637-2.807-14.427-6.46-22.43-8.9
+		c0.063,1.724-1.824,1.498-3.56,1.424c-0.086,1.746,2.535,0.727,2.492,0.712c0.189,0.063,0.23,1.015,0.355,1.068
+		c0.535,0.229,1.556-0.189,2.137,0c0.671,0.219,1.535,1.304,2.492,1.78c3.63,1.807,6.501,3.132,9.612,4.983
+		c1.616-0.308,3.042-0.771,3.56,1.068c-1.939,1.415-4.035,0.58-5.34,0c-0.74-0.329-1.92,0.086-2.136,0
+		c-0.775-0.308-1.835-1.23-2.849-1.78c-1.996-1.082-4.412-1.808-6.408-2.848c-2.03-1.059-2.996-2.09-4.272-2.849
+		c-2.216,0.08-3.588-0.684-4.271-2.136c1.117-0.402,0.94,0.103,1.779-0.356c-0.389-1.576,0.604-1.77,0.712-2.848
+		c-0.673-0.632-2.351-0.26-3.56-0.356c0.175-0.49,1.963-2.11,1.068-1.424C308.057,562.083,305.367,563.071,304.881,566.264z
+		 M10.456,566.976c-0.279,1.822,0.5,2.586,0.356,4.272c3.189,0.222,4.707-1.228,6.764-2.137c0.421,0.41,1.259,0.403,2.136,0.356
+		c7.087-2.77,16.337-3.364,22.073-7.12C31.073,558.123,20.198,564.116,10.456,566.976z M377.864,561.28
+		c-0.208,2.229-1.534,4.412-0.356,6.052c3.77,0.352,10.082-1.465,8.544-6.408C384.586,560.888,379.895,560.695,377.864,561.28z
+		 M455.831,562.704c1.134,0.874,2.771-0.127,3.561-0.712c-0.061-0.533,0.127-1.314-0.356-1.424
+		C458.395,561.707,456.51,561.603,455.831,562.704z M357.927,567.688c-0.019-1.714-1.629-4.727-2.492-6.765
+		C355.397,562.694,355.125,567.588,357.927,567.688z M350.807,564.484c-1.468-0.558-2.993-2.93-4.628-2.136
+		C347.727,562.78,348.837,566.767,350.807,564.484z M353.299,565.908c0.694-0.873,0.355-2.992-0.356-3.56
+		C352.239,563.229,352.861,565.066,353.299,565.908z M43.209,564.127c-10.13,3.99-22.049,5.852-32.753,9.969
+		c-0.758,0.729,0.862,2.727,0,3.561c1.846,1.119,3.283-0.31,4.984-0.712c9.451-2.24,19.011-4.888,28.125-7.833
+		c0.671-0.553-0.511-1.387,0.356-2.136c1.332-1.279,5.352,0.13,6.408-1.424c-1.319-0.646-4.617,0.601-5.696-1.068
+		c0.643-1.187,2.187,0.371,2.492-1.424c-1.381-0.696-2.219,0.151-3.916-0.356C43.209,563.178,43.209,563.653,43.209,564.127z
+		 M141.47,564.839c-0.881-0.689-2.787-1.756-3.916-1.067c-0.588,0.006-0.199,0.987-0.712,1.067
+		c0.029,9.69-1.092,19.094-1.424,28.481c-0.596,0.629-1.193-0.316-2.492,0c-0.281,0.787-1.245,0.892-1.78,1.424
+		c-3.542,0.396-6.632,2.018-9.612,3.204c-3.118,1.242-6.305,1.949-8.9,3.917c11.753,2.03,28.036,6.697,41.654,8.544
+		c1.806,0.245,5.073,1.215,6.764,1.068c0.604-0.053,1.448-0.891,2.848-1.424c0.765-0.292,1.904-0.079,2.492-0.356
+		c0.692-0.326,1.022-1.138,1.78-1.424c3.696-1.396,6.003-1.236,8.188-3.204c0.267-1.217-1.447-0.452-1.068-1.78
+		c0.475,0,0.949,0,1.424,0c-0.36-10.112,0.33-19.161,0.356-30.617c0.846-0.728,1.657,0.737,1.78-0.712
+		c-1.571-3.165-7.131-0.486-10.68,0.355c-1.302,0.234-1.366-0.771-2.492-0.712c-5.074,2.749-10.368-1.96-13.172-4.984
+		c-0.919-0.91-0.259-1.556-1.068-2.848C148.248,564.26,145.597,565.288,141.47,564.839z M179.207,570.18
+		c0.002,1.304,2.089,0.522,1.78,2.136c-0.898,11.122-0.753,22.526-0.356,33.466c3.241-0.857,7.248-1.96,10.324-3.916
+		c7.458-1.442,15.466-5.142,23.497-7.477c1.791-0.521,3.854-0.503,5.34-1.78c4.143-0.547,8.964-3.011,13.885-3.916
+		c1.225-2.335,4.825-2.295,7.12-3.561c0.009-2.266,0.197-2.156,0.712-3.916c-1.973-0.832-2.131-2.774-4.628-1.424
+		c-0.39-1.101,0.016-1.91-1.424-2.492c-2.806,0.593-5.111,1.946-7.832,2.848c-1.02,0.339-2.431,0.36-3.56,0.713
+		c-2.543,0.793-3.898,1.414-5.696,2.136c-2.792,1.121-6.054,2.015-9.613,3.204c-1.356,0.453-2.969,0.523-4.272,1.068
+		c-1.288,0.538-2.249,1.656-3.56,2.136c-1.688,0.617-3.465,0.407-4.984,1.424c-1.909-7.844,0.137-17.614-1.068-27.413
+		C188.629,565.434,184.326,567.363,179.207,570.18z M477.192,566.264c-1.321-0.337-2.529-1.175-3.917-1.425
+		c-3.098-0.559-6.798-0.855-9.968-0.355c0,0.355,0,0.712,0,1.068c8.276,1.224,16.162,4.715,24.921,4.271
+		C485.914,566.947,481.188,567.281,477.192,566.264z M249.698,566.62c1.429,0.64,2.121,1.633,3.561,1.78
+		c1.381,0.142,3.617-0.25,4.628-1.068c-0.946-1.893-3.746-0.445-6.052-0.712c-2.195-0.253-3.523-0.996-4.628-2.136
+		c-0.356,0-0.712,0-1.068,0C245.45,566.733,248.24,565.967,249.698,566.62z M245.426,570.892c-0.937,0.867-1.199,0.201-2.136,1.068
+		c-0.234,1.302,0.771,1.365,0.712,2.492c-1.175,0.604-1.698,1.861-1.78,3.56c1.978,2.187,6.415,3.81,8.9,2.492
+		c0.512-3.262,4.04-7.26,4.629-10.324c-4.757-0.55-7.093-2.071-10.681-3.204C243.749,568.672,245.139,569.135,245.426,570.892z
+		 M47.481,568.756c-3.542,2.717-7.572,3.095-12.104,4.271c-2.664,0.692-5.075,2.035-7.476,2.492c-3.707,0.706-6.589,1.21-8.9,3.204
+		c-1.643-1.015-5.726,1.283-8.188,1.78c-0.785,1.47,0.01,2.921,0.356,4.272c1.045-0.143,1.206-1.168,2.136-1.424
+		c8.18-1.568,16.947-4.095,24.565-6.408c2.368-0.72,4.786-1.549,6.052-0.713c0.103,2.002-2.442,1.355-3.916,1.78
+		c-7.358,2.942-16.814,3.695-23.141,6.765c-2.189-0.531-3.692,1.029-6.052,0.712c0.319,4.226-0.687,7.995,0.356,11.036
+		c1.914-1.061,3.291-0.904,4.984-2.492c0.708,0.005,0.453,0.972,1.424,0.712c3.906-1.834,7.836-1.812,11.037-3.916
+		c-1.118,0.169-1.455-0.443-1.78-1.067c1.537-1.504,1.742-2.15,1.78-4.984c3.255-0.898,6.09-2.217,8.544-3.916
+		c0.593,0,1.187,0,1.78,0c2.26-2.171,6.995-2.26,9.968-3.916c-2.892-0.194-2.272-3.899-3.56-5.696
+		c0.905-1.231,3.573-0.699,4.984-1.425C49.468,569.38,48.601,568.943,47.481,568.756z M479.328,574.096
+		c-4.7-0.575-10.521-2.059-13.885-3.204c-0.316,0.633-0.994,0.905-0.712,2.136c7.364,1.384,14.467,2.824,21.361,3.204
+		C485.583,573.213,481.614,574.375,479.328,574.096z M220.861,579.081c3.2-0.472,4.464,0.433,6.409-1.424
+		c1.71,1.104,3.48-0.782,4.628-1.425c2.641-0.619,5.908-0.353,6.052-2.492C232.213,574.057,225.856,576.836,220.861,579.081z
+		 M347.958,575.52c-0.747,3.831,5.22,1.976,7.833,0.712C353.275,575.487,350.201,575.561,347.958,575.52z M110.496,579.792
+		c-0.5,0.519-4.027,2.119-4.272,2.136c-1.276,0.091-1.79-0.819-2.136-0.712c-1.821,0.568-3.279,4.601-5.696,2.137
+		c-0.8,1.099-1.749,2.048-2.848,2.848c-0.741,0.779-1.151-0.312-1.78,0.356c-1.869,2.759-5.535,3.722-8.188,5.696
+		c-6.561-0.223-12.237,4.511-18.513,5.695c-0.259-0.971,0.708-0.716,0.712-1.424c-1.275,0.03-2.057,0.554-3.204,0.712
+		c-11.077-1.739-23.43-4.699-34.89-6.052c0.74,1.335,0.007,2.368-1.068,2.848c-6.251,0.512-11.669,2.761-17.801,4.629
+		c0.346,1.627-0.242,1.976,0.356,3.204c1.443-0.575,3.494-0.542,4.272-1.78c3.987-0.209,5.945-1.505,9.256-2.492
+		c2.537-0.756,5.224-1.11,7.476-1.78c1.746-0.52,3.909-2.601,5.696-1.068c-8.082,3.548-17.62,5.64-26.345,8.545
+		c-0.78,1.264-0.796,3.101-0.356,3.916c1.538,0.231,1.996-0.615,2.848-1.068c1.382,0.371,2.895-0.269,4.272-0.712
+		c4.325-1.393,8.477-2.878,13.172-4.271c4.236-1.259,8.765-3.363,12.816-4.272c1.182-0.266,3.576-1.339,4.272,0.355
+		c-13.106,3.85-24.44,7.767-37.738,11.749c0.228,1.723-0.47,2.518,0,3.56c5.281-1.69,10.252-3.077,14.953-4.628
+		c3.766-1.242,8.578-2.655,11.393-3.916c3.941-0.834,8.135-2.239,11.393-3.204c0.878-0.26,1.431-0.855,2.136-1.068
+		c0.41-0.123,0.513,0.511,1.068,0.356c0.181-0.051,0.365-0.624,0.712-0.712c0.917-0.234,2.046-0.125,2.848-0.356
+		c1.25-0.361,3.021-2.215,4.272-0.712c-1.734,1.814-4.571,1.825-6.764,2.492c-5.1,1.552-10.575,3.574-14.953,4.984
+		c-1.966,0.633-4.125,0.868-6.052,1.424c-7.003,2.021-14.329,4.858-21.005,7.12c0.042,1.025-0.194,2.331,0.356,2.849
+		c1.087,0.646,2.642-0.771,3.917-1.068c23.228-7.147,47.075-15.413,69.067-21.717c0.781-0.643,1.459-1.389,2.492-1.78
+		c1.417,0.26,1.431,0.26,2.848,0c6.252-2.258,13.436-5.099,20.649-7.12c2.78-0.779,8.547-0.761,8.9-4.272
+		c-2.663,0.238-5.191,2.332-7.476,1.78c-0.393-1.508,1.642-2.858,0.712-4.984C110.599,577.495,110.878,579.396,110.496,579.792z
+		 M484.668,581.573c-6.05-1.053-11.99-3.873-19.58-3.561c-0.357-0.001-0.424,0.288-0.713,0.356
+		c-0.621,0.327-0.785,1.112-0.712,2.136c1.124,0.175,1.258-0.642,2.492-0.356c4.658,2.281,11.855,2.419,17.445,3.561
+		c1.73,0.354,3.471,2.021,4.984,0.356c-0.039-0.886-0.668-1.103,0-1.78C487.371,581.319,485.979,581.8,484.668,581.573z
+		 M48.194,579.792c-0.696,0.227-1.891,0.856-2.492,1.068c-1.331,0.468-2.37,0.698-3.56,1.067c-2.56,0.795-5.839,1.411-6.765,3.917
+		c7.913,1.266,18.815,4.193,27.057,4.628c-0.708-2.916,5.329-1.335,4.984-4.984c-2.67-3.285-4.947,0.526-6.764,2.136
+		c-0.513-0.199-0.869-0.555-1.068-1.067c0.459-1.797,2.425-2.085,2.848-3.917c-1.632,0.47-1.474,0.612-3.204,0.713
+		c-0.112-0.481-0.507-0.681-0.356-1.425c-1.342-0.273-1.702,0.435-2.848,0.356c-0.668-0.679,0.211-0.645,0-1.78
+		c-0.885,0.039-1.102,0.667-1.78,0c0.41-0.421,0.403-1.258,0.356-2.136C52.273,579.12,50.356,579.087,48.194,579.792z
+		 M244.002,581.928c-1.316,3.26-2.425,6.327-2.492,9.612c1.587,0.17,2.593-1.444,3.204-2.492c0.954-1.632,1.499-4.458,2.136-6.408
+		C245.228,583.076,245.453,581.664,244.002,581.928z M464.731,583.353c-0.016-0.49,0.168-0.782,0.356-1.068
+		c-0.421-0.41-1.259-0.403-2.137-0.356C462.996,582.952,463.396,583.619,464.731,583.353z M305.593,584.42
+		c-2.568,0.245-3.928-0.499-6.408-1.067C299.559,585.893,304.937,584.976,305.593,584.42z M470.784,585.132
+		c4.596-0.769,8.816,1.52,13.884,1.425c0.604,0.634,2.944,1.928,3.561,0.355c-5.617-1.623-13.636-2.74-19.581-2.848
+		C469.558,584.223,470.284,584.564,470.784,585.132z M79.523,586.201c0.721,0.373,3.131-0.026,2.848-1.78
+		c-0.455-0.02-0.493-0.456-1.068-0.355C81.198,585.264,79.725,585.097,79.523,586.201z M117.973,584.777
+		c-19.405,6.469-39.956,12.714-59.099,18.868c-6.628,2.132-13.367,3.871-19.581,6.765c-9.4,1.76-19.095,6.298-28.837,8.9
+		c0.299,0.888,0.466,1.907,0.356,3.204c29.33-8.523,58.459-18.7,86.156-27.413c7.398-2.327,14.76-4.455,22.073-6.765
+		c1.855-0.585,5.734-0.756,5.696-3.916c-0.481-0.111-0.68-0.507-1.424-0.355C121.52,584.699,120.185,585.414,117.973,584.777z
+		 M463.663,585.132c-0.075-0.43-0.395-0.219-0.712,0c0.077,10.43-0.107,22.401,0,31.686c2.495,1.785,5.743,1.381,8.9,1.78
+		c5.509,0.696,11.055,2.39,16.021,3.204c0.03-10.3-0.181-22.721,0.356-31.329C481.113,587.437,472.112,587.944,463.663,585.132z
+		 M116.905,590.829c-5.349,0.855-10.532,2.651-15.665,4.272c-3.156,0.996-7.019,2.178-9.612,3.204
+		c-2.041,0.808-3.992,1.056-6.408,1.78c-2.974,0.892-5.909,2.173-8.9,3.204c-3.877,1.336-8.089,2.764-11.393,3.916
+		c-11.912,4.155-23.333,7.288-34.889,10.681c-6.352,1.864-12.478,4.638-19.225,5.34c0.131,1.412-0.326,3.412,0.356,4.272
+		c1.905,0.261,3.635-1.201,5.34-1.78c15.482-5.254,32.113-9.864,47.35-14.952c3.125-1.044,6.153-2.23,9.256-3.204
+		c6.387-2.006,12.688-3.945,18.513-6.765c2.954,0.369,5.175-1.625,7.833-2.492c2.337-0.763,4.67-1.322,7.12-2.136
+		c6.102-2.027,14.229-3.972,19.937-6.765c0.655-0.32,1.812,0.091,1.424-1.068C123.779,588.247,119.716,588.719,116.905,590.829z
+		 M64.926,591.541c1.433,0.396,5.521-1.295,5.34-2.492C68.388,589.781,65.518,589.522,64.926,591.541z M177.427,606.849
+		c0.826,0.114,1.367-0.057,1.78-0.355c0.1-0.812-0.085-1.338-0.712-1.424C178.385,605.909,177.259,605.732,177.427,606.849z
+		 M465.088,631.059c0.358,0.004,0.447,0.624,0,0.712c-3.121,1.195-6.122,2.956-9.257,4.271c-0.949,0.398-2.416,0.101-2.848,1.425
+		c2.761,0.799,6.979,0.142,10.324,0.355c-0.053-0.883-0.066-1.728,0.712-1.78c1.167-0.02,1.36-1.012,2.848-0.712
+		c2.536-1.652,5.546-2.94,8.545-4.271c1.707-0.759,3.83-1.84,4.984-2.137c0.771-0.198,2.732-1.431,2.848,0.712
+		c-4.184,1.304-8.149,3.703-12.104,5.341c-1.764,0.729-3.911,0.74-4.984,2.492c2.584,0.963,7.05,0.281,9.612,0.712
+		c2.812-4.19,10.271-3.733,13.173-7.833c-1.04-0.384-1.153-1.694-1.068-3.204c-2.055-0.496-4.065,3.065-4.984,0.356
+		c0.771-1.009,2.847-0.714,3.205-2.136C477.081,622.957,472.352,629.503,465.088,631.059z M478.26,638.179
+		c4.027-0.285,7.223,0.799,9.969-0.712c-0.407-2.042,1.003-3.868-0.712-4.272C485.205,635.63,480.462,635.634,478.26,638.179z
+		 M178.495,640.671c-2.164,0-4.746-0.585-5.696,0.712c3.868,0.066,9.63,1.228,13.173,0c0.019-0.612-0.274-0.913-0.712-1.068
+		C183.808,640.962,180.878,640.671,178.495,640.671z M187.396,640.671c-0.075-0.431-0.395-0.22-0.712,0
+		c-0.277,0.078-0.414,0.298-0.356,0.712c0.533,1.524,1.833,0.332,2.848,0.355c7.995,0.185,19.663-0.137,27.057,0
+		c1.184,0.022,2.368,0.678,3.56,0.712c10.65,0.309,22.373-0.164,33.466,0c5.41,0.08,12.365,0.449,16.021-0.712
+		c4.122,1.131,9.652,0.638,14.952,0.712c2.474,0.035,5.296-0.009,7.833,0c2.075,0.008,5.283,1.185,6.052-1.067
+		C266.835,641.169,222.774,640.446,187.396,640.671z M405.633,641.383c-19.59-0.327-36.741,0.137-54.826,0
+		c-3.797-0.029-7.898-0.711-11.393-0.356c-0.568,0.058-1.201,0.711-1.78,0.712c-0.541,0.001-1.259-0.673-1.78-0.712
+		c-3.825-0.286-7.868,0.274-11.392,0.356c-2.966,0.069-5.15-0.321-7.121-0.356c-5.583-0.1-13.217,0.4-17.801,0.356
+		c-0.434,0.04-0.843,0.106-0.712,0.712c10.854,1.521,23.737,0.099,35.246,0.712c7.995,0.427,15.264-0.111,22.784,0
+		c2.534,0.037,5.319,0.683,7.477,0.356c2.312-0.351,1.801-1.164,3.204-0.356c0.545,0.313,2.302,0.359,3.561,0.356
+		c10.751-0.029,23.822-0.076,33.821,0c3.545,0.026,7.638,0.799,9.612-1.068C411.637,640.576,408.659,641.433,405.633,641.383z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M163.187,28.325c0.2,1.581,1.449,2.112,2.492,2.848
+		c0.988-0.08,1.007-1.129,1.78-1.424c4.172,0.492,6.947,1.947,10.324,3.916c1.235,0.286,1.369-0.53,2.492-0.356
+		c1.579,1.669,1.945,5.271,0.712,7.833c-3.188-1.014-5.362,1.146-8.544,0c-0.396-0.937-0.318-1.199,0.356-2.136
+		c-0.277-1.027-1.722-0.889-2.492-1.424c-0.197,1.39,2.346,1.11,1.068,2.492c-2.407-0.222-4.256-2.071-6.764-2.492
+		c-2.984-0.501-6.296,0.21-9.613,0.356c-3.414,0.149-6.991-0.237-9.612,0.356c-0.486,0.11-1.01,0.675-1.424,0.712
+		c-3.542,0.317-8.23-0.782-10.681,0.712c-0.168,0.103-0.828,0.181-1.068,0.356c-0.532,0.389-0.577,1.146-1.068,1.424
+		c-1.612,0.915-4.478,0.792-4.984,2.848c-0.475,0.593-2.017,0.119-2.492,0.712c-0.514,0.435-0.54,1.359-1.068,1.78
+		c-4.526,0.223-7.688-0.169-11.393,1.068c-0.518-1.542-1.919-3.358-0.712-4.628c1.576,0.085,2.096,1.227,2.492,2.492
+		c1.654-0.863,5.646-0.03,7.121-0.712c-1.669-1.772-4.259-2.624-7.477-2.848c0.15-0.792,1.889-0.279,2.136,0
+		c0.944-0.551,0.972-2.017,2.492-1.068c0.25-2.076-1.774,0.188-2.492-1.068c0.138-1.988,2.498-1.111,3.916-1.068
+		c0.925,0.028,2.036-0.643,2.848-0.712c11.452-0.972,28.758-1.931,41.654-2.492c0.855-1.004-0.689-0.635-0.356-2.136
+		c0.191-0.862,0.982-1.22,1.068-1.068c-0.929-1.645-1.561-0.486-3.916-0.356c-15.046,0.833-32.126,2.826-46.282,3.916
+		c-0.767,2.274-0.896,3.164-1.424,5.34c-1.748-1.298-1.086,0.425-3.204,0.356c1.065-2.258,1.708-4.938,2.848-7.12
+		c3.733-1.119,11.962-0.54,16.733-1.78c0.744-0.323,1.085-1.051,1.068-2.136c1.413-0.438,2.84-0.562,4.272-1.068
+		c1.005-0.355,1.917-1.275,2.848-1.424c1.959-0.313,4.595,0.015,7.121,0C150.386,28.289,155.576,28.275,163.187,28.325z
+		 M149.302,30.105c1.868-0.16,5.777,1.068,7.121-0.712C153.639,29.603,150.248,28.928,149.302,30.105z M157.134,30.817
+		c1.044,0.603,2.626-0.787,4.628-0.356C161.794,28.903,157.238,28.746,157.134,30.817z M177.071,39.005
+		c1.359,0.172,2.272-0.101,2.848-0.712c0-1.662-0.432-2.892-2.136-2.848C177.451,36.175,178.117,38.172,177.071,39.005z
+		 M174.935,36.157c0.223,0.846,0.479,1.657,1.424,1.78c0.486-0.497,0.768-1.757,0.356-2.136
+		C175.89,35.688,175.348,35.858,174.935,36.157z M122.245,39.717c0.764,1.719,4.898,1.156,6.052,0
+		C125.722,39.569,124.733,39.409,122.245,39.717z M120.465,43.634c0.302,0.766,0.877,1.259,2.136,1.068
+		c-0.52-0.667-0.014-2.359-0.712-2.848C121.531,42.564,120.314,42.416,120.465,43.634z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M93.764,64.995c1.25,0.256,1.662,1.395,2.848,2.492
+		c0.197,5.342-5.086,5.234-4.628,0.712C92.14,66.659,93.412,66.938,93.764,64.995z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M93.052,103.088c2.862-0.876,3.109,4.04,1.068,4.628
+		C91.867,108.365,89.861,104.065,93.052,103.088z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M291.353,131.213c-1.402,3.803,1.174,4.637,1.424,8.188
+		c-1.146,1.108-2.299,2.211-4.629,2.136c-0.315-1.508,1.646-1.81,0.713-2.848c-1.845,0.847-2.878,3.314-4.629,3.205
+		c-1.591-1.376,1.78-3.256,2.137-4.984c-2.307-1.951-2.253-5.835-1.425-9.256c-0.923-0.682-2.287,0.667-3.204,0.356
+		c-0.149,1.218,1.066,1.07,1.425,1.78c0.211,2.691-1.751,6.086,0.712,7.833c0.056,1.598-1.188,1.898-1.78,2.848
+		c-1.294-0.486-1.347-2.213-2.849-2.492c0.475-1.543,0.601-3.435,0.713-5.34c-0.534-1.177-0.871,0.74-1.78,0.356
+		c-0.412-0.527-0.412-0.897,0-1.424c-0.053-0.794-0.897,0.462-1.78,0c-1.657-4.437-0.51-11.998-0.712-19.225
+		c-0.046-1.654-0.878-3.562-0.712-4.984c0.08-0.688,0.692-1.124,0.712-1.78c0.196-6.8-0.341-13.746,0.355-19.937
+		c1.449-0.094,2.416-0.67,3.561-1.068c0.073-1.114-0.24-2.613,0.356-3.204c4.203-0.352,8.064,0.134,11.036,0
+		c2.574-0.116,3.907-0.109,5.34,2.492c0.412,2.086,0.981,4.355,1.068,6.764c0.186,5.156,0.784,10.523-0.712,16.021
+		c0.752,6.898,0.294,16.182-0.712,23.141C294.52,130.346,293.668,131.512,291.353,131.213z M287.436,86.711
+		c0.427,1.947,0.524,4.223,1.425,5.696c-0.771,0.002-0.779,2.69,0.355,2.848c0.133-2.416-0.315-3.519,0-5.34
+		c1.682-0.335,2.033-2.002,2.849-3.204C291.154,86.15,288.345,86.15,287.436,86.711z M278.535,86.711
+		c-0.776,1.036-0.931,2.361-1.067,3.56c-1.051,9.222-0.086,20.189,0,29.905c0.026,3.015-0.783,6.165,0.355,9.256
+		c4.978-2.188-0.957-7.157,0.356-11.036c0.316-0.751,1.518-0.619,1.424-1.78c-0.32-4.685,0.513-11.249,0.712-18.157
+		c-0.663-0.34-1.189,1.066-1.424,0c-1.995-4.146,0.347-10.193,4.272-7.121c-0.657,10.75-1.551,23.229-0.356,35.246
+		c3.246-0.377,2.124-4.451,2.136-6.764c0.054-10.007,0.573-18.175,0-29.549c-0.67-1.134-1.647,0.249-2.136-1.068
+		c0.344-1.318,2.031-1.292,2.492-2.492C282.574,86.396,280.67,87.448,278.535,86.711z M294.2,94.188
+		c0.474-0.269,0.893-3.48-0.356-3.204C294.184,92.665,292.168,93.717,294.2,94.188z M293.488,107.004
+		c1.405-1.259,0.627-3.456,0.712-4.984c0.135-2.426,0.407-4.498,0.356-6.764c-0.356,0-0.713,0-1.068,0
+		C293.346,99.126,293.388,102.427,293.488,107.004z M288.504,97.036c2.503-0.416,0.987,1.808,2.136,2.136
+		c0.421-1.075,0.867-2.121,0.356-3.204c-1.156,0.207-1.656-0.243-2.492-0.356C288.504,96.086,288.504,96.561,288.504,97.036z
+		 M290.64,115.193c0.475,0,0.95,0,1.425,0c0.798-1.603-0.011-3.666,0-5.696c0.008-1.698,1.192-4.093-0.356-5.34
+		C289.884,106.829,290.99,112.594,290.64,115.193z M293.488,120.533c0.537-1.87,0.792-5.35,0-6.052
+		C293.237,116.803,292.932,118.756,293.488,120.533z M287.436,129.789c1.594,0.79,2.212-1.252,4.272-0.356
+		c1.643-1.951-0.277-4.405-1.78-5.34c-0.336-2.156-1.186-3.799-1.067-6.409c-0.455-0.02-0.493-0.456-1.068-0.356
+		C286.793,120.924,288.879,125.766,287.436,129.789z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M235.102,146.878c1.209,0.453,2.059,1.264,3.204,1.78
+		c0,1.068,0,2.136,0,3.204c-1.137,1.078-3.51,0.302-4.628,0.356C234.246,149.802,233.304,148.064,235.102,146.878z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M251.479,165.391c-2.303-4.81,5.863-7.436,4.984-2.136
+		C255.45,164.587,253.505,166.175,251.479,165.391z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M270.703,161.831c-1.378,0.838-3.204,0.295-4.272,0.712
+		c0.728,0.816,2.822,0.264,2.137,2.492c1.975-0.043,2.325-1.709,2.848-3.204c3.016-0.146,2.178,2.546,2.137,4.984
+		c-0.038,2.211,0.767,4.895-1.068,6.052c2.108,4.283-0.427,9.666,0,14.597c0.074,0.857,0.823,1.261,1.068,2.136
+		c0.759,2.721,0.235,5.994-0.713,8.188c-1.38,0.094-4.11,0.509-5.34,1.78c-2.263-1.611-6.174,0.6-8.188-1.068
+		c1.168-2.867,6.489-1.581,9.257-2.848c-1.547-2.365-6.151,1.412-7.833-1.424c0.237-11.151,0.188-22.774,0.712-32.397
+		C263.819,160.514,269.17,159.122,270.703,161.831z M263.227,171.087c1.403-1.652,1.197-2.787,2.492-4.628
+		c-0.878,0.047-1.715,0.054-2.136-0.356C262.293,166.775,262.695,169.408,263.227,171.087z M262.871,172.155
+		c0.143,4.844-0.57,11.748,0,16.021c0.975,0.515,2.15-0.256,3.56,0.356c1.212-4.865,0.278-10.605,0.712-16.021
+		C265.576,171.804,264.768,172.533,262.871,172.155z M262.515,190.668c-0.257,1.088,0.364,1.297,0.356,2.136
+		c1.854,0.704,4.786,0.266,4.271-2.492C265.378,190.918,263.811,190.131,262.515,190.668z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M285.656,161.119c-0.36,1.183-2.592,0.494-3.204,1.424
+		c-0.169,1.118,0.958,0.941,1.067,1.78c1.31,0.209,1.773-2.47,2.492-0.712c0.912-0.394,0.561-2.05,2.136-1.78
+		c0.236,3.135-0.062,6.204-0.712,8.9c-0.123,0.511-0.68,1.204-0.712,1.78c-0.072,1.305,0.669,2.307,0.712,3.56
+		c0.035,1.002-0.237,2.547-0.355,3.916c-0.207,2.398-0.287,4.182-1.424,6.052c0.661,2.013,0.793,6.368-0.713,8.188
+		c-1.589,0.53-2.301,0.209-3.204-0.712c-0.78,0.762-1.978,1.107-2.492,2.136c1.634,0.691,5.032-0.604,6.409,1.068
+		c-0.459,1.832-3.5,1.193-5.341,1.424c-1.722,0.216-3.469,1.335-4.628,0.356c-0.097-1.521,1.3-1.548,1.78-2.492
+		c-0.233-0.954-1.021-1.354-1.425-2.136c0.119-10.089-0.293-22.609,1.068-32.753C279.317,159.966,283.511,159.545,285.656,161.119z
+		 M278.892,170.019c1.175-0.961,1.251-3.021,1.78-4.628c-0.421-0.41-1.259-0.403-2.137-0.356
+		C278.29,166.195,276.727,169.754,278.892,170.019z M277.823,172.155c0.305,3.721-0.251,9.706,0,13.172
+		c1.217,0.147,2.905,0.071,3.916-0.712c-0.466-4.517,0.399-10.215-0.355-12.816C280.544,172.783,279.137,172.409,277.823,172.155z
+		 M277.468,188.888c-0.391,0.958-0.067,1.826,0.355,2.848c1.555-0.25,2.006,0.605,3.561,0.356c0.415-1.412-0.367-2.704,0.355-4.272
+		C280.582,187.201,279.219,188.964,277.468,188.888z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M257.887,167.171c0.198,2.235,0.585,2.811-0.356,4.272
+		c-1.721-0.968-3.163,1.251-4.628-0.356c-0.108-1.651,0.004-3.082,0.712-3.916C255.164,167.098,256.526,166.444,257.887,167.171z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M418.806,347.315c0.673,0.869,0.013,3.072,1.068,3.56
+		c4.544-0.15,9.799,1.742,14.24,2.849c0.302-2.072,1.296-3.451,2.848-4.272c2.591,1.848,4.107,0.956,7.121,2.492
+		c-0.98,2.876,0.805,6.438-1.068,8.544c-2.873-1.216-0.445-5.842-2.492-7.476c-1.724-0.106-1.454-0.361-3.561-0.356
+		c-0.778,0.053-0.764,0.897-0.712,1.78c0.497,1.524,2.383,0.043,3.204,0.712c0.033,1.932-2.256,1.542-2.492,3.204
+		c0.674,1.211,1.248-0.609,2.137-0.356c-0.103,2.595,2.03,2.954,3.56,3.917c-1.048,2.314-6.975-1.198-8.9-1.78
+		c-1.268,0.716-2.331-0.48-3.56-0.712c-1.201-0.227-2.413,0.173-3.561,0c-4.602-0.693-9.185-2.335-13.173-4.629
+		c0.991-2.193-0.795-2.745-1.424-4.271c-0.031-1.219,2.167-0.207,2.136-1.425c-1.656-0.716-3.687-1.06-4.271-2.848
+		C413.329,344.43,414.35,347.863,418.806,347.315z M432.69,357.283c-2.038-0.46-5.033-1.843-7.477-0.712
+		C427.521,356.669,430.92,358.962,432.69,357.283z"/>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;" d="M360.063,477.26c2.452,3.837,5.116,7.462,6.764,12.104
+		c-0.744,0.15-0.942-0.244-1.424-0.356c1.132,3.734,3.919,5.812,4.272,10.325c-1.088,0.257-1.298-0.364-2.137-0.356
+		c-0.83-2.611-1.423-5.46-3.56-6.765c-0.714-3.394-2.424-5.689-3.916-8.188c-0.491-0.821-1.702-1.157-1.068-2.491
+		c2.023,0.231,1.865,2.645,3.56,3.204C362.899,482.751,358.535,479.325,360.063,477.26z"/>
+</g>
+</svg>
diff --git a/src/main/resources/static/stomp-ws/doc/index.html b/src/main/resources/static/stomp-ws/doc/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..05300b3c089d036d677dc7890b05f6f6f72cf121
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/doc/index.html
@@ -0,0 +1,588 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+<title>STOMP Over WebSocket</title>
+<!--[if IE]>
+<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<link rel=stylesheet href=screen.css>
+<link rel=alternate type=application/atom+xml href=http://github.com/feeds/jmesnil/commits/stomp-websocket/master>
+</head>
+
+<body>
+<header>
+<h1>STOMP Over WebSocket</h1>
+</header>
+
+<p id="toc">&nbsp;</p>
+
+<section>
+<h2 id=stomp>What is STOMP?</h2>
+
+<p><img src=i/johnny_automatic/johnny_automatic_elephant_climbing.svg></p>
+<p><a href=http://stomp.github.com/>STOMP</a> is a simple text-orientated messaging protocol.
+  It defines an <a href=http://stomp.github.com/stomp-specification-1.1.html>interoperable wire format</a> 
+  so that any of the available STOMP clients can communicate with any STOMP message broker to provide easy and widespread
+  messaging interoperability among languages and platforms (the STOMP web site has a <a href=http://stomp.github.com/implementations.html>list of STOMP client and server implementations</a>.</p>
+</section>
+
+<section>
+<h2 id=websockets>What is the WebSocket API?</h2>
+
+<p class=ss style="width:248px"><img width=248 src=i/johnny_automatic/johnny_automatic_follow_the_leader.svg><br>
+  <span id=live-web-sockets></span></p>
+<p><a href=http://dev.w3.org/html5/websockets/>WebSockets</a> are "TCP for the Web".</p>
+<p>When Google announced the availability of
+<a href=http://blog.chromium.org/2009/12/web-sockets-now-available-in-google.html>WebSocket in Google Chrome</a>,
+it explained the idea behind WebSockets:</p>
+<blockquote>
+  <p>The WebSocket API enables web applications to handle bidirectional communications
+    with server-side process in a straightforward way. Developers have been using XMLHttpRequest
+    ("XHR") for such purposes, but XHR makes developing web applications that communicate back
+    and forth to the server unnecessarily complex. XHR is basically asynchronous HTTP,
+    and because you need to use a tricky technique like long-hanging GET for sending data
+    from the server to the browser, simple tasks rapidly become complex. As opposed to XMLHttpRequest,
+    WebSockets provide a real bidirectional communication channel in your browser.
+    Once you get a WebSocket connection, you can send data from browser to server by calling
+    a send() method, and receive data from server to browser by an onmessage event handler.</p>
+
+  <p>In addition to the new WebSocket API, there is also a new protocol
+    (the "WebSocket Protocol") that the browser uses to communicate with servers.
+    The protocol is not raw TCP because it needs to provide the browser's "same-origin"
+    security model. It's also not HTTP because WebSocket traffic differers from HTTP's
+    request-response model. WebSocket communications using the new WebSocket protocol
+    should use less bandwidth because, unlike a series of XHRs and hanging GETs,
+    no headers are exchanged once the single connection has been established. To use this new
+    API and protocol and take advantage of the simpler programming model and more
+    efficient network traffic, you do need a new server implementation to communicate
+    with.</p>
+</blockquote>
+
+<p>The API is part of <a href=>HTML5</a> and is supported (<a href=http://en.wikipedia.org/wiki/WebSocket#Browser_support>at various degree...</a>) by most modern Web Browsers (including Google Chrome, Firefox and Safari on Mac OS X and iOS).</p>
+
+</section>
+
+<section>
+<h2 id=protocols>Protocol Support</h2>
+
+<p>This library supports multiple version of STOMP protocols:
+
+<ul>
+  <li><a href=http://stomp.github.com/stomp-specification-1.0.html>STOMP 1.0</a>
+  <li><a href=http://stomp.github.com/stomp-specification-1.1.html>STOMP 1.1<a> (including <a href=#heartbeat>heart-beating</a>)
+</ul>
+
+<h2 id=requirements>Server Requirements</h2>
+
+<p>This library is not a <em>pure</em> STOMP client. It is aimed to run on the WebSockets protocol which
+  is not TCP. Basically, the WebSocket protocol requires a <em>handshake</em> between the browser's 
+  client and the server to ensure the browser's "same-origin" security model remains in effect.</p>
+<p>This means that this library can not connect to regular STOMP brokers since they would not understand
+  the handshake initiated by the WebSocket which is not part of the STOMP protocol and would
+  likely reject the connection.</p>
+<p>There are ongoing works to add WebSocket support to STOMP broker so that they will accept STOMP connections over 
+  the WebSocket protocol.</p>
+
+<h3 id=hornetq>HornetQ</h3>
+
+<p><a href=http://jboss.org/hornetq>HornetQ</a> is the Open Source messaging system developed
+  by Red Hat and JBoss.</p>
+  
+<p>To start HornetQ with support for STOMP Over WebSocket, <a href=http://www.jboss.org/hornetq/downloads.html>download the latest version</a> and run the following steps:</p>
+
+<pre>
+  <samp>$ </samp><kbd>cd hornetq-x.y.z/examples/jms/stomp-websockets</kbd>
+  <samp>$ </samp><kbd>mvn clean install</kbd>
+  <samp>...
+  INFO: HQ221020: Started Netty Acceptor version 3.6.2.Final-c0d783c localhost:61614 for STOMP_WS protocol
+  Apr 15, 2013 1:15:33 PM org.hornetq.core.server.impl.HornetQServerImpl$SharedStoreLiveActivation run
+  INFO: HQ221007: Server is now live
+  Apr 15, 2013 1:15:33 PM org.hornetq.core.server.impl.HornetQServerImpl start
+  INFO: HQ221001: HornetQ Server version 2.3.0.CR2 (black'n'yellow2, 123) [c9e29e45-a5bd-11e2-976a-b3fef7ceb5df]</samp>
+</pre>
+
+<p>HornetQ is now started and listens to STOMP over WebSocket on the port <code>61614</code>.<br>
+It accepts <em>WebSocket connections</em> from the URL <code>ws://localhost:61614/stomp</code></p>
+</section>
+
+<p>To configure and run HornetQ with STOMP Over WebSocket enabled, follow the
+  <a href=http://docs.jboss.org/hornetq/2.3.0.CR2/docs/user-manual/html/interoperability.html#stomp.websockets>instructions</a>.</p>
+
+<h3 id=activemq>ActiveMQ</h3>
+
+<p><a href=http://activemq.apache.org>ActiveMQ</a> is the Open Source messaging system developed by Apache.
+  Starting with 5.4 snapshots, ActiveMQ supports STOMP Over WebSocket.</p>
+<p>To configure and run ActiveMQ with STOMP Over WebSocket enabled, follow the
+  <a href=http://activemq.apache.org/websockets.html>instructions</a>.</p>
+
+<h3 id=apollo>ActiveMQ Apollo</h3>
+
+<p><a href=http://activemq.apache.org/apollo/>ActiveMQ Apollo</a> is the next generation of ActiveMQ broker.
+  From the start, Apollo supports STOMP Over WebSocket.</p>
+<p>To configure and run Apollo with STOMP Over WebSocket enabled, follow the
+  <a href=http://activemq.apache.org/apollo/documentation/user-manual.html#WebSocket_Transports>instructions</a>.</p>
+
+<h3 id=rabbitmq>RabbitMQ</h3>
+
+<p><a href=http://www.rabbitmq.com/>RabbitMQ</a> is Open Source messaging system sponsored by VMware.
+<p>To configure and run RabbitMQ with STOMP Over WebSocket enabled, follow the instructions to install the <a href=http://www.rabbitmq.com/web-stomp.html>Web-Stomp plugin</a>.</p>
+
+<h3 id=stilts>Stilts &amp; Torquebox</h3>
+
+<p><a href=http://stilts.projectodd.org/>Stilts</a> is a STOMP-native messaging framework which aims to address treating STOMP as primary contract for messaging, and integrating around it, instead of simply applying STOMP shims to existing services.
+<p><a href=http://torquebox.org/>TorqueBox</a> uses the Stilts project to provide its <a href=http://torquebox.org/documentation/2.1.2/stomp.html>WebSockets and STOMP stack</a>.
+
+<section>
+
+  
+<h2 id=download>Download stomp.js JavaScript file</h2>
+
+<p>You can download <a href="https://raw.github.com/jmesnil/stomp-websocket/master/lib/stomp.js">stomp.js</a> to use it in your Web applications</p>
+
+<p>A <a href="https://raw.github.com/jmesnil/stomp-websocket/master/lib/stomp.min.js">minified version</a> is also provided to be used in production.
+
+<p>This JavaScript file is generated from <a href=http://jashkenas.github.com/coffee-script/>CoffeeScript</a> files. See the <a href=#contribute>Contribute</a> section to download the source code or browse the <a href="stomp.html">annotated source code</a>.
+
+<h2 id=api>STOMP API</h2>
+
+<h3 id=frame>STOMP Frame</h3>
+
+<p>STOMP Over WebSocket provides a straightforward mapping from a STOMP frame to a JavaScript
+  object.</p>
+
+<table class=st>
+<caption>Frame Object</caption>
+<tr class=ho><th>Property<th>Type<th>Notes
+<tr class=zebra><th><code>command</code><td>String<td>name of the frame (<code>"CONNECT"</code>, <code>"SEND"</code>, etc.)
+<tr><th><code>headers</code><td>JavaScript object<td>
+<tr class=zebra><th><code>body</code><td>String<td>
+</table>
+
+<p>The <code>command</code> and <code>headers</code> properties will always be defined
+  but the <code>headers</code> can be empty if the frame has no headers.
+  The <code>body</code> can be <code>null</code> if the frame does not have a body.</p>
+
+<h3 id=client>Create a STOMP client</h3>
+
+<h4 id=clientws>In a Web browser with regular Web Socket</h4>
+
+<p>STOMP JavaScript clients will communicate to a STOMP server using a <code>ws://</code> URL.</p>
+<p>To create a STOMP client JavaScript object, you need to call <code>Stomp.client(url)</code>
+  with the URL corresponding to the server's WebSocket endpoint:
+
+<pre><code>
+  var url = "ws://localhost:61614/stomp";
+  var client = <mark>Stomp.client(url)</mark>;
+</code></pre>
+
+<p>The <code>Stomp.client(url, protocols)</code> can also be used to override the default subprotocols provided by the library: <code>['v10.stomp', 'v11.stomp]'</code> (for STOMP 1.0 &amp; 1.1 specifications). This second argument can either be a single string or an array of strings to specify multiple subprotocols.
+
+<h4 id=alternative>In the Web browser with a custom WebSocket</h3>
+
+<p>Web browsers supports different versions of the WebSocket protocol. Some older browsers does not provide the WebSocket JavaScript or expose it under another name. By default, <code>stomp.js</code> will use the Web browser native <code>WebSocket</code> class to create the WebSocket.
+<p>However it is possible to use other type of WebSockets by using the <code>Stomp.over(ws)</code> method.
+This method expects an object that conforms to the WebSocket definition.
+
+<p>For example, it is possible to use the implementation provided by the <a href=https://github.com/sockjs/sockjs-client>SockJS</a> project which falls back to a variety of browser-specific transport protocols instead:
+
+<pre><code>
+  &lt;script src="http://cdn.sockjs.org/sockjs-0.3.min.js">&lt;/script>
+  &lt;script>
+    // use SockJS implementation instead of the browser's native implementation
+    var ws = new SockJS(url);
+    var client = <mark>Stomp.over(ws)</mark>;
+    [...]
+  &lt;/script>
+</code></pre>
+
+<p>Use <code>Stomp.client(url)</code> to use regular WebSockets or use <code>Stomp.over(ws)</code> if you required another type of WebSocket.
+<p>Apart from this initialization, the STOMP API remains the same in both cases.
+
+<h4 id=nodejs>In a node.js application</h3>
+
+<p>The library can also be used in <a href="http://nodejs.org">node.js</a> application by using the 
+  <a href="https://npmjs.org/package/stompjs">stompjs npm package</a>.
+
+<pre>
+  <samp>$ </samp><kbd>npm install <mark>stompjs</mark></kbd>
+</pre>
+  
+<p>In the node.js app, require the module with:
+
+<pre><code>
+  var <mark>Stomp</mark> = require(<mark>'stompjs'</mark>);
+</code></pre>
+  
+<p>To connect to a STOMP broker over a <em>TCP socket</em>, use the <code>Stomp.overTCP(host, port)</code> method:
+
+<pre><code>
+  var client = Stomp.<mark>overTCP</mark>('localhost', 61613);
+</code></pre>
+
+<p>To connect to a STOMP broker over a <em>Web Socket</em>, use instead the <code>Stomp.overWS(url)</code> method:
+
+<pre><code>
+  var client = Stomp.<mark>overWS</mark>('ws://localhost:61614/stomp');
+</code></pre>
+
+<p>Apart from this initialization, the STOMP API remains the same whether it is running in a Web browser or in node.js application.
+
+<h3 id=connection>Connection to the server</h3>
+
+<p>Once a STOMP client is created, it must call its <code>connect()</code> method to effectively
+  connect and authenticate to the STOMP server. The method takes two mandatory arguments,
+  <code>login</code> and <code>passcode</code> corresponding to the user credentials.</p>
+<p>Behind the scene, the client will open a connection using a WebSocket and send
+  a <a href=http://stomp.github.com/stomp-specification-1.1.html#CONNECT_or_STOMP_Frame>CONNECT</a> frame.</p>
+<p>The connection is done asynchronously: you have no guarantee to be effectively connected when
+  the call to <code>connect</code> returns. To be notified of the connection, you need to pass a
+  <code>connect_callback</code> function to the <code>connect()</code> method:</p>
+<pre><code>
+  <mark>var connect_callback</mark> = function() {
+    // called back after the client is connected and authenticated to the STOMP server
+  };
+</code></pre>
+<p>But what happens if the connection fails? the <code>connect()</code> method accepts an
+  optional <code>error_callback</code> argument which will be called if the client is not able
+  to connect to the server.
+  The callback will be called with a single argument, an error object corresponding to STOMP
+  <a href=http://stomp.github.com/stomp-specification-1.1.html#ERROR>ERROR</a> frame:</p>
+  
+<pre><code>
+  <mark>var error_callback</mark> = function(error) {
+    // display the error's message header:
+    alert(error.headers.message);
+  };
+</code></pre>
+
+<p>The <code>connect()</code> method accepts different number of arguments to provide a simple API to use in most cases:
+
+<pre><code>
+  <mark>client.connect</mark>(login, passcode, connectCallback);
+  <mark>client.connect</mark>(login, passcode, connectCallback, errorCallback);
+  <mark>client.connect</mark>(login, passcode, connectCallback, errorCallback, host);
+</code></pre>
+
+<p>where <code>login</code>, <code>passcode</code> are strings and <code>connectCallback</code> and <code>errorCallback</code> are functions
+  (some brokers also require to pass a <a href=http://stomp.github.io/stomp-specification-1.1.html#CONNECT_or_STOMP_Frame>host</a> String).
+
+<p>The <code>connect()</code> method also accepts two other variants if you need to pass additional headers:
+
+<pre><code>
+  <mark>client.connect</mark>(headers, connectCallback);
+  <mark>client.connect</mark>(headers, connectCallback, errorCallback);
+</code></pre>
+
+<p>where <code>header</code> is a map and <code>connectCallback</code> and <code>errorCallback</code> are functions.
+<p>Please note that if you use these forms, you <strong>must</strong> add the <code>login</code>, <code>passcode</code> (and eventually <code>host</code>)
+  headers yourself:
+
+  <pre><code>
+    var <mark>headers</mark> = {
+      login: 'mylogin',
+      passcode: 'mypasscode',
+      // additional header
+      'client-id': 'my-client-id'
+    };
+    client.connect(<mark>headers</mark>, connectCallback);
+  </code></pre>
+
+<p>To disconnect a client from the server, you can call its <code>disconnect()</code> method.
+  The disconnection is asynchronous: to be notified when the disconnection is effective,
+  the <code>disconnect</code> method takes an optional <code>callback</code> argument.</p>
+
+<pre><code>
+  <mark>client.disconnect</mark>(function() {
+    alert("See you next time!");
+  };
+</code></pre>
+
+<p>When a client is disconnected, it can no longer send or receive messages.</p>
+
+<h3 id=heartbeat>Heart-beating</h3>
+
+<p>If the STOMP broker accepts STOMP 1.1 frames, <a href=>heart-beating</a> is enabled by default.
+
+<p>The <code>client</code> object has a <code>heartbeat</code> field which can be used to configure heart-beating by changing its <code>incoming</code> and <code>outgoing</code> integer fields (default value for both is <code>10000</code>ms):
+
+<pre><code>
+    client.<mark>heartbeat.outgoing</mark> = 20000; // client will send heartbeats every 20000ms
+    client.<mark>heartbeat.incoming</mark> = 0;     // client does not want to receive heartbeats
+                                       // from the server
+</code></pre>
+
+<p>The heart-beating is using <code>window.setInterval()</code> to regularly send heart-beats and/or check server heart-beats.
+
+<h3 id=send>Send messages</h3>
+
+<p>When the client is connected to the server, it can send STOMP messages using
+  the <code>send()</code> method. The method takes a mandatory <code>destination</code>
+  argument corresponding to the STOMP destination. It also takes two optional
+  arguments: <code>headers</code>, a JavaScript object containing additional
+  message headers and <code>body</code>, a String object.</p>
+
+<pre><code>
+  <mark>client.send</mark>("/queue/test", {priority: 9}, "Hello, STOMP");
+</code></pre>
+
+<p>The client will send a STOMP
+  <a href=http://stomp.github.com/stomp-specification-1.1.html#SEND>SEND</a> frame to <code>/queue/test</code> destination
+  with a header <code>priority</code> set to <code>9</code> and a body <code>Hello, STOMP</code>.</p>
+
+<div class=advice>
+  <img style="float:left" width=120 src="i/johnny_automatic/johnny_automatic_advise_from_the_doctor.svg">
+  <p>If you want to send a message with a body, you <em>must</em> also pass the <code>headers</code>
+    argument. If you have no headers to pass, use an empty JavaScript literal <code>{}</code>:</p>
+  <pre><code>
+  client.send(destination, <mark>{}</mark>, body);
+  </code></pre>
+</div>
+
+<h3 id=subscribe>Subscribe and receive messages</h3>
+
+<p>To receive messages in the browser, the STOMP client must first subscribe to a destination.</p>
+<p>You can use the <code>subscribe()</code> method to subscribe to a destination. The method takes 2 mandatory
+  arguments: <code>destination</code>, a String corresponding to the destination and
+  <code>callback</code>, a function with one <code>message</code> argument
+  and an <em>optional</em> argument <code>headers</code>, a JavaScript object for additional headers.
+
+<pre><code>
+  var subscription = <mark>client.subscribe</mark>("/queue/test", callback);
+</code></pre>
+<p>The <code>subscribe()</code> methods returns a JavaScript obect with 1 attribute, <code>id</code>, that correspond to the client subscription ID
+  and one method <code>unsubscribe()</code> that can be used later on to unsubscribe the client from this destination.</p>
+
+<p>By default, the library will generate an unique ID if there is none provided in the headers. To use your own ID, pass it using the <code>headers</code> argument:
+
+<pre><code>
+  var mysubid = '...';
+  var subscription = client.subscribe(destination, callback, <mark>{ id: mysubid }</mark>);
+</code></pre>
+
+
+<p>The client will send a STOMP
+  <a href=http://stomp.github.com/stomp-specification-1.1.html#SUBSCRIBE>SUBSCRIBE</a> frame to the server
+  and register the callback. Every time the server
+  send a message to the client, the client will in turn call the callback with a STOMP Frame object
+  corresponding to the message:</p>
+
+<pre><code>
+  <mark>callback</mark> = function(message) {
+    // called when the client receives a STOMP message from the server
+    if (message.body) {
+      alert("got message with body " + message.body)
+    } else {
+      alert("got empty message");
+    }
+  });
+</code></pre>
+
+<p>The <code>subscribe()</code> method takes an optional <code>headers</code> argument to specify
+  additional headers when subscribing to a destination:</p>
+
+<pre><code>
+  var headers = {ack: 'client', 'selector': "location = 'Europe'"};
+  client.subscribe("/queue/test", message_callback, <mark>headers</mark>);
+</code></pre>
+
+<p>The client specifies that it will handle the message acknowledgement and is interested to receive
+  only messages matching the selector <code>location = 'Europe'</code>.</p>
+<div class=advice>
+  <img style="float:left" width=120 src="i/johnny_automatic/johnny_automatic_advise_from_the_doctor.svg">
+  <p>If you want to subscribe the client to multiple destinations, you can use the same callback to receive all
+    the messages:</p>
+  <pre style="clear:left"><code>
+  onmessage = function(message) {
+    // called every time the client receives a message
+  }
+  var sub1 = client.subscribe("queue/test", <mark>onmessage</mark>);
+  var sub2 = client.subscribe("queue/another", <mark>onmessage</mark>);
+  </code></pre>
+</div>
+
+<p>To stop receiving messages, the client can use the <code>unsubscribe()</code> method on the object returned by the <code>subscribe()</code>
+  method.</p>
+
+<pre><code>
+  var subscription = client.subscribe(...);
+  
+  ...
+  
+  <mark>subscription.unsubscribe</mark>();
+</code></pre>
+
+<h3 id=json>JSON support</h3>
+
+<p>The body of a STOMP message must be a <code>String</code>. If you want to send and receive
+  <a href=http://json.org/>JSON</a> objects, you can use <code>JSON.stringify()</code> and <code>JSON.parse()</code> to transform the JSON
+  object to a String and vice versa.</p>
+
+<pre><code>
+  var quote = {symbol: 'APPL', value: 195.46};
+  client.send("/topic/stocks", {}, <mark>JSON.stringify(quote)</mark>);
+
+  client.subcribe("/topic/stocks", function(message) {
+    var quote = <mark>JSON.parse(message.body)</mark>;
+    alert(quote.symbol + " is at " + quote.value);
+  };
+</code></pre>
+
+<h3 id=ack>Acknowledgment</h3>
+
+<p>By default, STOMP messages will be automatically acknowledged by the server before the message
+  is delivered to the client.</p>
+<p>The client can chose instead to handle message <a href=http://stomp.github.com/stomp-specification-1.1.html#SUBSCRIBE_ack_Header>acknowledgement</a> by subscribing to a destination and
+  specify a <code>ack</code> header set to <code>client</code> or <code>client-individual</code>.</p>
+<p>In that case, the client must use the <code>message.ack()</code> method to inform the server that it has
+  acknowledge the message.</p>
+
+<pre><code>
+  var subscription = client.subscribe("/queue/test",
+    function(message) {
+      // do something with the message
+      ...
+      // and acknowledge it
+      <mark>message.ack()</mark>;
+    },
+    <mark>{ack: 'client'}</mark>
+  );
+</code></pre>
+
+<p>The <code>ack()</code> method accepts a <code>headers</code> argument for additional headers to acknowledge the message. For example, it is possible
+  to acknowledge a message as part of a transaction and ask for a receipt when the <code>ACK</code> STOMP frame has effectively be processed by the broker:
+
+<pre><code>
+  var tx = client.begin();
+  message.ack(<mark>{ transaction: tx.id, receipt: 'my-receipt' }</mark>);
+  tx.commit();
+</code></pre>
+
+<p>The <code>nack()</code> method can also be used to inform STOMP 1.1 brokers that the client did <em>not</em> consume the message. It takes the same arguments than the <code>ack()</code> method.
+
+<h3 id=transaction>Transactions</h3>
+
+<p>Messages can be sent and acknowledged <em>in a transaction</em>.</p>
+<p>A transaction is started by the client using its <code>begin()</code> method
+  which takes an optional <code>transaction</code>, a String which uniquely identifies the
+  transaction. If no <code>transaction</code> is passed, the library will generate one automatically.
+<p>This methods returns a JavaScript object with a <code>id</code> attribute corresponding to the transaction ID and two methods:
+
+<ul>
+  <li><code>commit()</code> to commit the transaction
+  <li><code>abort()</code> to abort the transaction
+</ul>
+
+The client can then send and/or acknowledge messages in the transaction by specifying a
+<code>transaction</code> set with the transaction <code>id</code>.</p>
+
+<pre><code>
+  // start the transaction
+  var tx = <mark>client.begin</mark>();
+  // send the message in a transaction
+  client.send("/queue/test", <mark>{transaction: tx.id}</mark>, "message in a transaction");
+  // commit the transaction to effectively send the message
+  <mark>tx.commit</mark>();
+</code></pre>
+
+<div class=advice>
+  <img style="float:left" width=120 src="i/johnny_automatic/johnny_automatic_advise_from_the_doctor.svg">
+  <p>If you forget to add the <code>transaction</code> header when calling <code>send()</code>
+    the message will <em>not</em> be part of the transaction and will be sent directly without
+    waiting for the completion of the transaction.</p>
+  <pre style="clear:both"><code>
+  var txid = "unique_transaction_identifier";
+  // start the transaction
+  var tx = <mark>client.begin</mark>();
+  // oops! send the message outside the transaction
+  client.send("/queue/test", <mark>{}</mark>, "I thought I was in a transaction!");
+  <mark>tx.abort</mark>(); // Too late! the message has been sent
+  </code></pre>
+</div>
+
+<h3 id=debug>Debug</h3>
+
+<p>There are few tests in the code and it is helpful to see what is sent and received
+  from the library to debug application.</p>
+<p>The client can set its <code>debug</code> property to a function with takes a <code>String</code> argument
+  to see all the debug statements of the library:</p>
+
+<pre><code>
+  <mark>client.debug</mark> = function(str) {
+    // append the debug log to a #debug div somewhere in the page using JQuery:
+    $("#debug").append(str + "\n");
+  };
+</code></pre>
+
+<p>By default, the debug messages are logged in the browser window's console.
+
+</section>
+
+<section>
+<h2 id=example>Example</h2>
+
+<p>The source code contains a chat example in <kbd>examples/chat/index.html</kbd></p>
+<p>You need to start a STOMP server with support for WebSocket (using for example <a href=#hornetq>HornetQ</a>).</p>
+<p>Click on the <kbd>Connect</kbd> button to connect to the server and subscribe to the <code>/queue/test/</code> queue.</p>
+<p>You can then type messages in the form at the bottom of the page to send STOMP messages to the queue.
+  Messages received by the client will be displayed at the top of the page.</p>
+<p>You can also send regular STOMP messages and see them displayed in the browser. For
+  example using directly <kbd>telnet</kbd> on STOMP default port:</p>
+
+<pre>
+  <samp>$ </samp><kbd>telnet localhost 61613</kbd>
+  <kbd>CONNECT
+  login:guest
+  passcode:guest
+
+  ^@
+  </kbd>
+  <samp>CONNECTED
+  session:1092296064
+  </samp>
+</pre>
+
+<p><kbd>^@</kbd> is a null (<kbd>control-@</kbd> in ASCII) byte.</p>
+
+<pre>
+  <kbd>SEND
+  destination:/queue/test
+
+  Hello from TCP!
+  ^@
+  </kbd>
+</pre>
+
+<p>You should now have received this message in your browser.</p>
+</section>
+
+<section>
+<h2 id=contribute>Contribute</h2>
+
+<p><img width=240 src=i/johnny_automatic/johnny_automatic_the_dynamometer_test.svg></p>
+<p> The source code is hosted on <a href=http://github/org>GitHub</a>:</p>
+
+<pre>
+  <kbd>git clone <a href=http://github.com/jmesnil/stomp-websocket>git://github.com/jmesnil/stomp-websocket.git</a></kbd>
+</pre>
+
+</section>
+
+<footer>
+&copy; 2012 <a href="http://jmesnil.net/">Jeff Mesnil</a>
+</footer>
+
+<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js'></script>
+<script src='j/doc.js'></script>
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-257783-1");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+
+</body>
+</html>
diff --git a/src/main/resources/static/stomp-ws/doc/j/doc.js b/src/main/resources/static/stomp-ws/doc/j/doc.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ed7955426bc68f0bd07257f0c2208f44170d8b5
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/doc/j/doc.js
@@ -0,0 +1,65 @@
+/*
+Copyright (c) 2009, Mark Pilgrim, All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* 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.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+*/
+
+$(document).ready(function() {
+	hideTOC();
+	$("#live-web-sockets").html(supports("WebSocket" in window, "WebSockets"));
+}); /* document.ready */
+
+function hideTOC() {
+    var toc = '<a href="javascript:showTOC()">Show Table of Contents</a>';
+    $("#toc").html(toc);
+}
+
+function showTOC() {
+    var toc = '';
+    var old_level = 1;
+    $('h2,h3').each(function(i, h) {
+	    level = parseInt(h.tagName.substring(1));
+	    if (level < old_level) {
+		toc += '</ol>';
+	    } else if (level > old_level) {
+		toc += '<ol>';
+	    }
+	    toc += '<li><a href=#' + h.id + '>' + h.innerHTML + '</a>';
+	    old_level = level;
+	});
+    while (level > 1) {
+	toc += '</ol>';
+	level -= 1;
+    }
+    toc = '<a href="javascript:hideTOC()">Hide Table of Contents</a><ol>' + toc.substring(4);
+    $("#toc").html(toc);
+}
+
+function supports(bool, suffix) {
+  var s = "Your browser ";
+  if (bool) {
+    s += "supports " + suffix + ".";
+  } else {
+    s += "does not support " + suffix + ". :(";
+  }
+  return s;
+}
diff --git a/src/main/resources/static/stomp-ws/doc/screen.css b/src/main/resources/static/stomp-ws/doc/screen.css
new file mode 100644
index 0000000000000000000000000000000000000000..355e42cc4d09e73cc8f788ce2f2558e269ccb334
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/doc/screen.css
@@ -0,0 +1,151 @@
+/*
+
+Copyright (c) 2010, Jeff Mesnil (http://jmesnil.net) All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* 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.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+Acknowledgements & Inspirations
+
+The stub of the stylesheet (and the documentation in general) was taken 
+from Mark Pilgrim's Dive into HTML 5 (http//diveintohtml5.org).
+ 
+"The Elements of Typographic Style Applied to the Web" ... http://webtypography.net/toc/
+"Use the Best Available Ampersand" ....................... http://simplebits.com/notebook/2008/08/14/ampersands.html
+"Unicode Support in HTML, Fonts, and Web Browsers" ....... http://alanwood.net/unicode/
+"Punctuation" ............................................ http://en.wikipedia.org/wiki/Punctuation
+"Essays 1743" ............................................ http://www.thibault.org/fonts/essays/
+"Linux Libertine" ........................................ http://linuxlibertine.sourceforge.net/
+"CSS Styled Restaurant Menu" ............................. http://www.web-graphics.com/mtarchive/ItalianMenu.html
+*/
+
+footer {
+  clear: both;
+  text-align: center;
+  font-size: small;
+  display: block;
+}
+
+
+body {
+    font: large/1.556 "Linux Libertine", Palatino, "Palatino Linotype", "Book Antiqua", Georgia, "Times New Roman", serif;
+     word-spacing: 0.1em;
+     max-width: 800px;
+     margin: 0 auto;
+     padding-bottom: 2em;
+   }
+   
+pre, kbd, samp, code, var {
+  font: medium Consolas, "Andale Mono", Monaco, "Liberation Mono", "Bitstream Vera Sans Mono", "DejaVu Sans Mono", monospace;
+  word-spacing: 0;
+  letter-spacing: 0;
+}
+
+code, var, samp {
+  line-height:inherit !important;
+}
+
+samp {
+  display:inline ;
+  color: #667;
+}
+mark {
+  display: inline-block;
+  background: #ff8;
+  border: 1px dotted #888;
+}
+
+h1, h2, h3, h4, caption, thead th {
+  font-family: "Essays 1743", "Linux Libertine", Palatino, "Palatino Linotype", "Book Antiqua", Georgia, "Times New Roman", serif;
+}
+
+h1, h2, h3, h4 {
+  clear: both;
+}
+
+
+img {
+  float: left;
+  margin-right: 5px;
+  margin-bottom: 5px;
+}
+
+.bc, .st {
+  width:100%;
+  border-collapse:collapse;
+}
+
+.st {
+  border: 1px solid;
+}
+
+.st th {
+  text-align: left;
+  font-weight: normal;
+}
+
+.st tr > th:first-child {
+  padding-left: 5px;
+}
+
+.ho th {
+  border-bottom: 1px solid;
+}
+
+.zebra {
+  background: #eee;
+}
+
+.ss {
+  float: right;
+  margin: 0 0 1.75em 1.75em;
+  font-size: medium;
+}
+
+aside {
+  display: block;
+  padding: 0.75em;
+  border: 1px solid #000;
+  -moz-border-radius: 1em;
+  -webkit-border-radius: 1em;
+  border-radius: 1em;
+  font-style: oblique;
+  margin: 1.75em 0;
+}
+
+.advice {
+  display: block;
+  padding: 0.75em;
+  border: 1px solid #000;
+  -moz-border-radius: 1em;
+  -webkit-border-radius: 1em;
+  border-radius: 1em;
+  font-style: oblique;
+  margin: 1.75em 0;
+  min-height: 148px;
+  
+}
+
+.ss span {
+  display: block;
+  text-align: center;
+  border-bottom: 3px double;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/example/README.md b/src/main/resources/static/stomp-ws/example/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..9c4ac530d82dc73aea80714aeb4076b9aa7ad010
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/example/README.md
@@ -0,0 +1,9 @@
+# STOMP Over WebSocket Examples
+
+To run the examples, start a local HTTP server:
+
+    $ node server.js
+
+The [Chat example](http://localhost:8080/chat/) shows how to use `stomp.js` to send and receive STOMP messages directly from the Web browser.
+
+The [WebWorker example](http://localhost:8080/chat/) uses a WebWorker to send and receive STOMP messages from the broker.
diff --git a/src/main/resources/static/stomp-ws/example/chat/index.html b/src/main/resources/static/stomp-ws/example/chat/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..052c0ce001c057cd115e5267e066feb0535cfd5c
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/example/chat/index.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Chat Example Using STOMP Over WebSockets</title>
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link href="/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/css/bootstrap.min.responsive.css" rel="stylesheet">
+    <style type="text/css">
+      body { padding-top: 40px; }
+    </style>
+  </head>
+
+  <body>
+    
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="#">Stomp Over WebSocket Chat Example</a>
+        </div>
+      </div>
+    </div>
+
+    <div class="container-fluid">
+      <div class="row-fluid">
+        <div class="span6">
+          <div id="connect">
+            <div class="page-header">
+              <h2>Server Login</h2>
+            </div>
+            <form class="form-horizontal" id='connect_form'>
+              <fieldset>
+                <div class="control-group">
+                  <label>WebSocket URL</label>
+                  <div class="controls">
+                    <input name=url id='connect_url' value='ws://localhost:61623' type="text">
+                  </div>
+                </div>
+                <div class="control-group">
+                  <label>User</label>
+                  <div class="controls">
+                    <input id='connect_login' placeholder="User Login" value="admin" type="text">
+                  </div>
+                </div>
+                <div class="control-group">
+                  <label>Password</label>
+                  <div class="controls">
+                    <input id='connect_passcode' placeholder="User Password" value="password" type="password">
+                  </div>
+                </div>
+                <div class="control-group">
+                  <label>Destination</label>
+                  <div class="controls">
+                    <input id='destination' placeholder="Destination" value="/topic/chat.general" type="text">
+                  </div>
+                </div>
+                <div class="form-actions">
+                  <button id='connect_submit' type="submit" class="btn btn-large btn-primary">Connect</button>
+                </div>
+              </fieldset>
+            </form>
+          </div>
+          <div id="connected" style="display:none">
+            <div class="page-header">
+              <h2>Chat Room</h2>
+            </div>
+            <div id="messages">
+            </div>
+            <form class="well form-search" id='send_form'>
+              <button class="btn" type="button" id='disconnect' style="float:right">Disconnect</button>
+              <input class="input-medium" id='send_form_input' placeholder="Type your message here" class="span6"/>
+              <button class="btn" type="submit">Send</button>
+            </form>
+          </div>
+        </div>
+        <div class="span4">
+          <div class="page-header">
+            <h2>Debug Log</h2>
+          </div>
+          <pre id="debug"></pre>
+        </div>
+      </div>
+    </div>
+
+    <!-- Scripts placed at the end of the document so the pages load faster -->
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+    <script src="/stomp.js"></script>
+    <script>//<![CDATA[
+    $(document).ready(function() {
+      if(window.WebSocket) {
+        var client, destination;
+        $('#connect_form').submit(function() {
+          var url = $("#connect_url").val();
+          var login = $("#connect_login").val();
+          var passcode = $("#connect_passcode").val();
+          destination = $("#destination").val();
+
+          client = Stomp.client(url);
+
+          // this allows to display debug logs directly on the web page
+          client.debug = function(str) {
+            $("#debug").append(str + "\n");
+          };
+          
+          // the client is notified when it is connected to the server.
+          client.connect(login, passcode, function(frame) {
+            client.debug("connected to Stomp");
+            $('#connect').fadeOut({ duration: 'fast' });
+            $('#connected').fadeIn();
+            client.subscribe(destination, function(message) {
+              $("#messages").append("<p>" + message.body + "</p>\n");
+            });
+          });
+          return false;
+        });
+  
+        $('#disconnect').click(function() {
+          client.disconnect(function() {
+            $('#connected').fadeOut({ duration: 'fast' });
+            $('#connect').fadeIn();
+            $("#messages").html("")
+          });
+          return false;
+        });
+   
+        $('#send_form').submit(function() {
+          var text = $('#send_form_input').val();
+          if (text) {
+            client.send(destination, {}, text);
+            $('#send_form_input').val("");
+          }
+          return false;
+        });
+      } else {
+        $("#connect").html("\
+            <h1>Get a new Web Browser!</h1>\
+            <p>\
+            Your browser does not support WebSockets. This example will not work properly.<br>\
+            Please use a Web Browser with WebSockets support (WebKit or Google Chrome).\
+            </p>\
+        ");
+      }
+    });
+    //]]></script>
+
+  </body>
+</html>
diff --git a/src/main/resources/static/stomp-ws/example/css/bootstrap.min.css b/src/main/resources/static/stomp-ws/example/css/bootstrap.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..5e1aee0948dd2a1654199e44cac1ff49df454df2
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/example/css/bootstrap.min.css
@@ -0,0 +1,610 @@
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+a:hover,a:active{outline:0;}
+sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;}
+button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
+button,input{*overflow:visible;line-height:normal;}
+button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
+button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
+input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
+input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-color:#ffffff;}
+a{color:#0088cc;text-decoration:none;}
+a:hover{color:#005580;text-decoration:underline;}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row:after{clear:both;}
+[class*="span"]{float:left;margin-left:20px;}
+.span1{width:60px;}
+.span2{width:140px;}
+.span3{width:220px;}
+.span4{width:300px;}
+.span5{width:380px;}
+.span6{width:460px;}
+.span7{width:540px;}
+.span8{width:620px;}
+.span9{width:700px;}
+.span10{width:780px;}
+.span11{width:860px;}
+.span12,.container{width:940px;}
+.offset1{margin-left:100px;}
+.offset2{margin-left:180px;}
+.offset3{margin-left:260px;}
+.offset4{margin-left:340px;}
+.offset5{margin-left:420px;}
+.offset6{margin-left:500px;}
+.offset7{margin-left:580px;}
+.offset8{margin-left:660px;}
+.offset9{margin-left:740px;}
+.offset10{margin-left:820px;}
+.offset11{margin-left:900px;}
+.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";}
+.row-fluid:after{clear:both;}
+.row-fluid>[class*="span"]{float:left;margin-left:2.127659574%;}
+.row-fluid>[class*="span"]:first-child{margin-left:0;}
+.row-fluid .span1{width:6.382978723%;}
+.row-fluid .span2{width:14.89361702%;}
+.row-fluid .span3{width:23.404255317%;}
+.row-fluid .span4{width:31.914893614%;}
+.row-fluid .span5{width:40.425531911%;}
+.row-fluid .span6{width:48.93617020799999%;}
+.row-fluid .span7{width:57.446808505%;}
+.row-fluid .span8{width:65.95744680199999%;}
+.row-fluid .span9{width:74.468085099%;}
+.row-fluid .span10{width:82.97872339599999%;}
+.row-fluid .span11{width:91.489361693%;}
+.row-fluid .span12{width:99.99999998999999%;}
+.container{width:940px;margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
+.container:after{clear:both;}
+.container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
+.container-fluid:after{clear:both;}
+p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
+.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}
+h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
+h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
+h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
+h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
+h4,h5,h6{line-height:18px;}
+h4{font-size:14px;}h4 small{font-size:12px;}
+h5{font-size:12px;}
+h6{font-size:11px;color:#999999;text-transform:uppercase;}
+.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;}
+.page-header h1{line-height:1;}
+ul,ol{padding:0;margin:0 0 9px 25px;}
+ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
+ul{list-style:disc;}
+ol{list-style:decimal;}
+li{line-height:18px;}
+ul.unstyled{margin-left:0;list-style:none;}
+dl{margin-bottom:18px;}
+dt,dd{line-height:18px;}
+dt{font-weight:bold;}
+dd{margin-left:9px;}
+hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;}
+strong{font-weight:bold;}
+em{font-style:italic;}
+.muted{color:#999999;}
+abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
+blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
+blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
+blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
+small{font-size:100%;}
+cite{font-style:normal;}
+code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+code{padding:3px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
+pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
+pre code{padding:0;background-color:transparent;}
+form{margin:0 0 18px;}
+fieldset{padding:0;margin:0;border:0;}
+legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}
+label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
+label{display:block;margin-bottom:5px;color:#333333;}
+input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.uneditable-textarea{width:auto;height:auto;}
+label input,label textarea,label select{display:block;}
+input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:0;cursor:pointer;border-radius:0 \0/;}
+input[type="file"]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;}
+select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;}
+select{width:220px;background-color:#ffffff;}
+select[multiple],select[size]{height:auto;}
+input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+textarea{height:auto;}
+input[type="hidden"]{display:none;}
+.radio,.checkbox{padding-left:18px;}
+.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;}
+.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
+.radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;vertical-align:middle;}
+.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
+.controls>.radio.inline:first-child,.controls>.checkbox.inline:first-child{padding-top:0;}
+input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
+input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;}
+input[type="file"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.input-mini{width:60px;}
+.input-small{width:90px;}
+.input-medium{width:150px;}
+.input-large{width:210px;}
+.input-xlarge{width:270px;}
+.input-xxlarge{width:530px;}
+input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;}
+input.span1,textarea.span1,.uneditable-input.span1{width:50px;}
+input.span2,textarea.span2,.uneditable-input.span2{width:130px;}
+input.span3,textarea.span3,.uneditable-input.span3{width:210px;}
+input.span4,textarea.span4,.uneditable-input.span4{width:290px;}
+input.span5,textarea.span5,.uneditable-input.span5{width:370px;}
+input.span6,textarea.span6,.uneditable-input.span6{width:450px;}
+input.span7,textarea.span7,.uneditable-input.span7{width:530px;}
+input.span8,textarea.span8,.uneditable-input.span8{width:610px;}
+input.span9,textarea.span9,.uneditable-input.span9{width:690px;}
+input.span10,textarea.span10,.uneditable-input.span10{width:770px;}
+input.span11,textarea.span11,.uneditable-input.span11{width:850px;}
+input.span12,textarea.span12,.uneditable-input.span12{width:930px;}
+input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
+.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
+.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
+.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
+.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
+.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
+.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
+input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
+.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
+.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
+:-moz-placeholder{color:#999999;}
+::-webkit-input-placeholder{color:#999999;}
+.help-block{margin-top:5px;margin-bottom:0;color:#999999;}
+.help-inline{display:inline-block;*display:inline;*zoom:1;margin-bottom:9px;vertical-align:middle;padding-left:5px;}
+.input-prepend,.input-append{margin-bottom:5px;*zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";}
+.input-prepend:after,.input-append:after{clear:both;}
+.input-prepend input,.input-append input,.input-prepend .uneditable-input,.input-append .uneditable-input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;}
+.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
+.input-prepend .add-on,.input-append .add-on{float:left;display:block;width:auto;min-width:16px;height:18px;margin-right:-1px;padding:4px 5px;font-weight:normal;line-height:18px;color:#999999;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
+.input-prepend .add-on{*margin-top:1px;}
+.input-append input,.input-append .uneditable-input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-append .uneditable-input{border-right-color:#ccc;}
+.input-append .add-on{margin-right:0;margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-append input:first-child{*margin-left:-160px;}.input-append input:first-child+.add-on{*margin-left:-21px;}
+.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
+.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
+.form-search label,.form-inline label,.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{display:inline-block;}
+.form-search .input-append .add-on,.form-inline .input-prepend .add-on,.form-search .input-append .add-on,.form-inline .input-prepend .add-on{vertical-align:middle;}
+.control-group{margin-bottom:9px;}
+.form-horizontal legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;}
+.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";}
+.form-horizontal .control-group:after{clear:both;}
+.form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
+.form-horizontal .controls{margin-left:160px;}
+.form-horizontal .form-actions{padding-left:160px;}
+table{max-width:100%;border-collapse:collapse;border-spacing:0;}
+.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
+.table th{font-weight:bold;vertical-align:bottom;}
+.table td{vertical-align:top;}
+.table thead:first-child tr th,.table thead:first-child tr td{border-top:0;}
+.table tbody+tbody{border-top:2px solid #ddd;}
+.table-condensed th,.table-condensed td{padding:4px 5px;}
+.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;}
+.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
+.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
+.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
+.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
+.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
+table .span1{float:none;width:44px;margin-left:0;}
+table .span2{float:none;width:124px;margin-left:0;}
+table .span3{float:none;width:204px;margin-left:0;}
+table .span4{float:none;width:284px;margin-left:0;}
+table .span5{float:none;width:364px;margin-left:0;}
+table .span6{float:none;width:444px;margin-left:0;}
+table .span7{float:none;width:524px;margin-left:0;}
+table .span8{float:none;width:604px;margin-left:0;}
+table .span9{float:none;width:684px;margin-left:0;}
+table .span10{float:none;width:764px;margin-left:0;}
+table .span11{float:none;width:844px;margin-left:0;}
+table .span12{float:none;width:924px;margin-left:0;}
+[class^="icon-"]{display:inline-block;width:14px;height:14px;vertical-align:text-top;background-image:url(../img/glyphicons-halflings.png);background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child{*margin-left:0;}
+.icon-white{background-image:url(../img/glyphicons-halflings-white.png);}
+.icon-glass{background-position:0 0;}
+.icon-music{background-position:-24px 0;}
+.icon-search{background-position:-48px 0;}
+.icon-envelope{background-position:-72px 0;}
+.icon-heart{background-position:-96px 0;}
+.icon-star{background-position:-120px 0;}
+.icon-star-empty{background-position:-144px 0;}
+.icon-user{background-position:-168px 0;}
+.icon-film{background-position:-192px 0;}
+.icon-th-large{background-position:-216px 0;}
+.icon-th{background-position:-240px 0;}
+.icon-th-list{background-position:-264px 0;}
+.icon-ok{background-position:-288px 0;}
+.icon-remove{background-position:-312px 0;}
+.icon-zoom-in{background-position:-336px 0;}
+.icon-zoom-out{background-position:-360px 0;}
+.icon-off{background-position:-384px 0;}
+.icon-signal{background-position:-408px 0;}
+.icon-cog{background-position:-432px 0;}
+.icon-trash{background-position:-456px 0;}
+.icon-home{background-position:0 -24px;}
+.icon-file{background-position:-24px -24px;}
+.icon-time{background-position:-48px -24px;}
+.icon-road{background-position:-72px -24px;}
+.icon-download-alt{background-position:-96px -24px;}
+.icon-download{background-position:-120px -24px;}
+.icon-upload{background-position:-144px -24px;}
+.icon-inbox{background-position:-168px -24px;}
+.icon-play-circle{background-position:-192px -24px;}
+.icon-repeat{background-position:-216px -24px;}
+.icon-refresh{background-position:-240px -24px;}
+.icon-list-alt{background-position:-264px -24px;}
+.icon-lock{background-position:-287px -24px;}
+.icon-flag{background-position:-312px -24px;}
+.icon-headphones{background-position:-336px -24px;}
+.icon-volume-off{background-position:-360px -24px;}
+.icon-volume-down{background-position:-384px -24px;}
+.icon-volume-up{background-position:-408px -24px;}
+.icon-qrcode{background-position:-432px -24px;}
+.icon-barcode{background-position:-456px -24px;}
+.icon-tag{background-position:0 -48px;}
+.icon-tags{background-position:-25px -48px;}
+.icon-book{background-position:-48px -48px;}
+.icon-bookmark{background-position:-72px -48px;}
+.icon-print{background-position:-96px -48px;}
+.icon-camera{background-position:-120px -48px;}
+.icon-font{background-position:-144px -48px;}
+.icon-bold{background-position:-167px -48px;}
+.icon-italic{background-position:-192px -48px;}
+.icon-text-height{background-position:-216px -48px;}
+.icon-text-width{background-position:-240px -48px;}
+.icon-align-left{background-position:-264px -48px;}
+.icon-align-center{background-position:-288px -48px;}
+.icon-align-right{background-position:-312px -48px;}
+.icon-align-justify{background-position:-336px -48px;}
+.icon-list{background-position:-360px -48px;}
+.icon-indent-left{background-position:-384px -48px;}
+.icon-indent-right{background-position:-408px -48px;}
+.icon-facetime-video{background-position:-432px -48px;}
+.icon-picture{background-position:-456px -48px;}
+.icon-pencil{background-position:0 -72px;}
+.icon-map-marker{background-position:-24px -72px;}
+.icon-adjust{background-position:-48px -72px;}
+.icon-tint{background-position:-72px -72px;}
+.icon-edit{background-position:-96px -72px;}
+.icon-share{background-position:-120px -72px;}
+.icon-check{background-position:-144px -72px;}
+.icon-move{background-position:-168px -72px;}
+.icon-step-backward{background-position:-192px -72px;}
+.icon-fast-backward{background-position:-216px -72px;}
+.icon-backward{background-position:-240px -72px;}
+.icon-play{background-position:-264px -72px;}
+.icon-pause{background-position:-288px -72px;}
+.icon-stop{background-position:-312px -72px;}
+.icon-forward{background-position:-336px -72px;}
+.icon-fast-forward{background-position:-360px -72px;}
+.icon-step-forward{background-position:-384px -72px;}
+.icon-eject{background-position:-408px -72px;}
+.icon-chevron-left{background-position:-432px -72px;}
+.icon-chevron-right{background-position:-456px -72px;}
+.icon-plus-sign{background-position:0 -96px;}
+.icon-minus-sign{background-position:-24px -96px;}
+.icon-remove-sign{background-position:-48px -96px;}
+.icon-ok-sign{background-position:-72px -96px;}
+.icon-question-sign{background-position:-96px -96px;}
+.icon-info-sign{background-position:-120px -96px;}
+.icon-screenshot{background-position:-144px -96px;}
+.icon-remove-circle{background-position:-168px -96px;}
+.icon-ok-circle{background-position:-192px -96px;}
+.icon-ban-circle{background-position:-216px -96px;}
+.icon-arrow-left{background-position:-240px -96px;}
+.icon-arrow-right{background-position:-264px -96px;}
+.icon-arrow-up{background-position:-289px -96px;}
+.icon-arrow-down{background-position:-312px -96px;}
+.icon-share-alt{background-position:-336px -96px;}
+.icon-resize-full{background-position:-360px -96px;}
+.icon-resize-small{background-position:-384px -96px;}
+.icon-plus{background-position:-408px -96px;}
+.icon-minus{background-position:-433px -96px;}
+.icon-asterisk{background-position:-456px -96px;}
+.icon-exclamation-sign{background-position:0 -120px;}
+.icon-gift{background-position:-24px -120px;}
+.icon-leaf{background-position:-48px -120px;}
+.icon-fire{background-position:-72px -120px;}
+.icon-eye-open{background-position:-96px -120px;}
+.icon-eye-close{background-position:-120px -120px;}
+.icon-warning-sign{background-position:-144px -120px;}
+.icon-plane{background-position:-168px -120px;}
+.icon-calendar{background-position:-192px -120px;}
+.icon-random{background-position:-216px -120px;}
+.icon-comment{background-position:-240px -120px;}
+.icon-magnet{background-position:-264px -120px;}
+.icon-chevron-up{background-position:-288px -120px;}
+.icon-chevron-down{background-position:-313px -119px;}
+.icon-retweet{background-position:-336px -120px;}
+.icon-shopping-cart{background-position:-360px -120px;}
+.icon-folder-close{background-position:-384px -120px;}
+.icon-folder-open{background-position:-408px -120px;}
+.icon-resize-vertical{background-position:-432px -119px;}
+.icon-resize-horizontal{background-position:-456px -118px;}
+.dropdown{position:relative;}
+.dropdown-toggle{*margin-bottom:-3px;}
+.dropdown-toggle:active,.open .dropdown-toggle{outline:0;}
+.caret{display:inline-block;width:0;height:0;text-indent:-99999px;*text-indent:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"\2193";}
+.dropdown .caret{margin-top:8px;margin-left:2px;}
+.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);}
+.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.bottom-up{top:auto;bottom:100%;margin-bottom:2px;}
+.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;}
+.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;}
+.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
+.dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
+.dropdown.open .dropdown-menu{display:block;}
+.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
+.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
+.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
+.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;}
+.btn{display:inline-block;padding:4px 10px 4px;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:first-child{*margin-left:0;}
+.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
+.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;color:rgba(0, 0, 0, 0.5);outline:0;}
+.btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn-large .icon{margin-top:1px;}
+.btn-small{padding:5px 9px;font-size:11px;line-height:16px;}
+.btn-small .icon{margin-top:-1px;}
+.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
+.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active{color:rgba(255, 255, 255, 0.75);}
+.btn-primary{background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-ms-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(top, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0044cc;}
+.btn-primary:active,.btn-primary.active{background-color:#003399 \9;}
+.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;}
+.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;}
+.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;}
+.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;}
+.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;}
+.btn-success:active,.btn-success.active{background-color:#408140 \9;}
+.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;}
+.btn-info:active,.btn-info.active{background-color:#24748c \9;}
+button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;}
+button.btn.large,input[type="submit"].btn.large{*padding-top:7px;*padding-bottom:7px;}
+button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom:3px;}
+.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";}
+.btn-group:after{clear:both;}
+.btn-group:first-child{*margin-left:0;}
+.btn-group+.btn-group{margin-left:5px;}
+.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;}
+.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
+.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
+.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
+.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
+.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;}
+.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;}
+.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:5px;*padding-bottom:5px;}
+.btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn .caret{margin-top:7px;margin-left:0;}
+.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);}
+.btn-primary .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
+.btn-small .caret{margin-top:4px;}
+.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.alert,.alert-heading{color:#c09853;}
+.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;}
+.alert-success{background-color:#dff0d8;border-color:#d6e9c6;}
+.alert-success,.alert-success .alert-heading{color:#468847;}
+.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;}
+.alert-danger,.alert-error,.alert-danger .alert-heading,.alert-error .alert-heading{color:#b94a48;}
+.alert-info{background-color:#d9edf7;border-color:#bce8f1;}
+.alert-info,.alert-info .alert-heading{color:#3a87ad;}
+.alert-block{padding-top:14px;padding-bottom:14px;}
+.alert-block>p,.alert-block>ul{margin-bottom:0;}
+.alert-block p+p{margin-top:5px;}
+.nav{margin-left:0;margin-bottom:18px;list-style:none;}
+.nav>li>a{display:block;}
+.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
+.nav-list{padding-left:14px;padding-right:14px;margin-bottom:0;}
+.nav-list>li>a,.nav-list .nav-header{display:block;padding:3px 15px;margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
+.nav-list .nav-header{font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-transform:uppercase;}
+.nav-list>li+.nav-header{margin-top:9px;}
+.nav-list .active>a{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
+.nav-list .icon{margin-right:2px;}
+.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";}
+.nav-tabs:after,.nav-pills:after{clear:both;}
+.nav-tabs>li,.nav-pills>li{float:left;}
+.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
+.nav-tabs{border-bottom:1px solid #ddd;}
+.nav-tabs>li{margin-bottom:-1px;}
+.nav-tabs>li>a{padding-top:9px;padding-bottom:9px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
+.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
+.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.nav-pills .active>a,.nav-pills .active>a:hover{color:#ffffff;background-color:#0088cc;}
+.nav-stacked>li{float:none;}
+.nav-stacked>li>a{margin-right:0;}
+.nav-tabs.nav-stacked{border-bottom:0;}
+.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;}
+.nav-pills.nav-stacked>li>a{margin-bottom:3px;}
+.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;}
+.nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{margin-top:1px;border-width:1px;}
+.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
+.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;}
+.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;}
+.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;}
+.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;}
+.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
+.tabs-stacked .open>a:hover{border-color:#999999;}
+.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
+.tabbable:after{clear:both;}
+.tabs-below .nav-tabs,.tabs-right .nav-tabs,.tabs-left .nav-tabs{border-bottom:0;}
+.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
+.tab-content>.active,.pill-content>.active{display:block;}
+.tabs-below .nav-tabs{border-top:1px solid #ddd;}
+.tabs-below .nav-tabs>li{margin-top:-1px;margin-bottom:0;}
+.tabs-below .nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
+.tabs-below .nav-tabs .active>a,.tabs-below .nav-tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;}
+.tabs-left .nav-tabs>li,.tabs-right .nav-tabs>li{float:none;}
+.tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
+.tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
+.tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
+.tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;}
+.tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
+.tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
+.tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;}
+.navbar{overflow:visible;margin-bottom:18px;}
+.navbar-inner{padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;}
+.btn-navbar:active,.btn-navbar.active{background-color:#080808 \9;}
+.btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);}
+.btn-navbar .icon-bar+.icon-bar{margin-top:3px;}
+.nav-collapse.collapse{height:auto;}
+.navbar .brand:hover{text-decoration:none;}
+.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
+.navbar .navbar-text{margin-bottom:0;line-height:40px;color:#999999;}.navbar .navbar-text a:hover{color:#ffffff;background-color:transparent;}
+.navbar .btn,.navbar .btn-group{margin-top:5px;}
+.navbar .btn-group .btn{margin-top:0;}
+.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";}
+.navbar-form:after{clear:both;}
+.navbar-form input,.navbar-form select{display:inline-block;margin-top:5px;margin-bottom:0;}
+.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;}
+.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
+.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#666;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
+.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
+.navbar-fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030;}
+.navbar-fixed-top .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
+.navbar .nav.pull-right{float:right;}
+.navbar .nav>li{display:block;float:left;}
+.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
+.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;background-color:rgba(0, 0, 0, 0.5);}
+.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;}
+.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
+.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
+.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;}
+.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);}
+.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
+.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
+.navbar .nav.pull-right .dropdown-menu{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
+.navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
+.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
+.breadcrumb .divider{padding:0 5px;color:#999999;}
+.breadcrumb .active a{color:#333333;}
+.pagination{height:36px;margin:18px 0;}
+.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
+.pagination li{display:inline;}
+.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;}
+.pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
+.pagination .active a{color:#999999;cursor:default;}
+.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
+.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.pagination-centered{text-align:center;}
+.pagination-right{text-align:right;}
+.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
+.pager:after{clear:both;}
+.pager li{display:inline;}
+.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.pager a:hover{text-decoration:none;background-color:#f5f5f5;}
+.pager .next a{float:right;}
+.pager .previous a{float:left;}
+.modal-open .dropdown-menu{z-index:2050;}
+.modal-open .dropdown.open{*z-index:2050;}
+.modal-open .popover{z-index:2060;}
+.modal-open .tooltip{z-index:2070;}
+.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
+.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
+.modal{position:fixed;top:50%;left:50%;z-index:1050;max-height:500px;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
+.modal.fade.in{top:50%;}
+.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
+.modal-body{padding:15px;}
+.modal-footer{padding:14px 15px 15px;margin-bottom:0;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
+.modal-footer:after{clear:both;}
+.modal-footer .btn{float:right;margin-left:5px;margin-bottom:0;}
+.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
+.tooltip.top{margin-top:-2px;}
+.tooltip.right{margin-left:2px;}
+.tooltip.bottom{margin-top:2px;}
+.tooltip.left{margin-left:-2px;}
+.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tooltip-arrow{position:absolute;width:0;height:0;}
+.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
+.popover.right{margin-left:5px;}
+.popover.bottom{margin-top:5px;}
+.popover.left{margin-left:-5px;}
+.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.popover .arrow{position:absolute;width:0;height:0;}
+.popover-inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
+.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
+.popover-content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;}
+.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
+.thumbnails:after{clear:both;}
+.thumbnails>li{float:left;margin:0 0 18px 20px;}
+.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}
+a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
+.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;}
+.thumbnail .caption{padding:9px;}
+.label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.label-important{background-color:#b94a48;}
+.label-warning{background-color:#f89406;}
+.label-success{background-color:#468847;}
+.label-info{background-color:#3a87ad;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
+.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
+.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
+.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
+.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
+.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.accordion{margin-bottom:18px;}
+.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion-heading{border-bottom:0;}
+.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
+.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
+.carousel{position:relative;margin-bottom:18px;line-height:1;}
+.carousel-inner{overflow:hidden;width:100%;position:relative;}
+.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
+.carousel .item>img{display:block;line-height:1;}
+.carousel .active,.carousel .next,.carousel .prev{display:block;}
+.carousel .active{left:0;}
+.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
+.carousel .next{left:100%;}
+.carousel .prev{left:-100%;}
+.carousel .next.left,.carousel .prev.right{left:0;}
+.carousel .active.left{left:-100%;}
+.carousel .active.right{left:100%;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;}
+.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
+.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
+.carousel-caption h4,.carousel-caption p{color:#ffffff;}
+.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
+.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}
diff --git a/src/main/resources/static/stomp-ws/example/css/bootstrap.min.responsive.css b/src/main/resources/static/stomp-ws/example/css/bootstrap.min.responsive.css
new file mode 100644
index 0000000000000000000000000000000000000000..bc3f2ab71a8268a3b1b81abd8b69598882dedf0b
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/example/css/bootstrap.min.responsive.css
@@ -0,0 +1,3 @@
+
+.hidden{display:none;visibility:hidden;}
+@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:18px;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} .input-prepend input[class*="span"],.input-append input[class*="span"]{width:auto;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .modal{position:absolute;top:10px;left:10px;right:10px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (max-width:768px){.container{width:auto;padding:0 20px;} .row-fluid{width:100%;} .row{margin-left:0;} .row>[class*="span"],.row-fluid>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:980px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} .span1{width:42px;} .span2{width:104px;} .span3{width:166px;} .span4{width:228px;} .span5{width:290px;} .span6{width:352px;} .span7{width:414px;} .span8{width:476px;} .span9{width:538px;} .span10{width:600px;} .span11{width:662px;} .span12,.container{width:724px;} .offset1{margin-left:82px;} .offset2{margin-left:144px;} .offset3{margin-left:206px;} .offset4{margin-left:268px;} .offset5{margin-left:330px;} .offset6{margin-left:392px;} .offset7{margin-left:454px;} .offset8{margin-left:516px;} .offset9{margin-left:578px;} .offset10{margin-left:640px;} .offset11{margin-left:702px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid>[class*="span"]{float:left;margin-left:2.762430939%;} .row-fluid>[class*="span"]:first-child{margin-left:0;} .row-fluid .span1{width:5.801104972%;} .row-fluid .span2{width:14.364640883%;} .row-fluid .span3{width:22.928176794%;} .row-fluid .span4{width:31.491712705%;} .row-fluid .span5{width:40.055248616%;} .row-fluid .span6{width:48.618784527%;} .row-fluid .span7{width:57.182320438000005%;} .row-fluid .span8{width:65.74585634900001%;} .row-fluid .span9{width:74.30939226%;} .row-fluid .span10{width:82.87292817100001%;} .row-fluid .span11{width:91.436464082%;} .row-fluid .span12{width:99.999999993%;} input.span1,textarea.span1,.uneditable-input.span1{width:32px;} input.span2,textarea.span2,.uneditable-input.span2{width:94px;} input.span3,textarea.span3,.uneditable-input.span3{width:156px;} input.span4,textarea.span4,.uneditable-input.span4{width:218px;} input.span5,textarea.span5,.uneditable-input.span5{width:280px;} input.span6,textarea.span6,.uneditable-input.span6{width:342px;} input.span7,textarea.span7,.uneditable-input.span7{width:404px;} input.span8,textarea.span8,.uneditable-input.span8{width:466px;} input.span9,textarea.span9,.uneditable-input.span9{width:528px;} input.span10,textarea.span10,.uneditable-input.span10{width:590px;} input.span11,textarea.span11,.uneditable-input.span11{width:652px;} input.span12,textarea.span12,.uneditable-input.span12{width:714px;}}@media (max-width:980px){body{padding-top:0;} .navbar-fixed-top{position:static;margin-bottom:18px;} .navbar-fixed-top .navbar-inner{padding:5px;} .navbar .container{width:auto;padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .navbar .nav-collapse{clear:left;} .navbar .nav{float:none;margin:0 0 9px;} .navbar .nav>li{float:none;} .navbar .nav>li>a{margin-bottom:2px;} .navbar .nav>.divider-vertical{display:none;} .navbar .nav>li>a,.navbar .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .navbar .dropdown-menu li+li a{margin-bottom:2px;} .navbar .nav>li>a:hover,.navbar .dropdown-menu a:hover{background-color:#222222;} .navbar .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .dropdown-menu:before,.navbar .dropdown-menu:after{display:none;} .navbar .dropdown-menu .divider{display:none;} .navbar-form,.navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222222;border-bottom:1px solid #222222;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);} .navbar .nav.pull-right{float:none;margin-left:0;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;} .btn-navbar{display:block;} .nav-collapse{overflow:hidden;height:0;}}@media (min-width:980px){.nav-collapse.collapse{height:auto !important;}}@media (min-width:1200px){.row{margin-left:-30px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:30px;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12,.container{width:1170px;} .offset1{margin-left:130px;} .offset2{margin-left:230px;} .offset3{margin-left:330px;} .offset4{margin-left:430px;} .offset5{margin-left:530px;} .offset6{margin-left:630px;} .offset7{margin-left:730px;} .offset8{margin-left:830px;} .offset9{margin-left:930px;} .offset10{margin-left:1030px;} .offset11{margin-left:1130px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid>[class*="span"]{float:left;margin-left:2.564102564%;} .row-fluid>[class*="span"]:first-child{margin-left:0;} .row-fluid .span1{width:5.982905983%;} .row-fluid .span2{width:14.529914530000001%;} .row-fluid .span3{width:23.076923077%;} .row-fluid .span4{width:31.623931624%;} .row-fluid .span5{width:40.170940171000005%;} .row-fluid .span6{width:48.717948718%;} .row-fluid .span7{width:57.264957265%;} .row-fluid .span8{width:65.81196581200001%;} .row-fluid .span9{width:74.358974359%;} .row-fluid .span10{width:82.905982906%;} .row-fluid .span11{width:91.45299145300001%;} .row-fluid .span12{width:100%;} input.span1,textarea.span1,.uneditable-input.span1{width:60px;} input.span2,textarea.span2,.uneditable-input.span2{width:160px;} input.span3,textarea.span3,.uneditable-input.span3{width:260px;} input.span4,textarea.span4,.uneditable-input.span4{width:360px;} input.span5,textarea.span5,.uneditable-input.span5{width:460px;} input.span6,textarea.span6,.uneditable-input.span6{width:560px;} input.span7,textarea.span7,.uneditable-input.span7{width:660px;} input.span8,textarea.span8,.uneditable-input.span8{width:760px;} input.span9,textarea.span9,.uneditable-input.span9{width:860px;} input.span10,textarea.span10,.uneditable-input.span10{width:960px;} input.span11,textarea.span11,.uneditable-input.span11{width:1060px;} input.span12,textarea.span12,.uneditable-input.span12{width:1160px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;}}
diff --git a/src/main/resources/static/stomp-ws/example/index.html b/src/main/resources/static/stomp-ws/example/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..2ad898cc9c530b6c1264cf0e71607fd53dd5c038
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/example/index.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Examples Using STOMP Over WebSockets</title>
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link href="css/bootstrap.min.css" rel="stylesheet">
+    <link href="css/bootstrap.min.responsive.css" rel="stylesheet">
+    <style type="text/css">
+      body { padding-top: 80px; }
+    </style>
+  </head>
+
+  <body>
+    
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="#">Examples Using Stomp Over WebSocket</a>
+        </div>
+      </div>
+    </div>
+
+    <div class="container-fluid">
+      <div class="row-fluid">
+        <p>The <a href="/chat/">Chat example</a> shows how to use <code>stomp.js</code> to send and receive STOMP messages directly from the Web browser.</p>
+        <p>The <a href="/webworker/">WebWorker example</a> uses a WebWorker instead to send and receive STOMP messages from the broker.</p>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/src/main/resources/static/stomp-ws/example/server.js b/src/main/resources/static/stomp-ws/example/server.js
new file mode 100644
index 0000000000000000000000000000000000000000..4920dba7c0451d50d8a5b904b231f6f550e0a569
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/example/server.js
@@ -0,0 +1,8 @@
+var connect = require('connect');
+
+connect()
+  .use(connect.logger('dev'))
+  .use(connect.static(__dirname))
+  .use(connect.static(__dirname + '/../lib/'))
+  .listen(8080);
+console.log('Server running at http://0.0.0.0:8080/');
diff --git a/src/main/resources/static/stomp-ws/example/webworker/README.md b/src/main/resources/static/stomp-ws/example/webworker/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..0b1f8946069678718cecb3d750428d72f443eeef
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/example/webworker/README.md
@@ -0,0 +1,14 @@
+#WebWorker Example Using STOMP Over WebSocket
+
+This example uses a WebWorker to send and receive STOMP messages from the broker.
+
+The main page creates a WebWorker and post all the configuration to connect to the STOMP broker and send a text message.
+When the WebWorker will receive a message, it will inform the main page using its `postMessage` method. 
+
+##Running the Example
+
+run in the `example`parent directory:
+
+    $ node server.js
+  
+and go to [/webworker/](http://localhost:8080/webworker/).
diff --git a/src/main/resources/static/stomp-ws/example/webworker/index.html b/src/main/resources/static/stomp-ws/example/webworker/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..96697189430afbc73fc2d5348d3e2d09d0349441
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/example/webworker/index.html
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>WebWorker Example Using STOMP Over WebSocket</title>
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link href="/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/css/bootstrap.min.responsive.css" rel="stylesheet">
+    <style type="text/css">
+      body { padding-top: 40px; }
+    </style>
+  </head>
+
+  <body>
+    
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="#">WebWorker Example Using STOMP Over WebSockets</a>
+        </div>
+      </div>
+    </div>
+
+    <div class="container-fluid">
+      <div class="row-fluid">
+        <div class="span12">
+          <div id="connect">
+            <div class="page-header">
+              <h2>Server Login</h2>
+            </div>
+            <form class="form-horizontal" id='connect_form'>
+              <fieldset>
+                <div class="control-group">
+                  <label>WebSocket URL</label>
+                  <div class="controls">
+                    <input name=url id='connect_url' value='ws://localhost:61623' type="text">
+                  </div>
+                </div>
+                <div class="control-group">
+                  <label>User</label>
+                  <div class="controls">
+                    <input id='connect_login' placeholder="User Login" value="admin" type="text">
+                  </div>
+                </div>
+                <div class="control-group">
+                  <label>Password</label>
+                  <div class="controls">
+                    <input id='connect_passcode' placeholder="User Password" value="password" type="password">
+                  </div>
+                </div>
+                <div class="control-group">
+                  <label>Destination</label>
+                  <div class="controls">
+                    <input id='destination' placeholder="Destination" value="/topic/chat.general" type="text">
+                  </div>
+                </div>
+                <div class="control-group">
+                  <label>Text</label>
+                  <div class="controls">
+                    <input id='text' placeholder="Text" value="Hello, World!" type="text">
+                  </div>
+                </div>
+                <div class="form-actions">
+                  <button id='connect_submit' type="submit" class="btn btn-large btn-primary">Send</button>
+                </div>
+              </fieldset>
+            </form>
+          </div>          
+          <div id="messages">
+            <h2>Messages</h2>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Scripts placed at the end of the document so the pages load faster -->
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+    <script>//<![CDATA[
+    $(document).ready(function() {
+      if(window.WebSocket) {
+
+        $('#connect_form').submit(function() {
+          var url = $("#connect_url").val();
+          var login = $("#connect_login").val();
+          var passcode = $("#connect_passcode").val();
+          var destination = $("#destination").val();
+          var text = $("#text").val();
+
+          var worker = new Worker("webworker.js");
+          worker.onmessage = function (event) {
+            $("#messages").append("<p>" + event.data + "</p>\n");
+          };
+
+          worker.postMessage({
+            url: url,
+            login: login,
+            passcode: passcode,
+            destination: destination,
+            text: text
+          });
+          return false;
+        });
+      } else {
+        $("#connect").html("\
+            <h1>Get a new Web Browser!</h1>\
+            <p>\
+            Your browser does not support WebSockets. This example will not work properly.<br>\
+            Please use a Web Browser with WebSockets support (WebKit or Google Chrome).\
+            </p>\
+        ");
+      }
+    });
+    //]]></script>
+
+  </body>
+</html>
diff --git a/src/main/resources/static/stomp-ws/example/webworker/webworker.js b/src/main/resources/static/stomp-ws/example/webworker/webworker.js
new file mode 100644
index 0000000000000000000000000000000000000000..752f809990111a0773baf289536ef0ffe06a6983
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/example/webworker/webworker.js
@@ -0,0 +1,28 @@
+importScripts ("/stomp.js");
+
+// *WebWorker* onmessage implementation
+onmessage = function (event) {
+  var url = event.data.url;
+  var login = event.data.login;
+  var passcode = event.data.passcode;
+  var destination = event.data.destination;
+  var text = event.data.text;
+
+  // create the Stomp client
+  var client = Stomp.client(url);
+  
+  // connect to the server
+  client.connect(login, passcode, function(frame) {
+    // upon connection, subscribe to the destination
+    var sub = client.subscribe(destination, function(message) {
+      // when a message is received, post it to the current WebWorker
+      postMessage("WebWorker: " + message.body);
+      //... unsubscribe from the destination
+      sub.unsubscribe();
+      //... and disconnect from the server
+      client.disconnect();
+    });
+    // send the text to the destination
+    client.send(destination, {}, text);
+  });
+};
diff --git a/src/main/resources/static/stomp-ws/index.js b/src/main/resources/static/stomp-ws/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..42c43abef2e2ea1da11cb3cfc6b955cbd70fce96
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/index.js
@@ -0,0 +1,15 @@
+// Copyright (C) 2013 [Jeff Mesnil](http://jmesnil.net/)
+//
+//   Stomp Over WebSocket http://www.jmesnil.net/stomp-websocket/doc/ | Apache License V2.0
+//
+// The library can be used in node.js app to connect to STOMP brokers over TCP 
+// or Web sockets.
+
+// Root of the `stompjs module`
+
+var Stomp = require('./lib/stomp.js');
+var StompNode = require('./lib/stomp-node.js');
+
+module.exports = Stomp.Stomp;
+module.exports.overTCP = StompNode.overTCP;
+module.exports.overWS = StompNode.overWS;
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/package.json b/src/main/resources/static/stomp-ws/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..eb729460e3e5dc65e4ca045ecee0ac6fbacd0c77
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "stompjs",
+  "version": "2.3.4-next",
+  "author": "Jeff Mesnil <jmesnil@gmail.com>",
+  "description": "STOMP for JavaScript apps (Web browser & node.js)",
+  "scripts": {
+    "build": "cake build",
+    "test": "coffeelint -f coffeelint.json -r src && cake test"
+  },
+  "devDependencies": {
+    "coffee-script": "latest",
+    "coffeelint": "latest",
+    "jasmine-node": "latest",
+    "uglify-js": "latest",
+    "docco": "latest",
+    "connect": "latest"
+  },
+  "optionalDependencies": {
+    "websocket": "latest"
+  },
+  "directories": {
+    "doc": "doc",
+    "example": "example",
+    "test": "test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jmesnil/stomp-websocket"
+  },
+  "keywords": [
+    "STOMP",
+    "Web sockets",
+    "messaging",
+    "queue"
+  ],
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/jmesnil/stomp-websocket/issues"
+  }
+}
diff --git a/src/main/resources/static/stomp-ws/src/stomp-node.coffee b/src/main/resources/static/stomp-ws/src/stomp-node.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..1ba08625359af203ade9b13f9c0d78a5d631e992
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/src/stomp-node.coffee
@@ -0,0 +1,92 @@
+# * Copyright (C) 2013 [Jeff Mesnil](http://jmesnil.net/)
+#
+# The library can be used in node.js app to connect to STOMP brokers over TCP
+# or Web sockets.
+
+###
+   Stomp Over WebSocket http://www.jmesnil.net/stomp-websocket/doc/ | Apache License V2.0
+
+   Copyright (C) 2013 [Jeff Mesnil](http://jmesnil.net/)
+###
+
+Stomp = require('./stomp')
+net   = require('net')
+
+# in node.js apps, `setInterval` and `clearInterval` methods used to handle
+# hear-beats are implemented using node.js Timers
+Stomp.Stomp.setInterval = (interval, f) ->
+  setInterval f, interval
+Stomp.Stomp.clearInterval = (id) ->
+  clearInterval id
+
+# wrap a TCP socket (provided by node.js's net module) in a "Web Socket"-like
+# object
+wrapTCP = (port, host) ->
+
+  # the raw TCP socket
+  socket = null
+
+  # the "Web Socket"-like object expected by stomp.js
+  ws = {
+    url: 'tcp:// ' + host + ':' + port
+    send: (d) -> socket.write(d)
+    close: -> socket.end()
+  }
+
+  socket = net.connect port, host, (e) -> ws.onopen()
+  socket.on 'error', (e) -> ws.onclose?(e)
+  socket.on 'close', (e) -> ws.onclose?(e)
+  socket.on 'data', (data) ->
+    event = {
+      'data': data.toString()
+    }
+    ws.onmessage(event)
+
+  return ws
+
+# wrap a Web Socket connection (provided by the websocket npm module) in a "Web
+# Socket"-like object
+wrapWS = (url) ->
+
+  WebSocketClient = require('websocket').client
+
+  # the underlying connection that will be wrapped
+  connection = null
+
+  # the "Web Socket"-like object expected by stomp.js
+  ws = {
+    url: url
+    send: (d) -> connection.sendUTF(d)
+    close: ->connection.close()
+  }
+
+  socket = new WebSocketClient()
+  socket.on 'connect', (conn) ->
+    connection = conn
+    ws.onopen()
+    connection.on 'error', (error) -> ws.onclose?(error)
+    connection.on 'close', -> ws.onclose?()
+    connection.on 'message', (message) ->
+      if message.type == 'utf8'
+        event = {
+          'data': message.utf8Data
+        }
+        ws.onmessage(event)
+
+  socket.connect url
+  return ws
+
+# This method can be used by node.js app to connect to a STOMP broker over a
+# TCP socket
+overTCP = (host, port) ->
+  socket = wrapTCP port, host
+  Stomp.Stomp.over socket
+
+# This method can be used by node.js app to connect to a STOMP broker over a
+# Web socket
+overWS = (url) ->
+  socket = wrapWS url
+  Stomp.Stomp.over socket
+
+exports.overTCP = overTCP
+exports.overWS = overWS
diff --git a/src/main/resources/static/stomp-ws/src/stomp-node.orig.js b/src/main/resources/static/stomp-ws/src/stomp-node.orig.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce68ee34c380d71ea39d857d425a039b63841398
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/src/stomp-node.orig.js
@@ -0,0 +1,100 @@
+var Stomp = require("./stomp");
+var net   = require('net');
+
+var wrapTCP = function(port, host) {
+  // node.js net.Socket;
+  var socket;
+
+  // Web Socket-like object
+  var ws = {
+    url: 'tcp:// ' + host + ':' + port,
+    send: function(d) {
+      socket.write(d);
+    },
+    close: function() {
+      socket.end();
+    }
+  };
+
+  socket = net.connect(port, host, function(e) {
+    ws.onopen();
+  });
+  socket.on('error', function(e) {
+    // handler can be null if the ws is properly closed
+    if (ws.onclose) {
+      ws.onclose(e);
+    }
+  });
+  socket.on('close', function(e) {
+    // handler can be null if the ws is properly closed
+    if (ws.onclose) {
+      ws.onclose();
+    }
+  });
+  socket.on('data', function(data) {
+    // wrap the data in an event object
+    var event = {
+      'data': data.toString()
+    };
+    ws.onmessage(event);
+  });
+  
+  return ws;
+};
+
+var wrapWS = function(url) {
+  var WebSocketClient = require('websocket').client;
+
+  var connection;
+
+  var ws = {
+    url: url,
+    send : function(d) {
+      connection.sendUTF(d);
+    },
+    close : function() {
+      connection.close();
+    }
+  };
+  
+  var socket = new WebSocketClient();
+  socket.on('connect', function(conn) {
+      connection = conn;
+      ws.onopen();
+      connection.on('error', function(error) {
+        if (ws.onclose) {
+          ws.onclose(error);
+        }
+      });
+      connection.on('close', function() {
+        if (ws.onclose) {
+          ws.onclose();
+        }
+      });
+      connection.on('message', function(message) {
+          if (message.type === 'utf8') {
+            // wrap the data in an event object
+            var event = {
+              'data': message.utf8Data
+            };
+            ws.onmessage(event);
+          }
+      });
+  });
+
+  socket.connect(url);
+  return ws;
+}
+
+var overTCP = function(host, port) {
+  var socket = wrapTCP(port, host);
+  return Stomp.Stomp.over(socket);
+}
+
+var overWS= function(url) {
+  var socket = wrapWS(url);
+  return Stomp.Stomp.over(socket);
+}
+
+exports.overTCP = overTCP;
+exports.overWS = overWS;
diff --git a/src/main/resources/static/stomp-ws/src/stomp.coffee b/src/main/resources/static/stomp-ws/src/stomp.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..69788a90e9a6f395cf07e947594df7e9eff30dcc
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/src/stomp.coffee
@@ -0,0 +1,527 @@
+
+# **STOMP Over Web Socket** is a JavaScript STOMP Client using
+# [HTML5 Web Sockets API](http://www.w3.org/TR/websockets).
+#
+# * Copyright (C) 2010-2012 [Jeff Mesnil](http://jmesnil.net/)
+# * Copyright (C) 2012 [FuseSource, Inc.](http://fusesource.com)
+#
+# This library supports:
+#
+# * [STOMP 1.0](http://stomp.github.com/stomp-specification-1.0.html)
+# * [STOMP 1.1](http://stomp.github.com/stomp-specification-1.1.html)
+#
+# The library is accessed through the `Stomp` object that is set on the `window`
+# when running in a Web browser.
+
+###
+   Stomp Over WebSocket http://www.jmesnil.net/stomp-websocket/doc/ | Apache License V2.0
+
+   Copyright (C) 2010-2013 [Jeff Mesnil](http://jmesnil.net/)
+   Copyright (C) 2012 [FuseSource, Inc.](http://fusesource.com)
+###
+
+# Define constants for bytes used throughout the code.
+Byte =
+  # LINEFEED byte (octet 10)
+  LF: '\x0A'
+  # NULL byte (octet 0)
+  NULL: '\x00'
+
+# ##[STOMP Frame](http://stomp.github.com/stomp-specification-1.1.html#STOMP_Frames) Class
+class Frame
+  # Frame constructor
+  constructor: (@command, @headers={}, @body='') ->
+
+  # Provides a textual representation of the frame
+  # suitable to be sent to the server
+  toString: ->
+    lines = [@command]
+    skipContentLength = if (@headers['content-length'] == false) then true else false
+    delete @headers['content-length'] if skipContentLength
+
+    for own name, value of @headers
+      lines.push("#{name}:#{value}")
+    if @body && !skipContentLength
+      lines.push("content-length:#{Frame.sizeOfUTF8(@body)}")
+    lines.push(Byte.LF + @body)
+    return lines.join(Byte.LF)
+
+  # Compute the size of a UTF-8 string by counting its number of bytes
+  # (and not the number of characters composing the string)
+  @sizeOfUTF8: (s)->
+    if s
+      encodeURI(s).match(/%..|./g).length
+    else
+      0
+
+  # Unmarshall a single STOMP frame from a `data` string
+  unmarshallSingle= (data) ->
+    # search for 2 consecutives LF byte to split the command
+    # and headers from the body
+    divider = data.search(///#{Byte.LF}#{Byte.LF}///)
+    headerLines = data.substring(0, divider).split(Byte.LF)
+    command = headerLines.shift()
+    headers = {}
+    # utility function to trim any whitespace before and after a string
+    trim= (str) ->
+      str.replace(/^\s+|\s+$/g,'')
+    # Parse headers in reverse order so that for repeated headers, the 1st
+    # value is used
+    for line in headerLines.reverse()
+      idx = line.indexOf(':')
+      headers[trim(line.substring(0, idx))] = trim(line.substring(idx + 1))
+    # Parse body
+    # check for content-length or  topping at the first NULL byte found.
+    body = ''
+    # skip the 2 LF bytes that divides the headers from the body
+    start = divider + 2
+    if headers['content-length']
+      len = parseInt headers['content-length']
+      body = ('' + data).substring(start, start + len)
+    else
+      chr = null
+      for i in [start...data.length]
+        chr = data.charAt(i)
+        break if chr is Byte.NULL
+        body += chr
+    return new Frame(command, headers, body)
+
+  # Split the data before unmarshalling every single STOMP frame.
+  # Web socket servers can send multiple frames in a single websocket message.
+  # If the message size exceeds the websocket message size, then a single
+  # frame can be fragmented across multiple messages.
+  #
+  # `datas` is a string.
+  #
+  # returns an *array* of Frame objects
+  @unmarshall: (datas) ->
+    # Ugly list comprehension to split and unmarshall *multiple STOMP frames*
+    # contained in a *single WebSocket frame*.
+    # The data is split when a NULL byte (followed by zero or many LF bytes) is
+    # found
+    frames = datas.split(///#{Byte.NULL}#{Byte.LF}*///)
+
+    r =
+      frames:  []
+      partial: ''
+    r.frames = (unmarshallSingle(frame) for frame in frames[0..-2])
+
+    # If this contains a final full message or just a acknowledgement of a PING
+    # without any other content, process this frame, otherwise return the
+    # contents of the buffer to the caller.
+    last_frame = frames[-1..][0]
+
+    if last_frame is Byte.LF or (last_frame.search ///#{Byte.NULL}#{Byte.LF}*$///) isnt -1
+      r.frames.push(unmarshallSingle(last_frame))
+    else
+      r.partial = last_frame
+    return r
+
+  # Marshall a Stomp frame
+  @marshall: (command, headers, body) ->
+    frame = new Frame(command, headers, body)
+    return frame.toString() + Byte.NULL
+
+# ##STOMP Client Class
+#
+# All STOMP protocol is exposed as methods of this class (`connect()`,
+# `send()`, etc.)
+class Client
+  constructor: (@ws) ->
+    @ws.binaryType = "arraybuffer"
+    # used to index subscribers
+    @counter = 0
+    @connected = false
+    # Heartbeat properties of the client
+    @heartbeat = {
+      # send heartbeat every 10s by default (value is in ms)
+      outgoing: 10000
+      # expect to receive server heartbeat at least every 10s by default
+      # (value in ms)
+      incoming: 10000
+    }
+    # maximum *WebSocket* frame size sent by the client. If the STOMP frame
+    # is bigger than this value, the STOMP frame will be sent using multiple
+    # WebSocket frames (default is 16KiB)
+    @maxWebSocketFrameSize = 16*1024
+    # subscription callbacks indexed by subscriber's ID
+    @subscriptions = {}
+    @partialData = ''
+
+  # ### Debugging
+  #
+  # By default, debug messages are logged in the window's console if it is defined.
+  # This method is called for every actual transmission of the STOMP frames over the
+  # WebSocket.
+  #
+  # It is possible to set a `debug(message)` method
+  # on a client instance to handle differently the debug messages:
+  #
+  #     client.debug = function(str) {
+  #         // append the debug log to a #debug div
+  #         $("#debug").append(str + "\n");
+  #     };
+  debug: (message) ->
+    window?.console?.log message
+      
+  # Utility method to get the current timestamp (Date.now is not defined in IE8)
+  now= ->
+    if Date.now then Date.now() else new Date().valueOf
+  
+  # Base method to transmit any stomp frame
+  _transmit: (command, headers, body) ->
+    out = Frame.marshall(command, headers, body)
+    @debug? ">>> " + out
+    # if necessary, split the *STOMP* frame to send it on many smaller
+    # *WebSocket* frames
+    while(true)
+      if out.length > @maxWebSocketFrameSize
+        @ws.send(out.substring(0, @maxWebSocketFrameSize))
+        out = out.substring(@maxWebSocketFrameSize)
+        @debug? "remaining = " + out.length
+      else
+        return @ws.send(out)
+
+  # Heart-beat negotiation
+  _setupHeartbeat: (headers) ->
+    return unless headers.version in [Stomp.VERSIONS.V1_1, Stomp.VERSIONS.V1_2]
+
+    # heart-beat header received from the server looks like:
+    #
+    #     heart-beat: sx, sy
+    [serverOutgoing, serverIncoming] = (parseInt(v) for v in headers['heart-beat'].split(","))
+
+    unless @heartbeat.outgoing == 0 or serverIncoming == 0
+      ttl = Math.max(@heartbeat.outgoing, serverIncoming)
+      @debug? "send PING every #{ttl}ms"
+      # The `Stomp.setInterval` is a wrapper to handle regular callback
+      # that depends on the runtime environment (Web browser or node.js app)
+      @pinger = Stomp.setInterval ttl, =>
+        @ws.send Byte.LF
+        @debug? ">>> PING"
+
+    unless @heartbeat.incoming == 0 or serverOutgoing == 0
+      ttl = Math.max(@heartbeat.incoming, serverOutgoing)
+      @debug? "check PONG every #{ttl}ms"
+      @ponger = Stomp.setInterval ttl, =>
+        delta = now() - @serverActivity
+        # We wait twice the TTL to be flexible on window's setInterval calls
+        if delta > ttl * 2
+          @debug? "did not receive server activity for the last #{delta}ms"
+          @ws.close()
+
+  # parse the arguments number and type to find the headers, connectCallback and
+  # (eventually undefined) errorCallback
+  _parseConnect: (args...) ->
+    headers = {}
+    switch args.length
+      when 2
+        [headers, connectCallback] = args
+      when 3
+        if args[1] instanceof Function
+          [headers, connectCallback, errorCallback] = args
+        else
+          [headers.login, headers.passcode, connectCallback] = args
+      when 4
+        [headers.login, headers.passcode, connectCallback, errorCallback] = args
+      else
+        [headers.login, headers.passcode, connectCallback, errorCallback, headers.host] = args
+
+    [headers, connectCallback, errorCallback]
+
+  # [CONNECT Frame](http://stomp.github.com/stomp-specification-1.1.html#CONNECT_or_STOMP_Frame)
+  #
+  # The `connect` method accepts different number of arguments and types:
+  #
+  # * `connect(headers, connectCallback)`
+  # * `connect(headers, connectCallback, errorCallback)`
+  # * `connect(login, passcode, connectCallback)`
+  # * `connect(login, passcode, connectCallback, errorCallback)`
+  # * `connect(login, passcode, connectCallback, errorCallback, host)`
+  #
+  # The errorCallback is optional and the 2 first forms allow to pass other
+  # headers in addition to `client`, `passcode` and `host`.
+  connect: (args...) ->
+    out = @_parseConnect(args...)
+    [headers, @connectCallback, errorCallback] = out
+    @debug? "Opening Web Socket..."
+    @ws.onmessage = (evt) =>
+      data = if typeof(ArrayBuffer) != 'undefined' and evt.data instanceof ArrayBuffer
+        # the data is stored inside an ArrayBuffer, we decode it to get the
+        # data as a String
+        arr = new Uint8Array(evt.data)
+        @debug? "--- got data length: #{arr.length}"
+        # Return a string formed by all the char codes stored in the Uint8array
+        (String.fromCharCode(c) for c in arr).join('')
+      else
+        # take the data directly from the WebSocket `data` field
+        evt.data
+      @serverActivity = now()
+      if data == Byte.LF # heartbeat
+        @debug? "<<< PONG"
+        return
+      @debug? "<<< #{data}"
+      # Handle STOMP frames received from the server
+      # The unmarshall function returns the frames parsed and any remaining
+      # data from partial frames.
+      unmarshalledData = Frame.unmarshall(@partialData + data)
+      @partialData = unmarshalledData.partial
+      for frame in unmarshalledData.frames
+        switch frame.command
+          # [CONNECTED Frame](http://stomp.github.com/stomp-specification-1.1.html#CONNECTED_Frame)
+          when "CONNECTED"
+            @debug? "connected to server #{frame.headers.server}"
+            @connected = true
+            @_setupHeartbeat(frame.headers)
+            @connectCallback? frame
+          # [MESSAGE Frame](http://stomp.github.com/stomp-specification-1.1.html#MESSAGE)
+          when "MESSAGE"
+            # the `onreceive` callback is registered when the client calls
+            # `subscribe()`.
+            # If there is registered subscription for the received message,
+            # we used the default `onreceive` method that the client can set.
+            # This is useful for subscriptions that are automatically created
+            # on the browser side (e.g. [RabbitMQ's temporary
+            # queues](http://www.rabbitmq.com/stomp.html)).
+            subscription = frame.headers.subscription
+            onreceive = @subscriptions[subscription] or @onreceive
+            if onreceive
+              client = this
+              messageID = frame.headers["message-id"]
+              # add `ack()` and `nack()` methods directly to the returned frame
+              # so that a simple call to `message.ack()` can acknowledge the message.
+              frame.ack = (headers = {}) =>
+                client .ack messageID , subscription, headers
+              frame.nack = (headers = {}) =>
+                client .nack messageID, subscription, headers
+              onreceive frame
+            else
+              @debug? "Unhandled received MESSAGE: #{frame}"
+          # [RECEIPT Frame](http://stomp.github.com/stomp-specification-1.1.html#RECEIPT)
+          #
+          # The client instance can set its `onreceipt` field to a function taking
+          # a frame argument that will be called when a receipt is received from
+          # the server:
+          #
+          #     client.onreceipt = function(frame) {
+          #       receiptID = frame.headers['receipt-id'];
+          #       ...
+          #     }
+          when "RECEIPT"
+            @onreceipt?(frame)
+          # [ERROR Frame](http://stomp.github.com/stomp-specification-1.1.html#ERROR)
+          when "ERROR"
+            errorCallback?(frame)
+          else
+            @debug? "Unhandled frame: #{frame}"
+    @ws.onclose   = =>
+      msg = "Whoops! Lost connection to #{@ws.url}"
+      @debug?(msg)
+      @_cleanUp()
+      errorCallback?(msg)
+    @ws.onopen    = =>
+      @debug?('Web Socket Opened...')
+      headers["accept-version"] = Stomp.VERSIONS.supportedVersions()
+      headers["heart-beat"] = [@heartbeat.outgoing, @heartbeat.incoming].join(',')
+      @_transmit "CONNECT", headers
+
+  # [DISCONNECT Frame](http://stomp.github.com/stomp-specification-1.1.html#DISCONNECT)
+  disconnect: (disconnectCallback, headers={}) ->
+    @_transmit "DISCONNECT", headers
+    # Discard the onclose callback to avoid calling the errorCallback when
+    # the client is properly disconnected.
+    @ws.onclose = null
+    @ws.close()
+    @_cleanUp()
+    disconnectCallback?()
+
+  # Clean up client resources when it is disconnected or the server did not
+  # send heart beats in a timely fashion
+  _cleanUp: () ->
+    @connected = false
+    Stomp.clearInterval @pinger if @pinger
+    Stomp.clearInterval @ponger if @ponger
+
+  # [SEND Frame](http://stomp.github.com/stomp-specification-1.1.html#SEND)
+  #
+  # * `destination` is MANDATORY.
+  send: (destination, headers={}, body='') ->
+    headers.destination = destination
+    @_transmit "SEND", headers, body
+
+  # [SUBSCRIBE Frame](http://stomp.github.com/stomp-specification-1.1.html#SUBSCRIBE)
+  subscribe: (destination, callback, headers={}) ->
+    # for convenience if the `id` header is not set, we create a new one for this client
+    # that will be returned to be able to unsubscribe this subscription
+    unless headers.id
+      headers.id = "sub-" + @counter++
+    headers.destination = destination
+    @subscriptions[headers.id] = callback
+    @_transmit "SUBSCRIBE", headers
+    client = this
+    return {
+      id: headers.id
+
+      unsubscribe: ->
+        client.unsubscribe headers.id
+    }
+
+  # [UNSUBSCRIBE Frame](http://stomp.github.com/stomp-specification-1.1.html#UNSUBSCRIBE)
+  #
+  # * `id` is MANDATORY.
+  #
+  # It is preferable to unsubscribe from a subscription by calling
+  # `unsubscribe()` directly on the object returned by `client.subscribe()`:
+  #
+  #     var subscription = client.subscribe(destination, onmessage);
+  #     ...
+  #     subscription.unsubscribe();
+  unsubscribe: (id) ->
+    delete @subscriptions[id]
+    @_transmit "UNSUBSCRIBE", {
+      id: id
+    }
+
+  # [BEGIN Frame](http://stomp.github.com/stomp-specification-1.1.html#BEGIN)
+  #
+  # If no transaction ID is passed, one will be created automatically
+  begin: (transaction) ->
+    txid = transaction || "tx-" + @counter++
+    @_transmit "BEGIN", {
+      transaction: txid
+    }
+    client = this
+    return {
+      id: txid
+      commit: ->
+        client.commit txid
+      abort: ->
+        client.abort txid
+    }
+  
+  # [COMMIT Frame](http://stomp.github.com/stomp-specification-1.1.html#COMMIT)
+  #
+  # * `transaction` is MANDATORY.
+  #
+  # It is preferable to commit a transaction by calling `commit()` directly on
+  # the object returned by `client.begin()`:
+  #
+  #     var tx = client.begin(txid);
+  #     ...
+  #     tx.commit();
+  commit: (transaction) ->
+    @_transmit "COMMIT", {
+      transaction: transaction
+    }
+  
+  # [ABORT Frame](http://stomp.github.com/stomp-specification-1.1.html#ABORT)
+  #
+  # * `transaction` is MANDATORY.
+  #
+  # It is preferable to abort a transaction by calling `abort()` directly on
+  # the object returned by `client.begin()`:
+  #
+  #     var tx = client.begin(txid);
+  #     ...
+  #     tx.abort();
+  abort: (transaction) ->
+    @_transmit "ABORT", {
+      transaction: transaction
+    }
+  
+  # [ACK Frame](http://stomp.github.com/stomp-specification-1.1.html#ACK)
+  #
+  # * `messageID` & `subscription` are MANDATORY.
+  #
+  # It is preferable to acknowledge a message by calling `ack()` directly
+  # on the message handled by a subscription callback:
+  #
+  #     client.subscribe(destination,
+  #       function(message) {
+  #         // process the message
+  #         // acknowledge it
+  #         message.ack();
+  #       },
+  #       {'ack': 'client'}
+  #     );
+  ack: (messageID, subscription, headers = {}) ->
+    headers["message-id"] = messageID
+    headers.subscription = subscription
+    @_transmit "ACK", headers
+
+  # [NACK Frame](http://stomp.github.com/stomp-specification-1.1.html#NACK)
+  #
+  # * `messageID` & `subscription` are MANDATORY.
+  #
+  # It is preferable to nack a message by calling `nack()` directly on the
+  # message handled by a subscription callback:
+  #
+  #     client.subscribe(destination,
+  #       function(message) {
+  #         // process the message
+  #         // an error occurs, nack it
+  #         message.nack();
+  #       },
+  #       {'ack': 'client'}
+  #     );
+  nack: (messageID, subscription, headers = {}) ->
+    headers["message-id"] = messageID
+    headers.subscription = subscription
+    @_transmit "NACK", headers
+
+# ##The `Stomp` Object
+Stomp =
+  VERSIONS:
+    V1_0: '1.0'
+    V1_1: '1.1'
+    V1_2: '1.2'
+
+    # Versions of STOMP specifications supported
+    supportedVersions: ->
+      '1.1,1.0'
+
+  # This method creates a WebSocket client that is connected to
+  # the STOMP server located at the url.
+  client: (url, protocols = ['v10.stomp', 'v11.stomp']) ->
+    # This is a hack to allow another implementation than the standard
+    # HTML5 WebSocket class.
+    #
+    # It is possible to use another class by calling
+    #
+    #     Stomp.WebSocketClass = MozWebSocket
+    #
+    # *prior* to call `Stomp.client()`.
+    #
+    # This hack is deprecated and  `Stomp.over()` method should be used
+    # instead.
+    klass = Stomp.WebSocketClass || WebSocket
+    ws = new klass(url, protocols)
+    new Client ws
+
+  # This method is an alternative to `Stomp.client()` to let the user
+  # specify the WebSocket to use (either a standard HTML5 WebSocket or
+  # a similar object).
+  over: (ws) ->
+    new Client ws
+
+  # For testing purpose, expose the Frame class inside Stomp to be able to
+  # marshall/unmarshall frames
+  Frame: Frame
+
+# # `Stomp` object exportation
+
+# export as CommonJS module
+if exports?
+  exports.Stomp = Stomp
+
+# export in the Web Browser
+if window?
+  # in the Web browser, rely on `window.setInterval` to handle heart-beats
+  Stomp.setInterval= (interval, f) ->
+    window.setInterval f, interval
+  Stomp.clearInterval= (id) ->
+    window.clearInterval id
+  window.Stomp = Stomp
+# or in the current object (e.g. a WebWorker)
+else if !exports
+  self.Stomp = Stomp
diff --git a/src/main/resources/static/stomp-ws/src/stomp.orig.js b/src/main/resources/static/stomp-ws/src/stomp.orig.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a58069166ccdc3c59088cb810eddade47fdb9be
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/src/stomp.orig.js
@@ -0,0 +1,197 @@
+// (c) 2010 Jeff Mesnil -- http://jmesnil.net/
+// Copyright (C) FuseSource, Inc. --  http://fusesource.com
+
+(function(window) {
+  
+  var Stomp = {};
+
+  Stomp.frame = function(command, headers, body) {
+    return {
+      command: command,
+      headers: headers,
+      body: body,
+      toString: function() {
+        var out = command + '\n';
+        if (headers) {
+          for (header in headers) {
+            if(headers.hasOwnProperty(header)) {
+              out = out + header + ': ' + headers[header] + '\n';
+            }
+          }
+        }
+        out = out + '\n';
+        if (body) {
+          out = out + body;
+        }
+        return out;
+      }
+    }
+  };
+
+  trim = function(str) {
+    return str.replace(/^\s+/g,'').replace(/\s+$/g,'');
+  };
+
+  Stomp.unmarshal = function(data) {
+    var divider = data.search(/\n\n/),
+        headerLines = data.substring(0, divider).split('\n'),
+        command = headerLines.shift(),
+        headers = {},
+        body = '';
+
+    // Parse headers
+    var line = idx = null;
+    for (var i = 0; i < headerLines.length; i++) {
+      line = headerLines[i];
+      idx = line.indexOf(':');
+      headers[trim(line.substring(0, idx))] = trim(line.substring(idx + 1));
+    }
+
+    // Parse body, stopping at the first \0 found.
+    // TODO: Add support for content-length header.
+    var chr = null;
+    for (var i = divider + 2; i < data.length; i++) {
+      chr = data.charAt(i);
+      if (chr === '\0') {
+         break;
+      }
+      body += chr;
+    }
+
+    return Stomp.frame(command, headers, body);
+  };
+
+  Stomp.marshal = function(command, headers, body) {
+    return Stomp.frame(command, headers, body).toString() + '\0';
+  };
+  
+  Stomp.client = function (url){
+
+    var that, ws, login, passcode;
+    var counter = 0; // used to index subscribers
+    // subscription callbacks indexed by subscriber's ID
+    var subscriptions = {};
+
+    debug = function(str) {
+      if (that.debug) {
+        that.debug(str);
+      }
+    };
+
+    onmessage = function(evt) {
+      var data = evt.data
+      if (data instanceof ArrayBuffer) {
+        view = new Uint8Array(data);
+        data = "";
+        var i, len;
+        for (i = 0, len = view.length; i < len; i++) {
+          data += String.fromCharCode(view[i]);
+        }
+      }
+      debug('<<< ' + data);
+      var frame = Stomp.unmarshal(data);
+      if (frame.command === "CONNECTED" && that.connectCallback) {
+        that.connectCallback(frame);
+      } else if (frame.command === "MESSAGE") {
+        var onreceive = subscriptions[frame.headers.subscription];
+        if (onreceive) {
+          onreceive(frame);
+        }
+      } else if (frame.command === "RECEIPT" && that.onreceipt) {
+        that.onreceipt(frame);
+      } else if (frame.command === "ERROR" && that.onerror) {
+        that.onerror(frame);
+      }
+    };
+
+    transmit = function(command, headers, body) {
+      var out = Stomp.marshal(command, headers, body);
+      debug(">>> " + out);
+      ws.send(out);
+    };
+
+    that = {};
+
+    that.connect = function(login_, passcode_, connectCallback, errorCallback) {
+      debug("Opening Web Socket...");
+      var Socket = "MozWebSocket" in window ? MozWebSocket : WebSocket;
+      ws = new Socket(url);
+      ws.binaryType = "arraybuffer";
+      ws.onmessage = onmessage;
+      ws.onclose   = function() {
+        var msg = "Whoops! Lost connection to " + url;
+        debug(msg);
+          if (errorCallback) {
+            errorCallback(msg);
+          }
+      };
+      ws.onopen    = function() {
+        debug('Web Socket Opened...');
+        transmit("CONNECT", {login: login, passcode: passcode});
+        // connectCallback handler will be called from onmessage when a CONNECTED frame is received
+      };
+      login = login_;
+      passcode = passcode_;
+      that.connectCallback = connectCallback;
+    };
+
+    that.disconnect = function(disconnectCallback) {
+      transmit("DISCONNECT");
+      ws.close();
+      if (disconnectCallback) {
+        disconnectCallback();
+      }
+    };
+
+    that.send = function(destination, headers, body) {
+      var headers = headers || {};
+      headers.destination = destination;
+      transmit("SEND", headers, body);
+    };
+
+    that.subscribe = function(destination, callback, headers) {
+      var headers = headers || {};
+      var id = "sub-" + counter++;
+      headers.destination = destination;
+      headers.id = id;
+      subscriptions[id] = callback;
+      transmit("SUBSCRIBE", headers);
+      return id;
+    };
+
+    that.unsubscribe = function(id, headers) {
+      var headers = headers || {};
+      headers.id = id;
+      delete subscriptions[id];
+      transmit("UNSUBSCRIBE", headers);
+    };
+    
+    that.begin = function(transaction, headers) {
+      var headers = headers || {};
+      headers.transaction = transaction;
+      transmit("BEGIN", headers);
+    };
+
+    that.commit = function(transaction, headers) {
+      var headers = headers || {};
+      headers.transaction = transaction;
+      transmit("COMMIT", headers);
+    };
+    
+    that.abort = function(transaction, headers) {
+      var headers = headers || {};
+      headers.transaction = transaction;
+      transmit("ABORT", headers);
+    };
+    
+    that.ack = function(message_id, headers) {
+      var headers = headers || {};
+      headers["message-id"] = message_id;
+      transmit("ACK", headers);
+    };
+    return that;
+  };
+  
+  window.Stomp = Stomp;
+
+})(window);
diff --git a/src/main/resources/static/stomp-ws/test/server.mock.coffee b/src/main/resources/static/stomp-ws/test/server.mock.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..73cc14c808c2c12726651170aa3073884a939728
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/test/server.mock.coffee
@@ -0,0 +1,93 @@
+WebSocketMock = require('./websocket.mock.js').WebSocketMock
+Stomp = require('../../lib/stomp.js').Stomp
+
+console = require 'console'
+
+class StompServerMock extends WebSocketMock
+  # WebSocketMock handlers
+  
+  handle_send: (msg) =>
+    @stomp_dispatch(Stomp.Frame.unmarshall(msg).frames[0])
+  
+  handle_close: =>
+    @_shutdown()
+  
+  handle_open: =>
+    @stomp_init()
+    @_accept()
+  
+  # Stomp server implementation
+  
+  stomp_init: ->
+    @transactions = {}
+    @subscriptions = {}
+    @messages = []
+  
+  stomp_send: (command, headers, body=null) ->
+    @_respond(Stomp.Frame.marshall(command, headers, body))
+    
+  stomp_send_receipt: (frame) ->
+    if frame.headers.message?
+      @stomp_send("ERROR", {'receipt-id': frame.headers['receipt-id'], 'message': frame.headers.message})
+    else
+      @stomp_send("RECEIPT", {'receipt-id': frame.headers['receipt-id']})
+    
+  stomp_send_message: (destination, subscription, message_id, body) ->
+    @stomp_send("MESSAGE", {
+      'destination': destination, 
+      'message-id': message_id,
+      'subscription': subscription}, body)
+
+  stomp_dispatch: (frame) ->
+    handler = "stomp_handle_#{frame.command.toLowerCase()}"
+    if this[handler]?
+      this[handler](frame)
+      if frame.receipt
+        @stomp_send_receipt(frame)
+    else
+      console.log "StompServerMock: Unknown command: #{frame.command}"
+
+  stomp_handle_connect: (frame) ->
+    @session_id = Math.random()
+    @stomp_send("CONNECTED", {'session': @session_id})
+    
+  stomp_handle_begin: (frame) ->
+    @transactions[frame.headers.transaction] = []
+    
+  stomp_handle_commit: (frame) ->
+    transaction = @transactions[frame.headers.transaction]
+    for frame in transaction
+      @messages.push(frame.body)
+    delete @transactions[frame.headers.transaction]
+
+  stomp_handle_abort: (frame) ->
+    delete @transactions[frame.headers.transaction]
+
+  stomp_handle_send: (frame) ->
+    if frame.headers.transaction
+      @transactions[frame.headers.transaction].push(frame)
+    else
+      @messages.push(frame)
+
+  stomp_handle_subscribe: (frame) ->
+    sub_id = frame.headers.id or Math.random()
+    cb = (id, body) => @stomp_send_message(frame.headers.destination, sub_id, id, body)
+    @subscriptions[sub_id] = [frame.headers.destination, cb]
+
+  stomp_handle_unsubscribe: (frame) ->
+    if frame.headers.id in Object.keys(@subscriptions)
+      delete @subscriptions[frame.headers.id]
+    else
+      frame.headers.message = "Subscription does not exist"
+        
+  stomp_handle_disconnect: (frame) ->
+    @_shutdown()
+  
+  # Test helpers
+  
+  test_send: (sub_id, message) ->
+    msgid = 'msg-' + Math.random()
+    @subscriptions[sub_id][1](msgid, message)
+  
+
+exports.StompServerMock = StompServerMock
\ No newline at end of file
diff --git a/src/main/resources/static/stomp-ws/test/stomp.spec.coffee b/src/main/resources/static/stomp-ws/test/stomp.spec.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..b826ca7e80ff080b6cef2be34c9ca3e1c33d439c
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/test/stomp.spec.coffee
@@ -0,0 +1,111 @@
+Stomp = require('../../lib/stomp.js').Stomp
+StompServerMock = require('./server.mock.js').StompServerMock
+
+Stomp.WebSocketClass = StompServerMock
+
+describe "Stomp", ->
+  it "lets you connect to a server with a websocket and get a callback", ->
+    ws = new StompServerMock("ws://mocked/stomp/server")
+    client = Stomp.over(ws)
+    connected = false
+    client.connect("guest", "guest", ->
+      connected = true
+    )
+    waitsFor -> connected
+    runs -> expect(client.connected).toBe(true)
+  
+  it "lets you connect to a server and get a callback", ->
+    client = Stomp.client("ws://mocked/stomp/server")
+    connected = false
+    client.connect("guest", "guest", ->
+      connected = true
+    )
+    waitsFor -> connected
+    runs -> expect(client.connected).toBe(true)
+  
+  it "lets you subscribe to a destination", ->
+    client = Stomp.client("ws://mocked/stomp/server")
+    subscription = null
+    client.connect("guest", "guest", ->
+      subscription = client.subscribe("/queue/test")
+    )
+    waitsFor -> subscription
+    runs -> expect(Object.keys(client.ws.subscriptions)).toContain(subscription.id)
+  
+  it "lets you publish a message to a destination", ->
+    client = Stomp.client("ws://mocked/stomp/server")
+    message = null
+    client.connect("guest", "guest", ->
+      message = "Hello world!"
+      client.send("/queue/test", {}, message)
+    )
+    waitsFor -> message
+    runs -> expect(client.ws.messages.pop().toString()).toContain(message)
+
+  
+  it "lets you unsubscribe from a destination", ->
+    client = Stomp.client("ws://mocked/stomp/server")
+    unsubscribed = false
+    subscription = null
+    client.connect("guest", "guest", ->
+      subscription = client.subscribe("/queue/test")
+      subscription.unsubscribe()
+      unsubscribed = true
+    )
+    waitsFor -> unsubscribed
+    runs -> expect(Object.keys(client.ws.subscriptions)).not.toContain(subscription.id)
+    
+  it "lets you receive messages only while subscribed", ->
+    client = Stomp.client("ws://mocked/stomp/server")
+    subscription = null
+    messages = []
+    client.connect("guest", "guest", ->
+      subscription = client.subscribe("/queue/test", (msg) ->
+        messages.push(msg)
+      )
+    )
+    waitsFor -> subscription
+    runs ->
+      client.ws.test_send(subscription.id, Math.random())
+      client.ws.test_send(subscription.id, Math.random())
+      expect(messages.length).toEqual(2)
+      subscription.unsubscribe()
+      try
+        client.ws.test_send(id, Math.random()) 
+      catch err
+        null
+      expect(messages.length).toEqual(2)
+  
+  it "lets you send messages in a transaction", ->
+    client = Stomp.client("ws://mocked/stomp/server")
+    connected = false
+    client.connect("guest", "guest", ->
+      connected = true
+    )
+    waitsFor -> connected
+    runs ->
+      txid = "123"
+      client.begin(txid)
+      client.send("/queue/test", {transaction: txid}, "messages 1")
+      client.send("/queue/test", {transaction: txid}, "messages 2")
+      expect(client.ws.messages.length).toEqual(0)
+      client.send("/queue/test", {transaction: txid}, "messages 3")
+      client.commit(txid)
+      expect(client.ws.messages.length).toEqual(3)
+  
+  it "lets you abort a transaction", ->
+    client = Stomp.client("ws://mocked/stomp/server")
+    connected = false
+    client.connect("guest", "guest", ->
+      connected = true
+    )
+    waitsFor -> connected
+    runs ->
+      txid = "123"
+      client.begin(txid)
+      client.send("/queue/test", {transaction: txid}, "messages 1")
+      client.send("/queue/test", {transaction: txid}, "messages 2")
+      expect(client.ws.messages.length).toEqual(0)
+      client.send("/queue/test", {transaction: txid}, "messages 3")
+      client.abort(txid)
+      expect(client.ws.messages.length).toEqual(0)
diff --git a/src/main/resources/static/stomp-ws/test/websocket.mock.coffee b/src/main/resources/static/stomp-ws/test/websocket.mock.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..9c09fb518c6f3c6b9feaa8b08f115070695a54c5
--- /dev/null
+++ b/src/main/resources/static/stomp-ws/test/websocket.mock.coffee
@@ -0,0 +1,52 @@
+class WebSocketMock
+  constructor: (@url) ->
+    @onclose = ->
+    @onopen = ->
+    @onerror = ->
+    @onmessage = ->
+    @readyState = 0
+    @bufferedAmount = 0
+    @extensions = ''
+    @protocol = ''
+    setTimeout(@handle_open, 0)
+  
+  # WebSocket API
+  
+  close: ->
+    @handle_close()
+    @readyState = 2
+   
+  send: (msg) ->
+    if @readyState isnt 1 then return false
+    @handle_send(msg)
+    return true
+  
+  # Helpers
+  
+  _accept: ->
+    @readyState = 1
+    @onopen({'type': 'open'})
+  
+  _shutdown: ->
+    @readyState = 3
+    @onclose({'type': 'close'})
+  
+  _error: ->
+    @readyState = 3
+    @onerror({'type': 'error'})
+  
+  _respond: (data) ->
+    @onmessage({'type': 'message', 'data': data})
+    
+  # Handlers
+  
+  handle_send: (msg) ->
+    # implement me
+  
+  handle_close: ->
+    # implement me
+  
+  handle_open: ->
+    # implement me
+
+exports.WebSocketMock = WebSocketMock
\ No newline at end of file