old web pages utf-8 meta fixed
Merge remote-tracking branch 'origin/master'

auto merge conflicts
Merge fix