diff --git a/Gemfile b/Gemfile
index 799b2773a..f5db9a0e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,11 +21,10 @@ gem 'sass-rails', '~> 4.0.3'       # '5.0.0'   # sass style
 gem 'bootstrap-sass', '~> 3.2.0.1' # '3.3.1.0' # bootstrap style
 
 # js
-gem 'uglifier', '>= 1.3.0'         # '2.6.1' # minifies js
-gem 'coffee-rails', '~> 4.0.0'     # '4.1.0' # coffeescript support
-gem 'turbolinks'                   # '2.5.3' # faster page load
-gem 'jquery-rails'                 # '4.0.3' # jquery
-gem 'jbuilder', '~> 2.0'           # '2.2.6' # json api
+gem 'uglifier',        '>= 1.3.0'  # '2.6.1' # minifies js
+gem 'coffee-rails',    '~> 4.0.0'  # '4.1.0' # coffeescript support
+gem 'turbolinks',      '~> 2.5.3'  # faster page load
+gem 'jquery-rails',    '~> 3.1.1'  # '4.0.3' jquery
 gem 'selectize-rails', '~> 0.11.0' # '0.11.2' # include selectize.js for select
 
 # view helpers
@@ -37,7 +36,8 @@ gem 'devise',    '~> 3.3.0' # '3.4.0' # authenitcation
 gem 'cancancan', '~> 1.9.2' # autharization
 
 # rest api
-gem 'grape', '~> 0.10.1'
+gem 'grape',    '~> 0.10.1'
+gem 'jbuilder', '~> 2.2.6'  # json api
 
 # registry specfic
 gem 'simpleidn', '~> 0.0.5' # For punycode
@@ -45,7 +45,7 @@ gem 'isikukood' # for EE-id validation
 
 # deploy
 gem 'whenever', '~> 0.9.4', require: false
-gem 'daemons'  '~> 1.1.9' # process delayed jobs
+gem 'daemons',  '~> 1.1.9' # process delayed jobs
 
 group :development do
   # dev tools
@@ -97,7 +97,7 @@ group :development, :test do
   gem 'bundler-audit', '~> 0.3.1'  # for finding future vulnerable gems
   gem 'brakeman',      '~> 2.6.2', require: false # for security audit'
   gem 'sdoc',          '~> 0.4.0'  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'railroady'      '~> 1.3.0'  # to generate database diagrams
+  gem 'railroady',     '~> 1.3.0'  # to generate database diagrams
 
   # dev tools
   gem 'unicorn'
diff --git a/Gemfile.lock b/Gemfile.lock
index 75e4a0cde..4fe5d8289 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -166,7 +166,7 @@ GEM
     ice_nine (0.11.0)
     isikukood (0.1.2)
     iso8601 (0.8.2)
-    jbuilder (2.2.2)
+    jbuilder (2.2.6)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.2)
@@ -209,7 +209,7 @@ GEM
     parser (2.2.0.pre.5)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
-    pg (0.17.1)
+    pg (0.18.1)
     phantomjs (1.9.7.1)
     phantomjs-binaries (1.9.2.4)
       sys-uname (= 0.9.0)
@@ -233,7 +233,7 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railroady (1.2.0)
+    railroady (1.3.0)
     rails (4.1.4)
       actionmailer (= 4.1.4)
       actionpack (= 4.1.4)
@@ -253,7 +253,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     raindrops (0.13.0)
-    rake (10.3.2)
+    rake (10.4.2)
     ransack (1.3.0)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -362,7 +362,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.4.0)
+    turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -398,11 +398,11 @@ DEPENDENCIES
   bootstrap-sass (~> 3.2.0.1)
   brakeman (~> 2.6.2)
   bullet (~> 4.14.0)
-  bundler-audit
+  bundler-audit (~> 0.3.1)
   cancancan (~> 1.9.2)
   capybara (~> 2.4.1)
   coffee-rails (~> 4.0.0)
-  daemons
+  daemons (~> 1.1.9)
   database_cleaner (~> 1.3.0)
   delayed_job_active_record (~> 4.0.2)
   devise (~> 3.3.0)
@@ -418,22 +418,22 @@ DEPENDENCIES
   hashie_rails (~> 0.0.1)
   isikukood
   iso8601 (~> 0.8.2)
-  jbuilder (~> 2.0)
-  jquery-rails
+  jbuilder (~> 2.2.6)
+  jquery-rails (~> 3.1.1)
   kaminari (~> 0.16.1)
   launchy (~> 2.4.3)
   mina (~> 0.3.1)
   nokogiri (~> 1.6.2.1)
   nprogress-rails (~> 0.1.3.1)
   paper_trail (~> 3.0.5)
-  pg
+  pg (~> 0.18.0)
   phantomjs (~> 1.9.7.1)
   phantomjs-binaries (~> 1.9.2.4)
   poltergeist (~> 1.5.1)
   pry (~> 0.10.1)
-  railroady
+  railroady (~> 1.3.0)
   rails (= 4.1.4)
-  rails-settings-cached (= 0.4.1)
+  rails-settings-cached (~> 0.4.1)
   ransack (~> 1.3.0)
   rspec-rails (~> 3.0.2)
   rubocop (~> 0.26.1)
@@ -448,7 +448,7 @@ DEPENDENCIES
   spring-commands-rspec (~> 1.0.2)
   therubyracer
   traceroute (~> 0.4.0)
-  turbolinks
+  turbolinks (~> 2.5.3)
   uglifier (>= 1.3.0)
   unicorn
   uuidtools (~> 2.1.4)