Merge shared components from gh-pages branch