add thumbnail entropy cropping and border removal
version bump
Update base.py

fixing recursive bug - if multi thumbnails on same file.
Preparing new release [skip ci]
Use the new ReadTheDocs-Theme

Nature and Sphinx's default theme are a bit outdated. The new theme is mobile-friendly and provides great readability.
Merge pull request #244 from jnns/patch-1

Use the new ReadTheDocs-Theme
bugfix: ZeroDivisionError for images with dimensions like 1x54 px
bugfix: ZeroDivisionError for images with dimensions like 1x54 px
Correct is_portrait example

Assuming that intension was to show different results for is_portrait = True/False
Merge pull request #247 from nder/patch-1

Correct is_portrait example
Add missing units to settings.rst

Add missing unit *seconds* to ``THUMBNAIL_URL_TIMEOUT`` and ``THUMBNAIL_CACHE_TIMEOUT``.
Merge pull request #248 from jnns/patch-1

Add missing units to settings.rst
Resolves conflicts from the new feature smart cropping and the master branch
Prepares tests for smart crop
Merge branch 'hcliff-master'

* hcliff-master:
  Prepares tests for smart crop
  version bump
  add thumbnail entropy cropping and border removal
Merge branch 'master' of https://github.com/vovkd/sorl-thumbnail into vovkd-master

* 'master' of https://github.com/vovkd/sorl-thumbnail:
  bugfix: ZeroDivisionError for images with dimensions like 1x54 px
  bugfix: ZeroDivisionError for images with dimensions like 1x54 px
Merge branch 'master' of https://github.com/roojoom/sorl-thumbnail into roojoom-master

* 'master' of https://github.com/roojoom/sorl-thumbnail:
  Update base.py
Fix correct version
Prepare release of v11.12b1
Fix version schema [skip ci]