Updated rails to 3.2.16.
Capistrano rails rbenv version to 2.0.0-p353.
Updated gems and made binding_of_caller ruby only.
Repaired functional test for mailboxes controller.
Wrong unit for quota.
Merge branch 'master' into rails4

Rails 4.0.2.

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/mailboxes_controller.rb