fixed error in resizing images
Merge branch 'master' into 207_composer_twig

* master:
  fixed error in resizing images