Merge pull request #1769 from mahagr/feature-crypsis

Merge changes from develop branch
remove old classes
Merge pull request #1790 from 810/template-crypsis

remove old classes
Added support for multiple extensions for category images
Merge pull request #1808 from janich/develop

#1807 Added support for multiple extensions for category images
Merge branch 'master' of github.com:Kunena/Kunena-Forum into develop

Conflicts:
	pkg_kunena.xml
Merge pull request #1823 from mahagr/develop

Merge changes from K3.0.1
Merge branch 'develop' of github.com:Kunena/Kunena-Forum into feature-crypsis

Conflicts:
	components/com_kunena/site/template/crypsis/html/common/logout_menu.php
Merge pull request #1824 from mahagr/feature-crypsis

Merge changes from K3.0.1
Convert poll script to jQuery
update branch
Convert Kunena poll script to use jQuery (Part 2)
Merge pull request #1838 from xillibit/k31_poll_jquery

Convert Kunena poll script to use jQuery
update branch with correct origin