Merge branch 'master' of github.com:jquery/jquery-ui

Conflicts:
	tests/unit/dialog/dialog_defaults.js

Author: scottgonzalez