'testing only on Rails 4'
Merge branch 'development'