From 0540247bf0efc4aea3036b9ec75192e2fd2ba63d Mon Sep 17 00:00:00 2001
From: Raul <elecash@gmail.com>
Date: Fri, 30 Dec 2016 00:13:26 +0100
Subject: [PATCH 1/2] chore(package): Migrate to core-js

Migrate to core-js to fix problems with triple-slash directives added by es6-shim

close #317
---
 karma.conf.js                                         | 2 +-
 package.json                                          | 6 +++---
 src/controls/vg-playback-button/vg-playback-button.ts | 3 ---
 tsconfig.json                                         | 6 +++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 00a30336..55de5884 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -15,7 +15,7 @@ module.exports = function(config) {
 
         files: [
             // Polyfills.
-            'node_modules/es6-shim/es6-shim.js',
+            'node_modules/core-js/client/shim.min.js',
 
             'node_modules/reflect-metadata/Reflect.js',
 
diff --git a/package.json b/package.json
index e12fc574..d9c5cc8e 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/videogular/videogular2"
   },
   "dependencies": {
-    "es6-shim": "0.35.2",
+    "core-js": "2.4.1",
     "reflect-metadata": "0.1.9",
     "rxjs": "5.0.0-beta.12",
     "systemjs": "0.19.40",
@@ -21,7 +21,7 @@
     "@angular/platform-browser": "2.2.3",
     "@angular/platform-browser-dynamic": "2.2.3",
     "@angular/platform-server": "2.2.3",
-    "@types/es6-shim": "0.31.32",
+    "@types/core-js": "0.9.35",
     "@types/jasmine": "2.5.38",
     "codelyzer": "2.0.0-beta.1",
     "commitizen": "2.9.3",
@@ -39,7 +39,7 @@
     "remap-istanbul": "0.8.0",
     "semantic-release": "6.3.2",
     "tslint": "4.2.0",
-    "typescript": "2.0.10",
+    "typescript": "2.1.4",
     "watch": "1.0.1"
   },
   "scripts": {
diff --git a/src/controls/vg-playback-button/vg-playback-button.ts b/src/controls/vg-playback-button/vg-playback-button.ts
index e2542d07..aab4afe7 100644
--- a/src/controls/vg-playback-button/vg-playback-button.ts
+++ b/src/controls/vg-playback-button/vg-playback-button.ts
@@ -10,7 +10,6 @@ import {VgAPI} from '../../core/services/vg-api';
         :host {
             -webkit-touch-callout: none;
             -webkit-user-select: none;
-            -khtml-user-select: none;
             -moz-user-select: none;
             -ms-user-select: none;
             user-select: none;
@@ -21,8 +20,6 @@ import {VgAPI} from '../../core/services/vg-api';
             cursor: pointer;
             color: white;
             line-height: 50px;
-            width: 50px;
-            color: white;
             font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
         }
     `]
diff --git a/tsconfig.json b/tsconfig.json
index 6b0c4484..98cc303b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,9 +11,9 @@
         "moduleResolution": "node"
     },
     "exclude": [
-        "node_modules",
-        "coverage",
-        "examples"
+        "node_modules/*",
+        "coverage/*",
+        "compiled/*"
     ],
     "angularCompilerOptions": {
         "genDir": "compiled"

From 8b0b38bd1752731789ffb212fd3cf934b2795c5a Mon Sep 17 00:00:00 2001
From: Raul <elecash@gmail.com>
Date: Fri, 30 Dec 2016 00:18:29 +0100
Subject: [PATCH 2/2] fix(package): Migrate to core-js

bump and update license owner

close #317
---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 2a6b69f7..16e84e7b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 2fdevs
+Copyright (c) 2013 ByteDefault SL
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in