prefixed order column with table name to avoid ambiguity
switched deprecated finders to Rails 4 syntax
Merge branch 'rails4_compatibility'