Merge pull request #2114 from mahagr/feature-hmvc

Merge changes during development
Class 'JFolder' not found in kunena.upload.class.php line 171
Merge pull request #2123 from xillibit/k31_bugs1

K31 bugs1
Merge branch 'feature-hmvc' of github.com:Kunena/Kunena-Forum into feature-hmvc
Minor cleanup after merge from K3.0