bundle update & rails 4.1.6
Merge branch 'development'