Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
button takes up empty space when preview is not being used
Merge remote-tracking branch 'upstream/master' into bd859
working on thread issues
Field matching implemented in queues iOS
Merge remote-tracking branch 'origin/bd859' into bd859
Merge remote-tracking branch 'upstream/master' into bd859
iOS dev switch, regex field matching for accel and field matching bug fix
Merge pull request #926 from stowellm/goat

Field Matching in iOS, Field Matching Bug Fixes, Regex Accel Matching
New Uploader apk to store
Merge pull request #927 from stowellm/goat

New Uploader apk to store
fixed upload problem
Fixed ProjectBrowseVC to not always be on dev, manual project ID fix for saved data sets
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
API uses milliseconds in time stamps as well
Merge pull request #928 from stowellm/goat

Fixed ProjectBrowseVC, API uses millis
Merge remote-tracking branch 'upstream/master' into bd859
API logs for upload data set media