satisfy rails4 deprecation warning on magic find_or_create_by method
Merge remote-tracking branch 'origin/rails4'