Merge pull request #767 from hennevogel/fix_depreciation_warnings

Update factory_girl, silence deprecation warnings

Gemfile.lock

@@ -154,10 +154,10 @@ GEM
     docile (1.1.3)
     erubis (2.7.0)
     execjs (2.6.0)
-    factory_girl (4.4.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.4.1)
-      factory_girl (~> 4.4.0)
+    factory_girl_rails (4.6.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)

config/environments/test.rb

@@ -46,6 +46,7 @@ Osem::Application.configure do
     # Set Time.now to May 1, 2014 00:01:00 AM (at this instant), but allow it to move forward
     t = Time.local(2014, 05, 01, 00, 01, 00)
     Timecop.travel(t)
+    ActiveSupport::Deprecation.silenced = true
   end
 
 end