fixed merge issue
fixed merge issues again
Merge pull request #976 from AlanRosenthal/fixlogin

append dataset now works with new json upload format
Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware