Merge branch 'release/0.14'0.14

Conflicts:
    locale/bg/app.po
    locale/fr/app.po
    locale/fr_CA/app.po
    locale/he_IL/app.po
    locale/hr/app.po
    locale/it/app.po
    locale/nb_NO/app.po
    locale/pl/app.po
    locale/sv/app.po
    locale/vi/app.po

1 files changed, 2 insertions, 0 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 86ca5150a..0d8f8fac5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -155,5 +155,7 @@ Spork.prefork do
 end
 
 Spork.each_run do
+    FactoryGirl.definition_file_paths = [ Rails.root.join('spec', 'factories') ]
+    FactoryGirl.reload
   # This code will be run each time you run your specs.
 end