Merge branch 'master' of gitorious@scm.thm.de:arsnova/arsnova-war.git

Conflicts:
	src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java

src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java

@@ -35,7 +35,6 @@ public class ARSnovaSocketIOServer {
 
 	public ARSnovaSocketIOServer() {
 		config = new Configuration();
-
 	}
 
 	public void startServer() throws Exception {

src/main/resources/log4j.properties

@@ -5,5 +5,6 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n
 
  
-#log4j.category.org.springframework.beans.factory=DEBUG
-log4j.category.de.thm.arsnova=DEBUG
\ No newline at end of file
+log4j.category.org.springframework=INFO
+log4j.category.de.thm.arsnova=DEBUG
+log4j.category.com.corundumstudio.socketio=TRACE
\ No newline at end of file