SaveLoadController JUnit and modifications to handle edge cases
Merge origin/master

Conflicts:
	src/controllers/SpaceTradersController.java
Made practical changes to the way resources were handled