Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

app/models/resource.rb

@@ -14,6 +14,7 @@ class Resource < ActiveRecord::Base
                                    :thumb => "100x100>",
                                    :tiny => "50x50>"},
                       :storage => :s3,
+                      :s3_protocol => :https,
                       :s3_credentials => { :access_key_id     => ENV['S3_KEY'], 
                                          :secret_access_key => ENV['S3_SECRET'] },
                       :path => ":attachment/:id/:style.:extension",

app/views/home/index.html.erb

@@ -45,6 +45,6 @@
 </div>
 
 <span class="col-sm-4">
-  <h3>Featured item:</h3>
+  <h3>Featured tool:</h3>
   <%= render @featured_resource unless @featured_resource.blank? %>
 </span>