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
Re-write most of iOS DFM, minus reOrderData and a local private static getOrder for the class
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'upstream/master' into goat
Finished up iOS DFM and QDataSet upload function.  Cannot do extensive testing until FieldMatching is implemented properly into automatic, passing off to CRP for testing.
Merge remote-tracking branch 'origin/bd859' into bd859
Fixed up some dfm bugs, recording data for no proj correctly (I hope)
Update app to match spec
Merge pull request #895 from balabhv/vb548

Lots of changes that I haven't merged yet
Merge remote-tracking branch 'upstream/master' into goat
Added xcode proj configurations
Fixed a minor upload bug: distinction between nsdictionary and nsmutabledictionary
Merge pull request #896 from stowellm/goat

iOS DFM completed, tested for no project
Merge remote-tracking branch 'upstream/master' into bd859
hopefully fixed continuous picture loop