jquery 1
Merge branch 'master' into gh-pages
update bower_components for gh-pages