CB-7187 Make CoreLocation a required library only for cordova-ios < 3.6.0
CB-7132 Fix regression regarding default resources

github: close #58
Add VERSION files to fix failing tests (forgot to git add in b7781cb)
CB-6756 Adds save and restore command for platforms.

It also enhances the ConfigParser to support engine elements and cordova namespace.

Conflicts:
	cordova-lib/spec-cordova/restore.spec.js
	cordova-lib/src/configparser/ConfigParser.js
	cordova-lib/src/cordova/restore.js
	cordova-lib/src/cordova/save.js

github: close #18
Fix style errors - make jshint happy
Merge remote-tracking branch 'upstream/master'