minor changes
merges
Merge branch 'master' of https://github.com/barta3/TravelPlanner.git

Conflicts:
	src/model/entity/SimulationEditorModel.java