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