diff --git a/Gemfile b/Gemfile
index cea80acfd..a9dea2b9f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,9 @@ gem 'figaro', '~> 1.1.0'
 gem 'pg',                        '~> 0.18.0'
 gem 'ransack',                   '~> 1.5.1' # for searching
 # with polymorphic fix
-gem 'paper_trail', github: 'airblade/paper_trail', ref: 'a453811226ec4ea59753ba6b827e390ced2fc140'
+gem 'paper_trail', 
+  github: 'airblade/paper_trail', 
+  ref: 'a453811226ec4ea59753ba6b827e390ced2fc140'
 gem 'rails-settings-cached',     '~> 0.4.1' # for settings
 
 # html-xml
@@ -48,11 +50,11 @@ gem 'select2-rails',    '~> 3.5.9.3' # for autocomplete
 gem 'bootstrap-datepicker-rails', '~> 1.3.1.1' # datepicker
 
 # rights
-gem 'devise',    '~> 3.4.1' # authenitcation
-gem 'cancancan', '~> 1.9.2' # autharization
+gem 'devise',    '~> 3.5.1'  # authenitcation
+gem 'cancancan', '~> 1.11.0' # autharization
 
 # rest api
-gem 'grape',    '~> 0.10.1'
+gem 'grape',    '~> 0.12.0'
 gem 'jbuilder', '~> 2.2.6'  # json api
 
 # registry specfic
@@ -70,7 +72,7 @@ gem 'data_migrate',
 gem 'newrelic_rpm', '~> 3.12.0.288'
 
 # country listing
-gem 'countries', '~> 0.10.0'
+gem 'countries', '~> 0.11.4'
 
 # cloning activerecord objects
 gem 'deep_cloneable', '~> 2.1.1'
@@ -120,13 +122,13 @@ end
 
 group :development, :test do
   # test stack
-  gem 'rspec-rails',        '~> 3.0.2'
+  gem 'rspec-rails',        '~> 3.3.2'
   gem 'capybara',           '~> 2.4.1'
   gem 'phantomjs-binaries', '~> 1.9.2.4'
   gem 'poltergeist',        '~> 1.6.0'  # We are using PhantomJS instead
   gem 'phantomjs',          '~> 1.9.8.0'
   gem 'fabrication',        '~> 2.13.2' # Replacement for fixtures
-  gem 'shoulda-matchers',   '~> 2.6.1', require: false # Additional matchers for RSpec
+  gem 'shoulda-matchers',   '~> 2.8.0', require: false # Additional matchers for RSpec
   gem 'launchy',            '~> 2.4.3' # for opening browser automatically
 
   # helper gems
@@ -156,5 +158,5 @@ group :development, :test do
   # for travis
   gem 'rake'
 
-  gem "autodoc"
+  gem 'autodoc'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 66ecb33eb..edae15b53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,7 +131,7 @@ GEM
     bullet (4.14.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.9.0)
-    cancancan (1.9.2)
+    cancancan (1.11.0)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -155,8 +155,9 @@ GEM
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    countries (0.10.0)
+    countries (0.11.4)
       currencies (~> 0.4.2)
+      i18n_data (~> 0.7.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     currencies (0.4.2)
@@ -166,7 +167,7 @@ GEM
       activerecord (>= 3.1.0, < 5.0.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (3.4.1)
+    devise (3.5.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -203,7 +204,7 @@ GEM
     formatador (0.2.5)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
-    grape (0.10.1)
+    grape (0.12.0)
       activesupport
       builder
       hashie (>= 2.1.0)
@@ -259,6 +260,7 @@ GEM
     httpi (2.4.1)
       rack
     i18n (0.7.0)
+    i18n_data (0.7.0)
     ice_nine (0.11.1)
     isikukood (0.1.2)
     iso8601 (0.8.6)
@@ -405,26 +407,27 @@ GEM
     request_store (1.1.0)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-rails (3.0.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.2)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     rubocop (0.32.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.2.5, < 3.0)
@@ -467,7 +470,7 @@ GEM
     selectize-rails (0.12.1)
     sexp_processor (4.6.0)
     shellany (0.0.1)
-    shoulda-matchers (2.6.2)
+    shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -554,22 +557,22 @@ DEPENDENCIES
   brakeman (~> 3.0.5)
   bullet (~> 4.14.4)
   bundler-audit!
-  cancancan (~> 1.9.2)
+  cancancan (~> 1.11.0)
   capybara (~> 2.4.1)
   coderay (~> 1.1.0)
   coffee-rails (~> 4.1.0)
-  countries (~> 0.10.0)
+  countries (~> 0.11.4)
   data_migrate!
   database_cleaner (~> 1.4.1)
   deep_cloneable (~> 2.1.1)
-  devise (~> 3.4.1)
+  devise (~> 3.5.1)
   digidoc_client (~> 0.2.1)
   epp (~> 1.4.2)!
   epp-xml (~> 1.0.3)
   fabrication (~> 2.13.2)
   faker (~> 1.4.3)
   figaro (~> 1.1.0)
-  grape (~> 0.10.1)
+  grape (~> 0.12.0)
   guard (~> 2.12.6)
   guard-rails (~> 0.7.1)
   guard-rspec (~> 4.5.2)
@@ -605,14 +608,14 @@ DEPENDENCIES
   rails-settings-cached (~> 0.4.1)
   rake
   ransack (~> 1.5.1)
-  rspec-rails (~> 3.0.2)
+  rspec-rails (~> 3.3.2)
   rubocop (~> 0.32.1)
   rubycritic (~> 1.4.0)
   sass-rails (~> 5.0.3)
   sdoc (~> 0.4.0)
   select2-rails (~> 3.5.9.3)
   selectize-rails (~> 0.12.1)
-  shoulda-matchers (~> 2.6.1)
+  shoulda-matchers (~> 2.8.0)
   simplecov (~> 0.10.0)
   simpleidn (~> 0.0.5)
   spring (~> 1.3.6)