updating trackingService with arduino callbacks
working on getting a callback registered
Phone sensor classification working with hardcoded threshold
Merge branch 'tempMaster' into newTrackingService

Conflicts:
	MyRuns/AndroidManifest.xml
	MyRuns/bin/AndroidManifest.xml
	MyRuns/bin/R.txt
	MyRuns/gen/com/facebook/android/R.java
	MyRuns/gen/edu/dartmouth/cs/myruns5/R.java
	MyRuns/project.properties
	google_play_services/libproject/google-play-services_lib/bin/google-play-services_lib.jar
Merge branch 'master' into newTrackingService

Conflicts:
	MyRuns/bin/AndroidManifest.xml
	MyRuns/bin/R.txt
	MyRuns/gen/com/facebook/android/R.java
	MyRuns/gen/com/google/android/gms/R.java
	MyRuns/gen/edu/dartmouth/cs/myruns5/R.java
	MyRuns/res/layout/activity_map_display.xml
	MyRuns/src/edu/dartmouth/cs/myruns5/Globals.java
	MyRuns/src/edu/dartmouth/cs/myruns5/TrackingService.java
	MyRunsDataCollector/bin/MyRunsDataCollector.apk
	MyRunsDataCollector/bin/classes.dex
	MyRunsDataCollector/bin/resources.ap_
	SerialUsbDriver/bin/serialusbdriver.jar
	google_play_services/libproject/google-play-services_lib/bin/google-play-services_lib.jar
Basic view now will tell you whether or not arduino is detected on startup
Added arduino light data being output to view - max of both values
Merge branch 'master' into newTrackingService

Conflicts:
	MyRuns/bin/R.txt
	MyRuns/gen/com/facebook/android/R.java
	MyRuns/gen/edu/dartmouth/cs/myruns5/R.java
	SerialUsbDriver/bin/serialusbdriver.jar
	google_play_services/libproject/google-play-services_lib/bin/google-play-services_lib.jar
arduino classification and display working