Conflicts:
	src/main/java/de/thm/arsnova/dao/CouchDBDao.java
	src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
	src/main/java/de/thm/arsnova/services/IQuestionService.java
	src/main/java/de/thm/arsnova/services/QuestionService.java
	src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java

Set tracking mode to COOKIE to prevent session URL rewriting.

There was a bug in the session retrieval code causing an exception.

There was a bug in the session retrieval code causing an exception.

Conflicts:
	src/main/webapp/WEB-INF/spring/spring-main.xml

Conflicts:
	pom.xml