Merge remote-tracking branch 'upstream/master' into dojo-event-services-data

Author: nalabjp

.gitignore

@@ -18,6 +18,7 @@ db/test
 /log/*
 !/log/.keep
 /tmp
+public/assets/*
 .DS_Store
 
 #Enviormental variable

.ruby-version

@@ -1 +1 @@
-2.4.0
+2.4.2

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
-ruby '2.4.0'
+ruby '2.4.2'
 
-gem 'rails',    '~> 5.0'
+gem 'rails', '5.1.4'
 
 gem 'scrivito'
 gem 'scrivito_section_widgets'
@@ -34,6 +34,7 @@ gem 'faraday_middleware', '0.10'
 group :development do
   gem 'web-console'
   gem 'spring'
+  gem 'listen'
 end
 
 group :development, :test do