Fix Rails 4 deprecation warnings about find_or_create_by_style
Merge branch 'fix-for-rails-4-deprecation-warnings'