Updated rails to 3.2.20
Merge branch 'upgrade_rails_to_3.2.20' into develop