Merge branch 'dokumente' into protokolle

Conflicts:
	stratum0doc.sty

stratum0doc.sty

@@ -43,6 +43,10 @@
 \newcommand{\vote}[4]{%
   \marginpar{\footnotesize #1:\\#2~pro, #3~con, #4~neutral}%
 }
+%% consents without vote
+\newcommand{\consent}[1]{%
+  \marginpar{\footnotesize #1}%
+}
 
 \RequirePackage{fancyhdr}
 \RequirePackage{lastpage}