Merge pull request #1767 from mahagr/develop

Merge changes from 3.0 branch
Merge pull request #1768 from mahagr/develop

Update version to 3.1
Added support for multiple extensions for category images
Merge pull request #1808 from janich/develop

#1807 Added support for multiple extensions for category images