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

5 files changed, 9 insertions, 9 deletions

diff --git a/docs/src/less/components/buttons.less b/docs/src/less/components/buttons.less
index 066011fe..1401cd01 100644
--- a/docs/src/less/components/buttons.less
+++ b/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%);
 	}
-}
\ No newline at end of file
+}
diff --git a/docs/src/less/components/icons.less b/docs/src/less/components/icons.less
index 882ce25d..7bcc792e 100644
--- a/docs/src/less/components/icons.less
+++ b/docs/src/less/components/icons.less
@@ -19,4 +19,4 @@ label svg {
 a .icon,
 .btn .icon {
 	margin-right: (@padding-base / 2);
-}
\ No newline at end of file
+}
diff --git a/docs/src/less/components/type.less b/docs/src/less/components/type.less
index 7b214b49..8fc200e2 100644
--- a/docs/src/less/components/type.less
+++ b/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;
-}
\ No newline at end of file
+}
diff --git a/docs/src/less/docs.less b/docs/src/less/docs.less
index ea799382..965dcba1 100644
--- a/docs/src/less/docs.less
+++ b/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";
\ No newline at end of file
+@import "components/examples.less";
diff --git a/docs/src/less/variables.less b/docs/src/less/variables.less
index 8cb4bc1b..097aa1f2 100644
--- a/docs/src/less/variables.less
+++ b/docs/src/less/variables.less
@@ -35,4 +35,4 @@
 
 // Examples
 @example-width-audio: 		520px;
-@example-width-video: 		1200px;
\ No newline at end of file
+@example-width-video: 		1200px;