Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle
#	gradle.properties
#	package.json
#	src/main/resources/js/highlight/highlight.min.js
#	src/main/resources/js/toc.js
#	src/main/sass/ossez.scss
#	src/main/sass/ossez/_responsive.scss

build.gradle

@@ -1,7 +1,8 @@
 plugins {
 	id 'distribution'
 	id 'maven-publish'
-	id 'com.github.node-gradle.node' version '2.2.4'
+	id 'com.moowork.node' version '1.2.0'
+	id "com.moowork.gulp" version '1.2.0'
 }
 
 group = 'com.ossez.docresources'

src/main/sass/ossez.scss

@@ -1,6 +1,6 @@
 @charset "utf-8";
 
-@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Karla:400,700|Montserrat:400,700');
 
 @import "ossez/normalize";