See git issue #548 for list of completed changes.
Finished Step One setup for iOS.
Merge pull request #565 from stowellm/ms542

Finished Step One setup for iOS.
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.
Fixed issue with orange text boxes on landscape enter name dialog for v11
Merge pull request #566 from balabhv/vb548

Fixed v11 Landscape Enter Name Dialog
Fixed Change Name dialog on menu to not exit app
specified unit on recording length dialog
fixed missing time
Merge pull request #567 from balabhv/vb548

Fixed Change Name dialog on menu to not exit app, specified unit on recording length dialog, fixed missing time
Fixed stuff by reverted to old state
Merge pull request #568 from jaypoulz/retrieveMainWindow

Fixed stuff by reverted to old state
Back to where I was yesterday except this time my dev environment isn't horribly broken.
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...
The record button now works correctly and the buttons now enabled and disabled mostly correctly.
The new uploading model will be to add all datasets to the upload queue before trying to upload any of them, so I reworked a bunch of the logic handling this.
I changed the upload or delete dialog to a save or delete dialog.
Safely merge Mike's waffles into my new code
Merge pull request #571 from jaypoulz/jp508

Jp508 -- Reworked automatic application workflow logic