Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

95 files changed, 16423 insertions, 5016 deletions

diff --git a/resources/Resources.php b/resources/Resources.php
index 5c1ade8d..7549b9c9 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -5,14 +5,19 @@ return array(
 	/* Special resources who have their own classes */
 
 	'site' => array( 'class' => 'ResourceLoaderSiteModule' ),
+	'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
 	'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
 	'user' => array( 'class' => 'ResourceLoaderUserModule' ),
+	'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
 	'user.options' => array( 'class' => 'ResourceLoaderUserOptionsModule' ),
+	'user.tokens' => array( 'class' => 'ResourceLoaderUserTokensModule' ),
+	'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
 
 	/* Skins */
 
 	'skins.vector' => array(
 		'styles' => array( 'vector/screen.css' => array( 'media' => 'screen' ) ),
+		'scripts' => 'vector/vector.js',
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
@@ -23,6 +28,16 @@ return array(
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
+	'skins.archlinux' => array(
+		'styles' => array(
+			'archlinux/main.css' => array( 'media' => 'screen' ),
+			'archlinux/archnavbar.css' => array( 'media' => 'screen' ),
+			'archlinux/arch.css' => array( 'media' => 'screen' ),
+			'archlinux/print.css' => array( 'media' => 'print' ),
+		),
+		'remoteBasePath' => $GLOBALS['wgStylePath'],
+		'localBasePath' => $GLOBALS['wgStyleDirectory'],
+	),
 	'skins.simple' => array(
 		'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ),
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
@@ -34,18 +49,20 @@ return array(
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
 	'skins.modern' => array(
-		'styles' => array( 'modern/main.css' => array( 'media' => 'screen' ),
-				   'modern/print.css' => array( 'media' => 'print' ) ),
+		'styles' => array(
+			'modern/main.css' => array( 'media' => 'screen' ),
+			'modern/print.css' => array( 'media' => 'print' ),
+		),
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
 	'skins.cologneblue' => array(
-		'styles' => array( 'common/cologneblue.css' => array( 'media' => 'screen' ) ),
+		'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ),
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
 	'skins.nostalgia' => array(
-		'styles' => array( 'common/nostalgia.css' => array( 'media' => 'screen' ) ),
+		'styles' => array( 'nostalgia/screen.css' => array( 'media' => 'screen' ) ),
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
@@ -65,41 +82,84 @@ return array(
 	/* jQuery Plugins */
 
 	'jquery.async' => array(
-		'scripts' => 'resources/jquery/jquery.async.js'
+		'scripts' => 'resources/jquery/jquery.async.js',
+	),
+	'jquery.appear' => array(
+		'scripts' => 'resources/jquery/jquery.appear.js',
 	),
 	'jquery.autoEllipsis' => array(
 		'scripts' => 'resources/jquery/jquery.autoEllipsis.js',
 		'dependencies' => 'jquery.highlightText',
 	),
+	'jquery.byteLength' => array(
+		'scripts' => 'resources/jquery/jquery.byteLength.js',
+	),
+	'jquery.byteLimit' => array(
+		'scripts' => 'resources/jquery/jquery.byteLimit.js',
+		'dependencies' => 'jquery.byteLength',
+	),
 	'jquery.checkboxShiftClick' => array(
-		'scripts' => 'resources/jquery/jquery.checkboxShiftClick.js'
+		'scripts' => 'resources/jquery/jquery.checkboxShiftClick.js',
 	),
 	'jquery.client' => array(
 		'scripts' => 'resources/jquery/jquery.client.js',
 	),
 	'jquery.collapsibleTabs' => array(
-		'scripts' => 'resources/jquery/jquery.collapsibleTabs.js'
+		'scripts' => 'resources/jquery/jquery.collapsibleTabs.js',
+	),
+	'jquery.colorUtil' => array(
+		'scripts' => 'resources/jquery/jquery.colorUtil.js',
 	),
 	'jquery.color' => array(
-		'scripts' => 'resources/jquery/jquery.color.js'
+		'scripts' => 'resources/jquery/jquery.color.js',
+		'dependencies' => 'jquery.colorUtil',
 	),
 	'jquery.cookie' => array(
-		'scripts' => 'resources/jquery/jquery.cookie.js'
+		'scripts' => 'resources/jquery/jquery.cookie.js',
 	),
 	'jquery.delayedBind' => array(
-		'scripts' => 'resources/jquery/jquery.delayedBind.js'
+		'scripts' => 'resources/jquery/jquery.delayedBind.js',
 	),
 	'jquery.expandableField' => array(
-		'scripts' => 'resources/jquery/jquery.expandableField.js'
+		'scripts' => 'resources/jquery/jquery.expandableField.js',
+		'dependencies' => 'jquery.delayedBind',
+	),
+	'jquery.form' => array(
+		'scripts' => 'resources/jquery/jquery.form.js',
+	),
+	'jquery.getAttrs' => array(
+		'scripts' => 'resources/jquery/jquery.getAttrs.js',
 	),
 	'jquery.highlightText' => array(
-		'scripts' => 'resources/jquery/jquery.highlightText.js'
+		'scripts' => 'resources/jquery/jquery.highlightText.js',
+	),
+	'jquery.hoverIntent' => array(
+		'scripts' => 'resources/jquery/jquery.hoverIntent.js',
+	),
+	'jquery.messageBox' => array(
+		'scripts' => 'resources/jquery/jquery.messageBox.js',
+		'styles' => 'resources/jquery/jquery.messageBox.css',
 	),
 	'jquery.placeholder' => array(
-		'scripts' => 'resources/jquery/jquery.placeholder.js'
+		'scripts' => 'resources/jquery/jquery.placeholder.js',
+	),
+	'jquery.json' => array(
+		'scripts' => 'resources/jquery/jquery.json.js',
 	),
 	'jquery.localize' => array(
-		'scripts' => 'resources/jquery/jquery.localize.js'
+		'scripts' => 'resources/jquery/jquery.localize.js',
+	),
+	'jquery.makeCollapsible' => array(
+		'scripts' => 'resources/jquery/jquery.makeCollapsible.js',
+		'styles' => 'resources/jquery/jquery.makeCollapsible.css',
+		'messages' => array( 'collapsible-expand', 'collapsible-collapse' ),
+	),
+	'jquery.mwPrototypes' => array(
+		'scripts' => 'resources/jquery/jquery.mwPrototypes.js',
+	),
+	'jquery.qunit' => array(
+		'scripts' => 'resources/jquery/jquery.qunit.js',
+		'styles' => 'resources/jquery/jquery.qunit.css',
 	),
 	'jquery.suggestions' => array(
 		'scripts' => 'resources/jquery/jquery.suggestions.js',
@@ -107,10 +167,15 @@ return array(
 		'dependencies' => 'jquery.autoEllipsis',
 	),
 	'jquery.tabIndex' => array(
-		'scripts' => 'resources/jquery/jquery.tabIndex.js'
+		'scripts' => 'resources/jquery/jquery.tabIndex.js',
+	),
+	'jquery.tablesorter' => array(
+		'scripts' => 'resources/jquery/jquery.tablesorter.js',
+		'styles' => 'resources/jquery/jquery.tablesorter.css',
+		'messages' => array( 'sort-descending', 'sort-ascending' ),
 	),
 	'jquery.textSelection' => array(
-		'scripts' => 'resources/jquery/jquery.textSelection.js'
+		'scripts' => 'resources/jquery/jquery.textSelection.js',
 	),
 	'jquery.tipsy' => array(
 		'scripts' => 'resources/jquery.tipsy/jquery.tipsy.js',
@@ -133,27 +198,33 @@ return array(
 			),
 		),
 		'dependencies' => 'jquery',
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.widget' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.widget.js',
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.mouse' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.mouse.js',
 		'dependencies' => 'jquery.ui.widget',
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.position' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.position.js',
+		'group' => 'jquery.ui',
 	),
 	// Interactions
 	'jquery.ui.draggable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.draggable.js',
 		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget' ),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.droppable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.droppable.js',
 		'dependencies' => array(
-			'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable'
+			'jquery.ui.core', 'jquery.ui.mouse', 'jquery.ui.widget', 'jquery.ui.draggable',
 		),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.resizable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.resizable.js',
@@ -162,6 +233,7 @@ return array(
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.resizable.css',
 		),
 		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.selectable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.selectable.js',
@@ -170,10 +242,12 @@ return array(
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.selectable.css',
 		),
 		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.sortable' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.sortable.js',
 		'dependencies' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.mouse' ),
+		'group' => 'jquery.ui',
 	),
 	// Widgets
 	'jquery.ui.accordion' => array(
@@ -183,6 +257,7 @@ return array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.accordion.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.accordion.css',
 		),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.autocomplete' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.autocomplete.js',
@@ -191,6 +266,7 @@ return array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.autocomplete.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.autocomplete.css',
 		),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.button' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.button.js',
@@ -199,6 +275,7 @@ return array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.button.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.button.css',
 		),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.datepicker' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.datepicker.js',
@@ -259,8 +336,9 @@ return array(
 			'vi' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-vi.js',
 			'zh-cn' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-CN.js',
 			'zh-hk' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-HK.js',
-			'zh-tw' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js'
+			'zh-tw' => 'resources/jquery.ui/i18n/jquery.ui.datepicker-zh-TW.js',
 		),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.dialog' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.dialog.js',
@@ -277,6 +355,7 @@ return array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.dialog.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.dialog.css',
 		),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.progressbar' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.progressbar.js',
@@ -285,6 +364,7 @@ return array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.progressbar.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.progressbar.css',
 		),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.slider' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.slider.js',
@@ -293,6 +373,7 @@ return array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.slider.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.slider.css',
 		),
+		'group' => 'jquery.ui',
 	),
 	'jquery.ui.tabs' => array(
 		'scripts' => 'resources/jquery.ui/jquery.ui.tabs.js',
@@ -301,59 +382,73 @@ return array(
 			'default' => 'resources/jquery.ui/themes/default/jquery.ui.tabs.css',
 			'vector' => 'resources/jquery.ui/themes/vector/jquery.ui.tabs.css',
 		),
+		'group' => 'jquery.ui',
 	),
 	// Effects
 	'jquery.effects.core' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.core.js',
 		'dependencies' => 'jquery',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.blind' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.blind.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.bounce' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.bounce.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.clip' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.clip.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.drop' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.drop.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.explode' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.explode.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.fold' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.fold.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.highlight' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.highlight.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.pulsate' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.pulsate.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.scale' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.scale.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.shake' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.shake.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.slide' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.slide.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 	'jquery.effects.transfer' => array(
 		'scripts' => 'resources/jquery.effects/jquery.effects.transfer.js',
 		'dependencies' => 'jquery.effects.core',
+		'group' => 'jquery.ui',
 	),
 
 	/* MediaWiki */
@@ -361,36 +456,135 @@ return array(
 	'mediawiki' => array(
 		'scripts' => 'resources/mediawiki/mediawiki.js',
 		'debugScripts' => 'resources/mediawiki/mediawiki.log.js',
-		'debugRaw' => false
+		'debugRaw' => false,
+	),
+	'mediawiki.Title' => array(
+		'scripts' => 'resources/mediawiki/mediawiki.Title.js',
+		'dependencies' => 'mediawiki.util',
+	),
+	'mediawiki.Uri' => array( 
+		'scripts' => 'resources/mediawiki/mediawiki.Uri.js',
+	),
+	'mediawiki.htmlform' => array(
+		'scripts' => 'resources/mediawiki/mediawiki.htmlform.js',
+	),
+	'mediawiki.user' => array(
+		'scripts' => 'resources/mediawiki/mediawiki.user.js',
+		'dependencies' => array(
+			'jquery.cookie',
+		),
+	),
+	'mediawiki.page.startup' => array(
+		'scripts' => 'resources/mediawiki.page/mediawiki.page.startup.js',
+		'dependencies' => array(
+			'jquery.client',
+		),
+		'position' => 'top',
+	),
+	'mediawiki.page.ready' => array(
+		'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js',
+		'dependencies' => array(
+			'jquery.checkboxShiftClick',
+			'jquery.makeCollapsible',
+			'jquery.placeholder',
+		),
 	),
 	'mediawiki.util' => array(
-		'scripts' => 'resources/mediawiki.util/mediawiki.util.js',
-		'dependencies' => array( 'jquery.checkboxShiftClick', 'jquery.client', 'jquery.placeholder' ),
-		'debugScripts' => 'resources/mediawiki.util/mediawiki.util.test.js',
+		'scripts' => 'resources/mediawiki/mediawiki.util.js',
+		'dependencies' => array(
+			'jquery.client',
+			'jquery.cookie',
+			'jquery.messageBox',
+			'jquery.mwPrototypes',
+		),
+	),
+	'mediawiki.libs.jpegmeta' => array(
+		'scripts' => 'resources/mediawiki.libs/mediawiki.libs.jpegmeta.js',
 	),
 	'mediawiki.action.history' => array(
 		'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
-		'dependencies' => 'mediawiki.legacy.history',
+		'dependencies' => 'jquery.ui.button',
+		'group' => 'mediawiki.action.history',
+	),
+	'mediawiki.action.history.diff' => array(
+		'styles' => 'resources/mediawiki.action/mediawiki.action.history.diff.css',
 		'group' => 'mediawiki.action.history',
 	),
 	'mediawiki.action.edit' => array(
 		'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
+		'dependencies' => array(
+			'jquery.textSelection',
+			'jquery.byteLimit',
+		),
 	),
 	'mediawiki.action.view.rightClickEdit' => array(
 		'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
 	),
+	'mediawiki.action.view.metadata' => array(
+		'scripts' => 'resources/mediawiki.action/mediawiki.action.view.metadata.js',
+		'messages' => array( 'metadata-expand', 'metadata-collapse' ),
+	),
+	'mediawiki.action.watch.ajax' => array(
+		'scripts' => 'resources/mediawiki.action/mediawiki.action.watch.ajax.js',
+		'messages' => array(
+			'watch',
+			'unwatch',
+			'watching',
+			'unwatching',
+			'tooltip-ca-watch',
+			'tooltip-ca-unwatch',
+			'watcherrortext',
+		),
+	),
+
+	/* Special pages */
+
+	'mediawiki.special' => array(
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.js',
+		'styles' => 'resources/mediawiki.special/mediawiki.special.css',
+	),
 	'mediawiki.special.preferences' => array(
 		'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
 		'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',
 		'messages' => array( 'email-address-validity-valid', 'email-address-validity-invalid' ),
 	),
+	'mediawiki.special.changeslist' => array(
+		'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
+		'dependencies' => array( 'jquery.makeCollapsible' ),
+	),
 	'mediawiki.special.search' => array(
 		'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
+		'styles'  => 'resources/mediawiki.special/mediawiki.special.search.css',
 	),
-	'mediawiki.action.history' => array(
-		'scripts' => 'resources/mediawiki.action/mediawiki.action.history.js',
-		'dependencies' => 'mediawiki.legacy.history',
+	'mediawiki.special.block' => array(
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.block.js',
+	),
+	'mediawiki.special.undelete' => array(
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.undelete.js',
+	),
+	'mediawiki.special.movePage' => array(
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.movePage.js',
+		'dependencies' => 'jquery.byteLimit',
 	),
+	'mediawiki.special.recentchanges' => array(
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js',
+		'dependencies' => array( 'mediawiki.special' ),
+		'position' => 'top',
+	),
+	'mediawiki.special.upload' => array(
+		// @TODO: merge in remainder of mediawiki.legacy.upload
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js',
+		'messages' => array(
+			'widthheight',
+			'size-bytes',
+			'size-kilobytes',
+			'size-megabytes',
+			'size-gigabytes',
+			'largefileserver',
+		),
+		'dependencies' => array( 'mediawiki.libs.jpegmeta' ),
+	),
+
 	'mediawiki.language' => array(
 		'scripts' => 'resources/mediawiki.language/mediawiki.language.js',
 		'languageScripts' => array(
@@ -422,8 +616,10 @@ return array(
 			'mk' => 'resources/mediawiki.language/languages/mk.js',
 			'mo' => 'resources/mediawiki.language/languages/mo.js',
 			'mt' => 'resources/mediawiki.language/languages/mt.js',
+			'nl' => 'resources/mediawiki.language/languages/nl.js',
 			'nso' => 'resources/mediawiki.language/languages/nso.js',
 			'pl' => 'resources/mediawiki.language/languages/pl.js',
+			'pt' => 'resources/mediawiki.language/languages/pt.js',
 			'pt-br' => 'resources/mediawiki.language/languages/pt-br.js',
 			'ro' => 'resources/mediawiki.language/languages/ro.js',
 			'ru' => 'resources/mediawiki.language/languages/ru.js',
@@ -448,22 +644,6 @@ return array(
 		'scripts' => 'common/ajax.js',
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'messages' => array(
-			'watch', 'unwatch', 'watching', 'unwatching', 'tooltip-ca-watch',
-			'tooltip-ca-unwatch'
-		),
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
-	'mediawiki.legacy.ajaxwatch' => array(
-		'scripts' => 'common/ajaxwatch.js',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
-	'mediawiki.legacy.block' => array(
-		'scripts' => 'common/block.js',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 		'dependencies' => 'mediawiki.legacy.wikibits',
 	),
 	'mediawiki.legacy.commonPrint' => array(
@@ -478,65 +658,19 @@ return array(
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 		'dependencies' => 'mediawiki.legacy.wikibits',
 	),
-	'mediawiki.legacy.diff' => array(
-		'scripts' => 'common/diff.js',
-		'styles' => 'common/diff.css',
-		'group' => 'mediawiki.action.history',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
-	'mediawiki.legacy.edit' => array(
-		'scripts' => 'common/edit.js',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
-	'mediawiki.legacy.enhancedchanges' => array(
-		'scripts' => 'common/enhancedchanges.js',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
-	'mediawiki.legacy.history' => array(
-		'scripts' => 'common/history.js',
-		'group' => 'mediawiki.action.history',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
-	'mediawiki.legacy.htmlform' => array(
-		'scripts' => 'common/htmlform.js',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
 	'mediawiki.legacy.IEFixes' => array(
 		'scripts' => 'common/IEFixes.js',
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 		'dependencies' => 'mediawiki.legacy.wikibits',
 	),
-	'mediawiki.legacy.metadata' => array(
-		'scripts' => 'common/metadata.js',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
-		'messages' => array( 'metadata-expand', 'metadata-collapse' ),
-	),
 	'mediawiki.legacy.mwsuggest' => array(
 		'scripts' => 'common/mwsuggest.js',
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
+		'dependencies' => array( 'mediawiki.legacy.wikibits', 'jquery.client' ),
 		'messages' => array( 'search-mwsuggest-enabled', 'search-mwsuggest-disabled' ),
 	),
-	'mediawiki.legacy.prefs' => array(
-		'scripts' => 'common/prefs.js',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => array( 'mediawiki.legacy.wikibits', 'mediawiki.legacy.htmlform' ),
-	),
 	'mediawiki.legacy.preview' => array(
 		'scripts' => 'common/preview.js',
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
@@ -547,14 +681,10 @@ return array(
 		'scripts' => 'common/protect.js',
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
-	'mediawiki.legacy.search' => array(
-		'scripts' => 'common/search.js',
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'styles' => 'common/search.css',
-		'dependencies' => 'mediawiki.legacy.wikibits',
+		'dependencies' => array(
+			'mediawiki.legacy.wikibits',
+			'jquery.byteLimit',
+		),
 	),
 	'mediawiki.legacy.shared' => array(
 		'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
diff --git a/resources/jquery.tipsy/jquery.tipsy.css b/resources/jquery.tipsy/jquery.tipsy.css
index d79554d2..2e504c32 100644
--- a/resources/jquery.tipsy/jquery.tipsy.css
+++ b/resources/jquery.tipsy/jquery.tipsy.css
@@ -2,6 +2,7 @@
 	padding: 5px;
 	position: absolute;
 	z-index: 100000;
+	cursor: default;
 }
 .tipsy-inner {
 	padding: 5px 8px 4px 8px;
diff --git a/resources/jquery.tipsy/jquery.tipsy.js b/resources/jquery.tipsy/jquery.tipsy.js
index 847a527b..7c808734 100644
--- a/resources/jquery.tipsy/jquery.tipsy.js
+++ b/resources/jquery.tipsy/jquery.tipsy.js
@@ -56,17 +56,17 @@
                 
                 if (gravity.length == 2) {
                     if (gravity.charAt(1) == 'w') {
-                    	if ( this.options.center ) {
-                    		tp.left = pos.left + pos.width / 2 - 15;
-                    	} else {
+                        if (this.options.center) {
+                            tp.left = pos.left + pos.width / 2 - 15;
+                        } else {
                             tp.left = pos.left;
-                    	}
+                        }
                     } else {
-                    	if ( this.options.center ) {
-                    		tp.left = pos.left + pos.width / 2 - actualWidth + 15;
-                    	} else {
-                    		tp.left = pos.left + pos.width;
-                    	}
+                        if (this.options.center) {
+                            tp.left = pos.left + pos.width / 2 - actualWidth + 15;
+                        } else {
+                            tp.left = pos.left + pos.width;
+                        }
                     }
                 }
                 
diff --git a/resources/jquery.ui/jquery.ui.accordion.js b/resources/jquery.ui/jquery.ui.accordion.js
index 7d926e09..898160a1 100644
--- a/resources/jquery.ui/jquery.ui.accordion.js
+++ b/resources/jquery.ui/jquery.ui.accordion.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Accordion 1.8.2
+ * jQuery UI Accordion 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Accordion
  *
@@ -11,12 +11,12 @@
  *	jquery.ui.core.js
  *	jquery.ui.widget.js
  */
-(function($) {
+(function( $, undefined ) {
 
-$.widget("ui.accordion", {
+$.widget( "ui.accordion", {
 	options: {
 		active: 0,
-		animated: 'slide',
+		animated: "slide",
 		autoHeight: true,
 		clearStyle: false,
 		collapsible: false,
@@ -29,322 +29,398 @@ $.widget("ui.accordion", {
 		},
 		navigation: false,
 		navigationFilter: function() {
-			return this.href.toLowerCase() == location.href.toLowerCase();
+			return this.href.toLowerCase() === location.href.toLowerCase();
 		}
 	},
-	_create: function() {
-
-		var o = this.options, self = this;
-		this.running = 0;
 
-		this.element.addClass("ui-accordion ui-widget ui-helper-reset");
-		
-		// in lack of child-selectors in CSS we need to mark top-LIs in a UL-accordion for some IE-fix
-		this.element.children("li").addClass("ui-accordion-li-fix");
-
-		this.headers = this.element.find(o.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all")
-			.bind("mouseenter.accordion", function(){ $(this).addClass('ui-state-hover'); })
-			.bind("mouseleave.accordion", function(){ $(this).removeClass('ui-state-hover'); })
-			.bind("focus.accordion", function(){ $(this).addClass('ui-state-focus'); })
-			.bind("blur.accordion", function(){ $(this).removeClass('ui-state-focus'); });
+	_create: function() {
+		var self = this,
+			options = self.options;
+
+		self.running = 0;
+
+		self.element
+			.addClass( "ui-accordion ui-widget ui-helper-reset" )
+			// in lack of child-selectors in CSS
+			// we need to mark top-LIs in a UL-accordion for some IE-fix
+			.children( "li" )
+				.addClass( "ui-accordion-li-fix" );
+
+		self.headers = self.element.find( options.header )
+			.addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" )
+			.bind( "mouseenter.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-hover" );
+			})
+			.bind( "mouseleave.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( "ui-state-hover" );
+			})
+			.bind( "focus.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-focus" );
+			})
+			.bind( "blur.accordion", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( "ui-state-focus" );
+			});
 
-		this.headers
-			.next()
-				.addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+		self.headers.next()
+			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" );
 
-		if ( o.navigation ) {
-			var current = this.element.find("a").filter(o.navigationFilter);
+		if ( options.navigation ) {
+			var current = self.element.find( "a" ).filter( options.navigationFilter ).eq( 0 );
 			if ( current.length ) {
-				var header = current.closest(".ui-accordion-header");
+				var header = current.closest( ".ui-accordion-header" );
 				if ( header.length ) {
 					// anchor within header
-					this.active = header;
+					self.active = header;
 				} else {
 					// anchor within content
-					this.active = current.closest(".ui-accordion-content").prev();
+					self.active = current.closest( ".ui-accordion-content" ).prev();
 				}
 			}
 		}
 
-		this.active = this._findActive(this.active || o.active).toggleClass("ui-state-default").toggleClass("ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");
-		this.active.next().addClass('ui-accordion-content-active');
-
-		//Append icon elements
-		this._createIcons();
-
-		this.resize();
+		self.active = self._findActive( self.active || options.active )
+			.addClass( "ui-state-default ui-state-active" )
+			.toggleClass( "ui-corner-all" )
+			.toggleClass( "ui-corner-top" );
+		self.active.next().addClass( "ui-accordion-content-active" );
 
-		//ARIA
-		this.element.attr('role','tablist');
-
-		this.headers
-			.attr('role','tab')
-			.bind('keydown', function(event) { return self._keydown(event); })
+		self._createIcons();
+		self.resize();
+		
+		// ARIA
+		self.element.attr( "role", "tablist" );
+
+		self.headers
+			.attr( "role", "tab" )
+			.bind( "keydown.accordion", function( event ) {
+				return self._keydown( event );
+			})
 			.next()
-			.attr('role','tabpanel');
-
-		this.headers
-			.not(this.active || "")
-			.attr('aria-expanded','false')
-			.attr("tabIndex", "-1")
+				.attr( "role", "tabpanel" );
+
+		self.headers
+			.not( self.active || "" )
+			.attr({
+				"aria-expanded": "false",
+				"aria-selected": "false",
+				tabIndex: -1
+			})
 			.next()
-			.hide();
+				.hide();
 
 		// make sure at least one header is in the tab order
-		if (!this.active.length) {
-			this.headers.eq(0).attr('tabIndex','0');
+		if ( !self.active.length ) {
+			self.headers.eq( 0 ).attr( "tabIndex", 0 );
 		} else {
-			this.active
-				.attr('aria-expanded','true')
-				.attr('tabIndex', '0');
+			self.active
+				.attr({
+					"aria-expanded": "true",
+					"aria-selected": "true",
+					tabIndex: 0
+				});
 		}
 
-		// only need links in taborder for Safari
-		if (!$.browser.safari)
-			this.headers.find('a').attr('tabIndex','-1');
+		// only need links in tab order for Safari
+		if ( !$.browser.safari ) {
+			self.headers.find( "a" ).attr( "tabIndex", -1 );
+		}
 
-		if (o.event) {
-			this.headers.bind((o.event) + ".accordion", function(event) {
-				self._clickHandler.call(self, event, this);
+		if ( options.event ) {
+			self.headers.bind( options.event.split(" ").join(".accordion ") + ".accordion", function(event) {
+				self._clickHandler.call( self, event, this );
 				event.preventDefault();
 			});
 		}
-
 	},
-	
+
 	_createIcons: function() {
-		var o = this.options;
-		if (o.icons) {
-			$("<span/>").addClass("ui-icon " + o.icons.header).prependTo(this.headers);
-			this.active.find(".ui-icon").toggleClass(o.icons.header).toggleClass(o.icons.headerSelected);
-			this.element.addClass("ui-accordion-icons");
+		var options = this.options;
+		if ( options.icons ) {
+			$( "<span></span>" )
+				.addClass( "ui-icon " + options.icons.header )
+				.prependTo( this.headers );
+			this.active.children( ".ui-icon" )
+				.toggleClass(options.icons.header)
+				.toggleClass(options.icons.headerSelected);
+			this.element.addClass( "ui-accordion-icons" );
 		}
 	},
-	
+
 	_destroyIcons: function() {
-		this.headers.children(".ui-icon").remove();
-		this.element.removeClass("ui-accordion-icons");
+		this.headers.children( ".ui-icon" ).remove();
+		this.element.removeClass( "ui-accordion-icons" );
 	},
 
 	destroy: function() {
-		var o = this.options;
+		var options = this.options;
 
 		this.element
-			.removeClass("ui-accordion ui-widget ui-helper-reset")
-			.removeAttr("role")
-			.unbind('.accordion')
-			.removeData('accordion');
+			.removeClass( "ui-accordion ui-widget ui-helper-reset" )
+			.removeAttr( "role" );
 
 		this.headers
-			.unbind(".accordion")
-			.removeClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-corner-top")
-			.removeAttr("role").removeAttr("aria-expanded").removeAttr("tabIndex");
-
-		this.headers.find("a").removeAttr("tabIndex");
+			.unbind( ".accordion" )
+			.removeClass( "ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-expanded" )
+			.removeAttr( "aria-selected" )
+			.removeAttr( "tabIndex" );
+
+		this.headers.find( "a" ).removeAttr( "tabIndex" );
 		this._destroyIcons();
-		var contents = this.headers.next().css("display", "").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active");
-		if (o.autoHeight || o.fillHeight) {
-			contents.css("height", "");
+		var contents = this.headers.next()
+			.css( "display", "" )
+			.removeAttr( "role" )
+			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled" );
+		if ( options.autoHeight || options.fillHeight ) {
+			contents.css( "height", "" );
 		}
 
-		return this;
+		return $.Widget.prototype.destroy.call( this );
 	},
-	
-	_setOption: function(key, value) {
-		$.Widget.prototype._setOption.apply(this, arguments);
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
 			
-		if (key == "active") {
-			this.activate(value);
+		if ( key == "active" ) {
+			this.activate( value );
 		}
-		if (key == "icons") {
+		if ( key == "icons" ) {
 			this._destroyIcons();
-			if (value) {
+			if ( value ) {
 				this._createIcons();
 			}
 		}
-		
+		// #5332 - opacity doesn't cascade to positioned elements in IE
+		// so we need to add the disabled class to the headers and panels
+		if ( key == "disabled" ) {
+			this.headers.add(this.headers.next())
+				[ value ? "addClass" : "removeClass" ](
+					"ui-accordion-disabled ui-state-disabled" );
+		}
 	},
 
-	_keydown: function(event) {
-
-		var o = this.options, keyCode = $.ui.keyCode;
-
-		if (o.disabled || event.altKey || event.ctrlKey)
+	_keydown: function( event ) {
+		if ( this.options.disabled || event.altKey || event.ctrlKey ) {
 			return;
+		}
 
-		var length = this.headers.length;
-		var currentIndex = this.headers.index(event.target);
-		var toFocus = false;
+		var keyCode = $.ui.keyCode,
+			length = this.headers.length,
+			currentIndex = this.headers.index( event.target ),
+			toFocus = false;
 
-		switch(event.keyCode) {
+		switch ( event.keyCode ) {
 			case keyCode.RIGHT:
 			case keyCode.DOWN:
-				toFocus = this.headers[(currentIndex + 1) % length];
+				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
 				break;
 			case keyCode.LEFT:
 			case keyCode.UP:
-				toFocus = this.headers[(currentIndex - 1 + length) % length];
+				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
 				break;
 			case keyCode.SPACE:
 			case keyCode.ENTER:
-				this._clickHandler({ target: event.target }, event.target);
+				this._clickHandler( { target: event.target }, event.target );
 				event.preventDefault();
 		}
 
-		if (toFocus) {
-			$(event.target).attr('tabIndex','-1');
-			$(toFocus).attr('tabIndex','0');
+		if ( toFocus ) {
+			$( event.target ).attr( "tabIndex", -1 );
+			$( toFocus ).attr( "tabIndex", 0 );
 			toFocus.focus();
 			return false;
 		}
 
 		return true;
-
 	},
 
 	resize: function() {
+		var options = this.options,
+			maxHeight;
 
-		var o = this.options, maxHeight;
-
-		if (o.fillSpace) {
-			
-			if($.browser.msie) { var defOverflow = this.element.parent().css('overflow'); this.element.parent().css('overflow', 'hidden'); }
+		if ( options.fillSpace ) {
+			if ( $.browser.msie ) {
+				var defOverflow = this.element.parent().css( "overflow" );
+				this.element.parent().css( "overflow", "hidden");
+			}
 			maxHeight = this.element.parent().height();
-			if($.browser.msie) { this.element.parent().css('overflow', defOverflow); }
-	
+			if ($.browser.msie) {
+				this.element.parent().css( "overflow", defOverflow );
+			}
+
 			this.headers.each(function() {
-				maxHeight -= $(this).outerHeight(true);
+				maxHeight -= $( this ).outerHeight( true );
 			});
 
-			this.headers.next().each(function() {
-    		   $(this).height(Math.max(0, maxHeight - $(this).innerHeight() + $(this).height()));
-			}).css('overflow', 'auto');
-
-		} else if ( o.autoHeight ) {
+			this.headers.next()
+				.each(function() {
+					$( this ).height( Math.max( 0, maxHeight -
+						$( this ).innerHeight() + $( this ).height() ) );
+				})
+				.css( "overflow", "auto" );
+		} else if ( options.autoHeight ) {
 			maxHeight = 0;
-			this.headers.next().each(function() {
-				maxHeight = Math.max(maxHeight, $(this).height());
-			}).height(maxHeight);
+			this.headers.next()
+				.each(function() {
+					maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
+				})
+				.height( maxHeight );
 		}
 
 		return this;
 	},
 
-	activate: function(index) {
+	activate: function( index ) {
 		// TODO this gets called on init, changing the option without an explicit call for that
 		this.options.active = index;
 		// call clickHandler with custom event
-		var active = this._findActive(index)[0];
-		this._clickHandler({ target: active }, active);
+		var active = this._findActive( index )[ 0 ];
+		this._clickHandler( { target: active }, active );
 
 		return this;
 	},
 
-	_findActive: function(selector) {
+	_findActive: function( selector ) {
 		return selector
-			? typeof selector == "number"
-				? this.headers.filter(":eq(" + selector + ")")
-				: this.headers.not(this.headers.not(selector))
+			? typeof selector === "number"
+				? this.headers.filter( ":eq(" + selector + ")" )
+				: this.headers.not( this.headers.not( selector ) )
 			: selector === false
-				? $([])
-				: this.headers.filter(":eq(0)");
+				? $( [] )
+				: this.headers.filter( ":eq(0)" );
 	},
 
-	// TODO isn't event.target enough? why the seperate target argument?
-	_clickHandler: function(event, target) {
-
-		var o = this.options;
-		if (o.disabled)
+	// TODO isn't event.target enough? why the separate target argument?
+	_clickHandler: function( event, target ) {
+		var options = this.options;
+		if ( options.disabled ) {
 			return;
+		}
 
 		// called only when using activate(false) to close all parts programmatically
-		if (!event.target) {
-			if (!o.collapsible)
+		if ( !event.target ) {
+			if ( !options.collapsible ) {
 				return;
-			this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all")
-				.find(".ui-icon").removeClass(o.icons.headerSelected).addClass(o.icons.header);
-			this.active.next().addClass('ui-accordion-content-active');
+			}
+			this.active
+				.removeClass( "ui-state-active ui-corner-top" )
+				.addClass( "ui-state-default ui-corner-all" )
+				.children( ".ui-icon" )
+					.removeClass( options.icons.headerSelected )
+					.addClass( options.icons.header );
+			this.active.next().addClass( "ui-accordion-content-active" );
 			var toHide = this.active.next(),
 				data = {
-					options: o,
-					newHeader: $([]),
-					oldHeader: o.active,
-					newContent: $([]),
+					options: options,
+					newHeader: $( [] ),
+					oldHeader: options.active,
+					newContent: $( [] ),
 					oldContent: toHide
 				},
-				toShow = (this.active = $([]));
-			this._toggle(toShow, toHide, data);
+				toShow = ( this.active = $( [] ) );
+			this._toggle( toShow, toHide, data );
 			return;
 		}
 
 		// get the click target
-		var clicked = $(event.currentTarget || target);
-		var clickedIsActive = clicked[0] == this.active[0];
-		
+		var clicked = $( event.currentTarget || target ),
+			clickedIsActive = clicked[0] === this.active[0];
+
 		// TODO the option is changed, is that correct?
 		// TODO if it is correct, shouldn't that happen after determining that the click is valid?
-		o.active = o.collapsible && clickedIsActive ? false : $('.ui-accordion-header', this.element).index(clicked);
+		options.active = options.collapsible && clickedIsActive ?
+			false :
+			this.headers.index( clicked );
 
 		// if animations are still active, or the active header is the target, ignore click
-		if (this.running || (!o.collapsible && clickedIsActive)) {
+		if ( this.running || ( !options.collapsible && clickedIsActive ) ) {
 			return;
 		}
 
-		// switch classes
-		this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all")
-			.find(".ui-icon").removeClass(o.icons.headerSelected).addClass(o.icons.header);
-		if (!clickedIsActive) {
-			clicked.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top")
-				.find(".ui-icon").removeClass(o.icons.header).addClass(o.icons.headerSelected);
-			clicked.next().addClass('ui-accordion-content-active');
-		}
-
 		// find elements to show and hide
-		var toShow = clicked.next(),
+		var active = this.active,
+			toShow = clicked.next(),
 			toHide = this.active.next(),
 			data = {
-				options: o,
-				newHeader: clickedIsActive && o.collapsible ? $([]) : clicked,
+				options: options,
+				newHeader: clickedIsActive && options.collapsible ? $([]) : clicked,
 				oldHeader: this.active,
-				newContent: clickedIsActive && o.collapsible ? $([]) : toShow,
+				newContent: clickedIsActive && options.collapsible ? $([]) : toShow,
 				oldContent: toHide
 			},
 			down = this.headers.index( this.active[0] ) > this.headers.index( clicked[0] );
 
+		// when the call to ._toggle() comes after the class changes
+		// it causes a very odd bug in IE 8 (see #6720)
 		this.active = clickedIsActive ? $([]) : clicked;
-		this._toggle(toShow, toHide, data, clickedIsActive, down);
+		this._toggle( toShow, toHide, data, clickedIsActive, down );
 
-		return;
+		// switch classes
+		active
+			.removeClass( "ui-state-active ui-corner-top" )
+			.addClass( "ui-state-default ui-corner-all" )
+			.children( ".ui-icon" )
+				.removeClass( options.icons.headerSelected )
+				.addClass( options.icons.header );
+		if ( !clickedIsActive ) {
+			clicked
+				.removeClass( "ui-state-default ui-corner-all" )
+				.addClass( "ui-state-active ui-corner-top" )
+				.children( ".ui-icon" )
+					.removeClass( options.icons.header )
+					.addClass( options.icons.headerSelected );
+			clicked
+				.next()
+				.addClass( "ui-accordion-content-active" );
+		}
 
+		return;
 	},
 
-	_toggle: function(toShow, toHide, data, clickedIsActive, down) {
+	_toggle: function( toShow, toHide, data, clickedIsActive, down ) {
+		var self = this,
+			options = self.options;
 
-		var o = this.options, self = this;
+		self.toShow = toShow;
+		self.toHide = toHide;
+		self.data = data;
 
-		this.toShow = toShow;
-		this.toHide = toHide;
-		this.data = data;
-
-		var complete = function() { if(!self) return; return self._completed.apply(self, arguments); };
+		var complete = function() {
+			if ( !self ) {
+				return;
+			}
+			return self._completed.apply( self, arguments );
+		};
 
 		// trigger changestart event
-		this._trigger("changestart", null, this.data);
+		self._trigger( "changestart", null, self.data );
 
 		// count elements to animate
-		this.running = toHide.size() === 0 ? toShow.size() : toHide.size();
-
-		if (o.animated) {
+		self.running = toHide.size() === 0 ? toShow.size() : toHide.size();
 
+		if ( options.animated ) {
 			var animOptions = {};
 
-			if ( o.collapsible && clickedIsActive ) {
+			if ( options.collapsible && clickedIsActive ) {
 				animOptions = {
-					toShow: $([]),
+					toShow: $( [] ),
 					toHide: toHide,
 					complete: complete,
 					down: down,
-					autoHeight: o.autoHeight || o.fillSpace
+					autoHeight: options.autoHeight || options.fillSpace
 				};
 			} else {
 				animOptions = {
@@ -352,101 +428,120 @@ $.widget("ui.accordion", {
 					toHide: toHide,
 					complete: complete,
 					down: down,
-					autoHeight: o.autoHeight || o.fillSpace
+					autoHeight: options.autoHeight || options.fillSpace
 				};
 			}
 
-			if (!o.proxied) {
-				o.proxied = o.animated;
+			if ( !options.proxied ) {
+				options.proxied = options.animated;
 			}
 
-			if (!o.proxiedDuration) {
-				o.proxiedDuration = o.duration;
+			if ( !options.proxiedDuration ) {
+				options.proxiedDuration = options.duration;
 			}
 
-			o.animated = $.isFunction(o.proxied) ?
-				o.proxied(animOptions) : o.proxied;
+			options.animated = $.isFunction( options.proxied ) ?
+				options.proxied( animOptions ) :
+				options.proxied;
 
-			o.duration = $.isFunction(o.proxiedDuration) ?
-				o.proxiedDuration(animOptions) : o.proxiedDuration;
+			options.duration = $.isFunction( options.proxiedDuration ) ?
+				options.proxiedDuration( animOptions ) :
+				options.proxiedDuration;
 
 			var animations = $.ui.accordion.animations,
-				duration = o.duration,
-				easing = o.animated;
+				duration = options.duration,
+				easing = options.animated;
 
-			if (easing && !animations[easing] && !$.easing[easing]) {
-				easing = 'slide';
+			if ( easing && !animations[ easing ] && !$.easing[ easing ] ) {
+				easing = "slide";
 			}
-			if (!animations[easing]) {
-				animations[easing] = function(options) {
-					this.slide(options, {
+			if ( !animations[ easing ] ) {
+				animations[ easing ] = function( options ) {
+					this.slide( options, {
 						easing: easing,
 						duration: duration || 700
 					});
 				};
 			}
 
-			animations[easing](animOptions);
-
+			animations[ easing ]( animOptions );
 		} else {
-
-			if (o.collapsible && clickedIsActive) {
+			if ( options.collapsible && clickedIsActive ) {
 				toShow.toggle();
 			} else {
 				toHide.hide();
 				toShow.show();
 			}
 
-			complete(true);
-
+			complete( true );
 		}
 
 		// TODO assert that the blur and focus triggers are really necessary, remove otherwise
-		toHide.prev().attr('aria-expanded','false').attr("tabIndex", "-1").blur();
-		toShow.prev().attr('aria-expanded','true').attr("tabIndex", "0").focus();
-
+		toHide.prev()
+			.attr({
+				"aria-expanded": "false",
+				"aria-selected": "false",
+				tabIndex: -1
+			})
+			.blur();
+		toShow.prev()
+			.attr({
+				"aria-expanded": "true",
+				"aria-selected": "true",
+				tabIndex: 0
+			})
+			.focus();
 	},
 
-	_completed: function(cancel) {
-
-		var o = this.options;
-
+	_completed: function( cancel ) {
 		this.running = cancel ? 0 : --this.running;
-		if (this.running) return;
+		if ( this.running ) {
+			return;
+		}
 
-		if (o.clearStyle) {
-			this.toShow.add(this.toHide).css({
+		if ( this.options.clearStyle ) {
+			this.toShow.add( this.toHide ).css({
 				height: "",
 				overflow: ""
 			});
 		}
-		
+
 		// other classes are removed before the animation; this one needs to stay until completed
-		this.toHide.removeClass("ui-accordion-content-active");
+		this.toHide.removeClass( "ui-accordion-content-active" );
+		// Work around for rendering bug in IE (#5421)
+		if ( this.toHide.length ) {
+			this.toHide.parent()[0].className = this.toHide.parent()[0].className;
+		}
 
-		this._trigger('change', null, this.data);
+		this._trigger( "change", null, this.data );
 	}
-
 });
 
-
-$.extend($.ui.accordion, {
-	version: "1.8.2",
+$.extend( $.ui.accordion, {
+	version: "1.8.11",
 	animations: {
-		slide: function(options, additions) {
+		slide: function( options, additions ) {
 			options = $.extend({
 				easing: "swing",
 				duration: 300
-			}, options, additions);
+			}, options, additions );
 			if ( !options.toHide.size() ) {
-				options.toShow.animate({height: "show"}, options);
+				options.toShow.animate({
+					height: "show",
+					paddingTop: "show",
+					paddingBottom: "show"
+				}, options );
 				return;
 			}
 			if ( !options.toShow.size() ) {
-				options.toHide.animate({height: "hide"}, options);
+				options.toHide.animate({
+					height: "hide",
+					paddingTop: "hide",
+					paddingBottom: "hide"
+				}, options );
 				return;
 			}
-			var overflow = options.toShow.css('overflow'),
+			var overflow = options.toShow.css( "overflow" ),
 				percentDone = 0,
 				showProps = {},
 				hideProps = {},
@@ -455,45 +550,57 @@ $.extend($.ui.accordion, {
 			// fix width before calculating height of hidden element
 			var s = options.toShow;
 			originalWidth = s[0].style.width;
-			s.width( parseInt(s.parent().width(),10) - parseInt(s.css("paddingLeft"),10) - parseInt(s.css("paddingRight"),10) - (parseInt(s.css("borderLeftWidth"),10) || 0) - (parseInt(s.css("borderRightWidth"),10) || 0) );
-			
-			$.each(fxAttrs, function(i, prop) {
-				hideProps[prop] = 'hide';
-				
-				var parts = ('' + $.css(options.toShow[0], prop)).match(/^([\d+-.]+)(.*)$/);
-				showProps[prop] = {
-					value: parts[1],
-					unit: parts[2] || 'px'
+			s.width( parseInt( s.parent().width(), 10 )
+				- parseInt( s.css( "paddingLeft" ), 10 )
+				- parseInt( s.css( "paddingRight" ), 10 )
+				- ( parseInt( s.css( "borderLeftWidth" ), 10 ) || 0 )
+				- ( parseInt( s.css( "borderRightWidth" ), 10) || 0 ) );
+
+			$.each( fxAttrs, function( i, prop ) {
+				hideProps[ prop ] = "hide";
+
+				var parts = ( "" + $.css( options.toShow[0], prop ) ).match( /^([\d+-.]+)(.*)$/ );
+				showProps[ prop ] = {
+					value: parts[ 1 ],
+					unit: parts[ 2 ] || "px"
 				};
 			});
-			options.toShow.css({ height: 0, overflow: 'hidden' }).show();
-			options.toHide.filter(":hidden").each(options.complete).end().filter(":visible").animate(hideProps,{
-				step: function(now, settings) {
+			options.toShow.css({ height: 0, overflow: "hidden" }).show();
+			options.toHide
+				.filter( ":hidden" )
+					.each( options.complete )
+				.end()
+				.filter( ":visible" )
+				.animate( hideProps, {
+				step: function( now, settings ) {
 					// only calculate the percent when animating height
 					// IE gets very inconsistent results when animating elements
 					// with small values, which is common for padding
-					if (settings.prop == 'height') {
+					if ( settings.prop == "height" ) {
 						percentDone = ( settings.end - settings.start === 0 ) ? 0 :
-							(settings.now - settings.start) / (settings.end - settings.start);
+							( settings.now - settings.start ) / ( settings.end - settings.start );
 					}
-					
-					options.toShow[0].style[settings.prop] =
-						(percentDone * showProps[settings.prop].value) + showProps[settings.prop].unit;
+
+					options.toShow[ 0 ].style[ settings.prop ] =
+						( percentDone * showProps[ settings.prop ].value )
+						+ showProps[ settings.prop ].unit;
 				},
 				duration: options.duration,
 				easing: options.easing,
 				complete: function() {
 					if ( !options.autoHeight ) {
-						options.toShow.css("height", "");
+						options.toShow.css( "height", "" );
 					}
-					options.toShow.css("width", originalWidth);
-					options.toShow.css({overflow: overflow});
+					options.toShow.css({
+						width: originalWidth,
+						overflow: overflow
+					});
 					options.complete();
 				}
 			});
 		},
-		bounceslide: function(options) {
-			this.slide(options, {
+		bounceslide: function( options ) {
+			this.slide( options, {
 				easing: options.down ? "easeOutBounce" : "swing",
 				duration: options.down ? 1000 : 200
 			});
@@ -501,4 +608,4 @@ $.extend($.ui.accordion, {
 	}
 });
 
-})(jQuery);
+})( jQuery );
diff --git a/resources/jquery.ui/jquery.ui.autocomplete.js b/resources/jquery.ui/jquery.ui.autocomplete.js
index 9a12a6b0..41c13930 100644
--- a/resources/jquery.ui/jquery.ui.autocomplete.js
+++ b/resources/jquery.ui/jquery.ui.autocomplete.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Autocomplete 1.8.2
+ * jQuery UI Autocomplete 1.8.14
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Autocomplete
  *
@@ -12,16 +12,32 @@
  *	jquery.ui.widget.js
  *	jquery.ui.position.js
  */
-(function( $ ) {
+(function( $, undefined ) {
+
+// used to prevent race conditions with remote data sources
+var requestIndex = 0;
 
 $.widget( "ui.autocomplete", {
 	options: {
+		appendTo: "body",
+		autoFocus: false,
+		delay: 300,
 		minLength: 1,
-		delay: 300
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null
 	},
+
+	pending: 0,
+
 	_create: function() {
 		var self = this,
-			doc = this.element[ 0 ].ownerDocument;
+			doc = this.element[ 0 ].ownerDocument,
+			suppressKeyPress;
+
 		this.element
 			.addClass( "ui-autocomplete-input" )
 			.attr( "autocomplete", "off" )
@@ -32,6 +48,11 @@ $.widget( "ui.autocomplete", {
 				"aria-haspopup": "true"
 			})
 			.bind( "keydown.autocomplete", function( event ) {
+				if ( self.options.disabled || self.element.attr( "readonly" ) ) {
+					return;
+				}
+
+				suppressKeyPress = false;
 				var keyCode = $.ui.keyCode;
 				switch( event.keyCode ) {
 				case keyCode.PAGE_UP:
@@ -52,8 +73,11 @@ $.widget( "ui.autocomplete", {
 					break;
 				case keyCode.ENTER:
 				case keyCode.NUMPAD_ENTER:
-					// when menu is open or has focus
+					// when menu is open and has focus
 					if ( self.menu.active ) {
+						// #6055 - Opera still allows the keypress to occur
+						// which causes forms to submit
+						suppressKeyPress = true;
 						event.preventDefault();
 					}
 					//passthrough - ENTER and TAB both select the current element
@@ -67,33 +91,38 @@ $.widget( "ui.autocomplete", {
 					self.element.val( self.term );
 					self.close( event );
 					break;
-				case keyCode.LEFT:
-				case keyCode.RIGHT:
-				case keyCode.SHIFT:
-				case keyCode.CONTROL:
-				case keyCode.ALT:
-				case keyCode.COMMAND:
-				case keyCode.COMMAND_RIGHT:
-				case keyCode.INSERT:
-				case keyCode.CAPS_LOCK:
-				case keyCode.END:
-				case keyCode.HOME:
-					// ignore metakeys (shift, ctrl, alt)
-					break;
 				default:
 					// keypress is triggered before the input value is changed
 					clearTimeout( self.searching );
 					self.searching = setTimeout(function() {
-						self.search( null, event );
+						// only search if the value has changed
+						if ( self.term != self.element.val() ) {
+							self.selectedItem = null;
+							self.search( null, event );
+						}
 					}, self.options.delay );
 					break;
 				}
 			})
+			.bind( "keypress.autocomplete", function( event ) {
+				if ( suppressKeyPress ) {
+					suppressKeyPress = false;
+					event.preventDefault();
+				}
+			})
 			.bind( "focus.autocomplete", function() {
+				if ( self.options.disabled ) {
+					return;
+				}
+
 				self.selectedItem = null;
 				self.previous = self.element.val();
 			})
 			.bind( "blur.autocomplete", function( event ) {
+				if ( self.options.disabled ) {
+					return;
+				}
+
 				clearTimeout( self.searching );
 				// clicks on the menu (or a button to trigger a search) will cause a blur event
 				self.closing = setTimeout(function() {
@@ -107,9 +136,26 @@ $.widget( "ui.autocomplete", {
 		};
 		this.menu = $( "<ul></ul>" )
 			.addClass( "ui-autocomplete" )
-			.appendTo( "body", doc )
+			.appendTo( $( this.options.appendTo || "body", doc )[0] )
 			// prevent the close-on-blur in case of a "slow" click on the menu (long mousedown)
-			.mousedown(function() {
+			.mousedown(function( event ) {
+				// clicking on the scrollbar causes focus to shift to the body
+				// but we can't detect a mouseup or a click immediately afterward
+				// so we have to track the next mousedown and close the menu if
+				// the user clicks somewhere outside of the autocomplete
+				var menuElement = self.menu.element[ 0 ];
+				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
+					setTimeout(function() {
+						$( document ).one( 'mousedown', function( event ) {
+							if ( event.target !== self.element[ 0 ] &&
+								event.target !== menuElement &&
+								!$.ui.contains( menuElement, event.target ) ) {
+								self.close();
+							}
+						});
+					}, 1 );
+				}
+
 				// use another timeout to make sure the blur-event-handler on the input was already triggered
 				setTimeout(function() {
 					clearTimeout( self.closing );
@@ -118,7 +164,7 @@ $.widget( "ui.autocomplete", {
 			.menu({
 				focus: function( event, ui ) {
 					var item = ui.item.data( "item.autocomplete" );
-					if ( false !== self._trigger( "focus", null, { item: item } ) ) {
+					if ( false !== self._trigger( "focus", event, { item: item } ) ) {
 						// use value to match what will end up in the input, if it was a key event
 						if ( /^key/.test(event.originalEvent.type) ) {
 							self.element.val( item.value );
@@ -126,21 +172,37 @@ $.widget( "ui.autocomplete", {
 					}
 				},
 				selected: function( event, ui ) {
-					var item = ui.item.data( "item.autocomplete" );
-					if ( false !== self._trigger( "select", event, { item: item } ) ) {
-						self.element.val( item.value );
-					}
-					self.close( event );
+					var item = ui.item.data( "item.autocomplete" ),
+						previous = self.previous;
+
 					// only trigger when focus was lost (click on menu)
-					var previous = self.previous;
 					if ( self.element[0] !== doc.activeElement ) {
 						self.element.focus();
 						self.previous = previous;
+						// #6109 - IE triggers two focus events and the second
+						// is asynchronous, so we need to reset the previous
+						// term synchronously and asynchronously :-(
+						setTimeout(function() {
+							self.previous = previous;
+							self.selectedItem = item;
+						}, 1);
 					}
+
+					if ( false !== self._trigger( "select", event, { item: item } ) ) {
+						self.element.val( item.value );
+					}
+					// reset the term after the select event
+					// this allows custom select handling to work properly
+					self.term = self.element.val();
+
+					self.close( event );
 					self.selectedItem = item;
 				},
 				blur: function( event, ui ) {
-					if ( self.menu.element.is(":visible") ) {
+					// don't set the value of the text field if it's already correct
+					// this prevents moving the cursor unnecessarily
+					if ( self.menu.element.is(":visible") &&
+						( self.element.val() !== self.term ) ) {
 						self.element.val( self.term );
 					}
 				}
@@ -166,15 +228,22 @@ $.widget( "ui.autocomplete", {
 		$.Widget.prototype.destroy.call( this );
 	},
 
-	_setOption: function( key ) {
+	_setOption: function( key, value ) {
 		$.Widget.prototype._setOption.apply( this, arguments );
 		if ( key === "source" ) {
 			this._initSource();
 		}
+		if ( key === "appendTo" ) {
+			this.menu.element.appendTo( $( value || "body", this.element[0].ownerDocument )[0] )
+		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
 	},
 
 	_initSource: function() {
-		var array,
+		var self = this,
+			array,
 			url;
 		if ( $.isArray(this.options.source) ) {
 			array = this.options.source;
@@ -184,7 +253,25 @@ $.widget( "ui.autocomplete", {
 		} else if ( typeof this.options.source === "string" ) {
 			url = this.options.source;
 			this.source = function( request, response ) {
-				$.getJSON( url, request, response );
+				if ( self.xhr ) {
+					self.xhr.abort();
+				}
+				self.xhr = $.ajax({
+					url: url,
+					data: request,
+					dataType: "json",
+					autocompleteRequest: ++requestIndex,
+					success: function( data, status ) {
+						if ( this.autocompleteRequest === requestIndex ) {
+							response( data );
+						}
+					},
+					error: function() {
+						if ( this.autocompleteRequest === requestIndex ) {
+							response( [] );
+						}
+					}
+				});
 			};
 		} else {
 			this.source = this.options.source;
@@ -193,12 +280,16 @@ $.widget( "ui.autocomplete", {
 
 	search: function( value, event ) {
 		value = value != null ? value : this.element.val();
+
+		// always save the actual value, not the one passed as an argument
+		this.term = this.element.val();
+
 		if ( value.length < this.options.minLength ) {
 			return this.close( event );
 		}
 
 		clearTimeout( this.closing );
-		if ( this._trigger("search") === false ) {
+		if ( this._trigger( "search", event ) === false ) {
 			return;
 		}
 
@@ -206,31 +297,32 @@ $.widget( "ui.autocomplete", {
 	},
 
 	_search: function( value ) {
-		this.term = this.element
-			.addClass( "ui-autocomplete-loading" )
-			// always save the actual value, not the one passed as an argument
-			.val();
+		this.pending++;
+		this.element.addClass( "ui-autocomplete-loading" );
 
 		this.source( { term: value }, this.response );
 	},
 
 	_response: function( content ) {
-		if ( content.length ) {
+		if ( !this.options.disabled && content && content.length ) {
 			content = this._normalize( content );
 			this._suggest( content );
 			this._trigger( "open" );
 		} else {
 			this.close();
 		}
-		this.element.removeClass( "ui-autocomplete-loading" );
+		this.pending--;
+		if ( !this.pending ) {
+			this.element.removeClass( "ui-autocomplete-loading" );
+		}
 	},
 
 	close: function( event ) {
 		clearTimeout( this.closing );
 		if ( this.menu.element.is(":visible") ) {
-			this._trigger( "close", event );
 			this.menu.element.hide();
 			this.menu.deactivate();
+			this._trigger( "close", event );
 		}
 	},
 	
@@ -261,26 +353,33 @@ $.widget( "ui.autocomplete", {
 
 	_suggest: function( items ) {
 		var ul = this.menu.element
-				.empty()
-				.zIndex( this.element.zIndex() + 1 ),
-			menuWidth,
-			textWidth;
+			.empty()
+			.zIndex( this.element.zIndex() + 1 );
 		this._renderMenu( ul, items );
 		// TODO refresh should check if the active item is still in the dom, removing the need for a manual deactivate
 		this.menu.deactivate();
 		this.menu.refresh();
-		this.menu.element.show().position({
-			my: "left top",
-			at: "left bottom",
-			of: this.element,
-			collision: "none"
-		});
 
-		menuWidth = ul.width( "" ).width();
-		textWidth = this.element.width();
-		ul.width( Math.max( menuWidth, textWidth ) );
+		// size and position menu
+		ul.show();
+		this._resizeMenu();
+		ul.position( $.extend({
+			of: this.element
+		}, this.options.position ));
+
+		if ( this.options.autoFocus ) {
+			this.menu.next( new $.Event("mouseover") );
+		}
 	},
-	
+
+	_resizeMenu: function() {
+		var ul = this.menu.element;
+		ul.outerWidth( Math.max(
+			ul.width( "" ).outerWidth(),
+			this.element.outerWidth()
+		) );
+	},
+
 	_renderMenu: function( ul, items ) {
 		var self = this;
 		$.each( items, function( index, item ) {
@@ -291,7 +390,7 @@ $.widget( "ui.autocomplete", {
 	_renderItem: function( ul, item) {
 		return $( "<li></li>" )
 			.data( "item.autocomplete", item )
-			.append( "<a>" + item.label + "</a>" )
+			.append( $( "<a></a>" ).text( item.label ) )
 			.appendTo( ul );
 	},
 
@@ -316,7 +415,7 @@ $.widget( "ui.autocomplete", {
 
 $.extend( $.ui.autocomplete, {
 	escapeRegex: function( value ) {
-		return value.replace( /([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1" );
+		return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
 	},
 	filter: function(array, term) {
 		var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
@@ -335,9 +434,9 @@ $.extend( $.ui.autocomplete, {
  * it for the next release. You're welcome to give it a try anyway and give us feedback,
  * as long as you're okay with migrating your code later on. We can help with that, too.
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Menu
  *
@@ -391,12 +490,12 @@ $.widget("ui.menu", {
 		this.deactivate();
 		if (this.hasScroll()) {
 			var offset = item.offset().top - this.element.offset().top,
-				scroll = this.element.attr("scrollTop"),
+				scroll = this.element.scrollTop(),
 				elementHeight = this.element.height();
 			if (offset < 0) {
-				this.element.attr("scrollTop", scroll + offset);
-			} else if (offset > elementHeight) {
-				this.element.attr("scrollTop", scroll + offset - elementHeight + item.height());
+				this.element.scrollTop( scroll + offset);
+			} else if (offset >= elementHeight) {
+				this.element.scrollTop( scroll + offset - elementHeight + item.height());
 			}
 		}
 		this.active = item.eq(0)
@@ -426,11 +525,11 @@ $.widget("ui.menu", {
 	},
 
 	first: function() {
-		return this.active && !this.active.prev().length;
+		return this.active && !this.active.prevAll(".ui-menu-item").length;
 	},
 
 	last: function() {
-		return this.active && !this.active.next().length;
+		return this.active && !this.active.nextAll(".ui-menu-item").length;
 	},
 
 	move: function(direction, edge, event) {
@@ -451,12 +550,12 @@ $.widget("ui.menu", {
 		if (this.hasScroll()) {
 			// TODO merge with no-scroll-else
 			if (!this.active || this.last()) {
-				this.activate(event, this.element.children(":first"));
+				this.activate(event, this.element.children(".ui-menu-item:first"));
 				return;
 			}
 			var base = this.active.offset().top,
 				height = this.element.height(),
-				result = this.element.children("li").filter(function() {
+				result = this.element.children(".ui-menu-item").filter(function() {
 					var close = $(this).offset().top - base - height + $(this).height();
 					// TODO improve approximation
 					return close < 10 && close > -10;
@@ -464,11 +563,12 @@ $.widget("ui.menu", {
 
 			// TODO try to catch this earlier when scrollTop indicates the last page anyway
 			if (!result.length) {
-				result = this.element.children(":last");
+				result = this.element.children(".ui-menu-item:last");
 			}
 			this.activate(event, result);
 		} else {
-			this.activate(event, this.element.children(!this.active || this.last() ? ":first" : ":last"));
+			this.activate(event, this.element.children(".ui-menu-item")
+				.filter(!this.active || this.last() ? ":first" : ":last"));
 		}
 	},
 
@@ -477,13 +577,13 @@ $.widget("ui.menu", {
 		if (this.hasScroll()) {
 			// TODO merge with no-scroll-else
 			if (!this.active || this.first()) {
-				this.activate(event, this.element.children(":last"));
+				this.activate(event, this.element.children(".ui-menu-item:last"));
 				return;
 			}
 
 			var base = this.active.offset().top,
 				height = this.element.height();
-				result = this.element.children("li").filter(function() {
+				result = this.element.children(".ui-menu-item").filter(function() {
 					var close = $(this).offset().top - base + height - $(this).height();
 					// TODO improve approximation
 					return close < 10 && close > -10;
@@ -491,16 +591,17 @@ $.widget("ui.menu", {
 
 			// TODO try to catch this earlier when scrollTop indicates the last page anyway
 			if (!result.length) {
-				result = this.element.children(":first");
+				result = this.element.children(".ui-menu-item:first");
 			}
 			this.activate(event, result);
 		} else {
-			this.activate(event, this.element.children(!this.active || this.first() ? ":last" : ":first"));
+			this.activate(event, this.element.children(".ui-menu-item")
+				.filter(!this.active || this.first() ? ":last" : ":first"));
 		}
 	},
 
 	hasScroll: function() {
-		return this.element.height() < this.element.attr("scrollHeight");
+		return this.element.height() < this.element[ $.fn.prop ? "prop" : "attr" ]("scrollHeight");
 	},
 
 	select: function( event ) {
diff --git a/resources/jquery.ui/jquery.ui.button.js b/resources/jquery.ui/jquery.ui.button.js
index d318e3de..9a70a01d 100644
--- a/resources/jquery.ui/jquery.ui.button.js
+++ b/resources/jquery.ui/jquery.ui.button.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Button 1.8.2
+ * jQuery UI Button 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Button
  *
@@ -11,12 +11,12 @@
  *	jquery.ui.core.js
  *	jquery.ui.widget.js
  */
-(function( $ ) {
+(function( $, undefined ) {
 
 var lastActive,
 	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
 	stateClasses = "ui-state-hover ui-state-active ",
-	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon ui-button-text-only",
+	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
 	formResetHandler = function( event ) {
 		$( ":ui-button", event.target.form ).each(function() {
 			var inst = $( this ).data( "button" );
@@ -44,6 +44,7 @@ var lastActive,
 
 $.widget( "ui.button", {
 	options: {
+		disabled: null,
 		text: true,
 		label: null,
 		icons: {
@@ -56,6 +57,10 @@ $.widget( "ui.button", {
 			.unbind( "reset.button" )
 			.bind( "reset.button", formResetHandler );
 
+		if ( typeof this.options.disabled !== "boolean" ) {
+			this.options.disabled = this.element.attr( "disabled" );
+		}
+
 		this._determineButtonType();
 		this.hasTitle = !!this.buttonElement.attr( "title" );
 
@@ -195,8 +200,16 @@ $.widget( "ui.button", {
 		if ( this.type === "checkbox" || this.type === "radio" ) {
 			// we don't search against the document in case the element
 			// is disconnected from the DOM
-			this.buttonElement = this.element.parents().last()
-				.find( "[for=" + this.element.attr("id") + "]" );
+			var ancestor = this.element.parents().filter(":last"),
+				labelSelector = "label[for=" + this.element.attr("id") + "]";
+			this.buttonElement = ancestor.find( labelSelector );
+			if ( !this.buttonElement.length ) {
+				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
+				this.buttonElement = ancestor.filter( labelSelector );
+				if ( !this.buttonElement.length ) {
+					this.buttonElement = ancestor.find( labelSelector );
+				}
+			}
 			this.element.addClass( "ui-helper-hidden-accessible" );
 
 			var checked = this.element.is( ":checked" );
@@ -285,34 +298,43 @@ $.widget( "ui.button", {
 				.appendTo( buttonElement.empty() )
 				.text(),
 			icons = this.options.icons,
-			multipleIcons = icons.primary && icons.secondary;
+			multipleIcons = icons.primary && icons.secondary,
+			buttonClasses = [];  
+
 		if ( icons.primary || icons.secondary ) {
-			buttonElement.addClass( "ui-button-text-icon" +
-				( multipleIcons ? "s" : "" ) );
+			if ( this.options.text ) {
+				buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+			}
+
 			if ( icons.primary ) {
 				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
 			}
+
 			if ( icons.secondary ) {
 				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
 			}
+
 			if ( !this.options.text ) {
-				buttonElement
-					.addClass( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" )
-					.removeClass( "ui-button-text-icons ui-button-text-icon" );
+				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+
 				if ( !this.hasTitle ) {
 					buttonElement.attr( "title", buttonText );
 				}
 			}
 		} else {
-			buttonElement.addClass( "ui-button-text-only" );
+			buttonClasses.push( "ui-button-text-only" );
 		}
+		buttonElement.addClass( buttonClasses.join( " " ) );
 	}
 });
 
 $.widget( "ui.buttonset", {
+	options: {
+		items: ":button, :submit, :reset, :checkbox, :radio, a, :data(button)"
+	},
+
 	_create: function() {
 		this.element.addClass( "ui-buttonset" );
-		this._init();
 	},
 	
 	_init: function() {
@@ -328,7 +350,7 @@ $.widget( "ui.buttonset", {
 	},
 	
 	refresh: function() {
-		this.buttons = this.element.find( ":button, :submit, :reset, :checkbox, :radio, a, :data(button)" )
+		this.buttons = this.element.find( this.options.items )
 			.filter( ":ui-button" )
 				.button( "refresh" )
 			.end()
diff --git a/resources/jquery.ui/jquery.ui.core.js b/resources/jquery.ui/jquery.ui.core.js
index 80448028..4589a47e 100644
--- a/resources/jquery.ui/jquery.ui.core.js
+++ b/resources/jquery.ui/jquery.ui.core.js
@@ -1,82 +1,24 @@
 /*!
- * jQuery UI 1.8.2
+ * jQuery UI 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI
  */
-
-(function($) {
+(function( $, undefined ) {
 
 // prevent duplicate loading
 // this is only a problem because we proxy existing functions
 // and we don't want to double proxy them
 $.ui = $.ui || {};
-if ($.ui.version) {
+if ( $.ui.version ) {
 	return;
 }
 
-//Helper functions and ui object
-$.extend($.ui, {
-	version: "1.8.2",
-
-	// $.ui.plugin is deprecated.  Use the proxy pattern instead.
-	plugin: {
-		add: function(module, option, set) {
-			var proto = $.ui[module].prototype;
-			for(var i in set) {
-				proto.plugins[i] = proto.plugins[i] || [];
-				proto.plugins[i].push([option, set[i]]);
-			}
-		},
-		call: function(instance, name, args) {
-			var set = instance.plugins[name];
-			if(!set || !instance.element[0].parentNode) { return; }
-
-			for (var i = 0; i < set.length; i++) {
-				if (instance.options[set[i][0]]) {
-					set[i][1].apply(instance.element, args);
-				}
-			}
-		}
-	},
-
-	contains: function(a, b) {
-		return document.compareDocumentPosition
-			? a.compareDocumentPosition(b) & 16
-			: a !== b && a.contains(b);
-	},
-
-	hasScroll: function(el, a) {
-
-		//If overflow is hidden, the element might have extra content, but the user wants to hide it
-		if ($(el).css('overflow') == 'hidden') { return false; }
-
-		var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop',
-			has = false;
-
-		if (el[scroll] > 0) { return true; }
-
-		// TODO: determine which cases actually cause this to happen
-		// if the element doesn't have the scroll set, see if it's possible to
-		// set the scroll
-		el[scroll] = 1;
-		has = (el[scroll] > 0);
-		el[scroll] = 0;
-		return has;
-	},
-
-	isOverAxis: function(x, reference, size) {
-		//Determines when x coordinate is over "b" element axis
-		return (x > reference) && (x < (reference + size));
-	},
-
-	isOver: function(y, x, top, left, height, width) {
-		//Determines when x, y coordinates is over "b" element
-		return $.ui.isOverAxis(y, top, height) && $.ui.isOverAxis(x, left, width);
-	},
+$.extend( $.ui, {
+	version: "1.8.11",
 
 	keyCode: {
 		ALT: 18,
@@ -114,36 +56,26 @@ $.extend($.ui, {
 	}
 });
 
-//jQuery plugins
+// plugins
 $.fn.extend({
 	_focus: $.fn.focus,
-	focus: function(delay, fn) {
-		return typeof delay === 'number'
-			? this.each(function() {
+	focus: function( delay, fn ) {
+		return typeof delay === "number" ?
+			this.each(function() {
 				var elem = this;
 				setTimeout(function() {
-					$(elem).focus();
-					(fn && fn.call(elem));
-				}, delay);
-			})
-			: this._focus.apply(this, arguments);
-	},
-	
-	enableSelection: function() {
-		return this
-			.attr('unselectable', 'off')
-			.css('MozUserSelect', '');
-	},
-
-	disableSelection: function() {
-		return this
-			.attr('unselectable', 'on')
-			.css('MozUserSelect', 'none');
+					$( elem ).focus();
+					if ( fn ) {
+						fn.call( elem );
+					}
+				}, delay );
+			}) :
+			this._focus.apply( this, arguments );
 	},
 
 	scrollParent: function() {
 		var scrollParent;
-		if(($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
+		if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
 			scrollParent = this.parents().filter(function() {
 				return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
 			}).eq(0);
@@ -156,26 +88,25 @@ $.fn.extend({
 		return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
 	},
 
-	zIndex: function(zIndex) {
-		if (zIndex !== undefined) {
-			return this.css('zIndex', zIndex);
+	zIndex: function( zIndex ) {
+		if ( zIndex !== undefined ) {
+			return this.css( "zIndex", zIndex );
 		}
-		
-		if (this.length) {
-			var elem = $(this[0]), position, value;
-			while (elem.length && elem[0] !== document) {
+
+		if ( this.length ) {
+			var elem = $( this[ 0 ] ), position, value;
+			while ( elem.length && elem[ 0 ] !== document ) {
 				// Ignore z-index if position is set to a value where z-index is ignored by the browser
 				// This makes behavior of this function consistent across browsers
 				// WebKit always returns auto if the element is positioned
-				position = elem.css('position');
-				if (position == 'absolute' || position == 'relative' || position == 'fixed')
-				{
+				position = elem.css( "position" );
+				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
 					// IE returns 0 when zIndex is not specified
 					// other browsers return a string
 					// we ignore the case of nested elements with an explicit value of 0
 					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
-					value = parseInt(elem.css('zIndex'));
-					if (!isNaN(value) && value != 0) {
+					value = parseInt( elem.css( "zIndex" ), 10 );
+					if ( !isNaN( value ) && value !== 0 ) {
 						return value;
 					}
 				}
@@ -184,33 +115,194 @@ $.fn.extend({
 		}
 
 		return 0;
+	},
+
+	disableSelection: function() {
+		return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+			".ui-disableSelection", function( event ) {
+				event.preventDefault();
+			});
+	},
+
+	enableSelection: function() {
+		return this.unbind( ".ui-disableSelection" );
+	}
+});
+
+$.each( [ "Width", "Height" ], function( i, name ) {
+	var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+		type = name.toLowerCase(),
+		orig = {
+			innerWidth: $.fn.innerWidth,
+			innerHeight: $.fn.innerHeight,
+			outerWidth: $.fn.outerWidth,
+			outerHeight: $.fn.outerHeight
+		};
+
+	function reduce( elem, size, border, margin ) {
+		$.each( side, function() {
+			size -= parseFloat( $.curCSS( elem, "padding" + this, true) ) || 0;
+			if ( border ) {
+				size -= parseFloat( $.curCSS( elem, "border" + this + "Width", true) ) || 0;
+			}
+			if ( margin ) {
+				size -= parseFloat( $.curCSS( elem, "margin" + this, true) ) || 0;
+			}
+		});
+		return size;
 	}
+
+	$.fn[ "inner" + name ] = function( size ) {
+		if ( size === undefined ) {
+			return orig[ "inner" + name ].call( this );
+		}
+
+		return this.each(function() {
+			$( this ).css( type, reduce( this, size ) + "px" );
+		});
+	};
+
+	$.fn[ "outer" + name] = function( size, margin ) {
+		if ( typeof size !== "number" ) {
+			return orig[ "outer" + name ].call( this, size );
+		}
+
+		return this.each(function() {
+			$( this).css( type, reduce( this, size, true, margin ) + "px" );
+		});
+	};
 });
 
+// selectors
+function visible( element ) {
+	return !$( element ).parents().andSelf().filter(function() {
+		return $.curCSS( this, "visibility" ) === "hidden" ||
+			$.expr.filters.hidden( this );
+	}).length;
+}
 
-//Additional selectors
-$.extend($.expr[':'], {
-	data: function(elem, i, match) {
-		return !!$.data(elem, match[3]);
+$.extend( $.expr[ ":" ], {
+	data: function( elem, i, match ) {
+		return !!$.data( elem, match[ 3 ] );
 	},
 
-	focusable: function(element) {
+	focusable: function( element ) {
 		var nodeName = element.nodeName.toLowerCase(),
-			tabIndex = $.attr(element, 'tabindex');
-		return (/input|select|textarea|button|object/.test(nodeName)
+			tabIndex = $.attr( element, "tabindex" );
+		if ( "area" === nodeName ) {
+			var map = element.parentNode,
+				mapName = map.name,
+				img;
+			if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+				return false;
+			}
+			img = $( "img[usemap=#" + mapName + "]" )[0];
+			return !!img && visible( img );
+		}
+		return ( /input|select|textarea|button|object/.test( nodeName )
 			? !element.disabled
-			: 'a' == nodeName || 'area' == nodeName
-				? element.href || !isNaN(tabIndex)
-				: !isNaN(tabIndex))
+			: "a" == nodeName
+				? element.href || !isNaN( tabIndex )
+				: !isNaN( tabIndex ))
 			// the element and all of its ancestors must be visible
-			// the browser may report that the area is hidden
-			&& !$(element)['area' == nodeName ? 'parents' : 'closest'](':hidden').length;
+			&& visible( element );
 	},
 
-	tabbable: function(element) {
-		var tabIndex = $.attr(element, 'tabindex');
-		return (isNaN(tabIndex) || tabIndex >= 0) && $(element).is(':focusable');
+	tabbable: function( element ) {
+		var tabIndex = $.attr( element, "tabindex" );
+		return ( isNaN( tabIndex ) || tabIndex >= 0 ) && $( element ).is( ":focusable" );
+	}
+});
+
+// support
+$(function() {
+	var body = document.body,
+		div = body.appendChild( div = document.createElement( "div" ) );
+
+	$.extend( div.style, {
+		minHeight: "100px",
+		height: "auto",
+		padding: 0,
+		borderWidth: 0
+	});
+
+	$.support.minHeight = div.offsetHeight === 100;
+	$.support.selectstart = "onselectstart" in div;
+
+	// set display to none to avoid a layout bug in IE
+	// http://dev.jquery.com/ticket/4014
+	body.removeChild( div ).style.display = "none";
+});
+
+
+
+
+
+// deprecated
+$.extend( $.ui, {
+	// $.ui.plugin is deprecated.  Use the proxy pattern instead.
+	plugin: {
+		add: function( module, option, set ) {
+			var proto = $.ui[ module ].prototype;
+			for ( var i in set ) {
+				proto.plugins[ i ] = proto.plugins[ i ] || [];
+				proto.plugins[ i ].push( [ option, set[ i ] ] );
+			}
+		},
+		call: function( instance, name, args ) {
+			var set = instance.plugins[ name ];
+			if ( !set || !instance.element[ 0 ].parentNode ) {
+				return;
+			}
+	
+			for ( var i = 0; i < set.length; i++ ) {
+				if ( instance.options[ set[ i ][ 0 ] ] ) {
+					set[ i ][ 1 ].apply( instance.element, args );
+				}
+			}
+		}
+	},
+	
+	// will be deprecated when we switch to jQuery 1.4 - use jQuery.contains()
+	contains: function( a, b ) {
+		return document.compareDocumentPosition ?
+			a.compareDocumentPosition( b ) & 16 :
+			a !== b && a.contains( b );
+	},
+	
+	// only used by resizable
+	hasScroll: function( el, a ) {
+	
+		//If overflow is hidden, the element might have extra content, but the user wants to hide it
+		if ( $( el ).css( "overflow" ) === "hidden") {
+			return false;
+		}
+	
+		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+			has = false;
+	
+		if ( el[ scroll ] > 0 ) {
+			return true;
+		}
+	
+		// TODO: determine which cases actually cause this to happen
+		// if the element doesn't have the scroll set, see if it's possible to
+		// set the scroll
+		el[ scroll ] = 1;
+		has = ( el[ scroll ] > 0 );
+		el[ scroll ] = 0;
+		return has;
+	},
+	
+	// these are odd functions, fix the API or move into individual plugins
+	isOverAxis: function( x, reference, size ) {
+		//Determines when x coordinate is over "b" element axis
+		return ( x > reference ) && ( x < ( reference + size ) );
+	},
+	isOver: function( y, x, top, left, height, width ) {
+		//Determines when x, y coordinates is over "b" element
+		return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width );
 	}
 });
 
-})(jQuery);
+})( jQuery );
diff --git a/resources/jquery.ui/jquery.ui.dialog.js b/resources/jquery.ui/jquery.ui.dialog.js
index 5f9b1f8b..f0656a2f 100644
--- a/resources/jquery.ui/jquery.ui.dialog.js
+++ b/resources/jquery.ui/jquery.ui.dialog.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Dialog 1.8.2
+ * jQuery UI Dialog 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Dialog
  *
@@ -16,13 +16,28 @@
  *	jquery.ui.position.js
  *	jquery.ui.resizable.js
  */
-(function($) {
+(function( $, undefined ) {
 
 var uiDialogClasses =
-	'ui-dialog ' +
-	'ui-widget ' +
-	'ui-widget-content ' +
-	'ui-corner-all ';
+		'ui-dialog ' +
+		'ui-widget ' +
+		'ui-widget-content ' +
+		'ui-corner-all ',
+	sizeRelatedOptions = {
+		buttons: true,
+		height: true,
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true,
+		width: true
+	},
+	resizableRelatedOptions = {
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true
+	};
 
 $.widget("ui.dialog", {
 	options: {
@@ -39,7 +54,18 @@ $.widget("ui.dialog", {
 		minHeight: 150,
 		minWidth: 150,
 		modal: false,
-		position: 'center',
+		position: {
+			my: 'center',
+			at: 'center',
+			collision: 'fit',
+			// ensure that the titlebar is never outside the document
+			using: function(pos) {
+				var topOffset = $(this).css(pos).offset().top;
+				if (topOffset < 0) {
+					$(this).css('top', pos.top - topOffset);
+				}
+			}
+		},
 		resizable: true,
 		show: null,
 		stack: true,
@@ -47,13 +73,19 @@ $.widget("ui.dialog", {
 		width: 300,
 		zIndex: 1000
 	},
+
 	_create: function() {
 		this.originalTitle = this.element.attr('title');
+		// #5742 - .attr() might return a DOMElement
+		if ( typeof this.originalTitle !== "string" ) {
+			this.originalTitle = "";
+		}
 
+		this.options.title = this.options.title || this.originalTitle;
 		var self = this,
 			options = self.options,
 
-			title = options.title || self.originalTitle || '&#160;',
+			title = options.title || '&#160;',
 			titleId = $.ui.dialog.getTitleId(self.element),
 
 			uiDialog = (self.uiDialog = $('<div></div>'))
@@ -161,6 +193,7 @@ $.widget("ui.dialog", {
 			uiDialog.bgiframe();
 		}
 	},
+
 	_init: function() {
 		if ( this.options.autoOpen ) {
 			this.open();
@@ -187,14 +220,14 @@ $.widget("ui.dialog", {
 
 		return self;
 	},
-	
+
 	widget: function() {
 		return this.uiDialog;
 	},
 
 	close: function(event) {
 		var self = this,
-			maxZ;
+			maxZ, thisZ;
 		
 		if (false === self._trigger('beforeClose', event)) {
 			return;
@@ -223,7 +256,10 @@ $.widget("ui.dialog", {
 			maxZ = 0;
 			$('.ui-dialog').each(function() {
 				if (this !== self.uiDialog[0]) {
-					maxZ = Math.max(maxZ, $(this).css('z-index'));
+					thisZ = $(this).css('z-index');
+					if(!isNaN(thisZ)) {
+						maxZ = Math.max(maxZ, thisZ);
+					}
 				}
 			});
 			$.ui.dialog.maxZ = maxZ;
@@ -242,12 +278,12 @@ $.widget("ui.dialog", {
 		var self = this,
 			options = self.options,
 			saveScroll;
-		
+
 		if ((options.modal && !force) ||
 			(!options.stack && !options.modal)) {
 			return self._trigger('focus', event);
 		}
-		
+
 		if (options.zIndex > $.ui.dialog.maxZ) {
 			$.ui.dialog.maxZ = options.zIndex;
 		}
@@ -275,9 +311,6 @@ $.widget("ui.dialog", {
 			uiDialog = self.uiDialog;
 
 		self.overlay = options.modal ? new $.ui.dialog.overlay(self) : null;
-		if (uiDialog.next().length) {
-			uiDialog.appendTo('body');
-		}
 		self._size();
 		self._position(options.position);
 		uiDialog.show(options.show);
@@ -289,11 +322,11 @@ $.widget("ui.dialog", {
 				if (event.keyCode !== $.ui.keyCode.TAB) {
 					return;
 				}
-	
+
 				var tabbables = $(':tabbable', this),
 					first = tabbables.filter(':first'),
 					last  = tabbables.filter(':last');
-	
+
 				if (event.target === last[0] && !event.shiftKey) {
 					first.focus(1);
 					return false;
@@ -306,15 +339,12 @@ $.widget("ui.dialog", {
 
 		// set focus to the first tabbable element in the content area or the first button
 		// if there are no tabbable elements, set focus on the dialog itself
-		$([])
-			.add(uiDialog.find('.ui-dialog-content :tabbable:first'))
-			.add(uiDialog.find('.ui-dialog-buttonpane :tabbable:first'))
-			.add(uiDialog)
-			.filter(':first')
-			.focus();
+		$(self.element.find(':tabbable').get().concat(
+			uiDialog.find('.ui-dialog-buttonpane :tabbable').get().concat(
+				uiDialog.get()))).eq(0).focus();
 
-		self._trigger('open');
 		self._isOpen = true;
+		self._trigger('open');
 
 		return self;
 	},
@@ -327,7 +357,10 @@ $.widget("ui.dialog", {
 					'ui-dialog-buttonpane ' +
 					'ui-widget-content ' +
 					'ui-helper-clearfix'
-				);
+				),
+			uiButtonSet = $( "<div></div>" )
+				.addClass( "ui-dialog-buttonset" )
+				.appendTo( uiDialogButtonPane );
 
 		// if we already have a button pane, remove it
 		self.uiDialog.find('.ui-dialog-buttonpane').remove();
@@ -338,11 +371,17 @@ $.widget("ui.dialog", {
 			});
 		}
 		if (hasButtons) {
-			$.each(buttons, function(name, fn) {
+			$.each(buttons, function(name, props) {
+				props = $.isFunction( props ) ?
+					{ click: props, text: name } :
+					props;
 				var button = $('<button type="button"></button>')
-					.text(name)
-					.click(function() { fn.apply(self.element[0], arguments); })
-					.appendTo(uiDialogButtonPane);
+					.attr( props, true )
+					.unbind('click')
+					.click(function() {
+						props.click.apply(self.element[0], arguments);
+					})
+					.appendTo(uiButtonSet);
 				if ($.fn.button) {
 					button.button();
 				}
@@ -450,40 +489,34 @@ $.widget("ui.dialog", {
 			offset = [0, 0],
 			isVisible;
 
-		position = position || $.ui.dialog.prototype.options.position;
+		if (position) {
+			// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
+	//		if (typeof position == 'string' || $.isArray(position)) {
+	//			myAt = $.isArray(position) ? position : position.split(' ');
 
-		// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
-//		if (typeof position == 'string' || $.isArray(position)) {
-//			myAt = $.isArray(position) ? position : position.split(' ');
+			if (typeof position === 'string' || (typeof position === 'object' && '0' in position)) {
+				myAt = position.split ? position.split(' ') : [position[0], position[1]];
+				if (myAt.length === 1) {
+					myAt[1] = myAt[0];
+				}
 
-		if (typeof position === 'string' || (typeof position === 'object' && '0' in position)) {
-			myAt = position.split ? position.split(' ') : [position[0], position[1]];
-			if (myAt.length === 1) {
-				myAt[1] = myAt[0];
-			}
+				$.each(['left', 'top'], function(i, offsetPosition) {
+					if (+myAt[i] === myAt[i]) {
+						offset[i] = myAt[i];
+						myAt[i] = offsetPosition;
+					}
+				});
 
-			$.each(['left', 'top'], function(i, offsetPosition) {
-				if (+myAt[i] === myAt[i]) {
-					offset[i] = myAt[i];
-					myAt[i] = offsetPosition;
-				}
-			});
-		} else if (typeof position === 'object') {
-			if ('left' in position) {
-				myAt[0] = 'left';
-				offset[0] = position.left;
-			} else if ('right' in position) {
-				myAt[0] = 'right';
-				offset[0] = -position.right;
-			}
+				position = {
+					my: myAt.join(" "),
+					at: myAt.join(" "),
+					offset: offset.join(" ")
+				};
+			} 
 
-			if ('top' in position) {
-				myAt[1] = 'top';
-				offset[1] = position.top;
-			} else if ('bottom' in position) {
-				myAt[1] = 'bottom';
-				offset[1] = -position.bottom;
-			}
+			position = $.extend({}, $.ui.dialog.prototype.options.position, position);
+		} else {
+			position = $.ui.dialog.prototype.options.position;
 		}
 
 		// need to show the dialog to get the actual offset in the position plugin
@@ -494,31 +527,40 @@ $.widget("ui.dialog", {
 		this.uiDialog
 			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
 			.css({ top: 0, left: 0 })
-			.position({
-				my: myAt.join(' '),
-				at: myAt.join(' '),
-				offset: offset.join(' '),
-				of: window,
-				collision: 'fit',
-				// ensure that the titlebar is never outside the document
-				using: function(pos) {
-					var topOffset = $(this).css(pos).offset().top;
-					if (topOffset < 0) {
-						$(this).css('top', pos.top - topOffset);
-					}
-				}
-			});
+			.position($.extend({ of: window }, position));
 		if (!isVisible) {
 			this.uiDialog.hide();
 		}
 	},
 
-	_setOption: function(key, value){
+	_setOptions: function( options ) {
 		var self = this,
-			uiDialog = self.uiDialog,
-			isResizable = uiDialog.is(':data(resizable)'),
+			resizableOptions = {},
 			resize = false;
-		
+
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+			
+			if ( key in sizeRelatedOptions ) {
+				resize = true;
+			}
+			if ( key in resizableRelatedOptions ) {
+				resizableOptions[ key ] = value;
+			}
+		});
+
+		if ( resize ) {
+			this._size();
+		}
+		if ( this.uiDialog.is( ":data(resizable)" ) ) {
+			this.uiDialog.resizable( "option", resizableOptions );
+		}
+	},
+
+	_setOption: function(key, value){
+		var self = this,
+			uiDialog = self.uiDialog;
+
 		switch (key) {
 			//handling of deprecated beforeclose (vs beforeClose) option
 			//Ticket #4669 http://dev.jqueryui.com/ticket/4669
@@ -530,7 +572,7 @@ $.widget("ui.dialog", {
 				self._createButtons(value);
 				break;
 			case "closeText":
-				// convert whatever was passed in to a string, for text() to not throw up
+				// ensure that we always pass a string
 				self.uiDialogTitlebarCloseText.text("" + value);
 				break;
 			case "dialogClass":
@@ -546,44 +588,21 @@ $.widget("ui.dialog", {
 				}
 				break;
 			case "draggable":
-				if (value) {
-					self._makeDraggable();
-				} else {
-					uiDialog.draggable('destroy');
-				}
-				break;
-			case "height":
-				resize = true;
-				break;
-			case "maxHeight":
-				if (isResizable) {
-					uiDialog.resizable('option', 'maxHeight', value);
-				}
-				resize = true;
-				break;
-			case "maxWidth":
-				if (isResizable) {
-					uiDialog.resizable('option', 'maxWidth', value);
-				}
-				resize = true;
-				break;
-			case "minHeight":
-				if (isResizable) {
-					uiDialog.resizable('option', 'minHeight', value);
+				var isDraggable = uiDialog.is( ":data(draggable)" );
+				if ( isDraggable && !value ) {
+					uiDialog.draggable( "destroy" );
 				}
-				resize = true;
-				break;
-			case "minWidth":
-				if (isResizable) {
-					uiDialog.resizable('option', 'minWidth', value);
+				
+				if ( !isDraggable && value ) {
+					self._makeDraggable();
 				}
-				resize = true;
 				break;
 			case "position":
 				self._position(value);
 				break;
 			case "resizable":
 				// currently resizable, becoming non-resizable
+				var isResizable = uiDialog.is( ":data(resizable)" );
 				if (isResizable && !value) {
 					uiDialog.resizable('destroy');
 				}
@@ -602,15 +621,9 @@ $.widget("ui.dialog", {
 				// convert whatever was passed in o a string, for html() to not throw up
 				$(".ui-dialog-title", self.uiDialogTitlebar).html("" + (value || '&#160;'));
 				break;
-			case "width":
-				resize = true;
-				break;
 		}
 
 		$.Widget.prototype._setOption.apply(self, arguments);
-		if (resize) {
-			self._size();
-		}
 	},
 
 	_size: function() {
@@ -618,16 +631,21 @@ $.widget("ui.dialog", {
 		 * divs will both have width and height set, so we need to reset them
 		 */
 		var options = this.options,
-			nonContentHeight;
+			nonContentHeight,
+			minContentHeight,
+			isVisible = this.uiDialog.is( ":visible" );
 
 		// reset content sizing
-		// hide for non content measurement because height: 0 doesn't work in IE quirks mode (see #4350)
-		this.element.css({
+		this.element.show().css({
 			width: 'auto',
 			minHeight: 0,
 			height: 0
 		});
 
+		if (options.minWidth > options.width) {
+			options.width = options.minWidth;
+		}
+
 		// reset wrapper sizing
 		// determine the height of all the non-content elements
 		nonContentHeight = this.uiDialog.css({
@@ -635,16 +653,26 @@ $.widget("ui.dialog", {
 				width: options.width
 			})
 			.height();
-
-		this.element
-			.css(options.height === 'auto' ? {
-					minHeight: Math.max(options.minHeight - nonContentHeight, 0),
-					height: 'auto'
-				} : {
-					minHeight: 0,
-					height: Math.max(options.height - nonContentHeight, 0)				
-			})
-			.show();
+		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
+		
+		if ( options.height === "auto" ) {
+			// only needed for IE6 support
+			if ( $.support.minHeight ) {
+				this.element.css({
+					minHeight: minContentHeight,
+					height: "auto"
+				});
+			} else {
+				this.uiDialog.show();
+				var autoHeight = this.element.css( "height", "auto" ).height();
+				if ( !isVisible ) {
+					this.uiDialog.hide();
+				}
+				this.element.height( Math.max( autoHeight, minContentHeight ) );
+			}
+		} else {
+			this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
+		}
 
 		if (this.uiDialog.is(':data(resizable)')) {
 			this.uiDialog.resizable('option', 'minHeight', this._minHeight());
@@ -653,7 +681,7 @@ $.widget("ui.dialog", {
 });
 
 $.extend($.ui.dialog, {
-	version: "1.8.2",
+	version: "1.8.11",
 
 	uuid: 0,
 	maxZ: 0,
@@ -689,7 +717,10 @@ $.extend($.ui.dialog.overlay, {
 				if ($.ui.dialog.overlay.instances.length) {
 					$(document).bind($.ui.dialog.overlay.events, function(event) {
 						// stop events if the z-index of the target is < the z-index of the overlay
-						return ($(event.target).zIndex() >= $.ui.dialog.overlay.maxZ);
+						// we cannot return true when we don't want to cancel the event (#3523)
+						if ($(event.target).zIndex() < $.ui.dialog.overlay.maxZ) {
+							return false;
+						}
 					});
 				}
 			}, 1);
@@ -724,7 +755,10 @@ $.extend($.ui.dialog.overlay, {
 	},
 
 	destroy: function($el) {
-		this.oldInstances.push(this.instances.splice($.inArray($el, this.instances), 1)[0]);
+		var indexOf = $.inArray($el, this.instances);
+		if (indexOf != -1){
+			this.oldInstances.push(this.instances.splice(indexOf, 1)[0]);
+		}
 
 		if (this.instances.length === 0) {
 			$([document, window]).unbind('.dialog-overlay');
diff --git a/resources/jquery.ui/jquery.ui.draggable.js b/resources/jquery.ui/jquery.ui.draggable.js
index b4c1070d..5f367616 100644
--- a/resources/jquery.ui/jquery.ui.draggable.js
+++ b/resources/jquery.ui/jquery.ui.draggable.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Draggable 1.8.2
+ * jQuery UI Draggable 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Draggables
  *
@@ -12,7 +12,7 @@
  *	jquery.ui.mouse.js
  *	jquery.ui.widget.js
  */
-(function($) {
+(function( $, undefined ) {
 
 $.widget("ui.draggable", $.ui.mouse, {
 	widgetEventPrefix: "drag",
@@ -192,8 +192,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 			this.dropped = false;
 		}
 		
-		//if the original element is removed, don't bother to continue
-		if(!this.element[0] || !this.element[0].parentNode)
+		//if the original element is removed, don't bother to continue if helper is set to "original"
+		if((!this.element[0] || !this.element[0].parentNode) && this.options.helper == "original")
 			return false;
 
 		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
@@ -317,7 +317,9 @@ $.widget("ui.draggable", $.ui.mouse, {
 	_cacheMargins: function() {
 		this.margins = {
 			left: (parseInt(this.element.css("marginLeft"),10) || 0),
-			top: (parseInt(this.element.css("marginTop"),10) || 0)
+			top: (parseInt(this.element.css("marginTop"),10) || 0),
+			right: (parseInt(this.element.css("marginRight"),10) || 0),
+			bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
 		};
 	},
 
@@ -333,10 +335,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 		var o = this.options;
 		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
 		if(o.containment == 'document' || o.containment == 'window') this.containment = [
-			0 - this.offset.relative.left - this.offset.parent.left,
-			0 - this.offset.relative.top - this.offset.parent.top,
-			$(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
-			($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) - this.offset.relative.left - this.offset.parent.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) - this.offset.relative.top - this.offset.parent.top,
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) + $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
 		];
 
 		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
@@ -345,10 +347,10 @@ $.widget("ui.draggable", $.ui.mouse, {
 			var over = ($(ce).css("overflow") != 'hidden');
 
 			this.containment = [
-				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
-				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
-				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
-				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top  - this.margins.bottom
 			];
 		} else if(o.containment.constructor == Array) {
 			this.containment = o.containment;
@@ -459,7 +461,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 });
 
 $.extend($.ui.draggable, {
-	version: "1.8.2"
+	version: "1.8.11"
 });
 
 $.ui.plugin.add("draggable", "connectToSortable", {
@@ -475,7 +477,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
 					instance: sortable,
 					shouldRevert: sortable.options.revert
 				});
-				sortable._refreshItems();	//Do a one-time refresh at start to refresh the containerCache
+				sortable.refreshPositions();	// Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
 				sortable._trigger("activate", event, uiSortable);
 			}
 		});
diff --git a/resources/jquery.ui/jquery.ui.droppable.js b/resources/jquery.ui/jquery.ui.droppable.js
index b6a15fdf..7d6b8975 100644
--- a/resources/jquery.ui/jquery.ui.droppable.js
+++ b/resources/jquery.ui/jquery.ui.droppable.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Droppable 1.8.2
+ * jQuery UI Droppable 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Droppables
  *
@@ -13,7 +13,7 @@
  *	jquery.ui.mouse.js
  *	jquery.ui.draggable.js
  */
-(function($) {
+(function( $, undefined ) {
 
 $.widget("ui.droppable", {
 	widgetEventPrefix: "drop",
@@ -147,7 +147,7 @@ $.widget("ui.droppable", {
 });
 
 $.extend($.ui.droppable, {
-	version: "1.8.2"
+	version: "1.8.11"
 });
 
 $.ui.intersect = function(draggable, droppable, toleranceMode) {
@@ -161,8 +161,8 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
 
 	switch (toleranceMode) {
 		case 'fit':
-			return (l < x1 && x2 < r
-				&& t < y1 && y2 < b);
+			return (l <= x1 && x2 <= r
+				&& t <= y1 && y2 <= b);
 			break;
 		case 'intersect':
 			return (l < x1 + (draggable.helperProportions.width / 2) // Right Half
@@ -212,11 +212,11 @@ $.ui.ddmanager = {
 			for (var j=0; j < list.length; j++) { if(list[j] == m[i].element[0]) { m[i].proportions.height = 0; continue droppablesLoop; } }; //Filter out elements in the current dragged item
 			m[i].visible = m[i].element.css("display") != "none"; if(!m[i].visible) continue; 									//If the element is not visible, continue
 
+			if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
+
 			m[i].offset = m[i].element.offset();
 			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
 
-			if(type == "mousedown") m[i]._activate.call(m[i], event); //Activate the droppable if used directly from draggables
-
 		}
 
 	},
diff --git a/resources/jquery.ui/jquery.ui.mouse.js b/resources/jquery.ui/jquery.ui.mouse.js
index 871edd83..b8db85ce 100644
--- a/resources/jquery.ui/jquery.ui.mouse.js
+++ b/resources/jquery.ui/jquery.ui.mouse.js
@@ -1,16 +1,16 @@
 /*!
- * jQuery UI Mouse 1.8.2
+ * jQuery UI Mouse 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Mouse
  *
  * Depends:
  *	jquery.ui.widget.js
  */
-(function($) {
+(function( $, undefined ) {
 
 $.widget("ui.mouse", {
 	options: {
@@ -26,8 +26,8 @@ $.widget("ui.mouse", {
 				return self._mouseDown(event);
 			})
 			.bind('click.'+this.widgetName, function(event) {
-				if(self._preventClickEvent) {
-					self._preventClickEvent = false;
+				if (true === $.data(event.target, self.widgetName + '.preventClickEvent')) {
+				    $.removeData(event.target, self.widgetName + '.preventClickEvent');
 					event.stopImmediatePropagation();
 					return false;
 				}
@@ -75,6 +75,11 @@ $.widget("ui.mouse", {
 			}
 		}
 
+		// Click event may never have fired (Gecko & Opera)
+		if (true === $.data(event.target, this.widgetName + '.preventClickEvent')) {
+			$.removeData(event.target, this.widgetName + '.preventClickEvent');
+		}
+
 		// these delegates are required to keep context
 		this._mouseMoveDelegate = function(event) {
 			return self._mouseMove(event);
@@ -86,18 +91,14 @@ $.widget("ui.mouse", {
 			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
 			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
 
-		// preventDefault() is used to prevent the selection of text here -
-		// however, in Safari, this causes select boxes not to be selectable
-		// anymore, so this fix is needed
-		($.browser.safari || event.preventDefault());
-
+		event.preventDefault();
 		event.originalEvent.mouseHandled = true;
 		return true;
 	},
 
 	_mouseMove: function(event) {
 		// IE mouseup check - mouseup happened when mouse was out of window
-		if ($.browser.msie && !event.button) {
+		if ($.browser.msie && !(document.documentMode >= 9) && !event.button) {
 			return this._mouseUp(event);
 		}
 
@@ -122,7 +123,11 @@ $.widget("ui.mouse", {
 
 		if (this._mouseStarted) {
 			this._mouseStarted = false;
-			this._preventClickEvent = (event.target == this._mouseDownEvent.target);
+
+			if (event.target == this._mouseDownEvent.target) {
+			    $.data(event.target, this.widgetName + '.preventClickEvent', true);
+			}
+
 			this._mouseStop(event);
 		}
 
diff --git a/resources/jquery.ui/jquery.ui.position.js b/resources/jquery.ui/jquery.ui.position.js
index 50dd57f0..b66e59ef 100644
--- a/resources/jquery.ui/jquery.ui.position.js
+++ b/resources/jquery.ui/jquery.ui.position.js
@@ -1,20 +1,19 @@
 /*
- * jQuery UI Position 1.8.2
+ * jQuery UI Position 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Position
  */
-(function( $ ) {
+(function( $, undefined ) {
 
 $.ui = $.ui || {};
 
 var horizontalPositions = /left|center|right/,
-	horizontalDefault = "center",
 	verticalPositions = /top|center|bottom/,
-	verticalDefault = "center",
+	center = "center",
 	_position = $.fn.position,
 	_offset = $.fn.offset;
 
@@ -27,21 +26,23 @@ $.fn.position = function( options ) {
 	options = $.extend( {}, options );
 
 	var target = $( options.of ),
+		targetElem = target[0],
 		collision = ( options.collision || "flip" ).split( " " ),
 		offset = options.offset ? options.offset.split( " " ) : [ 0, 0 ],
 		targetWidth,
 		targetHeight,
 		basePosition;
 
-	if ( options.of.nodeType === 9 ) {
+	if ( targetElem.nodeType === 9 ) {
 		targetWidth = target.width();
 		targetHeight = target.height();
 		basePosition = { top: 0, left: 0 };
-	} else if ( options.of.scrollTo && options.of.document ) {
+	// TODO: use $.isWindow() in 1.9
+	} else if ( targetElem.setTimeout ) {
 		targetWidth = target.width();
 		targetHeight = target.height();
 		basePosition = { top: target.scrollTop(), left: target.scrollLeft() };
-	} else if ( options.of.preventDefault ) {
+	} else if ( targetElem.preventDefault ) {
 		// force left top to allow flipping
 		options.at = "left top";
 		targetWidth = targetHeight = 0;
@@ -58,13 +59,13 @@ $.fn.position = function( options ) {
 		var pos = ( options[this] || "" ).split( " " );
 		if ( pos.length === 1) {
 			pos = horizontalPositions.test( pos[0] ) ?
-				pos.concat( [verticalDefault] ) :
+				pos.concat( [center] ) :
 				verticalPositions.test( pos[0] ) ?
-					[ horizontalDefault ].concat( pos ) :
-					[ horizontalDefault, verticalDefault ];
+					[ center ].concat( pos ) :
+					[ center, center ];
 		}
-		pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : horizontalDefault;
-		pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : verticalDefault;
+		pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : center;
+		pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : center;
 		options[ this ] = pos;
 	});
 
@@ -82,13 +83,13 @@ $.fn.position = function( options ) {
 
 	if ( options.at[0] === "right" ) {
 		basePosition.left += targetWidth;
-	} else if (options.at[0] === horizontalDefault ) {
+	} else if ( options.at[0] === center ) {
 		basePosition.left += targetWidth / 2;
 	}
 
 	if ( options.at[1] === "bottom" ) {
 		basePosition.top += targetHeight;
-	} else if ( options.at[1] === verticalDefault ) {
+	} else if ( options.at[1] === center ) {
 		basePosition.top += targetHeight / 2;
 	}
 
@@ -99,23 +100,35 @@ $.fn.position = function( options ) {
 		var elem = $( this ),
 			elemWidth = elem.outerWidth(),
 			elemHeight = elem.outerHeight(),
-			position = $.extend( {}, basePosition );
+			marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
+			marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
+			collisionWidth = elemWidth + marginLeft +
+				( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ),
+			collisionHeight = elemHeight + marginTop +
+				( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ),
+			position = $.extend( {}, basePosition ),
+			collisionPosition;
 
 		if ( options.my[0] === "right" ) {
 			position.left -= elemWidth;
-		} else if ( options.my[0] === horizontalDefault ) {
+		} else if ( options.my[0] === center ) {
 			position.left -= elemWidth / 2;
 		}
 
 		if ( options.my[1] === "bottom" ) {
 			position.top -= elemHeight;
-		} else if ( options.my[1] === verticalDefault ) {
+		} else if ( options.my[1] === center ) {
 			position.top -= elemHeight / 2;
 		}
 
 		// prevent fractions (see #5280)
-		position.left = parseInt( position.left );
-		position.top = parseInt( position.top );
+		position.left = Math.round( position.left );
+		position.top = Math.round( position.top );
+
+		collisionPosition = {
+			left: position.left - marginLeft,
+			top: position.top - marginTop
+		};
 
 		$.each( [ "left", "top" ], function( i, dir ) {
 			if ( $.ui.position[ collision[i] ] ) {
@@ -124,6 +137,9 @@ $.fn.position = function( options ) {
 					targetHeight: targetHeight,
 					elemWidth: elemWidth,
 					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
 					offset: offset,
 					my: options.my,
 					at: options.at
@@ -142,41 +158,44 @@ $.ui.position = {
 	fit: {
 		left: function( position, data ) {
 			var win = $( window ),
-				over = position.left + data.elemWidth - win.width() - win.scrollLeft();
-			position.left = over > 0 ? position.left - over : Math.max( 0, position.left );
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft();
+			position.left = over > 0 ? position.left - over : Math.max( position.left - data.collisionPosition.left, position.left );
 		},
 		top: function( position, data ) {
 			var win = $( window ),
-				over = position.top + data.elemHeight - win.height() - win.scrollTop();
-			position.top = over > 0 ? position.top - over : Math.max( 0, position.top );
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop();
+			position.top = over > 0 ? position.top - over : Math.max( position.top - data.collisionPosition.top, position.top );
 		}
 	},
 
 	flip: {
 		left: function( position, data ) {
-			if ( data.at[0] === "center" ) {
+			if ( data.at[0] === center ) {
 				return;
 			}
 			var win = $( window ),
-				over = position.left + data.elemWidth - win.width() - win.scrollLeft(),
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft(),
 				myOffset = data.my[ 0 ] === "left" ?
 					-data.elemWidth :
 					data.my[ 0 ] === "right" ?
 						data.elemWidth :
 						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					-data.targetWidth,
 				offset = -2 * data.offset[ 0 ];
-			position.left += position.left < 0 ?
-				myOffset + data.targetWidth + offset :
+			position.left += data.collisionPosition.left < 0 ?
+				myOffset + atOffset + offset :
 				over > 0 ?
-					myOffset - data.targetWidth + offset :
+					myOffset + atOffset + offset :
 					0;
 		},
 		top: function( position, data ) {
-			if ( data.at[1] === "center" ) {
+			if ( data.at[1] === center ) {
 				return;
 			}
 			var win = $( window ),
-				over = position.top + data.elemHeight - win.height() - win.scrollTop(),
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop(),
 				myOffset = data.my[ 1 ] === "top" ?
 					-data.elemHeight :
 					data.my[ 1 ] === "bottom" ?
@@ -186,8 +205,8 @@ $.ui.position = {
 					data.targetHeight :
 					-data.targetHeight,
 				offset = -2 * data.offset[ 1 ];
-			position.top += position.top < 0 ?
-				myOffset + data.targetHeight + offset :
+			position.top += data.collisionPosition.top < 0 ?
+				myOffset + atOffset + offset :
 				over > 0 ?
 					myOffset + atOffset + offset :
 					0;
diff --git a/resources/jquery.ui/jquery.ui.progressbar.js b/resources/jquery.ui/jquery.ui.progressbar.js
index 4bc092d1..c432132a 100644
--- a/resources/jquery.ui/jquery.ui.progressbar.js
+++ b/resources/jquery.ui/jquery.ui.progressbar.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Progressbar 1.8.2
+ * jQuery UI Progressbar 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Progressbar
  *
@@ -11,25 +11,30 @@
  *   jquery.ui.core.js
  *   jquery.ui.widget.js
  */
-(function( $ ) {
+(function( $, undefined ) {
 
 $.widget( "ui.progressbar", {
 	options: {
-		value: 0
+		value: 0,
+		max: 100
 	},
+
+	min: 0,
+
 	_create: function() {
 		this.element
 			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
 			.attr({
 				role: "progressbar",
-				"aria-valuemin": this._valueMin(),
-				"aria-valuemax": this._valueMax(),
+				"aria-valuemin": this.min,
+				"aria-valuemax": this.options.max,
 				"aria-valuenow": this._value()
 			});
 
 		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
 			.appendTo( this.element );
 
+		this.oldValue = this._value();
 		this._refreshValue();
 	},
 
@@ -56,12 +61,12 @@ $.widget( "ui.progressbar", {
 	},
 
 	_setOption: function( key, value ) {
-		switch ( key ) {
-			case "value":
-				this.options.value = value;
-				this._refreshValue();
-				this._trigger( "change" );
-				break;
+		if ( key === "value" ) {
+			this.options.value = value;
+			this._refreshValue();
+			if ( this._value() === this.options.max ) {
+				this._trigger( "complete" );
+			}
 		}
 
 		$.Widget.prototype._setOption.apply( this, arguments );
@@ -73,35 +78,31 @@ $.widget( "ui.progressbar", {
 		if ( typeof val !== "number" ) {
 			val = 0;
 		}
-		if ( val < this._valueMin() ) {
-			val = this._valueMin();
-		}
-		if ( val > this._valueMax() ) {
-			val = this._valueMax();
-		}
-
-		return val;
+		return Math.min( this.options.max, Math.max( this.min, val ) );
 	},
 
-	_valueMin: function() {
-		return 0;
-	},
-
-	_valueMax: function() {
-		return 100;
+	_percentage: function() {
+		return 100 * this._value() / this.options.max;
 	},
 
 	_refreshValue: function() {
 		var value = this.value();
+		var percentage = this._percentage();
+
+		if ( this.oldValue !== value ) {
+			this.oldValue = value;
+			this._trigger( "change" );
+		}
+
 		this.valueDiv
-			[ value === this._valueMax() ? "addClass" : "removeClass"]( "ui-corner-right" )
-			.width( value + "%" );
+			.toggleClass( "ui-corner-right", value === this.options.max )
+			.width( percentage.toFixed(0) + "%" );
 		this.element.attr( "aria-valuenow", value );
 	}
 });
 
 $.extend( $.ui.progressbar, {
-	version: "1.8.2"
+	version: "1.8.11"
 });
 
 })( jQuery );
diff --git a/resources/jquery.ui/jquery.ui.resizable.js b/resources/jquery.ui/jquery.ui.resizable.js
index 0a782bb5..1d1c906e 100644
--- a/resources/jquery.ui/jquery.ui.resizable.js
+++ b/resources/jquery.ui/jquery.ui.resizable.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Resizable 1.8.2
+ * jQuery UI Resizable 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Resizables
  *
@@ -12,7 +12,7 @@
  *	jquery.ui.mouse.js
  *	jquery.ui.widget.js
  */
-(function($) {
+(function( $, undefined ) {
 
 $.widget("ui.resizable", $.ui.mouse, {
 	widgetEventPrefix: "resize",
@@ -322,10 +322,10 @@ $.widget("ui.resizable", $.ui.mouse, {
 
 		if(this._helper) {
 			var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
-						soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
-							soffsetw = ista ? 0 : self.sizeDiff.width;
+				soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+				soffsetw = ista ? 0 : self.sizeDiff.width;
 
-			var s = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
+			var s = { width: (self.helper.width()  - soffsetw), height: (self.helper.height() - soffseth) },
 				left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
 				top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
 
@@ -519,7 +519,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 });
 
 $.extend($.ui.resizable, {
-	version: "1.8.2"
+	version: "1.8.11"
 });
 
 /*
@@ -528,28 +528,29 @@ $.extend($.ui.resizable, {
 
 $.ui.plugin.add("resizable", "alsoResize", {
 
-	start: function(event, ui) {
-
+	start: function (event, ui) {
 		var self = $(this).data("resizable"), o = self.options;
 
-		var _store = function(exp) {
+		var _store = function (exp) {
 			$(exp).each(function() {
-				$(this).data("resizable-alsoresize", {
-					width: parseInt($(this).width(), 10), height: parseInt($(this).height(), 10),
-					left: parseInt($(this).css('left'), 10), top: parseInt($(this).css('top'), 10)
+				var el = $(this);
+				el.data("resizable-alsoresize", {
+					width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+					left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10),
+					position: el.css('position') // to reset Opera on stop()
 				});
 			});
 		};
 
 		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.parentNode) {
-			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0];	_store(o.alsoResize); }
-			else { $.each(o.alsoResize, function(exp, c) { _store(exp); }); }
+			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
+			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
 		}else{
 			_store(o.alsoResize);
 		}
 	},
 
-	resize: function(event, ui){
+	resize: function (event, ui) {
 		var self = $(this).data("resizable"), o = self.options, os = self.originalSize, op = self.originalPosition;
 
 		var delta = {
@@ -557,18 +558,19 @@ $.ui.plugin.add("resizable", "alsoResize", {
 			top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
 		},
 
-		_alsoResize = function(exp, c) {
+		_alsoResize = function (exp, c) {
 			$(exp).each(function() {
-				var el = $(this), start = $(this).data("resizable-alsoresize"), style = {}, css = c && c.length ? c : ['width', 'height', 'top', 'left'];
+				var el = $(this), start = $(this).data("resizable-alsoresize"), style = {}, 
+					css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left'];
 
-				$.each(css || ['width', 'height', 'top', 'left'], function(i, prop) {
+				$.each(css, function (i, prop) {
 					var sum = (start[prop]||0) + (delta[prop]||0);
 					if (sum && sum >= 0)
 						style[prop] = sum || null;
 				});
 
-				//Opera fixing relative position
-				if (/relative/.test(el.css('position')) && $.browser.opera) {
+				// Opera fixing relative position
+				if ($.browser.opera && /relative/.test(el.css('position'))) {
 					self._revertToRelativePosition = true;
 					el.css({ position: 'absolute', top: 'auto', left: 'auto' });
 				}
@@ -578,22 +580,33 @@ $.ui.plugin.add("resizable", "alsoResize", {
 		};
 
 		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
-			$.each(o.alsoResize, function(exp, c) { _alsoResize(exp, c); });
+			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
 		}else{
 			_alsoResize(o.alsoResize);
 		}
 	},
 
-	stop: function(event, ui){
-		var self = $(this).data("resizable");
+	stop: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
 
-		//Opera fixing relative position
-		if (self._revertToRelativePosition && $.browser.opera) {
+		var _reset = function (exp) {
+			$(exp).each(function() {
+				var el = $(this);
+				// reset position for Opera - no need to verify it was changed
+				el.css({ position: el.data("resizable-alsoresize").position });
+			});
+		};
+
+		if (self._revertToRelativePosition) {
 			self._revertToRelativePosition = false;
-			el.css({ position: 'relative' });
+			if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
+				$.each(o.alsoResize, function (exp) { _reset(exp); });
+			}else{
+				_reset(o.alsoResize);
+			}
 		}
 
-		$(this).removeData("resizable-alsoresize-start");
+		$(this).removeData("resizable-alsoresize");
 	}
 });
 
diff --git a/resources/jquery.ui/jquery.ui.selectable.js b/resources/jquery.ui/jquery.ui.selectable.js
index bc707d36..e3b91328 100644
--- a/resources/jquery.ui/jquery.ui.selectable.js
+++ b/resources/jquery.ui/jquery.ui.selectable.js
@@ -1,10 +1,9 @@
-
 /*
- * jQuery UI Selectable 1.8.2
+ * jQuery UI Selectable 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Selectables
  *
@@ -13,7 +12,7 @@
  *	jquery.ui.mouse.js
  *	jquery.ui.widget.js
  */
-(function($) {
+(function( $, undefined ) {
 
 $.widget("ui.selectable", $.ui.mouse, {
 	options: {
@@ -90,8 +89,6 @@ $.widget("ui.selectable", $.ui.mouse, {
 		$(options.appendTo).append(this.helper);
 		// position helper (lasso)
 		this.helper.css({
-			"z-index": 100,
-			"position": "absolute",
 			"left": event.clientX,
 			"top": event.clientY,
 			"width": 0,
@@ -263,7 +260,7 @@ $.widget("ui.selectable", $.ui.mouse, {
 });
 
 $.extend($.ui.selectable, {
-	version: "1.8.2"
+	version: "1.8.11"
 });
 
 })(jQuery);
diff --git a/resources/jquery.ui/jquery.ui.slider.js b/resources/jquery.ui/jquery.ui.slider.js
index 81d854b5..f02a922f 100644
--- a/resources/jquery.ui/jquery.ui.slider.js
+++ b/resources/jquery.ui/jquery.ui.slider.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Slider 1.8.2
+ * jQuery UI Slider 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Slider
  *
@@ -12,8 +12,7 @@
  *	jquery.ui.mouse.js
  *	jquery.ui.widget.js
  */
-
-(function( $ ) {
+(function( $, undefined ) {
 
 // number of pages in a slider
 // (how many times can you page up/down to go through the whole range)
@@ -310,8 +309,9 @@ $.widget( "ui.slider", $.ui.mouse, {
 				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
 		};
 
-		normValue = this._normValueFromMouse( position );
-		this._slide( event, index, normValue );
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
 		this._animateOff = true;
 		return true;
 	},
@@ -585,14 +585,14 @@ $.widget( "ui.slider", $.ui.mouse, {
 	
 	// returns the step-aligned value that val is closest to, between (inclusive) min and max
 	_trimAlignValue: function( val ) {
-		if ( val < this._valueMin() ) {
+		if ( val <= this._valueMin() ) {
 			return this._valueMin();
 		}
-		if ( val > this._valueMax() ) {
+		if ( val >= this._valueMax() ) {
 			return this._valueMax();
 		}
 		var step = ( this.options.step > 0 ) ? this.options.step : 1,
-			valModStep = val % step,
+			valModStep = (val - this._valueMin()) % step;
 			alignValue = val - valModStep;
 
 		if ( Math.abs(valModStep) * 2 >= step ) {
@@ -676,7 +676,7 @@ $.widget( "ui.slider", $.ui.mouse, {
 });
 
 $.extend( $.ui.slider, {
-	version: "1.8.2"
+	version: "1.8.11"
 });
 
 }(jQuery));
diff --git a/resources/jquery.ui/jquery.ui.sortable.js b/resources/jquery.ui/jquery.ui.sortable.js
index fe9898e0..1a06dcae 100644
--- a/resources/jquery.ui/jquery.ui.sortable.js
+++ b/resources/jquery.ui/jquery.ui.sortable.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Sortable 1.8.2
+ * jQuery UI Sortable 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Sortables
  *
@@ -12,7 +12,7 @@
  *	jquery.ui.mouse.js
  *	jquery.ui.widget.js
  */
-(function($) {
+(function( $, undefined ) {
 
 $.widget("ui.sortable", $.ui.mouse, {
 	widgetEventPrefix: "sort",
@@ -49,8 +49,8 @@ $.widget("ui.sortable", $.ui.mouse, {
 		//Get the items
 		this.refresh();
 
-		//Let's determine if the items are floating
-		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
+		//Let's determine if the items are being displayed horizontally
+		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
 
 		//Let's determine the parent's offset
 		this.offset = this.element.offset();
@@ -360,7 +360,7 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 		if(this.dragging) {
 
-			this._mouseUp();
+			this._mouseUp({ target: null });
 
 			if(this.options.helper == "original")
 				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
@@ -378,21 +378,23 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 		}
 
-		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
-		if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-		if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
-
-		$.extend(this, {
-			helper: null,
-			dragging: false,
-			reverting: false,
-			_noFinalSort: null
-		});
+		if (this.placeholder) {
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+			if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
 
-		if(this.domPosition.prev) {
-			$(this.domPosition.prev).after(this.currentItem);
-		} else {
-			$(this.domPosition.parent).prepend(this.currentItem);
+			$.extend(this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			});
+
+			if(this.domPosition.prev) {
+				$(this.domPosition.prev).after(this.currentItem);
+			} else {
+				$(this.domPosition.parent).prepend(this.currentItem);
+			}
 		}
 
 		return this;
@@ -409,6 +411,10 @@ $.widget("ui.sortable", $.ui.mouse, {
 			if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
 		});
 
+		if(!str.length && o.key) {
+			str.push(o.key + '=');
+		}
+
 		return str.join('&');
 
 	},
@@ -1061,7 +1067,7 @@ $.widget("ui.sortable", $.ui.mouse, {
 });
 
 $.extend($.ui.sortable, {
-	version: "1.8.2"
+	version: "1.8.11"
 });
 
 })(jQuery);
diff --git a/resources/jquery.ui/jquery.ui.tabs.js b/resources/jquery.ui/jquery.ui.tabs.js
index 1f94d52a..3be7ff49 100644
--- a/resources/jquery.ui/jquery.ui.tabs.js
+++ b/resources/jquery.ui/jquery.ui.tabs.js
@@ -1,9 +1,9 @@
 /*
- * jQuery UI Tabs 1.8.2
+ * jQuery UI Tabs 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Tabs
  *
@@ -11,7 +11,7 @@
  *	jquery.ui.core.js
  *	jquery.ui.widget.js
  */
-(function($) {
+(function( $, undefined ) {
 
 var tabId = 0,
 	listId = 0;
@@ -24,7 +24,7 @@ function getNextListId() {
 	return ++listId;
 }
 
-$.widget("ui.tabs", {
+$.widget( "ui.tabs", {
 	options: {
 		add: null,
 		ajaxOptions: null,
@@ -34,619 +34,650 @@ $.widget("ui.tabs", {
 		disable: null,
 		disabled: [],
 		enable: null,
-		event: 'click',
+		event: "click",
 		fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
-		idPrefix: 'ui-tabs-',
+		idPrefix: "ui-tabs-",
 		load: null,
-		panelTemplate: '<div></div>',
+		panelTemplate: "<div></div>",
 		remove: null,
 		select: null,
 		show: null,
-		spinner: '<em>Loading&#8230;</em>',
-		tabTemplate: '<li><a href="#{href}"><span>#{label}</span></a></li>'
+		spinner: "<em>Loading&#8230;</em>",
+		tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>"
 	},
+
 	_create: function() {
-		this._tabify(true);
+		this._tabify( true );
 	},
 
-	_setOption: function(key, value) {
-		if (key == 'selected') {
-			if (this.options.collapsible && value == this.options.selected) {
+	_setOption: function( key, value ) {
+		if ( key == "selected" ) {
+			if (this.options.collapsible && value == this.options.selected ) {
 				return;
 			}
-			this.select(value);
-		}
-		else {
-			this.options[key] = value;
+			this.select( value );
+		} else {
+			this.options[ key ] = value;
 			this._tabify();
 		}
 	},
 
-	_tabId: function(a) {
-		return a.title && a.title.replace(/\s/g, '_').replace(/[^A-Za-z0-9\-_:\.]/g, '') ||
+	_tabId: function( a ) {
+		return a.title && a.title.replace( /\s/g, "_" ).replace( /[^\w\u00c0-\uFFFF-]/g, "" ) ||
 			this.options.idPrefix + getNextTabId();
 	},
 
-	_sanitizeSelector: function(hash) {
-		return hash.replace(/:/g, '\\:'); // we need this because an id may contain a ":"
+	_sanitizeSelector: function( hash ) {
+		// we need this because an id may contain a ":"
+		return hash.replace( /:/g, "\\:" );
 	},
 
 	_cookie: function() {
-		var cookie = this.cookie || (this.cookie = this.options.cookie.name || 'ui-tabs-' + getNextListId());
-		return $.cookie.apply(null, [cookie].concat($.makeArray(arguments)));
+		var cookie = this.cookie ||
+			( this.cookie = this.options.cookie.name || "ui-tabs-" + getNextListId() );
+		return $.cookie.apply( null, [ cookie ].concat( $.makeArray( arguments ) ) );
 	},
 
-	_ui: function(tab, panel) {
+	_ui: function( tab, panel ) {
 		return {
 			tab: tab,
 			panel: panel,
-			index: this.anchors.index(tab)
+			index: this.anchors.index( tab )
 		};
 	},
 
 	_cleanup: function() {
 		// restore all former loading tabs labels
-		this.lis.filter('.ui-state-processing').removeClass('ui-state-processing')
-				.find('span:data(label.tabs)')
+		this.lis.filter( ".ui-state-processing" )
+			.removeClass( "ui-state-processing" )
+			.find( "span:data(label.tabs)" )
 				.each(function() {
-					var el = $(this);
-					el.html(el.data('label.tabs')).removeData('label.tabs');
+					var el = $( this );
+					el.html( el.data( "label.tabs" ) ).removeData( "label.tabs" );
 				});
 	},
 
-	_tabify: function(init) {
-
-		this.list = this.element.find('ol,ul').eq(0);
-		this.lis = $('li:has(a[href])', this.list);
-		this.anchors = this.lis.map(function() { return $('a', this)[0]; });
-		this.panels = $([]);
+	_tabify: function( init ) {
+		var self = this,
+			o = this.options,
+			fragmentId = /^#.+/; // Safari 2 reports '#' for an empty hash
 
-		var self = this, o = this.options;
-
-		var fragmentId = /^#.+/; // Safari 2 reports '#' for an empty hash
-		this.anchors.each(function(i, a) {
-			var href = $(a).attr('href');
+		this.list = this.element.find( "ol,ul" ).eq( 0 );
+		this.lis = $( " > li:has(a[href])", this.list );
+		this.anchors = this.lis.map(function() {
+			return $( "a", this )[ 0 ];
+		});
+		this.panels = $( [] );
 
+		this.anchors.each(function( i, a ) {
+			var href = $( a ).attr( "href" );
 			// For dynamically created HTML that contains a hash as href IE < 8 expands
 			// such href to the full page url with hash and then misinterprets tab as ajax.
 			// Same consideration applies for an added tab with a fragment identifier
 			// since a[href=#fragment-identifier] does unexpectedly not match.
 			// Thus normalize href attribute...
-			var hrefBase = href.split('#')[0], baseEl;
-			if (hrefBase && (hrefBase === location.toString().split('#')[0] ||
-					(baseEl = $('base')[0]) && hrefBase === baseEl.href)) {
+			var hrefBase = href.split( "#" )[ 0 ],
+				baseEl;
+			if ( hrefBase && ( hrefBase === location.toString().split( "#" )[ 0 ] ||
+					( baseEl = $( "base" )[ 0 ]) && hrefBase === baseEl.href ) ) {
 				href = a.hash;
 				a.href = href;
 			}
 
 			// inline tab
-			if (fragmentId.test(href)) {
-				self.panels = self.panels.add(self._sanitizeSelector(href));
-			}
-
+			if ( fragmentId.test( href ) ) {
+				self.panels = self.panels.add( self.element.find( self._sanitizeSelector( href ) ) );
 			// remote tab
-			else if (href != '#') { // prevent loading the page itself if href is just "#"
-				$.data(a, 'href.tabs', href); // required for restore on destroy
+			// prevent loading the page itself if href is just "#"
+			} else if ( href && href !== "#" ) {
+				// required for restore on destroy
+				$.data( a, "href.tabs", href );
 
 				// TODO until #3808 is fixed strip fragment identifier from url
 				// (IE fails to load from such url)
-				$.data(a, 'load.tabs', href.replace(/#.*$/, '')); // mutable data
-
-				var id = self._tabId(a);
-				a.href = '#' + id;
-				var $panel = $('#' + id);
-				if (!$panel.length) {
-					$panel = $(o.panelTemplate).attr('id', id).addClass('ui-tabs-panel ui-widget-content ui-corner-bottom')
-						.insertAfter(self.panels[i - 1] || self.list);
-					$panel.data('destroy.tabs', true);
+				$.data( a, "load.tabs", href.replace( /#.*$/, "" ) );
+
+				var id = self._tabId( a );
+				a.href = "#" + id;
+				var $panel = self.element.find( "#" + id );
+				if ( !$panel.length ) {
+					$panel = $( o.panelTemplate )
+						.attr( "id", id )
+						.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+						.insertAfter( self.panels[ i - 1 ] || self.list );
+					$panel.data( "destroy.tabs", true );
 				}
-				self.panels = self.panels.add($panel);
-			}
-
+				self.panels = self.panels.add( $panel );
 			// invalid tab href
-			else {
-				o.disabled.push(i);
+			} else {
+				o.disabled.push( i );
 			}
 		});
 
 		// initialization from scratch
-		if (init) {
-
+		if ( init ) {
 			// attach necessary classes for styling
-			this.element.addClass('ui-tabs ui-widget ui-widget-content ui-corner-all');
-			this.list.addClass('ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all');
-			this.lis.addClass('ui-state-default ui-corner-top');
-			this.panels.addClass('ui-tabs-panel ui-widget-content ui-corner-bottom');
+			this.element.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" );
+			this.list.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
+			this.lis.addClass( "ui-state-default ui-corner-top" );
+			this.panels.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" );
 
 			// Selected tab
 			// use "selected" option or try to retrieve:
 			// 1. from fragment identifier in url
 			// 2. from cookie
 			// 3. from selected class attribute on <li>
-			if (o.selected === undefined) {
-				if (location.hash) {
-					this.anchors.each(function(i, a) {
-						if (a.hash == location.hash) {
+			if ( o.selected === undefined ) {
+				if ( location.hash ) {
+					this.anchors.each(function( i, a ) {
+						if ( a.hash == location.hash ) {
 							o.selected = i;
-							return false; // break
+							return false;
 						}
 					});
 				}
-				if (typeof o.selected != 'number' && o.cookie) {
-					o.selected = parseInt(self._cookie(), 10);
+				if ( typeof o.selected !== "number" && o.cookie ) {
+					o.selected = parseInt( self._cookie(), 10 );
 				}
-				if (typeof o.selected != 'number' && this.lis.filter('.ui-tabs-selected').length) {
-					o.selected = this.lis.index(this.lis.filter('.ui-tabs-selected'));
+				if ( typeof o.selected !== "number" && this.lis.filter( ".ui-tabs-selected" ).length ) {
+					o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
 				}
-				o.selected = o.selected || (this.lis.length ? 0 : -1);
-			}
-			else if (o.selected === null) { // usage of null is deprecated, TODO remove in next release
+				o.selected = o.selected || ( this.lis.length ? 0 : -1 );
+			} else if ( o.selected === null ) { // usage of null is deprecated, TODO remove in next release
 				o.selected = -1;
 			}
 
 			// sanity check - default to first tab...
-			o.selected = ((o.selected >= 0 && this.anchors[o.selected]) || o.selected < 0) ? o.selected : 0;
+			o.selected = ( ( o.selected >= 0 && this.anchors[ o.selected ] ) || o.selected < 0 )
+				? o.selected
+				: 0;
 
 			// Take disabling tabs via class attribute from HTML
 			// into account and update option properly.
 			// A selected tab cannot become disabled.
-			o.disabled = $.unique(o.disabled.concat(
-				$.map(this.lis.filter('.ui-state-disabled'),
-					function(n, i) { return self.lis.index(n); } )
-			)).sort();
-
-			if ($.inArray(o.selected, o.disabled) != -1) {
-				o.disabled.splice($.inArray(o.selected, o.disabled), 1);
+			o.disabled = $.unique( o.disabled.concat(
+				$.map( this.lis.filter( ".ui-state-disabled" ), function( n, i ) {
+					return self.lis.index( n );
+				})
+			) ).sort();
+
+			if ( $.inArray( o.selected, o.disabled ) != -1 ) {
+				o.disabled.splice( $.inArray( o.selected, o.disabled ), 1 );
 			}
 
 			// highlight selected tab
-			this.panels.addClass('ui-tabs-hide');
-			this.lis.removeClass('ui-tabs-selected ui-state-active');
-			if (o.selected >= 0 && this.anchors.length) { // check for length avoids error when initializing empty list
-				this.panels.eq(o.selected).removeClass('ui-tabs-hide');
-				this.lis.eq(o.selected).addClass('ui-tabs-selected ui-state-active');
+			this.panels.addClass( "ui-tabs-hide" );
+			this.lis.removeClass( "ui-tabs-selected ui-state-active" );
+			// check for length avoids error when initializing empty list
+			if ( o.selected >= 0 && this.anchors.length ) {
+				self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) ).removeClass( "ui-tabs-hide" );
+				this.lis.eq( o.selected ).addClass( "ui-tabs-selected ui-state-active" );
 
 				// seems to be expected behavior that the show callback is fired
-				self.element.queue("tabs", function() {
-					self._trigger('show', null, self._ui(self.anchors[o.selected], self.panels[o.selected]));
+				self.element.queue( "tabs", function() {
+					self._trigger( "show", null,
+						self._ui( self.anchors[ o.selected ], self.element.find( self._sanitizeSelector( self.anchors[ o.selected ].hash ) )[ 0 ] ) );
 				});
-				
-				this.load(o.selected);
+
+				this.load( o.selected );
 			}
 
 			// clean up to avoid memory leaks in certain versions of IE 6
-			$(window).bind('unload', function() {
-				self.lis.add(self.anchors).unbind('.tabs');
+			// TODO: namespace this event
+			$( window ).bind( "unload", function() {
+				self.lis.add( self.anchors ).unbind( ".tabs" );
 				self.lis = self.anchors = self.panels = null;
 			});
-
-		}
 		// update selected after add/remove
-		else {
-			o.selected = this.lis.index(this.lis.filter('.ui-tabs-selected'));
+		} else {
+			o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
 		}
 
 		// update collapsible
-		this.element[o.collapsible ? 'addClass' : 'removeClass']('ui-tabs-collapsible');
+		// TODO: use .toggleClass()
+		this.element[ o.collapsible ? "addClass" : "removeClass" ]( "ui-tabs-collapsible" );
 
 		// set or update cookie after init and add/remove respectively
-		if (o.cookie) {
-			this._cookie(o.selected, o.cookie);
+		if ( o.cookie ) {
+			this._cookie( o.selected, o.cookie );
 		}
 
 		// disable tabs
-		for (var i = 0, li; (li = this.lis[i]); i++) {
-			$(li)[$.inArray(i, o.disabled) != -1 &&
-				!$(li).hasClass('ui-tabs-selected') ? 'addClass' : 'removeClass']('ui-state-disabled');
+		for ( var i = 0, li; ( li = this.lis[ i ] ); i++ ) {
+			$( li )[ $.inArray( i, o.disabled ) != -1 &&
+				// TODO: use .toggleClass()
+				!$( li ).hasClass( "ui-tabs-selected" ) ? "addClass" : "removeClass" ]( "ui-state-disabled" );
 		}
 
 		// reset cache if switching from cached to not cached
-		if (o.cache === false) {
-			this.anchors.removeData('cache.tabs');
+		if ( o.cache === false ) {
+			this.anchors.removeData( "cache.tabs" );
 		}
 
 		// remove all handlers before, tabify may run on existing tabs after add or option change
-		this.lis.add(this.anchors).unbind('.tabs');
+		this.lis.add( this.anchors ).unbind( ".tabs" );
 
-		if (o.event != 'mouseover') {
-			var addState = function(state, el) {
-				if (el.is(':not(.ui-state-disabled)')) {
-					el.addClass('ui-state-' + state);
+		if ( o.event !== "mouseover" ) {
+			var addState = function( state, el ) {
+				if ( el.is( ":not(.ui-state-disabled)" ) ) {
+					el.addClass( "ui-state-" + state );
 				}
 			};
-			var removeState = function(state, el) {
-				el.removeClass('ui-state-' + state);
+			var removeState = function( state, el ) {
+				el.removeClass( "ui-state-" + state );
 			};
-			this.lis.bind('mouseover.tabs', function() {
-				addState('hover', $(this));
+			this.lis.bind( "mouseover.tabs" , function() {
+				addState( "hover", $( this ) );
 			});
-			this.lis.bind('mouseout.tabs', function() {
-				removeState('hover', $(this));
+			this.lis.bind( "mouseout.tabs", function() {
+				removeState( "hover", $( this ) );
 			});
-			this.anchors.bind('focus.tabs', function() {
-				addState('focus', $(this).closest('li'));
+			this.anchors.bind( "focus.tabs", function() {
+				addState( "focus", $( this ).closest( "li" ) );
 			});
-			this.anchors.bind('blur.tabs', function() {
-				removeState('focus', $(this).closest('li'));
+			this.anchors.bind( "blur.tabs", function() {
+				removeState( "focus", $( this ).closest( "li" ) );
 			});
 		}
 
 		// set up animations
 		var hideFx, showFx;
-		if (o.fx) {
-			if ($.isArray(o.fx)) {
-				hideFx = o.fx[0];
-				showFx = o.fx[1];
-			}
-			else {
+		if ( o.fx ) {
+			if ( $.isArray( o.fx ) ) {
+				hideFx = o.fx[ 0 ];
+				showFx = o.fx[ 1 ];
+			} else {
 				hideFx = showFx = o.fx;
 			}
 		}
 
 		// Reset certain styles left over from animation
 		// and prevent IE's ClearType bug...
-		function resetStyle($el, fx) {
-			$el.css({ display: '' });
-			if (!$.support.opacity && fx.opacity) {
-				$el[0].style.removeAttribute('filter');
+		function resetStyle( $el, fx ) {
+			$el.css( "display", "" );
+			if ( !$.support.opacity && fx.opacity ) {
+				$el[ 0 ].style.removeAttribute( "filter" );
 			}
 		}
 
 		// Show a tab...
-		var showTab = showFx ?
-			function(clicked, $show) {
-				$(clicked).closest('li').addClass('ui-tabs-selected ui-state-active');
-				$show.hide().removeClass('ui-tabs-hide') // avoid flicker that way
-					.animate(showFx, showFx.duration || 'normal', function() {
-						resetStyle($show, showFx);
-						self._trigger('show', null, self._ui(clicked, $show[0]));
+		var showTab = showFx
+			? function( clicked, $show ) {
+				$( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+				$show.hide().removeClass( "ui-tabs-hide" ) // avoid flicker that way
+					.animate( showFx, showFx.duration || "normal", function() {
+						resetStyle( $show, showFx );
+						self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
 					});
-			} :
-			function(clicked, $show) {
-				$(clicked).closest('li').addClass('ui-tabs-selected ui-state-active');
-				$show.removeClass('ui-tabs-hide');
-				self._trigger('show', null, self._ui(clicked, $show[0]));
+			}
+			: function( clicked, $show ) {
+				$( clicked ).closest( "li" ).addClass( "ui-tabs-selected ui-state-active" );
+				$show.removeClass( "ui-tabs-hide" );
+				self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) );
 			};
 
 		// Hide a tab, $show is optional...
-		var hideTab = hideFx ?
-			function(clicked, $hide) {
-				$hide.animate(hideFx, hideFx.duration || 'normal', function() {
-					self.lis.removeClass('ui-tabs-selected ui-state-active');
-					$hide.addClass('ui-tabs-hide');
-					resetStyle($hide, hideFx);
-					self.element.dequeue("tabs");
+		var hideTab = hideFx
+			? function( clicked, $hide ) {
+				$hide.animate( hideFx, hideFx.duration || "normal", function() {
+					self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+					$hide.addClass( "ui-tabs-hide" );
+					resetStyle( $hide, hideFx );
+					self.element.dequeue( "tabs" );
 				});
-			} :
-			function(clicked, $hide, $show) {
-				self.lis.removeClass('ui-tabs-selected ui-state-active');
-				$hide.addClass('ui-tabs-hide');
-				self.element.dequeue("tabs");
+			}
+			: function( clicked, $hide, $show ) {
+				self.lis.removeClass( "ui-tabs-selected ui-state-active" );
+				$hide.addClass( "ui-tabs-hide" );
+				self.element.dequeue( "tabs" );
 			};
 
 		// attach tab event handler, unbind to avoid duplicates from former tabifying...
-		this.anchors.bind(o.event + '.tabs', function() {
-			var el = this, $li = $(this).closest('li'), $hide = self.panels.filter(':not(.ui-tabs-hide)'),
-					$show = $(self._sanitizeSelector(this.hash));
+		this.anchors.bind( o.event + ".tabs", function() {
+			var el = this,
+				$li = $(el).closest( "li" ),
+				$hide = self.panels.filter( ":not(.ui-tabs-hide)" ),
+				$show = self.element.find( self._sanitizeSelector( el.hash ) );
 
 			// If tab is already selected and not collapsible or tab disabled or
 			// or is already loading or click callback returns false stop here.
 			// Check if click handler returns false last so that it is not executed
 			// for a disabled or loading tab!
-			if (($li.hasClass('ui-tabs-selected') && !o.collapsible) ||
-				$li.hasClass('ui-state-disabled') ||
-				$li.hasClass('ui-state-processing') ||
-				self._trigger('select', null, self._ui(this, $show[0])) === false) {
+			if ( ( $li.hasClass( "ui-tabs-selected" ) && !o.collapsible) ||
+				$li.hasClass( "ui-state-disabled" ) ||
+				$li.hasClass( "ui-state-processing" ) ||
+				self.panels.filter( ":animated" ).length ||
+				self._trigger( "select", null, self._ui( this, $show[ 0 ] ) ) === false ) {
 				this.blur();
 				return false;
 			}
 
-			o.selected = self.anchors.index(this);
+			o.selected = self.anchors.index( this );
 
 			self.abort();
 
 			// if tab may be closed
-			if (o.collapsible) {
-				if ($li.hasClass('ui-tabs-selected')) {
+			if ( o.collapsible ) {
+				if ( $li.hasClass( "ui-tabs-selected" ) ) {
 					o.selected = -1;
 
-					if (o.cookie) {
-						self._cookie(o.selected, o.cookie);
+					if ( o.cookie ) {
+						self._cookie( o.selected, o.cookie );
 					}
 
-					self.element.queue("tabs", function() {
-						hideTab(el, $hide);
-					}).dequeue("tabs");
-					
+					self.element.queue( "tabs", function() {
+						hideTab( el, $hide );
+					}).dequeue( "tabs" );
+
 					this.blur();
 					return false;
-				}
-				else if (!$hide.length) {
-					if (o.cookie) {
-						self._cookie(o.selected, o.cookie);
+				} else if ( !$hide.length ) {
+					if ( o.cookie ) {
+						self._cookie( o.selected, o.cookie );
 					}
-					
-					self.element.queue("tabs", function() {
-						showTab(el, $show);
+
+					self.element.queue( "tabs", function() {
+						showTab( el, $show );
 					});
 
-					self.load(self.anchors.index(this)); // TODO make passing in node possible, see also http://dev.jqueryui.com/ticket/3171
-					
+					// TODO make passing in node possible, see also http://dev.jqueryui.com/ticket/3171
+					self.load( self.anchors.index( this ) );
+
 					this.blur();
 					return false;
 				}
 			}
 
-			if (o.cookie) {
-				self._cookie(o.selected, o.cookie);
+			if ( o.cookie ) {
+				self._cookie( o.selected, o.cookie );
 			}
 
 			// show new tab
-			if ($show.length) {
-				if ($hide.length) {
-					self.element.queue("tabs", function() {
-						hideTab(el, $hide);
+			if ( $show.length ) {
+				if ( $hide.length ) {
+					self.element.queue( "tabs", function() {
+						hideTab( el, $hide );
 					});
 				}
-				self.element.queue("tabs", function() {
-					showTab(el, $show);
+				self.element.queue( "tabs", function() {
+					showTab( el, $show );
 				});
-				
-				self.load(self.anchors.index(this));
-			}
-			else {
-				throw 'jQuery UI Tabs: Mismatching fragment identifier.';
+
+				self.load( self.anchors.index( this ) );
+			} else {
+				throw "jQuery UI Tabs: Mismatching fragment identifier.";
 			}
 
 			// Prevent IE from keeping other link focussed when using the back button
 			// and remove dotted border from clicked link. This is controlled via CSS
 			// in modern browsers; blur() removes focus from address bar in Firefox
 			// which can become a usability and annoying problem with tabs('rotate').
-			if ($.browser.msie) {
+			if ( $.browser.msie ) {
 				this.blur();
 			}
-
 		});
 
 		// disable click in any case
-		this.anchors.bind('click.tabs', function(){return false;});
+		this.anchors.bind( "click.tabs", function(){
+			return false;
+		});
+	},
+
+    _getIndex: function( index ) {
+		// meta-function to give users option to provide a href string instead of a numerical index.
+		// also sanitizes numerical indexes to valid values.
+		if ( typeof index == "string" ) {
+			index = this.anchors.index( this.anchors.filter( "[href$=" + index + "]" ) );
+		}
 
+		return index;
 	},
 
 	destroy: function() {
 		var o = this.options;
 
 		this.abort();
-		
-		this.element.unbind('.tabs')
-			.removeClass('ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible')
-			.removeData('tabs');
 
-		this.list.removeClass('ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all');
+		this.element
+			.unbind( ".tabs" )
+			.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" )
+			.removeData( "tabs" );
+
+		this.list.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" );
 
 		this.anchors.each(function() {
-			var href = $.data(this, 'href.tabs');
-			if (href) {
+			var href = $.data( this, "href.tabs" );
+			if ( href ) {
 				this.href = href;
 			}
-			var $this = $(this).unbind('.tabs');
-			$.each(['href', 'load', 'cache'], function(i, prefix) {
-				$this.removeData(prefix + '.tabs');
+			var $this = $( this ).unbind( ".tabs" );
+			$.each( [ "href", "load", "cache" ], function( i, prefix ) {
+				$this.removeData( prefix + ".tabs" );
 			});
 		});
 
-		this.lis.unbind('.tabs').add(this.panels).each(function() {
-			if ($.data(this, 'destroy.tabs')) {
-				$(this).remove();
-			}
-			else {
-				$(this).removeClass([
-					'ui-state-default',
-					'ui-corner-top',
-					'ui-tabs-selected',
-					'ui-state-active',
-					'ui-state-hover',
-					'ui-state-focus',
-					'ui-state-disabled',
-					'ui-tabs-panel',
-					'ui-widget-content',
-					'ui-corner-bottom',
-					'ui-tabs-hide'
-				].join(' '));
+		this.lis.unbind( ".tabs" ).add( this.panels ).each(function() {
+			if ( $.data( this, "destroy.tabs" ) ) {
+				$( this ).remove();
+			} else {
+				$( this ).removeClass([
+					"ui-state-default",
+					"ui-corner-top",
+					"ui-tabs-selected",
+					"ui-state-active",
+					"ui-state-hover",
+					"ui-state-focus",
+					"ui-state-disabled",
+					"ui-tabs-panel",
+					"ui-widget-content",
+					"ui-corner-bottom",
+					"ui-tabs-hide"
+				].join( " " ) );
 			}
 		});
 
-		if (o.cookie) {
-			this._cookie(null, o.cookie);
+		if ( o.cookie ) {
+			this._cookie( null, o.cookie );
 		}
 
 		return this;
 	},
 
-	add: function(url, label, index) {
-		if (index === undefined) {
-			index = this.anchors.length; // append by default
+	add: function( url, label, index ) {
+		if ( index === undefined ) {
+			index = this.anchors.length;
 		}
 
-		var self = this, o = this.options,
-			$li = $(o.tabTemplate.replace(/#\{href\}/g, url).replace(/#\{label\}/g, label)),
-			id = !url.indexOf('#') ? url.replace('#', '') : this._tabId($('a', $li)[0]);
+		var self = this,
+			o = this.options,
+			$li = $( o.tabTemplate.replace( /#\{href\}/g, url ).replace( /#\{label\}/g, label ) ),
+			id = !url.indexOf( "#" ) ? url.replace( "#", "" ) : this._tabId( $( "a", $li )[ 0 ] );
 
-		$li.addClass('ui-state-default ui-corner-top').data('destroy.tabs', true);
+		$li.addClass( "ui-state-default ui-corner-top" ).data( "destroy.tabs", true );
 
 		// try to find an existing element before creating a new one
-		var $panel = $('#' + id);
-		if (!$panel.length) {
-			$panel = $(o.panelTemplate).attr('id', id).data('destroy.tabs', true);
-		}
-		$panel.addClass('ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide');
-
-		if (index >= this.lis.length) {
-			$li.appendTo(this.list);
-			$panel.appendTo(this.list[0].parentNode);
+		var $panel = self.element.find( "#" + id );
+		if ( !$panel.length ) {
+			$panel = $( o.panelTemplate )
+				.attr( "id", id )
+				.data( "destroy.tabs", true );
 		}
-		else {
-			$li.insertBefore(this.lis[index]);
-			$panel.insertBefore(this.panels[index]);
+		$panel.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" );
+
+		if ( index >= this.lis.length ) {
+			$li.appendTo( this.list );
+			$panel.appendTo( this.list[ 0 ].parentNode );
+		} else {
+			$li.insertBefore( this.lis[ index ] );
+			$panel.insertBefore( this.panels[ index ] );
 		}
 
-		o.disabled = $.map(o.disabled,
-			function(n, i) { return n >= index ? ++n : n; });
+		o.disabled = $.map( o.disabled, function( n, i ) {
+			return n >= index ? ++n : n;
+		});
 
 		this._tabify();
 
-		if (this.anchors.length == 1) { // after tabify
+		if ( this.anchors.length == 1 ) {
 			o.selected = 0;
-			$li.addClass('ui-tabs-selected ui-state-active');
-			$panel.removeClass('ui-tabs-hide');
-			this.element.queue("tabs", function() {
-				self._trigger('show', null, self._ui(self.anchors[0], self.panels[0]));
+			$li.addClass( "ui-tabs-selected ui-state-active" );
+			$panel.removeClass( "ui-tabs-hide" );
+			this.element.queue( "tabs", function() {
+				self._trigger( "show", null, self._ui( self.anchors[ 0 ], self.panels[ 0 ] ) );
 			});
-				
-			this.load(0);
+
+			this.load( 0 );
 		}
 
-		// callback
-		this._trigger('add', null, this._ui(this.anchors[index], this.panels[index]));
+		this._trigger( "add", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
 		return this;
 	},
 
-	remove: function(index) {
-		var o = this.options, $li = this.lis.eq(index).remove(),
-			$panel = this.panels.eq(index).remove();
+	remove: function( index ) {
+		index = this._getIndex( index );
+		var o = this.options,
+			$li = this.lis.eq( index ).remove(),
+			$panel = this.panels.eq( index ).remove();
 
 		// If selected tab was removed focus tab to the right or
 		// in case the last tab was removed the tab to the left.
-		if ($li.hasClass('ui-tabs-selected') && this.anchors.length > 1) {
-			this.select(index + (index + 1 < this.anchors.length ? 1 : -1));
+		if ( $li.hasClass( "ui-tabs-selected" ) && this.anchors.length > 1) {
+			this.select( index + ( index + 1 < this.anchors.length ? 1 : -1 ) );
 		}
 
-		o.disabled = $.map($.grep(o.disabled, function(n, i) { return n != index; }),
-			function(n, i) { return n >= index ? --n : n; });
+		o.disabled = $.map(
+			$.grep( o.disabled, function(n, i) {
+				return n != index;
+			}),
+			function( n, i ) {
+				return n >= index ? --n : n;
+			});
 
 		this._tabify();
 
-		// callback
-		this._trigger('remove', null, this._ui($li.find('a')[0], $panel[0]));
+		this._trigger( "remove", null, this._ui( $li.find( "a" )[ 0 ], $panel[ 0 ] ) );
 		return this;
 	},
 
-	enable: function(index) {
+	enable: function( index ) {
+		index = this._getIndex( index );
 		var o = this.options;
-		if ($.inArray(index, o.disabled) == -1) {
+		if ( $.inArray( index, o.disabled ) == -1 ) {
 			return;
 		}
 
-		this.lis.eq(index).removeClass('ui-state-disabled');
-		o.disabled = $.grep(o.disabled, function(n, i) { return n != index; });
+		this.lis.eq( index ).removeClass( "ui-state-disabled" );
+		o.disabled = $.grep( o.disabled, function( n, i ) {
+			return n != index;
+		});
 
-		// callback
-		this._trigger('enable', null, this._ui(this.anchors[index], this.panels[index]));
+		this._trigger( "enable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
 		return this;
 	},
 
-	disable: function(index) {
+	disable: function( index ) {
+		index = this._getIndex( index );
 		var self = this, o = this.options;
-		if (index != o.selected) { // cannot disable already selected tab
-			this.lis.eq(index).addClass('ui-state-disabled');
+		// cannot disable already selected tab
+		if ( index != o.selected ) {
+			this.lis.eq( index ).addClass( "ui-state-disabled" );
 
-			o.disabled.push(index);
+			o.disabled.push( index );
 			o.disabled.sort();
 
-			// callback
-			this._trigger('disable', null, this._ui(this.anchors[index], this.panels[index]));
+			this._trigger( "disable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) );
 		}
 
 		return this;
 	},
 
-	select: function(index) {
-		if (typeof index == 'string') {
-			index = this.anchors.index(this.anchors.filter('[href$=' + index + ']'));
-		}
-		else if (index === null) { // usage of null is deprecated, TODO remove in next release
-			index = -1;
-		}
-		if (index == -1 && this.options.collapsible) {
-			index = this.options.selected;
+	select: function( index ) {
+		index = this._getIndex( index );
+		if ( index == -1 ) {
+			if ( this.options.collapsible && this.options.selected != -1 ) {
+				index = this.options.selected;
+			} else {
+				return this;
+			}
 		}
-
-		this.anchors.eq(index).trigger(this.options.event + '.tabs');
+		this.anchors.eq( index ).trigger( this.options.event + ".tabs" );
 		return this;
 	},
 
-	load: function(index) {
-		var self = this, o = this.options, a = this.anchors.eq(index)[0], url = $.data(a, 'load.tabs');
+	load: function( index ) {
+		index = this._getIndex( index );
+		var self = this,
+			o = this.options,
+			a = this.anchors.eq( index )[ 0 ],
+			url = $.data( a, "load.tabs" );
 
 		this.abort();
 
 		// not remote or from cache
-		if (!url || this.element.queue("tabs").length !== 0 && $.data(a, 'cache.tabs')) {
-			this.element.dequeue("tabs");
+		if ( !url || this.element.queue( "tabs" ).length !== 0 && $.data( a, "cache.tabs" ) ) {
+			this.element.dequeue( "tabs" );
 			return;
 		}
 
 		// load remote from here on
-		this.lis.eq(index).addClass('ui-state-processing');
+		this.lis.eq( index ).addClass( "ui-state-processing" );
 
-		if (o.spinner) {
-			var span = $('span', a);
-			span.data('label.tabs', span.html()).html(o.spinner);
+		if ( o.spinner ) {
+			var span = $( "span", a );
+			span.data( "label.tabs", span.html() ).html( o.spinner );
 		}
 
-		this.xhr = $.ajax($.extend({}, o.ajaxOptions, {
+		this.xhr = $.ajax( $.extend( {}, o.ajaxOptions, {
 			url: url,
-			success: function(r, s) {
-				$(self._sanitizeSelector(a.hash)).html(r);
+			success: function( r, s ) {
+				self.element.find( self._sanitizeSelector( a.hash ) ).html( r );
 
 				// take care of tab labels
 				self._cleanup();
 
-				if (o.cache) {
-					$.data(a, 'cache.tabs', true); // if loaded once do not load them again
+				if ( o.cache ) {
+					$.data( a, "cache.tabs", true );
 				}
 
-				// callbacks
-				self._trigger('load', null, self._ui(self.anchors[index], self.panels[index]));
+				self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
 				try {
-					o.ajaxOptions.success(r, s);
+					o.ajaxOptions.success( r, s );
 				}
-				catch (e) {}
+				catch ( e ) {}
 			},
-			error: function(xhr, s, e) {
+			error: function( xhr, s, e ) {
 				// take care of tab labels
 				self._cleanup();
 
-				// callbacks
-				self._trigger('load', null, self._ui(self.anchors[index], self.panels[index]));
+				self._trigger( "load", null, self._ui( self.anchors[ index ], self.panels[ index ] ) );
 				try {
 					// Passing index avoid a race condition when this method is
 					// called after the user has selected another tab.
 					// Pass the anchor that initiated this request allows
 					// loadError to manipulate the tab content panel via $(a.hash)
-					o.ajaxOptions.error(xhr, s, index, a);
+					o.ajaxOptions.error( xhr, s, index, a );
 				}
-				catch (e) {}
+				catch ( e ) {}
 			}
-		}));
+		} ) );
 
 		// last, so that load event is fired before show...
-		self.element.dequeue("tabs");
+		self.element.dequeue( "tabs" );
 
 		return this;
 	},
 
 	abort: function() {
 		// stop possibly running animations
-		this.element.queue([]);
-		this.panels.stop(false, true);
+		this.element.queue( [] );
+		this.panels.stop( false, true );
 
 		// "tabs" queue must not contain more than two elements,
 		// which are the callbacks for the latest clicked tab...
-		this.element.queue("tabs", this.element.queue("tabs").splice(-2, 2));
+		this.element.queue( "tabs", this.element.queue( "tabs" ).splice( -2, 2 ) );
 
 		// terminate pending requests from other tabs
-		if (this.xhr) {
+		if ( this.xhr ) {
 			this.xhr.abort();
 			delete this.xhr;
 		}
@@ -656,19 +687,18 @@ $.widget("ui.tabs", {
 		return this;
 	},
 
-	url: function(index, url) {
-		this.anchors.eq(index).removeData('cache.tabs').data('load.tabs', url);
+	url: function( index, url ) {
+		this.anchors.eq( index ).removeData( "cache.tabs" ).data( "load.tabs", url );
 		return this;
 	},
 
 	length: function() {
 		return this.anchors.length;
 	}
-
 });
 
-$.extend($.ui.tabs, {
-	version: '1.8.2'
+$.extend( $.ui.tabs, {
+	version: "1.8.11"
 });
 
 /*
@@ -678,46 +708,45 @@ $.extend($.ui.tabs, {
 /*
  * Rotate
  */
-$.extend($.ui.tabs.prototype, {
+$.extend( $.ui.tabs.prototype, {
 	rotation: null,
-	rotate: function(ms, continuing) {
+	rotate: function( ms, continuing ) {
+		var self = this,
+			o = this.options;
 
-		var self = this, o = this.options;
-		
-		var rotate = self._rotate || (self._rotate = function(e) {
-			clearTimeout(self.rotation);
+		var rotate = self._rotate || ( self._rotate = function( e ) {
+			clearTimeout( self.rotation );
 			self.rotation = setTimeout(function() {
 				var t = o.selected;
 				self.select( ++t < self.anchors.length ? t : 0 );
-			}, ms);
+			}, ms );
 			
-			if (e) {
+			if ( e ) {
 				e.stopPropagation();
 			}
 		});
-		
-		var stop = self._unrotate || (self._unrotate = !continuing ?
-			function(e) {
+
+		var stop = self._unrotate || ( self._unrotate = !continuing
+			? function(e) {
 				if (e.clientX) { // in case of a true click
 					self.rotate(null);
 				}
-			} :
-			function(e) {
+			}
+			: function( e ) {
 				t = o.selected;
 				rotate();
 			});
 
 		// start rotation
-		if (ms) {
-			this.element.bind('tabsshow', rotate);
-			this.anchors.bind(o.event + '.tabs', stop);
+		if ( ms ) {
+			this.element.bind( "tabsshow", rotate );
+			this.anchors.bind( o.event + ".tabs", stop );
 			rotate();
-		}
 		// stop rotation
-		else {
-			clearTimeout(self.rotation);
-			this.element.unbind('tabsshow', rotate);
-			this.anchors.unbind(o.event + '.tabs', stop);
+		} else {
+			clearTimeout( self.rotation );
+			this.element.unbind( "tabsshow", rotate );
+			this.anchors.unbind( o.event + ".tabs", stop );
 			delete this._rotate;
 			delete this._unrotate;
 		}
@@ -726,4 +755,4 @@ $.extend($.ui.tabs.prototype, {
 	}
 });
 
-})(jQuery);
+})( jQuery );
diff --git a/resources/jquery.ui/jquery.ui.widget.js b/resources/jquery.ui/jquery.ui.widget.js
index 6425d086..b6b1beea 100644
--- a/resources/jquery.ui/jquery.ui.widget.js
+++ b/resources/jquery.ui/jquery.ui.widget.js
@@ -1,28 +1,38 @@
 /*!
- * jQuery UI Widget 1.8.2
+ * jQuery UI Widget 1.8.11
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Widget
  */
-(function( $ ) {
-
-var _remove = $.fn.remove;
-
-$.fn.remove = function( selector, keepData ) {
-	return this.each(function() {
-		if ( !keepData ) {
-			if ( !selector || $.filter( selector, [ this ] ).length ) {
-				$( "*", this ).add( this ).each(function() {
-					$( this ).triggerHandler( "remove" );
-				});
-			}
+(function( $, undefined ) {
+
+// jQuery 1.4+
+if ( $.cleanData ) {
+	var _cleanData = $.cleanData;
+	$.cleanData = function( elems ) {
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			$( elem ).triggerHandler( "remove" );
 		}
-		return _remove.call( $(this), selector, keepData );
-	});
-};
+		_cleanData( elems );
+	};
+} else {
+	var _remove = $.fn.remove;
+	$.fn.remove = function( selector, keepData ) {
+		return this.each(function() {
+			if ( !keepData ) {
+				if ( !selector || $.filter( selector, [ this ] ).length ) {
+					$( "*", this ).add( [ this ] ).each(function() {
+						$( this ).triggerHandler( "remove" );
+					});
+				}
+			}
+			return _remove.call( $(this), selector, keepData );
+		});
+	};
+}
 
 $.widget = function( name, base, prototype ) {
 	var namespace = name.split( "." )[ 0 ],
@@ -57,7 +67,7 @@ $.widget = function( name, base, prototype ) {
 //			basePrototype[ key ] = $.extend( {}, val );
 //		}
 //	});
-	basePrototype.options = $.extend( {}, basePrototype.options );
+	basePrototype.options = $.extend( true, {}, basePrototype.options );
 	$[ namespace ][ name ].prototype = $.extend( true, basePrototype, {
 		namespace: namespace,
 		widgetName: name,
@@ -80,7 +90,7 @@ $.widget.bridge = function( name, object ) {
 			options;
 
 		// prevent calls to internal methods
-		if ( isMethodCall && options.substring( 0, 1 ) === "_" ) {
+		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
 			return returnValue;
 		}
 
@@ -90,6 +100,15 @@ $.widget.bridge = function( name, object ) {
 					methodValue = instance && $.isFunction( instance[options] ) ?
 						instance[ options ].apply( instance, args ) :
 						instance;
+				// TODO: add this back in 1.9 and use $.error() (see #5972)
+//				if ( !instance ) {
+//					throw "cannot call methods on " + name + " prior to initialization; " +
+//						"attempted to call method '" + options + "'";
+//				}
+//				if ( !$.isFunction( instance[options] ) ) {
+//					throw "no such method '" + options + "' for " + name + " widget instance";
+//				}
+//				var methodValue = instance[ options ].apply( instance, args );
 				if ( methodValue !== instance && methodValue !== undefined ) {
 					returnValue = methodValue;
 					return false;
@@ -99,10 +118,7 @@ $.widget.bridge = function( name, object ) {
 			this.each(function() {
 				var instance = $.data( this, name );
 				if ( instance ) {
-					if ( options ) {
-						instance.option( options );
-					}
-					instance._init();
+					instance.option( options || {} )._init();
 				} else {
 					$.data( this, name, new object( options, this ) );
 				}
@@ -129,10 +145,11 @@ $.Widget.prototype = {
 	_createWidget: function( options, element ) {
 		// $.widget.bridge stores the plugin instance, but we do it anyway
 		// so that it's stored even before the _create function runs
-		this.element = $( element ).data( this.widgetName, this );
+		$.data( element, this.widgetName, this );
+		this.element = $( element );
 		this.options = $.extend( true, {},
 			this.options,
-			$.metadata && $.metadata.get( element )[ this.widgetName ],
+			this._getCreateOptions(),
 			options );
 
 		var self = this;
@@ -141,8 +158,12 @@ $.Widget.prototype = {
 		});
 
 		this._create();
+		this._trigger( "create" );
 		this._init();
 	},
+	_getCreateOptions: function() {
+		return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
+	},
 	_create: function() {},
 	_init: function() {},
 
@@ -163,12 +184,11 @@ $.Widget.prototype = {
 	},
 
 	option: function( key, value ) {
-		var options = key,
-			self = this;
+		var options = key;
 
 		if ( arguments.length === 0 ) {
 			// don't return a reference to the internal hash
-			return $.extend( {}, self.options );
+			return $.extend( {}, this.options );
 		}
 
 		if  (typeof key === "string" ) {
@@ -179,11 +199,17 @@ $.Widget.prototype = {
 			options[ key ] = value;
 		}
 
+		this._setOptions( options );
+
+		return this;
+	},
+	_setOptions: function( options ) {
+		var self = this;
 		$.each( options, function( key, value ) {
 			self._setOption( key, value );
 		});
 
-		return self;
+		return this;
 	},
 	_setOption: function( key, value ) {
 		this.options[ key ] = value;
diff --git a/resources/jquery.ui/themes/default/jquery.ui.autocomplete.css b/resources/jquery.ui/themes/default/jquery.ui.autocomplete.css
index 5957f78f..f287dbe9 100644
--- a/resources/jquery.ui/themes/default/jquery.ui.autocomplete.css
+++ b/resources/jquery.ui/themes/default/jquery.ui.autocomplete.css
@@ -13,6 +13,7 @@
 	padding: 2px;
 	margin: 0;
 	display:block;
+	float: left;
 }
 .ui-menu .ui-menu {
 	margin-top: -3px;
diff --git a/resources/jquery.ui/themes/default/jquery.ui.datepicker.css b/resources/jquery.ui/themes/default/jquery.ui.datepicker.css
index a1116e69..580a2929 100644
--- a/resources/jquery.ui/themes/default/jquery.ui.datepicker.css
+++ b/resources/jquery.ui/themes/default/jquery.ui.datepicker.css
@@ -35,17 +35,17 @@
 .ui-datepicker-row-break { clear:both; width:100%; }
 
 /* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+/* @noflip */ .ui-datepicker-rtl { direction: rtl; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-group { float:right; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
 
 /* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
 .ui-datepicker-cover {
diff --git a/resources/jquery.ui/themes/vector/jquery.ui.autocomplete.css b/resources/jquery.ui/themes/vector/jquery.ui.autocomplete.css
index 6610a878..c06fd18a 100644
--- a/resources/jquery.ui/themes/vector/jquery.ui.autocomplete.css
+++ b/resources/jquery.ui/themes/vector/jquery.ui.autocomplete.css
@@ -13,6 +13,7 @@
 	padding: 2px;
 	margin: 0;
 	display:block;
+	float: left;
 }
 .ui-menu .ui-menu {
 	margin-top: -3px;
diff --git a/resources/jquery.ui/themes/vector/jquery.ui.button.css b/resources/jquery.ui/themes/vector/jquery.ui.button.css
index 5507c42b..631fa756 100644
--- a/resources/jquery.ui/themes/vector/jquery.ui.button.css
+++ b/resources/jquery.ui/themes/vector/jquery.ui.button.css
@@ -8,19 +8,23 @@ button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a l
 button.ui-button-icons-only { width: 3.7em; } 
 
 /*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .125em .25em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button .ui-button-text { display: block; line-height: 1.4em;  }
+.ui-button-text-only .ui-button-text { padding: 0.3em 1em 0.25em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 0.3em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: 0.3em 1em 0.25em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: 0.3em 2.1em 0.25em 1em; }
 .ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* for older versions of jQuery UI */
+.ui-button-text-icon .ui-button-text { padding: 0.3em 1em 0.3em 2.1em; }
+
 /* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
+input.ui-button { padding: 0.3em 1em; }
 
 /*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -9px; }
 .ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: 0.5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icon .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: 0.5em; }
 
 /*button sets*/
 .ui-buttonset { margin-right: 7px; }
@@ -29,10 +33,10 @@ input.ui-button { padding: .4em 1em; }
 /* workarounds */
 button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
 
-body button.ui-button {
+body .ui-button {
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
-	padding: 0.2em 0.6em 0.15em !important;
+	border-radius: 4px;
 	margin: 0.5em 0 0.5em 0.4em !important;
 	border: 1px solid #a6a6a6 !important;
 	/* @embed */
@@ -43,18 +47,18 @@ body button.ui-button {
 	width: auto;
 	overflow: visible;
 }
-body button.ui-button:hover {
+body .ui-button:hover {
 	border-color: #6e7273;
 	/* @embed */
 	background: #e1e1e1 url(images/button-over.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button:active,
-body button.ui-button:focus {
+body .ui-button:active,
+body .ui-button:focus {
 	border-color: #707271;
 	/* @embed */
 	background: #bfbfbf url(images/button-down.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.disabled {
+body .ui-button.disabled {
 	color: #7f7f7f;
 	border-color: #cccccc;
 	/* @embed */
@@ -67,24 +71,24 @@ body  button.ui-button::-moz-focus-inner {
 
 /* Green buttons */
 
-body button.ui-button.ui-button-green {
+body .ui-button.ui-button-green {
 	color: white;
 	border-color: #97af7e !important;
 	/* @embed */
 	background: #85c940 url(images/button-off-green.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.ui-button-green:hover {
+body .ui-button.ui-button-green:hover {
 	border-color: #778e61;
 	/* @embed */
 	background: #77ad40 url(images/button-over-green.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.ui-button-green:active,
-body button.ui-button.ui-button-green:focus {
+body .ui-button.ui-button-green:active,
+body .ui-button.ui-button-green:focus {
 	border-color: #61b000;
 	/* @embed */
 	background: #54a800 url(images/button-down-green.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.ui-button-green.disabled {
+body .ui-button.ui-button-green.disabled {
 	color: #7f7f7f;
 	border-color: #b8d29f;
 	/* @embed */
@@ -93,24 +97,24 @@ body button.ui-button.ui-button-green.disabled {
 
 /* Blue buttons */
 
-body button.ui-button.ui-button-blue {
+body .ui-button.ui-button-blue {
 	color: white;
 	border-color: #407ec9 !important;
 	/* @embed */
 	background: #407ec9 url(images/button-off-blue.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.ui-button-blue:hover {
+body .ui-button.ui-button-blue:hover {
 	border-color: #245289;
 	/* @embed */
 	background: #4071ad url(images/button-over-blue.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.ui-button-blue:active,
-body button.ui-button.ui-button-blue:focus {
+body .ui-button.ui-button-blue:active,
+body .ui-button.ui-button-blue:focus {
 	border-color: #003980;
 	/* @embed */
 	background: #004daa url(images/button-down-blue.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.ui-button-blue.disabled {
+body .ui-button.ui-button-blue.disabled {
 	border-color: #9eafc6;
 	/* @embed */
 	background: #c3c8cf url(images/button-disabled-blue.png) repeat-x scroll 50% 100% !important;	
@@ -118,24 +122,24 @@ body button.ui-button.ui-button-blue.disabled {
 
 /* Red buttons */
 
-body button.ui-button.ui-button-red {
+body .ui-button.ui-button-red {
 	color: white;
 	border-color: #af977e !important;
 	/* @embed */
 	background: #c9404c url(images/button-off-red.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.ui-button-red:hover {
+body .ui-button.ui-button-red:hover {
 	border-color: #8e7761;
 	/* @embed */
 	background: #ad404a url(images/button-over-red.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.ui-button-red:active,
-body button.ui-button.ui-button-red:focus {
+body .ui-button.ui-button-red:active,
+body .ui-button.ui-button-red:focus {
 	border-color: #b06100;
 	/* @embed */
 	background: #aa000f url(images/button-down-red.png) repeat-x scroll 50% 100% !important;
 }
-body button.ui-button.ui-button-red.disabled {
+body .ui-button.ui-button-red.disabled {
 	color: #7f7f7f;
 	border-color: #c3acae;
 	/* @embed */
diff --git a/resources/jquery.ui/themes/vector/jquery.ui.datepicker.css b/resources/jquery.ui/themes/vector/jquery.ui.datepicker.css
index a1116e69..81022250 100644
--- a/resources/jquery.ui/themes/vector/jquery.ui.datepicker.css
+++ b/resources/jquery.ui/themes/vector/jquery.ui.datepicker.css
@@ -10,7 +10,7 @@
 .ui-datepicker .ui-datepicker-next-hover { right:1px; }
 .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
 .ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; padding:1px 0; }
 .ui-datepicker select.ui-datepicker-month-year {width: 100%;}
 .ui-datepicker select.ui-datepicker-month, 
 .ui-datepicker select.ui-datepicker-year { width: 49%;}
@@ -18,7 +18,7 @@
 .ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
 .ui-datepicker td { border: 0; padding: 1px; }
 .ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .2em 0 0 0; padding: 0 .2em; border-top: 1px solid #DDDDDD; border-left: 0; border-right: 0; border-bottom: 0; }
 .ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
 .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
 
@@ -35,17 +35,17 @@
 .ui-datepicker-row-break { clear:both; width:100%; }
 
 /* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+/* @noflip */ .ui-datepicker-rtl { direction: rtl; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-group { float:right; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+/* @noflip */ .ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
 
 /* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
 .ui-datepicker-cover {
diff --git a/resources/jquery.ui/themes/vector/jquery.ui.theme.css b/resources/jquery.ui/themes/vector/jquery.ui.theme.css
index 26551213..e39371de 100644
--- a/resources/jquery.ui/themes/vector/jquery.ui.theme.css
+++ b/resources/jquery.ui/themes/vector/jquery.ui.theme.css
@@ -13,9 +13,9 @@
 .ui-widget { font-family: sans-serif; font-size: 0.8em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: sans-serif; font-size: 1em; }
-.ui-widget-content { border: none; /* @embed */ background: #f2f5f7 url(images/ui-bg_highlight-hard_100_f2f5f7_1x100.png) 50% top repeat-x; color: #362b36; }
+.ui-widget-content { border: 1px solid #cccccc; /* @embed */ background: #f2f5f7 url(images/ui-bg_highlight-hard_100_f2f5f7_1x100.png) 50% top repeat-x; color: #362b36; }
 .ui-widget-content a { color: #362b36; }
-.ui-widget-header { border: 1px solid #aed0ea; line-height: 1em; /* @embed */ background: #ffffff url(images/ui-bg_highlight-soft_100_ffffff_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header { border-bottom: 1px solid #bbbbbb; line-height: 1em; /* @embed */ background: #ffffff url(images/ui-bg_highlight-soft_100_ffffff_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
 .ui-widget-header a { color: #222222; }
 
 /* Interaction states
diff --git a/resources/jquery/images/sort_both.gif b/resources/jquery/images/sort_both.gif
new file mode 100644
index 00000000..50ad15a0
--- /dev/null
+++ b/resources/jquery/images/sort_both.gif
diff --git a/resources/jquery/images/sort_down.gif b/resources/jquery/images/sort_down.gif
new file mode 100644
index 00000000..ec4f41b0
--- /dev/null
+++ b/resources/jquery/images/sort_down.gif
diff --git a/resources/jquery/images/sort_none.gif b/resources/jquery/images/sort_none.gif
new file mode 100644
index 00000000..edd07e58
--- /dev/null
+++ b/resources/jquery/images/sort_none.gif
diff --git a/resources/jquery/images/sort_up.gif b/resources/jquery/images/sort_up.gif
new file mode 100644
index 00000000..80189185
--- /dev/null
+++ b/resources/jquery/images/sort_up.gif
diff --git a/resources/jquery/jquery.appear.js b/resources/jquery/jquery.appear.js
new file mode 100644
index 00000000..4f77886c
--- /dev/null
+++ b/resources/jquery/jquery.appear.js
@@ -0,0 +1,138 @@
+/*
+ * jQuery.appear
+ * http://code.google.com/p/jquery-appear/
+ *
+ * Copyright (c) 2009 Michael Hixson
+ * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
+*/
+(function($) {
+	 
+	$.fn.appear = function(fn, options) {
+		 
+		var settings = $.extend({
+ 
+			//arbitrary data to pass to fn
+			data: undefined,
+ 
+			//call fn only on the first appear?
+			one: true
+			 
+		}, options);
+		 
+		return this.each(function() {
+		 
+			var t = $(this);
+			 
+			//whether the element is currently visible
+			t.appeared = false;
+			 
+			if (!fn) {
+ 
+				//trigger the custom event
+				t.trigger('appear', settings.data);
+				return;
+			}
+			 
+			var w = $(window);
+			 
+			//fires the appear event when appropriate
+			var check = function() {
+ 
+				//is the element hidden?
+				if (!t.is(':visible')) {
+					 
+					//it became hidden
+					t.appeared = false;
+					return;
+				}
+ 
+				//is the element inside the visible window?
+				var a = w.scrollLeft();
+				var b = w.scrollTop();
+				var o = t.offset();
+				var x = o.left;
+				var y = o.top;
+				 
+				if (y + t.height() >= b && 
+						y <= b + w.height() &&
+						x + t.width() >= a && 
+						x <= a + w.width()) {
+ 
+					//trigger the custom event
+					if (!t.appeared) t.trigger('appear', settings.data);
+					 
+				} else {
+ 
+					//it scrolled out of view
+					t.appeared = false;
+				}
+			};
+ 
+			//create a modified fn with some additional logic
+			var modifiedFn = function() {
+				 
+				//mark the element as visible
+				t.appeared = true;
+ 
+				//is this supposed to happen only once?
+				if (settings.one) {
+ 
+					//remove the check
+					w.unbind('scroll', check);
+					var i = $.inArray(check, $.fn.appear.checks);
+					if (i >= 0) $.fn.appear.checks.splice(i, 1);
+				}
+ 
+				//trigger the original fn
+				fn.apply(this, arguments);
+			};
+			 
+			//bind the modified fn to the element
+			if (settings.one) t.one('appear', settings.data, modifiedFn);
+			else t.bind('appear', settings.data, modifiedFn);
+			 
+			//check whenever the window scrolls
+			w.scroll(check);
+			 
+			//check whenever the dom changes
+			$.fn.appear.checks.push(check);
+			 
+			//check now
+			(check)();
+		});
+	};
+	 
+	//keep a queue of appearance checks
+	$.extend($.fn.appear, {
+		 
+		checks: [],
+		timeout: null,
+ 
+		//process the queue
+		checkAll: function() {
+			var length = $.fn.appear.checks.length;
+			if (length > 0) while (length--) ($.fn.appear.checks[length])();
+		},
+ 
+		//check the queue asynchronously
+		run: function() {
+			if ($.fn.appear.timeout) clearTimeout($.fn.appear.timeout);
+			$.fn.appear.timeout = setTimeout($.fn.appear.checkAll, 20);
+		}
+	});
+	 
+	//run checks when these methods are called
+	$.each(['append', 'prepend', 'after', 'before', 'attr', 
+					'removeAttr', 'addClass', 'removeClass', 'toggleClass', 
+					'remove', 'css', 'show', 'hide'], function(i, n) {
+		var old = $.fn[n];
+		if (old) {
+			$.fn[n] = function() {
+				var r = old.apply(this, arguments);
+				$.fn.appear.run();
+				return r;
+			}
+		}
+	});
+	 
+})(jQuery);
\ No newline at end of file
diff --git a/resources/jquery/jquery.async.js b/resources/jquery/jquery.async.js
index 61493f71..2161f6b9 100644
--- a/resources/jquery/jquery.async.js
+++ b/resources/jquery/jquery.async.js
@@ -13,33 +13,28 @@
 // opts.test : (default true) function to test in the while test part
 // opts.loop : (default empty) function to call in the while loop part
 // opts.end : (default empty) function to call at the end of the while loop
-$.whileAsync = function(opts)
-{
+$.whileAsync = function(opts) {
 	var delay = Math.abs(opts.delay) || 10,
 		bulk = isNaN(opts.bulk) ? 500 : Math.abs(opts.bulk),
 		test = opts.test || function(){ return true; },
 		loop = opts.loop || function(){},
-		end  = opts.end  || function(){};
+		end = opts.end || function(){};
 	
 	(function(){
 
 		var t = false,
 			begin = new Date();
 			
-		while( t = test() )
-		{
+		while( t = test() ) {
 			loop();
-			if( bulk === 0 || (new Date() - begin) > bulk )
-			{
+			if( bulk === 0 || (new Date() - begin) > bulk ) {
 				break;
 			}
 		}
-		if( t )
-		{
+		if( t ) {
 			setTimeout(arguments.callee, delay);
 		}
-		else
-		{
+		else {
 			end();
 		}
 		
@@ -50,17 +45,15 @@ $.whileAsync = function(opts)
 // opts.bulk : (default 500) delay during which the loop can continue synchronously without yielding the CPU
 // opts.loop : (default empty) function to call in the each loop part, signature: function(index, value) this = value
 // opts.end : (default empty) function to call at the end of the each loop
-$.eachAsync = function(array, opts)
-{
-	var i = 0,
+$.eachAsync = function(array, opts) {
+	var	i = 0,
 		l = array.length,
 		loop = opts.loop || function(){};
 	
 	$.whileAsync(
 		$.extend(opts, {
-			test: function(){ return i < l; },
-			loop: function()
-			{
+			test: function() { return i < l; },
+			loop: function() {
 				var val = array[i];
 				return loop.call(val, i++, val);
 			}
@@ -68,11 +61,9 @@ $.eachAsync = function(array, opts)
 	);
 };
 
-$.fn.eachAsync = function(opts)
-{
+$.fn.eachAsync = function(opts) {
 	$.eachAsync(this, opts);
 	return this;
 }
 
-})(jQuery);
-
+})(jQuery);
\ No newline at end of file
diff --git a/resources/jquery/jquery.autoEllipsis.js b/resources/jquery/jquery.autoEllipsis.js
index 4993118d..7d726894 100644
--- a/resources/jquery/jquery.autoEllipsis.js
+++ b/resources/jquery/jquery.autoEllipsis.js
@@ -3,9 +3,9 @@
  */
 ( function( $ ) {
 
-// Cache ellipsed substrings for every string-width combination
+// Cache ellipsed substrings for every string-width-position combination
 var cache = { };
-// Use a seperate cache when match highlighting is enabled
+// Use a separate cache when match highlighting is enabled
 var matchTextCache = { };
 
 $.fn.autoEllipsis = function( options ) {
@@ -17,29 +17,29 @@ $.fn.autoEllipsis = function( options ) {
 		'matchText': null
 	}, options );
 	$(this).each( function() {
-		var $this = $(this);
+		var $el = $(this);
 		if ( options.restoreText ) {
-			if ( ! $this.data( 'autoEllipsis.originalText' ) ) {
-				$this.data( 'autoEllipsis.originalText', $this.text() );
+			if ( !$el.data( 'autoEllipsis.originalText' ) ) {
+				$el.data( 'autoEllipsis.originalText', $el.text() );
 			} else {
-				$this.text( $this.data( 'autoEllipsis.originalText' ) );
+				$el.text( $el.data( 'autoEllipsis.originalText' ) );
 			}
 		}
 		
 		// container element - used for measuring against
-		var $container = $this;
+		var $container = $el;
 		// trimmable text element - only the text within this element will be trimmed
 		var $trimmableText = null;
 		// protected text element - the width of this element is counted, but next is never trimmed from it
 		var $protectedText = null;
 
 		if ( options.hasSpan ) {
-			$trimmableText = $this.children( options.selector );
+			$trimmableText = $el.children( options.selector );
 		} else {
 			$trimmableText = $( '<span />' )
 				.css( 'whiteSpace', 'nowrap' )
-				.text( $this.text() );
-			$this
+				.text( $el.text() );
+			$el
 				.empty()
 				.append( $trimmableText );
 		}
@@ -49,27 +49,39 @@ $.fn.autoEllipsis = function( options ) {
 		var w = $container.width();
 		var pw = $protectedText ? $protectedText.width() : 0;
 		// Try cache
-		if ( !( text in cache ) ) {
-			cache[text] = {};
-		}
-		if ( options.matchText && !( text in matchTextCache ) ) {
-			matchTextCache[text] = {};
-		}
-		if ( options.matchText && !( options.matchText in matchTextCache[text] ) ) {
-			matchTextCache[text][options.matchText] = {};
-		}
-		if ( !options.matchText && w in cache[text] ) {
-			$container.html( cache[text][w] );
-			if ( options.tooltip )
-				$container.attr( 'title', text );
-			return;
-		}
-		if( options.matchText && options.matchText in matchTextCache[text] && w in matchTextCache[text][options.matchText] ) {
-			$container.html( matchTextCache[text][options.matchText][w] );
-			if ( options.tooltip )
-				$container.attr( 'title', text );
-			return;
+		if ( options.matchText ) {
+			if ( !( text in matchTextCache ) ) {
+				matchTextCache[text] = {};
+			}
+			if ( !( options.matchText in matchTextCache[text] ) ) {
+				matchTextCache[text][options.matchText] = {};
+			}
+			if ( !( w in matchTextCache[text][options.matchText] ) ) {
+				matchTextCache[text][options.matchText][w] = {};
+			}
+			if ( options.position in matchTextCache[text][options.matchText][w] ) {
+				$container.html( matchTextCache[text][options.matchText][w][options.position] );
+				if ( options.tooltip ) {
+					$container.attr( 'title', text );
+				}
+				return;
+			}
+		} else {
+			if ( !( text in cache ) ) {
+				cache[text] = {};
+			}
+			if ( !( w in cache[text] ) ) {
+				cache[text][w] = {};
+			}
+			if ( options.position in cache[text][w] ) {
+				$container.html( cache[text][w][options.position] );
+				if ( options.tooltip ) {
+					$container.attr( 'title', text );
+				}
+				return;
+			}
 		}
+		
 		if ( $trimmableText.width() + pw > w ) {
 			switch ( options.position ) {
 				case 'right':
@@ -94,7 +106,7 @@ $.fn.autoEllipsis = function( options ) {
 					while ( $trimmableText.outerWidth() + pw > w  && i[0] > 0 ) {
 						$trimmableText.text( trimmableText.substr( 0, i[0] ) + '...' + trimmableText.substr( i[1] ) );
 						// Alternate between trimming the end and begining
-						if ( side == 0 ) {
+						if ( side === 0 ) {
 							// Make the begining shorter
 							i[0]--;
 							side = 1;
@@ -120,9 +132,9 @@ $.fn.autoEllipsis = function( options ) {
 		}
 		if ( options.matchText ) {
 			$container.highlightText( options.matchText );
-			matchTextCache[text][options.matchText][w] = $container.html();
+			matchTextCache[text][options.matchText][w][options.position] = $container.html();
 		} else {
-			cache[text][w] = $container.html();
+			cache[text][w][options.position] = $container.html();
 		}
 		
 	} );
diff --git a/resources/jquery/jquery.byteLength.js b/resources/jquery/jquery.byteLength.js
new file mode 100644
index 00000000..20fa5c8e
--- /dev/null
+++ b/resources/jquery/jquery.byteLength.js
@@ -0,0 +1,19 @@
+/**
+ * jQuery.byteLength
+ *
+ * Calculate the byte length of a string (accounting for UTF-8).
+ *
+ * @author Jan Paul Posma
+ */
+jQuery.byteLength = function( str ) {
+
+	// This basically figures out how many bytes a UTF-16 string (which is what js sees)
+	// will take in UTF-8 by replacing a 2 byte character with 2 *'s, etc, and counting that.
+	// Note, surrogate (\uD800-\uDFFF) characters are counted as 2 bytes, since there's two of them
+	// and the actual character takes 4 bytes in UTF-8 (2*2=4). Might not work perfectly in
+	// edge cases such as illegal sequences, but that should never happen.
+	return str
+		.replace( /[\u0080-\u07FF\uD800-\uDFFF]/g, '**' )
+		.replace( /[\u0800-\uD7FF\uE000-\uFFFF]/g, '***' )
+		.length;
+}
diff --git a/resources/jquery/jquery.byteLimit.js b/resources/jquery/jquery.byteLimit.js
new file mode 100644
index 00000000..c1d26fc4
--- /dev/null
+++ b/resources/jquery/jquery.byteLimit.js
@@ -0,0 +1,56 @@
+/**
+ * jQuery byteLimit
+ *
+ * @author Jan Paul Posma
+ */
+( function( $ ) {
+
+	/**
+	 * Enforces a byte limit to a textbox, so that UTF-8 entries are not arbitrarily truncated.
+	 */
+	$.fn.byteLimit = function( limit ) {
+
+		// Default to current attribute value
+		if ( limit == null ) {
+			limit = this.attr( 'maxLength' );
+
+		// If passed, update/set attribute value instead
+		} else {
+			this.attr( 'maxLength', limit );
+		}
+
+		// Nothing passed and/or empty attribute, return without binding an event.
+		if ( limit == null ) {
+			return this;
+		}
+
+		// We've got something, go for it:
+		return this.keypress( function( e ) {
+			// First check to see if this is actually a character key
+			// being pressed.
+			// Based on key-event info from http://unixpapa.com/js/key.html
+			// jQuery should also normalize e.which to be consistent cross-browser,
+			// however the same check is still needed regardless of jQuery.
+	
+			// Note: At the moment, for some older opera versions (~< 10.5)
+			// some special keys won't be recognized (aka left arrow key).
+			// Backspace will be, so not big issue.
+	
+			if ( e.which === 0 || e.charCode === 0 || e.which === 8 ||
+				e.ctrlKey || e.altKey || e.metaKey )
+			{
+				return true; //a special key (backspace, etc) so don't interfere.
+			}
+	
+			var len = $.byteLength( this.value );
+			// Note that keypress returns a character code point, not a keycode.
+			// However, this may not be super reliable depending on how keys come in...
+			var charLen = $.byteLength( String.fromCharCode( e.which ) );
+
+			if ( ( len + charLen ) > limit ) {
+				e.preventDefault();
+			}
+		});
+	};
+
+} )( jQuery );
diff --git a/resources/jquery/jquery.checkboxShiftClick.js b/resources/jquery/jquery.checkboxShiftClick.js
index b2fcb6ef..cfa696d4 100644
--- a/resources/jquery/jquery.checkboxShiftClick.js
+++ b/resources/jquery/jquery.checkboxShiftClick.js
@@ -7,22 +7,22 @@
  * @license GPL v2
  */
 ( function( $ ) {
-jQuery.fn.checkboxShiftClick = function( text ) {
+$.fn.checkboxShiftClick = function( text ) {
 	var prevCheckbox = null;
 	var $box = this;
 	// When our boxes are clicked..
-	$box.click(function (e) {
+	$box.click( function( e ) {
 		// And one has been clicked before...
-		if (prevCheckbox !== null && e.shiftKey) {
+		if ( prevCheckbox !== null && e.shiftKey ) {
 			// Check or uncheck this one and all in-between checkboxes
 			$box.slice(
-			  Math.min($box.index(prevCheckbox), $box.index(e.target)),
-			  Math.max($box.index(prevCheckbox), $box.index(e.target)) + 1
-			).attr({checked: e.target.checked ? 'checked' : ''});
+			  Math.min( $box.index( prevCheckbox ), $box.index( e.target ) ),
+			  Math.max( $box.index( prevCheckbox ), $box.index( e.target ) ) + 1
+			).attr( {checked: e.target.checked ? 'checked' : ''} );
 		}
 		// Either way, update the prevCheckbox variable to the one clicked now
 		prevCheckbox = e.target;
-	});
+	} );
 	return $box;
 };
 } )( jQuery );
\ No newline at end of file
diff --git a/resources/jquery/jquery.client.js b/resources/jquery/jquery.client.js
index 4b9f580f..8082fa7d 100644
--- a/resources/jquery/jquery.client.js
+++ b/resources/jquery/jquery.client.js
@@ -1,206 +1,216 @@
-/*
+/**
  * User-agent detection
  */
 ( function( $ ) {
-$.client = new ( function() {
 
 	/* Private Members */
 
-	var profile;
-
-	/* Public Functions */
-
 	/**
-	 * Returns an object containing information about the browser
-	 *
-	 * The resulting client object will be in the following format:
-	 * 	{
-	 * 		'name': 'firefox',
-	 * 		'layout': 'gecko',
-	 * 		'layoutVersion': '20101026',
-	 * 		'platform': 'linux'
-	 * 		'version': '3.5.1',
-	 * 		'versionBase': '3',
-	 * 		'versionNumber': 3.5,
-	 * 	}
+	 * @var profileCache {Object} Keyed by userAgent string,
+	 * value is the parsed $.client.profile object for that user agent.
 	 */
-	this.profile = function() {
-		// Use the cached version if possible
-		if ( typeof profile === 'undefined' ) {
-
-			/* Configuration */
-
-			// Name of browsers or layout engines we don't recognize
-			var uk = 'unknown';
-			// Generic version digit
-			var x = 'x';
-			// Strings found in user agent strings that need to be conformed
-			var wildUserAgents = [ 'Opera', 'Navigator', 'Minefield', 'KHTML', 'Chrome', 'PLAYSTATION 3'];
-			// Translations for conforming user agent strings
-			var userAgentTranslations = [
-			    // Tons of browsers lie about being something they are not
-				[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/, ''],
-				// Chrome lives in the shadow of Safari still
-				['Chrome Safari', 'Chrome'],
-				// KHTML is the layout engine not the browser - LIES!
-				['KHTML', 'Konqueror'],
-				// Firefox nightly builds
-				['Minefield', 'Firefox'],
-				// This helps keep differnt versions consistent
-				['Navigator', 'Netscape'],
-				// This prevents version extraction issues, otherwise translation would happen later
-				['PLAYSTATION 3', 'PS3'],
-			];
-			// Strings which precede a version number in a user agent string - combined and used as match 1 in
-			// version detectection
-			var versionPrefixes = [
-				'camino', 'chrome', 'firefox', 'netscape', 'netscape6', 'opera', 'version', 'konqueror', 'lynx',
-				'msie', 'safari', 'ps3'
-			];
-			// Used as matches 2, 3 and 4 in version extraction - 3 is used as actual version number
-			var versionSuffix = '(\\/|\\;?\\s|)([a-z0-9\\.\\+]*?)(\\;|dev|rel|\\)|\\s|$)';
-			// Names of known browsers
-			var names = [
-			 	'camino', 'chrome', 'firefox', 'netscape', 'konqueror', 'lynx', 'msie', 'opera', 'safari', 'ipod',
-			 	'iphone', 'blackberry', 'ps3'
-			];
-			// Tanslations for conforming browser names
-			var nameTranslations = [];
-			// Names of known layout engines
-			var layouts = ['gecko', 'konqueror', 'msie', 'opera', 'webkit'];
-			// Translations for conforming layout names
-			var layoutTranslations = [['konqueror', 'khtml'], ['msie', 'trident'], ['opera', 'presto']];
-			// Names of supported layout engines for version number
-			var layoutVersions = ['applewebkit', 'gecko'];
-			// Names of known operating systems
-			var platforms = ['win', 'mac', 'linux', 'sunos', 'solaris', 'iphone'];
-			// Translations for conforming operating system names
-			var platformTranslations = [['sunos', 'solaris']];
-
-			/* Methods */
-
-			// Performs multiple replacements on a string
-			function translate( source, translations ) {
-				for ( var i = 0; i < translations.length; i++ ) {
-					source = source.replace( translations[i][0], translations[i][1] );
-				}
-				return source;
-			};
-
-			/* Pre-processing  */
-
-			var userAgent = navigator.userAgent, match, name = uk, layout = uk, layoutversion = uk, platform = uk, version = x;
-			if ( match = new RegExp( '(' + wildUserAgents.join( '|' ) + ')' ).exec( userAgent ) ) {
-				// Takes a userAgent string and translates given text into something we can more easily work with
-				userAgent = translate( userAgent, userAgentTranslations );
+	var profileCache = {};
+
+	/* Public Methods */
+
+	$.client = {
+	
+		/**
+		 * Get an object containing information about the client.
+		 *
+		 * @param nav {Object} An object with atleast a 'userAgent' and 'platform' key.=
+		 * Defaults to the global Navigator object.
+		 * @return {Object} The resulting client object will be in the following format:
+		 *  {
+		 *   'name': 'firefox',
+		 *   'layout': 'gecko',
+		 *   'layoutVersion': 20101026,
+		 *   'platform': 'linux'
+		 *   'version': '3.5.1',
+		 *   'versionBase': '3',
+		 *   'versionNumber': 3.5,
+		 *  }
+		 */
+		profile: function( nav ) {
+			if ( nav === undefined ) {
+				nav = window.navigator;
 			}
-			// Everything will be in lowercase from now on
-			userAgent = userAgent.toLowerCase();
-
-			/* Extraction */
-
-			if ( match = new RegExp( '(' + names.join( '|' ) + ')' ).exec( userAgent ) ) {
-				name = translate( match[1], nameTranslations );
-			}
-			if ( match = new RegExp( '(' + layouts.join( '|' ) + ')' ).exec( userAgent ) ) {
-				layout = translate( match[1], layoutTranslations );
-			}
-			if ( match = new RegExp( '(' + layoutVersions.join( '|' ) + ')\\\/(\\d+)').exec( navigator.userAgent.toLowerCase() ) ) {
-				layoutversion = parseInt(match[2]);
-			}
-			if ( match = new RegExp( '(' + platforms.join( '|' ) + ')' ).exec( navigator.platform.toLowerCase() ) ) {
-				platform = translate( match[1], platformTranslations );
-			}
-			if ( match = new RegExp( '(' + versionPrefixes.join( '|' ) + ')' + versionSuffix ).exec( userAgent ) ) {
-				version = match[3];
-			}
-
-			/* Edge Cases -- did I mention about how user agent string lie? */
-
-			// Decode Safari's crazy 400+ version numbers
-			if ( name.match( /safari/ ) && version > 400 ) {
-				version = '2.0';
+			// Use the cached version if possible
+			if ( profileCache[nav.userAgent] === undefined ) {
+	
+				/* Configuration */
+	
+				// Name of browsers or layout engines we don't recognize
+				var uk = 'unknown';
+				// Generic version digit
+				var x = 'x';
+				// Strings found in user agent strings that need to be conformed
+				var wildUserAgents = [ 'Opera', 'Navigator', 'Minefield', 'KHTML', 'Chrome', 'PLAYSTATION 3'];
+				// Translations for conforming user agent strings
+				var userAgentTranslations = [
+				    // Tons of browsers lie about being something they are not
+					[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/, ''],
+					// Chrome lives in the shadow of Safari still
+					['Chrome Safari', 'Chrome'],
+					// KHTML is the layout engine not the browser - LIES!
+					['KHTML', 'Konqueror'],
+					// Firefox nightly builds
+					['Minefield', 'Firefox'],
+					// This helps keep differnt versions consistent
+					['Navigator', 'Netscape'],
+					// This prevents version extraction issues, otherwise translation would happen later
+					['PLAYSTATION 3', 'PS3']
+				];
+				// Strings which precede a version number in a user agent string - combined and used as match 1 in
+				// version detectection
+				var versionPrefixes = [
+					'camino', 'chrome', 'firefox', 'netscape', 'netscape6', 'opera', 'version', 'konqueror', 'lynx',
+					'msie', 'safari', 'ps3'
+				];
+				// Used as matches 2, 3 and 4 in version extraction - 3 is used as actual version number
+				var versionSuffix = '(\\/|\\;?\\s|)([a-z0-9\\.\\+]*?)(\\;|dev|rel|\\)|\\s|$)';
+				// Names of known browsers
+				var names = [
+					'camino', 'chrome', 'firefox', 'netscape', 'konqueror', 'lynx', 'msie', 'opera', 'safari', 'ipod',
+					'iphone', 'blackberry', 'ps3'
+				];
+				// Tanslations for conforming browser names
+				var nameTranslations = [];
+				// Names of known layout engines
+				var layouts = ['gecko', 'konqueror', 'msie', 'opera', 'webkit'];
+				// Translations for conforming layout names
+				var layoutTranslations = [['konqueror', 'khtml'], ['msie', 'trident'], ['opera', 'presto']];
+				// Names of supported layout engines for version number
+				var layoutVersions = ['applewebkit', 'gecko'];
+				// Names of known operating systems
+				var platforms = ['win', 'mac', 'linux', 'sunos', 'solaris', 'iphone'];
+				// Translations for conforming operating system names
+				var platformTranslations = [['sunos', 'solaris']];
+	
+				/* Methods */
+	
+				// Performs multiple replacements on a string
+				var translate = function( source, translations ) {
+					for ( var i = 0; i < translations.length; i++ ) {
+						source = source.replace( translations[i][0], translations[i][1] );
+					}
+					return source;
+				};
+	
+				/* Pre-processing  */
+	
+				var	ua = nav.userAgent,
+					match,
+					name = uk,
+					layout = uk,
+					layoutversion = uk,
+					platform = uk,
+					version = x;
+
+				if ( match = new RegExp( '(' + wildUserAgents.join( '|' ) + ')' ).exec( ua ) ) {
+					// Takes a userAgent string and translates given text into something we can more easily work with
+					ua = translate( ua, userAgentTranslations );
+				}
+				// Everything will be in lowercase from now on
+				ua = ua.toLowerCase();
+	
+				/* Extraction */
+	
+				if ( match = new RegExp( '(' + names.join( '|' ) + ')' ).exec( ua ) ) {
+					name = translate( match[1], nameTranslations );
+				}
+				if ( match = new RegExp( '(' + layouts.join( '|' ) + ')' ).exec( ua ) ) {
+					layout = translate( match[1], layoutTranslations );
+				}
+				if ( match = new RegExp( '(' + layoutVersions.join( '|' ) + ')\\\/(\\d+)').exec( ua ) ) {
+					layoutversion = parseInt( match[2], 10 );
+				}
+				if ( match = new RegExp( '(' + platforms.join( '|' ) + ')' ).exec( nav.platform.toLowerCase() ) ) {
+					platform = translate( match[1], platformTranslations );
+				}
+				if ( match = new RegExp( '(' + versionPrefixes.join( '|' ) + ')' + versionSuffix ).exec( ua ) ) {
+					version = match[3];
+				}
+	
+				/* Edge Cases -- did I mention about how user agent string lie? */
+	
+				// Decode Safari's crazy 400+ version numbers
+				if ( name.match( /safari/ ) && version > 400 ) {
+					version = '2.0';
+				}
+				// Expose Opera 10's lies about being Opera 9.8
+				if ( name === 'opera' && version >= 9.8) {
+					version = ua.match( /version\/([0-9\.]*)/i )[1] || 10;
+				}
+				var versionNumber = parseFloat( version, 10 ) || 0.0;
+	
+				/* Caching */
+	
+				profileCache[nav.userAgent] = {
+					'name': name,
+					'layout': layout,
+					'layoutVersion': layoutversion,
+					'platform': platform,
+					'version': version,
+					'versionBase': ( version !== x ? Math.floor( versionNumber ).toString() : x ),
+					'versionNumber': versionNumber
+				};
 			}
-			// Expose Opera 10's lies about being Opera 9.8
-			if ( name === 'opera' && version >= 9.8) {
-				version = userAgent.match( /version\/([0-9\.]*)/i )[1] || 10;
+			return profileCache[nav.userAgent];
+		},
+	
+		/**
+		 * Checks the current browser against a support map object to determine if the browser has been black-listed or
+		 * not. If the browser was not configured specifically it is assumed to work. It is assumed that the body
+		 * element is classified as either "ltr" or "rtl". If neither is set, "ltr" is assumed.
+		 *
+		 * A browser map is in the following format:
+		 * {
+		 *   'ltr': {
+		 *     // Multiple rules with configurable operators
+		 *     'msie': [['>=', 7], ['!=', 9]],
+		 *      // Blocked entirely
+		 *     'iphone': false
+		 *   },
+		 *   'rtl': {
+		 *     // Test against a string
+		 *     'msie': [['!==', '8.1.2.3']],
+		 *     // RTL rules do not fall through to LTR rules, you must explicity set each of them
+		 *     'iphone': false
+		 *   }
+		 * }
+		 *
+		 * @param map {Object} Browser support map
+		 * @param profile {Object} (optional) a client-profile object.
+		 *
+		 * @return Boolean true if browser known or assumed to be supported, false if blacklisted
+		 */
+		test: function( map, profile ) {
+			profile = $.isPlainObject( profile ) ? profile : $.client.profile();
+
+			var dir = $( 'body' ).is( '.rtl' ) ? 'rtl' : 'ltr';
+			// Check over each browser condition to determine if we are running in a compatible client
+			if ( typeof map[dir] !== 'object' || typeof map[dir][profile.name] === 'undefined' ) {
+				// Unknown, so we assume it's working
+				return true;
 			}
-
-			/* Caching */
-
-			profile = {
-				'name': name,
-				'layout': layout,
-				'layoutVersion': layoutversion,
-				'platform': platform,
-				'version': version,
-				'versionBase': ( version !== x ? new String( version ).substr( 0, 1 ) : x ),
-				'versionNumber': ( parseFloat( version, 10 ) || 0.0 )
-			};
-		}
-		return profile;
-	};
-
-	/**
-	 * Checks the current browser against a support map object to determine if the browser has been black-listed or
-	 * not. If the browser was not configured specifically it is assumed to work. It is assumed that the body
-	 * element is classified as either "ltr" or "rtl". If neither is set, "ltr" is assumed.
-	 *
-	 * A browser map is in the following format:
-	 *	{
-	 * 		'ltr': {
-	 * 			// Multiple rules with configurable operators
-	 * 			'msie': [['>=', 7], ['!=', 9]],
-	 *			// Blocked entirely
-	 * 			'iphone': false
-	 * 		},
-	 * 		'rtl': {
-	 * 			// Test against a string
-	 * 			'msie': [['!==', '8.1.2.3']],
-	 * 			// RTL rules do not fall through to LTR rules, you must explicity set each of them
-	 * 			'iphone': false
-	 * 		}
-	 *	}
-	 *
-	 * @param map Object of browser support map
-	 *
-	 * @return Boolean true if browser known or assumed to be supported, false if blacklisted
-	 */
-	this.test = function( map ) {
-		var profile = jQuery.client.profile();
-		var dir = jQuery( 'body' ).is( '.rtl' ) ? 'rtl' : 'ltr';
-		// Check over each browser condition to determine if we are running in a compatible client
-		if ( typeof map[dir] !== 'object' || typeof map[dir][profile.name] === 'undefined' ) {
-			// Unknown, so we assume it's working
-			return true;
-		}
-		var name = map[dir][profile.name];
-		for ( var condition in name ) {
-			var op = name[condition][0];
-			var val = name[condition][1];
-			if ( val === false ) {
-				return false;
-			} else if ( typeof val == 'string' ) {
-				if ( !( eval( 'profile.version' + op + '"' + val + '"' ) ) ) {
-					return false;
-				}
-			} else if ( typeof val == 'number' ) {
-				if ( !( eval( 'profile.versionNumber' + op + val ) ) ) {
+			var conditions = map[dir][profile.name];
+			for ( var i = 0; i < conditions.length; i++ ) {
+				var op = conditions[i][0];
+				var val = conditions[i][1];
+				if ( val === false ) {
 					return false;
+				} else if ( typeof val == 'string' ) {
+					if ( !( eval( 'profile.version' + op + '"' + val + '"' ) ) ) {
+						return false;
+					}
+				} else if ( typeof val == 'number' ) {
+					if ( !( eval( 'profile.versionNumber' + op + val ) ) ) {
+						return false;
+					}
 				}
 			}
+			return true;
 		}
-		return true;
-	}
-} )();
-
-$( document ).ready( function() {
-	var profile = $.client.profile();
-	$( 'html' )
-		.addClass( 'client-' + profile.name )
-		.addClass( 'client-' + profile.name + '-' + profile.versionBase )
-		.addClass( 'client-' + profile.layout )
-		.addClass( 'client-' + profile.platform );
-} );
-
+	};
 } )( jQuery );
diff --git a/resources/jquery/jquery.color.js b/resources/jquery/jquery.color.js
index e1b0d0dd..b0419428 100644
--- a/resources/jquery/jquery.color.js
+++ b/resources/jquery/jquery.color.js
@@ -1,123 +1,44 @@
-/*
+/**
  * jQuery Color Animations
  * Copyright 2007 John Resig
  * Released under the MIT and GPL licenses.
+ *
+ * - 2011-01-05: Modified by Krinkle to use the jQuery.colorUtil plugin (which has to be loaded first!)
  */
-
-(function(jQuery){
+(function( $ ) {
 
 	// We override the animation for all of these color styles
-	jQuery.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i,attr){
-		jQuery.fx.step[attr] = function(fx){
-			if ( fx.state == 0 ) {
-				fx.start = getColor( fx.elem, attr );
-				fx.end = getRGB( fx.end );
+	$.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'],
+		function( i, attr ) {
+			$.fx.step[attr] = function( fx ) {
+				if ( fx.state == 0 ) {
+					fx.start = getColor( fx.elem, attr );
+					fx.end = $.colorUtil.getRGB( fx.end );
+				}
+		
+				fx.elem.style[attr] = 'rgb(' + [
+					Math.max(Math.min( parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0]), 255), 0),
+					Math.max(Math.min( parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1]), 255), 0),
+					Math.max(Math.min( parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2]), 255), 0)
+				].join( ',' ) + ')';
 			}
-
-			fx.elem.style[attr] = "rgb(" + [
-				Math.max(Math.min( parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0]), 255), 0),
-				Math.max(Math.min( parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1]), 255), 0),
-				Math.max(Math.min( parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2]), 255), 0)
-			].join(",") + ")";
 		}
-	});
-
-	// Color Conversion functions from highlightFade
-	// By Blair Mitchelmore
-	// http://jquery.offput.ca/highlightFade/
-
-	// Parse strings looking for color tuples [255,255,255]
-	function getRGB(color) {
-		var result;
-
-		// Check if we're already dealing with an array of colors
-		if ( color && color.constructor == Array && color.length == 3 )
-			return color;
-
-		// Look for rgb(num,num,num)
-		if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
-			return [parseInt(result[1]), parseInt(result[2]), parseInt(result[3])];
-
-		// Look for rgb(num%,num%,num%)
-		if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)%\s*,\s*([0-9]+(?:\.[0-9]+)?)%\s*,\s*([0-9]+(?:\.[0-9]+)?)%\s*\)/.exec(color))
-			return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
-
-		// Look for #a0b1c2
-		if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
-			return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
-
-		// Look for #fff
-		if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
-			return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
-
-		// Otherwise, we're most likely dealing with a named color
-		return colors[jQuery.trim(color).toLowerCase()];
-	}
+	);
 	
 	function getColor(elem, attr) {
 		var color;
 
 		do {
-			color = jQuery.curCSS(elem, attr);
+			color = $.curCSS(elem, attr);
 
 			// Keep going until we find an element that has color, or we hit the body
-			if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") )
+			if ( color != '' && color != 'transparent' || $.nodeName(elem, 'body') )
 				break; 
 
-			attr = "backgroundColor";
+			attr = 'backgroundColor';
 		} while ( elem = elem.parentNode );
 
-		return getRGB(color);
-	};
-	
-	// Some named colors to work with
-	// From Interface by Stefan Petre
-	// http://interface.eyecon.ro/
-
-	var colors = {
-		aqua:[0,255,255],
-		azure:[240,255,255],
-		beige:[245,245,220],
-		black:[0,0,0],
-		blue:[0,0,255],
-		brown:[165,42,42],
-		cyan:[0,255,255],
-		darkblue:[0,0,139],
-		darkcyan:[0,139,139],
-		darkgrey:[169,169,169],
-		darkgreen:[0,100,0],
-		darkkhaki:[189,183,107],
-		darkmagenta:[139,0,139],
-		darkolivegreen:[85,107,47],
-		darkorange:[255,140,0],
-		darkorchid:[153,50,204],
-		darkred:[139,0,0],
-		darksalmon:[233,150,122],
-		darkviolet:[148,0,211],
-		fuchsia:[255,0,255],
-		gold:[255,215,0],
-		green:[0,128,0],
-		indigo:[75,0,130],
-		khaki:[240,230,140],
-		lightblue:[173,216,230],
-		lightcyan:[224,255,255],
-		lightgreen:[144,238,144],
-		lightgrey:[211,211,211],
-		lightpink:[255,182,193],
-		lightyellow:[255,255,224],
-		lime:[0,255,0],
-		magenta:[255,0,255],
-		maroon:[128,0,0],
-		navy:[0,0,128],
-		olive:[128,128,0],
-		orange:[255,165,0],
-		pink:[255,192,203],
-		purple:[128,0,128],
-		violet:[128,0,128],
-		red:[255,0,0],
-		silver:[192,192,192],
-		white:[255,255,255],
-		yellow:[255,255,0]
+		return $.colorUtil.getRGB(color);
 	};
 	
-})(jQuery);
+} )( jQuery );
diff --git a/resources/jquery/jquery.colorUtil.js b/resources/jquery/jquery.colorUtil.js
new file mode 100644
index 00000000..1116aec6
--- /dev/null
+++ b/resources/jquery/jquery.colorUtil.js
@@ -0,0 +1,193 @@
+/**
+ * jQuery Color Utilities
+ * Written by Krinkle in 2011
+ * Released under the MIT and GPL licenses.
+ * Mostly based on other plugins and functions (taken through JSLint and optimized a little).
+ * Sources cited locally.
+ */
+( function( $ ) {
+$.colorUtil = {
+
+	// Color Conversion function from highlightFade
+	// By Blair Mitchelmore
+	// http://jquery.offput.ca/highlightFade/
+	// Parse strings looking for color tuples [255,255,255]
+	getRGB : function( color ) {
+		var result;
+
+		// Check if we're already dealing with an array of colors
+		if ( color && color.constructor == Array && color.length == 3 ){
+			return color;
+		}
+
+		// Look for rgb(num,num,num)
+		if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)) {
+			return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)];
+		}
+
+		// Look for rgb(num%,num%,num%)
+		if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)) {
+			return [parseFloat(result[1],10)*2.55, parseFloat(result[2],10)*2.55, parseFloat(result[3])*2.55];
+		}
+
+		// Look for #a0b1c2
+		if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)) {
+			return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
+		}
+
+		// Look for #fff
+		if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) {
+			return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
+		}
+
+		// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
+		if (result = /rgba\(0, 0, 0, 0\)/.exec(color)) {
+			return $.colorUtil.colors.transparent;
+		}
+
+		// Otherwise, we're most likely dealing with a named color
+		return $.colorUtil.colors[$.trim(color).toLowerCase()];
+	},
+
+	// Some named colors to work with
+	// From Interface by Stefan Petre
+	// http://interface.eyecon.ro/
+	colors: {
+		aqua:[0,255,255],
+		azure:[240,255,255],
+		beige:[245,245,220],
+		black:[0,0,0],
+		blue:[0,0,255],
+		brown:[165,42,42],
+		cyan:[0,255,255],
+		darkblue:[0,0,139],
+		darkcyan:[0,139,139],
+		darkgrey:[169,169,169],
+		darkgreen:[0,100,0],
+		darkkhaki:[189,183,107],
+		darkmagenta:[139,0,139],
+		darkolivegreen:[85,107,47],
+		darkorange:[255,140,0],
+		darkorchid:[153,50,204],
+		darkred:[139,0,0],
+		darksalmon:[233,150,122],
+		darkviolet:[148,0,211],
+		fuchsia:[255,0,255],
+		gold:[255,215,0],
+		green:[0,128,0],
+		indigo:[75,0,130],
+		khaki:[240,230,140],
+		lightblue:[173,216,230],
+		lightcyan:[224,255,255],
+		lightgreen:[144,238,144],
+		lightgrey:[211,211,211],
+		lightpink:[255,182,193],
+		lightyellow:[255,255,224],
+		lime:[0,255,0],
+		magenta:[255,0,255],
+		maroon:[128,0,0],
+		navy:[0,0,128],
+		olive:[128,128,0],
+		orange:[255,165,0],
+		pink:[255,192,203],
+		purple:[128,0,128],
+		violet:[128,0,128],
+		red:[255,0,0],
+		silver:[192,192,192],
+		white:[255,255,255],
+		yellow:[255,255,0],
+		transparent: [255,255,255]
+	},
+	/**
+	 * http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
+	 * Converts an RGB color value to HSL. Conversion formula
+	 * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
+	 * Assumes r, g, and b are contained in the set [0, 255] and
+	 * returns h, s, and l in the set [0, 1].
+	 *
+	 * @param	Number	R		The red color value
+	 * @param	Number	G		The green color value
+	 * @param	Number	B		The blue color value
+	 * @return	Array			The HSL representation
+	 */
+	rgbToHsl: function( R, G, B ) {
+		var	r = R / 255,
+			g = G / 255,
+			b = B / 255;
+		var max = Math.max(r, g, b), min = Math.min(r, g, b);
+		var h, s, l = (max + min) / 2;
+
+		if(max == min){
+			h = s = 0; // achromatic
+		}else{
+			var d = max - min;
+			s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+			switch(max){
+				case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+				case g: h = (b - r) / d + 2; break;
+				case b: h = (r - g) / d + 4; break;
+			}
+			h /= 6;
+		}
+
+		return [h, s, l];
+	},
+	/**
+	 * http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
+	 * Converts an HSL color value to RGB. Conversion formula
+	 * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
+	 * Assumes h, s, and l are contained in the set [0, 1] and
+	 * returns r, g, and b in the set [0, 255].
+	 *
+	 * @param	Number	h		The hue
+	 * @param	Number	s		The saturation
+	 * @param	Number	l		The lightness
+	 * @return	Array			The RGB representation
+	 */
+	hslToRgb: function( h, s, l ) {
+		var r, g, b;
+
+		if(s === 0){
+			r = g = b = l; // achromatic
+		}else{
+			var hue2rgb = function(p, q, t){
+				if(t < 0){ t += 1; }
+				if(t > 1){ t -= 1; }
+				if(t < 1/6){ return p + (q - p) * 6 * t; }
+				if(t < 1/2){ return q; }
+				if(t < 2/3){ return p + (q - p) * (2/3 - t) * 6; }
+				return p;
+			};
+
+			var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+			var p = 2 * l - q;
+			r = hue2rgb(p, q, h + 1/3);
+			g = hue2rgb(p, q, h);
+			b = hue2rgb(p, q, h - 1/3);
+		}
+
+		return [r * 255, g * 255, b * 255];
+	},
+	/**
+	 * Get's a brighter or darker rgb() value string.
+	 *
+	 * @author Krinkle
+	 *
+	 * @example	getCSSColorMod( 'red', +0.1 )
+	 * @example	getCSSColorMod( 'rgb(200,50,50)', -0.2 )
+	 *
+	 * @param	Mixed	currentColor current value in css
+	 * @param	Number	mod wanted brightness modification between -1 and 1
+	 * @return	String 'rgb(r,g,b)'
+	 */
+	getColorBrightness: function( currentColor, mod ) {
+		var	rgbArr = $.colorUtil.getRGB( currentColor ),
+			hslArr = $.colorUtil.rgbToHsl(rgbArr[0], rgbArr[1], rgbArr[2] );
+		rgbArr = $.colorUtil.hslToRgb(hslArr[0], hslArr[1], hslArr[2]+mod);
+		return 'rgb(' +
+			[parseInt( rgbArr[0], 10), parseInt( rgbArr[1], 10 ), parseInt( rgbArr[2], 10 )].join( ',' ) +
+			')';
+	}
+
+};
+} )( jQuery );
\ No newline at end of file
diff --git a/resources/jquery/jquery.cookie.js b/resources/jquery/jquery.cookie.js
index eaa254e5..79317f74 100644
--- a/resources/jquery/jquery.cookie.js
+++ b/resources/jquery/jquery.cookie.js
@@ -1,19 +1,15 @@
-/*jslint browser: true */ /*global jQuery: true */
-
 /**
- * jQuery Cookie plugin
+ * Cookie plugin
  *
- * Copyright (c) 2010 Klaus Hartl (stilbuero.de)
+ * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
  * http://www.gnu.org/licenses/gpl.html
  *
  */
 
-// TODO JsDoc
-
 /**
- * Create a cookie with the given key and value and other optional parameters.
+ * Create a cookie with the given name and value and other optional parameters.
  *
  * @example $.cookie('the_cookie', 'the_value');
  * @desc Set the value of a cookie.
@@ -25,16 +21,16 @@
  * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
  *       used when the cookie was set.
  *
- * @param key String The key of the cookie.
- * @param value String The value of the cookie.
- * @param options Object An object literal containing key/value pairs to provide optional cookie attributes.
- * @option expires Number|Date Either an integer specifying the expiration date from now on in days or a Date object.
+ * @param String name The name of the cookie.
+ * @param String value The value of the cookie.
+ * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
+ * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
  *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
  *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
  *                             when the the browser exits.
- * @option path String The value of the path atribute of the cookie (default: path of page that created the cookie).
- * @option domain String The value of the domain attribute of the cookie (default: domain of page that created the cookie).
- * @option secure Boolean If true, the secure attribute of the cookie will be set and the cookie transmission will
+ * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
+ * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
+ * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
  *                        require a secure protocol (like HTTPS).
  * @type undefined
  *
@@ -44,12 +40,12 @@
  */
 
 /**
- * Get the value of a cookie with the given key.
+ * Get the value of a cookie with the given name.
  *
  * @example $.cookie('the_cookie');
  * @desc Get the value of a cookie.
  *
- * @param key String The key of the cookie.
+ * @param String name The name of the cookie.
  * @return The value of the cookie.
  * @type String
  *
@@ -57,33 +53,44 @@
  * @cat Plugins/Cookie
  * @author Klaus Hartl/klaus.hartl@stilbuero.de
  */
-jQuery.cookie = function (key, value, options) {
-
-    // key and value given, set cookie...
-    if (arguments.length > 1 && (value === null || typeof value !== "object")) {
-        options = jQuery.extend({}, options);
-
+jQuery.cookie = function(name, value, options) {
+    if (typeof value != 'undefined') { // name and value given, set cookie
+        options = options || {};
         if (value === null) {
+            value = '';
             options.expires = -1;
         }
-
-        if (typeof options.expires === 'number') {
-            var days = options.expires, t = options.expires = new Date();
-            t.setDate(t.getDate() + days);
+        var expires = '';
+        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+            var date;
+            if (typeof options.expires == 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
         }
-
-        return (document.cookie = [
-            encodeURIComponent(key), '=',
-            options.raw ? String(value) : encodeURIComponent(String(value)),
-            options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-            options.path ? '; path=' + options.path : '',
-            options.domain ? '; domain=' + options.domain : '',
-            options.secure ? '; secure' : ''
-        ].join(''));
+        // CAUTION: Needed to parenthesize options.path and options.domain
+        // in the following expressions, otherwise they evaluate to undefined
+        // in the packed version for some reason...
+        var path = options.path ? '; path=' + (options.path) : '';
+        var domain = options.domain ? '; domain=' + (options.domain) : '';
+        var secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    } else { // only name given, get cookie
+        var cookieValue = null;
+        if (document.cookie && document.cookie != '') {
+            var cookies = document.cookie.split(';');
+            for (var i = 0; i < cookies.length; i++) {
+                var cookie = jQuery.trim(cookies[i]);
+                // Does this cookie string begin with the name we want?
+                if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                    break;
+                }
+            }
+        }
+        return cookieValue;
     }
-
-    // key and possibly options given, get cookie...
-    options = value || {};
-    var result, decode = options.raw ? function (s) { return s; } : decodeURIComponent;
-    return (result = new RegExp('(?:^|; )' + encodeURIComponent(key) + '=([^;]*)').exec(document.cookie)) ? decode(result[1]) : null;
 };
diff --git a/resources/jquery/jquery.form.js b/resources/jquery/jquery.form.js
new file mode 100644
index 00000000..53c078f9
--- /dev/null
+++ b/resources/jquery/jquery.form.js
@@ -0,0 +1,791 @@
+/*!
+ * jQuery Form Plugin
+ * version: 2.52 (07-DEC-2010)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+
+	if (typeof options == 'function') {
+		options = { success: options };
+	}
+
+	var action = this.attr('action');
+	var url = (typeof action === 'string') ? $.trim(action) : '';
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+	}
+	url = url || window.location.href || '';
+
+	options = $.extend(true, {
+		url:  url,
+		type: this.attr('method') || 'GET',
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options);
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var n,v,a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (n in options.data) {
+			if(options.data[n] instanceof Array) {
+				for (var k in options.data[n]) {
+					a.push( { name: n, value: options.data[n][k] } );
+				}
+			}
+			else {
+				v = options.data[n];
+				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
+				a.push( { name: n, value: v } );
+			}
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else {
+		options.data = q; // data is the query string for 'post'
+	}
+
+	var $form = this, callbacks = [];
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(); });
+	}
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success) {
+		callbacks.push(options.success);
+	}
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		var context = options.context || options;   // jQuery 1.4+ supports scope context 
+		for (var i=0, max=callbacks.length; i < max; i++) {
+			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+		}
+	};
+
+	// are there files to upload?
+	var fileInputs = $('input:file', this).length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive) {
+		   $.get(options.closeKeepAlive, fileUpload);
+		}
+	   else {
+		   fileUpload();
+		}
+   }
+   else {
+	   $.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload() {
+		var form = $form[0];
+
+		if ($(':input[name=submit],:input[id=submit]', form).length) {
+			// if there is an input with a name or id of 'submit' then we won't be
+			// able to invoke the submit fn on the form (at least not x-browser)
+			alert('Error: Form elements must not have name or id of "submit".');
+			return;
+		}
+		
+		var s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		var id = 'jqFormIO' + (new Date().getTime()), fn = '_'+id;
+		window[fn] = function() {
+			var f = $io.data('form-plugin-onload');
+			if (f) {
+				f();
+				window[fn] = undefined;
+				try { delete window[fn]; } catch(e){}
+			}
+		};
+		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ s.iframeSrc +'" onload="window[\'_\'+this.id]()" />');
+		var io = $io[0];
+
+		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+		var xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function() {
+				this.aborted = 1;
+				$io.attr('src', s.iframeSrc); // abort op in progress
+			}
+		};
+
+		var g = s.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) {
+			$.event.trigger("ajaxStart");
+		}
+		if (g) {
+			$.event.trigger("ajaxSend", [xhr, s]);
+		}
+
+		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+			if (s.global) { 
+				$.active--;
+			}
+			return;
+		}
+		if (xhr.aborted) {
+			return;
+		}
+
+		var cbInvoked = false;
+		var timedOut = 0;
+
+		// add submitting element to data if we know it
+		var sub = form.clk;
+		if (sub) {
+			var n = sub.name;
+			if (n && !sub.disabled) {
+				s.extraData = s.extraData || {};
+				s.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					s.extraData[n+'.x'] = form.clk_x;
+					s.extraData[n+'.y'] = form.clk_y;
+				}
+			}
+		}
+
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		function doSubmit() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (form.getAttribute('method') != 'POST') {
+				form.setAttribute('method', 'POST');
+			}
+			if (form.getAttribute('action') != s.url) {
+				form.setAttribute('action', s.url);
+			}
+
+			// ie borks in some cases when setting encoding
+			if (! s.skipEncodingOverride) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (s.timeout) {
+				setTimeout(function() { timedOut = true; cb(); }, s.timeout);
+			}
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (s.extraData) {
+					for (var n in s.extraData) {
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" value="'+s.extraData[n]+'" />')
+								.appendTo(form)[0]);
+					}
+				}
+
+				// add iframe to doc and submit the form
+				$io.appendTo('body');
+				$io.data('form-plugin-onload', cb);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				if(t) {
+					form.setAttribute('target', t);
+				} else {
+					$form.removeAttr('target');
+				}
+				$(extraInputs).remove();
+			}
+		}
+
+		if (s.forceSync) {
+			doSubmit();
+		}
+		else {
+			setTimeout(doSubmit, 10); // this lets dom updates render
+		}
+	
+		var data, doc, domCheckCount = 50;
+
+		function cb() {
+			if (cbInvoked) {
+				return;
+			}
+
+			$io.removeData('form-plugin-onload');
+			
+			var ok = true;
+			try {
+				if (timedOut) {
+					throw 'timeout';
+				}
+				// extract the server response from the iframe
+				doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+				
+				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
+					if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
+						return;
+					}
+					// let this fall through because server response could be an empty document
+					//log('Could not access iframe DOM after mutiple tries.');
+					//throw 'DOMException: not available';
+				}
+
+				//log('response detected');
+				cbInvoked = true;
+				xhr.responseText = doc.documentElement ? doc.documentElement.innerHTML : null; 
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': s.dataType};
+					return headers[header];
+				};
+
+				var scr = /(json|script)/.test(s.dataType);
+				if (scr || s.textarea) {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta) {
+						xhr.responseText = ta.value;
+					}
+					else if (scr) {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						var b = doc.getElementsByTagName('body')[0];
+						if (pre) {
+							xhr.responseText = pre.textContent;
+						}
+						else if (b) {
+							xhr.responseText = b.innerHTML;
+						}
+					}			  
+				}
+				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+				data = $.httpData(xhr, s.dataType);
+			}
+			catch(e){
+				log('error caught:',e);
+				ok = false;
+				xhr.error = e;
+				$.handleError(s, xhr, 'error', e);
+			}
+			
+			if (xhr.aborted) {
+				log('upload aborted');
+				ok = false;
+			}
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (ok) {
+				s.success.call(s.context, data, 'success', xhr);
+				if (g) {
+					$.event.trigger("ajaxSuccess", [xhr, s]);
+				}
+			}
+			if (g) {
+				$.event.trigger("ajaxComplete", [xhr, s]);
+			}
+			if (g && ! --$.active) {
+				$.event.trigger("ajaxStop");
+			}
+			if (s.complete) {
+				s.complete.call(s.context, xhr, ok ? 'success' : 'error');
+			}
+
+			// clean up
+			setTimeout(function() {
+				$io.removeData('form-plugin-onload');
+				$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		}
+
+		function toXml(s, doc) {
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else {
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			}
+			return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+		}
+	}
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	// in jQuery 1.3+ we can fix mistakes with the ready state
+	if (this.length === 0) {
+		var o = { s: this.selector, c: this.context };
+		if (!$.isReady && o.s) {
+			log('DOM not ready, queuing ajaxForm');
+			$(function() {
+				$(o.s,o.c).ajaxForm(options);
+			});
+			return this;
+		}
+		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+		return this;
+	}
+	
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+			e.preventDefault();
+			$(this).ajaxSubmit(options);
+		}
+	}).bind('click.form-plugin', function(e) {
+		var target = e.target;
+		var $el = $(target);
+		if (!($el.is(":submit,input:image"))) {
+			// is this a child element of the submit el?  (ex: a span within a button)
+			var t = $el.closest(':submit');
+			if (t.length == 0) {
+				return;
+			}
+			target = t[0];
+		}
+		var form = this;
+		form.clk = target;
+		if (target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - target.offsetLeft;
+				form.clk_y = e.pageY - target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length === 0) {
+		return a;
+	}
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) {
+		return a;
+	}
+	
+	var i,j,n,v,el,max,jmax;
+	for(i=0, max=els.length; i < max; i++) {
+		el = els[i];
+		n = el.name;
+		if (!n) {
+			continue;
+		}
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(j=0, jmax=v.length; j < jmax; j++) {
+				a.push({name: n, value: v[j]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: n, value: v});
+		}
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0];
+		n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) {
+			return;
+		}
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++) {
+				a.push({name: n, value: v[i]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: this.name, value: v});
+		}
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	   array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
+			continue;
+		}
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (successful === undefined) {
+		successful = true;
+	}
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1)) {
+			return null;
+	}
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) {
+			return null;
+		}
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) { // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				}
+				if (one) {
+					return v;
+				}
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return $(el).val();
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (t == 'text' || t == 'password' || tag == 'textarea') {
+			this.value = '';
+		}
+		else if (t == 'checkbox' || t == 'radio') {
+			this.checked = false;
+		}
+		else if (tag == 'select') {
+			this.selectedIndex = -1;
+		}
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
+			this.reset();
+		}
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b === undefined) {
+		b = true;
+	}
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select === undefined) {
+		select = true;
+	}
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio') {
+			this.checked = select;
+		}
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// helper fn for console logging
+// set $.fn.ajaxSubmit.debug to true to enable debug logging
+function log() {
+	if ($.fn.ajaxSubmit.debug) {
+		var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+		if (window.console && window.console.log) {
+			window.console.log(msg);
+		}
+		else if (window.opera && window.opera.postError) {
+			window.opera.postError(msg);
+		}
+	}
+};
+
+})(jQuery);
diff --git a/resources/jquery/jquery.getAttrs.js b/resources/jquery/jquery.getAttrs.js
new file mode 100644
index 00000000..c05012d9
--- /dev/null
+++ b/resources/jquery/jquery.getAttrs.js
@@ -0,0 +1,24 @@
+/**
+ * Utility to get all attributes of an element directy as an object.
+ *
+ * @author Timo Tijhof, 2011
+ */
+jQuery.fn.getAttrs = function( all ) {
+	var	map = this[0].attributes,
+		attrs = {},
+		len = map.length,
+		i, v;
+
+	for ( i = 0; i < len; i++ ) {
+		// IE6 includes *all* allowed attributes for thew element (including those
+		// not set). Those have values like undefined, null, 0, false, "" or "inherit".
+		// However there may be genuine attributes set to that. If you need them,
+		// set all to true. They are excluded by default.
+		v = map[i].nodeValue;
+		if ( all || ( v && v !== 'inherit' ) ) {
+			attrs[ map[i].nodeName ] = v;
+		}
+	}
+
+	return attrs;
+};
diff --git a/resources/jquery/jquery.hoverIntent.js b/resources/jquery/jquery.hoverIntent.js
new file mode 100644
index 00000000..adf948df
--- /dev/null
+++ b/resources/jquery/jquery.hoverIntent.js
@@ -0,0 +1,111 @@
+/**
+* hoverIntent is similar to jQuery's built-in "hover" function except that
+* instead of firing the onMouseOver event immediately, hoverIntent checks
+* to see if the user's mouse has slowed down (beneath the sensitivity
+* threshold) before firing the onMouseOver event.
+* 
+* hoverIntent r5 // 2007.03.27 // jQuery 1.1.2+
+* <http://cherne.net/brian/resources/jquery.hoverIntent.html>
+* 
+* hoverIntent is currently available for use in all personal or commercial 
+* projects under both MIT and GPL licenses. This means that you can choose 
+* the license that best suits your project, and use it accordingly.
+* 
+* // basic usage (just like .hover) receives onMouseOver and onMouseOut functions
+* $("ul li").hoverIntent( showNav , hideNav );
+* 
+* // advanced usage receives configuration object only
+* $("ul li").hoverIntent({
+*	sensitivity: 7, // number = sensitivity threshold (must be 1 or higher)
+*	interval: 100,   // number = milliseconds of polling interval
+*	over: showNav,  // function = onMouseOver callback (required)
+*	timeout: 0,   // number = milliseconds delay before onMouseOut function call
+*	out: hideNav    // function = onMouseOut callback (required)
+* });
+* 
+* @param  f  onMouseOver function || An object with configuration options
+* @param  g  onMouseOut function  || Nothing (use configuration options object)
+* @author    Brian Cherne <brian@cherne.net>
+*/
+(function($) {
+	$.fn.hoverIntent = function(f,g) {
+		// default configuration options
+		var cfg = {
+			sensitivity: 7,
+			interval: 100,
+			timeout: 0
+		};
+		// override configuration options with user supplied object
+		cfg = $.extend(cfg, g ? { over: f, out: g } : f );
+
+		// instantiate variables
+		// cX, cY = current X and Y position of mouse, updated by mousemove event
+		// pX, pY = previous X and Y position of mouse, set by mouseover and polling interval
+		var cX, cY, pX, pY;
+
+		// A private function for getting mouse position
+		var track = function(ev) {
+			cX = ev.pageX;
+			cY = ev.pageY;
+		};
+
+		// A private function for comparing current and previous mouse position
+		var compare = function(ev,ob) {
+			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+			// compare mouse positions to see if they've crossed the threshold
+			if ( ( Math.abs(pX-cX) + Math.abs(pY-cY) ) < cfg.sensitivity ) {
+				$(ob).unbind("mousemove",track);
+				// set hoverIntent state to true (so mouseOut can be called)
+				ob.hoverIntent_s = 1;
+				return cfg.over.apply(ob,[ev]);
+			} else {
+				// set previous coordinates for next time
+				pX = cX; pY = cY;
+				// use self-calling timeout, guarantees intervals are spaced out properly (avoids JavaScript timer bugs)
+				ob.hoverIntent_t = setTimeout( function(){compare(ev, ob);} , cfg.interval );
+			}
+		};
+
+		// A private function for delaying the mouseOut function
+		var delay = function(ev,ob) {
+			ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t);
+			ob.hoverIntent_s = 0;
+			return cfg.out.apply(ob,[ev]);
+		};
+
+		// A private function for handling mouse 'hovering'
+		var handleHover = function(e) {
+			// next three lines copied from jQuery.hover, ignore children onMouseOver/onMouseOut
+			var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
+			while ( p && p != this ) { try { p = p.parentNode; } catch(e) { p = this; } }
+			if ( p == this ) { return false; }
+
+			// copy objects to be passed into t (required for event object to be passed in IE)
+			var ev = $.extend({},e);
+			var ob = this;
+
+			// cancel hoverIntent timer if it exists
+			if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }
+
+			// else e.type == "onmouseover"
+			if (e.type == "mouseover") {
+				// set "previous" X and Y position based on initial entry point
+				pX = ev.pageX; pY = ev.pageY;
+				// update "current" X and Y position based on mousemove
+				$(ob).bind("mousemove",track);
+				// start polling interval (self-calling timeout) to compare mouse coordinates over time
+				if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}
+
+			// else e.type == "onmouseout"
+			} else {
+				// unbind expensive mousemove event
+				$(ob).unbind("mousemove",track);
+				// if hoverIntent state is true, then call the mouseOut function after the specified delay
+				if (ob.hoverIntent_s == 1) { ob.hoverIntent_t = setTimeout( function(){delay(ev,ob);} , cfg.timeout );}
+			}
+		};
+
+		// bind the function to the two event listeners
+		return this.mouseover(handleHover).mouseout(handleHover);
+	};
+})(jQuery);
\ No newline at end of file
diff --git a/resources/jquery/jquery.js b/resources/jquery/jquery.js
index 27456efd..11e6d067 100644
--- a/resources/jquery/jquery.js
+++ b/resources/jquery/jquery.js
@@ -1,24 +1,30 @@
 /*!
- * jQuery JavaScript Library v1.4.2
+ * jQuery JavaScript Library v1.6.4
  * http://jquery.com/
  *
- * Copyright 2010, John Resig
+ * Copyright 2011, John Resig
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
  * Includes Sizzle.js
  * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
+ * Copyright 2011, The Dojo Foundation
  * Released under the MIT, BSD, and GPL Licenses.
  *
- * Date: Sat Feb 13 22:33:48 2010 -0500
+ * Date: Mon Sep 12 18:54:48 2011 -0400
  */
 (function( window, undefined ) {
 
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document,
+	navigator = window.navigator,
+	location = window.location;
+var jQuery = (function() {
+
 // Define a local copy of jQuery
 var jQuery = function( selector, context ) {
 		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context );
+		return new jQuery.fn.init( selector, context, rootjQuery );
 	},
 
 	// Map over jQuery in case of overwrite
@@ -27,52 +33,73 @@ var jQuery = function( selector, context ) {
 	// Map over the $ in case of overwrite
 	_$ = window.$,
 
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
 	// A central reference to the root jQuery(document)
 	rootjQuery,
 
 	// A simple way to check for HTML strings or ID strings
-	// (both of which we optimize for)
-	quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,
-
-	// Is it a simple selector
-	isSimple = /^.[^:#\[\.,]*$/,
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
 
 	// Check if a string has a non-whitespace character in it
 	rnotwhite = /\S/,
 
 	// Used for trimming whitespace
-	rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g,
+	trimLeft = /^\s+/,
+	trimRight = /\s+$/,
+
+	// Check for digits
+	rdigit = /\d/,
 
 	// Match a standalone tag
 	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
 
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+
+	// Useragent RegExp
+	rwebkit = /(webkit)[ \/]([\w.]+)/,
+	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+	rmsie = /(msie) ([\w.]+)/,
+	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+
+	// Matches dashed string for camelizing
+	rdashAlpha = /-([a-z]|[0-9])/ig,
+	rmsPrefix = /^-ms-/,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return ( letter + "" ).toUpperCase();
+	},
+
 	// Keep a UserAgent string for use with jQuery.browser
 	userAgent = navigator.userAgent,
 
 	// For matching the engine and version of the browser
 	browserMatch,
-	
-	// Has the ready events already been bound?
-	readyBound = false,
-	
-	// The functions to execute on DOM ready
-	readyList = [],
+
+	// The deferred used on DOM ready
+	readyList,
 
 	// The ready event handler
 	DOMContentLoaded,
 
 	// Save a reference to some core methods
 	toString = Object.prototype.toString,
-	hasOwnProperty = Object.prototype.hasOwnProperty,
+	hasOwn = Object.prototype.hasOwnProperty,
 	push = Array.prototype.push,
 	slice = Array.prototype.slice,
-	indexOf = Array.prototype.indexOf;
+	trim = String.prototype.trim,
+	indexOf = Array.prototype.indexOf,
+
+	// [[Class]] -> type pairs
+	class2type = {};
 
 jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
 		var match, elem, ret, doc;
 
 		// Handle $(""), $(null), or $(undefined)
@@ -86,12 +113,12 @@ jQuery.fn = jQuery.prototype = {
 			this.length = 1;
 			return this;
 		}
-		
+
 		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context ) {
+		if ( selector === "body" && !context && document.body ) {
 			this.context = document;
 			this[0] = document.body;
-			this.selector = "body";
+			this.selector = selector;
 			this.length = 1;
 			return this;
 		}
@@ -99,13 +126,20 @@ jQuery.fn = jQuery.prototype = {
 		// Handle HTML strings
 		if ( typeof selector === "string" ) {
 			// Are we dealing with HTML string or an ID?
-			match = quickExpr.exec( selector );
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = quickExpr.exec( selector );
+			}
 
 			// Verify a match, and that no context was specified for #id
 			if ( match && (match[1] || !context) ) {
 
 				// HANDLE: $(html) -> $(array)
 				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
 					doc = (context ? context.ownerDocument || context : document);
 
 					// If a single string is passed in and it's a single tag
@@ -122,17 +156,19 @@ jQuery.fn = jQuery.prototype = {
 						}
 
 					} else {
-						ret = buildFragment( [ match[1] ], [ doc ] );
-						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
+						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
+						selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes;
 					}
-					
+
 					return jQuery.merge( this, selector );
-					
+
 				// HANDLE: $("#id")
 				} else {
 					elem = document.getElementById( match[2] );
 
-					if ( elem ) {
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
 						// Handle the case where IE and Opera return items
 						// by name instead of ID
 						if ( elem.id !== match[2] ) {
@@ -149,13 +185,6 @@ jQuery.fn = jQuery.prototype = {
 					return this;
 				}
 
-			// HANDLE: $("TAG")
-			} else if ( !context && /^\w+$/.test( selector ) ) {
-				this.selector = selector;
-				this.context = document;
-				selector = document.getElementsByTagName( selector );
-				return jQuery.merge( this, selector );
-
 			// HANDLE: $(expr, $(...))
 			} else if ( !context || context.jquery ) {
 				return (context || rootjQuery).find( selector );
@@ -163,7 +192,7 @@ jQuery.fn = jQuery.prototype = {
 			// HANDLE: $(expr, context)
 			// (which is just equivalent to: $(context).find(expr)
 			} else {
-				return jQuery( context ).find( selector );
+				return this.constructor( context ).find( selector );
 			}
 
 		// HANDLE: $(function)
@@ -184,7 +213,7 @@ jQuery.fn = jQuery.prototype = {
 	selector: "",
 
 	// The current version of jQuery being used
-	jquery: "1.4.2",
+	jquery: "1.6.4",
 
 	// The default length of a jQuery object is 0
 	length: 0,
@@ -207,18 +236,18 @@ jQuery.fn = jQuery.prototype = {
 			this.toArray() :
 
 			// Return just the object
-			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
 	},
 
 	// Take an array of elements and push it onto the stack
 	// (returning the new matched element set)
 	pushStack: function( elems, name, selector ) {
 		// Build a new jQuery matched element set
-		var ret = jQuery();
+		var ret = this.constructor();
 
 		if ( jQuery.isArray( elems ) ) {
 			push.apply( ret, elems );
-		
+
 		} else {
 			jQuery.merge( ret, elems );
 		}
@@ -244,25 +273,17 @@ jQuery.fn = jQuery.prototype = {
 	each: function( callback, args ) {
 		return jQuery.each( this, callback, args );
 	},
-	
+
 	ready: function( fn ) {
 		// Attach the listeners
 		jQuery.bindReady();
 
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else if ( readyList ) {
-			// Add the function to the wait list
-			readyList.push( fn );
-		}
+		// Add the callback
+		readyList.done( fn );
 
 		return this;
 	},
-	
+
 	eq: function( i ) {
 		return i === -1 ?
 			this.slice( i ) :
@@ -287,9 +308,9 @@ jQuery.fn = jQuery.prototype = {
 			return callback.call( elem, i, elem );
 		}));
 	},
-	
+
 	end: function() {
-		return this.prevObject || jQuery(null);
+		return this.prevObject || this.constructor(null);
 	},
 
 	// For internal use only.
@@ -303,8 +324,11 @@ jQuery.fn = jQuery.prototype = {
 jQuery.fn.init.prototype = jQuery.fn;
 
 jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy;
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
 
 	// Handle a deep copy situation
 	if ( typeof target === "boolean" ) {
@@ -338,10 +362,15 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 				}
 
-				// Recurse if we're merging object literal values or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
-					var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
-						: jQuery.isArray(copy) ? [] : {};
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
 
 					// Never move original objects, clone them
 					target[ name ] = jQuery.extend( deep, clone, copy );
@@ -360,67 +389,79 @@ jQuery.extend = jQuery.fn.extend = function() {
 
 jQuery.extend({
 	noConflict: function( deep ) {
-		window.$ = _$;
+		if ( window.$ === jQuery ) {
+			window.$ = _$;
+		}
 
-		if ( deep ) {
+		if ( deep && window.jQuery === jQuery ) {
 			window.jQuery = _jQuery;
 		}
 
 		return jQuery;
 	},
-	
+
 	// Is the DOM ready to be used? Set to true once it occurs.
 	isReady: false,
-	
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
 	// Handle when the DOM is ready
-	ready: function() {
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.isReady ) {
+	ready: function( wait ) {
+		// Either a released hold or an DOMready/load event and not yet ready
+		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
 			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
 			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 13 );
+				return setTimeout( jQuery.ready, 1 );
 			}
 
 			// Remember that the DOM is ready
 			jQuery.isReady = true;
 
-			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn, i = 0;
-				while ( (fn = readyList[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Reset the list of functions
-				readyList = null;
+			// If a normal DOM Ready event fired, decrement, and wait if need be
+			if ( wait !== true && --jQuery.readyWait > 0 ) {
+				return;
 			}
 
+			// If there are functions bound, to execute
+			readyList.resolveWith( document, [ jQuery ] );
+
 			// Trigger any bound ready events
-			if ( jQuery.fn.triggerHandler ) {
-				jQuery( document ).triggerHandler( "ready" );
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).unbind( "ready" );
 			}
 		}
 	},
-	
+
 	bindReady: function() {
-		if ( readyBound ) {
+		if ( readyList ) {
 			return;
 		}
 
-		readyBound = true;
+		readyList = jQuery._Deferred();
 
 		// Catch cases where $(document).ready() is called after the
 		// browser event has already occurred.
 		if ( document.readyState === "complete" ) {
-			return jQuery.ready();
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			return setTimeout( jQuery.ready, 1 );
 		}
 
 		// Mozilla, Opera and webkit nightlies currently support this event
 		if ( document.addEventListener ) {
 			// Use the handy event callback
 			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			
+
 			// A fallback to window.onload, that will always work
 			window.addEventListener( "load", jQuery.ready, false );
 
@@ -428,8 +469,8 @@ jQuery.extend({
 		} else if ( document.attachEvent ) {
 			// ensure firing before onload,
 			// maybe late but safe also for iframes
-			document.attachEvent("onreadystatechange", DOMContentLoaded);
-			
+			document.attachEvent( "onreadystatechange", DOMContentLoaded );
+
 			// A fallback to window.onload, that will always work
 			window.attachEvent( "onload", jQuery.ready );
 
@@ -451,35 +492,55 @@ jQuery.extend({
 	// Since version 1.3, DOM methods and functions like alert
 	// aren't supported. They return false on IE (#2968).
 	isFunction: function( obj ) {
-		return toString.call(obj) === "[object Function]";
+		return jQuery.type(obj) === "function";
 	},
 
-	isArray: function( obj ) {
-		return toString.call(obj) === "[object Array]";
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	// A crude way of determining if an object is a window
+	isWindow: function( obj ) {
+		return obj && typeof obj === "object" && "setInterval" in obj;
+	},
+
+	isNaN: function( obj ) {
+		return obj == null || !rdigit.test( obj ) || isNaN( obj );
+	},
+
+	type: function( obj ) {
+		return obj == null ?
+			String( obj ) :
+			class2type[ toString.call(obj) ] || "object";
 	},
 
 	isPlainObject: function( obj ) {
 		// Must be an Object.
 		// Because of IE, we also have to check the presence of the constructor property.
 		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) {
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
 			return false;
 		}
-		
-		// Not own constructor property must be Object
-		if ( obj.constructor
-			&& !hasOwnProperty.call(obj, "constructor")
-			&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!hasOwn.call(obj, "constructor") &&
+				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
 			return false;
 		}
-		
+
 		// Own properties are enumerated firstly, so to speed up,
 		// if last one is own, then all properties are own.
-	
+
 		var key;
 		for ( key in obj ) {}
-		
-		return key === undefined || hasOwnProperty.call( obj, key );
+
+		return key === undefined || hasOwn.call( obj, key );
 	},
 
 	isEmptyObject: function( obj ) {
@@ -488,11 +549,11 @@ jQuery.extend({
 		}
 		return true;
 	},
-	
+
 	error: function( msg ) {
 		throw msg;
 	},
-	
+
 	parseJSON: function( data ) {
 		if ( typeof data !== "string" || !data ) {
 			return null;
@@ -500,48 +561,67 @@ jQuery.extend({
 
 		// Make sure leading/trailing whitespace is removed (IE can't handle it)
 		data = jQuery.trim( data );
-		
+
+		// Attempt to parse using the native JSON parser first
+		if ( window.JSON && window.JSON.parse ) {
+			return window.JSON.parse( data );
+		}
+
 		// Make sure the incoming data is actual JSON
 		// Logic borrowed from http://json.org/json2.js
-		if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
-			.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
-			.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
+		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+			.replace( rvalidtokens, "]" )
+			.replace( rvalidbraces, "")) ) {
 
-			// Try to use the native JSON parser first
-			return window.JSON && window.JSON.parse ?
-				window.JSON.parse( data ) :
-				(new Function("return " + data))();
+			return (new Function( "return " + data ))();
 
-		} else {
-			jQuery.error( "Invalid JSON: " + data );
 		}
+		jQuery.error( "Invalid JSON: " + data );
+	},
+
+	// Cross-browser xml parsing
+	parseXML: function( data ) {
+		var xml, tmp;
+		try {
+			if ( window.DOMParser ) { // Standard
+				tmp = new DOMParser();
+				xml = tmp.parseFromString( data , "text/xml" );
+			} else { // IE
+				xml = new ActiveXObject( "Microsoft.XMLDOM" );
+				xml.async = "false";
+				xml.loadXML( data );
+			}
+		} catch( e ) {
+			xml = undefined;
+		}
+		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		return xml;
 	},
 
 	noop: function() {},
 
-	// Evalulates a script in a global context
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
 	globalEval: function( data ) {
-		if ( data && rnotwhite.test(data) ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-
-			if ( jQuery.support.scriptEval ) {
-				script.appendChild( document.createTextNode( data ) );
-			} else {
-				script.text = data;
-			}
-
-			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709).
-			head.insertBefore( script, head.firstChild );
-			head.removeChild( script );
+		if ( data && rnotwhite.test( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
 		}
 	},
 
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
 	nodeName: function( elem, name ) {
 		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
 	},
@@ -550,7 +630,7 @@ jQuery.extend({
 	each: function( object, callback, args ) {
 		var name, i = 0,
 			length = object.length,
-			isObj = length === undefined || jQuery.isFunction(object);
+			isObj = length === undefined || jQuery.isFunction( object );
 
 		if ( args ) {
 			if ( isObj ) {
@@ -576,17 +656,31 @@ jQuery.extend({
 					}
 				}
 			} else {
-				for ( var value = object[0];
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+				for ( ; i < length; ) {
+					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
+						break;
+					}
+				}
 			}
 		}
 
 		return object;
 	},
 
-	trim: function( text ) {
-		return (text || "").replace( rtrim, "" );
-	},
+	// Use native String.trim function wherever possible
+	trim: trim ?
+		function( text ) {
+			return text == null ?
+				"" :
+				trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
+		},
 
 	// results is for internal usage only
 	makeArray: function( array, results ) {
@@ -596,7 +690,10 @@ jQuery.extend({
 			// The window, strings (and functions) also have 'length'
 			// The extra typeof function check is to prevent crashes
 			// in Safari 2 (See: #3039)
-			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
+			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+			var type = jQuery.type( array );
+
+			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
 				push.call( ret, array );
 			} else {
 				jQuery.merge( ret, array );
@@ -607,8 +704,12 @@ jQuery.extend({
 	},
 
 	inArray: function( elem, array ) {
-		if ( array.indexOf ) {
-			return array.indexOf( elem );
+		if ( !array ) {
+			return -1;
+		}
+
+		if ( indexOf ) {
+			return indexOf.call( array, elem );
 		}
 
 		for ( var i = 0, length = array.length; i < length; i++ ) {
@@ -621,13 +722,14 @@ jQuery.extend({
 	},
 
 	merge: function( first, second ) {
-		var i = first.length, j = 0;
+		var i = first.length,
+			j = 0;
 
 		if ( typeof second.length === "number" ) {
 			for ( var l = second.length; j < l; j++ ) {
 				first[ i++ ] = second[ j ];
 			}
-		
+
 		} else {
 			while ( second[j] !== undefined ) {
 				first[ i++ ] = second[ j++ ];
@@ -640,12 +742,14 @@ jQuery.extend({
 	},
 
 	grep: function( elems, callback, inv ) {
-		var ret = [];
+		var ret = [], retVal;
+		inv = !!inv;
 
 		// Go through the array, only saving the items
 		// that pass the validator function
 		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			if ( !inv !== !callback( elems[ i ], i ) ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
 				ret.push( elems[ i ] );
 			}
 		}
@@ -655,69 +759,143 @@ jQuery.extend({
 
 	// arg is for internal usage only
 	map: function( elems, callback, arg ) {
-		var ret = [], value;
+		var value, key, ret = [],
+			i = 0,
+			length = elems.length,
+			// jquery objects are treated as arrays
+			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
 
 		// Go through the array, translating each of the items to their
-		// new value (or values).
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			value = callback( elems[ i ], i, arg );
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
 
-			if ( value != null ) {
-				ret[ ret.length ] = value;
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( key in elems ) {
+				value = callback( elems[ key ], key, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
 			}
 		}
 
+		// Flatten any nested arrays
 		return ret.concat.apply( [], ret );
 	},
 
 	// A global GUID counter for objects
 	guid: 1,
 
-	proxy: function( fn, proxy, thisObject ) {
-		if ( arguments.length === 2 ) {
-			if ( typeof proxy === "string" ) {
-				thisObject = fn;
-				fn = thisObject[ proxy ];
-				proxy = undefined;
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		if ( typeof context === "string" ) {
+			var tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
 
-			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
-				thisObject = proxy;
-				proxy = undefined;
-			}
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
 		}
 
-		if ( !proxy && fn ) {
+		// Simulated bind
+		var args = slice.call( arguments, 2 ),
 			proxy = function() {
-				return fn.apply( thisObject || this, arguments );
+				return fn.apply( context, args.concat( slice.call( arguments ) ) );
 			};
-		}
 
 		// Set the guid of unique handler to the same of original handler, so it can be removed
-		if ( fn ) {
-			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-		}
+		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
 
-		// So proxy can be declared as an argument
 		return proxy;
 	},
 
+	// Mutifunctional method to get and set values to a collection
+	// The value/s can optionally be executed if it's a function
+	access: function( elems, key, value, exec, fn, pass ) {
+		var length = elems.length;
+
+		// Setting many attributes
+		if ( typeof key === "object" ) {
+			for ( var k in key ) {
+				jQuery.access( elems, k, key[k], exec, fn, value );
+			}
+			return elems;
+		}
+
+		// Setting one attribute
+		if ( value !== undefined ) {
+			// Optionally, function values get executed if exec is true
+			exec = !pass && exec && jQuery.isFunction(value);
+
+			for ( var i = 0; i < length; i++ ) {
+				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+			}
+
+			return elems;
+		}
+
+		// Getting an attribute
+		return length ? fn( elems[0], key ) : undefined;
+	},
+
+	now: function() {
+		return (new Date()).getTime();
+	},
+
 	// Use of jQuery.browser is frowned upon.
 	// More details: http://docs.jquery.com/Utilities/jQuery.browser
 	uaMatch: function( ua ) {
 		ua = ua.toLowerCase();
 
-		var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-			/(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
-			/(msie) ([\w.]+)/.exec( ua ) ||
-			!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
-		  	[];
+		var match = rwebkit.exec( ua ) ||
+			ropera.exec( ua ) ||
+			rmsie.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
+			[];
 
 		return { browser: match[1] || "", version: match[2] || "0" };
 	},
 
+	sub: function() {
+		function jQuerySub( selector, context ) {
+			return new jQuerySub.fn.init( selector, context );
+		}
+		jQuery.extend( true, jQuerySub, this );
+		jQuerySub.superclass = this;
+		jQuerySub.fn = jQuerySub.prototype = this();
+		jQuerySub.fn.constructor = jQuerySub;
+		jQuerySub.sub = this.sub;
+		jQuerySub.fn.init = function init( selector, context ) {
+			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
+				context = jQuerySub( context );
+			}
+
+			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		};
+		jQuerySub.fn.init.prototype = jQuerySub.fn;
+		var rootjQuerySub = jQuerySub(document);
+		return jQuerySub;
+	},
+
 	browser: {}
 });
 
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
 browserMatch = jQuery.uaMatch( userAgent );
 if ( browserMatch.browser ) {
 	jQuery.browser[ browserMatch.browser ] = true;
@@ -729,10 +907,10 @@ if ( jQuery.browser.webkit ) {
 	jQuery.browser.safari = true;
 }
 
-if ( indexOf ) {
-	jQuery.inArray = function( elem, array ) {
-		return indexOf.call( array, elem );
-	};
+// IE doesn't match non-breaking spaces with \s
+if ( rnotwhite.test( "\xA0" ) ) {
+	trimLeft = /^[\s\xA0]+/;
+	trimRight = /[\s\xA0]+$/;
 }
 
 // All jQuery objects should point back to these
@@ -765,7 +943,7 @@ function doScrollCheck() {
 		// If IE is used, use the trick by Diego Perini
 		// http://javascript.nwbox.com/IEContentLoaded/
 		document.documentElement.doScroll("left");
-	} catch( error ) {
+	} catch(e) {
 		setTimeout( doScrollCheck, 1 );
 		return;
 	}
@@ -774,93 +952,268 @@ function doScrollCheck() {
 	jQuery.ready();
 }
 
-function evalScript( i, elem ) {
-	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-	} else {
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-	}
+return jQuery;
 
-	if ( elem.parentNode ) {
-		elem.parentNode.removeChild( elem );
-	}
-}
+})();
 
-// Mutifunctional method to get and set values to a collection
-// The value/s can be optionally by executed if its a function
-function access( elems, key, value, exec, fn, pass ) {
-	var length = elems.length;
-	
-	// Setting many attributes
-	if ( typeof key === "object" ) {
-		for ( var k in key ) {
-			access( elems, k, key[k], exec, fn, value );
+
+var // Promise methods
+	promiseMethods = "done fail isResolved isRejected promise then always pipe".split( " " ),
+	// Static reference to slice
+	sliceDeferred = [].slice;
+
+jQuery.extend({
+	// Create a simple deferred (one callbacks list)
+	_Deferred: function() {
+		var // callbacks list
+			callbacks = [],
+			// stored [ context , args ]
+			fired,
+			// to avoid firing when already doing so
+			firing,
+			// flag to know if the deferred has been cancelled
+			cancelled,
+			// the deferred itself
+			deferred  = {
+
+				// done( f1, f2, ...)
+				done: function() {
+					if ( !cancelled ) {
+						var args = arguments,
+							i,
+							length,
+							elem,
+							type,
+							_fired;
+						if ( fired ) {
+							_fired = fired;
+							fired = 0;
+						}
+						for ( i = 0, length = args.length; i < length; i++ ) {
+							elem = args[ i ];
+							type = jQuery.type( elem );
+							if ( type === "array" ) {
+								deferred.done.apply( deferred, elem );
+							} else if ( type === "function" ) {
+								callbacks.push( elem );
+							}
+						}
+						if ( _fired ) {
+							deferred.resolveWith( _fired[ 0 ], _fired[ 1 ] );
+						}
+					}
+					return this;
+				},
+
+				// resolve with given context and args
+				resolveWith: function( context, args ) {
+					if ( !cancelled && !fired && !firing ) {
+						// make sure args are available (#8421)
+						args = args || [];
+						firing = 1;
+						try {
+							while( callbacks[ 0 ] ) {
+								callbacks.shift().apply( context, args );
+							}
+						}
+						finally {
+							fired = [ context, args ];
+							firing = 0;
+						}
+					}
+					return this;
+				},
+
+				// resolve with this as context and given arguments
+				resolve: function() {
+					deferred.resolveWith( this, arguments );
+					return this;
+				},
+
+				// Has this deferred been resolved?
+				isResolved: function() {
+					return !!( firing || fired );
+				},
+
+				// Cancel
+				cancel: function() {
+					cancelled = 1;
+					callbacks = [];
+					return this;
+				}
+			};
+
+		return deferred;
+	},
+
+	// Full fledged deferred (two callbacks list)
+	Deferred: function( func ) {
+		var deferred = jQuery._Deferred(),
+			failDeferred = jQuery._Deferred(),
+			promise;
+		// Add errorDeferred methods, then and promise
+		jQuery.extend( deferred, {
+			then: function( doneCallbacks, failCallbacks ) {
+				deferred.done( doneCallbacks ).fail( failCallbacks );
+				return this;
+			},
+			always: function() {
+				return deferred.done.apply( deferred, arguments ).fail.apply( this, arguments );
+			},
+			fail: failDeferred.done,
+			rejectWith: failDeferred.resolveWith,
+			reject: failDeferred.resolve,
+			isRejected: failDeferred.isResolved,
+			pipe: function( fnDone, fnFail ) {
+				return jQuery.Deferred(function( newDefer ) {
+					jQuery.each( {
+						done: [ fnDone, "resolve" ],
+						fail: [ fnFail, "reject" ]
+					}, function( handler, data ) {
+						var fn = data[ 0 ],
+							action = data[ 1 ],
+							returned;
+						if ( jQuery.isFunction( fn ) ) {
+							deferred[ handler ](function() {
+								returned = fn.apply( this, arguments );
+								if ( returned && jQuery.isFunction( returned.promise ) ) {
+									returned.promise().then( newDefer.resolve, newDefer.reject );
+								} else {
+									newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
+								}
+							});
+						} else {
+							deferred[ handler ]( newDefer[ action ] );
+						}
+					});
+				}).promise();
+			},
+			// Get a promise for this deferred
+			// If obj is provided, the promise aspect is added to the object
+			promise: function( obj ) {
+				if ( obj == null ) {
+					if ( promise ) {
+						return promise;
+					}
+					promise = obj = {};
+				}
+				var i = promiseMethods.length;
+				while( i-- ) {
+					obj[ promiseMethods[i] ] = deferred[ promiseMethods[i] ];
+				}
+				return obj;
+			}
+		});
+		// Make sure only one callback list will be used
+		deferred.done( failDeferred.cancel ).fail( deferred.cancel );
+		// Unexpose cancel
+		delete deferred.cancel;
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( firstParam ) {
+		var args = arguments,
+			i = 0,
+			length = args.length,
+			count = length,
+			deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
+				firstParam :
+				jQuery.Deferred();
+		function resolveFunc( i ) {
+			return function( value ) {
+				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
+				if ( !( --count ) ) {
+					// Strange bug in FF4:
+					// Values changed onto the arguments object sometimes end up as undefined values
+					// outside the $.when method. Cloning the object into a fresh array solves the issue
+					deferred.resolveWith( deferred, sliceDeferred.call( args, 0 ) );
+				}
+			};
 		}
-		return elems;
-	}
-	
-	// Setting one attribute
-	if ( value !== undefined ) {
-		// Optionally, function values get executed if exec is true
-		exec = !pass && exec && jQuery.isFunction(value);
-		
-		for ( var i = 0; i < length; i++ ) {
-			fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+		if ( length > 1 ) {
+			for( ; i < length; i++ ) {
+				if ( args[ i ] && jQuery.isFunction( args[ i ].promise ) ) {
+					args[ i ].promise().then( resolveFunc(i), deferred.reject );
+				} else {
+					--count;
+				}
+			}
+			if ( !count ) {
+				deferred.resolveWith( deferred, args );
+			}
+		} else if ( deferred !== firstParam ) {
+			deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
 		}
-		
-		return elems;
+		return deferred.promise();
 	}
-	
-	// Getting an attribute
-	return length ? fn( elems[0], key ) : undefined;
-}
+});
+
 
-function now() {
-	return (new Date).getTime();
-}
-(function() {
 
-	jQuery.support = {};
+jQuery.support = (function() {
 
-	var root = document.documentElement,
-		script = document.createElement("script"),
-		div = document.createElement("div"),
-		id = "script" + now();
+	var div = document.createElement( "div" ),
+		documentElement = document.documentElement,
+		all,
+		a,
+		select,
+		opt,
+		input,
+		marginDiv,
+		support,
+		fragment,
+		body,
+		testElementParent,
+		testElement,
+		testElementStyle,
+		tds,
+		events,
+		eventName,
+		i,
+		isSupported;
 
-	div.style.display = "none";
-	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+	// Preliminary tests
+	div.setAttribute("className", "t");
+	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
 
-	var all = div.getElementsByTagName("*"),
-		a = div.getElementsByTagName("a")[0];
+
+	all = div.getElementsByTagName( "*" );
+	a = div.getElementsByTagName( "a" )[ 0 ];
 
 	// Can't get basic test support
 	if ( !all || !all.length || !a ) {
-		return;
+		return {};
 	}
 
-	jQuery.support = {
+	// First batch of supports tests
+	select = document.createElement( "select" );
+	opt = select.appendChild( document.createElement("option") );
+	input = div.getElementsByTagName( "input" )[ 0 ];
+
+	support = {
 		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: div.firstChild.nodeType === 3,
+		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
 
 		// Make sure that tbody elements aren't automatically inserted
 		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
+		tbody: !div.getElementsByTagName( "tbody" ).length,
 
 		// Make sure that link elements get serialized correctly by innerHTML
 		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
+		htmlSerialize: !!div.getElementsByTagName( "link" ).length,
 
 		// Get the style information from getAttribute
-		// (IE uses .cssText insted)
-		style: /red/.test( a.getAttribute("style") ),
+		// (IE uses .cssText instead)
+		style: /top/.test( a.getAttribute("style") ),
 
 		// Make sure that URLs aren't manipulated
 		// (IE normalizes it by default)
-		hrefNormalized: a.getAttribute("href") === "/a",
+		hrefNormalized: ( a.getAttribute( "href" ) === "/a" ),
 
 		// Make sure that element opacity exists
 		// (IE uses filter instead)
@@ -874,213 +1227,462 @@ function now() {
 		// Make sure that if no value is specified for a checkbox
 		// that it defaults to "on".
 		// (WebKit defaults to "" instead)
-		checkOn: div.getElementsByTagName("input")[0].value === "on",
+		checkOn: ( input.value === "on" ),
 
 		// Make sure that a selected-by-default option has a working selected property.
 		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected,
+		optSelected: opt.selected,
 
-		parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null,
+		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+		getSetAttribute: div.className !== "t",
 
 		// Will be defined later
+		submitBubbles: true,
+		changeBubbles: true,
+		focusinBubbles: false,
 		deleteExpando: true,
-		checkClone: false,
-		scriptEval: false,
 		noCloneEvent: true,
-		boxModel: null
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableMarginRight: true
 	};
 
-	script.type = "text/javascript";
-	try {
-		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
-	} catch(e) {}
+	// Make sure checked status is properly cloned
+	input.checked = true;
+	support.noCloneChecked = input.cloneNode( true ).checked;
 
-	root.insertBefore( script, root.firstChild );
-
-	// Make sure that the execution of code works by injecting a script
-	// tag with appendChild/createTextNode
-	// (IE doesn't support this, fails, and uses .text instead)
-	if ( window[ id ] ) {
-		jQuery.support.scriptEval = true;
-		delete window[ id ];
-	}
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
 
 	// Test to see if it's possible to delete an expando from an element
 	// Fails in Internet Explorer
 	try {
-		delete script.test;
-	
-	} catch(e) {
-		jQuery.support.deleteExpando = false;
+		delete div.test;
+	} catch( e ) {
+		support.deleteExpando = false;
 	}
 
-	root.removeChild( script );
-
-	if ( div.attachEvent && div.fireEvent ) {
-		div.attachEvent("onclick", function click() {
+	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
+		div.attachEvent( "onclick", function() {
 			// Cloning a node shouldn't copy over any
 			// bound event handlers (IE does this)
-			jQuery.support.noCloneEvent = false;
-			div.detachEvent("onclick", click);
+			support.noCloneEvent = false;
 		});
-		div.cloneNode(true).fireEvent("onclick");
+		div.cloneNode( true ).fireEvent( "onclick" );
 	}
 
-	div = document.createElement("div");
-	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
+	// Check if a radio maintains it's value
+	// after being appended to the DOM
+	input = document.createElement("input");
+	input.value = "t";
+	input.setAttribute("type", "radio");
+	support.radioValue = input.value === "t";
 
-	var fragment = document.createDocumentFragment();
+	input.setAttribute("checked", "checked");
+	div.appendChild( input );
+	fragment = document.createDocumentFragment();
 	fragment.appendChild( div.firstChild );
 
 	// WebKit doesn't clone checked state correctly in fragments
-	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
+	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	div.innerHTML = "";
 
 	// Figure out if the W3C box model works as expected
-	// document.body must exist before we can do this
-	jQuery(function() {
-		var div = document.createElement("div");
-		div.style.width = div.style.paddingLeft = "1px";
+	div.style.width = div.style.paddingLeft = "1px";
+
+	body = document.getElementsByTagName( "body" )[ 0 ];
+	// We use our own, invisible, body unless the body is already present
+	// in which case we use a div (#9239)
+	testElement = document.createElement( body ? "div" : "body" );
+	testElementStyle = {
+		visibility: "hidden",
+		width: 0,
+		height: 0,
+		border: 0,
+		margin: 0,
+		background: "none"
+	};
+	if ( body ) {
+		jQuery.extend( testElementStyle, {
+			position: "absolute",
+			left: "-1000px",
+			top: "-1000px"
+		});
+	}
+	for ( i in testElementStyle ) {
+		testElement.style[ i ] = testElementStyle[ i ];
+	}
+	testElement.appendChild( div );
+	testElementParent = body || documentElement;
+	testElementParent.insertBefore( testElement, testElementParent.firstChild );
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	support.appendChecked = input.checked;
+
+	support.boxModel = div.offsetWidth === 2;
+
+	if ( "zoom" in div.style ) {
+		// Check if natively block-level elements act like inline-block
+		// elements when setting their display to 'inline' and giving
+		// them layout
+		// (IE < 8 does this)
+		div.style.display = "inline";
+		div.style.zoom = 1;
+		support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 );
+
+		// Check if elements with layout shrink-wrap their children
+		// (IE 6 does this)
+		div.style.display = "";
+		div.innerHTML = "<div style='width:4px;'></div>";
+		support.shrinkWrapBlocks = ( div.offsetWidth !== 2 );
+	}
 
-		document.body.appendChild( div );
-		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
-		document.body.removeChild( div ).style.display = 'none';
+	div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
+	tds = div.getElementsByTagName( "td" );
+
+	// Check if table cells still have offsetWidth/Height when they are set
+	// to display:none and there are still other visible table cells in a
+	// table row; if so, offsetWidth/Height are not reliable for use when
+	// determining if an element has been hidden directly using
+	// display:none (it is still safe to use offsets if a parent element is
+	// hidden; don safety goggles and see bug #4512 for more information).
+	// (only IE 8 fails this test)
+	isSupported = ( tds[ 0 ].offsetHeight === 0 );
+
+	tds[ 0 ].style.display = "";
+	tds[ 1 ].style.display = "none";
+
+	// Check if empty table cells still have offsetWidth/Height
+	// (IE < 8 fail this test)
+	support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+	div.innerHTML = "";
+
+	// Check if div with explicit width and no margin-right incorrectly
+	// gets computed margin-right based on width of container. For more
+	// info see bug #3333
+	// Fails in WebKit before Feb 2011 nightlies
+	// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+	if ( document.defaultView && document.defaultView.getComputedStyle ) {
+		marginDiv = document.createElement( "div" );
+		marginDiv.style.width = "0";
+		marginDiv.style.marginRight = "0";
+		div.appendChild( marginDiv );
+		support.reliableMarginRight =
+			( parseInt( ( document.defaultView.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
+	}
 
-		div = null;
-	});
+	// Remove the body element we added
+	testElement.innerHTML = "";
+	testElementParent.removeChild( testElement );
 
 	// Technique from Juriy Zaytsev
 	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
-	var eventSupported = function( eventName ) { 
-		var el = document.createElement("div"); 
-		eventName = "on" + eventName; 
-
-		var isSupported = (eventName in el); 
-		if ( !isSupported ) { 
-			el.setAttribute(eventName, "return;"); 
-			isSupported = typeof el[eventName] === "function"; 
-		} 
-		el = null; 
-
-		return isSupported; 
-	};
-	
-	jQuery.support.submitBubbles = eventSupported("submit");
-	jQuery.support.changeBubbles = eventSupported("change");
+	// We only care about the case where non-standard event systems
+	// are used, namely in IE. Short-circuiting here helps us to
+	// avoid an eval call (in setAttribute) which can cause CSP
+	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+	if ( div.attachEvent ) {
+		for( i in {
+			submit: 1,
+			change: 1,
+			focusin: 1
+		} ) {
+			eventName = "on" + i;
+			isSupported = ( eventName in div );
+			if ( !isSupported ) {
+				div.setAttribute( eventName, "return;" );
+				isSupported = ( typeof div[ eventName ] === "function" );
+			}
+			support[ i + "Bubbles" ] = isSupported;
+		}
+	}
 
-	// release memory in IE
-	root = script = div = all = a = null;
+	// Null connected elements to avoid leaks in IE
+	testElement = fragment = select = opt = body = marginDiv = div = input = null;
+
+	return support;
 })();
 
-jQuery.props = {
-	"for": "htmlFor",
-	"class": "className",
-	readonly: "readOnly",
-	maxlength: "maxLength",
-	cellspacing: "cellSpacing",
-	rowspan: "rowSpan",
-	colspan: "colSpan",
-	tabindex: "tabIndex",
-	usemap: "useMap",
-	frameborder: "frameBorder"
-};
-var expando = "jQuery" + now(), uuid = 0, windowData = {};
+// Keep track of boxModel
+jQuery.boxModel = jQuery.support.boxModel;
+
+
+
+
+var rbrace = /^(?:\{.*\}|\[.*\])$/,
+	rmultiDash = /([A-Z])/g;
 
 jQuery.extend({
 	cache: {},
-	
-	expando:expando,
+
+	// Please use with caution
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
 
 	// The following elements throw uncatchable exceptions if you
 	// attempt to add expando properties to them.
 	noData: {
 		"embed": true,
-		"object": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
 		"applet": true
 	},
 
-	data: function( elem, name, data ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
 			return;
 		}
 
-		elem = elem == window ?
-			windowData :
-			elem;
+		var thisCache, ret,
+			internalKey = jQuery.expando,
+			getByName = typeof name === "string",
 
-		var id = elem[ expando ], cache = jQuery.cache, thisCache;
+			// We have to handle DOM nodes and JS objects differently because IE6-7
+			// can't GC object references properly across the DOM-JS boundary
+			isNode = elem.nodeType,
 
-		if ( !id && typeof name === "string" && data === undefined ) {
-			return null;
-		}
+			// Only DOM nodes need the global jQuery cache; JS object data is
+			// attached directly to the object so GC can occur automatically
+			cache = isNode ? jQuery.cache : elem,
+
+			// Only defining an ID for JS objects if its cache already exists allows
+			// the code to shortcut on the same path as a DOM node with no cache
+			id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando;
 
-		// Compute a unique ID for the element
-		if ( !id ) { 
-			id = ++uuid;
+		// Avoid doing any more work than we need to when trying to get data on an
+		// object that has no data at all
+		if ( (!id || (pvt && id && (cache[ id ] && !cache[ id ][ internalKey ]))) && getByName && data === undefined ) {
+			return;
 		}
 
-		// Avoid generating a new cache unless none exists and we
-		// want to manipulate it.
-		if ( typeof name === "object" ) {
-			elem[ expando ] = id;
-			thisCache = cache[ id ] = jQuery.extend(true, {}, name);
+		if ( !id ) {
+			// Only DOM nodes need a new unique ID for each element since their data
+			// ends up in the global cache
+			if ( isNode ) {
+				elem[ jQuery.expando ] = id = ++jQuery.uuid;
+			} else {
+				id = jQuery.expando;
+			}
+		}
 
-		} else if ( !cache[ id ] ) {
-			elem[ expando ] = id;
+		if ( !cache[ id ] ) {
 			cache[ id ] = {};
+
+			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
+			// metadata on plain JS objects when the object is serialized using
+			// JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+		}
+
+		// An object can be passed to jQuery.data instead of a key/value pair; this gets
+		// shallow copied over onto the existing cache
+		if ( typeof name === "object" || typeof name === "function" ) {
+			if ( pvt ) {
+				cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name);
+			} else {
+				cache[ id ] = jQuery.extend(cache[ id ], name);
+			}
 		}
 
 		thisCache = cache[ id ];
 
-		// Prevent overriding the named cache with undefined values
+		// Internal jQuery data is stored in a separate object inside the object's data
+		// cache in order to avoid key collisions between internal data and user-defined
+		// data
+		if ( pvt ) {
+			if ( !thisCache[ internalKey ] ) {
+				thisCache[ internalKey ] = {};
+			}
+
+			thisCache = thisCache[ internalKey ];
+		}
+
 		if ( data !== undefined ) {
-			thisCache[ name ] = data;
+			thisCache[ jQuery.camelCase( name ) ] = data;
+		}
+
+		// TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should
+		// not attempt to inspect the internal events object using jQuery.data, as this
+		// internal data object is undocumented and subject to change.
+		if ( name === "events" && !thisCache[name] ) {
+			return thisCache[ internalKey ] && thisCache[ internalKey ].events;
 		}
 
-		return typeof name === "string" ? thisCache[ name ] : thisCache;
+		// Check for both converted-to-camel and non-converted data property names
+		// If a data property was specified
+		if ( getByName ) {
+
+			// First Try to find as-is property data
+			ret = thisCache[ name ];
+
+			// Test for null|undefined property data
+			if ( ret == null ) {
+
+				// Try to find the camelCased property
+				ret = thisCache[ jQuery.camelCase( name ) ];
+			}
+		} else {
+			ret = thisCache;
+		}
+
+		return ret;
 	},
 
-	removeData: function( elem, name ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
 			return;
 		}
 
-		elem = elem == window ?
-			windowData :
-			elem;
+		var thisCache,
+
+			// Reference to internal data cache key
+			internalKey = jQuery.expando,
+
+			isNode = elem.nodeType,
+
+			// See jQuery.data for more information
+			cache = isNode ? jQuery.cache : elem,
 
-		var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
+			// See jQuery.data for more information
+			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+		// If there is already no cache entry for this object, there is no
+		// purpose in continuing
+		if ( !cache[ id ] ) {
+			return;
+		}
 
-		// If we want to remove a specific section of the element's data
 		if ( name ) {
+
+			thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ];
+
 			if ( thisCache ) {
-				// Remove the section of cache data
+
+				// Support interoperable removal of hyphenated or camelcased keys
+				if ( !thisCache[ name ] ) {
+					name = jQuery.camelCase( name );
+				}
+
 				delete thisCache[ name ];
 
-				// If we've removed all the data, remove the element's cache
-				if ( jQuery.isEmptyObject(thisCache) ) {
-					jQuery.removeData( elem );
+				// If there is no data left in the cache, we want to continue
+				// and let the cache object itself get destroyed
+				if ( !isEmptyDataObject(thisCache) ) {
+					return;
 				}
 			}
+		}
+
+		// See jQuery.data for more information
+		if ( pvt ) {
+			delete cache[ id ][ internalKey ];
+
+			// Don't destroy the parent cache unless the internal data object
+			// had been the only thing left in it
+			if ( !isEmptyDataObject(cache[ id ]) ) {
+				return;
+			}
+		}
 
-		// Otherwise, we want to remove all of the element's data
+		var internalCache = cache[ id ][ internalKey ];
+
+		// Browsers that fail expando deletion also refuse to delete expandos on
+		// the window, but it will allow it on all other JS objects; other browsers
+		// don't care
+		// Ensure that `cache` is not a window object #10080
+		if ( jQuery.support.deleteExpando || !cache.setInterval ) {
+			delete cache[ id ];
 		} else {
+			cache[ id ] = null;
+		}
+
+		// We destroyed the entire user cache at once because it's faster than
+		// iterating through each key, but we need to continue to persist internal
+		// data if it existed
+		if ( internalCache ) {
+			cache[ id ] = {};
+			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
+			// metadata on plain JS objects when the object is serialized using
+			// JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+
+			cache[ id ][ internalKey ] = internalCache;
+
+		// Otherwise, we need to eliminate the expando on the node to avoid
+		// false lookups in the cache for entries that no longer exist
+		} else if ( isNode ) {
+			// IE does not allow us to delete expando properties from nodes,
+			// nor does it have a removeAttribute function on Document nodes;
+			// we must handle all of these cases
 			if ( jQuery.support.deleteExpando ) {
 				delete elem[ jQuery.expando ];
-
 			} else if ( elem.removeAttribute ) {
 				elem.removeAttribute( jQuery.expando );
+			} else {
+				elem[ jQuery.expando ] = null;
 			}
+		}
+	},
 
-			// Completely remove the data cache
-			delete cache[ id ];
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return jQuery.data( elem, name, data, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		if ( elem.nodeName ) {
+			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+			if ( match ) {
+				return !(match === true || elem.getAttribute("classid") !== match);
+			}
 		}
+
+		return true;
 	}
 });
 
 jQuery.fn.extend({
 	data: function( key, value ) {
-		if ( typeof key === "undefined" && this.length ) {
-			return jQuery.data( this[0] );
+		var data = null;
+
+		if ( typeof key === "undefined" ) {
+			if ( this.length ) {
+				data = jQuery.data( this[0] );
+
+				if ( this[0].nodeType === 1 ) {
+			    var attr = this[0].attributes, name;
+					for ( var i = 0, l = attr.length; i < l; i++ ) {
+						name = attr[i].name;
+
+						if ( name.indexOf( "data-" ) === 0 ) {
+							name = jQuery.camelCase( name.substring(5) );
+
+							dataAttr( this[0], name, data[ name ] );
+						}
+					}
+				}
+			}
+
+			return data;
 
 		} else if ( typeof key === "object" ) {
 			return this.each(function() {
@@ -1092,17 +1694,26 @@ jQuery.fn.extend({
 		parts[1] = parts[1] ? "." + parts[1] : "";
 
 		if ( value === undefined ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
 
+			// Try to fetch any internally stored data first
 			if ( data === undefined && this.length ) {
 				data = jQuery.data( this[0], key );
+				data = dataAttr( this[0], key, data );
 			}
+
 			return data === undefined && parts[1] ?
 				this.data( parts[0] ) :
 				data;
+
 		} else {
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
+			return this.each(function() {
+				var $this = jQuery( this ),
+					args = [ parts[0], value ];
+
+				$this.triggerHandler( "setData" + parts[1] + "!", args );
 				jQuery.data( this, key, value );
+				$this.triggerHandler( "changeData" + parts[1] + "!", args );
 			});
 		}
 	},
@@ -1113,34 +1724,123 @@ jQuery.fn.extend({
 		});
 	}
 });
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		if ( !elem ) {
-			return;
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				!jQuery.isNaN( data ) ? parseFloat( data ) :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
 		}
+	}
 
-		type = (type || "fx") + "queue";
-		var q = jQuery.data( elem, type );
+	return data;
+}
 
-		// Speed up dequeue by getting out quickly if this is just a lookup
-		if ( !data ) {
-			return q || [];
+// TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON
+// property to be considered empty objects; this property always exists in
+// order to make sure JSON.stringify does not expose internal metadata
+function isEmptyDataObject( obj ) {
+	for ( var name in obj ) {
+		if ( name !== "toJSON" ) {
+			return false;
 		}
+	}
 
-		if ( !q || jQuery.isArray(data) ) {
-			q = jQuery.data( elem, type, jQuery.makeArray(data) );
+	return true;
+}
 
-		} else {
-			q.push( data );
+
+
+
+function handleQueueMarkDefer( elem, type, src ) {
+	var deferDataKey = type + "defer",
+		queueDataKey = type + "queue",
+		markDataKey = type + "mark",
+		defer = jQuery.data( elem, deferDataKey, undefined, true );
+	if ( defer &&
+		( src === "queue" || !jQuery.data( elem, queueDataKey, undefined, true ) ) &&
+		( src === "mark" || !jQuery.data( elem, markDataKey, undefined, true ) ) ) {
+		// Give room for hard-coded callbacks to fire first
+		// and eventually mark/queue something else on the element
+		setTimeout( function() {
+			if ( !jQuery.data( elem, queueDataKey, undefined, true ) &&
+				!jQuery.data( elem, markDataKey, undefined, true ) ) {
+				jQuery.removeData( elem, deferDataKey, true );
+				defer.resolve();
+			}
+		}, 0 );
+	}
+}
+
+jQuery.extend({
+
+	_mark: function( elem, type ) {
+		if ( elem ) {
+			type = (type || "fx") + "mark";
+			jQuery.data( elem, type, (jQuery.data(elem,type,undefined,true) || 0) + 1, true );
 		}
+	},
 
-		return q;
+	_unmark: function( force, elem, type ) {
+		if ( force !== true ) {
+			type = elem;
+			elem = force;
+			force = false;
+		}
+		if ( elem ) {
+			type = type || "fx";
+			var key = type + "mark",
+				count = force ? 0 : ( (jQuery.data( elem, key, undefined, true) || 1 ) - 1 );
+			if ( count ) {
+				jQuery.data( elem, key, count, true );
+			} else {
+				jQuery.removeData( elem, key, true );
+				handleQueueMarkDefer( elem, type, "mark" );
+			}
+		}
+	},
+
+	queue: function( elem, type, data ) {
+		if ( elem ) {
+			type = (type || "fx") + "queue";
+			var q = jQuery.data( elem, type, undefined, true );
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !q || jQuery.isArray(data) ) {
+					q = jQuery.data( elem, type, jQuery.makeArray(data), true );
+				} else {
+					q.push( data );
+				}
+			}
+			return q || [];
+		}
 	},
 
 	dequeue: function( elem, type ) {
 		type = type || "fx";
 
-		var queue = jQuery.queue( elem, type ), fn = queue.shift();
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift(),
+			defer;
 
 		// If the fx queue is dequeued, always remove the progress sentinel
 		if ( fn === "inprogress" ) {
@@ -1158,6 +1858,11 @@ jQuery.extend({
 				jQuery.dequeue(elem, type);
 			});
 		}
+
+		if ( !queue.length ) {
+			jQuery.removeData( elem, type + "queue", true );
+			handleQueueMarkDefer( elem, type, "queue" );
+		}
 	}
 });
 
@@ -1171,7 +1876,7 @@ jQuery.fn.extend({
 		if ( data === undefined ) {
 			return jQuery.queue( this[0], type );
 		}
-		return this.each(function( i, elem ) {
+		return this.each(function() {
 			var queue = jQuery.queue( this, type, data );
 
 			if ( type === "fx" && queue[0] !== "inprogress" ) {
@@ -1184,7 +1889,6 @@ jQuery.fn.extend({
 			jQuery.dequeue( this, type );
 		});
 	},
-
 	// Based off of the plugin by Clint Helfers, with permission.
 	// http://blindsignals.com/index.php/2009/07/jquery-delay/
 	delay: function( time, type ) {
@@ -1198,57 +1902,108 @@ jQuery.fn.extend({
 			}, time );
 		});
 	},
-
 	clearQueue: function( type ) {
 		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, object ) {
+		if ( typeof type !== "string" ) {
+			object = type;
+			type = undefined;
+		}
+		type = type || "fx";
+		var defer = jQuery.Deferred(),
+			elements = this,
+			i = elements.length,
+			count = 1,
+			deferDataKey = type + "defer",
+			queueDataKey = type + "queue",
+			markDataKey = type + "mark",
+			tmp;
+		function resolve() {
+			if ( !( --count ) ) {
+				defer.resolveWith( elements, [ elements ] );
+			}
+		}
+		while( i-- ) {
+			if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
+					( jQuery.data( elements[ i ], queueDataKey, undefined, true ) ||
+						jQuery.data( elements[ i ], markDataKey, undefined, true ) ) &&
+					jQuery.data( elements[ i ], deferDataKey, jQuery._Deferred(), true ) )) {
+				count++;
+				tmp.done( resolve );
+			}
+		}
+		resolve();
+		return defer.promise();
 	}
 });
-var rclass = /[\n\t]/g,
+
+
+
+
+var rclass = /[\n\t\r]/g,
 	rspace = /\s+/,
 	rreturn = /\r/g,
-	rspecialurl = /href|src|style/,
-	rtype = /(button|input)/i,
-	rfocusable = /(button|input|object|select|textarea)/i,
-	rclickable = /^(a|area)$/i,
-	rradiocheck = /radio|checkbox/;
+	rtype = /^(?:button|input)$/i,
+	rfocusable = /^(?:button|input|object|select|textarea)$/i,
+	rclickable = /^a(?:rea)?$/i,
+	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+	nodeHook, boolHook;
 
 jQuery.fn.extend({
 	attr: function( name, value ) {
-		return access( this, name, value, true, jQuery.attr );
+		return jQuery.access( this, name, value, true, jQuery.attr );
 	},
 
-	removeAttr: function( name, fn ) {
-		return this.each(function(){
-			jQuery.attr( this, name, "" );
-			if ( this.nodeType === 1 ) {
-				this.removeAttribute( name );
-			}
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	},
+	
+	prop: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.prop );
+	},
+	
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
 		});
 	},
 
 	addClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.addClass( value.call(this, i, self.attr("class")) );
+		var classNames, i, l, elem,
+			setClass, c, cl;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call(this, j, this.className) );
 			});
 		}
 
 		if ( value && typeof value === "string" ) {
-			var classNames = (value || "").split( rspace );
+			classNames = value.split( rspace );
 
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
 
 				if ( elem.nodeType === 1 ) {
-					if ( !elem.className ) {
+					if ( !elem.className && classNames.length === 1 ) {
 						elem.className = value;
 
 					} else {
-						var className = " " + elem.className + " ", setClass = elem.className;
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
-								setClass += " " + classNames[c];
+						setClass = " " + elem.className + " ";
+
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) {
+								setClass += classNames[ c ] + " ";
 							}
 						}
 						elem.className = jQuery.trim( setClass );
@@ -1261,24 +2016,25 @@ jQuery.fn.extend({
 	},
 
 	removeClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.removeClass( value.call(this, i, self.attr("class")) );
+		var classNames, i, l, elem, className, c, cl;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call(this, j, this.className) );
 			});
 		}
 
 		if ( (value && typeof value === "string") || value === undefined ) {
-			var classNames = (value || "").split(rspace);
+			classNames = (value || "").split( rspace );
 
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
 
 				if ( elem.nodeType === 1 && elem.className ) {
 					if ( value ) {
-						var className = (" " + elem.className + " ").replace(rclass, " ");
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[c] + " ", " ");
+						className = (" " + elem.className + " ").replace( rclass, " " );
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[ c ] + " ", " ");
 						}
 						elem.className = jQuery.trim( className );
 
@@ -1293,19 +2049,21 @@ jQuery.fn.extend({
 	},
 
 	toggleClass: function( value, stateVal ) {
-		var type = typeof value, isBool = typeof stateVal === "boolean";
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
 
 		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
 			});
 		}
 
 		return this.each(function() {
 			if ( type === "string" ) {
 				// toggle individual class names
-				var className, i = 0, self = jQuery(this),
+				var className,
+					i = 0,
+					self = jQuery( this ),
 					state = stateVal,
 					classNames = value.split( rspace );
 
@@ -1318,11 +2076,11 @@ jQuery.fn.extend({
 			} else if ( type === "undefined" || type === "boolean" ) {
 				if ( this.className ) {
 					// store className if set
-					jQuery.data( this, "__className__", this.className );
+					jQuery._data( this, "__className__", this.className );
 				}
 
 				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
 			}
 		});
 	},
@@ -1330,7 +2088,7 @@ jQuery.fn.extend({
 	hasClass: function( selector ) {
 		var className = " " + selector + " ";
 		for ( var i = 0, l = this.length; i < l; i++ ) {
-			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
 				return true;
 			}
 		}
@@ -1339,102 +2097,132 @@ jQuery.fn.extend({
 	},
 
 	val: function( value ) {
-		if ( value === undefined ) {
-			var elem = this[0];
-
+		var hooks, ret,
+			elem = this[0];
+		
+		if ( !arguments.length ) {
 			if ( elem ) {
-				if ( jQuery.nodeName( elem, "option" ) ) {
-					return (elem.attributes.value || {}).specified ? elem.value : elem.text;
-				}
-
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						options = elem.options,
-						one = elem.type === "select-one";
-
-					// Nothing was selected
-					if ( index < 0 ) {
-						return null;
-					}
-
-					// Loop through all the selected options
-					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-						var option = options[ i ];
+				hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ];
 
-						if ( option.selected ) {
-							// Get the specifc value for the option
-							value = jQuery(option).val();
-
-							// We don't need an array for one selects
-							if ( one ) {
-								return value;
-							}
-
-							// Multi-Selects return an array
-							values.push( value );
-						}
-					}
-
-					return values;
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
 				}
 
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
-					return elem.getAttribute("value") === null ? "on" : elem.value;
-				}
-				
-
-				// Everything else, we just grab the value
-				return (elem.value || "").replace(rreturn, "");
+				ret = elem.value;
 
+				return typeof ret === "string" ? 
+					// handle most common string cases
+					ret.replace(rreturn, "") : 
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
 			}
 
 			return undefined;
 		}
 
-		var isFunction = jQuery.isFunction(value);
+		var isFunction = jQuery.isFunction( value );
 
-		return this.each(function(i) {
-			var self = jQuery(this), val = value;
+		return this.each(function( i ) {
+			var self = jQuery(this), val;
 
 			if ( this.nodeType !== 1 ) {
 				return;
 			}
 
 			if ( isFunction ) {
-				val = value.call(this, i, self.val());
+				val = value.call( this, i, self.val() );
+			} else {
+				val = value;
 			}
 
-			// Typecast each time if the value is a Function and the appended
-			// value is therefore different each time.
-			if ( typeof val === "number" ) {
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
 				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map(val, function ( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				// attributes.value is undefined in Blackberry 4.7 but
+				// uses .value. See #6932
+				var val = elem.attributes.value;
+				return !val || val.specified ? elem.value : elem.text;
 			}
+		},
+		select: {
+			get: function( elem ) {
+				var value,
+					index = elem.selectedIndex,
+					values = [],
+					options = elem.options,
+					one = elem.type === "select-one";
+
+				// Nothing was selected
+				if ( index < 0 ) {
+					return null;
+				}
+
+				// Loop through all the selected options
+				for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+					var option = options[ i ];
+
+					// Don't return options that are disabled or in a disabled optgroup
+					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
+							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
+				if ( one && !values.length && options.length ) {
+					return jQuery( options[ index ] ).val();
+				}
 
-			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
-				this.checked = jQuery.inArray( self.val(), val ) >= 0;
+				return values;
+			},
 
-			} else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = jQuery.makeArray(val);
+			set: function( elem, value ) {
+				var values = jQuery.makeArray( value );
 
-				jQuery( "option", this ).each(function() {
+				jQuery(elem).find("option").each(function() {
 					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
 				});
 
 				if ( !values.length ) {
-					this.selectedIndex = -1;
+					elem.selectedIndex = -1;
 				}
-
-			} else {
-				this.value = val;
+				return values;
 			}
-		});
-	}
-});
+		}
+	},
 
-jQuery.extend({
 	attrFn: {
 		val: true,
 		css: true,
@@ -1445,106 +2233,349 @@ jQuery.extend({
 		height: true,
 		offset: true
 	},
-		
+	
+	attrFix: {
+		// Always normalize to ensure hook usage
+		tabindex: "tabIndex"
+	},
+	
 	attr: function( elem, name, value, pass ) {
-		// don't set attributes on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+		var nType = elem.nodeType;
+		
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
 			return undefined;
 		}
 
 		if ( pass && name in jQuery.attrFn ) {
-			return jQuery(elem)[name](value);
+			return jQuery( elem )[ name ]( value );
 		}
 
-		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
-			// Whether we are setting (or getting)
-			set = value !== undefined;
+		// Fallback to prop when attributes are not supported
+		if ( !("getAttribute" in elem) ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		var ret, hooks,
+			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		// Normalize the name if needed
+		if ( notxml ) {
+			name = jQuery.attrFix[ name ] || name;
+
+			hooks = jQuery.attrHooks[ name ];
 
-		// Try to normalize/fix the name
-		name = notxml && jQuery.props[ name ] || name;
+			if ( !hooks ) {
+				// Use boolHook for boolean attributes
+				if ( rboolean.test( name ) ) {
+					hooks = boolHook;
+
+				// Use nodeHook if available( IE6/7 )
+				} else if ( nodeHook ) {
+					hooks = nodeHook;
+				}
+			}
+		}
+
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return undefined;
 
-		// Only do all the following if this is a node (faster for style)
+			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, "" + value );
+				return value;
+			}
+
+		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+
+			ret = elem.getAttribute( name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret === null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, name ) {
+		var propName;
 		if ( elem.nodeType === 1 ) {
-			// These attributes require special treatment
-			var special = rspecialurl.test( name );
-
-			// Safari mis-reports the default selected property of an option
-			// Accessing the parent's selectedIndex property fixes it
-			if ( name === "selected" && !jQuery.support.optSelected ) {
-				var parent = elem.parentNode;
-				if ( parent ) {
-					parent.selectedIndex;
-	
-					// Make sure that it also works with optgroups, see #5701
-					if ( parent.parentNode ) {
-						parent.parentNode.selectedIndex;
+			name = jQuery.attrFix[ name ] || name;
+
+			jQuery.attr( elem, name, "" );
+			elem.removeAttribute( name );
+
+			// Set corresponding property to false for boolean attributes
+			if ( rboolean.test( name ) && (propName = jQuery.propFix[ name ] || name) in elem ) {
+				elem[ propName ] = false;
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				// We can't allow the type property to be changed (since it causes problems in IE)
+				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
+					jQuery.error( "type property can't be changed" );
+				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+					// Setting the type on a radio button after the value resets the value in IE6-9
+					// Reset value to it's default in case type is set after value
+					// This is for element creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
 					}
+					return value;
 				}
 			}
+		},
+		// Use the value property for back compat
+		// Use the nodeHook for button elements in IE6/7 (#1954)
+		value: {
+			get: function( elem, name ) {
+				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+					return nodeHook.get( elem, name );
+				}
+				return name in elem ?
+					elem.value :
+					null;
+			},
+			set: function( elem, value, name ) {
+				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+					return nodeHook.set( elem, value, name );
+				}
+				// Does not return so that setAttribute is also used
+				elem.value = value;
+			}
+		}
+	},
 
-			// If applicable, access the attribute via the DOM 0 way
-			if ( name in elem && notxml && !special ) {
-				if ( set ) {
-					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
-						jQuery.error( "type property can't be changed" );
-					}
+	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( elem, name, value ) {
+		var nType = elem.nodeType;
 
-					elem[ name ] = value;
-				}
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return undefined;
+		}
 
-				// browsers index elements by id/name on forms, give priority to attributes.
-				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
-					return elem.getAttributeNode( name ).nodeValue;
-				}
+		var ret, hooks,
+			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
 
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				return (elem[ name ] = value);
+			}
+
+		} else {
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+				return ret;
+
+			} else {
+				return elem[ name ];
+			}
+		}
+	},
+	
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
 				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
 				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				if ( name === "tabIndex" ) {
-					var attributeNode = elem.getAttributeNode( "tabIndex" );
+				var attributeNode = elem.getAttributeNode("tabindex");
 
-					return attributeNode && attributeNode.specified ?
-						attributeNode.value :
-						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							undefined;
-				}
+				return attributeNode && attributeNode.specified ?
+					parseInt( attributeNode.value, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+		}
+	}
+});
 
-				return elem[ name ];
+// Add the tabindex propHook to attrHooks for back-compat
+jQuery.attrHooks.tabIndex = jQuery.propHooks.tabIndex;
+
+// Hook for boolean attributes
+boolHook = {
+	get: function( elem, name ) {
+		// Align boolean attributes with corresponding properties
+		// Fall back to attribute presence where some booleans are not supported
+		var attrNode;
+		return jQuery.prop( elem, name ) === true || ( attrNode = elem.getAttributeNode( name ) ) && attrNode.nodeValue !== false ?
+			name.toLowerCase() :
+			undefined;
+	},
+	set: function( elem, value, name ) {
+		var propName;
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else {
+			// value is true since we know at this point it's type boolean and not false
+			// Set boolean attributes to the same name and set the DOM property
+			propName = jQuery.propFix[ name ] || name;
+			if ( propName in elem ) {
+				// Only set the IDL specifically if it already exists on the element
+				elem[ propName ] = true;
 			}
 
-			if ( !jQuery.support.style && notxml && name === "style" ) {
-				if ( set ) {
-					elem.style.cssText = "" + value;
-				}
+			elem.setAttribute( name, name.toLowerCase() );
+		}
+		return name;
+	}
+};
 
-				return elem.style.cssText;
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !jQuery.support.getSetAttribute ) {
+	
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret;
+			ret = elem.getAttributeNode( name );
+			// Return undefined if nodeValue is empty string
+			return ret && ret.nodeValue !== "" ?
+				ret.nodeValue :
+				undefined;
+		},
+		set: function( elem, value, name ) {
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				ret = document.createAttribute( name );
+				elem.setAttributeNode( ret );
 			}
+			return (ret.nodeValue = value + "");
+		}
+	};
 
-			if ( set ) {
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
 			}
+		});
+	});
+}
 
-			var attr = !jQuery.support.hrefNormalized && notxml && special ?
-					// Some attributes require a special call on IE
-					elem.getAttribute( name, 2 ) :
-					elem.getAttribute( name );
 
-			// Non-existent attributes return null, we normalize to undefined
-			return attr === null ? undefined : attr;
+// Some attributes require a special call on IE
+if ( !jQuery.support.hrefNormalized ) {
+	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			get: function( elem ) {
+				var ret = elem.getAttribute( name, 2 );
+				return ret === null ? undefined : ret;
+			}
+		});
+	});
+}
+
+if ( !jQuery.support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			// Return undefined in the case of empty string
+			// Normalize to lowercase since IE uppercases css property names
+			return elem.style.cssText.toLowerCase() || undefined;
+		},
+		set: function( elem, value ) {
+			return (elem.style.cssText = "" + value);
 		}
+	};
+}
 
-		// elem is actually elem.style ... set the style
-		// Using attr for specific style information is now deprecated. Use style instead.
-		return jQuery.style( elem, name, value );
-	}
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		}
+	});
+}
+
+// Radios and checkboxes getter/setter
+if ( !jQuery.support.checkOn ) {
+	jQuery.each([ "radio", "checkbox" ], function() {
+		jQuery.valHooks[ this ] = {
+			get: function( elem ) {
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				return elem.getAttribute("value") === null ? "on" : elem.value;
+			}
+		};
+	});
+}
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return (elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0);
+			}
+		}
+	});
 });
+
+
+
+
 var rnamespaces = /\.(.*)$/,
+	rformElems = /^(?:textarea|input|select)$/i,
+	rperiod = /\./g,
+	rspaces = / /g,
+	rescape = /[^\w\s.|`]/g,
 	fcleanup = function( nm ) {
-		return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
-			return "\\" + ch;
-		});
+		return nm.replace(rescape, "\\$&");
 	};
 
 /*
@@ -1561,10 +2592,11 @@ jQuery.event = {
 			return;
 		}
 
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) {
-			elem = window;
+		if ( handler === false ) {
+			handler = returnFalse;
+		} else if ( !handler ) {
+			// Fixes bug #7229. Fix recommended by jdalton
+			return;
 		}
 
 		var handleObjIn, handleObj;
@@ -1580,7 +2612,7 @@ jQuery.event = {
 		}
 
 		// Init the element's event structure
-		var elemData = jQuery.data( elem );
+		var elemData = jQuery._data( elem );
 
 		// If no elemData is found then we must be trying to bind to one of the
 		// banned noData elements
@@ -1588,14 +2620,18 @@ jQuery.event = {
 			return;
 		}
 
-		var events = elemData.events = elemData.events || {},
-			eventHandle = elemData.handle, eventHandle;
+		var events = elemData.events,
+			eventHandle = elemData.handle;
+
+		if ( !events ) {
+			elemData.events = events = {};
+		}
 
 		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function() {
-				// Handle the second event of a trigger and when
-				// an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+			elemData.handle = eventHandle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
 					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
 					undefined;
 			};
@@ -1628,7 +2664,9 @@ jQuery.event = {
 			}
 
 			handleObj.type = type;
-			handleObj.guid = handler.guid;
+			if ( !handleObj.guid ) {
+				handleObj.guid = handler.guid;
+			}
 
 			// Get the current list of functions bound to this event
 			var handlers = events[ type ],
@@ -1651,9 +2689,9 @@ jQuery.event = {
 					}
 				}
 			}
-			
-			if ( special.add ) { 
-				special.add.call( elem, handleObj ); 
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
 
 				if ( !handleObj.handler.guid ) {
 					handleObj.handler.guid = handler.guid;
@@ -1663,7 +2701,7 @@ jQuery.event = {
 			// Add the function to the element's handler list
 			handlers.push( handleObj );
 
-			// Keep track of which events have been used, for global triggering
+			// Keep track of which events have been used, for event optimization
 			jQuery.event.global[ type ] = true;
 		}
 
@@ -1680,8 +2718,12 @@ jQuery.event = {
 			return;
 		}
 
-		var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
-			elemData = jQuery.data( elem ),
+		if ( handler === false ) {
+			handler = returnFalse;
+		}
+
+		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
 			events = elemData && elemData.events;
 
 		if ( !elemData || !events ) {
@@ -1720,8 +2762,8 @@ jQuery.event = {
 				namespaces = type.split(".");
 				type = namespaces.shift();
 
-				namespace = new RegExp("(^|\\.)" + 
-					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)")
+				namespace = new RegExp("(^|\\.)" +
+					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
 			}
 
 			eventType = events[ type ];
@@ -1731,7 +2773,7 @@ jQuery.event = {
 			}
 
 			if ( !handler ) {
-				for ( var j = 0; j < eventType.length; j++ ) {
+				for ( j = 0; j < eventType.length; j++ ) {
 					handleObj = eventType[ j ];
 
 					if ( all || namespace.test( handleObj.namespace ) ) {
@@ -1745,7 +2787,7 @@ jQuery.event = {
 
 			special = jQuery.event.special[ type ] || {};
 
-			for ( var j = pos || 0; j < eventType.length; j++ ) {
+			for ( j = pos || 0; j < eventType.length; j++ ) {
 				handleObj = eventType[ j ];
 
 				if ( handler.guid === handleObj.guid ) {
@@ -1769,7 +2811,7 @@ jQuery.event = {
 			// remove generic event handler if no more handlers exist
 			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
 				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-					removeEvent( elem, type, elemData.handle );
+					jQuery.removeEvent( elem, type, elemData.handle );
 				}
 
 				ret = null;
@@ -1788,175 +2830,196 @@ jQuery.event = {
 			delete elemData.handle;
 
 			if ( jQuery.isEmptyObject( elemData ) ) {
-				jQuery.removeData( elem );
+				jQuery.removeData( elem, undefined, true );
 			}
 		}
 	},
+	
+	// Events that are safe to short-circuit if no handlers are attached.
+	// Native DOM events should not be added, they may have inline handlers.
+	customEvent: {
+		"getData": true,
+		"setData": true,
+		"changeData": true
+	},
 
-	// bubbling is internal
-	trigger: function( event, data, elem /*, bubbling */ ) {
+	trigger: function( event, data, elem, onlyHandlers ) {
 		// Event object or event type
 		var type = event.type || event,
-			bubbling = arguments[3];
+			namespaces = [],
+			exclusive;
 
-		if ( !bubbling ) {
-			event = typeof event === "object" ?
-				// jQuery.Event object
-				event[expando] ? event :
-				// Object literal
-				jQuery.extend( jQuery.Event(type), event ) :
-				// Just the event type (string)
-				jQuery.Event(type);
+		if ( type.indexOf("!") >= 0 ) {
+			// Exclusive events trigger only for the exact event (no namespaces)
+			type = type.slice(0, -1);
+			exclusive = true;
+		}
 
-			if ( type.indexOf("!") >= 0 ) {
-				event.type = type = type.slice(0, -1);
-				event.exclusive = true;
-			}
+		if ( type.indexOf(".") >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
 
-			// Handle a global trigger
-			if ( !elem ) {
-				// Don't bubble custom events when global (to avoid too much overhead)
-				event.stopPropagation();
-
-				// Only trigger if we've ever bound an event for it
-				if ( jQuery.event.global[ type ] ) {
-					jQuery.each( jQuery.cache, function() {
-						if ( this.events && this.events[type] ) {
-							jQuery.event.trigger( event, data, this.handle.elem );
-						}
-					});
-				}
-			}
+		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
+			// No jQuery handlers for this event type, and it can't have inline handlers
+			return;
+		}
 
-			// Handle triggering a single element
+		// Caller can pass in an Event, Object, or just an event type string
+		event = typeof event === "object" ?
+			// jQuery.Event object
+			event[ jQuery.expando ] ? event :
+			// Object literal
+			new jQuery.Event( type, event ) :
+			// Just the event type (string)
+			new jQuery.Event( type );
 
-			// don't do events on text and comment nodes
-			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-				return undefined;
-			}
+		event.type = type;
+		event.exclusive = exclusive;
+		event.namespace = namespaces.join(".");
+		event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)");
+		
+		// triggerHandler() and global events don't bubble or run the default action
+		if ( onlyHandlers || !elem ) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
 
-			// Clean up in case it is reused
-			event.result = undefined;
-			event.target = elem;
+		// Handle a global trigger
+		if ( !elem ) {
+			// TODO: Stop taunting the data cache; remove global events and always attach to document
+			jQuery.each( jQuery.cache, function() {
+				// internalKey variable is just used to make it easier to find
+				// and potentially change this stuff later; currently it just
+				// points to jQuery.expando
+				var internalKey = jQuery.expando,
+					internalCache = this[ internalKey ];
+				if ( internalCache && internalCache.events && internalCache.events[ type ] ) {
+					jQuery.event.trigger( event, data, internalCache.handle.elem );
+				}
+			});
+			return;
+		}
 
-			// Clone the incoming data, if any
-			data = jQuery.makeArray( data );
-			data.unshift( event );
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
 		}
 
-		event.currentTarget = elem;
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		event.target = elem;
 
-		// Trigger the event, it is assumed that "handle" is a function
-		var handle = jQuery.data( elem, "handle" );
-		if ( handle ) {
-			handle.apply( elem, data );
-		}
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data != null ? jQuery.makeArray( data ) : [];
+		data.unshift( event );
 
-		var parent = elem.parentNode || elem.ownerDocument;
+		var cur = elem,
+			// IE doesn't like method names with a colon (#3533, #8272)
+			ontype = type.indexOf(":") < 0 ? "on" + type : "";
 
-		// Trigger an inline bound script
-		try {
-			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
-				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
-					event.result = false;
-				}
+		// Fire event on the current element, then bubble up the DOM tree
+		do {
+			var handle = jQuery._data( cur, "handle" );
+
+			event.currentTarget = cur;
+			if ( handle ) {
+				handle.apply( cur, data );
 			}
 
-		// prevent IE from throwing an error for some elements with some event types, see #3533
-		} catch (e) {}
+			// Trigger an inline bound script
+			if ( ontype && jQuery.acceptData( cur ) && cur[ ontype ] && cur[ ontype ].apply( cur, data ) === false ) {
+				event.result = false;
+				event.preventDefault();
+			}
 
-		if ( !event.isPropagationStopped() && parent ) {
-			jQuery.event.trigger( event, data, parent, true );
+			// Bubble up to document, then to window
+			cur = cur.parentNode || cur.ownerDocument || cur === event.target.ownerDocument && window;
+		} while ( cur && !event.isPropagationStopped() );
 
-		} else if ( !event.isDefaultPrevented() ) {
-			var target = event.target, old,
-				isClick = jQuery.nodeName(target, "a") && type === "click",
+		// If nobody prevented the default action, do it now
+		if ( !event.isDefaultPrevented() ) {
+			var old,
 				special = jQuery.event.special[ type ] || {};
 
-			if ( (!special._default || special._default.call( elem, event ) === false) && 
-				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
+			if ( (!special._default || special._default.call( elem.ownerDocument, event ) === false) &&
+				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
 
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction)() check here because IE6/7 fails that test.
+				// IE<9 dies on focus to hidden element (#1486), may want to revisit a try/catch.
 				try {
-					if ( target[ type ] ) {
-						// Make sure that we don't accidentally re-trigger the onFOO events
-						old = target[ "on" + type ];
+					if ( ontype && elem[ type ] ) {
+						// Don't re-trigger an onFOO event when we call its FOO() method
+						old = elem[ ontype ];
 
 						if ( old ) {
-							target[ "on" + type ] = null;
+							elem[ ontype ] = null;
 						}
 
-						jQuery.event.triggered = true;
-						target[ type ]();
+						jQuery.event.triggered = type;
+						elem[ type ]();
 					}
-
-				// prevent IE from throwing an error for some elements with some event types, see #3533
-				} catch (e) {}
+				} catch ( ieError ) {}
 
 				if ( old ) {
-					target[ "on" + type ] = old;
+					elem[ ontype ] = old;
 				}
 
-				jQuery.event.triggered = false;
+				jQuery.event.triggered = undefined;
 			}
 		}
+		
+		return event.result;
 	},
 
 	handle: function( event ) {
-		var all, handlers, namespaces, namespace, events;
-
-		event = arguments[0] = jQuery.event.fix( event || window.event );
+		event = jQuery.event.fix( event || window.event );
+		// Snapshot the handlers list since a called handler may add/remove events.
+		var handlers = ((jQuery._data( this, "events" ) || {})[ event.type ] || []).slice(0),
+			run_all = !event.exclusive && !event.namespace,
+			args = Array.prototype.slice.call( arguments, 0 );
+
+		// Use the fix-ed Event rather than the (read-only) native event
+		args[0] = event;
 		event.currentTarget = this;
 
-		// Namespaced event handlers
-		all = event.type.indexOf(".") < 0 && !event.exclusive;
-
-		if ( !all ) {
-			namespaces = event.type.split(".");
-			event.type = namespaces.shift();
-			namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
-		}
-
-		var events = jQuery.data(this, "events"), handlers = events[ event.type ];
-
-		if ( events && handlers ) {
-			// Clone the handlers to prevent manipulation
-			handlers = handlers.slice(0);
-
-			for ( var j = 0, l = handlers.length; j < l; j++ ) {
-				var handleObj = handlers[ j ];
-
-				// Filter the functions by class
-				if ( all || namespace.test( handleObj.namespace ) ) {
-					// Pass in a reference to the handler function itself
-					// So that we can later remove it
-					event.handler = handleObj.handler;
-					event.data = handleObj.data;
-					event.handleObj = handleObj;
-	
-					var ret = handleObj.handler.apply( this, arguments );
-
-					if ( ret !== undefined ) {
-						event.result = ret;
-						if ( ret === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
+		for ( var j = 0, l = handlers.length; j < l; j++ ) {
+			var handleObj = handlers[ j ];
+
+			// Triggered event must 1) be non-exclusive and have no namespace, or
+			// 2) have namespace(s) a subset or equal to those in the bound event.
+			if ( run_all || event.namespace_re.test( handleObj.namespace ) ) {
+				// Pass in a reference to the handler function itself
+				// So that we can later remove it
+				event.handler = handleObj.handler;
+				event.data = handleObj.data;
+				event.handleObj = handleObj;
+
+				var ret = handleObj.handler.apply( this, args );
+
+				if ( ret !== undefined ) {
+					event.result = ret;
+					if ( ret === false ) {
+						event.preventDefault();
+						event.stopPropagation();
 					}
+				}
 
-					if ( event.isImmediatePropagationStopped() ) {
-						break;
-					}
+				if ( event.isImmediatePropagationStopped() ) {
+					break;
 				}
 			}
 		}
-
 		return event.result;
 	},
 
-	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
 
 	fix: function( event ) {
-		if ( event[ expando ] ) {
+		if ( event[ jQuery.expando ] ) {
 			return event;
 		}
 
@@ -1972,7 +3035,8 @@ jQuery.event = {
 
 		// Fix target property, if necessary
 		if ( !event.target ) {
-			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+			// Fixes #1925 where srcElement might not be defined either
+			event.target = event.srcElement || document;
 		}
 
 		// check if target is a textnode (safari)
@@ -1987,14 +3051,17 @@ jQuery.event = {
 
 		// Calculate pageX/Y if missing and clientX/Y available
 		if ( event.pageX == null && event.clientX != null ) {
-			var doc = document.documentElement, body = document.body;
+			var eventDocument = event.target.ownerDocument || document,
+				doc = eventDocument.documentElement,
+				body = eventDocument.body;
+
 			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
 			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
 		}
 
 		// Add which for key events
-		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) {
-			event.which = event.charCode || event.keyCode;
+		if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
+			event.which = event.charCode != null ? event.charCode : event.keyCode;
 		}
 
 		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
@@ -2026,36 +3093,24 @@ jQuery.event = {
 
 		live: {
 			add: function( handleObj ) {
-				jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); 
+				jQuery.event.add( this,
+					liveConvert( handleObj.origType, handleObj.selector ),
+					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) );
 			},
 
 			remove: function( handleObj ) {
-				var remove = true,
-					type = handleObj.origType.replace(rnamespaces, "");
-				
-				jQuery.each( jQuery.data(this, "events").live || [], function() {
-					if ( type === this.origType.replace(rnamespaces, "") ) {
-						remove = false;
-						return false;
-					}
-				});
-
-				if ( remove ) {
-					jQuery.event.remove( this, handleObj.origType, liveHandler );
-				}
+				jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
 			}
-
 		},
 
 		beforeunload: {
 			setup: function( data, namespaces, eventHandle ) {
 				// We only want to do this special case on windows
-				if ( this.setInterval ) {
+				if ( jQuery.isWindow( this ) ) {
 					this.onbeforeunload = eventHandle;
 				}
-
-				return false;
 			},
+
 			teardown: function( namespaces, eventHandle ) {
 				if ( this.onbeforeunload === eventHandle ) {
 					this.onbeforeunload = null;
@@ -2065,35 +3120,50 @@ jQuery.event = {
 	}
 };
 
-var removeEvent = document.removeEventListener ?
+jQuery.removeEvent = document.removeEventListener ?
 	function( elem, type, handle ) {
-		elem.removeEventListener( type, handle, false );
-	} : 
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
 	function( elem, type, handle ) {
-		elem.detachEvent( "on" + type, handle );
+		if ( elem.detachEvent ) {
+			elem.detachEvent( "on" + type, handle );
+		}
 	};
 
-jQuery.Event = function( src ) {
+jQuery.Event = function( src, props ) {
 	// Allow instantiation without the 'new' keyword
 	if ( !this.preventDefault ) {
-		return new jQuery.Event( src );
+		return new jQuery.Event( src, props );
 	}
 
 	// Event object
 	if ( src && src.type ) {
 		this.originalEvent = src;
 		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
+
 	// Event type
 	} else {
 		this.type = src;
 	}
 
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
 	// timeStamp is buggy for some events on Firefox(#3843)
 	// So we won't rely on the native value
-	this.timeStamp = now();
+	this.timeStamp = jQuery.now();
 
 	// Mark it as fixed
-	this[ expando ] = true;
+	this[ jQuery.expando ] = true;
 };
 
 function returnFalse() {
@@ -2113,13 +3183,15 @@ jQuery.Event.prototype = {
 		if ( !e ) {
 			return;
 		}
-		
+
 		// if preventDefault exists run it on the original event
 		if ( e.preventDefault ) {
 			e.preventDefault();
-		}
+
 		// otherwise set the returnValue property of the original event to false (IE)
-		e.returnValue = false;
+		} else {
+			e.returnValue = false;
+		}
 	},
 	stopPropagation: function() {
 		this.isPropagationStopped = returnTrue;
@@ -2147,27 +3219,27 @@ jQuery.Event.prototype = {
 // Checks if an event happened on an element within another element
 // Used in jQuery.event.special.mouseenter and mouseleave handlers
 var withinElement = function( event ) {
+
 	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
+	var related = event.relatedTarget,
+		inside = false,
+		eventType = event.type;
 
-	// Firefox sometimes assigns relatedTarget a XUL element
-	// which we cannot access the parentNode property of
-	try {
-		// Traverse up the tree
-		while ( parent && parent !== this ) {
-			parent = parent.parentNode;
+	event.type = event.data;
+
+	if ( related !== this ) {
+
+		if ( related ) {
+			inside = jQuery.contains( this, related );
 		}
 
-		if ( parent !== this ) {
-			// set the correct event type
-			event.type = event.data;
+		if ( !inside ) {
 
-			// handle event if we actually just moused on to a non sub-element
 			jQuery.event.handle.apply( this, arguments );
-		}
 
-	// assuming we've left the element since we most likely mousedover a xul element
-	} catch(e) { }
+			event.type = eventType;
+		}
+	}
 },
 
 // In case of event delegation, we only need to rename the event.type,
@@ -2197,20 +3269,23 @@ if ( !jQuery.support.submitBubbles ) {
 
 	jQuery.event.special.submit = {
 		setup: function( data, namespaces ) {
-			if ( this.nodeName.toLowerCase() !== "form" ) {
+			if ( !jQuery.nodeName( this, "form" ) ) {
 				jQuery.event.add(this, "click.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
+					// Avoid triggering error on non-existent type attribute in IE VML (#7071)
+					var elem = e.target,
+						type = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.type : "";
 
 					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
-						return trigger( "submit", this, arguments );
+						trigger( "submit", this, arguments );
 					}
 				});
-	 
+
 				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
+					var elem = e.target,
+						type = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.type : "";
 
 					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
-						return trigger( "submit", this, arguments );
+						trigger( "submit", this, arguments );
 					}
 				});
 
@@ -2229,12 +3304,11 @@ if ( !jQuery.support.submitBubbles ) {
 // change delegation, happens here so we have bind.
 if ( !jQuery.support.changeBubbles ) {
 
-	var formElems = /textarea|input|select/i,
-
-	changeFilters,
+	var changeFilters,
 
 	getVal = function( elem ) {
-		var type = elem.type, val = elem.value;
+		var type = jQuery.nodeName( elem, "input" ) ? elem.type : "",
+			val = elem.value;
 
 		if ( type === "radio" || type === "checkbox" ) {
 			val = elem.checked;
@@ -2246,7 +3320,7 @@ if ( !jQuery.support.changeBubbles ) {
 				}).join("-") :
 				"";
 
-		} else if ( elem.nodeName.toLowerCase() === "select" ) {
+		} else if ( jQuery.nodeName( elem, "select" ) ) {
 			val = elem.selectedIndex;
 		}
 
@@ -2256,58 +3330,61 @@ if ( !jQuery.support.changeBubbles ) {
 	testChange = function testChange( e ) {
 		var elem = e.target, data, val;
 
-		if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
+		if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
 			return;
 		}
 
-		data = jQuery.data( elem, "_change_data" );
+		data = jQuery._data( elem, "_change_data" );
 		val = getVal(elem);
 
 		// the current data will be also retrieved by beforeactivate
 		if ( e.type !== "focusout" || elem.type !== "radio" ) {
-			jQuery.data( elem, "_change_data", val );
+			jQuery._data( elem, "_change_data", val );
 		}
-		
+
 		if ( data === undefined || val === data ) {
 			return;
 		}
 
 		if ( data != null || val ) {
 			e.type = "change";
-			return jQuery.event.trigger( e, arguments[1], elem );
+			e.liveFired = undefined;
+			jQuery.event.trigger( e, arguments[1], elem );
 		}
 	};
 
 	jQuery.event.special.change = {
 		filters: {
-			focusout: testChange, 
+			focusout: testChange,
+
+			beforedeactivate: testChange,
 
 			click: function( e ) {
-				var elem = e.target, type = elem.type;
+				var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : "";
 
-				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
-					return testChange.call( this, e );
+				if ( type === "radio" || type === "checkbox" || jQuery.nodeName( elem, "select" ) ) {
+					testChange.call( this, e );
 				}
 			},
 
 			// Change has to be called before submit
 			// Keydown will be called before keypress, which is used in submit-event delegation
 			keydown: function( e ) {
-				var elem = e.target, type = elem.type;
+				var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : "";
 
-				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
+				if ( (e.keyCode === 13 && !jQuery.nodeName( elem, "textarea" ) ) ||
 					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
 					type === "select-multiple" ) {
-					return testChange.call( this, e );
+					testChange.call( this, e );
 				}
 			},
 
 			// Beforeactivate happens also before the previous element is blurred
 			// with this event you can't trigger a change event, but you can store
-			// information/focus[in] is not needed anymore
+			// information
 			beforeactivate: function( e ) {
 				var elem = e.target;
-				jQuery.data( elem, "_change_data", getVal(elem) );
+				jQuery._data( elem, "_change_data", getVal(elem) );
 			}
 		},
 
@@ -2320,46 +3397,75 @@ if ( !jQuery.support.changeBubbles ) {
 				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
 			}
 
-			return formElems.test( this.nodeName );
+			return rformElems.test( this.nodeName );
 		},
 
 		teardown: function( namespaces ) {
 			jQuery.event.remove( this, ".specialChange" );
 
-			return formElems.test( this.nodeName );
+			return rformElems.test( this.nodeName );
 		}
 	};
 
 	changeFilters = jQuery.event.special.change.filters;
+
+	// Handle when the input is .focus()'d
+	changeFilters.focus = changeFilters.beforeactivate;
 }
 
 function trigger( type, elem, args ) {
-	args[0].type = type;
-	return jQuery.event.handle.apply( elem, args );
+	// Piggyback on a donor event to simulate a different one.
+	// Fake originalEvent to avoid donor's stopPropagation, but if the
+	// simulated event prevents default then we do the same on the donor.
+	// Don't pass args or remember liveFired; they apply to the donor event.
+	var event = jQuery.extend( {}, args[ 0 ] );
+	event.type = type;
+	event.originalEvent = {};
+	event.liveFired = undefined;
+	jQuery.event.handle.call( elem, event );
+	if ( event.isDefaultPrevented() ) {
+		args[ 0 ].preventDefault();
+	}
 }
 
 // Create "bubbling" focus and blur events
-if ( document.addEventListener ) {
+if ( !jQuery.support.focusinBubbles ) {
 	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler while someone wants focusin/focusout
+		var attaches = 0;
+
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				this.addEventListener( orig, handler, true );
-			}, 
-			teardown: function() { 
-				this.removeEventListener( orig, handler, true );
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			},
+			teardown: function() {
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
 			}
 		};
 
-		function handler( e ) { 
-			e = jQuery.event.fix( e );
+		function handler( donor ) {
+			// Donor event is always a native one; fix it and switch its type.
+			// Let focusin/out handler cancel the donor focus/blur event.
+			var e = jQuery.event.fix( donor );
 			e.type = fix;
-			return jQuery.event.handle.call( this, e );
+			e.originalEvent = {};
+			jQuery.event.trigger( e, null, e.target );
+			if ( e.isDefaultPrevented() ) {
+				donor.preventDefault();
+			}
 		}
 	});
 }
 
 jQuery.each(["bind", "one"], function( i, name ) {
 	jQuery.fn[ name ] = function( type, data, fn ) {
+		var handler;
+
 		// Handle object literals
 		if ( typeof type === "object" ) {
 			for ( var key in type ) {
@@ -2367,16 +3473,21 @@ jQuery.each(["bind", "one"], function( i, name ) {
 			}
 			return this;
 		}
-		
-		if ( jQuery.isFunction( data ) ) {
+
+		if ( arguments.length === 2 || data === false ) {
 			fn = data;
 			data = undefined;
 		}
 
-		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
-			jQuery( this ).unbind( event, handler );
-			return fn.apply( this, arguments );
-		}) : fn;
+		if ( name === "one" ) {
+			handler = function( event ) {
+				jQuery( this ).unbind( event, handler );
+				return fn.apply( this, arguments );
+			};
+			handler.guid = fn.guid || jQuery.guid++;
+		} else {
+			handler = fn;
+		}
 
 		if ( type === "unload" && name !== "one" ) {
 			this.one( type, data, fn );
@@ -2407,20 +3518,20 @@ jQuery.fn.extend({
 
 		return this;
 	},
-	
+
 	delegate: function( selector, types, data, fn ) {
 		return this.live( types, data, fn, selector );
 	},
-	
+
 	undelegate: function( selector, types, fn ) {
 		if ( arguments.length === 0 ) {
-				return this.unbind( "live" );
-		
+			return this.unbind( "live" );
+
 		} else {
 			return this.die( types, null, fn, selector );
 		}
 	},
-	
+
 	trigger: function( type, data ) {
 		return this.each(function() {
 			jQuery.event.trigger( type, data, this );
@@ -2429,34 +3540,34 @@ jQuery.fn.extend({
 
 	triggerHandler: function( type, data ) {
 		if ( this[0] ) {
-			var event = jQuery.Event( type );
-			event.preventDefault();
-			event.stopPropagation();
-			jQuery.event.trigger( event, data, this[0] );
-			return event.result;
+			return jQuery.event.trigger( type, data, this[0], true );
 		}
 	},
 
 	toggle: function( fn ) {
 		// Save reference to arguments for access in closure
-		var args = arguments, i = 1;
+		var args = arguments,
+			guid = fn.guid || jQuery.guid++,
+			i = 0,
+			toggler = function( event ) {
+				// Figure out which function to execute
+				var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+				jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+				// Make sure that clicks stop
+				event.preventDefault();
+
+				// and execute the function
+				return args[ lastToggle ].apply( this, arguments ) || false;
+			};
 
 		// link all the functions, so any of them can unbind this click handler
+		toggler.guid = guid;
 		while ( i < args.length ) {
-			jQuery.proxy( fn, args[ i++ ] );
+			args[ i++ ].guid = guid;
 		}
 
-		return this.click( jQuery.proxy( fn, function( event ) {
-			// Figure out which function to execute
-			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-			// Make sure that clicks stop
-			event.preventDefault();
-
-			// and execute the function
-			return args[ lastToggle ].apply( this, arguments ) || false;
-		}));
+		return this.click( toggler );
 	},
 
 	hover: function( fnOver, fnOut ) {
@@ -2477,8 +3588,24 @@ jQuery.each(["live", "die"], function( i, name ) {
 			selector = origSelector || this.selector,
 			context = origSelector ? this : jQuery( this.context );
 
-		if ( jQuery.isFunction( data ) ) {
-			fn = data;
+		if ( typeof types === "object" && !types.preventDefault ) {
+			for ( var key in types ) {
+				context[ name ]( key, data, types[key], selector );
+			}
+
+			return this;
+		}
+
+		if ( name === "die" && !types &&
+					origSelector && origSelector.charAt(0) === "." ) {
+
+			context.unbind( origSelector );
+
+			return this;
+		}
+
+		if ( data === false || jQuery.isFunction( data ) ) {
+			fn = data || returnFalse;
 			data = undefined;
 		}
 
@@ -2500,7 +3627,7 @@ jQuery.each(["live", "die"], function( i, name ) {
 
 			preType = type;
 
-			if ( type === "focus" || type === "blur" ) {
+			if ( liveMap[ type ] ) {
 				types.push( liveMap[ type ] + namespaces );
 				type = type + namespaces;
 
@@ -2510,31 +3637,36 @@ jQuery.each(["live", "die"], function( i, name ) {
 
 			if ( name === "live" ) {
 				// bind live handler
-				context.each(function(){
-					jQuery.event.add( this, liveConvert( type, selector ),
+				for ( var j = 0, l = context.length; j < l; j++ ) {
+					jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
 						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
-				});
+				}
 
 			} else {
 				// unbind live handler
-				context.unbind( liveConvert( type, selector ), fn );
+				context.unbind( "live." + liveConvert( type, selector ), fn );
 			}
 		}
-		
+
 		return this;
-	}
+	};
 });
 
 function liveHandler( event ) {
-	var stop, elems = [], selectors = [], args = arguments,
-		related, match, handleObj, elem, j, i, l, data,
-		events = jQuery.data( this, "events" );
+	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
+		elems = [],
+		selectors = [],
+		events = jQuery._data( this, "events" );
 
-	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
-	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
+	// Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911)
+	if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) {
 		return;
 	}
 
+	if ( event.namespace ) {
+		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
+	}
+
 	event.liveFired = this;
 
 	var live = events.live.slice(0);
@@ -2553,20 +3685,28 @@ function liveHandler( event ) {
 	match = jQuery( event.target ).closest( selectors, event.currentTarget );
 
 	for ( i = 0, l = match.length; i < l; i++ ) {
+		close = match[i];
+
 		for ( j = 0; j < live.length; j++ ) {
 			handleObj = live[j];
 
-			if ( match[i].selector === handleObj.selector ) {
-				elem = match[i].elem;
+			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) && !close.elem.disabled ) {
+				elem = close.elem;
 				related = null;
 
 				// Those two events require additional checking
 				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
+					event.type = handleObj.preType;
 					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
+
+					// Make sure not to accidentally match a child element with the same selector
+					if ( related && jQuery.contains( elem, related ) ) {
+						related = elem;
+					}
 				}
 
 				if ( !related || related !== elem ) {
-					elems.push({ elem: elem, handleObj: handleObj });
+					elems.push({ elem: elem, handleObj: handleObj, level: close.level });
 				}
 			}
 		}
@@ -2574,13 +3714,26 @@ function liveHandler( event ) {
 
 	for ( i = 0, l = elems.length; i < l; i++ ) {
 		match = elems[i];
+
+		if ( maxLevel && match.level > maxLevel ) {
+			break;
+		}
+
 		event.currentTarget = match.elem;
 		event.data = match.handleObj.data;
 		event.handleObj = match.handleObj;
 
-		if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) {
-			stop = false;
-			break;
+		ret = match.handleObj.origHandler.apply( match.elem, arguments );
+
+		if ( ret === false || event.isPropagationStopped() ) {
+			maxLevel = match.level;
+
+			if ( ret === false ) {
+				stop = false;
+			}
+			if ( event.isImmediatePropagationStopped() ) {
+				break;
+			}
 		}
 	}
 
@@ -2588,7 +3741,7 @@ function liveHandler( event ) {
 }
 
 function liveConvert( type, selector ) {
-	return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
+	return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspaces, "&");
 }
 
 jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
@@ -2596,8 +3749,15 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
 	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
 
 	// Handle event binding
-	jQuery.fn[ name ] = function( fn ) {
-		return fn ? this.bind( name, fn ) : this.trigger( name );
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
+			fn = data;
+			data = null;
+		}
+
+		return arguments.length > 0 ?
+			this.bind( name, data, fn ) :
+			this.trigger( name );
 	};
 
 	if ( jQuery.attrFn ) {
@@ -2605,48 +3765,38 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
 	}
 });
 
-// Prevent memory leaks in IE
-// Window isn't included so as not to unbind existing unload events
-// More info:
-//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
-if ( window.attachEvent && !window.addEventListener ) {
-	window.attachEvent("onunload", function() {
-		for ( var id in jQuery.cache ) {
-			if ( jQuery.cache[ id ].handle ) {
-				// Try/Catch is to handle iframes being unloaded, see #4280
-				try {
-					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
-				} catch(e) {}
-			}
-		}
-	});
-}
+
+
 /*!
- * Sizzle CSS Selector Engine - v1.0
- *  Copyright 2009, The Dojo Foundation
+ * Sizzle CSS Selector Engine
+ *  Copyright 2011, The Dojo Foundation
  *  Released under the MIT, BSD, and GPL Licenses.
  *  More information: http://sizzlejs.com/
  */
 (function(){
 
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
 	done = 0,
 	toString = Object.prototype.toString,
 	hasDuplicate = false,
-	baseHasDuplicate = true;
+	baseHasDuplicate = true,
+	rBackslash = /\\/g,
+	rNonWord = /\W/;
 
 // Here we check if the JavaScript engine is using some sort of
 // optimization where it does not always call our comparision
 // function. If that is the case, discard the hasDuplicate value.
 //   Thus far that includes Google Chrome.
-[0, 0].sort(function(){
+[0, 0].sort(function() {
 	baseHasDuplicate = false;
 	return 0;
 });
 
-var Sizzle = function(selector, context, results, seed) {
+var Sizzle = function( selector, context, results, seed ) {
 	results = results || [];
-	var origContext = context = context || document;
+	context = context || document;
+
+	var origContext = context;
 
 	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
 		return [];
@@ -2656,24 +3806,34 @@ var Sizzle = function(selector, context, results, seed) {
 		return results;
 	}
 
-	var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context),
+	var m, set, checkSet, extra, ret, cur, pop, i,
+		prune = true,
+		contextXML = Sizzle.isXML( context ),
+		parts = [],
 		soFar = selector;
 	
 	// Reset the position of the chunker regexp (start from head)
-	while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
-		soFar = m[3];
+	do {
+		chunker.exec( "" );
+		m = chunker.exec( soFar );
+
+		if ( m ) {
+			soFar = m[3];
 		
-		parts.push( m[1] );
+			parts.push( m[1] );
 		
-		if ( m[2] ) {
-			extra = m[3];
-			break;
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
 		}
-	}
+	} while ( m );
 
 	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+
 		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
 			set = posProcess( parts[0] + parts[1], context );
+
 		} else {
 			set = Expr.relative[ parts[0] ] ?
 				[ context ] :
@@ -2689,29 +3849,38 @@ var Sizzle = function(selector, context, results, seed) {
 				set = posProcess( selector, set );
 			}
 		}
+
 	} else {
 		// Take a shortcut and set the context if the root selector is an ID
 		// (but not if it'll be faster if the inner selector is an ID)
 		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
 				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-			var ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
+
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set )[0] :
+				ret.set[0];
 		}
 
 		if ( context ) {
-			var ret = seed ?
+			ret = seed ?
 				{ expr: parts.pop(), set: makeArray(seed) } :
 				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
+
+			set = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set ) :
+				ret.set;
 
 			if ( parts.length > 0 ) {
-				checkSet = makeArray(set);
+				checkSet = makeArray( set );
+
 			} else {
 				prune = false;
 			}
 
 			while ( parts.length ) {
-				var cur = parts.pop(), pop = cur;
+				cur = parts.pop();
+				pop = cur;
 
 				if ( !Expr.relative[ cur ] ) {
 					cur = "";
@@ -2725,6 +3894,7 @@ var Sizzle = function(selector, context, results, seed) {
 
 				Expr.relative[ cur ]( checkSet, pop, contextXML );
 			}
+
 		} else {
 			checkSet = parts = [];
 		}
@@ -2741,19 +3911,22 @@ var Sizzle = function(selector, context, results, seed) {
 	if ( toString.call(checkSet) === "[object Array]" ) {
 		if ( !prune ) {
 			results.push.apply( results, checkSet );
+
 		} else if ( context && context.nodeType === 1 ) {
-			for ( var i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
 					results.push( set[i] );
 				}
 			}
+
 		} else {
-			for ( var i = 0; checkSet[i] != null; i++ ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
 				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
 					results.push( set[i] );
 				}
 			}
 		}
+
 	} else {
 		makeArray( checkSet, results );
 	}
@@ -2766,15 +3939,15 @@ var Sizzle = function(selector, context, results, seed) {
 	return results;
 };
 
-Sizzle.uniqueSort = function(results){
+Sizzle.uniqueSort = function( results ) {
 	if ( sortOrder ) {
 		hasDuplicate = baseHasDuplicate;
-		results.sort(sortOrder);
+		results.sort( sortOrder );
 
 		if ( hasDuplicate ) {
 			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[i-1] ) {
-					results.splice(i--, 1);
+				if ( results[i] === results[ i - 1 ] ) {
+					results.splice( i--, 1 );
 				}
 			}
 		}
@@ -2783,27 +3956,33 @@ Sizzle.uniqueSort = function(results){
 	return results;
 };
 
-Sizzle.matches = function(expr, set){
-	return Sizzle(expr, null, null, set);
+Sizzle.matches = function( expr, set ) {
+	return Sizzle( expr, null, null, set );
+};
+
+Sizzle.matchesSelector = function( node, expr ) {
+	return Sizzle( expr, null, null, [node] ).length > 0;
 };
 
-Sizzle.find = function(expr, context, isXML){
-	var set, match;
+Sizzle.find = function( expr, context, isXML ) {
+	var set;
 
 	if ( !expr ) {
 		return [];
 	}
 
 	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
-		var type = Expr.order[i], match;
+		var match,
+			type = Expr.order[i];
 		
 		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
 			var left = match[1];
-			match.splice(1,1);
+			match.splice( 1, 1 );
 
 			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace(/\\/g, "");
+				match[1] = (match[1] || "").replace( rBackslash, "" );
 				set = Expr.find[ type ]( match, context, isXML );
+
 				if ( set != null ) {
 					expr = expr.replace( Expr.match[ type ], "" );
 					break;
@@ -2813,20 +3992,28 @@ Sizzle.find = function(expr, context, isXML){
 	}
 
 	if ( !set ) {
-		set = context.getElementsByTagName("*");
+		set = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( "*" ) :
+			[];
 	}
 
-	return {set: set, expr: expr};
+	return { set: set, expr: expr };
 };
 
-Sizzle.filter = function(expr, set, inplace, not){
-	var old = expr, result = [], curLoop = set, match, anyFound,
-		isXMLFilter = set && set[0] && isXML(set[0]);
+Sizzle.filter = function( expr, set, inplace, not ) {
+	var match, anyFound,
+		old = expr,
+		result = [],
+		curLoop = set,
+		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
 
 	while ( expr && set.length ) {
 		for ( var type in Expr.filter ) {
 			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				var filter = Expr.filter[ type ], found, item, left = match[1];
+				var found, item,
+					filter = Expr.filter[ type ],
+					left = match[1];
+
 				anyFound = false;
 
 				match.splice(1,1);
@@ -2844,6 +4031,7 @@ Sizzle.filter = function(expr, set, inplace, not){
 
 					if ( !match ) {
 						anyFound = found = true;
+
 					} else if ( match === true ) {
 						continue;
 					}
@@ -2858,9 +4046,11 @@ Sizzle.filter = function(expr, set, inplace, not){
 							if ( inplace && found != null ) {
 								if ( pass ) {
 									anyFound = true;
+
 								} else {
 									curLoop[i] = false;
 								}
+
 							} else if ( pass ) {
 								result.push( item );
 								anyFound = true;
@@ -2889,6 +4079,7 @@ Sizzle.filter = function(expr, set, inplace, not){
 		if ( expr === old ) {
 			if ( anyFound == null ) {
 				Sizzle.error( expr );
+
 			} else {
 				break;
 			}
@@ -2906,30 +4097,38 @@ Sizzle.error = function( msg ) {
 
 var Expr = Sizzle.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|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+		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(elem){
-			return elem.getAttribute("href");
+		href: function( elem ) {
+			return elem.getAttribute( "href" );
+		},
+		type: function( elem ) {
+			return elem.getAttribute( "type" );
 		}
 	},
+
 	relative: {
 		"+": function(checkSet, part){
 			var isPartStr = typeof part === "string",
-				isTag = isPartStr && !/\W/.test(part),
+				isTag = isPartStr && !rNonWord.test( part ),
 				isPartStrNotTag = isPartStr && !isTag;
 
 			if ( isTag ) {
@@ -2950,22 +4149,29 @@ var Expr = Sizzle.selectors = {
 				Sizzle.filter( part, checkSet, true );
 			}
 		},
-		">": function(checkSet, part){
-			var isPartStr = typeof part === "string";
 
-			if ( isPartStr && !/\W/.test(part) ) {
+		">": function( checkSet, part ) {
+			var elem,
+				isPartStr = typeof part === "string",
+				i = 0,
+				l = checkSet.length;
+
+			if ( isPartStr && !rNonWord.test( part ) ) {
 				part = part.toLowerCase();
 
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
 					if ( elem ) {
 						var parent = elem.parentNode;
 						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
 					}
 				}
+
 			} else {
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
 					if ( elem ) {
 						checkSet[i] = isPartStr ?
 							elem.parentNode :
@@ -2978,37 +4184,50 @@ var Expr = Sizzle.selectors = {
 				}
 			}
 		},
+
 		"": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
 
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
 				checkFn = dirNodeCheck;
 			}
 
-			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
 		},
-		"~": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
 
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
+		"~": function( checkSet, part, isXML ) {
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
 				checkFn = dirNodeCheck;
 			}
 
-			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
 		}
 	},
+
 	find: {
-		ID: function(match, context, isXML){
+		ID: function( match, context, isXML ) {
 			if ( typeof context.getElementById !== "undefined" && !isXML ) {
 				var m = context.getElementById(match[1]);
-				return m ? [m] : [];
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
 			}
 		},
-		NAME: function(match, context){
+
+		NAME: function( match, context ) {
 			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [], results = context.getElementsByName(match[1]);
+				var ret = [],
+					results = context.getElementsByName( match[1] );
 
 				for ( var i = 0, l = results.length; i < l; i++ ) {
 					if ( results[i].getAttribute("name") === match[1] ) {
@@ -3019,13 +4238,16 @@ var Expr = Sizzle.selectors = {
 				return ret.length === 0 ? null : ret;
 			}
 		},
-		TAG: function(match, context){
-			return context.getElementsByTagName(match[1]);
+
+		TAG: function( match, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( match[1] );
+			}
 		}
 	},
 	preFilter: {
-		CLASS: function(match, curLoop, inplace, result, not, isXML){
-			match = " " + match[1].replace(/\\/g, "") + " ";
+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
+			match = " " + match[1].replace( rBackslash, "" ) + " ";
 
 			if ( isXML ) {
 				return match;
@@ -3033,10 +4255,11 @@ var Expr = Sizzle.selectors = {
 
 			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
 				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
 						if ( !inplace ) {
 							result.push( elem );
 						}
+
 					} else if ( inplace ) {
 						curLoop[i] = false;
 					}
@@ -3045,16 +4268,25 @@ var Expr = Sizzle.selectors = {
 
 			return false;
 		},
-		ID: function(match){
-			return match[1].replace(/\\/g, "");
+
+		ID: function( match ) {
+			return match[1].replace( rBackslash, "" );
 		},
-		TAG: function(match, curLoop){
-			return match[1].toLowerCase();
+
+		TAG: function( match, curLoop ) {
+			return match[1].replace( rBackslash, "" ).toLowerCase();
 		},
-		CHILD: function(match){
+
+		CHILD: function( match ) {
 			if ( match[1] === "nth" ) {
+				if ( !match[2] ) {
+					Sizzle.error( match[0] );
+				}
+
+				match[2] = match[2].replace(/^\+|\s*/g, '');
+
 				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
 					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
 					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
 
@@ -3062,178 +4294,243 @@ var Expr = Sizzle.selectors = {
 				match[2] = (test[1] + (test[2] || 1)) - 0;
 				match[3] = test[3] - 0;
 			}
+			else if ( match[2] ) {
+				Sizzle.error( match[0] );
+			}
 
 			// TODO: Move to normal caching system
 			match[0] = done++;
 
 			return match;
 		},
-		ATTR: function(match, curLoop, inplace, result, not, isXML){
-			var name = match[1].replace(/\\/g, "");
+
+		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
+			var name = match[1] = match[1].replace( rBackslash, "" );
 			
 			if ( !isXML && Expr.attrMap[name] ) {
 				match[1] = Expr.attrMap[name];
 			}
 
+			// Handle if an un-quoted value was used
+			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
+
 			if ( match[2] === "~=" ) {
 				match[4] = " " + match[4] + " ";
 			}
 
 			return match;
 		},
-		PSEUDO: function(match, curLoop, inplace, result, not){
+
+		PSEUDO: function( match, curLoop, inplace, result, not ) {
 			if ( match[1] === "not" ) {
 				// If we're dealing with a complex expression, or a simple one
 				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
 					match[3] = Sizzle(match[3], null, null, curLoop);
+
 				} else {
 					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+
 					if ( !inplace ) {
 						result.push.apply( result, ret );
 					}
+
 					return false;
 				}
+
 			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
 				return true;
 			}
 			
 			return match;
 		},
-		POS: function(match){
+
+		POS: function( match ) {
 			match.unshift( true );
+
 			return match;
 		}
 	},
+	
 	filters: {
-		enabled: function(elem){
+		enabled: function( elem ) {
 			return elem.disabled === false && elem.type !== "hidden";
 		},
-		disabled: function(elem){
+
+		disabled: function( elem ) {
 			return elem.disabled === true;
 		},
-		checked: function(elem){
+
+		checked: function( elem ) {
 			return elem.checked === true;
 		},
-		selected: function(elem){
+		
+		selected: function( elem ) {
 			// Accessing this property makes selected-by-default
 			// options in Safari work properly
-			elem.parentNode.selectedIndex;
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+			
 			return elem.selected === true;
 		},
-		parent: function(elem){
+
+		parent: function( elem ) {
 			return !!elem.firstChild;
 		},
-		empty: function(elem){
+
+		empty: function( elem ) {
 			return !elem.firstChild;
 		},
-		has: function(elem, i, match){
+
+		has: function( elem, i, match ) {
 			return !!Sizzle( match[3], elem ).length;
 		},
-		header: function(elem){
-			return /h\d/i.test( elem.nodeName );
+
+		header: function( elem ) {
+			return (/h\d/i).test( elem.nodeName );
 		},
-		text: function(elem){
-			return "text" === elem.type;
+
+		text: function( elem ) {
+			var attr = elem.getAttribute( "type" ), type = elem.type;
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) 
+			// use getAttribute instead to test this case
+			return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
 		},
-		radio: function(elem){
-			return "radio" === elem.type;
+
+		radio: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
 		},
-		checkbox: function(elem){
-			return "checkbox" === elem.type;
+
+		checkbox: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
+		},
+
+		file: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
 		},
-		file: function(elem){
-			return "file" === elem.type;
+
+		password: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
 		},
-		password: function(elem){
-			return "password" === elem.type;
+
+		submit: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "submit" === elem.type;
 		},
-		submit: function(elem){
-			return "submit" === elem.type;
+
+		image: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
 		},
-		image: function(elem){
-			return "image" === elem.type;
+
+		reset: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "reset" === elem.type;
 		},
-		reset: function(elem){
-			return "reset" === elem.type;
+
+		button: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && "button" === elem.type || name === "button";
 		},
-		button: function(elem){
-			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+
+		input: function( elem ) {
+			return (/input|select|textarea|button/i).test( elem.nodeName );
 		},
-		input: function(elem){
-			return /input|select|textarea|button/i.test(elem.nodeName);
+
+		focus: function( elem ) {
+			return elem === elem.ownerDocument.activeElement;
 		}
 	},
 	setFilters: {
-		first: function(elem, i){
+		first: function( elem, i ) {
 			return i === 0;
 		},
-		last: function(elem, i, match, array){
+
+		last: function( elem, i, match, array ) {
 			return i === array.length - 1;
 		},
-		even: function(elem, i){
+
+		even: function( elem, i ) {
 			return i % 2 === 0;
 		},
-		odd: function(elem, i){
+
+		odd: function( elem, i ) {
 			return i % 2 === 1;
 		},
-		lt: function(elem, i, match){
+
+		lt: function( elem, i, match ) {
 			return i < match[3] - 0;
 		},
-		gt: function(elem, i, match){
+
+		gt: function( elem, i, match ) {
 			return i > match[3] - 0;
 		},
-		nth: function(elem, i, match){
+
+		nth: function( elem, i, match ) {
 			return match[3] - 0 === i;
 		},
-		eq: function(elem, i, match){
+
+		eq: function( elem, i, match ) {
 			return match[3] - 0 === i;
 		}
 	},
 	filter: {
-		PSEUDO: function(elem, match, i, array){
-			var name = match[1], filter = Expr.filters[ name ];
+		PSEUDO: function( elem, match, i, array ) {
+			var name = match[1],
+				filter = Expr.filters[ name ];
 
 			if ( filter ) {
 				return filter( elem, i, match, array );
+
 			} else if ( name === "contains" ) {
-				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
+				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
+
 			} else if ( name === "not" ) {
 				var not = match[3];
 
-				for ( var i = 0, l = not.length; i < l; i++ ) {
-					if ( not[i] === elem ) {
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
 						return false;
 					}
 				}
 
 				return true;
+
 			} else {
-				Sizzle.error( "Syntax error, unrecognized expression: " + name );
+				Sizzle.error( name );
 			}
 		},
-		CHILD: function(elem, match){
-			var type = match[1], node = elem;
-			switch (type) {
-				case 'only':
-				case 'first':
+
+		CHILD: function( elem, match ) {
+			var type = match[1],
+				node = elem;
+
+			switch ( type ) {
+				case "only":
+				case "first":
 					while ( (node = node.previousSibling) )	 {
 						if ( node.nodeType === 1 ) { 
 							return false; 
 						}
 					}
+
 					if ( type === "first" ) { 
 						return true; 
 					}
+
 					node = elem;
-				case 'last':
+
+				case "last":
 					while ( (node = node.nextSibling) )	 {
 						if ( node.nodeType === 1 ) { 
 							return false; 
 						}
 					}
+
 					return true;
-				case 'nth':
-					var first = match[2], last = match[3];
+
+				case "nth":
+					var first = match[2],
+						last = match[3];
 
 					if ( first === 1 && last === 0 ) {
 						return true;
@@ -3244,33 +4541,41 @@ var Expr = Sizzle.selectors = {
 	
 					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
 						var count = 0;
+						
 						for ( node = parent.firstChild; node; node = node.nextSibling ) {
 							if ( node.nodeType === 1 ) {
 								node.nodeIndex = ++count;
 							}
 						} 
+
 						parent.sizcache = doneName;
 					}
 					
 					var diff = elem.nodeIndex - last;
+
 					if ( first === 0 ) {
 						return diff === 0;
+
 					} else {
 						return ( diff % first === 0 && diff / first >= 0 );
 					}
 			}
 		},
-		ID: function(elem, match){
+
+		ID: function( elem, match ) {
 			return elem.nodeType === 1 && elem.getAttribute("id") === match;
 		},
-		TAG: function(elem, match){
+
+		TAG: function( elem, match ) {
 			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
 		},
-		CLASS: function(elem, match){
+		
+		CLASS: function( elem, match ) {
 			return (" " + (elem.className || elem.getAttribute("class")) + " ")
 				.indexOf( match ) > -1;
 		},
-		ATTR: function(elem, match){
+
+		ATTR: function( elem, match ) {
 			var name = match[1],
 				result = Expr.attrHandle[ name ] ?
 					Expr.attrHandle[ name ]( elem ) :
@@ -3301,8 +4606,10 @@ var Expr = Sizzle.selectors = {
 				value === check || value.substr(0, check.length + 1) === check + "-" :
 				false;
 		},
-		POS: function(elem, match, i, array){
-			var name = match[2], filter = Expr.setFilters[ name ];
+
+		POS: function( elem, match, i, array ) {
+			var name = match[2],
+				filter = Expr.setFilters[ name ];
 
 			if ( filter ) {
 				return filter( elem, i, match, array );
@@ -3311,16 +4618,17 @@ var Expr = Sizzle.selectors = {
 	}
 };
 
-var origPOS = Expr.match.POS;
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
 
 for ( var type in Expr.match ) {
-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
-	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, function(all, num){
-		return "\\" + (num - 0 + 1);
-	}));
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
 }
 
-var makeArray = function(array, results) {
+var makeArray = function( array, results ) {
 	array = Array.prototype.slice.call( array, 0 );
 
 	if ( results ) {
@@ -3339,19 +4647,22 @@ try {
 	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
 
 // Provide a fallback method if it does not work
-} catch(e){
-	makeArray = function(array, results) {
-		var ret = results || [];
+} catch( e ) {
+	makeArray = function( array, results ) {
+		var i = 0,
+			ret = results || [];
 
 		if ( toString.call(array) === "[object Array]" ) {
 			Array.prototype.push.apply( ret, array );
+
 		} else {
 			if ( typeof array.length === "number" ) {
-				for ( var i = 0, l = array.length; i < l; i++ ) {
+				for ( var l = array.length; i < l; i++ ) {
 					ret.push( array[i] );
 				}
+
 			} else {
-				for ( var i = 0; array[i]; i++ ) {
+				for ( ; array[i]; i++ ) {
 					ret.push( array[i] );
 				}
 			}
@@ -3361,62 +4672,104 @@ try {
 	};
 }
 
-var sortOrder;
+var sortOrder, siblingCheck;
 
 if ( document.documentElement.compareDocumentPosition ) {
 	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
 		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
 			return a.compareDocumentPosition ? -1 : 1;
 		}
 
-		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
 	};
-} else if ( "sourceIndex" in document.documentElement ) {
+
+} else {
 	sortOrder = function( a, b ) {
-		if ( !a.sourceIndex || !b.sourceIndex ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.sourceIndex ? -1 : 1;
+		// The nodes are identical, we can exit early
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// Fallback to using sourceIndex (in IE) if it's available on both nodes
+		} else if ( a.sourceIndex && b.sourceIndex ) {
+			return a.sourceIndex - b.sourceIndex;
 		}
 
-		var ret = a.sourceIndex - b.sourceIndex;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
+		var al, bl,
+			ap = [],
+			bp = [],
+			aup = a.parentNode,
+			bup = b.parentNode,
+			cur = aup;
+
+		// If the nodes are siblings (or identical) we can do a quick check
+		if ( aup === bup ) {
+			return siblingCheck( a, b );
+
+		// If no parents were found then the nodes are disconnected
+		} else if ( !aup ) {
+			return -1;
+
+		} else if ( !bup ) {
+			return 1;
 		}
-		return ret;
-	};
-} else if ( document.createRange ) {
-	sortOrder = function( a, b ) {
-		if ( !a.ownerDocument || !b.ownerDocument ) {
-			if ( a == b ) {
-				hasDuplicate = true;
+
+		// Otherwise they're somewhere else in the tree so we need
+		// to build up a full list of the parentNodes for comparison
+		while ( cur ) {
+			ap.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		al = ap.length;
+		bl = bp.length;
+
+		// Start walking down the tree looking for a discrepancy
+		for ( var i = 0; i < al && i < bl; i++ ) {
+			if ( ap[i] !== bp[i] ) {
+				return siblingCheck( ap[i], bp[i] );
 			}
-			return a.ownerDocument ? -1 : 1;
 		}
 
-		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
-		aRange.setStart(a, 0);
-		aRange.setEnd(a, 0);
-		bRange.setStart(b, 0);
-		bRange.setEnd(b, 0);
-		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
-		if ( ret === 0 ) {
-			hasDuplicate = true;
+		// We ended someplace up the tree so do a sibling check
+		return i === al ?
+			siblingCheck( a, bp[i], -1 ) :
+			siblingCheck( ap[i], b, 1 );
+	};
+
+	siblingCheck = function( a, b, ret ) {
+		if ( a === b ) {
+			return ret;
 		}
-		return ret;
+
+		var cur = a.nextSibling;
+
+		while ( cur ) {
+			if ( cur === b ) {
+				return -1;
+			}
+
+			cur = cur.nextSibling;
+		}
+
+		return 1;
 	};
 }
 
 // Utility function for retreiving the text value of an array of DOM nodes
-function getText( elems ) {
+Sizzle.getText = function( elems ) {
 	var ret = "", elem;
 
 	for ( var i = 0; elems[i]; i++ ) {
@@ -3428,43 +4781,52 @@ function getText( elems ) {
 
 		// Traverse everything else, except comment nodes
 		} else if ( elem.nodeType !== 8 ) {
-			ret += getText( elem.childNodes );
+			ret += Sizzle.getText( elem.childNodes );
 		}
 	}
 
 	return ret;
-}
+};
 
 // Check to see if the browser returns elements by name when
 // querying by getElementById (and provide a workaround)
 (function(){
 	// We're going to inject a fake input element with a specified name
 	var form = document.createElement("div"),
-		id = "script" + (new Date).getTime();
+		id = "script" + (new Date()).getTime(),
+		root = document.documentElement;
+
 	form.innerHTML = "<a name='" + id + "'/>";
 
 	// Inject it into the root element, check its status, and remove it quickly
-	var root = document.documentElement;
 	root.insertBefore( form, root.firstChild );
 
 	// The workaround has to do additional checks after a getElementById
 	// Which slows things down for other browsers (hence the branching)
 	if ( document.getElementById( id ) ) {
-		Expr.find.ID = function(match, context, isXML){
+		Expr.find.ID = function( match, context, isXML ) {
 			if ( typeof context.getElementById !== "undefined" && !isXML ) {
 				var m = context.getElementById(match[1]);
-				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+
+				return m ?
+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+						[m] :
+						undefined :
+					[];
 			}
 		};
 
-		Expr.filter.ID = function(elem, match){
+		Expr.filter.ID = function( elem, match ) {
 			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+
 			return elem.nodeType === 1 && node && node.nodeValue === match;
 		};
 	}
 
 	root.removeChild( form );
-	root = form = null; // release memory in IE
+
+	// release memory in IE
+	root = form = null;
 })();
 
 (function(){
@@ -3477,8 +4839,8 @@ function getText( elems ) {
 
 	// Make sure no comments are found
 	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function(match, context){
-			var results = context.getElementsByTagName(match[1]);
+		Expr.find.TAG = function( match, context ) {
+			var results = context.getElementsByTagName( match[1] );
 
 			// Filter out possible comments
 			if ( match[1] === "*" ) {
@@ -3499,19 +4861,25 @@ function getText( elems ) {
 
 	// Check to see if an attribute returns normalized href attributes
 	div.innerHTML = "<a href='#'></a>";
+
 	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
 			div.firstChild.getAttribute("href") !== "#" ) {
-		Expr.attrHandle.href = function(elem){
-			return elem.getAttribute("href", 2);
+
+		Expr.attrHandle.href = function( elem ) {
+			return elem.getAttribute( "href", 2 );
 		};
 	}
 
-	div = null; // release memory in IE
+	// release memory in IE
+	div = null;
 })();
 
 if ( document.querySelectorAll ) {
 	(function(){
-		var oldSizzle = Sizzle, div = document.createElement("div");
+		var oldSizzle = Sizzle,
+			div = document.createElement("div"),
+			id = "__sizzle__";
+
 		div.innerHTML = "<p class='TEST'></p>";
 
 		// Safari can't handle uppercase or unicode characters when
@@ -3520,15 +4888,86 @@ if ( document.querySelectorAll ) {
 			return;
 		}
 	
-		Sizzle = function(query, context, extra, seed){
+		Sizzle = function( query, context, extra, seed ) {
 			context = context || document;
 
 			// Only use querySelectorAll on non-XML documents
 			// (ID selectors don't work in non-HTML documents)
-			if ( !seed && context.nodeType === 9 && !isXML(context) ) {
-				try {
-					return makeArray( context.querySelectorAll(query), extra );
-				} catch(e){}
+			if ( !seed && !Sizzle.isXML(context) ) {
+				// See if we find a selector to speed up
+				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
+				
+				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
+					// Speed-up: Sizzle("TAG")
+					if ( match[1] ) {
+						return makeArray( context.getElementsByTagName( query ), extra );
+					
+					// Speed-up: Sizzle(".CLASS")
+					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
+						return makeArray( context.getElementsByClassName( match[2] ), extra );
+					}
+				}
+				
+				if ( context.nodeType === 9 ) {
+					// Speed-up: Sizzle("body")
+					// The body element only exists once, optimize finding it
+					if ( query === "body" && context.body ) {
+						return makeArray( [ context.body ], extra );
+						
+					// Speed-up: Sizzle("#ID")
+					} else if ( match && match[3] ) {
+						var elem = context.getElementById( match[3] );
+
+						// Check parentNode to catch when Blackberry 4.6 returns
+						// nodes that are no longer in the document #6963
+						if ( elem && elem.parentNode ) {
+							// Handle the case where IE and Opera return items
+							// by name instead of ID
+							if ( elem.id === match[3] ) {
+								return makeArray( [ elem ], extra );
+							}
+							
+						} else {
+							return makeArray( [], extra );
+						}
+					}
+					
+					try {
+						return makeArray( context.querySelectorAll(query), extra );
+					} catch(qsaError) {}
+
+				// qSA works strangely on Element-rooted queries
+				// We can work around this by specifying an extra ID on the root
+				// and working up from there (Thanks to Andrew Dupont for the technique)
+				// IE 8 doesn't work on object elements
+				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+					var oldContext = context,
+						old = context.getAttribute( "id" ),
+						nid = old || id,
+						hasParent = context.parentNode,
+						relativeHierarchySelector = /^\s*[+~]/.test( query );
+
+					if ( !old ) {
+						context.setAttribute( "id", nid );
+					} else {
+						nid = nid.replace( /'/g, "\\$&" );
+					}
+					if ( relativeHierarchySelector && hasParent ) {
+						context = context.parentNode;
+					}
+
+					try {
+						if ( !relativeHierarchySelector || hasParent ) {
+							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
+						}
+
+					} catch(pseudoError) {
+					} finally {
+						if ( !old ) {
+							oldContext.removeAttribute( "id" );
+						}
+					}
+				}
 			}
 		
 			return oldSizzle(query, context, extra, seed);
@@ -3538,11 +4977,56 @@ if ( document.querySelectorAll ) {
 			Sizzle[ prop ] = oldSizzle[ prop ];
 		}
 
-		div = null; // release memory in IE
+		// release memory in IE
+		div = null;
 	})();
 }
 
 (function(){
+	var html = document.documentElement,
+		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
+
+	if ( matches ) {
+		// Check to see if it's possible to do matchesSelector
+		// on a disconnected node (IE 9 fails this)
+		var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),
+			pseudoWorks = false;
+
+		try {
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( document.documentElement, "[test!='']:sizzle" );
+	
+		} catch( pseudoError ) {
+			pseudoWorks = true;
+		}
+
+		Sizzle.matchesSelector = function( node, expr ) {
+			// Make sure that attribute selectors are quoted
+			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			if ( !Sizzle.isXML( node ) ) {
+				try { 
+					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
+						var ret = matches.call( node, expr );
+
+						// IE 9's matchesSelector returns false on disconnected nodes
+						if ( ret || !disconnectedMatch ||
+								// As well, disconnected nodes are said to be in a document
+								// fragment in IE 9, so check for that
+								node.document && node.document.nodeType !== 11 ) {
+							return ret;
+						}
+					}
+				} catch(e) {}
+			}
+
+			return Sizzle(expr, null, null, [node]).length > 0;
+		};
+	}
+})();
+
+(function(){
 	var div = document.createElement("div");
 
 	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
@@ -3561,22 +5045,25 @@ if ( document.querySelectorAll ) {
 	}
 	
 	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function(match, context, isXML) {
+	Expr.find.CLASS = function( match, context, isXML ) {
 		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
 			return context.getElementsByClassName(match[1]);
 		}
 	};
 
-	div = null; // release memory in IE
+	// release memory in IE
+	div = null;
 })();
 
 function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
 		var elem = checkSet[i];
+
 		if ( elem ) {
-			elem = elem[dir];
 			var match = false;
 
+			elem = elem[dir];
+
 			while ( elem ) {
 				if ( elem.sizcache === doneName ) {
 					match = checkSet[elem.sizset];
@@ -3604,9 +5091,11 @@ function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
 		var elem = checkSet[i];
+
 		if ( elem ) {
-			elem = elem[dir];
 			var match = false;
+			
+			elem = elem[dir];
 
 			while ( elem ) {
 				if ( elem.sizcache === doneName ) {
@@ -3619,6 +5108,7 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 						elem.sizcache = doneName;
 						elem.sizset = i;
 					}
+
 					if ( typeof cur !== "string" ) {
 						if ( elem === cur ) {
 							match = true;
@@ -3639,21 +5129,34 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 	}
 }
 
-var contains = document.compareDocumentPosition ? function(a, b){
-	return !!(a.compareDocumentPosition(b) & 16);
-} : function(a, b){
-	return a !== b && (a.contains ? a.contains(b) : true);
-};
+if ( document.documentElement.contains ) {
+	Sizzle.contains = function( a, b ) {
+		return a !== b && (a.contains ? a.contains(b) : true);
+	};
+
+} else if ( document.documentElement.compareDocumentPosition ) {
+	Sizzle.contains = function( a, b ) {
+		return !!(a.compareDocumentPosition(b) & 16);
+	};
+
+} else {
+	Sizzle.contains = function() {
+		return false;
+	};
+}
 
-var isXML = function(elem){
+Sizzle.isXML = function( elem ) {
 	// documentElement is verified for cases where it doesn't yet exist
 	// (such as loading iframes in IE - #4833) 
 	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+
 	return documentElement ? documentElement.nodeName !== "HTML" : false;
 };
 
-var posProcess = function(selector, context){
-	var tmpSet = [], later = "", match,
+var posProcess = function( selector, context ) {
+	var match,
+		tmpSet = [],
+		later = "",
 		root = context.nodeType ? [context] : context;
 
 	// Position selectors must be done after the filter
@@ -3677,62 +5180,55 @@ jQuery.find = Sizzle;
 jQuery.expr = Sizzle.selectors;
 jQuery.expr[":"] = jQuery.expr.filters;
 jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = getText;
-jQuery.isXMLDoc = isXML;
-jQuery.contains = contains;
-
-return;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
 
-window.Sizzle = Sizzle;
 
 })();
+
+
 var runtil = /Until$/,
 	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
 	// Note: This RegExp should be improved, or likely pulled from Sizzle
 	rmultiselector = /,/,
-	slice = Array.prototype.slice;
-
-// Implement the identical functionality for filter and not
-var winnow = function( elements, qualifier, keep ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return !!qualifier.call( elem, i, elem ) === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return (elem === qualifier) === keep;
-		});
+	isSimple = /^.[^:#\[\.,]*$/,
+	slice = Array.prototype.slice,
+	POS = jQuery.expr.match.POS,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
 
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
+jQuery.fn.extend({
+	find: function( selector ) {
+		var self = this,
+			i, l;
 
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
+		if ( typeof selector !== "string" ) {
+			return jQuery( selector ).filter(function() {
+				for ( i = 0, l = self.length; i < l; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			});
 		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-	});
-};
 
-jQuery.fn.extend({
-	find: function( selector ) {
-		var ret = this.pushStack( "", "find", selector ), length = 0;
+		var ret = this.pushStack( "", "find", selector ),
+			length, n, r;
 
-		for ( var i = 0, l = this.length; i < l; i++ ) {
+		for ( i = 0, l = this.length; i < l; i++ ) {
 			length = ret.length;
 			jQuery.find( selector, this[i], ret );
 
 			if ( i > 0 ) {
 				// Make sure that the results are unique
-				for ( var n = length; n < ret.length; n++ ) {
-					for ( var r = 0; r < length; r++ ) {
+				for ( n = length; n < ret.length; n++ ) {
+					for ( r = 0; r < length; r++ ) {
 						if ( ret[r] === ret[n] ) {
 							ret.splice(n--, 1);
 							break;
@@ -3763,21 +5259,28 @@ jQuery.fn.extend({
 	filter: function( selector ) {
 		return this.pushStack( winnow(this, selector, true), "filter", selector );
 	},
-	
+
 	is: function( selector ) {
-		return !!selector && jQuery.filter( selector, this ).length > 0;
+		return !!selector && ( typeof selector === "string" ?
+			jQuery.filter( selector, this ).length > 0 :
+			this.filter( selector ).length > 0 );
 	},
 
 	closest: function( selectors, context ) {
+		var ret = [], i, l, cur = this[0];
+		
+		// Array
 		if ( jQuery.isArray( selectors ) ) {
-			var ret = [], cur = this[0], match, matches = {}, selector;
+			var match, selector,
+				matches = {},
+				level = 1;
 
 			if ( cur && selectors.length ) {
-				for ( var i = 0, l = selectors.length; i < l; i++ ) {
+				for ( i = 0, l = selectors.length; i < l; i++ ) {
 					selector = selectors[i];
 
-					if ( !matches[selector] ) {
-						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
+					if ( !matches[ selector ] ) {
+						matches[ selector ] = POS.test( selector ) ?
 							jQuery( selector, context || this.context ) :
 							selector;
 					}
@@ -3785,43 +5288,62 @@ jQuery.fn.extend({
 
 				while ( cur && cur.ownerDocument && cur !== context ) {
 					for ( selector in matches ) {
-						match = matches[selector];
+						match = matches[ selector ];
 
-						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
-							ret.push({ selector: selector, elem: cur });
-							delete matches[selector];
+						if ( match.jquery ? match.index( cur ) > -1 : jQuery( cur ).is( match ) ) {
+							ret.push({ selector: selector, elem: cur, level: level });
 						}
 					}
+
 					cur = cur.parentNode;
+					level++;
 				}
 			}
 
 			return ret;
 		}
 
-		var pos = jQuery.expr.match.POS.test( selectors ) ? 
-			jQuery( selectors, context || this.context ) : null;
+		// String
+		var pos = POS.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
 
-		return this.map(function( i, cur ) {
-			while ( cur && cur.ownerDocument && cur !== context ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
-					return cur;
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+
+				} else {
+					cur = cur.parentNode;
+					if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
+						break;
+					}
 				}
-				cur = cur.parentNode;
 			}
-			return null;
-		});
+		}
+
+		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
+
+		return this.pushStack( ret, "closest", selectors );
 	},
-	
+
 	// Determine the position of an element within
 	// the matched set of elements
 	index: function( elem ) {
-		if ( !elem || typeof elem === "string" ) {
-			return jQuery.inArray( this[0],
-				// If it receives a string, the selector is used
-				// If it receives nothing, the siblings are used
-				elem ? jQuery( elem ) : this.parent().children() );
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
 		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[0], jQuery( elem ) );
+		}
+
 		// Locate the position of the desired element
 		return jQuery.inArray(
 			// If it receives a jQuery object, the first element is used
@@ -3830,8 +5352,8 @@ jQuery.fn.extend({
 
 	add: function( selector, context ) {
 		var set = typeof selector === "string" ?
-				jQuery( selector, context || this.context ) :
-				jQuery.makeArray( selector ),
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
 			all = jQuery.merge( this.get(), set );
 
 		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
@@ -3892,8 +5414,13 @@ jQuery.each({
 	}
 }, function( name, fn ) {
 	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-		
+		var ret = jQuery.map( this, fn, until ),
+			// The variable 'args' was introduced in
+			// https://github.com/jquery/jquery/commit/52a0238
+			// to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed.
+			// http://code.google.com/p/v8/issues/detail?id=1050
+			args = slice.call(arguments);
+
 		if ( !runtil.test( name ) ) {
 			selector = until;
 		}
@@ -3902,13 +5429,13 @@ jQuery.each({
 			ret = jQuery.filter( selector, ret );
 		}
 
-		ret = this.length > 1 ? jQuery.unique( ret ) : ret;
+		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
 
 		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
 			ret = ret.reverse();
 		}
 
-		return this.pushStack( ret, name, slice.call(arguments).join(",") );
+		return this.pushStack( ret, name, args.join(",") );
 	};
 });
 
@@ -3918,11 +5445,15 @@ jQuery.extend({
 			expr = ":not(" + expr + ")";
 		}
 
-		return jQuery.find.matches(expr, elems);
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
 	},
-	
+
 	dir: function( elem, dir, until ) {
-		var matched = [], cur = elem[dir];
+		var matched = [],
+			cur = elem[ dir ];
+
 		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
 			if ( cur.nodeType === 1 ) {
 				matched.push( cur );
@@ -3957,20 +5488,56 @@ jQuery.extend({
 		return r;
 	}
 });
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+
+	// Can't pass null or undefined to indexOf in Firefox 4
+	// Set to 0 to skip string check
+	qualifier = qualifier || 0;
+
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return (elem === qualifier) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+	});
+}
+
+
+
+
 var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g,
-	rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
 	rtagName = /<([\w:]+)/,
 	rtbody = /<tbody/i,
 	rhtml = /<|&#?\w+;/,
-	rnocache = /<script|<object|<embed|<option|<style/i,
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,  // checked="checked" or checked (html5)
-	fcloseTag = function( all, front, tag ) {
-		return rselfClosing.test( tag ) ?
-			all :
-			front + "></" + tag + ">";
-	},
+	rnocache = /<(?:script|object|embed|option|style)/i,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /\/(java|ecma)script/i,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
 	wrapMap = {
 		option: [ 1, "<select multiple='multiple'>", "</select>" ],
 		legend: [ 1, "<fieldset>", "</fieldset>" ],
@@ -3995,7 +5562,8 @@ jQuery.fn.extend({
 	text: function( text ) {
 		if ( jQuery.isFunction(text) ) {
 			return this.each(function(i) {
-				var self = jQuery(this);
+				var self = jQuery( this );
+
 				self.text( text.call(this, i, self.text()) );
 			});
 		}
@@ -4030,7 +5598,7 @@ jQuery.fn.extend({
 				}
 
 				return elem;
-			}).append(this);
+			}).append( this );
 		}
 
 		return this;
@@ -4044,7 +5612,8 @@ jQuery.fn.extend({
 		}
 
 		return this.each(function() {
-			var self = jQuery( this ), contents = self.contents();
+			var self = jQuery( this ),
+				contents = self.contents();
 
 			if ( contents.length ) {
 				contents.wrapAll( html );
@@ -4108,7 +5677,7 @@ jQuery.fn.extend({
 			return set;
 		}
 	},
-	
+
 	// keepData is for internal use only--do not document
 	remove: function( selector, keepData ) {
 		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
@@ -4119,11 +5688,11 @@ jQuery.fn.extend({
 				}
 
 				if ( elem.parentNode ) {
-					 elem.parentNode.removeChild( elem );
+					elem.parentNode.removeChild( elem );
 				}
 			}
 		}
-		
+
 		return this;
 	},
 
@@ -4139,46 +5708,17 @@ jQuery.fn.extend({
 				elem.removeChild( elem.firstChild );
 			}
 		}
-		
+
 		return this;
 	},
 
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function() {
-			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var html = this.outerHTML, ownerDocument = this.ownerDocument;
-				if ( !html ) {
-					var div = ownerDocument.createElement("div");
-					div.appendChild( this.cloneNode(true) );
-					html = div.innerHTML;
-				}
-
-				return jQuery.clean([html.replace(rinlinejQuery, "")
-					// Handle the case in IE 8 where action=/test/> self-closes a tag
-					.replace(/=([^="'>\s]+\/)>/g, '="$1">')
-					.replace(rleadingWhitespace, "")], ownerDocument)[0];
-			} else {
-				return this.cloneNode(true);
-			}
-		});
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
 
-		// Copy the events from the original to the clone
-		if ( events === true ) {
-			cloneCopyEvent( this, ret );
-			cloneCopyEvent( this.find("*"), ret.find("*") );
-		}
-
-		// Return the cloned set
-		return ret;
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
 	},
 
 	html: function( value ) {
@@ -4192,7 +5732,7 @@ jQuery.fn.extend({
 			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
 			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
 
-			value = value.replace(rxhtmlTag, fcloseTag);
+			value = value.replace(rxhtmlTag, "<$1></$2>");
 
 			try {
 				for ( var i = 0, l = this.length; i < l; i++ ) {
@@ -4210,10 +5750,9 @@ jQuery.fn.extend({
 
 		} else if ( jQuery.isFunction( value ) ) {
 			this.each(function(i){
-				var self = jQuery(this), old = self.html();
-				self.empty().append(function(){
-					return value.call( this, i, old );
-				});
+				var self = jQuery( this );
+
+				self.html( value.call(this, i, self.html()) );
 			});
 
 		} else {
@@ -4235,13 +5774,14 @@ jQuery.fn.extend({
 			}
 
 			if ( typeof value !== "string" ) {
-				value = jQuery(value).detach();
+				value = jQuery( value ).detach();
 			}
 
 			return this.each(function() {
-				var next = this.nextSibling, parent = this.parentNode;
+				var next = this.nextSibling,
+					parent = this.parentNode;
 
-				jQuery(this).remove();
+				jQuery( this ).remove();
 
 				if ( next ) {
 					jQuery(next).before( value );
@@ -4250,7 +5790,9 @@ jQuery.fn.extend({
 				}
 			});
 		} else {
-			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+			return this.length ?
+				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
+				this;
 		}
 	},
 
@@ -4259,7 +5801,9 @@ jQuery.fn.extend({
 	},
 
 	domManip: function( args, table, callback ) {
-		var results, first, value = args[0], scripts = [], fragment, parent;
+		var results, first, fragment, parent,
+			value = args[0],
+			scripts = [];
 
 		// We can't cloneNode fragments that contain checked, in WebKit
 		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
@@ -4284,11 +5828,11 @@ jQuery.fn.extend({
 				results = { fragment: parent };
 
 			} else {
-				results = buildFragment( args, this, scripts );
+				results = jQuery.buildFragment( args, this, scripts );
 			}
-			
+
 			fragment = results.fragment;
-			
+
 			if ( fragment.childNodes.length === 1 ) {
 				first = fragment = fragment.firstChild;
 			} else {
@@ -4298,13 +5842,20 @@ jQuery.fn.extend({
 			if ( first ) {
 				table = table && jQuery.nodeName( first, "tr" );
 
-				for ( var i = 0, l = this.length; i < l; i++ ) {
+				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
 					callback.call(
 						table ?
 							root(this[i], first) :
 							this[i],
-						i > 0 || results.cacheable || this.length > 1  ?
-							fragment.cloneNode(true) :
+						// Make sure that we do not leak memory by inadvertently discarding
+						// the original fragment (which might have attached data) instead of
+						// using it; in addition, use the original fragment object for the last
+						// item instead of first because it can end up being emptied incorrectly
+						// in certain situations (Bug #8070).
+						// Fragments from the fragment cache must always be cloned and never used
+						// in place.
+						results.cacheable || (l > 1 && i < lastIndex) ?
+							jQuery.clone( fragment, true, true ) :
 							fragment
 					);
 				}
@@ -4316,56 +5867,132 @@ jQuery.fn.extend({
 		}
 
 		return this;
-
-		function root( elem, cur ) {
-			return jQuery.nodeName(elem, "table") ?
-				(elem.getElementsByTagName("tbody")[0] ||
-				elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-				elem;
-		}
 	}
 });
 
-function cloneCopyEvent(orig, ret) {
-	var i = 0;
+function root( elem, cur ) {
+	return jQuery.nodeName(elem, "table") ?
+		(elem.getElementsByTagName("tbody")[0] ||
+		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+		elem;
+}
 
-	ret.each(function() {
-		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
-			return;
-		}
+function cloneCopyEvent( src, dest ) {
 
-		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var internalKey = jQuery.expando,
+		oldData = jQuery.data( src ),
+		curData = jQuery.data( dest, oldData );
+
+	// Switch to use the internal data object, if it exists, for the next
+	// stage of data copying
+	if ( (oldData = oldData[ internalKey ]) ) {
+		var events = oldData.events;
+				curData = curData[ internalKey ] = jQuery.extend({}, oldData);
 
 		if ( events ) {
 			delete curData.handle;
 			curData.events = {};
 
 			for ( var type in events ) {
-				for ( var handler in events[ type ] ) {
-					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+				for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
+					jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
 				}
 			}
 		}
-	});
+	}
+}
+
+function cloneFixAttributes( src, dest ) {
+	var nodeName;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	// clearAttributes removes the attributes, which we don't want,
+	// but also removes the attachEvent events, which we *do* want
+	if ( dest.clearAttributes ) {
+		dest.clearAttributes();
+	}
+
+	// mergeAttributes, in contrast, only merges back on the
+	// original attributes, not the events
+	if ( dest.mergeAttributes ) {
+		dest.mergeAttributes( src );
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	// IE6-8 fail to clone children inside object elements that use
+	// the proprietary classid attribute value (rather than the type
+	// attribute) to identify the type of content to display
+	if ( nodeName === "object" ) {
+		dest.outerHTML = src.outerHTML;
+
+	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+		if ( src.checked ) {
+			dest.defaultChecked = dest.checked = src.checked;
+		}
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+
+	// Event data gets referenced instead of copied if the expando
+	// gets copied too
+	dest.removeAttribute( jQuery.expando );
 }
 
-function buildFragment( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults,
-		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+jQuery.buildFragment = function( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults, doc;
+
+  // nodes may contain either an explicit document object,
+  // a jQuery collection or context object.
+  // If nodes[0] contains a valid object to assign to doc
+  if ( nodes && nodes[0] ) {
+    doc = nodes[0].ownerDocument || nodes[0];
+  }
+
+  // Ensure that an attr object doesn't incorrectly stand in as a document object
+	// Chrome and Firefox seem to allow this to occur and will throw exception
+	// Fixes #8950
+	if ( !doc.createDocumentFragment ) {
+		doc = document;
+	}
 
-	// Only cache "small" (1/2 KB) strings that are associated with the main document
+	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
 	// Cloning options loses the selected state, so don't cache them
 	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
 	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
 	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
-		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+		args[0].charAt(0) === "<" && !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
 
 		cacheable = true;
+
 		cacheresults = jQuery.fragments[ args[0] ];
-		if ( cacheresults ) {
-			if ( cacheresults !== 1 ) {
-				fragment = cacheresults;
-			}
+		if ( cacheresults && cacheresults !== 1 ) {
+			fragment = cacheresults;
 		}
 	}
 
@@ -4379,7 +6006,7 @@ function buildFragment( args, nodes, scripts ) {
 	}
 
 	return { fragment: fragment, cacheable: cacheable };
-}
+};
 
 jQuery.fragments = {};
 
@@ -4391,27 +6018,109 @@ jQuery.each({
 	replaceAll: "replaceWith"
 }, function( name, original ) {
 	jQuery.fn[ name ] = function( selector ) {
-		var ret = [], insert = jQuery( selector ),
+		var ret = [],
+			insert = jQuery( selector ),
 			parent = this.length === 1 && this[0].parentNode;
-		
+
 		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
 			insert[ original ]( this[0] );
 			return this;
-			
+
 		} else {
 			for ( var i = 0, l = insert.length; i < l; i++ ) {
 				var elems = (i > 0 ? this.clone(true) : this).get();
-				jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
+				jQuery( insert[i] )[ original ]( elems );
 				ret = ret.concat( elems );
 			}
-		
+
 			return this.pushStack( ret, name, insert.selector );
 		}
 	};
 });
 
+function getAll( elem ) {
+	if ( "getElementsByTagName" in elem ) {
+		return elem.getElementsByTagName( "*" );
+
+	} else if ( "querySelectorAll" in elem ) {
+		return elem.querySelectorAll( "*" );
+
+	} else {
+		return [];
+	}
+}
+
+// Used in clean, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+	if ( elem.type === "checkbox" || elem.type === "radio" ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+// Finds all inputs and passes them to fixDefaultChecked
+function findInputs( elem ) {
+	if ( jQuery.nodeName( elem, "input" ) ) {
+		fixDefaultChecked( elem );
+	} else if ( "getElementsByTagName" in elem ) {
+		jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
+	}
+}
+
 jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var clone = elem.cloneNode(true),
+				srcElements,
+				destElements,
+				i;
+
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+			// IE copies events bound via attachEvent when using cloneNode.
+			// Calling detachEvent on the clone will also remove the events
+			// from the original. In order to get around this, we use some
+			// proprietary methods to clear the events. Thanks to MooTools
+			// guys for this hotness.
+
+			cloneFixAttributes( elem, clone );
+
+			// Using Sizzle here is crazy slow, so we use getElementsByTagName
+			// instead
+			srcElements = getAll( elem );
+			destElements = getAll( clone );
+
+			// Weird iteration because IE will replace the length property
+			// with an element if you are cloning the body and one of the
+			// elements on the page has a name or id of "length"
+			for ( i = 0; srcElements[i]; ++i ) {
+				// Ensure that the destination node is not null; Fixes #9587
+				if ( destElements[i] ) {
+					cloneFixAttributes( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			cloneCopyEvent( elem, clone );
+
+			if ( deepDataAndEvents ) {
+				srcElements = getAll( elem );
+				destElements = getAll( clone );
+
+				for ( i = 0; srcElements[i]; ++i ) {
+					cloneCopyEvent( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		srcElements = destElements = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
 	clean: function( elems, context, fragment, scripts ) {
+		var checkScriptType;
+
 		context = context || document;
 
 		// !context.createElement fails in IE with an error but returns typeof 'object'
@@ -4419,7 +6128,7 @@ jQuery.extend({
 			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
 		}
 
-		var ret = [];
+		var ret = [], j;
 
 		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
 			if ( typeof elem === "number" ) {
@@ -4431,54 +6140,67 @@ jQuery.extend({
 			}
 
 			// Convert html string into DOM nodes
-			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
-				elem = context.createTextNode( elem );
-
-			} else if ( typeof elem === "string" ) {
-				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(rxhtmlTag, fcloseTag);
+			if ( typeof elem === "string" ) {
+				if ( !rhtml.test( elem ) ) {
+					elem = context.createTextNode( elem );
+				} else {
+					// Fix "XHTML"-style tags in all browsers
+					elem = elem.replace(rxhtmlTag, "<$1></$2>");
 
-				// Trim whitespace, otherwise indexOf won't work as expected
-				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
-					wrap = wrapMap[ tag ] || wrapMap._default,
-					depth = wrap[0],
-					div = context.createElement("div");
+					// Trim whitespace, otherwise indexOf won't work as expected
+					var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+						wrap = wrapMap[ tag ] || wrapMap._default,
+						depth = wrap[0],
+						div = context.createElement("div");
 
-				// Go to html and back, then peel off extra wrappers
-				div.innerHTML = wrap[1] + elem + wrap[2];
+					// Go to html and back, then peel off extra wrappers
+					div.innerHTML = wrap[1] + elem + wrap[2];
 
-				// Move to the right depth
-				while ( depth-- ) {
-					div = div.lastChild;
-				}
+					// Move to the right depth
+					while ( depth-- ) {
+						div = div.lastChild;
+					}
 
-				// Remove IE's autoinserted <tbody> from table fragments
-				if ( !jQuery.support.tbody ) {
+					// Remove IE's autoinserted <tbody> from table fragments
+					if ( !jQuery.support.tbody ) {
 
-					// String was a <table>, *may* have spurious <tbody>
-					var hasBody = rtbody.test(elem),
-						tbody = tag === "table" && !hasBody ?
-							div.firstChild && div.firstChild.childNodes :
+						// String was a <table>, *may* have spurious <tbody>
+						var hasBody = rtbody.test(elem),
+							tbody = tag === "table" && !hasBody ?
+								div.firstChild && div.firstChild.childNodes :
 
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !hasBody ?
-								div.childNodes :
-								[];
+								// String was a bare <thead> or <tfoot>
+								wrap[1] === "<table>" && !hasBody ?
+									div.childNodes :
+									[];
 
-					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
-						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-							tbody[ j ].parentNode.removeChild( tbody[ j ] );
+						for ( j = tbody.length - 1; j >= 0 ; --j ) {
+							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+								tbody[ j ].parentNode.removeChild( tbody[ j ] );
+							}
 						}
 					}
 
-				}
+					// IE completely kills leading whitespace when innerHTML is used
+					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+					}
 
-				// IE completely kills leading whitespace when innerHTML is used
-				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+					elem = div.childNodes;
 				}
+			}
 
-				elem = div.childNodes;
+			// Resets defaultChecked for any radios and checkboxes
+			// about to be appended to the DOM in IE 6/7 (#8060)
+			var len;
+			if ( !jQuery.support.appendChecked ) {
+				if ( elem[0] && typeof (len = elem.length) === "number" ) {
+					for ( j = 0; j < len; j++ ) {
+						findInputs( elem[j] );
+					}
+				} else {
+					findInputs( elem );
+				}
 			}
 
 			if ( elem.nodeType ) {
@@ -4489,13 +6211,18 @@ jQuery.extend({
 		}
 
 		if ( fragment ) {
-			for ( var i = 0; ret[i]; i++ ) {
+			checkScriptType = function( elem ) {
+				return !elem.type || rscriptType.test( elem.type );
+			};
+			for ( i = 0; ret[i]; i++ ) {
 				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
 					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
-				
+
 				} else {
 					if ( ret[i].nodeType === 1 ) {
-						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+						var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), checkScriptType );
+
+						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
 					}
 					fragment.appendChild( ret[i] );
 				}
@@ -4504,297 +6231,620 @@ jQuery.extend({
 
 		return ret;
 	},
-	
+
 	cleanData: function( elems ) {
-		var data, id, cache = jQuery.cache,
-			special = jQuery.event.special,
+		var data, id, cache = jQuery.cache, internalKey = jQuery.expando, special = jQuery.event.special,
 			deleteExpando = jQuery.support.deleteExpando;
-		
+
 		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+				continue;
+			}
+
 			id = elem[ jQuery.expando ];
-			
+
 			if ( id ) {
-				data = cache[ id ];
-				
-				if ( data.events ) {
+				data = cache[ id ] && cache[ id ][ internalKey ];
+
+				if ( data && data.events ) {
 					for ( var type in data.events ) {
 						if ( special[ type ] ) {
 							jQuery.event.remove( elem, type );
 
+						// This is a shortcut to avoid jQuery.event.remove's overhead
 						} else {
-							removeEvent( elem, type, data.handle );
+							jQuery.removeEvent( elem, type, data.handle );
 						}
 					}
+
+					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
+					if ( data.handle ) {
+						data.handle.elem = null;
+					}
 				}
-				
+
 				if ( deleteExpando ) {
 					delete elem[ jQuery.expando ];
 
 				} else if ( elem.removeAttribute ) {
 					elem.removeAttribute( jQuery.expando );
 				}
-				
+
 				delete cache[ id ];
 			}
 		}
 	}
 });
-// exclude the following css properties to add px
-var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-	ralpha = /alpha\([^)]*\)/,
+
+function evalScript( i, elem ) {
+	if ( elem.src ) {
+		jQuery.ajax({
+			url: elem.src,
+			async: false,
+			dataType: "script"
+		});
+	} else {
+		jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
+	}
+
+	if ( elem.parentNode ) {
+		elem.parentNode.removeChild( elem );
+	}
+}
+
+
+
+
+var ralpha = /alpha\([^)]*\)/i,
 	ropacity = /opacity=([^)]*)/,
-	rfloat = /float/i,
-	rdashAlpha = /-([a-z])/ig,
-	rupper = /([A-Z])/g,
+	// fixed for IE9, see #8346
+	rupper = /([A-Z]|^ms)/g,
 	rnumpx = /^-?\d+(?:px)?$/i,
 	rnum = /^-?\d/,
+	rrelNum = /^([\-+])=([\-+.\de]+)/,
 
-	cssShow = { position: "absolute", visibility: "hidden", display:"block" },
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
 	cssWidth = [ "Left", "Right" ],
 	cssHeight = [ "Top", "Bottom" ],
+	curCSS,
 
-	// cache check for defaultView.getComputedStyle
-	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
-	// normalize float css property
-	styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
+	getComputedStyle,
+	currentStyle;
 
 jQuery.fn.css = function( name, value ) {
-	return access( this, name, value, true, function( elem, name, value ) {
-		if ( value === undefined ) {
-			return jQuery.curCSS( elem, name );
-		}
-		
-		if ( typeof value === "number" && !rexclude.test(name) ) {
-			value += "px";
-		}
+	// Setting 'undefined' is a no-op
+	if ( arguments.length === 2 && value === undefined ) {
+		return this;
+	}
 
-		jQuery.style( elem, name, value );
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
+		return value !== undefined ?
+			jQuery.style( elem, name, value ) :
+			jQuery.css( elem, name );
 	});
 };
 
 jQuery.extend({
-	style: function( elem, name, value ) {
-		// don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return undefined;
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity", "opacity" );
+					return ret === "" ? "1" : ret;
+
+				} else {
+					return elem.style.opacity;
+				}
+			}
 		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"fillOpacity": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
 
-		// ignore negative width and height values #1599
-		if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
-			value = undefined;
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
 		}
 
-		var style = elem.style || elem, set = value !== undefined;
+		// Make sure that we're working with the right name
+		var ret, type, origName = jQuery.camelCase( name ),
+			style = elem.style, hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
 
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" ) {
-			if ( set ) {
-				// IE has trouble with opacity if it does not have layout
-				// Force it by setting the zoom level
-				style.zoom = 1;
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
 
-				// Set the alpha filter to set the opacity
-				var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
-				var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
-				style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
+			// convert relative number strings (+= or -=) to relative numbers. #7345
+			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+				value = ( +( ret[1] + 1) * +ret[2] ) + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
 			}
 
-			return style.filter && style.filter.indexOf("opacity=") >= 0 ?
-				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
-				"";
-		}
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( value == null || type === "number" && isNaN( value ) ) {
+				return;
+			}
 
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
-		}
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
 
-		name = name.replace(rdashAlpha, fcamelCase);
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
 
-		if ( set ) {
-			style[ name ] = value;
+			// Otherwise just get the value from the style object
+			return style[ name ];
 		}
-
-		return style[ name ];
 	},
 
-	css: function( elem, name, force, extra ) {
-		if ( name === "width" || name === "height" ) {
-			var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
+	css: function( elem, name, extra ) {
+		var ret, hooks;
 
-			function getWH() {
-				val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+		// Make sure that we're working with the right name
+		name = jQuery.camelCase( name );
+		hooks = jQuery.cssHooks[ name ];
+		name = jQuery.cssProps[ name ] || name;
 
-				if ( extra === "border" ) {
-					return;
-				}
+		// cssFloat needs a special treatment
+		if ( name === "cssFloat" ) {
+			name = "float";
+		}
 
-				jQuery.each( which, function() {
-					if ( !extra ) {
-						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					}
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
+			return ret;
 
-					if ( extra === "margin" ) {
-						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
-					} else {
-						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-					}
-				});
-			}
+		// Otherwise, if a way to get the computed value exists, use that
+		} else if ( curCSS ) {
+			return curCSS( elem, name );
+		}
+	},
 
-			if ( elem.offsetWidth !== 0 ) {
-				getWH();
-			} else {
-				jQuery.swap( elem, props, getWH );
-			}
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
 
-			return Math.max(0, Math.round(val));
+		// Remember the old values, and insert the new ones
+		for ( var name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
 		}
 
-		return jQuery.curCSS( elem, name, force );
-	},
+		callback.call( elem );
 
-	curCSS: function( elem, name, force ) {
-		var ret, style = elem.style, filter;
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	}
+});
 
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
-			ret = ropacity.test(elem.currentStyle.filter || "") ?
-				(parseFloat(RegExp.$1) / 100) + "" :
-				"";
+// DEPRECATED, Use jQuery.css() instead
+jQuery.curCSS = jQuery.css;
 
-			return ret === "" ?
-				"1" :
-				ret;
-		}
+jQuery.each(["height", "width"], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			var val;
 
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
-		}
+			if ( computed ) {
+				if ( elem.offsetWidth !== 0 ) {
+					return getWH( elem, name, extra );
+				} else {
+					jQuery.swap( elem, cssShow, function() {
+						val = getWH( elem, name, extra );
+					});
+				}
+
+				return val;
+			}
+		},
 
-		if ( !force && style && style[ name ] ) {
-			ret = style[ name ];
+		set: function( elem, value ) {
+			if ( rnumpx.test( value ) ) {
+				// ignore negative width and height values #1599
+				value = parseFloat( value );
 
-		} else if ( getComputedStyle ) {
+				if ( value >= 0 ) {
+					return value + "px";
+				}
 
-			// Only "float" is needed here
-			if ( rfloat.test( name ) ) {
-				name = "float";
+			} else {
+				return value;
 			}
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+				( parseFloat( RegExp.$1 ) / 100 ) + "" :
+				computed ? "1" : "";
+		},
 
-			name = name.replace( rupper, "-$1" ).toLowerCase();
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNaN( value ) ? "" : "alpha(opacity=" + value * 100 + ")",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
 
-			var defaultView = elem.ownerDocument.defaultView;
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
 
-			if ( !defaultView ) {
-				return null;
+			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+			if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there there is no filter style applied in a css rule, we are done
+				if ( currentStyle && !currentStyle.filter ) {
+					return;
+				}
 			}
 
-			var computedStyle = defaultView.getComputedStyle( elem, null );
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
 
-			if ( computedStyle ) {
-				ret = computedStyle.getPropertyValue( name );
+jQuery(function() {
+	// This hook cannot be added until DOM ready because the support test
+	// for it is not run until after DOM ready
+	if ( !jQuery.support.reliableMarginRight ) {
+		jQuery.cssHooks.marginRight = {
+			get: function( elem, computed ) {
+				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+				// Work around by temporarily setting element display to inline-block
+				var ret;
+				jQuery.swap( elem, { "display": "inline-block" }, function() {
+					if ( computed ) {
+						ret = curCSS( elem, "margin-right", "marginRight" );
+					} else {
+						ret = elem.style.marginRight;
+					}
+				});
+				return ret;
 			}
+		};
+	}
+});
+
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	getComputedStyle = function( elem, name ) {
+		var ret, defaultView, computedStyle;
+
+		name = name.replace( rupper, "-$1" ).toLowerCase();
 
-			// We should always get a number back from opacity
-			if ( name === "opacity" && ret === "" ) {
-				ret = "1";
+		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
+			return undefined;
+		}
+
+		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
 			}
+		}
 
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(rdashAlpha, fcamelCase);
+		return ret;
+	};
+}
 
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+if ( document.documentElement.currentStyle ) {
+	currentStyle = function( elem, name ) {
+		var left,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ],
+			style = elem.style;
 
-			// From the awesome hack by Dean Edwards
-			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
 
-			// If we're not dealing with a regular pixel number
-			// but a number that has a weird ending, we need to convert it to pixels
-			if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-				// Remember the original values
-				var left = style.left, rsLeft = elem.runtimeStyle.left;
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+			// Remember the original values
+			left = style.left;
 
-				// Put in the new values to get a computed value out
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
 				elem.runtimeStyle.left = elem.currentStyle.left;
-				style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
-				ret = style.pixelLeft + "px";
+			}
+			style.left = name === "fontSize" ? "1em" : (ret || 0);
+			ret = style.pixelLeft + "px";
 
-				// Revert the changed values
-				style.left = left;
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
 				elem.runtimeStyle.left = rsLeft;
 			}
 		}
 
-		return ret;
-	},
+		return ret === "" ? "auto" : ret;
+	};
+}
 
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
+curCSS = getComputedStyle || currentStyle;
 
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
+function getWH( elem, name, extra ) {
 
-		callback.call( elem );
+	// Start with offset property
+	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		which = name === "width" ? cssWidth : cssHeight;
 
-		// Revert the old values
-		for ( var name in options ) {
-			elem.style[ name ] = old[ name ];
+	if ( val > 0 ) {
+		if ( extra !== "border" ) {
+			jQuery.each( which, function() {
+				if ( !extra ) {
+					val -= parseFloat( jQuery.css( elem, "padding" + this ) ) || 0;
+				}
+				if ( extra === "margin" ) {
+					val += parseFloat( jQuery.css( elem, extra + this ) ) || 0;
+				} else {
+					val -= parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0;
+				}
+			});
 		}
+
+		return val + "px";
 	}
-});
+
+	// Fall back to computed then uncomputed css if necessary
+	val = curCSS( elem, name, name );
+	if ( val < 0 || val == null ) {
+		val = elem.style[ name ] || 0;
+	}
+	// Normalize "", auto, and prepare for extra
+	val = parseFloat( val ) || 0;
+
+	// Add padding, border, margin
+	if ( extra ) {
+		jQuery.each( which, function() {
+			val += parseFloat( jQuery.css( elem, "padding" + this ) ) || 0;
+			if ( extra !== "padding" ) {
+				val += parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0;
+			}
+			if ( extra === "margin" ) {
+				val += parseFloat( jQuery.css( elem, extra + this ) ) || 0;
+			}
+		});
+	}
+
+	return val + "px";
+}
 
 if ( jQuery.expr && jQuery.expr.filters ) {
 	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth, height = elem.offsetHeight,
-			skip = elem.nodeName.toLowerCase() === "tr";
-
-		return width === 0 && height === 0 && !skip ?
-			true :
-			width > 0 && height > 0 && !skip ?
-				false :
-				jQuery.curCSS(elem, "display") === "none";
+		var width = elem.offsetWidth,
+			height = elem.offsetHeight;
+
+		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
 	};
 
 	jQuery.expr.filters.visible = function( elem ) {
 		return !jQuery.expr.filters.hidden( elem );
 	};
 }
-var jsc = now(),
-	rscript = /<script(.|\s)*?\/script>/gi,
-	rselectTextarea = /select|textarea/i,
-	rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
-	jsre = /=\?(&|$)/,
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rhash = /#.*$/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
 	rquery = /\?/,
-	rts = /(\?|&)_=.*?(&|$)/,
-	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
-	r20 = /%20/g,
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rspacesAjax = /\s+/,
+	rts = /([?&])_=[^&]*/,
+	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
 
 	// Keep a copy of the old load method
-	_load = jQuery.fn.load;
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Document location
+	ajaxLocation,
+
+	// Document location segments
+	ajaxLocParts,
+	
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = ["*/"] + ["*"];
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+	ajaxLocation = location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		if ( jQuery.isFunction( func ) ) {
+			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
+				i = 0,
+				length = dataTypes.length,
+				dataType,
+				list,
+				placeBefore;
+
+			// For each dataType in the dataTypeExpression
+			for(; i < length; i++ ) {
+				dataType = dataTypes[ i ];
+				// We control if we're asked to add before
+				// any existing element
+				placeBefore = /^\+/.test( dataType );
+				if ( placeBefore ) {
+					dataType = dataType.substr( 1 ) || "*";
+				}
+				list = structure[ dataType ] = structure[ dataType ] || [];
+				// then we add to the structure accordingly
+				list[ placeBefore ? "unshift" : "push" ]( func );
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
+		dataType /* internal */, inspected /* internal */ ) {
+
+	dataType = dataType || options.dataTypes[ 0 ];
+	inspected = inspected || {};
+
+	inspected[ dataType ] = true;
+
+	var list = structure[ dataType ],
+		i = 0,
+		length = list ? list.length : 0,
+		executeOnly = ( structure === prefilters ),
+		selection;
+
+	for(; i < length && ( executeOnly || !selection ); i++ ) {
+		selection = list[ i ]( options, originalOptions, jqXHR );
+		// If we got redirected to another dataType
+		// we try there if executing only and not done already
+		if ( typeof selection === "string" ) {
+			if ( !executeOnly || inspected[ selection ] ) {
+				selection = undefined;
+			} else {
+				options.dataTypes.unshift( selection );
+				selection = inspectPrefiltersOrTransports(
+						structure, options, originalOptions, jqXHR, selection, inspected );
+			}
+		}
+	}
+	// If we're only executing or nothing was selected
+	// we try the catchall dataType if not done already
+	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
+		selection = inspectPrefiltersOrTransports(
+				structure, options, originalOptions, jqXHR, "*", inspected );
+	}
+	// unnecessary when only executing (prefilters)
+	// but it'll be ignored by the caller in that case
+	return selection;
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var key, deep,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+	for( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+}
 
 jQuery.fn.extend({
 	load: function( url, params, callback ) {
-		if ( typeof url !== "string" ) {
-			return _load.call( this, url );
+		if ( typeof url !== "string" && _load ) {
+			return _load.apply( this, arguments );
 
 		// Don't do a request if no elements are being requested
 		} else if ( !this.length ) {
 			return this;
 		}
 
-		var off = url.indexOf(" ");
+		var off = url.indexOf( " " );
 		if ( off >= 0 ) {
-			var selector = url.slice(off, url.length);
-			url = url.slice(0, off);
+			var selector = url.slice( off, url.length );
+			url = url.slice( 0, off );
 		}
 
 		// Default to a GET request
@@ -4806,7 +6856,7 @@ jQuery.fn.extend({
 			if ( jQuery.isFunction( params ) ) {
 				// We assume that it's the callback
 				callback = params;
-				params = null;
+				params = undefined;
 
 			// Otherwise, build a param string
 			} else if ( typeof params === "object" ) {
@@ -4823,26 +6873,34 @@ jQuery.fn.extend({
 			type: type,
 			dataType: "html",
 			data: params,
-			complete: function( res, status ) {
+			// Complete callback (responseText is used internally)
+			complete: function( jqXHR, status, responseText ) {
+				// Store the response as specified by the jqXHR object
+				responseText = jqXHR.responseText;
 				// If successful, inject the HTML into all the matched elements
-				if ( status === "success" || status === "notmodified" ) {
+				if ( jqXHR.isResolved() ) {
+					// #4825: Get the actual response in case
+					// a dataFilter is present in ajaxSettings
+					jqXHR.done(function( r ) {
+						responseText = r;
+					});
 					// See if a selector was specified
 					self.html( selector ?
 						// Create a dummy div to hold the results
-						jQuery("<div />")
+						jQuery("<div>")
 							// inject the contents of the document in, removing the scripts
 							// to avoid any 'Permission Denied' errors in IE
-							.append(res.responseText.replace(rscript, ""))
+							.append(responseText.replace(rscript, ""))
 
 							// Locate the specified elements
 							.find(selector) :
 
 						// If not, just inject the full result
-						res.responseText );
+						responseText );
 				}
 
 				if ( callback ) {
-					self.each( callback, [res.responseText, status, res] );
+					self.each( callback, [ responseText, status, jqXHR ] );
 				}
 			}
 		});
@@ -4851,88 +6909,87 @@ jQuery.fn.extend({
 	},
 
 	serialize: function() {
-		return jQuery.param(this.serializeArray());
+		return jQuery.param( this.serializeArray() );
 	},
+
 	serializeArray: function() {
-		return this.map(function() {
-			return this.elements ? jQuery.makeArray(this.elements) : this;
+		return this.map(function(){
+			return this.elements ? jQuery.makeArray( this.elements ) : this;
 		})
-		.filter(function() {
+		.filter(function(){
 			return this.name && !this.disabled &&
-				(this.checked || rselectTextarea.test(this.nodeName) ||
-					rinput.test(this.type));
+				( this.checked || rselectTextarea.test( this.nodeName ) ||
+					rinput.test( this.type ) );
 		})
-		.map(function( i, elem ) {
-			var val = jQuery(this).val();
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
 
 			return val == null ?
 				null :
-				jQuery.isArray(val) ?
-					jQuery.map( val, function( val, i ) {
-						return { name: elem.name, value: val };
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val, i ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
 					}) :
-					{ name: elem.name, value: val };
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
 		}).get();
 	}
 });
 
 // Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
-	jQuery.fn[o] = function( f ) {
-		return this.bind(o, f);
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
+	jQuery.fn[ o ] = function( f ){
+		return this.bind( o, f );
 	};
 });
 
-jQuery.extend({
-
-	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
 			callback = data;
-			data = null;
+			data = undefined;
 		}
 
 		return jQuery.ajax({
-			type: "GET",
+			type: method,
 			url: url,
 			data: data,
 			success: callback,
 			dataType: type
 		});
-	},
+	};
+});
+
+jQuery.extend({
 
 	getScript: function( url, callback ) {
-		return jQuery.get(url, null, callback, "script");
+		return jQuery.get( url, undefined, callback, "script" );
 	},
 
 	getJSON: function( url, data, callback ) {
-		return jQuery.get(url, data, callback, "json");
+		return jQuery.get( url, data, callback, "json" );
 	},
 
-	post: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = {};
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		if ( settings ) {
+			// Building a settings object
+			ajaxExtend( target, jQuery.ajaxSettings );
+		} else {
+			// Extending ajaxSettings
+			settings = target;
+			target = jQuery.ajaxSettings;
 		}
-
-		return jQuery.ajax({
-			type: "POST",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	ajaxSetup: function( settings ) {
-		jQuery.extend( jQuery.ajaxSettings, settings );
+		ajaxExtend( target, settings );
+		return target;
 	},
 
 	ajaxSettings: {
-		url: location.href,
+		url: ajaxLocation,
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
 		global: true,
 		type: "GET",
 		contentType: "application/x-www-form-urlencoded",
@@ -4941,507 +6998,1075 @@ jQuery.extend({
 		/*
 		timeout: 0,
 		data: null,
+		dataType: null,
 		username: null,
 		password: null,
+		cache: null,
 		traditional: false,
+		headers: {},
 		*/
-		// Create the request object; Microsoft failed to properly
-		// implement the XMLHttpRequest in IE7 (can't request local files),
-		// so we use the ActiveXObject when it is available
-		// This function can be overriden by calling jQuery.ajaxSetup
-		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
-			function() {
-				return new window.XMLHttpRequest();
-			} :
-			function() {
-				try {
-					return new window.ActiveXObject("Microsoft.XMLHTTP");
-				} catch(e) {}
-			},
+
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
-			script: "text/javascript, application/javascript",
-			json: "application/json, text/javascript",
 			text: "text/plain",
-			_default: "*/*"
-		}
-	},
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
+			json: "application/json, text/javascript",
+			"*": allTypes
+		},
 
-	ajax: function( origSettings ) {
-		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
-		
-		var jsonp, status, data,
-			callbackContext = origSettings && origSettings.context || s,
-			type = s.type.toUpperCase();
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
 
-		// convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText"
+		},
 
-		// Handle JSONP Parameter Callbacks
-		if ( s.dataType === "jsonp" ) {
-			if ( type === "GET" ) {
-				if ( !jsre.test( s.url ) ) {
-					s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
-				}
-			} else if ( !s.data || !jsre.test(s.data) ) {
-				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
-			}
-			s.dataType = "json";
-		}
+		// List of data converters
+		// 1) key format is "source_type destination_type" (a single space in-between)
+		// 2) the catchall symbol "*" can be used for source_type
+		converters: {
 
-		// Build temporary JSONP function
-		if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
-			jsonp = s.jsonpCallback || ("jsonp" + jsc++);
+			// Convert anything to text
+			"* text": window.String,
 
-			// Replace the =? sequence both in the query string and the data
-			if ( s.data ) {
-				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
-			}
+			// Text to html (true = no transformation)
+			"text html": true,
 
-			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
 
-			// We need to make sure
-			// that a JSONP style response is executed properly
-			s.dataType = "script";
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
 
-			// Handle JSONP-style loading
-			window[ jsonp ] = window[ jsonp ] || function( tmp ) {
-				data = tmp;
-				success();
-				complete();
-				// Garbage collect
-				window[ jsonp ] = undefined;
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			context: true,
+			url: true
+		}
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events
+			// It's the callbackContext if one was provided in the options
+			// and if it's a DOM node or a jQuery collection
+			globalEventContext = callbackContext !== s &&
+				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
+						jQuery( callbackContext ) : jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery._Deferred(),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// ifModified key
+			ifModifiedKey,
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// transport
+			transport,
+			// timeout handle
+			timeoutTimer,
+			// Cross-domain detection vars
+			parts,
+			// The jqXHR state
+			state = 0,
+			// To know if global events are to be dispatched
+			fireGlobals,
+			// Loop variable
+			i,
+			// Fake xhr
+			jqXHR = {
+
+				readyState: 0,
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					if ( !state ) {
+						var lname = name.toLowerCase();
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match === undefined ? null : match;
+				},
 
-				try {
-					delete window[ jsonp ];
-				} catch(e) {}
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
 
-				if ( head ) {
-					head.removeChild( script );
+				// Cancel the request
+				abort: function( statusText ) {
+					statusText = statusText || "abort";
+					if ( transport ) {
+						transport.abort( statusText );
+					}
+					done( 0, statusText );
+					return this;
 				}
 			};
-		}
-
-		if ( s.dataType === "script" && s.cache === null ) {
-			s.cache = false;
-		}
-
-		if ( s.cache === false && type === "GET" ) {
-			var ts = now();
 
-			// try replacing _= if it is there
-			var ret = s.url.replace(rts, "$1_=" + ts + "$2");
-
-			// if nothing was replaced, add timestamp to the end
-			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
-		}
+		// Callback for when everything is done
+		// It is defined here because jslint complains if it is declared
+		// at the end of the function (which would be more logical and readable)
+		function done( status, nativeStatusText, responses, headers ) {
 
-		// If data is available, append data to url for get requests
-		if ( s.data && type === "GET" ) {
-			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
-		}
-
-		// Watch for a new set of requests
-		if ( s.global && ! jQuery.active++ ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
 
-		// Matches an absolute URL, and saves the domain
-		var parts = rurl.exec( s.url ),
-			remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+			// State is "done" now
+			state = 2;
 
-		// If we're requesting a remote document
-		// and trying to load JSON or Script with a GET
-		if ( s.dataType === "script" && type === "GET" && remote ) {
-			var head = document.getElementsByTagName("head")[0] || document.documentElement;
-			var script = document.createElement("script");
-			script.src = s.url;
-			if ( s.scriptCharset ) {
-				script.charset = s.scriptCharset;
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
 			}
 
-			// Handle Script loading
-			if ( !jsonp ) {
-				var done = false;
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
 
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function() {
-					if ( !done && (!this.readyState ||
-							this.readyState === "loaded" || this.readyState === "complete") ) {
-						done = true;
-						success();
-						complete();
+			// Cache response headers
+			responseHeadersString = headers || "";
 
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
-					}
-				};
-			}
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
 
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709 and #4378).
-			head.insertBefore( script, head.firstChild );
+			var isSuccess,
+				success,
+				error,
+				statusText = nativeStatusText,
+				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
+				lastModified,
+				etag;
 
-			// We handle everything using the script element injection
-			return undefined;
-		}
+			// If successful, handle type chaining
+			if ( status >= 200 && status < 300 || status === 304 ) {
 
-		var requestDone = false;
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
 
-		// Create the request object
-		var xhr = s.xhr();
+					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
+						jQuery.lastModified[ ifModifiedKey ] = lastModified;
+					}
+					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
+						jQuery.etag[ ifModifiedKey ] = etag;
+					}
+				}
 
-		if ( !xhr ) {
-			return;
-		}
+				// If not modified
+				if ( status === 304 ) {
 
-		// Open the socket
-		// Passing null username, generates a login popup on Opera (#2865)
-		if ( s.username ) {
-			xhr.open(type, s.url, s.async, s.username, s.password);
-		} else {
-			xhr.open(type, s.url, s.async);
-		}
+					statusText = "notmodified";
+					isSuccess = true;
 
-		// Need an extra try/catch for cross domain requests in Firefox 3
-		try {
-			// Set the correct header, if data is being sent
-			if ( s.data || origSettings && origSettings.contentType ) {
-				xhr.setRequestHeader("Content-Type", s.contentType);
-			}
+				// If we have data
+				} else {
 
-			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-			if ( s.ifModified ) {
-				if ( jQuery.lastModified[s.url] ) {
-					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
+					try {
+						success = ajaxConvert( s, response );
+						statusText = "success";
+						isSuccess = true;
+					} catch(e) {
+						// We have a parsererror
+						statusText = "parsererror";
+						error = e;
+					}
 				}
-
-				if ( jQuery.etag[s.url] ) {
-					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if( !statusText || status ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
 				}
 			}
 
-			// Set header so the called script knows that it's an XMLHttpRequest
-			// Only send the header if it's not a remote XHR
-			if ( !remote ) {
-				xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-			}
-
-			// Set the Accepts header for the server, depending on the dataType
-			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
-				s.accepts[ s.dataType ] + ", */*" :
-				s.accepts._default );
-		} catch(e) {}
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = "" + ( nativeStatusText || statusText );
 
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) {
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
 			}
 
-			// close opended socket
-			xhr.abort();
-			return false;
-		}
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
 
-		if ( s.global ) {
-			trigger("ajaxSend", [xhr, s]);
-		}
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
+						[ jqXHR, s, isSuccess ? success : error ] );
+			}
 
-		// Wait for a response to come back
-		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
-			// The request was aborted
-			if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
-				// Opera doesn't call onreadystatechange before this point
-				// so we simulate the call
-				if ( !requestDone ) {
-					complete();
-				}
+			// Complete
+			completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] );
 
-				requestDone = true;
-				if ( xhr ) {
-					xhr.onreadystatechange = jQuery.noop;
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger( "ajaxStop" );
 				}
+			}
+		}
 
-			// The transfer is complete and the data is available, or the request timed out
-			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
-				requestDone = true;
-				xhr.onreadystatechange = jQuery.noop;
-
-				status = isTimeout === "timeout" ?
-					"timeout" :
-					!jQuery.httpSuccess( xhr ) ?
-						"error" :
-						s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
-							"notmodified" :
-							"success";
-
-				var errMsg;
-
-				if ( status === "success" ) {
-					// Watch for, and catch, XML document parse errors
-					try {
-						// process the data (runs the xml through httpData regardless of callback)
-						data = jQuery.httpData( xhr, s.dataType, s );
-					} catch(err) {
-						status = "parsererror";
-						errMsg = err;
-					}
-				}
+		// Attach deferreds
+		deferred.promise( jqXHR );
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+		jqXHR.complete = completeDeferred.done;
 
-				// Make sure that the request was successful or notmodified
-				if ( status === "success" || status === "notmodified" ) {
-					// JSONP handles its own success callback
-					if ( !jsonp ) {
-						success();
+		// Status-dependent callbacks
+		jqXHR.statusCode = function( map ) {
+			if ( map ) {
+				var tmp;
+				if ( state < 2 ) {
+					for( tmp in map ) {
+						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
 					}
 				} else {
-					jQuery.handleError(s, xhr, status, errMsg);
-				}
-
-				// Fire the complete handlers
-				complete();
-
-				if ( isTimeout === "timeout" ) {
-					xhr.abort();
-				}
-
-				// Stop memory leaks
-				if ( s.async ) {
-					xhr = null;
+					tmp = map[ jqXHR.status ];
+					jqXHR.then( tmp, tmp );
 				}
 			}
+			return this;
 		};
 
-		// Override the abort handler, if we can (IE doesn't allow it, but that's OK)
-		// Opera doesn't fire onreadystatechange at all on abort
-		try {
-			var oldAbort = xhr.abort;
-			xhr.abort = function() {
-				if ( xhr ) {
-					oldAbort.call( xhr );
-				}
-
-				onreadystatechange( "abort" );
-			};
-		} catch(e) { }
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
 
-		// Timeout checker
-		if ( s.async && s.timeout > 0 ) {
-			setTimeout(function() {
-				// Check to see if the request is still happening
-				if ( xhr && !requestDone ) {
-					onreadystatechange( "timeout" );
-				}
-			}, s.timeout);
-		}
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
 
-		// Send the data
-		try {
-			xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
-		} catch(e) {
-			jQuery.handleError(s, xhr, null, e);
-			// Fire the complete handlers
-			complete();
+		// Determine if a cross-domain request is in order
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
 		}
 
-		// firefox 1.5 doesn't fire statechange for sync requests
-		if ( !s.async ) {
-			onreadystatechange();
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
 		}
 
-		function success() {
-			// If a local callback was specified, fire it and pass it the data
-			if ( s.success ) {
-				s.success.call( callbackContext, data, status, xhr );
-			}
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
 
-			// Fire the global callback
-			if ( s.global ) {
-				trigger( "ajaxSuccess", [xhr, s] );
-			}
+		// If request was aborted inside a prefiler, stop there
+		if ( state === 2 ) {
+			return false;
 		}
 
-		function complete() {
-			// Process result
-			if ( s.complete ) {
-				s.complete.call( callbackContext, xhr, status);
-			}
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
 
-			// The request was completed
-			if ( s.global ) {
-				trigger( "ajaxComplete", [xhr, s] );
-			}
-
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-		}
-		
-		function trigger(type, args) {
-			(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
-		}
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
 
-		// return XMLHttpRequest to allow aborting the request etc.
-		return xhr;
-	},
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
 
-	handleError: function( s, xhr, status, e ) {
-		// If a local callback was specified, fire it
-		if ( s.error ) {
-			s.error.call( s.context || s, xhr, status, e );
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
 		}
 
-		// Fire the global callback
-		if ( s.global ) {
-			(s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
-		}
-	},
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
 
-	// Counter for holding the number of active queries
-	active: 0,
+			// If data is available, append data to url
+			if ( s.data ) {
+				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
 
-	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function( xhr ) {
-		try {
-			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-			return !xhr.status && location.protocol === "file:" ||
-				// Opera returns 0 when status is 304
-				( xhr.status >= 200 && xhr.status < 300 ) ||
-				xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
-		} catch(e) {}
+			// Get ifModifiedKey before adding the anti-cache parameter
+			ifModifiedKey = s.url;
 
-		return false;
-	},
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
 
-	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function( xhr, url ) {
-		var lastModified = xhr.getResponseHeader("Last-Modified"),
-			etag = xhr.getResponseHeader("Etag");
+				var ts = jQuery.now(),
+					// try replacing _= if it is there
+					ret = s.url.replace( rts, "$1_=" + ts );
 
-		if ( lastModified ) {
-			jQuery.lastModified[url] = lastModified;
+				// if nothing was replaced, add timestamp to the end
+				s.url = ret + ( (ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+			}
 		}
 
-		if ( etag ) {
-			jQuery.etag[url] = etag;
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
 		}
 
-		// Opera returns 0 when status is 304
-		return xhr.status === 304 || xhr.status === 0;
-	},
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			ifModifiedKey = ifModifiedKey || s.url;
+			if ( jQuery.lastModified[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
+			}
+			if ( jQuery.etag[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
+			}
+		}
 
-	httpData: function( xhr, type, s ) {
-		var ct = xhr.getResponseHeader("content-type") || "",
-			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
-			data = xml ? xhr.responseXML : xhr.responseText;
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
 
-		if ( xml && data.documentElement.nodeName === "parsererror" ) {
-			jQuery.error( "parsererror" );
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
 		}
 
-		// Allow a pre-filtering function to sanitize the response
-		// s is checked to keep backwards compatibility
-		if ( s && s.dataFilter ) {
-			data = s.dataFilter( data, type );
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+				// Abort if not done already
+				jqXHR.abort();
+				return false;
+
 		}
 
-		// The filter can actually parse the response
-		if ( typeof data === "string" ) {
-			// Get the JavaScript object, if JSON is used.
-			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
-				data = jQuery.parseJSON( data );
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
 
-			// If the type is "script", eval it in global context
-			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
-				jQuery.globalEval( data );
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout( function(){
+					jqXHR.abort( "timeout" );
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch (e) {
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					jQuery.error( e );
+				}
 			}
 		}
 
-		return data;
+		return jqXHR;
 	},
 
 	// Serialize an array of form elements or a set of
 	// key/values into a query string
 	param: function( a, traditional ) {
-		var s = [];
-		
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction( value ) ? value() : value;
+				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+			};
+
 		// Set traditional to true for jQuery <= 1.3.2 behavior.
 		if ( traditional === undefined ) {
 			traditional = jQuery.ajaxSettings.traditional;
 		}
-		
+
 		// If an array was passed in, assume that it is an array of form elements.
-		if ( jQuery.isArray(a) || a.jquery ) {
+		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
 			// Serialize the form elements
 			jQuery.each( a, function() {
 				add( this.name, this.value );
 			});
-			
+
 		} else {
 			// If traditional, encode the "old" way (the way 1.3.2 or older
 			// did it), otherwise encode params recursively.
 			for ( var prefix in a ) {
-				buildParams( prefix, a[prefix] );
+				buildParams( prefix, a[ prefix ], traditional, add );
 			}
 		}
 
 		// Return the resulting serialization
-		return s.join("&").replace(r20, "+");
-
-		function buildParams( prefix, obj ) {
-			if ( jQuery.isArray(obj) ) {
-				// Serialize array item.
-				jQuery.each( obj, function( i, v ) {
-					if ( traditional || /\[\]$/.test( prefix ) ) {
-						// Treat each array item as a scalar.
-						add( prefix, v );
-					} else {
-						// If array item is non-scalar (array or object), encode its
-						// numeric index to resolve deserialization ambiguity issues.
-						// Note that rack (as of 1.0.0) can't currently deserialize
-						// nested arrays properly, and attempting to do so may cause
-						// a server error. Possible fixes are to modify rack's
-						// deserialization algorithm or to provide an option or flag
-						// to force array serialization to be shallow.
-						buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v );
-					}
-				});
-					
-			} else if ( !traditional && obj != null && typeof obj === "object" ) {
-				// Serialize object item.
-				jQuery.each( obj, function( k, v ) {
-					buildParams( prefix + "[" + k + "]", v );
-				});
-					
+		return s.join( "&" ).replace( r20, "+" );
+	}
+});
+
+function buildParams( prefix, obj, traditional, add ) {
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
 			} else {
-				// Serialize scalar item.
-				add( prefix, obj );
+				// If array item is non-scalar (array or object), encode its
+				// numeric index to resolve deserialization ambiguity issues.
+				// Note that rack (as of 1.0.0) can't currently deserialize
+				// nested arrays properly, and attempting to do so may cause
+				// a server error. Possible fixes are to modify rack's
+				// deserialization algorithm or to provide an option or flag
+				// to force array serialization to be shallow.
+				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && obj != null && typeof obj === "object" ) {
+		// Serialize object item.
+		for ( var name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {}
+
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+	var contents = s.contents,
+		dataTypes = s.dataTypes,
+		responseFields = s.responseFields,
+		ct,
+		type,
+		finalDataType,
+		firstDataType;
+
+	// Fill responseXXX fields
+	for( type in responseFields ) {
+		if ( type in responses ) {
+			jqXHR[ responseFields[type] ] = responses[ type ];
+		}
+	}
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+
+	// Apply the dataFilter if provided
+	if ( s.dataFilter ) {
+		response = s.dataFilter( response, s.dataType );
+	}
+
+	var dataTypes = s.dataTypes,
+		converters = {},
+		i,
+		key,
+		length = dataTypes.length,
+		tmp,
+		// Current and previous dataTypes
+		current = dataTypes[ 0 ],
+		prev,
+		// Conversion expression
+		conversion,
+		// Conversion function
+		conv,
+		// Conversion functions (transitive conversion)
+		conv1,
+		conv2;
+
+	// For each dataType in the chain
+	for( i = 1; i < length; i++ ) {
+
+		// Create converters map
+		// with lowercased keys
+		if ( i === 1 ) {
+			for( key in s.converters ) {
+				if( typeof key === "string" ) {
+					converters[ key.toLowerCase() ] = s.converters[ key ];
+				}
+			}
+		}
+
+		// Get the dataTypes
+		prev = current;
+		current = dataTypes[ i ];
+
+		// If current is auto dataType, update it to prev
+		if( current === "*" ) {
+			current = prev;
+		// If no auto and dataTypes are actually different
+		} else if ( prev !== "*" && prev !== current ) {
+
+			// Get the converter
+			conversion = prev + " " + current;
+			conv = converters[ conversion ] || converters[ "* " + current ];
+
+			// If there is no direct converter, search transitively
+			if ( !conv ) {
+				conv2 = undefined;
+				for( conv1 in converters ) {
+					tmp = conv1.split( " " );
+					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
+						conv2 = converters[ tmp[1] + " " + current ];
+						if ( conv2 ) {
+							conv1 = converters[ conv1 ];
+							if ( conv1 === true ) {
+								conv = conv2;
+							} else if ( conv2 === true ) {
+								conv = conv1;
+							}
+							break;
+						}
+					}
+				}
+			}
+			// If we found no converter, dispatch an error
+			if ( !( conv || conv2 ) ) {
+				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
+			}
+			// If found converter is not an equivalence
+			if ( conv !== true ) {
+				// Convert with 1 or 2 converters accordingly
+				response = conv ? conv( response ) : conv2( conv1(response) );
+			}
+		}
+	}
+	return response;
+}
+
+
+
+
+var jsc = jQuery.now(),
+	jsre = /(\=)\?(&|$)|\?\?/i;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		return jQuery.expando + "_" + ( jsc++ );
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var inspectData = s.contentType === "application/x-www-form-urlencoded" &&
+		( typeof s.data === "string" );
+
+	if ( s.dataTypes[ 0 ] === "jsonp" ||
+		s.jsonp !== false && ( jsre.test( s.url ) ||
+				inspectData && jsre.test( s.data ) ) ) {
+
+		var responseContainer,
+			jsonpCallback = s.jsonpCallback =
+				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
+			previous = window[ jsonpCallback ],
+			url = s.url,
+			data = s.data,
+			replace = "$1" + jsonpCallback + "$2";
+
+		if ( s.jsonp !== false ) {
+			url = url.replace( jsre, replace );
+			if ( s.url === url ) {
+				if ( inspectData ) {
+					data = data.replace( jsre, replace );
+				}
+				if ( s.data === data ) {
+					// Add callback manually
+					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+				}
 			}
 		}
 
-		function add( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction(value) ? value() : value;
-			s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+		s.url = url;
+		s.data = data;
+
+		// Install callback
+		window[ jsonpCallback ] = function( response ) {
+			responseContainer = [ response ];
+		};
+
+		// Clean-up function
+		jqXHR.always(function() {
+			// Set callback back to previous value
+			window[ jsonpCallback ] = previous;
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( previous ) ) {
+				window[ jsonpCallback ]( responseContainer[ 0 ] );
+			}
+		});
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( jsonpCallback + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Delegate to script
+		return "script";
+	}
+});
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /javascript|ecmascript/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
 		}
 	}
 });
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement( "script" );
+
+				script.async = "async";
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+
+						// Dereference the script
+						script = undefined;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+				// This arises when a base node is used (#2709 and #4378).
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( 0, 1 );
+				}
+			}
+		};
+	}
+});
+
+
+
+
+var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
+	xhrOnUnloadAbort = window.ActiveXObject ? function() {
+		// Abort all pending requests
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( 0, 1 );
+		}
+	} : false,
+	xhrId = 0,
+	xhrCallbacks;
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Determine support properties
+(function( xhr ) {
+	jQuery.extend( jQuery.support, {
+		ajax: !!xhr,
+		cors: !!xhr && ( "withCredentials" in xhr )
+	});
+})( jQuery.ajaxSettings.xhr() );
+
+// Create transport if the browser can provide an xhr
+if ( jQuery.support.ajax ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var xhr = s.xhr(),
+						handle,
+						i;
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( _ ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+
+						var status,
+							statusText,
+							responseHeaders,
+							responses,
+							xml;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occured
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									if ( xhrOnUnloadAbort ) {
+										delete xhrCallbacks[ handle ];
+									}
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+									responses = {};
+									xml = xhr.responseXML;
+
+									// Construct response list
+									if ( xml && xml.documentElement /* #4958 */ ) {
+										responses.xml = xml;
+									}
+									responses.text = xhr.responseText;
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					// if we're in sync mode or it's in cache
+					// and has been retrieved directly (IE6 & IE7)
+					// we need to manually fire the callback
+					if ( !s.async || xhr.readyState === 4 ) {
+						callback();
+					} else {
+						handle = ++xhrId;
+						if ( xhrOnUnloadAbort ) {
+							// Create the active xhrs callbacks list if needed
+							// and attach the unload handler
+							if ( !xhrCallbacks ) {
+								xhrCallbacks = {};
+								jQuery( window ).unload( xhrOnUnloadAbort );
+							}
+							// Add to list of active xhrs callbacks
+							xhrCallbacks[ handle ] = callback;
+						}
+						xhr.onreadystatechange = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback(0,1);
+					}
+				}
+			};
+		}
+	});
+}
+
+
+
+
 var elemdisplay = {},
-	rfxtypes = /toggle|show|hide/,
-	rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
+	iframe, iframeDoc,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
 	timerId,
 	fxAttrs = [
 		// height animations
@@ -5450,69 +8075,77 @@ var elemdisplay = {},
 		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
 		// opacity animations
 		[ "opacity" ]
-	];
+	],
+	fxNow;
 
 jQuery.fn.extend({
-	show: function( speed, callback ) {
-		if ( speed || speed === 0) {
-			return this.animate( genFx("show", 3), speed, callback);
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var old = jQuery.data(this[i], "olddisplay");
-
-				this[i].style.display = old || "";
-
-				if ( jQuery.css(this[i], "display") === "none" ) {
-					var nodeName = this[i].nodeName, display;
-
-					if ( elemdisplay[ nodeName ] ) {
-						display = elemdisplay[ nodeName ];
+	show: function( speed, easing, callback ) {
+		var elem, display;
 
-					} else {
-						var elem = jQuery("<" + nodeName + " />").appendTo("body");
-
-						display = elem.css("display");
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("show", 3), speed, easing, callback);
 
-						if ( display === "none" ) {
-							display = "block";
-						}
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				elem = this[i];
 
-						elem.remove();
+				if ( elem.style ) {
+					display = elem.style.display;
 
-						elemdisplay[ nodeName ] = display;
+					// Reset the inline display of this element to learn if it is
+					// being hidden by cascaded rules or not
+					if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
+						display = elem.style.display = "";
 					}
 
-					jQuery.data(this[i], "olddisplay", display);
+					// Set elements which have been overridden with display: none
+					// in a stylesheet to whatever the default browser style is
+					// for such an element
+					if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
+						jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+					}
 				}
 			}
 
-			// Set the display of the elements in a second loop
+			// Set the display of most of the elements in a second loop
 			// to avoid the constant reflow
-			for ( var j = 0, k = this.length; j < k; j++ ) {
-				this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
+			for ( i = 0; i < j; i++ ) {
+				elem = this[i];
+
+				if ( elem.style ) {
+					display = elem.style.display;
+
+					if ( display === "" || display === "none" ) {
+						elem.style.display = jQuery._data(elem, "olddisplay") || "";
+					}
+				}
 			}
 
 			return this;
 		}
 	},
 
-	hide: function( speed, callback ) {
+	hide: function( speed, easing, callback ) {
 		if ( speed || speed === 0 ) {
-			return this.animate( genFx("hide", 3), speed, callback);
+			return this.animate( genFx("hide", 3), speed, easing, callback);
 
 		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var old = jQuery.data(this[i], "olddisplay");
-				if ( !old && old !== "none" ) {
-					jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				if ( this[i].style ) {
+					var display = jQuery.css( this[i], "display" );
+
+					if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
+						jQuery._data( this[i], "olddisplay", display );
+					}
 				}
 			}
 
 			// Set the display of the elements in a second loop
 			// to avoid the constant reflow
-			for ( var j = 0, k = this.length; j < k; j++ ) {
-				this[j].style.display = "none";
+			for ( i = 0; i < j; i++ ) {
+				if ( this[i].style ) {
+					this[i].style.display = "none";
+				}
 			}
 
 			return this;
@@ -5522,7 +8155,7 @@ jQuery.fn.extend({
 	// Save the old toggle function
 	_toggle: jQuery.fn.toggle,
 
-	toggle: function( fn, fn2 ) {
+	toggle: function( fn, fn2, callback ) {
 		var bool = typeof fn === "boolean";
 
 		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
@@ -5535,54 +8168,97 @@ jQuery.fn.extend({
 			});
 
 		} else {
-			this.animate(genFx("toggle", 3), fn, fn2);
+			this.animate(genFx("toggle", 3), fn, fn2, callback);
 		}
 
 		return this;
 	},
 
-	fadeTo: function( speed, to, callback ) {
+	fadeTo: function( speed, to, easing, callback ) {
 		return this.filter(":hidden").css("opacity", 0).show().end()
-					.animate({opacity: to}, speed, callback);
+					.animate({opacity: to}, speed, easing, callback);
 	},
 
 	animate: function( prop, speed, easing, callback ) {
 		var optall = jQuery.speed(speed, easing, callback);
 
 		if ( jQuery.isEmptyObject( prop ) ) {
-			return this.each( optall.complete );
+			return this.each( optall.complete, [ false ] );
 		}
 
+		// Do not change referenced properties as per-property easing will be lost
+		prop = jQuery.extend( {}, prop );
+
 		return this[ optall.queue === false ? "each" : "queue" ](function() {
-			var opt = jQuery.extend({}, optall), p,
-				hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
-				self = this;
+			// XXX 'this' does not always have a nodeName when running the
+			// test suite
+
+			if ( optall.queue === false ) {
+				jQuery._mark( this );
+			}
+
+			var opt = jQuery.extend( {}, optall ),
+				isElement = this.nodeType === 1,
+				hidden = isElement && jQuery(this).is(":hidden"),
+				name, val, p,
+				display, e,
+				parts, start, end, unit;
+
+			// will store per property easing and be used to determine when an animation is complete
+			opt.animatedProperties = {};
 
 			for ( p in prop ) {
-				var name = p.replace(rdashAlpha, fcamelCase);
 
+				// property name normalization
+				name = jQuery.camelCase( p );
 				if ( p !== name ) {
 					prop[ name ] = prop[ p ];
 					delete prop[ p ];
-					p = name;
 				}
 
-				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
-					return opt.complete.call(this);
+				val = prop[ name ];
+
+				// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
+				if ( jQuery.isArray( val ) ) {
+					opt.animatedProperties[ name ] = val[ 1 ];
+					val = prop[ name ] = val[ 0 ];
+				} else {
+					opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
 				}
 
-				if ( ( p === "height" || p === "width" ) && this.style ) {
-					// Store display property
-					opt.display = jQuery.css(this, "display");
+				if ( val === "hide" && hidden || val === "show" && !hidden ) {
+					return opt.complete.call( this );
+				}
 
+				if ( isElement && ( name === "height" || name === "width" ) ) {
 					// Make sure that nothing sneaks out
-					opt.overflow = this.style.overflow;
-				}
+					// Record all 3 overflow attributes because IE does not
+					// change the overflow attribute when overflowX and
+					// overflowY are set to the same value
+					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+
+					// Set display property to inline-block for height/width
+					// animations on inline elements that are having width/height
+					// animated
+					if ( jQuery.css( this, "display" ) === "inline" &&
+							jQuery.css( this, "float" ) === "none" ) {
+						if ( !jQuery.support.inlineBlockNeedsLayout ) {
+							this.style.display = "inline-block";
+
+						} else {
+							display = defaultDisplay( this.nodeName );
+
+							// inline-level elements accept inline-block;
+							// block-level elements need to be inline with layout
+							if ( display === "inline" ) {
+								this.style.display = "inline-block";
 
-				if ( jQuery.isArray( prop[p] ) ) {
-					// Create (if needed) and add to specialEasing
-					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
-					prop[p] = prop[p][0];
+							} else {
+								this.style.display = "inline";
+								this.style.zoom = 1;
+							}
+						}
+					}
 				}
 			}
 
@@ -5590,32 +8266,31 @@ jQuery.fn.extend({
 				this.style.overflow = "hidden";
 			}
 
-			opt.curAnim = jQuery.extend({}, prop);
-
-			jQuery.each( prop, function( name, val ) {
-				var e = new jQuery.fx( self, opt, name );
+			for ( p in prop ) {
+				e = new jQuery.fx( this, opt, p );
+				val = prop[ p ];
 
 				if ( rfxtypes.test(val) ) {
-					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]();
 
 				} else {
-					var parts = rfxnum.exec(val),
-						start = e.cur(true) || 0;
+					parts = rfxnum.exec( val );
+					start = e.cur();
 
 					if ( parts ) {
-						var end = parseFloat( parts[2] ),
-							unit = parts[3] || "px";
+						end = parseFloat( parts[2] );
+						unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
 
 						// We need to compute starting value
 						if ( unit !== "px" ) {
-							self.style[ name ] = (end || 1) + unit;
-							start = ((end || 1) / e.cur(true)) * start;
-							self.style[ name ] = start + unit;
+							jQuery.style( this, p, (end || 1) + unit);
+							start = ((end || 1) / e.cur()) * start;
+							jQuery.style( this, p, start + unit);
 						}
 
 						// If a +=/-= token was provided, we're doing a relative animation
 						if ( parts[1] ) {
-							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+							end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
 						}
 
 						e.custom( start, end, unit );
@@ -5624,7 +8299,7 @@ jQuery.fn.extend({
 						e.custom( start, val, "" );
 					}
 				}
-			});
+			}
 
 			// For JS strict compliance
 			return true;
@@ -5632,15 +8307,18 @@ jQuery.fn.extend({
 	},
 
 	stop: function( clearQueue, gotoEnd ) {
-		var timers = jQuery.timers;
-
 		if ( clearQueue ) {
 			this.queue([]);
 		}
 
 		this.each(function() {
-			// go in reverse order so anything added to the queue during the loop is ignored
-			for ( var i = timers.length - 1; i >= 0; i-- ) {
+			var timers = jQuery.timers,
+				i = timers.length;
+			// clear marker counters if we know they won't be
+			if ( !gotoEnd ) {
+				jQuery._unmark( true, this );
+			}
+			while ( i-- ) {
 				if ( timers[i].elem === this ) {
 					if (gotoEnd) {
 						// force the next step to be the last
@@ -5662,22 +8340,44 @@ jQuery.fn.extend({
 
 });
 
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout( clearFxNow, 0 );
+	return ( fxNow = jQuery.now() );
+}
+
+function clearFxNow() {
+	fxNow = undefined;
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+
 // Generate shortcuts for custom animations
 jQuery.each({
 	slideDown: genFx("show", 1),
 	slideUp: genFx("hide", 1),
 	slideToggle: genFx("toggle", 1),
 	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" }
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
 }, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, callback ) {
-		return this.animate( props, speed, callback );
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
 	};
 });
 
 jQuery.extend({
 	speed: function( speed, easing, fn ) {
-		var opt = speed && typeof speed === "object" ? speed : {
+		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
 			complete: fn || !fn && easing ||
 				jQuery.isFunction( speed ) && speed,
 			duration: speed,
@@ -5685,17 +8385,20 @@ jQuery.extend({
 		};
 
 		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-			jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
+			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
 
 		// Queueing
 		opt.old = opt.complete;
-		opt.complete = function() {
-			if ( opt.queue !== false ) {
-				jQuery(this).dequeue();
-			}
+		opt.complete = function( noUnmark ) {
 			if ( jQuery.isFunction( opt.old ) ) {
 				opt.old.call( this );
 			}
+
+			if ( opt.queue !== false ) {
+				jQuery.dequeue( this );
+			} else if ( noUnmark !== false ) {
+				jQuery._unmark( this );
+			}
 		};
 
 		return opt;
@@ -5717,9 +8420,7 @@ jQuery.extend({
 		this.elem = elem;
 		this.prop = prop;
 
-		if ( !options.orig ) {
-			options.orig = {};
-		}
+		options.orig = options.orig || {};
 	}
 
 });
@@ -5732,33 +8433,34 @@ jQuery.fx.prototype = {
 		}
 
 		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-
-		// Set display property to block for height/width animations
-		if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) {
-			this.elem.style.display = "block";
-		}
 	},
 
 	// Get the current size
-	cur: function( force ) {
+	cur: function() {
 		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
 			return this.elem[ this.prop ];
 		}
 
-		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
-		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
+		var parsed,
+			r = jQuery.css( this.elem, this.prop );
+		// Empty strings, null, undefined and "auto" are converted to 0,
+		// complex values such as "rotate(1rad)" are returned as is,
+		// simple values such as "10px" are parsed to Float.
+		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
 	},
 
 	// Start an animation from one number to another
 	custom: function( from, to, unit ) {
-		this.startTime = now();
+		var self = this,
+			fx = jQuery.fx;
+
+		this.startTime = fxNow || createFxNow();
 		this.start = from;
 		this.end = to;
-		this.unit = unit || this.unit || "px";
+		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
 		this.now = this.start;
 		this.pos = this.state = 0;
 
-		var self = this;
 		function t( gotoEnd ) {
 			return self.step(gotoEnd);
 		}
@@ -5766,7 +8468,7 @@ jQuery.fx.prototype = {
 		t.elem = this.elem;
 
 		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			timerId = setInterval(jQuery.fx.tick, 13);
+			timerId = setInterval( fx.tick, fx.interval );
 		}
 	},
 
@@ -5797,63 +8499,64 @@ jQuery.fx.prototype = {
 
 	// Each step of an animation
 	step: function( gotoEnd ) {
-		var t = now(), done = true;
+		var t = fxNow || createFxNow(),
+			done = true,
+			elem = this.elem,
+			options = this.options,
+			i, n;
 
-		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+		if ( gotoEnd || t >= options.duration + this.startTime ) {
 			this.now = this.end;
 			this.pos = this.state = 1;
 			this.update();
 
-			this.options.curAnim[ this.prop ] = true;
+			options.animatedProperties[ this.prop ] = true;
 
-			for ( var i in this.options.curAnim ) {
-				if ( this.options.curAnim[i] !== true ) {
+			for ( i in options.animatedProperties ) {
+				if ( options.animatedProperties[i] !== true ) {
 					done = false;
 				}
 			}
 
 			if ( done ) {
-				if ( this.options.display != null ) {
-					// Reset the overflow
-					this.elem.style.overflow = this.options.overflow;
+				// Reset the overflow
+				if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
 
-					// Reset the display
-					var old = jQuery.data(this.elem, "olddisplay");
-					this.elem.style.display = old ? old : this.options.display;
-
-					if ( jQuery.css(this.elem, "display") === "none" ) {
-						this.elem.style.display = "block";
-					}
+					jQuery.each( [ "", "X", "Y" ], function (index, value) {
+						elem.style[ "overflow" + value ] = options.overflow[index];
+					});
 				}
 
 				// Hide the element if the "hide" operation was done
-				if ( this.options.hide ) {
-					jQuery(this.elem).hide();
+				if ( options.hide ) {
+					jQuery(elem).hide();
 				}
 
 				// Reset the properties, if the item has been hidden or shown
-				if ( this.options.hide || this.options.show ) {
-					for ( var p in this.options.curAnim ) {
-						jQuery.style(this.elem, p, this.options.orig[p]);
+				if ( options.hide || options.show ) {
+					for ( var p in options.animatedProperties ) {
+						jQuery.style( elem, p, options.orig[p] );
 					}
 				}
 
 				// Execute the complete function
-				this.options.complete.call( this.elem );
+				options.complete.call( elem );
 			}
 
 			return false;
 
 		} else {
-			var n = t - this.startTime;
-			this.state = n / this.options.duration;
-
-			// Perform the easing function, defaults to swing
-			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
-			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
-			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
-			this.now = this.start + ((this.end - this.start) * this.pos);
+			// classical easing cannot be used with an Infinity duration
+			if ( options.duration == Infinity ) {
+				this.now = t;
+			} else {
+				n = t - this.startTime;
+				this.state = n / options.duration;
 
+				// Perform the easing function, defaults to swing
+				this.pos = jQuery.easing[ options.animatedProperties[ this.prop ] ]( this.state, n, 0, 1, options.duration );
+				this.now = this.start + ((this.end - this.start) * this.pos);
+			}
 			// Perform the next step of the animation
 			this.update();
 		}
@@ -5864,9 +8567,7 @@ jQuery.fx.prototype = {
 
 jQuery.extend( jQuery.fx, {
 	tick: function() {
-		var timers = jQuery.timers;
-
-		for ( var i = 0; i < timers.length; i++ ) {
+		for ( var timers = jQuery.timers, i = 0 ; i < timers.length ; ++i ) {
 			if ( !timers[i]() ) {
 				timers.splice(i--, 1);
 			}
@@ -5876,22 +8577,24 @@ jQuery.extend( jQuery.fx, {
 			jQuery.fx.stop();
 		}
 	},
-		
+
+	interval: 13,
+
 	stop: function() {
 		clearInterval( timerId );
 		timerId = null;
 	},
-	
+
 	speeds: {
 		slow: 600,
- 		fast: 200,
- 		// Default speed
- 		_default: 400
+		fast: 200,
+		// Default speed
+		_default: 400
 	},
 
 	step: {
 		opacity: function( fx ) {
-			jQuery.style(fx.elem, "opacity", fx.now);
+			jQuery.style( fx.elem, "opacity", fx.now );
 		},
 
 		_default: function( fx ) {
@@ -5912,20 +8615,64 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 	};
 }
 
-function genFx( type, num ) {
-	var obj = {};
+// Try to restore the default display value of an element
+function defaultDisplay( nodeName ) {
 
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
-		obj[ this ] = type;
-	});
+	if ( !elemdisplay[ nodeName ] ) {
 
-	return obj;
+		var body = document.body,
+			elem = jQuery( "<" + nodeName + ">" ).appendTo( body ),
+			display = elem.css( "display" );
+
+		elem.remove();
+
+		// If the simple way fails,
+		// get element's real default display by attaching it to a temp iframe
+		if ( display === "none" || display === "" ) {
+			// No iframe to use yet, so create it
+			if ( !iframe ) {
+				iframe = document.createElement( "iframe" );
+				iframe.frameBorder = iframe.width = iframe.height = 0;
+			}
+
+			body.appendChild( iframe );
+
+			// Create a cacheable copy of the iframe document on first call.
+			// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
+			// document to it; WebKit & Firefox won't allow reusing the iframe document.
+			if ( !iframeDoc || !iframe.createElement ) {
+				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
+				iframeDoc.write( ( document.compatMode === "CSS1Compat" ? "<!doctype html>" : "" ) + "<html><body>" );
+				iframeDoc.close();
+			}
+
+			elem = iframeDoc.createElement( nodeName );
+
+			iframeDoc.body.appendChild( elem );
+
+			display = jQuery.css( elem, "display" );
+
+			body.removeChild( iframe );
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return elemdisplay[ nodeName ];
 }
+
+
+
+
+var rtable = /^t(?:able|d|h)$/i,
+	rroot = /^(?:body|html)$/i;
+
 if ( "getBoundingClientRect" in document.documentElement ) {
 	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
+		var elem = this[0], box;
 
-		if ( options ) { 
+		if ( options ) {
 			return this.each(function( i ) {
 				jQuery.offset.setOffset( this, options, i );
 			});
@@ -5939,10 +8686,26 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 			return jQuery.offset.bodyOffset( elem );
 		}
 
-		var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
-			clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			top  = box.top  + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
-			left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+		try {
+			box = elem.getBoundingClientRect();
+		} catch(e) {}
+
+		var doc = elem.ownerDocument,
+			docElem = doc.documentElement;
+
+		// Make sure we're not dealing with a disconnected DOM node
+		if ( !box || !jQuery.contains( docElem, elem ) ) {
+			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
+		}
+
+		var body = doc.body,
+			win = getWindow(doc),
+			clientTop  = docElem.clientTop  || body.clientTop  || 0,
+			clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			scrollTop  = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop,
+			scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
+			top  = box.top  + scrollTop  - clientTop,
+			left = box.left + scrollLeft - clientLeft;
 
 		return { top: top, left: left };
 	};
@@ -5951,7 +8714,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 	jQuery.fn.offset = function( options ) {
 		var elem = this[0];
 
-		if ( options ) { 
+		if ( options ) {
 			return this.each(function( i ) {
 				jQuery.offset.setOffset( this, options, i );
 			});
@@ -5967,11 +8730,16 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 
 		jQuery.offset.initialize();
 
-		var offsetParent = elem.offsetParent, prevOffsetParent = elem,
-			doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
-			body = doc.body, defaultView = doc.defaultView,
+		var computedStyle,
+			offsetParent = elem.offsetParent,
+			prevOffsetParent = elem,
+			doc = elem.ownerDocument,
+			docElem = doc.documentElement,
+			body = doc.body,
+			defaultView = doc.defaultView,
 			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop, left = elem.offsetLeft;
+			top = elem.offsetTop,
+			left = elem.offsetLeft;
 
 		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
 			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
@@ -5986,12 +8754,13 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 				top  += elem.offsetTop;
 				left += elem.offsetLeft;
 
-				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
 					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
 					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
 				}
 
-				prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
+				prevOffsetParent = offsetParent;
+				offsetParent = elem.offsetParent;
 			}
 
 			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
@@ -6018,7 +8787,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 
 jQuery.offset = {
 	initialize: function() {
-		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0,
+		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
 			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
 
 		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
@@ -6032,53 +8801,74 @@ jQuery.offset = {
 		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
 		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
 
-		checkDiv.style.position = "fixed", checkDiv.style.top = "20px";
+		checkDiv.style.position = "fixed";
+		checkDiv.style.top = "20px";
+
 		// safari subtracts parent border width here which is 5px
 		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
 		checkDiv.style.position = checkDiv.style.top = "";
 
-		innerDiv.style.overflow = "hidden", innerDiv.style.position = "relative";
+		innerDiv.style.overflow = "hidden";
+		innerDiv.style.position = "relative";
+
 		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
 
 		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
 
 		body.removeChild( container );
-		body = container = innerDiv = checkDiv = table = td = null;
 		jQuery.offset.initialize = jQuery.noop;
 	},
 
 	bodyOffset: function( body ) {
-		var top = body.offsetTop, left = body.offsetLeft;
+		var top = body.offsetTop,
+			left = body.offsetLeft;
 
 		jQuery.offset.initialize();
 
 		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.curCSS(body, "marginTop",  true) ) || 0;
-			left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0;
+			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
 		}
 
 		return { top: top, left: left };
 	},
-	
+
 	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
 		// set position first, in-case top/left are set even on static elem
-		if ( /static/.test( jQuery.curCSS( elem, "position" ) ) ) {
+		if ( position === "static" ) {
 			elem.style.position = "relative";
 		}
-		var curElem   = jQuery( elem ),
+
+		var curElem = jQuery( elem ),
 			curOffset = curElem.offset(),
-			curTop    = parseInt( jQuery.curCSS( elem, "top",  true ), 10 ) || 0,
-			curLeft   = parseInt( jQuery.curCSS( elem, "left", true ), 10 ) || 0;
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = (position === "absolute" || position === "fixed") && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
 
 		if ( jQuery.isFunction( options ) ) {
 			options = options.call( elem, i, curOffset );
 		}
 
-		var props = {
-			top:  (options.top  - curOffset.top)  + curTop,
-			left: (options.left - curOffset.left) + curLeft
-		};
-		
+		if (options.top != null) {
+			props.top = (options.top - curOffset.top) + curTop;
+		}
+		if (options.left != null) {
+			props.left = (options.left - curOffset.left) + curLeft;
+		}
+
 		if ( "using" in options ) {
 			options.using.call( elem, props );
 		} else {
@@ -6101,17 +8891,17 @@ jQuery.fn.extend({
 
 		// Get correct offsets
 		offset       = this.offset(),
-		parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
 
 		// Subtract element margins
 		// note: when an element has margin: auto the offsetLeft and marginLeft
 		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.curCSS(elem, "marginTop",  true) ) || 0;
-		offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0;
+		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
 
 		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth",  true) ) || 0;
-		parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0;
+		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
 
 		// Subtract the two offsets
 		return {
@@ -6123,7 +8913,7 @@ jQuery.fn.extend({
 	offsetParent: function() {
 		return this.map(function() {
 			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
 				offsetParent = offsetParent.offsetParent;
 			}
 			return offsetParent;
@@ -6136,29 +8926,16 @@ jQuery.fn.extend({
 jQuery.each( ["Left", "Top"], function( i, name ) {
 	var method = "scroll" + name;
 
-	jQuery.fn[ method ] = function(val) {
-		var elem = this[0], win;
-		
-		if ( !elem ) {
-			return null;
-		}
+	jQuery.fn[ method ] = function( val ) {
+		var elem, win;
 
-		if ( val !== undefined ) {
-			// Set the scroll offset
-			return this.each(function() {
-				win = getWindow( this );
+		if ( val === undefined ) {
+			elem = this[ 0 ];
 
-				if ( win ) {
-					win.scrollTo(
-						!i ? val : jQuery(win).scrollLeft(),
-						 i ? val : jQuery(win).scrollTop()
-					);
+			if ( !elem ) {
+				return null;
+			}
 
-				} else {
-					this[ method ] = val;
-				}
-			});
-		} else {
 			win = getWindow( elem );
 
 			// Return the scroll offset
@@ -6167,32 +8944,53 @@ jQuery.each( ["Left", "Top"], function( i, name ) {
 					win.document.body[ method ] :
 				elem[ method ];
 		}
+
+		// Set the scroll offset
+		return this.each(function() {
+			win = getWindow( this );
+
+			if ( win ) {
+				win.scrollTo(
+					!i ? val : jQuery( win ).scrollLeft(),
+					 i ? val : jQuery( win ).scrollTop()
+				);
+
+			} else {
+				this[ method ] = val;
+			}
+		});
 	};
 });
 
 function getWindow( elem ) {
-	return ("scrollTo" in elem && elem.document) ?
+	return jQuery.isWindow( elem ) ?
 		elem :
 		elem.nodeType === 9 ?
 			elem.defaultView || elem.parentWindow :
 			false;
 }
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+
+
+
+
+// Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods
 jQuery.each([ "Height", "Width" ], function( i, name ) {
 
 	var type = name.toLowerCase();
 
 	// innerHeight and innerWidth
-	jQuery.fn["inner" + name] = function() {
-		return this[0] ?
-			jQuery.css( this[0], type, false, "padding" ) :
+	jQuery.fn[ "inner" + name ] = function() {
+		var elem = this[0];
+		return elem && elem.style ?
+			parseFloat( jQuery.css( elem, type, "padding" ) ) :
 			null;
 	};
 
 	// outerHeight and outerWidth
-	jQuery.fn["outer" + name] = function( margin ) {
-		return this[0] ?
-			jQuery.css( this[0], type, false, margin ? "margin" : "border" ) :
+	jQuery.fn[ "outer" + name ] = function( margin ) {
+		var elem = this[0];
+		return elem && elem.style ?
+			parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
 			null;
 	};
 
@@ -6202,7 +9000,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
 		if ( !elem ) {
 			return size == null ? null : this;
 		}
-		
+
 		if ( jQuery.isFunction( size ) ) {
 			return this.each(function( i ) {
 				var self = jQuery( this );
@@ -6210,31 +9008,39 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
 			});
 		}
 
-		return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window?
+		if ( jQuery.isWindow( elem ) ) {
 			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
-			elem.document.body[ "client" + name ] :
-
-			// Get document width or height
-			(elem.nodeType === 9) ? // is it a document
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max(
-					elem.documentElement["client" + name],
-					elem.body["scroll" + name], elem.documentElement["scroll" + name],
-					elem.body["offset" + name], elem.documentElement["offset" + name]
-				) :
-
-				// Get or set width or height on the element
-				size === undefined ?
-					// Get width or height on the element
-					jQuery.css( elem, type ) :
-
-					// Set the width or height on the element (default to pixels if value is unitless)
-					this.css( type, typeof size === "string" ? size : ( parseInt( size ) || 0 ) + "px" );
+			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
+			var docElemProp = elem.document.documentElement[ "client" + name ],
+				body = elem.document.body;
+			return elem.document.compatMode === "CSS1Compat" && docElemProp ||
+				body && body[ "client" + name ] || docElemProp;
+
+		// Get document width or height
+		} else if ( elem.nodeType === 9 ) {
+			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+			return Math.max(
+				elem.documentElement["client" + name],
+				elem.body["scroll" + name], elem.documentElement["scroll" + name],
+				elem.body["offset" + name], elem.documentElement["offset" + name]
+			);
+
+		// Get or set width or height on the element
+		} else if ( size === undefined ) {
+			var orig = jQuery.css( elem, type ),
+				ret = parseFloat( orig );
+
+			return jQuery.isNaN( ret ) ? orig : ret;
+
+		// Set the width or height on the element (default to pixels if value is unitless)
+		} else {
+			return this.css( type, typeof size === "string" ? size : size + "px" );
+		}
 	};
 
 });
+
+
 // Expose jQuery to the global object
 window.jQuery = window.$ = jQuery;
-
 })(window);
diff --git a/resources/jquery/jquery.json.js b/resources/jquery/jquery.json.js
new file mode 100644
index 00000000..63230b3b
--- /dev/null
+++ b/resources/jquery/jquery.json.js
@@ -0,0 +1,180 @@
+/*
+ * jQuery JSON Plugin
+ * version: 2.1 (2009-08-14)
+ *
+ * This document is licensed as free software under the terms of the
+ * MIT License: http://www.opensource.org/licenses/mit-license.php
+ *
+ * Brantley Harris wrote this plugin. It is based somewhat on the JSON.org 
+ * website's http://www.json.org/json2.js, which proclaims:
+ * "NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.", a sentiment that
+ * I uphold.
+ *
+ * It is also influenced heavily by MochiKit's serializeJSON, which is 
+ * copyrighted 2005 by Bob Ippolito.
+ * 
+ * @see http://code.google.com/p/jquery-json/
+ */
+
+(function($) {
+    /** jQuery.toJSON( json-serializble )
+        Converts the given argument into a JSON respresentation.
+ 
+        If an object has a "toJSON" function, that will be used to get the representation.
+        Non-integer/string keys are skipped in the object, as are keys that point to a function.
+ 
+        json-serializble:
+            The *thing* to be converted.
+     **/
+    $.toJSON = function(o)
+    {
+        if (typeof(JSON) == 'object' && JSON.stringify)
+            return JSON.stringify(o);
+         
+        var type = typeof(o);
+     
+        if (o === null)
+            return "null";
+     
+        if (type == "undefined")
+            return undefined;
+         
+        if (type == "number" || type == "boolean")
+            return o + "";
+     
+        if (type == "string")
+            return $.quoteString(o);
+     
+        if (type == 'object')
+        {
+            if (typeof o.toJSON == "function") 
+                return $.toJSON( o.toJSON() );
+             
+            if (o.constructor === Date)
+            {
+                var month = o.getUTCMonth() + 1;
+                if (month < 10) month = '0' + month;
+ 
+                var day = o.getUTCDate();
+                if (day < 10) day = '0' + day;
+ 
+                var year = o.getUTCFullYear();
+                 
+                var hours = o.getUTCHours();
+                if (hours < 10) hours = '0' + hours;
+                 
+                var minutes = o.getUTCMinutes();
+                if (minutes < 10) minutes = '0' + minutes;
+                 
+                var seconds = o.getUTCSeconds();
+                if (seconds < 10) seconds = '0' + seconds;
+                 
+                var milli = o.getUTCMilliseconds();
+                if (milli < 100) milli = '0' + milli;
+                if (milli < 10) milli = '0' + milli;
+ 
+                return '"' + year + '-' + month + '-' + day + 'T' +
+                             hours + ':' + minutes + ':' + seconds + 
+                             '.' + milli + 'Z"'; 
+            }
+ 
+            if (o.constructor === Array) 
+            {
+                var ret = [];
+                for (var i = 0; i < o.length; i++)
+                    ret.push( $.toJSON(o[i]) || "null" );
+ 
+                return "[" + ret.join(",") + "]";
+            }
+         
+            var pairs = [];
+            for (var k in o) {
+                var name;
+                var type = typeof k;
+ 
+                if (type == "number")
+                    name = '"' + k + '"';
+                else if (type == "string")
+                    name = $.quoteString(k);
+                else
+                    continue;  //skip non-string or number keys
+             
+                if (typeof o[k] == "function") 
+                    continue;  //skip pairs where the value is a function.
+             
+                var val = $.toJSON(o[k]);
+             
+                pairs.push(name + ":" + val);
+            }
+ 
+            return "{" + pairs.join(", ") + "}";
+        }
+    };
+ 
+    /** jQuery.evalJSON(src)
+        Evaluates a given piece of json source.
+     **/
+    $.evalJSON = function(src)
+    {
+        if (typeof(JSON) == 'object' && JSON.parse)
+            return JSON.parse(src);
+        return eval("(" + src + ")");
+    };
+     
+    /** jQuery.secureEvalJSON(src)
+        Evals JSON in a way that is *more* secure.
+    **/
+    $.secureEvalJSON = function(src)
+    {
+        if (typeof(JSON) == 'object' && JSON.parse)
+            return JSON.parse(src);
+         
+        var filtered = src;
+        filtered = filtered.replace(/\\["\\\/bfnrtu]/g, '@');
+        filtered = filtered.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']');
+        filtered = filtered.replace(/(?:^|:|,)(?:\s*\[)+/g, '');
+         
+        if (/^[\],:{}\s]*$/.test(filtered))
+            return eval("(" + src + ")");
+        else
+            throw new SyntaxError("Error parsing JSON, source is not valid.");
+    };
+ 
+    /** jQuery.quoteString(string)
+        Returns a string-repr of a string, escaping quotes intelligently.  
+        Mostly a support function for toJSON.
+     
+        Examples:
+            >>> jQuery.quoteString("apple")
+            "apple"
+         
+            >>> jQuery.quoteString('"Where are we going?", she asked.')
+            "\"Where are we going?\", she asked."
+     **/
+    $.quoteString = function(string)
+    {
+        if (string.match(_escapeable))
+        {
+            return '"' + string.replace(_escapeable, function (a) 
+            {
+                var c = _meta[a];
+                if (typeof c === 'string') return c;
+                c = a.charCodeAt();
+                return '\\u00' + Math.floor(c / 16).toString(16) + (c % 16).toString(16);
+            }) + '"';
+        }
+        return '"' + string + '"';
+    };
+     
+    var _escapeable = /["\\\x00-\x1f\x7f-\x9f]/g;
+     
+    var _meta = {
+        '\b': '\\b',
+        '\t': '\\t',
+        '\n': '\\n',
+        '\f': '\\f',
+        '\r': '\\r',
+        '"' : '\\"',
+        '\\': '\\\\'
+    };
+})(jQuery);
diff --git a/resources/jquery/jquery.localize.js b/resources/jquery/jquery.localize.js
index 3c8f597a..3a7925bf 100644
--- a/resources/jquery/jquery.localize.js
+++ b/resources/jquery/jquery.localize.js
@@ -1,14 +1,11 @@
 /**
- * Simple Placeholder-based Localization 
- * 
- * Call on a selection of HTML which contains <msg key="message-key" /> elements or elements with
- * title-msg="message-key" or alt-msg="message-key" attributes. <msg /> elements will be replaced
+ * Simple Placeholder-based Localization
+ *
+ * Call on a selection of HTML which contains <html:msg key="message-key" /> elements or elements with
+ * title-msg="message-key" or alt-msg="message-key" attributes. <html:msg /> elements will be replaced
  * with localized text, elements with title-msg and alt-msg attributes will receive localized title
  * and alt attributes.
- * 
- * Note that "msg" elements must have html namespacing such as "<html:msg />" to be compatible with
- * Internet Explorer.
- *
+ * *
  * Example:
  *		<p class="somethingCool">
  *			<html:msg key="my-message" />
@@ -16,49 +13,61 @@
  *		</p>
  *
  * Localizes to...
- * 
- * 		<p class="somethingCool">
- * 			My Message
- * 			<img src="something.jpg" title="My Title Message" alt="My Alt Message" />
- * 		</p>
+ *		<p class="somethingCool">
+ *			My Message
+ *			<img src="something.jpg" title="My Title Message" alt="My Alt Message" />
+ *		</p>
+ */
+( function( $ ) {
+/**
+ * Localizes a DOM selection by replacing <html:msg /> elements with localized text and adding
+ * localized title and alt attributes to elements with title-msg and alt-msg attributes
+ * respectively.
+ *
+ * @param Object: options Map of options
+ *  * prefix: Message prefix to use when localizing elements and attributes
  */
 
-( function( $, mw ) {
-	/**
-	 * Localizes a DOM selection by replacing <msg /> elements with localized text and adding
-	 * localized title and alt attributes to elements with title-msg and alt-msg attributes
-	 * respectively.
-	 * 
-	 * @param Object: options Map of options
-	 * 	* prefix: Message prefix to use when localizing elements and attributes
-	 */
-
-	$.fn.localize = function( options ) {
-		options = $.extend( { 'prefix': '' }, options );
-		return $(this)
-			.find( 'msg,html\\:msg' )
-				.each( function() {
-					$(this)
-						.text( mediaWiki.msg( options.prefix + $(this).attr( 'key' ) ) )
-						.replaceWith( $(this).html() );
-				} )
-				.end()
-			.find( '[title-msg]' )
-				.each( function() {
-					$(this)
-						.attr( 'title', mw.msg( options.prefix + $(this).attr( 'title-msg' ) ) )
-						.removeAttr( 'title-msg' );
-				} )
-				.end()
-			.find( '[alt-msg]' )
-				.each( function() {
-					$(this)
-						.attr( 'alt', mw.msg( options.prefix + $(this).attr( 'alt-msg' ) ) )
-						.removeAttr( 'alt-msg' );
-				} )
-				.end();
+$.fn.localize = function( options ) {
+	options = $.extend( { 'prefix': '', 'keys': {}, 'params': {} }, options );
+	function msg( key ) {
+		var args = key in options.params ? options.params[key] : [];
+		// Format: mw.msg( key [, p1, p2, ...] )
+		args.unshift( options.prefix + ( key in options.keys ? options.keys[key] : key ) );
+		return mw.msg.apply( mw, args );
 	};
-} )( jQuery, mediaWiki );
+	return $(this)
+		// Ok, so here's the story on this selector.
+		// In IE 6/7, searching for 'msg' turns up the 'html:msg', but searching for 'html:msg' does not.
+		// In later IE and other browsers, searching for 'html:msg' turns up the 'html:msg', but searching for 'msg' does not.
+		// So searching for both 'msg' and 'html:msg' seems to get the job done.
+		// This feels pretty icky, though.
+		.find( 'msg,html\\:msg' )
+			.each( function() {
+				var $el = $(this);
+				$el
+					.text( msg( $el.attr( 'key' ) ) )
+					.replaceWith( $el.html() );
+			} )
+			.end()
+		.find( '[title-msg]' )
+			.each( function() {
+				var $el = $(this);
+				$el
+					.attr( 'title', msg( $el.attr( 'title-msg' ) ) )
+					.removeAttr( 'title-msg' );
+			} )
+			.end()
+		.find( '[alt-msg]' )
+			.each( function() {
+				var $el = $(this);
+				$el
+					.attr( 'alt', msg( $el.attr( 'alt-msg' ) ) )
+					.removeAttr( 'alt-msg' );
+			} )
+			.end();
+};
 
 // Let IE know about the msg tag before it's used...
 document.createElement( 'msg' );
+} )( jQuery );
diff --git a/resources/jquery/jquery.makeCollapsible.css b/resources/jquery/jquery.makeCollapsible.css
new file mode 100644
index 00000000..993fa8c6
--- /dev/null
+++ b/resources/jquery/jquery.makeCollapsible.css
@@ -0,0 +1,14 @@
+/* See also jquery.makeCollapsible.js */
+.mw-collapsible-toggle {
+	float: right;
+}
+
+/* list-items go as wide as their parent element, don't float them inside list items */
+li .mw-collapsible-toggle {
+	float: none;
+}
+
+/* the added list item should have no list-style */
+.mw-collapsible-toggle-li {
+	list-style: none;
+}
diff --git a/resources/jquery/jquery.makeCollapsible.js b/resources/jquery/jquery.makeCollapsible.js
new file mode 100644
index 00000000..a84f405c
--- /dev/null
+++ b/resources/jquery/jquery.makeCollapsible.js
@@ -0,0 +1,339 @@
+/**
+ * jQuery makeCollapsible
+ *
+ * This will enable collapsible-functionality on all passed elements.
+ * Will prevent binding twice to the same element.
+ * Initial state is expanded by default, this can be overriden by adding class
+ * "mw-collapsed" to the "mw-collapsible" element.
+ * Elements made collapsible have class "mw-made-collapsible".
+ * Except for tables and lists, the inner content is wrapped in "mw-collapsible-content".
+ *
+ * @author Krinkle <krinklemail@gmail.com>
+ *
+ * Dual license:
+ * @license CC-BY 3.0 <http://creativecommons.org/licenses/by/3.0>
+ * @license GPL2 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
+ */
+( function( $, mw ) {
+
+$.fn.makeCollapsible = function() {
+
+	return this.each(function() {
+		var _fn = 'jquery.makeCollapsible> ';
+
+		// Define reused variables and functions
+		var	$that = $(this).addClass( 'mw-collapsible' ), // case: $( '#myAJAXelement' ).makeCollapsible()
+			that = this,
+			collapsetext = $(this).attr( 'data-collapsetext' ),
+			expandtext = $(this).attr( 'data-expandtext' ),
+			toggleElement = function( $collapsible, action, $defaultToggle, instantHide ) {
+				// Validate parameters
+				if ( !$collapsible.jquery ) { // $collapsible must be an instance of jQuery
+					return;
+				}
+				if ( action != 'expand' && action != 'collapse' ) {
+					// action must be string with 'expand' or 'collapse'
+					return;
+				}
+				if ( typeof $defaultToggle == 'undefined' ) {
+					$defaultToggle = null;
+				}
+				if ( $defaultToggle !== null && !($defaultToggle instanceof jQuery) ) {
+					// is optional (may be undefined), but if defined it must be an instance of jQuery.
+					// If it's not, abort right away.
+					// After this $defaultToggle is either null or a valid jQuery instance.
+					return;
+				}
+				
+				var $containers = null;
+
+				if ( action == 'collapse' ) {
+
+					// Collapse the element
+					if ( $collapsible.is( 'table' ) ) {
+						// Hide all table rows of this table
+						// Slide doens't work with tables, but fade does as of jQuery 1.1.3
+						// http://stackoverflow.com/questions/467336#920480
+						$containers = $collapsible.find( '>tbody>tr' );
+						if ( $defaultToggle ) { 
+							// Exclude tablerow containing togglelink
+							$containers.not( $defaultToggle.closest( 'tr' ) ).stop(true, true).fadeOut();
+						} else {
+							if ( instantHide ) {	
+								$containers.hide();
+							} else {
+								$containers.stop( true, true ).fadeOut();
+							}
+						}
+	
+					} else if ( $collapsible.is( 'ul' ) || $collapsible.is( 'ol' ) ) {
+						$containers = $collapsible.find( '> li' );
+						if ( $defaultToggle ) {
+							// Exclude list-item containing togglelink
+							$containers.not( $defaultToggle.parent() ).stop( true, true ).slideUp();
+						} else {
+							if ( instantHide ) {
+								$containers.hide();
+							} else {
+								$containers.stop( true, true ).slideUp();
+							}
+						}
+	
+					} else { // <div>, <p> etc.
+						var $collapsibleContent = $collapsible.find( '> .mw-collapsible-content' );
+						
+						// If a collapsible-content is defined, collapse it
+						if ( $collapsibleContent.length ) {
+							if ( instantHide ) {
+								$collapsibleContent.hide();
+							} else {
+								$collapsibleContent.slideUp();
+							}
+
+						// Otherwise assume this is a customcollapse with a remote toggle
+						// .. and there is no collapsible-content because the entire element should be toggled
+						} else {
+							if ( $collapsible.is( 'tr' ) || $collapsible.is( 'td' ) || $collapsible.is( 'th' ) ) {
+								$collapsible.fadeOut();
+							} else {
+								$collapsible.slideUp();
+							}
+						}
+					}
+
+				} else {
+				
+					// Expand the element
+					if ( $collapsible.is( 'table' ) ) {
+						$containers = $collapsible.find( '>tbody>tr' );
+						if ( $defaultToggle ) {
+							// Exclude tablerow containing togglelink
+							$containers.not( $defaultToggle.parent().parent() ).stop(true, true).fadeIn();
+						} else {
+							$containers.stop(true, true).fadeIn();
+						}
+	
+					} else if ( $collapsible.is( 'ul' ) || $collapsible.is( 'ol' ) ) {
+						$containers = $collapsible.find( '> li' );
+						if ( $defaultToggle ) {
+							// Exclude list-item containing togglelink
+							$containers.not( $defaultToggle.parent() ).stop( true, true ).slideDown();
+						} else {
+							$containers.stop( true, true ).slideDown();
+						}
+	
+					} else { // <div>, <p> etc.
+						var $collapsibleContent = $collapsible.find( '> .mw-collapsible-content' );
+						
+						// If a collapsible-content is defined, collapse it
+						if ( $collapsibleContent.length ) {
+							$collapsibleContent.slideDown();
+
+						// Otherwise assume this is a customcollapse with a remote toggle
+						// .. and there is no collapsible-content because the entire element should be toggled
+						} else {
+							if ( $collapsible.is( 'tr' ) || $collapsible.is( 'td' ) || $collapsible.is( 'th' ) ) {
+								$collapsible.fadeIn();
+							} else {
+								$collapsible.slideDown();
+							}
+						}
+					}
+				}
+			},
+			// Toggles collapsible and togglelink class and updates text label
+			toggleLinkDefault = function( that, e ) {
+				var	$that = $(that),
+					$collapsible = $that.closest( '.mw-collapsible.mw-made-collapsible' ).toggleClass( 'mw-collapsed' );
+				e.preventDefault();
+				e.stopPropagation();
+				
+				// It's expanded right now
+				if ( !$that.hasClass( 'mw-collapsible-toggle-collapsed' ) ) {
+					// Change link to "Show"
+					$that.removeClass( 'mw-collapsible-toggle-expanded' ).addClass( 'mw-collapsible-toggle-collapsed' );
+					if ( $that.find( '> a' ).length ) {
+						$that.find( '> a' ).text( expandtext );
+					} else {
+						$that.text( expandtext );
+					}
+					// Collapse element
+					toggleElement( $collapsible, 'collapse', $that );
+
+				// It's collapsed right now
+				} else {
+					// Change link to "Hide"
+					$that.removeClass( 'mw-collapsible-toggle-collapsed' ).addClass( 'mw-collapsible-toggle-expanded' );
+					if ( $that.find( '> a' ).length ) {
+						$that.find( '> a' ).text( collapsetext );
+					} else {
+						$that.text( collapsetext );
+					}
+					// Expand element
+					toggleElement( $collapsible, 'expand', $that );
+				}
+				return;
+			},
+			// Toggles collapsible and togglelink class
+			toggleLinkPremade = function( $that, e ) {
+				var	$collapsible = $that.eq(0).closest( '.mw-collapsible.mw-made-collapsible' ).toggleClass( 'mw-collapsed' );
+				if ( $(e.target).is('a') ) {
+					return true;
+				}
+				e.preventDefault();
+				e.stopPropagation();
+				
+				// It's expanded right now
+				if ( !$that.hasClass( 'mw-collapsible-toggle-collapsed' ) ) {
+					// Change toggle to collapsed
+					$that.removeClass( 'mw-collapsible-toggle-expanded' ).addClass( 'mw-collapsible-toggle-collapsed' );
+					// Collapse element
+					toggleElement( $collapsible, 'collapse', $that );
+
+				// It's collapsed right now
+				} else {
+					// Change toggle to expanded
+					$that.removeClass( 'mw-collapsible-toggle-collapsed' ).addClass( 'mw-collapsible-toggle-expanded' );
+					// Expand element
+					toggleElement( $collapsible, 'expand', $that );
+				}
+				return;
+			},
+			// Toggles customcollapsible
+			toggleLinkCustom = function( $that, e, $collapsible ) {
+				// For the initial state call of customtogglers there is no event passed
+				if (e) {
+					e.preventDefault();
+				e.stopPropagation();
+				}
+				// Get current state and toggle to the opposite
+				var action = $collapsible.hasClass( 'mw-collapsed' ) ? 'expand' : 'collapse';
+				$collapsible.toggleClass( 'mw-collapsed' );
+				toggleElement( $collapsible, action, $that );
+				
+			};
+
+		// Use custom text or default ?
+		if( !collapsetext ) {
+			collapsetext = mw.msg( 'collapsible-collapse' );
+		}
+		if ( !expandtext ) {
+			expandtext = mw.msg( 'collapsible-expand' );
+		}
+
+		// Create toggle link with a space around the brackets (&nbsp;[text]&nbsp;)
+		var $toggleLink =
+			$( '<a href="#"></a>' )
+				.text( collapsetext )
+				.wrap( '<span class="mw-collapsible-toggle"></span>' )
+				.parent()
+				.prepend( '&nbsp;[' )
+				.append( ']&nbsp;' )
+				.bind( 'click.mw-collapse', function(e) {
+					toggleLinkDefault( this, e );
+				} );
+
+		// Return if it has been enabled already.
+		if ( $that.hasClass( 'mw-made-collapsible' ) ) {
+			return;
+		} else {
+			$that.addClass( 'mw-made-collapsible' );
+		}
+		
+		// Check if this element has a custom position for the toggle link
+		// (ie. outside the container or deeper inside the tree)
+		// Then: Locate the custom toggle link(s) and bind them
+		if ( ( $that.attr( 'id' ) || '' ).indexOf( 'mw-customcollapsible-' ) === 0 ) {
+
+			var thatId = $that.attr( 'id' ),
+				$customTogglers = $( '.' + thatId.replace( 'mw-customcollapsible', 'mw-customtoggle' ) );
+			mw.log( _fn + 'Found custom collapsible: #' + thatId );
+						
+			// Double check that there is actually a customtoggle link
+			if ( $customTogglers.length ) {
+				$customTogglers.bind( 'click.mw-collapse', function( e ) {
+					toggleLinkCustom( $(this), e, $that );
+				} );
+			} else {
+				mw.log( _fn + '#' + thatId + ': Missing toggler!' );
+			}
+			
+			// Initial state
+			if ( $that.hasClass( 'mw-collapsed' ) ) {
+				$that.removeClass( 'mw-collapsed' );
+				toggleLinkCustom( $customTogglers, null, $that );
+			}
+
+		// If this is not a custom case, do the default:
+		// Wrap the contents add the toggle link 
+		} else {
+
+			// Elements are treated differently
+			if ( $that.is( 'table' ) ) {
+				// The toggle-link will be in one the the cells (td or th) of the first row
+				var	$firstRowCells = $( 'tr:first th, tr:first td', that ),
+					$toggle = $firstRowCells.find( '> .mw-collapsible-toggle' );
+	
+				// If theres no toggle link, add it to the last cell
+				if ( !$toggle.length ) {
+					$firstRowCells.eq(-1).prepend( $toggleLink );
+				} else {
+					$toggleLink = $toggle.unbind( 'click.mw-collapse' ).bind( 'click.mw-collapse', function( e ) {
+						toggleLinkPremade( $toggle, e );
+					} );
+				}
+				
+			} else if ( $that.is( 'ul' ) || $that.is( 'ol' ) ) {
+				// The toggle-link will be in the first list-item
+				var	$firstItem = $( 'li:first', $that),
+					$toggle = $firstItem.find( '> .mw-collapsible-toggle' );
+	
+				// If theres no toggle link, add it
+				if ( !$toggle.length ) {
+					// Make sure the numeral order doesn't get messed up, force the first (soon to be second) item
+					// to be "1". Except if the value-attribute is already used.
+					// If no value was set WebKit returns "", Mozilla returns '-1', others return null or undefined.
+					var firstval = $firstItem.attr( 'value' );
+					if ( firstval === undefined || !firstval || firstval == '-1' ) { 
+						$firstItem.attr( 'value', '1' );
+					}
+					$that.prepend( $toggleLink.wrap( '<li class="mw-collapsible-toggle-li"></li>' ).parent() );
+				} else {
+					$toggleLink = $toggle.unbind( 'click.mw-collapse' ).bind( 'click.mw-collapse', function( e ) {
+						toggleLinkPremade( $toggle, e );
+					} );
+				}
+	
+			} else { // <div>, <p> etc.
+	
+				// The toggle-link will be the first child of the element
+				var $toggle = $that.find( '> .mw-collapsible-toggle' );
+
+				// If a direct child .content-wrapper does not exists, create it
+				if ( !$that.find( '> .mw-collapsible-content' ).length ) {
+					$that.wrapInner( '<div class="mw-collapsible-content"></div>' );
+				}
+	
+				// If theres no toggle link, add it
+				if ( !$toggle.length ) {
+					$that.prepend( $toggleLink );
+				} else {
+					$toggleLink = $toggle.unbind( 'click.mw-collapse' ).bind( 'click.mw-collapse', function( e ) {
+						toggleLinkPremade( $toggle, e );
+					} );
+				}
+			}
+		}
+
+		// Initial state (only for those that are not custom)
+		if ( $that.hasClass( 'mw-collapsed' ) && ( $that.attr( 'id' ) || '').indexOf( 'mw-customcollapsible-' ) !== 0 ) {
+			$that.removeClass( 'mw-collapsed' );
+			// The collapsible element could have multiple togglers
+			// To toggle the initial state only click one of them (ie. the first one, eq(0) )
+			// Else it would go like: hide,show,hide,show for each toggle link.
+			toggleElement( $that, 'collapse', $toggleLink.eq(0), /* instantHide = */ true );
+			$toggleLink.eq(0).click();
+		}
+	} );
+};
+} )( jQuery, mediaWiki );
\ No newline at end of file
diff --git a/resources/jquery/jquery.messageBox.css b/resources/jquery/jquery.messageBox.css
new file mode 100644
index 00000000..96332aa5
--- /dev/null
+++ b/resources/jquery/jquery.messageBox.css
@@ -0,0 +1,15 @@
+.js-messagebox {
+	margin: 1em 5%;
+	padding: 0.5em 2.5%;
+	border: 1px solid #ccc;
+	background-color: #fcfcfc;
+	font-size: 0.8em;
+}
+.js-messagebox .js-messagebox-group {
+	margin: 1px;
+	padding: 0.5em 2.5%;
+	border-bottom: 1px solid #ddd;
+}
+.js-messagebox .js-messagebox-group:last-child {
+	border-bottom: thin none transparent;
+}
\ No newline at end of file
diff --git a/resources/jquery/jquery.messageBox.js b/resources/jquery/jquery.messageBox.js
new file mode 100644
index 00000000..a69fca59
--- /dev/null
+++ b/resources/jquery/jquery.messageBox.js
@@ -0,0 +1,98 @@
+/**
+ * jQuery messageBox
+ *
+ * Function to inform the user of something. Use sparingly (since there's mw.log for
+ * messages aimed at developers / debuggers). Based on the function in MediaWiki's
+ * legacy javascript (wikibits.js) by Aryeh Gregor called jsMsg() added in r23233.
+ *
+ * @author Krinkle <krinklemail@gmail.com>
+ *
+ * Dual license:
+ * @license CC-BY 3.0 <http://creativecommons.org/licenses/by/3.0>
+ * @license GPL2 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
+ */
+( function( $, mw ) {
+// @return jQuery object of the message box
+$.messageBoxNew = function( options ) {
+	options = $.extend( {
+		'id': 'js-messagebox', // unique identifier for this message box
+		'parent': 'body', // jQuery/CSS selector
+		'insert': 'prepend' // 'prepend' or 'append'
+	}, options );
+	var $curBox = $( '#'+ options.id );
+	// Only create a new box if it doesn't exist already
+	if ( $curBox.size() > 0 ) {
+		if ( $curBox.hasClass( 'js-messagebox' ) ) {
+			return $curBox;
+		} else {
+			return $curBox.addClass( 'js-messagebox' );
+		}
+	} else {
+		var $newBox = $( '<div/>', {
+			'id': options.id,
+			'class': 'js-messagebox',
+			'css': {
+				'display': 'none'
+			}
+		});
+		if ( $( options.parent ).length < 1 ) {
+			options.parent = 'body';
+		}
+		if ( options.insert === 'append' ) {
+			$newBox.appendTo( options.parent );
+			return $newBox;
+		} else {
+			$newBox.prependTo( options.parent );
+			return $newBox;
+		}
+	}
+};
+// Calling with no message or message set to empty string or null will hide the group,
+// setting 'replace' to true as well will reset and hide the group entirely.
+// If there are no visible groups the main message box is hidden automatically,
+// and shown again once there are messages
+// @return jQuery object of message group
+$.messageBox = function( options ) {
+	options = $.extend( {
+		'message': '',
+		'group': 'default',
+		'replace': false, // if true replaces any previous message in this group
+		'target': 'js-messagebox'
+	}, options );	  
+	var $target = $.messageBoxNew( { id: options.target } );
+	var groupID = options.target + '-' + options.group;
+	var $group = $( '#' + groupID );
+	// Create group container if not existant
+	if ( $group.size() < 1 ) {
+		$group = $( '<div/>', {
+			'id': groupID,
+			'class': 'js-messagebox-group'
+		});
+		$target.prepend( $group );
+	}
+	// Replace ?
+	if ( options.replace === true ) {
+		$group.empty();
+	}
+	// Hide it ?
+	if ( options.message === '' || options.message === null ) {
+		$group.hide();
+	} else {
+		// Actual message addition
+		$group.prepend( $( '<p/>' ).append( options.message ) ).show();
+		$target.slideDown();
+	}
+	// If the last visible group was just hidden, slide the entire box up
+	// Othere wise slideDown (if already visible nothing will happen)
+	if ( $target.find( '> *:visible' ).size() === 0 ) {
+		// to avoid a sudden dissapearance of the last group followed by
+		// a slide up of only the outline, show it for a second
+		$group.show();
+		$target.slideUp();
+		$group.hide();
+	} else {
+		$target.slideDown();
+	}
+	return $group;
+};
+} )( jQuery, mediaWiki );
\ No newline at end of file
diff --git a/resources/jquery/jquery.mwPrototypes.js b/resources/jquery/jquery.mwPrototypes.js
new file mode 100644
index 00000000..e26a6be6
--- /dev/null
+++ b/resources/jquery/jquery.mwPrototypes.js
@@ -0,0 +1,120 @@
+/*
+ * JavaScript backwards-compatibility alternatives and other convenience functions
+ */
+
+jQuery.extend({
+	trimLeft : function( str ) {
+		return str === null ? '' : str.toString().replace( /^\s+/, '' );
+	},
+	trimRight : function( str ) {
+		return str === null ?
+				'' : str.toString().replace( /\s+$/, '' );
+	},
+	ucFirst : function( str ) {
+		return str.substr( 0, 1 ).toUpperCase() + str.substr( 1 );
+	},
+	escapeRE : function( str ) {
+		return str.replace ( /([\\{}()|.?*+\-^$\[\]])/g, "\\$1" );
+	},
+	isDomElement : function( el ) {
+		return !!el && !!el.nodeType;
+	},
+	isEmpty : function( v ) {
+		var key;
+		if ( v === "" || v === 0 || v === "0" || v === null
+			|| v === false || typeof v === 'undefined' )
+		{
+			return true;
+		}
+		// the for-loop could potentially contain prototypes
+		// to avoid that we check it's length first
+		if ( v.length === 0 ) {
+			return true;
+		}
+		if ( typeof v === 'object' ) {
+			for ( key in v ) {
+				return false;
+			}
+			return true;
+		}
+		return false;
+	},
+	compareArray : function( arrThis, arrAgainst ) {
+		if ( arrThis.length != arrAgainst.length ) {
+			return false;
+		}
+		for ( var i = 0; i < arrThis.length; i++ ) {
+			if ( arrThis[i] instanceof Array ) {
+				if ( !$.compareArray( arrThis[i], arrAgainst[i] ) ) {
+					return false;
+				}
+			} else if ( arrThis[i] !== arrAgainst[i] ) {
+				return false;
+			}
+		}
+		return true;
+	},
+	compareObject : function( objectA, objectB ) {
+
+		// Do a simple check if the types match
+		if ( typeof objectA == typeof objectB ) {
+
+			// Only loop over the contents if it really is an object
+			if ( typeof objectA == 'object' ) {
+				// If they are aliases of the same object (ie. mw and mediaWiki) return now
+				if ( objectA === objectB ) {
+					return true;
+				} else {
+					var prop;
+					// Iterate over each property
+					for ( prop in objectA ) {
+						// Check if this property is also present in the other object
+						if ( prop in objectB ) {
+							// Compare the types of the properties
+							var type = typeof objectA[prop];
+							if ( type == typeof objectB[prop] ) {
+								// Recursively check objects inside this one
+								switch ( type ) {
+									case 'object' :
+										if ( !$.compareObject( objectA[prop], objectB[prop] ) ) {
+											return false;
+										}
+										break;
+									case 'function' :
+										// Functions need to be strings to compare them properly
+										if ( objectA[prop].toString() !== objectB[prop].toString() ) {
+											return false;
+										}
+										break;
+									default:
+										// Strings, numbers
+										if ( objectA[prop] !== objectB[prop] ) {
+											return false;
+										}
+										break;
+								}
+							} else {
+								return false;
+							}
+						} else {
+							return false;
+						}
+					}
+					// Check for properties in B but not in A
+					// This is about 15% faster (tested in Safari 5 and Firefox 3.6)
+					// ...than incrementing a count variable in the above and below loops
+					// See also: http://www.mediawiki.org/wiki/ResourceLoader/Default_modules/compareObject_test#Results
+					for ( prop in objectB ) {
+						if ( !( prop in objectA ) ) {
+							return false;
+						}
+					}
+				}
+			}
+		} else {
+			return false;
+		}
+		return true;
+	}
+});
+
diff --git a/resources/jquery/jquery.placeholder.js b/resources/jquery/jquery.placeholder.js
index 0b54893e..1bb69f00 100644
--- a/resources/jquery/jquery.placeholder.js
+++ b/resources/jquery/jquery.placeholder.js
@@ -10,7 +10,7 @@
  */
 ( function( $ ) {
 
-jQuery.fn.placeholder = function() {
+$.fn.placeholder = function() {
 
 	return this.each( function() {
 
@@ -19,11 +19,11 @@ jQuery.fn.placeholder = function() {
 			return;
 		}
 
-		var placeholder = this.getAttribute('placeholder');
-		var $input = jQuery(this);
+		var placeholder = this.getAttribute( 'placeholder' );
+		var $input = $(this);
 
 		// Show initially, if empty
-		if ( this.value === '' || this.value == placeholder ) {
+		if ( this.value === '' || this.value === placeholder ) {
 			$input.addClass( 'placeholder' ).val( placeholder );
 		}
 
@@ -40,7 +40,7 @@ jQuery.fn.placeholder = function() {
 			// Also listen for other events in case $input was
 			// already focused when the events were bound
 			.bind( 'focus drop keydown paste', function( e ) {
-				if ($input.hasClass('placeholder')) {
+				if ( $input.hasClass( 'placeholder' ) ) {
 					if ( e.type == 'drop' && e.originalEvent.dataTransfer ) {
 						// Support for drag&drop. Instead of inserting the dropped
 						// text somewhere in the middle of the placeholder string,
@@ -69,16 +69,18 @@ jQuery.fn.placeholder = function() {
 			} );
 
 		// Blank on submit -- prevents submitting with unintended value
-		this.form && $( this.form ).submit( function() {
-			// $input.trigger( 'focus' ); would be problematic
-			// because it actually focuses $input, leading
-			// to nasty behavior in mobile browsers
-			if ( $input.hasClass('placeholder') ) {
-				$input
-					.val( '' )
-					.removeClass( 'placeholder' );
-			}
-		});
+		if ( this.form ) {
+			$( this.form ).submit( function() {
+				// $input.trigger( 'focus' ); would be problematic
+				// because it actually focuses $input, leading
+				// to nasty behavior in mobile browsers
+				if ( $input.hasClass( 'placeholder' ) ) {
+					$input
+						.val( '' )
+						.removeClass( 'placeholder' );
+				}
+			});
+		}
 
 	});
 };
diff --git a/resources/jquery/jquery.qunit.completenessTest.js b/resources/jquery/jquery.qunit.completenessTest.js
new file mode 100644
index 00000000..2244237c
--- /dev/null
+++ b/resources/jquery/jquery.qunit.completenessTest.js
@@ -0,0 +1,267 @@
+/**
+ * jQuery QUnit CompletenessTest 0.3
+ *
+ * Tests the completeness of test suites for object oriented javascript
+ * libraries. Written to be used in enviroments with jQuery and QUnit.
+ * Requires jQuery 1.5.2 or higher.
+ *
+ * Globals: jQuery, $, QUnit, console.log
+ *
+ * Built for and tested with:
+ * - Safari 5
+ * - Firefox 4
+ *
+ * @author Timo Tijhof, 2011
+ */
+(function(){
+
+/* Private members */
+var TYPE_SIMPLEFUNC = 101;
+var TYPE_OBJCONSTRFUNC = 100;
+
+/**
+ * CompletenessTest
+ * @constructor
+ *
+ * @example
+ *  var myTester = new CompletenessTest( myLib );
+ * @param masterVariable {Object} The root variable that contains all object
+ *  members. CompletenessTest will recursively traverse objects and keep track
+ *  of all methods.
+ * @param ignoreFn {Function} Optionally pass a function to filter out certain
+ *  methods. Example: You may want to filter out instances of jQuery or some
+ *  other constructor. Otherwise "missingTests" will include all methods that
+ *  were not called from that instance.
+ */
+var CompletenessTest = function ( masterVariable, ignoreFn ) {
+
+	// Keep track in these objects. Keyed by strings with the
+	// method names (ie. 'my.foo', 'my.bar', etc.) values are boolean true.
+	this.methodCallTracker = {};
+	this.missingTests = {};
+
+	this.ignoreFn = undefined === ignoreFn ? function(){ return false; } : ignoreFn;
+
+	// Lazy limit in case something weird happends (like recurse (part of) ourself).
+	this.lazyLimit = 1000;
+	this.lazyCounter = 0;
+
+	var that = this;
+
+	// Bind begin and end to QUnit.
+	QUnit.begin = function(){
+		that.checkTests( null, masterVariable, masterVariable, [], CompletenessTest.ACTION_INJECT );
+	};
+
+	QUnit.done = function(){
+		that.checkTests( null, masterVariable, masterVariable, [], CompletenessTest.ACTION_CHECK );
+		console.log( 'CompletenessTest.ACTION_CHECK', that );
+
+		// Build HTML representing the outcome from CompletenessTest
+		// And insert it into the header.
+
+		var makeList = function( blob, title, style ) {
+			title = title || 'Values';
+			var html = '<strong>' + mw.html.escape(title) + '</strong>';
+			$.each( blob, function( key ) {
+				html += '<br />' + mw.html.escape(key);
+			});
+			html += '<br /><br /><em>&mdash; CompletenessTest</em>';
+			var	$oldResult = $( '#qunit-completenesstest' ),
+				$result = $oldResult.length ? $oldResult : $( '<div id="qunit-completenesstest"></div>' );
+			return $result.css( style ).html( html );
+		};
+
+		if ( $.isEmptyObject( that.missingTests ) ) {
+			// Good
+			var $testResults = makeList(
+				{ 'No missing tests!': true },
+				'missingTests',
+				{
+					background: '#D2E0E6',
+					color: '#366097',
+					padding: '1em'
+				}
+			);
+		} else {
+			// Bad
+			var $testResults = makeList(
+				that.missingTests,
+				'missingTests',
+				{
+					background: '#EE5757',
+					color: 'black',
+					padding: '1em'
+				}
+			);
+		}
+
+		$( '#qunit-testrunner-toolbar' ).prepend( $testResults );
+	};
+
+	return this;
+};
+
+/* Static members */
+CompletenessTest.ACTION_INJECT = 500;
+CompletenessTest.ACTION_CHECK = 501;
+
+/* Public methods */
+CompletenessTest.fn = CompletenessTest.prototype = {
+
+	/**
+	 * CompletenessTest.fn.checkTests
+	 *
+	 * This function recursively walks through the given object, calling itself as it goes.
+	 * Depending on the action it either injects our listener into the methods, or
+	 * reads from our tracker and records which methods have not been called by the test suite.
+	 *
+	 * @param currName {String|Null} Name of the given object member (Initially this is null).
+	 * @param currVar {mixed} The variable to check (initially an object,
+	 *  further down it could be anything).
+	 * @param masterVariable {Object} Throughout our interation, always keep track of the master/root.
+	 *  Initially this is the same as currVar.
+	 * @param parentPathArray {Array} Array of names that indicate our breadcrumb path starting at
+	 *  masterVariable. Not including currName.
+	 * @param action {Number} What is this function supposed to do (ACTION_INJECT or ACTION_CHECK)
+	 */
+	checkTests: function( currName, currVar, masterVariable, parentPathArray, action ) {
+
+		// Handle the lazy limit
+		this.lazyCounter++;
+		if ( this.lazyCounter > this.lazyLimit ) {
+			console.log( 'CompletenessTest.fn.checkTests> Limit reached: ' + this.lazyCounter );
+			return null;
+		}
+
+		var	type = $.type( currVar ),
+			that = this;
+
+		// Hard ignores
+		if ( this.ignoreFn( currVar, that, parentPathArray ) ) {
+			return null;
+
+		// Functions
+		} else  if ( type === 'function' ) {
+
+			/* CHECK MODE */
+
+			if ( action === CompletenessTest.ACTION_CHECK ) {
+
+				if ( !currVar.prototype || $.isEmptyObject( currVar.prototype ) ) {
+
+					that.hasTest( parentPathArray.join( '.' ) );
+
+				// We don't support checking object constructors yet...
+				} else {
+
+					// ...the prototypes are fine tho
+					$.each( currVar.prototype, function( key, value ) {
+						if ( key === 'constructor' ) return;
+
+						// Clone and brake reference to parentPathArray
+						var tmpPathArray = $.extend( [], parentPathArray );
+						tmpPathArray.push( 'prototype' ); tmpPathArray.push( key );
+
+						that.hasTest( tmpPathArray.join( '.' ) );
+					} );
+				}
+
+			/* INJECT MODE */
+
+			} else if ( action === CompletenessTest.ACTION_INJECT ) {
+
+				if ( !currVar.prototype || $.isEmptyObject( currVar.prototype ) ) {
+
+					// Inject check
+					that.injectCheck( masterVariable, parentPathArray, function(){
+
+						that.methodCallTracker[ parentPathArray.join( '.' ) ] = true;
+
+					}, TYPE_SIMPLEFUNC );
+
+				// We don't support checking object constructors yet...
+				} else {
+
+					// ... the prototypes are fine tho
+					$.each( currVar.prototype, function( key, value ) {
+						if ( key === 'constructor' ) return;
+
+						// Clone and brake reference to parentPathArray
+						var tmpPathArray = $.extend( [], parentPathArray );
+						tmpPathArray.push( 'prototype' ); tmpPathArray.push( key );
+
+						that.checkTests( key, value, masterVariable, tmpPathArray, action );
+					} );
+				}
+
+			}
+
+		// Recursively. After all, this *is* the completness test
+		} else if ( type === 'object' ) {
+
+			$.each( currVar, function( key, value ) {
+
+				// Clone and brake reference to parentPathArray
+				var tmpPathArray = $.extend( [], parentPathArray );
+				tmpPathArray.push( key );
+
+				that.checkTests( key, value, masterVariable, tmpPathArray, action );
+
+			} );
+
+		}
+
+		return 'End of checkTests';
+	},
+
+	/**
+	 * CompletenessTest.fn.hasTest
+	 *
+	 * Checks if the given method name (ie. 'my.foo.bar')
+	 * was called during the test suite (as far as the tracker knows).
+	 * If so it adds it to missingTests.
+	 *
+	 * @param fnName {String}
+	 * @return {Boolean}
+	 */
+	hasTest: function( fnName ) {
+		if ( !(fnName in this.methodCallTracker) ) {
+			this.missingTests[fnName] = true;
+			return false;
+		}
+		return true;
+	},
+
+	/**
+	 * CompletenessTest.fn.injectCheck
+	 *
+	 * Injects a function (such as a spy that updates methodCallTracker when
+	 * it's called) inside another function.
+	 *
+	 * @param masterVariable {Object}
+	 * @param objectPathArray {Array}
+	 * @param injectFn {Function}
+	 */
+	injectCheck: function( masterVariable, objectPathArray, injectFn ) {
+		var	prev,
+			curr = masterVariable,
+			lastMember;
+
+		$.each( objectPathArray, function(i, memberName){
+			prev = curr;
+			curr = prev[memberName];
+			lastMember = memberName;
+		});
+
+		// Objects are by reference, members (unless objects) are not.
+		prev[lastMember] = function(){
+			injectFn();
+			return curr.apply( this, arguments );
+		};
+	}
+};
+
+window.CompletenessTest = CompletenessTest;
+
+})();
diff --git a/resources/jquery/jquery.qunit.css b/resources/jquery/jquery.qunit.css
new file mode 100644
index 00000000..fa9156f9
--- /dev/null
+++ b/resources/jquery/jquery.qunit.css
@@ -0,0 +1,225 @@
+/**
+ * QUnit - A JavaScript Unit Testing Framework
+ * 
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ */
+
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
+}
+
+#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-tests { font-size: smaller; }
+
+
+/** Resets */
+
+#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
+	margin: 0;
+	padding: 0;
+}
+
+
+/** Header */
+
+#qunit-header {
+	padding: 0.5em 0 0.5em 1em;
+
+	color: #8699a4;
+	background-color: #0d3349;
+
+	font-size: 1.5em;
+	line-height: 1em;
+	font-weight: normal;
+	
+	border-radius: 15px 15px 0 0;
+	-moz-border-radius: 15px 15px 0 0;
+	-webkit-border-top-right-radius: 15px;
+	-webkit-border-top-left-radius: 15px;
+}
+
+#qunit-header a {
+	text-decoration: none;
+	color: #c2ccd1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+	color: #fff;
+}
+
+#qunit-banner {
+	height: 5px;
+}
+
+#qunit-testrunner-toolbar {
+	padding: 0.5em 0 0.5em 2em;
+	color: #5E740B;
+	background-color: #eee;
+}
+
+#qunit-userAgent {
+	padding: 0.5em 0 0.5em 2.5em;
+	background-color: #2b81af;
+	color: #fff;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+	list-style-position: inside;
+}
+
+#qunit-tests li {
+	padding: 0.4em 0.5em 0.4em 2.5em;
+	border-bottom: 1px solid #fff;
+	list-style-position: inside;
+}
+
+#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
+	display: none;
+}
+
+#qunit-tests li strong {
+	cursor: pointer;
+}
+
+#qunit-tests li a {
+	padding: 0.5em;
+	color: #c2ccd1;
+	text-decoration: none;
+}
+#qunit-tests li a:hover,
+#qunit-tests li a:focus {
+	color: #000;
+}
+
+#qunit-tests ol {
+	margin-top: 0.5em;
+	padding: 0.5em;
+	
+	background-color: #fff;
+	
+	border-radius: 15px;
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+	
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+}
+
+#qunit-tests table {
+	border-collapse: collapse;
+	margin-top: .2em;
+}
+
+#qunit-tests th {
+	text-align: right;
+	vertical-align: top;
+	padding: 0 .5em 0 0;
+}
+
+#qunit-tests td {
+	vertical-align: top;
+}
+
+#qunit-tests pre {
+	margin: 0;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+#qunit-tests del {
+	background-color: #e0f2be;
+	color: #374e0c;
+	text-decoration: none;
+}
+
+#qunit-tests ins {
+	background-color: #ffcaca;
+	color: #500;
+	text-decoration: none;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts                       { color: black; }
+#qunit-tests b.passed                       { color: #5E740B; }
+#qunit-tests b.failed                       { color: #710909; }
+
+#qunit-tests li li {
+	margin: 0.5em;
+	padding: 0.4em 0.5em 0.4em 0.5em;
+	background-color: #fff;
+	border-bottom: none;
+	list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+	color: #5E740B;
+	background-color: #fff;
+	border-left: 26px solid #C6E746;
+}
+
+#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
+#qunit-tests .pass .test-name               { color: #366097; }
+ 
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected           { color: #999999; }
+
+#qunit-banner.qunit-pass                    { background-color: #C6E746; }
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+	color: #710909;
+	background-color: #fff;
+	border-left: 26px solid #EE5757;
+}
+
+#qunit-tests > li:last-child {
+	border-radius: 0 0 15px 15px;
+	-moz-border-radius: 0 0 15px 15px;
+	-webkit-border-bottom-right-radius: 15px;
+	-webkit-border-bottom-left-radius: 15px;
+}
+
+#qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name             { color: #000000; }
+
+#qunit-tests .fail .test-actual             { color: #EE5757; }
+#qunit-tests .fail .test-expected           { color: green;   }
+
+#qunit-banner.qunit-fail                    { background-color: #EE5757; }
+
+
+/** Result */
+
+#qunit-testresult {
+	padding: 0.5em 0.5em 0.5em 2.5em;
+
+	color: #2b81af;
+	background-color: #D2E0E6;
+
+	border-bottom: 1px solid white;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+	position: absolute;
+	top: -10000px;
+	left: -10000px;
+}
\ No newline at end of file
diff --git a/resources/jquery/jquery.qunit.js b/resources/jquery/jquery.qunit.js
new file mode 100644
index 00000000..1405e797
--- /dev/null
+++ b/resources/jquery/jquery.qunit.js
@@ -0,0 +1,1442 @@
+/**
+ * QUnit - A JavaScript Unit Testing Framework
+ * 
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+var defined = {
+	setTimeout: typeof window.setTimeout !== "undefined",
+	sessionStorage: (function() {
+		try {
+			return !!sessionStorage.getItem;
+		} catch(e){
+			return false;
+		}
+  })()
+};
+
+var testId = 0;
+
+var Test = function(name, testName, expected, testEnvironmentArg, async, callback) {
+	this.name = name;
+	this.testName = testName;
+	this.expected = expected;
+	this.testEnvironmentArg = testEnvironmentArg;
+	this.async = async;
+	this.callback = callback;
+	this.assertions = [];
+};
+Test.prototype = {
+	init: function() {
+		var tests = id("qunit-tests");
+		if (tests) {
+			var b = document.createElement("strong");
+				b.innerHTML = "Running " + this.name;
+			var li = document.createElement("li");
+				li.appendChild( b );
+				li.className = "running";
+				li.id = this.id = "test-output" + testId++;
+			tests.appendChild( li );
+		}
+	},
+	setup: function() {
+		if (this.module != config.previousModule) {
+			if ( config.previousModule ) {
+				QUnit.moduleDone( {
+					name: config.previousModule,
+					failed: config.moduleStats.bad,
+					passed: config.moduleStats.all - config.moduleStats.bad,
+					total: config.moduleStats.all
+				} );
+			}
+			config.previousModule = this.module;
+			config.moduleStats = { all: 0, bad: 0 };
+			QUnit.moduleStart( {
+				name: this.module
+			} );
+		}
+
+		config.current = this;
+		this.testEnvironment = extend({
+			setup: function() {},
+			teardown: function() {}
+		}, this.moduleTestEnvironment);
+		if (this.testEnvironmentArg) {
+			extend(this.testEnvironment, this.testEnvironmentArg);
+		}
+
+		QUnit.testStart( {
+			name: this.testName
+		} );
+
+		// allow utility functions to access the current test environment
+		// TODO why??
+		QUnit.current_testEnvironment = this.testEnvironment;
+		
+		try {
+			if ( !config.pollution ) {
+				saveGlobal();
+			}
+
+			this.testEnvironment.setup.call(this.testEnvironment);
+		} catch(e) {
+			QUnit.ok( false, "Setup failed on " + this.testName + ": " + e.message );
+		}
+	},
+	run: function() {
+		if ( this.async ) {
+			QUnit.stop();
+		}
+
+		if ( config.notrycatch ) {
+			this.callback.call(this.testEnvironment);
+			return;
+		}
+		try {
+			this.callback.call(this.testEnvironment);
+		} catch(e) {
+			fail("Test " + this.testName + " died, exception and test follows", e, this.callback);
+			QUnit.ok( false, "Died on test #" + (this.assertions.length + 1) + ": " + e.message + " - " + QUnit.jsDump.parse(e) );
+			// else next test will carry the responsibility
+			saveGlobal();
+
+			// Restart the tests if they're blocking
+			if ( config.blocking ) {
+				start();
+			}
+		}
+	},
+	teardown: function() {
+		try {
+			checkPollution();
+			this.testEnvironment.teardown.call(this.testEnvironment);
+		} catch(e) {
+			QUnit.ok( false, "Teardown failed on " + this.testName + ": " + e.message );
+		}
+	},
+	finish: function() {
+		if ( this.expected && this.expected != this.assertions.length ) {
+			QUnit.ok( false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" );
+		}
+		
+		var good = 0, bad = 0,
+			tests = id("qunit-tests");
+
+		config.stats.all += this.assertions.length;
+		config.moduleStats.all += this.assertions.length;
+
+		if ( tests ) {
+			var ol  = document.createElement("ol");
+
+			for ( var i = 0; i < this.assertions.length; i++ ) {
+				var assertion = this.assertions[i];
+
+				var li = document.createElement("li");
+				li.className = assertion.result ? "pass" : "fail";
+				li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed");
+				ol.appendChild( li );
+
+				if ( assertion.result ) {
+					good++;
+				} else {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+
+			// store result when possible
+			if ( QUnit.config.reorder && defined.sessionStorage ) {
+				if (bad) {
+					sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad);
+				} else {
+					sessionStorage.removeItem("qunit-" + this.module + "-" + this.testName);
+				}
+			}
+
+			if (bad == 0) {
+				ol.style.display = "none";
+			}
+
+			var b = document.createElement("strong");
+			b.innerHTML = this.name + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
+			
+			var a = document.createElement("a");
+			a.innerHTML = "Rerun";
+			a.href = QUnit.url({ filter: getText([b]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+			
+			addEvent(b, "click", function() {
+				var next = b.nextSibling.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() == "span" || target.nodeName.toLowerCase() == "b" ) {
+					target = target.parentNode;
+				}
+				if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
+					window.location = QUnit.url({ filter: getText([target]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+				}
+			});
+
+			var li = id(this.id);
+			li.className = bad ? "fail" : "pass";
+			li.removeChild( li.firstChild );
+			li.appendChild( b );
+			li.appendChild( a );
+			li.appendChild( ol );
+
+		} else {
+			for ( var i = 0; i < this.assertions.length; i++ ) {
+				if ( !this.assertions[i].result ) {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+		}
+
+		try {
+			QUnit.reset();
+		} catch(e) {
+			fail("reset() failed, following Test " + this.testName + ", exception and reset fn follows", e, QUnit.reset);
+		}
+
+		QUnit.testDone( {
+			name: this.testName,
+			failed: bad,
+			passed: this.assertions.length - bad,
+			total: this.assertions.length
+		} );
+	},
+	
+	queue: function() {
+		var test = this;
+		synchronize(function() {
+			test.init();
+		});
+		function run() {
+			// each of these can by async
+			synchronize(function() {
+				test.setup();
+			});
+			synchronize(function() {
+				test.run();
+			});
+			synchronize(function() {
+				test.teardown();
+			});
+			synchronize(function() {
+				test.finish();
+			});
+		}
+		// defer when previous test run passed, if storage is available
+		var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-" + this.module + "-" + this.testName);
+		if (bad) {
+			run();
+		} else {
+			synchronize(run);
+		};
+	}
+	
+};
+
+var QUnit = {
+
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+		config.currentModuleTestEnviroment = 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 = '<span class="test-name">' + testName + '</span>', 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 = '<span class="module-name">' + config.currentModule + "</span>: " + name;
+		}
+
+		if ( !validTest(config.currentModule + ": " + testName) ) {
+			return;
+		}
+		
+		var test = new Test(name, testName, expected, testEnvironmentArg, async, callback);
+		test.module = config.currentModule;
+		test.moduleTestEnvironment = config.currentModuleTestEnviroment;
+		test.queue();
+	},
+	
+	/**
+	 * 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.current.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		a = !!a;
+		var details = {
+			result: a,
+			message: msg
+		};
+		msg = escapeHtml(msg);
+		QUnit.log(details);
+		config.current.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) {
+		QUnit.push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		QUnit.push(expected != actual, actual, expected, message);
+	},
+	
+	deepEqual: function(actual, expected, message) {
+		QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	notDeepEqual: function(actual, expected, message) {
+		QUnit.push(!QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		QUnit.push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		QUnit.push(expected !== actual, actual, expected, message);
+	},
+
+	raises: function(block, expected, message) {
+		var actual, ok = false;
+	
+		if (typeof expected === 'string') {
+			message = expected;
+			expected = null;
+		}
+	
+		try {
+			block();
+		} catch (e) {
+			actual = e;
+		}
+	
+		if (actual) {
+			// we don't want to validate thrown error
+			if (!expected) {
+				ok = true;
+			// expected is a regexp	
+			} else if (QUnit.objectType(expected) === "regexp") {
+				ok = expected.test(actual);
+			// expected is a constructor	
+			} else if (actual instanceof expected) {
+				ok = true;
+			// expected is a validation function which returns true is validation passed	
+			} else if (expected.call({}, actual) === true) {
+				ok = true;
+			}
+		}
+			
+		QUnit.ok(ok, message);
+	},
+
+	start: function() {
+		config.semaphore--;
+		if (config.semaphore > 0) {
+			// don't start until equal number of stop-calls
+			return;
+		}
+		if (config.semaphore < 0) {
+			// ignore if start is called more often then stop
+			config.semaphore = 0;
+		}
+		// A slight delay, to avoid any current callbacks
+		if ( defined.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+	
+	stop: function(timeout) {
+		config.semaphore++;
+		config.blocking = true;
+
+		if ( timeout && defined.setTimeout ) {
+			clearTimeout(config.timeout);
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	}
+};
+
+// 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,
+	
+	// by default, run previously failed tests first
+	// very useful in combination with "Hide passed tests" checked
+	reorder: true,
+
+	noglobals: false,
+	notrycatch: false
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		params = location.search.slice( 1 ).split( "&" ),
+		length = params.length,
+		urlParams = {},
+		current;
+
+	if ( params[ 0 ] ) {
+		for ( var i = 0; i < length; i++ ) {
+			current = params[ i ].split( "=" );
+			current[ 0 ] = decodeURIComponent( current[ 0 ] );
+			// allow just a key to turn on a flag, e.g., test.html?noglobals
+			current[ 1 ] = current[ 1 ] ? decodeURIComponent( current[ 1 ] ) : true;
+			urlParams[ current[ 0 ] ] = current[ 1 ];
+			if ( current[ 0 ] in config ) {
+				config[ current[ 0 ] ] = current[ 1 ];
+			}
+		}
+	}
+
+	QUnit.urlParams = urlParams;
+	config.filter = urlParams.filter;
+
+	// 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;
+}
+
+// define these after exposing globals to keep them in these QUnit namespace only
+extend(QUnit, {
+	config: config,
+
+	// Initialize the configuration options
+	init: function() {
+		extend(config, {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			updateRate: 1000,
+			blocking: false,
+			autostart: true,
+			autorun: false,
+			filter: "",
+			queue: [],
+			semaphore: 0
+		});
+
+		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 );
+		}
+		
+		if ( tests ) {
+			result = document.createElement( "p" );
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests );
+			result.innerHTML = 'Running...<br/>&nbsp;';
+		}
+	},
+	
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 * 
+	 * If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery( "#qunit-fixture" ).html( config.fixture );
+		} else {
+			var main = id( 'qunit-fixture' );
+			if ( main ) {
+				main.innerHTML = config.fixture;
+			}
+		}
+	},
+	
+	/**
+	 * 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 QUnit.objectType( obj ) == type;
+	},
+	
+	objectType: function( obj ) {
+		if (typeof obj === "undefined") {
+				return "undefined";
+
+		// consider: typeof null === object
+		}
+		if (obj === null) {
+				return "null";
+		}
+
+		var type = Object.prototype.toString.call( obj )
+			.match(/^\[object\s(.*)\]$/)[1] || '';
+
+		switch (type) {
+				case 'Number':
+						if (isNaN(obj)) {
+								return "nan";
+						} else {
+								return "number";
+						}
+				case 'String':
+				case 'Boolean':
+				case 'Array':
+				case 'Date':
+				case 'RegExp':
+				case 'Function':
+						return type.toLowerCase();
+		}
+		if (typeof obj === "object") {
+				return "object";
+		}
+		return undefined;
+	},
+	
+	push: function(result, actual, expected, message) {
+		var details = {
+			result: result,
+			message: message,
+			actual: actual,
+			expected: expected
+		};
+		
+		message = escapeHtml(message) || (result ? "okay" : "failed");
+		message = '<span class="test-message">' + message + "</span>";
+		expected = escapeHtml(QUnit.jsDump.parse(expected));
+		actual = escapeHtml(QUnit.jsDump.parse(actual));
+		var output = message + '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>';
+		if (actual != expected) {
+			output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>';
+			output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) +'</pre></td></tr>';
+		}
+		if (!result) {
+			var source = sourceFromStacktrace();
+			if (source) {
+				details.source = source;
+				output += '<tr class="test-source"><th>Source: </th><td><pre>' + source +'</pre></td></tr>';
+			}
+		}
+		output += "</table>";
+		
+		QUnit.log(details);
+		
+		config.current.assertions.push({
+			result: !!result,
+			message: output
+		});
+	},
+	
+	url: function( params ) {
+		params = extend( extend( {}, QUnit.urlParams ), params );
+		var querystring = "?",
+			key;
+		for ( key in params ) {
+			querystring += encodeURIComponent( key ) + "=" +
+				encodeURIComponent( params[ key ] ) + "&";
+		}
+		return window.location.pathname + querystring.slice( 0, -1 );
+	},
+	
+	// Logging callbacks; all receive a single argument with the listed properties
+	// run test/logs.html for any related changes
+	begin: function() {},
+	// done: { failed, passed, total, runtime }
+	done: function() {},
+	// log: { result, actual, expected, message }
+	log: function() {},
+	// testStart: { name }
+	testStart: function() {},
+	// testDone: { name, failed, passed, total }
+	testDone: function() {},
+	// moduleStart: { name }
+	moduleStart: function() {},
+	// moduleDone: { name, failed, passed, total }
+	moduleDone: function() {}
+});
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+addEvent(window, "load", function() {
+	QUnit.begin({});
+	
+	// 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 banner = id("qunit-header");
+	if ( banner ) {
+		banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' +
+			'<label><input name="noglobals" type="checkbox"' + ( config.noglobals ? ' checked="checked"' : '' ) + '>noglobals</label>' +
+			'<label><input name="notrycatch" type="checkbox"' + ( config.notrycatch ? ' checked="checked"' : '' ) + '>notrycatch</label>';
+		addEvent( banner, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+	}
+	
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		addEvent( filter, "click", function() {
+			var ol = document.getElementById("qunit-tests");
+			if ( filter.checked ) {
+				ol.className = ol.className + " hidepass";
+			} else {
+				var tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
+				ol.className = tmp.replace(/ hidepass /, " ");
+			}
+			if ( defined.sessionStorage ) {
+				if (filter.checked) {
+					sessionStorage.setItem("qunit-filter-passed-tests",  "true");
+				} else {
+					sessionStorage.removeItem("qunit-filter-passed-tests");
+				}
+			}
+		});
+		if ( defined.sessionStorage && sessionStorage.getItem("qunit-filter-passed-tests") ) {
+			filter.checked = true;
+			var ol = document.getElementById("qunit-tests");
+			ol.className = ol.className + " hidepass";
+		}
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('qunit-fixture');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if (config.autostart) {
+		QUnit.start();
+	}
+});
+
+function done() {
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( {
+			name: config.currentModule,
+			failed: config.moduleStats.bad,
+			passed: config.moduleStats.all - config.moduleStats.bad,
+			total: config.moduleStats.all
+		} );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		runtime = +new Date - config.started,
+		passed = config.stats.all - config.stats.bad,
+		html = [
+			'Tests completed in ',
+			runtime,
+			' milliseconds.<br/>',
+			'<span class="passed">',
+			passed,
+			'</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 ) {	
+		id( "qunit-testresult" ).innerHTML = html;
+	}
+
+	QUnit.done( {
+		failed: config.stats.bad,
+		passed: passed, 
+		total: config.stats.all,
+		runtime: runtime
+	} );
+}
+
+function validTest( name ) {
+	var filter = config.filter,
+		run = false;
+
+	if ( !filter ) {
+		return true;
+	}
+
+	not = filter.charAt( 0 ) === "!";
+	if ( not ) {
+		filter = filter.slice( 1 );
+	}
+
+	if ( name.indexOf( filter ) !== -1 ) {
+		return !not;
+	}
+
+	if ( not ) {
+		run = true;
+	}
+
+	return run;
+}
+
+// so far supports only Firefox, Chrome and Opera (buggy)
+// could be extended in the future to use something like https://github.com/csnover/TraceKit
+function sourceFromStacktrace() {
+	try {
+		throw new Error();
+	} catch ( e ) {
+		if (e.stacktrace) {
+			// Opera
+			return e.stacktrace.split("\n")[6];
+		} else if (e.stack) {
+			// Firefox, Chrome
+			return e.stack.split("\n")[4];
+		}
+	}
+}
+
+function escapeHtml(s) {
+	if (!s) {
+		return "";
+	}
+	s = s + "";
+	return s.replace(/[\&"<>\\]/g, function(s) {
+		switch(s) {
+			case "&": return "&amp;";
+			case "\\": return "\\\\";
+			case '"': return '\"';
+			case "<": return "&lt;";
+			case ">": return "&gt;";
+			default: return s;
+		}
+	});
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	var start = (new Date()).getTime();
+
+	while ( config.queue.length && !config.blocking ) {
+		if ( config.updateRate <= 0 || (((new Date()).getTime() - start) < config.updateRate) ) {
+			config.queue.shift()();
+		} else {
+			window.setTimeout( process, 13 );
+			break;
+		}
+	}
+  if (!config.blocking && !config.queue.length) {
+    done();
+  }
+}
+
+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( config.pollution, old );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+	}
+
+	var deletedGlobals = diff( old, config.pollution );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+	}
+}
+
+// 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 ) {
+		if ( b[prop] === undefined ) {
+			delete a[prop];
+		} else {
+			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
+    var parents = []; // stack to avoiding loops from circular referencing
+
+    // Call the o related callback with the given arguments.
+    function bindCallbacks(o, callbacks, args) {
+        var prop = QUnit.objectType(o);
+        if (prop) {
+            if (QUnit.objectType(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 QUnit.objectType(b) === "date" && a.valueOf() === b.valueOf();
+            },
+
+            "regexp": function (b, a) {
+                return QUnit.objectType(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, j, loop;
+                var len;
+
+                // b could be an object literal here
+                if ( ! (QUnit.objectType(b) === "array")) {
+                    return false;
+                }   
+                
+                len = a.length;
+                if (len !== b.length) { // safe and faster
+                    return false;
+                }
+                
+                //track reference to avoid circular references
+                parents.push(a);
+                for (i = 0; i < len; i++) {
+                    loop = false;
+                    for(j=0;j<parents.length;j++){
+                        if(parents[j] === a[i]){
+                            loop = true;//dont rewalk array
+                        }
+                    }
+                    if (!loop && ! innerEquiv(a[i], b[i])) {
+                        parents.pop();
+                        return false;
+                    }
+                }
+                parents.pop();
+                return true;
+            },
+
+            "object": function (b, a) {
+                var i, j, loop;
+                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);
+                //track reference to avoid circular references
+                parents.push(a);
+                
+                for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
+                    loop = false;
+                    for(j=0;j<parents.length;j++){
+                        if(parents[j] === a[i])
+                            loop = true; //don't go down the same path twice
+                    }
+                    aProperties.push(i); // collect a's properties
+
+                    if (!loop && ! innerEquiv(a[i], b[i])) {
+                        eq = false;
+                        break;
+                    }
+                }
+
+                callers.pop(); // unstack, we are done
+                parents.pop();
+
+                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" || QUnit.objectType(a) !== QUnit.objectType(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 (typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined") {
+				type = "window";
+			} else if (obj.nodeType === 9) {
+				type = "document";
+			} else if (obj.nodeType) {
+				type = "node";
+			} else if (typeof obj === "object" && typeof obj.length === "number" && obj.length >= 0) {
+				type = "array";
+			} 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, QUnit.jsDump.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, QUnit.jsDump.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map ) {
+				var ret = [ ];
+				QUnit.jsDump.up();
+				for ( var key in map )
+					ret.push( QUnit.jsDump.parse(key,'key') + ': ' + QUnit.jsDump.parse(map[key]) );
+				QUnit.jsDump.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = QUnit.jsDump.HTML ? '&lt;' : '<',
+					close = QUnit.jsDump.HTML ? '&gt;' : '>';
+					
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+					
+				for ( var a in QUnit.jsDump.DOMAttrs ) {
+					var val = node[QUnit.jsDump.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + QUnit.jsDump.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:false,//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;
+})();
+
+// from Sizzle.js
+function getText( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+/*
+ * Javascript Diff Algorithm
+ *  By John Resig (http://ejohn.org/)
+ *  Modified by Chu Alan "sprite"
+ *
+ * Released under the MIT license.
+ *
+ * More Info:
+ *  http://ejohn.org/projects/javascript-diff-algorithm/
+ *  
+ * Usage: QUnit.diff(expected, actual)
+ * 
+ * QUnit.diff("the quick brown fox jumped over", "the quick fox jumps over") == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
+ */
+QUnit.diff = (function() {
+	function diff(o, n){
+		var ns = new Object();
+		var os = new Object();
+		
+		for (var i = 0; i < n.length; i++) {
+			if (ns[n[i]] == null) 
+				ns[n[i]] = {
+					rows: new Array(),
+					o: null
+				};
+			ns[n[i]].rows.push(i);
+		}
+		
+		for (var i = 0; i < o.length; i++) {
+			if (os[o[i]] == null) 
+				os[o[i]] = {
+					rows: new Array(),
+					n: null
+				};
+			os[o[i]].rows.push(i);
+		}
+		
+		for (var i in ns) {
+			if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
+				n[ns[i].rows[0]] = {
+					text: n[ns[i].rows[0]],
+					row: os[i].rows[0]
+				};
+				o[os[i].rows[0]] = {
+					text: o[os[i].rows[0]],
+					row: ns[i].rows[0]
+				};
+			}
+		}
+		
+		for (var i = 0; i < n.length - 1; i++) {
+			if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
+			n[i + 1] == o[n[i].row + 1]) {
+				n[i + 1] = {
+					text: n[i + 1],
+					row: n[i].row + 1
+				};
+				o[n[i].row + 1] = {
+					text: o[n[i].row + 1],
+					row: i + 1
+				};
+			}
+		}
+		
+		for (var i = n.length - 1; i > 0; i--) {
+			if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
+			n[i - 1] == o[n[i].row - 1]) {
+				n[i - 1] = {
+					text: n[i - 1],
+					row: n[i].row - 1
+				};
+				o[n[i].row - 1] = {
+					text: o[n[i].row - 1],
+					row: i - 1
+				};
+			}
+		}
+		
+		return {
+			o: o,
+			n: n
+		};
+	}
+	
+	return function(o, n){
+		o = o.replace(/\s+$/, '');
+		n = n.replace(/\s+$/, '');
+		var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
+
+		var str = "";
+		
+		var oSpace = o.match(/\s+/g);
+		if (oSpace == null) {
+			oSpace = [" "];
+		}
+		else {
+			oSpace.push(" ");
+		}
+		var nSpace = n.match(/\s+/g);
+		if (nSpace == null) {
+			nSpace = [" "];
+		}
+		else {
+			nSpace.push(" ");
+		}
+		
+		if (out.n.length == 0) {
+			for (var i = 0; i < out.o.length; i++) {
+				str += '<del>' + out.o[i] + oSpace[i] + "</del>";
+			}
+		}
+		else {
+			if (out.n[0].text == null) {
+				for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
+					str += '<del>' + out.o[n] + oSpace[n] + "</del>";
+				}
+			}
+			
+			for (var i = 0; i < out.n.length; i++) {
+				if (out.n[i].text == null) {
+					str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
+				}
+				else {
+					var pre = "";
+					
+					for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
+						pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
+					}
+					str += " " + out.n[i].text + nSpace[i] + pre;
+				}
+			}
+		}
+		
+		return str;
+	};
+})();
+
+})(this);
\ No newline at end of file
diff --git a/resources/jquery/jquery.suggestions.css b/resources/jquery/jquery.suggestions.css
index f0b48da1..74094c53 100644
--- a/resources/jquery/jquery.suggestions.css
+++ b/resources/jquery/jquery.suggestions.css
@@ -7,7 +7,7 @@
 	left: 0px;
 	width: 0px;
 	border: none;
-	z-index: 99;
+	z-index: 1099;
 	padding: 0;
 	margin: -1px -1px 0 0;
 }
diff --git a/resources/jquery/jquery.suggestions.js b/resources/jquery/jquery.suggestions.js
index 9fc8a47d..90cf53b2 100644
--- a/resources/jquery/jquery.suggestions.js
+++ b/resources/jquery/jquery.suggestions.js
@@ -66,20 +66,25 @@ $.suggestions = {
 	},
 	/**
 	 * Ask the user-specified callback for new suggestions. Any previous delayed call to this function still pending
-	 * will be canceled.  If the value in the textbox hasn't changed since the last time suggestions were fetched, this
+	 * will be canceled.  If the value in the textbox is empty or hasn't changed since the last time suggestions were fetched, this
 	 * function does nothing.
 	 * @param {Boolean} delayed Whether or not to delay this by the currently configured amount of time
 	 */
 	update: function( context, delayed ) {
-		// Only fetch if the value in the textbox changed
+		// Only fetch if the value in the textbox changed and is not empty
+		// if the textbox is empty then clear the result div, but leave other settings intouched
 		function maybeFetch() {
-			if ( context.data.$textbox.val() !== context.data.prevText ) {
-				context.data.prevText = context.data.$textbox.val();
+			if ( context.data.$textbox.val().length == 0 ) {
+				context.data.$container.hide();
+				context.data.prevText = '';
+			} else if ( context.data.$textbox.val() !== context.data.prevText ) {
 				if ( typeof context.config.fetch == 'function' ) {
+     					context.data.prevText = context.data.$textbox.val();
 					context.config.fetch.call( context.data.$textbox, context.data.$textbox.val() );
 				}
 			}
 		}
+
 		// Cancel previous call
 		if ( context.data.timerID != null ) {
 			clearTimeout( context.data.timerID );
@@ -224,7 +229,7 @@ $.suggestions = {
 				} else {
 					result = selected.prev();
 					if ( selected.length == 0 ) {
-						// we are at the begginning, so lets jump to the last item
+						// we are at the beginning, so lets jump to the last item
 						if ( context.data.$container.find( '.suggestions-special' ).html() != "" ) {
 							result = context.data.$container.find( '.suggestions-special' );
 						} else {
@@ -517,5 +522,4 @@ $.fn.suggestions = function() {
 	} );
 	return returnValue !== null ? returnValue : $(this);
 };
-
-} )( jQuery );
+} )( jQuery );
\ No newline at end of file
diff --git a/resources/jquery/jquery.tabIndex.js b/resources/jquery/jquery.tabIndex.js
index bb9b2bfa..33e06047 100644
--- a/resources/jquery/jquery.tabIndex.js
+++ b/resources/jquery/jquery.tabIndex.js
@@ -5,31 +5,46 @@
 /**
  * Finds the lowerst tabindex in use within a selection
  * 
- * @return Integer of lowest tabindex on the page
+ * @return number Lowest tabindex on the page
  */
-jQuery.fn.firstTabIndex = function() {
-	var minTabIndex = 0;
-	jQuery(this).find( '[tabindex]' ).each( function() {
-		var tabIndex = parseInt( jQuery(this).attr( 'tabindex' ) );
-		if ( tabIndex > minTabIndex ) {
-			minTabIndex = tabIndex;
+$.fn.firstTabIndex = function() {
+	var minTabIndex = null;
+	$(this).find( '[tabindex]' ).each( function() {
+		var tabIndex = parseInt( $(this).attr( 'tabindex' ), 10 );
+		// In IE6/IE7 the above jQuery selector returns all elements,
+		// becuase it has a default value for tabIndex in IE6/IE7 of 0
+		// (rather than null/undefined). Therefore check "> 0" as well.
+		// Under IE7 under Windows NT 5.2 is also capable of returning NaN.
+		if ( tabIndex > 0 && !isNaN( tabIndex ) ) {
+			// Initial value
+			if ( minTabIndex === null ) {
+				minTabIndex = tabIndex;
+			} else if ( tabIndex < minTabIndex ) {
+				minTabIndex = tabIndex;
+			}
 		}
 	} );
 	return minTabIndex;
 };
+
 /**
  * Finds the highest tabindex in use within a selection
  * 
- * @return Integer of highest tabindex on the page
+ * @return number Highest tabindex on the page
  */
-jQuery.fn.lastTabIndex = function() {
-	var maxTabIndex = 0;
-	jQuery(this).find( '[tabindex]' ).each( function() {
-		var tabIndex = parseInt( jQuery(this).attr( 'tabindex' ) );
-		if ( tabIndex > maxTabIndex ) {
-			maxTabIndex = tabIndex;
+$.fn.lastTabIndex = function() {
+	var maxTabIndex = null;
+	$(this).find( '[tabindex]' ).each( function() {
+		var tabIndex = parseInt( $(this).attr( 'tabindex' ), 10 );
+		if ( tabIndex > 0 && !isNaN( tabIndex ) ) {
+			// Initial value
+			if ( maxTabIndex === null ) {
+				maxTabIndex = tabIndex;
+			} else if ( tabIndex > maxTabIndex ) {
+				maxTabIndex = tabIndex;
+			}
 		}
 	} );
 	return maxTabIndex;
 };
-} )( jQuery );
\ No newline at end of file
+} )( jQuery );
diff --git a/resources/jquery/jquery.tablesorter.css b/resources/jquery/jquery.tablesorter.css
new file mode 100644
index 00000000..87719810
--- /dev/null
+++ b/resources/jquery/jquery.tablesorter.css
@@ -0,0 +1,17 @@
+/* Table Sorting */
+table.jquery-tablesorter th.headerSort {
+	/* @embed */
+	background-image: url(images/sort_both.gif) !important;
+	cursor: pointer;
+	background-repeat: no-repeat !important;
+	background-position: center right !important;
+	padding-right: 21px !important;
+}
+table.jquery-tablesorter th.headerSortUp {
+	/* @embed */
+	background-image: url(images/sort_up.gif) !important;
+}
+table.jquery-tablesorter th.headerSortDown {
+	/* @embed */
+	background-image: url(images/sort_down.gif) !important;
+}
diff --git a/resources/jquery/jquery.tablesorter.js b/resources/jquery/jquery.tablesorter.js
new file mode 100644
index 00000000..5af27cc4
--- /dev/null
+++ b/resources/jquery/jquery.tablesorter.js
@@ -0,0 +1,910 @@
+/**
+ * TableSorter for MediaWiki
+ *
+ * Written 2011 Leo Koppelkamm
+ * Based on tablesorter.com plugin, written (c) 2007 Christian Bach.
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * @depends on mw.config (wgDigitTransformTable, wgMonthNames, wgMonthNamesShort,
+ * wgDefaultDateFormat, wgContentLanguage)
+ */
+/**
+ *
+ * @description Create a sortable table with multi-column sorting capabilitys
+ *
+ * @example $( 'table' ).tablesorter();
+ * @desc Create a simple tablesorter interface.
+ *
+ * @option String cssHeader ( optional ) A string of the class name to be appended
+ *         to sortable tr elements in the thead of the table. Default value:
+ *         "header"
+ *
+ * @option String cssAsc ( optional ) A string of the class name to be appended to
+ *         sortable tr elements in the thead on a ascending sort. Default value:
+ *         "headerSortUp"
+ *
+ * @option String cssDesc ( optional ) A string of the class name to be appended
+ *         to sortable tr elements in the thead on a descending sort. Default
+ *         value: "headerSortDown"
+ *
+ * @option String sortInitialOrder ( optional ) A string of the inital sorting
+ *         order can be asc or desc. Default value: "asc"
+ *
+ * @option String sortMultisortKey ( optional ) A string of the multi-column sort
+ *         key. Default value: "shiftKey"
+ *
+ * @option Boolean sortLocaleCompare ( optional ) Boolean flag indicating whatever
+ *         to use String.localeCampare method or not. Set to false.
+ *
+ * @option Boolean cancelSelection ( optional ) Boolean flag indicating if
+ *         tablesorter should cancel selection of the table headers text.
+ *         Default value: true
+ *
+ * @option Boolean debug ( optional ) Boolean flag indicating if tablesorter
+ *         should display debuging information usefull for development.
+ *
+ * @type jQuery
+ *
+ * @name tablesorter
+ *
+ * @cat Plugins/Tablesorter
+ *
+ * @author Christian Bach/christian.bach@polyester.se
+ */
+
+( function( $ ) {
+
+	/* Local scope */
+
+	var	ts,
+		parsers = [];
+
+	/* Parser utility functions */
+
+	function getParserById( name ) {
+		var len = parsers.length;
+		for ( var i = 0; i < len; i++ ) {
+			if ( parsers[i].id.toLowerCase() === name.toLowerCase() ) {
+				return parsers[i];
+			}
+		}
+		return false;
+	}
+
+	function getElementText( node ) {
+		var $node = $( node ),
+			data = $node.attr( 'data-sort-value' );
+		if ( data !== undefined ) {
+			return data;
+		} else {
+			return $node.text();
+		}
+	}
+
+	function getTextFromRowAndCellIndex( rows, rowIndex, cellIndex ) {
+		if ( rows[rowIndex] && rows[rowIndex].cells[cellIndex] ) {
+			return $.trim( getElementText( rows[rowIndex].cells[cellIndex] ) );
+		} else {
+			return '';
+		}
+	}
+
+	function detectParserForColumn( table, rows, cellIndex ) {
+		var	l = parsers.length,
+			nodeValue,
+			// Start with 1 because 0 is the fallback parser
+			i = 1,
+			rowIndex = 0,
+			concurrent = 0,
+			needed = ( rows.length > 4 ) ? 5 : rows.length;
+
+		while( i < l ) {
+			nodeValue = getTextFromRowAndCellIndex( rows, rowIndex, cellIndex );
+			if ( nodeValue !== '') {
+				if ( parsers[i].is( nodeValue, table ) ) {
+					concurrent++;
+					rowIndex++;
+					if ( concurrent >= needed ) {
+						// Confirmed the parser for multiple cells, let's return it
+						return parsers[i];
+					}
+				} else {
+					// Check next parser, reset rows
+					i++;
+					rowIndex = 0;
+					concurrent = 0;
+				}
+			} else {
+				// Empty cell
+				rowIndex++;
+				if ( rowIndex > rows.length ) {
+					rowIndex = 0;
+					i++;
+				}
+			}
+		}
+
+		// 0 is always the generic parser (text)
+		return parsers[0];
+	}
+
+	function buildParserCache( table, $headers ) {
+		var	rows = table.tBodies[0].rows,
+			sortType,
+			parsers = [];
+
+		if ( rows[0] ) {
+
+			var	cells = rows[0].cells,
+				len = cells.length,
+				i, parser;
+
+			for ( i = 0; i < len; i++ ) {
+				parser = false;
+				sortType = $headers.eq( i ).data( 'sort-type' );
+				if ( sortType !== undefined ) {
+					parser = getParserById( sortType );
+				}
+
+				if ( parser === false ) {
+					parser = detectParserForColumn( table, rows, i );
+				}
+
+				parsers.push( parser );
+			}
+		}
+		return parsers;
+	}
+
+	/* Other utility functions */
+
+	function buildCache( table ) {
+		var	totalRows = ( table.tBodies[0] && table.tBodies[0].rows.length ) || 0,
+			totalCells = ( table.tBodies[0].rows[0] && table.tBodies[0].rows[0].cells.length ) || 0,
+			parsers = table.config.parsers,
+			cache = {
+				row: [],
+				normalized: []
+			};
+
+		for ( var i = 0; i < totalRows; ++i ) {
+
+			// Add the table data to main data array
+			var	$row = $( table.tBodies[0].rows[i] ),
+				cols = [];
+
+			// if this is a child row, add it to the last row's children and
+			// continue to the next row
+			if ( $row.hasClass( table.config.cssChildRow ) ) {
+				cache.row[cache.row.length - 1] = cache.row[cache.row.length - 1].add( $row );
+				// go to the next for loop
+				continue;
+			}
+
+			cache.row.push( $row );
+
+			for ( var j = 0; j < totalCells; ++j ) {
+				cols.push( parsers[j].format( getElementText( $row[0].cells[j] ), table, $row[0].cells[j] ) );
+			}
+
+			cols.push( cache.normalized.length ); // add position for rowCache
+			cache.normalized.push( cols );
+			cols = null;
+		}
+
+		return cache;
+	}
+
+	function appendToTable( table, cache ) {
+		var	row = cache.row,
+			normalized = cache.normalized,
+			totalRows = normalized.length,
+			checkCell = ( normalized[0].length - 1 ),
+			fragment = document.createDocumentFragment();
+
+		for ( var i = 0; i < totalRows; i++ ) {
+			var pos = normalized[i][checkCell];
+
+			var l = row[pos].length;
+
+			for ( var j = 0; j < l; j++ ) {
+				fragment.appendChild( row[pos][j] );
+			}
+
+		}
+		table.tBodies[0].appendChild( fragment );
+	}
+	
+	/**
+	 * Find all header rows in a thead-less table and put them in a <thead> tag.
+	 * This only treats a row as a header row if it contains only <th>s (no <td>s)
+	 * and if it is preceded entirely by header rows. The algorithm stops when
+	 * it encounters the first non-header row.
+	 * 
+	 * After this, it will look at all rows at the bottom for footer rows
+	 * And place these in a tfoot using similar rules.
+	 * @param $table jQuery object for a <table>
+	 */ 
+	function emulateTHeadAndFoot( $table ) {
+		var $rows = $table.find( '> tbody > tr' );
+		if( !$table.get(0).tHead ) {
+			var $thead = $( '<thead>' );
+			$rows.each( function() {
+				if ( $(this).children( 'td' ).length > 0 ) {
+					// This row contains a <td>, so it's not a header row
+					// Stop here
+					return false;
+				}
+				$thead.append( this );
+			} );
+			$table.children('tbody').before( $thead );
+		}
+		if( !$table.get(0).tFoot ) {
+			var $tfoot = $( '<tfoot>' );
+			var len = $rows.length;
+			for ( var i = len-1; i >= 0; i-- ) {
+				if( $( $rows[i] ).children( 'td' ).length > 0 ){
+					break;
+				}
+				$tfoot.prepend( $( $rows[i] ));
+			} 
+			$table.append( $tfoot );
+		}
+	}
+
+	function buildHeaders( table, msg ) {
+		var	maxSeen = 0,
+			longest,
+			realCellIndex = 0,
+			$tableHeaders = $( 'thead:eq(0) tr', table );
+		if ( $tableHeaders.length > 1 ) {
+			$tableHeaders.each(function() {
+				if ( this.cells.length > maxSeen ) {
+					maxSeen = this.cells.length;
+					longest = this;
+				}
+			});
+			$tableHeaders = $( longest );
+		}
+		$tableHeaders = $tableHeaders.children( 'th' ).each( function( index ) {
+			this.column = realCellIndex;
+
+			var colspan = this.colspan;
+			colspan = colspan ? parseInt( colspan, 10 ) : 1;
+			realCellIndex += colspan;
+
+			this.order = 0;
+			this.count = 0;
+
+			if ( $( this ).is( '.unsortable' ) ) {
+				this.sortDisabled = true;
+			}
+
+			if ( !this.sortDisabled ) {
+				var $th = $( this ).addClass( table.config.cssHeader ).attr( 'title', msg[1] );
+			}
+
+			// add cell to headerList
+			table.config.headerList[index] = this;
+		} );
+
+		return $tableHeaders;
+
+	}
+
+	function isValueInArray( v, a ) {
+		var l = a.length;
+		for ( var i = 0; i < l; i++ ) {
+			if ( a[i][0] == v ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	function setHeadersCss( table, $headers, list, css, msg ) {
+		// Remove all header information
+		$headers.removeClass( css[0] ).removeClass( css[1] );
+
+		var h = [];
+		$headers.each( function( offset ) {
+			if ( !this.sortDisabled ) {
+				h[this.column] = $( this );
+			}
+		} );
+
+		var l = list.length;
+		for ( var i = 0; i < l; i++ ) {
+			h[ list[i][0] ].addClass( css[ list[i][1] ] ).attr( 'title', msg[ list[i][1] ] );
+		}
+	}
+
+	function sortText( a, b ) {
+		return ( (a < b) ? false : ((a > b) ? true : 0) );
+	}
+
+	function sortTextDesc( a, b ) {
+		return ( (b < a) ? false : ((b > a) ? true : 0) );
+	}
+
+	function checkSorting( array1, array2, sortList ) {
+		var col, fn, ret;
+		for ( var i = 0, len = sortList.length; i < len; i++ ) {
+			col = sortList[i][0];
+			fn = ( sortList[i][1] ) ? sortTextDesc : sortText;
+			ret = fn.call( this, array1[col], array2[col] );
+			if ( ret !== 0 ) {
+				return ret;
+			}
+		}
+		return ret;
+	}
+
+	// Merge sort algorithm
+	// Based on http://en.literateprograms.org/Merge_sort_(JavaScript)
+	function mergeSortHelper( array, begin, beginRight, end, sortList ) {
+		for ( ; begin < beginRight; ++begin ) {
+			if ( checkSorting( array[begin], array[beginRight], sortList ) ) {
+				var v = array[begin];
+				array[begin] = array[beginRight];
+				var begin2 = beginRight;
+				while ( begin2 + 1 < end && checkSorting( v, array[begin2 + 1], sortList ) ) {
+					var tmp = array[begin2];
+					array[begin2] = array[begin2 + 1];
+					array[begin2 + 1] = tmp;
+					++begin2;
+				}
+				array[begin2] = v;
+			}
+		}
+	}
+
+	function mergeSort(array, begin, end, sortList) {
+		var size = end - begin;
+		if ( size < 2 ) {
+			return;
+		}
+
+		var beginRight = begin + Math.floor(size / 2);
+
+		mergeSort( array, begin, beginRight, sortList );
+		mergeSort( array, beginRight, end, sortList );
+		mergeSortHelper( array, begin, beginRight, end, sortList );
+	}
+
+	function multisort( table, sortList, cache ) {
+		var i = sortList.length;
+		mergeSort( cache.normalized, 0, cache.normalized.length, sortList );
+
+		return cache;
+	}
+
+	function buildTransformTable() {
+		var digits = '0123456789,.'.split( '' );
+		var separatorTransformTable = mw.config.get( 'wgSeparatorTransformTable' );
+		var digitTransformTable = mw.config.get( 'wgDigitTransformTable' );
+		if ( separatorTransformTable === null || ( separatorTransformTable[0] === '' && digitTransformTable[2] === '' ) ) {
+			ts.transformTable = false;
+		} else {
+			ts.transformTable = {};
+
+			// Unpack the transform table
+			var ascii = separatorTransformTable[0].split( "\t" ).concat( digitTransformTable[0].split( "\t" ) );
+			var localised = separatorTransformTable[1].split( "\t" ).concat( digitTransformTable[1].split( "\t" ) );
+
+			// Construct regex for number identification
+			for ( var i = 0; i < ascii.length; i++ ) {
+				ts.transformTable[localised[i]] = ascii[i];
+				digits.push( $.escapeRE( localised[i] ) );
+			}
+		}
+		var digitClass = '[' + digits.join( '', digits ) + ']';
+
+		// We allow a trailing percent sign, which we just strip. This works fine
+		// if percents and regular numbers aren't being mixed.
+		ts.numberRegex = new RegExp("^(" + "[-+\u2212]?[0-9][0-9,]*(\\.[0-9,]*)?(E[-+\u2212]?[0-9][0-9,]*)?" + // Fortran-style scientific
+		"|" + "[-+\u2212]?" + digitClass + "+[\\s\\xa0]*%?" + // Generic localised
+		")$", "i");
+	}
+
+	function buildDateTable() {
+		var regex = [];
+		ts.monthNames = [
+			[],
+			[]
+		];
+
+		for ( var i = 1; i < 13; i++ ) {
+			ts.monthNames[0][i] = mw.config.get( 'wgMonthNames' )[i].toLowerCase();
+			ts.monthNames[1][i] = mw.config.get( 'wgMonthNamesShort' )[i].toLowerCase().replace( '.', '' );
+			regex.push( $.escapeRE( ts.monthNames[0][i] ) );
+			regex.push( $.escapeRE( ts.monthNames[1][i] ) );
+		}
+
+		// Build piped string
+		regex = regex.join( '|' );
+
+		// Build RegEx
+		// Any date formated with . , ' - or /
+		ts.dateRegex[0] = new RegExp( /^\s*\d{1,2}[\,\.\-\/'\s]{1,2}\d{1,2}[\,\.\-\/'\s]{1,2}\d{2,4}\s*?/i);
+
+		// Written Month name, dmy
+		ts.dateRegex[1] = new RegExp( '^\\s*\\d{1,2}[\\,\\.\\-\\/\'\\s]*(' + regex + ')' + '[\\,\\.\\-\\/\'\\s]*\\d{2,4}\\s*$', 'i' );
+
+		// Written Month name, mdy
+		ts.dateRegex[2] = new RegExp( '^\\s*(' + regex + ')' + '[\\,\\.\\-\\/\'\\s]*\\d{1,2}[\\,\\.\\-\\/\'\\s]*\\d{2,4}\\s*$', 'i' );
+
+	}
+
+	function explodeRowspans( $table ) {
+		// Split multi row cells into multiple cells with the same content
+		$table.find( '> tbody > tr > [rowspan]' ).each(function() {
+			var rowSpan = this.rowSpan;
+			this.rowSpan = 1;
+			var cell = $( this );
+			var next = cell.parent().nextAll();
+			for ( var i = 0; i < rowSpan - 1; i++ ) {
+				var td = next.eq( i ).children( 'td' );
+				if ( !td.length ) {
+					next.eq( i ).append( cell.clone() );
+				} else if ( this.cellIndex === 0 ) {
+					td.eq( this.cellIndex ).before( cell.clone() );
+				} else {
+					td.eq( this.cellIndex - 1 ).after( cell.clone() );
+				}
+			}
+		});
+	}
+
+	function buildCollationTable() {
+		ts.collationTable = mw.config.get( 'tableSorterCollation' );
+		ts.collationRegex = null;
+		if ( ts.collationTable ) {
+			var keys = [];
+
+			// Build array of key names
+			for ( var key in ts.collationTable ) {
+				if ( ts.collationTable.hasOwnProperty(key) ) { //to be safe
+					keys.push(key);
+				}
+			}
+			if (keys.length) {
+				ts.collationRegex = new RegExp( '[' + keys.join( '' ) + ']', 'ig' );
+			}
+		}
+	}
+
+	function cacheRegexs() {
+		if ( ts.rgx ) {
+			return;
+		}
+		ts.rgx = {
+			IPAddress: [
+				new RegExp( /^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/)
+			],
+			currency: [
+				new RegExp( /^[£$€?.]/),
+				new RegExp( /[£$€]/g)
+			],
+			url: [
+				new RegExp( /^(https?|ftp|file):\/\/$/),
+				new RegExp( /(https?|ftp|file):\/\//)
+			],
+			isoDate: [
+				new RegExp( /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/)
+			],
+			usLongDate: [
+				new RegExp( /^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/)
+			],
+			time: [
+				new RegExp( /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/)
+			]
+		};
+	}
+
+	/* Public scope */
+
+	$.tablesorter = {
+
+			defaultOptions: {
+				cssHeader: 'headerSort',
+				cssAsc: 'headerSortUp',
+				cssDesc: 'headerSortDown',
+				cssChildRow: 'expand-child',
+				sortInitialOrder: 'asc',
+				sortMultiSortKey: 'shiftKey',
+				sortLocaleCompare: false,
+				parsers: {},
+				widgets: [],
+				headers: {},
+				cancelSelection: true,
+				sortList: [],
+				headerList: [],
+				selectorHeaders: 'thead tr:eq(0) th',
+				debug: false
+			},
+
+			dateRegex: [],
+			monthNames: [],
+
+			/**
+			 * @param $tables {jQuery}
+			 * @param settings {Object} (optional)
+			 */
+			construct: function( $tables, settings ) {
+				return $tables.each( function( i, table ) {
+					// Declare and cache.
+					var	$document, $headers, cache, config, sortOrder,
+						$table = $( table ),
+						shiftDown = 0,
+						firstTime = true;
+
+					// Quit if no tbody
+					if ( !table.tBodies ) {
+						return;
+					}
+					if ( !table.tHead ) {
+						// No thead found. Look for rows with <th>s and
+						// move them into a <thead> tag or a <tfoot> tag
+						emulateTHeadAndFoot( $table );
+						
+						// Still no thead? Then quit
+						if ( !table.tHead ) {
+							return;
+						}
+					}
+					$table.addClass( "jquery-tablesorter" );
+
+					// New config object.
+					table.config = {};
+
+					// Merge and extend.
+					config = $.extend( table.config, $.tablesorter.defaultOptions, settings );
+
+					// Save the settings where they read
+					$.data( table, 'tablesorter', config );
+
+					// Get the CSS class names, could be done else where.
+					var sortCSS = [ config.cssDesc, config.cssAsc ];
+					var sortMsg = [ mw.msg( 'sort-descending' ), mw.msg( 'sort-ascending' ) ];
+
+					// Build headers
+					$headers = buildHeaders( table, sortMsg );
+
+					// Grab and process locale settings
+					buildTransformTable();
+					buildDateTable();
+					buildCollationTable();
+
+					// Precaching regexps can bring 10 fold
+					// performance improvements in some browsers.
+					cacheRegexs();
+
+					// Apply event handling to headers
+					// this is too big, perhaps break it out?
+					$headers.click( function( e ) {
+						if ( e.target.nodeName.toLowerCase() == 'a' ) {
+							// The user clicked on a link inside a table header
+							// Do nothing and let the default link click action continue
+							return true;
+						}
+
+						if ( firstTime ) {
+							firstTime = false;
+							
+							// Legacy fix of .sortbottoms
+							// Wrap them inside inside a tfoot (because that's what they actually want to be) &
+							// and put the <tfoot> at the end of the <table>
+							var $sortbottoms = $table.find( '> tbody > tr.sortbottom' );
+							if ( $sortbottoms.length ) {
+								var $tfoot = $table.children( 'tfoot' );
+								if ( $tfoot.length ) {
+									$tfoot.eq(0).prepend( $sortbottoms );
+								} else {
+									$table.append( $( '<tfoot>' ).append( $sortbottoms ) )
+								}
+							}
+							
+							explodeRowspans( $table );
+							// try to auto detect column type, and store in tables config
+							table.config.parsers = buildParserCache( table, $headers );
+							// build the cache for the tbody cells
+							cache = buildCache( table );
+						}
+						var totalRows = ( $table[0].tBodies[0] && $table[0].tBodies[0].rows.length ) || 0;
+						if ( !table.sortDisabled && totalRows > 0 ) {
+
+							// Cache jQuery object
+							var $cell = $( this );
+
+							// Get current column index
+							var i = this.column;
+
+							// Get current column sort order
+							this.order = this.count % 2;
+							this.count++;
+
+							// User only wants to sort on one column
+							if ( !e[config.sortMultiSortKey] ) {
+								// Flush the sort list
+								config.sortList = [];
+								// Add column to sort list
+								config.sortList.push( [i, this.order] );
+
+							// Multi column sorting
+							} else {
+								// The user has clicked on an already sorted column.
+								if ( isValueInArray( i, config.sortList ) ) {
+									// Reverse the sorting direction for all tables.
+									for ( var j = 0; j < config.sortList.length; j++ ) {
+										var s = config.sortList[j],
+											o = config.headerList[s[0]];
+										if ( s[0] == i ) {
+											o.count = s[1];
+											o.count++;
+											s[1] = o.count % 2;
+										}
+									}
+								} else {
+									// Add column to sort list array
+									config.sortList.push( [i, this.order] );
+								}
+							}
+
+							// Set CSS for headers
+							setHeadersCss( $table[0], $headers, config.sortList, sortCSS, sortMsg );
+							appendToTable(
+								$table[0], multisort( $table[0], config.sortList, cache )
+							);
+
+							// Stop normal event by returning false
+							return false;
+						}
+
+					// Cancel selection
+					} ).mousedown( function() {
+						if ( config.cancelSelection ) {
+							this.onselectstart = function() {
+								return false;
+							};
+							return false;
+						}
+					} );
+				} );
+			},
+
+			addParser: function( parser ) {
+				var	l = parsers.length,
+					a = true;
+				for ( var i = 0; i < l; i++ ) {
+					if ( parsers[i].id.toLowerCase() == parser.id.toLowerCase() ) {
+						a = false;
+					}
+				}
+				if ( a ) {
+					parsers.push( parser );
+				}
+			},
+
+			formatDigit: function( s ) {
+				if ( ts.transformTable !== false ) {
+					var	out = '',
+						c;
+					for ( var p = 0; p < s.length; p++ ) {
+						c = s.charAt(p);
+						if ( c in ts.transformTable ) {
+							out += ts.transformTable[c];
+						} else {
+							out += c;
+						}
+					}
+					s = out;
+				}
+				var i = parseFloat( s.replace( /[, ]/g, '' ).replace( "\u2212", '-' ) );
+				return ( isNaN(i)) ? 0 : i;
+			},
+
+			formatFloat: function( s ) {
+				var i = parseFloat(s);
+				return ( isNaN(i)) ? 0 : i;
+			},
+
+			formatInt: function( s ) {
+				var i = parseInt( s, 10 );
+				return ( isNaN(i)) ? 0 : i;
+			},
+
+			clearTableBody: function( table ) {
+				if ( $.browser.msie ) {
+					var empty = function( el ) {
+						while ( el.firstChild ) {
+							el.removeChild( el.firstChild );
+						}
+					};
+					empty( table.tBodies[0] );
+				} else {
+					table.tBodies[0].innerHTML = '';
+				}
+			}
+		};
+
+	// Shortcut
+	ts = $.tablesorter;
+
+	// Register as jQuery prototype method
+	$.fn.tablesorter = function( settings ) {
+		return ts.construct( this, settings );
+	};
+
+	// Add default parsers
+	ts.addParser( {
+		id: 'text',
+		is: function( s ) {
+			return true;
+		},
+		format: function( s ) {
+			s = $.trim( s.toLowerCase() );
+			if ( ts.collationRegex ) {
+				var tsc = ts.collationTable;
+				s = s.replace( ts.collationRegex, function( match ) {
+					var r = tsc[match] ? tsc[match] : tsc[match.toUpperCase()];
+					return r.toLowerCase();
+				} );
+			}
+			return s;
+		},
+		type: 'text'
+	} );
+
+	ts.addParser( {
+		id: 'IPAddress',
+		is: function( s ) {
+			return ts.rgx.IPAddress[0].test(s);
+		},
+		format: function( s ) {
+			var	a = s.split( '.' ),
+				r = '',
+				l = a.length;
+			for ( var i = 0; i < l; i++ ) {
+				var item = a[i];
+				if ( item.length == 1 ) {
+					r += '00' + item;
+				} else if ( item.length == 2 ) {
+					r += '0' + item;
+				} else {
+					r += item;
+				}
+			}
+			return $.tablesorter.formatFloat(r);
+		},
+		type: 'numeric'
+	} );
+
+	ts.addParser( {
+		id: 'currency',
+		is: function( s ) {
+			return ts.rgx.currency[0].test(s);
+		},
+		format: function( s ) {
+			return $.tablesorter.formatDigit( s.replace( ts.rgx.currency[1], '' ) );
+		},
+		type: 'numeric'
+	} );
+
+	ts.addParser( {
+		id: 'url',
+		is: function( s ) {
+			return ts.rgx.url[0].test(s);
+		},
+		format: function( s ) {
+			return $.trim( s.replace( ts.rgx.url[1], '' ) );
+		},
+		type: 'text'
+	} );
+
+	ts.addParser( {
+		id: 'isoDate',
+		is: function( s ) {
+			return ts.rgx.isoDate[0].test(s);
+		},
+		format: function( s ) {
+			return $.tablesorter.formatFloat((s !== '') ? new Date(s.replace(
+			new RegExp( /-/g), '/')).getTime() : '0' );
+		},
+		type: 'numeric'
+	} );
+
+	ts.addParser( {
+		id: 'usLongDate',
+		is: function( s ) {
+			return ts.rgx.usLongDate[0].test(s);
+		},
+		format: function( s ) {
+			return $.tablesorter.formatFloat( new Date(s).getTime() );
+		},
+		type: 'numeric'
+	} );
+
+	ts.addParser( {
+		id: 'date',
+		is: function( s ) {
+			return ( ts.dateRegex[0].test(s) || ts.dateRegex[1].test(s) || ts.dateRegex[2].test(s ));
+		},
+		format: function( s, table ) {
+			s = $.trim( s.toLowerCase() );
+
+			for ( var i = 1, j = 0; i < 13 && j < 2; i++ ) {
+				s = s.replace( ts.monthNames[j][i], i );
+				if ( i == 12 ) {
+					j++;
+					i = 0;
+				}
+			}
+
+			s = s.replace( /[\-\.\,' ]/g, '/' );
+
+			// Replace double slashes
+			s = s.replace( /\/\//g, '/' );
+			s = s.replace( /\/\//g, '/' );
+			s = s.split( '/' );
+
+			// Pad Month and Day
+			if ( s[0] && s[0].length == 1 ) {
+				s[0] = '0' + s[0];
+			}
+			if ( s[1] && s[1].length == 1 ) {
+				s[1] = '0' + s[1];
+			}
+			var y;
+
+			if ( !s[2] ) {
+				// Fix yearless dates
+				s[2] = 2000;
+			} else if ( ( y = parseInt( s[2], 10) ) < 100 ) {
+				// Guestimate years without centuries
+				if ( y < 30 ) {
+					s[2] = 2000 + y;
+				} else {
+					s[2] = 1900 + y;
+				}
+			}
+			// Resort array depending on preferences
+			if ( mw.config.get( 'wgDefaultDateFormat' ) == 'mdy' || mw.config.get( 'wgContentLanguage' ) == 'en' ) {
+				s.push( s.shift() );
+				s.push( s.shift() );
+			} else if ( mw.config.get( 'wgDefaultDateFormat' ) == 'dmy' ) {
+				var d = s.shift();
+				s.push( s.shift() );
+				s.push(d);
+			}
+			return parseInt( s.join( '' ), 10 );
+		},
+		type: 'numeric'
+	} );
+
+	ts.addParser( {
+		id: 'time',
+		is: function( s ) {
+			return ts.rgx.time[0].test(s);
+		},
+		format: function( s ) {
+			return $.tablesorter.formatFloat( new Date( '2000/01/01 ' + s ).getTime() );
+		},
+		type: 'numeric'
+	} );
+
+	ts.addParser( {
+		id: 'number',
+		is: function( s, table ) {
+			return $.tablesorter.numberRegex.test( $.trim( s ));
+		},
+		format: function( s ) {
+			return $.tablesorter.formatDigit(s);
+		},
+		type: 'numeric'
+	} );
+
+} )( jQuery );
diff --git a/resources/jquery/jquery.textSelection.js b/resources/jquery/jquery.textSelection.js
index 35e224db..f3d1a146 100644
--- a/resources/jquery/jquery.textSelection.js
+++ b/resources/jquery/jquery.textSelection.js
@@ -2,7 +2,54 @@
  * These plugins provide extra functionality for interaction with textareas.
  */
 ( function( $ ) {
+
+if (document.selection && document.selection.createRange) {
+	// On IE, patch the focus() method to restore the windows' scroll position
+	// (bug 32241)
+	$.fn.extend({
+		focus : (function ( _focus ) {
+			return function () {
+				if ( arguments.length == 0 ) {
+					var $w = $( window );
+					var state = {top: $w.scrollTop(), left: $w.scrollLeft()};
+					var result = _focus.apply( this, arguments );
+					window.scrollTo( state.top, state.left );
+					return result;
+				}
+				return _focus.apply( this, arguments );
+			};
+		})( $.fn.focus )
+	});
+}
+
 $.fn.textSelection = function( command, options ) {
+
+/**
+ * Helper function to get an IE TextRange object for an element
+ */
+function rangeForElementIE( e ) {
+	if ( e.nodeName.toLowerCase() == 'input' ) {
+		return e.createTextRange();
+	} else {
+		var sel = document.body.createTextRange();
+		sel.moveToElementText( e );
+		return sel;
+	}
+}
+
+/**
+ * Helper function for IE for activating the textarea. Called only in the
+ * IE-specific code paths below; makes use of IE-specific non-standard
+ * function setActive() if possible to avoid screen flicker.
+ */
+function activateElementOnIE( element ) {
+	if ( element.setActive ) {
+		element.setActive(); // bug 32241: doesn't scroll
+	} else {
+		$( element ).focus(); // may scroll (but we patched it above)
+	}
+}
+
 var fn = {
 /**
  * Get the contents of the textarea
@@ -20,7 +67,7 @@ getSelection: function() {
 	if ( $(e).is( ':hidden' ) ) {
 		// Do nothing
 	} else if ( document.selection && document.selection.createRange ) {
-		e.focus();
+		activateElementOnIE( e );
 		var range = document.selection.createRange();
 		retval = range.text;
 	} else if ( e.selectionStart || e.selectionStart == '0' ) {
@@ -34,9 +81,13 @@ getSelection: function() {
  *
  * Inserts text at the begining and end of a text selection, optionally
  * inserting text at the caret when selection is empty.
+ *
+ * @fixme document the options parameters
  */
 encapsulateSelection: function( options ) {
 	return this.each( function() {
+		var pre = options.pre, post = options.post;
+		
 		/**
 		 * Check if the selected text is the same as the insert text
 		 */
@@ -46,84 +97,136 @@ encapsulateSelection: function( options ) {
 				isSample = true;
 			} else if ( options.replace ) {
 				selText = options.peri;
-			} else if ( selText.charAt( selText.length - 1 ) == ' ' ) {
-				// Exclude ending space char
-				selText = selText.substring(0, selText.length - 1);
-				options.post += ' ';
+			} else {
+				while ( selText.charAt( selText.length - 1 ) == ' ' ) {
+					// Exclude ending space char
+					selText = selText.substring( 0, selText.length - 1 );
+					post += ' ';
+				}
+				while ( selText.charAt( 0 ) == ' ' ) {
+					// Exclude prepending space char
+					selText = selText.substring( 1, selText.length );
+					pre = ' ' + pre;
+				}
+			}
+		}
+		
+		/**
+		 * Do the splitlines stuff.
+		 * 
+		 * Wrap each line of the selected text with pre and post
+		 */
+		function doSplitLines( selText, pre, post ) {
+			var insertText = '';
+			var selTextArr = selText.split( '\n' );
+			for ( var i = 0; i < selTextArr.length; i++ ) {
+				insertText += pre + selTextArr[i] + post;
+				if ( i != selTextArr.length - 1 ) {
+					insertText += '\n';
+				}
 			}
+			return insertText;
 		}
+		
 		var isSample = false;
 		if ( this.style.display == 'none' ) {
 			// Do nothing
 		} else if ( this.selectionStart || this.selectionStart == '0' ) {
 			// Mozilla/Opera
 			$(this).focus();
+			if ( options.selectionStart !== undefined ) {
+				$(this).textSelection( 'setSelection', { 'start': options.selectionStart, 'end': options.selectionEnd } );
+			}
+			
 			var selText = $(this).textSelection( 'getSelection' );
 			var startPos = this.selectionStart;
 			var endPos = this.selectionEnd;
 			var scrollTop = this.scrollTop;
 			checkSelectedText();
+			
+			if ( options.selectionStart !== undefined
+					&& endPos - startPos != options.selectionEnd - options.selectionStart )
+			{
+				// This means there is a difference in the selection range returned by browser and what we passed.
+				// This happens for Chrome in the case of composite characters. Ref bug #30130
+				// Set the startPos to the correct position.
+				startPos = options.selectionStart;
+			}
+
+			var insertText = pre + selText + post;
+			if ( options.splitlines ) {
+				insertText = doSplitLines( selText, pre, post );
+			}
 			if ( options.ownline ) {
 				if ( startPos != 0 && this.value.charAt( startPos - 1 ) != "\n" ) {
-					options.pre = "\n" + options.pre;
+					insertText = "\n" + insertText;
 				}
 				if ( this.value.charAt( endPos ) != "\n" ) {
-					options.post += "\n";
+					insertText += "\n";
 				}
 			}
-			this.value = this.value.substring( 0, startPos ) + options.pre + selText + options.post +
+			this.value = this.value.substring( 0, startPos ) + insertText +
 				this.value.substring( endPos, this.value.length );
 			// Setting this.value scrolls the textarea to the top, restore the scroll position
 			this.scrollTop = scrollTop;
 			if ( window.opera ) {
-				options.pre = options.pre.replace( /\r?\n/g, "\r\n" );
+				pre = pre.replace( /\r?\n/g, "\r\n" );
 				selText = selText.replace( /\r?\n/g, "\r\n" );
-				options.post = options.post.replace( /\r?\n/g, "\r\n" );
+				post = post.replace( /\r?\n/g, "\r\n" );
 			}
-			if ( isSample && options.selectPeri ) {
-				this.selectionStart = startPos + options.pre.length;
-				this.selectionEnd = startPos + options.pre.length + selText.length;
+			if ( isSample && options.selectPeri && !options.splitlines ) {
+				this.selectionStart = startPos + pre.length;
+				this.selectionEnd = startPos + pre.length + selText.length;
 			} else {
-				this.selectionStart = startPos + options.pre.length + selText.length +
-					options.post.length;
+				this.selectionStart = startPos + insertText.length;
 				this.selectionEnd = this.selectionStart;
 			}
 		} else if ( document.selection && document.selection.createRange ) {
 			// IE
-			$(this).focus();
+			activateElementOnIE( this );
 			if ( context ) {
 				context.fn.restoreCursorAndScrollTop();
 			}
+			if ( options.selectionStart !== undefined ) {
+				$(this).textSelection( 'setSelection', { 'start': options.selectionStart, 'end': options.selectionEnd } );
+			}
+			
 			var selText = $(this).textSelection( 'getSelection' );
 			var scrollTop = this.scrollTop;
 			var range = document.selection.createRange();
+			
+			checkSelectedText();
+			var insertText = pre + selText  + post;
+			if ( options.splitlines ) {
+				insertText = doSplitLines( selText, pre, post );
+			}
 			if ( options.ownline && range.moveStart ) {
 				var range2 = document.selection.createRange();
 				range2.collapse();
 				range2.moveStart( 'character', -1 );
 				// FIXME: Which check is correct?
 				if ( range2.text != "\r" && range2.text != "\n" && range2.text != "" ) {
-					options.pre = "\n" + options.pre;
+					insertText = "\n" + insertText;
 				}
 				var range3 = document.selection.createRange();
 				range3.collapse( false );
 				range3.moveEnd( 'character', 1 );
 				if ( range3.text != "\r" && range3.text != "\n" && range3.text != "" ) {
-					options.post += "\n";
+					insertText += "\n";
 				}
 			}
-			checkSelectedText();
-			range.text = options.pre + selText + options.post;
+			
+			range.text = insertText;
 			if ( isSample && options.selectPeri && range.moveStart ) {
-				range.moveStart( 'character', - options.post.length - selText.length );
-				range.moveEnd( 'character', - options.post.length );
+				range.moveStart( 'character', - post.length - selText.length );
+				range.moveEnd( 'character', - post.length );
 			}
 			range.select();
 			// Restore the scroll position
 			this.scrollTop = scrollTop;
 		}
 		$(this).trigger( 'encapsulateSelection', [ options.pre, options.peri, options.post, options.ownline,
-			options.replace ] );
+			options.replace, options.spitlines ] );
 	});
 },
 /**
@@ -134,11 +237,21 @@ encapsulateSelection: function( options ) {
  *
  * Get the position (in resolution of bytes not nessecarily characters)
  * in a textarea
+ *
+ * Will focus the textarea in some browsers (IE/Opera)
+ *
+ * @fixme document the options parameters
  */
  getCaretPosition: function( options ) {
 	function getCaret( e ) {
 		var caretPos = 0, endPos = 0;
-		if ( $.browser.msie ) {
+		if ( document.selection && document.selection.createRange ) {
+			// IE doesn't properly report non-selected caret position through
+			// the selection ranges when textarea isn't focused. This can
+			// lead to saving a bogus empty selection, which then screws up
+			// whatever we do later (bug 31847).
+			activateElementOnIE( e );
+
 			// IE Support
 			var preFinished = false;
 			var periFinished = false;
@@ -148,15 +261,11 @@ encapsulateSelection: function( options ) {
 			// Create range containing text in the selection
 			var periRange = document.selection.createRange().duplicate();
 			// Create range containing text before the selection
-			var preRange = document.body.createTextRange();
-			// Select all the text
-			preRange.moveToElementText(e);
+			var preRange = rangeForElementIE( e );
 			// Move the end where we need it
 			preRange.setEndPoint("EndToStart", periRange);
 			// Create range containing text after the selection
-			var postRange = document.body.createTextRange();
-			// Select all the text
-			postRange.moveToElementText(e);
+			var postRange = rangeForElementIE( e );
 			// Move the start where we need it
 			postRange.setEndPoint("StartToEnd", periRange);
 			// Load the text values we need to compare
@@ -217,6 +326,9 @@ encapsulateSelection: function( options ) {
 	}
 	return getCaret( this.get( 0 ) );
 },
+/**
+ * @fixme document the options parameters
+ */
 setSelection: function( options ) {
 	return this.each( function() {
 		if ( $(this).is( ':hidden' ) ) {
@@ -233,8 +345,7 @@ setSelection: function( options ) {
 				this.selectionEnd = options.end;
 			}
 		} else if ( document.body.createTextRange ) {
-			var selection = document.body.createTextRange();
-			selection.moveToElementText( this );
+			var selection = rangeForElementIE( this );
 			var length = this.value.length;
 			// IE doesn't count \n when computing the offset, so we won't either
 			var newLines = this.value.match( /\n/g );
@@ -258,6 +369,8 @@ setSelection: function( options ) {
  * position with setSelection()
  * @param options boolean Whether to force a scroll even if the caret position
  *  is already visible. Defaults to false
+ *
+ * @fixme document the options parameters (function body suggests options.force is a boolean, not options itself)
  */
 scrollToCaretPosition: function( options ) {
 	function getLineLength( e ) {
@@ -357,7 +470,10 @@ scrollToCaretPosition: function( options ) {
 				'post': '', // Text to insert after the cursor/selection
 				'ownline': false, // Put the inserted text on a line of its own
 				'replace': false, // If there is a selection, replace it with peri instead of leaving it alone
-				'selectPeri': true // Select the peri text if it was inserted (but not if there was a selection and replace==false)
+				'selectPeri': true, // Select the peri text if it was inserted (but not if there was a selection and replace==false, or if splitlines==true)
+				'splitlines': false, // If multiple lines are selected, encapsulate each line individually
+				'selectionStart': undefined, // Position to start selection at
+				'selectionEnd': undefined // Position to end selection at. Defaults to start
 			}, options );
 			break;
 		case 'getCaretPosition':
@@ -400,5 +516,4 @@ scrollToCaretPosition: function( options ) {
 	}
 	return retval;
 };
-
 } )( jQuery );
diff --git a/resources/mediawiki.action/mediawiki.action.edit.js b/resources/mediawiki.action/mediawiki.action.edit.js
index e5b50958..b121d34f 100644
--- a/resources/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/mediawiki.action/mediawiki.action.edit.js
@@ -1,30 +1,101 @@
-/* Note, there is still stuff in skins/common/edit.js that
- * has not been jQuery-ized.
- */
-
 (function( $ ) {
-	//make sure edit summary does not exceed byte limit
-	$( '#wpSummary' ).attr( 'maxLength', 250 ).keypress( function( e ) {
-		// first check to see if this is actually a character key
-		// being pressed.
-		// Based on key-event info from http://unixpapa.com/js/key.html
-		// JQuery should also normalize e.which to be consistent cross-browser,
-		// however the same check is still needed regardless of jQuery.
+	// currentFocus is used to determine where to insert tags
+	var currentFocused = $( '#wpTextbox1' );
+	
+	mw.toolbar = {
+		$toolbar : $( '#toolbar' ),
+		buttons : [],
+		// If you want to add buttons, use 
+		// mw.toolbar.addButton( imageFile, speedTip, tagOpen, tagClose, sampleText, imageId, selectText );
+		addButton : function() {
+			this.buttons.push( [].slice.call( arguments ) );
+		},
+		insertButton : function( imageFile, speedTip, tagOpen, tagClose, sampleText, imageId, selectText ) {
+			var image = $('<img>', {
+				width  : 23,
+				height : 22,
+				src    : imageFile,
+				alt    : speedTip,
+				title  : speedTip,
+				id     : imageId || '',
+				'class': 'mw-toolbar-editbutton'
+			} ).click( function() {
+				mw.toolbar.insertTags( tagOpen, tagClose, sampleText, selectText );
+				return false;
+			} );
+
+			this.$toolbar.append( image );
+			return true;
+		},
 
-		if ( e.which === 0 || e.charCode === 0 || e.ctrlKey || e.altKey || e.metaKey ) {
-			return true; //a special key (backspace, etc) so don't interfere.
+		// apply tagOpen/tagClose to selection in textarea,
+		// use sampleText instead of selection if there is none
+		insertTags : function( tagOpen, tagClose, sampleText, selectText) {
+			if ( currentFocused.length ) {
+				currentFocused.textSelection(
+					'encapsulateSelection', { 'pre': tagOpen, 'peri': sampleText, 'post': tagClose }
+				);
+			}
+		}, 
+		init : function() {
+			// Legacy
+			// Merge buttons from mwCustomEditButtons
+			var buttons = [].concat( this.buttons, window.mwCustomEditButtons );
+			for ( var i = 0; i < buttons.length; i++ ) {
+				if ( $.isArray( buttons[i] ) ) {
+					// Passes our button array as arguments
+					mw.toolbar.insertButton.apply( this, buttons[i] );
+				} else {
+					// Legacy mwCustomEditButtons is an object
+					var c = buttons[i];
+					mw.toolbar.insertButton( c.imageFile, c.speedTip, c.tagOpen, c.tagClose, c.sampleText, c.imageId, c.selectText );
+				}
+			}
+			return true;
 		}
+	};
 
-		// This basically figures out how many bytes a UTF-16 string (which is what js sees)
-		// will take in UTF-8 by replacing a 2 byte character with 2 *'s, etc, and counting that.
-		// Note, surrogate (\uD800-\uDFFF) characters are counted as 2 bytes, since there's two of them
-		// and the actual character takes 4 bytes in UTF-8 (2*2=4). Might not work perfectly in edge cases
-		// such as illegal sequences, but that should never happen.
+	//Legacy
+	window.addButton =  mw.toolbar.addButton;
+	window.insertTags = mw.toolbar.insertTags;
+
+	//make sure edit summary does not exceed byte limit
+	$( '#wpSummary' ).byteLimit( 250 );
+	
+	$( document ).ready( function() {
+		/**
+		 * Restore the edit box scroll state following a preview operation,
+		 * and set up a form submission handler to remember this state
+		 */
+		var scrollEditBox = function() {
+			var editBox = document.getElementById( 'wpTextbox1' );
+			var scrollTop = document.getElementById( 'wpScrolltop' );
+			var $editForm = $( '#editform' );
+			if( $editForm.length && editBox && scrollTop ) {
+				if( scrollTop.value ) {
+					editBox.scrollTop = scrollTop.value;
+				}
+				$editForm.submit( function() {
+					scrollTop.value = editBox.scrollTop;
+				});
+			}
+		};
+		scrollEditBox();
+		
+		// Create button bar
+		mw.toolbar.init();
+		
+		$( 'textarea, input:text' ).focus( function() {
+			currentFocused = $(this);
+		});
 
-		var len = this.value.replace( /[\u0080-\u07FF\uD800-\uDFFF]/g, '**' ).replace( /[\u0800-\uD7FF\uE000-\uFFFF]/g, '***' ).length;
-		//247 as this doesn't count character about to be inserted.
-		if ( len > 247 ) {
-			e.preventDefault();
+		// HACK: make currentFocused work with the usability iframe
+		// With proper focus detection support (HTML 5!) this'll be much cleaner
+		var iframe = $( '.wikiEditor-ui-text iframe' );
+		if ( iframe.length > 0 ) {
+			$( iframe.get( 0 ).contentWindow.document )
+				.add( iframe.get( 0 ).contentWindow.document.body ) // for IE
+				.focus( function() { currentFocused = iframe; } );
 		}
 	});
 })(jQuery);
diff --git a/resources/mediawiki.action/mediawiki.action.history.diff.css b/resources/mediawiki.action/mediawiki.action.history.diff.css
new file mode 100644
index 00000000..3907a5f4
--- /dev/null
+++ b/resources/mediawiki.action/mediawiki.action.history.diff.css
@@ -0,0 +1,61 @@
+/*
+** Diff rendering
+*/
+table.diff, td.diff-otitle, td.diff-ntitle {
+	background-color: white;
+}
+td.diff-otitle,
+td.diff-ntitle {
+	text-align: center;
+}
+td.diff-marker {
+	text-align: right;
+}
+td.diff-lineno {
+	font-weight: bold;
+}
+td.diff-addedline {
+	background: #cfc;
+	font-size: smaller;
+}
+td.diff-deletedline {
+	background: #ffa;
+	font-size: smaller;
+}
+td.diff-context {
+	background: #eee;
+	font-size: smaller;
+}
+.diffchange {
+	color: red;
+	font-weight: bold;
+	white-space: -moz-pre-wrap;
+	white-space: pre-wrap;
+	text-decoration: none;
+}
+
+table.diff {
+	border: none;
+	width: 98%;
+	border-spacing: 4px;
+
+	/* Ensure that colums are of equal width */
+	table-layout: fixed;
+}
+table.diff td {
+	padding: 0;
+}
+table.diff col.diff-marker {
+	width: 2%;
+}
+table.diff col.diff-content {
+	width: 48%;
+}
+table.diff td div {
+	/* Force-wrap very long lines such as URLs or page-widening char strings.*/
+	word-wrap: break-word;
+
+	/* As fallback (FF<3.5, Opera <10.5), scrollbars will be added for very wide cells
+	   instead of text overflowing or widening */
+	overflow: auto;
+}
diff --git a/resources/mediawiki.action/mediawiki.action.history.js b/resources/mediawiki.action/mediawiki.action.history.js
index 66f90b07..1b5b3a00 100644
--- a/resources/mediawiki.action/mediawiki.action.history.js
+++ b/resources/mediawiki.action/mediawiki.action.history.js
@@ -1,7 +1,53 @@
 /*
  * JavaScript for History action
  */
+jQuery( function( $ ) {
+	var $lis = $( 'ul#pagehistory li' );
+	var updateDiffRadios = function() {
+		var diffLi = false, // the li where the diff radio is checked
+			oldLi = false; // the li where the oldid radio is checked
 
-// Replaces histrowinit
-$( '#pagehistory li input[name=diff], #pagehistory li input[name=oldid]' ).click( diffcheck );
-diffcheck();
\ No newline at end of file
+		if ( !$lis.length ) {
+			return true;
+		}
+		$lis.removeClass( 'selected' );
+		$lis.each( function() {
+			var $this = $(this);
+			var $inputs = $this.find( 'input[type="radio"]' );
+			if ( $inputs.length !== 2 ) {
+				return true;
+			}
+
+			// this row has a checked radio button
+			if ( $inputs.get(0).checked ) { 
+				oldLi = true;
+				$this.addClass( 'selected' );
+				$inputs.eq(0).css( 'visibility', 'visible' );
+				$inputs.eq(1).css( 'visibility', 'hidden' );
+			} else if ( $inputs.get(1).checked ) {
+				diffLi = true;
+				$this.addClass( 'selected' );
+				$inputs.eq(0).css( 'visibility', 'hidden' );
+				$inputs.eq(1).css( 'visibility', 'visible' );
+			} else { 
+				// no radio is checked in this row
+				if ( diffLi && oldLi ) {
+					// We're below the selected radios
+					$inputs.eq(0).css( 'visibility', 'visible' );
+					$inputs.eq(1).css( 'visibility', 'hidden' );
+	 			} else if ( diffLi ) {
+					// We're between the selected radios
+					$inputs.css( 'visibility', 'visible' );
+				} else {
+					// We're above the selected radios
+					$inputs.eq(1).css( 'visibility', 'visible' );
+					$inputs.eq(0).css( 'visibility', 'hidden' );
+				}
+			}
+		});
+		return true;
+	};
+
+	$( '#pagehistory li input[name="diff"], #pagehistory li input[name="oldid"]' ).click( updateDiffRadios );
+	updateDiffRadios();
+});
\ No newline at end of file
diff --git a/resources/mediawiki.action/mediawiki.action.view.metadata.js b/resources/mediawiki.action/mediawiki.action.view.metadata.js
new file mode 100644
index 00000000..378dd155
--- /dev/null
+++ b/resources/mediawiki.action/mediawiki.action.view.metadata.js
@@ -0,0 +1,39 @@
+// Exif metadata display for MediaWiki file uploads
+//
+// Add an expand/collapse link and collapse by default if set to
+// (with JS disabled, user will see all items)
+//
+
+jQuery( document ).ready( function( $ ) {
+	var showText = mw.msg( 'metadata-expand' );
+	var hideText = mw.msg( 'metadata-collapse' );
+
+	var $table = $( '#mw_metadata' );
+	var $tbody = $table.find( 'tbody' );
+	if ( !$tbody.length ) {
+		return;
+	}
+
+	var $row = $( '<tr></tr>' );
+	var $col = $( '<td colspan="2"></td>' );
+
+	var $link = $( '<a></a>', {
+		'text': showText,
+		'href': '#'
+	}).click(function() {
+		if ( $table.hasClass( 'collapsed' ) ) {
+			$( this ).text( hideText );
+		} else {
+			$( this ).text( showText );
+		}
+		$table.toggleClass( 'expanded collapsed' );
+		return false;
+	});
+
+	$col.append( $link );
+	$row.append( $col );
+	$tbody.append( $row );
+
+	// And collapse!
+	$table.addClass( 'collapsed' );
+} );
diff --git a/resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js b/resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js
index 5a7c777f..caf9a9f2 100644
--- a/resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js
+++ b/resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js
@@ -1,7 +1,7 @@
 /*
  * JavaScript to enable right click edit functionality
  */
-$( function() {
+jQuery( function( $ ) {
 	// Select all h1-h6 elements that contain editsection links
 	$( 'h1:has(.editsection a), ' +
 		'h2:has(.editsection a), ' +
diff --git a/resources/mediawiki.action/mediawiki.action.watch.ajax.js b/resources/mediawiki.action/mediawiki.action.watch.ajax.js
new file mode 100644
index 00000000..93aa29c9
--- /dev/null
+++ b/resources/mediawiki.action/mediawiki.action.watch.ajax.js
@@ -0,0 +1,174 @@
+/**
+ * Animate watch/unwatch links to use asynchronous API requests to
+ * watch pages, rather than clicking on links. Requires jQuery.
+ */
+( function( $ ) {
+var $links;
+
+var setLinkText = function( $link, action ) {
+	if ( action == 'watch' || action == 'unwatch' ) {
+		// save the accesskey from the title
+		var keyCommand = $link.attr( 'title' ).match( /\[.*?\]$/ ) ? $link.attr( 'title' ).match( /\[.*?\]$/ )[0] : '';
+		$link.attr( 'title', mw.msg( 'tooltip-ca-' + action ) + ' ' + keyCommand );
+	}
+	if ( $link.data( 'icon' ) ) {
+		$link.attr( 'alt', mw.msg( action ) );
+		if ( action == 'watching' || action == 'unwatching' ) {
+			$link.addClass( 'loading' );
+		} else {
+			$link.removeClass( 'loading' );
+		}
+	} else {
+		$link.html( mw.msg( action ) );
+	}
+};
+
+var errorHandler = function( $link ) {
+
+	// Reset link text to whatever it was before we switching it to the '(un)watch'+ing message.
+	setLinkText( $link, $link.data( 'action' ) );
+
+	// Format error message
+	var cleanTitle = mw.config.get( 'wgPageName' ).replace( /_/g, ' ' );
+	var link = mw.html.element(
+		'a', {
+			'href': mw.util.wikiGetlink( mw.config.get( 'wgPageName' ) ),
+			'title': cleanTitle
+		}, cleanTitle
+	);
+	var msg = mw.msg( 'watcherrortext', link );
+
+	// Report to user about the error
+	mw.util.jsMessage( msg, 'watch' );
+};
+
+/**
+ * Process the result of the API watch action.
+ *
+ * @param response Data object from API request.
+ * @param $link jQuery object of the watch link.
+ * @return Boolean true on success, false otherwise.
+ */
+var processResult = function( response, $link ) {
+
+	if ( ( 'error' in response ) || !response.watch ) {
+		errorHandler( $link );
+		return false;
+	}
+
+	var watchResponse = response.watch;
+
+	// To ensure we set the same status for all watch links with the
+	// same target we trigger a custom event on *all* watch links.
+	if ( watchResponse.watched !== undefined ) {
+		$links.trigger( 'mw-ajaxwatch', [watchResponse.title, 'watch', $link] );
+	} else if ( watchResponse.unwatched !== undefined ) {
+		$links.trigger( 'mw-ajaxwatch', [watchResponse.title, 'unwatch', $link] );
+	} else {
+		// Either we got an error code or it just plain broke.
+		window.location.href = $link[0].href;
+		return false;
+	}
+
+	mw.util.jsMessage( watchResponse.message, 'watch' );
+
+	// Bug 12395 - update the watch checkbox on edit pages when the
+	// page is watched or unwatched via the tab.
+	if ( watchResponse.watched !== undefined ) {
+		$( '#wpWatchthis' ).attr( 'checked', 'checked' );
+	} else {
+		$( '#wpWatchthis' ).removeAttr( 'checked' );
+	}
+	return true;
+};
+
+$( document ).ready( function() {
+	$links = $( '.mw-watchlink a, a.mw-watchlink' );
+	// BC with older skins
+	$links = $links
+		.add( '#ca-watch a, #ca-unwatch a, a#mw-unwatch-link1, ' +
+			'a#mw-unwatch-link2, a#mw-watch-link2, a#mw-watch-link1' );
+	// allowing people to add inline animated links is a little scary
+	$links = $links.filter( ':not( #bodyContent *, #content * )' );
+
+	$links.each( function() {
+		var $link = $( this );
+		var link = this;
+		$link
+			.data( 'icon', $link.closest( 'li' ).hasClass( 'icon' ) )
+			.data( 'action', mw.util.getParamValue( 'action', link.href ) == 'unwatch' ? 'unwatch' : 'watch' );
+		var title = mw.util.getParamValue( 'title', link.href );
+		$link.data( 'target', title.replace( /_/g, ' ' ) );
+	});
+
+	$links.click( function( event ) {
+		var $link = $( this );
+
+		if ( !mw.config.get( 'wgEnableWriteAPI' ) ) {
+			// Lazy initialization so we don't toss up
+			// ActiveX warnings on initial page load
+			// for IE 6 users with security settings.
+			$links.unbind( 'click' );
+			return true;
+		}
+
+		setLinkText( $link, $link.data( 'action' ) + 'ing' );
+
+		var reqData = {
+			'action': 'watch',
+			'format': 'json',
+			'title': $link.data( 'target' ),
+			'token': mw.user.tokens.get( 'watchToken' ),
+			// API return contains a localized data.watch.message string.
+			'uselang': mw.config.get( 'wgUserLanguage' )
+		};
+
+		if ( $link.data( 'action' ) == 'unwatch' ) {
+			reqData.unwatch = '';
+		}
+
+		$.ajax({
+			url: mw.util.wikiScript( 'api' ),
+			dataType: 'json',
+			type: 'POST',
+			data: reqData,
+			success: function( data, textStatus, xhr ) {
+				processResult( data, $link );
+			},
+			error: function(){
+				processResult( {}, $link );
+			}
+		});
+
+		return false;
+	});
+
+	// When a request returns, a custom event 'mw-ajaxwatch' is triggered
+	// on *all* watch links, so they can be updated if necessary
+	$links.bind( 'mw-ajaxwatch', function( event, target, action, $link ) {
+		var foo = $link.data( 'target' );
+		if ( $link.data( 'target' ) == target ) {
+			var otheraction = action == 'watch'
+				? 'unwatch'
+				: 'watch';
+
+			$link.data( 'action', otheraction );
+			setLinkText( $link, otheraction );
+			$link.attr( 'href',
+				mw.config.get( 'wgScript' )
+				+ '?title=' + mw.util.wikiUrlencode( mw.config.get( 'wgPageName' ) )
+				+ '&action=' + otheraction
+			);
+			if ( $link.closest( 'li' ).attr( 'id' ) == 'ca-' + action ) {
+				$link.closest( 'li' ).attr( 'id', 'ca-' + otheraction );
+				// update the link text with the new message
+				$link.text( mw.msg( otheraction ) );
+			}
+		}
+
+		return false;
+	});
+
+});
+
+})( jQuery );
diff --git a/resources/mediawiki.language/languages/nl.js b/resources/mediawiki.language/languages/nl.js
new file mode 100644
index 00000000..a2b22f4b
--- /dev/null
+++ b/resources/mediawiki.language/languages/nl.js
@@ -0,0 +1,8 @@
+/**
+ * Dutch (Nederlands) language functions
+ */
+
+mediaWiki.language.digitTransformTable = {
+    '.' : ',',
+    ',' : '.'
+};
diff --git a/resources/mediawiki.language/languages/pt-br.js b/resources/mediawiki.language/languages/pt-br.js
index eda10d2e..2457e247 100644
--- a/resources/mediawiki.language/languages/pt-br.js
+++ b/resources/mediawiki.language/languages/pt-br.js
@@ -2,7 +2,7 @@
  * Brazilian Portugese (Portuguêsi do Brasil) language functions
  */
 
-mediaWiki.language.convertPlural = function( count, forms ) {
-	forms = mediaWiki.language.preConvertPlural( forms, 2 );
-	return ( count <= 1 ) ? forms[0] : forms[1];
+mediaWiki.language.digitTransformTable = {
+    '.' : ',',
+    ',' : ' '
 };
diff --git a/resources/mediawiki.language/languages/pt.js b/resources/mediawiki.language/languages/pt.js
new file mode 100644
index 00000000..1b8fc72f
--- /dev/null
+++ b/resources/mediawiki.language/languages/pt.js
@@ -0,0 +1,8 @@
+/**
+ * Portugese language functions
+ */
+
+mediaWiki.language.digitTransformTable = {
+    '.' : ',',
+    ',' : ' '
+};
diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js
index f199101b..fa7aa8d5 100644
--- a/resources/mediawiki.language/mediawiki.language.js
+++ b/resources/mediawiki.language/mediawiki.language.js
@@ -28,7 +28,7 @@ mw.language = {
 			// Restore the count into a Number ( if it got converted earlier )
 			var count = mw.language.convertNumber( template.title, true );
 			// Do convertPlural call 
-			return mw.language.convertPlural( parseInt( count ), template.parameters );
+			return mw.language.convertPlural( parseInt( count, 10 ), template.parameters );
 		}
 		// Could not process plural return first form or nothing
 		if ( template.parameters[0] ) {
@@ -47,7 +47,7 @@ mw.language = {
 		if ( !forms || forms.length == 0 ) {
 			return '';
 		}
-		return ( parseInt( count ) == 1 ) ? forms[0] : forms[1];
+		return ( parseInt( count, 10 ) == 1 ) ? forms[0] : forms[1];
 	},
 	/**
 	 * Pads an array to a specific length by copying the last one element.
@@ -65,19 +65,19 @@ mw.language = {
 	/**
 	 * Converts a number using digitTransformTable.
 	 *
-	 * @param {number} number Value to be converted
+	 * @param {num} number Value to be converted
 	 * @param {boolean} integer Convert the return value to an integer
 	 */
-	'convertNumber': function( number, integer ) {
+	'convertNumber': function( num, integer ) {
 		if ( !mw.language.digitTransformTable ) {
-			return number;
+			return num;
 		}
 		// Set the target Transform table:
 		var transformTable = mw.language.digitTransformTable;
 		// Check if the "restore" to Latin number flag is set:
 		if ( integer ) {
-			if ( parseInt( number ) == number ) {
-				return number;
+			if ( parseInt( num, 10 ) == num ) {
+				return num;
 			}
 			var tmp = [];
 			for ( var i in transformTable ) {
@@ -85,7 +85,7 @@ mw.language = {
 			}
 			transformTable = tmp;
 		}
-		var numberString =  '' + number;
+		var numberString =  '' + num;
 		var convertedNumber = '';
 		for ( var i = 0; i < numberString.length; i++ ) {
 			if ( transformTable[ numberString[i] ] ) {
@@ -94,9 +94,9 @@ mw.language = {
 				convertedNumber += numberString[i];
 			}
 		}
-		return integer ? parseInt( convertedNumber ) : convertedNumber;
+		return integer ? parseInt( convertedNumber, 10 ) : convertedNumber;
 	},
 	// Digit Transform Table, populated by language classes where applicable
 	'digitTransformTable': null
 };
-} )( jQuery, mediaWiki );
\ No newline at end of file
+} )( jQuery, mediaWiki );
diff --git a/resources/mediawiki.libs/mediawiki.libs.jpegmeta.js b/resources/mediawiki.libs/mediawiki.libs.jpegmeta.js
new file mode 100644
index 00000000..af49889a
--- /dev/null
+++ b/resources/mediawiki.libs/mediawiki.libs.jpegmeta.js
@@ -0,0 +1,731 @@
+/* This is JsJpegMeta 1.0, ported to MediaWiki ResourceLoader by Bryan Tong Minh */
+/* The following lines where changed with respect to the original: 54, 625-627 */
+
+(function( $ ) {
+
+	/* JsJpegMeta starts here */
+	
+	/*
+	Copyright (c) 2009 Ben Leslie
+	
+	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.
+	*/
+	
+	/*
+	 This JavaScript library is used to parse meta-data from files 
+	 with mime-type image/jpeg.
+	
+	 Include it with something like:
+	
+	   <script type="text/javascript" src="jpegmeta.js"></script>
+	
+	 This adds a single 'module' object called 'JpegMeta' to the global
+	 namespace.
+	
+	 Public Functions
+	 ----------------
+	 JpegMeta.parseNum - parse unsigned integers from binary data
+	 JpegMeta.parseSnum - parse signed integers from binary data
+	
+	 Public Classes
+	 --------------
+	 JpegMeta.Rational - A rational number class
+	 JpegMeta.JfifSegment
+	 JpegMeta.ExifSegment
+	 JpegMeta.JpegFile - Primary class for Javascript parsing
+	*/
+
+	var JpegMeta = {};
+	this.JpegMeta = JpegMeta; // I have no clue why I need this magic... -- Bryan
+	
+	/* 
+	   parse an unsigned number of size bytes at offset in some binary string data.
+	   If endian
+	   is "<" parse the data as little endian, if endian
+	   is ">" parse as big-endian.
+	*/
+	JpegMeta.parseNum = function parseNum(endian, data, offset, size) {
+	    var i;
+	    var ret;
+	    var big_endian = (endian === ">");
+	    if (offset === undefined) offset = 0;
+	    if (size === undefined) size = data.length - offset;
+	    for (big_endian ? i = offset : i = offset + size - 1; 
+		 big_endian ? i < offset + size : i >= offset; 
+		 big_endian ? i++ : i--) {
+		ret <<= 8;
+		ret += data.charCodeAt(i);
+	    }
+	    return ret;
+	};
+	
+	/* 
+	   parse an signed number of size bytes at offset in some binary string data.
+	   If endian
+	   is "<" parse the data as little endian, if endian
+	   is ">" parse as big-endian.
+	*/
+	JpegMeta.parseSnum = function parseSnum(endian, data, offset, size) {
+	    var i;
+	    var ret;
+	    var neg;
+	    var big_endian = (endian === ">");
+	    if (offset === undefined) offset = 0;
+	    if (size === undefined) size = data.length - offset;
+	    for (big_endian ? i = offset : i = offset + size - 1; 
+		 big_endian ? i < offset + size : i >= offset; 
+		 big_endian ? i++ : i--) {
+		if (neg === undefined) {
+		    /* Negative if top bit is set */
+		    neg = (data.charCodeAt(i) & 0x80) === 0x80;
+		}
+		ret <<= 8;
+		/* If it is negative we invert the bits */
+		ret += neg ? ~data.charCodeAt(i) & 0xff: data.charCodeAt(i);
+	    }
+	    if (neg) {
+		/* If it is negative we do two's complement */
+		ret += 1;
+		ret *= -1;
+	    }
+	    return ret;
+	};
+	
+	/* Rational number class */
+	JpegMeta.Rational = function Rational(num, den)
+	{
+	    this.num = num;
+	    this.den = den || 1;
+	    return this;
+	};
+	
+	/* Rational number methods */
+	JpegMeta.Rational.prototype.toString = function toString() {
+	    if (this.num === 0) {
+		return "" + this.num;
+	    }
+	    if (this.den === 1) {
+		return "" + this.num;
+	    }
+	    if (this.num === 1) {
+		return this.num + " / " + this.den;
+	    }
+	    return this.num / this.den; // + "/" + this.den;
+	};
+	
+	JpegMeta.Rational.prototype.asFloat = function asFloat() {
+	    return this.num / this.den;
+	};
+	
+	/* MetaGroup class */
+	JpegMeta.MetaGroup = function MetaGroup(fieldName, description) {
+	    this.fieldName = fieldName;
+	    this.description = description;
+	    this.metaProps = {};
+	    return this;
+	};
+	
+	JpegMeta.MetaGroup.prototype._addProperty = function _addProperty(fieldName, description, value) {
+	    var property = new JpegMeta.MetaProp(fieldName, description, value);
+	    this[property.fieldName] = property;
+	    this.metaProps[property.fieldName] = property;
+	};
+	
+	JpegMeta.MetaGroup.prototype.toString = function toString() {
+	    return "[MetaGroup " + this.description + "]";
+	};
+
+	/* MetaProp class */
+	JpegMeta.MetaProp = function MetaProp(fieldName, description, value) {
+	    this.fieldName = fieldName;
+	    this.description = description;
+	    this.value = value;
+	    return this;
+	};
+	
+	JpegMeta.MetaProp.prototype.toString = function toString() {
+	    return "" + this.value;
+	};
+
+	/* JpegFile class */
+	JpegMeta.JpegFile = function JpegFile(binary_data, filename) {
+	    /* Change this to EOI if we want to parse. */
+	    var break_segment = this._SOS;
+	    
+	    this.metaGroups = {};
+	    this._binary_data = binary_data;
+	    this.filename = filename;
+	    
+	    /* Go through and parse. */
+	    var pos = 0;
+	    var pos_start_of_segment = 0;
+	    var delim;
+	    var mark;
+	    var _mark;
+	    var segsize;
+	    var headersize;
+	    var mark_code;
+	    var mark_fn;
+	
+	    /* Check to see if this looks like a JPEG file */
+	    if (this._binary_data.slice(0, 2) !== this._SOI_MARKER) {
+		throw new Error("Doesn't look like a JPEG file. First two bytes are " + 
+				this._binary_data.charCodeAt(0) + "," + 
+				this._binary_data.charCodeAt(1) + ".");
+	    }
+	    
+	    pos += 2;
+	    
+	    while (pos < this._binary_data.length) {
+		delim = this._binary_data.charCodeAt(pos++);
+		mark = this._binary_data.charCodeAt(pos++);
+		
+		pos_start_of_segment = pos;
+		
+		if (delim != this._DELIM) {
+		    break;
+		}
+		
+		if (mark === break_segment) {
+		    break;
+		}
+		
+		headersize = JpegMeta.parseNum(">", this._binary_data, pos, 2);
+		
+		/* Find the end */
+		pos += headersize;
+		while (pos < this._binary_data.length) {
+		    delim = this._binary_data.charCodeAt(pos++);
+		    if (delim == this._DELIM) {
+			_mark = this._binary_data.charCodeAt(pos++);
+			if (_mark != 0x0) {
+			    pos -= 2;
+			    break;
+			}
+		    }
+		}
+		
+		segsize = pos - pos_start_of_segment;
+		
+		if (this._markers[mark]) {
+		    mark_code = this._markers[mark][0];
+		    mark_fn = this._markers[mark][1];
+		} else {
+		    mark_code = "UNKN";
+		    mark_fn = undefined;
+		}
+		
+		if (mark_fn) {
+		    this[mark_fn](mark, pos_start_of_segment + 2);
+		}
+		
+	    }
+	    
+	    if (this.general === undefined) {
+		throw Error("Invalid JPEG file.");
+	    }
+	    
+	    return this;
+	};
+	
+	this.JpegMeta.JpegFile.prototype.toString = function () {
+	    return "[JpegFile " + this.filename + " " + 
+		this.general.type + " " + 
+		this.general.pixelWidth + "x" + 
+		this.general.pixelHeight +
+		" Depth: " + this.general.depth + "]";
+	};
+	
+	/* Some useful constants */
+	this.JpegMeta.JpegFile.prototype._SOI_MARKER = '\xff\xd8';
+	this.JpegMeta.JpegFile.prototype._DELIM = 0xff;
+	this.JpegMeta.JpegFile.prototype._EOI = 0xd9;
+	this.JpegMeta.JpegFile.prototype._SOS = 0xda;
+	
+	this.JpegMeta.JpegFile.prototype._sofHandler = function _sofHandler (mark, pos) {
+	    if (this.general !== undefined) {
+		throw Error("Unexpected multiple-frame image");
+	    }
+	
+	    this._addMetaGroup("general", "General");
+	    this.general._addProperty("depth", "Depth", JpegMeta.parseNum(">", this._binary_data, pos, 1));
+	    this.general._addProperty("pixelHeight", "Pixel Height", JpegMeta.parseNum(">", this._binary_data, pos + 1, 2));
+	    this.general._addProperty("pixelWidth", "Pixel Width",JpegMeta.parseNum(">", this._binary_data, pos + 3, 2));
+	    this.general._addProperty("type", "Type", this._markers[mark][2]);
+	};
+	
+	/* JFIF idents */
+	this.JpegMeta.JpegFile.prototype._JFIF_IDENT = "JFIF\x00";
+	this.JpegMeta.JpegFile.prototype._JFXX_IDENT = "JFXX\x00";
+	
+	/* EXIF idents */
+	this.JpegMeta.JpegFile.prototype._EXIF_IDENT = "Exif\x00";
+	
+	/* TIFF types */
+	this.JpegMeta.JpegFile.prototype._types = {
+	    /* The format is identifier : ["type name", type_size_in_bytes ] */
+	    1 : ["BYTE", 1],
+	    2 : ["ASCII", 1],
+	    3 : ["SHORT", 2],
+	    4 : ["LONG", 4],
+	    5 : ["RATIONAL", 8],
+	    6 : ["SBYTE", 1],
+	    7 : ["UNDEFINED", 1],
+	    8 : ["SSHORT", 2],
+	    9 : ["SLONG", 4],
+	    10 : ["SRATIONAL", 8],
+	    11 : ["FLOAT", 4],
+	    12 : ["DOUBLE", 8]
+	};
+	
+	this.JpegMeta.JpegFile.prototype._tifftags = {
+	    /* A. Tags relating to image data structure */
+	    256 : ["Image width", "ImageWidth"],
+	    257 : ["Image height", "ImageLength"],
+	    258 : ["Number of bits per component", "BitsPerSample"],
+	    259 : ["Compression scheme", "Compression", 
+		   {1 : "uncompressed", 6 : "JPEG compression" }],
+	    262 : ["Pixel composition", "PhotmetricInerpretation",
+		   {2 : "RGB", 6 : "YCbCr"}],
+	    274 : ["Orientation of image", "Orientation",
+		   /* FIXME: Check the mirror-image / reverse encoding and rotation */
+		   {1 : "Normal", 2 : "Reverse?", 
+		    3 : "Upside-down", 4 : "Upside-down Reverse",
+		    5 : "90 degree CW", 6 : "90 degree CW reverse",
+		    7 : "90 degree CCW", 8 : "90 degree CCW reverse"}],
+	    277 : ["Number of components", "SamplesPerPixel"],
+	    284 : ["Image data arrangement", "PlanarConfiguration",
+		   {1 : "chunky format", 2 : "planar format"}],
+	    530 : ["Subsampling ratio of Y to C", "YCbCrSubSampling"],
+	    531 : ["Y and C positioning", "YCbCrPositioning",
+		   {1 : "centered", 2 : "co-sited"}],
+	    282 : ["X Resolution", "XResolution"],
+	    283 : ["Y Resolution", "YResolution"],
+	    296 : ["Resolution Unit", "ResolutionUnit",
+		   {2 : "inches", 3 : "centimeters"}],
+	    /* B. Tags realting to recording offset */
+	    273 : ["Image data location", "StripOffsets"],
+	    278 : ["Number of rows per strip", "RowsPerStrip"],
+	    279 : ["Bytes per compressed strip", "StripByteCounts"],
+	    513 : ["Offset to JPEG SOI", "JPEGInterchangeFormat"],
+	    514 : ["Bytes of JPEG Data", "JPEGInterchangeFormatLength"],
+	    /* C. Tags relating to image data characteristics */
+	    301 : ["Transfer function", "TransferFunction"],
+	    318 : ["White point chromaticity", "WhitePoint"],
+	    319 : ["Chromaticities of primaries", "PrimaryChromaticities"],
+	    529 : ["Color space transformation matrix coefficients", "YCbCrCoefficients"],
+	    532 : ["Pair of black and white reference values", "ReferenceBlackWhite"],
+	    /* D. Other tags */
+	    306 : ["Date and time", "DateTime"],
+	    270 : ["Image title", "ImageDescription"],
+	    271 : ["Make", "Make"],
+	    272 : ["Model", "Model"],
+	    305 : ["Software", "Software"],
+	    315 : ["Person who created the image", "Artist"],
+	    316 : ["Host Computer", "HostComputer"],
+	    33432 : ["Copyright holder", "Copyright"],
+	    
+	    34665 : ["Exif tag", "ExifIfdPointer"],
+	    34853 : ["GPS tag", "GPSInfoIfdPointer"]
+	};
+	
+	this.JpegMeta.JpegFile.prototype._exiftags = {
+	    /* Tag Support Levels (2) - 0th IFX Exif Private Tags */
+	    /* A. Tags Relating to Version */
+	    36864 : ["Exif Version", "ExifVersion"],
+	    40960 : ["FlashPix Version", "FlashpixVersion"],
+	    
+	    /* B. Tag Relating to Image Data Characteristics */
+	    40961 : ["Color Space", "ColorSpace"],
+	    
+	    /* C. Tags Relating to Image Configuration */
+	    37121 : ["Meaning of each component", "ComponentsConfiguration"],
+	    37122 : ["Compressed Bits Per Pixel", "CompressedBitsPerPixel"],
+	    40962 : ["Pixel X Dimension", "PixelXDimension"],
+	    40963 : ["Pixel Y Dimension", "PixelYDimension"],
+	    
+	    /* D. Tags Relating to User Information */
+	    37500 : ["Manufacturer notes", "MakerNote"],
+	    37510 : ["User comments", "UserComment"],
+	    
+	    /* E. Tag Relating to Related File Information */
+	    40964 : ["Related audio file", "RelatedSoundFile"],
+	    
+	    /* F. Tags Relating to Date and Time */
+	    36867 : ["Date Time Original", "DateTimeOriginal"],
+	    36868 : ["Date Time Digitized", "DateTimeDigitized"],
+	    37520 : ["DateTime subseconds", "SubSecTime"],
+	    37521 : ["DateTimeOriginal subseconds", "SubSecTimeOriginal"],
+	    37522 : ["DateTimeDigitized subseconds", "SubSecTimeDigitized"],
+	    
+	    /* G. Tags Relating to Picture-Taking Conditions */
+	    33434 : ["Exposure time", "ExposureTime"],
+	    33437 : ["FNumber", "FNumber"],
+	    34850 : ["Exposure program", "ExposureProgram"],
+	    34852 : ["Spectral sensitivity", "SpectralSensitivity"],
+	    34855 : ["ISO Speed Ratings", "ISOSpeedRatings"],
+	    34856 : ["Optoelectric coefficient", "OECF"],
+	    37377 : ["Shutter Speed",  "ShutterSpeedValue"],
+	    37378 : ["Aperture Value", "ApertureValue"],
+	    37379 : ["Brightness", "BrightnessValue"],
+	    37380 : ["Exposure Bias Value", "ExposureBiasValue"],
+	    37381 : ["Max Aperture Value", "MaxApertureValue"],
+	    37382 : ["Subject Distance", "SubjectDistance"],
+	    37383 : ["Metering Mode", "MeteringMode"],
+	    37384 : ["Light Source", "LightSource"],
+	    37385 : ["Flash", "Flash"],
+	    37386 : ["Focal Length", "FocalLength"],
+	    37396 : ["Subject Area", "SubjectArea"],
+	    41483 : ["Flash Energy", "FlashEnergy"],
+	    41484 : ["Spatial Frequency Response", "SpatialFrequencyResponse"],
+	    41486 : ["Focal Plane X Resolution", "FocalPlaneXResolution"],
+	    41487 : ["Focal Plane Y Resolution", "FocalPlaneYResolution"],
+	    41488 : ["Focal Plane Resolution Unit", "FocalPlaneResolutionUnit"],
+	    41492 : ["Subject Location", "SubjectLocation"],
+	    41493 : ["Exposure Index", "ExposureIndex"],
+	    41495 : ["Sensing Method", "SensingMethod"],
+	    41728 : ["File Source", "FileSource"],
+	    41729 : ["Scene Type", "SceneType"],
+	    41730 : ["CFA Pattern", "CFAPattern"],
+	    41985 : ["Custom Rendered", "CustomRendered"],
+	    41986 : ["Exposure Mode", "Exposure Mode"],
+	    41987 : ["White Balance", "WhiteBalance"],
+	    41988 : ["Digital Zoom Ratio", "DigitalZoomRatio"],
+	    41990 : ["Scene Capture Type", "SceneCaptureType"],
+	    41991 : ["Gain Control", "GainControl"],
+	    41992 : ["Contrast", "Contrast"],
+	    41993 : ["Saturation", "Saturation"],
+	    41994 : ["Sharpness", "Sharpness"],
+	    41995 : ["Device settings description", "DeviceSettingDescription"],
+	    41996 : ["Subject distance range", "SubjectDistanceRange"],
+	    
+	    /* H. Other Tags */
+	    42016 : ["Unique image ID", "ImageUniqueID"],
+	    
+	    40965 : ["Interoperability tag", "InteroperabilityIFDPointer"]
+	};
+	
+	this.JpegMeta.JpegFile.prototype._gpstags = {
+	    /* A. Tags Relating to GPS */
+	    0 : ["GPS tag version", "GPSVersionID"],
+	    1 : ["North or South Latitude", "GPSLatitudeRef"],
+	    2 : ["Latitude", "GPSLatitude"],
+	    3 : ["East or West Longitude", "GPSLongitudeRef"],
+	    4 : ["Longitude", "GPSLongitude"],
+	    5 : ["Altitude reference", "GPSAltitudeRef"],
+	    6 : ["Altitude", "GPSAltitude"],
+	    7 : ["GPS time (atomic clock)", "GPSTimeStamp"],
+	    8 : ["GPS satellites usedd for measurement", "GPSSatellites"],
+	    9 : ["GPS receiver status", "GPSStatus"],
+	    10 : ["GPS mesaurement mode", "GPSMeasureMode"],
+	    11 : ["Measurement precision", "GPSDOP"],
+	    12 : ["Speed unit", "GPSSpeedRef"],
+	    13 : ["Speed of GPS receiver", "GPSSpeed"],
+	    14 : ["Reference for direction of movement", "GPSTrackRef"],
+	    15 : ["Direction of movement", "GPSTrack"],
+	    16 : ["Reference for direction of image", "GPSImgDirectionRef"],
+	    17 : ["Direction of image", "GPSImgDirection"],
+	    18 : ["Geodetic survey data used", "GPSMapDatum"],
+	    19 : ["Reference for latitude of destination", "GPSDestLatitudeRef"],
+	    20 : ["Latitude of destination", "GPSDestLatitude"],
+	    21 : ["Reference for longitude of destination", "GPSDestLongitudeRef"],
+	    22 : ["Longitude of destination", "GPSDestLongitude"],
+	    23 : ["Reference for bearing of destination", "GPSDestBearingRef"],
+	    24 : ["Bearing of destination", "GPSDestBearing"],
+	    25 : ["Reference for distance to destination", "GPSDestDistanceRef"],
+	    26 : ["Distance to destination", "GPSDestDistance"],
+	    27 : ["Name of GPS processing method", "GPSProcessingMethod"],
+	    28 : ["Name of GPS area", "GPSAreaInformation"],
+	    29 : ["GPS Date", "GPSDateStamp"],
+	    30 : ["GPS differential correction", "GPSDifferential"]
+	};
+
+	this.JpegMeta.JpegFile.prototype._markers = {
+	    /* Start Of Frame markers, non-differential, Huffman coding */
+	    0xc0: ["SOF0", "_sofHandler", "Baseline DCT"],
+	    0xc1: ["SOF1", "_sofHandler", "Extended sequential DCT"],
+	    0xc2: ["SOF2", "_sofHandler", "Progressive DCT"],
+	    0xc3: ["SOF3", "_sofHandler", "Lossless (sequential)"],
+	    
+	    /* Start Of Frame markers, differential, Huffman coding */
+	    0xc5: ["SOF5", "_sofHandler", "Differential sequential DCT"],
+	    0xc6: ["SOF6", "_sofHandler", "Differential progressive DCT"],
+	    0xc7: ["SOF7", "_sofHandler", "Differential lossless (sequential)"],
+	    
+	    /* Start Of Frame markers, non-differential, arithmetic coding */
+	    0xc8: ["JPG", null, "Reserved for JPEG extensions"],
+	    0xc9: ["SOF9", "_sofHandler", "Extended sequential DCT"],
+	    0xca: ["SOF10", "_sofHandler", "Progressive DCT"],
+	    0xcb: ["SOF11", "_sofHandler", "Lossless (sequential)"],
+	    
+	    /* Start Of Frame markers, differential, arithmetic coding */
+	    0xcd: ["SOF13", "_sofHandler", "Differential sequential DCT"],
+	    0xce: ["SOF14", "_sofHandler", "Differential progressive DCT"],
+	    0xcf: ["SOF15", "_sofHandler", "Differential lossless (sequential)"],
+	    
+	    /* Huffman table specification */
+	    0xc4: ["DHT", null, "Define Huffman table(s)"],
+	    0xcc: ["DAC", null, "Define arithmetic coding conditioning(s)"],
+	    
+	    /* Restart interval termination" */
+	    0xd0: ["RST0", null, "Restart with modulo 8 count “0”"],
+	    0xd1: ["RST1", null, "Restart with modulo 8 count “1”"],
+	    0xd2: ["RST2", null, "Restart with modulo 8 count “2”"],
+	    0xd3: ["RST3", null, "Restart with modulo 8 count “3”"],
+	    0xd4: ["RST4", null, "Restart with modulo 8 count “4”"],
+	    0xd5: ["RST5", null, "Restart with modulo 8 count “5”"],
+	    0xd6: ["RST6", null, "Restart with modulo 8 count “6”"],
+	    0xd7: ["RST7", null, "Restart with modulo 8 count “7”"],
+	    
+	    /* Other markers */
+	    0xd8: ["SOI", null, "Start of image"],
+	    0xd9: ["EOI", null, "End of image"],
+	    0xda: ["SOS", null, "Start of scan"],
+	    0xdb: ["DQT", null, "Define quantization table(s)"],
+	    0xdc: ["DNL", null, "Define number of lines"],
+	    0xdd: ["DRI", null, "Define restart interval"],
+	    0xde: ["DHP", null, "Define hierarchical progression"],
+	    0xdf: ["EXP", null, "Expand reference component(s)"],
+	    0xe0: ["APP0", "_app0Handler", "Reserved for application segments"],
+	    0xe1: ["APP1", "_app1Handler"],
+	    0xe2: ["APP2", null],
+	    0xe3: ["APP3", null],
+	    0xe4: ["APP4", null],
+	    0xe5: ["APP5", null],
+	    0xe6: ["APP6", null],
+	    0xe7: ["APP7", null],
+	    0xe8: ["APP8", null],
+	    0xe9: ["APP9", null],
+	    0xea: ["APP10", null],
+	    0xeb: ["APP11", null],
+	    0xec: ["APP12", null],
+	    0xed: ["APP13", null],
+	    0xee: ["APP14", null],
+	    0xef: ["APP15", null],
+	    0xf0: ["JPG0", null], /* Reserved for JPEG extensions */
+	    0xf1: ["JPG1", null],
+	    0xf2: ["JPG2", null],
+	    0xf3: ["JPG3", null],
+	    0xf4: ["JPG4", null],
+	    0xf5: ["JPG5", null],
+	    0xf6: ["JPG6", null],
+	    0xf7: ["JPG7", null],
+	    0xf8: ["JPG8", null],
+	    0xf9: ["JPG9", null],
+	    0xfa: ["JPG10", null],
+	    0xfb: ["JPG11", null],
+	    0xfc: ["JPG12", null],
+	    0xfd: ["JPG13", null],
+	    0xfe: ["COM", null], /* Comment */
+	    
+	    /* Reserved markers */
+	    0x01: ["JPG13", null] /* For temporary private use in arithmetic coding */
+	    /* 02 -> bf are reserverd */
+	};
+
+	/* Private methods */
+	this.JpegMeta.JpegFile.prototype._addMetaGroup = function _addMetaGroup(name, description) {
+	    var group = new JpegMeta.MetaGroup(name, description);
+	    this[group.fieldName] = group;
+	    this.metaGroups[group.fieldName] = group;
+	    return group;
+	};
+
+	this.JpegMeta.JpegFile.prototype._parseIfd = function _parseIfd(endian, _binary_data, base, ifd_offset, tags, name, description) {
+	    var num_fields = JpegMeta.parseNum(endian, _binary_data, base + ifd_offset, 2);
+	    /* Per tag variables */
+	    var i, j;
+	    var tag_base;
+	    var tag_field;
+	    var type, type_field, type_size;
+	    var num_values;
+	    var value_offset;
+	    var value;
+	    var _val;
+	    var num;
+	    var den;
+	    
+	    var group;
+	    
+	    group = this._addMetaGroup(name, description);
+	
+	    for (var i = 0; i < num_fields; i++) {
+		/* parse the field */
+		tag_base = base + ifd_offset + 2 + (i * 12);
+		tag_field = JpegMeta.parseNum(endian, _binary_data, tag_base, 2);
+		type_field = JpegMeta.parseNum(endian, _binary_data, tag_base + 2, 2);
+		num_values = JpegMeta.parseNum(endian, _binary_data, tag_base + 4, 4);
+		value_offset = JpegMeta.parseNum(endian, _binary_data, tag_base + 8, 4);
+		if (this._types[type_field] === undefined) {
+		    continue;
+		}
+		type = this._types[type_field][0];
+		type_size = this._types[type_field][1];
+		
+		if (type_size * num_values <= 4) {
+		    /* Data is in-line */
+		    value_offset = tag_base + 8;
+		} else {
+		    value_offset = base + value_offset;
+		}
+		
+		/* Read the value */
+		if (type == "UNDEFINED") {
+		    value = _binary_data.slice(value_offset, value_offset + num_values);
+		} else if (type == "ASCII") {
+		    value = _binary_data.slice(value_offset, value_offset + num_values);
+		    value = value.split('\x00')[0];
+		    /* strip trail nul */
+		} else {
+		    value = new Array();
+		    for (j = 0; j < num_values; j++, value_offset += type_size) {
+			if (type == "BYTE" || type == "SHORT" || type == "LONG") {
+			    value.push(JpegMeta.parseNum(endian, _binary_data, value_offset, type_size));
+			}
+			if (type == "SBYTE" || type == "SSHORT" || type == "SLONG") {
+			    value.push(JpegMeta.parseSnum(endian, _binary_data, value_offset, type_size));
+			}
+			if (type == "RATIONAL") {
+			    num = JpegMeta.parseNum(endian, _binary_data, value_offset, 4);
+			    den = JpegMeta.parseNum(endian, _binary_data, value_offset + 4, 4);
+			    value.push(new JpegMeta.Rational(num, den));
+			}
+			if (type == "SRATIONAL") {
+			    num = JpegMeta.parseSnum(endian, _binary_data, value_offset, 4);
+			    den = JpegMeta.parseSnum(endian, _binary_data, value_offset + 4, 4);
+			    value.push(new JpegMeta.Rational(num, den));
+			}
+			value.push();
+		    }
+		    if (num_values === 1) {
+			value = value[0];
+		    }
+		}
+		if (tags[tag_field] !== undefined) {
+			group._addProperty(tags[tag_field][1], tags[tag_field][0], value);
+		}
+	    }
+	};
+
+	this.JpegMeta.JpegFile.prototype._jfifHandler = function _jfifHandler(mark, pos) {
+	    if (this.jfif !== undefined) {
+		throw Error("Multiple JFIF segments found");
+	    }
+	    this._addMetaGroup("jfif", "JFIF");
+	    this.jfif._addProperty("version_major", "Version Major", this._binary_data.charCodeAt(pos + 5));
+	    this.jfif._addProperty("version_minor", "Version Minor", this._binary_data.charCodeAt(pos + 6));
+	    this.jfif._addProperty("version", "JFIF Version", this.jfif.version_major.value + "." + this.jfif.version_minor.value);
+	    this.jfif._addProperty("units", "Density Unit", this._binary_data.charCodeAt(pos + 7));
+	    this.jfif._addProperty("Xdensity", "X density", JpegMeta.parseNum(">", this._binary_data, pos + 8, 2));
+	    this.jfif._addProperty("Ydensity", "Y Density", JpegMeta.parseNum(">", this._binary_data, pos + 10, 2));
+	    this.jfif._addProperty("Xthumbnail", "X Thumbnail", JpegMeta.parseNum(">", this._binary_data, pos + 12, 1));
+	    this.jfif._addProperty("Ythumbnail", "Y Thumbnail", JpegMeta.parseNum(">", this._binary_data, pos + 13, 1));
+	};
+
+	/* Handle app0 segments */
+	this.JpegMeta.JpegFile.prototype._app0Handler = function app0Handler(mark, pos) {
+	    var ident = this._binary_data.slice(pos, pos + 5);
+	    if (ident == this._JFIF_IDENT) {
+		this._jfifHandler(mark, pos);
+	    } else if (ident == this._JFXX_IDENT) {
+		/* Don't handle JFXX Ident yet */
+	    } else {
+		/* Don't know about other idents */
+	    }
+	};
+
+	/* Handle app1 segments */
+	this.JpegMeta.JpegFile.prototype._app1Handler = function _app1Handler(mark, pos) {
+	    var ident = this._binary_data.slice(pos, pos + 5);
+	    if (ident == this._EXIF_IDENT) {
+		this._exifHandler(mark, pos + 6);
+	    } else {
+		/* Don't know about other idents */
+	    }
+	};
+
+	/* Handle exif segments */
+	JpegMeta.JpegFile.prototype._exifHandler = function _exifHandler(mark, pos) {
+	    if (this.exif !== undefined) {
+		throw new Error("Multiple JFIF segments found");
+	    }
+	    
+	    /* Parse this TIFF header */
+	    var endian;
+	    var magic_field;
+	    var ifd_offset;
+	    var primary_ifd, exif_ifd, gps_ifd;
+	    var endian_field = this._binary_data.slice(pos, pos + 2);
+	    
+	    /* Trivia: This 'I' is for Intel, the 'M' is for Motorola */
+	    if (endian_field === "II") {
+		endian = "<";
+	    } else if (endian_field === "MM") {
+		endian = ">";
+	    } else {
+		throw new Error("Malformed TIFF meta-data. Unknown endianess: " + endian_field);
+	    }
+	    
+	    magic_field = JpegMeta.parseNum(endian, this._binary_data, pos + 2, 2);
+	    
+	    if (magic_field !== 42) {
+		throw new Error("Malformed TIFF meta-data. Bad magic: " + magic_field);
+	    }
+	    
+	    ifd_offset = JpegMeta.parseNum(endian, this._binary_data, pos + 4, 4);
+	    
+	    /* Parse 0th IFD */
+	    this._parseIfd(endian, this._binary_data, pos, ifd_offset, this._tifftags, "tiff", "TIFF");
+	    
+	    if (this.tiff.ExifIfdPointer) {
+		this._parseIfd(endian, this._binary_data, pos, this.tiff.ExifIfdPointer.value, this._exiftags, "exif", "Exif");
+	    }
+	    
+	    if (this.tiff.GPSInfoIfdPointer) {
+		this._parseIfd(endian, this._binary_data, pos, this.tiff.GPSInfoIfdPointer.value, this._gpstags, "gps", "GPS");
+		if (this.gps.GPSLatitude) {
+		    var latitude;
+		    latitude = this.gps.GPSLatitude.value[0].asFloat() + 
+			(1 / 60) * this.gps.GPSLatitude.value[1].asFloat() + 
+			(1 / 3600) * this.gps.GPSLatitude.value[2].asFloat();
+		    if (this.gps.GPSLatitudeRef.value === "S") {
+			latitude = -latitude;
+		    }
+		    this.gps._addProperty("latitude", "Dec. Latitude", latitude);
+		}
+		if (this.gps.GPSLongitude) {
+		    var longitude;
+		    longitude = this.gps.GPSLongitude.value[0].asFloat() + 
+			(1 / 60) * this.gps.GPSLongitude.value[1].asFloat() + 
+			(1 / 3600) * this.gps.GPSLongitude.value[2].asFloat();
+		    if (this.gps.GPSLongitudeRef.value === "W") {
+			longitude = -longitude;
+		    }
+		    this.gps._addProperty("longitude", "Dec. Longitude", longitude);
+		}
+	    }
+	};
+	
+	/* JsJpegMeta ends here */
+
+	mw.libs.jpegmeta = function( fileReaderResult, fileName ) {
+		return new JpegMeta.JpegFile( fileReaderResult, fileName );
+	};
+
+} )( jQuery );
diff --git a/resources/mediawiki.page/images/AJAXCategorySprite.png b/resources/mediawiki.page/images/AJAXCategorySprite.png
new file mode 100644
index 00000000..d5f9cf48
--- /dev/null
+++ b/resources/mediawiki.page/images/AJAXCategorySprite.png
diff --git a/resources/mediawiki.page/mediawiki.page.ajaxCategories.css b/resources/mediawiki.page/mediawiki.page.ajaxCategories.css
new file mode 100644
index 00000000..dd991aaf
--- /dev/null
+++ b/resources/mediawiki.page/mediawiki.page.ajaxCategories.css
@@ -0,0 +1,64 @@
+.mw-addcategory-prompt {
+	display: inline;
+}
+
+.mw-addcategory-prompt input {
+	margin-left: 0.5em;
+	margin-right: 0.5em;
+}
+
+.mw-remove-category {
+	padding: 2px 8px;
+	display:inline;
+}
+.mw-removed-category {
+	text-decoration: line-through;
+}
+#catlinks:hover .icon {
+	opacity: 1;
+}
+
+.mw-ajax-addcategory {
+	padding-left: 30px;
+	margin-right: 1em;
+	cursor: pointer;
+}
+#catlinks .icon {
+	cursor: pointer;
+	padding: 1px 8px;
+	margin: 0;
+	background: url('images/AJAXCategorySprite.png') 0 0 no-repeat;
+	opacity: 0.5;
+}
+#catlinks .icon-parent {
+	cursor: pointer;
+}
+#catlinks .icon-parent:hover .icon {
+	background-position-y: -16px;
+}
+#catlinks .no-text {
+}
+#catlinks .icon-close {
+	background-position: 0 0;
+}
+#catlinks .icon-edit {
+	background-position: -16px 0;
+}
+#catlinks .icon-tick {
+	background-position: -32px 0;
+}
+#catlinks .icon-add {
+	background-position: -64px 0;
+}
+#catlinks .icon-close:hover {
+	background-position: 0 -16px;
+}
+#catlinks .icon-edit:hover {
+	background-position: -16px -16px;
+}
+#catlinks .icon-tick:hover {
+	background-position: -32px -16px;
+}
+#catlinks .icon-add:hover {
+	background-position: -64px -16px;
+}
\ No newline at end of file
diff --git a/resources/mediawiki.page/mediawiki.page.ready.js b/resources/mediawiki.page/mediawiki.page.ready.js
new file mode 100644
index 00000000..eba5db11
--- /dev/null
+++ b/resources/mediawiki.page/mediawiki.page.ready.js
@@ -0,0 +1,24 @@
+jQuery( document ).ready( function( $ ) {
+
+	/* Emulate placeholder if not supported by browser */
+	if ( !( 'placeholder' in document.createElement( 'input' ) ) ) {
+		$( 'input[placeholder]' ).placeholder();
+	}
+
+	/* Enable makeCollapse */
+	$( '.mw-collapsible' ).makeCollapsible();
+
+	/* Lazy load jquery.tablesorter */
+	if ( $( 'table.sortable' ).length ) {
+		mw.loader.using( 'jquery.tablesorter', function() {
+			$( 'table.sortable' ).tablesorter();
+		});
+	}
+
+	/* Enable CheckboxShiftClick */
+	$( 'input[type=checkbox]:not(.noshiftselect)' ).checkboxShiftClick();
+
+	/* Add accesskey hints to the tooltips */
+	mw.util.updateTooltipAccessKeys();
+
+} );
diff --git a/resources/mediawiki.page/mediawiki.page.startup.js b/resources/mediawiki.page/mediawiki.page.startup.js
new file mode 100644
index 00000000..8af2fad9
--- /dev/null
+++ b/resources/mediawiki.page/mediawiki.page.startup.js
@@ -0,0 +1,10 @@
+( function( $ ) {
+
+	/* Client profile classes for <html> */
+	/* Allows for easy hiding/showing of JS or no-JS-specific UI elements */
+
+	$( 'html' )
+		.addClass('client-js' )
+		.removeClass( 'client-nojs' );
+
+} )( jQuery );
diff --git a/resources/mediawiki.special/mediawiki.special.block.js b/resources/mediawiki.special/mediawiki.special.block.js
new file mode 100644
index 00000000..6f79929b
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.block.js
@@ -0,0 +1,46 @@
+/* JavaScript for Special:Block */
+
+jQuery( function( $ ) {
+
+	var	DO_INSTANT = true,
+		$blockTarget = $( '#mw-bi-target' ),
+		$anonOnlyRow = $( '#mw-input-wpHardBlock' ).closest( 'tr' ),
+		$enableAutoblockRow = $( '#mw-input-wpAutoBlock' ).closest( 'tr' ),
+		$hideUser = $( '#mw-input-wpHideUser' ).closest( 'tr' ),
+		$watchUser = $( '#mw-input-wpWatch' ).closest( 'tr' );
+
+	var updateBlockOptions = function( instant ) {
+		if ( !$blockTarget.length ) {
+			return;
+		}
+
+		var blocktarget = $.trim( $blockTarget.val() );
+		var isEmpty = ( blocktarget === '' );
+		var isIp = mw.util.isIPv4Address( blocktarget, true ) || mw.util.isIPv6Address( blocktarget, true );
+		var isIpRange = isIp && blocktarget.match( /\/\d+$/ );
+
+		if ( isIp && !isEmpty ) {
+			$enableAutoblockRow.goOut( instant );
+			$hideUser.goOut( instant );
+		} else {
+			$enableAutoblockRow.goIn( instant );
+			$hideUser.goIn( instant );
+		}
+		if ( !isIp && !isEmpty ) {
+			$anonOnlyRow.goOut( instant );
+		} else {
+			$anonOnlyRow.goIn( instant );
+		}
+		if ( isIpRange && !isEmpty ) {
+			$watchUser.goOut( instant );
+		} else {
+			$watchUser.goIn( instant );
+		}
+	};
+
+	// Bind functions so they're checked whenever stuff changes
+	$blockTarget.keyup( updateBlockOptions );
+
+	// Call them now to set initial state (ie. Special:Block/Foobar?wpBlockExpiry=2+hours)
+	updateBlockOptions( DO_INSTANT );
+});
diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.css b/resources/mediawiki.special/mediawiki.special.changeslist.css
new file mode 100644
index 00000000..cb4d2156
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.css
@@ -0,0 +1,47 @@
+/**
+ * Styling for Special:Watchlist and Special:RecentChanges
+ */
+
+table.mw-enhanced-rc {
+	border: 0;
+	border-spacing: 0;
+}
+
+table.mw-enhanced-rc th, table.mw-enhanced-rc td {
+	padding: 0;
+	vertical-align: top;
+}
+
+td.mw-enhanced-rc {
+	white-space: nowrap;
+	font-family: monospace;
+}
+
+.mw-enhanced-rc-time {
+	font-family: monospace;
+}
+
+table.mw-enhanced-rc td.mw-enhanced-rc-nested {
+	padding-left: 1em;
+}
+
+/* Show/hide arrows in enhanced changeslist */
+.mw-enhanced-rc .collapsible-expander {
+	float: none;
+}
+
+/* If JS is disabled, the arrow is still needed
+   for spacing, but ideally shouldn't be shown */
+.mw-enhanced-rc .mw-rc-openarrow {
+	visibility: hidden;
+}
+
+.mw-enhanced-rc.mw-made-collapsible .mw-rc-openarrow,
+.mw-enhanced-rc .mw-rc-closearrow {
+	visibility: visible;
+	display: none;
+}
+.mw-enhanced-rc.mw-made-collapsible .mw-collapsible-toggle-collapsed .mw-rc-openarrow,
+.mw-enhanced-rc.mw-made-collapsible .mw-collapsible-toggle-expanded .mw-rc-closearrow {
+	display: inline;
+}
diff --git a/resources/mediawiki.special/mediawiki.special.css b/resources/mediawiki.special/mediawiki.special.css
new file mode 100644
index 00000000..3cd97397
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.css
@@ -0,0 +1,274 @@
+
+/**** Special:AllMessages ****/
+#mw-allmessagestable .allmessages-customised td.am_default {
+	background-color: #fcffc4;
+}
+
+#mw-allmessagestable tr.allmessages-customised:hover td.am_default {
+	background-color: #faff90;
+}
+
+#mw-allmessagestable td.am_actual {
+	background-color: #e2ffe2;
+}
+
+#mw-allmessagestable tr.allmessages-customised:hover + tr.allmessages-customised td.am_actual {
+	background-color: #b1ffb1;
+}
+
+/**** Special:Allpages ****/
+table.mw-allpages-table-form, table.mw-allpages-table-chunk {
+	width: 100%;
+}
+td.mw-allpages-alphaindexline {
+	text-align: right;
+}
+.mw-allpages-nav {
+	text-align: right;
+	margin-bottom: 1em;
+}
+table.mw-allpages-table-form tr {
+	vertical-align: top;
+}
+
+/**** Special:Block ****/
+tr.mw-block-hideuser {
+	font-weight: bold;
+}
+
+/**** Special:BlockList ****/
+table.mw-blocklist span.mw-usertoollinks,
+span.mw-blocklist-actions{
+	white-space: nowrap;
+	font-size: 90%;
+}
+
+/**** Special:Contributions ****/
+.mw-uctop {
+	font-weight: bold;
+}
+
+/**** Special:EmailUser ****/
+table.mw-emailuser-table {
+	width: 98%;
+}
+td#mw-emailuser-sender,
+td#mw-emailuser-recipient {
+	font-weight: bold;
+}
+
+/**** Special:ListGroupRights ****/
+table.mw-listgrouprights-table tr {
+	vertical-align: top;
+}
+.listgrouprights-revoked {
+	text-decoration: line-through;
+}
+
+/**** Special:Prefixindex ****/
+table#mw-prefixindex-list-table,
+table#mw-prefixindex-nav-table {
+	width: 98%;
+}
+td#mw-prefixindex-nav-form {
+	margin-bottom: 1em;
+	vertical-align: top;
+}
+.mw-prefixindex-nav {
+	text-align: right;
+}
+
+
+/**** Special:Search ****/
+.searchresults {
+}
+
+.searchresults p {
+	margin-left: 0.4em;
+	margin-top: 1em;
+	margin-bottom: 1.2em;
+}
+div.searchresult {
+	font-size: 95%;
+	width: 38em;
+}
+.mw-search-results {
+	margin-left: 0.4em;
+}
+.mw-search-results li {
+	padding-bottom: 1em;
+	list-style: none;
+	list-style-image: none;
+}
+.mw-search-results li a {
+	font-size: 108%;
+}
+.mw-search-result-data {
+	color: green;
+	font-size: 97%;
+}
+.mw-search-formheader {
+	background-color: #f3f3f3;
+	margin-top: 1em;
+	border: 1px solid silver;
+}
+.mw-search-formheader div.search-types {
+	float: left;
+	padding-left: 0.25em;
+}
+.mw-search-formheader div.search-types ul {
+	margin: 0 !important;
+	padding: 0 !important;
+	list-style: none !important;
+}
+.mw-search-formheader div.search-types ul li {
+	float: left;
+	margin: 0;
+	padding: 0;
+}
+.mw-search-formheader div.search-types ul li a {
+	display: block;
+	padding: 0.5em;
+}
+.mw-search-formheader div.search-types ul li.current a {
+	color: #333333;
+	cursor: default;
+}
+.mw-search-formheader div.search-types ul li.current a:hover {
+	text-decoration: none;
+}
+.mw-search-formheader div.results-info {
+	float: right;
+	padding: 0.5em;
+	padding-right: 0.75em;
+}
+.mw-search-formheader div.results-info ul {
+	margin: 0 !important;
+	padding: 0 !important;
+	list-style: none !important;
+}
+.mw-search-formheader div.results-info ul li {
+	float: right;
+	margin: 0;
+	padding: 0;
+}
+fieldset#mw-searchoptions {
+	margin: 0;
+	padding: 0.5em 0.75em 0.75em 0.75em !important;
+	border: none;
+	background-color: #f9f9f9;
+	border: 1px solid silver !important;
+	border-top-width: 0 !important;
+}
+fieldset#mw-searchoptions legend {
+	display: none;
+}
+fieldset#mw-searchoptions h4 {
+	padding: 0;
+	margin: 0;
+	float: left;
+}
+fieldset#mw-searchoptions div#mw-search-togglebox {
+	float: right;
+}
+fieldset#mw-searchoptions div#mw-search-togglebox label {
+	margin-right: 0.25em;
+}
+fieldset#mw-searchoptions div#mw-search-togglebox input {
+	margin-left: 0.25em;
+}
+fieldset#mw-searchoptions table {
+	float: left;
+	margin-right: 3em;
+}
+fieldset#mw-searchoptions table td {
+	padding-right: 1em;
+}
+fieldset#mw-searchoptions div.divider {
+	clear: both;
+	border-bottom: 1px solid #DDDDDD;
+	padding-top: 0.5em;
+	margin-bottom: 0.5em;
+}
+td#mw-search-menu {
+	padding-left:6em;
+	font-size:85%;
+}
+div#mw-search-interwiki {
+	float: right;
+	width: 18em;
+	border: 1px solid #AAAAAA;
+	margin-top: 2ex;
+}
+div#mw-search-interwiki li {
+	font-size: 95%;
+}
+.mw-search-interwiki-more {
+	float: right;
+	font-size: 90%;
+}
+div#mw-search-interwiki-caption {
+	text-align: center;
+	font-weight: bold;
+	font-size: 95%;
+}
+.mw-search-interwiki-project {
+	font-size: 97%;
+	text-align: left;
+	padding: 0.15em 0.15em 0.2em 0.2em;
+	background-color: #ececec;
+	border-top: 1px solid #BBBBBB;
+}
+span.searchalttitle {
+	font-size: 95%;
+}
+div.searchdidyoumean {
+	font-size: 127%;
+	margin-top: 0.8em;
+	/* Note that this color won't affect the link, as desired. */
+	color: #c00;
+}
+div.searchdidyoumean em {
+	font-weight: bold;
+}
+.searchmatch {
+	font-weight: bold;
+}
+/* Advanced PowerSearch box */
+td#mw-search-togglebox {
+	text-align: right;
+}
+table#mw-search-powertable {
+	width: 100%;
+}
+form#powersearch {
+	clear: both;
+}
+
+/**** Special:Specialpages ****/
+.mw-specialpagerestricted {
+	font-weight: bold;
+}
+
+.mw-specialpages-table {
+	margin-top: -1em;
+	margin-bottom: 1em;
+}
+
+.mw-specialpages-table td {
+	vertical-align: top;
+}
+
+/**** Special:Statistics ****/
+td.mw-statistics-numbers {
+	text-align: right;
+}
+
+/**** Special:UserRights ****/
+.mw-userrights-disabled {
+	color: #888;
+}
+table.mw-userrights-groups * td,
+table.mw-userrights-groups * th {
+	padding-right: 1.5em;
+}
diff --git a/resources/mediawiki.special/mediawiki.special.js b/resources/mediawiki.special/mediawiki.special.js
new file mode 100644
index 00000000..3526cef4
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.js
@@ -0,0 +1 @@
+mw.special = {};
diff --git a/resources/mediawiki.special/mediawiki.special.movePage.js b/resources/mediawiki.special/mediawiki.special.movePage.js
new file mode 100644
index 00000000..2f94cc06
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.movePage.js
@@ -0,0 +1,5 @@
+/* JavaScript for Special:MovePage */
+
+jQuery( function( $ ) {
+	$( '#wpReason' ).byteLimit();
+});
diff --git a/resources/mediawiki.special/mediawiki.special.preferences.js b/resources/mediawiki.special/mediawiki.special.preferences.js
index 1775bec4..2e07e7f1 100644
--- a/resources/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/mediawiki.special/mediawiki.special.preferences.js
@@ -2,44 +2,61 @@
  * JavaScript for Special:Preferences
  */
 ( function( $, mw ) {
-
 $( '#prefsubmit' ).attr( 'id', 'prefcontrol' );
-$( '#preferences' )
+var $preftoc = $('<ul id="preftoc"></ul>');
+var $preferences = $( '#preferences' )
 	.addClass( 'jsprefs' )
-	.before( $( '<ul id="preftoc"></ul>' ) )
-	.children( 'fieldset' )
-		.hide()
-		.addClass( 'prefsection' )
-		.children( 'legend' )
-			.addClass( 'mainLegend' )
-			.each( function( i ) {
-					$(this).parent().attr( 'id', 'prefsection-' + i );
-					if ( i === 0 ) {
-						$(this).parent().show();
-					}
-					$( '#preftoc' ).append(
-						$( '<li></li>' )
-							.addClass( i === 0 ? 'selected' : null )
-							.append(
-								$( '<a></a>')
-									.text( $(this).text() )
-									.attr( 'href', '#prefsection-' + i )
-									.mousedown( function( e ) {
-										$(this).parent().parent().find( 'li' ).removeClass( 'selected' );
-										$(this).parent().addClass( 'selected' );
-										e.preventDefault();
-										return false;
-									} )
-									.click( function( e ) {
-										$( '#preferences > fieldset' ).hide();
-										$( '#prefsection-' + i ).show();
-										e.preventDefault();
-										return false;
-									} )
-							)
-					);
-				}
-			);
+	.before( $preftoc );
+
+var $fieldsets = $preferences.children( 'fieldset' )
+	.hide()
+	.addClass( 'prefsection' );
+
+var $legends = $fieldsets.children( 'legend' )
+	.addClass( 'mainLegend' );
+
+// Populate the prefToc
+$legends.each( function( i, legend ) {
+	var $legend = $(legend);
+	if ( i === 0 ) {
+		$legend.parent().show();
+	}
+	var ident = $legend.parent().attr( 'id' );
+	
+	var $li = $( '<li/>', {
+		'class' : ( i === 0 ) ? 'selected' : null
+	});
+	var $a = $( '<a/>', {
+		text : $legend.text(),
+		id : ident.replace( 'mw-prefsection', 'preftab' ),
+		href : '#' + ident
+	}).click( function( e ) {
+		e.preventDefault();
+		// Handle hash manually to prevent jumping
+		// Therefore save and restore scrollTop to prevent jumping
+		var scrollTop = $(window).scrollTop();
+		window.location.hash = $(this).attr('href');
+		$(window).scrollTop(scrollTop);
+		
+		$preftoc.find( 'li' ).removeClass( 'selected' );
+		$(this).parent().addClass( 'selected' );
+		$( '#preferences > fieldset' ).hide();
+		$( '#' + ident ).show();
+	});
+	$li.append( $a );
+	$preftoc.append( $li );
+} );
+
+// If we've reloaded the page or followed an open-in-new-window,
+// make the selected tab visible.
+// On document ready:
+$( function() {
+	var hash = window.location.hash;
+	if( hash.match( /^#mw-prefsection-[\w-]+/ ) ) {
+		var $tab = $( hash.replace( 'mw-prefsection', 'preftab' ) );
+		$tab.click();
+	}
+} );
 
 /**
  * Given an email validity status (true, false, null) update the label CSS class
@@ -74,4 +91,85 @@ $( '#mw-input-wpemailaddress' ).one( 'blur', function() {
 		updateMailValidityLabel( $(this).val() );
 	} );
 } );
-} )( jQuery, mediaWiki );
\ No newline at end of file
+
+
+
+/**
+* Timezone functions.
+* Guesses Timezone from browser and updates fields onchange
+*/
+
+var $tzSelect = $( '#mw-input-wptimecorrection' );
+var $tzTextbox = $( '#mw-input-wptimecorrection-other' );
+
+var $localtimeHolder = $( '#wpLocalTime' );
+var servertime = parseInt( $( 'input[name=wpServerTime]' ).val(), 10 );
+var minuteDiff = 0;
+
+var minutesToHours = function( min ) {
+	var tzHour = Math.floor( Math.abs( min ) / 60 );
+	var tzMin = Math.abs( min ) % 60;
+	var tzString = ( ( min >= 0 ) ? '' : '-' ) + ( ( tzHour < 10 ) ? '0' : '' ) + tzHour +
+		':' + ( ( tzMin < 10 ) ? '0' : '' ) + tzMin;
+	return tzString;
+};
+
+var hoursToMinutes = function( hour ) {
+	var arr = hour.split( ':' );
+	arr[0] = parseInt( arr[0], 10 );
+
+	var minutes;
+	if ( arr.length == 1 ) {
+		// Specification is of the form [-]XX
+		minutes = arr[0] * 60;
+	} else {
+		// Specification is of the form [-]XX:XX
+		minutes = Math.abs( arr[0] ) * 60 + parseInt( arr[1], 10 );
+		if ( arr[0] < 0 ) {
+			minutes *= -1;
+		}
+	}
+	// Gracefully handle non-numbers.
+	if ( isNaN( minutes ) ) {
+		return 0;
+	} else {
+		return minutes;
+	}
+};
+
+var updateTimezoneSelection = function() {
+	var type = $tzSelect.val();
+	if ( type == 'guess' ) {
+		// Get browser timezone & fill it in
+		minuteDiff = -new Date().getTimezoneOffset();
+		$tzTextbox.val( minutesToHours( minuteDiff ) );
+		$tzSelect.val( 'other' );
+		$tzTextbox.get( 0 ).disabled = false;
+	} else if ( type == 'other'  ) {
+		// Grab data from the textbox, parse it.
+		minuteDiff = hoursToMinutes( $tzTextbox.val() );
+	} else {
+		// Grab data from the $tzSelect value
+		minuteDiff = parseInt( type.split( '|' )[1], 10 ) || 0;
+		$tzTextbox.val( minutesToHours( minuteDiff ) );
+	}
+
+	// Determine local time from server time and minutes difference, for display.
+	var localTime = servertime + minuteDiff;
+
+	// Bring time within the [0,1440) range.
+	while ( localTime < 0 ) {
+		localTime += 1440;
+	}
+	while ( localTime >= 1440 ) {
+		localTime -= 1440;
+	}
+	$localtimeHolder.text( minutesToHours( localTime ) );
+};
+
+if ( $tzSelect.length && $tzTextbox.length ) {
+	$tzSelect.change( function() { updateTimezoneSelection(); } );
+	$tzTextbox.blur( function() { updateTimezoneSelection(); } );
+	updateTimezoneSelection();
+}
+} )( jQuery, mediaWiki );
diff --git a/resources/mediawiki.special/mediawiki.special.recentchanges.js b/resources/mediawiki.special/mediawiki.special.recentchanges.js
new file mode 100644
index 00000000..7e284fbd
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.recentchanges.js
@@ -0,0 +1,39 @@
+/* JavaScript for Special:RecentChanges */
+( function( $ ) {
+
+	var checkboxes = [ 'nsassociated', 'nsinvert' ];
+
+	/**
+	 * @var select {jQuery}
+	 */
+	var $select = null;
+
+	var rc = mw.special.recentchanges = {
+	
+		/**
+		 * Handler to disable/enable the namespace selector checkboxes when the
+		 * special 'all' namespace is selected/unselected respectively.
+		 */
+	 	updateCheckboxes: function() {
+			// The option element for the 'all' namespace has an empty value
+			var isAllNS = ('' === $select.find('option:selected').val() );
+
+			// Iterates over checkboxes and propagate the selected option
+			$.each( checkboxes, function( i, id ) {
+				$( '#' + id ).attr( 'disabled', isAllNS );
+			});
+		},
+
+		init: function() {
+			// Populate
+	 		$select = $( '#namespace' );
+
+			// Bind to change event, and trigger once to set the initial state of the checkboxes.
+			$select.change( rc.updateCheckboxes ).change();
+		}
+	};
+
+	// Run when document is ready
+	$( rc.init );
+
+})( jQuery );
diff --git a/resources/mediawiki.special/mediawiki.special.search.css b/resources/mediawiki.special/mediawiki.special.search.css
new file mode 100644
index 00000000..89d55b0b
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.search.css
@@ -0,0 +1,14 @@
+/**
+ * Fixes sister projects box moving down the extract 
+ * of the first result (bug #16886).
+ * It only happens when the window is small and 
+ * This changes slightly the layout for big screens 
+ * where there was space for the extracts and the 
+ * sister projects and thus it showed like in any 
+ * other browser.
+ *
+ * This will only affect IE 7 and lower
+ */
+.searchresult {
+	display: inline !ie;
+}
diff --git a/resources/mediawiki.special/mediawiki.special.search.js b/resources/mediawiki.special/mediawiki.special.search.js
index d4317188..bac27fc6 100644
--- a/resources/mediawiki.special/mediawiki.special.search.js
+++ b/resources/mediawiki.special/mediawiki.special.search.js
@@ -1,11 +1,37 @@
 /*
- * JavaScript for Specical:Search
+ * JavaScript for Special:Search
  */
-( function( $, mw ) {
+jQuery( function( $ ) {
 
 // Emulate HTML5 autofocus behavior in non HTML5 compliant browsers
 if ( !( 'autofocus' in document.createElement( 'input' ) ) ) {
 	$( 'input[autofocus]:first' ).focus();
 }
 
-} )( jQuery, mediaWiki );
\ No newline at end of file
+// Bind check all/none button
+var $checkboxes = $('#powersearch input[id^=mw-search-ns]');
+$('#mw-search-toggleall').click( function() {
+	$checkboxes.prop("checked", true);
+} );
+$('#mw-search-togglenone').click( function() {
+	$checkboxes.prop("checked", false);
+} );
+
+// Change the header search links to what user entered
+var headerLinks = $('.search-types a');
+$('#searchText, #powerSearchText').change(function() {
+	var searchterm = $(this).val();
+	headerLinks.each( function() {
+		var parts = this.href.split( 'search=' );
+		var lastpart = '';
+		var prefix = 'search=';
+		if( parts.length > 1 && parts[1].indexOf('&') >= 0 ) {
+			lastpart = parts[1].substring( parts[1].indexOf('&') );
+		} else {
+			prefix = '&search=';
+		}
+		this.href = parts[0] + prefix + encodeURIComponent( searchterm ) + lastpart;
+	});
+}).trigger('change');
+
+} );
\ No newline at end of file
diff --git a/resources/mediawiki.special/mediawiki.special.undelete.js b/resources/mediawiki.special/mediawiki.special.undelete.js
new file mode 100644
index 00000000..33b80275
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.undelete.js
@@ -0,0 +1,10 @@
+/*
+ * JavaScript for Specical:Undelete
+ */
+jQuery( document ).ready( function( $ ) {
+	$( '#mw-undelete-invert' ).click( function( e ) {
+		e.preventDefault();
+		$( '#undelete' ).find( 'input:checkbox' )
+			.prop( 'checked', function( i, val ) { return !val; } );
+	} );
+} );
diff --git a/resources/mediawiki.special/mediawiki.special.upload.js b/resources/mediawiki.special/mediawiki.special.upload.js
new file mode 100644
index 00000000..4a8622f5
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.upload.js
@@ -0,0 +1,272 @@
+/*
+ * JavaScript for Special:Upload
+ * Note that additional code still lives in skins/common/upload.js
+ */
+
+/**
+ * Add a preview to the upload form
+ */
+jQuery( function( $ ) {
+	/**
+	 * Is the FileAPI available with sufficient functionality?
+	 */
+	function hasFileAPI(){
+		return typeof window.FileReader !== 'undefined';
+	}
+
+	/**
+	 * Check if this is a recognizable image type...
+	 * Also excludes files over 10M to avoid going insane on memory usage.
+	 *
+	 * @todo is there a way we can ask the browser what's supported in <img>s?
+	 * @todo put SVG back after working around Firefox 7 bug <https://bugzilla.wikimedia.org/show_bug.cgi?id=31643>
+	 *
+	 * @param {File} file
+	 * @return boolean
+	 */
+	function fileIsPreviewable( file ) {
+		var	known = ['image/png', 'image/gif', 'image/jpeg'],
+			tooHuge = 10 * 1024 * 1024;
+		return ( $.inArray( file.type, known ) !== -1 ) && file.size > 0 && file.size < tooHuge;
+	}
+
+	/**
+	 * Show a thumbnail preview of PNG, JPEG, GIF, and SVG files prior to upload
+	 * in browsers supporting HTML5 FileAPI.
+	 *
+	 * As of this writing, known good:
+	 * - Firefox 3.6+
+	 * - Chrome 7.something
+	 *
+	 * @todo check file size limits and warn of likely failures
+	 *
+	 * @param {File} file
+	 */
+	function showPreview( file ) {
+		var	previewSize = 180,
+			thumb = $( '<div id="mw-upload-thumbnail" class="thumb tright">' +
+						'<div class="thumbinner">' +
+							'<canvas width="' + previewSize + '" height="' + previewSize + '" ></canvas>' +
+							'<div class="thumbcaption"><div class="filename"></div><div class="fileinfo"></div></div>' +
+						'</div>' +
+					'</div>' );
+		thumb.find( '.filename' ).text( file.name ).end()
+			.find( '.fileinfo' ).text( prettySize( file.size ) ).end();
+		
+		var	ctx = thumb.find( 'canvas' )[0].getContext( '2d' ),
+			spinner = new Image();
+		spinner.onload = function() { 
+			ctx.drawImage( spinner, (previewSize - spinner.width) / 2, 
+					(previewSize - spinner.height) / 2 ); 
+		};
+		spinner.src = mw.config.get( 'wgScriptPath' ) + '/skins/common/images/spinner.gif';
+		$( '#mw-htmlform-source' ).parent().prepend( thumb );
+
+		var meta;
+		fetchPreview( file, function( dataURL ) {
+			var	img = new Image(),
+				rotation = 0;
+			
+			if ( meta && meta.tiff && meta.tiff.Orientation ) {
+				rotation = (360 - function () {
+					// See includes/media/Bitmap.php
+					switch ( meta.tiff.Orientation.value ) {
+						case 8:
+							return 90;
+						case 3:
+							return 180;
+						case 6:
+							return 270;
+						default:
+							return 0;
+					}
+				}() ) % 360;
+			}
+			
+			img.onload = function() {
+				var width, height, x, y, dx, dy, logicalWidth, logicalHeight;
+				// Fit the image within the previewSizexpreviewSize box
+				if ( img.width > img.height ) {
+					width = previewSize;
+					height = img.height / img.width * previewSize;
+				} else {
+					height = previewSize;
+					width = img.width / img.height * previewSize;
+				}
+				// Determine the offset required to center the image
+				dx = (180 - width) / 2;
+				dy = (180 - height) / 2;
+				switch ( rotation ) {
+					// If a rotation is applied, the direction of the axis
+					// changes as well. You can derive the values below by 
+					// drawing on paper an axis system, rotate it and see
+					// where the positive axis direction is
+					case 0:
+						x = dx;
+						y = dy;
+						logicalWidth = img.width;
+						logicalHeight = img.height;
+						break;
+					case 90:
+						
+						x = dx;
+						y = dy - previewSize;
+						logicalWidth = img.height;
+						logicalHeight = img.width;
+						break;
+					case 180:
+						x = dx - previewSize;
+						y = dy - previewSize;
+						logicalWidth = img.width;
+						logicalHeight = img.height;
+						break;
+					case 270:
+						x = dx - previewSize;
+						y = dy;
+						logicalWidth = img.height;
+						logicalHeight = img.width;
+						break;
+				}
+				
+				ctx.clearRect( 0, 0, 180, 180 );
+				ctx.rotate( rotation / 180 * Math.PI );
+				ctx.drawImage( img, x, y, width, height );
+				
+				// Image size
+				var info = mw.msg( 'widthheight', logicalWidth, logicalHeight ) +
+					', ' + prettySize( file.size );
+				$( '#mw-upload-thumbnail .fileinfo' ).text( info );
+			};
+			img.src = dataURL;
+		}, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) {
+			try {
+				meta = mw.libs.jpegmeta( data, file.fileName );
+				meta._binary_data = null;
+			} catch ( e ) {
+				meta = null;
+			}
+		} : null );
+	}
+
+	/**
+	 * Start loading a file into memory; when complete, pass it as a
+	 * data URL to the callback function. If the callbackBinary is set it will
+	 * first be read as binary and afterwards as data URL. Useful if you want
+	 * to do preprocessing on the binary data first.
+	 *
+	 * @param {File} file
+	 * @param {function} callback
+	 * @param {function} callbackBinary
+	 */
+	function fetchPreview( file, callback, callbackBinary ) {
+		var reader = new FileReader();
+		reader.onload = function() {
+			if ( callbackBinary ) {
+				callbackBinary( reader.result );
+				reader.onload = function() {
+					callback( reader.result );
+				};
+				reader.readAsDataURL( file );
+			} else {
+				callback( reader.result );
+			}
+		};
+		if ( callbackBinary ) {
+			reader.readAsBinaryString( file );
+		} else {
+			reader.readAsDataURL( file );
+		}
+	}
+
+	/**
+	 * Format a file size attractively.
+	 * @todo match numeric formatting
+	 *
+	 * @param {number} s
+	 * @return string
+	 */
+	function prettySize( s ) {
+		var sizes = ['size-bytes', 'size-kilobytes', 'size-megabytes', 'size-gigabytes'];
+		while ( s >= 1024 && sizes.length > 1 ) {
+			s /= 1024;
+			sizes = sizes.slice( 1 );
+		}
+		return mw.msg( sizes[0], Math.round( s ) );
+	}
+
+	/**
+	 * Clear the file upload preview area.
+	 */
+	function clearPreview() {
+		$( '#mw-upload-thumbnail' ).remove();
+	}
+	
+	/**
+	 * Check if the file does not exceed the maximum size
+	 */
+	function checkMaxUploadSize( file ) {
+		function getMaxUploadSize( type ) {
+			var sizes = mw.config.get( 'wgMaxUploadSize' );
+			if ( sizes[type] !== undefined ) {
+				return sizes[type];
+			}
+			return sizes['*'];
+		}
+		$( '.mw-upload-source-error' ).remove();
+		
+		var maxSize = getMaxUploadSize( 'file' ); 
+		if ( file.size > maxSize ) {
+			var error = $( '<p class="error mw-upload-source-error" id="wpSourceTypeFile-error">' + 
+					mw.message( 'largefileserver', file.size, maxSize ).escaped() + '</p>' );
+			$( '#wpUploadFile' ).after( error );
+			return false;
+		}
+		return true;
+	}
+	
+	
+	/**
+	 * Initialization
+	 */
+	if ( hasFileAPI() ) {
+		// Update thumbnail when the file selection control is updated.
+		$( '#wpUploadFile' ).change( function() {
+			clearPreview();
+			if ( this.files && this.files.length ) {
+				// Note: would need to be updated to handle multiple files.
+				var file = this.files[0];
+				
+				if ( !checkMaxUploadSize( file ) ) {
+					return;
+				}
+				
+				if ( fileIsPreviewable( file ) ) {
+					showPreview( file );
+				}
+			}
+		} );
+	}
+} );
+
+/**
+ * Disable all upload source fields except the selected one
+ */
+jQuery( function ( $ ) {
+	var rows = $( '.mw-htmlform-field-UploadSourceField' );
+	for ( var i = rows.length; i; i-- ) {
+		var row = rows[i - 1];
+		$( 'input[name="wpSourceType"]', row ).change( function () {
+			var currentRow = row; // Store current row in our own scope
+			return function () {
+				$( '.mw-upload-source-error' ).remove();
+				if ( this.checked ) {
+					// Disable all inputs
+					$( 'input[name!="wpSourceType"]', rows ).attr( 'disabled', true );
+					// Re-enable the current one
+					$( 'input', currentRow ).attr( 'disabled', false );
+				}
+			};
+		}() );
+	}
+} );
+
diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js
deleted file mode 100644
index 4258cb0c..00000000
--- a/resources/mediawiki.util/mediawiki.util.js
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Utilities
- */
-( function( $, mw ) {
-
-	mediaWiki.util = {
-
-		/* Initialisation */
-		'initialised' : false,
-		'init' : function () {
-			if ( this.initialised === false ) {
-				this.initialised = true;
-
-				// Any initialisation after the DOM is ready
-				$( function() {
-
-					// Shortcut
-					var profile = $.client.profile();
-
-					// Set tooltipAccessKeyPrefix
-
-					// Opera on any platform
-					if ( profile.name == 'opera' ) {
-						mw.util.tooltipAccessKeyPrefix = 'shift-esc-';
-
-					// Chrome on any platform
-					} else if ( profile.name == 'chrome' ) {
-						// Chrome on Mac or Chrome on other platform ?
-						mw.util.tooltipAccessKeyPrefix = ( profile.platform == 'mac'
-							? 'ctrl-option-' : 'alt-' );
-
-					// Non-Windows Safari with webkit_version > 526
-					} else if ( profile.platform !== 'win'
-						&& profile.name == 'safari'
-						&& profile.layoutVersion > 526 )
-					{
-						mw.util.tooltipAccessKeyPrefix = 'ctrl-alt-';
-
-					// Safari/Konqueror on any platform, or any browser on Mac
-					// (but not Safari on Windows)
-					} else if ( !( profile.platform == 'win' && profile.name == 'safari' )
-									&& ( profile.name == 'safari'
-									|| profile.platform == 'mac'
-									|| profile.name == 'konqueror' ) ) {
-						mw.util.tooltipAccessKeyPrefix = 'ctrl-';
-
-					// Firefox 2.x
-					} else if ( profile.name == 'firefox' && profile.versionBase == '2' ) {
-						mw.util.tooltipAccessKeyPrefix = 'alt-shift-';
-					}
-
-					// Enable CheckboxShiftClick
-					$('input[type=checkbox]:not(.noshiftselect)').checkboxShiftClick();
-
-					// Emulate placeholder if not supported by browser
-					if ( !( 'placeholder' in document.createElement( 'input' ) ) ) {
-						$('input[placeholder]').placeholder();
-					}
-
-					// Fill $content var
-					if ( $('#bodyContent').length ) {
-						mw.util.$content = $('#bodyContent');
-					} else if ( $('#article').length ) {
-						mw.util.$content = $('#article');
-					} else {
-						mw.util.$content = $('#content');
-					}
-				});
-
-				return true;
-			}
-			return false;
-		},
-
-		/* Main body */
-
-		/**
-		 * Encode the string like PHP's rawurlencode
-		 *
-		 * @param str String to be encoded
-		 */
-		'rawurlencode' : function( str ) {
-			str = (str + '').toString();
-			return encodeURIComponent( str )
-				.replace( /!/g, '%21' ).replace( /'/g, '%27' ).replace( /\(/g, '%28' )
-				.replace( /\)/g, '%29' ).replace( /\*/g, '%2A' ).replace( /~/g, '%7E' );
-		},
-
-		/**
-		 * Encode page titles for use in a URL
-		 * We want / and : to be included as literal characters in our title URLs
-		 * as they otherwise fatally break the title
-		 *
-		 * @param str String to be encoded
-		 */
-		'wikiUrlencode' : function( str ) {
-			return this.rawurlencode( str )
-				.replace( /%20/g, '_' ).replace( /%3A/g, ':' ).replace( /%2F/g, '/' );
-		},
-
-		/**
-		 * Append a new style block to the head
-		 *
-		 * @param text String CSS to be appended
-		 * @return the CSS stylesheet
-		 */
-		'addCSS' : function( text ) {
-			var s = document.createElement( 'style' );
-			s.type = 'text/css';
-			s.rel = 'stylesheet';
-			if ( s.styleSheet ) {
-				s.styleSheet.cssText = text; // IE
-			} else {
-				s.appendChild( document.createTextNode( text + '' ) ); // Safari sometimes borks on null
-			}
-			document.getElementsByTagName("head")[0].appendChild( s );
-			return s.sheet || s;
-		},
-
-		/**
-		 * Get the full URL to a page name
-		 *
-		 * @param str Page name to link to
-		 */
-		'wikiGetlink' : function( str ) {
-			return wgServer + wgArticlePath.replace( '$1', this.wikiUrlencode( str ) );
-		},
-
-		/**
-		 * Grab the URL parameter value for the given parameter.
-		 * Returns null if not found.
-		 *
-		 * @param param The parameter name
-		 * @param url URL to search through (optional)
-		 */
-		'getParamValue' : function( param, url ) {
-			url = url ? url : document.location.href;
-			// Get last match, stop at hash
-			var re = new RegExp( '[^#]*[&?]' + $.escapeRE( param ) + '=([^&#]*)' );
-			var m = re.exec( url );
-			if ( m && m.length > 1 ) {
-				// Beware that decodeURIComponent is not required to understand '+'
-				// by spec, as encodeURIComponent does not produce it.
-				return decodeURIComponent( m[1].replace( /\+/g, '%20' ) );
-			}
-			return null;
-		},
-
-		// Access key prefix.
-		// Will be re-defined based on browser/operating system detection in
-		// mw.util.init().
-		'tooltipAccessKeyPrefix' : 'alt-',
-
-		// Regex to match accesskey tooltips
-		'tooltipAccessKeyRegexp': /\[(ctrl-)?(alt-)?(shift-)?(esc-)?(.)\]$/,
-
-		/**
-		 * Add the appropriate prefix to the accesskey shown in the tooltip.
-		 * If the nodeList parameter is given, only those nodes are updated;
-		 * otherwise, all the nodes that will probably have accesskeys by
-		 * default are updated.
-		 *
-		 * @param nodeList jQuery object, or array of elements
-		 */
-		'updateTooltipAccessKeys' : function( nodeList ) {
-			var $nodes;
-			if ( nodeList instanceof jQuery ) {
-				$nodes = nodeList;
-			} else if ( nodeList ) {
-				$nodes = $(nodeList);
-			} else {
-				// Rather than scanning all links, just the elements that
-				// contain the relevant links
-				this.updateTooltipAccessKeys(
-					$('#column-one a, #mw-head a, #mw-panel a, #p-logo a') );
-
-				// these are rare enough that no such optimization is needed
-				this.updateTooltipAccessKeys( $('input') );
-				this.updateTooltipAccessKeys( $('label') );
-				return;
-			}
-
-			$nodes.each( function ( i ) {
-				var tip = $(this).attr( 'title' );
-				if ( !!tip && mw.util.tooltipAccessKeyRegexp.exec( tip ) ) {
-					tip = tip.replace( mw.util.tooltipAccessKeyRegexp,
-						'[' + mw.util.tooltipAccessKeyPrefix + "$5]" );
-					$(this).attr( 'title', tip );
-				}
-			});
-		},
-
-		// jQuery object that refers to the page-content element
-		// Populated by init()
-		'$content' : null,
-
-		/**
-		 * Add a link to a portlet menu on the page, such as:
-		 *
-		 * p-cactions (Content actions), p-personal (Personal tools),
-		 * p-navigation (Navigation), p-tb (Toolbox)
-		 *
-		 * The first three paramters are required, others are optionals. Though
-		 * providing an id and tooltip is recommended.
-		 *
-		 * By default the new link will be added to the end of the list. To
-		 * add the link before a given existing item, pass the DOM node
-		 * (document.getElementById('foobar')) or the jQuery-selector
-		 * ('#foobar') of that item.
-		 *
-		 * @example mw.util.addPortletLink(
-		 *	 'p-tb', 'http://mediawiki.org/',
-		 *	 'MediaWiki.org', 't-mworg', 'Go to MediaWiki.org ', 'm', '#t-print'
-		 * )
-		 *
-		 * @param portlet ID of the target portlet ('p-cactions' or 'p-personal' etc.)
-		 * @param href Link URL
-		 * @param text Link text (will be automatically converted to lower
-		 *	 case by CSS for p-cactions in Monobook)
-		 * @param id ID of the new item, should be unique and preferably have
-		 *	 the appropriate prefix ( 'ca-', 'pt-', 'n-' or 't-' )
-		 * @param tooltip Text to show when hovering over the link, without accesskey suffix
-		 * @param accesskey Access key to activate this link (one character, try
-		 *	 to avoid conflicts. Use $( '[accesskey=x' ).get() in the console to
-		 *	 see if 'x' is already used.
-		 * @param nextnode DOM node or jQuery-selector of the item that the new
-		 *	 item should be added before, should be another item in the same
-		 *	 list will be ignored if not the so
-		 *
-		 * @return The DOM node of the new item (a LI element, or A element for
-		 *	 older skins) or null.
-		 */
-		'addPortletLink' : function( portlet, href, text, id, tooltip, accesskey, nextnode ) {
-
-			// Check if there's atleast 3 arguments to prevent a TypeError
-			if ( arguments.length < 3 ) {
-				return null;
-			}
-			// Setup the anchor tag
-			var $link = $( '<a></a>' ).attr( 'href', href ).text( text );
-			if ( tooltip ) {
-				$link.attr( 'title', tooltip );
-			}
-
-			// Some skins don't have any portlets
-			// just add it to the bottom of their 'sidebar' element as a fallback
-			switch ( skin ) {
-			case 'standard' :
-			case 'cologneblue' :
-				$("#quickbar").append($link.after( '<br />' ));
-				return $link.get(0);
-			case 'nostalgia' :
-				$("#searchform").before($link).before( ' &#124; ' );
-				return $link.get(0);
-			default : // Skins like chick, modern, monobook, myskin, simple, vector...
-
-				// Select the specified portlet
-				var $portlet = $('#' + portlet);
-				if ( $portlet.length === 0 ) {
-					return null;
-				}
-				// Select the first (most likely only) unordered list inside the portlet
-				var $ul = $portlet.find( 'ul' ).eq( 0 );
-
-				// If it didn't have an unordered list yet, create it
-				if ($ul.length === 0) {
-					// If there's no <div> inside, append it to the portlet directly
-					if ($portlet.find( 'div' ).length === 0) {
-						$portlet.append( '<ul></ul>' );
-					} else {
-						// otherwise if there's a div (such as div.body or div.pBody)
-						// append the <ul> to last (most likely only) div
-						$portlet.find( 'div' ).eq( -1 ).append( '<ul></ul>' );
-					}
-					// Select the created element
-					$ul = $portlet.find( 'ul' ).eq( 0 );
-				}
-				// Just in case..
-				if ( $ul.length === 0 ) {
-					return null;
-				}
-
-				// Unhide portlet if it was hidden before
-				$portlet.removeClass( 'emptyPortlet' );
-
-				// Wrap the anchor tag in a <span> and create a list item for it
-				// and back up the selector to the list item
-				var $item = $link.wrap( '<li><span></span></li>' ).parent().parent();
-
-				// Implement the properties passed to the function
-				if ( id ) {
-					$item.attr( 'id', id );
-				}
-				if ( accesskey ) {
-					$link.attr( 'accesskey', accesskey );
-					tooltip += ' [' + accesskey + ']';
-				}
-				if ( tooltip ) {
-					$link.attr( 'title', tooltip );
-				}
-				if ( accesskey && tooltip ) {
-					this.updateTooltipAccessKeys( $link );
-				}
-
-				// Append using DOM-element passing
-				if ( nextnode && nextnode.parentNode == $ul.get( 0 ) ) {
-					$(nextnode).before( $item );
-				} else {
-					// If the jQuery selector isn't found within the <ul>, just
-					// append it at the end
-					if ( $ul.find( nextnode ).length === 0 ) {
-						$ul.append( $item );
-					} else {
-						// Append using jQuery CSS selector
-						$ul.find( nextnode ).eq( 0 ).before( $item );
-					}
-				}
-
-				return $item.get( 0 );
-			}
-		},
-	
-		/**
-		 * Validate a string as representing a valid e-mail address
-		 * according to HTML5 specification. Please note the specification
-		 * does not validate a domain with one character.
-		 *
-		 * FIXME: should be moved to a JavaScript validation module.
-		 */
-		'validateEmail' : function( mailtxt ) {
-			if( mailtxt === '' ) {
-				return null;
-			}
-		
-			/**
-			 * HTML5 defines a string as valid e-mail address if it matches
-			 * the ABNF:
-			 *	1 * ( atext / "." ) "@" ldh-str 1*( "." ldh-str )
-			 * With:
-			 * - atext	: defined in RFC 5322 section 3.2.3
-			 * - ldh-str : defined in RFC 1034 section 3.5
-			 *
-			 * (see STD 68 / RFC 5234 http://tools.ietf.org/html/std68):
-			 */
-		
-			/**
-			 * First, define the RFC 5322 'atext' which is pretty easy :
-			 * atext = ALPHA / DIGIT / ; Printable US-ASCII
-						 "!" / "#" /	 ; characters not including
-						 "$" / "%" /	 ; specials. Used for atoms.
-						 "&" / "'" /
-						 "*" / "+" /
-						 "-" / "/" /
-						 "=" / "?" /
-						 "^" / "_" /
-						 "`" / "{" /
-						 "|" / "}" /
-						 "~"
-			*/
-			var	rfc5322_atext = "a-z0-9!#$%&'*+\\-/=?^_`{|}~",
-		
-			/**
-			 * Next define the RFC 1034 'ldh-str'
-			 *	<domain> ::= <subdomain> | " "
-			 *	<subdomain> ::= <label> | <subdomain> "." <label>
-			 *	<label> ::= <letter> [ [ <ldh-str> ] <let-dig> ]
-			 *	<ldh-str> ::= <let-dig-hyp> | <let-dig-hyp> <ldh-str>
-			 *	<let-dig-hyp> ::= <let-dig> | "-"
-			 *	<let-dig> ::= <letter> | <digit>
-			 */
-				rfc1034_ldh_str = "a-z0-9\\-",
-	
-				HTML5_email_regexp = new RegExp(
-					// start of string
-					'^'
-					+
-					// User part which is liberal :p
-					'[' + rfc5322_atext + '\\.]+'
-					+
-					// "at"
-					'@'
-					+
-					// Domain first part
-					'[' + rfc1034_ldh_str + ']+'
-					+
-					// Optional second part and following are separated by a dot
-					'(?:\\.[' + rfc1034_ldh_str + ']+)*'
-					+
-					// End of string
-					'$',
-					// RegExp is case insensitive
-					'i'
-				);
-			return (null !== mailtxt.match( HTML5_email_regexp ) );
-		}
-
-	};
-
-	mediaWiki.util.init();
-
-} )( jQuery, mediaWiki );
\ No newline at end of file
diff --git a/resources/mediawiki.util/mediawiki.util.test.js b/resources/mediawiki.util/mediawiki.util.test.js
deleted file mode 100644
index 43bf1d88..00000000
--- a/resources/mediawiki.util/mediawiki.util.test.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * mediaWiki.util Test Suite
- *
- * Available on Special:BlankPage?action=mwutiltest&debug=true
- *
- * @author Krinkle <krinklemail@gmail.com>
- */
-
-(function ($, mw) {
-
-	mw.test = {
-
-		/* Variables */
-		'$table' : null,
-		'addedTests' : [],
-
-		/* Functions */
-
-		/**
-		* Adds a row to the test-table
-		*
-		* @param code String	Code of the test to be executed
-		* @param result String	Expected result in 'var (vartype)' form
-		* @param contain String	Important part of the result, if result is different but does contain this it will not return ERROR but PARTIALLY
-		*/
-		'addTest' : function( code, result, contain ) {
-			if (!contain) {
-				contain = result;
-			}
-			this.addedTests.push([code, result, contain]);
-			this.$table.append('<tr><td>' + mw.html.escape(code).replace(/  /g, '&nbsp;&nbsp;') + '</td><td>' + mw.html.escape(result).replace(/  /g, '&nbsp;&nbsp;') + '<td></td></td><td>?</td></tr>');
-		},
-
-		/* Initialisation */
-		'initialised' : false,
-		'init' : function () {
-			if (this.initialised === false) {
-				this.initialised = true;
-				$(function () {
-					if (wgCanonicalSpecialPageName == 'Blankpage' && mw.util.getParamValue('action') === 'mwutiltest') {
-
-						// Build page
-						document.title = 'mediaWiki.util JavaScript Test - ' + wgSiteName;
-						$('#firstHeading').text('mediaWiki.util JavaScript Test');
-						mw.util.$content.html(
-							'<p>Below is a list of tests to confirm proper functionality of the mediaWiki.util functions</p>' +
-							'<hr />' +
-							'<table id="mw-mwutiltest-table" class="wikitable sortable" style="white-space:break; font-family:monospace,\'Courier New\'">' +
-							'<tr><th>Exec</th><th>Should return</th><th>Does return</th><th>Equal ?</th></tr>' +
-							'</table>'
-						);
-						mw.test.$table = $('table#mw-mwutiltest-table');
-
-						// Populate tests
-						mw.test.addTest('typeof $.trimLeft',
-							'function (string)');
-						mw.test.addTest('$.trimLeft(\'  foo bar  \')',
-							'foo bar   (string)');
-						mw.test.addTest('typeof $.trimRight',
-							'function (string)');
-						mw.test.addTest('$.trimRight(\'  foo bar  \')',
-							'  foo bar (string)');
-						mw.test.addTest('typeof $.isEmpty',
-							'function (string)');
-						mw.test.addTest('$.isEmpty(\'string\')',
-							'false (boolean)');
-						mw.test.addTest('$.isEmpty(\'0\')',
-							'true (boolean)');
-						mw.test.addTest('$.isEmpty([])',
-							'true (boolean)');
-						mw.test.addTest('typeof $.compareArray',
-							'function (string)');
-						mw.test.addTest('$.compareArray( [1, "a", [], [2, \'b\'] ], [1, \'a\', [], [2, "b"] ] )',
-							'true (boolean)');
-						mw.test.addTest('$.compareArray( [1], [2] )',
-							'false (boolean)');
-						mw.test.addTest('4',
-							'4 (number)');
-						mw.test.addTest('typeof mediaWiki',
-							'object (string)');
-						mw.test.addTest('typeof mw',
-							'object (string)');
-						mw.test.addTest('typeof mw.util',
-							'object (string)');
-						mw.test.addTest('typeof mw.html',
-							'object (string)');
-						mw.test.addTest('typeof $.ucFirst',
-							'function (string)');
-						mw.test.addTest('$.ucFirst( \'mediawiki\' )',
-							'Mediawiki (string)');
-						mw.test.addTest('typeof $.escapeRE',
-							'function (string)');
-						mw.test.addTest('$.escapeRE( \'.st{e}$st\' )',
-							'\\.st\\{e\\}\\$st (string)');
-						mw.test.addTest('typeof $.fn.checkboxShiftClick',
-							'function (string)');
-						mw.test.addTest('typeof mw.util.rawurlencode',
-							'function (string)');
-						mw.test.addTest('mw.util.rawurlencode( \'Test: A&B/Here\' )',
-							'Test%3A%20A%26B%2FHere (string)');
-						mw.test.addTest('typeof mw.util.wikiGetlink',
-							'function (string)');
-						mw.test.addTest('typeof mw.util.getParamValue',
-							'function (string)');
-						mw.test.addTest('mw.util.getParamValue( \'action\' )',
-							'mwutiltest (string)');
-						mw.test.addTest('mw.util.getParamValue( \'foo\', \'http://mw.org/?foo=wrong&foo=right#&foo=bad\' )',
-							'right (string)');
-						mw.test.addTest('mw.util.tooltipAccessKeyRegexp.constructor.name',
-							'RegExp (string)');
-						mw.test.addTest('typeof mw.util.updateTooltipAccessKeys',
-							'function (string)');
-						mw.test.addTest('typeof mw.util.addPortletLink',
-							'function (string)');
-						mw.test.addTest('typeof mw.util.addPortletLink( "p-tb", "http://mediawiki.org/", "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", "#t-print" )',
-							'object (string)');
-						mw.test.addTest('a = mw.util.addPortletLink( "p-tb", "http://mediawiki.org/", "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", "#t-print" ); $(a).text();',
-							'MediaWiki.org (string)');
-						mw.test.addTest('mw.html.element( \'hr\' )',
-							'<hr/> (string)');
-						mw.test.addTest('mw.html.element( \'img\', { \'src\': \'http://mw.org/?title=Main page&action=edit\' } )',
-							'<img src="http://mw.org/?title=Main page&amp;action=edit"/> (string)');
-						// Try to roughly keep the order similar to the order in the files
-						// or alphabetical (depending on the context)
-
-						// Run tests and compare results
-						var	exec,
-							result,
-							resulttype,
-							numberoftests = 0,
-							numberofpasseds = 0,
-							numberofpartials = 0,
-							numberoferrors = 0,
-							$testrows;
-						$testrows = mw.test.$table.find('tr');
-						$.each(mw.test.addedTests, (function ( i ) {
-								numberoftests++;
-
-								exec = mw.test.addedTests[i][0];
-								shouldreturn = mw.test.addedTests[i][1];
-								shouldcontain = mw.test.addedTests[i][2];
-								doesreturn = eval(exec);
-								doesreturn = doesreturn + ' (' + typeof doesreturn + ')';
-								$thisrow = $testrows.eq(i + 1);
-								$thisrow.find('> td').eq(2).text(doesreturn);
-
-								if (doesreturn.indexOf(shouldcontain) !== -1) {
-									if (doesreturn == shouldreturn){
-										$thisrow.find('> td').eq(3).css('background', '#EFE').text('OK');
-										numberofpasseds++;
-									} else {
-										$thisrow.find('> td').eq(3).css('background', '#FFE').html('<small>PARTIALLY</small>');
-										numberofpartials++;
-									}
-								} else {
-									$thisrow.find('> td').eq(3).css('background', '#FEE').text('ERROR');
-									numberoferrors++;
-								}
-
-							})
-						);
-						mw.test.$table.before('<p><strong>Ran ' + numberoftests + ' tests. ' + numberofpasseds + ' passed test(s). ' + numberoferrors + ' error(s). ' + numberofpartials + ' partially passed test(s). </p>');
-
-					}
-				});
-			}
-		}
-	};
-
-	mw.test.init();
-
-} )(jQuery, mediaWiki);
\ No newline at end of file
diff --git a/resources/mediawiki/mediawiki.Title.js b/resources/mediawiki/mediawiki.Title.js
new file mode 100644
index 00000000..8d7996cb
--- /dev/null
+++ b/resources/mediawiki/mediawiki.Title.js
@@ -0,0 +1,334 @@
+/**
+ * mediaWiki.Title
+ *
+ * @author Neil Kandalgaonkar, 2010
+ * @author Timo Tijhof, 2011
+ * @since 1.18
+ *
+ * Relies on: mw.config (wgFormattedNamespaces, wgNamespaceIds, wgCaseSensitiveNamespaces), mw.util.wikiGetlink
+ */
+( function( $ ) {
+
+	/* Local space */
+
+	/**
+	 * Title
+	 * @constructor
+	 *
+	 * @param title {String} Title of the page. If no second argument given,
+	 * this will be searched for a namespace.
+	 * @param namespace {Number} (optional) Namespace id. If given, title will be taken as-is.
+	 * @return {Title} this
+	 */
+var	Title = function( title, namespace ) {
+		this._ns = 0; // integer namespace id
+		this._name = null; // name in canonical 'database' form
+		this._ext = null; // extension
+
+		if ( arguments.length === 2 ) {
+			setNameAndExtension( this, title );
+			this._ns = fixNsId( namespace );
+		} else if ( arguments.length === 1 ) {
+			setAll( this, title );
+		}
+		return this;
+	},
+
+	/**
+	 * Strip some illegal chars: control chars, colon, less than, greater than,
+	 * brackets, braces, pipe, whitespace and normal spaces. This still leaves some insanity
+	 * intact, like unicode bidi chars, but it's a good start..
+	 * @param s {String}
+	 * @return {String}
+	 */
+	clean = function( s ) {
+		if ( s !== undefined ) {
+			return s.replace( /[\x00-\x1f\x23\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f\s]+/g, '_' );
+		}
+	},
+
+	/**
+	 * Convert db-key to readable text.
+	 * @param s {String}
+	 * @return {String}
+	 */
+	text = function ( s ) {
+		if ( s !== null && s !== undefined ) {
+			return s.replace( /_/g, ' ' );
+		} else {
+			return '';
+		}
+	},
+
+	/**
+	 * Sanitize name.
+	 */
+	fixName = function( s ) {
+		return clean( $.trim( s ) );
+	},
+
+	/**
+	 * Sanitize name.
+	 */
+	fixExt = function( s ) {
+		return clean( s );
+	},
+
+	/**
+	 * Sanitize namespace id.
+	 * @param id {Number} Namespace id.
+	 * @return {Number|Boolean} The id as-is or boolean false if invalid.
+	 */
+	fixNsId = function( id ) {
+		// wgFormattedNamespaces is an object of *string* key-vals (ie. arr["0"] not arr[0] )
+		var ns = mw.config.get( 'wgFormattedNamespaces' )[id.toString()];
+
+		// Check only undefined (may be false-y, such as '' (main namespace) ).
+		if ( ns === undefined ) {
+			return false;
+		} else {
+			return Number( id );
+		}
+	},
+
+	/**
+	 * Get namespace id from namespace name by any known namespace/id pair (localized, canonical or alias).
+	 *
+	 * @example On a German wiki this would return 6 for any of 'File', 'Datei', 'Image' or even 'Bild'.
+	 * @param ns {String} Namespace name (case insensitive, leading/trailing space ignored).
+	 * @return {Number|Boolean} Namespace id or boolean false if unrecognized.
+	 */
+	getNsIdByName = function( ns ) {
+		// toLowerCase throws exception on null/undefined. Return early.
+		if ( ns == null ) {
+			return false;
+		}
+		ns = clean( $.trim( ns.toLowerCase() ) ); // Normalize
+		var id = mw.config.get( 'wgNamespaceIds' )[ns];
+		if ( id === undefined ) {
+			mw.log( 'mw.Title: Unrecognized namespace: ' + ns );
+			return false;
+		}
+		return fixNsId( id );
+	},
+
+	/**
+	 * Helper to extract namespace, name and extension from a string.
+	 *
+	 * @param title {mw.Title}
+	 * @param raw {String}
+	 * @return {mw.Title}
+	 */
+	setAll = function( title, s ) {
+		// In normal browsers the match-array contains null/undefined if there's no match,
+		// IE returns an empty string.
+		var	matches = s.match( /^(?:([^:]+):)?(.*?)(?:\.(\w{1,5}))?$/ ),
+			ns_match = getNsIdByName( matches[1] );
+
+		// Namespace must be valid, and title must be a non-empty string.
+		if ( ns_match && typeof matches[2] === 'string' && matches[2] !== '' ) {
+			title._ns = ns_match;
+			title._name = fixName( matches[2] );
+			if ( typeof matches[3] === 'string' && matches[3] !== '' ) {
+				title._ext = fixExt( matches[3] );
+			}
+		} else {
+			// Consistency with MediaWiki PHP: Unknown namespace -> fallback to main namespace.
+			title._ns = 0;
+			setNameAndExtension( title, s );
+		}
+		return title;
+	},
+
+	/**
+	 * Helper to extract name and extension from a string.
+	 *
+	 * @param title {mw.Title}
+	 * @param raw {String}
+	 * @return {mw.Title}
+	 */
+	setNameAndExtension = function( title, raw ) {
+		// In normal browsers the match-array contains null/undefined if there's no match,
+		// IE returns an empty string.
+		var matches = raw.match( /^(?:)?(.*?)(?:\.(\w{1,5}))?$/ );
+
+		// Title must be a non-empty string.
+		if ( typeof matches[1] === 'string' && matches[1] !== '' ) {
+			title._name = fixName( matches[1] );
+			if ( typeof matches[2] === 'string' && matches[2] !== '' ) {
+				title._ext = fixExt( matches[2] );
+			}
+		} else {
+			throw new Error( 'mw.Title: Could not parse title "' + raw + '"' );
+		}
+		return title;
+	};
+
+
+	/* Static space */
+
+	/**
+	 * Whether this title exists on the wiki.
+	 * @param title {mixed} prefixed db-key name (string) or instance of Title
+	 * @return {mixed} Boolean true/false if the information is available. Otherwise null.
+	 */
+	Title.exists = function( title ) {
+		var type = $.type( title ), obj = Title.exist.pages, match;
+		if ( type === 'string' ) {
+			match = obj[title];
+		} else if ( type === 'object' && title instanceof Title ) {
+			match = obj[title.toString()];
+		} else {
+			throw new Error( 'mw.Title.exists: title must be a string or an instance of Title' );
+		}
+		if ( typeof match === 'boolean' ) {
+			return match;
+		}
+		return null;
+	};
+
+	/**
+	 * @var Title.exist {Object}
+	 */
+	Title.exist = {
+		/**
+		 * @var Title.exist.pages {Object} Keyed by PrefixedDb title.
+		 * Boolean true value indicates page does exist.
+		 */
+		pages: {},
+		/**
+		 * @example Declare existing titles: Title.exist.set(['User:John_Doe', ...]);
+		 * @example Declare titles nonexistent: Title.exist.set(['File:Foo_bar.jpg', ...], false);
+		 * @param titles {String|Array} Title(s) in strict prefixedDb title form.
+		 * @param state {Boolean} (optional) State of the given titles. Defaults to true.
+		 * @return {Boolean}
+		 */
+		set: function( titles, state ) {
+			titles = $.isArray( titles ) ? titles : [titles];
+			state = state === undefined ? true : !!state;
+			var pages = this.pages, i, len = titles.length;
+			for ( i = 0; i < len; i++ ) {
+				pages[ titles[i] ] = state;
+			}
+			return true;
+		}
+	};
+
+	/* Public methods */
+
+	var fn = {
+		constructor: Title,
+
+		/**
+		 * Get the namespace number.
+		 * @return {Number}
+		 */
+		getNamespaceId: function(){
+			return this._ns;
+		},
+
+		/**
+		 * Get the namespace prefix (in the content-language).
+		 * In NS_MAIN this is '', otherwise namespace name plus ':'
+		 * @return {String}
+		 */
+		getNamespacePrefix: function(){
+			return mw.config.get( 'wgFormattedNamespaces' )[this._ns].replace( / /g, '_' ) + (this._ns === 0 ? '' : ':');
+		},
+
+		/**
+		 * The name, like "Foo_bar"
+		 * @return {String}
+		 */
+		getName: function() {
+			if ( $.inArray( this._ns, mw.config.get( 'wgCaseSensitiveNamespaces' ) ) !== -1 ) {
+				return this._name;
+			} else {
+				return $.ucFirst( this._name );
+			}
+		},
+
+		/**
+		 * The name, like "Foo bar"
+		 * @return {String}
+		 */
+		getNameText: function() {
+			return text( this.getName() );
+		},
+
+		/**
+		 * Get full name in prefixed DB form, like File:Foo_bar.jpg,
+		 * most useful for API calls, anything that must identify the "title".
+		 */
+		getPrefixedDb: function() {
+			return this.getNamespacePrefix() + this.getMain();
+		},
+
+		/**
+		 * Get full name in text form, like "File:Foo bar.jpg".
+		 * @return {String}
+		 */
+		getPrefixedText: function() {
+			return text( this.getPrefixedDb() );
+		},
+
+		/**
+		 * The main title (without namespace), like "Foo_bar.jpg"
+		 * @return {String}
+		 */
+		getMain: function() {
+			return this.getName() + this.getDotExtension();
+		},
+
+		/**
+		 * The "text" form, like "Foo bar.jpg"
+		 * @return {String}
+		 */
+		getMainText: function() {
+			return text( this.getMain() );
+		},
+
+		/**
+		 * Get the extension (returns null if there was none)
+		 * @return {String|null} extension
+		 */
+		getExtension: function() {
+			return this._ext;
+		},
+
+		/**
+		 * Convenience method: return string like ".jpg", or "" if no extension
+		 * @return {String}
+		 */
+		getDotExtension: function() {
+			return this._ext === null ? '' : '.' + this._ext;
+		},
+
+		/**
+		 * Return the URL to this title
+		 * @return {String}
+		 */
+		getUrl: function() {
+			return mw.util.wikiGetlink( this.toString() );
+		},
+
+		/**
+		 * Whether this title exists on the wiki.
+		 * @return {mixed} Boolean true/false if the information is available. Otherwise null.
+		 */
+		exists: function() {
+			return Title.exists( this );
+		}
+	};
+
+	// Alias
+	fn.toString = fn.getPrefixedDb;
+	fn.toText = fn.getPrefixedText;
+
+	// Assign
+	Title.prototype = fn;
+
+	// Expose
+	mw.Title = Title;
+
+})(jQuery);
diff --git a/resources/mediawiki/mediawiki.Uri.js b/resources/mediawiki/mediawiki.Uri.js
new file mode 100644
index 00000000..7ff8dda4
--- /dev/null
+++ b/resources/mediawiki/mediawiki.Uri.js
@@ -0,0 +1,260 @@
+/**
+ * Library for simple URI parsing and manipulation.  Requires jQuery.
+ *
+ * Do not expect full RFC 3986 compliance. Intended to be minimal, but featureful.
+ * The use cases we have in mind are constructing 'next page' or 'previous page' URLs,
+ * detecting whether we need to use cross-domain proxies for an API, constructing
+ * simple URL-based API calls, etc.
+ *
+ * Intended to compress very well if you use a JS-parsing minifier.
+ *
+ * Dependencies: mw, jQuery
+ *
+ * Example:
+ *
+ *     var uri = new mw.Uri( 'http://foo.com/mysite/mypage.php?quux=2' );
+ *
+ *     if ( uri.host == 'foo.com' ) {
+ *         uri.host = 'www.foo.com';
+ *         uri.extend( { bar: 1 } );
+ *
+ *         $( 'a#id1' ).attr( 'href', uri );
+ *         // anchor with id 'id1' now links to http://foo.com/mysite/mypage.php?bar=1&quux=2
+ *
+ *         $( 'a#id2' ).attr( 'href', uri.clone().extend( { bar: 3, pif: 'paf' } ) );
+ *         // anchor with id 'id2' now links to http://foo.com/mysite/mypage.php?bar=3&quux=2&pif=paf
+ *     }
+ *
+ * Parsing here is regex based, so may not work on all URIs, but is good enough for most.
+ *
+ * Given a URI like
+ * 'http://usr:pwd@www.test.com:81/dir/dir.2/index.htm?q1=0&&test1&test2=&test3=value+%28escaped%29&r=1&r=2#top':
+ * The returned object will have the following properties:
+ *
+ *    protocol  'http'
+ *    user      'usr'
+ *    password  'pwd'
+ *    host      'www.test.com'
+ *    port      '81'
+ *    path      '/dir/dir.2/index.htm'
+ *    query     {
+ *                  q1: 0,
+ *                  test1: null,
+ *                  test2: '',
+ *                  test3: 'value (escaped)'
+ *                  r: [1, 2]
+ *              }
+ *    fragment  'top'
+ *
+ * n.b. 'password' is not technically allowed for HTTP URIs, but it is possible with other
+ * sorts of URIs.
+ * You can modify the properties directly. Then use the toString() method to extract the
+ * full URI string again.
+ *
+ * Parsing based on parseUri 1.2.2 (c) Steven Levithan <stevenlevithan.com> MIT License
+ * http://stevenlevithan.com/demo/parseuri/js/
+ *
+ */
+
+( function( $ ) {
+
+	/**
+	 * Function that's useful when constructing the URI string -- we frequently encounter the pattern of
+	 * having to add something to the URI as we go, but only if it's present, and to include a character before or after if so.
+	 * @param {String} to prepend, if value not empty
+	 * @param {String} value to include, if not empty
+	 * @param {String} to append, if value not empty
+	 * @param {Boolean} raw -- if true, do not URI encode
+	 * @return {String}
+	 */
+	function cat( pre, val, post, raw ) {
+		if ( val === undefined || val === null || val === '' ) {
+			return '';
+		} else {
+			return pre + ( raw ? val : mw.Uri.encode( val ) ) + post;
+		}
+	}
+
+	// Regular expressions to parse many common URIs.
+	var parser = {
+		strict: /^(?:([^:\/?#]+):)?(?:\/\/(?:(?:([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)?((?:[^?#\/]*\/)*[^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
+		loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?(?:(?:([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?((?:\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?[^?#\/]*)(?:\?([^#]*))?(?:#(.*))?/
+	},
+
+	// The order here matches the order of captured matches in the above parser regexes.
+	properties = [
+		'protocol',  // http
+		'user',      // usr
+		'password',  // pwd
+		'host',      // www.test.com
+		'port',      // 81
+		'path',      // /dir/dir.2/index.htm
+		'query',     // q1=0&&test1&test2=value (will become { q1: 0, test1: '', test2: 'value' } )
+		'fragment'   // top
+	];
+
+	/**
+	 * Constructs URI object. Throws error if arguments are illegal/impossible, or otherwise don't parse.
+	 * @constructor
+	 * @param {!Object|String} URI string, or an Object with appropriate properties (especially another URI object to clone). Object must have non-blank 'protocol', 'host', and 'path' properties.
+	 * @param {Boolean} strict mode (when parsing a string)
+	 */
+	mw.Uri = function( uri, strictMode ) {
+		strictMode = !!strictMode;
+		if ( uri !== undefined && uri !== null || uri !== '' ) {
+			if ( typeof uri === 'string' ) {
+				this._parse( uri, strictMode );
+			} else if ( typeof uri === 'object' ) {
+				var _this = this;
+				$.each( properties, function( i, property ) {
+					_this[property] = uri[property];
+				} );
+				if ( this.query === undefined ) {
+					this.query = {};
+				}
+			}
+		}
+		if ( !( this.protocol && this.host && this.path ) ) {
+			throw new Error( 'Bad constructor arguments' );
+		}
+	};
+
+	/**
+	 * Standard encodeURIComponent, with extra stuff to make all browsers work similarly and more compliant with RFC 3986
+	 * Similar to rawurlencode from PHP and our JS library mw.util.rawurlencode, but we also replace space with a +
+	 * @param {String} string
+	 * @return {String} encoded for URI
+	 */
+	mw.Uri.encode = function( s ) {
+		return encodeURIComponent( s )
+			.replace( /!/g, '%21').replace( /'/g, '%27').replace( /\(/g, '%28')
+			.replace( /\)/g, '%29').replace( /\*/g, '%2A')
+			.replace( /%20/g, '+' );
+	};
+
+	/**
+	 * Standard decodeURIComponent, with '+' to space
+	 * @param {String} string encoded for URI
+	 * @return {String} decoded string
+	 */
+	mw.Uri.decode = function( s ) {
+		return decodeURIComponent( s ).replace( /\+/g, ' ' );
+	};
+
+	mw.Uri.prototype = {
+
+		/**
+		 * Parse a string and set our properties accordingly.
+		 * @param {String} URI
+		 * @param {Boolean} strictness
+		 * @return {Boolean} success
+		 */
+		_parse: function( str, strictMode ) {
+			var matches = parser[ strictMode ? 'strict' : 'loose' ].exec( str );
+			var uri = this;
+			$.each( properties, function( i, property ) {
+				uri[ property ] = matches[ i+1 ];
+			} );
+
+			// uri.query starts out as the query string; we will parse it into key-val pairs then make
+			// that object the "query" property.
+			// we overwrite query in uri way to make cloning easier, it can use the same list of properties.
+			var q = {};
+			// using replace to iterate over a string
+			if ( uri.query ) {
+				uri.query.replace( /(?:^|&)([^&=]*)(?:(=)([^&]*))?/g, function ($0, $1, $2, $3) {
+					if ( $1 ) {
+						var k = mw.Uri.decode( $1 );
+						var v = ( $2 === '' || $2 === undefined ) ? null : mw.Uri.decode( $3 );
+						if ( typeof q[ k ] === 'string' ) {
+							q[ k ] = [ q[ k ] ];
+						}
+						if ( typeof q[ k ] === 'object' ) {
+							q[ k ].push( v );
+						} else {
+							q[ k ] = v;
+						}
+					}
+				} );
+			}
+			this.query = q;
+		},
+
+		/**
+		 * Returns user and password portion of a URI.
+		 * @return {String}
+		 */
+		getUserInfo: function() {
+			return cat( '', this.user, cat( ':', this.password, '' ) );
+		},
+
+		/**
+		 * Gets host and port portion of a URI.
+		 * @return {String}
+		 */
+		getHostPort: function() {
+			return this.host + cat( ':', this.port, '' );
+		},
+
+		/**
+		 * Returns the userInfo and host and port portion of the URI.
+		 * In most real-world URLs, this is simply the hostname, but it is more general.
+		 * @return {String}
+		 */
+		getAuthority: function() {
+			return cat( '', this.getUserInfo(), '@' ) + this.getHostPort();
+		},
+
+		/**
+		 * Returns the query arguments of the URL, encoded into a string
+		 * Does not preserve the order of arguments passed into the URI. Does handle escaping.
+		 * @return {String}
+		 */
+		getQueryString: function() {
+			var args = [];
+			$.each( this.query, function( key, val ) {
+				var k = mw.Uri.encode( key );
+				var vals = val === null ? [ null ] : $.makeArray( val );
+				$.each( vals, function( i, v ) {
+					args.push( k + ( v === null ? '' : '=' + mw.Uri.encode( v ) ) );
+				} );
+			} );
+			return args.join( '&' );
+		},
+
+		/**
+		 * Returns everything after the authority section of the URI
+		 * @return {String}
+		 */
+		getRelativePath: function() {
+			return this.path + cat( '?', this.getQueryString(), '', true ) + cat( '#', this.fragment, '' );
+		},
+
+		/**
+		 * Gets the entire URI string. May not be precisely the same as input due to order of query arguments.
+		 * @return {String} the URI string
+		 */
+		toString: function() {
+			return this.protocol + '://' + this.getAuthority() + this.getRelativePath();
+		},
+
+		/**
+		 * Clone this URI
+		 * @return {Object} new URI object with same properties
+		 */
+		clone: function() {
+			return new mw.Uri( this );
+		},
+
+		/**
+		 * Extend the query -- supply query parameters to override or add to ours
+		 * @param {Object} query parameters in key-val form to override or add
+		 * @return {Object} this URI object
+		 */
+		extend: function( parameters ) {
+			$.extend( this.query, parameters );
+			return this;
+		}
+	};
+
+} )( jQuery );
diff --git a/resources/mediawiki/mediawiki.htmlform.js b/resources/mediawiki/mediawiki.htmlform.js
new file mode 100644
index 00000000..1a6acd6f
--- /dev/null
+++ b/resources/mediawiki/mediawiki.htmlform.js
@@ -0,0 +1,64 @@
+/**
+ * Utility functions for jazzing up HTMLForm elements
+ */
+( function( $ ) { 
+
+/**
+ * jQuery plugin to fade or snap to visible state.
+ *
+ * @param boolean instantToggle (optional)
+ * @return jQuery
+ */
+$.fn.goIn = function( instantToggle ) {
+	if ( instantToggle !== undefined && instantToggle === true ) {
+		return $(this).show();
+	}
+	return $(this).stop( true, true ).fadeIn();
+};
+
+/**
+ * jQuery plugin to fade or snap to hiding state.
+ *
+ * @param boolean instantToggle (optional)
+ * @return jQuery
+ */
+$.fn.goOut = function( instantToggle ) {
+	if ( instantToggle !== undefined && instantToggle === true ) {
+		return $(this).hide();
+	}
+	return $(this).stop( true, true ).fadeOut();
+};
+
+/**
+ * Bind a function to the jQuery object via live(), and also immediately trigger
+ * the function on the objects with an 'instant' paramter set to true
+ * @param callback function taking one paramter, which is Bool true when the event
+ *     is called immediately, and the EventArgs object when triggered from an event
+ */
+$.fn.liveAndTestAtStart = function( callback ){
+	$(this)
+		.live( 'change', callback )
+		.each( function( index, element ){
+			callback.call( this, true );
+		} );
+};
+
+// Document ready:
+$( function() {
+
+	// Animate the SelectOrOther fields, to only show the text field when
+	// 'other' is selected.
+	$( '.mw-htmlform-select-or-other' ).liveAndTestAtStart( function( instant ) {
+		var $other = $( '#' + $(this).attr( 'id' ) + '-other' );
+		$other = $other.add( $other.siblings( 'br' ) );
+		if ( $(this).val() === 'other' ) {
+			$other.goIn( instant );
+		} else {
+			$other.goOut( instant );
+		}
+	});
+
+});
+
+
+})( jQuery );
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 03f92844..a763ba93 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -1,98 +1,49 @@
 /*
- * JavaScript backwards-compatibility alternatives and other convenience functions
- */
-
-jQuery.extend({
-	trimLeft : function( str ) {
-		return str == null ? '' : str.toString().replace( /^\s+/, '' );
-	},
-	trimRight : function( str ) {
-		return str == null ?
-				'' : str.toString().replace( /\s+$/, '' );
-	},
-	ucFirst : function( str ) {
-		return str.substr( 0, 1 ).toUpperCase() + str.substr( 1, str.length );
-	},
-	escapeRE : function( str ) {
-		return str.replace ( /([\\{}()\|.?*+-^$\[\]])/g, "\\$1" );
-	},
-	isEmpty : function( v ) {
-		var key;
-		if ( v === "" || v === 0 || v === "0" || v === null
-			|| v === false || typeof v === 'undefined' )
-		{
-			return true;
-		}
-		// the for-loop could potentially contain prototypes
-		// to avoid that we check it's length first
-		if ( v.length === 0 ) {
-			return true;
-		}
-		if ( typeof v === 'object' ) {
-			for ( key in v ) {
-				return false;
-			}
-			return true;
-		}
-		return false;
-	},
-	compareArray : function( arrThis, arrAgainst ) {
-		if ( arrThis.length != arrAgainst.length ) {
-			return false;
-		}
-		for ( var i = 0; i < arrThis.length; i++ ) {
-			if ( arrThis[i] instanceof Array ) {
-				if ( !$.compareArray( arrThis[i], arrAgainst[i] ) ) {
-					return false;
-				}
-			} else if ( arrThis[i] !== arrAgainst[i] ) {
-				return false;
-			}
-		}
-		return true;
-	}
-});
-
-/*
  * Core MediaWiki JavaScript Library
  */
 
 // Attach to window
 window.mediaWiki = new ( function( $ ) {
 
-	/* Constants */
-
-	// This will not change until we are 100% ready to turn off legacy globals
-	var LEGACY_GLOBALS = true;
-
 	/* Private Members */
 
-	// List of messages that have been requested to be loaded
+	/**
+	 * @var object List of messages that have been requested to be loaded.
+	 */
 	var messageQueue = {};
 
-	/* Prototypes */
+	/* Object constructors */
 
 	/**
-	 * An object which allows single and multiple get/set/exists functionality
-	 * on a list of key / value pairs.
+	 * Map
+	 *
+	 * Creates an object that can be read from or written to from prototype functions
+	 * that allow both single and multiple variables at once.
 	 *
-	 * @param {boolean} global Whether to get/set/exists values on the window
-	 *   object or a private object
+	 * @param global boolean Whether to store the values in the global window
+	 * object or a exclusively in the object property 'values'.
+	 * @return Map
 	 */
 	function Map( global ) {
 		this.values = ( global === true ) ? window : {};
-	};
+		return this;
+	}
 
 	/**
-	 * Gets the value of a key, or a list of key/value pairs for an array of keys.
+	 * Get the value of one or multiple a keys.
 	 *
 	 * If called with no arguments, all values will be returned.
 	 *
-	 * @param selection mixed Key or array of keys to get values for
-	 * @param fallback mixed Value to use in case key(s) do not exist (optional)
+	 * @param selection mixed String key or array of keys to get values for.
+	 * @param fallback mixed Value to use in case key(s) do not exist (optional).
+	 * @return mixed If selection was a string returns the value or null,
+	 * If selection was an array, returns an object of key/values (value is null if not found),
+	 * If selection was not passed or invalid, will return the 'values' object member (be careful as
+	 * objects are always passed by reference in JavaScript!).
+	 * @return Values as a string or object, null if invalid/inexistant.
 	 */
 	Map.prototype.get = function( selection, fallback ) {
-		if ( typeof selection === 'object' ) {
+		if ( $.isArray( selection ) ) {
 			selection = $.makeArray( selection );
 			var results = {};
 			for ( var i = 0; i < selection.length; i++ ) {
@@ -100,37 +51,45 @@ window.mediaWiki = new ( function( $ ) {
 			}
 			return results;
 		} else if ( typeof selection === 'string' ) {
-			if ( typeof this.values[selection] === 'undefined' ) {
-				if ( typeof fallback !== 'undefined' ) {
+			if ( this.values[selection] === undefined ) {
+				if ( fallback !== undefined ) {
 					return fallback;
 				}
 				return null;
 			}
 			return this.values[selection];
 		}
-		return this.values;
+		if ( selection === undefined ) {
+			return this.values;
+		} else {
+			return null; // invalid selection key
+		}
 	};
 
 	/**
 	 * Sets one or multiple key/value pairs.
 	 *
-	 * @param selection mixed Key or object of key/value pairs to set
+	 * @param selection mixed String key or array of keys to set values for.
 	 * @param value mixed Value to set (optional, only in use when key is a string)
+	 * @return bool This returns true on success, false on failure.
 	 */
 	Map.prototype.set = function( selection, value ) {
-		if ( typeof selection === 'object' ) {
+		if ( $.isPlainObject( selection ) ) {
 			for ( var s in selection ) {
 				this.values[s] = selection[s];
 			}
-		} else if ( typeof selection === 'string' && typeof value !== 'undefined' ) {
+			return true;
+		} else if ( typeof selection === 'string' && value !== undefined ) {
 			this.values[selection] = value;
+			return true;
 		}
+		return false;
 	};
 
 	/**
 	 * Checks if one or multiple keys exist.
 	 *
-	 * @param selection mixed Key or array of keys to check
+	 * @param selection mixed String key or array of keys to check
 	 * @return boolean Existence of key(s)
 	 */
 	Map.prototype.exists = function( selection ) {
@@ -147,35 +106,49 @@ window.mediaWiki = new ( function( $ ) {
 	};
 
 	/**
-	 * Message object, similar to Message in PHP
+	 * Message
+	 *
+	 * Object constructor for messages,
+	 * similar to the Message class in MediaWiki PHP.
+	 *
+	 * @param map Map Instance of mw.Map
+	 * @param key String
+	 * @param parameters Array
+	 * @return Message
 	 */
 	function Message( map, key, parameters ) {
 		this.format = 'parse';
 		this.map = map;
 		this.key = key;
-		this.parameters = typeof parameters === 'undefined' ? [] : $.makeArray( parameters );
-	};
+		this.parameters = parameters === undefined ? [] : $.makeArray( parameters );
+		return this;
+	}
 
 	/**
-	 * Appends parameters for replacement
+	 * Appends (does not replace) parameters for replacement to the .parameters property.
 	 *
-	 * @param parameters mixed First in a list of variadic arguments to append as message parameters
+	 * @param parameters Array
+	 * @return Message
 	 */
 	Message.prototype.params = function( parameters ) {
 		for ( var i = 0; i < parameters.length; i++ ) {
-			this.parameters[this.parameters.length] = parameters[i];
+			this.parameters.push( parameters[i] );
 		}
 		return this;
 	};
 
 	/**
-	 * Converts message object to it's string form based on the state of format
+	 * Converts message object to it's string form based on the state of format.
 	 *
-	 * @return {string} String form of message
+	 * @return string Message as a string in the current form or <key> if key does not exist.
 	 */
 	Message.prototype.toString = function() {
 		if ( !this.map.exists( this.key ) ) {
-			// Return <key> if key does not exist
+			// Use <key> as text if key does not exist
+			if ( this.format !== 'plain' ) {
+				// format 'escape' and 'parse' need to have the brackets and key html escaped
+				return mw.html.escape( '<' + this.key + '>' );
+			}
 			return '<' + this.key + '>';
 		}
 		var text = this.map.get( this.key );
@@ -184,9 +157,19 @@ window.mediaWiki = new ( function( $ ) {
 			var index = parseInt( match, 10 ) - 1;
 			return index in parameters ? parameters[index] : '$' + match;
 		} );
+
+		if ( this.format === 'plain' ) {
+			return text;
+		}
+		if ( this.format === 'escaped' ) {
+			// According to Message.php this needs {{-transformation, which is
+			// still todo
+			return mw.html.escape( text );
+		}
+
 		/* This should be fixed up when we have a parser
 		if ( this.format === 'parse' && 'language' in mediaWiki ) {
-			text = mediaWiki.language.parse( text );
+			text = mw.language.parse( text );
 		}
 		*/
 		return text;
@@ -213,6 +196,16 @@ window.mediaWiki = new ( function( $ ) {
 	};
 
 	/**
+	 * Changes the format to html escaped and converts message to string
+	 *
+	 * @return {string} String form of html escaped message
+	 */
+	Message.prototype.escaped = function() {
+		this.format = 'escaped';
+		return this.toString();
+	};
+
+	/**
 	 * Checks if message exists
 	 *
 	 * @return {string} String form of parsed message
@@ -221,114 +214,39 @@ window.mediaWiki = new ( function( $ ) {
 		return this.map.exists( this.key );
 	};
 
-	/**
-	 * User object
-	 */
-	function User() {
-		this.options = new Map();
-
-		/* Public Methods */
-
-		/*
-		 * Generates a random user session ID (32 alpha-numeric characters).
-		 * 
-		 * This information would potentially be stored in a cookie to identify a user during a
-		 * session or series of sessions. It's uniqueness should not be depended on.
-		 * 
-		 * @return string random set of 32 alpha-numeric characters
-		 */
-		function generateId() {
-			var id = '';
-			var seed = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
-			for ( var i = 0, r; i < 32; i++ ) {
-				r = Math.floor( Math.random() * seed.length );
-				id += seed.substring( r, r + 1 );
-			}
-			return id;
-		}
-
-		/*
-		 * Gets the current user's name.
-		 * 
-		 * @return mixed user name string or null if users is anonymous
-		 */
-		this.name = function() {
-			return mediaWiki.config.get( 'wgUserName' );
-		};
-
-		/*
-		 * Gets a random session ID automatically generated and kept in a cookie.
-		 * 
-		 * This ID is ephemeral for everyone, staying in their browser only until they close
-		 * their browser.
-		 * 
-		 * Do not use this method before the first call to mediaWiki.loader.go(), it depends on
-		 * jquery.cookie, which is added to the first pay-load just after mediaWiki is defined, but
-		 * won't be loaded until the first call to go().
-		 * 
-		 * @return string user name or random session ID
-		 */
-		this.sessionId = function () {
-			var sessionId = $.cookie( 'mediaWiki.user.sessionId' );
-			if ( typeof sessionId == 'undefined' || sessionId == null ) {
-				sessionId = generateId();
-				$.cookie( 'mediaWiki.user.sessionId', sessionId, { 'expires': null, 'path': '/' } );
-			}
-			return sessionId;
-		};
-
-		/*
-		 * Gets the current user's name or a random ID automatically generated and kept in a cookie.
-		 * 
-		 * This ID is persistent for anonymous users, staying in their browser up to 1 year. The
-		 * expiration time is reset each time the ID is queried, so in most cases this ID will
-		 * persist until the browser's cookies are cleared or the user doesn't visit for 1 year.
-		 * 
-		 * Do not use this method before the first call to mediaWiki.loader.go(), it depends on
-		 * jquery.cookie, which is added to the first pay-load just after mediaWiki is defined, but
-		 * won't be loaded until the first call to go().
-		 * 
-		 * @return string user name or random session ID
-		 */
-		this.id = function() {
-			var name = that.name();
-			if ( name ) {
-				return name;
-			}
-			var id = $.cookie( 'mediaWiki.user.id' );
-			if ( typeof id == 'undefined' || id == null ) {
-				id = generateId();
-			}
-			// Set cookie if not set, or renew it if already set
-			$.cookie( 'mediaWiki.user.id', id, { 'expires': 365, 'path': '/' } );
-			return id;
-		};
-	}
-
 	/* Public Members */
 
 	/*
 	 * Dummy function which in debug mode can be replaced with a function that
-	 * does something clever
+	 * emulates console.log in console-less environments.
 	 */
 	this.log = function() { };
 
-	/*
+	/**
+	 * @var constructor Make the Map-class publicly available.
+	 */
+	this.Map = Map;
+
+	/**
 	 * List of configuration values
 	 *
-	 * In legacy mode the values this object wraps will be in the global space
+	 * Dummy placeholder. Initiated in startUp module as a new instance of mw.Map().
+	 * If $wgLegacyJavaScriptGlobals is true, this Map will have its values
+	 * in the global window object.
 	 */
-	this.config = new Map( LEGACY_GLOBALS );
+	this.config = null;
 
-	/*
-	 * Information about the current user
+	/**
+	 * @var object
+	 *
+	 * Empty object that plugins can be installed in.
 	 */
-	this.user = new User();
+	this.libs = {};
 
 	/*
 	 * Localization system
 	 */
-	this.messages = new Map();
+	this.messages = new this.Map();
 
 	/* Public Methods */
 
@@ -336,29 +254,32 @@ window.mediaWiki = new ( function( $ ) {
 	 * Gets a message object, similar to wfMessage()
 	 *
 	 * @param key string Key of message to get
-	 * @param parameters mixed First argument in a list of variadic arguments, each a parameter for $
-	 * replacement
+	 * @param parameter_1 mixed First argument in a list of variadic arguments,
+	 * each a parameter for $N replacement in messages.
+	 * @return Message
 	 */
-	this.message = function( key, parameters ) {
+	this.message = function( key, parameter_1 /* [, parameter_2] */ ) {
+		var parameters;
 		// Support variadic arguments
-		if ( typeof parameters !== 'undefined' ) {
+		if ( parameter_1 !== undefined ) {
 			parameters = $.makeArray( arguments );
 			parameters.shift();
 		} else {
 			parameters = [];
 		}
-		return new Message( mediaWiki.messages, key, parameters );
+		return new Message( mw.messages, key, parameters );
 	};
 
 	/**
 	 * Gets a message string, similar to wfMsg()
 	 *
 	 * @param key string Key of message to get
-	 * @param parameters mixed First argument in a list of variadic arguments, each a parameter for $
-	 * replacement
+	 * @param parameters mixed First argument in a list of variadic arguments,
+	 * each a parameter for $N replacement in messages.
+	 * @return String.
 	 */
 	this.msg = function( key, parameters ) {
-		return mediaWiki.message.apply( mediaWiki.message, arguments ).toString();
+		return mw.message.apply( mw.message, arguments ).toString();
 	};
 
 	/**
@@ -378,16 +299,16 @@ window.mediaWiki = new ( function( $ ) {
 		 * mediawiki.
 		 *
 		 * Format:
-		 * 	{
-		 * 		'moduleName': {
-		 * 			'dependencies': ['required module', 'required module', ...], (or) function() {}
-		 * 			'state': 'registered', 'loading', 'loaded', 'ready', or 'error'
-		 * 			'script': function() {},
-		 * 			'style': 'css code string',
-		 * 			'messages': { 'key': 'value' },
-		 * 			'version': ############## (unix timestamp)
-		 * 		}
-		 * 	}
+		 *   {
+		 *     'moduleName': {
+		 *       'dependencies': ['required module', 'required module', ...], (or) function() {}
+		 *       'state': 'registered', 'loading', 'loaded', 'ready', or 'error'
+		 *       'script': function() {},
+		 *       'style': 'css code string',
+		 *       'messages': { 'key': 'value' },
+		 *       'version': ############## (unix timestamp)
+		 *     }
+		 *   }
 		 */
 		var registry = {};
 		// List of modules which will be loaded as when ready
@@ -396,15 +317,28 @@ window.mediaWiki = new ( function( $ ) {
 		var queue = [];
 		// List of callback functions waiting for modules to be ready to be called
 		var jobs = [];
-		// Flag indicating that requests should be suspended
-		var suspended = true;
 		// Flag inidicating that document ready has occured
 		var ready = false;
-		// Marker element for adding dynamic styles
-		var $marker = $( 'head meta[name=ResourceLoaderDynamicStyles]' );
+		// Selector cache for the marker element. Use getMarker() to get/use the marker!
+		var $marker = null;
 
 		/* Private Methods */
 
+		function getMarker(){
+			// Cached ?
+			if ( $marker ) {
+				return $marker;
+			} else {
+				$marker = $( 'meta[name="ResourceLoaderDynamicStyles"]' );
+				if ( $marker.length ) {
+					return $marker;
+				}
+				mw.log( 'getMarker> No <meta name="ResourceLoaderDynamicStyles"> found, inserting dynamically.' );
+				$marker = $( '<meta>' ).attr( 'name', 'ResourceLoaderDynamicStyles' ).appendTo( 'head' );
+				return $marker;
+			}
+		}
+
 		function compare( a, b ) {
 			if ( a.length != b.length ) {
 				return false;
@@ -420,7 +354,7 @@ window.mediaWiki = new ( function( $ ) {
 				}
 			}
 			return true;
-		};
+		}
 
 		/**
 		 * Generates an ISO8601 "basic" string from a UNIX timestamp
@@ -441,11 +375,11 @@ window.mediaWiki = new ( function( $ ) {
 		 * Recursively resolves dependencies and detects circular references
 		 */
 		function recurse( module, resolved, unresolved ) {
-			if ( typeof registry[module] === 'undefined' ) {
+			if ( registry[module] === undefined ) {
 				throw new Error( 'Unknown dependency: ' + module );
 			}
 			// Resolves dynamic loader function and replaces it with its own results
-			if ( typeof registry[module].dependencies === 'function' ) {
+			if ( $.isFunction( registry[module].dependencies ) ) {
 				registry[module].dependencies = registry[module].dependencies();
 				// Ensures the module's dependencies are always in an array
 				if ( typeof registry[module].dependencies !== 'object' ) {
@@ -475,7 +409,7 @@ window.mediaWiki = new ( function( $ ) {
 		 * @return list of dependencies
 		 * @throws Error if circular reference is detected
 		 */
-		function resolve( module, resolved, unresolved ) {
+		function resolve( module ) {
 			// Allow calling with an array of module names
 			if ( typeof module === 'object' ) {
 				var modules = [];
@@ -496,7 +430,7 @@ window.mediaWiki = new ( function( $ ) {
 				return resolved;
 			}
 			throw new Error( 'Invalid module argument: ' + module );
-		};
+		}
 
 		/**
 		 * Narrows a list of module names down to those matching a specific
@@ -514,8 +448,8 @@ window.mediaWiki = new ( function( $ ) {
 				states = [states];
 			}
 			// If called without a list of modules, build and use a list of all modules
-			var list = [];
-			if ( typeof modules === 'undefined' ) {
+			var list = [], module;
+			if ( modules === undefined ) {
 				modules = [];
 				for ( module in registry ) {
 					modules[modules.length] = module;
@@ -524,7 +458,7 @@ window.mediaWiki = new ( function( $ ) {
 			// Build a list of modules which are in one of the specified states
 			for ( var s = 0; s < states.length; s++ ) {
 				for ( var m = 0; m < modules.length; m++ ) {
-					if ( typeof registry[modules[m]] === 'undefined' ) {
+					if ( registry[modules[m]] === undefined ) {
 						// Module does not exist
 						if ( states[s] == 'undefined' ) {
 							// OK, undefined
@@ -547,8 +481,9 @@ window.mediaWiki = new ( function( $ ) {
 		 *
 		 * @param module string module name to execute
 		 */
-		function execute( module ) {
-			if ( typeof registry[module] === 'undefined' ) {
+		function execute( module, callback ) {
+			var _fn = 'mw.loader::execute> ';
+			if ( registry[module] === undefined ) {
 				throw new Error( 'Module has not been registered yet: ' + module );
 			} else if ( registry[module].state === 'registered' ) {
 				throw new Error( 'Module has not been requested from the server yet: ' + module );
@@ -557,37 +492,88 @@ window.mediaWiki = new ( function( $ ) {
 			} else if ( registry[module].state === 'ready' ) {
 				throw new Error( 'Module has already been loaded: ' + module );
 			}
-			// Add style sheet to document
-			if ( typeof registry[module].style === 'string' && registry[module].style.length ) {
-				$marker.before( mediaWiki.html.element( 'style',
-						{ type: 'text/css' },
-						new mediaWiki.html.Cdata( registry[module].style )
-					) );
-			} else if ( typeof registry[module].style === 'object'
-				&& !( registry[module].style instanceof Array ) )
-			{
+			// Add styles
+			if ( $.isPlainObject( registry[module].style ) ) {
 				for ( var media in registry[module].style ) {
-					$marker.before( mediaWiki.html.element( 'style',
-						{ type: 'text/css', media: media },
-						new mediaWiki.html.Cdata( registry[module].style[media] )
-					) );
+					var style = registry[module].style[media];
+					if ( $.isArray( style ) ) {
+						for ( var i = 0; i < style.length; i++ ) {
+							getMarker().before( mw.html.element( 'link', {
+								'type': 'text/css',
+								'media': media,
+								'rel': 'stylesheet',
+								'href': style[i]
+							} ) );
+						}
+					} else if ( typeof style === 'string' ) {
+						getMarker().before( mw.html.element(
+							'style',
+							{ 'type': 'text/css', 'media': media },
+							new mw.html.Cdata( style )
+						) );
+					}
 				}
 			}
 			// Add localizations to message system
-			if ( typeof registry[module].messages === 'object' ) {
-				mediaWiki.messages.set( registry[module].messages );
+			if ( $.isPlainObject( registry[module].messages ) ) {
+				mw.messages.set( registry[module].messages );
 			}
 			// Execute script
 			try {
-				registry[module].script( jQuery, mediaWiki );
-				registry[module].state = 'ready';
+				var	script = registry[module].script,
+					markModuleReady = function() {
+						registry[module].state = 'ready';
+						handlePending( module );
+						if ( $.isFunction( callback ) ) {
+							callback();
+						}
+					},
+					nestedAddScript = function( arr, callback, i ) {
+						// Recursively call addScript() in its own callback
+						// for each element of arr.
+						if ( i >= arr.length ) {
+							// We're at the end of the array
+							callback();
+							return;
+						}
+						
+						addScript( arr[i], function() {
+							nestedAddScript( arr, callback, i + 1 );
+						} );
+					};
+
+				if ( $.isArray( script ) ) {
+					registry[module].state = 'loading';
+					nestedAddScript( script, markModuleReady, 0 );
+				} else if ( $.isFunction( script ) ) {
+					script( jQuery );
+					markModuleReady();
+				}
+			} catch ( e ) {
+				// This needs to NOT use mw.log because these errors are common in production mode
+				// and not in debug mode, such as when a symbol that should be global isn't exported
+				if ( window.console && typeof window.console.log === 'function' ) {
+					console.log( _fn + 'Exception thrown by ' + module + ': ' + e.message );
+				}
+				registry[module].state = 'error';
+				throw e;
+			}
+		}
+
+		/**
+		 * Automatically executes jobs and modules which are pending with satistifed dependencies.
+		 *
+		 * This is used when dependencies are satisfied, such as when a module is executed.
+		 */
+		function handlePending( module ) {
+			try {
 				// Run jobs who's dependencies have just been met
 				for ( var j = 0; j < jobs.length; j++ ) {
 					if ( compare(
 						filter( 'ready', jobs[j].dependencies ),
 						jobs[j].dependencies ) )
 					{
-						if ( typeof jobs[j].ready === 'function' ) {
+						if ( $.isFunction( jobs[j].ready ) ) {
 							jobs[j].ready();
 						}
 						jobs.splice( j, 1 );
@@ -595,7 +581,7 @@ window.mediaWiki = new ( function( $ ) {
 					}
 				}
 				// Execute modules who's dependencies have just been met
-				for ( r in registry ) {
+				for ( var r in registry ) {
 					if ( registry[r].state == 'loaded' ) {
 						if ( compare(
 							filter( ['ready'], registry[r].dependencies ),
@@ -606,13 +592,10 @@ window.mediaWiki = new ( function( $ ) {
 					}
 				}
 			} catch ( e ) {
-				mediaWiki.log( 'Exception thrown by ' + module + ': ' + e.message );
-				mediaWiki.log( e );
-				registry[module].state = 'error';
 				// Run error callbacks of jobs affected by this condition
 				for ( var j = 0; j < jobs.length; j++ ) {
 					if ( $.inArray( module, jobs[j].dependencies ) !== -1 ) {
-						if ( typeof jobs[j].error === 'function' ) {
+						if ( $.isFunction( jobs[j].error ) ) {
 							jobs[j].error();
 						}
 						jobs.splice( j, 1 );
@@ -659,7 +642,7 @@ window.mediaWiki = new ( function( $ ) {
 				}
 			}
 			// Work the queue
-			mediaWiki.loader.work();
+			mw.loader.work();
 		}
 
 		function sortQuery(o) {
@@ -675,7 +658,7 @@ window.mediaWiki = new ( function( $ ) {
 			}
 			return sorted;
 		}
-		
+
 		/**
 		 * Converts a module map of the form { foo: [ 'bar', 'baz' ], bar: [ 'baz, 'quux' ] }
 		 * to a query string of the form foo.bar,baz|bar.baz,quux
@@ -688,7 +671,55 @@ window.mediaWiki = new ( function( $ ) {
 			}
 			return arr.join( '|' );
 		}
-		
+
+		/**
+		 * Adds a script tag to the body, either using document.write or low-level DOM manipulation,
+		 * depending on whether document-ready has occured yet.
+		 *
+		 * @param src String: URL to script, will be used as the src attribute in the script tag
+		 * @param callback Function: Optional callback which will be run when the script is done
+		 */
+		function addScript( src, callback ) {
+			if ( ready ) {
+				// jQuery's getScript method is NOT better than doing this the old-fashioned way
+				// because jQuery will eval the script's code, and errors will not have sane
+				// line numbers.
+				var script = document.createElement( 'script' );
+				script.setAttribute( 'src', src );
+				script.setAttribute( 'type', 'text/javascript' );
+				if ( $.isFunction( callback ) ) {
+					var done = false;
+					// Attach handlers for all browsers -- this is based on jQuery.getScript
+					script.onload = script.onreadystatechange = function() {
+						if (
+							!done
+							&& (
+								!this.readyState
+								|| this.readyState === 'loaded'
+								|| this.readyState === 'complete'
+							)
+						) {
+							done = true;
+							callback();
+							// Handle memory leak in IE
+							script.onload = script.onreadystatechange = null;
+							if ( script.parentNode ) {
+								script.parentNode.removeChild( script );
+							}
+						}
+					};
+				}
+				document.body.appendChild( script );
+			} else {
+				document.write( mw.html.element(
+					'script', { 'type': 'text/javascript', 'src': src }, ''
+				) );
+				if ( $.isFunction( callback ) ) {
+					// Document.write is synchronous, so this is called when it's done
+					callback();
+				}
+			}
+		}
 
 		/* Public Methods */
 
@@ -710,102 +741,92 @@ window.mediaWiki = new ( function( $ ) {
 					}
 				}
 			}
+			// Early exit if there's nothing to load
+			if ( !batch.length ) {
+				return;
+			}
 			// Clean up the queue
 			queue = [];
-			// After document ready, handle the batch
-			if ( !suspended && batch.length ) {
-				// Always order modules alphabetically to help reduce cache
-				// misses for otherwise identical content
-				batch.sort();
-				// Build a list of request parameters
-				var base = {
-					'skin': mediaWiki.config.get( 'skin' ),
-					'lang': mediaWiki.config.get( 'wgUserLanguage' ),
-					'debug': mediaWiki.config.get( 'debug' )
-				};
-				// Extend request parameters with a list of modules in the batch
-				var requests = [];
-				// Split into groups
-				var groups = {};
-				for ( var b = 0; b < batch.length; b++ ) {
-					var group = registry[batch[b]].group;
-					if ( !( group in groups ) ) {
-						groups[group] = [];
-					}
-					groups[group][groups[group].length] = batch[b];
+			// Always order modules alphabetically to help reduce cache
+			// misses for otherwise identical content
+			batch.sort();
+			// Build a list of request parameters
+			var base = {
+				'skin': mw.config.get( 'skin' ),
+				'lang': mw.config.get( 'wgUserLanguage' ),
+				'debug': mw.config.get( 'debug' )
+			};
+			// Extend request parameters with a list of modules in the batch
+			var requests = [];
+			// Split into groups
+			var groups = {};
+			for ( var b = 0; b < batch.length; b++ ) {
+				var group = registry[batch[b]].group;
+				if ( !( group in groups ) ) {
+					groups[group] = [];
 				}
-				for ( var group in groups ) {
-					// Calculate the highest timestamp
-					var version = 0;
-					for ( var g = 0; g < groups[group].length; g++ ) {
-						if ( registry[groups[group][g]].version > version ) {
-							version = registry[groups[group][g]].version;
-						}
-					}
-					var reqBase = $.extend( { 'version': formatVersionNumber( version ) }, base );
-					var reqBaseLength = $.param( reqBase ).length;
-					var reqs = [];
-					var limit = mw.config.get( 'wgResourceLoaderMaxQueryLength', -1 );
-					// We may need to split up the request to honor the query string length limit
-					// So build it piece by piece
-					var l = reqBaseLength + 9; // '&modules='.length == 9
-					var r = 0;
-					reqs[0] = {}; // { prefix: [ suffixes ] }
-					for ( var i = 0; i < groups[group].length; i++ ) {
-						// Determine how many bytes this module would add to the query string
-						var lastDotIndex = groups[group][i].lastIndexOf( '.' );
-						// Note that these substr() calls work even if lastDotIndex == -1
-						var prefix = groups[group][i].substr( 0, lastDotIndex );
-						var suffix = groups[group][i].substr( lastDotIndex + 1 );
-						var bytesAdded = prefix in reqs[r] ?
-							suffix.length + 3 : // '%2C'.length == 3
-							groups[group][i].length + 3; // '%7C'.length == 3
-						
-						// If the request would become too long, create a new one,
-						// but don't create empty requests
-						if ( limit > 0 &&  reqs[r] != {} && l + bytesAdded > limit ) {
-							// This request would become too long, create a new one
-							r++;
-							reqs[r] = {};
-							l = reqBaseLength + 9;
-						}
-						if ( !( prefix in reqs[r] ) ) {
-							reqs[r][prefix] = [];
-						}
-						reqs[r][prefix].push( suffix );
-						l += bytesAdded;
-					}
-					for ( var r = 0; r < reqs.length; r++ ) {
-						requests[requests.length] = $.extend(
-							{ 'modules': buildModulesString( reqs[r] ) }, reqBase
-						);
+				groups[group][groups[group].length] = batch[b];
+			}
+			for ( var group in groups ) {
+				// Calculate the highest timestamp
+				var version = 0;
+				for ( var g = 0; g < groups[group].length; g++ ) {
+					if ( registry[groups[group][g]].version > version ) {
+						version = registry[groups[group][g]].version;
 					}
 				}
-				// Clear the batch - this MUST happen before we append the
-				// script element to the body or it's possible that the script
-				// will be locally cached, instantly load, and work the batch
-				// again, all before we've cleared it causing each request to
-				// include modules which are already loaded
-				batch = [];
-				// Asynchronously append a script tag to the end of the body
-				function request() {
-					var html = '';
-					for ( var r = 0; r < requests.length; r++ ) {
-						requests[r] = sortQuery( requests[r] );
-						// Build out the HTML
-						var src = mediaWiki.config.get( 'wgLoadScript' ) + '?' + $.param( requests[r] );
-						html += mediaWiki.html.element( 'script',
-							{ type: 'text/javascript', src: src }, '' );
+				var reqBase = $.extend( { 'version': formatVersionNumber( version ) }, base );
+				var reqBaseLength = $.param( reqBase ).length;
+				var reqs = [];
+				var limit = mw.config.get( 'wgResourceLoaderMaxQueryLength', -1 );
+				// We may need to split up the request to honor the query string length limit
+				// So build it piece by piece
+				var l = reqBaseLength + 9; // '&modules='.length == 9
+				var r = 0;
+				reqs[0] = {}; // { prefix: [ suffixes ] }
+				for ( var i = 0; i < groups[group].length; i++ ) {
+					// Determine how many bytes this module would add to the query string
+					var lastDotIndex = groups[group][i].lastIndexOf( '.' );
+					// Note that these substr() calls work even if lastDotIndex == -1
+					var prefix = groups[group][i].substr( 0, lastDotIndex );
+					var suffix = groups[group][i].substr( lastDotIndex + 1 );
+					var bytesAdded = prefix in reqs[r] ?
+						suffix.length + 3 : // '%2C'.length == 3
+						groups[group][i].length + 3; // '%7C'.length == 3
+
+					// If the request would become too long, create a new one,
+					// but don't create empty requests
+					if ( limit > 0 &&  reqs[r] != {} && l + bytesAdded > limit ) {
+						// This request would become too long, create a new one
+						r++;
+						reqs[r] = {};
+						l = reqBaseLength + 9;
+					}
+					if ( !( prefix in reqs[r] ) ) {
+						reqs[r][prefix] = [];
 					}
-					return html;
+					reqs[r][prefix].push( suffix );
+					l += bytesAdded;
 				}
-				// Load asynchronously after doumument ready
-				if ( ready ) {
-					setTimeout( function() { $( 'body' ).append( request() ); }, 0 )
-				} else {
-					document.write( request() );
+				for ( var r = 0; r < reqs.length; r++ ) {
+					requests[requests.length] = $.extend(
+						{ 'modules': buildModulesString( reqs[r] ) }, reqBase
+					);
 				}
 			}
+			// Clear the batch - this MUST happen before we append the
+			// script element to the body or it's possible that the script
+			// will be locally cached, instantly load, and work the batch
+			// again, all before we've cleared it causing each request to
+			// include modules which are already loaded
+			batch = [];
+			// Asynchronously append a script tag to the end of the body
+			for ( var r = 0; r < requests.length; r++ ) {
+				requests[r] = sortQuery( requests[r] );
+				// Append &* to avoid triggering the IE6 extension check
+				var src = mw.config.get( 'wgLoadScript' ) + '?' + $.param( requests[r] ) + '&*';
+				addScript( src );
+			}
 		};
 
 		/**
@@ -817,9 +838,9 @@ window.mediaWiki = new ( function( $ ) {
 			if ( typeof module === 'object' ) {
 				for ( var m = 0; m < module.length; m++ ) {
 					if ( typeof module[m] === 'string' ) {
-						mediaWiki.loader.register( module[m] );
+						mw.loader.register( module[m] );
 					} else if ( typeof module[m] === 'object' ) {
-						mediaWiki.loader.register.apply( mediaWiki.loader, module[m] );
+						mw.loader.register.apply( mw.loader, module[m] );
 					}
 				}
 				return;
@@ -828,20 +849,20 @@ window.mediaWiki = new ( function( $ ) {
 			if ( typeof module !== 'string' ) {
 				throw new Error( 'module must be a string, not a ' + typeof module );
 			}
-			if ( typeof registry[module] !== 'undefined' ) {
-				throw new Error( 'module already implemeneted: ' + module );
+			if ( registry[module] !== undefined ) {
+				throw new Error( 'module already implemented: ' + module );
 			}
 			// List the module as registered
 			registry[module] = {
 				'state': 'registered',
 				'group': typeof group === 'string' ? group : null,
 				'dependencies': [],
-				'version': typeof version !== 'undefined' ? parseInt( version ) : 0
+				'version': version !== undefined ? parseInt( version, 10 ) : 0
 			};
 			if ( typeof dependencies === 'string' ) {
 				// Allow dependencies to be given as a single module name
 				registry[module].dependencies = [dependencies];
-			} else if ( typeof dependencies === 'object' || typeof dependencies === 'function' ) {
+			} else if ( typeof dependencies === 'object' || $.isFunction( dependencies ) ) {
 				// Allow dependencies to be given as an array of module names
 				// or a function which returns an array
 				registry[module].dependencies = dependencies;
@@ -852,44 +873,44 @@ window.mediaWiki = new ( function( $ ) {
 		 * Implements a module, giving the system a course of action to take
 		 * upon loading. Results of a request for one or more modules contain
 		 * calls to this function.
+		 *
+		 * All arguments are required.
+		 *
+		 * @param module String: Name of module
+		 * @param script Mixed: Function of module code or String of URL to be used as the src
+		 * attribute when adding a script element to the body
+		 * @param style Object: Object of CSS strings keyed by media-type or Object of lists of URLs
+		 * keyed by media-type
+		 * @param msgs Object: List of key/value pairs to be passed through mw.messages.set
 		 */
-		this.implement = function( module, script, style, localization ) {
-			// Automatically register module
-			if ( typeof registry[module] === 'undefined' ) {
-				mediaWiki.loader.register( module );
-			}
+		this.implement = function( module, script, style, msgs ) {
 			// Validate input
-			if ( typeof script !== 'function' ) {
-				throw new Error( 'script must be a function, not a ' + typeof script );
+			if ( typeof module !== 'string' ) {
+				throw new Error( 'module must be a string, not a ' + typeof module );
 			}
-			if ( typeof style !== 'undefined'
-				&& typeof style !== 'string'
-				&& typeof style !== 'object' )
-			{
-				throw new Error( 'style must be a string or object, not a ' + typeof style );
+			if ( !$.isFunction( script ) && !$.isArray( script ) ) {
+				throw new Error( 'script must be a function or an array, not a ' + typeof script );
 			}
-			if ( typeof localization !== 'undefined'
-				&& typeof localization !== 'object' )
-			{
-				throw new Error( 'localization must be an object, not a ' + typeof localization );
+			if ( !$.isPlainObject( style ) ) {
+				throw new Error( 'style must be an object, not a ' + typeof style );
 			}
-			if ( typeof registry[module] !== 'undefined'
-				&& typeof registry[module].script !== 'undefined' )
-			{
+			if ( !$.isPlainObject( msgs ) ) {
+				throw new Error( 'msgs must be an object, not a ' + typeof msgs );
+			}
+			// Automatically register module
+			if ( registry[module] === undefined ) {
+				mw.loader.register( module );
+			}
+			// Check for duplicate implementation
+			if ( registry[module] !== undefined && registry[module].script !== undefined ) {
 				throw new Error( 'module already implemeneted: ' + module );
 			}
 			// Mark module as loaded
 			registry[module].state = 'loaded';
 			// Attach components
 			registry[module].script = script;
-			if ( typeof style === 'string'
-				|| typeof style === 'object' && !( style instanceof Array ) )
-			{
-				registry[module].style = style;
-			}
-			if ( typeof localization === 'object' ) {
-				registry[module].messages = localization;
-			}
+			registry[module].style = style;
+			registry[module].messages = msgs;
 			// Execute or queue callback
 			if ( compare(
 				filter( ['ready'], registry[module].dependencies ),
@@ -914,7 +935,7 @@ window.mediaWiki = new ( function( $ ) {
 			// Validate input
 			if ( typeof dependencies !== 'object' && typeof dependencies !== 'string' ) {
 				throw new Error( 'dependencies must be a string or an array, not a ' +
-					typeof dependencies )
+					typeof dependencies );
 			}
 			// Allow calling with a single dependency as a string
 			if ( typeof dependencies === 'string' ) {
@@ -924,13 +945,13 @@ window.mediaWiki = new ( function( $ ) {
 			dependencies = resolve( dependencies );
 			// If all dependencies are met, execute ready immediately
 			if ( compare( filter( ['ready'], dependencies ), dependencies ) ) {
-				if ( typeof ready === 'function' ) {
+				if ( $.isFunction( ready ) ) {
 					ready();
 				}
 			}
 			// If any dependencies have errors execute error immediately
 			else if ( filter( ['error'], dependencies ).length ) {
-				if ( typeof error === 'function' ) {
+				if ( $.isFunction( error ) ) {
 					error();
 				}
 			}
@@ -953,26 +974,22 @@ window.mediaWiki = new ( function( $ ) {
 		this.load = function( modules, type ) {
 			// Validate input
 			if ( typeof modules !== 'object' && typeof modules !== 'string' ) {
-				throw new Error( 'dependencies must be a string or an array, not a ' +
-					typeof dependencies )
+				throw new Error( 'modules must be a string or an array, not a ' +
+					typeof modules );
 			}
 			// Allow calling with an external script or single dependency as a string
 			if ( typeof modules === 'string' ) {
 				// Support adding arbitrary external scripts
-				if ( modules.substr( 0, 7 ) == 'http://' || modules.substr( 0, 8 ) == 'https://' ) {
+				if ( modules.substr( 0, 7 ) === 'http://' || modules.substr( 0, 8 ) === 'https://' || modules.substr( 0, 2 ) === '//' ) {
 					if ( type === 'text/css' ) {
-						$( 'head' )
-							.append( $( '<link rel="stylesheet" type="text/css" />' )
-							.attr( 'href', modules ) );
+						$( 'head' ).append( $( '<link />', {
+							rel: 'stylesheet',
+							type: 'text/css',
+							href: modules
+						} ) );
 						return true;
-					} else if ( type === 'text/javascript' || typeof type === 'undefined' ) {
-						var script = mediaWiki.html.element( 'script',
-							{ type: 'text/javascript', src: modules }, '' );
-						if ( ready ) {
-							$( 'body' ).append( script );
-						} else {
-							document.write( script );
-						}
+					} else if ( type === 'text/javascript' || type === undefined ) {
+						addScript( modules );
 						return true;
 					}
 					// Unknown type
@@ -999,14 +1016,6 @@ window.mediaWiki = new ( function( $ ) {
 		};
 
 		/**
-		 * Flushes the request queue and begin executing load requests on demand
-		 */
-		this.go = function() {
-			suspended = false;
-			mediaWiki.loader.work();
-		};
-
-		/**
 		 * Changes the state of a module
 		 *
 		 * @param module string module name or object of module name/state pairs
@@ -1015,12 +1024,12 @@ window.mediaWiki = new ( function( $ ) {
 		this.state = function( module, state ) {
 			if ( typeof module === 'object' ) {
 				for ( var m in module ) {
-					mediaWiki.loader.state( m, module[m] );
+					mw.loader.state( m, module[m] );
 				}
 				return;
 			}
 			if ( !( module in registry ) ) {
-				mediaWiki.loader.register( module );
+				mw.loader.register( module );
 			}
 			registry[module].state = state;
 		};
@@ -1030,12 +1039,35 @@ window.mediaWiki = new ( function( $ ) {
 		 *
 		 * @param module string name of module to get version for
 		 */
-		this.version = function( module ) {
+		this.getVersion = function( module ) {
 			if ( module in registry && 'version' in registry[module] ) {
 				return formatVersionNumber( registry[module].version );
 			}
 			return null;
 		};
+		/**
+		* @deprecated use mw.loader.getVersion() instead
+		*/
+		this.version = function() {
+			return mediaWiki.loader.getVersion.apply( mediaWiki.loader, arguments );
+		};
+
+		/**
+		 * Gets the state of a module
+		 *
+		 * @param module string name of module to get state for
+		 */
+		this.getState = function( module ) {
+			if ( module in registry && 'state' in registry[module] ) {
+				return registry[module].state;
+			}
+			return null;
+		};
+		
+		/**
+		 * For backwards-compatibility with Squid-cached pages. Loads mw.user
+		 */
+		this.go = function() { mw.loader.load( 'mediawiki.user' ); };
 
 		/* Cache document ready status */
 
@@ -1044,7 +1076,7 @@ window.mediaWiki = new ( function( $ ) {
 
 	/** HTML construction helper functions */
 	this.html = new ( function () {
-		function escapeCallback( s ) {
+		var escapeCallback = function( s ) {
 			switch ( s ) {
 				case "'":
 					return '&#039;';
@@ -1057,7 +1089,7 @@ window.mediaWiki = new ( function( $ ) {
 				case '&':
 					return '&amp;';
 			}
-		}
+		};
 
 		/**
 		 * Escape a string for HTML. Converts special characters to HTML entities.
@@ -1068,14 +1100,14 @@ window.mediaWiki = new ( function( $ ) {
 		};
 
 		/**
-		 * Wrapper object for raw HTML passed to mediaWiki.html.element().
+		 * Wrapper object for raw HTML passed to mw.html.element().
 		 */
 		this.Raw = function( value ) {
 			this.value = value;
 		};
 
 		/**
-		 * Wrapper object for CDATA element contents passed to mediaWiki.html.element()
+		 * Wrapper object for CDATA element contents passed to mw.html.element()
 		 */
 		this.Cdata = function( value ) {
 			this.value = value;
@@ -1095,7 +1127,7 @@ window.mediaWiki = new ( function( $ ) {
 		 *      See http://www.w3.org/TR/1999/REC-html401-19991224/appendix/notes.html#h-B.3.2
 		 *
 		 * Example:
-		 *    var h = mediaWiki.html;
+		 *    var h = mw.html;
 		 *    return h.element( 'div', {},
 		 *        new h.Raw( h.element( 'img', {src: '<'} ) ) );
 		 * Returns <div><img src="&lt;"/></div>
@@ -1105,14 +1137,14 @@ window.mediaWiki = new ( function( $ ) {
 			for ( var attrName in attrs ) {
 				s += ' ' + attrName + '="' + this.escape( attrs[attrName] ) + '"';
 			}
-			if ( typeof contents == 'undefined' || contents === null ) {
+			if ( contents === undefined || contents === null ) {
 				// Self close tag
 				s += '/>';
 				return s;
 			}
 			// Regular open tag
 			s += '>';
-			if ( typeof contents === 'string') {
+			if ( typeof contents === 'string' ) {
 				// Escaped
 				s += this.escape( contents );
 			} else if ( contents instanceof this.Raw ) {
@@ -1132,23 +1164,21 @@ window.mediaWiki = new ( function( $ ) {
 		};
 	} )();
 
-
 	/* Extension points */
 
 	this.legacy = {};
 
 } )( jQuery );
 
+// Alias $j to jQuery for backwards compatibility
+window.$j = jQuery;
+
+// Global alias
+window.mw = mediaWiki;
+
 /* Auto-register from pre-loaded startup scripts */
 
-if ( typeof startUp === 'function' ) {
+if ( jQuery.isFunction( startUp ) ) {
 	startUp();
 	delete startUp;
 }
-
-// Add jQuery Cookie to initial payload (used in mediaWiki.user)
-mediaWiki.loader.load( 'jquery.cookie' );
-
-// Alias $j to jQuery for backwards compatibility
-window.$j = jQuery;
-window.mw = mediaWiki;
diff --git a/resources/mediawiki/mediawiki.log.js b/resources/mediawiki/mediawiki.log.js
index 55bf77f0..38f3411f 100644
--- a/resources/mediawiki/mediawiki.log.js
+++ b/resources/mediawiki/mediawiki.log.js
@@ -2,7 +2,7 @@
  * Implementation for mediaWiki.log stub
  */
 
-(function ($, mw) {
+(function( $ ) {
 
 	/**
 	 * Log output to the console.
@@ -13,16 +13,16 @@
 	 *
 	 * @author Michael Dale <mdale@wikimedia.org>
 	 * @author Trevor Parscal <tparscal@wikimedia.org>
-	 * @param {string} string Message to output to console
+	 * @param logmsg string Message to output to console.
 	 */
-	mediaWiki.log = function( string ) {
-		// Allow log messages to use a configured prefix
+	mw.log = function( logmsg ) {
+		// Allow log messages to use a configured prefix to identify the source window (ie. frame)
 		if ( mw.config.exists( 'mw.log.prefix' ) ) {
-			string = mw.config.get( 'mw.log.prefix' ) + '> ' + string;
+			logmsg = mw.config.get( 'mw.log.prefix' ) + '> ' + logmsg;
 		}
 		// Try to use an existing console
-		if ( typeof window.console !== 'undefined' && typeof window.console.log == 'function' ) {
-			window.console.log( string );
+		if ( window.console !== undefined && $.isFunction( window.console.log ) ) {
+			window.console.log( logmsg );
 		} else {
 			// Set timestamp
 			var d = new Date();
@@ -35,7 +35,7 @@
 			if ( !$log.length ) {
 				$log = $( '<div id="mw-log-console"></div>' )
 					.css( {
-						'position': 'absolute',
+						'position': 'fixed',
 						'overflow': 'auto',
 						'z-index': 500,
 						'bottom': '0px',
@@ -44,8 +44,10 @@
 						'height': '150px',
 						'background-color': 'white',
 						'border-top': 'solid 2px #ADADAD'
-					} )
-					.appendTo( 'body' );
+					} );
+				$( 'body' )
+					.css( 'padding-bottom', '150px' ) // don't hide anything
+					.append( $log );
 			}
 			$log.append(
 				$( '<div></div>' )
@@ -53,12 +55,13 @@
 						'border-bottom': 'solid 1px #DDDDDD',
 						'font-size': 'small',
 						'font-family': 'monospace',
+						'white-space': 'pre-wrap',
 						'padding': '0.125em 0.25em'
 					} )
-					.text( string )
-					.append( '<span style="float:right">[' + time + ']</span>' )
+					.text( logmsg )
+					.prepend( '<span style="float:right">[' + time + ']</span>' )
 			);
 		}
 	};
 
-})(jQuery, mediaWiki);
+})(jQuery);
diff --git a/resources/mediawiki/mediawiki.user.js b/resources/mediawiki/mediawiki.user.js
new file mode 100644
index 00000000..b0176cf4
--- /dev/null
+++ b/resources/mediawiki/mediawiki.user.js
@@ -0,0 +1,181 @@
+/*
+ * Implementation for mediaWiki.log stub
+ */
+
+(function( $ ) {
+
+	/**
+	 * User object
+	 */
+	function User() {
+
+		/* Private Members */
+
+		var that = this;
+
+		/* Public Members */
+
+		this.options = new mw.Map();
+
+		this.tokens = new mw.Map();
+
+		/* Public Methods */
+
+		/**
+		 * Generates a random user session ID (32 alpha-numeric characters).
+		 *
+		 * This information would potentially be stored in a cookie to identify a user during a
+		 * session or series of sessions. It's uniqueness should not be depended on.
+		 *
+		 * @return String: Random set of 32 alpha-numeric characters
+		 */
+		function generateId() {
+			var id = '';
+			var seed = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+			for ( var i = 0, r; i < 32; i++ ) {
+				r = Math.floor( Math.random() * seed.length );
+				id += seed.substring( r, r + 1 );
+			}
+			return id;
+		}
+
+		/**
+		 * Gets the current user's name.
+		 *
+		 * @return Mixed: User name string or null if users is anonymous
+		 */
+		this.name = function() {
+			return mw.config.get( 'wgUserName' );
+		};
+
+		/**
+		 * Checks if the current user is anonymous.
+		 *
+		 * @return Boolean
+		 */
+		this.anonymous = function() {
+			return that.name() ? false : true;
+		};
+
+		/**
+		 * Gets a random session ID automatically generated and kept in a cookie.
+		 *
+		 * This ID is ephemeral for everyone, staying in their browser only until they close
+		 * their browser.
+		 *
+		 * @return String: User name or random session ID
+		 */
+		this.sessionId = function () {
+			var sessionId = $.cookie( 'mediaWiki.user.sessionId' );
+			if ( typeof sessionId == 'undefined' || sessionId === null ) {
+				sessionId = generateId();
+				$.cookie( 'mediaWiki.user.sessionId', sessionId, { 'expires': null, 'path': '/' } );
+			}
+			return sessionId;
+		};
+
+		/**
+		 * Gets the current user's name or a random ID automatically generated and kept in a cookie.
+		 *
+		 * This ID is persistent for anonymous users, staying in their browser up to 1 year. The
+		 * expiration time is reset each time the ID is queried, so in most cases this ID will
+		 * persist until the browser's cookies are cleared or the user doesn't visit for 1 year.
+		 *
+		 * @return String: User name or random session ID
+		 */
+		this.id = function() {
+			var name = that.name();
+			if ( name ) {
+				return name;
+			}
+			var id = $.cookie( 'mediaWiki.user.id' );
+			if ( typeof id == 'undefined' || id === null ) {
+				id = generateId();
+			}
+			// Set cookie if not set, or renew it if already set
+			$.cookie( 'mediaWiki.user.id', id, { 'expires': 365, 'path': '/' } );
+			return id;
+		};
+
+		/**
+		 * Gets the user's bucket, placing them in one at random based on set odds if needed.
+		 *
+		 * @param key String: Name of bucket
+		 * @param options Object: Bucket configuration options
+		 * @param options.buckets Object: List of bucket-name/relative-probability pairs (required,
+		 * must have at least one pair)
+		 * @param options.version Number: Version of bucket test, changing this forces rebucketing
+		 * (optional, default: 0)
+		 * @param options.tracked Boolean: Track the event of bucketing through the API module of
+		 * the ClickTracking extension (optional, default: false)
+		 * @param options.expires Number: Length of time (in days) until the user gets rebucketed
+		 * (optional, default: 30)
+		 * @return String: Bucket name - the randomly chosen key of the options.buckets object
+		 *
+		 * @example
+		 *     mw.user.bucket( 'test', {
+		 *         'buckets': { 'ignored': 50, 'control': 25, 'test': 25 },
+		 *         'version': 1,
+		 *         'tracked': true,
+		 *         'expires': 7
+		 *     } );
+		 */
+		this.bucket = function( key, options ) {
+			options = $.extend( {
+				'buckets': {},
+				'version': 0,
+				'tracked': false,
+				'expires': 30
+			}, options || {} );
+			var cookie = $.cookie( 'mediaWiki.user.bucket:' + key );
+			var bucket = null;
+			var version = 0;
+			// Bucket information is stored as 2 integers, together as version:bucket like: "1:2"
+			if ( typeof cookie === 'string' && cookie.length > 2 && cookie.indexOf( ':' ) > 0 ) {
+				var parts = cookie.split( ':' );
+				if ( parts.length > 1 && parts[0] == options.version ) {
+					version = Number( parts[0] );
+					bucket = String( parts[1] );
+				}
+			}
+			if ( bucket === null ) {
+				if ( !$.isPlainObject( options.buckets ) ) {
+					throw 'Invalid buckets error. Object expected for options.buckets.';
+				}
+				version = Number( options.version );
+				// Find range
+				var	range = 0, k;
+				for ( k in options.buckets ) {
+					range += options.buckets[k];
+				}
+				// Select random value within range
+				var rand = Math.random() * range;
+				// Determine which bucket the value landed in
+				var total = 0;
+				for ( k in options.buckets ) {
+					bucket = k;
+					total += options.buckets[k];
+					if ( total >= rand ) {
+						break;
+					}
+				}
+				if ( options.tracked ) {
+					mw.loader.using( 'jquery.clickTracking', function() {
+						$.trackAction(
+							'mediaWiki.user.bucket:' + key + '@' + version + ':' + bucket
+						);
+					} );
+				}
+				$.cookie(
+					'mediaWiki.user.bucket:' + key,
+					version + ':' + bucket,
+					{ 'path': '/', 'expires': Number( options.expires ) }
+				);
+			}
+			return bucket;
+		};
+	}
+
+	mw.user = new User();
+
+})(jQuery);
\ No newline at end of file
diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js
new file mode 100644
index 00000000..71875835
--- /dev/null
+++ b/resources/mediawiki/mediawiki.util.js
@@ -0,0 +1,598 @@
+/**
+ * Utilities
+ */
+( function( $ ) {
+
+	// Local cache and alias
+	var util = mw.util = {
+
+		/* Initialisation */
+		/**
+		 * @var boolean Wether or not already initialised
+		 */
+		'initialised' : false,
+		'init' : function() {
+			if ( this.initialised === false ) {
+				this.initialised = true;
+
+				// Folllowing the initialisation after the DOM is ready
+				$(document).ready( function() {
+
+					/* Set up $.messageBox */
+					$.messageBoxNew( {
+						'id': 'mw-js-message',
+						'parent': '#content'
+					} );
+
+					// Shortcut to client profile return
+					var profile = $.client.profile();
+
+					/* Set tooltipAccessKeyPrefix */
+
+					// Opera on any platform
+					if ( profile.name == 'opera' ) {
+						util.tooltipAccessKeyPrefix = 'shift-esc-';
+
+					// Chrome on any platform
+					} else if ( profile.name == 'chrome' ) {
+						// Chrome on Mac or Chrome on other platform ?
+						util.tooltipAccessKeyPrefix = ( profile.platform == 'mac'
+							? 'ctrl-option-' : 'alt-' );
+
+					// Non-Windows Safari with webkit_version > 526
+					} else if ( profile.platform !== 'win'
+						&& profile.name == 'safari'
+						&& profile.layoutVersion > 526 ) {
+						util.tooltipAccessKeyPrefix = 'ctrl-alt-';
+
+					// Safari/Konqueror on any platform, or any browser on Mac
+					// (but not Safari on Windows)
+					} else if ( !( profile.platform == 'win' && profile.name == 'safari' )
+									&& ( profile.name == 'safari'
+									|| profile.platform == 'mac'
+									|| profile.name == 'konqueror' ) ) {
+						util.tooltipAccessKeyPrefix = 'ctrl-';
+
+					// Firefox 2.x and later
+					} else if ( profile.name == 'firefox' && profile.versionBase > '1' ) {
+						util.tooltipAccessKeyPrefix = 'alt-shift-';
+					}
+
+					/* Fill $content var */
+					if ( $( '#bodyContent' ).length ) {
+						// Vector, Monobook, Chick etc.
+						util.$content = $( '#bodyContent' );
+
+					} else if ( $( '#mw_contentholder' ).length ) {
+						// Modern
+						util.$content = $( '#mw_contentholder' );
+
+					} else if ( $( '#article' ).length ) {
+						// Standard, CologneBlue
+						util.$content = $( '#article' );
+
+					} else {
+						// #content is present on almost all if not all skins. Most skins (the above cases)
+						// have #content too, but as an outer wrapper instead of the article text container.
+						// The skins that don't have an outer wrapper do have #content for everything
+						// so it's a good fallback
+						util.$content = $( '#content' );
+					}
+
+					/* Table of Contents toggle */
+					var	$tocContainer = $( '#toc' ),
+						$tocTitle = $( '#toctitle' ),
+						$tocToggleLink = $( '#togglelink' );
+					// Only add it if there is a TOC and there is no toggle added already
+					if ( $tocContainer.size() && $tocTitle.size() && !$tocToggleLink.size() ) {
+						var	hideTocCookie = $.cookie( 'mw_hidetoc' );
+							$tocToggleLink = $( '<a href="#" class="internal" id="togglelink"></a>' )
+								.text( mw.msg( 'hidetoc' ) )
+								.click( function(e){
+									e.preventDefault();
+									util.toggleToc( $(this) );
+							} );
+						$tocTitle.append( $tocToggleLink.wrap( '<span class="toctoggle"></span>' ).parent().prepend( '&nbsp;[' ).append( ']&nbsp;' ) );
+
+						if ( hideTocCookie == '1' ) {
+							// Cookie says user want toc hidden
+							$tocToggleLink.click();
+						}
+					}
+				} );
+
+				return true;
+			}
+			return false;
+		},
+
+		/* Main body */
+
+		/**
+		 * Encode the string like PHP's rawurlencode
+		 *
+		 * @param str string String to be encoded
+		 */
+		'rawurlencode' : function( str ) {
+			str = ( str + '' ).toString();
+			return encodeURIComponent( str )
+				.replace( /!/g, '%21' ).replace( /'/g, '%27' ).replace( /\(/g, '%28' )
+				.replace( /\)/g, '%29' ).replace( /\*/g, '%2A' ).replace( /~/g, '%7E' );
+		},
+
+		/**
+		 * Encode page titles for use in a URL
+		 * We want / and : to be included as literal characters in our title URLs
+		 * as they otherwise fatally break the title
+		 *
+		 * @param str string String to be encoded
+		 */
+		'wikiUrlencode' : function( str ) {
+			return this.rawurlencode( str )
+				.replace( /%20/g, '_' ).replace( /%3A/g, ':' ).replace( /%2F/g, '/' );
+		},
+
+		/**
+		 * Get the link to a page name (relative to wgServer)
+		 *
+		 * @param str string Page name to get the link for.
+		 * @return string Location for a page with name of 'str' or boolean false on error.
+		 */
+		'wikiGetlink' : function( str ) {
+			return mw.config.get( 'wgArticlePath' ).replace( '$1',
+				this.wikiUrlencode( str || mw.config.get( 'wgPageName' ) ) );
+		},
+
+		/**
+		 * Get address to a script in the wiki root.
+		 * For index.php use mw.config.get( 'wgScript' )
+		 *
+		 * @param str string Name of script (eg. 'api'), defaults to 'index'
+		 * @return string Address to script (eg. '/w/api.php' )
+		 */
+		'wikiScript' : function( str ) {
+			return mw.config.get( 'wgScriptPath' ) + '/' + ( str || 'index' ) + mw.config.get( 'wgScriptExtension' );
+		},
+
+		/**
+		 * Append a new style block to the head
+		 *
+		 * @param text string CSS to be appended
+		 * @return CSSStyleSheet
+		 */
+		'addCSS' : function( text ) {
+			var s = document.createElement( 'style' );
+			s.type = 'text/css';
+			s.rel = 'stylesheet';
+			if ( s.styleSheet ) {
+				s.styleSheet.cssText = text; // IE
+			} else {
+				s.appendChild( document.createTextNode( text + '' ) ); // Safari sometimes borks on null
+			}
+			document.getElementsByTagName('head')[0].appendChild( s );
+			return s.sheet || s;
+		},
+
+		/**
+		 * Hide/show the table of contents element
+		 *
+		 * @param $toggleLink jQuery A jQuery object of the toggle link.
+		 * @param callback function Function to be called after the toggle is
+		 * completed (including the animation) (optional)
+		 * @return mixed Boolean visibility of the toc (true if it's visible)
+		 * or Null if there was no table of contents.
+		 */
+		'toggleToc' : function( $toggleLink, callback ) {
+			var $tocList = $( '#toc ul:first' );
+
+			// This function shouldn't be called if there's no TOC,
+			// but just in case...
+			if ( $tocList.size() ) {
+				if ( $tocList.is( ':hidden' ) ) {
+					$tocList.slideDown( 'fast', callback );
+					$toggleLink.text( mw.msg( 'hidetoc' ) );
+					$( '#toc' ).removeClass( 'tochidden' );
+					$.cookie( 'mw_hidetoc', null, {
+						expires: 30,
+						path: '/'
+					} );
+					return true;
+				} else {
+					$tocList.slideUp( 'fast', callback );
+					$toggleLink.text( mw.msg( 'showtoc' ) );
+					$( '#toc' ).addClass( 'tochidden' );
+					$.cookie( 'mw_hidetoc', '1', {
+						expires: 30,
+						path: '/'
+					} );
+					return false;
+				}
+			} else {
+				return null;
+			}
+		},
+
+		/**
+		 * Grab the URL parameter value for the given parameter.
+		 * Returns null if not found.
+		 *
+		 * @param param string The parameter name.
+		 * @param url string URL to search through (optional)
+		 * @return mixed Parameter value or null.
+		 */
+		'getParamValue' : function( param, url ) {
+			url = url ? url : document.location.href;
+			// Get last match, stop at hash
+			var re = new RegExp( '^[^#]*[&?]' + $.escapeRE( param ) + '=([^&#]*)' );
+			var m = re.exec( url );
+			if ( m && m.length > 1 ) {
+				// Beware that decodeURIComponent is not required to understand '+'
+				// by spec, as encodeURIComponent does not produce it.
+				return decodeURIComponent( m[1].replace( /\+/g, '%20' ) );
+			}
+			return null;
+		},
+
+		/**
+		 * @var string
+		 * Access key prefix. Will be re-defined based on browser/operating system
+		 * detection in mw.util.init().
+		 */
+		'tooltipAccessKeyPrefix' : 'alt-',
+
+		/**
+		 * @var RegExp
+		 * Regex to match accesskey tooltips.
+		 */
+		'tooltipAccessKeyRegexp': /\[(ctrl-)?(alt-)?(shift-)?(esc-)?(.)\]$/,
+
+		/**
+		 * Add the appropriate prefix to the accesskey shown in the tooltip.
+		 * If the nodeList parameter is given, only those nodes are updated;
+		 * otherwise, all the nodes that will probably have accesskeys by
+		 * default are updated.
+		 *
+		 * @param nodeList {Array|jQuery} (optional) A jQuery object, or array of elements to update.
+		 */
+		'updateTooltipAccessKeys' : function( nodeList ) {
+			var $nodes;
+			if ( !nodeList ) {
+			
+				// Rather than scanning all links, just the elements that
+				// contain the relevant links
+				this.updateTooltipAccessKeys(
+					$( '#column-one a, #mw-head a, #mw-panel a, #p-logo a' ) );
+
+				// these are rare enough that no such optimization is needed
+				this.updateTooltipAccessKeys( $( 'input' ) );
+				this.updateTooltipAccessKeys( $( 'label' ) );
+
+				return;
+
+			} else if ( nodeList instanceof jQuery ) {
+				$nodes = nodeList;
+			} else {
+				$nodes = $( nodeList );
+			}
+
+			$nodes.each( function ( i ) {
+				var tip = $(this).attr( 'title' );
+				if ( !!tip && util.tooltipAccessKeyRegexp.exec( tip ) ) {
+					tip = tip.replace( util.tooltipAccessKeyRegexp,
+						'[' + util.tooltipAccessKeyPrefix + "$5]" );
+					$(this).attr( 'title', tip );
+				}
+			} );
+		},
+
+		/*
+		 * @var jQuery
+		 * A jQuery object that refers to the page-content element
+		 * Populated by init().
+		 */
+		'$content' : null,
+
+		/**
+		 * Add a link to a portlet menu on the page, such as:
+		 *
+		 * p-cactions (Content actions), p-personal (Personal tools),
+		 * p-navigation (Navigation), p-tb (Toolbox)
+		 *
+		 * The first three paramters are required, the others are optional and
+		 * may be null. Though providing an id and tooltip is recommended.
+		 *
+		 * By default the new link will be added to the end of the list. To
+		 * add the link before a given existing item, pass the DOM node
+		 * (document.getElementById( 'foobar' )) or the jQuery-selector
+		 * ( '#foobar' ) of that item.
+		 *
+		 * @example mw.util.addPortletLink(
+		 *	 'p-tb', 'http://mediawiki.org/',
+		 *	 'MediaWiki.org', 't-mworg', 'Go to MediaWiki.org ', 'm', '#t-print'
+		 * )
+		 *
+		 * @param portlet string ID of the target portlet ( 'p-cactions' or 'p-personal' etc.)
+		 * @param href string Link URL
+		 * @param text string Link text
+		 * @param id string ID of the new item, should be unique and preferably have
+		 * the appropriate prefix ( 'ca-', 'pt-', 'n-' or 't-' )
+		 * @param tooltip string Text to show when hovering over the link, without accesskey suffix
+		 * @param accesskey string Access key to activate this link (one character, try
+		 * to avoid conflicts. Use $( '[accesskey=x]' ).get() in the console to
+		 * see if 'x' is already used.
+		 * @param nextnode mixed DOM Node or jQuery-selector string of the item that the new
+		 * item should be added before, should be another item in the same
+		 * list, it will be ignored otherwise
+		 *
+		 * @return mixed The DOM Node of the added item (a ListItem or Anchor element,
+		 * depending on the skin) or null if no element was added to the document.
+		 */
+		'addPortletLink' : function( portlet, href, text, id, tooltip, accesskey, nextnode ) {
+
+			// Check if there's atleast 3 arguments to prevent a TypeError
+			if ( arguments.length < 3 ) {
+				return null;
+			}
+			// Setup the anchor tag
+			var $link = $( '<a></a>' ).attr( 'href', href ).text( text );
+			if ( tooltip ) {
+				$link.attr( 'title', tooltip );
+			}
+
+			// Some skins don't have any portlets
+			// just add it to the bottom of their 'sidebar' element as a fallback
+			switch ( mw.config.get( 'skin' ) ) {
+			case 'standard' :
+			case 'cologneblue' :
+				$( '#quickbar' ).append( $link.after( '<br />' ) );
+				return $link[0];
+			case 'nostalgia' :
+				$( '#searchform' ).before( $link).before( ' &#124; ' );
+				return $link[0];
+			default : // Skins like chick, modern, monobook, myskin, simple, vector...
+
+				// Select the specified portlet
+				var $portlet = $( '#' + portlet );
+				if ( $portlet.length === 0 ) {
+					return null;
+				}
+				// Select the first (most likely only) unordered list inside the portlet
+				var $ul = $portlet.find( 'ul' );
+
+				// If it didn't have an unordered list yet, create it
+				if ( $ul.length === 0 ) {
+					// If there's no <div> inside, append it to the portlet directly
+					if ( $portlet.find( 'div:first' ).length === 0 ) {
+						$portlet.append( '<ul></ul>' );
+					} else {
+						// otherwise if there's a div (such as div.body or div.pBody)
+						// append the <ul> to last (most likely only) div
+						$portlet.find( 'div' ).eq( -1 ).append( '<ul></ul>' );
+					}
+					// Select the created element
+					$ul = $portlet.find( 'ul' ).eq( 0 );
+				}
+				// Just in case..
+				if ( $ul.length === 0 ) {
+					return null;
+				}
+
+				// Unhide portlet if it was hidden before
+				$portlet.removeClass( 'emptyPortlet' );
+
+				// Wrap the anchor tag in a list item (and a span if $portlet is a Vector tab)
+				// and back up the selector to the list item
+				var $item;
+				if ( $portlet.hasClass( 'vectorTabs' ) ) {
+					$item = $link.wrap( '<li><span></span></li>' ).parent().parent();
+				} else {
+					$item = $link.wrap( '<li></li>' ).parent();
+				}
+
+				// Implement the properties passed to the function
+				if ( id ) {
+					$item.attr( 'id', id );
+				}
+				if ( accesskey ) {
+					$link.attr( 'accesskey', accesskey );
+					tooltip += ' [' + accesskey + ']';
+					$link.attr( 'title', tooltip );
+				}
+				if ( accesskey && tooltip ) {
+					this.updateTooltipAccessKeys( $link );
+				}
+
+				// Where to put our node ?
+				// - nextnode is a DOM element (before MW 1.17, in wikibits.js, this was the only option)
+				if ( nextnode && nextnode.parentNode == $ul[0] ) {
+					$(nextnode).before( $item );
+
+				// - nextnode is a CSS selector for jQuery
+				} else if ( typeof nextnode == 'string' && $ul.find( nextnode ).length !== 0 ) {
+					$ul.find( nextnode ).eq( 0 ).before( $item );
+
+
+				// If the jQuery selector isn't found within the <ul>,
+				// or if nextnode was invalid or not passed at all,
+				// then just append it at the end of the <ul> (this is the default behaviour)
+				} else {
+					$ul.append( $item );
+				}
+
+
+				return $item[0];
+			}
+		},
+
+		/**
+		 * Add a little box at the top of the screen to inform the user of
+		 * something, replacing any previous message.
+		 * Calling with no arguments, with an empty string or null will hide the message
+		 *
+		 * @param message mixed The DOM-element or HTML-string to be put inside the message box.
+		 * @param className	string Used in adding a class; should be different for each call
+		 * to allow CSS/JS to hide different boxes. null = no class used.
+		 * @return boolean True on success, false on failure.
+		 */
+		'jsMessage' : function( message, className ) {
+
+			if ( !arguments.length || message === '' || message === null ) {
+
+				$( '#mw-js-message' ).empty().hide();
+				return true; // Emptying and hiding message is intended behaviour, return true
+
+			} else {
+				// We special-case skin structures provided by the software. Skins that
+				// choose to abandon or significantly modify our formatting can just define
+				// an mw-js-message div to start with.
+				var $messageDiv = $( '#mw-js-message' );
+				if ( !$messageDiv.length ) {
+					$messageDiv = $( '<div id="mw-js-message">' );
+					if ( util.$content.parent().length ) {
+						util.$content.parent().prepend( $messageDiv );
+					} else {
+						return false;
+					}
+				}
+
+				if ( className ) {
+					$messageDiv.attr( 'class', 'mw-js-message-' + className );
+				}
+
+				if ( typeof message === 'object' ) {
+					$messageDiv.empty();
+					$messageDiv.append( message ); // Append new content
+				} else {
+					$messageDiv.html( message );
+				}
+
+				$messageDiv.slideDown();
+				return true;
+			}
+		},
+
+		/**
+		 * Validate a string as representing a valid e-mail address
+		 * according to HTML5 specification. Please note the specification
+		 * does not validate a domain with one character.
+		 *
+		 * @todo FIXME: should be moved to or replaced by a JavaScript validation module.
+		 *
+		 * @param mailtxt string E-mail address to be validated.
+		 * @return mixed Null if mailtxt was an empty string, otherwise true/false
+		 * is determined by validation.
+		 */
+		'validateEmail' : function( mailtxt ) {
+			if( mailtxt === '' ) {
+				return null;
+			}
+
+			/**
+			 * HTML5 defines a string as valid e-mail address if it matches
+			 * the ABNF:
+			 *	1 * ( atext / "." ) "@" ldh-str 1*( "." ldh-str )
+			 * With:
+			 * - atext	: defined in RFC 5322 section 3.2.3
+			 * - ldh-str : defined in RFC 1034 section 3.5
+			 *
+			 * (see STD 68 / RFC 5234 http://tools.ietf.org/html/std68):
+			 */
+
+			/**
+			 * First, define the RFC 5322 'atext' which is pretty easy :
+			 * atext = ALPHA / DIGIT / ; Printable US-ASCII
+						 "!" / "#" /	 ; characters not including
+						 "$" / "%" /	 ; specials. Used for atoms.
+						 "&" / "'" /
+						 "*" / "+" /
+						 "-" / "/" /
+						 "=" / "?" /
+						 "^" / "_" /
+						 "`" / "{" /
+						 "|" / "}" /
+						 "~"
+			*/
+			var	rfc5322_atext = "a-z0-9!#$%&'*+\\-/=?^_`{|}~",
+
+			/**
+			 * Next define the RFC 1034 'ldh-str'
+			 *	<domain> ::= <subdomain> | " "
+			 *	<subdomain> ::= <label> | <subdomain> "." <label>
+			 *	<label> ::= <letter> [ [ <ldh-str> ] <let-dig> ]
+			 *	<ldh-str> ::= <let-dig-hyp> | <let-dig-hyp> <ldh-str>
+			 *	<let-dig-hyp> ::= <let-dig> | "-"
+			 *	<let-dig> ::= <letter> | <digit>
+			 */
+				rfc1034_ldh_str = "a-z0-9\\-",
+
+				HTML5_email_regexp = new RegExp(
+					// start of string
+					'^'
+					+
+					// User part which is liberal :p
+					'[' + rfc5322_atext + '\\.]+'
+					+
+					// 'at'
+					'@'
+					+
+					// Domain first part
+					'[' + rfc1034_ldh_str + ']+'
+					+
+					// Optional second part and following are separated by a dot
+					'(?:\\.[' + rfc1034_ldh_str + ']+)*'
+					+
+					// End of string
+					'$',
+					// RegExp is case insensitive
+					'i'
+				);
+			return (null !== mailtxt.match( HTML5_email_regexp ) );
+		},
+
+		/**
+		 * Note: borrows from IP::isIPv4
+		 *
+		 * @param address string
+		 * @param allowBlock boolean
+		 * @return boolean
+		 */
+		'isIPv4Address' : function( address, allowBlock ) {
+			var block = allowBlock ? '(?:\\/(?:3[0-2]|[12]?\\d))?' : '';
+			var RE_IP_BYTE = '(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|0?[0-9]?[0-9])';
+			var RE_IP_ADD = '(?:' + RE_IP_BYTE + '\\.){3}' + RE_IP_BYTE;
+			return typeof address === 'string' && address.search( new RegExp( '^' + RE_IP_ADD + block + '$' ) ) != -1;
+		},
+		/**
+		 * Note: borrows from IP::isIPv6
+		 *
+		 * @param address string
+		 * @param allowBlock boolean
+		 * @return boolean
+		 */
+		'isIPv6Address' : function( address, allowBlock ) {
+			if ( typeof address !== 'string' ) {
+				return false;
+			}
+			var block = allowBlock ? '(?:\\/(?:12[0-8]|1[01][0-9]|[1-9]?\\d))?' : '';
+			var RE_IPV6_ADD =
+			'(?:' + // starts with "::" (including "::")
+			':(?::|(?::' + '[0-9A-Fa-f]{1,4}' + '){1,7})' +
+			'|' + // ends with "::" (except "::")
+			'[0-9A-Fa-f]{1,4}' + '(?::' + '[0-9A-Fa-f]{1,4}' + '){0,6}::' +
+			'|' + // contains no "::"
+			'[0-9A-Fa-f]{1,4}' + '(?::' + '[0-9A-Fa-f]{1,4}' + '){7}' +
+			')';
+			if ( address.search( new RegExp( '^' + RE_IPV6_ADD + block + '$' ) ) != -1 ) {
+				return true;
+			}
+			RE_IPV6_ADD = // contains one "::" in the middle (single '::' check below)
+				'[0-9A-Fa-f]{1,4}' + '(?:::?' + '[0-9A-Fa-f]{1,4}' + '){1,6}';
+			return address.search( new RegExp( '^' + RE_IPV6_ADD + block + '$' ) ) != -1
+				&& address.search( /::/ ) != -1 && address.search( /::.*::/ ) == -1;
+		}
+
+	};
+
+	util.init();
+
+} )( jQuery );