Class check
null
Merge branch 'master' into Live

Conflicts:
	app/models/quote.rb