diff --git a/Gemfile.lock b/Gemfile.lock
index c88fdb0fac154c3c4c1c69f21ea0a0f8f55330a7..f97d5f9128b3660afd5c71726d93f55fab402077 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,15 @@
+GIT
+  remote: git://github.com/mgiacomini/dspace-rest-client.git
+  revision: 7bc3a0a4fe8222663b9642d580de17acfdb76688
+  branch: master
+  specs:
+    dspace_rest_client (2.2.8)
+      activesupport (>= 4.2.0)
+      faraday (~> 0.9.2)
+      json (~> 1.8, >= 1.8.3)
+      net-http-persistent (~> 2.9, >= 2.9.4)
+      resource_kit (>= 0.1.4)
+
 GIT
   remote: git://github.com/rubysherpas/paranoia.git
   revision: bd3383729c790bf09e488f84221eaaea27c6597e
@@ -32,11 +44,11 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_model_serializers (0.10.2)
+    active_model_serializers (0.10.5)
       actionpack (>= 4.1, < 6)
       activemodel (>= 4.1, < 6)
-      jsonapi (~> 0.1.1.beta2)
-      railties (>= 4.1, < 6)
+      case_transform (>= 0.2)
+      jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
     activejob (5.0.0.1)
       activesupport (= 5.0.0.1)
       globalid (>= 0.3.6)
@@ -46,14 +58,17 @@ GEM
       activemodel (= 5.0.0.1)
       activesupport (= 5.0.0.1)
       arel (~> 7.0)
-    activerecord-import (0.16.1)
+    activerecord-import (0.17.2)
       activerecord (>= 3.2)
     activesupport (5.0.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    acts_as_list (0.9.4)
+      activerecord (>= 3.0)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     annotate (2.7.1)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 12.0)
@@ -74,16 +89,17 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.4.1)
-    builder (3.2.2)
-    bullet (5.4.2)
+    brakeman (3.6.1)
+    builder (3.2.3)
+    bullet (5.5.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
     byebug (9.0.6)
+    case_transform (0.2)
+      activesupport
     choice (0.2.0)
     chronic (0.10.2)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+    climate_control (0.1.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     codeclimate-engine-rb (0.4.0)
@@ -91,8 +107,8 @@ GEM
     coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.2)
-    connection_pool (2.2.0)
+    concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
     curb (0.8.8)
     cvss (0.99.0)
     dalli (2.7.6)
@@ -109,7 +125,7 @@ GEM
     data_objects (0.10.17)
       addressable (~> 2.1)
     database_cleaner (1.5.3)
-    dawnscanner (1.6.6)
+    dawnscanner (1.6.7)
       cvss
       data_mapper
       dm-sqlite-adapter
@@ -122,13 +138,13 @@ GEM
       sys-uname
       terminal-table
     debug_inspector (0.0.2)
-    derailed_benchmarks (1.3.1)
+    derailed_benchmarks (1.3.2)
       benchmark-ips (~> 2)
       get_process_mem (~> 0)
       heapy (~> 0)
       memory_profiler (~> 0)
       rack (>= 1)
-      rake (> 10, < 12)
+      rake (> 10, < 13)
       thor (~> 0.19)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -138,10 +154,10 @@ GEM
       railties (>= 4.1.0, < 5.1)
       responders
       warden (~> 1.2.3)
-    devise_token_auth (0.1.39)
+    devise_token_auth (0.1.40)
       devise (> 3.5.2, <= 4.2)
       rails (< 6)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     dm-aggregates (1.2.0)
       dm-core (~> 1.2.0)
     dm-constraints (1.2.0)
@@ -178,45 +194,39 @@ GEM
       dm-core (~> 1.2.0)
     do_sqlite3 (0.10.17)
       data_objects (= 0.10.17)
-    dspace_rest_client (2.2.8)
-      activesupport (>= 4.2.0)
-      faraday (~> 0.9.2)
-      json (~> 1.8, >= 1.8.3)
-      net-http-persistent (~> 2.9, >= 2.9.4)
-      resource_kit (>= 0.1.4)
-    elasticsearch (2.0.0)
-      elasticsearch-api (= 2.0.0)
-      elasticsearch-transport (= 2.0.0)
-    elasticsearch-api (2.0.0)
+    elasticsearch (5.0.3)
+      elasticsearch-api (= 5.0.3)
+      elasticsearch-transport (= 5.0.3)
+    elasticsearch-api (5.0.3)
       multi_json
-    elasticsearch-transport (2.0.0)
+    elasticsearch-transport (5.0.3)
       faraday
       multi_json
     equalizer (0.0.11)
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_girl (4.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faker (1.6.6)
+    faker (1.7.3)
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     fastercsv (1.5.5)
     feature (1.4.0)
-    ffi (1.9.14)
+    ffi (1.9.18)
     flamegraph (0.9.5)
     flay (2.8.1)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    flog (4.4.0)
+    flog (4.6.1)
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
-      sexp_processor (~> 4.4)
+      sexp_processor (~> 4.8)
     get_process_mem (0.2.1)
     gitlab (3.7.0)
       httparty (~> 0.13.0)
@@ -225,22 +235,18 @@ GEM
       activesupport (>= 4.1.0)
     haml (4.0.7)
       tilt
-    hashie (3.4.6)
+    hashie (3.5.5)
     heapy (0.1.2)
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.7.0)
+    i18n (0.8.1)
     ice_nine (0.11.2)
-    immigrant (0.3.5)
+    immigrant (0.3.6)
       activerecord (>= 3.0)
-    json (1.8.3)
-    json_pure (1.8.3)
-    jsonapi (0.1.1.beta6)
-      jsonapi-parser (= 0.1.1.beta3)
-      jsonapi-renderer (= 0.1.1.beta1)
-    jsonapi-parser (0.1.1.beta3)
-    jsonapi-renderer (0.1.1.beta1)
+    json (1.8.6)
+    json_pure (1.8.6)
+    jsonapi-renderer (0.1.2)
     justify (1.0.2)
     jwt (1.5.6)
     launchy (2.4.3)
@@ -251,40 +257,40 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    memory_profiler (0.9.6)
+    memory_profiler (0.9.8)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mina (1.0.2)
+    mina (1.0.6)
       open4 (~> 1.3.4)
       rake
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    minitest-reporters (1.1.12)
+    minitest (5.10.1)
+    minitest-reporters (1.1.14)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustache (1.0.3)
+    mustache (1.0.5)
     net-http-persistent (2.9.4)
     nio4r (1.2.1)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     oauth (0.5.1)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.3.1)
-      hashie (>= 1.2, < 4)
-      rack (>= 1.0, < 3)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
     omniauth-google-oauth2 (0.4.1)
@@ -298,13 +304,13 @@ GEM
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-twitter (1.2.1)
-      json (~> 1.3)
+    omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
+      rack
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    paper_trail (5.2.2)
-      activerecord (>= 3.0, < 6.0)
+    paper_trail (6.0.2)
+      activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
     paperclip (5.1.0)
       activemodel (>= 4.2.0)
@@ -312,10 +318,10 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    parser (2.3.1.2)
+    parser (2.4.0.0)
       ast (~> 2.2)
-    path_expander (1.0.0)
-    pg (0.19.0)
+    path_expander (1.0.1)
+    pg (0.20.0)
     phantomjs (2.1.1.0)
     powerpack (0.1.1)
     ptools (1.3.3)
@@ -324,14 +330,15 @@ GEM
       activerecord (>= 3.0)
       i18n (>= 0.5.0)
       railties (>= 3.0.0)
-    puma (3.6.0)
+    public_suffix (2.0.5)
+    puma (3.8.2)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
     rack (2.0.1)
     rack-attack (5.0.1)
       rack
-    rack-cors (0.4.0)
-    rack-mini-profiler (0.10.1)
+    rack-cors (0.4.1)
+    rack-mini-profiler (0.10.2)
       rack (>= 1.2.0)
     rack-protection (1.5.3)
       rack
@@ -349,9 +356,9 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 5.0.0.1)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.1)
+    rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
     rails-erd (1.5.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
@@ -365,18 +372,17 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
+    rainbow (2.2.1)
     rake (11.3.0)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    redis (3.3.1)
-    reek (4.5.1)
+    rdoc (4.3.0)
+    redis (3.3.3)
+    reek (4.5.6)
       codeclimate-engine-rb (~> 0.4.0)
-      parser (~> 2.3.1, >= 2.3.1.2)
+      parser (>= 2.3.1.2, < 2.5)
       rainbow (~> 2.0)
-    request_store (1.3.1)
-    resource_kit (0.1.5)
-      addressable (~> 2.3.6)
+    request_store (1.3.2)
+    resource_kit (0.1.6)
+      addressable (>= 2.3.6, < 3.0.0)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     rmagick (2.16.0)
@@ -401,30 +407,30 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rspec_api_documentation (4.8.0)
+    rspec_api_documentation (4.9.0)
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
-      rspec (~> 3.0, >= 3.0.0)
-    rubocop (0.45.0)
-      parser (>= 2.3.1.1, < 3.0)
+      rspec (~> 3.0)
+    rubocop (0.48.0)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-graphviz (1.2.2)
+    ruby-graphviz (1.2.3)
     ruby-progressbar (1.8.1)
-    ruby_parser (3.8.3)
+    ruby_parser (3.8.4)
       sexp_processor (~> 4.1)
-    rubycritic (3.0.0)
+    rubycritic (3.2.0)
       flay (~> 2.8)
       flog (~> 4.4)
       launchy (= 2.4.3)
-      parser (= 2.3.1.2)
-      rainbow
+      parser (= 2.4.0)
+      rainbow (~> 2.1)
       reek (~> 4.4)
       ruby_parser (~> 3.8)
       virtus (~> 1.0)
-    rubyzip (1.2.0)
+    rubyzip (1.2.1)
     screencap (0.1.4)
       phantomjs
     sdoc (0.4.2)
@@ -434,14 +440,14 @@ GEM
       activemodel
       elasticsearch (>= 1)
       hashie
-    sexp_processor (4.7.0)
+    sexp_processor (4.8.0)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
+    shoulda-context (1.2.2)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (4.2.4)
+    sidekiq (4.2.10)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
@@ -451,16 +457,16 @@ GEM
     slim (3.0.7)
       temple (~> 0.7.6)
       tilt (>= 1.3.3, < 2.1)
-    spring (2.0.0)
+    spring (2.0.1)
       activesupport (>= 4.2)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     stackprof (0.2.10)
     streamio-ffmpeg (1.0.0)
     stringex (1.5.1)
@@ -469,12 +475,12 @@ GEM
     temple (0.7.7)
     terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.1.3)
     uniform_notifier (1.10.0)
     uuidtools (2.1.5)
     virtus (1.0.5)
@@ -482,14 +488,14 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
     web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     whenever (0.9.7)
@@ -501,12 +507,14 @@ PLATFORMS
 DEPENDENCIES
   active_model_serializers
   activerecord-import
+  acts_as_list
   annotate
   bcrypt (~> 3.1.7)
   better_errors
   brakeman
   bullet
   byebug
+  connection_pool
   curb (~> 0.8.8)
   dalli
   database_cleaner
@@ -514,7 +522,7 @@ DEPENDENCIES
   derailed_benchmarks
   devise
   devise_token_auth
-  dspace_rest_client (= 2.2.8)
+  dspace_rest_client!
   execjs
   factory_girl_rails
   faker