Jqueryui

Bring master up to date with the latest changes. It's looking good.