stufffff
Probably removed the conflictz
added data set field file
Project fields can now be retrieved given a project id
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute
App is Finished
Nyeh
Merge pull request #678 from Rajia/ra553

Finished version of DataWalk V2
Added data set object, and added a bit of javadoc to the API
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute
Updated a bunch of UIs and logos
removed stuffz
Merge pull request #679 from jaypoulz/jp646

Jp646 -- new logos and ui updates for some apps + small bug fixes on Android
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute
Insanity
Merge remote-tracking branch 'upstream/master' into vb653
added log out functionality (semi-broken), added stub of uploadDataSet
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