Merge branch 'gh-pages'
fix testimonial
Merge branch 'master' into gh-pages