Merge branch 'master' into gh-pages
removed jquery ui
Merge branch 'gh-pages'