Updated iOS tutorial to resolve conflicts
Merge pull request #1556 from krisragh/test_0905

Updated iOS tutorial to resolve conflicts