Merge branch 'c4c.staging.hotfix' into pulse_cdm
Upgrade Rails to 2.3.16
Merge branch 'c4c.staging.upgrade_rails' into c4c.staging