Fixed two issues around the SyntaxHighlighter project
Merge branch 'master' of https://github.com/marfous/j1demo-pf
Merge branch 'master' of https://github.com/marfous/j1demo-pf