Merge remote-tracking branch 'remotes/origin/master' into mydspace

# Conflicts:
#	src/app/core/data/base-response-parsing.service.ts
#	src/app/core/data/request.service.ts

src/app/core/auth/auth.service.spec.ts

@@ -43,7 +43,7 @@ describe('AuthService test', () => {
       pipe: observableOf(true)
     });
     window = new NativeWindowRef();
-    routerStub = new RouterStub()
+    routerStub = new RouterStub();
     token = new AuthTokenInfo('test_token');
     token.expires = Date.now() + (1000 * 60 * 60);
     authenticatedState = {