Szukanie_1
Merge remote-tracking branch 'origin/master'

Conflicts:
	ResearchServer/src/main/java/pl/lodz/uni/math/server/model/QuestionType.java