add save/load functionality to gui
Merge remote-tracking branch 'origin/master' into load-save-csv

Conflicts:
	src/main/java/tripcalculator/bl/TripModel.java
	src/main/resources/tripcalculator/bl/trips.csv