Smarter nickname highlight insert in confernces
Merge pull request #400 from xsrc/development

Smarter nickname highlight insert in confernces