Merge branch 'master' into develop

# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	docs/dist/docs.css
#	docs/dist/docs.js
#	docs/index.html
#	docs/src/js/docs.js
#	docs/src/less/components/icons.less
#	docs/src/less/components/type.less
#	docs/src/less/docs.less
#	gulpfile.js
#	package.json
#	src/js/plyr.js

docs/src/js/docs.js

@@ -2,7 +2,7 @@
 // Docs example
 // ==========================================================================
 
-/*global plyr, shr */
+/*global plyr, shr*/
 
 // Setup the player
 plyr.setup({
@@ -25,7 +25,7 @@ shr.setup({
 });
 
 // General functions
-(function() { 
+(function() {
 	var buttons = document.querySelectorAll('[data-source]');
 
 	// Bind to each button
@@ -103,7 +103,7 @@ shr.setup({
 	}
 })();
 
-// Google analytics 
+// Google analytics
 // For demo site (http://[www.]plyr.io) only
 if(document.domain.indexOf('plyr.io') > -1) {
 	(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){
@@ -112,4 +112,4 @@ if(document.domain.indexOf('plyr.io') > -1) {
 	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 	ga('create', 'UA-40881672-11', 'auto');
 	ga('send', 'pageview');
-}
+}

docs/src/less/components/buttons.less

@@ -78,7 +78,7 @@ nav {
 	}
 }
 
-// Shared 
+// Shared
 .btn,
 .btn-count {
 	display: inline-block;
@@ -88,7 +88,7 @@ nav {
 	user-select: none;
 }
 
-// Buttons 
+// Buttons
 .btn {
 	padding: (@padding-base / 2) @padding-base;
 	background: @body-background;
@@ -121,7 +121,7 @@ nav {
 	box-shadow: 0 1px 1px rgba(0,0,0, .15);
 	text-shadow: 0 1px 1px rgba(0,0,0, .1);
 	color: #fff;
-	
+
 	&:hover,
 	&:focus {
 		color: #fff;
@@ -156,4 +156,4 @@ nav {
 		border-width: 1px 0 0 1px;
 		transform: rotate(-45deg) translate(-50%, -50%);
 	}
-}
+}

docs/src/less/components/icons.less

@@ -19,4 +19,4 @@ label svg {
 a .icon,
 .btn .icon {
 	margin-right: (@padding-base / 2);
-}
+}

docs/src/less/components/type.less

@@ -29,7 +29,7 @@ small {
 ul
 li {
     list-style: none;
-    margin: 0; 
+    margin: 0;
     padding: 0;
 }
 
@@ -58,4 +58,4 @@ a {
 }
 .color-youtube {
     color: @color-youtube;
-}
+}

docs/src/less/docs.less

@@ -24,4 +24,4 @@
 @import "components/buttons.less";
 @import "components/panels.less";
 @import "components/error.less";
-@import "components/examples.less";
+@import "components/examples.less";

docs/src/less/variables.less

@@ -35,4 +35,4 @@
 
 // Examples
 @example-width-audio: 		520px;
-@example-width-video: 		1200px;
+@example-width-video: 		1200px;