Remove unneeded jimport() calls (fixes potential J!3.1.5 issues)
Merge remote-tracking branch 'origin/master'
HMVC: Fix a bug when there are no categories to be shown
Minor code cleanup
Merge branches 'feature-hmvc' and 'rtv3' of github.com:mahagr/Kunena-Forum into rtv3
Merge branch 'master' of github.com:mahagr/Kunena-Forum into rtv3

Conflicts:
	components/com_kunena/site/template/crypsis/html/category/manage.php