add thumbnail entropy cropping and border removal
version bump
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