Made Manual prompt for an experiment # if one hasn't been saved to preferences yet,
removed the experiment selection menu item from Automatic, fine-tuned the layouts
again for Step One Setup.
Removed ZXing Project.
Committing xcode configs to fetch from upstream
Merge remote-tracking branch 'upstream/master' into ms542

Conflicts:
	iOS/Data_Collector/Data_Collector.xcodeproj/project.pbxproj
Merge pull request #569 from stowellm/ms542

Removed ZXing, manual prompts exp, sensor select dispatch created
Fixed merge head addition in the xcode project file causing it to be unparsable
Merge pull request #570 from stowellm/ms542

Fixed merge head addition in the xcode project file causing it to be unp...