Merge commit 'stash' into redesign2018

Conflicts:
	homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak

homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate.bak

@@ -51,12 +51,14 @@ $if(phpTitleFunction)$
 $else$
 		<title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
 $endif$
+$if(css)$
 		<style>
-			code{white-space: pre;}
-$for(css)$
-			<?php include($$basePath."/$css$");?>
-$endfor$
+	$for(css)$
+			<?php include_once( $$basePath."/$css$" );?>
+	$endfor$
 		</style>
+$endif$
+		<style>code{white-space: pre;}</style>
 $if(quotes)$
 		<style>
 			q { quotes: "“" "”" "‘" "’"; }