updated rails to 3.2.14
Merge branch 'master' into rails4
upgraded to rails 4.0.4