Merge pull request #527 from nickavv/master

TSoR Fixes
Fixed upload, seem to have fixed time syncing on device connect
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware