fixed style bug in html.template that was breaking syntax highlighting
Merge branch 'real_master'