add jquery-ui
Merge branch 'master' into jqeury_ui_bootstrap