diff --git a/Gemfile b/Gemfile
index 29ad0f73d..b145c64dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ gem 'magent', :git => 'http://github.com/dcu/magent.git'
 #File uploading
 gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
 gem 'mini_magick'
+gem 'aws'
 
 group :test, :development do
   gem 'factory_girl_rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 44d386e33..d56eddfee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,6 +99,10 @@ GEM
     arel (1.0.1)
       activesupport (~> 3.0.0)
     autotest (4.3.2)
+    aws (2.3.21)
+      http_connection
+      uuidtools
+      xml-simple
     bcrypt-ruby (2.1.2)
     bson (1.0.7)
     bson_ext (1.0.7)
@@ -149,6 +153,7 @@ GEM
     haml (3.0.18)
     hashie (0.4.0)
     highline (1.6.1)
+    http_connection (1.3.1)
     i18n (0.4.1)
     json (1.4.6)
     json_pure (1.4.6)
@@ -249,6 +254,7 @@ GEM
       rack (>= 1.0)
       rack-test (>= 0.5.3)
     will_paginate (3.0.pre2)
+    xml-simple (1.0.12)
 
 PLATFORMS
   ruby
@@ -256,6 +262,7 @@ PLATFORMS
 DEPENDENCIES
   addressable
   autotest
+  aws
   bson (= 1.0.7)
   bson_ext (= 1.0.7)
   bundler (>= 1.0.0)
diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index e8a40a4c2..bd9a849ab 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 class DevUtilitiesController < ApplicationController
-  before_filter :authenticate_user!, :except => [:set_backer_number]
+  before_filter :authenticate_user!, :except => [:set_backer_number, :log]
   include ApplicationHelper
   include RequestsHelper
 
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 58399c90d..247f5f997 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -5,8 +5,6 @@
 class ImageUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
-  storage :file
-
   def store_dir
     "uploads/images"
   end
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index b28f1be66..ed1d07f91 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -3,5 +3,13 @@
 #   the COPYRIGHT file.
 
 CarrierWave.configure do |config|
-  config.storage = :file
+  if ENV['S3_KEY'] && ENV['S3_SECRET'] && ENV['S3_BUCKET']
+    config.storage = :s3
+    config.s3_access_key_id = ENV['S3_KEY']
+    config.s3_secret_access_key = ENV['S3_SECRET']
+    config.s3_bucket = ENV['S3_BUCKET']
+    config.cache_dir = "#{Rails.root}/tmp/uploads"
+  else
+    config.storage = :file
+  end
 end
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index d1e8ca2f7..c7aa1f27d 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -2,7 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-no_NO:
+nb:
   errors:
     messages:
       not_found: "ble ikke funnet"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 6e2dc0ad3..82f927db1 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -5,7 +5,7 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-en:
+nb:
   hello: "Hallo, verden!"
   application:
       helper: