Image Hover Expansion fix

Conflicts:
	client/options.js