New apk for Android
Merge remote-tracking branch 'upstream/master' into vb548
I think my version of iOS DFM is working now. The data is properly reordered. I now need to figure out why upload crashes.
More changes to DFM
Merge remote-tracking branch 'upstream/master' into vb548
Update app to match spec
Merge pull request #895 from balabhv/vb548

Lots of changes that I haven't merged yet