Merge branch 'master' into 6-0-dev

Conflicts:
	Gemfile
	Gemfile.lock

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index f259f90,d26f4d8..4866f95
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -130,8 -130,18 +131,18 @@@ GE
        faraday (>= 0.7.4, < 0.9)
      faye-websocket (0.4.7)
        eventmachine (>= 0.12.0)
 -    ffaker (1.16.0)
 -    ffi (1.8.1)
 +    ffaker (1.16.1)
 +    ffi (1.9.0)
+     fog (1.3.1)
+       builder
+       excon (~> 0.13.0)
+       formatador (~> 0.2.0)
+       mime-types
+       multi_json (~> 1.0)
+       net-scp (~> 1.0.4)
+       net-ssh (>= 2.1.3)
+       nokogiri (~> 1.5.0)
+       ruby-hmac
      font-awesome-rails (3.1.1.3)
        railties (>= 3.2, < 5.0)
      foreman (0.63.0)
@@@ -245,12 -254,13 +256,13 @@@
      kaminari (0.14.1)
        actionpack (>= 3.0.0)
        activesupport (>= 3.0.0)
 -    launchy (2.2.0)
+     kgio (2.8.0)
 +    launchy (2.3.0)
        addressable (~> 2.3)
 -    letter_opener (1.1.0)
 -      launchy (~> 2.2.0)
 +    letter_opener (1.1.1)
 +      launchy (~> 2.2)
      libv8 (3.11.8.17)
 -    listen (1.1.3)
 +    listen (1.2.2)
        rb-fsevent (>= 0.9.3)
        rb-inotify (>= 0.9)
        rb-kqueue (>= 0.2)
@@@ -268,7 -279,10 +280,10 @@@
      multipart-post (1.2.0)
      mysql2 (0.3.11)
      net-ldap (0.3.1)
 -    nokogiri (1.5.9)
+     net-scp (1.0.4)
+       net-ssh (>= 1.99.1)
+     net-ssh (2.6.8)
 +    nokogiri (1.5.10)
      oauth (0.4.7)
      oauth2 (0.8.1)
        faraday (~> 0.8)
@@@ -355,7 -369,8 +370,8 @@@
        rake (>= 0.8.7)
        rdoc (~> 3.4)
        thor (>= 0.14.6, < 2.0)
 -    rake (10.0.4)
+     raindrops (0.11.0)
 +    rake (10.1.0)
      rb-fsevent (0.9.3)
      rb-inotify (0.9.0)
        ffi (>= 0.5.0)
@@@ -401,10 -416,10 +417,11 @@@
        rspec-core (~> 2.13.0)
        rspec-expectations (~> 2.13.0)
        rspec-mocks (~> 2.13.0)
 -    ruby-progressbar (1.0.2)
+     ruby-hmac (0.4.0)
 +    ruby-progressbar (1.1.1)
      rubyntlm (0.1.1)
      rubyzip (0.9.9)
 +    safe_yaml (0.9.3)
      sanitize (2.0.3)
        nokogiri (>= 1.4.4, < 1.6)
      sass (3.2.9)
@@@ -501,8 -516,12 +518,12 @@@
        execjs (>= 0.3.0)
        multi_json (~> 1.0, >= 1.0.2)
      underscore-rails (1.4.4)
 -    virtus (0.5.4)
 -      backports (~> 2.6.1)
+     unicorn (4.6.3)
+       kgio (~> 2.6)
+       rack
+       raindrops (~> 0.7)
 +    virtus (0.5.5)
 +      backports (~> 3.3)
        descendants_tracker (~> 0.0.1)
      warden (1.2.1)
        rack (>= 1.0)

diff --cc config/puma.rb.example
Simple merge

diff --cc doc/install/installation.md
Simple merge