jquery ui 1.1*
Merge remote-tracking branch 'origin/master'