Merge branch 'master' into question-based-progress

src/main/java/de/thm/arsnova/controller/ConfigurationController.java

@@ -102,6 +102,9 @@ public class ConfigurationController extends AbstractController {
 
 	@Value("${question.answer-option-limit:8}")
 	private String answerOptionLimit;
+	
+	@Value("${upload.filesize_b:}")
+	private String maxUploadFilesize;
 
 	@Value("${question.parse-answer-option-formatting:false}")
 	private String parseAnswerOptionFormatting;
@@ -183,6 +186,9 @@ public class ConfigurationController extends AbstractController {
 		if (!"".equals(demoSessionKey)) {
 			config.put("demoSessionKey", demoSessionKey);
 		}
+		if (!"".equals(maxUploadFilesize)) {
+			config.put("maxUploadFilesize", maxUploadFilesize);
+		}
 
 		config.put("answerOptionLimit", Integer.valueOf(answerOptionLimit));
 		config.put("parseAnswerOptionFormatting", Boolean.valueOf(parseAnswerOptionFormatting));