stufffff
Probably removed the conflictz
Insanity
Merge remote-tracking branch 'upstream/master' into vb653
Made is so that automatic will only upload automatic sessions and manual will only upload manual sessions.

*Important*
Changed DataSaver's upload method to take a parent object! Make sure this matches the dataSet parent you assign.
Merge pull request #680 from jaypoulz/jp646

Made is so that automatic will only upload automatic sessions and manual...
Hotfixes for my queue changes that won't explode if you delete datasets anymore
Merge pull request #681 from jaypoulz/hamster

Hotfixes for my queue changes that won't explode if you delete datasets ...
Fixed Lines going underneath upload button, and more bugs
Merge remote-tracking branch 'upstream/master' into vb653
Merge pull request #683 from balabhv/vb653

Fixed lines going under upload button
Spinner implemented for recording length in Car Ramp Physics v2
Merge remote-tracking branch 'upstream/master' into vb682
Merge pull request #684 from balabhv/vb682

Spinner for recording length working
uploadDataSet does part of what it's supposed to do, I have a new button for testing various API calls so I don't have to make a new button for each one
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute