Cleaning up the image cropping functionality
Merge branch 'master' into testparty
tests