Made commands use local cordova
Merge branch 'local-cordova' into cordova-hcp

Conflicts:
	tools/commands-cordova.js