Merge branch 'hotfix/0.3.1' into develop

* hotfix/0.3.1:
  Add json gem for 1.8.7
Refactoring: move image-stuff to new Thumbnail class
re-implement overwrite spec.
re-adding spec for large-image detection
Store image in subdirectories.

Other tests fail. refactoring needed.
Fix regressions.
Merge branch 'feature/subdirs' into develop

* feature/subdirs:
  Fix regressions.
  Store image in subdirectories.
  re-adding spec for large-image detection
  re-implement overwrite spec.
  Refactoring: move image-stuff to new Thumbnail class
Merge branch 'release/0.4.0'

* release/0.4.0:
  Fix regressions.
  Store image in subdirectories.
  re-adding spec for large-image detection
  re-implement overwrite spec.
  Refactoring: move image-stuff to new Thumbnail class