TrailList gui change
Merge origin/master

Conflicts:
	src/ctrl/TrailsApp.java
	src/model/TrailModel.java