Image hover expansion

Conflicts:
	client/options.js
	tmpl/index.html