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\!
Merge pull request #528 from nickavv/master

more TSoR improvements
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!
Fixed time uploading from TSoR app
Fixed conflicts