Merge branch 'master' into menubar

Conflicts:
	demos/index.html
	ui/jquery.ui.menu.js

.editorconfig

@@ -1,13 +1,11 @@
-; This file is for unifying the coding style for different editors and IDEs.
-; More information at http://EditorConfig.org
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
 
 root = true
 
-[grunt.js]
-indent_style = tab
-
-[ui/**.js]
-indent_style = tab
-
-[tests/unit/**.js]
+[*]
 indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

AUTHORS.txt

@@ -4,14 +4,14 @@ A list of current team members is available at http://jqueryui.com/about
 Paul Bakaus <paul.bakaus@googlemail.com>
 Richard Worth <rdworth@gmail.com>
 Yehuda Katz <wycats@gmail.com>
-Sean Catchpole <littlecooldude@gmail.com>
+Sean Catchpole <sean@sunsean.com>
 John Resig <jeresig@gmail.com>
-Tane Piper <tane@tanepiper.com>
+Tane Piper <piper.tane@gmail.com>
 Dmitri Gaskin <dmitrig01@gmail.com>
 Klaus Hartl <klaus.hartl@googlemail.com>
 Stefan Petre <stefan.petre@gmail.com>