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

Conflicts:
	src/main/java/de/thm/arsnova/controller/QuestionController.java
	src/main/java/de/thm/arsnova/dao/CouchDBDao.java
	src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
	src/main/java/de/thm/arsnova/entities/Question.java
	src/main/java/de/thm/arsnova/entities/User.java
	src/main/java/de/thm/arsnova/services/IQuestionService.java
	src/test/java/de/thm/arsnova/controller/LoginControllerTest.java