Merge pull request #697 from balabhv/vb548

Updates. App still broken due to changing to rSENSE API
Fixed more things. Need nick's help understanding the format data needs to be in before uploading.
Merge remote-tracking branch 'upstream/master' into vb548