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

Conflicts:
	src/main/java/de/thm/arsnova/controller/QuestionController.java
	src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
	src/main/java/de/thm/arsnova/services/IQuestionService.java