Merge remote-tracking branch 'upstream/master' into vb653


Former-commit-id: 5095ed66904e0f82c03f907d6f851d84bf08dcd5
Merge pull request #687 from stowellm/ms636

Updated csv uploader for production

Former-commit-id: fcef5b297bf03e02404d29cda60f2cc545ec484e
Added xxhdpi assets to isense imports


Former-commit-id: f7644eeb6086930906629f60cffd89c04f383236
Added the ability to retrieve a data set from iSENSE, and wrote a function to convert row-major jsonobjects into column-major ones to facilitate this


Former-commit-id: 062fc55260b65e7c4fded7a7c023fe6046e09f72
Merge branch 'master' of ssh://github.com/isenseDev/iSENSE-Hardware into parachute


Former-commit-id: 18cd4b6c436476917a9d19bb8dea26c5b8ce8620
added getDataSets function


Former-commit-id: a8ff7102f21aa86d8c5b8d8d26584c34e02e6797
See log for August 2nd and remaining to do list


Former-commit-id: b6df7dcdad55399003dba1cae666fd2db9423e3d
Merge pull request #690 from Rajia/ra553

See log for August 2nd and remaining to do list

Former-commit-id: ce0a89f32c0b6df4c72f2f23faa63754107d120a
fixed logout


Former-commit-id: 110d42bd942d5b7058ed6a91db88c2f0390c562b
fix recording data


Former-commit-id: 6be474307ae974db79852f23cda5b36c0aa1dd6c
updated all function headers in API to javadoc standard


Former-commit-id: a4ea05f7e7d2627ab9c85da0cb1e00f8f12ee68e
Merge pull request #692 from nickavv/parachute

a bit more API fun

Former-commit-id: 51bc49cb9efd9aa76cfcfad71f7ba85d3ff69fdd
Merge remote-tracking branch 'upstream/master' into vb653


Former-commit-id: df8eb99651251aab7b0aedfab87059392aba8a19
Merge remote-tracking branch 'upstream/master' into hamster


Former-commit-id: 184c187ae8504949a89765f276d527db6967fdff
Updated Data Collector to production, not dev


Former-commit-id: 62840c0eac2fbf25e863a308758e7e4367364dda
Merge remote-tracking branch 'upstream/master' into vb653


Former-commit-id: 87db330b73d094b2a0fb2afd8affa90eb48111ec
Merge pull request #693 from stowellm/ms636

xxhdpi logos, data collector on production

Former-commit-id: c92b6954c63f731123345e3c9806aa192cd9a72a
switched some of the rapi to new api


Former-commit-id: dfc4b148c0eaed5dc648b5956d0013f421aad10d
append data set data function oughta work, but authenticity is goin nuts


Former-commit-id: aaa37ebf62be01d5276c563d03cc05d52567b30f
"Fixed uploading..."


Former-commit-id: 4e40c84f5935c31b3d8af8bbd0edf54fc51ad57e