gem updates: rails 4.2
Merge branch 'development'