Upgrade to Rails 3.2, Part I
Merge branch 'master' into upgrade
migrated to rails 3.2.14