Final
Merge branch 'master' of https://github.com/mikikrk/plagiat-system

Conflicts:
	client/src/main/java/com/zpi/plagiarism_detector/client/controller/ResultSceneController.java