Backport some rails 4 activescaffold fixes

activescaffold@e9faeac

Author: will89

app/views/active_scaffold_overrides/_form_association.html.erb

@@ -1,7 +1,6 @@
 <%
 parent_record = @record
 associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
-associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
 if show_blank_record = column.show_blank_record?(associated)
   associated << build_associated(column, parent_record)
 end