upload CSV started, not working though
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute
made upload CSV alllllmost work
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute
Upload dialog displays Project: xx, Type: Data, and Data Point Count: xx for Data Walk
Merge pull request #720 from stowellm/goat

Upload dialog displays Project: xx, Type: Data, and Data Point Count: xx...
Fixed points recorded text in DW_v2, and don't view data if dsid returned = -1
Merge pull request #722 from jaypoulz/hamster

Added catch for no data points.
Merge remote-tracking branch 'upstream/master' into goat
Merge pull request #723 from stowellm/goat

Fixed points recorded text in DW_v2, and don't view data if dsid retu… …
Updated version code
Merge remote-tracking branch 'upstream/master' into goat
working version of PT for workshop
Merge pull request #725 from beejisbrigit/brigit_dev

working version of PT for workshop
Merge remote-tracking branch 'upstream/master' into goat
Updated Data Collector to rSense production
Merge pull request #733 from stowellm/goat

Updated Data Collector to rSense production
attempts to get upload CSV working
removed recur from getProjectFields, should work if Skittles' changes worked. untested, beware
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute