Merge branch 'master' into remove-spring-gem

# Conflicts:
#	config/environments/test.rb

lib/gem_ext/builder.rb

@@ -0,0 +1,14 @@
+module Builder
+  class XmlMarkup
+    def epp_head
+      instruct!
+      epp(
+        'xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd',
+        'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+        'xsi:schemaLocation' => 'lib/schemas/epp-ee-1.0.xsd'
+      ) do
+        yield
+      end
+    end
+  end
+end

lib/gem_ext/i18n.rb

@@ -0,0 +1,11 @@
+# Don't raise error when nil
+# http://stackoverflow.com/questions/9467034/rails-i18n-how-to-handle-case-of-a-nil-date-being-passed-ie-lnil
+module I18n
+  class << self
+    alias_method :original_localize, :localize
+
+    def localize(object, options = {})
+      object.present? ? original_localize(object, options) : ''
+    end
+  end
+end

lib/gem_ext/paper_trail.rb

@@ -0,0 +1,23 @@
+# the following line is required for PaperTrail >= 4.0.0 with Rails
+PaperTrail::Rails::Engine.eager_load!
+
+PaperTrail::Version.module_eval do
+  self.abstract_class = true
+end
+
+# Store console and rake changes in versions
+if defined?(::Rails::Console)
+  PaperTrail.whodunnit = "console-#{`whoami`.strip}"
+elsif File.basename($PROGRAM_NAME) == 'rake'
+  # rake username does not work when spring enabled
+  PaperTrail.whodunnit = "rake-#{`whoami`.strip} #{ARGV.join ' '}"
+end
+
+class PaperSession
+  class << self
+    attr_writer :session
+    def session
+      @session ||= Time.zone.now.to_s(:db)
+    end
+  end
+end