Merge branch 'release/4.1' into release/4.2

Conflicts:
	Gemfile.lock
	lib/open_project/version.rb

Gemfile

@@ -164,7 +164,7 @@ group :test do
   gem 'capybara-screenshot', '~> 1.0.4'
   gem 'capybara-select2', github: 'goodwill/capybara-select2'
   gem 'capybara-ng', '~> 0.2.1'
-  gem 'selenium-webdriver', '~> 2.45.0'
+  gem 'selenium-webdriver', '~> 2.47.1'
   gem 'timecop', '~> 0.7.1'
 
   gem 'rb-readline', "~> 0.5.1" # ruby on CI needs this

Gemfile.lock

@@ -433,7 +433,7 @@ GEM
       structured_warnings (>= 0.1.3)
     rubyzip (1.1.6)
     sass (3.4.12)
-    selenium-webdriver (2.45.0)
+    selenium-webdriver (2.47.1)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
@@ -576,7 +576,7 @@ DEPENDENCIES
   rubytree (~> 0.8.3)
   sass (~> 3.4.12)
   sass-rails!
-  selenium-webdriver (~> 2.45.0)
+  selenium-webdriver (~> 2.47.1)
   shoulda-context (~> 1.2)
   shoulda-matchers (~> 2.8)
   simplecov (= 0.8.0.pre)