Merge remote-tracking branch 'upstream/master' into es6

With conflicts

src/elements/emby-radio/emby-radio.js

@@ -1,6 +1,11 @@
+<<<<<<< HEAD
 import layoutManager from 'layoutManager';
 import 'css!./emby-radio';
 import 'registerElement';
+=======
+define(['layoutManager', 'css!./emby-radio', 'webcomponents'], function (layoutManager) {
+    'use strict';
+>>>>>>> upstream/master
 
 /* eslint-disable indent */