New upstream version of jQuery iScrubber.
Merge commit '37287d8' into catalog-updates

Conflicts:
	client/js/jquery.iscrubber.coffee