Merge branch 'desktop_harry' into desktop_devin

app/uploaders/gallery_uploader.rb

@@ -35,7 +35,7 @@ class GalleryUploader < CarrierWave::Uploader::Base
   # end
   
   version :thumb do
-    process :resize_to_fit => [120, 90]
+    process :resize_to_fill => [120, 90]
   end
 
   # Add a white list of extensions which are allowed to be uploaded.