Fixed utf-8 encoding for text/html files and shtml files only !
Merge branch 'master' into gpio_test