Merge pull request #504 from stowellm/ms485

Data collector prepared for store, new .apk files saved
UI updates for iOS app
Merge remote-tracking branch 'upstream/master' into jp447
Merge pull request #505 from jaypoulz/jp447

Jp485
Fixed dfm nil issue, fixed toast string comp warnings