Bump node-xcode version
Update node-xcode dependency to 0.6.6
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli

Conflicts:
	package.json
Merge branch 'master' of github.com:agrieve/cordova-cli