Yingjie
Merge branch 'master' of https://github.com/grantdmckenzie/UCSBActivityTracker

Conflicts:
	bin/UCSBActivityTracker.apk
	bin/classes.dex
	bin/classes/edu/ucsb/geog/AccelService$GenerateUserActivityThread.class
	bin/classes/edu/ucsb/geog/AccelService$ScreenOffBroadcastReceiver.class
	bin/classes/edu/ucsb/geog/AccelService.class
Merge branch 'master' of https://github.com/grantdmckenzie/UCSBActivityTracker

Conflicts:
	bin/UCSBActivityTracker.apk
	bin/classes.dex
	bin/classes/edu/ucsb/geog/AcclThread.class
	src/edu/ucsb/geog/AcclThread.java
yingjie