fix #641 resize doesn't update image dimensions
Merge remote-tracking branch 'upstream/2.x' into 2.x

Conflicts:
	js/elFinder.js