Merge branch '2.1'

Conflicts:
	pom.xml

pom.xml

@@ -9,7 +9,7 @@
 	<properties>
 		<!-- Tests currently fail with Spring Framework >= 4.1.5 -->
 		<org.springframework-version>4.1.4.RELEASE</org.springframework-version>
-		<org.springframework.security-version>3.2.6.RELEASE</org.springframework.security-version>
+		<org.springframework.security-version>3.2.7.RELEASE</org.springframework.security-version>
 		<org.springframework.integration-mail-version>4.1.2.RELEASE</org.springframework.integration-mail-version>
 		<com.fasterxml.jackson-version>2.5.1</com.fasterxml.jackson-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -97,7 +97,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.2</version>
+				<version>2.10.3</version>
 				<configuration></configuration>
 			</plugin>
 		</plugins>
@@ -196,12 +196,12 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.10</version>
+			<version>1.7.12</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.10</version>
+			<version>1.7.12</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
@@ -321,7 +321,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.2</version>
+				<version>3.3</version>
 				<configuration>
 					<source>1.7</source>
 					<target>1.7</target>
@@ -394,7 +394,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.14</version>
+				<version>2.15</version>
 				<configuration>
 					<configLocation>ARSnova-checkstyle-checker.xml</configLocation>
 				</configuration>