from tommy
Merge branch 'bluetooth' of https://github.com/tledford/438.git into
bluetooth

Conflicts:
	ODK Collect/bin/ODK Collect.apk
	ODK Collect/bin/classes.dex
	ODK
Collect/bin/classes/org/odk/collect/android/activities/StartClicksCapture.class
	ODK
Collect/bin/dexedLibs/google-play-services_lib-a7704e6826870ed9d1a8c822c3d3e2ba.jar
	ODK Collect/bin/resources.ap_
	ODK Collect/src/org/odk/collect/android/tasks/InstanceUploaderTask.java