Fixing project settings to work with iOS 7
Merge pull request #13 from khawkins/ios7_project_update

Fixing project settings to work with iOS 7
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	CordovaLib/CordovaLib.xcodeproj/project.pbxproj
Merge pull request #14 from khawkins/unstable

Cordova: Merging master into unstable