Getting SensorLayout to show up on all devices, trying to get UITableViewCells to
cooperate.
Merge remote-tracking branch 'upstream/master' into ms572

Conflicts:
	iOS/Data_Collector/Data_Collector.xcodeproj/project.pbxproj
Merge pull request #580 from stowellm/ms572

Getting SensorLayout to show up on all devices, trying to get UITableVie...