Upgrade Rails from 3.2.14 to 3.2.15.
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	Gemfile.lock
Only use acts_as_list versions that are Ruby 1.8-compatible.