Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/javascripts/global.js.coffee