Fixed a time issue in StopDisplayVC
Added the new images for the track button.
Made some changes that make the app run better.
Made some changes to project file and attempting to fix the data model merger.
Fixed the data model issue.
Fixed a couple of issues.
Adjusted the menu so the trackMe button is on the top of the list.
Merge branch 'develop' into version-2

Conflicts:
	Busted/Busted.xcodeproj/project.xcworkspace/xcuserdata/aeisses.xcuserdatad/UserInterfaceState.xcuserstate
	Busted/Busted/ViewController.h
	Busted/Busted/ViewControllers/MapViewController.h
	Busted/Busted/ViewControllers/MapViewController.m
	Busted/Busted/ViewControllers/StopDisplayViewController.m
Adding the hamburger menu