merge the branch web-component to branch gh-pages

merge the branch web-component to branch gh-pages.