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.

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

Conflicts:
	pom.xml

Disabled AOP code executed when joining sessions which caused an
exception because of scoping.

joinSession method since HTTP session is out of scope

Note that this is currently untested. :o

Introduced a new CouchDB view method, and a new field to divide
'skill_questions' into preparation, lecture, and flashcard
variants. The former question type 'flashcard' will be removed
soon.

This is a workaround when a session keyword is entered as a single key

Lots of redundand code deleted thanks to this change