diff --git a/.rubocop.yml b/.rubocop.yml
index 5cf95d774..7adbff31b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,7 +3,7 @@ AllCops:
     - "vendor/**/*"
     - "db/schema.rb"
   UseCache: false
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 ##################### Style ####################################
 
diff --git a/Dockerfile b/Dockerfile
index f32135e8e..0eb255048 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4.5
+FROM ruby:2.5.5
 MAINTAINER BioSistemika <info@biosistemika.com>
 
 # additional dependecies
diff --git a/Dockerfile.production b/Dockerfile.production
index 5344fbec3..3dc59885e 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -1,4 +1,4 @@
-FROM ruby:2.4.5
+FROM ruby:2.5.5
 MAINTAINER BioSistemika <info@biosistemika.com>
 
 # additional dependecies
diff --git a/Gemfile b/Gemfile
index 54b8d3eef..bc6d70518 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,21 +2,21 @@
 
 source 'http://rubygems.org'
 
-ruby '2.4.5'
+ruby '2.5.5'
 
 
 gem 'webpacker', '~> 3.5'
-gem 'bootstrap-sass', '~> 3.3.7'
+gem 'bootstrap-sass', '~> 3.4'
 gem 'bootstrap_form'
-gem 'devise', '~> 4.3.0'
+gem 'devise', '~> 4.6.2'
 gem 'devise_invitable'
 gem 'figaro'
 gem 'pg', '~> 0.18'
 gem 'pg_search' # PostgreSQL full text search
-gem 'rails', '~> 5.1.6.2'
+gem 'rails', '~> 5.1.7'
 gem 'recaptcha', require: 'recaptcha/rails'
 gem 'sanitize', '~> 4.4'
-gem 'sass-rails', '~> 5.0.6'
+gem 'sassc-rails'
 gem 'simple_token_authentication', '~> 1.15.1' # Token authentication for Devise
 gem 'yomu'
 
@@ -35,9 +35,9 @@ gem 'rack-attack'
 # JS datetime library, requirement of datetime picker
 gem 'momentjs-rails', '~> 2.17.1'
 # JS datetime picker
-gem 'bootstrap3-datetimepicker-rails', '~> 4.15.35'
+gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
 # Select elements for Bootstrap
-gem 'bootstrap-select-rails', '~> 1.12.4'
+gem 'bootstrap-select-rails', '~> 1.13.8'
 gem 'uglifier', '>= 1.3.0'
 # jQuery & plugins
 gem 'autosize-rails' # jQuery autosize plugin
@@ -68,7 +68,7 @@ gem 'nested_form_fields'
 gem 'nokogiri', '~> 1.8.1' # HTML/XML parser
 gem 'rails_autolink', '~> 1.1', '>= 1.1.6'
 gem 'rgl' # Graph framework for project diagram calculations
-gem 'roo', '~> 2.7.1' # Spreadsheet parser
+gem 'roo', '~> 2.8.2' # Spreadsheet parser
 gem 'rubyzip'
 gem 'scenic', '~> 1.4'
 gem 'sdoc', '~> 1.0', group: :doc
@@ -116,8 +116,6 @@ group :development, :test do
   gem 'rails-controller-testing'
   gem 'rspec-rails'
   gem 'rubocop', '>= 0.59.0', require: false
-  gem 'scss_lint', require: false
-  gem 'starscope', require: false
   gem 'timecop'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 96c7515fc..21834e26a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/biosistemika/canaid
-  revision: 943ae9b9801819fd2513f6ab9e1143ad8de523ce
+  revision: 6c02dfe7e8354e130d543ec0b398ab6411892d13
   branch: master
   specs:
-    canaid (1.0.2)
+    canaid (1.0.3)
       devise (>= 3.4.1)
       docile (>= 1.1.0)
       rails (>= 4)
@@ -17,9 +17,9 @@ GIT
 
 GIT
   remote: https://github.com/einzige/sneaky-save
-  revision: 7e7596720e76a3c243042be2f5f916525b143a54
+  revision: ee71d0a00cd4ecdd575bd2a9aa8b8693915f4871
   specs:
-    sneaky-save (0.1.2)
+    sneaky-save (0.1.3)
       activerecord (>= 3.2.0)
 
 GIT
@@ -42,51 +42,51 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (5.1.6.2)
-      actionpack (= 5.1.6.2)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6.2)
-      actionpack (= 5.1.6.2)
-      actionview (= 5.1.6.2)
-      activejob (= 5.1.6.2)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.6.2)
-      actionview (= 5.1.6.2)
-      activesupport (= 5.1.6.2)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6.2)
-      activesupport (= 5.1.6.2)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.7)
+    active_model_serializers (0.10.9)
       actionpack (>= 4.1, < 6)
       activemodel (>= 4.1, < 6)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (5.1.6.2)
-      activesupport (= 5.1.6.2)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
       globalid (>= 0.3.6)
-    activemodel (5.1.6.2)
-      activesupport (= 5.1.6.2)
-    activerecord (5.1.6.2)
-      activemodel (= 5.1.6.2)
-      activesupport (= 5.1.6.2)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
       arel (~> 8.0)
-    activerecord-import (0.23.0)
+    activerecord-import (1.0.1)
       activerecord (>= 3.2)
-    activesupport (5.1.6.2)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     aes_key_wrap (1.0.1)
     ajax-datatables-rails (0.3.1)
@@ -94,56 +94,57 @@ GEM
     arel (8.0.0)
     aspector (0.14.0)
     ast (2.4.0)
-    auto_strip_attributes (2.2.0)
-      activerecord (>= 3.0)
-    autoprefixer-rails (7.2.5)
+    auto_strip_attributes (2.5.0)
+      activerecord (>= 4.0)
+    autoprefixer-rails (9.5.1)
       execjs
     autosize-rails (1.18.17)
       rails (>= 3.1)
     awesome_print (1.8.0)
-    aws-sdk (2.10.123)
-      aws-sdk-resources (= 2.10.123)
-    aws-sdk-core (2.10.123)
+    aws-eventstream (1.0.3)
+    aws-sdk (2.11.264)
+      aws-sdk-resources (= 2.11.264)
+    aws-sdk-core (2.11.264)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.123)
-      aws-sdk-core (= 2.10.123)
-    aws-sigv4 (1.0.2)
-    babel-source (5.8.35)
-    babel-transpiler (0.7.0)
-      babel-source (>= 4.0, < 6)
-      execjs (~> 2.0)
-    backports (3.11.0)
+    aws-sdk-resources (2.11.264)
+      aws-sdk-core (= 2.11.264)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    backports (3.14.0)
     base62 (1.0.0)
-    bcrypt (3.1.11)
-    better_errors (2.4.0)
+    bcrypt (3.1.12)
+    better_errors (2.5.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    bindata (2.4.3)
+    bindata (2.4.4)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.7)
+    bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
-      sass (>= 3.3.4)
-    bootstrap-select-rails (1.12.4)
-    bootstrap3-datetimepicker-rails (4.15.35)
+      sassc (>= 2.0.0)
+    bootstrap-select-rails (1.13.8)
+    bootstrap3-datetimepicker-rails (4.17.47)
       momentjs-rails (>= 2.8.1)
-    bootstrap_form (2.7.0)
+    bootstrap_form (4.2.0)
+      actionpack (>= 5.0)
+      activemodel (>= 5.0)
     builder (3.2.3)
-    bullet (5.7.5)
+    bullet (6.0.0)
       activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.11.0)
-    byebug (9.1.0)
-    capybara (2.18.0)
+      uniform_notifier (~> 1.11)
+    byebug (11.0.1)
+    capybara (3.18.0)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    capybara-email (2.5.0)
-      capybara (~> 2.4)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-email (3.0.1)
+      capybara (>= 2.4, < 4.0)
       mail
     case_transform (0.2)
       activesupport
@@ -164,57 +165,65 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
-    cucumber (3.1.0)
+    cucumber (3.1.2)
       builder (>= 2.1.2)
-      cucumber-core (~> 3.1.0)
-      cucumber-expressions (~> 5.0.4)
+      cucumber-core (~> 3.2.0)
+      cucumber-expressions (~> 6.0.1)
       cucumber-wire (~> 0.0.1)
       diff-lcs (~> 1.3)
-      gherkin (~> 5.0)
+      gherkin (~> 5.1.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (3.1.0)
+    cucumber-core (3.2.1)
       backports (>= 3.8.0)
       cucumber-tag_expressions (~> 1.1.0)
-      gherkin (>= 5.0.0)
-    cucumber-expressions (5.0.13)
-    cucumber-rails (1.5.0)
-      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 4)
+      gherkin (~> 5.0)
+    cucumber-expressions (6.0.1)
+    cucumber-rails (1.7.0)
+      capybara (>= 2.3.0, < 4)
+      cucumber (>= 3.0.2, < 4)
       mime-types (>= 1.17, < 4)
-      nokogiri (~> 1.5)
-      railties (>= 4, < 5.2)
+      nokogiri (~> 1.8)
+      railties (>= 4.2, < 7)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
-    database_cleaner (1.6.2)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
-    deface (1.3.0)
-      nokogiri (~> 1.6)
+    deface (1.3.2)
+      nokogiri (>= 1.6)
       polyglot
       rails (>= 4.1)
       rainbow (>= 2.1.0)
-    delayed_job (4.1.4)
-      activesupport (>= 3.0, < 5.2)
-    delayed_job_active_record (4.1.2)
-      activerecord (>= 3.0, < 5.2)
+    delayed_job (4.1.5)
+      activesupport (>= 3.0, < 5.3)
+    delayed_job_active_record (4.1.3)
+      activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
-    devise (4.3.0)
+    devise (4.6.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    devise_invitable (1.7.2)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
+    devise_invitable (2.0.1)
+      actionmailer (>= 5.0)
+      devise (>= 4.6)
     diff-lcs (1.3)
     discard (1.0.0)
       activerecord (>= 4.2, < 6)
+<<<<<<< HEAD
     docile (1.1.5)
     doorkeeper (5.0.0)
       railties (>= 4.2)
     erubi (1.8.0)
     et-orbi (1.1.7)
+=======
+    docile (1.3.1)
+    doorkeeper (5.1.0)
+      railties (>= 5)
+    erubi (1.8.0)
+    et-orbi (1.2.0)
+>>>>>>> master
       tzinfo
     execjs (2.7.0)
     factory_bot (4.8.2)
@@ -224,50 +233,49 @@ GEM
       railties (>= 3.0.0)
     faker (1.8.7)
       i18n (>= 0.7)
-    faraday (0.12.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
+    ffi (1.10.0)
     figaro (1.1.1)
       thor (~> 0.14)
-    fugit (1.1.8)
-      et-orbi (~> 1.1, >= 1.1.7)
+    fugit (1.2.0)
+      et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
-    gherkin (5.0.0)
-    globalid (0.4.1)
+    gherkin (5.1.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     hammerjs-rails (2.0.8)
-    hashdiff (0.3.8)
-    hashie (3.5.7)
+    hashdiff (0.3.9)
+    hashie (3.6.0)
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    i18n-js (3.0.3)
-      i18n (~> 0.6, >= 0.6.6)
+    i18n-js (3.2.1)
+      i18n (>= 0.6.6)
     iniparse (1.4.4)
-    jaro_winkler (1.5.1)
-    jbuilder (2.7.0)
+    jaro_winkler (1.5.2)
+    jbuilder (2.8.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
-    jmespath (1.3.1)
-    jquery-rails (4.3.1)
+    jmespath (1.4.0)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    js_cookie_rails (2.1.4)
+    js_cookie_rails (2.2.0)
       railties (>= 3.1)
     json (1.8.6)
-    json-jwt (1.9.4)
-      activesupport
+    json-jwt (1.10.0)
+      activesupport (>= 4.2)
       aes_key_wrap
       bindata
-    json-schema (2.8.0)
-      addressable (>= 2.4)
-    json_matchers (0.7.2)
-      json-schema (~> 2.7)
+    json_matchers (0.11.0)
+      json_schema
+    json_schema (0.20.4)
     jsonapi-renderer (0.2.0)
     jwt (1.5.6)
     kaminari (1.1.1)
@@ -294,12 +302,12 @@ GEM
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     method_source (0.9.2)
     mime-types (1.25.1)
-    mimemagic (0.3.2)
-    mini_mime (1.0.0)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     momentjs-rails (2.17.1)
@@ -312,30 +320,28 @@ GEM
       coffee-rails (>= 3.2.1)
       jquery-rails
       rails (>= 3.2.0)
-    newrelic_rpm (4.7.1.340)
+    newrelic_rpm (6.2.0.354)
     nio4r (2.3.1)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     nokogumbo (1.5.0)
       nokogiri
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.3.10)
-    omniauth (1.8.1)
-      hashie (>= 3.4.6, < 3.6.0)
+    omniauth (1.9.0)
+      hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)
-    omniauth-linkedin-oauth2 (0.2.5)
-      omniauth (~> 1.0)
+    omniauth-linkedin-oauth2 (1.0.0)
       omniauth-oauth2
-    omniauth-oauth2 (1.5.0)
+    omniauth-oauth2 (1.6.0)
       oauth2 (~> 1.1)
-      omniauth (~> 1.2)
+      omniauth (~> 1.9)
     orm_adapter (0.5.0)
-    overcommit (0.46.0)
+    overcommit (0.47.0)
       childprocess (~> 0.6, >= 0.6.3)
       iniparse (~> 1.4)
     paperclip (5.3.0)
@@ -344,54 +350,57 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    parallel (1.12.1)
-    parser (2.5.1.2)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     pg (0.21.0)
-    pg_search (2.1.4)
+    pg_search (2.1.7)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
     phantomjs (2.1.1.0)
-    poltergeist (1.17.0)
-      capybara (~> 2.1)
+    poltergeist (1.18.1)
+      capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.5)
-    powerpack (0.1.2)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.5.1)
-      byebug (~> 9.1)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-rails (0.3.6)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (3.0.2)
-    puma (3.11.2)
+    public_suffix (3.0.3)
+    puma (3.12.1)
     raabro (1.1.6)
     rack (2.0.7)
+<<<<<<< HEAD
     rack-attack (5.4.1)
+=======
+    rack-attack (6.0.0)
+>>>>>>> master
       rack (>= 1.0, < 3)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.6.2)
-      actioncable (= 5.1.6.2)
-      actionmailer (= 5.1.6.2)
-      actionpack (= 5.1.6.2)
-      actionview (= 5.1.6.2)
-      activejob (= 5.1.6.2)
-      activemodel (= 5.1.6.2)
-      activerecord (= 5.1.6.2)
-      activesupport (= 5.1.6.2)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
       bundler (>= 1.3.0)
-      railties (= 5.1.6.2)
+      railties (= 5.1.7)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -404,30 +413,30 @@ GEM
       rails (> 3.1)
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.1.6.2)
-      actionpack (= 5.1.6.2)
-      activesupport (= 5.1.6.2)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rdoc (6.0.4)
-    recaptcha (4.6.3)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rdoc (6.1.1)
+    recaptcha (4.14.0)
       json
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rgl (0.5.3)
+    regexp_parser (1.4.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rgl (0.5.4)
       lazy_priority_queue (~> 0.1.0)
-      stream (~> 0.5.0)
-    rkelly-remix (0.0.7)
-    roo (2.7.1)
+      stream (~> 0.5.2)
+    roo (2.8.2)
       nokogiri (~> 1)
-      rubyzip (~> 1.1, < 2.0.0)
+      rubyzip (>= 1.2.1, < 2.0.0)
     rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -445,42 +454,36 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.59.0)
+    rubocop (0.68.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-graphviz (1.2.3)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    ruby-graphviz (1.2.4)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
-    rubyzip (1.2.1)
-    rufus-scheduler (3.5.2)
-      fugit (~> 1.1, >= 1.1.5)
-    safe_yaml (1.0.4)
+    rubyzip (1.2.2)
+    rufus-scheduler (3.6.0)
+      fugit (~> 1.1, >= 1.1.6)
+    safe_yaml (1.0.5)
     sanitize (4.6.6)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
-    sass (3.5.5)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    scenic (1.4.1)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
+    sassc-rails (2.1.1)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    scenic (1.5.1)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    scss_lint (0.56.0)
-      rake (>= 0.9, < 13)
-      sass (~> 3.5.3)
     sdoc (1.0.0)
       rdoc (>= 5.0)
     shoulda-matchers (3.1.2)
@@ -490,12 +493,11 @@ GEM
       actionmailer (>= 3.2.6, < 6)
       actionpack (>= 3.2.6, < 6)
       devise (>= 3.2, < 6)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sourcemap (0.1.1)
     spinjs-rails (1.4)
       rails (>= 3.1)
     sprockets (3.7.2)
@@ -505,34 +507,27 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    starscope (1.5.6)
-      babel-transpiler (~> 0.7)
-      oj (~> 3.3)
-      parser (~> 2.4)
-      rkelly-remix (~> 0.0.7)
-      ruby-progressbar (~> 1.9)
-      sourcemap (~> 0.1)
-    stream (0.5)
+    stream (0.5.2)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     timecop (0.9.1)
     tinymce-rails (4.9.3)
       railties (>= 3.1.1)
     turbolinks (5.1.1)
       turbolinks-source (~> 5.1)
-    turbolinks-source (5.1.0)
+    turbolinks-source (5.2.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.4)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     underscore-rails (1.8.3)
-    unicode-display_width (1.4.0)
-    uniform_notifier (1.11.0)
-    warden (1.2.7)
-      rack (>= 1.0)
+    unicode-display_width (1.5.0)
+    uniform_notifier (1.12.1)
+    warden (1.2.8)
+      rack (>= 2.0.6)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -547,7 +542,7 @@ GEM
     whacamole (1.2.0)
     wicked_pdf (1.1.0)
     wkhtmltopdf-heroku (2.12.4.0)
-    xpath (3.0.0)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
     yomu (0.2.4)
       json (~> 1.8)
@@ -569,9 +564,9 @@ DEPENDENCIES
   bcrypt (~> 3.1.10)
   better_errors
   binding_of_caller
-  bootstrap-sass (~> 3.3.7)
-  bootstrap-select-rails (~> 1.12.4)
-  bootstrap3-datetimepicker-rails (~> 4.15.35)
+  bootstrap-sass (~> 3.4)
+  bootstrap-select-rails (~> 1.13.8)
+  bootstrap3-datetimepicker-rails (~> 4.17.47)
   bootstrap_form
   bullet
   byebug
@@ -584,7 +579,7 @@ DEPENDENCIES
   deface (~> 1.0)
   delayed_job_active_record
   delayed_paperclip!
-  devise (~> 4.3.0)
+  devise (~> 4.6.2)
   devise-async!
   devise_invitable
   discard (~> 1.0)
@@ -623,22 +618,21 @@ DEPENDENCIES
   pry-rails
   puma
   rack-attack
-  rails (~> 5.1.6.2)
+  rails (~> 5.1.7)
   rails-controller-testing
   rails_12factor
   rails_autolink (~> 1.1, >= 1.1.6)
   recaptcha
   rgl
-  roo (~> 2.7.1)
+  roo (~> 2.8.2)
   rspec-rails
   rubocop (>= 0.59.0)
   ruby-graphviz (~> 1.2)
   rubyzip
   rufus-scheduler (~> 3.5)
   sanitize (~> 4.4)
-  sass-rails (~> 5.0.6)
+  sassc-rails
   scenic (~> 1.4)
-  scss_lint
   sdoc (~> 1.0)
   shoulda-matchers
   silencer
@@ -646,7 +640,6 @@ DEPENDENCIES
   simplecov
   sneaky-save!
   spinjs-rails
-  starscope
   timecop
   tinymce-rails (~> 4.9.3)
   turbolinks (~> 5.1.1)
@@ -661,7 +654,7 @@ DEPENDENCIES
   yomu
 
 RUBY VERSION
-   ruby 2.4.5p335
+   ruby 2.5.5p157
 
 BUNDLED WITH
-   1.17.2
+   1.17.3
diff --git a/app/serializers/api/v1/user_serializer.rb b/app/serializers/api/v1/user_serializer.rb
index 2352b18c5..4b29121b2 100644
--- a/app/serializers/api/v1/user_serializer.rb
+++ b/app/serializers/api/v1/user_serializer.rb
@@ -5,12 +5,21 @@ module Api
     class UserSerializer < ActiveModel::Serializer
       type :users
       attributes :full_name, :initials, :email
-      attribute :avatar_file_name,
-                if: -> { object.avatar.present? } { object.avatar_file_name }
-      attribute :avatar_file_size,
-                if: -> { object.avatar.present? } { object.avatar.size }
-      attribute :avatar_url,
-                if: -> { object.avatar.present? } { object.avatar.url(:icon) }
+      attribute :avatar_file_name, if: -> { object.avatar.present? }
+      attribute :avatar_file_size, if: -> { object.avatar.present? }
+      attribute :avatar_url, if: -> { object.avatar.present? }
+
+      def avatar_file_name
+        object.avatar_file_name
+      end
+
+      def avatar_file_size
+        object.avatar.size
+      end
+
+      def avatar_url
+        object.avatar.url(:icon)
+      end
     end
   end
 end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e6868c381..22df30016 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -118,7 +118,7 @@ Rails.application.configure do
   if Rails.root.join('tmp/caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
-    config.cache_store = :memory_store
+    config.cache_store = :memory_store, { size: (ENV['RAILS_MEM_CACHE_SIZE_MB'] || 32).to_i.megabytes }
     config.public_file_server.headers = {
       'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
     }
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cd3a69326..600a005b6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -78,9 +78,6 @@ Rails.application.configure do
   # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
-
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'
 
@@ -90,7 +87,7 @@ Rails.application.configure do
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
-  config.i18n.fallbacks = true
+  config.i18n.fallbacks = [I18n.default_locale]
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
@@ -129,7 +126,7 @@ Rails.application.configure do
   end
 
   # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
+  config.cache_store = :memory_store, { size: (ENV['RAILS_MEM_CACHE_SIZE_MB'] || 32).to_i.megabytes }
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   config.active_job.queue_adapter     = :delayed_job
diff --git a/spec/models/project_comment_spec.rb b/spec/models/project_comment_spec.rb
index cdefd4449..a66cdd06a 100644
--- a/spec/models/project_comment_spec.rb
+++ b/spec/models/project_comment_spec.rb
@@ -1,8 +1,8 @@
 require 'rails_helper'
 
-describe Comment::ProjectComment, type: :model do
+describe ProjectComment, type: :model do
   it 'should be of class MyModuleTag' do
-    expect(subject.class).to eq Comment::ProjectComment
+    expect(subject.class).to eq ProjectComment
   end
 
   describe 'Database table' do