Add more functionality to the jQuery.
Merge remote-tracking branch 'origin/7.x-1.x' into 7.x-1.x

Conflicts:
	js/logo_watermark.js