diff --git a/Angular2_Dev/img/coreui-logotyp.png b/Angular2_Dev/img/logo.png
similarity index 100%
rename from Angular2_Dev/img/coreui-logotyp.png
rename to Angular2_Dev/img/logo.png
diff --git a/Angular2_Dev/karma.conf.js b/Angular2_Dev/karma.conf.js
index 28c0b52d713434ae4aa1f4aeda0f3eed7ed54c8e..650d82a8ba2f9aea06c0c402e543e8e8b838ea9b 100755
--- a/Angular2_Dev/karma.conf.js
+++ b/Angular2_Dev/karma.conf.js
@@ -1,7 +1,11 @@
 module.exports = function(config) {
 
-  var appBase   = 'app/';      // transpiled app JS files
-  var appAssets ='/base/app/'; // component assets fetched by Angular's compiler
+  var appBase    = 'app/';       // transpiled app JS and map files
+  var appSrcBase = 'app/';       // app source TS files
+  var appAssets  = '/base/app/'; // component assets fetched by Angular's compiler
+
+  var testBase    = 'testing/';       // transpiled test JS and map files
+  var testSrcBase = 'testing/';       // test source TS files
 
   config.set({
     basePath: '',
@@ -26,40 +30,48 @@ module.exports = function(config) {
 
       // Polyfills
       'node_modules/core-js/client/shim.js',
-
-      // Reflect and Zone.js
       'node_modules/reflect-metadata/Reflect.js',
+
+      // zone.js
       'node_modules/zone.js/dist/zone.js',
+      'node_modules/zone.js/dist/long-stack-trace-zone.js',
+      'node_modules/zone.js/dist/proxy.js',
+      'node_modules/zone.js/dist/sync-test.js',
+      'node_modules/zone.js/dist/jasmine-patch.js',
       'node_modules/zone.js/dist/async-test.js',
       'node_modules/zone.js/dist/fake-async-test.js',
-      'node_modules/zone.js/dist/sync-test.js',
-      'node_modules/zone.js/dist/proxy.js',
 
-      // RxJs.
+      // RxJs
       { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
       { pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false },
 
-      // Angular 2 itself and the testing library
+      // Paths loaded via module imports:
+      // Angular itself
       {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false},
       {pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false},
 
       {pattern: 'systemjs.config.js', included: false, watched: false},
+      {pattern: 'systemjs.config.extras.js', included: false, watched: false},
       'karma-test-shim.js',
 
       // transpiled application & spec code paths loaded via module imports
       {pattern: appBase + '**/*.js', included: false, watched: true},
+      {pattern: testBase + '**/*.js', included: false, watched: true},
+
 
-      // asset (HTML & CSS) paths loaded via Angular's component compiler
+      // Asset (HTML & CSS) paths loaded via Angular's component compiler
       // (these paths need to be rewritten, see proxies section)
       {pattern: appBase + '**/*.html', included: false, watched: true},
       {pattern: appBase + '**/*.css', included: false, watched: true},
 
-      // paths for debugging with source maps in dev tools
-      {pattern: appBase + '**/*.ts', included: false, watched: false},
-      {pattern: appBase + '**/*.js.map', included: false, watched: false}
+      // Paths for debugging with source maps in dev tools
+      {pattern: appSrcBase + '**/*.ts', included: false, watched: false},
+      {pattern: appBase + '**/*.js.map', included: false, watched: false},
+      {pattern: testSrcBase + '**/*.ts', included: false, watched: false},
+      {pattern: testBase + '**/*.js.map', included: false, watched: false}
     ],
 
-    // proxied base paths for loading assets
+    // Proxied base paths for loading assets
     proxies: {
       // required for component assets fetched by Angular's compiler
       "/app/": appAssets
diff --git a/Angular2_Dev/package.json b/Angular2_Dev/package.json
index 4e20063abc7acbac61335f6ccbe005945327d5c1..c85f008ae073fb980e823c03173a6149ac066587 100755
--- a/Angular2_Dev/package.json
+++ b/Angular2_Dev/package.json
@@ -48,8 +48,12 @@
     "moment": "^2.15.0"
   },
   "devDependencies": {
-    "canonical-path": "0.0.2",
     "concurrently": "^2.2.0",
+    "lite-server": "^2.2.2",
+    "typescript": "^2.0.2",
+    "typings": "^1.3.2",
+
+    "canonical-path": "0.0.2",
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
     "gulp-sass": "^2.3.2",
@@ -60,13 +64,12 @@
     "karma-cli": "^1.0.1",
     "karma-htmlfile-reporter": "^0.3.4",
     "karma-jasmine": "^1.0.2",
-    "lite-server": "^2.2.2",
     "lodash": "^4.11.1",
-    "protractor": "^4.0.5",
+    "protractor": "^3.3.0",
     "rimraf": "^2.5.2",
-    "tslint": "^3.15.1",
-    "typescript": "^2.0.2",
-    "typings": "^1.3.2"
+    "tslint": "^3.15.1"
+
+
   },
   "repository": {}
 }
diff --git a/Angular2_Dev/tsconfig.json b/Angular2_Dev/tsconfig.json
index e6a6eac11d14e517f75375592ca10d1f22a65c45..fd1d10190d11b32e437120445fc356636c53bfe4 100755
--- a/Angular2_Dev/tsconfig.json
+++ b/Angular2_Dev/tsconfig.json
@@ -7,6 +7,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "removeComments": false,
-    "noImplicitAny": false
+    "noImplicitAny": true,
+    "suppressImplicitAnyIndexErrors": true
   }
 }