Merge branch 'refs/heads/master' into stable

app/Http/Controllers/HomeController.php

@@ -54,7 +54,7 @@ class HomeController extends Controller
             $folder_id = $request->input('fid',$this->getFoldersTreeFirstId());
             $father_id = $this->getFoldersTreeFatherId($folder_id);
             $folder = SiteAlbumFolder::find($folder_id);
-            $albums = SiteAlbum::where('folder_id', $folder_id)->orderBy('id', 'desc')->get();
+            $albums = SiteAlbum::where('folder_id', $folder_id)->orderBy('order', 'desc')->orderBy('id', 'desc')->get();
             $albums = $albums->toArray();
             $title = $folder->title;
         }