ran rake rails:update after loading rails 4.2
Merge branch 'development'