Minor changes
Merge origin/MainBranch into MainBranch

Conflicts:
	src/mediator/CsvFile.java
Minor changes