Merge branch 'master' into 'master'

fix sort error



See merge request !8

app/controllers/archives_controller.rb

@@ -80,7 +80,7 @@ class ArchivesController < ApplicationController
     			        }
     			    end
     			    files = []
-    				archive.archive_file_multiples.each do |file|
+    				archive.archive_file_multiples.order_by(:sort_number=>'desc').each do |file|
     					if file.choose_lang.include?(I18n.locale.to_s)
     						title = (file.file_title.blank? ?  File.basename(file.file.path) : file.file_title) rescue ""
     						extension = file.file.file.extension.downcase rescue ""