Merge remote branch 'upstream/master' into pull_request

Conflicts:
	src/webui/static/app/tvheadend.js

diff --cc src/webui/static/app/tvheadend.js
index a2047b09f7da80ba594df7b841cd0b2f071f1bf1,5835b3f10961762a87619707e8804ef6f4f8b2b2..1066f6f866c32edb8ee4fc721cfecdc4244e671c
--- 1/src/webui/static/app/tvheadend.js
--- 2/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@@ -34,21 -45,16 +45,20 @@@ tvheadend.VLC = function(url) 
    var vlc = document.createElement('embed');
    vlc.setAttribute('type', 'application/x-vlc-plugin');
    vlc.setAttribute('pluginspage', 'http://www.videolan.org');
-   vlc.setAttribute('version', 'version="VideoLAN.VLCPlugin.2');
-   vlc.setAttribute('width', '507');
-   vlc.setAttribute('height', '384');
-   vlc.setAttribute('autoplay', 'yes');
-   vlc.setAttribute('id', 'vlc');
-   if(url) {
-     vlc.setAttribute('src', url);
-   } else {
-     vlc.style.display = 'none';
-   }
+   vlc.setAttribute('version', 'VideoLAN.VLCPlugin.2');
+   vlc.setAttribute('width', '100%');
+   vlc.setAttribute('height', '100%');
+   vlc.setAttribute('autoplay', 'no');
+   vlc.setAttribute('id', randomString());
+   
+   var missingPlugin = document.createElement('div');
+   missingPlugin.style.display = 'none';
+   missingPlugin.style.padding = '5px';
    
 +  var missingPlugin = document.createElement('div');
 +  missingPlugin.style.display = 'none';
 +  missingPlugin.style.padding = '5px';
 +
    var selectChannel = new Ext.form.ComboBox({
      loadingText: 'Loading...',
      width: 200,