Fix resize check and reset in image plugin
Fix resetting images and enhance cropping

Conflicts:
	build/hotfix-changelog.md
Merge pull request #989 from maschonber/hotfix-reset-resize

A number of fixes affecting image resizing/cropping/resetting