hopefully fixed jquery
Merge branch 'master' of https://github.com/whg/spotijay

Conflicts:
	shared.js