updating rails version to 3.2.18
adding score to comments on answer_set index for admins
Merge branch 'master' into rspec

Conflicts:
	Gemfile.lock