#1886 Enable Code Highlighting: the button in the editor stays inactive
Remove extra query to get usercount which have voted
Merge pull request #1995 from xillibit/k30_bugs20

Remove extra query to get usercount which have voted
Merge pull request #2021 from mahagr/master

Fix #1974: Kunena doesn't display users who aren't in #__kunena_users table
Merge branch 'k30_bugs13' of git://github.com/xillibit/Kunena

Conflicts:
	components/com_kunena/site/template/blue_eagle/html/topic/edit_editor.php
 Fix #1886 (move code out of template and add support for geshiall plugin)