Upgrade to jQuery 1.9...
Merge ../x0y0

Conflicts:
	Gemfile.lock
	app/assets/javascripts/common.js.coffee