From 04f1c1c08ddac5370f370a3bbab3efd3e80ca848 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 19 May 2017 23:07:42 +0200
Subject: [PATCH] Merge remote-tracking branch 'upstream/master' into
 pagination

---
 package.json                    | 4 ++--
 src/app/core/core.module.ts     | 1 +
 src/app/shared/shared.module.ts | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 8dd1110d1a..3a14107f3f 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "@angular/upgrade": "2.2.3",
     "@angularclass/bootloader": "1.0.1",
     "@angularclass/idle-preload": "1.0.4",
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.15",
+    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.24",
     "@ngrx/core": "^1.2.0",
     "@ngrx/effects": "^2.0.0",
     "@ngrx/router-store": "^1.2.5",
@@ -92,7 +92,7 @@
     "angular2-universal": "2.1.0-rc.1",
     "angular2-universal-polyfills": "2.1.0-rc.1",
     "body-parser": "1.15.2",
-    "bootstrap": "4.0.0-alpha.5",
+    "bootstrap": "4.0.0-alpha.6",
     "cerialize": "^0.1.13",
     "compression": "1.6.2",
     "express": "4.14.0",
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index cdd474a909..be8da28571 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -34,6 +34,7 @@ const PROVIDERS = [
   DSpaceRESTv2Service,
   ObjectCacheService,
   PaginationOptions,
+  ResponseCacheService,
   RequestService,
   RemoteDataBuildService
 ];
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 76f2c57ef9..f357dc892f 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -31,9 +31,9 @@ const PIPES = [
 ];
 
 const COMPONENTS = [
-  ThumbnailComponent
   // put shared components here
-  PaginationComponent
+  PaginationComponent,
+  ThumbnailComponent
 ];
 
 const PROVIDERS = [