crop image
Merge branch 'heroku-edition'

* heroku-edition:
  crop image