See git issue #548 for list of completed changes.
Merge pull request #565 from stowellm/ms542

Finished Step One setup for iOS.
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
Committing xcode configs to fetch from upstream
Merge remote-tracking branch 'upstream/master' into ms542

Conflicts:
	iOS/Data_Collector/Data_Collector.xcodeproj/project.pbxproj