Fixes for iOS 7
Prepared to test motion activity against my own motion detection
Merge branch 'master' of https://github.com/dmzza/NapTheL

Conflicts:
	NapTheL.xcodeproj/project.pbxproj
	NapTheL/AppDelegate.m
	NapTheL/TripViewController.xib
	Tune Out/TripViewController.m