Merge branch 'hotfix/0.6.1' into develop

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.6.1
+-----
+* Added rails_12factor gem
+
 0.6.0
 -----
 * Fontawesome 3.2.1

Gemfile

@@ -73,3 +73,7 @@ group :test do
   gem 'simplecov', require: false
   gem 'webmock', require: false
 end
+
+group :staging, :production do
+  gem 'rails_12factor'
+end

Gemfile.lock

@@ -170,6 +170,11 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.0.0.rc2)
       sprockets-rails (~> 2.0.0)
+    rails_12factor (0.0.2)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.1)
+    rails_stdout_logging (0.0.1)
     railties (4.0.0.rc2)
       actionpack (= 4.0.0.rc2)
       activesupport (= 4.0.0.rc2)
@@ -297,6 +302,7 @@ DEPENDENCIES
   pry-rails
   puma
   rails (= 4.0.0.rc2)
+  rails_12factor
   resque
   rest-client
   rspec

VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1