highlight pre tag
update testimonial
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/locales/testimonials.zh-TW.yml