[ljubljana 2014] add proposal by Tomaž Zaman
[ljubljana 2014] replace special char with html entity
Merge pull request #657 from extraordinaire/master

[ljubljana 2014] add proposal by Tomaž Zaman