Merge branch '2.0'

Conflicts:
	pom.xml

CHANGELOG.md

 # Changelog
 
+## 2.0.2
+This release updates dependencies. The updated library for Socket.IO support
+fixes memory leaks and disables SSL 3.0 support (POODLE vulnerability).
+
 ## 2.0.1
 This release introduces the following changes:
 * Updates dependency for Socket.IO support to fix memory leaks

pom.xml

@@ -7,9 +7,9 @@
 	<packaging>war</packaging>
 
 	<properties>
-		<org.springframework-version>4.0.7.RELEASE</org.springframework-version>
-		<org.springframework.security-version>3.2.4.RELEASE</org.springframework.security-version>
-		<org.springframework.integration-mail-version>4.0.3.RELEASE</org.springframework.integration-mail-version>
+		<org.springframework-version>4.0.8.RELEASE</org.springframework-version>
+		<org.springframework.security-version>3.2.5.RELEASE</org.springframework.security-version>
+		<org.springframework.integration-mail-version>4.0.6.RELEASE</org.springframework.integration-mail-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.url>https://scm.thm.de/arsnova</project.url>
 		<sonar.language>java</sonar.language>
@@ -175,6 +175,13 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-cas</artifactId>
 			<version>${org.springframework.security-version}</version>
+			<exclusions>
+				<!-- Exclude log4j-over-slf4j to prevent delegation loop -->
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>log4j-over-slf4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
@@ -194,12 +201,12 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.7</version>
+			<version>1.7.9</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.7</version>
+			<version>1.7.9</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
@@ -256,7 +263,7 @@
 		<dependency>
 			<groupId>com.corundumstudio.socketio</groupId>
 			<artifactId>netty-socketio</artifactId>
-			<version>1.7.3</version>
+			<version>1.7.5</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.inject</groupId>
@@ -345,7 +352,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>9.2.3.v20140905</version>
+				<version>9.2.6.v20141205</version>
 				<configuration>
 					<scanIntervalSeconds>1</scanIntervalSeconds>
 					<webApp>