bundle update: rails 3.2.19, etc.
Merge branch 'development'