Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Comminting imaginary changes
Merge remote-tracking branch 'upstream/master' into jp508
Added a lot of core data code.  Going to be focusing on reworking my previous data sets into Managed Objects (which will persist like my .ser file in Android)
Added a new logo for the iSENSE Data Collector application, and core data with my DataSet object now successfully compiles.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into jp508
App still compiles.  Data Saving not yet functional, but fairly close.
More dataset changes and logo changes
Merge remote-tracking branch 'upstream/master' into jp508
Merge remote-tracking branch 'upstream/master'
Moved logo stuff around so it would be neater
Merge remote-tracking branch 'upstream/master' into jp508