upgrade to rails 3.2.13
Merge remote-tracking branch 'origin/master' into message-board

Conflicts:
	Gemfile.lock