Merge pull request #17 from khawkins/unstable

Cordova: Merging master into unstable
Xcode 5 project settings