Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Merge remote-tracking branch 'upstream/master' into jp822
Stuff
Merge remote-tracking branch 'upstream/master' into vb548
Merge remote-tracking branch 'upstream/master' into jp822
Changed field matching UI, data structure for holding field matching data, started pickerview implementation
Stuff
Merge remote-tracking branch 'upstream/master' into vb548
Just about done with field matching - implemented uialertview with the spinner to select matched fields
Finished FieldMatching implementation, just needs integration.  Also removed the CreateProject button since I doubt I will be able to get to that in time
Fixed DFM bug with matching acceleration magnetic and gyroscope fields
Merge pull request #906 from stowellm/goat

Field Matching and DFM bug fix
More fixes
Merge remote-tracking branch 'upstream/master' into vb548
Uploading finally works! Default Dev project changed
Merge pull request #907 from balabhv/vb548

CRP Upload finally works
Merging preparation
Merge remote-tracking branch 'upstream/master' into goat