Revert "Merge remote-tracking branch 'remotes/origin/master' into GUI-and-controller"

This reverts commit 865cde6ac4d6de42a09982aefb88ea178a0f05b0, reversing
changes made to fd09719d71cca17d1c3af9688f7c313a7b173bc0.

Conflicts:
	src/main/java/FileSieve/Persistence/Reports/HTMLDiffReport.java