Merge branch '2.x'

pom.xml

@@ -7,8 +7,8 @@
 	<packaging>war</packaging>
 
 	<properties>
-		<io.spring.platform-version>Brussels-SR11</io.spring.platform-version>
-		<io.netty-version>4.1.26.Final</io.netty-version>
+		<io.spring.platform-version>Brussels-SR12</io.spring.platform-version>
+		<io.netty-version>4.1.28.Final</io.netty-version>
 		<org.aspectj-version>1.8.13</org.aspectj-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<timestamp>${maven.build.timestamp}</timestamp>
@@ -334,7 +334,7 @@
 		<dependency>
 			<groupId>org.checkerframework</groupId>
 			<artifactId>checker-qual</artifactId>
-			<version>2.5.3</version>
+			<version>2.5.4</version>
 		</dependency>
 	</dependencies>
 

src/site/markdown/index.md

-# Indroduction
+# Introduction
 
 ARSnova is a modern approach to Audience Response Systems (ARS).
 It is released under the GPLv3 license, and is offered as a Software as a Service free of charge.