fix merge conflict
merge conflict
fix merge conflics
Merge remote-tracking branch 'origin/bd859' into bd859
Moved Data Collector iOS to ARC
Merge remote-tracking branch 'upstream/master' into goat
Merge pull request #886 from stowellm/goat

iOS Data Collector on ARC Memory Management
Changed Data Collector to Uploader, removed logo from layouts, added new launcher icon
Renamed some proj to exp, session to data set in iOS Uploader
Merge remote-tracking branch 'upstream/master' into goat
More renaming exp to proj and session to data set
Merge pull request #891 from stowellm/goat

Changed DC -> Uploader, renamed exp->proj, ses->data set
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
updated landscape layout