Pushing my changes.
Update the Xcode project based on 4.6's recommendations.
Adding a comment and commenting out problematic code.
Fix improper merge.
Getting code back from the source. This should make merging code easier.