gem updates
rails 4.1.4 update
Merge branch 'development'