Add Category Icons.
Merge branch 'feature-hmvc' of git://github.com/Kunena/Kunena-Forum into feature-hmvc
Update Directory from Page to Widget for new specified terminology.
Some TODOs
Html fixes and less fixes
Html update 10-2
Merge branch 'feature-hmvc' of git://github.com/Kunena/Kunena-Forum into feature-hmvc
Merge branch 'feature-hmvc' of git://github.com/Kunena/Kunena-Forum into feature-hmvc
Merge branch 'feature-hmvc' of git://github.com/Kunena/Kunena-Forum into feature-hmvc
Merge pull request #2281 from mahagr/feature-hmvc

Admin: Fix performance issues in user manager
Update Html 14-2 #2260
Use more generic languages strings for alert boxes to be re-used easily
Merge branch 'feature-hmvc' of git://github.com/Kunena/Kunena-Forum into feature-hmvc
Regression after merge, missing part to list smileys list above textarea
Merge remote-tracking branch '810/html-crypsis-fix' into pr-810-feature-hmvc-merge2

Conflicts:
	components/com_kunena/site/template/crypsis/layouts/message/list/default.php
	components/com_kunena/site/template/crypsis/layouts/topic/list/default.php
Merge pull request #2286 from coder4life/pr-810-feature-hmvc-merge2

Pr 810 feature hmvc merge2
Merge pull request #2285 from xillibit/k31_bugs13

Regression after merge, missing part to list smileys list above textarea
Merge pull request #2284 from xillibit/k31_bugs15

Use more generic languages strings for alert boxes to be re-used easily
Merge remote-tracking branch '810/html-crypsis-fix' into pr-810-feature-hmvc-merge2

Conflicts:
	components/com_kunena/site/template/crypsis/layouts/topic/edit/editor/default.php
Small fix to author link.