bugfix for new quora
Merge branch 'master' into version_4_0

Conflicts:
	app/controllers/proposals_controller.rb