Updated for iOS6
Merge pull request #1 from moneytree/ios6

Updated for iOS6