Merge origin/master

Conflicts:
	client/src/main/java/com/zpi/plagiarism_detector/client/controller/MainSceneController.java
	client/src/main/java/com/zpi/plagiarism_detector/client/model/ClientModel.java