stupid crlf issues
fixed stp testimonials feature
Merge branch 'master' into branch_stp_page