UserPrefs File being a pain.
File Changes still not showing up...
Merge branch 'AddingSaveFeaturesToTripSummaryPage'

Conflicts:
	FrameWorkApp/FrameWorkApp.userprefs
	FrameWorkApp/FrameWorkApp/Helper Classes/SDMFileManager.cs