Merge origin/master

Conflicts:
	src/UserInterface/Operations/FXMLController/ReturnInformationPageFXMLController.java