Merge pull request #435 from khawkins/unstable

Mobile SDK: Merging master into unstable
Cordova project settings commit
Merge pull request #441 from khawkins/cordova_update

Cordova project settings commit
Merge remote-tracking branch 'upstream/master' into unstable

Conflicts:
	external/cordova-ios/cordova-ios