Wakelock for service
Merge remote-tracking branch 'upstream/master' into ms516
Started no experiment needed feature in data collector
Experiment selection is all isense importable, started no eid recording
New v11 dialogs and android-string-cancel fix
Fixed super fast sample rate and no-sd-card issue
Dfm is isense import, incomplete json bug, toThou formatted all fields
It may be a mess, but data recording with no experiment, re-ordering, and uploading later is a thing\!
Can't press Retrieve Data while data is being retrieved, can't click outside of progress dialog window to dismiss window anymore
Fixed buttons on sensor dialog
old datapoints go away when connecting to a new PPT
stopped you from uploading the no data when you connect to a new ppt
Made TSoR app way less crash-prone. Took advantage of exceptions that were already defined so that if the PINPoint becomes disconnected and you try and talk to it, everything fails safely, and gives you a chance to reconnect.
Complete layout redesign for Automatic and Manual (this commit is a pretty big deal).  Got some cleaning to do but it works
Merge pull request #537 from stowellm/ms516

No-Experiment Data Recording and Complete UI Overhaul
Updated the readme\!
Merge pull request #538 from Rajia/raAlpha

Updated the readme!
More dataset changes and logo changes
Merge remote-tracking branch 'upstream/master' into jp508
Fixed time uploading from TSoR app